diff --git a/.htaccess b/.htaccess
index c14fdb5a8..4faa4a59b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,11 +13,6 @@ RewriteRule ^(.+)/widgets/(.*) ./widgets/$2 [L]
 RewriteRule ^(.+)/layouts/(.*) ./layouts/$2 [L]
 RewriteRule ^(.+)/addons/(.*) ./addons/$2 [L]
 
-# tools
-RewriteRule ^tools/([a-zA-Z0-9_]+)$ ./tools/$1 [L]
-RewriteRule ^tools/$ ./tools/index.php [L]
-RewriteRule ^tools$ ./tools/index.php [L]
-
 # page 
 RewriteRule ^([a-zA-Z0-9_]+)/([[:digit:]]+)page$ ./index.php?mid=$1&page=$2 [L]
 
@@ -30,7 +25,7 @@ RewriteRule ^atom/([[:digit:]]+)$ ./index.php?module=rss&act=atom&page=$1 [L]
 RewriteRule ^atom$ ./index.php?module=rss&act=atom [L]
 
 # administrator page
-RewriteRule ^admin$ ./index.php?module=admin [L]
+RewriteRule ^admin/?$ ./index.php?module=admin [L]
 
 # mid + act 
 RewriteRule ^([a-zA-Z0-9_]+)/api$ ./index.php?mid=$1&act=api [L]
@@ -53,6 +48,9 @@ RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ ./index.php?mid=$1&act=$2 [L]
 # mid + page link
 RewriteRule ^([a-zA-Z0-9_]+)/page/([[:digit:]]+)$ ./index.php?mid=$1&page=$2 [L]
 
+# mid + entry title
+RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L]
+
 # mid + category link
 RewriteRule ^([a-zA-Z0-9_]+)/category/([[:digit:]]+)$ ./index.php?mid=$1&category=$2 [L]
 
diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
new file mode 100644
index 000000000..a3790652c
--- /dev/null
+++ b/addons/captcha/captcha.addon.php
@@ -0,0 +1,108 @@
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    /**
+     * @file captcha.addon.php
+     * @author zero (zero@nzeo.com)
+     * @brief 특정 action을 실행할때 captcah를 띄우도록 함
+     **/
+
+    // before_module_proc 일 경우 && act_type != everytime 이면 세션 초기화
+    if($called_position == "before_module_proc" && $addon_info->act_type == 'everytime' && $_SESSION['captcha_authed']) {
+        unset($_SESSION['captcha_authed']);
+
+    // before_module_init 일때에 captcha 동작
+    } else if($called_position == 'before_module_init') {
+
+        $logged_info = Context::get('logged_info');
+        if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin) return;
+        if($addon_info->target != 'all' && Context::get('is_logged')) return;
+
+        // 캡챠 인증이 되지 않은 세션이면 실행 시작
+        if(!$_SESSION['captcha_authed']) {
+
+            // 언어파일 로드
+            Context::loadLang(_XE_PATH_.'addons/captcha/lang');
+
+            // 캡챠 세션 세팅
+            if(Context::get('act')=='setCaptchaSession') {
+                $f = FileHandler::readDir('./addons/captcha/icon');
+                shuffle($f);
+                $key = rand(0,count($f)-1);
+                $keyword = str_replace('.gif','',$f[$key]);
+                $_SESSION['captcha_keyword'] = $keyword;
+                $target = Context::getLang('target_captcha');
+                header("Content-Type: text/xml; 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");
+                printf("<response>\r\n<error>0</error>\r\n<message>success</message>\r\n<about><![CDATA[%s]]></about>\r\n<keyword><![CDATA[%s]]></keyword>\r\n</response>",Context::getLang('about_captcha'),$target[$keyword]);
+                Context::close();
+                exit();
+
+            // 캡챠 이미지 출력
+            } else if(Context::get('act')=='captchaImage') {
+                $f = FileHandler::readDir('./addons/captcha/icon');
+                shuffle($f);
+                $keyword = $_SESSION['captcha_keyword'];
+                for($key=0,$c=count($f);$key<$c;$key++) {
+                    if($keyword.".gif" == $f[$key]) break;
+                }
+
+                // 이미지 만들기
+                $thumb = imagecreatetruecolor(250,100);
+                for($i=0,$c=count($f);$i<$c;$i++) {
+                    $x = ($i%5)*50;
+                    $y = $i>4?0:50;
+                    imagedestroy($dummy);
+                    $dummy = imagecreatefromgif('./addons/captcha/icon/'.$f[$i]);
+                    imagecopyresampled($thumb, $dummy, $x, $y, 0, 0, 50, 50, 50, 50);
+
+                    if($i==$key) {
+                        $_SESSION['captcha_x'] = $x;
+                        $_SESSION['captcha_y'] = $y;
+                    }
+                }
+                imagedestroy($dummy);
+                header("Cache-Control: ");
+                header("Pragma: ");
+                header("Content-Type: image/png");
+                imagepng($thumb, null,9);
+                imagedestroy($thumb);
+                Context::close();
+                exit();
+
+            // 캡챠 이미지 점검
+            } else if(Context::get('act')=='captchaCompare') {
+                $x = Context::get('mx');
+                $y = Context::get('my');
+                $sx = $_SESSION['captcha_x'];
+                $sy = $_SESSION['captcha_y'];
+
+                if($x>=$sx && $x<=$sx+50 && $y>=$sy && $y<=$sy+50) $_SESSION['captcha_authed'] = true;
+                else $_SESSION['captcha_authed'] = false;
+
+                header("Content-Type: text/xml; 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");
+                print("<response>\r\n<error>0</error>\r\n<message>success</message>\r\n</response>");
+
+                Context::close();
+
+                exit();
+            }
+
+            Context::addJsFile('./addons/captcha/captcha.js',false);
+
+            // 게시판/ 이슈트래커의 글쓰기/댓글쓰기 액션 호출시 세션 비교
+            if(in_array(Context::get('act'), array('procBoardInsertDocument','procBoardInsertComment','procIssuetrackerInsertIssue','procIssuetrackerInsertHistory'))) {
+                $this->error = "msg_not_permitted";
+            }
+        }
+    }
+?>
diff --git a/addons/captcha/captcha.js b/addons/captcha/captcha.js
new file mode 100644
index 000000000..32178b61a
--- /dev/null
+++ b/addons/captcha/captcha.js
@@ -0,0 +1,108 @@
+/**
+ * procFilter 함수를 가로채서 captcha 이미지 및 폼을 출력
+ **/
+var oldExecXml = null;
+var calledArgs = null;
+(function($){
+    $(function() {
+	
+        var captchaXE = null;
+
+        function xeCaptcha() {
+            var body    = $(document.body);
+            var captchaIma;
+            
+            if (!captchaXE) {
+                captchaXE = $("<div>")
+                    .attr("id","captcha_screen")
+                    .css({
+                        position:"absolute",
+                        display:"none",
+                        backgroundColor:"#111",
+                        backgroundRepeat:"repeat",
+                        backgroundPosition:"0 0",
+                        zIndex:500
+                    });
+
+                $('<div id="captchaBox" style="display:none;*zoom:1;overflow:hidden;height:200px;">'+
+                  '<img src="" id="captcha_image" />'+
+                  '<p style="color:#666;width:250px;padding:0;margin:10px 0 20px 0; " id="captchaAbout">&nbsp;</p>'+
+                  '<p style="color:#DDD;width:250px;font-size:15px;padding:0; margin:0 0 10px; font-weight:bold; text-align:center;" id="captchaText">&nbsp;</p>'+
+                  '</div>').appendTo(captchaXE);
+                    
+                body.append(captchaXE);
+                
+                captchaXE.exec = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) {
+                    if(act == 'procBoardInsertDocument' || act == 'procBoardInsertComment' || act == 'procIssuetrackerInsertIssue' || act == 'procIssuetrackerInsertHistory') {
+                        calledArgs = {'module':module,'act':act,'params':params,'callback_func':callback_func,'response_tags':response_tags,'callback_func_arg':callback_func_arg,'fo_obj':fo_obj};
+                        oldExecXml('captcha','setCaptchaSession',new Array(),captchaXE.show,new Array('error','message','about','keyword'));
+                    } else {
+                        oldExecXml(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj);
+                    }
+                    return true;
+                };
+
+                captchaXE.show = function(ret_obj) {
+                    var clientWidth  = $(window).width();
+                    var clientHeight = $(window).height();
+
+                    $(document).scrollTop(0);
+                    $(document).scrollLeft(0);
+
+                    $("#captcha_screen").css({
+                        display:"block",
+                        width  : clientWidth+"px",
+                        height : clientHeight+"px",
+                        left   : 0,
+                        top    : 0
+                    });
+
+                    $("#captchaAbout").html(ret_obj['about']);
+                    $("#captchaText").html(ret_obj['keyword']);
+
+                    $("#captcha_image")
+                        .css( {
+                            width:"250px",
+                            height:"100px",
+                            margin:"0 0 10px 0",
+                            cursor:"pointer"
+                        })
+                        .attr("src", request_uri.setQuery('act','captchaImage').setQuery('rnd',Math.round(Math.random() * 6)))
+                        .click (captchaXE.compare)
+                        .focus( function() { this.blur(); } );
+
+                    $("#captchaBox")
+                        .css({
+                            display:"block",
+                            border:"10px solid #222222",
+                            padding:"10px",
+                            position:"absolute",
+                            backgroundColor:"#2B2523",
+                            left   : (clientWidth/2-125)+"px",
+                            top    : (clientHeight/2-100)+"px"
+                        })
+                };
+
+                captchaXE.compare = function(e) {
+                    var posX = parseInt($("#captchaBox").css("left").replace(/px$/,''),10);
+                    var posY = parseInt($("#captchaBox").css("top").replace(/px$/,''),10);
+                    var x = e.pageX - posX - 20;
+                    var y = e.pageY - posY - 20;
+                    var params = new Array();
+                    params["mx"] = x;
+                    params["my"] = y;
+                    oldExecXml('captcha','captchaCompare',params, function() {
+                        $("#captcha_screen").css({ display:"none" });
+                        oldExecXml(calledArgs.module, calledArgs.act, calledArgs.params, calledArgs.callback_func, calledArgs.response_tags, calledArgs.callback_func_arg, calledArgs.fo_obj);
+                    } );
+                };
+            }
+            return captchaXE;
+        }
+
+        $(window).ready(function(){
+            oldExecXml = exec_xml;
+            exec_xml = xeCaptcha().exec;
+        });
+    });
+})(jQuery);
diff --git a/addons/captcha/conf/info.xml b/addons/captcha/conf/info.xml
new file mode 100644
index 000000000..86ac1a3b1
--- /dev/null
+++ b/addons/captcha/conf/info.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">Captcha 애드온</title>
+    <title xml:lang="jp">Captchaアドオン</title>
+    <title xml:lang="zh-TW">Captcha元件</title>
+    <description xml:lang="ko">
+        프로그램 글 등록기를 막기 위해 게시판/ issueTracker에서 글/ 댓글을 입력하려 할 때 이미지를 보여주고 글에 해당하는 이미지를 선택하게 하는 애드온입니다.
+        로그인하지 않은 경우에만 해당됩니다.
+    </description>
+    <description xml:lang="jp">
+        ボット(bot)がプログラムによるスパム行為を防ぐために、掲示板／issueTrackerで書き込み・コメントを入力する際、ランダムな文字や数字の列を画面に表示し、表示されたものと同じ情報を入力して、データを登録させるアドオンです。
+        ログインしてない時だけ、動作します。
+    </description>
+    <description xml:lang="zh-TW">
+        此元件可防止機器人程式的垃圾留言，在討論板/問題追蹤發表主題或評論時，請同時輸入畫面中所顯示的隨機數字與文字。
+        只適用於無法登入時。
+    </description>
+    <version>0.1</version>
+    <date>2009-02-20</date>
+
+    <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
+        <name xml:lang="ko">zero</name>
+		<name xml:lang="jp">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <extra_vars>
+        <var name="target" type="select">
+            <title xml:lang="ko">Captcha 표시 대상</title>
+			<title xml:lang="jp">Captchaを表示する対象</title>
+			<title xml:lang="zh-TW">Captcha顯示的目標</title>
+            <description xml:lang="ko">글/댓글 등록시 captcha가 동작할 대상을 정할 수 있습니다. 관리자는 무조건 제외됩니다</description>
+			<description xml:lang="jp">管理者以外、書き込み・コメントを入力する際captchaを見せる対象を設定します。</description>
+			<description xml:lang="zh-TW">管理者以外、書き込み・コメントを入力する際captchaを見せる対象を設定します。</description>
+            <options value="">
+                <title xml:lang="ko">로그인하지 않은 사용자</title>
+				<title xml:lang="jp">ログインしてないユーザー</title>
+				<title xml:lang="zh-TW">無法登入的用戶</title>
+            </options>
+            <options value="all">
+                <title xml:lang="ko">모든 사용자</title>
+				<title xml:lang="jp">すべてのユーザー</title>
+				<title xml:lang="zh-TW">所有用戶</title>
+            </options>
+        </var>
+        <var name="act_type" type="select">
+            <title xml:lang="ko">동작 방식</title>
+			<title xml:lang="jp">動作方式</title>
+			<title xml:lang="zh-TW">行為模式</title>
+            <description xml:lang="ko">"1번만 동작"을 선택하시면 1번만 동작후 상태를 저장해서 다음부터 물어보지 않고 그렇지 않으면 매번 물어보게 됩니다</description>
+			<description xml:lang="jp">"1回だけ表示"を選択すると、1回だけ動作した後、その情報を保存して次回からはCaptchaを見せないようにし、もう一つのオプションは毎回Captchaを表示します。</description>
+			<description xml:lang="zh-TW">選擇"單次"，在發生第一次行為後，該行為會儲存，下次不會再顯示；選擇"每次"則會一直顯示。</description>
+            <options value="onetime">
+                <title xml:lang="ko">1번만 동작</title>
+				<title xml:lang="jp">1回だけ表示</title>
+				<title xml:lang="zh-TW">單次</title>
+            </options>
+            <options value="everytime">
+                <title xml:lang="ko">매번 동작</title>
+				<title xml:lang="jp">毎回表示</title>
+				<title xml:lang="zh-TW">每次</title>
+            </options>
+        </var>
+    </extra_vars>
+</addon>
diff --git a/addons/captcha/icon/airplane.gif b/addons/captcha/icon/airplane.gif
new file mode 100755
index 000000000..9c69f2cf3
Binary files /dev/null and b/addons/captcha/icon/airplane.gif differ
diff --git a/addons/captcha/icon/apple.gif b/addons/captcha/icon/apple.gif
new file mode 100755
index 000000000..c1e264445
Binary files /dev/null and b/addons/captcha/icon/apple.gif differ
diff --git a/addons/captcha/icon/book.gif b/addons/captcha/icon/book.gif
new file mode 100755
index 000000000..d805d09fe
Binary files /dev/null and b/addons/captcha/icon/book.gif differ
diff --git a/addons/captcha/icon/camera.gif b/addons/captcha/icon/camera.gif
new file mode 100755
index 000000000..3e001a419
Binary files /dev/null and b/addons/captcha/icon/camera.gif differ
diff --git a/addons/captcha/icon/dog.gif b/addons/captcha/icon/dog.gif
new file mode 100755
index 000000000..fa3102b7c
Binary files /dev/null and b/addons/captcha/icon/dog.gif differ
diff --git a/addons/captcha/icon/earth.gif b/addons/captcha/icon/earth.gif
new file mode 100755
index 000000000..7732ee5c4
Binary files /dev/null and b/addons/captcha/icon/earth.gif differ
diff --git a/addons/captcha/icon/flag.gif b/addons/captcha/icon/flag.gif
new file mode 100755
index 000000000..e9d4a9fdf
Binary files /dev/null and b/addons/captcha/icon/flag.gif differ
diff --git a/addons/captcha/icon/mobile.gif b/addons/captcha/icon/mobile.gif
new file mode 100755
index 000000000..1239a7f4e
Binary files /dev/null and b/addons/captcha/icon/mobile.gif differ
diff --git a/addons/captcha/icon/note.gif b/addons/captcha/icon/note.gif
new file mode 100755
index 000000000..90fe75d31
Binary files /dev/null and b/addons/captcha/icon/note.gif differ
diff --git a/addons/captcha/icon/skeleton.gif b/addons/captcha/icon/skeleton.gif
new file mode 100755
index 000000000..c133251d0
Binary files /dev/null and b/addons/captcha/icon/skeleton.gif differ
diff --git a/addons/captcha/lang/en.lang.php b/addons/captcha/lang/en.lang.php
new file mode 100644
index 000000000..c46b9ce65
--- /dev/null
+++ b/addons/captcha/lang/en.lang.php
@@ -0,0 +1,21 @@
+<?php
+    /**
+     * @file   en.lang.php
+     * @author haneul (haneul0318@gmail.com)
+     * @brief  English Language Pack 
+     **/
+
+    $lang->about_captcha = "Choose an image whose name is listed below";
+    $lang->target_captcha = array(
+        "airplane" => "airplane",
+        "apple" => "apple",
+        "book" => "book",
+        "camera" => "camera",
+        "dog" => "dog",
+        "earth" => "earth",
+        "flag" => "flag",
+        "mobile" => "mobile",
+        "note" => "note",
+        "skeleton" => "skeleton",
+    );
+?>
diff --git a/addons/captcha/lang/jp.lang.php b/addons/captcha/lang/jp.lang.php
new file mode 100644
index 000000000..2d328eca1
--- /dev/null
+++ b/addons/captcha/lang/jp.lang.php
@@ -0,0 +1,21 @@
+<?php
+    /**
+     * @file   addons/captcha/lang/jp.lang.php
+     * @author zero (zero@nzeo.com) 翻訳：ミニミ
+     * @brief  日本語言語パッケージ 
+     **/
+
+    $lang->about_captcha = "ボット（bot）のスパム登録を防ぐため、下の単語と一致するイメージを選択して下さい。";
+    $lang->target_captcha = array(
+        "airplane" => "飛行機",
+        "apple" => "りんご",
+        "book" => "本",
+        "camera" => "カメラ",
+        "dog" => "犬",
+        "earth" => "地球",
+        "flag" => "旗",
+        "mobile" => "携帯",
+        "note" => "音符",
+        "skeleton" => "がいこつ",
+    );
+?>
diff --git a/addons/captcha/lang/ko.lang.php b/addons/captcha/lang/ko.lang.php
new file mode 100644
index 000000000..7defcf57c
--- /dev/null
+++ b/addons/captcha/lang/ko.lang.php
@@ -0,0 +1,21 @@
+<?php
+    /**
+     * @file   ko.lang.php
+     * @author zero (zero@nzeo.com)
+     * @brief  한국어 언어팩 
+     **/
+
+    $lang->about_captcha = "프로그램 등록을 방지하기 위하여 아래 알려주는 이름과 일치하는 이미지를 선택해주세요";
+    $lang->target_captcha = array(
+        "airplane" => "비행기",
+        "apple" => "사과",
+        "book" => "책",
+        "camera" => "카메라",
+        "dog" => "강아지",
+        "earth" => "지구",
+        "flag" => "깃발",
+        "mobile" => "핸드폰",
+        "note" => "음표",
+        "skeleton" => "해골",
+    );
+?>
diff --git a/addons/captcha/lang/zh-TW.lang.php b/addons/captcha/lang/zh-TW.lang.php
new file mode 100644
index 000000000..c81cb55e4
--- /dev/null
+++ b/addons/captcha/lang/zh-TW.lang.php
@@ -0,0 +1,21 @@
+<?php
+    /**
+     * @file   addons/captcha/lang/zh-TW.lang.php
+     * @author zero (zero@nzeo.com) 翻譯：royallin
+     * @brief  captcha正體中文語言
+     **/
+
+    $lang->about_captcha = "用於防止機器人程式之垃圾留言，請選擇一個符合下列詞語的圖像。";
+    $lang->target_captcha = array(
+        "airplane" => "飛機",
+        "apple" => "蘋果",
+        "book" => "書本",
+        "camera" => "照相機",
+        "dog" => "小狗",
+        "earth" => "地球",
+        "flag" => "國旗",
+        "mobile" => "手機",
+        "note" => "音符",
+        "skeleton" => "骷髏",
+    );
+?>
diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php
index d006ef9e4..32b3281f3 100644
--- a/addons/counter/counter.addon.php
+++ b/addons/counter/counter.addon.php
@@ -5,16 +5,10 @@
      * @file counter.addon.php
      * @author zero (zero@nzeo.com)
      * @brief 카운터 애드온
-     *
-     * 카운터 애드온은 XE의 기본 카운터(counter)모듈을 이용하여 로그를 남깁니다.
-     * 검색 로봇이나 기타 툴의 접속을 방지하고 부하를 줄이기 위해서 페이지가 로드된 후에 javascript로 다시 로그를 남기도록 합니다.
-     * 따라서 이 카운터 애드온은 카운터를 수집하게 하는 javascript 파일을 추가하는 동작만 하며 기본 카운터 모듈의 호출은 해당 javascript
-     * 파일내에서 이루어집니다.
      **/
-
-    // called_position가 before_module_init 이고 module이 admin이 아닐 경우
-    if($called_position == 'before_module_init' && !$GLOBALS['__counter_addon_called__'] && !in_array(Context::get('act'), array('procCounterExecute','procFileDelete'))) {
-        if($this->module != 'admin') Context::addJsFile('./modules/counter/tpl/js/counter.js');
-        $GLOBALS['__counter_addon_called__'] = true;
+    // called_position가 before_display_content 일 경우 실행
+    if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module')!='admin') {
+        $oCounterController = &getController('counter');
+        $oCounterController->procCounterExecute();
     }
 ?>
diff --git a/addons/keyword_link/conf/info.xml b/addons/keyword_link/conf/info.xml
index fbc3a9ce6..9820dfcfe 100644
--- a/addons/keyword_link/conf/info.xml
+++ b/addons/keyword_link/conf/info.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon version="0.2">
     <title xml:lang="ko">키워드 링크 애드온</title>
+    <title xml:lang="en">Keyword Link Addon</title>
+    <title xml:lang="zh-CN">关键字链接</title>
     <title xml:lang="zh-TW">關鍵字連結</title>
     <title xml:lang="jp">キーワードリンクアドオン</title>
     <description xml:lang="ko">
@@ -8,10 +10,20 @@
         키워드는 콤마(,)로 구분하여 여러개 등록할 수 있습니다.
         먼저 등록된 키워드가 우선순위를 갖습니다.
     </description>
+    <description xml:lang="en">
+        When this addon is enabled, add an hyperlink to the registered keyword 
+        appeared in contents of documents or comments. 
+        You may register multiple keywords seperated by comma(,).
+    </description>
+    <description xml:lang="zh-CN">
+        此插件将自动给主题正文及评论中的关键字添加相应的预设链接。
+        多个关键字可以用逗号(,)来区分输入。
+        多个关键字的优先级以输入顺序准。
+    </description>
     <description xml:lang="zh-TW">
-        게시글과 댓글의 내용중 등록된 키워드에 링크를 걸어주는 애드온입니다.
+        將文章與評論中和關鍵字相對應的文字自動作連結。
         可用逗號(,)區隔多個關鍵字。
-        以第一關鍵字為主。
+        關鍵字的優先順序以第一關鍵字為主。
     </description>
     <description xml:lang="jp">
         本文とコメントの内容中、登録されたキーワードにリンクを貼りつける機能を行います。
@@ -33,86 +45,122 @@
     <extra_vars>
         <var name="cssquery">
             <title xml:lang="ko">cssquery</title>
+	    	<title xml:lang="zh-CN">cssquery</title>
             <title xml:lang="zh-TW">cssquery</title>
             <title xml:lang="jp">cssquery</title>
+            <title xml:lang="en">cssquery</title>
             <description xml:lang="ko">치환할 부분의 jQuery cssquery입니다.
             xe_board 게시판 스킨이면 공백으로 두면 됩니다.</description>
-            <description xml:lang="zh-TW">치환할 부분의 jQuery cssquery입니다.
-            xe_board 게시판 스킨이면 공백으로 두면 됩니다.</description>
+            <description xml:lang="zh-TW">jQuery cssquery的部份可以置換。
+            如果是使用xe_board討論板面板，請留白。</description>
+	    	<description xml:lang="zh-CN">替换部分的jQuery cssquery。
+            如果正使用的是官方默认皮肤(xe_board），此处留空即可。</description>
             <description xml:lang="jp">置き換える部分のjQuery cssqueryです。
             xe_board掲示板スキンの場合、空白にして下さい。</description>
+            <description xml:lang="en">jQuery cssquery for the part to be substituted. 
+            You may leave blank for xe_board skin.</description>
         </var>
 
         <var name="reg_type" type="select">
             <title xml:lang="ko">링크 방법</title>
+	    	<title xml:lang="zh-CN">链接方式</title>
             <title xml:lang="zh-TW">連結方式</title>
             <title xml:lang="jp">リンクの貼りつけ方</title>
+            <title xml:lang="en">The way to make a link</title>
             <description xml:lang="ko"> 키워드가 여러개 있을때 "첫번째 키워드"에만 링크를 걸 것인지 "모든 키워드"에 걸 것인지 선택합니다.
+            </description>
+	    	<description xml:lang="zh-CN">有多个预设关键字时，在此可以指定链接方式。
             </description>
             <description xml:lang="zh-TW"> 키워드가 여러개 있을때 "첫번째 키워드"에만 링크를 걸 것인지 "모든 키워드"에 걸 것인지 선택합니다.
             </description>
             <description xml:lang="jp"> 複数のキーワードの場合、"最初のキーワード"のみ、もしくは "全てのキーワード"にリンクを貼りつけるかを選択します。
-            </description>            <options value="">
+            </description>
+            <description xml:lang="en">For the multiple keywords, choose if make a link to the first keyword, or all the keywords</description> 
+            <options value="">
                 <title xml:lang="ko">첫번째 키워드</title>
+				<title xml:lang="zh-CN">首个关键字</title>
                 <title xml:lang="zh-TW">第一關鍵字</title>
                 <title xml:lang="jp">最初のキーワード</title>
+                <title xml:lang="en">First keyword</title>
             </options>
             <options value="g">
                 <title xml:lang="ko">모든 키워드</title>
+				<title xml:lang="zh-CN">所有关键字</title>
                 <title xml:lang="zh-TW">所有關鍵字</title>
                 <title xml:lang="jp">全てのキーワード</title>
+                <title xml:lang="en">All keywords</title>
             </options>
         </var>
 
         <var name="keyword01">
             <title xml:lang="ko">키워드</title>
+	    	<title xml:lang="zh-CN">关键字</title>
             <title xml:lang="zh-TW">關鍵字</title>
             <title xml:lang="jp">キーワード</title>
+            <title xml:lang="en">Keyword</title>
         </var>
         <var name="url01">
             <title xml:lang="ko">링크</title>
+	    	<title xml:lang="zh-CN">链接</title>
             <title xml:lang="zh-TW">連結</title>
             <title xml:lang="jp">リンク</title>
+            <title xml:lang="en">Link</title>
         </var>
         <var name="keyword02">
             <title xml:lang="ko">키워드</title>
+	    	<title xml:lang="zh-CN">关键字</title>
             <title xml:lang="zh-TW">關鍵字</title>
             <title xml:lang="jp">キーワード</title>
+            <title xml:lang="en">Keyword</title>
         </var>
         <var name="url02">
             <title xml:lang="ko">링크</title>
+	    	<title xml:lang="zh-CN">链接</title>
             <title xml:lang="zh-TW">連結</title>
             <title xml:lang="jp">リンク</title>
+            <title xml:lang="en">Link</title>
         </var>
         <var name="keyword03">
             <title xml:lang="ko">키워드</title>
+	    	<title xml:lang="zh-CN">关键字</title>
             <title xml:lang="zh-TW">關鍵字</title>
             <title xml:lang="jp">キーワード</title>
+            <title xml:lang="en">Keyword</title>
         </var>
         <var name="url03">
             <title xml:lang="ko">링크</title>
+	    	<title xml:lang="zh-CN">链接</title>
             <title xml:lang="zh-TW">連結</title>
             <title xml:lang="jp">リンク</title>
+            <title xml:lang="en">Link</title>
         </var>
         <var name="keyword04">
             <title xml:lang="ko">키워드</title>
+	    	<title xml:lang="zh-CN">关键字</title>
             <title xml:lang="zh-TW">關鍵字</title>
             <title xml:lang="jp">キーワード</title>
+            <title xml:lang="en">Keyword</title>
         </var>
         <var name="url04">
             <title xml:lang="ko">링크</title>
+	    	<title xml:lang="zh-CN">链接</title>
             <title xml:lang="zh-TW">連結</title>
             <title xml:lang="jp">リンク</title>
+            <title xml:lang="en">Link</title>
         </var>
         <var name="keyword05">
             <title xml:lang="ko">키워드</title>
+	    	<title xml:lang="zh-CN">关键字</title>
             <title xml:lang="zh-TW">關鍵字</title>
             <title xml:lang="jp">キーワード</title>
+            <title xml:lang="en">Keyword</title>
         </var>
         <var name="url05">
             <title xml:lang="ko">링크</title>
+	    	<title xml:lang="zh-CN">链接</title>
             <title xml:lang="zh-TW">連結</title>
             <title xml:lang="jp">リンク</title>
+            <title xml:lang="en">Link</title>
         </var>
     </extra_vars>
 </addon>
diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php
index 7f9213fa1..46b58c9f5 100644
--- a/addons/member_communication/member_communication.addon.php
+++ b/addons/member_communication/member_communication.addon.php
@@ -81,4 +81,4 @@
                 $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', './modules/communication/tpl/images/icon_add_friend.gif', 'popup');
         }
     }
-?>
\ No newline at end of file
+?>
diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php
index 88ba3cce3..10d6ef72c 100644
--- a/addons/member_extra_info/member_extra_info.lib.php
+++ b/addons/member_extra_info/member_extra_info.lib.php
@@ -3,10 +3,15 @@
      * @brief div 또는 span에 member_번호 가 있을때 해당 회원 번호에 맞는 이미지이름이나 닉이미지를 대체
      **/
     function memberTransImageName($matches) {
+
         // 회원번호를 추출하여 0보다 찾으면 본문중 text만 return
         $member_srl = $matches[3];
         if($member_srl<0) return $matches[5];
 
+        $site_module_info = Context::get('site_module_info');
+        $oMemberModel = &getModel('member');
+        $group_image = $oMemberModel->getGroupImageMark($member_srl,$site_module_info->site_srl);
+
         // 회원이 아닐경우(member_srl = 0) 본문 전체를 return
         $nick_name = $matches[5];
         if(!$member_srl) return $matches[0];
@@ -26,11 +31,14 @@
         }
 
         // 이미지이름이나 마크가 없으면 원본 정보를 세팅
-        if(!$image_name_file && !$image_mark_file) return $matches[0];
+        if(!$image_name_file && !$image_mark_file && !$group_image) return $matches[0];
 
         if($image_name_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id: %s" style="vertical-align:middle;margin-right:3px" />', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
         if($image_mark_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id : %s" style="vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
 
+        if($group_image) $nick_name = sprintf('<img src="%s" border="0" style="vertical-align:middle;margin-right:3px"/>%s', $group_image->src, $nick_name);
+
+
         $orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
         return $orig_text.$nick_name.'</'.$matches[6].'>';
     }
diff --git a/addons/mobile/conf/info.xml b/addons/mobile/conf/info.xml
index 471979468..b7912d793 100644
--- a/addons/mobile/conf/info.xml
+++ b/addons/mobile/conf/info.xml
@@ -4,7 +4,7 @@
     <title xml:lang="jp">モバイルXEアドオン</title>
     <title xml:lang="zh-CN">手机XE插件</title>
     <title xml:lang="en">Mobile XE</title>
-    <title xml:lang="zh-TW">行動 XE</title>
+    <title xml:lang="zh-TW">XE行動上網</title>
     <description xml:lang="ko">
         모바일에서 접속시 헤더 정보를 분석하여 메뉴 - 모듈의 관계를 이용하여 WAP 태그로 출력하는 애드온입니다.
         wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
@@ -63,9 +63,9 @@
                 Default charset is euc-kr.
             </description>
             <description xml:lang="zh-TW">
-                行動工具無法讀取 utf-8編碼。
-                當您輸入您想要的編碼時，行動工具將會正確的顯示。
-                預設編碼是 euc-kr.
+                行動工具無法讀取utf-8編碼。
+                當您輸入所想要的編碼時，行動工具將會正確的顯示。
+                預設編碼是euc-kr.
             </description>
         </var>
     </extra_vars>
diff --git a/addons/mobile/lang/zh-CN.lang.php b/addons/mobile/lang/zh-CN.lang.php
index 8af552dc7..6e9b084ed 100644
--- a/addons/mobile/lang/zh-CN.lang.php
+++ b/addons/mobile/lang/zh-CN.lang.php
@@ -1,11 +1,11 @@
 <?php
     /**
      * @file   addons/mobile/lang/zh-CN.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  中文语言包
+     * @author zero (zero@nzeo.com) 翻译：guny
+     * @brief  手机XE插件简体中文语言包
      **/
 
     $lang->cmd_go_upper = '上一级';
     $lang->cmd_go_home = '首页';
-    $lang->cmd_view_sitemap = 'View site map';
+    $lang->cmd_view_sitemap = '网站地图';
 ?>
diff --git a/addons/mobile/lang/zh-TW.lang.php b/addons/mobile/lang/zh-TW.lang.php
index 7f838ce55..fc321705e 100644
--- a/addons/mobile/lang/zh-TW.lang.php
+++ b/addons/mobile/lang/zh-TW.lang.php
@@ -1,11 +1,11 @@
 <?php
     /**
      * @file   addons/mobile/lang/zh-TW.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  正體中文語言包 (只有基本內容)
+     * @author zero (zero@nzeo.com) 翻譯：royallin
+     * @brief  XE行動上網正體中文語言
      **/
 
     $lang->cmd_go_upper = '回上頁';
     $lang->cmd_go_home = '回首頁';
-    $lang->cmd_view_sitemap = 'View site map';
+    $lang->cmd_view_sitemap = '網站地圖';
 ?>
diff --git a/addons/planet_bookmark/conf/info.xml b/addons/planet_bookmark/conf/info.xml
index 98e3d22d2..9d5665bdb 100644
--- a/addons/planet_bookmark/conf/info.xml
+++ b/addons/planet_bookmark/conf/info.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon version="0.2">
     <title xml:lang="ko">플래닛 Bookmark 애드온</title>
+    <title xml:lang="en">Planet Bookmark Add-Ons</title>
+    <title xml:lang="es">Guardar planeta Add-Ons</title>
     <title xml:lang="zh-CN">微博收藏插件</title>
     <title xml:lang="zh-TW">微型部落格書籤</title>
     <title xml:lang="jp">Planet Bookmark アドオン</title>
     <description xml:lang="ko">
         플래닛 Bookmark 애드온
+    </description>
+	<description xml:lang="en">
+        Planet Bookmark Add-Ons
+    </description>
+	<description xml:lang="es">
+        Guardar planeta Add-Ons
     </description>
     <description xml:lang="zh-CN">
         XE微博收藏插件。
@@ -21,6 +29,8 @@
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
+	<name xml:lang="es">zero</name>
+	<name xml:lang="en">zero</name>
         <name xml:lang="jp">zero</name>
         <name xml:lang="zh-CN">zero</name>
         <name xml:lang="zh-TW">zero</name>
diff --git a/addons/wiki_link/conf/info.xml b/addons/wiki_link/conf/info.xml
new file mode 100644
index 000000000..2a22f9e3e
--- /dev/null
+++ b/addons/wiki_link/conf/info.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">위키 링크 애드온</title>
+    <title xml:lang="zh-CN">维基链接插件</title>
+    <title xml:lang="zh-TW">維基百科</title>
+    <title xml:lang="jp">wikiリンクアドオン</title>
+    <description xml:lang="ko">
+        위키 링크를 추가해주는 애드온.
+    </description>
+    <description xml:lang="zh-CN">
+        给维基模块添加链接的插件。
+    </description>
+    <description xml:lang="zh-TW">
+        維基百科控件。
+    </description>
+    <description xml:lang="jp">
+        wikiリンクを追加するアドオン
+    </description>
+    <version>0.1</version>
+    <date>2009-02-03</date>
+
+    <author email_address="haneul0318@gmail.com" link="http://blog.nzeo.com">
+        <name xml:lang="ko">haneul</name>
+		<name xml:lang="zh-CN">haneul</name>
+        <name xml:lang="zh-TW">haneul</name>
+        <name xml:lang="jp">haneul</name>
+    </author>
+</addon>
diff --git a/addons/wiki_link/wiki_link.addon.php b/addons/wiki_link/wiki_link.addon.php
new file mode 100644
index 000000000..99687c200
--- /dev/null
+++ b/addons/wiki_link/wiki_link.addon.php
@@ -0,0 +1,14 @@
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC" && Context::get('act')=='dispWikiEditPage' ) {
+        $module_info = Context::get('module_info');
+        if(!$module_info->module) return;
+        if($module_info->module != 'wiki') return;
+        Context::loadJavascriptPlugin('hotkeys');
+        Context::addJsFile('./addons/wiki_link/wikilink.js');
+        Context::addCssFile('./addons/wiki_link/wikilink.css');
+        $footer = "<div id='link'> <div class='linkForm'>Link Target: <input type='text' id='linktarget' class='inputTypeText w100' /><a href='#' onclick='setText(); return false;'>AddLink</a></div></div>";
+        Context::addHtmlFooter($footer);
+    }
+?>
diff --git a/addons/wiki_link/wikilink.css b/addons/wiki_link/wikilink.css
new file mode 100644
index 000000000..6738acecd
--- /dev/null
+++ b/addons/wiki_link/wikilink.css
@@ -0,0 +1,4 @@
+#link { display: none; }
+#link .linkForm { margin-left: 10px; margin-top: 10px; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 5px; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+
diff --git a/addons/wiki_link/wikilink.js b/addons/wiki_link/wikilink.js
new file mode 100644
index 000000000..2406ef34f
--- /dev/null
+++ b/addons/wiki_link/wikilink.js
@@ -0,0 +1,45 @@
+function openWikiLinkDialog()
+{
+    var link = jQuery("#link");
+    link.css('display', 'block');
+    var target = xGetElementById('linktarget');
+    target.value = "";
+    try{
+        link.dialog({height:100});
+    }
+    catch(e)
+    {
+        link.dialog("open");
+    }
+}
+
+function setText() {
+    var target = xGetElementById('linktarget');
+    if(!target.value || target.value.trim() == '') return;
+    var text = target.value;
+    text.replace(/&/ig,'&amp;').replace(/</ig,'&lt;').replace(/>/ig,'&gt;');
+    var url = request_uri.setQuery('mid',current_mid).setQuery('entry',text); 
+    var link = "<a href=\""+url+"\" ";
+    link += ">"+text+"</a>";
+
+    var iframe_obj = editorGetIFrame(1)
+    editorReplaceHTML(iframe_obj, link);
+    jQuery("#link").dialog("close");
+}
+
+function addShortCutForWiki() 
+{
+    var iframe_obj = editorGetIFrame(1);
+    if(jQuery.os.Mac)
+    {
+        jQuery(iframe_obj.contentWindow.document).bind('keydown', "ALT+SPACE", function(evt) { openWikiLinkDialog(); }); 
+    }
+    else
+    {
+        jQuery(iframe_obj.contentWindow.document).bind('keydown', "CTRL+SPACE", function(evt) { openWikiLinkDialog(); }); 
+    }
+    jQuery(document).bind('keydown',"CTRL+ALT+SPACE", function(evt) {} );
+}
+
+xAddEventListener(window, 'load', addShortCutForWiki);
+
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 5469475d6..62f2df7ca 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1,6 +1,6 @@
 <?php
     /**
-    * @class Context 
+    * @class Context
     * @author zero (zero@nzeo.com)
     * @brief  Request Argument/환경변수등의 모든 Context를 관리
     * Context 클래스는 Context::methodname() 처럼 쉽게 사용하기 위해 만들어진 객체를 받아서
@@ -16,7 +16,7 @@
         var $request_method = 'GET'; ///< @brief GET/POST/XMLRPC 중 어떤 방식으로 요청이 왔는지에 대한 값이 세팅. GET/POST/XML 3가지가 있음
         var $response_method = ''; ///< @brief HTML/XMLRPC 중 어떤 방식으로 결과를 출력할지 결정. (강제 지정전까지는 request_method를 따름)
 
-        var $context = NULL; ///< @brief request parameter 및 각종 환경 변수등을 정리하여 담을 변수 
+        var $context = NULL; ///< @brief request parameter 및 각종 환경 변수등을 정리하여 담을 변수
 
         var $db_info = NULL; ///< @brief DB 정보
         var $ftp_info = NULL; ///< @brief FTP 정보
@@ -26,6 +26,7 @@
         var $css_files = array(); ///< @brief display시에 사용하게 되는 css files의 목록
 
         var $html_header = NULL; ///< @brief display시에 사용하게 되는 <head>..</head>내의 스크립트코드
+        var $body_header = NULL; ///< @brief display시에 사용하게 되는 <body> 바로 다음에 출력될 스크립트 코드
         var $html_footer = NULL; ///< @brief display시에 사용하게 되는 </body> 바로 앞에 추가될 코드
 
         var $path = ''; ///< zbxe의 경로
@@ -40,10 +41,12 @@
 
         var $site_title = ''; ///< @brief 현 사이트의 browser title. Context::setBrowserTitle() 로 변경 가능
 
-        var $get_vars = NULL; ///< @brief form이나 get으로 요청이 들어온 변수만 별도로 관리 
+        var $get_vars = NULL; ///< @brief form이나 get으로 요청이 들어온 변수만 별도로 관리
 
         var $is_uploaded = false; ///< @brief 첨부파일이 업로드 된 요청이였는지에 대한 체크 플래그
 
+        var $widget_include_info_flag = false; // 위젯 정보 코드 출력
+
         /**
          * @brief 유일한 Context 객체를 반환 (Singleton)
          * Context는 어디서든 객체 선언없이 사용하기 위해서 static 하게 사용
@@ -64,6 +67,9 @@
             $this->context->lang = &$GLOBALS['lang'];
             $this->context->_COOKIE = $_COOKIE;
 
+            // 사용자의 쿠키 설정된 언어 타입 추출
+            if($_COOKIE['lang_type']) $this->lang_type = $_COOKIE['lang_type'];
+
             // 기본적인 DB정보 세팅
             $this->_loadDBInfo();
 
@@ -83,19 +89,6 @@
             );
             session_start();
 
-            // 쿠키로 설정된 언어타입 가져오기 
-            if($_COOKIE['lang_type']) $this->lang_type = $_COOKIE['lang_type'];
-            else $this->lang_type = $this->db_info->lang_type;
-            if(!in_array($this->lang_type, array_keys($lang_supported))) $this->lang_type = $this->db_info->lang_type;
-            if(!$this->lang_type) $this->lang_type = "en";
-
-            Context::set('lang_supported', $lang_supported);
-            $this->setLangType($this->lang_type);
-
-            // 기본 언어파일 로드
-            $this->lang = &$GLOBALS['lang'];
-            $this->_loadLang(_XE_PATH_."common/lang/");
-
             // Request Method 설정
             $this->_setRequestMethod();
 
@@ -105,13 +98,31 @@
             $this->_setRequestArgument();
             $this->_setUploadedArgument();
 
-            // 인증 관련 정보를 Context와 세션에 설정
+            // 설치가 되어 있다면 가상 사이트 정보를 구함
             if(Context::isInstalled()) {
                 // site_module_info를 구함
                 $oModuleModel = &getModel('module');
                 $site_module_info = $oModuleModel->getDefaultMid();
                 Context::set('site_module_info', $site_module_info);
+            }
 
+            // 사용자 설정 언어 타입이 없으면 기본 언어타입으로 지정
+            if(!$this->lang_type) {
+                // 가상 사이트라면 가상사이트의 언어타입으로 지정
+                if($site_module_info && $site_module_info->default_language) $this->db_info->lang_type = $site_module_info->default_language;
+
+                // 언어 타입 지정
+                $this->lang_type = $this->db_info->lang_type;
+            }
+            // 지정된 언어가 지원 언어에 속하지 않거나 없으면 영문으로 지정
+            if(!in_array($this->lang_type, array_keys($lang_supported))) $this->lang_type = $this->db_info->lang_type;
+            if(!$this->lang_type) $this->lang_type = "en";
+
+            Context::set('lang_supported', $lang_supported);
+            $this->setLangType($this->lang_type);
+
+            // 인증 관련 정보를 Context와 세션에 설정
+            if(Context::isInstalled()) {
                 // 인증관련 데이터를 Context에 설정
                 $oMemberModel = &getModel('member');
                 $oMemberController = &getController('member');
@@ -129,6 +140,10 @@
                 $this->_set('logged_info', $oMemberModel->getLoggedInfo() );
             }
 
+            // 기본 언어파일 로드
+            $this->lang = &$GLOBALS['lang'];
+            $this->_loadLang(_XE_PATH_."common/lang/");
+
             // rewrite 모듈사용 상태 체크
             if(file_exists(_XE_PATH_.'.htaccess')&&$this->db_info->use_rewrite == 'Y') $this->allow_rewrite = true;
             else $this->allow_rewrite = false;
@@ -206,7 +221,7 @@
             if(!$db_info->use_ssl) $db_info->use_ssl = 'none';
 
             $this->_setDBInfo($db_info);
-            
+
             $GLOBALS['_time_zone'] = $db_info->time_zone;
             $GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
             $this->set('_use_ssl', $db_info->use_ssl);
@@ -265,6 +280,14 @@
             return $this->db_info;
         }
 
+        /**
+         * @brief 기본 URL을 return
+         **/
+        function getDefaultUrl() {
+            $db_info = Context::getDBInfo();
+            return $db_info->default_url;
+        }
+
         /**
          * @brief 지원되는 언어 파일 찾기
          **/
@@ -305,6 +328,46 @@
             return $lang_selected;
         }
 
+        /**
+         * @brief SSO URL이 설정되어 있고 아직 SSO URL검사를 하지 않았다면 return true
+         **/
+        function checkSSO() {
+            // GET 접속이 아니거나 설치가 안되어 있으면 패스
+            if(Context::getRequestMethod()!='GET' || !Context::isInstalled()) return true;
+
+            // DB info에 설정된 Default URL이 없다면 무조건 무사통과
+            $default_url = trim($this->db_info->default_url);
+            if(!$default_url) return true;
+            if(substr($default_url,-1)!='/') $default_url .= '/';
+
+            // SSO 검증을 요청 받는 사이트
+            if($default_url == Context::getRequestUri()) {
+                if(Context::get('default_url')) {
+                    $url = base64_decode(Context::get('default_url'));
+                    $url_info = parse_url($url);
+                    $url_info['query'].= ($url_info['query']?'&':'').'SSOID='.session_id();
+                    $redirect_url = sprintf('%s://%s%s%s?%s',$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'',$url_info['path'], $url_info['query']);
+                    header("location:".$redirect_url);
+                    return false;
+                }
+            // SSO 검증을 요청하는 사이트
+            } else {
+                // SSO 결과를 받는 경우 session_name() 세팅
+                if(Context::get('SSOID')) {
+                    setcookie(session_name(), Context::get('SSOID'), 0, '/');
+                    header("location:".getUrl('SSOID',''));
+                    return false;
+                // SSO 결과를 요청
+                } else if($_COOKIE['sso']!=md5(Context::getRequestUri()) && !Context::get('SSOID')) {
+                    setcookie('sso',md5(Context::getRequestUri()),0,'/');
+                    $url = sprintf("%s?default_url=%s", $default_url, base64_encode(Context::getRequestUrl()));
+                    header("location:".$url);
+                    return false;
+                }
+            }
+
+            return true;
+        }
 
         /**
          * @biref FTP 정보가 등록되었는지 확인
@@ -347,8 +410,8 @@
          * @brief 사이트 title adding
          **/
         function _addBrowserTitle($site_title) {
-            if($this->site_title) $this->site_title .= ' - '.htmlspecialchars($site_title);
-            else $this->site_title .= htmlspecialchars($site_title);
+            if($this->site_title) $this->site_title .= ' - '.$site_title;
+            else $this->site_title .= $site_title;
         }
 
         /**
@@ -364,7 +427,7 @@
          * @brief 사이트 title setting
          **/
         function _setBrowserTitle($site_title) {
-            $this->site_title = htmlspecialchars($site_title);
+            $this->site_title = $site_title;
         }
 
         /**
@@ -558,14 +621,14 @@
          * @brief GET/POST방식일 경우 처리
          **/
         function _setRequestArgument() {
-            if($this->_getRequestMethod() == 'XMLRPC') return;
+            if($this->_getRequestMethod() == 'XMLRPC' || $this->_getRequestMethod() == 'JSON') return;
             if(!count($_REQUEST)) return;
 
             foreach($_REQUEST as $key => $val) {
                 if($val === "") continue;
                 $val = $this->_filterRequestVar($key, $val);
-                if($this->_getRequestMethod()=='GET'&&$_GET[$key]) $set_to_vars = true;
-                elseif($this->_getRequestMethod()=='POST'&&$_POST[$key]) $set_to_vars = true;
+                if($this->_getRequestMethod()=='GET'&&isset($_GET[$key])) $set_to_vars = true;
+                elseif($this->_getRequestMethod()=='POST'&&isset($_POST[$key])) $set_to_vars = true;
                 else $set_to_vars = false;
                 $this->_set($key, $val, $set_to_vars);
             }
@@ -671,6 +734,21 @@
             return $this->request_method;
         }
 
+        /**
+         * @brief 현재 요청된 full url을 return
+         **/
+        function getRequestUrl() {
+            static $url = null;
+            if(is_null($url)) {
+                $url = Context::getRequestUri();
+                if(count($_GET)) {
+                    foreach($_GET as $key => $val) $vars[] = $key.'='.$val;
+                    $url .= '?'.implode('&',$vars);
+                }
+            }
+            return $url;
+        }
+
         /**
          * @brief 요청받은 url에 args_list를 적용하여 return
          **/
@@ -683,14 +761,25 @@
          * @brief 요청받은 url에 args_list를 적용하여 return
          **/
         function _getUrl($num_args=0, $args_list=array(), $domain = null) {
-            if($domain) {
-                $domain = preg_replace('/^(http|https):\/\//i','', trim($domain));
-                if(substr($domain,-1) != '/') $domain .= '/';
+            static $site_module_info = null;
+            if(is_null($site_module_info)) {
+                $site_module_info = Context::get('site_module_info');
             }
 
+            if(!$domain) {
+                if($site_module_info->domain) $domain = $site_module_info->domain;
+                else {
+                    if($this->db_info->default_url) $domain = $this->db_info->default_url;
+                    else if(!$domain) $domain = Context::getRequestUri();
+                }
+            }
+
+            $domain = preg_replace('/^(http|https):\/\//i','', trim($domain));
+            if(substr($domain,-1) != '/') $domain .= '/';
+
             if(!$this->get_vars || $args_list[0]=='') {
                 $get_vars = null;
-                if($args_list[0]=='') {
+                if(is_array($args_list) && $args_list[0]=='') {
                     array_shift($args_list);
                     $num_args = count($args_list);
                 }
@@ -711,6 +800,9 @@
             /* member module중의 쪽지함/친구 관리 기능이 communication 모듈로 이전하여 하위 호환성을 위한 act값 변경 */
             if($get_vars['act'] == 'dispMemberFriend') $get_vars['act'] = 'dispCommunicationFriend';
             elseif($get_vars['act'] == 'dispMemberMessages') $get_vars['act'] = 'dispCommunicationMessages';
+            /* 기존의 action의 값이 바뀌어서 이를 강제 변경 */
+            elseif($get_vars['act'] == 'dispDocumentAdminManageDocument') $get_vars['act'] = 'dispDocumentManageDocument';
+            elseif($get_vars['act'] == 'dispModuleAdminSelectList') $get_vars['act'] = 'dispModuleSelectList';
 
             if($get_vars['act'] && $this->isExistsSSLAction($get_vars['act'])) $path = $this->getRequestUri(ENFORCE_SSL, $domain);
             else $path = $this->getRequestUri(RELEASE_SSL, $domain);
@@ -727,39 +819,41 @@
                 $target = implode('.',$var_keys);
 
                 switch($target) {
-                    case 'mid' : 
+                    case 'mid' :
                         return $path.$get_vars['mid'];
-                    case 'document_srl' : 
+                    case 'document_srl' :
                         return $path.$get_vars['document_srl'];
-                    case 'act.mid' : 
+                    case 'act.mid' :
                         return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['act']);
-                    case 'document_srl.mid' : 
+                    case 'document_srl.mid' :
                         return sprintf('%s%s/%s',$path,$get_vars['mid'],$get_vars['document_srl']);
-                    case 'act.document_srl' : 
+                    case 'act.document_srl' :
                         return sprintf('%s%s/%s',$path,$get_vars['document_srl'],$get_vars['act']);
-                    case 'mid.page' : 
+                    case 'mid.page' :
                         return sprintf('%s%s/page/%s',$path,$get_vars['mid'],$get_vars['page']);
-                    case 'category.mid' : 
+                    case 'category.mid' :
                         return sprintf('%s%s/category/%s',$path,$get_vars['mid'],$get_vars['category']);
-                    case 'act.document_srl.key' : 
+                    case 'act.document_srl.key' :
                         return sprintf('%s%s/%s/%s',$path,$get_vars['document_srl'],$get_vars['key'],$get_vars['act']);
-                    case 'document_srl.mid.page' : 
+                    case 'document_srl.mid.page' :
                         return sprintf('%s%s/%s/page/%s',$path,$get_vars['mid'],$get_vars['document_srl'],$get_vars['page']);
-                    case 'category.mid.page' : 
+                    case 'category.mid.page' :
                         return sprintf('%s%s/category/%s/page/%s',$path,$get_vars['mid'],$get_vars['category'],$get_vars['page']);
                     case 'mid.search_keyword.search_target' :
                             switch($get_vars['search_target']) {
-                                case 'tag' : 
+                                case 'tag' :
                                     return sprintf('%s%s/tag/%s',$path,$get_vars['mid'],str_replace(' ','+',$get_vars['search_keyword']));
-                                case 'nick_name' : 
+                                case 'nick_name' :
                                     return sprintf('%s%s/writer/%s',$path,$get_vars['mid'],str_replace(' ','+',$get_vars['search_keyword']));
-                                case 'regdate' : 
+                                case 'regdate' :
                                     if(strlen($get_vars['search_keyword'])==8) return sprintf('%s%s/%04d/%02d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2),substr($get_vars['search_keyword'],6,2));
-                                    elseif(strlen($get_vars['search_keyword'])==6) return sprintf('%s%s/%04d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2)); 
+                                    elseif(strlen($get_vars['search_keyword'])==6) return sprintf('%s%s/%04d/%02d',$path,$get_vars['mid'],substr($get_vars['search_keyword'],0,4),substr($get_vars['search_keyword'],4,2));
                             }
                         break;
                     case 'act.document_srl.mid' :
                         return sprintf('%s%s/%s/%s',$path,$get_vars['mid'], $get_vars['act'],$get_vars['document_srl']);
+                    case 'entry.mid' :
+                        return sprintf('%s%s/entry/%s',$path,$get_vars['mid'],$get_vars['entry']);
                 }
             }
 
@@ -805,7 +899,7 @@
 
             if($domain) {
                 $target_url = trim($domain);
-                if(substr($target_url,-1) != '/') $target_url.= '/'; 
+                if(substr($target_url,-1) != '/') $target_url.= '/';
             } else {
                 $target_url= $_SERVER['HTTP_HOST'].getScriptPath();
             }
@@ -952,17 +1046,20 @@
         /**
          * @brief js file을 추가
          **/
-        function addJsFile($file, $optimized = true, $targetie = '') {
+        function addJsFile($file, $optimized = true, $targetie = '',$index=null) {
             $oContext = &Context::getInstance();
-            return $oContext->_addJsFile($file, $optimized, $targetie);
+            return $oContext->_addJsFile($file, $optimized, $targetie,$index);
         }
 
         /**
          * @brief js file을 추가
          **/
-        function _addJsFile($file, $optimized, $targetie) {
+        function _addJsFile($file, $optimized, $targetie,$index) {
             if(in_array($file, $this->js_files)) return;
-            $this->js_files[] = array('file' => $file, 'optimized' => $optimized, 'targetie' => $targetie);
+
+            if(is_null($index)) $index=count($this->js_files);
+            for($i=$index;array_key_exists($i,$this->js_files);$i++);
+            $this->js_files[$i] = array('file' => $file, 'optimized' => $optimized, 'targetie' => $targetie);
         }
 
         /**
@@ -985,10 +1082,20 @@
             }
         }
 
+        /**
+         * @brief javascript filter 추가
+         **/
+        function addJsFilter($path, $filename) {
+            $oXmlFilter = new XmlJSFilter($path, $filename);
+            $oXmlFilter->compile();
+        }
+
         /**
          * @brief array_unique와 동작은 동일하나 file 첨자에 대해서만 동작함
          **/
         function _getUniqueFileList($files) {
+            ksort($files);
+            $files = array_values($files);
             $filenames = array();
             $size = count($files);
             for($i = 0; $i < $size; ++ $i)
@@ -997,6 +1104,7 @@
                     unset($files[$i]);
                 $filenames[] = $files[$i]['file'];
             }
+
             return $files;
         }
 
@@ -1020,19 +1128,22 @@
         /**
          * @brief CSS file 추가
          **/
-        function addCSSFile($file, $optimized = true, $media = 'all', $targetie = '') {
+        function addCSSFile($file, $optimized = true, $media = 'all', $targetie = '',$index = null) {
             $oContext = &Context::getInstance();
-            return $oContext->_addCSSFile($file, $optimized, $media, $targetie);
+            return $oContext->_addCSSFile($file, $optimized, $media, $targetie,$index);
         }
 
         /**
          * @brief CSS file 추가
          **/
-        function _addCSSFile($file, $optimized, $media, $targetie) {
+        function _addCSSFile($file, $optimized, $media, $targetie, $index) {
             if(in_array($file, $this->css_files)) return;
 
+            if(is_null($index)) $index=count($this->css_files);
+            for($i=$index;array_key_exists($i,$this->css_files);$i++);
+
             //if(preg_match('/^http:\/\//i',$file)) $file = str_replace(realpath("."), ".", realpath($file));
-            $this->css_files[] = array('file' => $file, 'optimized' => $optimized, 'media' => $media, 'targetie' => $targetie);
+            $this->css_files[$i] = array('file' => $file, 'optimized' => $optimized, 'media' => $media, 'targetie' => $targetie);
         }
 
         /**
@@ -1081,6 +1192,10 @@
         }
 
         function _loadJavascriptPlugin($plugin_name) {
+            static $loaded_plugins = array();
+            if($loaded_plugins[$plugin_name]) return;
+            $loaded_plugins[$plugin_name] = true;
+
             $plugin_path = './common/js/plugins/'.$plugin_name.'/';
             if(!is_dir($plugin_path)) return;
 
@@ -1092,8 +1207,8 @@
                 $filename = trim($list[$i]);
                 if(!$filename) continue;
                 if(substr($filename,0,2)=='./') $filename = substr($filename,2);
-                if(preg_match('/\.js$/i',$filename)) $this->_addJsFile($plugin_path.$filename, false, '');
-                elseif(preg_match('/\.css$/i',$filename)) $this->_addCSSFile($plugin_path.$filename, false, 'all','');
+                if(preg_match('/\.js$/i',$filename)) $this->_addJsFile($plugin_path.$filename, false, '', null);
+                elseif(preg_match('/\.css$/i',$filename)) $this->_addCSSFile($plugin_path.$filename, false, 'all','', null);
             }
 
             if(is_dir($plugin_path.'lang')) $this->_loadLang($plugin_path.'lang');
@@ -1129,6 +1244,36 @@
             return $this->html_header;
         }
 
+        /**
+         * @brief BodyHeader 추가
+         **/
+        function addBodyHeader($header) {
+            $oContext = &Context::getInstance();
+            return $oContext->_addBodyHeader($header);
+        }
+
+        /**
+         * @brief BodyHeader 추가
+         **/
+        function _addBodyHeader($header) {
+            $this->body_header .= "\n".$header;
+        }
+
+        /**
+         * @brief BodyHeader return
+         **/
+        function getBodyHeader() {
+            $oContext = &Context::getInstance();
+            return $oContext->_getBodyHeader();
+        }
+
+        /**
+         * @brief BodyHeader return
+         **/
+        function _getBodyHeader() {
+            return $this->body_header;
+        }
+
         /**
          * @brief HtmlFooter 추가
          **/
@@ -1179,24 +1324,40 @@
          * 단순히 db config 파일의 존재 유무로 설치 여부를 체크한다
          **/
         function isInstalled() {
-            return file_exists(Context::getConfigFile());
+            return file_exists(Context::getConfigFile()) && filesize(Context::getConfigFile());
+        }
+
+
+        /**
+         * @brief 내용의 위젯이나 기타 기능에 대한 code를 실제 code로 변경을 위한 flag set
+         **/
+        function setTransWidgetCodeIncludeInfo($flag=false){
+            $oContext = &Context::getInstance();
+            $oContext->widget_include_info_flag = $flag ? true : false;
         }
 
         /**
          * @brief 내용의 위젯이나 기타 기능에 대한 code를 실제 code로 변경
          **/
         function transContent($content) {
-            // 위젯 코드 변경 
+
+            // 사용자 정의 언어로 변경
+            $oModuleController = &getController('module');
+            $oModuleController->replaceDefinedLangCode($content);
+
+            // 위젯 코드 변경
             $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($content, false);
+            $content = $oWidgetController->transWidgetCode($content,$this->widget_include_info_flag);
 
             // 메타 파일 변경
             $content = preg_replace_callback('!<\!\-\-Meta:([^\-]*?)\-\->!is', array($this,'transMeta'), $content);
-            
+
             // 에디터 컴포넌트를 찾아서 결과 코드로 변환
             $content = preg_replace_callback('!<div([^\>]*)editor_component=([^\>]*)>(.*?)\<\/div\>!is', array($this,'transEditorComponent'), $content);
             $content = preg_replace_callback('!<img([^\>]*)editor_component=([^\>]*?)\>!is', array($this,'transEditorComponent'), $content);
 
+            // style의 url 경로를 재정의 한다.
+            $content = preg_replace('/url\(http:\/\/([^ ]+)http:\/\//is','url(http://', $content);
             // body 내의 <style ..></style>를 header로 이동
             $content = preg_replace_callback('!<style(.*?)<\/style>!is', array($this,'moveStyleToHeader'), $content);
 
@@ -1267,7 +1428,7 @@
         function isGzEnabled() {
             if(
                 (defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
-                strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false && 
+                strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false &&
                 function_exists('ob_gzhandler') &&
                 extension_loaded('zlib')
             ) return true;
diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 011ed5be7..20d34ea8e 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -50,7 +50,7 @@
          **/
         function &getInstance($db_type = NULL) {
             if(!$db_type) $db_type = Context::getDBType();
-            if(!$db_type) return new Object(-1, 'msg_db_not_setted');
+            if(!$db_type && Context::isInstalled()) return new Object(-1, 'msg_db_not_setted');
 
             if(!$GLOBALS['__DB__']) {
                 $class_name = sprintf("DB%s%s", strtoupper(substr($db_type,0,1)), strtolower(substr($db_type,1)));
@@ -105,9 +105,13 @@
                 $eval_str = sprintf('$oDB = new %s();', $class_name);
                 eval($eval_str);
 
-                if(!$oDB || !$oDB->isSupported()) continue;
+                if(!$oDB) continue;
 
-                $this->supported_list[] = $db_type;
+                $obj = null;
+                $obj->db_type = $db_type;
+                $obj->enable = $oDB->isSupported()?true:false;
+
+                $this->supported_list[] = $obj;
             }
 
             return $this->supported_list;
@@ -269,14 +273,13 @@
 
             if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid');
 
-            if($source_args) $args = clone($source_args);
+            if($source_args) $args = @clone($source_args);
 
             $output = @include($cache_file);
 
             if( (is_a($output, 'Object')||is_subclass_of($output,'Object'))&&!$output->toBool()) return $output;
             $output->_tables = ($output->_tables && is_array($output->_tables)) ? $output->_tables : array();
 
-
             // action값에 따라서 쿼리 생성으로 돌입
             switch($output->action) {
                 case 'insert' :
@@ -300,6 +303,7 @@
             else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object')) $output = new Object();
             $output->add('_query', $this->query);
             $output->add('_elapsed_time', sprintf("%0.5f",$this->elapsed_time));
+
             return $output;
         }
 
@@ -434,7 +438,7 @@
                         return $name.' in ('.$value.')';
                     break;
                 case 'notin' :
-                        return $name.' notin ('.$value.')';
+                        return $name.' not in ('.$value.')';
                     break;
                 case 'notequal' :
                         return $name.' <> '.$value;
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index 85cf76f3c..2cd93bfbb 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -3,9 +3,10 @@
      * @class DBCubrid
      * @author zero (zero@nzeo.com)
      * @brief Cubrid DBMS를 이용하기 위한 class
-     * @version 0.1
+     * @version 0.1p1
      *
-     * cubrid 7.0 에서 테스트 하였음.
+     * CUBRID2008 R1.3 에 대응하도록 수정 Prototype (prototype@cubrid.com) / 09.02.23
+     * 7.3 ~ 2008 R1.3 까지 테스트 완료함. 
      * 기본 쿼리만 사용하였기에 특화된 튜닝이 필요
      **/
 
@@ -222,6 +223,14 @@
             $this->_query($query);
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter class %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
         /**
          * @brief 특정 테이블의 column의 정보를 return
          **/
@@ -411,8 +420,14 @@
                     $pipe = $v['pipe'];
 
                     $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
+					if(!$value) {
+						$value = $v['value'];
+						if(strpos($value, ".") == false) $valuetmp = $value;
+						else $valuetmp = '"'.str_replace('.', '"."', $value).'"';
+					} else $valuetmp = $value;
+					if(strpos($name, ".") == false) $nametmp = '"'.$name.'"';
+					else $nametmp = '"'.str_replace('.', '"."', $name).'"';
+                    $str = $this->getConditionPart($nametmp, $valuetmp, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
                     $sub_condition .=  $str;
                 }
@@ -544,7 +559,7 @@
             // 테이블 정리
             $table_list = array();
             foreach($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'" as '.$key;
+                $table_list[] = '"'.$this->prefix.$val.'" as "'.$key.'"';
             }
 
             $left_join = array();
@@ -554,7 +569,7 @@
             foreach($left_tables as $key => $val) {
                 $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
                 if($condition){
-                    $left_join[] = $val . ' "'.$this->prefix.$output->tables[$key].'" as '.$key  . ' on (' . $condition . ')';
+                    $left_join[] = $val . ' "'.$this->prefix.$output->_tables[$key].'" as "'.$key  . '" on (' . $condition . ')';
                 }
             }
 
@@ -698,7 +713,7 @@
             require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
 
             // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
+            $count_query = sprintf("select count(*) as \"count\" from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
             $total_count = $this->getCountCache($output->tables, $condition);
             if($total_count === false) {
                 $result = $this->_query($count_query);
diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php
index 71283b9af..ee59b71cb 100644
--- a/classes/db/DBFirebird.class.php
+++ b/classes/db/DBFirebird.class.php
@@ -209,7 +209,7 @@
             return $string;
         }
 
-        function autoValueQuotes($string, $output){
+        function autoValueQuotes($string, $tables){
             $tok = strtok($string, ",");
             while($tok !== false) {
                 $values[] = $tok;
@@ -225,8 +225,9 @@
                     $tmpString2 = trim($tmpString2);
 
                     $isTable = false;
-                    foreach($output->tables as $key => $val) {
+                    foreach($tables as $key => $val) {
                         if($key == $tmpString1) $isTable = true;
+						if($val == $tmpString1) $isTable = true;
                     }
 
                     if($isTable) {
@@ -321,10 +322,18 @@
 
             while($tmp = ibase_fetch_object($result)) {
                 foreach($tmp as $key => $val) {
-                    $type = $output->column_type[$key];
+					$type = $output->column_type[$key];
+
+					if($type == null) {
+						foreach($output->columns as $cols) {
+							if($cols['alias'] == $key) {
+								$type = $output->column_type[$cols['name']];
+							}
+						}
+					}
 
                     if($type == "text" || $type == "bigtext") {
-                        $blob_data = ibase_blob_info($tmp->{$key});
+						$blob_data = ibase_blob_info($tmp->{$key});
                         $blob_hndl = ibase_blob_open($tmp->{$key});
                         $tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
                         ibase_blob_close($blob_hndl);
@@ -382,6 +391,14 @@
             @ibase_commit($this->fd);
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
 
         /**
          * @brief 특정 테이블의 column의 정보를 return
@@ -598,17 +615,17 @@
          **/
         function getCondition($output) {
             if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
+            $condition = $this->_getCondition($output->conditions,$output->column_type,$output->tables);
             if($condition) $condition = ' where '.$condition;
             return $condition;
         }
 
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
+        function getLeftCondition($conditions,$column_type,$tables){
+            return $this->_getCondition($conditions,$column_type,$tables);
         }
 
 
-        function _getCondition($conditions,$column_type) {
+        function _getCondition($conditions,$column_type,$tables) {
             $condition = '';
             foreach($conditions as $val) {
                 $sub_condition = '';
@@ -627,7 +644,7 @@
                     if(!$value) $value = $v['value'];
 
                     $name = $this->autoQuotes($name);
-                    $value = $this->autoValueQuotes($value, $output);
+                    $value = $this->autoValueQuotes($value, $tables);
 
                     $str = $this->getConditionPart($name, $value, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
@@ -638,6 +655,7 @@
                     $condition .= '('.$sub_condition.')';
                 }
             }
+
             return $condition;
         }
 
@@ -710,12 +728,17 @@
                     }
 
                     if(strlen($value) != 0) {
-                        if(($pos = strpos($value, '+1')) !== false) {
-                            $substr = substr($value, 0, $pos);
-                            $value = '"'.$substr.'"'."+1";
-                            $column_list[] = sprintf("\"%s\" = %s", $name, $value);
-                            continue;
-                        }
+						$pos = strpos($value, '+');
+						if($pos == 0) $pos = strpos($value, '-');
+						if($pos == 0) $pos = strpos($value, '*');
+						if($pos == 0) $pos = strpos($value, '/');
+
+						if($pos != 0) {
+							$substr = substr($value, 0, $pos);
+							$value = '"'.$substr.'"'.substr($value, $pos, strlen($value));
+							$column_list[] = sprintf("\"%s\" = %s", $name, $value);
+							continue;
+						}
                     }
 
                     $values[] = $value;
@@ -769,7 +792,7 @@
             $left_tables= (array)$output->left_tables;
 
             foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+                $condition = $this->getLeftCondition($output->left_conditions[$key],$output->column_type,$output->tables);
                 if($condition){
                     $left_join[] = $val . ' "'.$this->prefix.$output->_tables[$key].'" as '.$key  . ' on (' . $condition . ')';
                 }
@@ -850,7 +873,7 @@
             require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
 
             // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
+            $count_query = sprintf("select count(*) as \"count\" from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
             $total_count = $this->getCountCache($output->tables, $condition);
             if($total_count === false) {
                 $result = $this->_query($count_query);
@@ -925,6 +948,14 @@
                 foreach($tmp as $key => $val){
                     $type = $output->column_type[$key];
 
+					if($type == null) {
+						foreach($output->columns as $cols) {
+							if($cols['alias'] == $key) {
+								$type = $output->column_type[$cols['name']];
+							}
+						}
+					}
+
                     if($type == "text" || $type == "bigtext") {
                         $blob_data = ibase_blob_info($tmp->{$key});
                         $blob_hndl = ibase_blob_open($tmp->{$key});
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index d61a1f869..c2fcc1e7e 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -229,6 +229,13 @@
             $this->_query($query);
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
 
         /**
          * @brief 특정 테이블의 column의 정보를 return
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 4203d1c7b..9aa6097de 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -239,6 +239,13 @@
             $this->_query($query);
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
 
         /**
          * @brief 특정 테이블의 column의 정보를 return
diff --git a/classes/db/DBPostgresql.class.php b/classes/db/DBPostgresql.class.php
index 0e7fb8b07..81089800b 100644
--- a/classes/db/DBPostgresql.class.php
+++ b/classes/db/DBPostgresql.class.php
@@ -1,666 +1,861 @@
 <?php
+/**
+ * @class DBPostgreSQL
+ * @author ioseph (ioseph@postgresql.kr) updated by yoonjong.joh@gmail.com
+ * @brief MySQL DBMS를 이용하기 위한 class
+ * @version 0.2
+ *
+ * postgresql handling class
+ * 2009.02.10  update 와 delete query를 실행할때 table 이름에 alias 사용하는 것을 없앰. 지원 안함
+ *             order by clause를 실행할때 함수를 실행 하는 부분을 column alias로 대체.
+ * 2009.02.11  dropColumn() function이 추가  
+ * 2009.02.13  addColumn() 함수 변경
+ **/
+
+class DBPostgresql extends DB
+{
+
     /**
-     * @class DBPostgreSQL
-     * @author ioseph (ioseph@postgresql.kr)
-     * @brief MySQL DBMS를 이용하기 위한 class
-     * @version 0.1
-     *
-     * postgresql handling class
+     * @brief PostgreSQL DB에 접속하기 위한 정보
      **/
+    var $hostname = '127.0.0.1'; ///< hostname
+    var $userid = null; ///< user id
+    var $password = null; ///< password
+    var $database = null; ///< database
+    var $prefix = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE설치 가능)
 
-    class DBPostgresql extends DB {
+    /**
+     * @brief postgresql에서 사용될 column type
+     *
+     * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
+     * 각 DBMS에 맞게 replace 해주어야 한다
+     **/
+    var $column_type = array('bignumber' => 'bigint', 'number' => 'integer',
+        'varchar' => 'varchar', 'char' => 'char', 'text' => 'text', 'bigtext' => 'text',
+        'date' => 'varchar(14)', );
 
-        /**
-         * @brief PostgreSQL DB에 접속하기 위한 정보
-         **/
-        var $hostname = '127.0.0.1'; ///< hostname
-        var $userid   = NULL; ///< user id
-        var $password   = NULL; ///< password
-        var $database = NULL; ///< database
-        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE설치 가능)
+    /**
+     * @brief constructor
+     **/
+    function DBPostgresql()
+    {
+        $this->_setDBInfo();
+        $this->_connect();
+    }
 
-        /**
-         * @brief postgresql에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'bigint',
-            'number' => 'integer',
-            'varchar' => 'varchar',
-            'char' => 'char',
-            'text' => 'text',
-            'bigtext' => 'text',
-            'date' => 'varchar(14)',
-        );
+    /**
+     * @brief 설치 가능 여부를 return
+     **/
+    function isSupported()
+    {
+        if (!function_exists('pg_connect'))
+            return false;
+        return true;
+    }
 
-        /**
-         * @brief constructor
-         **/
-        function DBPostgresql() {
-            $this->_setDBInfo();
-            $this->_connect();
+    /**
+     * @brief DB정보 설정 및 connect/ close
+     **/
+    function _setDBInfo()
+    {
+        $db_info = Context::getDBInfo();
+        $this->hostname = $db_info->db_hostname;
+        $this->port = $db_info->db_port;
+        $this->userid = $db_info->db_userid;
+        $this->password = $db_info->db_password;
+        $this->database = $db_info->db_database;
+        $this->prefix = $db_info->db_table_prefix;
+        if (!substr($this->prefix, -1) != '_')
+            $this->prefix .= '_';
+    }
+
+    /**
+     * @brief DB 접속
+     **/
+    function _connect()
+    {
+        // pg용 connection string
+        $conn_string = "";
+
+        // db 정보가 없으면 무시
+        if (!$this->hostname || !$this->userid || !$this->database)
+            return;
+
+        // connection string 만들기
+        $conn_string .= ($this->hostname) ? " host=$this->hostname" : "";
+        $conn_string .= ($this->userid) ? " user=$this->userid" : "";
+        $conn_string .= ($this->password) ? " password=$this->password" : "";
+        $conn_string .= ($this->database) ? " dbname=$this->database" : "";
+        $conn_string .= ($this->port) ? " port=$this->port" : "";
+
+        // 접속시도
+        $this->fd = @pg_connect($conn_string);
+        if (!$this->fd || pg_connection_status($this->fd) != PGSQL_CONNECTION_OK) {
+            $this->setError(-1, "CONNECTION FAILURE");
+            return;
         }
 
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            if(!function_exists('pg_connect')) return false;
-            return true;
-        }
+        // 접속체크
+        $this->is_connected = true;
 
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->hostname = $db_info->db_hostname;
-            $this->port = $db_info->db_port;
-            $this->userid   = $db_info->db_userid;
-            $this->password   = $db_info->db_password;
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
+        // utf8임을 지정
+        //$this ->_query('set client_encoding to uhc');
+    }
 
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // pg용 connection string
-            $conn_string = "";
+    /**
+     * @brief DB접속 해제
+     **/
+    function close()
+    {
+        if (!$this->isConnected())
+            return;
+        @pg_close($this->fd);
+    }
 
-            // db 정보가 없으면 무시
-            if(!$this->hostname || !$this->userid || !$this->database) return;
+    /**
+     * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
+     **/
+    function addQuotes($string)
+    {
+        if (version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+            $string = stripslashes(str_replace("\\", "\\\\", $string));
+        if (!is_numeric($string))
+            $string = @pg_escape_string($string);
+        return $string;
+    }
 
-            // connection string 만들기
-            $conn_string .= ($this->hostname) ? " host=$this->hostname" : "";
-            $conn_string .= ($this->userid) ? " user=$this->userid" : "";
-            $conn_string .= ($this->password) ? " password=$this->password" : "";
-            $conn_string .= ($this->database) ? " dbname=$this->database" : "";
-            $conn_string .= ($this->port) ? " port=$this->port" : "";
-
-            // 접속시도
-            $this->fd = @pg_connect($conn_string);
-            if(!$this->fd || pg_connection_status($this->fd) != PGSQL_CONNECTION_OK) {
-                $this->setError(-1, "CONNECTION FAILURE");
-                return;
-            }
-
-            // 접속체크
-            $this->is_connected = true;
-
-            // utf8임을 지정
-            //$this ->_query('set client_encoding to uhc');
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->isConnected()) return;
-            @pg_close($this->fd);
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            if(!is_numeric($string)) $string = @pg_escape_string($string);
-            return $string;
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-            if(!$this->isConnected() || $this->transaction_started == false) return;
-            if($this->_query($this->fd, 'BEGIN'))
+    /**
+     * @brief 트랜잭션 시작
+     **/
+    function begin()
+    {
+        if (!$this->isConnected() || $this->transaction_started == false)
+            return;
+        if ($this->_query($this->fd, 'BEGIN'))
             $this->transaction_started = true;
-        }
+    }
 
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-            if(!$this->isConnected() || $this->transaction_started == false) return;
-            if($this->_query($this->fd, 'ROLLBACK'))
+    /**
+     * @brief 롤백
+     **/
+    function rollback()
+    {
+        if (!$this->isConnected() || $this->transaction_started == false)
+            return;
+        if ($this->_query($this->fd, 'ROLLBACK'))
             $this->transaction_started = false;
-        }
+    }
 
-        /**
-         * @brief 커밋
-         **/
-        function commit() {
-            if(!$this->isConnected() || $this->transaction_started == false) return;
-            if($this->_query($this->fd, 'COMMIT'))
+    /**
+     * @brief 커밋
+     **/
+    function commit()
+    {
+        if (!$this->isConnected() || $this->transaction_started == false)
+            return;
+        if ($this->_query($this->fd, 'COMMIT'))
             $this->transaction_started = false;
+    }
+
+    /**
+     * @brief : 쿼리문의 실행 및 결과의 fetch 처리
+     *
+     * query : query문 실행하고 result return\n
+     * fetch : reutrn 된 값이 없으면 NULL\n
+     *         rows이면 array object\n
+     *         row이면 object\n
+     *         return\n
+     **/
+    function _query($query)
+    {
+        if (!$this->isConnected())
+            return;
+
+        /*
+        $l_query_array = explode(" ", $query);
+        if ($l_query_array[0] = "update")
+        {
+        if (strtolower($l_query_array[2]) == "as")
+        {
+        $l_query_array[2] = "";
+        $l_query_array[3] = "";
+        $query = implode(" ",$l_query_array);
+        }
+        }
+        else if ($l_query_array[0] = "delete") 
+        {
+        if (strtolower($l_query_array[3]) == "as")
+        {
+        $l_query_array[3] = "";
+        $l_query_array[4] = "";            
+        $query = implode(" ",$l_query_array);
+        }
+        }
+        */
+
+        // 쿼리 시작을 알림
+        $this->actStart($query);
+        $arr = array('Hello', 'World!', 'Beautiful', 'Day!');
+
+
+        // 쿼리 문 실행
+        $result = @pg_query($this->fd, $query);
+
+        // 오류 체크
+        if (!$result) {
+            //              var_dump($l_query_array);
+            //var_dump($query);
+            //die("\nin query statement\n");
+            //var_dump(debug_backtrace());
+            $this->setError(1, pg_last_error($this->fd));
         }
 
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-            if(!$this->isConnected()) return;
+        // 쿼리 실행 종료를 알림
+        $this->actFinish();
 
-            // 쿼리 시작을 알림
-            $this->actStart($query);
+        // 결과 리턴
+        return $result;
+    }
 
-            // 쿼리 문 실행
-            $result = @pg_query($this->fd, $query);
-
-            // 오류 체크
-            if(!$result) $this->setError(1, pg_last_error($this->fd));
-
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-
-            // 결과 리턴
-            return $result;
+    /**
+     * @brief 결과를 fetch
+     **/
+    function _fetch($result)
+    {
+        if (!$this->isConnected() || $this->isError() || !$result)
+            return;
+        while ($tmp = pg_fetch_object($result)) {
+            $output[] = $tmp;
         }
+        if (count($output) == 1)
+            return $output[0];
+        return $output;
+    }
 
-        /**
-         * @brief 결과를 fetch
-         **/
-        function _fetch($result) {
-            if(!$this->isConnected() || $this->isError() || !$result) return;
-            while($tmp = pg_fetch_object($result)) {
-                $output[] = $tmp;
-            }
-            if(count($output)==1) return $output[0];
-            return $output;
+    /**
+     * @brief 1씩 증가되는 sequence값을 return (postgresql의 auto_increment는 sequence테이블에서만 사용)
+     **/
+    function getNextSequence()
+    {
+        $query = sprintf("select nextval('%ssequence') as seq", $this->prefix);
+        $result = $this->_query($query);
+        $tmp = $this->_fetch($result);
+        return $tmp->seq;
+    }
+
+    /**
+     * @brief 테이블 기생성 여부 return
+     **/
+    function isTableExists($target_name)
+    {
+        if ($target_name == "sequence")
+            return true;
+        $query = sprintf("SELECT tablename FROM pg_tables WHERE tablename = '%s%s' AND schemaname = current_schema()",
+            $this->prefix, $this->addQuotes($target_name));
+
+        $result = $this->_query($query);
+        $tmp = $this->_fetch($result);
+        if (!$tmp)
+            return false;
+        return true;
+    }
+
+    /**
+     * @brief 특정 테이블에 특정 column 추가
+     **/
+    function addColumn($table_name, $column_name, $type = 'number', $size = '', $default =
+        NULL, $notnull = false)
+    {
+        $type = $this->column_type[$type];
+        if (strtoupper($type) == 'INTEGER' || strtoupper($type) == 'BIGINT')
+            $size = '';
+
+        $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
+
+        if ($size)
+            $query .= sprintf(" %s(%s) ", $type, $size);
+        else
+            $query .= sprintf(" %s ", $type);
+
+        $this->_query($query);
+
+        if (isset($default)) {
+            $query = sprintf("alter table %s%s alter %s  set default '%s' ", $this->prefix, $table_name, $column_name, $default);
+            $this->_query($query);
         }
-
-        /**
-         * @brief 1씩 증가되는 sequence값을 return (postgresql의 auto_increment는 sequence테이블에서만 사용)
-         **/
-        function getNextSequence() {
-            $query = sprintf("select nextval('%ssequence') as seq", $this->prefix);
-            $result = $this->_query($query);
-            $tmp = $this->_fetch($result);
-            return $tmp->seq;
+        if ($notnull) {
+            $query = sprintf("update %s%s set %s  = %s ", $this->prefix, $table_name, $column_name, $default);
+            $this->_query($query);              
+            $query = sprintf("alter table %s%s alter %s  set not null ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
         }
+    }
 
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists($target_name) {
-            if($target_name == "sequence") return true;
-            $query = sprintf("SELECT tablename FROM pg_tables WHERE tablename = '%s%s' AND schemaname = current_schema()", $this->prefix, $this->addQuotes($target_name));
 
-            $result = $this->_query($query);
-            $tmp = $this->_fetch($result);
-            if(!$tmp) return false;
+    /**
+     * @brief 특정 테이블의 column의 정보를 return
+     **/
+    function isColumnExists($table_name, $column_name)
+    {
+        $query = sprintf("SELECT attname FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = '%s%s') AND attname = '%s'",
+            $this->prefix, strtolower($table_name), strtolower($column_name));
+
+        // $query = sprintf("select column_name from information_schema.columns where table_schema = current_schema() and table_name = '%s%s' and column_name = '%s'", $this->prefix, $this->addQuotes($table_name), strtolower($column_name));
+        $result = $this->_query($query);
+        if ($this->isError()) {
+            return;
+        }
+        $output = $this->_fetch($result);
+        if ($output) {
             return true;
         }
+        return false;
+    }
 
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
-            $type = $this->column_type[$type];
-            if(strtoupper($type)=='INTEGER' || strtoupper($type)=='BIGINT') $size = '';
+    /**
+     * @brief 특정 테이블에 특정 인덱스 추가
+     * $target_columns = array(col1, col2)
+     * $is_unique? unique : none
+     **/
+    function addIndex($table_name, $index_name, $target_columns, $is_unique = false)
+    {
+        if (!is_array($target_columns))
+            $target_columns = array($target_columns);
 
-            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
-            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
-            else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
-            if($notnull) $query .= " not null ";
+        if (strpos($table_name, $this->prefix) === false)
+            $table_name = $this->prefix . $table_name;
 
-            $this->_query($query);
+        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        $index_name = $table_name . $index_name;
+
+        $query = sprintf("create %s index %s on %s (%s);", $is_unique ? 'unique' : '', $index_name,
+            $table_name, implode(',', $target_columns));
+        $this->_query($query);
+    }
+
+    /**
+     * @brief 특정 테이블에 특정 column 제거
+     **/
+    function dropColumn($table_name, $column_name)
+    {
+        $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+        $this->_query($query);
+    }
+
+    /**
+     * @brief 특정 테이블의 특정 인덱스 삭제
+     **/
+    function dropIndex($table_name, $index_name, $is_unique = false)
+    {
+        if (strpos($table_name, $this->prefix) === false)
+            $table_name = $this->prefix . $table_name;
+
+        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        $index_name = $table_name . $index_name;
+
+        $query = sprintf("drop index %s", $index_name);
+        $this->_query($query);
+    }
+
+
+    /**
+     * @brief 특정 테이블의 index 정보를 return
+     **/
+    function isIndexExists($table_name, $index_name)
+    {
+        if (strpos($table_name, $this->prefix) === false)
+            $table_name = $this->prefix . $table_name;
+
+        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        $index_name = $table_name . $index_name;
+
+        //$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
+        $query = sprintf("select indexname from pg_indexes where schemaname = current_schema() and tablename = '%s' and indexname = '%s'",
+            $table_name, strtolower($index_name));
+        $result = $this->_query($query);
+        if ($this->isError())
+            return;
+        $output = $this->_fetch($result);
+
+        if ($output) {
+            return true;
+        }
+        //                var_dump($query);
+        //                die(" no index");
+        return false;
+    }
+
+    /**
+     * @brief xml 을 받아서 테이블을 생성
+     **/
+    function createTableByXml($xml_doc)
+    {
+        return $this->_createTable($xml_doc);
+    }
+
+    /**
+     * @brief xml 을 받아서 테이블을 생성
+     **/
+    function createTableByXmlFile($file_name)
+    {
+        if (!file_exists($file_name))
+            return;
+        // xml 파일을 읽음
+        $buff = FileHandler::readFile($file_name);
+        return $this->_createTable($buff);
+    }
+
+    /**
+     * @brief schema xml을 이용하여 create table query생성
+     *
+     * type : number, varchar, text, char, date, \n
+     * opt : notnull, default, size\n
+     * index : primary key, index, unique\n
+     **/
+    function _createTable($xml_doc)
+    {
+        // xml parsing
+        $oXml = new XmlParser();
+        $xml_obj = $oXml->parse($xml_doc);
+
+        // 테이블 생성 schema 작성
+        $table_name = $xml_obj->table->attrs->name;
+
+        if ($table_name == 'sequence') {
+            $query = sprintf('create sequence %s', $this->prefix . $table_name);
+            return $this->_query($query);
+        }
+
+        if ($this->isTableExists($table_name))
+            return;
+        $table_name = $this->prefix . $table_name;
+
+        if (!is_array($xml_obj->table->column))
+            $columns[] = $xml_obj->table->column;
+        else
+            $columns = $xml_obj->table->column;
+
+        foreach ($columns as $column) {
+            $name = $column->attrs->name;
+            $type = $column->attrs->type;
+            $size = $column->attrs->size;
+            $notnull = $column->attrs->notnull;
+            $primary_key = $column->attrs->primary_key;
+            $index = $column->attrs->index;
+            $unique = $column->attrs->unique;
+            $default = $column->attrs->default;
+            $auto_increment = $column->attrs->auto_increment;
+
+            if ($type == "bignumber" || $type == "number")
+                $size = 0;
+
+            $column_schema[] = sprintf('%s %s%s %s %s', $name, $this->column_type[$type], $size ?
+                '(' . $size . ')' : '', $default ? "default '" . $default . "'" : '', $notnull ?
+                'not null' : '');
+
+            if ($primary_key)
+                $primary_list[] = $name;
+            else
+                if ($unique)
+                    $unique_list[$unique][] = $name;
+                else
+                    if ($index)
+                        $index_list[$index][] = $name;
+        }
+
+        if (count($primary_list)) {
+            $column_schema[] = sprintf("primary key (%s)", implode($primary_list, ','));
+        }
+
+        if (count($unique_list)) {
+            foreach ($unique_list as $key => $val) {
+                $column_schema[] = sprintf("unique (%s)", implode($val, ','));
+            }
         }
 
 
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists($table_name, $column_name) {
-            $query = sprintf("select column_name from information_schema.columns where table_schema = current_schema() and table_name = '%s%s' and column_name = '%s'", $this->prefix, $this->addQuotes($table_name), strtolower($column_name));
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $output = $this->_fetch($result);
-            if($output) return true;
+        $schema = sprintf('create table %s (%s%s);', $this->addQuotes($table_name), "\n",
+            implode($column_schema, ",\n"));
+
+        $output = $this->_query($schema);
+
+        if (count($index_list)) {
+            foreach ($index_list as $key => $val) {
+                if (!$this->isIndexExists($table_name, $key))
+                    $this->addIndex($table_name, $key, $val);
+            }
+        }
+
+        if (!$output)
             return false;
-        }
 
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-            if(!is_array($target_columns)) $target_columns = array($target_columns);
+    }
 
-            if(strpos($table_name,$this->prefix)===false) $table_name = $this->prefix.$table_name;
+    /**
+     * @brief 조건문 작성하여 return
+     **/
+    function getCondition($output)
+    {
+        if (!$output->conditions)
+            return;
+        $condition = $this->_getCondition($output->conditions, $output->column_type);
+        if ($condition)
+            $condition = ' where ' . $condition;
+        return $condition;
+    }
 
-            // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
-            $index_name = $table_name.$index_name;
-
-            $query = sprintf("create %s index %s on %s (%s);", $is_unique?'unique':'', $index_name, $table_name, implode(',',$target_columns));
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex($table_name, $index_name, $is_unique = false) {
-            if(strpos($table_name,$this->prefix)===false) $table_name = $this->prefix.$table_name;
-
-            // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
-            $index_name = $table_name.$index_name;
-
-            $query = sprintf("drop index %s", $index_name);
-            $this->_query($query);
-        }
+    function getLeftCondition($conditions, $column_type)
+    {
+        return $this->_getCondition($conditions, $column_type);
+    }
 
 
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists($table_name, $index_name) {
-            if(strpos($table_name,$this->prefix)===false) $table_name = $this->prefix.$table_name;
+    function _getCondition($conditions, $column_type)
+    {
+        $condition = '';
+        foreach ($conditions as $val) {
+            $sub_condition = '';
+            foreach ($val['condition'] as $v) {
+                if (!isset($v['value']))
+                    continue;
+                if ($v['value'] === '')
+                    continue;
+                if (!in_array(gettype($v['value']), array('string', 'integer')))
+                    continue;
 
-            // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
-            $index_name = $table_name.$index_name;
+                $name = $v['column'];
+                $operation = $v['operation'];
+                $value = $v['value'];
+                $type = $this->getColumnType($column_type, $name);
+                $pipe = $v['pipe'];
 
-            //$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
-            $query = sprintf("select indexname from pg_indexes where schemaname = current_schema() and tablename = '%s' and indexname = '%s'", $table_name, strtolower($index_name));
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $output = $this->_fetch($result);
-
-            if($output) return true;
-            return false;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml($xml_doc) {
-            return $this->_createTable($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile($file_name) {
-            if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile($file_name);
-            return $this->_createTable($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-
-            if($table_name == 'sequence') {
-                $query = sprintf('create sequence %s', $this->prefix.$table_name);
-                return $this->_query($query);
-            }
-
-            if($this->isTableExists($table_name)) return;
-            $table_name = $this->prefix.$table_name;
-
-            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-            else $columns = $xml_obj->table->column;
-
-            foreach($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-                $auto_increment = $column->attrs->auto_increment;
-
-                if($type == "bignumber" || $type == "number") $size = 0;
-
-                $column_schema[] = sprintf('%s %s%s %s %s',
-                    $name,
-                    $this->column_type[$type],
-                    $size?'('.$size.')':'',
-                    $default?"default '".$default."'":'',
-                    $notnull?'not null':''
-                );
-
-                if($primary_key) $primary_list[] = $name;
-                else if($unique) $unique_list[$unique][] = $name;
-                else if($index) $index_list[$index][] = $name;
-            }
-
-            if(count($primary_list)) {
-                $column_schema[] = sprintf("primary key (%s)", implode($primary_list,','));
-            }
-
-            if(count($unique_list)) {
-                foreach($unique_list as $key => $val) {
-                    $column_schema[] = sprintf("unique (%s)", implode($val,','));
-                }
-            }
-
-
-            $schema = sprintf('create table %s (%s%s);', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
-
-            $output = $this->_query($schema);
-
-            if(count($index_list)) {
-                foreach($index_list as $key => $val) {
-                    if(!$this->isIndexExists($table_name, $key)) $this->addIndex($table_name, $key, $val);
-                }
-            }
-
-            if(!$output) return false;
-
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
-        }
-
-
-        function _getCondition($conditions,$column_type) {
-            $condition = '';
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
+                $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
+                if (!$value)
                     $value = $v['value'];
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-
-                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
+                $str = $this->getConditionPart($name, $value, $operation);
+                if ($sub_condition)
+                    $sub_condition .= ' ' . $pipe . ' ';
+                $sub_condition .= $str;
+            }
+            if ($sub_condition) {
+                if ($condition && $val['pipe'])
+                    $condition .= ' ' . $val['pipe'] . ' ';
+                $condition .= '(' . $sub_condition . ')';
+            }
+        }
+        return $condition;
+    }
+
+
+    /**
+     * @brief insertAct 처리
+     **/
+    function _executeInsertAct($output)
+    {
+        // 테이블 정리
+        foreach ($output->tables as $key => $val) {
+            $table_list[] = $this->prefix . $val;
+        }
+
+        // 컬럼 정리
+        foreach ($output->columns as $key => $val) {
+            $name = $val['name'];
+            $value = $val['value'];
+            if ($output->column_type[$name] != 'number') {
+                $value = "'" . $this->addQuotes($value) . "'";
+                if (!$value)
+                    $value = 'null';
+            } elseif (!$value || is_numeric($value))
+                $value = (int)$value;
+
+            $column_list[] = $name;
+            $value_list[] = $value;
+        }
+
+        $query = sprintf("insert into %s (%s) values (%s);", implode(',', $table_list),
+            implode(',', $column_list), implode(',', $value_list));
+        return $this->_query($query);
+    }
+
+    /**
+     * @brief updateAct 처리
+     **/
+    function _executeUpdateAct($output)
+    {
+        // 테이블 정리
+        foreach ($output->tables as $key => $val) {
+            //$table_list[] = $this->prefix.$val.' as '.$key;
+            $table_list[] = $this->prefix . $val;
+        }
+
+        // 컬럼 정리
+        foreach ($output->columns as $key => $val) {
+            if (!isset($val['value']))
+                continue;
+            $name = $val['name'];
+            $value = $val['value'];
+            if (strpos($name, '.') !== false && strpos($value, '.') !== false)
+                $column_list[] = $name . ' = ' . $value;
+            else {
+                if ($output->column_type[$name] != 'number')
+                    $value = "'" . $this->addQuotes($value) . "'";
+                elseif (!$value || is_numeric($value))
+                    $value = (int)$value;
+
+                $column_list[] = sprintf("%s = %s", $name, $value);
+            }
+        }
+
+        // 조건절 정리
+        $condition = $this->getCondition($output);
+
+        $query = sprintf("update %s set %s %s", implode(',', $table_list), implode(',',
+            $column_list), $condition);
+
+        return $this->_query($query);
+    }
+
+    /**
+     * @brief deleteAct 처리
+     **/
+    function _executeDeleteAct($output)
+    {
+        // 테이블 정리
+        foreach ($output->tables as $key => $val) {
+            $table_list[] = $this->prefix . $val;
+        }
+
+        // 조건절 정리
+        $condition = $this->getCondition($output);
+
+        $query = sprintf("delete from %s %s", implode(',', $table_list), $condition);
+
+        return $this->_query($query);
+    }
+
+    /**
+     * @brief selectAct 처리
+     *
+     * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
+     * navigation이라는 method를 제공
+     **/
+    function _executeSelectAct($output)
+    {
+        // 테이블 정리
+        $table_list = array();
+        foreach ($output->tables as $key => $val) {
+            $table_list[] = $this->prefix . $val . ' as ' . $key;
+        }
+
+        $left_join = array();
+        // why???
+        $left_tables = (array )$output->left_tables;
+
+        foreach ($left_tables as $key => $val) {
+            $condition = $this->_getCondition($output->left_conditions[$key], $output->
+                column_type);
+            if ($condition) {
+                $left_join[] = $val . ' ' . $this->prefix . $output->_tables[$key] . ' as ' . $key .
+                    ' on (' . $condition . ')';
             }
-            return $condition;
         }
 
 
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 컬럼 정리
-            foreach($output->columns as $key => $val) {
+        if (!$output->columns) {
+            $columns = '*';
+        } else {
+            $column_list = array();
+            foreach ($output->columns as $key => $val) {
                 $name = $val['name'];
-                $value = $val['value'];
-                if($output->column_type[$name]!='number') {
-                    $value = "'".$this->addQuotes($value)."'";
-                    if(!$value) $value = 'null';
-                } elseif(!$value || is_numeric($value)) $value = (int)$value;
-
-                $column_list[] = $name;
-                $value_list[] = $value;
+                $alias = $val['alias'];
+                if (substr($name, -1) == '*') {
+                    $column_list[] = $name;
+                } elseif (strpos($name, '.') === false && strpos($name, '(') === false) {
+                    if ($alias)
+                        $column_list[] = sprintf('%s as %s', $name, $alias);
+                    else
+                        $column_list[] = sprintf('%s', $name);
+                } else {
+                    if ($alias)
+                        $column_list[] = sprintf('%s as %s', $name, $alias);
+                    else
+                        $column_list[] = sprintf('%s', $name);
+                }
             }
-
-            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
-            return $this->_query($query);
+            $columns = implode(',', $column_list);
         }
 
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val.' as '.$key;
-            }
+        $condition = $this->getCondition($output);
 
-            // 컬럼 정리
+        if ($output->list_count && $output->page)
+            return $this->_getNavigationData($table_list, $columns, $left_join, $condition,
+                $output);
+
+        // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+        if ($output->order) {
+            $conditions = $this->getConditionList($output);
+            if (!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                foreach ($output->order as $key => $val) {
+                    $col = $val[0];
+                    if (!in_array($col, array('list_order', 'update_order')))
+                        continue;
+                    if ($condition)
+                        $condition .= sprintf(' and %s < 2100000000 ', $col);
+                    else
+                        $condition = sprintf(' where %s < 2100000000 ', $col);
+                }
+            }
+        }
+
+        $query = sprintf("select %s from %s %s %s", $columns, implode(',', $table_list),
+            implode(' ', $left_join), $condition);
+
+        if (count($output->groups)) {
+            /*
+            var_dump("= column output start = ");
+            var_dump(sizeof ($output->columns) . " = end length == ");
+            var_dump($output->columns);
+            var_dump("= column output end = " . "\n");
+            var_dump($output->groups);
+            var_dump("=== " . "\n");
+            var_dump(debug_backtrace());
+            
             foreach($output->columns as $key => $val) {
-                if(!isset($val['value'])) continue;
-                $name = $val['name'];
-                $value = $val['value'];
-                if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
-                else {
-                    if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                    elseif(!$value || is_numeric($value)) $value = (int)$value;
-
-                    $column_list[] = sprintf("%s = %s", $name, $value);
-                }
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("update %s set %s %s", implode(',',$table_list), implode(',',$column_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val.' as '.$key;
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
-                if($condition){
-                    $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key  . ' on (' . $condition . ')';
-                }
-            }
-
-
-            if(!$output->columns) {
-                $columns = '*';
-            } else {
-                $column_list = array();
-                foreach($output->columns as $key => $val) {
+            $name = $val['name'];
+            $alias = $val['alias'];
+            } */
+            $group_list = array();
+            foreach ($output->groups as $gkey => $gval) {
+                foreach ($output->columns as $key => $val) {
                     $name = $val['name'];
                     $alias = $val['alias'];
-                    if(substr($name,-1) == '*') {
-                        $column_list[] = $name;
-                    } elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
-                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
-                        else $column_list[] = sprintf('%s',$name);
-                    } else {
-                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
-                        else $column_list[] = sprintf('%s',$name);
+                    if (trim($name) == trim($gval)) {
+                        $group_list[] = $alias;
+                        break;
                     }
                 }
-                $columns = implode(',',$column_list);
+
             }
-
-            $condition = $this->getCondition($output);
-
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
-
-            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-                }
-                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
-            }
-
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $data = $this->_fetch($result);
-
-            $buff = new Object();
-            $buff->data = $data;
-            return $buff;
+            $query .= sprintf(' group by %s', implode(',', $group_list));
+            //             var_dump($query);
         }
 
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-            // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
-            $total_count = $this->getCountCache($output->tables, $condition);
-            if($total_count === false) {
-                $result = $this->_query($count_query);
-                $count_output = $this->_fetch($result);
-                $total_count = (int)$count_output->count;
-                $this->putCountCache($output->tables, $condition, $total_count);
+        if ($output->order) {
+            foreach ($output->order as $key => $val) {
+                $index_list[] = sprintf('%s %s', $val[0], $val[1]);
             }
+            if (count($index_list))
+                $query .= ' order by ' . implode(',', $index_list);
+        }
 
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
+        $result = $this->_query($query);
+        if ($this->isError())
+            return;
+        $data = $this->_fetch($result);
 
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
+        $buff = new Object();
+        $buff->data = $data;
+        return $buff;
+    }
 
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
+    /**
+     * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
+     *
+     * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
+     **/
+    function _getNavigationData($table_list, $columns, $left_join, $condition, $output)
+    {
+        require_once (_XE_PATH_ . 'classes/page/PageHandler.class.php');
 
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
+        // 전체 개수를 구함
+        $count_query = sprintf("select count(*) as count from %s %s %s", implode(',', $table_list),
+            implode(' ', $left_join), $condition);
+        $total_count = $this->getCountCache($output->tables, $condition);
+        if ($total_count === false) {
+            $result = $this->_query($count_query);
+            $count_output = $this->_fetch($result);
+            $total_count = (int)$count_output->count;
+            $this->putCountCache($output->tables, $condition, $total_count);
+        }
+
+        $list_count = $output->list_count['value'];
+        if (!$list_count)
+            $list_count = 20;
+        $page_count = $output->page_count['value'];
+        if (!$page_count)
+            $page_count = 10;
+        $page = $output->page['value'];
+        if (!$page)
+            $page = 1;
+
+        // 전체 페이지를 구함
+        if ($total_count)
+            $total_page = (int)(($total_count - 1) / $list_count) + 1;
+        else
+            $total_page = 1;
+
+        // 페이지 변수를 체크
+        if ($page > $total_page)
+            $page = $total_page;
+        $start_count = ($page - 1) * $list_count;
+
+        // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+        if ($output->order) {
+            $conditions = $this->getConditionList($output);
+            if (!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                foreach ($output->order as $key => $val) {
+                    $col = $val[0];
+                    if (!in_array($col, array('list_order', 'update_order')))
+                        continue;
+                    if ($condition)
+                        $condition .= sprintf(' and %s < 2100000000 ', $col);
+                    else
+                        $condition = sprintf(' where %s < 2100000000 ', $col);
                 }
             }
+        }
 
-            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
+        $query = sprintf("select %s from %s %s %s", $columns, implode(',', $table_list),
+            implode(' ', $left_join), $condition);
 
-            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
+        if (count($output->groups))
+            $query .= sprintf(' group by %s', implode(',', $output->groups));
 
-            if(count($output->order)) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-                }
-                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
+        if (count($output->order)) {
+            foreach ($output->order as $key => $val) {
+                $index_list[] = sprintf('%s %s', $val[0], $val[1]);
             }
+            if (count($index_list))
+                $query .= ' order by ' . implode(',', $index_list);
+        }
 
-            $query = sprintf('%s offset %d limit %d', $query, $start_count, $list_count);
-
-            $result = $this->_query($query);
-            if($this->isError()) {
-                $buff = new Object();
-                $buff->total_count = 0;
-                $buff->total_page = 0;
-                $buff->page = 1;
-                $buff->data = array();
-
-                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-                return $buff;
-            }
-
-            $virtual_no = $total_count - ($page-1)*$list_count;
-            while($tmp = pg_fetch_object($result)) {
-                $data[$virtual_no--] = $tmp;
-            }
+        $query = sprintf('%s offset %d limit %d', $query, $start_count, $list_count);
 
+        $result = $this->_query($query);
+        if ($this->isError()) {
             $buff = new Object();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
+            $buff->total_count = 0;
+            $buff->total_page = 0;
+            $buff->page = 1;
+            $buff->data = array();
 
             $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
             return $buff;
         }
+
+        $virtual_no = $total_count - ($page - 1) * $list_count;
+        while ($tmp = pg_fetch_object($result)) {
+            $data[$virtual_no--] = $tmp;
+        }
+
+        $buff = new Object();
+        $buff->total_count = $total_count;
+        $buff->total_page = $total_page;
+        $buff->page = $page;
+        $buff->data = $data;
+
+        $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+        return $buff;
     }
+}
 ?>
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 34efa7da6..0a352a34c 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -209,6 +209,13 @@
             return $this->_query($query);
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
 
         /**
          * @brief 특정 테이블의 column의 정보를 return
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 000487132..90ba376ff 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -232,6 +232,14 @@
             return $this->_execute();
         }
 
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
         /**
          * @brief 특정 테이블의 column의 정보를 return
          **/
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index ea8e7fdcb..51e2bdc86 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -34,12 +34,17 @@
             // 요청방식에 따라 출력을 별도로
             if(Context::getResponseMethod()=="HTML") {
 
+                // 관리자 모드일 경우 #xeAdmin id를 가지는 div 추가
+                if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $content = '<div id="xeAdmin">'.$content.'</div>';
+
+                // 내용을 content라는 변수로 설정 (layout에서 {$content}에서 대체됨) 
                 Context::set('content', $content);
 
                 // 레이아웃을 컴파일
                 if(__DEBUG__==3) $start = getMicroTime();
                 $oTemplate = &TemplateHandler::getInstance();
 
+                // layout이라는 변수가 none으로 설정되면 기본 레이아웃으로 변경
                 if(Context::get('layout') != 'none') {
                     $layout_path = $oModule->getLayoutPath();
                     $layout_file = $oModule->getLayoutFile();
@@ -47,8 +52,30 @@
                 }
                 if(!$layout_path) $layout_path = './common/tpl/';
                 if(!$layout_file) $layout_file = 'default_layout.html';
-                $zbxe_final_content = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
 
+                // 현재 요청된 레이아웃 정보를 구함
+                $oLayoutModel = &getModel('layout');
+                $current_module_info = Context::get('current_module_info');
+                $layout_srl = $current_module_info->layout_srl;
+
+                // 생성된 레이아웃과 연결되어 있으면 처리
+                if($layout_srl > 0){
+                    $layout_info = Context::get('layout_info');
+
+                    // faceoff 레이아웃일 경우 별도 처리
+                    if($layout_info && $layout_info->type == 'faceoff') {
+                        $oLayoutModel->doActivateFaceOff($layout_info);
+                    }
+
+                    // 관리자 레이아웃 수정화면에서 변경된 CSS가 있는지 조사
+                    $edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
+
+
+                    if(file_exists($edited_layout_css)) Context::addCSSFile($edited_layout_css,true,'all','',100);
+                }
+                Context::set('layout_info', $layout_info);
+
+                $zbxe_final_content = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
                 if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
 
 
@@ -62,17 +89,23 @@
 
                 // 최종 결과를 common_layout에 넣어버림
                 Context::set('zbxe_final_content', $zbxe_final_content);
+
                 $output = $oTemplate->compile('./common/tpl', 'common_layout');
 
+                // 사용자 정의 언어 변경
+                $oModuleController = &getController('module');
+                $oModuleController->replaceDefinedLangCode($output);
+
+
             } else {
-
                 $output = $content;
-
             }
 
             // 애드온 실행
             $called_position = 'before_display_content';
-            @include("./files/cache/activated_addons.cache.php");
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath();
+            if(file_exists($addon_file)) @include($addon_file);
 
             $this->content_size = strlen($output);
 
@@ -234,8 +267,6 @@
 
             // 파일 및 HTML 주석으로 출력
             } else {
-                // debug string 작성 시작
-                $buff  = "** Debug at ".date('Y-m-d H:i:s').str_repeat('*', 60)."\n";
 
                 // 전체 실행 시간 출력, Request/Response info 출력
                 if(__DEBUG__ & 2) {
@@ -283,22 +314,25 @@
 
                 // HTML 주석으로 출력
                 if(__DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
+                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
+
                     if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
                         $buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
                     }
+
                     return "<!--\r\n".$buff."\r\n-->";
                 }
 
                 // 파일에 출력
                 if(__DEBUG_OUTPUT__ == 0) {
                     $debug_file = _XE_PATH_.'files/_debug_message.php';
-                    $debug_output = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($debug_output, true));
+                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
 
-                    if($display_option === true) $debug_output = str_repeat('=', 40)."\n".$debug_output.str_repeat('-', 40);
-                    $debug_output = "\n<?php\n/*".$debug_output."*/\n?>\n";
+                    $buff = str_repeat('=', 40)."\n".$buff.str_repeat('-', 40);
+                    $buff = "\n<?php\n/*".$buff."*/\n?>\n";
 
                     if(@!$fp = fopen($debug_file, 'a')) return;
-                    fwrite($fp, $debug_output);
+                    fwrite($fp, $buff);
                     fclose($fp);
                 }
             }
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
new file mode 100644
index 000000000..b29f40b17
--- /dev/null
+++ b/classes/extravar/Extravar.class.php
@@ -0,0 +1,314 @@
+<?php
+    /**
+     * @class ExtraVar
+     * @author zero (zero@nzeo.com)
+     * @brief 게시글, 회원등에서 사용하는 확장변수를 핸들링하는 클래스
+     *
+     * php4대비 class static 변수가 안됨으로 $GLOBALS['XE_EXTRAVARS']를 이용해서 같은 효과 냄
+     **/
+    class ExtraVar {
+
+        var $module_srl = null;
+
+        /**
+         * @brief constructor
+         **/
+        function &getInstance($module_srl) {
+            static $oInstance = array();
+            if(!$oInstance[$module_srl]) $oInstance[$module_srl] = new ExtraVar($module_srl);
+            return $oInstance[$module_srl];
+        }
+
+        /**
+         * @brief constructor
+         **/
+        function ExtraVar($module_srl) { 
+            $this->module_srl = $module_srl;
+        }
+
+        /**
+         * @brief 불필요한 등록을 피하기 위해서 특정 module_srl에 확장변수가 등록되었는지 확인
+         **/
+        function isSettedExtraVars() {
+            return isset($GLOBALS['XE_EXTRAVARS'][$this->module_srl]);
+        }
+
+        /**
+         * @brief 확장변수 키를 등록
+         * php4를 대비해 class static 멤버변수 대신 $GLOBAL 변수 사용
+         * @param module_srl, idx, name, type, default, desc, is_required, search, value
+         **/
+        function setExtraVarKeys($extra_keys) {
+            if(!$this->isSettedExtraVars()) {
+                if(!$extra_keys || !count($extra_keys)) $GLOBALS['XE_EXTRAVARS'][$this->module_srl] = array();
+                else {
+                    if(!is_array($GLOBALS['XE_EXTRAVARS'][$this->module_srl])) $GLOBALS['XE_EXTRAVARS'][$this->module_srl] = array();
+                    foreach($extra_keys as $key => $val) {
+                        $obj = null;
+                        $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value); 
+                        $GLOBALS['XE_EXTRAVARS'][$this->module_srl][$val->idx] = $obj;
+                    }
+                }
+            }
+        }
+
+        /**
+         * @brief 확장변수 객체 배열 return
+         **/
+        function getExtraVars() {
+            if(!$this->isSettedExtraVars()) return array();
+            return $GLOBALS['XE_EXTRAVARS'][$this->module_srl];
+        }
+    }
+
+    /**
+     * @class ExtraItem
+     * @author zero (zero@nzeo.com)
+     * @brief 확장변수의 개별 값
+     **/
+    class ExtraItem {
+        var $module_srl = 0;
+        var $idx = 0;
+        var $name = 0;
+        var $type = 'text';
+        var $default = null;
+        var $desc = '';
+        var $is_required = 'N';
+        var $search = 'N';
+        var $value = null;
+
+        /**
+         * @brief constructor
+         **/
+        function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null) {
+            if(!$idx) return;
+            $this->module_srl = $module_srl;
+            $this->idx = $idx;
+            $this->name = $name;
+            $this->type = $type;
+            $this->default = $default;
+            $this->desc = $desc;
+            $this->is_required = $is_required;
+            $this->search = $search;
+            $this->value = $value;
+        }
+
+        /**
+         * @brief 값 지정
+         **/
+        function setValue($value) {
+            $this->value = $value;
+        }
+
+        /**
+         * @brief type에 따라서 주어진 값을 변형하여 원형 값을 return
+         **/
+        function _getTypeValue($type, $value) {
+            $value = trim($value);
+            if(!isset($value)) return;
+            switch($type) {
+                case 'homepage' :
+                        if(!preg_match('/^([a-z]+):\/\//i',$value)) $value = 'http://'.$value;
+                        return htmlspecialchars($value);
+                    break;
+                case 'tel' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        $values[0] = $values[0];
+                        $values[1] = $values[1];
+                        $values[2] = $values[2];
+                        return $values;
+                    break;
+                    break;
+                case 'checkbox' :
+                case 'radio' :
+                case 'select' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        else $values = array($value);
+                        for($i=0;$i<count($values);$i++) $values[$i] = htmlspecialchars($values[$i]);
+                        return $values;
+                    break;
+                case 'kr_zip' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        return $values;
+                    break;
+                //case 'date' :
+                //case 'email_address' :
+                //case 'text' :
+                //case 'textarea' :
+                default :
+                        return htmlspecialchars($value);
+                    break;
+            }
+        }
+
+        /**
+         * @brief 값을 return
+         * 원형 값을 HTML 결과물로 return
+         **/
+        function getValueHTML() {
+            $value = $this->_getTypeValue($this->type, $this->value);
+            switch($this->type) {
+                case 'homepage' :
+                        return sprintf('<a href="%s" onclick="window.open(this.href); return false;">%s</a>', $value, $value);
+                case 'email_address' :
+                        return sprintf('<a href="mailto:%s">%s</a>', $value, $value);
+                    break;
+                case 'tel' :
+                        return sprintf('%s - %s - %s', $value[0],$value[1],$value[2]);
+                    break;
+                case 'textarea' :
+                        return nl2br($value);
+                    break;
+                case 'checkbox' :
+                        if(is_array($value)) return implode(', ',$value);
+                        else return $value;
+                    break;
+                case 'date' :
+                        return zdate($value,"Y-m-d");
+                    break;
+                case 'select' :
+                case 'radio' :
+                        if(is_array($value)) return implode(', ',$value);
+                        else return $value;
+                    break;
+                case 'kr_zip' :
+                        if(is_array($value)) return implode(' ',$value);
+                        else return $value;
+                    break;
+                // case 'text' :
+                default :
+                    return $value;
+            }
+        }
+
+        /**
+         * @brief type에 따른 form을 리턴
+         **/
+        function getFormHTML() {
+            $type = $this->type;
+            $name = $this->name;
+            $value = $this->_getTypeValue($this->type, $this->value);
+            $default = $this->_getTypeValue($this->type, $this->default);
+            $column_name = 'extra_vars'.$this->idx;
+
+            $buff = '';
+            switch($type) {
+                // 홈페이지 주소
+                case 'homepage' :
+                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
+                    break;
+
+                // Email 주소
+                case 'email_address' :
+                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
+                    break;
+
+                // 전화번호
+                case 'tel' :
+                        $buff .= 
+                            '<input type="text" name="'.$column_name.'" value="'.$value[0].'" size="4" class="tel" />'.
+                            '<input type="text" name="'.$column_name.'" value="'.$value[1].'" size="4" class="tel" />'.
+                            '<input type="text" name="'.$column_name.'" value="'.$value[2].'" size="4" class="tel" />';
+                    break;
+
+                // textarea
+                case 'textarea' :
+                        $buff .= '<textarea name="'.$column_name.'" class="textarea">'.$value.'</textarea>';
+                    break;
+
+                // 다중 선택
+                case 'checkbox' :
+                        $buff .= '<ul>';
+                        foreach($default as $v) {
+                            if($value && in_array($v, $value)) $checked = ' checked="checked"';
+                            else $checked = '';
+                            $buff .='<li><input type="checkbox" name="'.$column_name.'" value="'.htmlspecialchars($v).'" '.$checked.' />'.$v.'</li>';
+                        }
+                        $buff .= '</ul>';
+                    break;
+
+                // 단일 선택
+                case 'select' :
+                        $buff .= '<select name="'.$column_name.'" class="select">';
+                        foreach($default as $v) {
+                            if($value && in_array($v,$value)) $selected = ' selected="selected"';
+                            else $selected = '';
+                            $buff .= '<option value="'.$v.'" '.$selected.'>'.$v.'</option>';
+                        }
+                        $buff .= '</select>';
+                    break;
+
+                // radio 
+                case 'radio' :
+                        $buff .= '<ul>';
+                        foreach($default as $v) {
+                            if($value && in_array($v,$value)) $checked = ' checked="checked"';
+                            else $checked = '';
+                            $buff .= '<li><input type="radio" name="'.$column_name.'" '.$checked.' value="'.$v.'"  class="radio" />'.$v.'</li>';
+                        }
+                        $buff .= '</ul>';
+                    break;
+
+                // 날짜 입력
+                case 'date' :
+                        // datepicker javascript plugin load
+                        Context::loadJavascriptPlugin('ui.datepicker');
+
+                        $buff .= 
+                            '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'.
+                            '<input type="text" id="date_'.$column_name.'" value="'.zdate($value,'Y-m-d').'" readonly="readonly" class="date" />'."\n".
+                            '<script type="text/javascript">'."\n".
+                            '(function($){'."\n".
+                            '    $(function(){'."\n".
+                            '        var option = { gotoCurrent: false,yearRange:\'-100:+10\', onSelect:function(){'."\n".
+                            '            $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}'."\n".
+                            '        };'."\n".
+                            '        $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);'."\n".
+                            '        $("#date_'.$column_name.'").datepicker(option);'."\n".
+                            '    });'."\n".
+                            '})(jQuery);'."\n".
+                            '</script>';
+                    break;
+
+                // 주소 입력
+                case "kr_zip" :
+                        // krzip address javascript plugin load
+                        Context::loadJavascriptPlugin('ui.krzip');
+
+                        $buff .=
+                            '<div id="addr_searched_'.$column_name.'" style="display:'.($value[0]?'block':'none').';">'.
+                                '<input type="text" readonly="readonly" name="'.$column_name.'" value="'.$value[0].'" class="address" />'.
+                                '<a href="#" onclick="doShowKrZipSearch(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
+                            '</div>'.
+
+                            '<div id="addr_list_'.$column_name.'" style="display:none;">'.
+                                '<select name="addr_list_'.$column_name.'"></select>'.
+                                '<a href="#" onclick="doSelectKrZip(this, \''.$column_name.'\'); return false;" class="button blue"><span>'.Context::getLang('cmd_select').'</span></a>'.
+                                '<a href="#" onclick="doHideKrZipList(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
+                            '</div>'.
+
+                            '<div id="addr_search_'.$column_name.'" style="display:'.($value[0]?'none':'block').'">'.
+                                '<input type="text" name="addr_search_'.$column_name.'" class="address" value="" />'.
+                                '<a href="#" onclick="doSearchKrZip(this, \''.$column_name.'\'); return false;" class="button green"><span>'.Context::getLang('cmd_search').'</span></a>'.
+                            '</div>'.
+
+                            '<input type="text" name="'.$column_name.'" value="'.htmlspecialchars($value[1]).'" class="address" />'.
+                            '';
+                    break;
+
+                // 일반 text
+                default :
+                        $buff .=' <input type="text" name="'.$column_name.'" value="'.$value.'" class="text" />';
+                    break;
+            }
+            if($this->desc) $buff .= '<p>'.$this->desc.'</p>';
+            return $buff;
+        }
+    }
+?>
diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index e0d4dd988..830da21aa 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -18,8 +18,6 @@
             return $source;
         }
 
-
-
         /**
          * @brief 특정 디렉토리를 복사
          **/
@@ -50,6 +48,14 @@
             }
         }
 
+        function copyFile($source, $target, $force='Y'){
+            $source = FileHandler::getRealPath($source);
+            $target_dir = FileHandler::getRealPath(dirname($target));
+            $target = basename($target);
+            if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
+            if($force=='Y') @unlink($target_dir.'/'.$target);
+            @copy($source, $target_dir.'/'.$target);
+        }
 
         /**
          * @brief 파일의 내용을 읽어서 return
@@ -255,8 +261,8 @@
          **/
         function filesize($size) {
             if(!$size) return "0Byte";
-            if($size<1024) return ($size."Byte");
-            if($size >1024 && $size< 1024 *1024) return sprintf("%0.1fKB",$size / 1024);
+            if($size < 1024) return ($size."Byte");
+            if($size >= 1024 && $size < 1024*1024) return sprintf("%0.1fKB",$size / 1024);
             return sprintf("%0.2fMB",$size / (1024*1024));
         }
 
@@ -441,5 +447,44 @@
 
             return true;
         }
+
+
+        /**
+         * @brief ini 파일을 읽는다
+         **/
+        function readIniFile($filename){
+            $filename = FileHandler::getRealPath($filename);
+            if(!file_exists($filename)) return false;
+            $arr = parse_ini_file($filename, true);
+            if(is_array($arr) && count($arr)>0) return $arr;
+            else return array();
+        }
+
+
+        /**
+         * @brief array를 ini 파일로 저장한다.
+         **/
+        function writeIniFile($filename,$arr){
+            if(count($arr)==0) return false;
+            FileHandler::writeFile($filename,FileHandler::_makeIniBuff($arr));
+            return true;
+        }
+
+        function _makeIniBuff($arr){
+            $return = '';
+            foreach($arr as $key => $val){
+                // section
+                if(is_array($val)){
+                    $return .= sprintf("[%s]\n",$key);
+                    foreach($val as $k => $v){
+                        $return .= sprintf("%s=\"%s\"\n",$k,$v);
+                    }
+                // value
+                }else if(is_string($val) || is_int($val)){
+                    $return .= sprintf("%s=\"%s\"\n",$key,$val);
+                }
+            }
+            return $return;
+        }
     }
 ?>
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 4eef5fd67..cdd2650e6 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -56,6 +56,8 @@
             if(!$module_srl) $this->module_srl = (int)Context::get('module_srl');
             else $this->module_srl = (int)$module_srl;
 
+            $this->entry = Context::get('entry');
+
             // 기본 변수들의 검사 (XSS방지를 위한 기초적 검사)
             if($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->module)) die(Context::getLang("msg_invalid_request"));
             if($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->mid)) die(Context::getLang("msg_invalid_request"));
@@ -63,7 +65,9 @@
 
             // 애드온 실행 (모듈 실행 전)
             $called_position = 'before_module_init';
-            @include(_XE_PATH_."files/cache/activated_addons.cache.php");
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath();
+            if(file_exists($addon_file)) @include($addon_file);
         }
 
         /**
@@ -74,42 +78,63 @@
             $oModuleModel = &getModel('module');
 
             $site_module_info = Context::get('site_module_info');
-            $site_srl = $site_module_info->site_srl;
 
-            // document_srl만 있을 경우 document_srl로 모듈과 모듈 정보를 구함
-            if($this->document_srl && !$this->mid && !$this->module_srl) {
+            if(!$this->document_srl && $this->mid && $this->entry) {
+                $oDocumentModel = &getModel('document');
+                $this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
+                if($this->document_srl) Context::set('document_srl', $this->document_srl);
+            }
+
+            // 문서번호(document_srl)가 있을 경우 모듈 정보를 구해옴
+            if($this->document_srl && !$this->module) {
                 $module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl);
+
+                // 문서가 존재하지 않으면 문서 정보를 제거
+                if(!$module_info) {
+                    unset($this->document_srl);
+                // 문서가 존재할 경우 모듈 정보를 바탕으로 virtual site 및 mid 비교
+                } else {
+                    // mid 값이 다르면 문서의 mid로 설정
+                    if($this->mid != $module_info->mid) {
+                        $this->mid = $module_info->mid;
+                        Context::set('mid', $module_info->mid, true);
+                    }
+                }
+                // 요청된 모듈과 문서 번호가 다르면 문서 번호에 의한 모듈 정보를 제거
                 if($this->module && $module_info->module != $this->module) unset($module_info);
             }
 
-            // 아직 모듈을 못 찾았고 $mid값이 있으면 $mid로 모듈을 구함
+            // 모듈정보를 구하지 못했고 mid 요청이 있으면 mid에 해당하는 모듈 정보를 구함
             if(!$module_info && $this->mid) {
-                $module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_srl);
-                if($this->module && $module_info->module != $this->module) unset($module_info);
+                $module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
+                //if($this->module && $module_info->module != $this->module) unset($module_info);
             }
 
-            // 모듈정보와 사이트 모듈정보가 다르면(다른 사이트이면) 페이지 리다이렉트
-            if($module_info && $site_module_info && $module_info->site_srl != $site_module_info->site_srl) {
-                $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
-                $redirect_url = getSiteUrl($site_info->domain, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'));
-                header("location:".$redirect_url);
-                return false;
-            }
-
-            // 모듈을 여전히(;;) 못 찾고 $module_srl이 있으면 해당 모듈을 구함
-            if(!$module_info && $this->module_srl) {
+            // 모듈을 여전히(;;) 못 찾고 모듈번호(module_srl)가 있으면 해당 모듈을 구함
+            // module_srl로 대상 모듈을 찾는 것을 주석 처리함.
+            if(!$this->module && !$module_info && $this->module_srl) {
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl);
-                if($this->module && $module_info->module != $this->module) unset($module_info);
+                //if($this->module && $module_info->module != $this->module) unset($module_info);
             }
 
             // 역시 모듈을 못 찾았고 $module이 없다면 기본 모듈을 찾아봄
             if(!$module_info && !$this->module) $module_info = $site_module_info;
 
-            if($module_info && $site_module_info && $site_module_info->site_srl != $module_info->site_srl) {
-                unset($site_module_info);
-                $site_module_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+            // 모듈정보와 사이트 모듈정보가 다르면(다른 사이트이면) 페이지 리다이렉트
+            if($module_info && $module_info->site_srl != $site_module_info->site_srl) {
+                // 현재 요청된 모듈이 가상 사이트 모듈일 경우
+                if($module_info->site_srl) {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    $redirect_url = getSiteUrl($site_info->domain, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
+                // 가상 사이트 모듈이 아닌데 가상 사이트에서 호출되었을 경우
+                } else {
+                    $db_info = Context::getDBInfo();
+                    if(!$db_info->default_url) return die("기본 URL이 정해지지 않아서 동작을 중지합니다");
+                    else $redirect_url = getSiteUrl($db_info->default_url, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
+                }
+                header("location:".$redirect_url);
+                return false;
             }
-            Context::set('site_module_info', $site_module_info);
 
             // 모듈 정보가 찾아졌을 경우 모듈 정보에서 기본 변수들을 구함, 모듈 정보에서 module 이름을 구해움
             if($module_info) {
@@ -117,6 +142,8 @@
                 $this->mid = $module_info->mid;
                 $this->module_info = $module_info;
                 Context::setBrowserTitle($module_info->browser_title);
+                $part_config= $oModuleModel->getModulePartConfig('layout',$module_info->layout_srl);
+                Context::addHtmlHeader($part_config->header_script);
             }
 
             // 모듈정보에 module과 mid를 강제로 지정
@@ -146,8 +173,14 @@
          * @brief 모듈과 관련된 정보를 이용하여 객체를 구하고 act 실행까지 진행시킴
          **/
         function procModule() {
-            // 에러가 있으면 return
-            if($this->error) return;
+            // 에러가 있으면 메세지 객체를 만들어서 return
+            if($this->error) {
+                $oMessageView = &getView('message');
+                $oMessageView->setError(-1);
+                $oMessageView->setMessage($this->error);
+                $oMessageView->dispMessage();
+                return $oMessageView;
+            }
 
             // ModuleModel 객체 생성
             $oModuleModel = &getModel('module');
@@ -169,9 +202,8 @@
                 return;
             }
 
-            // type, grant 값 구함
+            // type, kind 값 구함
             $type = $xml_info->action->{$this->act}->type;
-            $grant = $xml_info->action->{$this->act}->grant;
             $kind = strpos(strtolower($this->act),'admin')!==false?'admin':'';
             if(!$kind && $this->module == 'admin') $kind = 'admin';
 
@@ -209,8 +241,8 @@
                 $this->error = 'msg_dbconnect_failed';
             }
 
-            // XMLRPC call 이 아니면 message view 객체 이용하도록
-            if(Context::getRequestMethod() != 'XMLRPC' && Context::getRequestMethod() != 'JSON') {
+            // HTML call 이면 message view 객체 이용하도록
+            if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
                 // 에러가 발생하였을시 처리
                 if($this->error) {
                     // message 모듈 객체를 생성해서 컨텐츠 생성
@@ -236,16 +268,18 @@
                     // layout_srl이 있으면 해당 레이아웃 정보를 가져와 layout_path/ layout_file 위치 변경
                     $oLayoutModel = &getModel('layout');
                     $layout_info = $oLayoutModel->getLayout($oModule->module_info->layout_srl);
-
                     if($layout_info) {
 
                         // 레이아웃 정보중 extra_vars의 이름과 값을 $layout_info에 입력
                         if($layout_info->extra_var_count) {
+
                             foreach($layout_info->extra_var as $var_id => $val) {
+                                if($val->type == 'image') {
+                                    if(preg_match('/^\.\/files\/attach\/images\/(.+)/i',$val->value)) $val->value = Context::getRequestUri().substr($val->value,2);
+                                }
                                 $layout_info->{$var_id} = $val->value;
                             }
                         }
-                        
                         // 레이아웃 정보중 menu를 Context::set
                         if($layout_info->menu_count) {
                             foreach($layout_info->menu as $menu_id => $menu) {
@@ -254,9 +288,6 @@
                             }
                         }
 
-                        // 레이아웃 정보중 header_script가 있으면 헤더 추가
-                        if($layout_info->header_script) Context::addHtmlHeader($layout_info->header_script);
-
                         // 레이아웃 정보를 Context::set
                         Context::set('layout_info', $layout_info);
 
@@ -264,7 +295,9 @@
                         $oModule->setLayoutFile('layout');
 
                         // 레이아웃이 수정되었을 경우 수정본을 지정
-                        $edited_layout = sprintf('./files/cache/layout/%d.html', $layout_info->layout_srl);
+                        $edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+//                        $edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
+//                        Context::addCSSFile($edited_layout_css);
                         if(file_exists($edited_layout)) $oModule->setEditedLayoutFile($edited_layout);
                     }
                 }
@@ -379,8 +412,6 @@
 
             if(__DEBUG__==3) $GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
 
-            // init method가 있으면 실행
-
             // 객체 리턴
             return $GLOBALS['_loaded_module'][$module][$type][$kind];
         }
@@ -393,20 +424,7 @@
             if(!Context::isInstalled()) return new Object();
 
             $oModuleModel = &getModel('module');
-
-            $cache_dir = sprintf("%sfiles/cache/triggers/",_XE_PATH_);
-            if(!is_dir($cache_dir)) FileHandler::makeDir($cache_dir);
-
-            $cache_file = sprintf("%s%s.%s", $cache_dir, $trigger_name, $called_position);
-
-            if(!@file_exists($cache_file)) {
-                $triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
-                FileHandler::writeFile($cache_file, serialize($triggers));
-            } else {
-                $buff = FileHandler::readFile($cache_file);
-                $triggers = unserialize($buff);
-            }
-
+            $triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
             if(!$triggers || !count($triggers)) return new Object();
 
             foreach($triggers as $item) {
@@ -420,6 +438,7 @@
 
                 $output = $oModule->{$called_method}($obj);
                 if(!$output->toBool()) return $output;
+                unset($oModule);
             }
 
             return new Object();
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 9d579c68a..aef05c31e 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -82,109 +82,39 @@
             // 웹서비스에서 꼭 필요한 인증 정보와 권한 설정 체크
             $is_logged = Context::get('is_logged');
             $logged_info = Context::get('logged_info');
-            $user_id = $logged_info->user_id;
-            $user_group = $logged_info->group_list;
-            $grant->is_admin = false;
 
+            // module model 객체 생성
             $oModuleModel = &getModel('module');
 
-            // 로그인되어 있다면 관리자 여부를 확인
-            if($is_logged) {
-                /* 로그인 사용자에 대한 관리자 여부는 다양한 방법으로 체크가 됨 */
-                // 1. 최고관리자일 경우
-                if($logged_info->is_admin == 'Y') {
-                    $grant->is_admin = true;
+            // 사이트 관리자이면 로그인 정보의 is_admin 에 'Y'로 세팅
+            //if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_admin = 'Y';
 
-                // 2. 사이트 관리자일 경우 사이트 관리 권한을 줌
-                } elseif($oModuleModel->isSiteAdmin()) {
-                    $grant->is_admin = true;
+            // XE에서 access, manager (== is_admin) 는 고정된 권한명이며 이와 관련된 권한 설정
+            $grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
 
+            // 현재 모듈의 access 권한이 없으면 권한 없음 표시
+            //if(!$grant->access) return $this->stop("msg_not_permitted");
 
-                // 3. 최고 관리자는 아니지만 모듈 object가 있고 admin_id 컬럼에 로그인 사용자의 아이디가 있을 경우
-                } elseif($this->module_info->admin_id) {
-                    if(is_array($this->module_info->admin_id) && in_array($user_id, $this->module_info->admin_id)) $grant->is_admin = true;
-
-                // 4. 1/2/3번이 아닐 경우 그룹을 체크하고 직접 모듈에 요청을 하여 체크를 함. (모듈.class.php에 정의)
-                } else {
-                    $manager_group = $this->module_info->grants['manager'];
-                    if(count($user_group) && count($manager_group)) {
-                        foreach($user_group as $group_srl => $group_info) {
-                            if(in_array($group_srl, $manager_group)) $grant->is_admin = true;
-                        }
-                    }
-
-                    if(!$grant->is_admin && $module_info->module) {
-                        $oClass = &getClass($module_info->module);
-                        if($oClass && method_exists($oClass, 'isAdmin')) $grant->is_admin = $oClass->isAdmin();
-                    }
-                }
-            }
-
-            // 권한 설정
-            if($xml_info->grant) {
-
-                // 이 모듈에 action.xml에서 선언된 권한 목록을 루프
-                foreach($xml_info->grant as $grant_name => $grant_item) {
-
-                    // 제목과 기타 설정 없을 경우의 기본 권한(guest, member, root)에 대한 변수 설정
-                    $title = $grant_item->title;
-                    $default = $grant_item->default;
-
-                    // 최고 관리자이면 모든 권한에 대해 true 설정
-                    if($grant->is_admin) {
-                        $grant->{$grant_name} = true;
-                        continue;
-                    }
-
-                    // 일단 현재 권한에 대해 false 지정
-                    $grant->{$grant_name} = false;
-
-                    // 모듈의 개별 설정에서 이 권한에 대한 그룹 지정이 있으면 체크
-                    if(count($this->module_info->grants[$grant_name])) {
-                        $group_srls = $this->module_info->grants[$grant_name];
-                        if(!is_array($group_srls)) $group_srls = array($group_srls);
-
-                        if(count($user_group)) {
-                            foreach($user_group as $group_srl => $group_title) {
-                                if(in_array($group_srl, $group_srls)) {
-                                    $grant->{$grant_name} = true;
-                                    break;
-                                }
-                            }
-                        } 
-
-                    // 별도의 지정이 없으면 default값으로 권한 체크
-                    } else {
-                        switch($default) {
-                            case 'member' :
-                                    if($is_logged) $grant->{$grant_name} = true;
-                                break;
-                            case 'root' :
-                                    if($logged_info->is_admin == 'Y') $grant->{$grant_name} = true;
-                                break;
-                            default :
-                                    $grant->{$grant_name} = true;
-                                break;
-                        }
-
-                    }
-                }
-            }
-
-            // 현재 action값에 따른 최고 관리 권한 부여
-            if($this->act && $xml_info->permission) {
+            // 관리 권한이 없으면 permision, action 확인
+            if(!$grant->manager) {
+                // 현재 요청된 action의 퍼미션 type(guest, member, manager, root)를 구함
                 $permission_target = $xml_info->permission->{$this->act};
-                if($permission_target && $grant->{$permission_target}) {
-                    foreach($grant as $key => $val) $grant->{$key} = true;
-                }
-            }
 
-            // act값에 admin이 들어 있는데 관리자가 아닌 경우 해당 모듈의 관리자 체크 
-            if(substr_count($this->act, 'Admin')) {
-                if(!$is_logged) $this->setAct("dispMemberLoginForm");
-                else if($logged_info->is_admin != 'Y' && (!method_exists($this, 'checkAdminActionGrant') || !$this->checkAdminActionGrant())) {
-                    $this->stop('msg_not_permitted_act');
-                } 
+                // module.xml에 명시된 퍼미션이 없을때 ation명에 Admin이 있으면 manager로 체크
+                if(!$permission_target && substr_count($this->act, 'Admin')) $permission_target = 'manager';
+
+                // 권한 체크
+                switch($permission_target) {
+                    case 'root' :
+                            $this->stop('msg_not_permitted_act');
+                        break;
+                    case 'manager' :
+                            if(!$grant->manager) $this->stop('msg_not_permitted_act');
+                        break;
+                    case 'member' :
+                            if(!$is_logged) $this->stop('msg_not_permitted_act');
+                        break;
+                }
             }
 
             // 권한변수 설정
@@ -301,55 +231,93 @@
          **/
         function proc() {
             // stop_proc==true이면 그냥 패스
-            if($this->stop_proc==true) return false;
+            if($this->stop_proc) return false;
 
             // addon 실행(called_position 를 before_module_proc로 하여 호출)
             $called_position = 'before_module_proc';
-            @include(_XE_PATH_."files/cache/activated_addons.cache.php");
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath();
+            if(file_exists($addon_file)) @include($addon_file);
 
-            // 지금까지 이상이 없었다면 action 실행
-            if(!$this->stop_proc) {
-                // 현재 모듈에 act값이 있으면 해당 act를 실행
-                if(method_exists($this, $this->act)) {
-                    $output = $this->{$this->act}();
+            // action 실행
+            if(method_exists($this, $this->act)) {
 
-                // act가 없으면 action_forward에서 해당하는 act가 있는지 찾아서 대신 실행
-                } else if(Context::isInstalled()) {
+                // 권한 체크
+                if(!$this->grant->access) return $this->stop("msg_not_permitted_act");
 
-                    $oModuleModel = &getModel('module');
-                    $forward = $oModuleModel->getActionForward($this->act);
-                    if($forward->module && $forward->type && $forward->act) {
+                // 모듈의 스킨 정보를 연동 (스킨 정보의 테이블 분리로 동작대상 모듈에만 스킨 정보를 싱크시키도록 변경)
+                $oModuleModel = &getModel('module');
+                $oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
+                Context::set('module_info', $this->module_info);
 
-                        $kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
-                        $oModule = &getModule($forward->module, $forward->type, $kind);
-                        $xml_info = $oModuleModel->getModuleActionXml($forward->module);
-                        $oModule->setAct($forward->act);
-                        $oModule->init();
-                        $oModule->setModuleInfo($this->module_info, $xml_info);
+                // 실행
+                $output = $this->{$this->act}();
 
-                        $output = $oModule->{$forward->act}();
+            // act이 없으면 action_forward에서 해당하는 act가 있는지 찾아서 대신 실행
+            } else if(Context::isInstalled()) {
+                $oModuleModel = &getModel('module');
 
-                        $this->setTemplatePath($oModule->getTemplatePath());
-                        $this->setTemplateFile($oModule->getTemplateFile());
+                $forward = null;
 
-                    } else {
-                        if($this->xml_info->default_index_act) {
-                            if(method_exists($this, $this->xml_info->default_index_act)) {
-                                $output = $this->{$this->xml_info->default_index_act}();
-                            }
-                        } else {
-                            return false;
-                        }
+                // 현재 요청된 action의 대상 모듈을 찾음
+                // 1. action이름으로 검색 (DB검색 없이 하기 위함)
+                if(preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches)) {
+                    $module = strtolower($matches[2].$matches[3]);
+                    $xml_info = $oModuleModel->getModuleActionXml($module);
+                    if($xml_info->action->{$this->act}) {
+                        $forward->module = $module;
+                        $forward->type = $xml_info->action->{$this->act}->type;
+                        $forward->act = $this->act;
                     }
-                    
+                }
+
+                // 2. 1번에서 찾지 못하면 action forward를 검색
+                if(!$forward) $forward = $oModuleModel->getActionForward($this->act);
+
+                // 찾아진 forward 모듈이 있으면 실행
+                if($forward->module && $forward->type && $forward->act) {
+
+                    $kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
+
+                    $oModule = &getModule($forward->module, $forward->type, $kind);
+                    $xml_info = $oModuleModel->getModuleActionXml($forward->module);
+
+                    $oModule->setAct($forward->act);
+                    $oModule->init();
+                    if($oModule->stop_proc) return $this->stop($oModule->getMessage());
+
+                    $oModule->setModuleInfo($this->module_info, $xml_info);
+
+                    if(method_exists($oModule, $forward->act)) {
+                        $output = $oModule->{$forward->act}();
+                    } else {
+                        return $this->stop("msg_module_is_not_exists");
+                    }
+
+                    // forward 모듈의 실행 결과 검사
+                    if($oModule->stop_proc) return $this->stop($oModule->getMessage());
+
+                    $this->setTemplatePath($oModule->getTemplatePath());
+                    $this->setTemplateFile($oModule->getTemplateFile());
+
+                    $this->adds($oModule->getVariables());
+
+                // forward 모듈을 찾지 못했다면 원 모듈의 default index action을 실행
+                } else if($this->xml_info->default_index_act && method_exists($this, $this->xml_info->default_index_act)) {
+                    $output = $this->{$this->xml_info->default_index_act}();
                 } else {
                     return false;
                 }
+
+            } else {
+                return false;
             }
 
             // addon 실행(called_position 를 after_module_proc로 하여 호출)
             $called_position = 'after_module_proc';
-            @include(_XE_PATH_."files/cache/activated_addons.cache.php");
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath();
+            if(file_exists($addon_file)) @include($addon_file);
 
             if(is_a($output, 'Object') || is_subclass_of($output, 'Object')) {
                 $this->setError($output->getError());
@@ -357,7 +325,7 @@
                 return false;
             }
 
-            // view action이고 결과 출력이 XMLRPC일 경우 해당 모듈의 api method를 실행
+            // view action이고 결과 출력이 XMLRPC 또는 JSON일 경우 해당 모듈의 api method를 실행
             if($this->module_info->module_type == 'view'){
                 if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON') {
                     $oAPI = getAPI($this->module_info->module, 'api');
@@ -365,11 +333,6 @@
                         $oAPI->{$this->act}($this);
                     }
                 }
-            }else if($this->module_info->module_type == 'controller'){
-                if(Context::getResponseMethod() == 'JSON'){
-
-                }
-
             }
 
             return true;
diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index ba6d603eb..8b462c1ee 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -37,7 +37,9 @@
             if(!is_array($source_files) || !count($source_files)) return;
 
             // $source_files의 역슬래쉬 경로를 슬래쉬로 변경 (윈도우즈 대비)
-            foreach($source_files as $key => $file) $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
+            foreach($source_files as $key => $file){
+                $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
+            }
 
             // 관리자 설정시 설정이 되어 있지 않으면 패스
             $db_info = Context::getDBInfo();
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index b00d16a0d..b52da352b 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -100,9 +100,6 @@
             // include 변경 <!--#include($filename)-->
             $buff = preg_replace_callback('!<\!--#include\(([^\)]*?)\)-->!is', array($this, '_compileIncludeToCode'), $buff);
 
-            // include 변경 <!--#include($filename)-->
-            //$buff = preg_replace_callback('!<\!--#include\(([^\)]*?)\)-->!is', array($this, '_compileIncludeToCode'), $buff);
-
             // 이미지 태그 img의 src의 값이 http:// 나 / 로 시작하지 않으면 root경로부터 시작하도록 변경
             $buff = preg_replace_callback('/<(img|input)([^>]*)src=[\'"]{1}(?!http)(.*?)[\'"]{1}/is', array($this, '_compileImgPath'), $buff);
 
diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index d5afaab30..a0ac28a3b 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -24,7 +24,7 @@
             $object_vars = get_object_vars($args);
             if(count($object_vars)) {
                 foreach($object_vars as $key => $val) {
-                    if(in_array($key, array('body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right'))) continue;
+                    if(in_array($key, array('body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','document_srl'))) continue;
                     $args->{$key} = utf8RawUrlDecode($val);
                 }
             }
@@ -68,7 +68,7 @@
 
             // 캐시 파일을 갱신하여야 할 경우 lock파일을 만들고 캐시 생성
             $oWidget = WidgetHandler::getObject($widget);
-            if(!$oWidget) return;
+            if(!$oWidget || !method_exists($oWidget,'proc')) return;
 
             $widget_content = $oWidget->proc($args);
             FileHandler::writeFile($cache_file, $widget_content);
@@ -93,11 +93,12 @@
             $object_vars = get_object_vars($args);
             if(count($object_vars)) {
                 foreach($object_vars as $key => $val) {
-                    if(in_array($key, array('body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right'))) continue;
+                    if(in_array($key, array('body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
                     $args->{$key} = utf8RawUrlDecode($val);
                 }
             }
 
+
             /**
              * 위젯이 widgetContent/ widgetBox가 아니라면 내용을 구함
              **/
@@ -122,11 +123,19 @@
             $inner_style = sprintf("padding:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
 
             $oDocumentModel = &getModel('document');
+
+
             /**
              * 위젯 출력물을 구함
              **/
+
+            $widget_content_header = '';
+            $widget_content_body = '';
+            $widget_content_footer = '';
+
             // 일반 페이지 호출일 경우 지정된 스타일만 꾸면서 바로 return 함
             if(!$include_info) {
+                if($args->id) $args->id = ' id="'.$args->id.'" ';
                 switch($widget) {
                     // 내용 직접 추가일 경우 
                     case 'widgetContent' :
@@ -136,17 +145,23 @@
                             } else {
                                 $body = base64_decode($args->body);
                             }
-                            $output = sprintf('<div style="overflow:hidden;%s"><div style="%s">%s</div></div>', $style, $inner_style, $body);
+
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s"><div style="%s">', $args->id, $style,  $inner_style);
+                            $widget_content_body = $body;
+                            $widget_content_footer = '</div></div>';
+
                         break;
 
                     // 위젯 박스일 경우
                     case 'widgetBox' :
-                            $output = sprintf('<div style="overflow:hidden;%s;"><div style="%s"><div>', $style, $inner_style);
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
                         break;
 
                     // 일반 위젯일 경우
                     default :
-                            $output = sprintf('<div style="overflow:hidden;%s;"><div style="%s">%s</div></div>', $style, $inner_style, $widget_content);
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s">',$args->id,$style);
+                            $widget_content_body = sprintf('<div style="%s">%s</div>', $inner_style,$widget_content);
+                            $widget_content_footer = '</div>';
                         break;
                 }
 
@@ -161,37 +176,49 @@
                             } else {
                                 $body = base64_decode($args->body);
                             }
+
+                            // args 정리
+                            $attribute = array();
+                            if($args) {
+                                foreach($args as $key => $val) {
+                                    if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
+                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
+                                }
+                            }
+
                             $oWidgetController = &getController('widget');
 
-                            $output = sprintf(
-                                '<div class="widgetOutput" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d">'.
+                            $widget_content_header = sprintf(
+                                '<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
                                     '<div class="widgetResize"></div>'.
                                     '<div class="widgetResizeLeft"></div>'.
                                     '<div class="widgetBorder">'.
-                                        '<div style="%s">'.
-                                            '%s'.
-                                        '</div><div class="clear"></div>'.
-                                    '</div>'.
-                                    '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
-                                '</div>',
+                                        '<div style="%s">',$args->widgetstyle,
                                 $style,
                                 $args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
                                 $args->document_srl,
-                                $inner_style,
-                                $body,
-                                base64_encode($body)
-                            );
+                                implode(' ',$attribute),
+                                $inner_style);
+
+                            $widget_content_body = $body;
+                            $widget_content_footer = sprintf('</div><div class="clear"></div>'.
+                                    '</div>'.
+                                    '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
+                                '</div>',base64_encode($body));
+
                         break;
 
                     // 위젯 박스일 경우
                     case 'widgetBox' :
-                            $output = sprintf(
-                                '<div class="widgetOutput" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s">'.
+
+                            $widget_content_header = sprintf(
+                                '<div class="widgetOutput" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s">'.
                                     '<div class="widgetBoxResize"></div>'.
                                     '<div class="widgetBoxResizeLeft"></div>'.
-                                    '<div class="widgetBoxBorder">'.
-                                        '<div class="nullWidget" style="%s">', 
-                                    $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, $inner_style);
+                                    '<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,$inner_style);
+
+
                         break;
 
                     // 일반 위젯일 경우
@@ -206,29 +233,31 @@
                                 }
                             }
 
-                            $output = sprintf(
-                                    '<div class="widgetOutput" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
+                            $widget_content_header = sprintf('<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
                                         '<div class="widgetResize"></div>'.
                                         '<div class="widgetResizeLeft"></div>'.
-                                        '<div class="widgetBorder">'.
-                                            '<div style="%s">'.
-                                                '%s'.
-                                            '</div><div class="clear"></div>'.
-                                        '</div>'.
-                                    '</div>', 
-                                    $style, 
+                                        '<div class="widgetBorder">',$args->widgetstyle,$style, 
                                     $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, 
-                                    $widget, implode(' ',$attribute), 
-                                    $inner_style, 
-                                    $widget_content
-                            );
+                                    $widget, implode(' ',$attribute));
+
+                            $widget_content_body = sprintf('<div style="%s">%s</div><div class="clear"></div>',$inner_style, $widget_content);
+
+                            $widget_content_footer = '</div></div>';
+
                         break;
                 }
             }
 
+
+            // 위젯 스타일을 컴파일 한다.
+            if($args->widgetstyle){
+                $widget_content_body = WidgetHandler::complieWidgetStyle($args->widgetstyle, $widget_content_body, $args);
+            }
+
+            $output = $widget_content_header . $widget_content_body . $widget_content_footer;
+
             // 위젯 결과물 생성 시간을 debug 정보에 추가
             if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
-
             // 결과 return
             return $output;
         }
@@ -263,5 +292,31 @@
             return $GLOBALS['_xe_loaded_widgets_'][$widget];
         }
 
+
+        function complieWidgetStyle($widgetStyle,$widget_content_body, $args){
+            if(!$widgetStyle) return $widget_content_body;
+
+            $oWidgetModel = &getModel('widget');
+
+            // 위젯 스타일의 extra_var를 가져와 묶는다
+            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
+            if(!$widgetstyle_info) return $widget_content_body;
+
+            $widgetstyle_extar_var_key = get_object_vars($widgetstyle_info);
+            if(count($widgetstyle_extar_var_key['extra_var'])){
+                foreach($widgetstyle_extar_var_key['extra_var'] as $key => $val){
+                    $widgetstyle_extar_var->{$key} =  $args->{$key};
+                }
+            }
+            Context::set('widgetstyle_extar_var', $widgetstyle_extar_var);
+            Context::set('widget_content', $widget_content_body);
+
+            // 컴파일
+            $widgetstyle_path = $oWidgetModel->getWidgetStylePath($widgetStyle);
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($widgetstyle_path, 'widgetstyle');
+
+            return $tpl;
+        }
     }
 ?>
diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php
index 08a140003..d54105c03 100644
--- a/classes/xml/XmlJsFilter.class.php
+++ b/classes/xml/XmlJsFilter.class.php
@@ -47,6 +47,7 @@
          * @brief constructor
          **/
         function XmlJsFilter($path, $xml_file) {
+            if(substr($path,-1)!=='/') $path .= '/';
             $this->xml_file = sprintf("%s%s",$path, $xml_file);
             $this->js_file = $this->_getCompiledFileName($this->xml_file);
         }
diff --git a/common/css/button.css b/common/css/button.css
index e8ebc2c7f..25336fc1c 100644
--- a/common/css/button.css
+++ b/common/css/button.css
@@ -89,3 +89,24 @@ span.button.blue input { background-image:url(../tpl/images/buttonBlue.gif); col
 /* Offset Debug */
 a.button,
 span.button{ margin-right:2px;}
+
+/* Button Set */
+.buttonSet{ width:16px; height:16px; background-image:url(../tpl/images/buttonSet.gif); background-repeat:no-repeat; border:0; background-color:transparent; vertical-align:middle; display:inline-block; text-decoration:none;}
+.buttonSet span{ z-index:-1; font-size:0; line-height:0; visibility:hidden;}
+.buttonSet.buttonUp{ background-position:0 0;}
+.buttonSet.buttonDown{ background-position:0 -16px;}
+.buttonSet.buttonLeft{ background-position:0 -32px;}
+.buttonSet.buttonRight{ background-position:0 -48px;}
+.buttonSet.buttonInfo{ background-position:0 -64px;}
+.buttonSet.buttonCopy{ background-position:0 -80px;}
+.buttonSet.buttonSetting{ background-position:0 -96px;}
+.buttonSet.buttonActive{ background-position:0 -112px;}
+.buttonSet.buttonDisable{ background-position:0 -128px;}
+.buttonSet.buttonDelete{ background-position:0 -144px;}
+.buttonSet.buttonHomepage{ background-position:0 -160px;}
+.buttonSet.buttonBlog{ background-position:0 -176px;}
+.buttonSet.buttonCalendar{ background-position:0 -192px;}
+.buttonSet.buttonLayoutEditor{ background-position:0 -208px;}
+.buttonSet.buttonAddWidget{ background-position:0 -224px;}
+.buttonSet.buttonAddContent{ background-position:0 -240px;}
+
diff --git a/common/css/default.css b/common/css/default.css
index ce5749b1e..e4344407b 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -88,3 +88,6 @@ a.bold { font-weight:bold; }
 #popup_menu_area li a:hover,
 #popup_menu_area li a:active,
 #popup_menu_area li a:focus{ font-weight:bold; letter-spacing:-1px;}
+
+/* xe faceoff */
+.faceOffManager { position:fixed; _position:absolute; right:3px; top:3px;  height:23px; }
diff --git a/common/js/common.js b/common/js/common.js
index f8ac5ef19..7bc0cf275 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -7,7 +7,20 @@
 /* jQuery 참조변수($) 제거 */
 if(jQuery) jQuery.noConflict();
 
-;(function($) {
+(function($) {
+    /* OS check */
+    var UA = navigator.userAgent.toLowerCase();
+    $.os = {
+        Linux: /linux/.test(UA),
+        Unix: /x11/.test(UA),
+        Mac: /mac/.test(UA),
+        Windows: /win/.test(UA)
+    };
+    $.os.name = ($.os.Windows) ? 'Windows' :
+        ($.os.Linux) ? 'Linux' :
+        ($.os.Unix) ? 'Unix' :
+        ($.os.Mac) ? 'Mac' : '';
+
     /**
      * @brief XE 공용 유틸리티 함수
      * @namespace XE
@@ -109,49 +122,46 @@ if(jQuery) jQuery.noConflict();
 
             /* 레이어 출력 */
             if(html) {
-                var area = jQuery("#popup_menu_area").html('<ul>'+html+'</ul>');
+                var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
                 var areaOffset = {top:params['page_y'], left:params['page_x']};
 
-                if(area.outerHeight()+areaOffset.top > jQuery(window).height()+jQuery(window).scrollTop())
-                    areaOffset.top = jQuery(window).height() - area.outerHeight() + jQuery(window).scrollTop();
-                if(area.outerWidth()+areaOffset.left > jQuery(window).width()+jQuery(window).scrollLeft())
-                    areaOffset.left = jQuery(window).width() - area.outerWidth() + jQuery(window).scrollLeft();
+                if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
+                    areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
+                if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft())
+                    areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
 
-                if($.browser.safari) {
-                    areaOffset.top -= 16;
-                    areaOffset.left -= 16;
-                }
-
-                area.css({ visibility:"visible", top:areaOffset.top, left:areaOffset.left });
+                area.css({ top:areaOffset.top, left:areaOffset.left }).show();
             }
         }
     }
 
 }) (jQuery);
 
+
+
 /* jQuery(document).ready() */
 jQuery(function($) {
     /* 팝업메뉴 레이어 생성 */
     if(!$('#popup_menu_area').length) {
         var menuObj = $('<div>')
             .attr('id', 'popup_menu_area')
-            .css({visibility:'hidden', zIndex:9999});
+            .css({display:'none', zIndex:9999});
         $(document.body).append(menuObj);
     }
 
     $(document).click(function(evt) {
-        var area = jQuery("#popup_menu_area");
+        var area = $('#popup_menu_area');
         if(!area.length) return;
 
         // 이전에 호출되었을지 모르는 팝업메뉴 숨김
-        area.css('visibility', 'hidden');
+        area.hide();
 
         var targetObj = $(evt.target);
         if(!targetObj.length) return;
 
         // obj의 nodeName이 div나 span이 아니면 나올대까지 상위를 찾음
-        if(targetObj.length && jQuery.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) targetObj = targetObj.parent();
-        if(!targetObj.length || jQuery.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) return;
+        if(targetObj.length && $.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) targetObj = targetObj.parent();
+        if(!targetObj.length || $.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) return;
 
         // 객체의 className값을 구함
         var class_name = targetObj.attr('className');
@@ -239,38 +249,6 @@ jQuery(function($) {
     }
 });
 
-/*
- * jQuery 1.2.6
- * Opera 브라우저에서 $(window).height() / width() 값을 잘못 가져오는 문제 수정
- * jQuery 1.3에서 수정되었음
- * @link http://dev.jquery.com/changeset/5938
- */
-if(jQuery.fn.jquery == '1.2.6') {
-    jQuery.each([ "Height", "Width" ], function(i, name){
-        var type = name.toLowerCase();
-
-        jQuery.fn[ type ] = function( size ) {
-            return this[0] == window ?
-                // Opera 브라우저에서 $(window).height() / width() 값을 잘못 가져오는 문제 수정
-                jQuery.browser.opera  && document.body.parentNode[ "client" + name ] ||
-
-                jQuery.browser.safari && window[ "inner" + name ] ||
-                document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-
-                this[0] == document ?
-                    Math.max(
-                        Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-                        Math.max(document.body["offset" + name], document.documentElement["offset" + name])
-                    ) :
-
-                    size == undefined ?
-                        (this.length ? jQuery.css( this[0], type ) : null) :
-                        this.css( type, size.constructor == String ? size : size + "px" );
-        };
-    });
-}
-
-
 
 /**
  * @brief location.href에서 특정 key의 값을 return
@@ -454,6 +432,10 @@ function move_url(url, open_wnidow) {
  * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용)
  **/
 function displayMultimedia(src, width, height, options) {
+    var html = _displayMultimedia(src, width, height, options);
+    if(html) document.writeln(html);
+}
+function _displayMultimedia(src, width, height, options) {
     if(src.indexOf('files') == 0) src = request_uri + src;
 
     var defaults = {
@@ -472,7 +454,9 @@ function displayMultimedia(src, width, height, options) {
     var codebase = "";
     var html = "";
 
-    if(/\.swf$/i.test(src)) {
+    if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){
+        html = '<img src="'+src+'" width="'+width+'" height="'+height+'" />';
+    } else if(/\.swf$/i.test(src)) {
         clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
         codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0";
         html = '<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';
@@ -494,7 +478,7 @@ function displayMultimedia(src, width, height, options) {
         }
         html += '></embed>';
     }
-    document.writeln(html);
+    return html;
 }
 
 /**
@@ -516,37 +500,54 @@ function zbxe_folder_close(id) {
  * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ
  * popup_layout 에서 window.onload 시 자동 요청됨.
  **/
+var _popupHeight = 0;
 function setFixedPopupSize() {
     var bodyObj = jQuery('#popBody');
 
     if(bodyObj.length) {
-        if(bodyObj.height() > 500) {
-            bodyObj.css({ overflowY:'scroll', overflowX:'hidden', height:500 });
+        if(bodyObj.height() > 400) {
+            bodyObj.css({ overflowY:'scroll', overflowX:'hidden', height:400 });
         }
     }
 
     var w = jQuery("#popup_content").width();
+    w = w< 400 ? 400 : w;
     var h = jQuery("#popup_content").height();
 
-    jQuery('div').each(function() {
-        var ww = jQuery(this).width();
-        if(jQuery.inArray(this.id, ['waitingforserverresponse', 'fororiginalimagearea', 'fororiginalimageareabg']) == -1) {
-            if(ww > w) w = ww;
+    if(h != _popupHeight)  {
+        _popupHeight = h;
+
+        jQuery('div').each(function() { var ww = jQuery(this).width(); if(jQuery.inArray(this.id, ['waitingforserverresponse', 'fororiginalimagearea', 'fororiginalimageareabg']) == -1) { if(ww > w) w = ww; } });
+        jQuery('table').each(function() { var ww = jQuery(this).width(); if(ww > w) w = ww; });
+        jQuery('form').each(function() { var ww = jQuery(this).width(); if(ww > w) w = ww; });
+
+        jQuery("#popup_content").width(w);
+        jQuery("#popHeader").width(w);
+        jQuery("#popFooter").width(w);
+
+        window.resizeTo(w, h);
+
+        // 윈도우 OS에서는 브라우저별로 미세 조절이 필요
+        var moreW = 0;
+        if(navigator.userAgent.toLowerCase().indexOf('windows') > 0) {
+            if(jQuery.browser.opera) moreW += 9;
+            else if(jQuery.browser.msie) moreW += 10;
+            else if(jQuery.browser.mozilla) moreW += 8;
+            else if(jQuery.browser.safari) {
+                moreW += 4;
+                h -= 12;
+            }
         }
-    });
-
-    // 윈도우에서는 브라우저 상관없이 가로 픽셀이 조금 더 늘어나야 한다.
-    if(navigator.userAgent.toLowerCase().indexOf('windows') > 0) {
-        if(jQuery.browser.opera) w += 10;
-        else if(jQuery.browser.msie) w += 10;
-        else w += 6;
+        var h1 = jQuery(window).height();
+        if(!/chrome/.test(navigator.userAgent.toLowerCase())) {
+            window.resizeBy(moreW, h-h1+5);
+        } else {
+            window.resizeBy(10,60);
+        }
+        window.scrollTo(0,0);
     }
-    window.resizeTo(w, h);
 
-    var h1 = jQuery(window).height();
-    window.resizeBy(0, h-h1);
-
-    window.scrollTo(0,0);
+    setTimeout(setFixedPopupSize, 300);
 }
 
 /**
@@ -584,7 +585,7 @@ function doChangeLangType(obj) {
 function setLangType(lang_type) {
     var expire = new Date();
     expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-    xSetCookie('lang_type', lang_type, expire);
+    xSetCookie('lang_type', lang_type, expire, '/');
 }
 
 /* 미리보기 */
@@ -683,7 +684,7 @@ function callAddDocumentCart(document_length) {
     if(addedDocument.length<1 || document_length != addedDocument.length) return;
     var params = new Array();
     params["srls"] = addedDocument.join(",");
-    exec_xml("document","procDocumentAdminAddCart", params, null);
+    exec_xml("document","procDocumentAddCart", params, null);
     addedDocument = new Array();
 }
 
diff --git a/common/js/jquery.js b/common/js/jquery.js
index 82b98e1d7..c327fae81 100644
--- a/common/js/jquery.js
+++ b/common/js/jquery.js
@@ -1,32 +1,19 @@
 /*
- * jQuery 1.2.6 - New Wave Javascript
+ * jQuery JavaScript Library v1.3.1
+ * http://jquery.com/
  *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
  *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
+ * Date: 2009-01-21 20:42:16 -0500 (Wed, 21 Jan 2009)
+ * Revision: 6158
  */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.makeArray(E))},selector:"",jquery:"1.3.1",size:function(){return this.length},get:function(E){return E===g?o.makeArray(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,find:function(E){if(this.length===1&&!/,/.test(E)){var G=this.pushStack([],"find",E);G.length=0;o.find(E,this[0],G);return G}else{var F=o.map(this,function(H){return o.find(E,H)});return this.pushStack(/[^+>] [^+>]/.test(E)?o.unique(F):F,"find",E)}},clone:function(F){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.cloneNode(true),H=document.createElement("div");H.appendChild(I);return o.clean([H.innerHTML])[0]}else{return this.cloneNode(true)}});var G=E.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(F===true){this.find("*").andSelf().each(function(I){if(this.nodeType==3){return}var H=o.data(this,"events");for(var K in H){for(var J in H[K]){o.event.add(G[I],K,H[K][J],H[K][J].data)}}})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var F=o.expr.match.POS.test(E)?o(E):null;return this.map(function(){var G=this;while(G&&G.ownerDocument){if(F?F.index(G)>-1:o(G).is(E)){return G}G=G.parentNode}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML:null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(K,N,M){if(this[0]){var J=(this[0].ownerDocument||this[0]).createDocumentFragment(),G=o.clean(K,(this[0].ownerDocument||this[0]),J),I=J.firstChild,E=this.length>1?J.cloneNode(true):J;if(I){for(var H=0,F=this.length;H<F;H++){M.call(L(this[H],I),H>0?E.cloneNode(true):J)}}if(G){o.each(G,z)}}return this;function L(O,P){return N&&o.nodeName(O,"table")&&o.nodeName(P,"tr")?(O.getElementsByTagName("tbody")[0]||O.appendChild(O.ownerDocument.createElement("tbody"))):O}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){G=o.trim(G);if(G){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(G,E,I){if(E=="width"||E=="height"){var K,F={position:"absolute",visibility:"hidden",display:"block"},J=E=="width"?["Left","Right"]:["Top","Bottom"];function H(){K=E=="width"?G.offsetWidth:G.offsetHeight;var M=0,L=0;o.each(J,function(){M+=parseFloat(o.curCSS(G,"padding"+this,true))||0;L+=parseFloat(o.curCSS(G,"border"+this+"Width",true))||0});K-=Math.round(M+L)}if(o(G).is(":visible")){H()}else{o.swap(G,F,H)}return Math.max(0,K)}return o.curCSS(G,E,I)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,R){if(typeof R==="number"){R+=""}if(!R){return}if(typeof R==="string"){R=R.replace(/(<(\w+)[^>]*?)\/>/g,function(T,U,S){return S.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?T:U+"></"+S+">"});var O=o.trim(R).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+R+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var N=!O.indexOf("<table")&&O.indexOf("<tbody")<0?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&O.indexOf("<tbody")<0?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(R)){L.insertBefore(K.createTextNode(R.match(/^\s*/)[0]),L.firstChild)}R=o.makeArray(L.childNodes)}if(R.nodeType){G.push(R)}else{G=o.merge(G,R)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(){var G=arguments;return this.each(function(){for(var H=0,I=G.length;H<I;H++){o(G[H])[F](this)}})}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(">*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var Q=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,K=0,G=Object.prototype.toString;var F=function(X,T,aa,ab){aa=aa||[];T=T||document;if(T.nodeType!==1&&T.nodeType!==9){return[]}if(!X||typeof X!=="string"){return aa}var Y=[],V,ae,ah,S,ac,U,W=true;Q.lastIndex=0;while((V=Q.exec(X))!==null){Y.push(V[1]);if(V[2]){U=RegExp.rightContext;break}}if(Y.length>1&&L.exec(X)){if(Y.length===2&&H.relative[Y[0]]){ae=I(Y[0]+Y[1],T)}else{ae=H.relative[Y[0]]?[T]:F(Y.shift(),T);while(Y.length){X=Y.shift();if(H.relative[X]){X+=Y.shift()}ae=I(X,ae)}}}else{var ad=ab?{expr:Y.pop(),set:E(ab)}:F.find(Y.pop(),Y.length===1&&T.parentNode?T.parentNode:T,P(T));ae=F.filter(ad.expr,ad.set);if(Y.length>0){ah=E(ae)}else{W=false}while(Y.length){var ag=Y.pop(),af=ag;if(!H.relative[ag]){ag=""}else{af=Y.pop()}if(af==null){af=T}H.relative[ag](ah,af,P(T))}}if(!ah){ah=ae}if(!ah){throw"Syntax error, unrecognized expression: "+(ag||X)}if(G.call(ah)==="[object Array]"){if(!W){aa.push.apply(aa,ah)}else{if(T.nodeType===1){for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&(ah[Z]===true||ah[Z].nodeType===1&&J(T,ah[Z]))){aa.push(ae[Z])}}}else{for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&ah[Z].nodeType===1){aa.push(ae[Z])}}}}}else{E(ah,aa)}if(U){F(U,T,aa,ab)}return aa};F.matches=function(S,T){return F(S,null,null,T)};F.find=function(Z,S,aa){var Y,W;if(!Z){return[]}for(var V=0,U=H.order.length;V<U;V++){var X=H.order[V],W;if((W=H.match[X].exec(Z))){var T=RegExp.leftContext;if(T.substr(T.length-1)!=="\\"){W[1]=(W[1]||"").replace(/\\/g,"");Y=H.find[X](W,S,aa);if(Y!=null){Z=Z.replace(H.match[X],"");break}}}}if(!Y){Y=S.getElementsByTagName("*")}return{set:Y,expr:Z}};F.filter=function(ab,aa,ae,V){var U=ab,ag=[],Y=aa,X,S;while(ab&&aa.length){for(var Z in H.filter){if((X=H.match[Z].exec(ab))!=null){var T=H.filter[Z],af,ad;S=false;if(Y==ag){ag=[]}if(H.preFilter[Z]){X=H.preFilter[Z](X,Y,ae,ag,V);if(!X){S=af=true}else{if(X===true){continue}}}if(X){for(var W=0;(ad=Y[W])!=null;W++){if(ad){af=T(ad,X,W,Y);var ac=V^!!af;if(ae&&af!=null){if(ac){S=true}else{Y[W]=false}}else{if(ac){ag.push(ad);S=true}}}}}if(af!==g){if(!ae){Y=ag}ab=ab.replace(H.match[Z],"");if(!S){return[]}break}}}ab=ab.replace(/\s*,\s*/,"");if(ab==U){if(S==null){throw"Syntax error, unrecognized expression: "+ab}else{break}}U=ab}return Y};var H=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(S){return S.getAttribute("href")}},relative:{"+":function(W,T){for(var U=0,S=W.length;U<S;U++){var V=W[U];if(V){var X=V.previousSibling;while(X&&X.nodeType!==1){X=X.previousSibling}W[U]=typeof T==="string"?X||false:X===T}}if(typeof T==="string"){F.filter(T,W,true)}},">":function(X,T,Y){if(typeof T==="string"&&!/\W/.test(T)){T=Y?T:T.toUpperCase();for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){var V=W.parentNode;X[U]=V.nodeName===T?V:false}}}else{for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){X[U]=typeof T==="string"?W.parentNode:W.parentNode===T}}if(typeof T==="string"){F.filter(T,X,true)}}},"":function(V,T,X){var U="done"+(K++),S=R;if(!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("parentNode",T,U,V,W,X)},"~":function(V,T,X){var U="done"+(K++),S=R;if(typeof T==="string"&&!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("previousSibling",T,U,V,W,X)}},find:{ID:function(T,U,V){if(typeof U.getElementById!=="undefined"&&!V){var S=U.getElementById(T[1]);return S?[S]:[]}},NAME:function(S,T,U){if(typeof T.getElementsByName!=="undefined"&&!U){return T.getElementsByName(S[1])}},TAG:function(S,T){return T.getElementsByTagName(S[1])}},preFilter:{CLASS:function(V,T,U,S,Y){V=" "+V[1].replace(/\\/g,"")+" ";var X;for(var W=0;(X=T[W])!=null;W++){if(X){if(Y^(" "+X.className+" ").indexOf(V)>=0){if(!U){S.push(X)}}else{if(U){T[W]=false}}}}return false},ID:function(S){return S[1].replace(/\\/g,"")},TAG:function(T,S){for(var U=0;S[U]===false;U++){}return S[U]&&P(S[U])?T[1]:T[1].toUpperCase()},CHILD:function(S){if(S[1]=="nth"){var T=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(S[2]=="even"&&"2n"||S[2]=="odd"&&"2n+1"||!/\D/.test(S[2])&&"0n+"+S[2]||S[2]);S[2]=(T[1]+(T[2]||1))-0;S[3]=T[3]-0}S[0]="done"+(K++);return S},ATTR:function(T){var S=T[1].replace(/\\/g,"");if(H.attrMap[S]){T[1]=H.attrMap[S]}if(T[2]==="~="){T[4]=" "+T[4]+" "}return T},PSEUDO:function(W,T,U,S,X){if(W[1]==="not"){if(W[3].match(Q).length>1){W[3]=F(W[3],null,null,T)}else{var V=F.filter(W[3],T,U,true^X);if(!U){S.push.apply(S,V)}return false}}else{if(H.match.POS.test(W[0])){return true}}return W},POS:function(S){S.unshift(true);return S}},filters:{enabled:function(S){return S.disabled===false&&S.type!=="hidden"},disabled:function(S){return S.disabled===true},checked:function(S){return S.checked===true},selected:function(S){S.parentNode.selectedIndex;return S.selected===true},parent:function(S){return !!S.firstChild},empty:function(S){return !S.firstChild},has:function(U,T,S){return !!F(S[3],U).length},header:function(S){return/h\d/i.test(S.nodeName)},text:function(S){return"text"===S.type},radio:function(S){return"radio"===S.type},checkbox:function(S){return"checkbox"===S.type},file:function(S){return"file"===S.type},password:function(S){return"password"===S.type},submit:function(S){return"submit"===S.type},image:function(S){return"image"===S.type},reset:function(S){return"reset"===S.type},button:function(S){return"button"===S.type||S.nodeName.toUpperCase()==="BUTTON"},input:function(S){return/input|select|textarea|button/i.test(S.nodeName)}},setFilters:{first:function(T,S){return S===0},last:function(U,T,S,V){return T===V.length-1},even:function(T,S){return S%2===0},odd:function(T,S){return S%2===1},lt:function(U,T,S){return T<S[3]-0},gt:function(U,T,S){return T>S[3]-0},nth:function(U,T,S){return S[3]-0==T},eq:function(U,T,S){return S[3]-0==T}},filter:{CHILD:function(S,V){var Y=V[1],Z=S.parentNode;var X=V[0];if(Z&&(!Z[X]||!S.nodeIndex)){var W=1;for(var T=Z.firstChild;T;T=T.nextSibling){if(T.nodeType==1){T.nodeIndex=W++}}Z[X]=W-1}if(Y=="first"){return S.nodeIndex==1}else{if(Y=="last"){return S.nodeIndex==Z[X]}else{if(Y=="only"){return Z[X]==1}else{if(Y=="nth"){var ab=false,U=V[2],aa=V[3];if(U==1&&aa==0){return true}if(U==0){if(S.nodeIndex==aa){ab=true}}else{if((S.nodeIndex-aa)%U==0&&(S.nodeIndex-aa)/U>=0){ab=true}}return ab}}}}},PSEUDO:function(Y,U,V,Z){var T=U[1],W=H.filters[T];if(W){return W(Y,V,U,Z)}else{if(T==="contains"){return(Y.textContent||Y.innerText||"").indexOf(U[3])>=0}else{if(T==="not"){var X=U[3];for(var V=0,S=X.length;V<S;V++){if(X[V]===Y){return false}}return true}}}},ID:function(T,S){return T.nodeType===1&&T.getAttribute("id")===S},TAG:function(T,S){return(S==="*"&&T.nodeType===1)||T.nodeName===S},CLASS:function(T,S){return S.test(T.className)},ATTR:function(W,U){var S=H.attrHandle[U[1]]?H.attrHandle[U[1]](W):W[U[1]]||W.getAttribute(U[1]),X=S+"",V=U[2],T=U[4];return S==null?V==="!=":V==="="?X===T:V==="*="?X.indexOf(T)>=0:V==="~="?(" "+X+" ").indexOf(T)>=0:!U[4]?S:V==="!="?X!=T:V==="^="?X.indexOf(T)===0:V==="$="?X.substr(X.length-T.length)===T:V==="|="?X===T||X.substr(0,T.length+1)===T+"-":false},POS:function(W,T,U,X){var S=T[2],V=H.setFilters[S];if(V){return V(W,U,T,X)}}}};var L=H.match.POS;for(var N in H.match){H.match[N]=RegExp(H.match[N].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(T,S){T=Array.prototype.slice.call(T);if(S){S.push.apply(S,T);return S}return T};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(M){E=function(W,V){var T=V||[];if(G.call(W)==="[object Array]"){Array.prototype.push.apply(T,W)}else{if(typeof W.length==="number"){for(var U=0,S=W.length;U<S;U++){T.push(W[U])}}else{for(var U=0;W[U];U++){T.push(W[U])}}}return T}}(function(){var T=document.createElement("form"),U="script"+(new Date).getTime();T.innerHTML="<input name='"+U+"'/>";var S=document.documentElement;S.insertBefore(T,S.firstChild);if(!!document.getElementById(U)){H.find.ID=function(W,X,Y){if(typeof X.getElementById!=="undefined"&&!Y){var V=X.getElementById(W[1]);return V?V.id===W[1]||typeof V.getAttributeNode!=="undefined"&&V.getAttributeNode("id").nodeValue===W[1]?[V]:g:[]}};H.filter.ID=function(X,V){var W=typeof X.getAttributeNode!=="undefined"&&X.getAttributeNode("id");return X.nodeType===1&&W&&W.nodeValue===V}}S.removeChild(T)})();(function(){var S=document.createElement("div");S.appendChild(document.createComment(""));if(S.getElementsByTagName("*").length>0){H.find.TAG=function(T,X){var W=X.getElementsByTagName(T[1]);if(T[1]==="*"){var V=[];for(var U=0;W[U];U++){if(W[U].nodeType===1){V.push(W[U])}}W=V}return W}}S.innerHTML="<a href='#'></a>";if(S.firstChild&&S.firstChild.getAttribute("href")!=="#"){H.attrHandle.href=function(T){return T.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var S=F,T=document.createElement("div");T.innerHTML="<p class='TEST'></p>";if(T.querySelectorAll&&T.querySelectorAll(".TEST").length===0){return}F=function(X,W,U,V){W=W||document;if(!V&&W.nodeType===9&&!P(W)){try{return E(W.querySelectorAll(X),U)}catch(Y){}}return S(X,W,U,V)};F.find=S.find;F.filter=S.filter;F.selectors=S.selectors;F.matches=S.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){H.order.splice(1,0,"CLASS");H.find.CLASS=function(S,T){return T.getElementsByClassName(S[1])}}function O(T,Z,Y,ac,aa,ab){for(var W=0,U=ac.length;W<U;W++){var S=ac[W];if(S){S=S[T];var X=false;while(S&&S.nodeType){var V=S[Y];if(V){X=ac[V];break}if(S.nodeType===1&&!ab){S[Y]=W}if(S.nodeName===Z){X=S;break}S=S[T]}ac[W]=X}}}function R(T,Y,X,ab,Z,aa){for(var V=0,U=ab.length;V<U;V++){var S=ab[V];if(S){S=S[T];var W=false;while(S&&S.nodeType){if(S[X]){W=ab[S[X]];break}if(S.nodeType===1){if(!aa){S[X]=V}if(typeof Y!=="string"){if(S===Y){W=true;break}}else{if(F.filter(Y,[S]).length>0){W=S;break}}}S=S[T]}ab[V]=W}}}var J=document.compareDocumentPosition?function(T,S){return T.compareDocumentPosition(S)&16}:function(T,S){return T!==S&&(T.contains?T.contains(S):true)};var P=function(S){return S.nodeType===9&&S.documentElement.nodeName!=="HTML"||!!S.ownerDocument&&P(S.ownerDocument)};var I=function(S,Z){var V=[],W="",X,U=Z.nodeType?[Z]:Z;while((X=H.match.PSEUDO.exec(S))){W+=X[0];S=S.replace(H.match.PSEUDO,"")}S=H.relative[S]?S+"*":S;for(var Y=0,T=U.length;Y<T;Y++){F(S,U[Y],V)}return F.filter(W,V)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(S){return"hidden"===S.type||o.css(S,"display")==="none"||o.css(S,"visibility")==="hidden"};F.selectors.filters.visible=function(S){return"hidden"!==S.type&&o.css(S,"display")!=="none"&&o.css(S,"visibility")!=="hidden"};F.selectors.filters.animated=function(S){return o.grep(o.timers,function(T){return S===T.elem}).length};o.multiFilter=function(U,S,T){if(T){U=":not("+U+")"}return F.matches(U,S)};o.dir=function(U,T){var S=[],V=U[T];while(V&&V!=document){if(V.nodeType==1){S.push(V)}V=V[T]}return S};o.nth=function(W,S,U,V){S=S||1;var T=0;for(;W;W=W[U]){if(W.nodeType==1&&++T==S){break}}return W};o.sibling=function(U,T){var S=[];for(;U;U=U.nextSibling){if(U.nodeType==1&&U!=T){S.push(U)}}return S};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){G=false}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&typeof l.frameElement==="undefined"){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width="1px";L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L)})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}this[H].style.display=o.data(this[H],"olddisplay",K)}}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)==1){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n)}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(H,F){var E=H?"Left":"Top",G=H?"Right":"Bottom";o.fn["inner"+F]=function(){return this[F.toLowerCase()]()+j(this,"padding"+E)+j(this,"padding"+G)};o.fn["outer"+F]=function(J){return this["inner"+F]()+j(this,"border"+E+"Width")+j(this,"border"+G+"Width")+(J?j(this,"margin"+E)+j(this,"margin"+G):0)};var I=F.toLowerCase();o.fn[I]=function(J){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+F]||document.body["client"+F]:this[0]==document?Math.max(document.documentElement["client"+F],document.body["scroll"+F],document.documentElement["scroll"+F],document.body["offset"+F],document.documentElement["offset"+F]):J===g?(this.length?o.css(this[0],I):null):this.css(I,typeof J==="string"?J:J+"px")}})})();
\ No newline at end of file
diff --git a/common/js/plugins/filebox/filebox.js b/common/js/plugins/filebox/filebox.js
new file mode 100644
index 000000000..9a0a33d53
--- /dev/null
+++ b/common/js/plugins/filebox/filebox.js
@@ -0,0 +1,82 @@
+
+;(function($) {
+
+    var defaults = {
+    };
+
+    var filebox = {
+        selected : null,
+        /**
+         * 파일 박스 창 팝업
+         */
+        open : function(input_obj, filter) {
+            this.selected = input_obj;
+
+            var url = request_uri
+                .setQuery('module', 'module')
+                .setQuery('act', 'dispModuleFileBox')
+                .setQuery('input', this.selected.name)
+                .setQuery('filter', filter);
+
+            popopen(url, 'filebox');
+        },
+
+        /**
+         * 파일 선택
+         */
+        selectFile : function(file_url, module_filebox_srl){
+            var target = $(opener.XE.filebox.selected);
+            var target_name = target.attr('name');
+
+            target.val(file_url);
+            var html = _displayMultimedia(file_url, '100%', '100%');
+            $('#filebox_preview_' + target_name, opener.document).html(html).show();
+            $('#filebox_cancel_' + target_name, opener.document).show();
+
+            window.close();
+        },
+
+        /**
+         * 파일 선택 취소
+         */
+        cancel : function(name) {
+            $('[name=' + name + ']').val('');
+            $('#filebox_preview_' + name).hide().html('');
+            $('#filebox_cancel_' + name).hide();
+        },
+
+        /**
+         * 파일 삭제
+         */
+        deleteFile : function(module_filebox_srl){
+            var params = {
+                'module_filebox_srl' : module_filebox_srl
+            };
+
+            $.exec_json('module.procModuleFileBoxDelete', params, function() { document.location.reload(); });
+        },
+
+        /**
+         * 초기화
+         */
+        init : function(name) {
+            var file;
+
+            if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")) {
+                file = opener.selectedWidget.getAttribute(name);
+            } else if($('[name=' + name + ']').val()) {
+                file = $('[name=' + name + ']').val();
+            }
+
+            if(file) {
+                var html = _displayMultimedia(file, '100%', '100%');
+                $('#filebox_preview_' + name).html(html).show();
+                $('#filebox_cancel_' + name).show();
+            }
+        }
+    };
+
+    // XE에 담기
+    $.extend(window.XE, {'filebox' : filebox});
+
+}) (jQuery);
diff --git a/common/js/plugins/filebox/plugin.load b/common/js/plugins/filebox/plugin.load
new file mode 100644
index 000000000..38b6bfc50
--- /dev/null
+++ b/common/js/plugins/filebox/plugin.load
@@ -0,0 +1 @@
+filebox.js
\ No newline at end of file
diff --git a/common/js/plugins/hotkeys/jquery.hotkeys-packed.js b/common/js/plugins/hotkeys/jquery.hotkeys-packed.js
new file mode 100644
index 000000000..0e62a9262
--- /dev/null
+++ b/common/js/plugins/hotkeys/jquery.hotkeys-packed.js
@@ -0,0 +1 @@
+(function(B){B.fn.__bind__=B.fn.bind;B.fn.__unbind__=B.fn.unbind;B.fn.__find__=B.fn.find;var A={version:"0.7.8",override:/keydown|keypress|keyup/g,triggersMap:{},specialKeys:{27:"esc",9:"tab",32:"space",13:"return",8:"backspace",145:"scroll",20:"capslock",144:"numlock",19:"pause",45:"insert",36:"home",46:"del",35:"end",33:"pageup",34:"pagedown",37:"left",38:"up",39:"right",40:"down",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12"},shiftNums:{"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":":","'":'"',",":"<",".":">","/":"?","\\":"|"},newTrigger:function(E,D,F){var C={};C[E]={};C[E][D]={cb:F,disableInInput:false};return C}};if(B.browser.mozilla){A.specialKeys=B.extend(A.specialKeys,{96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9"})}B.fn.find=function(C){this.query=C;return B.fn.__find__.apply(this,arguments)};B.fn.unbind=function(H,E,G){if(B.isFunction(E)){G=E;E=null}if(E&&typeof E==="string"){var F=((this.prevObject&&this.prevObject.query)||(this[0].id&&this[0].id)||this[0]).toString();var D=H.split(" ");for(var C=0;C<D.length;C++){delete A.triggersMap[F][D[C]][E]}}return this.__unbind__(H,G)};B.fn.bind=function(J,F,K){var H=J.match(A.override);if(B.isFunction(F)||!H){return this.__bind__(J,F,K)}else{var N=null,I=B.trim(J.replace(A.override,""));if(I){N=this.__bind__(I,F,K)}if(typeof F==="string"){F={combi:F}}if(F.combi){for(var M=0;M<H.length;M++){var D=H[M];var G=F.combi.toLowerCase(),E=A.newTrigger(D,G,K),L=((this.prevObject&&this.prevObject.query)||(this[0].id&&this[0].id)||this[0]).toString();E[D][G].disableInInput=F.disableInInput;if(!A.triggersMap[L]){A.triggersMap[L]=E}else{if(!A.triggersMap[L][D]){A.triggersMap[L][D]=E[D]}}var C=A.triggersMap[L][D][G];if(!C){A.triggersMap[L][D][G]=[E[D][G]]}else{if(C.constructor!==Array){A.triggersMap[L][D][G]=[C]}else{A.triggersMap[L][D][G][C.length]=E[D][G]}}this.each(function(){var O=B(this);if(O.attr("hkId")&&O.attr("hkId")!==L){L=O.attr("hkId")+";"+L}O.attr("hkId",L)});N=this.__bind__(H.join(" "),F,A.handler)}}return N}};A.findElement=function(C){if(!B(C).attr("hkId")){if(B.browser.opera||B.browser.safari){while(!B(C).attr("hkId")&&C.parentNode){C=C.parentNode}}}return C};A.handler=function(E){var O=A.findElement(E.currentTarget),I=B(O),D=I.attr("hkId");if(D){D=D.split(";");var G=E.which,Q=E.type,P=A.specialKeys[G],N=!P&&String.fromCharCode(G).toLowerCase(),H=E.shiftKey,C=E.ctrlKey,M=E.altKey||E.originalEvent.altKey,F=null;for(var R=0;R<D.length;R++){if(A.triggersMap[D[R]][Q]){F=A.triggersMap[D[R]][Q];break}}if(F){var J;if(!H&&!C&&!M){J=F[P]||(N&&F[N])}else{var L="";if(M){L+="alt+"}if(C){L+="ctrl+"}if(H){L+="shift+"}J=F[L+P];if(!J){if(N){J=F[L+N]||F[L+A.shiftNums[N]]||(L==="shift+"&&F[A.shiftNums[N]])}}}if(J){var S=false;for(var R=0;R<J.length;R++){if(J[R].disableInInput){var K=B(E.target);if(I.is("input")||I.is("textarea")||K.is("input")||K.is("textarea")){return true}}S=S||J[R].cb.apply(this,[E])}return S}}}};window.hotkeys=A;return B})(jQuery);
\ No newline at end of file
diff --git a/common/js/plugins/hotkeys/plugin.load b/common/js/plugins/hotkeys/plugin.load
new file mode 100644
index 000000000..4849d88ac
--- /dev/null
+++ b/common/js/plugins/hotkeys/plugin.load
@@ -0,0 +1 @@
+jquery.hotkeys-packed.js
diff --git a/common/js/plugins/ui.colorpicker/css/iepngfix.htc b/common/js/plugins/ui.colorpicker/css/iepngfix.htc
new file mode 100644
index 000000000..54961f9b0
--- /dev/null
+++ b/common/js/plugins/ui.colorpicker/css/iepngfix.htc
@@ -0,0 +1,103 @@
+<public:component>
+<public:attach event="onpropertychange" onevent="iePNGFix(0)" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0
+// (c) 2004-2008 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image, relative to the HTML document(s).
+// In production use I suggest '/images/blank.gif' or similar. That's all!
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+
+function filt(s, b)
+{
+ var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+ var sM = (currentStyle.backgroundRepeat == 'no-repeat') ? 'crop' : 'scale';
+ s = (s || '').replace(/\(/g, '%28').replace(/\)/g, '%29');
+
+ if (s && !(/IMG|INPUT/.test(nodeName) && !b) &&
+  currentStyle.width == 'auto' && currentStyle.height == 'auto')
+ {
+  style.width = offsetWidth + 'px';
+  style.height = clientHeight + 'px';
+  if (currentStyle.display == 'inline') style.display = 'inline-block';
+ }
+
+ if (filters[f])
+ {
+  filters[f].enabled = s ? true : false;
+  if (s) with (filters[f]) { src = s }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="' + sM + '")';
+}
+
+function iePNGFix(init)
+{
+ if (!/MSIE (5\.5|6)/.test(navigator.userAgent) || typeof filters == 'unknown') return;
+ var evt = init ? { propertyName: 'src,background' } : event;
+ var isSrc = /src/.test(evt.propertyName);
+ var isBg = /background/.test(evt.propertyName);
+ var isClass = !init &&
+  ((this.className != this._png_class) && (this.className || this._png_class));
+ if (!(isSrc || isBg || isClass)) return;
+ this._png_class = this.className;
+ var blank = blankImg.match(/([^\/]+)$/)[1];
+
+ // Required for Whatever:hover support - erase any set BG if className changes.
+ if (isClass && ((style.backgroundImage.indexOf('url(') == -1) ||
+     (style.backgroundImage.indexOf(blank) > -1)))
+ {
+  setTimeout(function() { this.style.backgroundImage = '' }, 0);
+  return;
+ }
+
+ if (isSrc && this.src && /IMG|INPUT/.test(nodeName))
+ {
+  if ((/\.png/i).test(src))
+  {
+   filt(src, 1);
+   src = blankImg;
+  }
+  else if (src.indexOf(blank) == -1) filt();
+ }
+
+ var bgSrc = currentStyle.backgroundImage || style.backgroundImage;
+ if ((bgSrc + this.src).indexOf(blank) == -1)
+ {
+  var bgPNG = bgSrc.match(/^url[("']+(.*\.png[^\)"']*)[\)"']+[^\)]*$/i);
+
+  if (bgPNG)
+  {
+   style.backgroundImage = 'url("' + blankImg + '")';
+   filt(bgPNG[1], 0);
+   // Unclickable elements inside PNG backgrounds.
+   var tags = ['a', 'input', 'select', 'textarea', 'iframe', 'object'],
+    t = tags.length, tFix = [];
+   while (t--)
+   {
+    var elms = all.tags(tags[t]), e = elms.length;
+    while (e--) tFix.push(elms[e]);
+   }
+   var t = tFix.length;
+   if (t && (/relative|absolute/i).test(currentStyle.position))
+    alert('IEPNGFix: Children of positioned element are unclickable:\n\n<' +
+     nodeName + (id && ' id=' + id) + '>');
+    while (t--)
+     if (!(/relative|absolute/i).test(tFix[t].currentStyle.position))
+      tFix[t].style.position = 'relative';
+  }
+  else filt();
+ }
+}
+
+iePNGFix(1);
+
+</script>
+</public:component>
diff --git a/common/js/plugins/ui.colorpicker/css/xe_colorpicker.css b/common/js/plugins/ui.colorpicker/css/xe_colorpicker.css
new file mode 100644
index 000000000..995e20d19
--- /dev/null
+++ b/common/js/plugins/ui.colorpicker/css/xe_colorpicker.css
@@ -0,0 +1,79 @@
+.colorpicker img, .colorpicker div {
+	behavior: url(iepngfix.htc);
+}
+
+
+.xe_colorpicker {
+	position:absolute;
+	width:194px;
+	height:183px;
+	overflow:hidden;
+	z-index:100;
+}
+
+.xe_colorpicker .colorpicker {
+	position:relative;
+	width:192px;
+	height:160px;
+	background-color:white;
+	border:1px solid silver;
+}
+
+.xe_colorpicker .colortable {
+	position:absolute;
+	left : 4px;
+	top  : 4px;
+	border:1px solid #909090;
+}
+
+.xe_colorpicker .colortable .background {
+	position:relative;
+	width:150px;
+	height:150px;
+	background:url(../images/colorpicker_overlay.png) no-repeat;
+	overflow:hidden;
+}
+
+.xe_colorpicker .colortable .indicator {
+	position:absolute;
+	width:11px;
+	height:11px;
+	background:url(../images/colorpicker_select.gif) no-repeat;
+}
+
+.xe_colorpicker .huebar {
+	position:absolute;
+	right : 4px;
+	top   : 4px;
+	border:1px solid #909090;
+}
+
+.xe_colorpicker .huebar .background {
+	width:20px;
+	height:150px;
+	background:url(../images/colorpicker_huebg.png) repeat-x;
+}
+
+.xe_colorpicker .huebar .indicator {
+	position:absolute;
+	width:35px;
+	height:9px;
+	left:-3px;
+	background:transparent url(../images/colorpicker_indic.gif) no-repeat;
+}
+
+.xe_colorpicker .buttons {
+	position:absolute;
+	width:194px;
+	background-color:black;
+}
+
+.xe_colorpicker .buttons button {
+	width:33%;
+	color:white;
+	height:22px;
+	border:0;
+	background-color:transparent;
+	padding:0;
+	margin:0;
+}
diff --git a/common/js/plugins/ui.colorpicker/images/colorpicker_huebg.png b/common/js/plugins/ui.colorpicker/images/colorpicker_huebg.png
new file mode 100644
index 000000000..bf653f85c
Binary files /dev/null and b/common/js/plugins/ui.colorpicker/images/colorpicker_huebg.png differ
diff --git a/common/js/plugins/ui.colorpicker/images/colorpicker_indic.gif b/common/js/plugins/ui.colorpicker/images/colorpicker_indic.gif
new file mode 100644
index 000000000..f9fa95e28
Binary files /dev/null and b/common/js/plugins/ui.colorpicker/images/colorpicker_indic.gif differ
diff --git a/common/js/plugins/ui.colorpicker/images/colorpicker_overlay.png b/common/js/plugins/ui.colorpicker/images/colorpicker_overlay.png
new file mode 100644
index 000000000..561cdd9c5
Binary files /dev/null and b/common/js/plugins/ui.colorpicker/images/colorpicker_overlay.png differ
diff --git a/common/js/plugins/ui.colorpicker/images/colorpicker_select.gif b/common/js/plugins/ui.colorpicker/images/colorpicker_select.gif
new file mode 100644
index 000000000..599f7f13a
Binary files /dev/null and b/common/js/plugins/ui.colorpicker/images/colorpicker_select.gif differ
diff --git a/common/js/plugins/ui.colorpicker/plugin.load b/common/js/plugins/ui.colorpicker/plugin.load
new file mode 100644
index 000000000..899251a8f
--- /dev/null
+++ b/common/js/plugins/ui.colorpicker/plugin.load
@@ -0,0 +1,2 @@
+css/xe_colorpicker.css
+xe_colorpicker.js
diff --git a/common/js/plugins/ui.colorpicker/xe_colorpicker.js b/common/js/plugins/ui.colorpicker/xe_colorpicker.js
new file mode 100644
index 000000000..a88aecb31
--- /dev/null
+++ b/common/js/plugins/ui.colorpicker/xe_colorpicker.js
@@ -0,0 +1,366 @@
+/**
+ * @brief XE Colorpicker
+ * @author mygony (http://mygony.com)
+ **/
+jQuery(function($){
+    var ready  = false;
+    var tmp    = $('<span>').hide();
+    // var panel  = null;
+
+    $.fn.xe_colorpicker = function(settings){
+        var selection = this;
+
+        if (!ready) {
+            ColorPicker.init(settings);
+            ready = true;
+        }
+
+        this.each(function(){
+            var col = color($(this).val());
+
+            $(this).val( col ).css('background-color', col );
+            setTextColor( $(this) );
+        }).focus(function(event){
+            var t = this;
+            $(this).select();
+
+            // show color picker
+            ColorPicker.show(this);
+        }).keypress(function(event){
+            if (!ColorPicker.is(':visible')) return;
+
+            if (/^#?[0-9a-f]{6}$/i.test( event.target.value )) {
+                ColorPicker.color( event.target.value );
+            }
+        });
+
+        $(document).mousedown(function(event){
+            var target = event.target;
+
+            if (selection.index(target) > -1) return;
+            if ($(target).parents().add(target).index(ColorPicker.element) > -1) return;
+            if ($(target).parents().add(target).index(ColorPicker.buttons) > -1) return;
+
+            ColorPicker.hide();
+        });
+
+        return this;
+    };
+
+    var ColorPicker = {
+        element  : null,
+        picker   : null,
+        colpane: null,
+        buttons  : null,
+        _target  : null,
+        _backup  : null,
+        _hsv     : null,
+        _mode    : 'none',
+
+        init : function() {
+            var cp = this;
+
+            this.element = $('<div class="xe_colorpicker"><div class="colorpicker"><div class="colortable"><div class="background"><div class="indicator"></div></div></div><div class="huebar"><div class="background"><div class="indicator"></div></div></div></div><div class="buttons"><button type="button" class="ok">OK</button><button type="button" class="cancel">Cancel</button><button type="button" class="none">None</button></div></div>');
+
+            this.picker    = this.element.find('> div.colorpicker');
+            this.colpane   = this.picker.find('div.colortable > div.background');
+            this.colpoint  = this.colpane.find('> .indicator');
+            this.buttons   = this.element.find('> div.buttons');
+            this.huepane   = this.element.find('div.huebar > .background');
+            this.huepoint  = this.huepane.find('> .indicator');
+
+            this._mousedown = method(this.onmousedown, this);
+            this._mousemove = method(this.onmousemove, this);
+            this._mouseup   = method(this.onmouseup, this);
+
+            this.picker.find('.background').mousedown(this._mousedown);
+
+            this.buttons.find('button.ok').click(method(this.ok,this));
+            this.buttons.find('button.cancel').click(method(this.cancel,this));
+            this.buttons.find('button.none').click(method(this.none,this));
+
+            // only for IE6
+            if ($.browser.msie && parseInt($.browser.version) < 7) {
+                this.element.append( $('<iframe>').css({position:'absolute','z-index':-1,left:0,top:0,width:9999,height:9999}) );
+            }
+        },
+        show : function(input) {
+            var pos = (input=$(input)).offset(), pos_panel;
+            //var par = input.get(0).offsetParent;
+            var par = $("body").get(0);
+            var btn = this.buttons.hide();
+            var col = color(input.val());
+
+            this._target = input;
+            this._backup = col;
+
+            this.color(col);
+            this._target.val(col);
+
+            pos_panel = this.element.hide().css({'z-index':99999,left:0,top:0}).appendTo( par ).show(300,function(){btn.slideDown(150)}).offset();
+            this.element.css({left:pos.left-pos_panel.left,top:pos.top-pos_panel.top+input.get(0).offsetHeight});
+        },
+        hide : function() {
+            var e = this.element;
+
+            this._target = null;
+            this.buttons.slideUp(100, function(){e.hide(200)});
+        },
+        visible : function() {
+            return this.element.is(':visible');
+        },
+        color : function(sColor) {
+            if (typeof sColor == 'string') {
+                var col = color(sColor);
+                var hsv = _hsv(rgb2hsv(hex2rgb(col)));
+
+                this.hsv(hsv.h, hsv.s, hsv.v);
+            } else if (this._target) {
+                return color(this._target.val());
+            }
+        },
+        hsv : function(h, s, v) {
+            var col = rgb2hex(hsv2rgb(h, s, v));
+
+            this._hsv = _hsv(h, s, v);
+
+            // background color and text color
+            this._target.val(col).css('background-color', col);
+            setTextColor(this._target);
+
+            // hue bar indicator
+            if (this._hue_h) this.huepoint.css('top', limit(0, Math.round((360-this._hsv.h)/360*this._hue_h), this._hue_h-1) - 3 );
+
+            // color - background
+            this.colpane.css('background-color', rgb2hex(hsv2rgb(h, 100, 100)) );
+
+            // color - indicator
+            if (this._col_h && this._col_w) {
+                this.colpoint.css({
+                    top  : limit(0, Math.round((100-this._hsv.v)/100*this._col_h), this._col_h-1) - 5,
+                    left : limit(0, Math.round(this._hsv.s/100*this._col_w), this._col_w-1 ) - 5
+                });
+            }
+        },
+        onmousedown : function(event) {
+            var cur = $(event.target);
+            var par = cur.parent();
+            var pos = cur.offset();
+            var hue, sat, val; // hue, saturation, value
+
+            this._height = cur.height();
+            this._width  = cur.width();
+            this._top    = pos.top;
+            this._left   = pos.left;
+
+            this._col_w  = this.colpane.width();
+            this._col_h  = this.colpane.width();
+            this._hue_h  = this.huepane.height();
+
+            if (par.is('.colortable')) {
+                this._mode = 'color';
+                hue = this._hsv.h;
+                sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
+                val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
+            } else if (par.is('.huebar')) {
+                this._mode = 'hue';
+                hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
+                sat = this._hsv.s;
+                val = this._hsv.v;
+            }
+
+            this.hsv( hue, sat, val );
+
+            $(document).bind('mousemove', this._mousemove).bind('mouseup', this._mouseup);
+        },
+        onmousemove : function(event) {
+            var hue, sat, val; // hue, saturation, value
+
+            switch(this._mode) {
+                case 'color':
+                    hue = this._hsv.h;
+                    sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
+                    val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
+                    break;
+                case 'hue':
+                    hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
+                    sat = this._hsv.s;
+                    val = this._hsv.v;
+                    break;
+            }
+
+            this.hsv( hue, sat, val );
+        },
+        onmouseup : function(event) {
+            this._mode = 'none';
+            $(document).unbind('mousemove', this._mousemove).unbind('mouseup', this._mouseup);
+        },
+        ok : function() {
+            this.hide();
+        },
+        cancel : function() {
+            this.color(this._backup);
+            this.hide();
+        },
+        none : function() {
+            this._target.attr('value','transparent').css('background','').css('color','#000000');
+            this.hide();
+        }
+    };
+
+    function setTextColor(input) {
+        var hex = input.css('color', '').val(), hsv, rgb;
+
+        if (hex == 'transparent' || hex == '') return;
+
+        rgb = hex2rgb(hex);
+        hsv = rgb2hsv(255-rgb.r, 255-rgb.g, 255-rgb.b); // 보색을 구한 뒤
+        hex = rgb2hex(hsv2rgb(0, 0, hsv.v>50?100:0)); // 보색에 해당하는 흑백으로 결정
+
+        input.css('color', hex);
+    }
+
+    function method(func, thisObj) {
+        return function() { return func.apply(thisObj, arguments) }
+    }
+
+    function color(str) {
+        var col = $.trim(str);
+        var regHex1 = /^#[0-9a-f]{6}$/i;
+        var regHex2 = /^#?([0-9a-f])([0-9a-f])([0-9a-f])$/i; // short hex
+
+        if (regHex1.test(col)) return col.toUpperCase();
+        if (regHex2.test(col)) return col.replace(regHex2, '#$1$1$2$2$3$3').toUpperCase();
+
+        try {
+            col = tmp.appendTo($('<body>')).css('background-color', col).css('background-color');
+        } catch(e) {
+            col = 'transparent';
+        } finally {
+            tmp.css('background-color','').remove();
+        }
+
+        if (/^rgb\(([0-9, ]+)\)$/i.test(col)) col = rgb2hex(RegExp.$1.split(/,\s*/));
+        if (!/#[0-9a-f]{6}/i.test(col)) col = 'transparent';
+
+        return col;
+    }
+
+    function _rgb(rgb, _g, _b) {
+        var r, g, b;
+
+        if (typeof arguments[2] == "number") {
+            r = rgb;
+            g = _g;
+            b = _b;
+        } else if (typeof rgb == "object") {
+            if (rgb.constructor == Array) {
+                r = rgb[0] || 0; g = rgb[1] || 0; b = rgb[2] || 0;
+            } else {
+                r = rgb.r || 0; g = rgb.g || 0; b = rgb.b || 0;
+            }
+        }
+
+        rgb = [];
+
+        rgb.r = rgb[0] = r = parseInt(r, 10);
+        rgb.g = rgb[1] = g = parseInt(g, 10);
+        rgb.b = rgb[2] = b = parseInt(b, 10);
+
+        return rgb;
+    }
+
+    function _hsv(hsv, _s, _v) {
+        var h, s, v;
+
+        if (typeof arguments[2] == "number") {
+            h = hsv; s = _s; v = _v;
+        } else if (typeof hsv == "object") {
+            if (hsv.constructor == Array) {
+                h = hsv[0] || 0; s = hsv[1] || 0; v = hsv[2] || 0;
+            } else {
+                h = hsv.h || 0; s = hsv.s || 0; v = hsv.v || 0;
+            }
+        }
+
+        hsv = [];
+
+        hsv.h = hsv[0] = h = parseInt(h, 10);
+        hsv.s = hsv[1] = s = parseInt(s, 10);
+        hsv.v = hsv[2] = v = parseInt(v, 10);
+
+        return hsv;
+    }
+
+    function rgb2hex(rgb, _g, _b) {
+        var rgb = _rgb(rgb, _g, _b);
+
+        for(var i=0; i < rgb.length; i++) {
+            (rgb[i] = Number(rgb[i]).toString(16)).length<2?rgb[i]='0'+rgb[i]:0;
+        }
+
+        return '#'+rgb.join('').toUpperCase();
+    }
+
+    function hex2rgb(hex) {
+        var r=0, g=0, b=0;
+
+        if (/^#?([0-9a-f]{1,2})([0-9a-f]{1,2})([0-9a-f]{1,2})$/i.test(hex)) {
+            r = parseInt(RegExp.$1, 16);
+            g = parseInt(RegExp.$2, 16);
+            b = parseInt(RegExp.$3, 16);
+        }
+
+        return _rgb(r, g, b);
+    }
+
+    function hsv2rgb(hsv, _s, _v) {
+        var r=0, g=0, b=0;
+        var h=0, s=0, v=0;
+        var i, f, p, q, t;
+
+        hsv = _hsv(hsv, _s, _v);
+
+        h = (hsv[0] % 360) / 60; s = hsv[1] / 100; v = hsv[2] / 100;
+
+        i = Math.floor(h);
+        f = h-i;
+        p = v*(1-s);
+        q = v*(1-s*f);
+        t = v*(1-s*(1-f));
+
+        switch (i) {
+            case 0: r=v; g=t; b=p; break;
+            case 1: r=q; g=v; b=p; break;
+            case 2: r=p; g=v; b=t; break;
+            case 3: r=p; g=q; b=v; break;
+            case 4: r=t; g=p; b=v; break;
+            case 5: r=v; g=p; b=q; break;
+            case 6: break;
+        }
+
+        return _rgb(Math.floor(r*255), Math.floor(g*255), Math.floor(b*255));
+    }
+
+    function rgb2hsv(rgb, _g, _b) {
+        var rgb = _rgb(rgb, _g, _b);
+        var r = rgb[0], g = rgb[1], b = rgb[2];
+        var h = 0, s = 0, v = Math.max(r,g,b), min = Math.min(r,g,b), delta = v - min;
+
+        if (s = v?delta/v:0) {
+            if (r == v) h = 60 * (g - b) / delta;
+            else if (g == v) h = 120 + 60 * (b - r) / delta;
+            else if (b == v) h = 240 + 60 * (r - g) / delta;
+
+            if (h < 0) h += 360;
+        }
+
+        return _hsv(Math.floor(h), Math.floor(s*100), Math.floor(v/255*100));
+    }
+
+    function limit(min, val, max){
+        return Math.min(Math.max(min, val), max);
+    }
+
+    $('input.color-indicator').xe_colorpicker();
+});
diff --git a/common/js/plugins/ui.krzip/krzip_search.js b/common/js/plugins/ui.krzip/krzip_search.js
new file mode 100644
index 000000000..c6371bbeb
--- /dev/null
+++ b/common/js/plugins/ui.krzip/krzip_search.js
@@ -0,0 +1,119 @@
+function doSearchKrZip(obj, column_name) {
+    var fo_obj = obj;
+    while(fo_obj) {
+        if(fo_obj.nodeName == 'FORM') break;
+        fo_obj = fo_obj.parentNode;
+    }
+    if(fo_obj.nodeName != 'FORM') return;
+
+    var field_obj = fo_obj['addr_search_'+column_name];
+    if(!field_obj) return;
+
+    var addr = field_obj.value;
+    if(!addr) return;
+
+    var params = new Array();
+    params['addr'] = addr;
+    params['column_name'] = column_name;
+    var response_tags = new Array('error','message','address_list');
+    exec_xml('krzip', 'getKrzipCodeList', params, completeSearchKrZip, response_tags, params, fo_obj);
+}
+
+function completeSearchKrZip(ret_obj, response_tags, callback_args, fo_obj) {
+    if(!ret_obj['address_list']) {
+            alert(alert_msg['address']);
+            return;
+    }
+    var address_list = ret_obj['address_list'].split("\n");
+    var column_name = callback_args['column_name'];
+
+    var zone_list_obj = xGetElementById('addr_list_'+column_name);
+    if(!zone_list_obj) return;
+
+    var zone_search_obj = xGetElementById('addr_search_'+column_name);
+    if(!zone_search_obj) return;
+
+    var sel_obj = fo_obj['addr_list_'+column_name];
+    if(!sel_obj) return;
+
+    for(var i=0;i<sel_obj.length;i++) {
+        sel_obj.remove(0);
+    }
+    for(var i=0;i<address_list.length;i++) {
+        if(!address_list[i]) continue;
+        var opt = new Option(address_list[i],address_list[i],false,false);
+        sel_obj.options[sel_obj.options.length] = opt;
+    }
+
+    sel_obj.selectedIndex = 0;
+
+    zone_search_obj.style.display = 'none';
+    zone_list_obj.style.display = 'block';
+}
+
+function doHideKrZipList(obj, column_name) {
+    var fo_obj = obj;
+    while(fo_obj) {
+        if(fo_obj.nodeName == 'FORM') break;
+        fo_obj = fo_obj.parentNode;
+    }
+
+    if(fo_obj.nodeName != 'FORM') return;
+
+    var zone_list_obj = xGetElementById('addr_list_'+column_name);
+    if(!zone_list_obj) return;
+
+    var zone_search_obj = xGetElementById('addr_search_'+column_name);
+    if(!zone_search_obj) return;
+
+    zone_list_obj.style.display = 'none';
+    zone_search_obj.style.display = 'block';
+
+    fo_obj['addr_search_'+column_name].focus();
+}
+
+function doSelectKrZip(obj, column_name) {
+    var fo_obj = obj;
+    while(fo_obj) {
+        if(fo_obj.nodeName == 'FORM') break;
+        fo_obj = fo_obj.parentNode;
+    }
+
+    if(fo_obj.nodeName != 'FORM') return;
+
+    var zone_list_obj = xGetElementById('addr_list_'+column_name);
+    if(!zone_list_obj) return;
+
+    var zone_search_obj = xGetElementById('addr_search_'+column_name);
+    if(!zone_search_obj) return;
+
+    var zone_searched_obj = xGetElementById('addr_searched_'+column_name);
+    if(!zone_searched_obj) return;
+
+    var sel_obj = fo_obj['addr_list_'+column_name];
+    if(!sel_obj) return;
+
+    var address = sel_obj.options[sel_obj.selectedIndex].value;
+    fo_obj[column_name][0].value = address;
+
+    zone_searched_obj.style.display = 'block';
+    zone_list_obj.style.display = 'none';
+    zone_search_obj.style.display = 'none';
+
+    fo_obj[column_name][1].focus();
+}
+
+function doShowKrZipSearch(obj, column_name) {
+    var zone_list_obj = xGetElementById('addr_list_'+column_name);
+    if(!zone_list_obj) return;
+
+    var zone_search_obj = xGetElementById('addr_search_'+column_name);
+    if(!zone_search_obj) return;
+
+    var zone_searched_obj = xGetElementById('addr_searched_'+column_name);
+    if(!zone_searched_obj) return;
+
+    zone_searched_obj.style.display = 'none';
+    zone_list_obj.style.display = 'none';
+    zone_search_obj.style.display = 'block';
+}
diff --git a/common/js/plugins/ui.krzip/plugin.load b/common/js/plugins/ui.krzip/plugin.load
new file mode 100644
index 000000000..fb86e1f77
--- /dev/null
+++ b/common/js/plugins/ui.krzip/plugin.load
@@ -0,0 +1 @@
+krzip_search.js
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index 0bd88660d..c74fde0fe 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -26,6 +26,14 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu
 
 // 결과 처리 후 callback_func에 넘겨줌
 function xml_response_filter(oXml, callback_func, response_tags, callback_func_arg, fo_obj) {
+    var text = oXml.getResponseText();
+    if(text && !/^<response>/i.test(text)) {
+        var waiting_obj = xGetElementById("waitingforserverresponse");
+        if(waiting_obj) waiting_obj.style.visibility = "hidden";
+        alert(text);
+        return null;
+    }
+
     var xmlDoc = oXml.getResponseXml();
     if(!xmlDoc) return null;
 
@@ -64,6 +72,7 @@ function xml_handler() {
     this.setPath = xml_handlerSetPath;
     this.addParam = xml_handlerAddParam;
     this.getResponseXml = xml_handlerGetResponseXML;
+    this.getResponseText = xml_handlerGetResponseText;
     this.toZMsgObject = xml_handlerToZMsgObject;
     this.parseXMLDoc = xml_parseXmlDoc;
 
@@ -160,6 +169,13 @@ function xml_handlerGetResponseXML() {
     return null;
 }
 
+function xml_handlerGetResponseText() {
+    if(this.objXmlHttp && this.objXmlHttp.readyState == 4 && isDef(this.objXmlHttp.responseText)) {
+        return this.objXmlHttp.responseText;
+    }
+    return null;
+}
+
 
 function xml_parseXmlDoc(dom) {
 
@@ -217,6 +233,17 @@ function xml_handlerToZMsgObject(xmlDoc, tags) {
 
     var parsed_array = this.parseXMLDoc(xmlDoc.getElementsByTagName('response')[0]);
 
+    if(typeof(parsed_array)=='undefined') {
+        var ret = new Array();
+        ret['error'] = -1;
+        ret['message'] = "Unexpected error occured.";
+        try{
+            if(typeof(xmlDoc.childNodes[0].firstChild.data)!='undefined') ret['message']+="\r\n"+xmlDoc.childNodes[0].firstChild.data;
+        } catch(e) {
+        }
+        return ret;
+    }
+
     var obj_ret = new Array();
     for(var i=0; i<tags.length; i++) {
         var key = tags[i];
@@ -417,7 +444,7 @@ $.exec_json = function(action,data,func){
     }
 };
 
-$.fn.exec_html = function(action,data,type){
+$.fn.exec_html = function(action,data,type,func,args){
     if(typeof(data) == 'undefined') data = {};
     if(!$.inArray(type, ['html','append','prepend'])) type = 'html';
 
@@ -437,6 +464,7 @@ $.fn.exec_html = function(action,data,type){
             ,success : function(html){
                 $("#waitingforserverresponse").css('visibility','hidden');
                 self[type](html);
+                if($.isFunction(func)) func(args);
             }
         });
     }
diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php
index 9ddf9e5d9..4d95e144e 100644
--- a/common/lang/en.lang.php
+++ b/common/lang/en.lang.php
@@ -75,6 +75,7 @@
     $lang->secret = 'Secret';
     $lang->category = $lang->category_srl = 'Category';
     $lang->none_category = 'None category';
+    $lang->none_image = '이미지 없음';
     $lang->document_srl = 'Doc. No.';
     $lang->user_id = 'User ID';
     $lang->author = 'Developer';
@@ -117,6 +118,7 @@
     $lang->order_type = 'Sorting Type';
     $lang->order_asc = 'ascend';
     $lang->order_desc = 'descend';
+    $lang->file = 'file';
 
     $lang->mid = 'Module Name';
     $lang->layout = 'Layout';
@@ -256,6 +258,7 @@
     $lang->column_type_list['textarea'] = 'multi-line textarea';
     $lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
     $lang->column_type_list['select'] = 'select box (single selection)';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     $lang->column_type_list['kr_zip'] = 'zip code (Korean)';
     $lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
     //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 2caeec1ce..2acccf352 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -74,6 +74,7 @@
     $lang->secret = 'Secreto';
     $lang->category = $lang->category_srl = 'Categoría';
     $lang->none_category = 'Sin categoría';
+    $lang->none_image = '이미지 없음';
     $lang->document_srl = 'Número del documento';
     $lang->user_id = 'ID de Usuario';
     $lang->author = 'Autor'; 
@@ -116,6 +117,7 @@
     $lang->order_type = 'Tipo de Ordenación';
     $lang->order_asc = 'ascendente';
     $lang->order_desc = 'descendente';
+    $lang->file = 'file';
 
     $lang->mid = 'ID del Módulo';
     $lang->layout = 'Composición';
@@ -262,6 +264,7 @@
     $lang->column_type_list['textarea'] = 'Texto multi-linea';
     $lang->column_type_list['checkbox'] = 'Caja de chequeo (selección múltiple)';
     $lang->column_type_list['select'] = 'Selección (selección individual)';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     //$lang->column_type_list['kr_zip'] = 'zip code (Korean)';
     $lang->column_type_list['date'] = 'fecha (dd/mm/aaaa)';
     //$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index ae45d799f..85ff4d13c 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -75,6 +75,7 @@
     $lang->secret = 'Secret';
     $lang->category = $lang->category_srl = 'Catégorie';
     $lang->none_category = 'None category';
+    $lang->none_image = '이미지 없음';
     $lang->document_srl = 'Numéro de série du Document';
     $lang->user_id = 'Compte';
     $lang->author = 'Auteur';
@@ -117,6 +118,7 @@
     $lang->order_type = 'Sorting Type';
     $lang->order_asc = 'Ascend';
     $lang->order_desc = 'Descendre';
+    $lang->file = 'file';
 
     $lang->mid = 'Nom';
     $lang->layout = 'Mise en Page';
@@ -256,6 +258,7 @@
     $lang->column_type_list['textarea'] = 'Texte en plusieurs lignes';
     $lang->column_type_list['checkbox'] = 'Case à cocher (multichoix)';
     $lang->column_type_list['select'] = 'Case d\'option (seul choix)';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     $lang->column_type_list['kr_zip'] = 'Code postal (coréen)';
     $lang->column_type_list['date'] = 'Jour (yyyy/mm/dd)';
     //$lang->column_type_list['jp_zip'] = 'code postal (japonais)';
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 5d1340acc..7ff3aca98 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -75,6 +75,7 @@
     $lang->secret = 'Geheim';
     $lang->category = $lang->category_srl = 'Kategorie';
     $lang->none_category = '분류없음';
+    $lang->none_image = '이미지 없음';
     $lang->document_srl = 'Doc. No ';
     $lang->user_id = 'User-ID';
     $lang->author = 'Entwickler';
@@ -117,6 +118,7 @@
     $lang->order_type = 'Sortieren Typ';
     $lang->order_asc = 'Aufstieg';
     $lang->order_desc = 'Abstieg';
+    $lang->file = 'file';
 
     $lang->mid = 'Module Name';
     $lang->layout = 'Layout';
@@ -256,6 +258,7 @@
     $lang->column_type_list['textarea'] = 'Multi-line textarea';
     $lang->column_type_list['checkbox'] = 'Checkbox (multiple Auswahl)';
     $lang->column_type_list['select'] = 'select box (Einzel-Auswahl) ';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     $lang->column_type_list['kr_zip'] = 'Postleitzahl (Koreanisch) ';
     $lang->column_type_list['date'] = 'Datum (jjjj / mm / dd)';
     // $lang->column_type_list [ 'jp_zip'] = 'Postleitzahl (Japanisch)';
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
index bffbb3997..68cbc08cd 100644
--- a/common/lang/jp.lang.php
+++ b/common/lang/jp.lang.php
@@ -69,12 +69,13 @@
     $lang->disable = '不可';
 
     // 基本用語
-    $lang->menu = 'Menu';
+    $lang->menu = 'メニュー';
     $lang->no = '番号';
     $lang->notice = 'お知らせ';
     $lang->secret = '非公開';
     $lang->category = $lang->category_srl = 'カテゴリ';
     $lang->none_category = 'カテゴリ無し';
+    $lang->none_image = 'イメージなし';
     $lang->document_srl = '書き込み番号';
     $lang->user_id = 'ユーザーＩＤ';
     $lang->author = '作成者';
@@ -117,6 +118,7 @@
     $lang->order_type = 'ソート方法';
     $lang->order_asc = '昇る';
     $lang->order_desc = '降下';
+    $lang->file = 'ファイル';
 
     $lang->mid = 'モジュール名';
     $lang->layout = 'レイアウト';
@@ -256,6 +258,7 @@
     $lang->column_type_list['textarea'] = 'テキストエリア(textarea)';
     $lang->column_type_list['checkbox'] = 'チェックボックス(checkbox)';
     $lang->column_type_list['select'] = '選択(select)';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     $lang->column_type_list['kr_zip'] = '韓国住所(zip)';
     $lang->column_type_list['date'] = '日付(年月日)';
     //$lang->column_type_list['jp_zip'] = '日本住所(zip)';
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 6f8552625..f8139fe59 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -42,7 +42,7 @@
     $lang->cmd_select = '선택';
     $lang->cmd_select_all = '모두선택';
     $lang->cmd_unselect_all = '모두해제';
-    $lang->cmd_reverse_all = "선택반전";
+    $lang->cmd_reverse_all = '선택반전';
     $lang->cmd_close_all = '모두닫기';
     $lang->cmd_open_all = '모두열기';
     $lang->cmd_reload = '다시읽기';
@@ -50,7 +50,7 @@
     $lang->cmd_open = '열기';
     $lang->cmd_setup = '설정';
     $lang->cmd_addition_setup = '추가 설정';
-	$lang->cmd_option = '옵션';
+    $lang->cmd_option = '옵션';
     $lang->cmd_apply = '적용';
     $lang->cmd_open_calendar = '날짜 선택';
     $lang->cmd_send = '발송';
@@ -58,8 +58,8 @@
     $lang->cmd_scrap = '스크랩';
     $lang->cmd_preview = '미리 보기';
     $lang->cmd_reset = '초기화';
-    $lang->cmd_remake_cache = "캐시파일 재생성";
-    $lang->cmd_publish = "발행";
+    $lang->cmd_remake_cache = '캐시파일 재생성';
+    $lang->cmd_publish = '발행';
     $lang->cmd_layout_setup = '레이아웃 설정';
     $lang->cmd_layout_edit = '레이아웃 편집';
     $lang->cmd_search_by_ipaddress = 'IP주소로 검색';
@@ -75,6 +75,7 @@
     $lang->secret = '비밀';
     $lang->category = $lang->category_srl = '분류';
     $lang->none_category = '분류 없음';
+    $lang->none_image = '이미지 없음';
     $lang->document_srl = '문서번호';
     $lang->user_id = '아이디';
     $lang->author = '작성자';
@@ -95,7 +96,7 @@
     $lang->topic = '주제';
     $lang->replies = '댓글';
     $lang->content = '내용';
-    $lang->document = '게시물';
+    $lang->document = '문서';
     $lang->comment = '댓글';
     $lang->description = '설명';
     $lang->trackback = '엮인글';
@@ -117,6 +118,7 @@
     $lang->order_type = '정렬방법';
     $lang->order_asc = '올림차순';
     $lang->order_desc = '내림차순';
+    $lang->file = '파일';
 
     $lang->mid = '모듈이름';
     $lang->layout = '레이아웃';
@@ -126,8 +128,8 @@
     $lang->colorset = '컬러셋';
     $lang->extra_vars = '확장변수';
 
-    $lang->domain = "도메인";
-    $lang->url = "URL";
+    $lang->domain = '도메인';
+    $lang->url = 'URL';
     $lang->document_url = '게시글 주소';
     $lang->trackback_url = '엮인글 주소';
     $lang->blog_name = '블로그이름';
@@ -216,7 +218,7 @@
     $lang->msg_not_founded = '대상을 찾을 수 없습니다';
     $lang->msg_no_result = '검색 결과가 없습니다';
 
-    $lang->msg_not_permitted_act = '요청하신 action을 실행할 수 있는 권한이 없습니다';
+    $lang->msg_not_permitted_act = '요청하신 기능을 실행할 수 있는 권한이 없습니다';
     $lang->msg_module_is_not_exists = '요청하신 모듈을 찾을 수 없습니다';
     $lang->msg_module_is_not_standalone = '요청하신 모듈은 독립적으로 동작할 수가 없습니다';
 
@@ -250,12 +252,13 @@
 
     $lang->column_type = '형식';
     $lang->column_type_list['text'] = '한줄 입력칸 (text)';
-    $lang->column_type_list['homepage'] = '홈페이지 형식 (url)';
+    $lang->column_type_list['homepage'] = 'URL 형식';
     $lang->column_type_list['email_address'] = '이메일 형식 (email)';
     $lang->column_type_list['tel'] = '전화번호 형식 (phone)';
     $lang->column_type_list['textarea'] = '여러줄 입력칸 (textarea)';
     $lang->column_type_list['checkbox'] = '다중 선택 (checkbox)';
     $lang->column_type_list['select'] = '단일 선택 (select)';
+    $lang->column_type_list['radio'] = '라디오 버튼 (radio)';
     $lang->column_type_list['kr_zip'] = '한국주소 (zip)';
     $lang->column_type_list['date'] = '일자 (년월일)';
     //$lang->column_type_list['jp_zip'] = '일본주소 (zip)';
@@ -278,12 +281,12 @@
         그리고 설치 후 관리자 페이지에서 FTP 정보를 변경하거나 제거할 수 있습니다.<br />
     ";
 
-    $lang->msg_safe_mode_ftp_needed = "PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해주셔야 XE의 설치 및 사용이 가능합니다";
-    $lang->msg_ftp_not_connected = "localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인해주시거나 ftp 서비스가 가능한지 확인해주세요";
-    $lang->msg_ftp_invalid_auth_info = "입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요";
-    $lang->msg_ftp_mkdir_fail = "FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-    $lang->msg_ftp_chmod_fail = "FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-    $lang->msg_ftp_connect_success = "FTP 접속 및 인증 성공하였습니다";
+    $lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해주셔야 XE의 설치 및 사용이 가능합니다';
+    $lang->msg_ftp_not_connected = 'localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인해주시거나 ftp 서비스가 가능한지 확인해주세요';
+    $lang->msg_ftp_invalid_auth_info = '입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요';
+    $lang->msg_ftp_mkdir_fail = 'FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요';
+    $lang->msg_ftp_chmod_fail = 'FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요';
+    $lang->msg_ftp_connect_success = 'FTP 접속 및 인증 성공하였습니다';
 
     // xml filter에서 사용되는 javascript용 alert msg
     $lang->filter->isnull = '%s의 값을 입력해주세요';
diff --git a/common/lang/lang.info b/common/lang/lang.info
index 6a807d974..de8d96ba3 100644
--- a/common/lang/lang.info
+++ b/common/lang/lang.info
@@ -1,8 +1,8 @@
 ko,한국어
 en,English
-zh-CN,简体中文
+zh-CN,中文(中国)
 jp,日本語
 es,Español
 ru,Русский
 fr,Français
-zh-TW,正體中文
+zh-TW,中文(臺灣)
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index eaee41067..75f971ded 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -256,6 +256,7 @@
     $lang->column_type_list['textarea'] = 'многолетних-лайн textarea';
     $lang->column_type_list['checkbox'] = 'флажок (несколько отбор)';
     $lang->column_type_list['select'] = 'выберите поле (один отбор)';
+    $lang->column_type_list['radio'] = 'radio button (radio)';
     $lang->column_type_list['kr_zip'] = 'почтовый индекс (корейский)';
     $lang->column_type_list['date'] = 'Дата (гггг / мм / дд)';
     //$lang->column_type_list['jp_zip'] = 'почтовый индекс (японский)';
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index 4f8d9da5f..c7abcecc5 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -49,7 +49,7 @@
     $lang->cmd_close = '关闭';
     $lang->cmd_open = '打开';
     $lang->cmd_setup = '设置';
-    $lang->cmd_addition_setup = '扩展设置';
+    $lang->cmd_addition_setup = '高级选项';
     $lang->cmd_option = '选项';
     $lang->cmd_apply = '应用';
     $lang->cmd_open_calendar = '选择日期';
@@ -58,7 +58,7 @@
     $lang->cmd_scrap = '收藏';
     $lang->cmd_preview = '预览';
     $lang->cmd_reset = '初始化';
-    $lang->cmd_remake_cache = "重新生成缓冲文件";
+    $lang->cmd_remake_cache = "更新缓冲";
     $lang->cmd_publish = "发表";
     $lang->cmd_layout_setup = '布局设置';
     $lang->cmd_layout_edit = '编辑布局';
@@ -75,6 +75,7 @@
     $lang->secret = '密帖';
     $lang->category = $lang->category_srl = '分类';
     $lang->none_category = '无分类';
+    $lang->none_image = '无图';
     $lang->document_srl = '文章编号';
     $lang->user_id = '用户名';
     $lang->author = '制作';
@@ -117,6 +118,7 @@
     $lang->order_type = '排序方式';
     $lang->order_asc = '升序';
     $lang->order_desc = '倒序';
+    $lang->file = '文件';
 
     $lang->mid = '模块名称';
     $lang->layout = '布局';
@@ -124,7 +126,7 @@
     $lang->module = '模块';
     $lang->skin = '皮肤';
     $lang->colorset = '颜色设定';
-    $lang->extra_vars = '扩展变数';
+    $lang->extra_vars = '扩展变量';
 
     $lang->domain = "域名";
     $lang->url = "URL";
@@ -256,6 +258,7 @@
     $lang->column_type_list['textarea'] = '多行文本框 (textarea)';
     $lang->column_type_list['checkbox'] = '复选框 (checkbox)';
     $lang->column_type_list['select'] = '下拉列表框 (select)';
+    $lang->column_type_list['radio'] = '单选框 (radio)';
     $lang->column_type_list['kr_zip'] = '韩国邮编(zip)';
     $lang->column_type_list['date'] = '日期 (年月日)';
     //$lang->column_type_list['jp_zip'] = '日本地址 (zip)';
diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php
index 42e567126..8242c57b1 100644
--- a/common/lang/zh-TW.lang.php
+++ b/common/lang/zh-TW.lang.php
@@ -62,19 +62,20 @@
     $lang->cmd_publish = "發表";
     $lang->cmd_layout_setup = '版面設置';
     $lang->cmd_layout_edit = '版面編輯';
-    $lang->cmd_search_by_ipaddress = '以 IP位址搜尋';
-    $lang->cmd_add_ip_to_spamfilter = '新增 IP至垃圾過濾器';
+    $lang->cmd_search_by_ipaddress = '以IP位址搜尋';
+    $lang->cmd_add_ip_to_spamfilter = '封鎖此IP位址';
 
     $lang->enable = '可用';
     $lang->disable = '禁用';
 
     // 基本詞語
-    $lang->menu = 'Menu';
+    $lang->menu = '選單';
     $lang->no = '編號';
     $lang->notice = '公告';
     $lang->secret = '秘密';
     $lang->category = $lang->category_srl = '分類';
     $lang->none_category = '無分類';
+    $lang->none_image = '無圖片';
     $lang->document_srl = '文章編號';
     $lang->user_id = '帳號';
     $lang->author = '作者';
@@ -117,6 +118,7 @@
     $lang->order_type = '排列方式';
     $lang->order_asc = '升冪';
     $lang->order_desc = '降冪';
+    $lang->file = '檔案';
 
     $lang->mid = '模組名稱';
     $lang->layout = '版面';
@@ -133,7 +135,7 @@
     $lang->blog_name = '部落格名稱';
     $lang->excerpt = '轉載自';
 
-    $lang->document_count = '文章數';
+    $lang->document_count = '文章數量';
     $lang->page_count = '頁數';
     $lang->list_count = '列表數';
     $lang->search_list_count = '搜尋列表數';
@@ -250,12 +252,13 @@
 
     $lang->column_type = '格式';
     $lang->column_type_list['text'] = '文字輸入(text)';
-    $lang->column_type_list['homepage'] = '網址格式 (url)';
+    $lang->column_type_list['homepage'] = '網址格式';
     $lang->column_type_list['email_address'] = '郵件格式 (email)';
     $lang->column_type_list['tel'] = '電話號碼格式 (phone)';
-    $lang->column_type_list['textarea'] = '文字輸入區塊 (textarea)';
-    $lang->column_type_list['checkbox'] = '復選框 (checkbox)';
+    $lang->column_type_list['textarea'] = '文字區域 (textarea)';
+    $lang->column_type_list['checkbox'] = '核取方塊 (checkbox)';
     $lang->column_type_list['select'] = '下拉式選單 (select)';
+    $lang->column_type_list['radio'] = '選項按紐 (radio)';
     $lang->column_type_list['kr_zip'] = '韓國郵編(zip)';
     $lang->column_type_list['date'] = '日期 (年月日)';
     //$lang->column_type_list['jp_zip'] = '日本郵編 (zip)';
@@ -265,33 +268,33 @@
     $lang->is_active = '啟動';
     $lang->is_required = '必填';
 
-    // 關於 FTP
-    $lang->ftp_form_title = '輸入 FTP資訊';
+    // 關於FTP
+    $lang->ftp_form_title = '輸入FTP資訊';
     $lang->ftp = 'FTP';
-    $lang->ftp_port = 'FTP Port';
-    $lang->cmd_check_ftp_connect = '確認 FTP連線';
+    $lang->ftp_port = 'FTP埠口';
+    $lang->cmd_check_ftp_connect = '檢查FTP連線';
     $lang->about_ftp_info = "
         FTP資訊可應用至以下情形<br/>
-        1. 當 PHP的安全模式(safe_mode)開啟時，可使程式正常運作。<br/>
+        1. 當PHP的安全模式(safe_mode)開啟時，可使程式正常運作。<br/>
         2. 可用於自動更新。<br/>
-        這個 FTP資訊會儲存在檔案 files/config/ftp.config.php裡面。<br/>
-        安裝程式後，可以在管理頁面中針對 FTP資訊進行修改或刪除。<br />
+        此FTP資訊會儲存在檔案『files/config/ftp.config.php』裡面。<br/>
+        安裝程式後，可以在管理頁面中針對FTP資訊進行修改或刪除。<br />
     ";
 
-    $lang->msg_safe_mode_ftp_needed = "當 PHP的安全模式(safe_mode)開啟時，請輸入相關 FTP資訊，否則無法正常安裝或使用程式。";
-    $lang->msg_ftp_not_connected = "本地(localhost)FTP連線錯誤。請確認 FTP Prot或確認是否支援 FTP功能。";
-    $lang->msg_ftp_invalid_auth_info = "FTP登入失敗。請確認輸入的 FTP資訊。";
-    $lang->msg_ftp_mkdir_fail = "新增資料夾失敗。請確認 FTP主機設置。";
-    $lang->msg_ftp_chmod_fail = "修改資料夾權限失敗。請確認 FTP主機設置。";
-    $lang->msg_ftp_connect_success = "FTP連線成功。";
+    $lang->msg_safe_mode_ftp_needed = '當PHP的安全模式(safe_mode)開啟時，請輸入相關FTP資訊，否則無法正常安裝或使用程式。';
+    $lang->msg_ftp_not_connected = '本地(localhost)FTP連線錯誤。請檢查FTP埠口並確認是否支援FTP功能。';
+    $lang->msg_ftp_invalid_auth_info = 'FTP登入失敗。請確認輸入的FTP資訊。';
+    $lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認FTP主機設置。';
+    $lang->msg_ftp_chmod_fail = '修改資料夾權限失敗。請確認FTP主機設置。';
+    $lang->msg_ftp_connect_success = 'FTP連線成功。';
 
-    // 在 xml filter使用的 javascript用 alert msg
+    // 在xml filter中所使用的JavaScript警告訊息
     $lang->filter->isnull = '請輸入%s';
     $lang->filter->outofrange = '請確認%s字數';
     $lang->filter->equalto = '%s值有誤。';
-    $lang->filter->invalid_email = '%s格式有誤。（例：zbxe@zeroboard.com)';
+    $lang->filter->invalid_email = '%s格式有誤。(例：zbxe@zeroboard.com)';
     $lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s只能用英文，數字和 _，第一個字母必須是英文。";
-    $lang->filter->invalid_homepage = '%s格式有誤。（例： http://www.zeroboard.com)';
+    $lang->filter->invalid_homepage = '%s格式有誤。(例： http://www.zeroboard.com)';
     $lang->filter->invalid_korean = '%s只能輸入中文';
     $lang->filter->invalid_korean_number = '%s只能輸入中文或數字';
     $lang->filter->invalid_alpha = '%s只能輸入英文字母';
diff --git a/common/tpl/calendar.php b/common/tpl/calendar.php
deleted file mode 100644
index a53070883..000000000
--- a/common/tpl/calendar.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-    ####################
-    ## 연도 범위 설정 ##
-    // 최대
-    $max_year = 2900;//년 (우주가 사라지는 날 까지)
-    // 최소
-    $min_year = 1900;//년 (0년 부터)
-    ####################
-
-    $year = htmlspecialchars($_REQUEST['year']);
-    $month = htmlspecialchars($_REQUEST['month']);
-
-    $method = htmlspecialchars($_REQUEST['method']);
-    $fo_id = htmlspecialchars($_REQUEST['fo_id']);
-    $callback_func = htmlspecialchars($_REQUEST['callback_func']);
-
-    $day_str = htmlspecialchars($_REQUEST['day_str']); // 날짜 (ex. 20080101)
-    if($day_str && strlen($day_str)) {
-        $year = substr($day_str, 0, 4);
-        $month = substr($day_str, 4, 2);
-    }
-
-    if($year < $min_year || $year > $max_year) $year = date("Y");
-    if(!(int)$month || $month < 1 || $month > 12) $month = date("n");
-
-    switch($method) {
-        case 'prev_year' :
-                $year --;
-            break;
-        case 'prev_month' :
-                $month --;
-                if($month < 1) {
-                    $month = 12;
-                    $year --;
-                }
-            break;
-        case 'next_month' :
-                $month ++;
-                if($month > 12) {
-                    $month = 1;
-                    $year ++;
-                }
-            break;
-        case 'next_year' :
-                $year ++;
-            break;
-    }
-
-// 긴 이름
-$monthLongName = array(1 => "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
-
-// 짧은 이름
-$monthShortName = array(1 => "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
-
-// 요일 이름
-$dayName = array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");
-
-/*
- * @brief 윤년 검사
- */
-function isLeapYear($year) { 
-    if ($year % 4 == 0 && $year % 100 != 0 || $year % 400 == 0) return true; 
-    else return false;
-} 
-
-/*
- * @brief 날짜 수 계산
- */
-function convertDatetoDay($year, $month, $day = 0) { 
-    $numOfLeapYear = 0; // 윤년의 수 
-
-    // 전년도까지의 윤년의 수를 구한다. 
-    for($i = 0; $i < $year; $i++) { 
-        if(isLeapYear($i)) $numOfLeapYear++; 
-    } 
-
-    // 전년도까지의 일 수를 구한다. 
-    $toLastYearDaySum = ($year-1) * 365 + $numOfLeapYear; 
-
-    // 올해의 현재 월까지의 일수 계산 
-    $thisYearDaySum = 0; 
-    //                        1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12 
-    $endOfMonth = array(1 => 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); 
-
-    for($i = 1; $i < $month; $i++) { 
-        $thisYearDaySum += $endOfMonth[$i]; 
-    } 
-
-    // 윤년이고, 2월이 포함되어 있으면 1일을 증가시킨다. 
-    if ($month > 2 && isLeapYear($year)) $thisYearDaySum++; 
-
-    if(isLeapYear($year)) $endOfMonth[2] = 29;
-
-    if($day) {
-        $thisYearDaySum += $day; 
-        return $toLastYearDaySum + $thisYearDaySum - 1; 
-    } else {
-        return $endOfMonth[$month];
-    }
-} 
-
-/*
- * @brief 요일 구하기
- */
-function getDayOfWeek($year, $month, $day) { 
-    // 0~6의 값을 반환한다. 결과가 0이면 일요일이다. 
-    return convertDatetoDay($year, $month, $day) % 7; 
-} 
-
-$start_week = getDayOfWeek($year, $month, 1);
-$month_day = convertDatetoDay($year, $month);
-$before_month_month_day = convertDatetoDay( $month == 1 ? $year - 1 : $year, $month == 1 ? 12 : $month - 1);
-
-?>
-<!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" />
-    <meta http-equiv="imagetoolbar" content="no" />
-    <title>Calendar</title>
-    <script type="text/javascript" src="../js/x.js"></script>
-    <script type="text/javascript" src="../js/common.js"></script>
-    <script type="text/javascript" src="../js/xml_handler.js"></script>
-
-    <link rel="stylesheet" href="../css/default.css" type="text/css" />
-    <link rel="stylesheet" href="../css/button.css" type="text/css" />
-    <link rel="stylesheet" href="../../modules/admin/tpl/css/admin.css" type="text/css" />
-    <link rel="stylesheet" href="./css/calendar.css" type="text/css" />
-
-    <script type="text/javascript">
-        function selectDate(date_str, date_val, callback_func) {
-            if(!opener) {
-                window.close();
-                return;
-            }
-
-            var date_obj = opener.xGetElementById("date_<?php echo $fo_id?>");
-            var str_obj = opener.xGetElementById("str_<?php echo $fo_id?>");
-
-            if(date_obj) date_obj.value = date_val;
-
-            if(str_obj) xInnerHtml(str_obj, date_str);
-
-            if(callback_func) eval('opener.'+callback_func+'('+date_val+')');
-
-            window.close();
-
-        }
-    </script>
-</head>
-<body>
-<div id="popup_content" >
-    <div id="popHeadder">
-        <h3>Calendar</h3>
-    </div>
-
-    <form action="./calendar.php" method="get">
-    <input type="hidden" name="fo_id" value="<?php echo $fo_id?>"/>
-    <input type="hidden" name="callback_func" value="<?php echo $callback_func?>"/>
-
-        <div id="popBody">
-
-            <div class="calendar">
-                <div class="yymm">
-                    <div class="yy">
-                        <a href="./calendar.php?fo_id=<?php echo $fo_id?>&year=<?php echo $year?>&month=<?php echo $month?>&method=prev_year&callback_func=<?php echo $callback_func?>" class="left"><img src="./images/buttonLeft2.gif" alt="<?php echo $year - 1?>" width="11" height="11" /></a><?php echo $year?><a href="./calendar.php?fo_id=<?php echo $fo_id?>&year=<?php echo $year?>&month=<?php echo $month?>&method=next_year&callback_func=<?php echo $callback_func?>" class="right"><img src="./images/buttonRight2.gif" alt="<?php echo $year + 1?>" width="11" height="11" /></a> 
-                    </div>
-                    <div class="mm">
-                        <p><?php echo $monthLongName[$month]?></p>
-                            <a href="./calendar.php?fo_id=<?php echo $fo_id?>&year=<?php echo $year?>&month=<?php echo $month?>&method=prev_month&callback_func=<?php echo $callback_func?>" class="left"><img src="./images/buttonLeft2.gif" alt="prev" width="11" height="11" /></a><span><?php echo $month?></span><a href="./calendar.php?fo_id=<?php echo $fo_id?>&year=<?php echo $year?>&month=<?php echo $month?>&method=next_month&callback_func=<?php echo $callback_func?>" class="right"><img src="./images/buttonRight2.gif" alt="next" width="11" height="11" /></a> 
-                    </div>
-
-                    <div class="go">
-                        <select name="year" class="selectTypeY" onchange="submit()">
-                            <?php for($i = $max_year; $i >= $min_year; $i--):?>
-                            <option value="<?php echo $i?>" <?php echo $year == $i? "selected":""?> class="<?php echo $i%10?($i%2?"select_color1":"select_color2"):"select_color10"?>"><?php echo $i?></option>
-                            <?php endfor?>
-                        </select>
-                        <select name="month" class="selectTypeM" onchange="submit()">
-                            <?php for($i = 1; $i <= 12; $i++):?>
-                            <option value="<?php echo $i?>" <?php echo $month == $i? "selected":""?> class="<?php echo $i%2?"select_color1":"select_color2"?>"><?php echo sprintf("%02d",$i)?></option>
-                            <?php endfor?>
-                        </select>
-                    </div>
-                    <br /><br />
-                    <center><a href="./calendar.php?fo_id=<?php echo $fo_id?>&callback_func=<?php echo $callback_func?>" class="button"><span>Go Today</span></a></center> 
-                </div>
-
-                <table cellspacing="0" class="dd">
-                <tr>
-                    <?php for($y = 0; $y < 7; $y++) {?>
-                    <td class="<?php echo $y==0?"sun":($y==6?"sat":"")?>"><?php echo $dayName[$y]?></td>
-                    <?php }?>
-                </tr>
-                <?php
-                    //1주~6주
-                    for($i = 0; $i < 6; $i++) {
-                ?>
-                <tr class="<?php if($i == 0){?>first<?php }elseif($i == 5){?>last<?php }?>">
-                <?php
-                        //요일
-                        for($j = 0; $j < 7; $j++) {
-                            $m = $month;
-                            $y = $year;
-
-                            $cell_no = $i * 7 + $j;
-
-                            if($cell_no < $start_week) {
-                                $day = $before_month_month_day + $cell_no - $start_week + 1;
-                                $m = $month - 1;
-                                if($m < 1) {
-                                    $m = 12;
-                                    $y = $year - 1;
-                                }
-                            } else {
-
-                                $day = $cell_no - $start_week + 1;
-                                $m = $month;
-
-                                if($day > $month_day) {
-                                    $day = $day - $month_day;
-                                    $m = $month + 1;
-                                    if($m >12 ) {
-                                        $m = 1;
-                                        $y = $year - 1;
-                                    }
-                                }
-                            }
-
-                            if($j == 0) $class_name = "sun";
-                            elseif($j == 6) $class_name = "sat";
-                            else $class_name= "";
-
-                            $date = $y.". ".sprintf("%02d", $m).". ".sprintf("%02d", $day);
-                            $date_str = $y.sprintf("%02d", $m).sprintf("%02d", $day);
-
-                ?>
-                    <td class="<?php echo $class_name?>" <?php if($day){?> onclick="selectDate('<?php echo $date?>','<?php echo $date_str?>','<?php echo $callback_func?>')"<?php }?>>
-                        <?php if($m == $month){?><?php if(date("Ymd")==$date_str){?><strong><?php }?>
-                            <?php if($day){?><?php echo $day?><?php }else{?>&nbsp;<?php }?>
-                            <?php if(date("Ymd")==$date_str){?></strong><?php }?>
-                        <?php }else{?>
-                            <span class="disable"><?php if($day){?><?php echo $day?><?php }else{?>&nbsp;<?php }?></span>
-                        <?php }?>
-                    </td>
-                <?php
-                        }
-                ?>
-                </tr>
-                <?php
-                    }
-                ?>
-                </table>
-
-            </div>
-        </div>
-    </form>
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="window.close();" class="button"><span>close</span></a>
-    </div>
-</div>
-
-<script type="text/javascript">
-    xAddEventListener(window,'load', setFixedPopupSize);
-    var _isPoped = true;
-</script>
-</body>
-</html>
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index b20acd002..c71aca0b5 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -64,8 +64,13 @@
 
 </head>
 <body>
-{$zbxe_final_content}
-{Context::getHtmlFooter()}
-<div id="waitingforserverresponse"></div>
+    {Context::getBodyHeader()}
+
+    {$zbxe_final_content}
+
+    {Context::getHtmlFooter()}
+
+    <div id="waitingforserverresponse"></div>
+
 </body>
 </html>
diff --git a/common/tpl/css/calendar.css b/common/tpl/css/calendar.css
deleted file mode 100644
index 003be3eb9..000000000
--- a/common/tpl/css/calendar.css
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "utf-8";
-
-body { margin:0; padding:0; }
-
-#popup_content { width:500px; overflow:hidden;}
-#popHeadder { width:500px; }
-#popBody { width:480px; }
-#popFooter { width:500px; }
-
-#popBody .calendar { width:480px; border:1px solid #c1c0bd; border-left:none; border-right:none; background:#f5f5f5; overflow:hidden; position:relative;}
-#popBody .calendar .yymm { width:143px; float:left;}
-#popBody .calendar .yymm .yy { padding:9px 0 6px 0; text-align:center; border-bottom:1px solid #ededed; margin:0 15px; font:bold 1.5em Tahoma; color:#444444;}
-#popBody .calendar .yymm .mm { margin:0 15px; border-top:1px solid #ffffff; border-bottom:1px solid #ededed; padding:10px 0 7px 0; text-align:center;}
-#popBody .calendar .yymm .mm p { color:#969696; font:1.6em "Times New Roman";}
-#popBody .calendar .yymm .mm span { font:4em "Times New Roman"; color:#158692; vertical-align:middle;}
-#popBody .calendar .yymm .go { padding:7px 0 0 0; margin:0px 15px; text-align:center; border-top:1px solid #ffffff; display:inline;}
-#popBody .calendar .yymm .go * { vertical-align:middle;}
-#popBody .calendar .yymm .go .selectTypeY { width:60px;}
-#popBody .calendar .yymm .go .selectTypeM { width:45px;}
-#popBody .calendar .yymm .go .inputTypeY { border:1px solid #c9c9c9; text-align:center; font:.9em Tahoma; color:#282828; width:31px; height:16px;}
-#popBody .calendar .yymm .go .inputTypeM { border:1px solid #c9c9c9; text-align:center; font:.9em Tahoma; color:#282828; width:20px; height:16px;}
-#popBody .calendar .yymm .left { vertical-align:middle; margin-right:14px;}
-#popBody .calendar .yymm .right { vertical-align:middle; margin-left:14px;}
-#popBody .calendar .yymm .left img,
-#popBody .calendar .yymm .right img { vertical-align:middle; position:relative; top:2px;}
-#popBody .calendar .dd { float:left; width:337px; background:#ffffff; border-left:10px solid #ffffff;}
-#popBody .calendar .dd td { border-bottom:1px solid #ededed; height:40px; text-align:center; color:#636363; font:1em Tahoma; cursor:pointer; width:14%;}
-#popBody .calendar .dd td:hover { background:#eeeeee;}
-#popBody .calendar .dd td strong { text-decoration:underline;}
-#popBody .calendar .dd td.sun { color:#c95b53;}
-#popBody .calendar .dd td.sat { color:#5378C9;}
-#popBody .calendar .dd .first { height:35px;}
-#popBody .calendar .dd .last td { height:35px; border-bottom:none;}
-#popBody .calendar .dd td .disable { color:#CCCCCC; }
-
-#popBody .calendar .select_color1 {background:#ffffff;color:#000000;}
-#popBody .calendar .select_color2 {background:#eeeeee;color:#000000;}
-#popBody .calendar .select_color10 {background:#ffff00;color:#000000;}
\ No newline at end of file
diff --git a/common/tpl/images/buttonSet.gif b/common/tpl/images/buttonSet.gif
new file mode 100755
index 000000000..3e13945cb
Binary files /dev/null and b/common/tpl/images/buttonSet.gif differ
diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html
index 50867fd6e..548730832 100644
--- a/common/tpl/popup_layout.html
+++ b/common/tpl/popup_layout.html
@@ -1,8 +1,12 @@
-<!--%import("css/popup.css")-->
 <!--%import("../../modules/admin/tpl/css/admin.css")-->
-<div id="popup_content">{$content}</div>
-
+<!--%import("../../modules/admin/tpl/css/pagination.css")-->
+<div id="xeAdmin">
+<div id="popup_content">
+    {$content}
+    <button class="xButton" type="button" onclick="window.close();return false;"><span>{$lang->cmd_close}</span></button>
+</div>
+</div>
 <script type="text/javascript">
     xAddEventListener(window, 'load', setFixedPopupSize); 
     var _isPoped = true;
-</script>
+</script>
\ No newline at end of file
diff --git a/config/config.inc.php b/config/config.inc.php
index cd03e3aae..e79fe0532 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -13,7 +13,7 @@
      * @brief XE의 전체 버전 표기
      * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
      **/
-    define('__ZBXE_VERSION__', '1.1.5');
+    define('__ZBXE_VERSION__', '1.2.0');
 
     /**
      * @brief zbXE가 설치된 장소의 base path를 구함
@@ -22,6 +22,16 @@
 
     /**
      * @brief 기본 설정에 우선하는 사용자 설정 파일
+     * config/config.user.inc.php 파일에 아래 내용을 저장하면 됨
+     * <?php 
+     * define('__DEBUG__', 0);
+     * define('__DEBUG_OUTPUT__', 0);
+     * define('__DEBUG_PROTECT__', 1);
+     * define('__DEBUG_PROTECT_IP__', '127.0.0.1');
+     * define('__DEBUG_DB_OUTPUT__', 0);
+     * define('__LOG_SLOW_QUERY__', 0);
+     * define('__OB_GZHANDLER_ENABLE__', 1);
+     * ?>
      */
     if(file_exists(_XE_PATH_.'config/config.user.inc.php')) {
         require _XE_PATH_.'config/config.user.inc.php';
@@ -75,8 +85,6 @@
      **/
     if(!defined('__OB_GZHANDLER_ENABLE__')) define('__OB_GZHANDLER_ENABLE__', 1);
 
-
-
     /**
      * @brief Firebug 콘솔 출력 사용시 관련 파일 require
      **/
@@ -98,8 +106,10 @@
      **/
     if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
     require_once(_XE_PATH_.'classes/object/Object.class.php');
+    require_once(_XE_PATH_.'classes/extravar/Extravar.class.php');
     require_once(_XE_PATH_.'classes/handler/Handler.class.php');
     require_once(_XE_PATH_.'classes/xml/XmlParser.class.php');
+    require_once(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
     require_once(_XE_PATH_.'classes/context/Context.class.php');
     require_once(_XE_PATH_.'classes/db/DB.class.php');
     require_once(_XE_PATH_.'classes/file/FileHandler.class.php');
@@ -110,5 +120,6 @@
     require_once(_XE_PATH_.'classes/display/DisplayHandler.class.php');
     require_once(_XE_PATH_.'classes/template/TemplateHandler.class.php');
     require_once(_XE_PATH_.'classes/mail/Mail.class.php');
+    require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
     if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
 ?>
diff --git a/config/func.inc.php b/config/func.inc.php
index d56b51c19..f82024cd1 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -262,7 +262,12 @@
             if($c<128) {
                 $char_width += (int)$chars[$c-32];
                 $idx++;
-            } else {
+            }
+            else if (191<$c && $c < 224) {
+			          $char_width += $chars[4];
+			          $idx += 2;
+		        }
+            else {
                 $char_width += $chars[0];
                 $idx += 3;
             }
@@ -533,6 +538,9 @@
         if(preg_match('/(src|href|lowsrc|dynsrc)=("|\'?)([\r\n]*)(vbscript|javascript)/is', $matches[2])) {
             $attrs = preg_replace('/(src|href|lowsrc|dynsrc)=("|\'?)([\r\n]*)(vbscript|javascript)/is','$1=$2_$4', $attrs);
         }
+        if(preg_match('/(url)[ \n]*\(("|\'?)([\r\n]*)(vbscript|javascript)/is', $matches[2])) {
+            $attrs = preg_replace('/(url)[ \n]*\(("|\'?)([\r\n]*)(vbscript|javascript)/is','$1($2_$4', $attrs);
+        }
 
         // 이벤트 제거
         // 전제 : 1. 이벤트명 앞에는 개행(r, n, rn)문자와 공백 문자만 올 수 있음
@@ -725,4 +733,4 @@
         }
     }
 
-?>
\ No newline at end of file
+?>
diff --git a/index.php b/index.php
index 55232bf83..7d485ca38 100644
--- a/index.php
+++ b/index.php
@@ -11,12 +11,8 @@
      * @section intro 소개
      * XE 는 오픈 프로젝트로 개발되는 오픈 소스입니다.\n
      * 자세한 내용은 아래 링크를 참조하세요.
-     * - 공식홈페이지        : http://www.zeroboard.com
-     * - XE 포럼           : http://www.zeroboard.com/forum_main
-     * - 이슈트래킹          : http://trac.zeroboard.com
-     * - SVN Repository      : http://svn.zeroboard.com/zeroboard_xe/trunk
-     * - document            : http://doc.zeroboard.com
-     * - pdf 문서            : http://doc.zeroboard.com/zeroboard_xe.pdf
+     * - 공식홈페이지        : http://www.xpressengine.com
+     * - SVN Repository      : http://svn.xpressengine.com/trunk
      * \n
      * "XpressEngine (XE)"은 자유 소프트웨어입니다. \n
      * 소프트웨어의 피양도자는 자유 소프트웨어 재단이 공표한 GNU 일반 공중 사용 허가서 2판 또는 \n
@@ -49,18 +45,25 @@
     $oContext->init();
 
     /**
-     * @brief ModuleHandler 객체를 생성/ 실행
-     *
-     * 모듈 핸들러는 Request Argument를 바탕으로 모듈을 찾아서\n
-     * 객체를 생성하고 기본 정보를 setting 해준다.\n
-     * ModuleHandler는 이 외에도 설치가 되어 있는지에 대한 체크를\n
-     * 하여 미설치시 Install 모듈을 실행하도록 한다\n
-     * 그리고 해당 모듈을 실행후 컨텐츠를 출력한다\n
+     * @brief SSO 인증 확인이 불필요할때 모듈 동작
      **/
-    $oModuleHandler = new ModuleHandler();
-    if($oModuleHandler->init()) {
-        $oModule = &$oModuleHandler->procModule();
-        $oModuleHandler->displayContent($oModule);
+    if($oContext->checkSSO()) {
+        
+        /**
+         * @brief ModuleHandler 객체를 생성/ 실행
+         *
+         * 모듈 핸들러는 Request Argument를 바탕으로 모듈을 찾아서\n
+         * 객체를 생성하고 기본 정보를 setting 해준다.\n
+         * ModuleHandler는 이 외에도 설치가 되어 있는지에 대한 체크를\n
+         * 하여 미설치시 Install 모듈을 실행하도록 한다\n
+         * 그리고 해당 모듈을 실행후 컨텐츠를 출력한다\n
+         **/
+        $oModuleHandler = new ModuleHandler();
+        if($oModuleHandler->init()) {
+            $oModule = &$oModuleHandler->procModule();
+            $oModuleHandler->displayContent($oModule);
+        }
+
     }
 
     $oContext->close();
diff --git a/layouts/cafeXE/conf/info.xml b/layouts/cafeXE/conf/info.xml
new file mode 100644
index 000000000..090af86b0
--- /dev/null
+++ b/layouts/cafeXE/conf/info.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE Cafe 공식 레이아웃</title>
+    <title xml:lang="zh-CN">官方站点模块布局</title>
+    <title xml:lang="zh-TW">虛擬網站官網版面</title>
+    <description xml:lang="ko">
+        XE Cafe 공식 레이아웃입니다.
+    </description>
+    <description xml:lang="zh-CN">
+        官方站点模块布局。
+    </description>
+    <description xml:lang="zh-TW">
+        虛擬網站官網版面。
+    </description>
+    <version>0.1</version>
+    <date>2009-02-09</date>
+    <link>http://www.xpressengine.com</link>
+
+    <author email_address="webmaster@xpressengine.com" link="http://www.xpressengine.com">
+        <name xml:lang="ko">XpressEngine</name>
+        <name xml:lang="zh-CN">XpressEngine</name>
+        <name xml:lang="zh-TW">XpressEngine</name>
+    </author>
+    <extra_vars>
+        <group>
+            <title xml:lang="ko">기본 설정</title>
+            <title xml:lang="zh-CN">常规选项</title>
+            <title xml:lang="zh-TW">預設</title>
+            <var name="colorset" type="select">
+                <title xml:lang="ko">컬러셋</title>
+                <title xml:lang="zh-CN">颜色</title>
+                <title xml:lang="zh-TW">顏色設定</title>
+                <description xml:lang="ko">원하시는 컬러셋을 선택해주세요.</description>
+                <description xml:lang="zh-CN">请选择颜色。</description>
+                <description xml:lang="zh-TW">請選擇顏色。</description>
+                <options value="white">
+                    <title xml:lang="ko">하얀색</title>
+                    <title xml:lang="zh-CN">白色</title>
+                    <title xml:lang="zh-TW">白色</title>
+                </options>
+                <options value="black">
+                    <title xml:lang="ko">검은색</title>
+                    <title xml:lang="zh-CN">黑色</title>
+                    <title xml:lang="zh-TW">黑色</title>
+                </options>
+            </var>
+            <var name="index_url" type="text">
+                <title xml:lang="ko">홈 페이지 URL</title>
+                <title xml:lang="zh-CN">站点地址</title>
+                <title xml:lang="zh-TW">主頁網址</title>
+                <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+                <description xml:lang="zh-CN">点击LOGO时要移动的页面地址。</description>
+                <description xml:lang="zh-TW">請輸入當用戶按了網站Logo後，要前往的頁面網址。</description>
+            </var>
+            <var name="logo_text" type="text">
+                <title xml:lang="ko">로고 글자</title>
+                <title xml:lang="zh-CN">站点标题</title>
+                <title xml:lang="zh-TW">Logo文字</title>
+                <description xml:lang="ko">좌측 상단의 로고 부분에 글자를 지정할 수 있습니다. 로고 이미지가 있으면 로고 이미지의 caption으로 표시됩니다.</description>
+                <description xml:lang="zh-CN">将显示在您的站点左侧头部，如你已上传lOGO图片，此标题将变成LOGO图片的caption。</description>
+                <description xml:lang="zh-TW">將顯示在虛擬網站的左上方，如果有上傳過Logo圖片，將會以圖片顯示。</description>
+            </var>
+            <var name="logo_image" type="image">
+                <title xml:lang="ko">로고이미지</title>
+                <title xml:lang="zh-CN">LOGO图片</title>
+                <title xml:lang="zh-TW">Logo圖片</title>
+                <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요.</description>
+                <description xml:lang="zh-CN">上传LOGO图片。</description>
+                <description xml:lang="zh-TW">請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)</description>
+            </var>
+            <var name="logo_background_image" type="image">
+                <title xml:lang="ko">로고 배경 이미지</title>
+                <title xml:lang="zh-CN">布局头部背景图片</title>
+                <title xml:lang="zh-TW">Logo背景圖片</title>
+                <description xml:lang="ko">로고가 있는 상단 영역의 배경 이미지를 적용하시려면 이미지를 등록해주세요.</description>
+                <description xml:lang="zh-CN">上传LOGO所在位头部背景图片。</description>
+                <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            </var>
+            <var name="content_background_image" type="image">
+                <title xml:lang="ko">내용 배경 이미지</title>
+                <title xml:lang="zh-CN">内容区背景图片</title>
+                <title xml:lang="zh-TW">內容背景圖片</title>
+                <description xml:lang="ko">내용이 있는 영역의 배경 이미지를 사용하시려면 이미지를 등록해주세요.</description>
+                <description xml:lang="zh-CN">上传内容区背景图片。</description>
+                <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            </var>
+        </group>
+        <group>
+            <title xml:lang="ko">모양 설정</title>
+            <title xml:lang="zh-CN">样式设置</title>
+            <title xml:lang="zh-TW">外觀設定</title>
+            <var name="content_position" type="select">
+                <title xml:lang="ko">본문 위치</title>
+                <title xml:lang="zh-CN">内容区位置</title>
+                <title xml:lang="zh-TW">選擇位置</title>
+                <description xml:lang="ko">본문의 위치를 좌/우중 선택할 수 있습니다.</description>
+                <description xml:lang="zh-CN">可以设置内容区的位置(左侧/右侧)。</description>
+                <description xml:lang="zh-TW">內容區域可選擇靠左側或右側。</description>
+                <options value="left">
+                    <title xml:lang="ko">왼쪽</title>
+                    <title xml:lang="zh-CN">左侧</title>
+                    <title xml:lang="zh-TW">左側</title>
+                </options>
+                <options value="right">
+                    <title xml:lang="ko">오른쪽</title>
+                    <title xml:lang="zh-CN">右侧</title>
+                    <title xml:lang="zh-TW">右側</title>
+                </options>
+            </var>
+        </group>
+
+    </extra_vars>
+
+    <menus>
+        <menu name="main_menu" maxdepth="5" default="true">
+            <title xml:lang="ko">메인 메뉴</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/layouts/cafeXE/css/layout.css b/layouts/cafeXE/css/layout.css
new file mode 100755
index 000000000..575fbc67c
--- /dev/null
+++ b/layouts/cafeXE/css/layout.css
@@ -0,0 +1,182 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+/* You'd better not fix : 이 파일 수정을 권장 안함 */
+
+/* Skip To Content */
+a.skipToContent{ display:block; position:relative; top:0; clear:both; overflow:hidden; height:0; text-decoration:none;}
+a.skipToContent:hover,
+a.skipToContent:active,
+a.skipToContent:focus{ height:auto; margin:0 0 10px 0; padding:5px;}
+
+/* Hr */
+hr.cafeXeHr{ display:none; position:absolute;}
+
+/* Container + Header + Body + Footer */
+#cafeXeContainer{ position:relative; margin:0 20px; *zoom:1;}
+#cafeXeHeader{ position:relative; padding:20px 0 10px; border-bottom:3px solid; *zoom:1; z-index:100;}
+#cafeXeHeader:after{ content:""; display:block; clear:both;}
+#cafeXeBody{ position:relative; padding-top:20px; padding-bottom:20px; *zoom:1;}
+#cafeXeBody:after{ content:""; display:block; clear:both;}
+#cafeXeContent{ position:relative; margin-bottom:20px; text-align:justify;}
+#cafeXeFooter{ position:relative; padding:10px 0; border-top:1px solid; *zoom:1; z-index:100;}
+#cafeXeFooter address{ text-align:center;}
+
+/* Layout Width */
+.cafeXeFixed #cafeXeContainer{ width:960px; margin-left:auto; margin-right:auto;}
+.cafeXeLiquid #cafeXeContainer{ width:80%; margin-left:auto; margin-right:auto;}
+.cafeXeHybrid #cafeXeContainer{ width:80%; margin-left:auto; margin-right:auto;}
+
+/* Align Layout */
+.aLeft #cafeXeContainer{ margin-left:0;}
+.aRight #cafeXeContainer{ margin-right:0;}
+
+/* Top Navigation */
+#cafeXeHeader .cafeXeNavigation{ position:relative; padding:15px 0 0 0; margin:0; overflow:hidden; float:right;}
+#cafeXeHeader .cafeXeNavigation:after{ content:""; display:block; clear:both;}
+#cafeXeHeader .cafeXeNavigation *{ margin:0; padding:0;}
+#cafeXeHeader .cafeXeNavigation h2{ display:none;}
+#cafeXeHeader .cafeXeNavigation li{ position:relative; float:left; list-style:none; padding:0 5px;}
+
+/* Footer Navigation */
+#cafeXeFooter .cafeXeNavigation{ position:relative; padding:0; margin:0 0 10px 0;}
+#cafeXeFooter .cafeXeNavigation:after{ content:""; display:block; clear:both;}
+#cafeXeFooter .cafeXeNavigation *{ margin:0; padding:0;}
+#cafeXeFooter .cafeXeNavigation h2{ display:none;}
+#cafeXeFooter .cafeXeNavigation .cafeXeSection{ text-align:center;}
+#cafeXeFooter .cafeXeNavigation ul{ position:relative; overflow:hidden;}
+#cafeXeFooter .cafeXeNavigation li{ display:inline; position:relative; list-style:none; padding:0 5px;}
+
+/* Neck */
+#neck{ position:relative; clear:both; *zoom:1;}
+#neck .cafeXeExtension{ margin-right:-30px; *zoom:1;}
+#neck .cafeXeExtension:after{ content:""; display:block; clear:both;}
+#neck .cafeXeExtension .cafeXeSection{ position:relative; float:left; width:300px; margin-right:30px;}
+.cafeXeLiquid #neck .cafeXeExtension .cafeXeSection{ width:30%; margin-right:3.3%;}
+
+/* Knee */
+#cafeXeKnee{ position:relative; clear:both; *zoom:1;}
+#cafeXeKnee{ padding-top:30px; border-top:1px solid;}
+#cafeXeKnee .cafeXeExtension{ margin-right:-30px; *zoom:1;}
+#cafeXeKnee .cafeXeExtension:after{ content:""; display:block; clear:both;}
+#cafeXeKnee .cafeXeExtension .cafeXeSection{ position:relative; float:left; width:300px; margin-right:30px;}
+.cafeXeLiquid #cafeXeKnee .cafeXeExtension .cafeXeSection{ width:30%; margin-right:3.3%;}
+
+/* Extension */
+.cafeXeExtension, 
+.cafeXeSection{position:relative; *zoom:1;}
+#cafeXeBody .cafeXeExtension{ position:relative; display:none; margin-bottom:20px;}
+.cafeXeExtension .cafeXeSection{ margin-bottom:20px;}
+
+/* ----- Fixed 2 Column Layout ----- */
+.cafeXeFixed .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeEC #cafeXeBody .cafeXeE1{ width:220px;}
+.cafeXeFixed .cafeXeCE #cafeXeBody #cafeXeContent,
+.cafeXeFixed .cafeXeEC #cafeXeBody #cafeXeContent{ width:720px;}
+.cafeXeFixed .cafeXeCE #cafeXeBody #cafeXeContent{ float:left;}
+.cafeXeFixed .cafeXeEC #cafeXeBody #cafeXeContent{ float:right;}
+.cafeXeFixed .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeEC #cafeXeBody .cafeXeE1{ display:block;}
+.cafeXeFixed .cafeXeCE #cafeXeBody .cafeXeE1{ float:right; clear:right;}
+.cafeXeFixed .cafeXeEC #cafeXeBody .cafeXeE1{ float:left; clear:left;}
+
+/* ----- Liquid 2 Column Layout ----- */
+.cafeXeLiquid .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeEC #cafeXeBody .cafeXeE1{ width:23%;}
+.cafeXeLiquid .cafeXeCE #cafeXeBody #cafeXeContent,
+.cafeXeLiquid .cafeXeEC #cafeXeBody #cafeXeContent{ width:75%;}
+.cafeXeLiquid .cafeXeCE #cafeXeBody #cafeXeContent{ float:left;}
+.cafeXeLiquid .cafeXeEC #cafeXeBody #cafeXeContent{ float:right;}
+.cafeXeLiquid .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeEC #cafeXeBody .cafeXeE1{ display:block;}
+.cafeXeLiquid .cafeXeCE #cafeXeBody .cafeXeE1{ float:right; clear:right;}
+.cafeXeLiquid .cafeXeEC #cafeXeBody .cafeXeE1{ float:left; clear:left;}
+
+/* ----- Hybrid 2 Column Layout ----- */
+.cafeXeHybrid .cafeXeCE #cafeXeBody{ padding-right:280px;}
+.cafeXeHybrid .cafeXeEC #cafeXeBody{ padding-left:280px;}
+.cafeXeHybrid .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeEC #cafeXeBody .cafeXeE1{ width:260px;}
+.cafeXeHybrid .cafeXeCE #cafeXeBody #cafeXeContent{ float:left; width:100%;}
+.cafeXeHybrid .cafeXeEC #cafeXeBody #cafeXeContent{ float:right; width:100%;}
+.cafeXeHybrid .cafeXeCE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeEC #cafeXeBody .cafeXeE1{ display:block;}
+.cafeXeHybrid .cafeXeCE #cafeXeBody .cafeXeE1{ float:right; clear:right; margin-left:-260px; right:-280px;}
+.cafeXeHybrid .cafeXeEC #cafeXeBody .cafeXeE1{ float:left; clear:left; margin-right:-260px; left:-280px;}
+
+/* ----- Fixed 3 Column Layout ----- */
+.cafeXeFixed .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeCEE #cafeXeBody .cafeXeE2,
+.cafeXeFixed .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeECE #cafeXeBody .cafeXeE2,
+.cafeXeFixed .cafeXeEEC #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeEEC #cafeXeBody .cafeXeE2{ display:block; width:200px;}
+
+.cafeXeFixed .cafeXeCEE #cafeXeBody #cafeXeContent,
+.cafeXeFixed .cafeXeECE #cafeXeBody #cafeXeContent,
+.cafeXeFixed .cafeXeEEC #cafeXeBody #cafeXeContent{ width:520px;}
+
+.cafeXeFixed .cafeXeCEE #cafeXeBody #cafeXeContent{ float:left; margin-right:20px;}
+.cafeXeFixed .cafeXeECE #cafeXeBody #cafeXeContent{ float:left; margin-right:-100%; left:220px;}
+.cafeXeFixed .cafeXeEEC #cafeXeBody #cafeXeContent{ float:right;}
+
+.cafeXeFixed .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeEEC #cafeXeBody .cafeXeE1{ float:left; margin-right:20px;}
+
+.cafeXeFixed .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeEEC #cafeXeBody .cafeXeE2{ float:left;}
+
+.cafeXeFixed .cafeXeCEE #cafeXeBody .cafeXeE2,
+.cafeXeFixed .cafeXeECE #cafeXeBody .cafeXeE2{ float:right;}
+
+/* ----- Liquid 3 Column Layout ----- */
+.cafeXeLiquid .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeCEE #cafeXeBody .cafeXeE2,
+.cafeXeLiquid .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeECE #cafeXeBody .cafeXeE2,
+.cafeXeLiquid .cafeXeEEC #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeEEC #cafeXeBody .cafeXeE2{ display:block; width:20%;}
+
+.cafeXeLiquid .cafeXeCEE #cafeXeBody #cafeXeContent,
+.cafeXeLiquid .cafeXeECE #cafeXeBody #cafeXeContent,
+.cafeXeLiquid .cafeXeEEC #cafeXeBody #cafeXeContent{ width:56%;}
+
+.cafeXeLiquid .cafeXeCEE #cafeXeBody #cafeXeContent{ float:left; margin-right:2%;}
+.cafeXeLiquid .cafeXeECE #cafeXeBody #cafeXeContent{ float:left; margin-right:-100%; left:22%;}
+.cafeXeLiquid .cafeXeEEC #cafeXeBody #cafeXeContent{ float:right;}
+
+.cafeXeLiquid .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeEEC #cafeXeBody .cafeXeE1{ float:left; margin-right:2%;}
+
+.cafeXeLiquid .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeLiquid .cafeXeEEC #cafeXeBody .cafeXeE2{ float:left;}
+
+.cafeXeLiquid .cafeXeCEE #cafeXeBody .cafeXeE2,
+.cafeXeLiquid .cafeXeECE #cafeXeBody .cafeXeE2{ float:right;}
+
+/* ----- Hybrid 3 Column Layout ----- */
+.cafeXeHybrid .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeCEE #cafeXeBody .cafeXeE2,
+.cafeXeHybrid .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeECE #cafeXeBody .cafeXeE2,
+.cafeXeHybrid .cafeXeEEC #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeEEC #cafeXeBody .cafeXeE2{ display:block; width:220px;}
+
+.cafeXeHybrid .cafeXeCEE #cafeXeBody{ padding-right:480px;}
+.cafeXeHybrid .cafeXeECE #cafeXeBody{ padding-left:240px; padding-right:240px;}
+.cafeXeHybrid .cafeXeEEC #cafeXeBody{ padding-left:480px;}
+
+.cafeXeHybrid .cafeXeCEE #cafeXeBody #cafeXeContent,
+.cafeXeHybrid .cafeXeECE #cafeXeBody #cafeXeContent,
+.cafeXeHybrid .cafeXeEEC #cafeXeBody #cafeXeContent{ width:100%;}
+
+.cafeXeHybrid .cafeXeCEE #cafeXeBody #cafeXeContent,
+.cafeXeHybrid .cafeXeECE #cafeXeBody #cafeXeContent{ float:left; margin-right:-100%;}
+.cafeXeHybrid .cafeXeEEC #cafeXeBody #cafeXeContent{ float:right;}
+
+.cafeXeHybrid .cafeXeECE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeEEC #cafeXeBody .cafeXeE2{ float:left; left:-240px; margin-right:-220px;}
+.cafeXeHybrid .cafeXeEEC #cafeXeBody .cafeXeE1{ float:left; left:-480px; margin-right:-220px;}
+
+.cafeXeHybrid .cafeXeCEE #cafeXeBody .cafeXeE1,
+.cafeXeHybrid .cafeXeECE #cafeXeBody .cafeXeE2{ float:right; left:240px; margin-left:-220px;}
+.cafeXeHybrid .cafeXeCEE #cafeXeBody .cafeXeE2{ float:right; left:480px; margin-left:-220px;}
\ No newline at end of file
diff --git a/layouts/cafeXE/css/layout@black.css b/layouts/cafeXE/css/layout@black.css
new file mode 100644
index 000000000..dbf79f06b
--- /dev/null
+++ b/layouts/cafeXE/css/layout@black.css
@@ -0,0 +1,20 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* Body */
+.cafeXe{ background:#000;}
+
+/* Heading */
+#cafeXeHeader a{ color:#999;}
+#cafeXeHeader h1.cafeXeH1 a{ color:#fff;}
+#cafeXeBody h2.cafeXeBodyH2{ color:#999; border-color:#999;}
+#cafeXeBody h2.cafeXeExtensionH2{ color:#999; border-color:#999;}
+#cafeXeKnee h2.cafeXeExtensionH2{ color:#ccc; border-color:#434343;}
+
+/* Layout */
+#cafeXeHeader,
+#cafeXeKnee,
+#cafeXeFooter{ background:#333; color:#666;}
+
+/* Footer */
+.cafeXeAddress abbr{ color:#fff;}
\ No newline at end of file
diff --git a/layouts/cafeXE/css/layout@cafe.css b/layouts/cafeXE/css/layout@cafe.css
new file mode 100644
index 000000000..8ccf1609b
--- /dev/null
+++ b/layouts/cafeXE/css/layout@cafe.css
@@ -0,0 +1,70 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* Common */
+.cafeXe{ margin:0; font-family:AppleGothic, Sans-serif;}
+.cafeXe a{ text-decoration:none;}
+.cafeXe a:hover,
+.cafeXe a:active,
+.cafeXe a:focus{ text-decoration:underline;}
+.cafeXe img{ border:0;}
+.cafeXe sup,
+.cafeXe sub{ line-height:1;}
+.cafeXeAddress{ font-style:normal;}
+
+/* Heading */
+#cafeXeBody h2.cafeXeBodyH2{ margin:0; padding-bottom:5px; font-size:16px; border-bottom:2px solid;}
+#cafeXeBody h2.cafeXeExtensionH2{ margin:0; padding-bottom:5px; font-size:16px; border-bottom:2px solid;}
+#cafeXeKnee h2.cafeXeExtensionH2{ position:relative; margin:0; font-size:12px; padding-bottom:5px; border-bottom:2px solid;}
+
+/* Container */
+.cafeXeFixed #cafeXeContainer{ width:auto;}
+
+/* Header */
+.cafeXeFixed .cafeXeEC #cafeXeHeader,
+.cafeXeFixed .cafeXeCE #cafeXeHeader{ border:0; padding:20px 0 0 0;}
+.cafeXeFixed .cafeXeEC #cafeXeHeader .cafeXeHeader,
+.cafeXeFixed .cafeXeCE #cafeXeHeader .cafeXeHeader{ position:relative; width:960px; margin:0 auto; padding-bottom:30px;}
+.cafeXeFixed .cafeXeEC #cafeXeHeader h1.cafeXeH1,
+.cafeXeFixed .cafeXeCE #cafeXeHeader h1.cafeXeH1{ margin:0;}
+.cafeXeFixed .cafeXeEC #cafeXeHeader h1.cafeXeH1 a,
+.cafeXeFixed .cafeXeCE #cafeXeHeader h1.cafeXeH1 a{ text-decoration:none;}
+.cafeXeFixed .cafeXeEC #cafeXeHeader .cafeXeUrl,
+.cafeXeFixed .cafeXeCE #cafeXeHeader .cafeXeUrl{ margin:0;}
+.cafeXeFixed .cafeXeEC #cafeXeHeader .cafeXeUrl a,
+.cafeXeFixed .cafeXeCE #cafeXeHeader .cafeXeUrl a{ font:10px Tahoma;}
+
+/* Body */
+.cafeXeFixed .cafeXeEC #cafeXeBody,
+.cafeXeFixed .cafeXeCE #cafeXeBody{ width:740px; margin:0 auto; padding-top:40px;}
+.cafeXeFixed .cafeXeEC #cafeXeBody{ padding-left:220px;}
+.cafeXeFixed .cafeXeCE #cafeXeBody{ padding-right:220px;}
+.cafeXeFixed .cafeXeEC #cafeXeBody .cafeXeE1,
+.cafeXeFixed .cafeXeCE #cafeXeBody .cafeXeE1{ width:180px;}
+.cafeXeFixed .cafeXeEC #cafeXeBody .cafeXeE1{ left:-220px; margin-right:-180px;}
+.cafeXeFixed .cafeXeCE #cafeXeBody .cafeXeE1{ right:-220px; margin-left:-180px;}
+.cafeXeFixed .cafeXeEC #cafeXeBody #cafeXeContent,
+.cafeXeFixed .cafeXeCE #cafeXeBody #cafeXeContent{ width:100%;}
+.cafeXeFixed .cafeXeEC #cafeXeBody #cafeXeContent .cafeXeSection,
+.cafeXeFixed .cafeXeCE #cafeXeBody #cafeXeContent .cafeXeSection{ margin-bottom:40px; *zoom:1;}
+
+/* Knee */
+.cafeXeFixed .cafeXeEC #cafeXeKnee,
+.cafeXeFixed .cafeXeCE #cafeXeKnee{ padding:30px 0; border:0;}
+.cafeXeFixed .cafeXeEC #cafeXeKnee .cafeXeExtension,
+.cafeXeFixed .cafeXeCE #cafeXeKnee .cafeXeExtension{ left:14px; _left:28px; width:988px; margin:0 auto;}
+.cafeXeFixed .cafeXeEC #cafeXeKnee .cafeXeExtension .cafeXeSection,
+.cafeXeFixed .cafeXeCE #cafeXeKnee .cafeXeExtension .cafeXeSection{ width:219px; margin-right:28px;}
+
+/* Footer */
+.cafeXeFixed .cafeXeEC #cafeXeFooter,
+.cafeXeFixed .cafeXeCE #cafeXeFooter{ padding:30px 0; border:0;}
+.cafeXeFixed .cafeXeEC #cafeXeFooter .cafeXeFooter,
+.cafeXeFixed .cafeXeCE #cafeXeFooter .cafeXeFooter{ position:relative; width:960px; margin:0 auto; *zoom:1; font:10px Tahoma;}
+.cafeXeFixed .cafeXeEC #cafeXeFooter .cafeXeFooter a,
+.cafeXeFixed .cafeXeCE #cafeXeFooter .cafeXeFooter a{ text-decoration:none;}
+.cafeXeFixed .cafeXeEC #cafeXeFooter .cafeXeFooter:after,
+.cafeXeFixed .cafeXeCE #cafeXeFooter .cafeXeFooter:after{ content:""; display:block; clear:both;}
+.cafeXeFixed .cafeXeEC #cafeXeFooter .cafeXeFooter address,
+.cafeXeFixed .cafeXeCE #cafeXeFooter .cafeXeFooter address{ float:left;}
+
diff --git a/layouts/cafeXE/css/layout@white.css b/layouts/cafeXE/css/layout@white.css
new file mode 100644
index 000000000..f219d629d
--- /dev/null
+++ b/layouts/cafeXE/css/layout@white.css
@@ -0,0 +1,20 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* Body */
+.cafeXe{ background:#fff;}
+
+/* Heading */
+#cafeXeHeader a{ color:#999;}
+#cafeXeHeader h1.cafeXeH1 a{ color:#fff;}
+#cafeXeBody h2.cafeXeBodyH2{ color:#333; border-color:#666;}
+#cafeXeBody h2.cafeXeExtensionH2{ color:#333; border-color:#666;}
+#cafeXeKnee h2.cafeXeExtensionH2{ color:#ccc; border-color:#434343;}
+
+/* Layout */
+#cafeXeHeader,
+#cafeXeKnee,
+#cafeXeFooter{ background:#333; color:#666;}
+
+/* Footer */
+.cafeXeAddress abbr{ color:#fff;}
\ No newline at end of file
diff --git a/layouts/cafeXE/css/widget.css b/layouts/cafeXE/css/widget.css
new file mode 100755
index 000000000..96e50bfbd
--- /dev/null
+++ b/layouts/cafeXE/css/widget.css
@@ -0,0 +1,866 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* common */
+.open{ display:block !important;}
+.floatLeft{ float:left;}
+.floatRight{ float:right;}
+.clearLeft{ clear:left;}
+.clearRight{ clear:right;}
+.widgetXeInputText{ border:1px solid; padding:2px 5px; font-size:12px;}
+.widgetXeInputCheck{ margin:0; width:13px; height:13px; vertical-align:middle;}
+.widgetXeInputSubmit{ padding:0;}
+.widgetXeAddress{ font-style:normal;}
+
+/* widgetContainer */
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+/* widgetDivider */
+dl.widgetDivider{ margin:0;}
+dl.widgetDivider dt{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0;}
+dl.widgetDivider dd{ display:none; margin:0;}
+
+/* widgetTableA */
+.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
+.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
+.widgetTableA td.title{ width:100%; white-space:normal;}
+.widgetTableA td .board{ padding-right:5px;}
+.widgetTableA td .notice{ padding-right:5px;}
+.widgetTableA td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableA td .replyNum a{ font:10px Tahoma;}
+.widgetTableA td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableA td.author{}
+.widgetTableA td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableB */
+.widgetTableB { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableB td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:8px 5px 6px 5px; border-bottom:1px solid;}
+.widgetTableB td.title{ width:100%; white-space:normal;}
+.widgetTableB td .board{ padding-right:5px;}
+.widgetTableB td .notice{ padding-right:5px;}
+.widgetTableB td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableB td .replyNum a{ font:10px Tahoma;}
+.widgetTableB td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableB td.author{}
+.widgetTableB td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableC */
+.widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
+.widgetTableC td.title,
+.widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
+.widgetTableC td.docNum{}
+.widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/white/iconForumNum.gif) no-repeat 0 0;}
+.widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
+.widgetTableC td.title dl{ margin:0;}
+.widgetTableC td.title dd{ margin:0;}
+.widgetTableC td.lastDoc p{ margin:0;}
+.widgetTableC td .author{ margin-right:5px;}
+.widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
+.widgetTableC td .time .date{ margin-right:5px;}
+
+/* widgetUlistA */
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li{ list-style:none;}
+
+/* widgetUlistB */
+.widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetUlistB:after{ content:""; display:block; clear:both;}
+.widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
+.widgetUlistB li .author{ float:left; margin-right:-42px;}
+.widgetUlistB li .author img{ border:1px solid;}
+.widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; _zoom:1;}
+.widgetUlistB li .title a{ text-decoration:underline;}
+.widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco .topLeft{}
+.widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
+.widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetOlistA */
+.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetOlistA li{ margin-left:25px;}
+.widgetOlistA li sup{ font-size:9px; font-family:tahoma; padding-left:10px; }
+
+/* widgetDlistA */
+.widgetDlistA{ margin:0; padding:0; font-size:12px; line-height:1.5; zoom:1;}
+.widgetDlistA:after{ content:""; display:block; clear:both;}
+.widgetDlistA dt{ float:left; clear:left; margin-right:5px; white-space:nowrap;}
+.widgetDlistA dd{ clear:right; white-space:nowrap; font-family:Tahoma;}
+
+/* widgetGalleryA */
+.widgetGalleryA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryA:after{ content:""; display:block; clear:both;}
+.widgetGalleryA li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none;}
+.widgetGalleryA li.clearRight{ margin-right:0;}
+.widgetGalleryA li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryA li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryA li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryA li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .author{ display:block;}
+.widgetGalleryA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .date{ font:11px Tahoma;}
+.widgetGalleryA li .hour{ font:11px Tahoma;}
+
+/* widgetGalleryB */
+.widgetGalleryB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryB:after{ content:""; display:block; clear:both;}
+.widgetGalleryB li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none; border-bottom:1px solid;}
+.widgetGalleryB li.clearRight{ margin-right:0;}
+.widgetGalleryB li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryB li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryB li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryB li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .author{ display:block;}
+.widgetGalleryB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .date{ font:11px Tahoma;}
+.widgetGalleryB li .hour{ font:11px Tahoma;}
+
+/* widgetZineA */
+.widgetZineA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineA:after{ content:""; display:block; clear:both;}
+.widgetZineA li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; overflow:hidden; *zoom:1;}
+.widgetZineA li p{ margin:0;}
+.widgetZineA li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineA li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.titleArea .board{ padding-right:5px;}
+.widgetZineA li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.authorArea{ margin-left:120px;}
+.widgetZineA li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineA li .thumb img{ position:relative; width:100%;}
+.widgetZineA li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineA li .title{ font-weight:bold;}
+.widgetZineA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .author{ margin-right:10px;}
+.widgetZineA li .date{ font:11px Tahoma;}
+.widgetZineA li .hour{ font:11px Tahoma;}
+
+/* widgetZineB */
+.widgetZineB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineB:after{ content:""; display:block; clear:both;}
+.widgetZineB li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; border-bottom:1px solid;}
+.widgetZineB li p{ margin:0;}
+.widgetZineB li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineB li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.titleArea .board{ padding-right:5px;}
+.widgetZineB li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.authorArea{ margin-left:120px;}
+.widgetZineB li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineB li .thumb img{ position:relative; width:100%;}
+.widgetZineB li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineB li .title{ font-weight:bold;}
+.widgetZineB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .author{ margin-right:10px;}
+.widgetZineB li .date{ font:11px Tahoma;}
+.widgetZineB li .hour{ font:11px Tahoma;}
+
+/* WidgetTree */
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -1px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetLogin */
+.widgetLogin{ font-size:12px;}
+.widgetLogin fieldset{ border:0; margin:0; padding:0;}
+.widgetLogin dl{ margin:0;}
+.widgetLogin dt{ display:none;}
+.widgetLogin dd{ margin:0 0 5px 0;}
+.widgetLogin dd .widgetXeInputText{ width:90%; height:16px;}
+.widgetLogin p{ margin:5px 0;}
+.widgetLogin p .widgetXeInputCheck{ margin-right:5px;}
+.widgetLogin .help{ position:relative; width:100%; overflow:hidden; margin:10px 0 0 0; padding:0;}
+.widgetLogin .help li{ position:relative; left:-5px; padding-left:5px; list-style:none; display:inline; letter-spacing:-1px;}
+
+/* widgetLastLogin */
+.widgetLastLogin{ margin:10px 0; font-size:12px;}
+.widgetLastLogin dt,
+.widgetLastLogin dd{ display:inline; margin:0;}
+.widgetLastLogin dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetMyInfo */
+.widgetMyInfo{ margin:0; padding:0; font-size:12px;}
+.widgetMyInfo:after{ content:""; display:block; clear:both; *zoom:1;}
+.widgetMyInfo li{ margin-bottom:5px; padding:0; text-indent:12px; list-style:none;}
+
+/* widgetLevel */
+.widgetLevel{ padding-left:30px; background-repeat:no-repeat; background-position:left 30%;}
+.widgetLevel em{ display:block; width:0; height:0; overflow:hidden; font-size:0; line-height:0; position:absolute;}
+
+/* widgetCounter */
+.widgetCounter{ font-size:12px; margin:0;}
+.widgetCounter dt,
+.widgetCounter dd{ height:18px;}
+.widgetCounter dt{ float:left; clear:left;}
+.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetLanguage */
+.widgetLanguage p{ float:right; margin:0;}
+.widgetLanguage .langList{ display:none; position:absolute; margin:0; padding:0; z-index:999;}
+.widgetLanguage .langList li{ list-style:none;}
+.widgetLanguage .langList li a{ font-size:12px; display:block; padding:2px 5px;}
+
+/* widgetTabA */
+.widgetTabA{ position:relative; margin:0; padding:0; *zoom:1; border-bottom:2px solid;}
+.widgetTabA:after{ content:""; display:block; clear:both;}
+.widgetTabA li{ float:left; margin-right:1px; list-style:none; background-repeat:no-repeat; background-position:0 0;}
+.widgetTabA li.active{ background-position:0 -30px;}
+.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
+.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
+
+/* widgetTabB */
+.widgetTabB{ margin:0; position:absolute; top:1px; right:0; white-space:nowrap; font-size:12px;}
+.widgetTabB li{ display:inline;}
+.widgetTabB li.active a{ font-weight:bold;}
+
+/* widgetTabC */
+.widgetTabC{ margin:0; padding:0; font-size:12px; border-top:1px solid;}
+.widgetTabC li{ list-style:none; border-bottom:1px solid; *zoom:1; margin-bottom:1px;}
+.widgetTabC li a{ display:block; padding:7px 0 6px 10px; text-decoration:none; *zoom:1;}
+
+/* widgetThumb */
+.widgetThumb{ position:relative; margin:0; text-align:center; font-size:12px; line-height:1.5;}
+.widgetThumb .thumb{ display:block; margin-bottom:5px; position:relative; *zoom:1; text-decoration:none;}
+.widgetThumb .thumb img{ display:block; width:100%;}
+.widgetThumb .thumb .imgNone{ display:block; position:relative; width:100%; padding-top:30px; padding-bottom:50px; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetThumb .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetThumb .title{ display:block;}
+.widgetThumb .author{ display:block;}
+.widgetThumb .date{ font-size:11px; font-family:Tahoma;}
+.widgetThumb .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetContainer */
+.widgetContainer{ *zoom:1;}
+.widgetContainer:after{ content:""; display:block; clear:both;}
+
+/* widgetNavigator */
+.widgetNavigator{ margin:0; padding:0; text-align:right; clear:both;}
+.widgetNavigator li{ list-style:none; display:inline;}
+.widgetNavigator li button{ width:16px; height:16px; padding:0; background-color:transparent; background-image:url(../img/white/buttonWidgetNavigation.gif); border:1px solid #999; cursor:pointer;}
+.widgetNavigator li button.prev{ background-position:left center; *background-position:-1px center;}
+.widgetNavigator li button.next{ background-position:right center; *background-position:13px center;}
+.widgetNavigator li button span{ position:absolute; display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+/* widgetTagCloud */
+.widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
+.widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
+.widgetTagCloud li.level1 a{ font-size:11px;}
+.widgetTagCloud li.level2 a{ font-size:12px;}
+.widgetTagCloud li.level3 a{ font-size:14px; font-weight:bold;}
+.widgetTagCloud li.level4 a{ font-size:18px; font-weight:bold;}
+
+/* widgetCalendar */
+.widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
+.widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
+.widgetCalendarNavigation button.prevYear{ left:0;}
+.widgetCalendarNavigation button.prevMonth{ left:25px;}
+.widgetCalendarNavigation button.nextYear{ right:0;}
+.widgetCalendarNavigation button.nextMonth{ right:25px;}
+.widgetCalendar{ position:relative; border:0; width:100%;}
+.widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
+.widgetCalendar th,
+.widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
+.widgetCalendar th{ font-size:10px; font-family:Tahoma; font-weight:normal;}
+.widgetCalendar td,
+.widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
+.widgetCalendar td em{ font-style:normal;}
+
+/* widgetPoint */
+.widgetPoint{ margin:0; *zoom:1; clear:both;}
+.widgetPoint:after{ content:""; display:block; clear:both;}
+.widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
+.widgetPoint dd{ margin:0;}
+.widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
+.widgetPoint dd.graph img{ width:0%;}
+.widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
+.widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
+
+/* widgetMenuA */
+.widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
+.widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
+.widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuA li li.active sup{ color:#ff1a1a;}
+.widgetMenuA li li{ padding:0; border:0;}
+.widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
+.widgetMenuA li.active ul{ display:block;}
+.widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
+.widgetMenuA li.active a{ font-weight:bold;}
+.widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
+.widgetMenuA li li.active a{ color:#ff1a1a;}
+.widgetMenuA li.active li a:hover,
+.widgetMenuA li.active li a:active,
+.widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetMenuB */
+.widgetMenuB{ margin:0; padding:0; font-size:12px; line-height:1.3; border-top:1px solid;}
+.widgetMenuB li{ position:relative; list-style:none; border-bottom:1px solid; white-space:nowrap; *zoom:1;}
+.widgetMenuB li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuB li li{ padding:2px 10px; border:none;}
+.widgetMenuB li li.first{ left:-4px; padding-left:14px; background-repeat:no-repeat; background-position:0 center;}
+.widgetMenuB li li.active sup{ color:#ff1a1a;}
+.widgetMenuB li ul{ position:absolute; display:none; top:-1px; left:100%; margin:0 0 0 5px; padding:5px 0 10px 0; border:1px solid}
+.widgetMenuB li.active{ z-index:100;}
+.widgetMenuB li.active ul{ display:block;}
+.widgetMenuB li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important; *zoom:1;}
+.widgetMenuB li.active a{ font-weight:bold;}
+.widgetMenuB li.active li a{ font-weight:normal; padding:0; background:none !important;}
+.widgetMenuB li li.active a{ color:#ff1a1a;}
+.widgetMenuB li.active li a:hover,
+.widgetMenuB li.active li a:active,
+.widgetMenuB li.active li a:focus{ text-decoration:underline !important;}
+
+.widgetMenuC{ margin:0; padding:0; font-size:12px; line-height:1.2; background-repeat:repeat-x;background-position:0 0;}
+.widgetMenuC ul{ margin:0; padding:0; height:35px;}
+.widgetMenuC ul li ul{ display:none; position:absolute; top:40px; left:20px; height:auto; padding-bottom:7px; background:#35ad06; border:1px solid #027a00;}
+.widgetMenuC ul li.active ul{ display:block;}
+.widgetMenuC ul.aCenter{ margin-left:auto; margin-right:auto;}
+.widgetMenuC ul.aLeft{ margin-right:auto;}
+.widgetMenuC ul.aRight{ margin-left:auto;}
+.widgetMenuC li{ position:relative; padding-right:3px; float:left; list-style:none; background-repeat:no-repeat;background-position:right -40px; white-space:nowrap;}
+.widgetMenuC li a{ position:relative; float:left; padding:12px 22px 0 25px; height:23px; color:#fff !important; text-decoration:none !important;}
+.widgetMenuC li.first a{ background-repeat:no-repeat;background-position:left -40px;}
+.widgetMenuC li.active{ margin-left:-2px; background-repeat:no-repeat;background-position:right -80px;}
+.widgetMenuC li.active a{ font-weight:bold; color:#ff0 !important; background-repeat:no-repeat; background-position:left -80px;}
+.widgetMenuC li.active li{ padding:2px 15px; float:none; background:none;}
+.widgetMenuC li.active li.active{ margin:0;}
+.widgetMenuC li.active li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
+.widgetMenuC li.active li a{ display:block; _display:inline-block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none;}
+.widgetMenuC li.active li.active a{ color:#ff0 !important;}
+.widgetMenuC li.active li a:hover,
+.widgetMenuC li.active li a:active,
+.widgetMenuC li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetSearch */
+.widgetSearch{ position:absolute; bottom:30px; right:0;}
+.widgetSearch fieldset{ border:0; margin:0; padding:0; position:absolute; bottom:0; right:0;}
+.widgetSearch .widgetXeInputText{ width:153px; height:16px; padding:2px 20px 2px 5px; vertical-align:middle; border:1px solid #666; border-top-color:#555; border-left-color:#555; background:#444; color:#fff;}
+.widgetSearch .widgetXeInputText:focus{ background:#494949;}
+.widgetSearch .widgetSearch{ position:absolute; top:3px; right:4px; vertical-align:middle;}
+
+address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
+
+/* white coloset */
+.widgetContainer .widgetXeInputText{ border-color:#ccc; background:#f4f4f4; color:#000;}
+
+/* widgetTableA */
+.widgetContainer .widgetTableA td.title a{ color:#333;}
+.widgetContainer .widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableA td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableA td .author { color:#333;}
+.widgetContainer .widgetTableA td .date{ color:#333;}
+.widgetContainer .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer .widgetTableB,
+.widgetContainer .widgetTableB td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableB td.title a{ color:#333;}
+.widgetContainer .widgetTableB td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableB td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableB td .author { color:#333;}
+.widgetContainer .widgetTableB td .date{ color:#333;}
+.widgetContainer .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer .widgetTableC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td.title a{ color:#333;}
+.widgetContainer .widgetTableC td.title dd{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc p a{ color:#333;}
+.widgetContainer .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer .widgetUlistA li a{ color:#666;}
+
+/* widgetUlistB */
+.widgetContainer .widgetUlistB li .author img{ border-color:#ccc;}
+.widgetContainer .widgetUlistB li .title{ border-color:#eee; color:#333; background:#fff;}
+.widgetContainer .widgetUlistB li .title a{ color:#0066ff;}
+.widgetContainer .widgetUlistB li .title .arrow{ background:url(../img/white/arrowUlistB.gif) no-repeat;}
+.widgetContainer .widgetUlistB li .title .deco{ background:#fff;}
+.widgetContainer .widgetUlistB li .title .date{ color:#333;}
+.widgetContainer .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer .widgetOlistA li,
+.widgetContainer .widgetOlistA li a{ color:#666;}
+.widgetContainer .widgetOlistA li sup{ color:#AAA;}
+
+/* widgetDlistA */
+.widgetContainer .widgetDlistA dt{ color:#333;}
+.widgetContainer .widgetDlistA dd,
+.widgetContainer .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer .widgetGalleryA li .title{ color:#333;}
+.widgetContainer .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryA li .author{ color:#333;}
+.widgetContainer .widgetGalleryA li .date{ color:#333;}
+.widgetContainer .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer .widgetGalleryB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetGalleryB li .title{ color:#333;}
+.widgetContainer .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryB li .author{ color:#333;}
+.widgetContainer .widgetGalleryB li .date{ color:#333;}
+.widgetContainer .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer .widgetZineA li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineA li .title{ color:#666;}
+.widgetContainer .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineA li .author{ color:#333;}
+.widgetContainer .widgetZineA li .date{ color:#333;}
+.widgetContainer .widgetZineA li .hour{ color:#888;}
+.widgetContainer .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer .widgetZineB li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetZineB li .title{ color:#666;}
+.widgetContainer .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineB li .author{ color:#333;}
+.widgetContainer .widgetZineB li .date{ color:#333;}
+.widgetContainer .widgetZineB li .hour{ color:#888;}
+.widgetContainer .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer .widgetLogin label{ color:#333;}
+.widgetContainer .widgetLogin .help a{ color:#333;}
+.widgetContainer .widgetLogin .help li{ background:url(../img/white/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer .widgetLastLogin dt{ color:#333;}
+.widgetContainer .widgetLastLogin dd{ color:#888;}
+.widgetContainer .widgetLastLogin a{ color:#333;}
+.widgetContainer .widgetLastLogin li{ background:url(../img/white/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer .widgetMyInfo li a{ color:#666;}
+.widgetContainer .widgetMyInfo li{ background:url(../img/white/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer .widgetTree{ color:#333;}
+.widgetContainer .widgetTree a{ color:#333;}
+
+/* widgetCounter */
+.widgetContainer .widgetCounter dt{ color:#333;}
+.widgetContainer .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer .widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer .widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer .widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer .widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetLevel */
+.widgetContainer .widgetLevel.num0 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/0.gif);}
+.widgetContainer .widgetLevel.num1 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/1.gif);}
+.widgetContainer .widgetLevel.num2 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/2.gif);}
+.widgetContainer .widgetLevel.num3 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/3.gif);}
+.widgetContainer .widgetLevel.num4 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/4.gif);}
+.widgetContainer .widgetLevel.num5 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/5.gif);}
+.widgetContainer .widgetLevel.num6 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/6.gif);}
+.widgetContainer .widgetLevel.num7 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/7.gif);}
+.widgetContainer .widgetLevel.num8 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/8.gif);}
+.widgetContainer .widgetLevel.num9 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/9.gif);}
+.widgetContainer .widgetLevel.num10 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/10.gif);}
+.widgetContainer .widgetLevel.num11 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/11.gif);}
+.widgetContainer .widgetLevel.num12 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/12.gif);}
+.widgetContainer .widgetLevel.num13 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/13.gif);}
+.widgetContainer .widgetLevel.num14 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/14.gif);}
+.widgetContainer .widgetLevel.num15 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/15.gif);}
+.widgetContainer .widgetLevel.num16 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/16.gif);}
+.widgetContainer .widgetLevel.num17 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/17.gif);}
+.widgetContainer .widgetLevel.num18 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/18.gif);}
+.widgetContainer .widgetLevel.num19 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/19.gif);}
+.widgetContainer .widgetLevel.num20 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/20.gif);}
+.widgetContainer .widgetLevel.num21 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/21.gif);}
+.widgetContainer .widgetLevel.num22 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/22.gif);}
+.widgetContainer .widgetLevel.num23 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/23.gif);}
+.widgetContainer .widgetLevel.num24 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/24.gif);}
+.widgetContainer .widgetLevel.num25 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/25.gif);}
+.widgetContainer .widgetLevel.num26 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/26.gif);}
+.widgetContainer .widgetLevel.num27 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/27.gif);}
+.widgetContainer .widgetLevel.num28 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/28.gif);}
+.widgetContainer .widgetLevel.num29 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/29.gif);}
+.widgetContainer .widgetLevel.num30 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/30.gif);}
+
+/* widgetTabA */
+.widgetContainer .widgetTabA{ border-color:#666;}
+.widgetContainer .widgetTabA li,
+.widgetContainer .widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
+.widgetContainer .widgetTabA li a{ color:#333;}
+
+/* widgetTabB */ 
+.widgetContainer .widgetTabB li a{ color:#333;}
+
+/* widgetTabC */
+.widgetContainer .widgetTabC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTabC li{ border-color:#e5e5e5; background:#f8f8f8;}
+.widgetContainer .widgetTabC li a{ color:#333;}
+.widgetContainer .widgetTabC li a:hover,
+.widgetContainer .widgetTabC li a:active,
+.widgetContainer .widgetTabC li a:focus{ background:#eee;}
+
+/* widgetThumb */
+.widgetContainer .widgetThumb{ color:#333;}
+.widgetContainer .widgetThumb a{ color:#333;}
+.widgetContainer .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer .widgetTagCloud li a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level1 a{ color:#999;}
+.widgetContainer .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level3 a{ color:#333;}
+.widgetContainer .widgetTagCloud li.level4 a{ color:#000;}
+
+/* widgetCalendar */
+.widgetContainer .widgetCalendarNavigation button{ color:#333;}
+.widgetContainer .widgetCalendar caption{ color:#333;}
+.widgetContainer .widgetCalendar th{ background:#eee; color:#333;}
+.widgetContainer .widgetCalendar th.sun,
+.widgetContainer .widgetCalendar td.sun,
+.widgetContainer .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer .widgetCalendar td,
+.widgetContainer .widgetCalendar td a{ color:#666;}
+.widgetContainer .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer .widgetPoint dt{ color:#333;}
+
+/* widgetMenuA */
+.widgetContainer .widgetMenuA{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuA li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer .widgetMenuB{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuB li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+.widgetContainer .widgetMenuB li ul{ border-color:#ddd; background:#fff;}
+.widgetContainer .widgetMenuB li li.first{ background-image:url(../img/white/arrowMenuB.gif);}
+
+/* widgetMenuCgreen */
+.widgetContainer .widgetMenuCgreen{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen ul li ul{ background:#35ad06; border-color:#027a00;}
+.widgetContainer .widgetMenuCgreen li{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.first a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
+
+/* widgetMenuCblue */
+.widgetContainer .widgetMenuCblue{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue ul li ul{ background:#0688ad; border-color:#00557a;}
+.widgetContainer .widgetMenuCblue li{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.first a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
+
+/* widgetMenuCcyan */
+.widgetContainer .widgetMenuCcyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan ul li ul{ background:#06a4ad; border-color:#00717a;}
+.widgetContainer .widgetMenuCcyan li{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.first a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
+
+/* widgetMenuCorange */
+.widgetContainer .widgetMenuCorange{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange ul li ul{ background:#ad9906; border-color:#7a6600;}
+.widgetContainer .widgetMenuCorange li{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.first a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
+
+/* widgetMenuCred */
+.widgetContainer .widgetMenuCred{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred ul li ul{ background:#ad4606; border-color:#7a1300;}
+.widgetContainer .widgetMenuCred li{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.first a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
+
+/* widgetMenuCgray */
+.widgetContainer .widgetMenuCgray{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray ul li ul{ background:#595959; border-color:#7a1300;}
+.widgetContainer .widgetMenuCgray li{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.first a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
+
+.widgetContainer address.period { color:#AAA; }
+
+/* black colorset Class */
+.widgetContainer.black .widgetXeInputText{ border-color:#666; background:#333; color:#ccc;}
+
+/* widgetTableA */
+.widgetContainer.black .widgetTableA td.title a{ color:#999;}
+.widgetContainer.black .widgetTableA td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableA td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableA td .author { color:#999;}
+.widgetContainer.black .widgetTableA td .date{ color:#999;}
+.widgetContainer.black .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer.black .widgetTableB,
+.widgetContainer.black .widgetTableB td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableB td.title a{ color:#999;}
+.widgetContainer.black .widgetTableB td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableB td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableB td .author { color:#999;}
+.widgetContainer.black .widgetTableB td .date{ color:#999;}
+.widgetContainer.black .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer.black .widgetTableC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td.title a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.title dd{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc p a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer.black .widgetUlistA li a{ color:#999;}
+
+/* widgetUlistB */
+.widgetContainer.black .widgetUlistB li .author img{ border-color:#666;}
+.widgetContainer.black .widgetUlistB li .title{ border-color:#333; color:#999; background:#000;}
+.widgetContainer.black .widgetUlistB li .title a{ color:#3399ff;}
+.widgetContainer.black .widgetUlistB li .title .arrow{ background:url(../img/black/arrowUlistB.gif) no-repeat;}
+.widgetContainer.black .widgetUlistB li .title .deco{ background:#000;}
+.widgetContainer.black .widgetUlistB li .title .date{ color:#999;}
+.widgetContainer.black .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer.black .widgetOlistA li,
+.widgetContainer.black .widgetOlistA li a{ color:#999;}
+.widgetContainer.black .widgetOlistA li sup{ color:#666;}
+
+/* widgetDlistA */
+.widgetContainer.black .widgetDlistA dt{ color:#999;}
+.widgetContainer.black .widgetDlistA dd,
+.widgetContainer.black .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer.black .widgetGalleryA li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryA li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer.black .widgetGalleryB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetGalleryB li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryB li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer.black .widgetZineA li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineA li .title{ color:#999;}
+.widgetContainer.black .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineA li .author{ color:#999;}
+.widgetContainer.black .widgetZineA li .date{ color:#999;}
+.widgetContainer.black .widgetZineA li .hour{ color:#888;}
+.widgetContainer.black .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer.black .widgetZineB li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetZineB li .title{ color:#999;}
+.widgetContainer.black .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineB li .author{ color:#999;}
+.widgetContainer.black .widgetZineB li .date{ color:#999;}
+.widgetContainer.black .widgetZineB li .hour{ color:#888;}
+.widgetContainer.black .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer.black .widgetLogin label{ color:#999;}
+.widgetContainer.black .widgetLogin .help a{ color:#ccc;}
+.widgetContainer.black .widgetLogin .help li{ background:url(../img/black/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer.black .widgetLastLogin dt{ color:#999;}
+.widgetContainer.black .widgetLastLogin dd{ color:#888;}
+.widgetContainer.black .widgetLastLogin a{ color:#333;}
+.widgetContainer.black .widgetLastLogin li{ background:url(../img/black/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer.black .widgetMyInfo li a{ color:#999;}
+.widgetContainer.black .widgetMyInfo li{ background:url(../img/black/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a{ color:#999;}
+
+/* widgetCounter */
+.widgetContainer.black .widgetCounter dt{ color:#999;}
+.widgetContainer.black .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer.black .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer.black .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer.black .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetLevel */
+.widgetContainer.black .widgetLevel.num0 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/0.gif);}
+.widgetContainer.black .widgetLevel.num1 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/1.gif);}
+.widgetContainer.black .widgetLevel.num2 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/2.gif);}
+.widgetContainer.black .widgetLevel.num3 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/3.gif);}
+.widgetContainer.black .widgetLevel.num4 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/4.gif);}
+.widgetContainer.black .widgetLevel.num5 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/5.gif);}
+.widgetContainer.black .widgetLevel.num6 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/6.gif);}
+.widgetContainer.black .widgetLevel.num7 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/7.gif);}
+.widgetContainer.black .widgetLevel.num8 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/8.gif);}
+.widgetContainer.black .widgetLevel.num9 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/9.gif);}
+.widgetContainer.black .widgetLevel.num10 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/10.gif);}
+.widgetContainer.black .widgetLevel.num11 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/11.gif);}
+.widgetContainer.black .widgetLevel.num12 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/12.gif);}
+.widgetContainer.black .widgetLevel.num13 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/13.gif);}
+.widgetContainer.black .widgetLevel.num14 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/14.gif);}
+.widgetContainer.black .widgetLevel.num15 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/15.gif);}
+.widgetContainer.black .widgetLevel.num16 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/16.gif);}
+.widgetContainer.black .widgetLevel.num17 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/17.gif);}
+.widgetContainer.black .widgetLevel.num18 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/18.gif);}
+.widgetContainer.black .widgetLevel.num19 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/19.gif);}
+.widgetContainer.black .widgetLevel.num20 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/20.gif);}
+.widgetContainer.black .widgetLevel.num21 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/21.gif);}
+.widgetContainer.black .widgetLevel.num22 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/22.gif);}
+.widgetContainer.black .widgetLevel.num23 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/23.gif);}
+.widgetContainer.black .widgetLevel.num24 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/24.gif);}
+.widgetContainer.black .widgetLevel.num25 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/25.gif);}
+.widgetContainer.black .widgetLevel.num26 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/26.gif);}
+.widgetContainer.black .widgetLevel.num27 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/27.gif);}
+.widgetContainer.black .widgetLevel.num28 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/28.gif);}
+.widgetContainer.black .widgetLevel.num29 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/29.gif);}
+.widgetContainer.black .widgetLevel.num30 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/30.gif);}
+
+/* widgetTabA */
+.widgetContainer.black .widgetTabA{ border-color:#999;}
+.widgetContainer.black .widgetTabA li,
+.widgetContainer.black .widgetTabA li a{ background-image:url(../img/black/buttonWidgetTab.gif);}
+.widgetContainer.black .widgetTabA li a{ color:#999;}
+
+/* widgetTabB */
+.widgetContainer.black .widgetTabB li a{ color:#999;}
+
+/* widgetTabC */
+.widgetContainer.black .widgetTabC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTabC li{ border-color:#7f7f7f; background:#222;}
+.widgetContainer.black .widgetTabC li a{ color:#999;}
+.widgetContainer.black .widgetTabC li a:hover,
+.widgetContainer.black .widgetTabC li a:active,
+.widgetContainer.black .widgetTabC li a:focus{ background:#333;}
+
+/* widgetThumb */
+.widgetContainer.black .widgetThumb{ color:#999;}
+.widgetContainer.black .widgetThumb a{ color:#999;}
+.widgetContainer.black .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer.black .widgetTagCloud li a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level1 a{ color:#333;}
+.widgetContainer.black .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer.black .widgetTagCloud li.level3 a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level4 a{ color:#fff;}
+
+/* widgetCalendar */
+.widgetContainer.black .widgetCalendarNavigation button{ color:#999;}
+.widgetContainer.black .widgetCalendar caption{ color:#999;}
+.widgetContainer.black .widgetCalendar th{ background:#333; color:#fff;}
+.widgetContainer.black .widgetCalendar th.sun,
+.widgetContainer.black .widgetCalendar td.sun,
+.widgetContainer.black .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer.black .widgetCalendar td,
+.widgetContainer.black .widgetCalendar td a{ color:#999;}
+.widgetContainer.black .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer.black .widgetPoint dt{ color:#999;}
+
+/* widgetMenuA */
+.widgetContainer.black .widgetMenuA{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuA li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer.black .widgetMenuB{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuB li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+.widgetContainer.black .widgetMenuB li ul{ border-color:#777; background:#000;}
+.widgetContainer.black .widgetMenuB li li.first{ background-image:url(../img/black/arrowMenuB.gif);}
+
+address.period { color:#333; }
diff --git a/layouts/cafeXE/img/black/buttonSearch.gif b/layouts/cafeXE/img/black/buttonSearch.gif
new file mode 100755
index 000000000..f8be7f12b
Binary files /dev/null and b/layouts/cafeXE/img/black/buttonSearch.gif differ
diff --git a/layouts/cafeXE/img/black/buttonTreeCollapse.gif b/layouts/cafeXE/img/black/buttonTreeCollapse.gif
new file mode 100755
index 000000000..53a942d58
Binary files /dev/null and b/layouts/cafeXE/img/black/buttonTreeCollapse.gif differ
diff --git a/layouts/cafeXE/img/black/iconMyInfo.gif b/layouts/cafeXE/img/black/iconMyInfo.gif
new file mode 100755
index 000000000..17670aa55
Binary files /dev/null and b/layouts/cafeXE/img/black/iconMyInfo.gif differ
diff --git a/layouts/cafeXE/img/black/iconWidgetList.gif b/layouts/cafeXE/img/black/iconWidgetList.gif
new file mode 100755
index 000000000..f376452ed
Binary files /dev/null and b/layouts/cafeXE/img/black/iconWidgetList.gif differ
diff --git a/layouts/cafeXE/img/black/lineTextDiv.gif b/layouts/cafeXE/img/black/lineTextDiv.gif
new file mode 100755
index 000000000..a573ed164
Binary files /dev/null and b/layouts/cafeXE/img/black/lineTextDiv.gif differ
diff --git a/layouts/cafeXE/img/black/lineTreeHr.gif b/layouts/cafeXE/img/black/lineTreeHr.gif
new file mode 100755
index 000000000..995f620d1
Binary files /dev/null and b/layouts/cafeXE/img/black/lineTreeHr.gif differ
diff --git a/layouts/cafeXE/img/black/lineTreeLastHr.gif b/layouts/cafeXE/img/black/lineTreeLastHr.gif
new file mode 100755
index 000000000..96c8d09ae
Binary files /dev/null and b/layouts/cafeXE/img/black/lineTreeLastHr.gif differ
diff --git a/layouts/cafeXE/img/black/lineTreeVr.gif b/layouts/cafeXE/img/black/lineTreeVr.gif
new file mode 100755
index 000000000..031c4bb42
Binary files /dev/null and b/layouts/cafeXE/img/black/lineTreeVr.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuB.gif b/layouts/cafeXE/img/white/arrowMenuB.gif
new file mode 100755
index 000000000..c5467bb7c
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuB.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCblue.gif b/layouts/cafeXE/img/white/arrowMenuCblue.gif
new file mode 100755
index 000000000..e526ab1bb
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCblue.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCcyan.gif b/layouts/cafeXE/img/white/arrowMenuCcyan.gif
new file mode 100755
index 000000000..d0b527151
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCcyan.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCgray.gif b/layouts/cafeXE/img/white/arrowMenuCgray.gif
new file mode 100755
index 000000000..295acf099
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCgray.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCgreen.gif b/layouts/cafeXE/img/white/arrowMenuCgreen.gif
new file mode 100755
index 000000000..ba70c4046
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCgreen.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCorange.gif b/layouts/cafeXE/img/white/arrowMenuCorange.gif
new file mode 100755
index 000000000..f1d37bbf9
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCorange.gif differ
diff --git a/layouts/cafeXE/img/white/arrowMenuCred.gif b/layouts/cafeXE/img/white/arrowMenuCred.gif
new file mode 100755
index 000000000..e94beeb7e
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowMenuCred.gif differ
diff --git a/layouts/cafeXE/img/white/arrowUlistB.gif b/layouts/cafeXE/img/white/arrowUlistB.gif
new file mode 100755
index 000000000..c5622a7cc
Binary files /dev/null and b/layouts/cafeXE/img/white/arrowUlistB.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCblue.gif b/layouts/cafeXE/img/white/bgMenuCblue.gif
new file mode 100755
index 000000000..218f0b3f7
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCblue.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCcyan.gif b/layouts/cafeXE/img/white/bgMenuCcyan.gif
new file mode 100755
index 000000000..666c8b08c
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCcyan.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCgray.gif b/layouts/cafeXE/img/white/bgMenuCgray.gif
new file mode 100755
index 000000000..56981ced0
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCgray.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCgreen.gif b/layouts/cafeXE/img/white/bgMenuCgreen.gif
new file mode 100755
index 000000000..2c4a20c83
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCgreen.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCorange.gif b/layouts/cafeXE/img/white/bgMenuCorange.gif
new file mode 100755
index 000000000..c3ebf218b
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCorange.gif differ
diff --git a/layouts/cafeXE/img/white/bgMenuCred.gif b/layouts/cafeXE/img/white/bgMenuCred.gif
new file mode 100755
index 000000000..7e382e330
Binary files /dev/null and b/layouts/cafeXE/img/white/bgMenuCred.gif differ
diff --git a/layouts/cafeXE/img/white/buttonSearch.gif b/layouts/cafeXE/img/white/buttonSearch.gif
new file mode 100755
index 000000000..f8be7f12b
Binary files /dev/null and b/layouts/cafeXE/img/white/buttonSearch.gif differ
diff --git a/layouts/cafeXE/img/white/buttonTreeCollapse.gif b/layouts/cafeXE/img/white/buttonTreeCollapse.gif
new file mode 100755
index 000000000..aa5493904
Binary files /dev/null and b/layouts/cafeXE/img/white/buttonTreeCollapse.gif differ
diff --git a/layouts/cafeXE/img/white/buttonWidgetNavigation.gif b/layouts/cafeXE/img/white/buttonWidgetNavigation.gif
new file mode 100755
index 000000000..975e0bd39
Binary files /dev/null and b/layouts/cafeXE/img/white/buttonWidgetNavigation.gif differ
diff --git a/layouts/cafeXE/img/white/buttonWidgetTab.gif b/layouts/cafeXE/img/white/buttonWidgetTab.gif
new file mode 100755
index 000000000..5d686dacc
Binary files /dev/null and b/layouts/cafeXE/img/white/buttonWidgetTab.gif differ
diff --git a/layouts/cafeXE/img/white/iconForumNum.gif b/layouts/cafeXE/img/white/iconForumNum.gif
new file mode 100755
index 000000000..42225782b
Binary files /dev/null and b/layouts/cafeXE/img/white/iconForumNum.gif differ
diff --git a/layouts/cafeXE/img/white/iconMenuAactive.gif b/layouts/cafeXE/img/white/iconMenuAactive.gif
new file mode 100755
index 000000000..67d5914e8
Binary files /dev/null and b/layouts/cafeXE/img/white/iconMenuAactive.gif differ
diff --git a/layouts/cafeXE/img/white/iconMenuAnormal.gif b/layouts/cafeXE/img/white/iconMenuAnormal.gif
new file mode 100755
index 000000000..1a635dcf1
Binary files /dev/null and b/layouts/cafeXE/img/white/iconMenuAnormal.gif differ
diff --git a/layouts/cafeXE/img/white/iconMyInfo.gif b/layouts/cafeXE/img/white/iconMyInfo.gif
new file mode 100755
index 000000000..6f8c1f5bc
Binary files /dev/null and b/layouts/cafeXE/img/white/iconMyInfo.gif differ
diff --git a/layouts/cafeXE/img/white/iconWidgetList.gif b/layouts/cafeXE/img/white/iconWidgetList.gif
new file mode 100755
index 000000000..9d84b6864
Binary files /dev/null and b/layouts/cafeXE/img/white/iconWidgetList.gif differ
diff --git a/layouts/cafeXE/img/white/linePoint.gif b/layouts/cafeXE/img/white/linePoint.gif
new file mode 100755
index 000000000..09958dad7
Binary files /dev/null and b/layouts/cafeXE/img/white/linePoint.gif differ
diff --git a/layouts/cafeXE/img/white/lineTextDiv.gif b/layouts/cafeXE/img/white/lineTextDiv.gif
new file mode 100755
index 000000000..0fa7654cb
Binary files /dev/null and b/layouts/cafeXE/img/white/lineTextDiv.gif differ
diff --git a/layouts/cafeXE/img/white/lineTreeHr.gif b/layouts/cafeXE/img/white/lineTreeHr.gif
new file mode 100755
index 000000000..2af04408c
Binary files /dev/null and b/layouts/cafeXE/img/white/lineTreeHr.gif differ
diff --git a/layouts/cafeXE/img/white/lineTreeLastHr.gif b/layouts/cafeXE/img/white/lineTreeLastHr.gif
new file mode 100755
index 000000000..e099787b2
Binary files /dev/null and b/layouts/cafeXE/img/white/lineTreeLastHr.gif differ
diff --git a/layouts/cafeXE/img/white/lineTreeVr.gif b/layouts/cafeXE/img/white/lineTreeVr.gif
new file mode 100755
index 000000000..3b9d1c444
Binary files /dev/null and b/layouts/cafeXE/img/white/lineTreeVr.gif differ
diff --git a/layouts/cafeXE/lang/en.lang.php b/layouts/cafeXE/lang/en.lang.php
new file mode 100644
index 000000000..9435e4970
--- /dev/null
+++ b/layouts/cafeXE/lang/en.lang.php
@@ -0,0 +1,5 @@
+<?php
+    $lang->new_members = 'New Members';
+    $lang->document_ranking = 'Rank by documents';
+    $lang->comment_ranking = 'Rank by replies';
+?>
diff --git a/layouts/cafeXE/lang/jp.lang.php b/layouts/cafeXE/lang/jp.lang.php
new file mode 100644
index 000000000..e821cb9c3
--- /dev/null
+++ b/layouts/cafeXE/lang/jp.lang.php
@@ -0,0 +1,5 @@
+<?php
+    $lang->new_members = '新会員のお知らせ';
+    $lang->document_ranking = 'ゲシゲウルランキング';
+    $lang->comment_ranking = 'コメント数ランキング';
+?>
diff --git a/layouts/cafeXE/lang/ko.lang.php b/layouts/cafeXE/lang/ko.lang.php
new file mode 100644
index 000000000..be7658adb
--- /dev/null
+++ b/layouts/cafeXE/lang/ko.lang.php
@@ -0,0 +1,5 @@
+<?php
+    $lang->new_members = '신입 회원 소식';
+    $lang->document_ranking = '게시글 랭킹';
+    $lang->comment_ranking = '댓글 랭킹';
+?>
diff --git a/layouts/cafeXE/lang/zh-CN.lang.php b/layouts/cafeXE/lang/zh-CN.lang.php
new file mode 100644
index 000000000..5a515145b
--- /dev/null
+++ b/layouts/cafeXE/lang/zh-CN.lang.php
@@ -0,0 +1,5 @@
+<?php
+    $lang->new_members = '有什么新成员';
+    $lang->document_ranking = '发帖排行';
+    $lang->comment_ranking = '评论排名';
+?>
diff --git a/layouts/cafeXE/lang/zh-TW.lang.php b/layouts/cafeXE/lang/zh-TW.lang.php
new file mode 100644
index 000000000..ff14052ed
--- /dev/null
+++ b/layouts/cafeXE/lang/zh-TW.lang.php
@@ -0,0 +1,5 @@
+<?php
+    $lang->new_members = '�̷s�|��';
+    $lang->document_ranking = '�D�D�Ʀ�';
+    $lang->comment_ranking = '���ױƦ�';
+?>
diff --git a/layouts/cafeXE/layout.html b/layouts/cafeXE/layout.html
new file mode 100644
index 000000000..262035889
--- /dev/null
+++ b/layouts/cafeXE/layout.html
@@ -0,0 +1,113 @@
+<!--%import("./lang")-->
+<!--%import("css/layout.css")-->
+<!--%import("css/layout@cafe.css")-->
+<!--%import("css/widget.css")-->
+
+<!--@if($layout_info->colorset == "black")-->
+    <!--%import("css/layout@black.css")-->
+    {@ $middle_widget_colorset = "black" }
+<!--@else-->
+    <!--%import("css/layout@white.css")-->
+    {@ $middle_widget_colorset = "white" }
+<!--@end-->
+
+<!--// 모양 설정 > 본문 위치 -->
+<!--@if($layout_info->content_position == "right")-->{@$_posClass = "cafeXeEC"}<!--@else-->{@$_posClass = "cafeXeCE"}<!--@end-->
+
+<!--// indexUrl 설정 -->
+<!--@if(!$layout_info->index_url)-->{@$layout_info->index_url = Context::getRequestUri()}<!--@end-->
+
+<!--// 로고 영역 이미지 -->
+<!--@if($layout_info->logo_background_image)-->
+<style type="text/css"> #cafeXeHeader {background:#FFFFFF url("{$layout_info->logo_background_image}") repeat left top !important; } </style>
+<!--@end-->
+
+<!--// 내용 영역 이미지 -->
+<!--@if($layout_info->content_background_image)-->
+<style type="text/css"> #cafeXeContainer {background:#FFFFFF url("{$layout_info->content_background_image}") repeat left top !important; } </style>
+<!--@end-->
+
+<div class="cafeXe">
+    <div class="cafeXeFixed">
+        <div id="cafeXeContainer" class="{$_posClass}">
+            <!-- #header -->
+            <div id="cafeXeHeader">
+                <div class="cafeXeHeader"><a href="#content" class="skipToContent">Skip to content</a>
+                    <!--@if($layout_info->logo_image)-->
+                    <h1 class="cafeXeH1"><a href="{$layout_info->index_url}" class="cafeXeA"><img src="{$layout_info->logo_image}" title="{$layout_info->logo_text}" /></a></h1>
+                    <!--@elseif($layout_info->logo_text)-->
+                    <h1 class="cafeXeH1"><a href="{$layout_info->index_url}" class="cafeXeA">{$layout_info->logo_text}</a></h1>
+                    <!--@else-->
+                    <h1 class="cafeXeH1"><a href="{$layout_info->index_url}" class="cafeXeA">Cafe<sup>XE</sup></a></h1>
+                    <!--@end-->
+
+					<form action="{getUrl()}" method="post" class="widgetSearch">
+						<fieldset>
+							<input type="hidden" name="mid" value="{$mid}" />
+							<input type="hidden" name="act" value="IS" />
+							<input type="hidden" name="search_target" value="title" />
+							<!--<legend>{$lang->cmd_search}</legend>-->
+							<input type="text" name="is_keyword" class="widgetXeInputText" title="{$lang->cmd_search}" />
+							<input type="image" src="./img/white/buttonSearch.gif" value="{$lang->cmd_search}" class="widgetSearch" />
+						</fieldset>
+					</form>
+
+                    <p class="cafeXeUrl"><a href="{$layout_info->index_url}" class="cafeXeA">{$layout_info->index_url}</a></p>
+
+                </div>
+            </div>
+            <!-- /#header -->
+            <hr class="cafeXeHr" />
+            <!-- #body -->
+            <div id="cafeXeBody">
+                <div id="cafeXeContent">
+                    {$content}
+                </div>
+                <hr class="cafeXeHr" />
+                <div class="cafeXeExtension cafeXeE1">
+                    <!--// Left/Right Widget -->
+
+                    <!--// Site Status -->
+                    <!--@if($site_module_info->site_srl>0)-->
+                    <img class="zbxe_widget_output" widget="site_info" skin="default" colorset="{$middle_widget_colorset}" widgetstyle="simple" ws_colorset="{$middle_widget_colorset}" ws_title="{$lang->cafe_info}"  ws_more_url="" ws_more_text=""/>
+                    <!--@end-->
+
+                    <!--// Login Info Widget -->
+                    <img class="zbxe_widget_output" widget="login_info" skin="default" colorset="{$middle_widget_colorset}" widgetstyle="simple" ws_colorset="{$middle_widget_colorset}" ws_title="<!--@if($is_logged)-->{$logged_info->nick_name}<!--@else-->{$lang->cmd_login}<!--@end-->" ws_more_url="" ws_more_text=""/>
+
+                    <!--// Menu Widget -->
+                    <img class="zbxe_widget_output" widget="navigator" skin="tree" colorset="{$middle_widget_colorset}" widgetstyle="simple" ws_colorset="{$middle_widget_colorset}" ws_title="{$lang->menu}" />
+
+                    <!--// Visitor Status Widget -->
+                    <img class="zbxe_widget_output" widget="counter_status" skin="default" colorset="{$middle_widget_colorset}" widgetstyle="simple" ws_colorset="{$middle_widget_colorset}" ws_title="{$lang->counter}" />
+                </div>
+            </div>
+            <!-- /#body -->
+            <hr class="cafeXeHr" />
+            <!-- #knee -->
+            <div id="cafeXeKnee">
+                <div class="cafeXeExtension">
+                    <!--// Bottom Widget -->
+                    <img class="zbxe_widget_output" widget="member_group" skin="default" colorset="black" widgetstyle="simple" ws_colorset="black" ws_title="{$lang->new_members}" list_count="5" style="width:219px;float:left;margin-right:28px;"/>
+                    <img class="zbxe_widget_output" widget="rank_count" rankby="document" skin="default" colorset="black"  widgetstyle="simple" ws_colorset="black" ws_title="{$lang->document_ranking}" list_count="5" style="width:219px;float:left;margin-right:28px;"/>
+                    <img class="zbxe_widget_output" widget="rank_count" rankby="comment" skin="default" colorset="black"  widgetstyle="simple" ws_colorset="black" ws_title="{$lang->comment_ranking}" list_count="5" style="width:219px;float:left;margin-right:28px;"/>
+                    <img class="zbxe_widget_output" widget="logged_members" skin="default"  colorset="black"  widgetstyle="simple" ws_colorset="black" ws_title="{$lang->logged_users}" list_count="99999" style="width:219px; float:left;margin-right:28px;" />
+                </div>
+            </div>
+            <!-- /#knee -->
+            <hr class="cafeXeHr" />
+            <!-- #footer -->
+            <div id="cafeXeFooter">
+                <div class="cafeXeFooter">
+                    <address class="cafeXeAddress">
+                    Powered by <a href="http://www.xpressengine.com" onclick="window.open(this.href);return false;"><abbr title="Xpress Engine">XE</abbr></a>.
+                    </address>
+
+                    <!-- 언어 선택 위젯 -->
+                    <img class="zbxe_widget_output" widget="language_select" skin="default" />
+                </div>
+            </div>
+            <!-- /#footer -->
+        </div>
+    </div>
+</div>
diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml
index 2e674a9fc..66015b95d 100644
--- a/layouts/xe_official/conf/info.xml
+++ b/layouts/xe_official/conf/info.xml
@@ -124,15 +124,15 @@
             <title xml:lang="ko">로고이미지</title>
             <title xml:lang="jp">ロゴイメージ</title>
             <title xml:lang="zh-CN">LOGO图片</title>
-            <title xml:lang="zh-TW">LOGO圖片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
             <title xml:lang="en">Logo image</title>
             <title xml:lang="ge">Logobildes</title>
             <title xml:lang="ru">Изображения логотипа</title>
             <title xml:lang="es">Imagen del logotipo</title>
             <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
             <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。)</description>
-            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
-            <description xml:lang="zh-TW">請輸入在版面上端要顯示的LOGO圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)</description>
             <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
             <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
             <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
@@ -150,7 +150,7 @@
             <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
             <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力してください。</description>
             <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
-            <description xml:lang="zh-TW">請輸入當用戶按了網站LOGO後，要前往的頁面網址。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站Logo後，要前往的頁面網址。</description>
             <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
             <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
             <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css
index 304f991a7..78a86ffa7 100644
--- a/layouts/xe_official/css/default.css
+++ b/layouts/xe_official/css/default.css
@@ -1,92 +1,92 @@
-@charset "utf-8";
-/*
-NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/)
-Jeong, Chan Myeong 070601~070630
-*/
-
-/* Default Skin - Start */
-#selectLang { margin:0; padding:0; }
-#gnb { margin:0; padding:0; }
-#lnb { margin:0; padding:0; }
-#lnb ul { margin:0; padding:0; }
-
-/* Site Layout - Body Wrap */
-body { background:#FFFFFF url(../images/default/bgBody.gif) repeat-x left top; }
-#bodyWrap { width:980px; margin:1.5em auto 0 auto; }
-
-/* Site Layout - Header */
-#header { position:relative; width:980px; height:120px; background:url(../images/default/bgHeader.jpg) no-repeat right top; margin-bottom:10px; z-index:99;}
-#header h1 { margin:0; padding:0; position:absolute; top:32px; left:25px;}
-#language { position:absolute; top:18px; right:19px; z-index:100;}
-#language strong { color:#ffffff; font:.75em Tahoma; margin-right:3px;}
-#language a img { vertical-align:-5px;}
-#language ul { position:absolute; top:15px; right:0px; display:none; border:1px solid #b23628; background:#de4332;}
-#language ul li { list-style:none; }
-#language ul li a { display:block; width:61px; padding:3px 8px; font:9px Tahoma; color:#ffffff; text-decoration:none;}
-#language ul li a:hover { background:#bc4032;}
-
-#it_search_form { position:absolute; top:50px; right:15px;}
-#it_search_form .input { border:1px solid #bc4032; height:17px; width:120px; color:#888888; font-size:.9em;} 
-#it_search_form .submit_button { width:1px; height:1px; visibility:hidden; }
-
-#gnb { position:absolute; top:82px; left:0; height:38px; overflow:hidden; white-space:nowrap; margin-bottom:10px;}
-#gnb li { float:left; list-style:none; background:url(../images/default/bgGnbVr.gif) no-repeat left center; padding-left:2px; position:relative; left:-2px; white-space:nowrap;}
-#gnb li a { display:block; float:left; padding:13px 15px 0 15px; height:25px; color:#e8e8e8; white-space:nowrap; text-decoration:none; }
-#gnb li a:hover,
-#gnb li a:focus { color:#ffffff;}
-#gnb li.on a { font-weight:bold; color:#ffffff; background:url(../images/default/bgGnbOn.gif) no-repeat center top;}
-
-#isSearch { position:absolute; top:48px; right:15px; width:214px; text-align:right;}
-#isSearch .searchOrder { display:none;}
-#isSearch .checked { position:absolute; left:0; top:0; text-align:left; display:block; padding:5px 0 0 5px; width:64px; height:14px; background:url(../images/default/bgSearchTerm.gif) no-repeat; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff; line-height:normal;}
-*:first-child+html #isSearch .checked { top:1px; }
-#isSearch ul { display:none; position:absolute; left:0; top:18px; padding:2px 0 3px 0; text-align:left; border:1px solid #919898; background:#536c6d;}
-#isSearch ul li { width:67px; height:18px; list-style:none; }
-#isSearch ul li input { display:none;}
-#isSearch ul li label { display:block; padding:4px 0 0 4px; width:63px; height:15px; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff;}
-#isSearch ul li label.on { background:#455a5b; }
-#isSearch ul li label:hover,
-#isSearch ul li label:focus { background:#455a5b;}
-#isSearch .inputText { vertical-align:middle; position:relative; top:0; _top:-1px; left:1px; padding:3px 3px 1px 3px; width:94px; height:13px; color:#ffffff; border:1px solid #8E8E8D; background-color:#857C79; }
-#isSearch .inputText:hover,
-#isSearch .inputText:focus { border:1px solid #B0B0AF; background-color:#A9A4A3; }
-*:first-child+html body#default #isSearch .inputText { position:relative; top:-1px;}
-#isSearch .submit { vertical-align:middle; _position:relative; _top:-1px;}
-*:first-child+html body#default #isSearch .submit { position:relative; top:-1px;}
-
-/* Site Layout - Content Body */
-#contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/default/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd;}
-
-/* Site Layout - Column Left */
-#columnLeft { position:relative; width:201px; float:left;}
-#columnLeft .mask { width:201px; height:5px; background:#ffffff; display:block; clear:both;}
-
-#lnb { border-top:1px solid #dddddd; padding:4px 5px; width:190px;}
-#lnb li { padding-bottom:4px; list-style:none; }
-#lnb li a { padding:6px 5px 6px 13px; width:170px; display:block; border:1px solid #e8e8e8; background:url(../images/default/bgLnbOff.gif) repeat-x; color:#3e3e3e; position:relative; z-index:99; text-decoration:none;}
-#lnb li a:hover,
-#lnb li a:focus { color:#ffffff; background:#de4332; border:1px solid #de4332;}
-#lnb li.on a { color:#ffffff; background:#de4332; border:1px solid #de4332;}
-#lnb li.on a:hover,
-#lnb li.on a:focus { font-weight:bold;}
-#lnb li ul { display:block; position:relative; width:184px; padding:0 3px; border-top:1px solid #ffffff; overflow:hidden;}
-#lnb li.on ul { display:block;}
-#lnb li ul li { padding:0; border-top:1px solid #f2f2f2; position:relative; top:-1px;}
-#lnb li ul li a { padding:6px 5px 6px 10px; width:169px; color:#818181 !important; border:none; background:none !important; border:none !important;}
-#lnb li ul li a:hover,
-#lnb li ul li a:focus { font-weight:normal !important; color:#de4332 !important;}
-#lnb li.on ul li.on a { color:#ff1a00 !important; font-weight:bold !important; background:url(../images/default/bulletLnb.gif) no-repeat 175px center  !important;}
-
-/* Site Layout - Column Right */
-#columnRight { width:770px; float:right; overflow:hidden;}
-#visualArea { width:770px; height:200px; background:#f5f5f5; margin-bottom:2.5em; position:relative; left:-15px; margin-right:-15px;}
-#content { width:100%; overflow:hidden;}
-
-/* Site Layout - Footer */
-#footer { margin:0; padding:0; border-top:3px solid #f4f4f4; text-align:center; padding:2em 0 4em; clear:both;}
-#footer li { display:inline; padding:0 .6em 0 1em; background:url(../images/default/vrType1.gif) no-repeat left center;}
-#footer li.first-child { background:none;}
-#footer li a { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;}
-#footer li address { display:inline; }
-
-/* Default Skin - End */
+@charset "utf-8";
+/*
+NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/)
+Jeong, Chan Myeong 070601~070630
+*/
+
+/* Default Skin - Start */
+#selectLang { margin:0; padding:0; }
+#gnb { margin:0; padding:0; }
+#lnb { margin:0; padding:0; }
+#lnb ul { margin:0; padding:0; }
+
+/* Site Layout - Body Wrap */
+body { background:#FFFFFF url(../images/default/bgBody.gif) repeat-x left top;}
+#bodyWrap { width:980px; margin:1.5em auto 0 auto; }
+
+/* Site Layout - Header */
+#header { position:relative; width:980px; height:120px; background:url(../images/default/bgHeader.jpg) no-repeat right top; margin-bottom:10px; z-index:99;}
+#header h1 { margin:0; padding:0; position:absolute; top:32px; left:25px;}
+#language { position:absolute; top:18px; right:19px; z-index:100;}
+#language strong { color:#ffffff; font:.75em Tahoma; margin-right:3px;}
+#language a img { vertical-align:-5px;}
+#language ul { position:absolute; top:15px; right:0px; display:none; border:1px solid #b23628; background:#de4332;}
+#language ul li { list-style:none; }
+#language ul li a { display:block; width:61px; padding:3px 8px; font:9px Tahoma; color:#ffffff; text-decoration:none;}
+#language ul li a:hover { background:#bc4032;}
+
+#it_search_form { position:absolute; top:50px; right:15px;}
+#it_search_form .input { border:1px solid #bc4032; height:17px; width:120px; color:#888888; font-size:.9em;} 
+#it_search_form .submit_button { width:1px; height:1px; visibility:hidden; }
+
+#gnb { position:absolute; top:82px; left:0; height:38px; overflow:hidden; white-space:nowrap; margin-bottom:10px;}
+#gnb li { float:left; list-style:none; background:url(../images/default/bgGnbVr.gif) no-repeat left center; padding-left:2px; position:relative; left:-2px; white-space:nowrap;}
+#gnb li a { display:block; float:left; padding:13px 15px 0 15px; height:25px; color:#e8e8e8; white-space:nowrap; text-decoration:none; }
+#gnb li a:hover,
+#gnb li a:focus { color:#ffffff;}
+#gnb li.on a { font-weight:bold; color:#ffffff; background:url(../images/default/bgGnbOn.gif) no-repeat center top;}
+
+#isSearch { position:absolute; top:48px; right:15px; width:214px; text-align:right;}
+#isSearch .searchOrder { display:none;}
+#isSearch .checked { position:absolute; left:0; top:0; text-align:left; display:block; padding:5px 0 0 5px; width:64px; height:14px; background:url(../images/default/bgSearchTerm.gif) no-repeat; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff; line-height:normal;}
+*:first-child+html #isSearch .checked { top:1px; }
+#isSearch ul { display:none; position:absolute; left:0; top:18px; padding:2px 0 3px 0; text-align:left; border:1px solid #919898; background:#536c6d;}
+#isSearch ul li { width:67px; height:18px; list-style:none; }
+#isSearch ul li input { display:none;}
+#isSearch ul li label { display:block; padding:4px 0 0 4px; width:63px; height:15px; font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#ffffff;}
+#isSearch ul li label.on { background:#455a5b; }
+#isSearch ul li label:hover,
+#isSearch ul li label:focus { background:#455a5b;}
+#isSearch .inputText { vertical-align:middle; position:relative; top:0; _top:-1px; left:1px; padding:3px 3px 1px 3px; width:94px; height:13px; color:#ffffff; border:1px solid #8E8E8D; background-color:#857C79; }
+#isSearch .inputText:hover,
+#isSearch .inputText:focus { border:1px solid #B0B0AF; background-color:#A9A4A3; }
+*:first-child+html body#default #isSearch .inputText { position:relative; top:-1px;}
+#isSearch .submit { vertical-align:middle; _position:relative; _top:-1px;}
+*:first-child+html body#default #isSearch .submit { position:relative; top:-1px;}
+
+/* Site Layout - Content Body */
+#contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/default/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd;}
+
+/* Site Layout - Column Left */
+#columnLeft { position:relative; width:201px; float:left;}
+#columnLeft .mask { width:201px; height:5px; background:#ffffff; display:block; clear:both;}
+
+#lnb { border-top:1px solid #dddddd; padding:4px 5px; width:190px;}
+#lnb li { padding-bottom:4px; list-style:none; }
+#lnb li a { padding:6px 5px 6px 13px; width:170px; display:block; border:1px solid #e8e8e8; background:url(../images/default/bgLnbOff.gif) repeat-x; color:#3e3e3e; position:relative; z-index:99; text-decoration:none;}
+#lnb li a:hover,
+#lnb li a:focus { color:#ffffff; background:#de4332; border:1px solid #de4332;}
+#lnb li.on a { color:#ffffff; background:#de4332; border:1px solid #de4332;}
+#lnb li.on a:hover,
+#lnb li.on a:focus { font-weight:bold;}
+#lnb li ul { display:block; position:relative; width:184px; padding:0 3px; border-top:1px solid #ffffff; overflow:hidden;}
+#lnb li.on ul { display:block;}
+#lnb li ul li { padding:0; border-top:1px solid #f2f2f2; position:relative; top:-1px;}
+#lnb li ul li a { padding:6px 5px 6px 10px; width:169px; color:#818181 !important; border:none; background:none !important; border:none !important;}
+#lnb li ul li a:hover,
+#lnb li ul li a:focus { font-weight:normal !important; color:#de4332 !important;}
+#lnb li.on ul li.on a { color:#ff1a00 !important; font-weight:bold !important; background:url(../images/default/bulletLnb.gif) no-repeat 175px center  !important;}
+
+/* Site Layout - Column Right */
+#columnRight { width:770px; float:right; overflow:hidden;}
+#visualArea { width:770px; height:200px; background:#f5f5f5; margin-bottom:2.5em; position:relative; left:-15px; margin-right:-15px;}
+#content { width:100%; overflow:hidden;}
+
+/* Site Layout - Footer */
+#footer { margin:0; padding:0; border-top:3px solid #f4f4f4; text-align:center; padding:2em 0 4em; clear:both;}
+#footer li { display:inline; padding:0 .6em 0 1em; background:url(../images/default/vrType1.gif) no-repeat left center;}
+#footer li.first-child { background:none;}
+#footer li a { color:#999999; font:.9em "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;}
+#footer li address { display:inline; }
+
+/* Default Skin - End */
diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html
index 30fa8a810..94de21107 100644
--- a/layouts/xe_official/layout.html
+++ b/layouts/xe_official/layout.html
@@ -1,107 +1,106 @@
-<!--// js 파일 import -->
-<!--%import("js/xe_official.js")-->
-
-<!--// 레이아웃과 연동될 css 파일 import -->
-<!--@if($layout_info->colorset == "white")-->
-    <!--%import("css/white.css")-->
-<!--@elseif($layout_info->colorset == "black")-->
-    <!--%import("css/black.css")-->
-<!--@else-->
-    <!--%import("css/default.css")-->
-<!--@end-->
-
-<!--@if($layout_info->background_image)-->
-<style type="text/css">
-    body {  background:#FFFFFF url({getUrl()}{$layout_info->background_image}) repeat-x left top; }
-</style>
-<!--@end-->
-
-<!--@if(!$layout_info->colorset)-->
-    {@$layout_info->colorset = "default"}
-<!--@end-->
-
-<div id="bodyWrap">
-    <div id="header">
-        <h1><!--@if($layout_info->logo_image)--><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /></a><!--@else-->&nbsp;<!--@end--></h1>
-
-        <div id="language">
-            <strong title="{$lang_type}">{$lang_supported[$lang_type]}</strong> <a href="#selectLang" onclick="showHide('selectLang');return false;"><img src="./images/{$layout_info->colorset}/buttonLang.gif" alt="Select Language" width="87" height="15" /></a>
-            <ul id="selectLang">
-                <!--@foreach($lang_supported as $key => $val)--><!--@if($key!= $lang_type)-->
-                <li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
-                <!--@end--><!--@end-->
-            </ul>
-        </div>
-
-        <!-- GNB -->
-        <ul id="gnb">
-            <!-- main_menu 1차 시작 -->
-            <!--@foreach($main_menu->list as $key => $val)--><!--@if($val['link'])-->
-                <!--@if($val['selected'])-->
-                    {@ $menu_1st = $val }
-                <!--@end-->
-
-                <li <!--@if($val['selected'])-->class="on"<!--@end-->><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a></li>
-
-            <!--@endif--><!--@endforeach-->
-        </ul>
-
-        <form action="{getUrl()}" method="post" id="isSearch">
-            <input type="hidden" name="mid" value="{$mid}" />
-            <input type="hidden" name="act" value="IS" />
-            <input type="hidden" name="search_target" value="title_content" />
-            <input name="is_keyword" type="text" class="inputText" title="keyword" />
-
-            <input type="image" src="./images/{$layout_info->colorset}/buttonSearch.gif" alt="{$lang->cmd_search}" class="submit" />
-        </form>
-
-    </div>
-    <div id="contentBody">
-        <div id="columnLeft">
-
-            <!-- 로그인 위젯 -->
-            <img src="./images/blank.gif" class="zbxe_widget_output" widget="login_info" skin="xe_official" colorset="{$layout_info->colorset}" />
-
-            <!-- 왼쪽 2차 메뉴 -->
-            <img src="./images/blank.gif" alt="" class="mask" />
-
-            <!--@if($menu_1st)-->
-            <ol id="lnb">
-                {@ $idx = 1 }
-                <!--@foreach($menu_1st['list'] as $key => $val)--><!--@if($val['link'])-->
-                <li <!--@if($val['selected'])-->class="on"<!--@end-->><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a>
-
-                    <!-- main_menu 3차 시작 -->
-                    <!--@if($val['list'] && ($val['expand']=='Y'||$val['selected']) )-->
-                    <ul>
-                    <!--@foreach($val['list'] as $k => $v)--><!--@if($v['link'])-->
-                        <li <!--@if($v['selected'])-->class="on"<!--@end-->><a href="{$v['href']}" <!--@if($v['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$v['link']}</a></li>
-                    <!--@endif--><!--@endforeach-->
-                    </ul>
-                    <!--@endif-->
-                </li>
-                {@$idx++}
-                <!--@endif--><!--@endforeach-->
-            </ol>
-            <!--@endif-->
-
-        </div>
-        <div id="columnRight">
-            <!-- 컨텐츠 시작 -->
-            {$content}
-
-        </div>
-    </div>
-    <ul id="footer">
-        <li class="first-child">
-            <address>
-            <a href="http://www.zeroboard.com" onclick="window.open(this.href);return false;"><img src="./images/powerdByXE.gif" alt="Powered By XpressEngine" width="70" height="5" /></a>
-            </address>
-
-        </li>
-
-        <!--@foreach($bottom_menu->list as $key => $val)-->
-        <li><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a></li>
-        <!--@endforeach-->
-    </ul>
-</div>
+<!--// js 파일 import -->
+<!--%import("js/xe_official.js")-->
+
+<!--// 레이아웃과 연동될 css 파일 import -->
+<!--@if($layout_info->colorset == "white")-->
+    <!--%import("css/white.css")-->
+<!--@elseif($layout_info->colorset == "black")-->
+    <!--%import("css/black.css")-->
+<!--@else-->
+    <!--%import("css/default.css")-->
+<!--@end-->
+
+<!--@if($layout_info->background_image)-->
+<style type="text/css">
+    body {  background:#FFFFFF url({getUrl()}{$layout_info->background_image}) repeat-x left top; }
+</style>
+<!--@end-->
+
+<!--@if(!$layout_info->colorset)-->
+    {@$layout_info->colorset = "default"}
+<!--@end-->
+<div id="bodyWrap">
+    <div id="header">
+        <h1><!--@if($layout_info->logo_image)--><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /></a><!--@else-->&nbsp;<!--@end--></h1>
+
+        <div id="language">
+            <strong title="{$lang_type}">{$lang_supported[$lang_type]}</strong> <a href="#selectLang" onclick="showHide('selectLang');return false;"><img src="./images/{$layout_info->colorset}/buttonLang.gif" alt="Select Language" width="87" height="15" /></a>
+            <ul id="selectLang">
+                <!--@foreach($lang_supported as $key => $val)--><!--@if($key!= $lang_type)-->
+                <li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
+                <!--@end--><!--@end-->
+            </ul>
+        </div>
+
+        <!-- GNB -->
+        <ul id="gnb">
+            <!-- main_menu 1차 시작 -->
+            <!--@foreach($main_menu->list as $key => $val)--><!--@if($val['link'])-->
+                <!--@if($val['selected'])-->
+                    {@ $menu_1st = $val }
+                <!--@end-->
+
+                <li <!--@if($val['selected'])-->class="on"<!--@end-->><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a></li>
+
+            <!--@endif--><!--@endforeach-->
+        </ul>
+
+        <form action="{getUrl()}" method="post" id="isSearch">
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="act" value="IS" />
+            <input type="hidden" name="search_target" value="title_content" />
+            <input name="is_keyword" type="text" class="inputText" title="keyword" />
+
+            <input type="image" src="./images/{$layout_info->colorset}/buttonSearch.gif" alt="{$lang->cmd_search}" class="submit" />
+        </form>
+
+    </div>
+    <div id="contentBody">
+        <div id="columnLeft">
+
+            <!-- 로그인 위젯 -->
+            <img src="./images/blank.gif" class="zbxe_widget_output" widget="login_info" skin="xe_official" colorset="{$layout_info->colorset}" />
+
+            <!-- 왼쪽 2차 메뉴 -->
+            <img src="./images/blank.gif" alt="" class="mask" />
+			
+            <!--@if($menu_1st)-->
+            <ol id="lnb">
+                {@ $idx = 1 }
+                <!--@foreach($menu_1st['list'] as $key => $val)--><!--@if($val['link'])-->
+                <li <!--@if($val['selected'])-->class="on"<!--@end-->><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a>
+
+                    <!-- main_menu 3차 시작 -->
+                    <!--@if($val['list'] && ($val['expand']=='Y'||$val['selected']) )-->
+                    <ul>
+                    <!--@foreach($val['list'] as $k => $v)--><!--@if($v['link'])-->
+                        <li <!--@if($v['selected'])-->class="on"<!--@end-->><a href="{$v['href']}" <!--@if($v['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$v['link']}</a></li>
+                    <!--@endif--><!--@endforeach-->
+                    </ul>
+                    <!--@endif-->
+                </li>
+                {@$idx++}
+                <!--@endif--><!--@endforeach-->
+            </ol>
+            <!--@endif-->
+
+        </div>
+        <div id="columnRight">
+            <!-- 컨텐츠 시작 -->
+            {$content}
+
+        </div>
+    </div>
+    <ul id="footer">
+        <li class="first-child">
+            <address>
+            <a href="http://www.zeroboard.com" onclick="window.open(this.href);return false;"><img src="./images/powerdByXE.gif" alt="Powered By XpressEngine" width="70" height="5" /></a>
+            </address>
+
+        </li>
+
+        <!--@foreach($bottom_menu->list as $key => $val)-->
+        <li><a href="{$val['href']}" <!--@if($val['open_window']=='Y')-->onclick="window.open(this.href);return false;"<!--@end-->>{$val['link']}</a></li>
+        <!--@endforeach-->
+    </ul>
+</div>
diff --git a/libs/tar.class.php b/libs/tar.class.php
new file mode 100644
index 000000000..d6d72f4e4
--- /dev/null
+++ b/libs/tar.class.php
@@ -0,0 +1,558 @@
+<?php
+/*
+=======================================================================
+Name:
+    tar Class
+
+Author:
+    Josh Barger <joshb@npt.com>
+
+Description:
+    This class reads and writes Tape-Archive (TAR) Files and Gzip
+    compressed TAR files, which are mainly used on UNIX systems.
+    This class works on both windows AND unix systems, and does
+    NOT rely on external applications!! Woohoo!
+
+Usage:
+    Copyright (C) 2002  Josh Barger
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details at:
+        http://www.gnu.org/copyleft/lesser.html
+
+    If you use this script in your application/website, please
+    send me an e-mail letting me know about it :)
+
+Bugs:
+    Please report any bugs you might find to my e-mail address
+    at joshb@npt.com.  If you have already created a fix/patch
+    for the bug, please do send it to me so I can incorporate it into my release.
+
+Version History:
+    1.0 04/10/2002  - InitialRelease
+
+    2.0 04/11/2002  - Merged both tarReader and tarWriter
+                  classes into one
+                - Added support for gzipped tar files
+                  Remember to name for .tar.gz or .tgz
+                  if you use gzip compression!
+                  :: THIS REQUIRES ZLIB EXTENSION ::
+                - Added additional comments to
+                  functions to help users
+                - Added ability to remove files and
+                  directories from archive
+    2.1 04/12/2002  - Fixed serious bug in generating tar
+                - Created another example file
+                - Added check to make sure ZLIB is
+                  installed before running GZIP
+                  compression on TAR
+    2.2 05/07/2002  - Added automatic detection of Gzipped
+                  tar files (Thanks go to J?gen Falch
+                  for the idea)
+                - Changed "private" functions to have
+                  special function names beginning with
+                  two underscores
+=======================================================================
+*/
+
+class tar {
+    // Unprocessed Archive Information
+    var $filename;
+    var $isGzipped;
+    var $tar_file;
+
+    // Processed Archive Information
+    var $files;
+    var $directories;
+    var $numFiles;
+    var $numDirectories;
+
+
+    // Class Constructor -- Does nothing...
+    function tar() {
+        return true;
+    }
+
+
+    // Computes the unsigned Checksum of a file's header
+    // to try to ensure valid file
+    // PRIVATE ACCESS FUNCTION
+    function __computeUnsignedChecksum($bytestring) {
+        for($i=0; $i<512; $i++)
+            $unsigned_chksum += ord($bytestring[$i]);
+        for($i=0; $i<8; $i++)
+            $unsigned_chksum -= ord($bytestring[148 + $i]);
+        $unsigned_chksum += ord(" ") * 8;
+
+        return $unsigned_chksum;
+    }
+
+
+    // Converts a NULL padded string to a non-NULL padded string
+    // PRIVATE ACCESS FUNCTION
+    function __parseNullPaddedString($string) {
+        $position = strpos($string,chr(0));
+        return substr($string,0,$position);
+    }
+
+
+    // This function parses the current TAR file
+    // PRIVATE ACCESS FUNCTION
+    function __parseTar() {
+        // Read Files from archive
+        $tar_length = strlen($this->tar_file);
+        $main_offset = 0;
+        while($main_offset < $tar_length) {
+            // If we read a block of 512 nulls, we are at the end of the archive
+            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
+                break;
+
+            // Parse file name
+            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
+
+            // Parse the file mode
+            $file_mode      = substr($this->tar_file,$main_offset + 100,8);
+
+            // Parse the file user ID
+            $file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
+
+            // Parse the file group ID
+            $file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
+
+            // Parse the file size
+            $file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
+
+            // Parse the file update time - unix timestamp format
+            $file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
+
+            // Parse Checksum
+            $file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
+
+            // Parse user name
+            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
+
+            // Parse Group name
+            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
+
+            // Make sure our file is valid
+            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
+                return false;
+
+            // Parse File Contents
+            $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
+
+            /*  ### Unused Header Information ###
+                $activeFile["typeflag"]     = substr($this->tar_file,$main_offset + 156,1);
+                $activeFile["linkname"]     = substr($this->tar_file,$main_offset + 157,100);
+                $activeFile["magic"]        = substr($this->tar_file,$main_offset + 257,6);
+                $activeFile["version"]      = substr($this->tar_file,$main_offset + 263,2);
+                $activeFile["devmajor"]     = substr($this->tar_file,$main_offset + 329,8);
+                $activeFile["devminor"]     = substr($this->tar_file,$main_offset + 337,8);
+                $activeFile["prefix"]       = substr($this->tar_file,$main_offset + 345,155);
+                $activeFile["endheader"]    = substr($this->tar_file,$main_offset + 500,12);
+            */
+
+            if($file_size > 0) {
+                // Increment number of files
+                $this->numFiles++;
+
+                // Create us a new file in our array
+                $activeFile = &$this->files[];
+
+                // Asign Values
+                $activeFile["name"]     = $file_name;
+                $activeFile["mode"]     = $file_mode;
+                $activeFile["size"]     = $file_size;
+                $activeFile["time"]     = $file_time;
+                $activeFile["user_id"]      = $file_uid;
+                $activeFile["group_id"]     = $file_gid;
+                $activeFile["user_name"]    = $file_uname;
+                $activeFile["group_name"]   = $file_gname;
+                $activeFile["checksum"]     = $file_chksum;
+                $activeFile["file"]     = $file_contents;
+
+            } else {
+                // Increment number of directories
+                $this->numDirectories++;
+
+                // Create a new directory in our array
+                $activeDir = &$this->directories[];
+
+                // Assign values
+                $activeDir["name"]      = $file_name;
+                $activeDir["mode"]      = $file_mode;
+                $activeDir["time"]      = $file_time;
+                $activeDir["user_id"]       = $file_uid;
+                $activeDir["group_id"]      = $file_gid;
+                $activeDir["user_name"]     = $file_uname;
+                $activeDir["group_name"]    = $file_gname;
+                $activeDir["checksum"]      = $file_chksum;
+            }
+
+            // Move our offset the number of blocks we have processed
+            $main_offset += 512 + (ceil($file_size / 512) * 512);
+        }
+
+        return true;
+    }
+
+
+    // Read a non gzipped tar file in for processing
+    // PRIVATE ACCESS FUNCTION
+    function __readTar($filename='') {
+        // Set the filename to load
+        if(!$filename)
+            $filename = $this->filename;
+
+        // Read in the TAR file
+        $fp = fopen($filename,"rb");
+        $this->tar_file = fread($fp,filesize($filename));
+        fclose($fp);
+
+        if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
+            if(!function_exists("gzinflate"))
+                return false;
+
+            $this->isGzipped = TRUE;
+
+            $this->tar_file = gzinflate(substr($this->tar_file,10,-4));
+        }
+
+        // Parse the TAR file
+        $this->__parseTar();
+
+        return true;
+    }
+
+
+    // Generates a TAR file from the processed data
+    // PRIVATE ACCESS FUNCTION
+    function __generateTAR() {
+        // Clear any data currently in $this->tar_file
+        unset($this->tar_file);
+
+        // Generate Records for each directory, if we have directories
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                unset($header);
+
+                // Generate tar header for this directory
+                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+                $header .= str_pad($information["name"],100,chr(0));
+                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_repeat(" ",8);
+                $header .= "5";
+                $header .= str_repeat(chr(0),100);
+                $header .= str_pad("ustar",6,chr(32));
+                $header .= chr(32) . chr(0);
+                $header .= str_pad("",32,chr(0));
+                $header .= str_pad("",32,chr(0));
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),155);
+                $header .= str_repeat(chr(0),12);
+
+                // Compute header checksum
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+                for($i=0; $i<6; $i++) {
+                    $header[(148 + $i)] = substr($checksum,$i,1);
+                }
+                $header[154] = chr(0);
+                $header[155] = chr(32);
+
+                // Add new tar formatted data to tar file contents
+                $this->tar_file .= $header;
+            }
+        }
+
+        // Generate Records for each file, if we have files (We should...)
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                unset($header);
+
+                // Generate the TAR header for this file
+                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+                $header .= str_pad($information["name"],100,chr(0));
+                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_repeat(" ",8);
+                $header .= "0";
+                $header .= str_repeat(chr(0),100);
+                $header .= str_pad("ustar",6,chr(32));
+                $header .= chr(32) . chr(0);
+                $header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
+                $header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),155);
+                $header .= str_repeat(chr(0),12);
+
+                // Compute header checksum
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+                for($i=0; $i<6; $i++) {
+                    $header[(148 + $i)] = substr($checksum,$i,1);
+                }
+                $header[154] = chr(0);
+                $header[155] = chr(32);
+
+                // Pad file contents to byte count divisible by 512
+                $file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
+
+                // Add new tar formatted data to tar file contents
+                $this->tar_file .= $header . $file_contents;
+            }
+        }
+
+        // Add 512 bytes of NULLs to designate EOF
+        $this->tar_file .= str_repeat(chr(0),512);
+
+        return true;
+    }
+
+
+    // Open a TAR file
+    function openTAR($filename) {
+        // Clear any values from previous tar archives
+        unset($this->filename);
+        unset($this->isGzipped);
+        unset($this->tar_file);
+        unset($this->files);
+        unset($this->directories);
+        unset($this->numFiles);
+        unset($this->numDirectories);
+
+        // If the tar file doesn't exist...
+        if(!file_exists($filename))
+            return false;
+
+        $this->filename = $filename;
+
+        // Parse this file
+        $this->__readTar();
+
+        return true;
+    }
+
+
+    // Appends a tar file to the end of the currently opened tar file
+    function appendTar($filename) {
+        // If the tar file doesn't exist...
+        if(!file_exists($filename))
+            return false;
+
+        $this->__readTar($filename);
+
+        return true;
+    }
+
+
+    // Retrieves information about a file in the current tar archive
+    function getFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename)
+                    return $information;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Retrieves information about a directory in the current tar archive
+    function getDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname)
+                    return $information;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Check if this tar archive contains a specific file
+    function containsFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Check if this tar archive contains a specific directory
+    function containsDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Add a directory to this tar archive
+    function addDirectory($dirname) {
+        if(!file_exists($dirname))
+            return false;
+
+        // Get directory information
+        $file_information = stat($dirname);
+
+        // Add directory to processed data
+        $this->numDirectories++;
+        $activeDir      = &$this->directories[];
+        $activeDir["name"]  = $dirname;
+        $activeDir["mode"]  = $file_information["mode"];
+        $activeDir["time"]  = $file_information["time"];
+        $activeDir["user_id"]   = $file_information["uid"];
+        $activeDir["group_id"]  = $file_information["gid"];
+        $activeDir["checksum"]  = $checksum;
+
+        return true;
+    }
+
+
+    // Add a file to the tar archive
+    function addFile($filename,$from=null,$to=null) {
+        // Make sure the file we are adding exists!
+        if(!file_exists($filename))
+            return false;
+
+        if(filesize($filename)==0)
+            return false;
+
+        // Make sure there are no other files in the archive that have this same filename
+        if($this->containsFile($filename))
+            return false;
+
+        // Get file information
+        $file_information = stat($filename);
+
+        // Read in the file's contents
+        $fp = fopen($filename,"rb");
+        $file_contents = fread($fp,filesize($filename));
+        fclose($fp);
+
+        if($from && $to){
+            $file_contents = str_replace($from,$to,$file_contents);
+            $file_information["size"] = strlen($file_contents);
+        }
+
+        // Add file to processed data
+        $this->numFiles++;
+        $activeFile         = &$this->files[];
+        $activeFile["name"]     = $filename;
+        $activeFile["mode"]     = $file_information["mode"];
+        $activeFile["user_id"]      = $file_information["uid"];
+        $activeFile["group_id"]     = $file_information["gid"];
+        $activeFile["size"]     = $file_information["size"];
+        $activeFile["time"]     = $file_information["mtime"];
+        $activeFile["checksum"]     = $checksum;
+        $activeFile["user_name"]    = "";
+        $activeFile["group_name"]   = "";
+        $activeFile["file"]     = $file_contents;
+
+        return true;
+    }
+
+
+    // Remove a file from the tar archive
+    function removeFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename) {
+                    $this->numFiles--;
+                    unset($this->files[$key]);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    // Remove a directory from the tar archive
+    function removeDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname) {
+                    $this->numDirectories--;
+                    unset($this->directories[$key]);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    // Write the currently loaded tar archive to disk
+    function saveTar() {
+        if(!$this->filename)
+            return false;
+
+        // Write tar to current file using specified gzip compression
+        $this->toTar($this->filename,$this->isGzipped);
+
+        return true;
+    }
+
+
+    // Saves tar archive to a different file than the current file
+    function toTar($filename,$useGzip) {
+        if(!$filename)
+            return false;
+
+        // Encode processed files into TAR file format
+        $this->__generateTar();
+
+        // GZ Compress the data if we need to
+        if($useGzip) {
+            // Make sure we have gzip support
+            if(!function_exists("gzencode"))
+                return false;
+
+            $file = gzencode($this->tar_file);
+        } else {
+            $file = $this->tar_file;
+        }
+
+        // Write the TAR file
+        $fp = fopen($filename,"wb");
+        fwrite($fp,$file);
+        fclose($fp);
+
+        return true;
+    }
+
+
+    function toTarStream() {
+        $this->__generateTar();
+        return $this->tar_file;
+    }
+}
+?>
diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 125d332f3..184540af5 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -20,17 +20,19 @@
         function procAddonAdminToggleActivate() {
             $oAddonModel = &getAdminModel('addon');
 
+            $site_module_info = Context::get('site_module_info');
+
             // addon값을 받아옴
             $addon = Context::get('addon');
             if($addon) {
                 // 활성화 되어 있으면 비활성화 시킴
-                if($oAddonModel->isActivatedAddon($addon)) $this->doDeactivate($addon);
+                if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl)) $this->doDeactivate($addon, $site_module_info->site_srl);
 
                 // 비활성화 되어 있으면 활성화 시킴
-                else $this->doActivate($addon);
+                else $this->doActivate($addon, $site_module_info->site_srl);
             }
 
-            $this->makeCacheFile();
+            $this->makeCacheFile($site_module_info->site_srl);
         }
 
         /**
@@ -44,9 +46,11 @@
             unset($args->addon_name);
             unset($args->body);
 
-            $this->doSetup($addon_name, $args);
+            $site_module_info = Context::get('site_module_info');
 
-            $this->makeCacheFile();
+            $this->doSetup($addon_name, $args, $site_module_info->site_srl);
+
+            $this->makeCacheFile($site_module_info->site_srl);
         }
 
 
@@ -55,20 +59,24 @@
          * @brief 애드온 추가
          * DB에 애드온을 추가함
          **/
-        function doInsert($addon) {
+        function doInsert($addon, $site_srl = 0) {
             $args->addon = $addon;
             $args->is_used = 'N';
-            return executeQuery('addon.insertAddon', $args);
+            if(!$site_srl) return executeQuery('addon.insertAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.insertSiteAddon', $args);
         }
 
         /**
          * @brief 애드온 활성화 
          * addons라는 테이블에 애드온의 활성화 상태를 on 시켜줌
          **/
-        function doActivate($addon) {
+        function doActivate($addon, $site_srl = 0) {
             $args->addon = $addon;
             $args->is_used = 'Y';
-            return executeQuery('addon.updateAddon', $args);
+            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
         }
 
         /**
@@ -76,10 +84,12 @@
          *
          * addons라는 테이블에 애드온의 이름을 제거하는 것으로 비활성화를 시키게 된다
          **/
-        function doDeactivate($addon) {
+        function doDeactivate($addon, $site_srl = 0) {
             $args->addon = $addon;
             $args->is_used = 'N';
-            return executeQuery('addon.updateAddon', $args);
+            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
         }
 
 
diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index 0a7b35757..7d4efe229 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -25,9 +25,9 @@
         /**
          * @brief 애드온의 종류와 정보를 구함
          **/
-        function getAddonList() {
+        function getAddonList($site_srl = 0) {
             // activated된 애드온 목록을 구함
-            $inserted_addons = $this->getInsertedAddons();
+            $inserted_addons = $this->getInsertedAddons($site_srl);
 
             // 다운받은 애드온과 설치된 애드온의 목록을 구함
             $searched_list = FileHandler::readDir('./addons');
@@ -44,7 +44,7 @@
 
                 // 해당 애드온의 정보를 구함
                 unset($info);
-                $info = $this->getAddonInfoXml($addon_name);
+                $info = $this->getAddonInfoXml($addon_name, $site_srl);
 
                 $info->addon = $addon_name;
                 $info->path = $path;
@@ -54,7 +54,7 @@
                 if(!in_array($addon_name, array_keys($inserted_addons))) {
                     // DB에 입력되어 있지 않으면 입력 (model에서 이런짓 하는거 싫지만 귀찮아서.. ㅡ.ㅜ)
                     $oAddonAdminController = &getAdminController('addon');
-                    $oAddonAdminController->doInsert($addon_name);
+                    $oAddonAdminController->doInsert($addon_name, $site_srl);
 
                 // 활성화 되어 있는지 확인
                 } else {
@@ -69,7 +69,7 @@
         /**
          * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
          **/
-        function getAddonInfoXml($addon) {
+        function getAddonInfoXml($addon, $site_srl = 0) {
             // 요청된 모듈의 경로를 구한다. 없으면 return
             $addon_path = $this->getAddonPath($addon);
             if(!$addon_path) return;
@@ -87,7 +87,11 @@
 
             // DB에 설정된 내역을 가져온다
             $db_args->addon = $addon;
-            $output = executeQuery('addon.getAddonInfo',$db_args);
+            if(!$site_srl) $output = executeQuery('addon.getAddonInfo',$db_args);
+            else {
+                $db_args->site_srl = $site_srl;
+                $output = executeQuery('addon.getSiteAddonInfo',$db_args);
+            }
             $extra_vals = unserialize($output->data->extra_vars);
 
             if($extra_vals->mid_list) {
@@ -266,9 +270,13 @@
         /**
          * @brief 활성화된 애드온 목록을 구해옴
          **/
-        function getInsertedAddons() {
+        function getInsertedAddons($site_srl = 0) {
             $args->list_order = 'addon';
-            $output = executeQuery('addon.getAddons', $args);
+            if(!$site_srl) $output = executeQuery('addon.getAddons', $args);
+            else {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('addon.getSiteAddons', $args);
+            }
             if(!$output->data) return array();
             if(!is_array($output->data)) $output->data = array($output->data);
 
@@ -283,9 +291,13 @@
         /**
          * @brief 애드온이 활성화 되어 있는지 체크
          **/
-        function isActivatedAddon($addon) {
+        function isActivatedAddon($addon, $site_srl = 0) {
             $args->addon = $addon;
-            $output = executeQuery('addon.getAddonIsActivated', $args);
+            if(!$site_srl) $output = executeQuery('addon.getAddonIsActivated', $args);
+            else {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('addon.getSiteAddonIsActivated', $args);
+            }
             if($output->data->count>0) return true;
             return false;
         }
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index 735a5361e..73e45af55 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -18,9 +18,11 @@
          * @brief 애드온 관리 메인 페이지 (목록 보여줌)
          **/
         function dispAddonAdminIndex() {
+            $site_module_info = Context::get('site_module_info');
+
             // 애드온 목록을 세팅
             $oAddonModel = &getAdminModel('addon');
-            $addon_list = $oAddonModel->getAddonList();
+            $addon_list = $oAddonModel->getAddonList($site_module_info->site_srl);
             Context::set('addon_list', $addon_list);
 
             // 템플릿 패스 및 파일을 지정
@@ -31,24 +33,27 @@
          * @biref 애드온 세부 설정 팝업 출력
          **/
         function dispAddonAdminSetup() {
+            $site_module_info = Context::get('site_module_info');
+
             // 요청된 애드온을 구함
             $selected_addon = Context::get('selected_addon');
 
             // 요청된 애드온의 정보를 구함
             $oAddonModel = &getAdminModel('addon');
-            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon);
+            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl);
             Context::set('addon_info', $addon_info);
 
             // mid 목록을 가져옴
             $oModuleModel = &getModel('module');
 
-            // 모듈 카테고리 목록을 구함
-            $module_categories = $oModuleModel->getModuleCategories();
-
-            $mid_list = $oModuleModel->getMidList();
+            if($site_module_info->site_srl) $args->site_srl = $site_module_info->site_srl;
+            $mid_list = $oModuleModel->getMidList($args);
 
             // module_category와 module의 조합
-            if($module_categories) {
+            if(!$site_module_info->site_srl) {
+                // 모듈 카테고리 목록을 구함
+                $module_categories = $oModuleModel->getModuleCategories();
+
                 foreach($mid_list as $module_srl => $module) {
                     $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
                 }
@@ -69,12 +74,14 @@
          * @brief 애드온의 상세 정보(conf/info.xml)를 팝업 출력
          **/
         function dispAddonAdminInfo() {
+            $site_module_info = Context::get('site_module_info');
+
             // 요청된 애드온을 구함
             $selected_addon = Context::get('selected_addon');
 
             // 요청된 애드온의 정보를 구함
             $oAddonModel = &getAdminModel('addon');
-            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon);
+            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl);
             Context::set('addon_info', $addon_info);
 
             // 레이아웃을 팝업으로 지정
diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index dcd4937e3..cce625e85 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -13,10 +13,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('addon', 'view', 'dispAddonAdminIndex');
-            
             // 몇가지 애드온을 등록
             $oAddonController = &getAdminController('addon');
             $oAddonController->doInsert('autolink');
@@ -39,7 +35,7 @@
             $oAddonController->doActivate('mobile');
             $oAddonController->doActivate('referer');
             $oAddonController->doActivate('resize_image');
-            $oAddonController->procAddonAdminToggleActivate();
+            $oAddonController->makeCacheFile(0);
             return new Object();
         }
 
@@ -47,6 +43,7 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
             return false;
         }
 
@@ -61,8 +58,7 @@
          * @brief 캐시 파일 재생성
          **/
         function recompileCache() {
-            $oAddonController = &getAdminController('addon');
-            $oAddonController->makeCacheFile();
+            FileHandler::removeFilesInDir('./files/cache/addons');
         }
 
     }
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 35a595638..b0f0eb5eb 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -14,14 +14,31 @@
         function init() {
         }
 
+        /**
+         * @brief 메인/ 가상 사이트별 애드온 캐시 파일의 위치를 구함
+         **/
+        function getCacheFilePath() {
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = $site_module_info->site_srl;
+
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
+
+            if($site_srl) $addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
+            else $addon_file = $addon_path.'acivated_addons.cache.php';
+
+            if(!file_exists($addon_file)) $this->makeCacheFile($site_srl);
+            return $addon_file;
+        }
+
 
         /**
          * @brief 애드온 mid 추가 설정 
          **/
-        function _getMidList($selected_addon) {
+        function _getMidList($selected_addon, $site_srl = 0) {
 
             $oAddonAdminModel = &getAdminModel('addon');
-            $addon_info = $oAddonAdminModel->getAddonInfoXml($selected_addon);
+            $addon_info = $oAddonAdminModel->getAddonInfoXml($selected_addon, $site_srl);
             return $addon_info->mid_list;
         }
 
@@ -30,24 +47,24 @@
         /**
          * @brief 애드온 mid 추가 설정 
          **/
-        function _setAddMid($selected_addon,$mid) {
+        function _setAddMid($selected_addon,$mid, $site_srl=0) {
 
             // 요청된 애드온의 정보를 구함
-            $mid_list = $this->_getMidList($selected_addon);
+            $mid_list = $this->_getMidList($selected_addon, $site_srl);
 
             $mid_list[] = $mid;
             $new_mid_list = array_unique($mid_list);
-            $this->_setMid($selected_addon,$new_mid_list);
+            $this->_setMid($selected_addon,$new_mid_list, $site_srl);
         }
 
 
         /**
          * @brief 애드온 mid 추가 설정 
          **/
-        function _setDelMid($selected_addon,$mid) {
+        function _setDelMid($selected_addon,$mid,$site_srl=0) {
 
             // 요청된 애드온의 정보를 구함
-            $mid_list = $this->_getMidList($selected_addon);
+            $mid_list = $this->_getMidList($selected_addon,$site_srl);
 
             $new_mid_list = array();
             if(is_array($mid_list)){
@@ -59,16 +76,16 @@
             }
 
 
-            $this->_setMid($selected_addon,$new_mid_list);
+            $this->_setMid($selected_addon,$new_mid_list,$site_srl);
         }
 
         /**
          * @brief 애드온 mid 추가 설정 
          **/
-        function _setMid($selected_addon,$mid_list) {
+        function _setMid($selected_addon,$mid_list,$site_srl=0) {
             $args->mid_list =  join('|@|',$mid_list);
-            $this->doSetup($selected_addon, $args);
-            $this->makeCacheFile();
+            $this->doSetup($selected_addon, $args,$site_srl);
+            $this->makeCacheFile($site_srl);
         }
 
 
@@ -76,37 +93,35 @@
          * @brief 애드온 mid 추가
          **/
         function procAddonSetupAddonAddMid() {
+            $site_module_info = Context::get('site_module_info');
 
             $args = Context::getRequestVars();
             $addon_name = $args->addon_name;
             $mid = $args->mid;
-            $this->_setAddMid($addon_name,$mid);
+            $this->_setAddMid($addon_name,$mid,$site_module_info->site_srl);
         }
 
-
         /**
          * @brief 애드온 mid 삭제
          **/
         function procAddonSetupAddonDelMid() {
+            $site_module_info = Context::get('site_module_info');
 
             $args = Context::getRequestVars();
             $addon_name = $args->addon_name;
             $mid = $args->mid;
 
-            $this->_setDelMid($addon_name,$mid);
+            $this->_setDelMid($addon_name,$mid,$site_module_info->site_srl);
         }
 
-
-
-
         /**
          * @brief 캐시 파일 생성
          **/
-        function makeCacheFile() {
+        function makeCacheFile($site_srl = 0) {
             // 모듈에서 애드온을 사용하기 위한 캐시 파일 생성
             $buff = "";
             $oAddonModel = &getAdminModel('addon');
-            $addon_list = $oAddonModel->getInsertedAddons();
+            $addon_list = $oAddonModel->getInsertedAddons($site_srl);
             foreach($addon_list as $addon => $val) {
                 if($val->is_used != 'Y' || !is_dir(_XE_PATH_.'addons/'.$addon) ) continue;
 
@@ -125,19 +140,39 @@
 
             $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $_m = Context::get(\'mid\'); %s ?>', $buff);
 
-            FileHandler::writeFile($this->cache_file, $buff);
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
+
+            if($site_srl) $addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
+            else $addon_file = $addon_path.'acivated_addons.cache.php';
+
+            FileHandler::writeFile($addon_file, $buff);
         }
 
-
-
         /**
          * @brief 애드온 설정
          **/
-        function doSetup($addon, $extra_vars) {
+        function doSetup($addon, $extra_vars,$site_srl=0) {
             if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
             $args->addon = $addon;
             $args->extra_vars = serialize($extra_vars);
-            return executeQuery('addon.updateAddon', $args);
+            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
+        }
+
+        /**
+         * @brief 가상 사이트에서의 애드온 정보 제거
+         **/
+        function removeAddonConfig($site_srl) {
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+            $addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
+            if(file_exists($addon_file)) FileHandler::removeFile($addon_file);
+
+            $args->site_srl = $site_srl;
+            executeQuery('addon.deleteSiteAddons', $args);
+
+
         }
 
 
diff --git a/modules/addon/conf/info.xml b/modules/addon/conf/info.xml
index 78dcaab28..a7d14cc82 100644
--- a/modules/addon/conf/info.xml
+++ b/modules/addon/conf/info.xml
@@ -3,7 +3,7 @@
     <title xml:lang="ko">애드온</title>
     <title xml:lang="en">Addon</title>
     <title xml:lang="es">Addon</title>
-    <title xml:lang="zh-CN">插件</title>
+    <title xml:lang="zh-CN">插件管理</title>
     <title xml:lang="jp">アドオン</title>
     <title xml:lang="fr">Additions</title>
     <title xml:lang="ru">Аддоны</title>
@@ -18,7 +18,7 @@
     <description xml:lang="zh-TW">設定附加元件「登錄、啟用、禁用」的管理模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>manager</category>
+    <category>utility</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/addon/conf/module.xml b/modules/addon/conf/module.xml
index bc552e1dc..6daf7c96d 100644
--- a/modules/addon/conf/module.xml
+++ b/modules/addon/conf/module.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispAddonAdminIndex" type="view" standalone="true" admin_index="true" />
         <action name="dispAddonAdminInfo" type="view" standalone="true" />
diff --git a/modules/addon/lang/ko.lang.php b/modules/addon/lang/ko.lang.php
index 9200a3c58..587b1fdb9 100644
--- a/modules/addon/lang/ko.lang.php
+++ b/modules/addon/lang/ko.lang.php
@@ -12,6 +12,6 @@
     $lang->addon_license = '라이선스';
     $lang->addon_history = '변경 이력';
 
-    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
+    $lang->about_addon_mid = '애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)';
     $lang->about_addon = '애드온은 html결과물을 출력하기 보다 동작을 제어하는 역할을 합니다.<br />원하시는 애드온을 on/ off하시는 것만으로 사이트 운영에 유용한 기능을 연동할 수 있습니다.';
 ?>
diff --git a/modules/addon/lang/zh-TW.lang.php b/modules/addon/lang/zh-TW.lang.php
index ea55114a7..8a6b99d63 100644
--- a/modules/addon/lang/zh-TW.lang.php
+++ b/modules/addon/lang/zh-TW.lang.php
@@ -13,5 +13,5 @@
     $lang->addon_history = '更新紀錄';
 
     $lang->about_addon_mid = "可以指定使用附加元件的目標。<br />(全部不選取表示可用在所有目標。)";
-    $lang->about_addon = '附加元件可擴展程式功能，而不是顯示輸出HTML結果。<br />『啟用/禁用』附加元件，增強網站的功能。';
+    $lang->about_addon = '附加元件可擴展程式功能，而不是顯示輸出HTML結果。<br />『啟用/禁用』附加元件，以增強網站的功能。';
 ?>
diff --git a/modules/addon/queries/deleteSiteAddon.xml b/modules/addon/queries/deleteSiteAddon.xml
new file mode 100644
index 000000000..91fc13695
--- /dev/null
+++ b/modules/addon/queries/deleteSiteAddon.xml
@@ -0,0 +1,9 @@
+<query id="deleteSiteAddon" action="delete">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/addon/queries/deleteSiteAddons.xml b/modules/addon/queries/deleteSiteAddons.xml
new file mode 100644
index 000000000..163ae955c
--- /dev/null
+++ b/modules/addon/queries/deleteSiteAddons.xml
@@ -0,0 +1,8 @@
+<query id="deleteSiteAddons" action="delete">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/addon/queries/getSiteAddonInfo.xml b/modules/addon/queries/getSiteAddonInfo.xml
new file mode 100644
index 000000000..064f1033e
--- /dev/null
+++ b/modules/addon/queries/getSiteAddonInfo.xml
@@ -0,0 +1,10 @@
+<query id="getSiteAddonInfo" action="select">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <columns />
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/addon/queries/getSiteAddonIsActivated.xml b/modules/addon/queries/getSiteAddonIsActivated.xml
new file mode 100644
index 000000000..b4bc83c89
--- /dev/null
+++ b/modules/addon/queries/getSiteAddonIsActivated.xml
@@ -0,0 +1,13 @@
+<query id="getAddonIsActivated" action="select">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <columns>
+      <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" pipe="and" />
+      <condition operation="equal" column="is_used" default="Y" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/addon/queries/getSiteAddons.xml b/modules/addon/queries/getSiteAddons.xml
new file mode 100644
index 000000000..2bf25b713
--- /dev/null
+++ b/modules/addon/queries/getSiteAddons.xml
@@ -0,0 +1,11 @@
+<query id="getSiteAddons" action="select">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <conditions>
+      <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+    </conditions>
+    <navigation>
+      <index var="list_order" default="addon" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/addon/queries/insertSiteAddon.xml b/modules/addon/queries/insertSiteAddon.xml
new file mode 100644
index 000000000..6aa9fc618
--- /dev/null
+++ b/modules/addon/queries/insertSiteAddon.xml
@@ -0,0 +1,11 @@
+<query id="insertSiteAddon" action="insert">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <columns>
+      <column name="site_srl" var="site_srl" notnull="notnull" />
+      <column name="addon" var="addon" notnull="notnull" />
+      <column name="is_used" var="is_used" default="N" notnull="notnull" />
+      <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/addon/queries/updateSiteAddon.xml b/modules/addon/queries/updateSiteAddon.xml
new file mode 100644
index 000000000..344c220d9
--- /dev/null
+++ b/modules/addon/queries/updateSiteAddon.xml
@@ -0,0 +1,13 @@
+<query id="updateSiteAddon" action="update">
+    <tables>
+      <table name="addons_site" />
+    </tables>
+    <columns>
+      <column name="is_used" var="is_used" />
+      <column name="extra_vars" var="extra_vars" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+        <condition operation="equal" column="addon" var="addon" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/addon/schemas/addons_site.xml b/modules/addon/schemas/addons_site.xml
new file mode 100644
index 000000000..fc156ae09
--- /dev/null
+++ b/modules/addon/schemas/addons_site.xml
@@ -0,0 +1,7 @@
+<table name="addons_site">
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" unique="unique_addon_site"/>
+    <column name="addon" type="varchar" size="250" notnull="notnull" unique="unique_addon_site" />
+    <column name="is_used" type="char" size="1" default="Y" notnull="notnull" />
+    <column name="extra_vars" type="text"/>
+    <column name="regdate" type="date" index="idx_regdate" />
+</table>
diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html
index 97441a3cd..dd13c3513 100644
--- a/modules/addon/tpl/addon_info.html
+++ b/modules/addon/tpl/addon_info.html
@@ -1,9 +1,9 @@
-<div id="popHeadder">
-    <h3>{$lang->addon_maker}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->addon_maker}</h3>
 </div>
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$addon_info->title} ver. {$addon_info->version}</td>
@@ -45,12 +45,12 @@
 </div>
 
 <!--@if($addon_info->history)-->
-<div id="popHistoryHeadder">
-    <h3>{$lang->addon_history}</h3>
+<div id="popHistoryHeader">
+    <h3 class="xeAdmin">{$lang->addon_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <col width="100" />
     <col />
 
@@ -84,7 +84,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter" class="tCenter">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 0caa8f3fd..f351b4a4e 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -1,7 +1,7 @@
 <!--%import("filter/toggle_activate_addon.xml")-->
 <!--%import("js/addon.js")-->
 
-<h3>{$lang->addon} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->addon} <span class="gray">{$lang->cmd_management}</span></h3>
 <div class="infoText">{nl2br($lang->about_addon)}</div>
 
 <!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
@@ -10,7 +10,7 @@
 </form>
 
 <!-- 애드온의 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
 <thead>
     <tr>
         <th scope="col"><div>{$lang->addon_name}</div></th>
@@ -31,20 +31,20 @@
             ({$val->addon})
         </div>
     </th>
-    <td class="number center">{$val->version}</td>
-    <td class="center nowrap">
+    <td>{$val->version}</td>
+    <td>
         <!--@foreach($val->author as $author)-->
         <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
         <!--@endforeach-->
     </td>
-    <td class="date center nowrap">{zdate($val->date, 'Y-m-d')}</td>
-    <td class="number nowrap">{$val->path}</td>
-    <td class="nowrap center setup"><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{$lang->cmd_setup}</a></td>
-    <td class="nowrap center <!--@if($val->activated)-->activated<!--@else-->deactivated<!--@end-->">
+    <td>{zdate($val->date, 'Y-m-d')}</td>
+    <td>{$val->path}</td>
+    <td><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" title="{htmlspecialchars($lang->cmd_setup)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+    <td>
         <!--@if($val->activated)-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->use}</a>
+        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
         <!--@else-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->notuse}</a>
+        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
         <!--@end-->
     </td>
 </tr>
diff --git a/modules/addon/tpl/js/addon.js b/modules/addon/tpl/js/addon.js
index 3ff4dad01..782702afa 100644
--- a/modules/addon/tpl/js/addon.js
+++ b/modules/addon/tpl/js/addon.js
@@ -7,3 +7,10 @@ function doToggleAddon(addon) {
     fo_obj.addon.value = addon;
     procFilter(fo_obj, toggle_activate_addon);
 }
+
+// 관리자 제어판 페이지용
+function doToggleAddonInAdmin(obj, addon) {
+    var params = new Array();
+    params['addon'] = addon;
+    exec_xml('addon','procAddonAdminToggleActivate',params,function() { if(/Active/.test(obj.className)) obj.className = "buttonSet buttonDisable"; else obj.className = "buttonSet buttonActive"; } );
+}
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index 0fccb37dd..d39b76217 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -2,15 +2,15 @@
 <!--%import("css/addon.css")-->
 <!--%import("js/addon.js")-->
 
-<div id="popHeadder">
-    <h3>{$lang->cmd_setup}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_setup}</h3>
 </div>
 
 <form action="./" method="get" onsubmit="return procFilter(this, setup_addon);">
 <input type="hidden" name="addon_name" value="{$addon_info->addon_name}" />
 
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <tr>
             <th scope="row"><div><label for="textfield1">{$lang->title}</label></div></th>
             <td>{$addon_info->title} ver. {$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})</td>
@@ -33,10 +33,11 @@
         <!--@if($var->group && ((!$group) || $group != $var->group))-->
         {@$group = $var->group}
         </table>
-        <table cellspacing="0" class="adminTable">
+
+        <h4 class="xeAdmin">{$group}</h4>
+        <table cellspacing="0" class="rowTable">
         <col width="100" />
         <col width="*" />
-        <caption>{$group}</caption>
         <!--@end-->
 
         <tr class="row{$cycle_idx}">
@@ -62,7 +63,7 @@
 
         <!--@if($group)-->
         </table>
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <!--@end-->
 
         <tr>
@@ -97,9 +98,6 @@
     </div>
 
     <div id="popFooter">
-        <div class="tCenter gap1">
-            <span class="button"><input type="submit" value="{$lang->cmd_apply}" class="editor_button" /></span>
-            <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        </div>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
     </div>
 </form>
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 0fcad69d4..7353aebb5 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -10,6 +10,12 @@
          * @brief 초기화
          **/
         function init() {
+            // 접속 사용자에 대한 체크
+            $oMemberModel = &getModel('member');
+            $logged_info = $oMemberModel->getLoggedInfo();
+
+            // 관리자가 아니면 금지
+            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
         }
 
         /**
@@ -33,5 +39,13 @@
 
             $this->setMessage('success_updated');
         }
+
+        /**
+         * @brief 관리자 로그아웃
+         **/
+        function procAdminLogout() {
+            $oMemberController = &getController('member');
+            $oMemberController->procMemberLogout();
+        }
     }
 ?>
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
deleted file mode 100644
index 1caf5a93c..000000000
--- a/modules/admin/admin.admin.model.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @class  adminAdminModel
-     * @author zero (zero@nzeo.com)
-     * @brief  admin 모듈의 admin model class
-     **/
-
-    class adminAdminModel extends admin {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-    }
-?>
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 9dbc5bd27..59785a14b 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -11,8 +11,6 @@
          * @brief 초기화
          **/
         function init() {
-            if(!$this->grant->is_admin) return;
-
             // template path 지정
             $this->setTemplatePath($this->module_path.'tpl');
 
@@ -20,22 +18,54 @@
             $oMemberModel = &getModel('member');
             $logged_info = $oMemberModel->getLoggedInfo();
 
+            // 관리자가 아니면 금지
+            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
+
             // 관리자용 레이아웃으로 변경
             $this->setLayoutPath($this->getTemplatePath());
             $this->setLayoutFile('layout.html');
 
-            // 설치된 모듈 목록 가져오기
+            // 설치된 모듈 목록 가져와서 적절히 분리
             $oModuleModel = &getModel('module');
             $installed_module_list = $oModuleModel->getModulesXmlInfo();
+
+            $installed_modules = $package_modules = array();
+            $package_idx = 0;
             foreach($installed_module_list as $key => $val) {
+                if($val->module == 'admin' || !$val->admin_index_act) continue;
+                // action 정보 구함
                 $action_spec = $oModuleModel->getModuleActionXml($val->module);
                 $actions = array();
                 if($action_spec->default_index_act) $actions[] = $action_spec->default_index_act;
                 if($action_spec->admin_index_act) $actions[] = $action_spec->admin_index_act;
                 if($action_spec->action) foreach($action_spec->action as $k => $v) $actions[] = $k;
-                $installed_module_list[$key]->actions = $actions;
+
+                $obj = null;
+                $obj->category = $val->category;
+                $obj->title = $val->title;
+                $obj->description = $val->description;
+                $obj->index_act = $val->admin_index_act;
+                if(in_array(Context::get('act'), $actions)) $obj->selected = true;
+
+                // 패키지 모듈
+                if($val->category == 'package') {
+                    if($package_idx == 0) $obj->position = "first";
+                    else $obj->position = "mid";
+                    $package_modules[] = $obj;
+                    $package_idx ++;
+                    if($obj->selected) Context::set('package_selected',true);
+                // 일반 모듈
+                } else {
+                    $installed_modules[] = $obj;
+                }
+                if($obj->selected) {
+                    Context::set('selected_module_category', $val->category);
+                    Context::set('selected_module_info', $val);
+                }
             }
-            Context::set('installed_module_list', $installed_module_list);
+            if(count($package_modules)) $package_modules[count($package_modules)-1]->position = 'end';
+            Context::set('package_modules', $package_modules);
+            Context::set('installed_modules', $installed_modules);
 
             $db_info = Context::getDBInfo();
 
@@ -45,14 +75,8 @@
             Context::set('use_optimizer', $db_info->use_optimizer!='N'?'Y':'N');
             Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
             Context::set('use_ssl', $db_info->use_ssl?$db_info->use_ssl:"none");
-            if($db_info->http_port)
-            {
-                Context::set('http_port', $db_info->http_port);
-            }
-            if($db_info->https_port)
-            {
-                Context::set('https_port', $db_info->https_port);
-            }
+            if($db_info->http_port) Context::set('http_port', $db_info->http_port);
+            if($db_info->https_port) Context::set('https_port', $db_info->https_port);
 
             Context::setBrowserTitle("XE Admin Page");
         }
@@ -61,6 +85,9 @@
          * @brief 관리자 메인 페이지 출력
          **/
         function dispAdminIndex() {
+            /**
+             * 최근 뉴스를 가져와서 세팅
+             **/
             $newest_news_url = sprintf("http://news.zeroboard.com/%s/news.php", Context::getLangType());
             $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_,Context::getLangType());
             if(!file_exists($cache_file) || filemtime($cache_file)+ 60*60 < time()) {
@@ -89,24 +116,31 @@
                 Context::set('download_link', $buff->zbxe_news->attrs->download_link);
             }
 
+            // DB 정보를 세팅
             $db_info = Context::getDBInfo();
             Context::set('selected_lang', $db_info->lang_type);
 
+            // 현재 버젼과 설치 경로 세팅
             Context::set('current_version', __ZBXE_VERSION__);
             Context::set('installed_path', realpath('./'));
 
+            // 모듈 목록을 가져옴
             $oModuleModel = &getModel('module');
             $module_list = $oModuleModel->getModuleList();
             Context::set('module_list', $module_list);
 
+            // 애드온 목록을 가져옴
             $oAddonModel = &getAdminModel('addon');
             $addon_list = $oAddonModel->getAddonList();
             Context::set('addon_list', $addon_list);
 
+            /**
+             * 각종 통계를 추출
+             **/
             $args->date = date("Ymd000000", time()-60*60*24);
             $today = date("Ymd");
 
-            // 회원
+            // 회원현황
             $output = executeQueryArray("admin.getMemberStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -120,7 +154,7 @@
             $output = executeQuery("admin.getMemberCount", $args);
             $status->member->total = $output->data->count;
 
-            // 문서
+            // 문서현황
             $output = executeQueryArray("admin.getDocumentStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -134,7 +168,7 @@
             $output = executeQuery("admin.getDocumentCount", $args);
             $status->document->total = $output->data->count;
 
-            // 댓글
+            // 댓글현황
             $output = executeQueryArray("admin.getCommentStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -148,7 +182,7 @@
             $output = executeQuery("admin.getCommentCount", $args);
             $status->comment->total = $output->data->count;
 
-            // 엮인글
+            // 엮인글현황
             $output = executeQueryArray("admin.getTrackbackStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -162,7 +196,7 @@
             $output = executeQuery("admin.getTrackbackCount", $args);
             $status->trackback->total = $output->data->count;
 
-            // 첨부파일
+            // 첨부파일현황
             $output = executeQueryArray("admin.getFileStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -176,7 +210,7 @@
             $output = executeQuery("admin.getFileCount", $args);
             $status->file->total = $output->data->count;
 
-            // 게시물 신고
+            // 게시물 신고현황
             $output = executeQueryArray("admin.getDocumentDeclaredStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -190,7 +224,7 @@
             $output = executeQuery("admin.getDocumentDeclaredCount", $args);
             $status->documentDeclared->total = $output->data->count;
 
-            // 댓글 신고
+            // 댓글 신고현황
             $output = executeQueryArray("admin.getCommentDeclaredStatus", $args);
             if($output->data) {
                 foreach($output->data as $var) {
@@ -206,7 +240,9 @@
 
             Context::set('status', $status);
 
+            Context::set('layout','none');
             $this->setTemplateFile('index');
+            //$this->setTemplateFile('a');
         }
 
         /**
@@ -217,13 +253,16 @@
 
             Context::set('selected_lang', $db_info->lang_type);
 
-            Context::set('lang_supported', Context::loadLangSupported());
+            Context::set('default_url', $db_info->default_url);
+
+            Context::set('langs', Context::loadLangSupported());
 
             Context::set('lang_selected', Context::loadLangSelected());
 
             Context::set('ftp_info', Context::getFTPInfo());
 
+            Context::set('layout','none');
             $this->setTemplateFile('config');
         }
     }
-?>
+?>
\ No newline at end of file
diff --git a/modules/admin/conf/info.xml b/modules/admin/conf/info.xml
index bafa5b7fa..55cdc7e93 100644
--- a/modules/admin/conf/info.xml
+++ b/modules/admin/conf/info.xml
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">列出各模組的功能並使用管理員版面，可讓其使用管理功能的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>base</category>
+    <category>system</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 4354491e5..e292da3ba 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispAdminIndex" type="view" standalone="true" index="true"/>
         <action name="dispAdminConfig" type="view" standalone="true" />
 
         <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
+        <action name="procAdminLogout" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/admin/lang/en.lang.php b/modules/admin/lang/en.lang.php
index 947b50dbb..42b6527c7 100644
--- a/modules/admin/lang/en.lang.php
+++ b/modules/admin/lang/en.lang.php
@@ -7,18 +7,26 @@
 
     $lang->admin_info = 'Administrator Info';
     $lang->admin_index = 'Index Admin Page';
+    $lang->control_panel = 'Control panel';
 
     $lang->module_category_title = array(
-        'service' => 'Service Modules',
-        'manager' => 'Managing Modules',
-        'utility' => 'Utility Modules',
-        'accessory' => 'Additional Modules',
-        'base' => 'Default Modules',
+        'service' => 'Service Setting',
+        'member' => 'Member Setting',
+        'content' => 'Content Setting',
+        'statistics' => 'Statistics',
+        'construction' => 'Construction',
+        'utility' => 'Utility Setting',
+        'interlock' => 'Interlock Setting',
+        'accessory' => 'Accessories',
+        'migration' => 'Data Migration',
+        'system' => 'System Setting',
     );
 
     $lang->newest_news = "Latest News";
     
     $lang->env_setup = "Setting";
+    $lang->default_url = "기본 URL";
+    $lang->about_default_url = "XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)";
 
     $lang->env_information = "Environment Information";
     $lang->current_version = "Current Version";
@@ -57,13 +65,13 @@
     $lang->cmd_lang_select = "Language";
     $lang->about_cmd_lang_select = "Selected languages only will be serviced";
     $lang->about_recompile_cache = "You can arrange useless or invalid cache files";
-    $lang->use_ssl = "SSL 사용";
+    $lang->use_ssl = "Use SSL";
     $lang->ssl_options = array(
-        'none' => "사용안함",
-        'optional' => "선택적으로",
-        'always' => "항상사용"
+        'none' => "Not use",
+        'optional' => "optional",
+        'always' => "always"
     );
-    $lang->about_use_ssl = "선택적으로에서는 회원가입/정보수정등의 지정된 action에서 SSL을 사용하고 항상 사용은 모든 서비스가 SSL을 이용하게 됩니다.";
-    $lang->server_ports = "서버포트지정";
-    $lang->about_server_ports = "HTTP는 80, HTTPS는 443이외의 다른 포트를 사용하는 경우에 포트를 지정해주어야합니다.";
+    $lang->about_use_ssl = "If you choose 'optional', SSL will be used for actions such as sign up / changing information. And for 'always', your site will be served only via https.";
+    $lang->server_ports = "Server port";
+    $lang->about_server_ports = "If your web-server uses other than 80 for HTTP, 443 for HTTPS, you should specify server ports";
 ?>
diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php
index 2d6faa3a3..00b1be7e6 100644
--- a/modules/admin/lang/es.lang.php
+++ b/modules/admin/lang/es.lang.php
@@ -7,18 +7,27 @@
 
     $lang->admin_info = 'Administrador de Información';
     $lang->admin_index = 'Índice de la página admin';
+    $lang->control_panel = 'Control panel';
 
     $lang->module_category_title = array(
-        'service' => 'Módulos de Servicio',
-        'manager' => 'La gestión de módulos',
-        'utility' => 'Utilidad de módulos',
-        'accessory' => 'Módulos adicionales',
-        'base' => 'Módulos por defecto',
+        'service' => 'Service Setting',
+        'member' => 'Member Setting',
+        'content' => 'Content Setting',
+        'statistics' => 'Statistics',
+        'construction' => 'Construction',
+        'utility' => 'Utility Setting',
+        'interlock' => 'Interlock Setting',
+        'accessory' => 'Accessories',
+        'migration' => 'Data Migration',
+        'system' => 'System Setting',
     );
 
+
     $lang->newest_news = "Noticias recientes";
     
     $lang->env_setup = "Configuración";
+    $lang->default_url = "기본 URL";
+    $lang->about_default_url = "XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)";
 
     $lang->env_information = "Información Ambiental";
     $lang->current_version = "Versión actual";
diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php
index 8ffdb5730..c204c3d16 100644
--- a/modules/admin/lang/fr.lang.php
+++ b/modules/admin/lang/fr.lang.php
@@ -7,18 +7,27 @@
 
     $lang->admin_info = 'Informations d\'Administrateur';
     $lang->admin_index = 'Page de l\'indice pour l\'Administrateur';
+    $lang->control_panel = 'Control panel';
 
     $lang->module_category_title = array(
-        'service' => 'Modules de Service',
-        'manager' => 'Modules Administratif',
-        'utility' => 'Modules d\'Utilité',
-        'accessory' => 'Modules Additionnels',
-        'base' => 'Modules Fondamentaux',
+        'service' => 'Service Setting',
+        'member' => 'Member Setting',
+        'content' => 'Content Setting',
+        'statistics' => 'Statistics',
+        'construction' => 'Construction',
+        'utility' => 'Utility Setting',
+        'interlock' => 'Interlock Setting',
+        'accessory' => 'Accessories',
+        'migration' => 'Data Migration',
+        'system' => 'System Setting',
     );
 
     $lang->newest_news = "Dernières Nouvelles";
     
     $lang->env_setup = "Configuration";
+    $lang->default_url = "기본 URL";
+    $lang->about_default_url = "XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)";
+
 
     $lang->env_information = "Informations de l'Environnement";
     $lang->current_version = "Version Courante";
diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php
index ac817f6e2..892524c44 100644
--- a/modules/admin/lang/jp.lang.php
+++ b/modules/admin/lang/jp.lang.php
@@ -7,18 +7,26 @@
 
     $lang->admin_info = '管理者情報';
     $lang->admin_index = '管理者トップページ';
+    $lang->control_panel = 'コントロールパネル';
 
     $lang->module_category_title = array(
-        'service' => 'サービス型モジュール',
-        'utility' => '機能性モジュール',
-        'manager' => '管理型モジュール',
-        'accessory' => '付加モジュール',
-        'base' => '基本モジュール',
+        'service' => 'サービス管理',
+        'member' => '会員管理',
+        'content' => 'コンテンツ管理',
+        'statistics' => '統計確認',
+        'construction' => 'サイト設定',
+        'utility' => '機能設定',
+        'interlock' => '連動設定',
+        'accessory' => '付加機能設定',
+        'migration' => 'データ管理／復元',
+        'system' => 'システム管理',
     );
 
     $lang->newest_news = "最新ニュース";
 
     $lang->env_setup = "環境設定";
+    $lang->sso_url = "SSO（シングルサインオン） URL";
+    $lang->about_sso_url = "複数のvirtual siteを運営する場合、どちらからログインしてもvirtual siteの間でログイン情報を維持できるようにするためには、基本になるサイトでのXEをインストールしたurlを登録してください。 (例: http://ドメイン/xe)";
 
     $lang->env_information = "環境情報";
     $lang->current_version = "インストールバージョン";
@@ -51,12 +59,12 @@
     $lang->xe_license = 'XEのライセンスはGPLです。';
     $lang->about_shortcut = 'よく使用するモジュールに登録されたショートカットは削除できます。';
 
-    $lang->yesterday = "Yesterday";
-    $lang->today = "Today";
+    $lang->yesterday = "昨日";
+    $lang->today = "今日";
 
     $lang->cmd_lang_select = "言語選択";
     $lang->about_cmd_lang_select = "選択された言語のみでサービスを行います。";
-    $lang->about_recompile_cache = "要らないか誤ったキャッシューファイルを整理します。";
+    $lang->about_recompile_cache = "要らないｄか誤ったキャッシューファイルを整理します。";
     $lang->use_ssl = "SSL環境設定";
     $lang->ssl_options = array(
         'none' => "使わない",
diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php
index b52acdacb..a06d95382 100644
--- a/modules/admin/lang/ko.lang.php
+++ b/modules/admin/lang/ko.lang.php
@@ -7,38 +7,47 @@
 
     $lang->admin_info = '관리자 정보';
     $lang->admin_index = '관리자 초기 페이지';
+    $lang->control_panel = '제어판';
 
     $lang->module_category_title = array(
-        'service' => '서비스 모듈',
-        'utility' => '기능성 모듈',
-        'manager' => '관리 모듈',
-        'accessory' => '부가 모듈',
-        'base' => '기본 모듈',
+        'service' => '서비스 관리',
+        'member' => '회원 관리',
+        'content' => '정보 관리',
+        'statistics' => '통계 열람',
+        'construction' => '사이트 설정',
+        'utility' => '기능 설정',
+        'interlock' => '연동 설정',
+        'accessory' => '부가 기능 설정',
+        'migration' => '데이터 관리/복원',
+        'system' => '시스템 관리',
     );
 
-    $lang->newest_news = "최신 소식";
+    $lang->newest_news = '최신 소식';
 
-    $lang->env_setup = "환경 설정";
+    $lang->env_setup = '환경 설정';
+    $lang->default_url = '기본 URL';
+    $lang->about_default_url = 'XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)';
 
-    $lang->env_information = "환경 정보";
-    $lang->current_version = "설치된 버전";
-    $lang->current_path = "설치된 경로";
-    $lang->released_version = "최신 버전";
+
+    $lang->env_information = '환경 정보';
+    $lang->current_version = '설치된 버전';
+    $lang->current_path = '설치된 경로';
+    $lang->released_version = '최신 버전';
     $lang->about_download_link = "최신 버전이 배포되었습니다.\ndownload 링크를 클릭하시면 다운 받으실 수 있습니다.";
 
-    $lang->item_module = "모듈 목록";
-    $lang->item_addon  = "애드온 목록";
-    $lang->item_widget = "위젯 목록";
-    $lang->item_layout = "레이아웃 목록";
+    $lang->item_module = '모듈 목록';
+    $lang->item_addon  = '애드온 목록';
+    $lang->item_widget = '위젯 목록';
+    $lang->item_layout = '레이아웃 목록';
 
-    $lang->module_name = "모듈 이름";
-    $lang->addon_name = "애드온 이름";
-    $lang->version = "버전";
-    $lang->author = "제작자";
-    $lang->table_count = "테이블수";
-    $lang->installed_path = "설치경로";
+    $lang->module_name = '모듈 이름';
+    $lang->addon_name = '애드온 이름';
+    $lang->version = '버전';
+    $lang->author = '제작자';
+    $lang->table_count = '테이블수';
+    $lang->installed_path = '설치경로';
 
-    $lang->cmd_shortcut_management = "메뉴 편집하기";
+    $lang->cmd_shortcut_management = '메뉴 편집하기';
 
     $lang->msg_is_not_administrator = '관리자만 접속이 가능합니다';
     $lang->msg_manage_module_cannot_delete = '모듈, 애드온, 레이아웃, 위젯 모듈의 바로가기는 삭제 불가능합니다';
@@ -46,24 +55,24 @@
 
     $lang->welcome_to_xe = 'XE 관리자';
     $lang->about_admin_page = "관리자 페이지는 아직 미완성입니다.\n클로즈 베타동안 좋은 의견 받아서 꼭 필요한 컨텐츠를 채우도록 하겠습니다.";
-    $lang->about_lang_env = "위 설정한 언어셋을 처음 방문하는 사용자들에게 동일하게 적용하기 위해서는 원하는 언어로 변경후 아래 [저장] 버튼을 클릭하시면 됩니다";
+    $lang->about_lang_env = '위 설정한 언어셋을 처음 방문하는 사용자들에게 동일하게 적용하기 위해서는 원하는 언어로 변경후 아래 [저장] 버튼을 클릭하시면 됩니다';
 
     $lang->xe_license = 'XE는 GPL을 따릅니다';
     $lang->about_shortcut = '자주 사용하는 모듈에 등록된 모듈의 바로가기를 삭제할 수 있습니다';
 
-    $lang->yesterday = "어제";
-    $lang->today = "오늘";
+    $lang->yesterday = '어제';
+    $lang->today = '오늘';
 
-    $lang->cmd_lang_select = "언어선택";
-    $lang->about_cmd_lang_select = "선택된 언어들만 서비스 됩니다";
-    $lang->about_recompile_cache = "쓸모 없어졌거나 잘못된 캐시파일들을 정리할 수 있습니다";
-    $lang->use_ssl = "SSL 사용";
+    $lang->cmd_lang_select = '언어선택';
+    $lang->about_cmd_lang_select = '선택된 언어들만 서비스 됩니다';
+    $lang->about_recompile_cache = '쓸모 없어졌거나 잘못된 캐시파일들을 정리할 수 있습니다';
+    $lang->use_ssl = 'SSL 사용';
     $lang->ssl_options = array(
-        'none' => "사용안함",
-        'optional' => "선택적으로",
-        'always' => "항상사용"
+        'none' => '사용안함',
+        'optional' => '선택적으로',
+        'always' => '항상사용'
     );
-    $lang->about_use_ssl = "선택적으로에서는 회원가입/정보수정등의 지정된 action에서 SSL을 사용하고 항상 사용은 모든 서비스가 SSL을 이용하게 됩니다.";
-    $lang->server_ports = "서버포트지정";
-    $lang->about_server_ports = "HTTP는 80, HTTPS는 443이외의 다른 포트를 사용하는 경우에 포트를 지정해주어야합니다.";
+    $lang->about_use_ssl = '선택적으로에서는 회원가입/정보수정등의 지정된 action에서 SSL을 사용하고 항상 사용은 모든 서비스가 SSL을 이용하게 됩니다.';
+    $lang->server_ports = '서버포트지정';
+    $lang->about_server_ports = 'HTTP는 80, HTTPS는 443이외의 다른 포트를 사용하는 경우에 포트를 지정해주어야합니다.';
 ?>
diff --git a/modules/admin/lang/ru.lang.php b/modules/admin/lang/ru.lang.php
index 750895f5c..b4f9cc48c 100644
--- a/modules/admin/lang/ru.lang.php
+++ b/modules/admin/lang/ru.lang.php
@@ -7,18 +7,27 @@
 
     $lang->admin_info = 'Информация администратора';
     $lang->admin_index = 'Индексная страница администратора';
+    $lang->control_panel = 'Control panel';
 
     $lang->module_category_title = array(
-        'service' => 'Служебные модули',
-        'manager' => 'Управляющие модули',
-        'utility' => 'Утилиратные модули',
-        'accessory' => 'Дополнительные модули',
-        'base' => 'Базовые модули',
+        'service' => 'Service Setting',
+        'member' => 'Member Setting',
+        'content' => 'Content Setting',
+        'statistics' => 'Statistics',
+        'construction' => 'Construction',
+        'utility' => 'Utility Setting',
+        'interlock' => 'Interlock Setting',
+        'accessory' => 'Accessories',
+        'migration' => 'Data Migration',
+        'system' => 'System Setting',
     );
 
     $lang->newest_news = "Последние новости";
     
     $lang->env_setup = "Настройка";
+    $lang->default_url = "기본 URL";
+    $lang->about_default_url = "XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)";
+
 
     $lang->env_information = "Информация окружения";
     $lang->current_version = "Текущая версия";
diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php
index 391d61f5d..e2ac2f9dc 100644
--- a/modules/admin/lang/zh-CN.lang.php
+++ b/modules/admin/lang/zh-CN.lang.php
@@ -7,18 +7,26 @@
 
     $lang->admin_info = '管理员信息';
     $lang->admin_index = '管理首页';
+    $lang->control_panel = '控制面板';
 
     $lang->module_category_title = array(
-        'service' => '服务类模块',
-        'manager' => '管理类模块',
-        'utility' => '功能模块',
-        'accessory' => '附加模块',
-        'base' => '基本模块',
+        'service' => '应用管理',
+        'member' => '用户管理',
+        'content' => '资源管理',
+        'statistics' => '统计管理',
+        'construction' => '界面管理',
+        'utility' => '扩展管理',
+        'interlock' => '辅助联动',
+        'accessory' => '附加功能',
+        'migration' => '数据导入',
+        'system' => '系统管理',
     );
 
     $lang->newest_news = "最新消息";
 
     $lang->env_setup = "系统设置";
+    $lang->default_url = "XE通行证";
+    $lang->about_default_url = "请输入默认站点的XE安装地址(ex: http://域名/xe)。 <br /><strong>说明：</strong>简单的说，就是绑定帐号系统。只需要登录一次，就可以在用站点模块生成的多个子站点中随意漫游。";
 
     $lang->env_information = "系统信息";
     $lang->current_version = "安装版本";
@@ -40,7 +48,7 @@
 
     $lang->cmd_shortcut_management = "编辑菜单";
 
-    $lang->msg_is_not_administrator = '只有管理员才可以查看';
+    $lang->msg_is_not_administrator = '只允许管理员访问';
     $lang->msg_manage_module_cannot_delete = '模块，插件，布局，控件模块的快捷菜单是不能删除的。';
     $lang->msg_default_act_is_null = '没有指定默认管理员的动作，是不能添加到快捷菜单的。';
 
@@ -55,8 +63,8 @@
     $lang->yesterday = "Yesterday";
     $lang->today = "Today";
 
-    $lang->cmd_lang_select = "多国语言支援";
-    $lang->about_cmd_lang_select = "只支援被选语言。";
+    $lang->cmd_lang_select = "多国语言支持";
+    $lang->about_cmd_lang_select = "请选择要使用的语言。";
     $lang->about_recompile_cache = "整理无用的或错误的缓冲文件。";
     $lang->use_ssl = "SSL使用";
     $lang->ssl_options = array(
diff --git a/modules/admin/lang/zh-TW.lang.php b/modules/admin/lang/zh-TW.lang.php
index de5b63132..a0a8300a8 100644
--- a/modules/admin/lang/zh-TW.lang.php
+++ b/modules/admin/lang/zh-TW.lang.php
@@ -7,24 +7,33 @@
 
     $lang->admin_info = '管理員資訊';
     $lang->admin_index = '管理頁面';
+    $lang->control_panel = '控制介面';
 
     $lang->module_category_title = array(
-        'service' => '服務類模組',
-        'utility' => '功能模組',
-        'manager' => '管理類模組',
-        'accessory' => '附加模組',
-        'base' => '基本模組',
+        'service' => '服務設定',
+        'member' => '會員管理',
+        'content' => '內容管理',
+        'statistics' => '統計資料',
+        'construction' => '界面設定',
+        'utility' => '擴充功能',
+        'interlock' => '連動設定',
+        'accessory' => '附加功能管理',
+        'migration' => '資料轉換',
+        'system' => '系統管理',
     );
 
     $lang->newest_news = "最新消息";
 
     $lang->env_setup = "系統設置";
+    $lang->default_url = "預設網址";
+    $lang->about_default_url = "XE虛擬網站必須要先輸入預設的網址確保虛擬網站的運作，請輸入預設程式安裝路徑。<br />(例: http://網域名稱/安裝路徑)";
+
 
     $lang->env_information = "系統資訊";
     $lang->current_version = "安裝版本";
     $lang->current_path = "安裝路徑";
     $lang->released_version = "最新版本";
-    $lang->about_download_link = "官方網站已發佈新版本。\n請按 [download] 下載最新版本。";
+    $lang->about_download_link = "官方網站已發佈新版本。\n請按[download]下載最新版本。";
 
     $lang->item_module = "模組列表";
     $lang->item_addon  = "元件列表";
@@ -44,11 +53,11 @@
     $lang->msg_manage_module_cannot_delete = '模組，附加元件，版面設計，控件模組的快捷選單是無法刪除的。';
     $lang->msg_default_act_is_null = '沒有指定預設管理員的動作，是無法新增到快捷選單的。';
 
-    $lang->welcome_to_xe = 'XE 管理頁面';
+    $lang->welcome_to_xe = 'XE管理頁面';
     $lang->about_admin_page = "後台管理頁面未完成";
-    $lang->about_lang_env = "可以設置顯示語言給首次訪問的使用者。修改語言環境後，請按 [儲存] 按鈕進行儲存。";
+    $lang->about_lang_env = "可以設置顯示語言給首次訪問的使用者。修改語言環境後，請按[儲存]按鈕進行儲存。";
 
-    $lang->xe_license = 'XE遵循 GPL 協議';
+    $lang->xe_license = 'XE遵循GPL協議';
     $lang->about_shortcut = '可以刪除新增到常用模組中的快捷選單。';
 
     $lang->yesterday = "昨天";
@@ -63,7 +72,7 @@
         'optional' => "選擇使用",
         'always' => "總是使用"
     );
-    $lang->about_use_ssl = "當會員登入或修改資料等動作時，可選擇是否使用 SSL 功能。";
+    $lang->about_use_ssl = "當會員登入或修改資料等動作時，可選擇是否使用SSL功能。";
     $lang->server_ports = "主機埠口";
-    $lang->about_server_ports = "預設 HTTP 是 80、HTTPS 是 443，如果想使用其他的埠口的話，請自行設定。";
+    $lang->about_server_ports = "HTTP預設埠口是『80』、HTTPS是『443』，如果想使用其他的埠口的話，請自行設定。";
 ?>
diff --git a/modules/admin/queries/getCommentDeclaredStatus.xml b/modules/admin/queries/getCommentDeclaredStatus.xml
index 2e78b65ae..9b7f0e21b 100644
--- a/modules/admin/queries/getCommentDeclaredStatus.xml
+++ b/modules/admin/queries/getCommentDeclaredStatus.xml
@@ -14,6 +14,6 @@
         <list_count var="list_count" default="2" />
     </navigation>
     <groups>
-        <group column="substr(regdate,0,8)" />
+        <group column="substr(regdate,1,8)" />
     </groups>
 </query>
diff --git a/modules/admin/queries/getDocumentDeclaredStatus.xml b/modules/admin/queries/getDocumentDeclaredStatus.xml
index 2edc1f822..160dce597 100644
--- a/modules/admin/queries/getDocumentDeclaredStatus.xml
+++ b/modules/admin/queries/getDocumentDeclaredStatus.xml
@@ -14,6 +14,6 @@
         <list_count var="list_count" default="2" />
     </navigation>
     <groups>
-        <group column="substr(regdate,0,8)" />
+        <group column="substr(regdate,1,8)" />
     </groups>
 </query>
diff --git a/modules/admin/tpl/_footer.html b/modules/admin/tpl/_footer.html
new file mode 100644
index 000000000..9d47a71e4
--- /dev/null
+++ b/modules/admin/tpl/_footer.html
@@ -0,0 +1,6 @@
+    </div>
+	<hr />
+	<div class="footer">
+        <address><a href="http://www.zeroboard.com" onclick="window.open(this.href);return false;">Powered by <strong>X</strong>press <strong>E</strong>ngine</a></address>
+	</div>
+</div>
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
new file mode 100644
index 000000000..287cc68fc
--- /dev/null
+++ b/modules/admin/tpl/_header.html
@@ -0,0 +1,44 @@
+<!--%import("css/layout.css")-->
+<!--%import("js/admin.js")-->
+<div id="xeAdmin" class="<!--@if(!$act || ($act == 'dispAdminIndex' || $act == 'dispAdminConfig'))-->ece<!--@else-->ec<!--@end-->">
+	<div class="header">
+		<h1 class="xeAdmin"><a href="{getUrl('','module','admin')}">XpressEngine</a></h1>
+		<ul class="gnb">
+            <li><a href="#" onclick="doAdminLogout(); return false;">Logout</a></li>
+			<!--@if($logged_info->is_admin=='Y')--><li><a href="{getUrl('','module','admin','act','dispAdminConfig')}">Settings</a></li><!--@end-->
+			<li><a href="#" onclick="toggleAdminLang();return false;">Language</a>
+				<ul id="adminLang">
+                    <!--@foreach($lang_supported as $key => $val)-->
+					<li <!--@if($key == $lang_type)-->class="open"<!--@end-->><a href="#" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
+                    <!--@end-->
+				</ul>
+			</li>
+		</ul>
+		<ul class="lnb">
+			<li class="core <!--@if(!$package_selected)-->selected<!--@end-->"><a href="{getUrl('','module','admin')}">{$lang->control_panel}</a></li>
+
+            <!--@foreach($package_modules as $key => $val)-->
+                <li class="{$val->position} <!--@if($val->selected)-->selected<!--@end-->"><a href="{getUrl('','module','admin','act',$val->index_act)}" title="{trim($val->description)}">{$val->title}</a></li>
+            <!--@end-->
+		</ul>
+	</div>
+	<hr />
+	<div class="body">
+		<div class="extension e1">
+			<div class="section">
+				<ul class="navigation">
+                    <!--@foreach($lang->module_category_title as $key => $val)-->
+					<li id="module_{$key}" class="<!--@if($selected_module_category == $key)-->open<!--@end-->"><a href="#"  onclick="toggleModuleMenu('{$key}'); return false;">{$val}</a>
+						<ul>
+                            <!--@foreach($installed_modules as $k => $v)-->
+                            <!--@if($v->category == $key)-->
+                            <li <!--@if($v->selected)-->class="active"<!--@end-->><a href="{getUrl('','module','admin','act',$v->index_act)}" title="{$v->description}">{$v->title}</a></li>
+                            <!--@end-->
+                            <!--@end-->
+						</ul>
+					</li>
+                    <!--@end-->
+                </ul>
+            </div>
+		</div>
+		<hr />
diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
index 754115b74..9dcd4310f 100644
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@@ -1,15 +1,23 @@
+<!--#include("_header.html")-->
+
 <!--%import("./filter/update_env_config.xml")-->
 <!--%import("./filter/update_lang_select.xml")-->
 <!--%import("./filter/install_ftp_info.xml")-->
 <!--%import("../../install/lang")-->
 <!--%import("../../install/tpl/js/install_admin.js",optimized=false)-->
 
-<h3 class="bottomGap">{$lang->cmd_setup}</h3>
+<div class="content">
+    <!--@if($logged_info->is_admin == 'Y')-->
+        <p class="path">
+            <a href="{getUrl('','module','admin')}">{$lang->control_panel}</a> 
+            &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$act)}">{$lang->env_setup}</a>
+        </p>
+    <!--@end-->
+
+    <h4 class="xeAdmin">{$lang->cmd_setup}</h4>
 
-<div class="adminLeftContent">
     <form action="./" method="get" onsubmit="return procFilter(this, update_env_config);">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->env_setup}</caption>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th><div>{$lang->use_rewrite}</div></th>
         <td>
@@ -17,6 +25,13 @@
             <p>{$lang->about_rewrite}</p>
         </td>
     </tr>
+    <tr>
+        <th><div>{$lang->default_url}</div></th>
+        <td>
+            <input type="text" name="default_url" value="{$default_url}" class="inputTypeText w300"/>
+            <p>{$lang->about_default_url}</p>
+        </td>
+    </tr>
     <tr>
         <th><div>{$lang->use_optimizer}</div></th>
         <td>
@@ -25,9 +40,9 @@
         </td>
     </tr>
     <tr>
-        <th><div>Language Selection</div></th>
+        <th><div>Language</div></th>
         <td>
-            <select name="lang_type">
+            <select name="change_lang_type">
                 <!--@foreach($lang_supported as $key => $val)-->
                     <option value="{$key}" <!--@if($key==$selected_lang)-->selected="selected"<!--@end-->>{$val}</option>
                 <!--@endforeach-->
@@ -38,7 +53,7 @@
     <tr>
         <th><div>{$lang->time_zone}</div></th>
         <td>
-            <select name="time_zone" class="fixWidth">
+            <select name="time_zone" class="fullWidth">
                 <!--@foreach($time_zone_list as $key => $val)-->
                 <option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
                 <!--@endforeach-->
@@ -73,21 +88,17 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+        </th>
     </tr>
     </table>
     </form>
 
+    <h4 class="xeAdmin">{$lang->ftp_form_title}</h4>
+    <p class="summary">{$lang->about_ftp_info}</p>
     <form action="./" method="post" onsubmit="return procFilter(this, install_ftp_info);" id="ftp_form">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->ftp_form_title}</caption>
-    <tr>
-        <td colspan="3">
-            <p>{$lang->about_ftp_info}</p>
-        </td>
-    </tr>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th><div><label for="textfield21">{$lang->user_id}</label></div></th>
         <th><div><label for="textfield22">{$lang->password}</label></div></th>
@@ -99,48 +110,50 @@
         <td><input id="textfield24" type="text" name="ftp_port" value="{$ftp_info->ftp_port}" class="inputTypeText" /></td>
     </tr>
     <tr>
-        <td colspan="3" class="right">
-            <span class="button"><input type="button" value="{$lang->cmd_check_ftp_connect}" onclick="doCheckFTPInfo(); return false;"/></span>
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </td>
+        <th colspan="3" class="button">
+            <span class="button blue"><input type="button" value="{$lang->cmd_check_ftp_connect}" onclick="doCheckFTPInfo(); return false;"/></span>
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
+        </th>
     </tr>
     </table>
     </form>
 
 </div>
 
-<div class="adminRightExtra">
-    <form action="./" method="get" onsubmit="return procFilter(this, update_lang_select);">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_lang_select}</caption>
-    <tr>
-        <td>
-            <!--@foreach($lang_supported as $key => $val)-->
-            <div><input id="lang_{$key}" type="checkbox" name="selected_lang" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked"<!--@end--> <!--@if($key==$selected_lang)-->disabled="disabled"<!--@end--> /> <label for="lang_{$key}">{$val}</label></div>
-            <!--@endforeach-->
-            <p>{$lang->about_cmd_lang_select}</p>
-        </td>
-    </tr>
-    <tr>
-        <td class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </td>
-    </tr>
-    </table>
-    </form>
+<hr />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_remake_cache}</caption>
-    <tr>
-        <td>
-            <p>{$lang->about_recompile_cache}</p>
-        </td>
-    </tr>
-    <tr>
-        <td class="right">
-            <span class="button"><input type="button" value="{$lang->cmd_remake_cache}" onclick="doRecompileCacheFile(); return false;"/></span>
-        </td>
-    </tr>
-    </table>
+<div class="extension e2">
+    <div class="section">
 
+        <h4 class="xeAdmin">{$lang->cmd_lang_select}</h4>
+        <p class="summary">{$lang->about_cmd_lang_select}</p>
+        <form action="./" method="get" onsubmit="return procFilter(this, update_lang_select);">
+        <table cellspacing="0" class="rowTable">
+        <!--@foreach($langs as $key => $val)-->
+        <tr>
+            <td>
+                <input id="lang_{$key}" type="checkbox" name="selected_lang" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked"<!--@end--> <!--@if($key==$selected_lang)-->disabled="disabled"<!--@end--> /> <label for="lang_{$key}">{$val}</label>
+            </td>
+        </tr>
+        <!--@endforeach-->
+        <tr>
+            <th class="button">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+            </th>
+        </tr>
+        </table>
+        </form>
+
+        <h4 class="xeAdmin">{$lang->cmd_remake_cache}</h4>
+        <p class="summary">{$lang->about_recompile_cache}</p>
+        <table cellspacing="0" class="colTable">
+        <tr>
+            <th class="button">
+                <span class="button black strong"><input type="button" value="{$lang->cmd_remake_cache}" onclick="doRecompileCacheFile(); return false;"/></span>
+            </th>
+        </tr>
+        </table>
+    </div>
 </div>
+
+<!--#include("_footer.html")-->
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index b58ebac07..ed00822cc 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -1,34 +1,151 @@
 @charset "utf-8";
+@import url("./font.css");
+@import url("./pagination.css");
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
 
-.topGap { margin-top:10px; }
-.rightGap { margin-right:10px; }
-.bottomGap { margin-bottom:15px; }
-.leftGap { margin-left:10px; }
-textarea { padding:.3em 0 0 .3em;}
+#xeAdmin {background-color:#fff; }
+#xeAdmin .open{ display:block !important;}
+#xeAdmin h1.xeAdmin { float:left; white-space:nowrap; margin:0;padding:0;}
+#xeAdmin caption{ text-align:left;}
+#xeAdmin button{ cursor:pointer;}
+#xeAdmin hr{ display:none;}
+#xeAdmin fieldset{ border:0;}
+#xeAdmin fieldset legend{ font-size:0; line-height:0; position:absolute; visibility:hidden;}
+#xeAdmin .section{ margin-bottom:20px;}
+#xeAdmin .buttonArea{ text-align:center; padding:15px 0;}
+#xeAdmin button.text{ background:none; border:0; color:#0000ee;}
+#xeAdmin img.graphHr{ height:5px; vertical-align:middle;}
 
-h3 { margin:0; padding:8px 0 0 10px; border:1px solid #5E95BC; border-left:1px solid #8EB9D8; border-top:1px solid #8EB9D8; background:url("../images/n_title_bg.gif") repeat-x left top; font-size:1em; color:#27536C; height:22px;}
-h3 .gray { color:#8AB2CE;}
-.infoText { background:#FFFFFF; padding:10px; color:#27536C; border-left:1px solid #8AB2CE; border-bottom:1px solid #8AB2CE; border-right:1px solid #8AB2CE; line-height:1.5; margin-bottom:10px; }
-.subInfoText { background:#FFFFFF; padding:10px; color:#27536C; border:1px solid #EEEEEE; line-height:1.5; margin-bottom:10px; }
+.crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+.crossTable th div { white-space:nowrap; }
+.crossTable th,
+.crossTable td{ border:0; padding:5px 10px; vertical-align:top;}
+.crossTable th{ background:#f4f4f4;}
+.crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+.crossTable thead th:first-child{ background-image:none;}
+.crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
+.crossTable td{ border-bottom:1px solid #f0f0f0;}
 
-h4 { text-align:right; font-size:12pt; color:#f2250d; padding-left:10px; margin:0;}
-h4 .bracket { font-weight:normal; color:#9d9d9d;}
-h4 .vr { font-weight:normal; color:#d1d1d1;}
-h4 .view { color:#158692; padding-right:.6em; font:bold 9pt Tahoma; text-decoration:none; }
+.colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+.colTable th div { white-space:nowrap; }
+.colTable tr.bg0{ background:#fff;}
+.colTable tr.bg1{ background:#f8f8f8;}
+.colTable th,
+.colTable td{ border:0; padding:5px 10px; vertical-align:top;}
+.colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+.colTable th:first-child{ background-image:none;}
+.colTable td{ border-bottom:1px solid #f0f0f0;}
 
-div.summary { clear:both; font:8pt tahoma; color:#636363; margin-bottom:5px; }
-div.summary .vr { font-weight:normal; color:#d1d1d1; }
-div.summary em { color:#ff1d00; font-style:normal;}
+.rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
+.rowTable th div { white-space:nowrap; }
+.rowTable tr.bg0{ background:#fff;}
+.rowTable tr.bg1{ background:#f8f8f8;}
+.rowTable th,
+.rowTable td{ border:0; padding:5px 10px; text-align:left; vertical-align:top;}
+.rowTable th{ background:#f4f4f4;}
+.rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
+.rowTable td{ border-bottom:1px solid #f0f0f0;}
 
-.adminLeftContent { float:left; width:60%; margin-right:2%; _margin-right:1.9%;}
-.adminRightExtra { float:left; width:38%; }
+.rowTable th.button, .colTable th.button, .crossTable th.button { text-align:right; }
+.rowTable td.alert, .colTable td.alert, .crossTable td.alert  { color:red !important; }
+.rowTable td.alert a, .colTable td.alert a, .crossTable td.alert a { text-decoration:none; color:red !important; }
 
-.adminTable { width:100%; border:1px solid #9BC2DE; border-bottom:none; border-right:none; margin-bottom:15px; }
-.adminTable caption { background:url("../images/n_caption_head.gif") no-repeat left top; padding:8px 0 5px 30px; text-align:left; font-weight:bold; color:#FFFFFF; background-color:#548DB5; border-bottom:1px solid #FFFFFF; }
+.colTable td.wide, .rowTable td.wide, .crossTable td.wide { width:100%;}
 
+.e1 .navigation { list-style:none; position:relative; *zoom:1; margin:0; padding:0;}
+.e1 .navigation ul { list-style:none; position:relative; *zoom:1; margin:0; padding:0;}
+.e1 .navigation li{ list-style:none; position:relative; *zoom:1; margin:0; padding:0;}
+.e1 .navigation li a{ display:block; position:relative; padding:4px 0 4px 24px; background-image:url(../img/iconNavigation.gif); background-repeat:no-repeat;}
+.e1 .navigation li.open a{ background-position:0 -24px; background-color:#eee; border-top:1px solid #ddd;  border-bottom:1px solid #ddd;}
+.e1 .navigation li.open ul li a{ background-color:#fff; border:0;}
+.e1 .navigation li ul{ display:none; margin:10px 0 20px 24px;}
+.e1 .navigation li.open ul{ display:block;}
+.e1 .navigation li ul li a{ padding:2px 0 2px 5px; background-image:none;}
+.e1 .navigation li a:hover,
+.e1 .navigation li a:active,
+.e1 .navigation li a:focus { background-color:#eee !important;}
+
+.e2 .section{ margin-left:20px;}
+.e2 .section h3.xeAdmin { margin:0 0 10px 0; padding:0 0 0 25px; }
+.e2 .section h3.xeAdmin .date{ padding-left:10px; background:url(../img/lineVrText.gif) no-repeat left center;}
+
+.e2 table th{ white-space:nowrap;}
+.e2 table tbody td{ text-align:left; word-break:break-all; -ms-word-break:break-all; }
+
+#xeAdmin .localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; }
+#xeAdmin .localNavigation:after {content:""; display:block; clear:both;}
+#xeAdmin .localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
+#xeAdmin .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x;}
+#xeAdmin .localNavigation li.on { margin-bottom:-1px;}
+#xeAdmin .localNavigation li.on a{ height:19px; background:none;}
+
+#xeAdmin h3.xeAdmin {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center;}
+#xeAdmin h4.xeAdmin {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
+#xeAdmin h4.xeAdmin span.vr { font-size:11px; color:#AAA; }
+#xeAdmin h4.xeAdmin a.view { font-size:11px; font-family:vertical; color:#777e86; }
+#xeAdmin p.summary, div.infoText { margin:0 0 15px 0; line-height:1.6;}
+
+.layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
+.layer * { margin:0; padding:0; font-size:12px; }
+.layer h4.xeAdmin { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
+.layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
+.layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
+.layer .layerBody{ margin:15px;}
+
+.boxModelControler select { margin-bottom:3px; }
+.boxModelControler .inputText { border:1px solid #ccc; padding:2px 3px; margin-bottom:3px; vertical-align:top; *margin-top:-1px; }
+.boxModelControler .inputCheck { width:13px; height:13px; vertical-align:middle; }
+.boxModelControler .layerBody { margin:15px; }
+.boxModelControler .preview{ overflow:hidden; margin-bottom:20px;}
+.boxModelControler .dragAble { position:relative; padding:15px 0 0 15px; background:url(../img/bgRuler.gif) no-repeat; *zoom:1; cursor:move;}
+.boxModelControler .dragAble .prevGrid { position:relative; margin:-1px; background:url(../img/bgGrid.gif) 0 0; border:1px solid #000; *zoom:1;}
+.boxModelControler .dragAble .prevBox { position:relative; }
+.boxModelControler .dragAble .prevBox .prevContent { position:relative; }
+.boxModelControler .boxModelTable { width:100%; border:0; border-bottom:1px solid #ddd; margin:0; padding:0;}
+.boxModelControler .boxModelTable th,
+.boxModelControler .boxModelTable td { border:0; border-top:1px solid #ddd; vertical-align:top; padding:5px 10px; text-align:left; }
+.boxModelControler .boxModelTable th { height:50px; *height:40px; background:#f1f1f1; padding-left:70px; background-repeat:no-repeat; background-position:10px 10px; }
+.boxModelControler .boxModelTable th.width { background-image:url(../img/exWidth.gif); }
+.boxModelControler .boxModelTable th.margin { background-image:url(../img/exMargin.gif); }
+.boxModelControler .boxModelTable th.padding { background-image:url(../img/exPadding.gif); }
+.boxModelControler .boxModelTable th.border { background-image:url(../img/exBorder.gif); }
+.boxModelControler .boxModelTable th.bgColor { background-image:url(../img/exBgColor.gif); }
+.boxModelControler .boxModelTable th.bgImage { background-image:url(../img/exBgImage.gif); }
+.boxModelControler .boxModelTable th sup { font-weight:normal; font-size:11px; font-family:Dotum; color:#999; }
+.boxModelControler .boxModelTable td dl.iList dt { display:inline; position:relative; top:3px; }
+.boxModelControler .boxModelTable td dl.iList dd { display:inline; }
+.boxModelControler .boxModelTable td dl.dList dt { float:left; clear:left; margin-right:5px; padding-top:3px; }
+.boxModelControler .boxModelTable td dl.dList dd { clear:right; }
+.boxModelControler .colorPicker { position:relative; display:inline; vertical-align:top; }
+.boxModelControler .colorPicker .picker { position:relative; top:2px; left:-22px; width:16px; height:16px; border:1px solid #ccc; background-color:transparent; background-position:right top; cursor:pointer; vertical-align:top; }
+.boxModelControler .colorPicker .picker span { font-size:0; line-height:0; z-index:-1; visibility:hidden; }
+.boxModelControler .colorPicker .palette { position:absolute; top:0px; left:0; display:none; width:272px; height:64px; list-style:none; margin:0; padding:1px 0 0 1px; border:1px solid #ccc; background:#fff; overflow:hidden; }
+.boxModelControler .colorPicker .palette.open { display:block; }
+.boxModelControler .colorPicker .palette li { float:left; margin:0 1px 1px 0; font-size:0; line-height:0; }
+.boxModelControler .colorPicker .palette li button { width:15px; height:15px; border:0; cursor:pointer; }
+.boxModelControler .colorPicker .palette li button span { position:relative; z-index:-1; font-size:0; line-height:0; visibility:hidden; }
+.boxModelControler .colorPicker .palette li button.transparent { background:url(../img/bgNone.gif) no-repeat right top; border:1px solid #ddd; }
+.boxModelControler .borderDetach { display:none; }
+.boxModelControler .borderDetach.open { display:block; }
+.boxModelControler .buttonArea{ padding:15px 0 0 0; text-align:center;}
+
+#popup_content { border:2px solid #777; margin:0; font-size:12px; background:#fff; position:relative;}
+#popup_content .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
+#popup_content .xButton span { position:relative; z-index:-1; visibility:hidden; }
+#popup_content * { font-size:12px; }
+#popHeadder h4.xeAdmin, #popHeadder h1.xeAdmin, #popHeadder h3.xeAdmin { font-size:14px !important; font-family:Dotum !important; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; border:none !important; margin:0 !important;}
+#popHeader h4.xeAdmin, #popHeader h1.xeAdmin, #popHeader h3.xeAdmin { font-size:14px !important; font-family:Dotum !important; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; border:none !important; margin:0 !important;}
+#popHeader, #popBody, #popFooter { position:relative; *zoom:1; overflow:hidden;}
+#popBody, #popHistoryBody { margin:15px !important;}
+#popFooter { padding:10px 0 0 0; height:28px; text-align:center; background:#f4f4f4;}
+#popHeader { }
+#popHeader.wide { width:600px;}
+
+.adminTable { width:100%; border:1px solid #EEE; border-bottom:none; border-right:none; margin-bottom:15px; }
+.adminTable caption { background:url("../img/n_caption_head.gif") no-repeat left top; padding:8px 0 5px 30px; text-align:left; font-weight:bold !important; color:#FFFFFF !important; background-color:#888 !important; border-bottom:1px solid #FFFFFF; font-size:12px !important;}
 .adminTable thead tr th div { text-align:center;}
-.adminTable thead tr th { background-color:#70A2C6; color:#FFFFFF; }
-.adminTable tr th { background-color:#FFFFFF; padding:6px; font-weight:bold; text-align:left; color:#666; border-right:1px solid #9BC2DE; border-bottom:1px solid #9BC2DE; }
+.adminTable thead tr th { background-color:#AAA; color:#FFFFFF !important; }
+.adminTable tr th { background-color:#FFFFFF; padding:6px; font-weight:bold; text-align:left; color:#666; border-right:1px solid #EEE; border-bottom:1px solid #EEE; }
 .adminTable tr.row2 th { background-color:#F3F3F3; }
 .adminTable tr th { width:10px; }
 .adminTable tr th div { white-space:nowrap; margin:0 5px; }
@@ -37,8 +154,7 @@ div.summary em { color:#ff1d00; font-style:normal;}
 .adminTable tr th.half_wide { width:50%; }
 .adminTable tr th.quarter_wide { width:25%; }
 .adminTable tr td.wide { width:100%; }
-
-.adminTable tr td { background-color:#FFFFFF;white-space:normal; font-weight:normal; text-align:left; color:#222222;  border-bottom:1px solid #9BC2DE; border-right:1px solid #9BC2DE; padding:4px 6px 4px 6px;}
+.adminTable tr td { background-color:#FFFFFF;white-space:normal; font-weight:normal; text-align:left; color:#222222;  border-bottom:1px solid #EEE; border-right:1px solid #EEE; padding:4px 6px 4px 6px;}
 .adminTable tr.row2 td { background-color:#F3F3F3; }
 .adminTable tr a { color:#222222; text-decoration:none; }
 .adminTable tr a:hover { color:#3D83B8; }
@@ -49,10 +165,10 @@ div.summary em { color:#ff1d00; font-style:normal;}
 .adminTable tr td span.date { font-size:8pt; font-family:tahoma; color:#666666;}
 .adminTable tr td.center { text-align:center; }
 .adminTable tr td.right { text-align:right; }
-.adminTable tr td.paper { background:transparent url("../images/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.paper { background:#F3F3F3 url("../images/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr td.circle { background:#FFFFFF url("../images/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.circle { background:#F3F3F3 url("../images/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
+.adminTable tr td.paper { background:transparent url("../img/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
+.adminTable tr.row2 td.paper { background:#F3F3F3 url("../img/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
+.adminTable tr td.circle { background:#FFFFFF url("../img/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
+.adminTable tr.row2 td.circle { background:#F3F3F3 url("../img/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
 .adminTable tr td strong.alert { color:red; }
 .adminTable tr td p { padding:0; margin:5px 0 0 5px; color:#777777; }
 .adminTable tr td p a { color:#9F875F; font-weight:bold; text-decoration:underline; }
@@ -66,105 +182,22 @@ div.summary em { color:#ff1d00; font-style:normal;}
 .adminTable tr td.selectAll a,
 .adminTable tr td.deSelectAll a,
 .adminTable tr td.view a { margin:0 auto; }
-.adminTable tr td.modify a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_modify.gif") no-repeat left top; }
-.adminTable tr td.delete a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_delete.gif") no-repeat left top; }
-.adminTable tr td.copy a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_copy.gif") no-repeat left top; }
-.adminTable tr td.view a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_view.gif") no-repeat left top; }
-.adminTable tr td.setup a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_setup.gif") no-repeat left top; }
-.adminTable tr td.activated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_light_on.gif") no-repeat left top; }
-.adminTable tr td.deactivated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_light_off.gif") no-repeat left top;   }
-.adminTable tr td.selectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_select_all.gif") no-repeat left top; }
-.adminTable tr td.deSelectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_remove.gif") no-repeat left top; }
-.adminTable tr td.moveupdown a.up { float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/button_up.gif") no-repeat left top; margin-right:5px; }
-.adminTable tr td.moveupdown a.down{ float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/button_down.gif") no-repeat left top; }
+.adminTable tr td.modify a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_modify.gif") no-repeat left top; }
+.adminTable tr td.delete a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_delete.gif") no-repeat left top; }
+.adminTable tr td.copy a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_copy.gif") no-repeat left top; }
+.adminTable tr td.view a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_view.gif") no-repeat left top; }
+.adminTable tr td.setup a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_setup.gif") no-repeat left top; }
+.adminTable tr td.activated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_light_on.gif") no-repeat left top; }
+.adminTable tr td.deactivated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_light_off.gif") no-repeat left top;   }
+.adminTable tr td.selectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_select_all.gif") no-repeat left top; }
+.adminTable tr td.deSelectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_remove.gif") no-repeat left top; }
+.adminTable tr td.moveupdown a.up { float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_button_up.gif") no-repeat left top; margin-right:5px; }
+.adminTable tr td.moveupdown a.down{ float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_button_down.gif") no-repeat left top; }
 .adminTable tr td.blue, .adminTable tr td.blue a { color:blue; } 
 .adminTable tr td.red, .adminTable tr td.red a { color:red; }
 
-ul.localNavigation { position:relative; clear:both; margin:10px 0 10px 0; padding:0 0 0 10px; height:25px; overflow:hidden; border-bottom:1px solid #86B4D2; }
-ul.localNavigation li { list-style:none; background:url("../images/n_small_tab.gif") no-repeat scroll left -26px; float:left; margin-right:10px; position:relative; text-align:center; top:4px; height:25px;}
-ul.localNavigation li a { background:url("../images/n_small_tab.gif") no-repeat scroll right -26px; color:#27536C; display:block; float:left; left:3px; padding:5px 15px 0 10px; position:relative; text-decoration:none; height:25px;}
-ul.localNavigation li a:hover { color:#000000; }
-ul.localNavigation li.on { background-position:left top; top:0; height:25px; }
-ul.localNavigation li.on a { background-position:right top; padding:8px 15px 5px 10px; height:25px; color:#222227; font-weight:bold; }
+.fullWidth { width:80%; }
 
-#popHeadder, #popHistoryHeadder { margin-bottom:10px;}
-#popHeadder h1, #popHistoryHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; margin:0; }
-#popBody, #popHistoryBody { width:600px; padding:10px; background:#ffffff; *zoom:1; position:relative;}
-#popHistoryBody { height: 200px; overflow: auto; padding-right:0; }
-#popFooter { width:620px; background:#70A2C6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; }
-#popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;}
-
-.adminSearch { text-align:right; clear:both; width:100%; margin:0 0 10px 0;}
-.adminSearch fieldset { border:none; display:inline; overflow:visible; padding:0;}
-.adminSearch * { vertical-align:middle;} 
-
-.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; position:relative; top:-1px; font:.75em Tahoma; text-align:center; background:url(../images/buttonTypeInput24.gif) no-repeat; }
-
-.layout_editor { width:99%; height:500px; border:0px; font-size:1em; }
-.layout_editor_box { padding:10px; border:1px solid #DDDDDD; }
-
-.fixWidth { width:90%; }
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-.pagination.a2 a,
-.pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-.pagination.a2 a.prev{ padding-left:10px; background:#fff url(../images/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../images/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a2 a.next{ padding-right:10px; background:#fff url(../images/arrowNextA1.gif) no-repeat right center; }
-.pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../images/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-.pagination.b1 a,
-.pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-.pagination.b1 a.prev{ padding-left:16px; background:url(../images/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b1 a.next{ padding-right:16px; background:url(../images/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-.pagination.b2 a,
-.pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-.pagination.b2 a.prev{ padding-left:12px; background:url(../images/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b2 a.next{ padding-right:12px; background:url(../images/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-.pagination.c1 a,
-.pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-.pagination.c1 a.prev,
-.pagination.c1 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c1 a.prev{ background:url(../images/arrowPrevC1.gif) no-repeat center;}
-.pagination.c1 a.next{ background:url(../images/arrowNextC1.gif) no-repeat center;}
-.pagination.c1 a.prev span,
-.pagination.c1 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-.pagination.c2 a,
-.pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-.pagination.c2 a.prev,
-.pagination.c2 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c2 a.prev{ background:url(../images/arrowPrevC1.gif) no-repeat center;}
-.pagination.c2 a.next{ background:url(../images/arrowNextC1.gif) no-repeat center;}
-.pagination.c2 a.prev span,
-.pagination.c2 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
+.adminLeftContent { float:left; width:60%; margin-right:2%; _margin-right:1.9%;}
+.adminRightExtra { float:left; width:38%; }
 
diff --git a/modules/admin/tpl/css/admin_layout.css b/modules/admin/tpl/css/admin_layout.css
deleted file mode 100644
index e8aa4d69d..000000000
--- a/modules/admin/tpl/css/admin_layout.css
+++ /dev/null
@@ -1,39 +0,0 @@
-@charset "utf-8";
-
-body { background:#548DB5; }
-
-.xeAdmin { width:100%; height:61px; border-bottom:1px solid #1b3d51; background:#FFFFFF url("../images/n_top_back.gif") repeat-x left top; position:relative; z-index:100;}
-.xeAdmin h1 { position:absolute; top:15px; left:20px; margin:0; padding:0; }
-.xeAdmin h1 img{ _behavior:url(./common/js/iePngFix.htc);}
-.xeAdmin ul.globalNavigator { list-style:none; margin:0; padding:0; position:absolute; right:20px; top:13px; }
-.xeAdmin ul.globalNavigator li { display:inline; margin:0 10px;}
-.xeAdmin ul.globalNavigator li a{ color:#ddd; text-decoration:none;}
-
-.xeAdmin div.mainNavigator { position:absolute; right:20px; top:35px; padding:0 0 0 6px; background:url(../images/n_menu_left.gif) no-repeat left top;}
-.xeAdmin div.mainNavigator img { float:left; display:block; }
-.xeAdmin div.mainNavigator ul { float:left; position:relative; list-style:none; margin:0; padding:0 6px 0 0; background:url(../images/n_menu_right.gif) no-repeat right top; }
-.xeAdmin div.mainNavigator ul li { position:relative; float:left; background:#547C93 url("../images/n_menu_bar.gif") no-repeat left top; padding:0; color:#eee; border-top:1px solid #1b3d51;}
-.xeAdmin div.mainNavigator ul li a{ position:relative; display:block; float:left; height:18px; padding:7px 10px 0 10px; color:#fff; text-decoration:none;}
-.xeAdmin div.mainNavigator ul li:hover { color:#FFFFFF; }
-.xeAdmin div.mainNavigator ul li.first { background-image:none; }
-
-.xeAdmin div.mainNavigator .adminSubMenu { border:1px solid #999; float:none; clear:both; position:absolute; left:-6px; top:31px; visibility:hidden; list-style:none; padding:0 7px 3px 7px; margin:0; background:#eee;}
-.xeAdmin div.mainNavigator .adminSubMenu li { position:relative; display:block; float:none; clear:both; font-weight:normal; margin:0; padding:8px 4px 4px 4px; background:url("../images/n_submenu_bar.gif") repeat-x left top; border:none;}
-.xeAdmin div.mainNavigator .adminSubMenu li a { position:relative; display:inline-block; float:none; clear:both; padding:0; color:#000; text-decoration:none; white-space:nowrap;}
-.xeAdmin div.mainNavigator .adminSubMenu li a:hover { color:#aaa; }
-.xeAdmin div.mainNavigator .adminSubMenu li.first { background:none; }
-
-.adminFolder { background:url("../images/n_folder_bg.gif") repeat-x left top; height:6px; text-align:center; overflow:hidden;}
-.adminPackage { background:#eee url("../images/n_package_bg.gif") repeat-x left top; overflow:hidden; height:28px; padding:10px 0 0 0;}
-.adminPackage ul { position:relative; clear:both; margin:0; padding:0 0 0 20px; height:28px; overflow:hidden;}
-.adminPackage ul li { list-style:none; background:url("../images/n_tab.gif") no-repeat scroll left -35px; float:left; margin-right:10px; position:relative; text-align:center; top:0; height:28px;}
-.adminPackage ul li a { float:left; background:url("../images/n_tab.gif") no-repeat scroll right -35px; color:#FFFFFF; font-weight:bold; display:block; left:3px; padding:8px 15px 0 10px; position:relative; text-decoration:none; height:28px;}
-.adminPackage ul li.active { background-position:left top; top:0; height:28px; }
-.adminPackage ul li.active a { background-position:right top; padding:8px 15px 5px 10px; height:28px; color:#185B83;}
-
-.adminContentBody { background:#FFFFFF; position:relative; padding:20px; *zoom:1; }
-.adminContentBody:after { content:""; display:block; clear:both;}
-
-.adminFooter{ background:#548DB5; text-align:center; padding:10px 0;}
-.adminFooter address { font:11px Tahoma; color:#fff;}
-.adminFooter address a{ font:11px Tahoma; color:#fff; text-decoration:none;}
diff --git a/modules/admin/tpl/css/font.css b/modules/admin/tpl/css/font.css
new file mode 100755
index 000000000..bc27ce0e3
--- /dev/null
+++ b/modules/admin/tpl/css/font.css
@@ -0,0 +1,57 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+#xeAdmin{ font-family:Sans-serif;}
+
+#xeAdmin a{ text-decoration:none !important;}
+#xeAdmin a:hover,
+#xeAdmin a:active,
+#xeAdmin a:focus{ text-decoration:underline !important;}
+
+#xeAdmin h1.xeAdmin a{ text-decoration:none !important; font-family:Arial; font-size:16px; color:#fff; margin:0; padding:0;}
+#xeAdmin table th{ color:#666;}
+#xeAdmin table th a { color:#666;}
+#xeAdmin table td{ color:#888;}
+#xeAdmin table td a { color:#888;}
+#xeAdmin caption{ font-size:11px; font-family:Tahoma; color:#888;}
+#xeAdmin div.summary { font-size:11px; font-family:Tahoma; color:#888;}
+#xeAdmin div.summary strong { font-weight:normal; }
+#xeAdmin button.text{ font-size:12px;}
+#xeAdmin em,
+#xeAdmin address{ font-style:normal;}
+#xeAdmin select{ font-size:12px;}
+#xeAdmin input{ font-size:12px;}
+#xeAdmin .buttonTypeGo{ padding:0; cursor:pointer;}
+
+#xeAdmin .footer address{ font:10px Tahoma;}
+#xeAdmin .footer address a{ color:#777e86; }
+#xeAdmin .gnb li a { color:#777e86; font-size:11px; font-family:Tahoma;}
+#adminLang li a{ font-size:12px;}
+#xeAdmin .lnb li,
+#xeAdmin .lnb li a{ color:#fff; font-size:14px; font-family:Dotum, Tahoma;}
+
+#xeAdmin .path{ color:#ccc; font-size:11px;}
+#xeAdmin .path a{ color:#888; font-size:11px; font-family:Dotum, Sans-serif;}
+
+.e1 .navigation li a{ color:#000; text-decoration:none;}
+.e1 .navigation li ul li a{ color:#888;}
+.e1 .navigation li ul li.active a{ font-weight:bold; color:#666;}
+
+.e2 .section h2.xeAdmin { font-size:12px; margin:0; padding:0;}
+.e2 .section h2.xeAdmin  .date{ font:Tahoma; color:#999;}
+
+.e2 table tbody th{ font-weight:normal; font-family:Dotum;}
+
+.e2 .notice li a{ color:#666; }
+.e2 .notice li .date{ color:#888; font:10px Tahoma;}
+
+.localNavigation li a{ text-decoration:none !important; color:#666;}
+.localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
+
+#xeAdmin h2.xeAdmin  { font-size:12px;}
+#xeAdmin h3.xeAdmin { font-size:12px; color:#666; margin:0; padding:0;}
+#xeAdmin p.summary{ color:#888;}
+#xeAdmin p.summary a { text-decoration:none; color:#888; }
+#xeAdmin p.summary.red { color:#A54D4D; }
+#xeAdmin p.summary.red a { text-decoration:none; color:#A54D4D; }
+#xeAdmin div.infoText { color:#888;}
diff --git a/modules/admin/tpl/css/layout.css b/modules/admin/tpl/css/layout.css
new file mode 100755
index 000000000..cd1b429a8
--- /dev/null
+++ b/modules/admin/tpl/css/layout.css
@@ -0,0 +1,43 @@
+@charset "utf-8";
+
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+#xeAdmin .header{ position:relative; height:62px; padding:10px 15px 10px 30px; background:url(../img/bgHeader.gif) repeat-x; z-index:10;}
+#xeAdmin .footer{ height:26px; padding-top:10px; background:url(../img/bgFooter.gif) repeat-x; text-align:center;}
+#xeAdmin .gnb{ position:relative; float:right; white-space:nowrap; clear:right; margin:0; padding:0;}
+#xeAdmin .gnb li{ position:relative; float:left; margin:0 15px 0 0; padding:0;list-style:none;}
+
+#xeAdmin .gnb #adminLang { position:absolute; top:18px; right:0; display:none; background:#fff; margin:0; padding:5px; border:1px solid #ddd; z-index:999;}
+#xeAdmin .gnb #adminLang li{ float:none; margin:0;}
+
+.body{ position:relative; margin:0; padding:20px 0 20px 200px; background:url(../img/lineBody.gif) repeat-y 180px 0; *zoom:1;}
+.body:after {content:""; display:block; clear:both;}
+.ece .body {padding-right:340px;}
+.ec .body {padding-right:20px;}
+.extension{ position:relative;}
+.body .e1 { float:left; width:160px; margin-right:-160px; left:-190px;}
+.content { position:relative; width:100%; margin-right:-100%; float:left;}
+.ece .e2 { width:300px; float:right; right:-320px; border-left:1px solid #ddd; padding-bottom:20px;}
+.ec .e2 { display:none;}
+
+#xeAdmin .lnb { position:relative; left:-3px; float:left; clear:left; margin:5px 0 0 0; padding:0;}
+#xeAdmin .lnb li,
+#xeAdmin .lnb li a{ position:relative; float:left; background:url(../img/buttonLNB.gif) no-repeat; white-space:nowrap;}
+#xeAdmin .lnb li{ margin:0 1px 0 0; padding:0;list-style:none; background-position:0 0;}
+#xeAdmin .lnb li a{ left:1px; height:30px; padding:10px 15px 0 15px; text-decoration:none !important; background-position:right 0;}
+#xeAdmin .lnb li.core{ margin-right:6px; background-position:0 -50px;}
+#xeAdmin .lnb li.core a{ padding-right:20px; left:5px; background-position:right -50px;}
+#xeAdmin .lnb li.first{ background-position:0 -50px; margin-right:5px;}
+#xeAdmin .lnb li.first a{ left:5px;}
+#xeAdmin .lnb li.end{}
+#xeAdmin .lnb li.end a{ padding-right:20px; background-position:right -50px;}
+
+#xeAdmin .lnb li.core.selected { background-position:0 -150px;}
+#xeAdmin .lnb li.core.selected  a{ background-position:right -150px;}
+#xeAdmin .lnb li.first.selected { background-position:0 -150px;}
+#xeAdmin .lnb li.first.selected  a{ background-position:right -100px;}
+#xeAdmin .lnb li.mid.selected { background-position:0 -100px;}
+#xeAdmin .lnb li.mid.selected  a{ background-position:right -100px;}
+#xeAdmin .lnb li.end.selected { background-position:0 -100px;}
+#xeAdmin .lnb li.end.selected  a{ background-position:right -150px;}
+
+#xeAdmin .path{ padding:0 0 0 25px; margin:0 0 20px 0; background:url(../img/iconPath.gif) no-repeat left center;}
diff --git a/modules/admin/tpl/css/pagination.css b/modules/admin/tpl/css/pagination.css
new file mode 100755
index 000000000..b71173652
--- /dev/null
+++ b/modules/admin/tpl/css/pagination.css
@@ -0,0 +1,85 @@
+@charset "utf-8"; 
+/* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* Pagination Reset */
+#xeAdmin .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
+#xeAdmin .pagination *{ margin:0; padding:0;}
+#xeAdmin .pagination img{ border:0;}
+#xeAdmin .pagination a,
+#xeAdmin .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+#xeAdmin .pagination a:hover,
+#xeAdmin .pagination a:active,
+#xeAdmin .pagination a:focus{ background-color:#f4f4f4 !important; }
+#xeAdmin .pagination strong{ color:#ff6600 !important;}
+#xeAdmin .pagination a.prev,
+#xeAdmin .pagination a.prevEnd,
+#xeAdmin .pagination a.next,
+#xeAdmin .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+/* Pagination A1 */
+#xeAdmin .pagination.a1 a,
+#xeAdmin .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+#xeAdmin .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
+#xeAdmin .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
+#xeAdmin .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
+#xeAdmin .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
+
+/* Pagination A2 */
+#xeAdmin .pagination.a2 a,
+#xeAdmin .pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
+#xeAdmin .pagination.a2 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
+#xeAdmin .pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
+#xeAdmin .pagination.a2 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
+#xeAdmin .pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
+
+/* Pagination B1 */
+#xeAdmin .pagination.b1 a,
+#xeAdmin .pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
+#xeAdmin .pagination.b1 a.prev,
+#xeAdmin .pagination.b1 a.prevEnd{ padding-left:16px; background:url(../img/arrowPrevB1.gif) no-repeat left center; }
+#xeAdmin .pagination.b1 a.next,
+#xeAdmin .pagination.b1 a.nextEnd{ padding-right:16px; background:url(../img/arrowNextB1.gif) no-repeat right center; }
+
+/* Pagination B2 */
+#xeAdmin .pagination.b2 a,
+#xeAdmin .pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
+#xeAdmin .pagination.b2 a.prev,
+#xeAdmin .pagination.b2 a.prevEnd{ padding-left:12px; background:url(../img/arrowPrevB1.gif) no-repeat left center; }
+#xeAdmin .pagination.b2 a.next,
+#xeAdmin .pagination.b2 a.nextEnd{ padding-right:12px; background:url(../img/arrowNextB1.gif) no-repeat right center; }
+
+/* Pagination C1 */
+#xeAdmin .pagination.c1 a,
+#xeAdmin .pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
+#xeAdmin .pagination.c1 a.prev,
+#xeAdmin .pagination.c1 a.prevEnd,
+#xeAdmin .pagination.c1 a.next,
+#xeAdmin .pagination.c1 a.nextEnd{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
+#xeAdmin .pagination.c1 a.prev,
+#xeAdmin .pagination.c1 a.prevEnd{ background:url(../img/arrowPrevC1.gif) no-repeat center;}
+#xeAdmin .pagination.c1 a.next,
+#xeAdmin .pagination.c1 a.nextEnd{ background:url(../img/arrowNextC1.gif) no-repeat center;}
+#xeAdmin .pagination.c1 a.prev span,
+#xeAdmin .pagination.c1 a.prevEnd span,
+#xeAdmin .pagination.c1 a.next span,
+#xeAdmin .pagination.c1 a.nextEnd span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+/* Pagination C2 */
+#xeAdmin .pagination.c2 a,
+#xeAdmin .pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
+#xeAdmin .pagination.c2 a.prev,
+#xeAdmin .pagination.c2 a.prevEnd,
+#xeAdmin .pagination.c2 a.next,
+#xeAdmin .pagination.c2 a.nextEnd{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
+#xeAdmin .pagination.c2 a.prev,
+#xeAdmin .pagination.c2 a.prevEnd{ background:url(../img/arrowPrevC1.gif) no-repeat center;}
+#xeAdmin .pagination.c2 a.next,
+#xeAdmin .pagination.c2 a.nextEnd{ background:url(../img/arrowNextC1.gif) no-repeat center;}
+#xeAdmin .pagination.c2 a.prev span,
+#xeAdmin .pagination.c2 a.prevEnd span,
+#xeAdmin .pagination.c2 a.next span,
+#xeAdmin .pagination.c2 a.nextEnd span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+
+
+
diff --git a/modules/admin/tpl/images/admin_background.gif b/modules/admin/tpl/images/admin_background.gif
deleted file mode 100644
index 3665755c7..000000000
Binary files a/modules/admin/tpl/images/admin_background.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/admin_bottom_bg.gif b/modules/admin/tpl/images/admin_bottom_bg.gif
deleted file mode 100644
index 102b23877..000000000
Binary files a/modules/admin/tpl/images/admin_bottom_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/admin_logo.gif b/modules/admin/tpl/images/admin_logo.gif
deleted file mode 100644
index cbc783302..000000000
Binary files a/modules/admin/tpl/images/admin_logo.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/admin_top_bg.gif b/modules/admin/tpl/images/admin_top_bg.gif
deleted file mode 100644
index 84562c2bb..000000000
Binary files a/modules/admin/tpl/images/admin_top_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/buttonTypeInput24.gif b/modules/admin/tpl/images/buttonTypeInput24.gif
deleted file mode 100644
index 0dcfc0e3d..000000000
Binary files a/modules/admin/tpl/images/buttonTypeInput24.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/expand.gif b/modules/admin/tpl/images/expand.gif
deleted file mode 100644
index f59a9ce73..000000000
Binary files a/modules/admin/tpl/images/expand.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_accessory_module.gif b/modules/admin/tpl/images/icon_accessory_module.gif
deleted file mode 100644
index f4f1577f5..000000000
Binary files a/modules/admin/tpl/images/icon_accessory_module.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_base_module.gif b/modules/admin/tpl/images/icon_base_module.gif
deleted file mode 100644
index c250046e9..000000000
Binary files a/modules/admin/tpl/images/icon_base_module.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_key.gif b/modules/admin/tpl/images/icon_key.gif
deleted file mode 100644
index cdc6cf7d3..000000000
Binary files a/modules/admin/tpl/images/icon_key.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_manager_module.gif b/modules/admin/tpl/images/icon_manager_module.gif
deleted file mode 100644
index 516a619b4..000000000
Binary files a/modules/admin/tpl/images/icon_manager_module.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_service_module.gif b/modules/admin/tpl/images/icon_service_module.gif
deleted file mode 100644
index 7c5ef487e..000000000
Binary files a/modules/admin/tpl/images/icon_service_module.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_summary.gif b/modules/admin/tpl/images/icon_summary.gif
deleted file mode 100644
index 39cf5f506..000000000
Binary files a/modules/admin/tpl/images/icon_summary.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_user.gif b/modules/admin/tpl/images/icon_user.gif
deleted file mode 100644
index 24c2b3ea3..000000000
Binary files a/modules/admin/tpl/images/icon_user.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_utility_module.gif b/modules/admin/tpl/images/icon_utility_module.gif
deleted file mode 100644
index 1d9164c36..000000000
Binary files a/modules/admin/tpl/images/icon_utility_module.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/icon_vcard.gif b/modules/admin/tpl/images/icon_vcard.gif
deleted file mode 100644
index 96e207ebc..000000000
Binary files a/modules/admin/tpl/images/icon_vcard.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_folder_bg.gif b/modules/admin/tpl/images/n_folder_bg.gif
deleted file mode 100644
index 9d33c1b60..000000000
Binary files a/modules/admin/tpl/images/n_folder_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_folder_btn.png b/modules/admin/tpl/images/n_folder_btn.png
deleted file mode 100644
index bd59b6444..000000000
Binary files a/modules/admin/tpl/images/n_folder_btn.png and /dev/null differ
diff --git a/modules/admin/tpl/images/n_folder_btn_off.png b/modules/admin/tpl/images/n_folder_btn_off.png
deleted file mode 100644
index 444336f53..000000000
Binary files a/modules/admin/tpl/images/n_folder_btn_off.png and /dev/null differ
diff --git a/modules/admin/tpl/images/n_info_bg.gif b/modules/admin/tpl/images/n_info_bg.gif
deleted file mode 100644
index d697e3018..000000000
Binary files a/modules/admin/tpl/images/n_info_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_logo.png b/modules/admin/tpl/images/n_logo.png
deleted file mode 100644
index 3577b5beb..000000000
Binary files a/modules/admin/tpl/images/n_logo.png and /dev/null differ
diff --git a/modules/admin/tpl/images/n_menu_bar.gif b/modules/admin/tpl/images/n_menu_bar.gif
deleted file mode 100644
index f1311ba7c..000000000
Binary files a/modules/admin/tpl/images/n_menu_bar.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_menu_left.gif b/modules/admin/tpl/images/n_menu_left.gif
deleted file mode 100644
index 0a2dc9585..000000000
Binary files a/modules/admin/tpl/images/n_menu_left.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_menu_right.gif b/modules/admin/tpl/images/n_menu_right.gif
deleted file mode 100644
index 319e14612..000000000
Binary files a/modules/admin/tpl/images/n_menu_right.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_package_bg.gif b/modules/admin/tpl/images/n_package_bg.gif
deleted file mode 100644
index e980aba75..000000000
Binary files a/modules/admin/tpl/images/n_package_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_package_bg.png b/modules/admin/tpl/images/n_package_bg.png
deleted file mode 100644
index a3a9a83f7..000000000
Binary files a/modules/admin/tpl/images/n_package_bg.png and /dev/null differ
diff --git a/modules/admin/tpl/images/n_small_tab.gif b/modules/admin/tpl/images/n_small_tab.gif
deleted file mode 100644
index 8b07ad415..000000000
Binary files a/modules/admin/tpl/images/n_small_tab.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_submenu_bar.gif b/modules/admin/tpl/images/n_submenu_bar.gif
deleted file mode 100644
index d43de68d8..000000000
Binary files a/modules/admin/tpl/images/n_submenu_bar.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_submenu_bg.png b/modules/admin/tpl/images/n_submenu_bg.png
deleted file mode 100644
index 530931885..000000000
Binary files a/modules/admin/tpl/images/n_submenu_bg.png and /dev/null differ
diff --git a/modules/admin/tpl/images/n_tab.gif b/modules/admin/tpl/images/n_tab.gif
deleted file mode 100644
index 8430d5571..000000000
Binary files a/modules/admin/tpl/images/n_tab.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_title_bg.gif b/modules/admin/tpl/images/n_title_bg.gif
deleted file mode 100644
index cc45194b0..000000000
Binary files a/modules/admin/tpl/images/n_title_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/n_top_back.gif b/modules/admin/tpl/images/n_top_back.gif
deleted file mode 100644
index 06c0f29ca..000000000
Binary files a/modules/admin/tpl/images/n_top_back.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/s_application.gif b/modules/admin/tpl/images/s_application.gif
deleted file mode 100644
index cbb7f3bfa..000000000
Binary files a/modules/admin/tpl/images/s_application.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/top_head_title_bg.gif b/modules/admin/tpl/images/top_head_title_bg.gif
deleted file mode 100644
index 6471749d3..000000000
Binary files a/modules/admin/tpl/images/top_head_title_bg.gif and /dev/null differ
diff --git a/modules/admin/tpl/images/arrowNextA1.gif b/modules/admin/tpl/img/arrowNextA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowNextA1.gif
rename to modules/admin/tpl/img/arrowNextA1.gif
diff --git a/modules/admin/tpl/images/arrowNextB1.gif b/modules/admin/tpl/img/arrowNextB1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowNextB1.gif
rename to modules/admin/tpl/img/arrowNextB1.gif
diff --git a/modules/admin/tpl/images/arrowNextC1.gif b/modules/admin/tpl/img/arrowNextC1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowNextC1.gif
rename to modules/admin/tpl/img/arrowNextC1.gif
diff --git a/modules/admin/tpl/images/arrowNextEndA1.gif b/modules/admin/tpl/img/arrowNextEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowNextEndA1.gif
rename to modules/admin/tpl/img/arrowNextEndA1.gif
diff --git a/modules/admin/tpl/images/arrowPrevA1.gif b/modules/admin/tpl/img/arrowPrevA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowPrevA1.gif
rename to modules/admin/tpl/img/arrowPrevA1.gif
diff --git a/modules/admin/tpl/images/arrowPrevB1.gif b/modules/admin/tpl/img/arrowPrevB1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowPrevB1.gif
rename to modules/admin/tpl/img/arrowPrevB1.gif
diff --git a/modules/admin/tpl/images/arrowPrevC1.gif b/modules/admin/tpl/img/arrowPrevC1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowPrevC1.gif
rename to modules/admin/tpl/img/arrowPrevC1.gif
diff --git a/modules/admin/tpl/images/arrowPrevEndA1.gif b/modules/admin/tpl/img/arrowPrevEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/admin/tpl/images/arrowPrevEndA1.gif
rename to modules/admin/tpl/img/arrowPrevEndA1.gif
diff --git a/modules/admin/tpl/img/bgFooter.gif b/modules/admin/tpl/img/bgFooter.gif
new file mode 100755
index 000000000..d49c3c5f8
Binary files /dev/null and b/modules/admin/tpl/img/bgFooter.gif differ
diff --git a/modules/admin/tpl/img/bgGrid.gif b/modules/admin/tpl/img/bgGrid.gif
new file mode 100755
index 000000000..199260772
Binary files /dev/null and b/modules/admin/tpl/img/bgGrid.gif differ
diff --git a/modules/admin/tpl/img/bgHeader.gif b/modules/admin/tpl/img/bgHeader.gif
new file mode 100755
index 000000000..507a80c7d
Binary files /dev/null and b/modules/admin/tpl/img/bgHeader.gif differ
diff --git a/modules/admin/tpl/img/bgNone.gif b/modules/admin/tpl/img/bgNone.gif
new file mode 100755
index 000000000..1289ebbc2
Binary files /dev/null and b/modules/admin/tpl/img/bgNone.gif differ
diff --git a/modules/admin/tpl/img/bgRuler.gif b/modules/admin/tpl/img/bgRuler.gif
new file mode 100755
index 000000000..53ad33c26
Binary files /dev/null and b/modules/admin/tpl/img/bgRuler.gif differ
diff --git a/modules/admin/tpl/img/bgTab.gif b/modules/admin/tpl/img/bgTab.gif
new file mode 100755
index 000000000..8835361b8
Binary files /dev/null and b/modules/admin/tpl/img/bgTab.gif differ
diff --git a/modules/admin/tpl/img/bgTransparent.gif b/modules/admin/tpl/img/bgTransparent.gif
new file mode 100755
index 000000000..c4440e217
Binary files /dev/null and b/modules/admin/tpl/img/bgTransparent.gif differ
diff --git a/modules/admin/tpl/img/buttonClose.gif b/modules/admin/tpl/img/buttonClose.gif
new file mode 100755
index 000000000..5bdbbc1ef
Binary files /dev/null and b/modules/admin/tpl/img/buttonClose.gif differ
diff --git a/modules/admin/tpl/img/buttonLNB.gif b/modules/admin/tpl/img/buttonLNB.gif
new file mode 100755
index 000000000..d29eb9de3
Binary files /dev/null and b/modules/admin/tpl/img/buttonLNB.gif differ
diff --git a/modules/admin/tpl/img/exBgColor.gif b/modules/admin/tpl/img/exBgColor.gif
new file mode 100755
index 000000000..a917cf235
Binary files /dev/null and b/modules/admin/tpl/img/exBgColor.gif differ
diff --git a/modules/admin/tpl/img/exBgImage.gif b/modules/admin/tpl/img/exBgImage.gif
new file mode 100755
index 000000000..d8e97fafa
Binary files /dev/null and b/modules/admin/tpl/img/exBgImage.gif differ
diff --git a/modules/admin/tpl/img/exBorder.gif b/modules/admin/tpl/img/exBorder.gif
new file mode 100755
index 000000000..2784b21f9
Binary files /dev/null and b/modules/admin/tpl/img/exBorder.gif differ
diff --git a/modules/admin/tpl/img/exMargin.gif b/modules/admin/tpl/img/exMargin.gif
new file mode 100755
index 000000000..d8d54d815
Binary files /dev/null and b/modules/admin/tpl/img/exMargin.gif differ
diff --git a/modules/admin/tpl/img/exPadding.gif b/modules/admin/tpl/img/exPadding.gif
new file mode 100755
index 000000000..220e75ccc
Binary files /dev/null and b/modules/admin/tpl/img/exPadding.gif differ
diff --git a/modules/admin/tpl/img/exWidth.gif b/modules/admin/tpl/img/exWidth.gif
new file mode 100755
index 000000000..6a2cfe51a
Binary files /dev/null and b/modules/admin/tpl/img/exWidth.gif differ
diff --git a/modules/admin/tpl/img/graphHr.gif b/modules/admin/tpl/img/graphHr.gif
new file mode 100755
index 000000000..8193ad5f7
Binary files /dev/null and b/modules/admin/tpl/img/graphHr.gif differ
diff --git a/modules/admin/tpl/img/iconCheck.gif b/modules/admin/tpl/img/iconCheck.gif
new file mode 100755
index 000000000..e4eb0fbd1
Binary files /dev/null and b/modules/admin/tpl/img/iconCheck.gif differ
diff --git a/modules/admin/tpl/img/iconH2.gif b/modules/admin/tpl/img/iconH2.gif
new file mode 100755
index 000000000..457867741
Binary files /dev/null and b/modules/admin/tpl/img/iconH2.gif differ
diff --git a/modules/admin/tpl/img/iconH3.gif b/modules/admin/tpl/img/iconH3.gif
new file mode 100755
index 000000000..889e2818e
Binary files /dev/null and b/modules/admin/tpl/img/iconH3.gif differ
diff --git a/modules/admin/tpl/img/iconNavigation.gif b/modules/admin/tpl/img/iconNavigation.gif
new file mode 100755
index 000000000..022de08bc
Binary files /dev/null and b/modules/admin/tpl/img/iconNavigation.gif differ
diff --git a/modules/admin/tpl/img/iconPath.gif b/modules/admin/tpl/img/iconPath.gif
new file mode 100755
index 000000000..6cc5f1635
Binary files /dev/null and b/modules/admin/tpl/img/iconPath.gif differ
diff --git a/modules/admin/tpl/img/iconX.gif b/modules/admin/tpl/img/iconX.gif
new file mode 100755
index 000000000..ba29ae14a
Binary files /dev/null and b/modules/admin/tpl/img/iconX.gif differ
diff --git a/modules/admin/tpl/img/lineBody.gif b/modules/admin/tpl/img/lineBody.gif
new file mode 100755
index 000000000..f4fb45e16
Binary files /dev/null and b/modules/admin/tpl/img/lineBody.gif differ
diff --git a/modules/admin/tpl/img/lineVrText.gif b/modules/admin/tpl/img/lineVrText.gif
new file mode 100755
index 000000000..27566578d
Binary files /dev/null and b/modules/admin/tpl/img/lineVrText.gif differ
diff --git a/modules/admin/tpl/images/button_down.gif b/modules/admin/tpl/img/n_button_down.gif
similarity index 100%
rename from modules/admin/tpl/images/button_down.gif
rename to modules/admin/tpl/img/n_button_down.gif
diff --git a/modules/admin/tpl/images/button_up.gif b/modules/admin/tpl/img/n_button_up.gif
similarity index 100%
rename from modules/admin/tpl/images/button_up.gif
rename to modules/admin/tpl/img/n_button_up.gif
diff --git a/modules/admin/tpl/images/n_caption_head.gif b/modules/admin/tpl/img/n_caption_head.gif
similarity index 100%
rename from modules/admin/tpl/images/n_caption_head.gif
rename to modules/admin/tpl/img/n_caption_head.gif
diff --git a/modules/admin/tpl/images/n_circle_bullet.gif b/modules/admin/tpl/img/n_circle_bullet.gif
similarity index 100%
rename from modules/admin/tpl/images/n_circle_bullet.gif
rename to modules/admin/tpl/img/n_circle_bullet.gif
diff --git a/modules/admin/tpl/images/n_icon_copy.gif b/modules/admin/tpl/img/n_icon_copy.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_copy.gif
rename to modules/admin/tpl/img/n_icon_copy.gif
diff --git a/modules/admin/tpl/images/n_icon_delete.gif b/modules/admin/tpl/img/n_icon_delete.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_delete.gif
rename to modules/admin/tpl/img/n_icon_delete.gif
diff --git a/modules/admin/tpl/images/n_icon_modify.gif b/modules/admin/tpl/img/n_icon_modify.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_modify.gif
rename to modules/admin/tpl/img/n_icon_modify.gif
diff --git a/modules/admin/tpl/images/n_icon_remove.gif b/modules/admin/tpl/img/n_icon_remove.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_remove.gif
rename to modules/admin/tpl/img/n_icon_remove.gif
diff --git a/modules/admin/tpl/images/n_icon_select_all.gif b/modules/admin/tpl/img/n_icon_select_all.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_select_all.gif
rename to modules/admin/tpl/img/n_icon_select_all.gif
diff --git a/modules/admin/tpl/images/n_icon_view.gif b/modules/admin/tpl/img/n_icon_view.gif
similarity index 100%
rename from modules/admin/tpl/images/n_icon_view.gif
rename to modules/admin/tpl/img/n_icon_view.gif
diff --git a/modules/admin/tpl/images/n_light_off.gif b/modules/admin/tpl/img/n_light_off.gif
similarity index 100%
rename from modules/admin/tpl/images/n_light_off.gif
rename to modules/admin/tpl/img/n_light_off.gif
diff --git a/modules/admin/tpl/images/n_light_on.gif b/modules/admin/tpl/img/n_light_on.gif
similarity index 100%
rename from modules/admin/tpl/images/n_light_on.gif
rename to modules/admin/tpl/img/n_light_on.gif
diff --git a/modules/admin/tpl/images/n_paper_bullet.gif b/modules/admin/tpl/img/n_paper_bullet.gif
similarity index 100%
rename from modules/admin/tpl/images/n_paper_bullet.gif
rename to modules/admin/tpl/img/n_paper_bullet.gif
diff --git a/modules/admin/tpl/images/n_setup.gif b/modules/admin/tpl/img/n_setup.gif
similarity index 100%
rename from modules/admin/tpl/images/n_setup.gif
rename to modules/admin/tpl/img/n_setup.gif
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index 35b4d1349..60b378b9d 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -1,198 +1,211 @@
+<!--#include("_header.html")-->
+
 <!--%import("../../install/lang")-->
 <!--%import("../../module/tpl/js/module_admin.js",optimized=false)-->
 <!--%import("../../addon/tpl/js/addon.js",optimized=false)-->
 <!--%import("../../addon/tpl/filter/toggle_activate_addon.xml")-->
 
-<h3 class="bottomGap">{$lang->welcome_to_xe}</h3>
+<div class="content">
+    <!--@if($logged_info->is_admin == 'Y')-->
+        <p class="path">
+            <a href="{getUrl('','module','admin')}">{$lang->control_panel}</a> 
+            &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$act)}">{$lang->admin_index}</a>
+        </p>
+    <!--@end-->
 
-<div class="adminLeftContent">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->env_information}</caption>
-    <tbody>
-    <tr>
-        <th><div>{$lang->current_version}</div></th>
-        <td><strong>{$current_version}</strong></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->current_path}</div></th>
-        <td>{$installed_path}/</td>
-    </tr>
-    <tr>
-        <th><div>{$lang->time_zone}</div></th>
-        <td><!--@foreach($time_zone_list as $key => $val)--><!--@if($time_zone==$key)-->{$val}<!--@end--><!--@endforeach--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_rewrite}</div></th>
-        <td><!--@if($use_rewrite=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_optimizer}</div></th>
-        <td><!--@if($use_optimizer=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-    </tr>
-    <tr>
-        <th><div>Language</div></th>
-        <td><!--@foreach($lang_supported as $key => $val)--><!--@if($key == $selected_lang)-->{$val}<!--@endif--><!--@endforeach--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->qmail_compatibility}</div></th>
-        <td><!--@if($qmail_compatibility=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-    </tr>
-    </tbody>
-    </table>
+    <ul class="localNavigation">
+        <li class="on" id="moduleOn"><a href="#" onclick="toggleModuleAddon('module');return false;">{$lang->module}</a></li>
+        <li id="addonOn"><a href="#" onclick="toggleModuleAddon('addon');return false;">{$lang->addon}</a></li>
+    </ul>
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->module}</caption>
-    <thead>
+    <div id="xeModules">
+        <table cellspacing="0" class="rowTable">
+        <thead>
+            <tr>
+                <th><div>{$lang->module_name}</div></th>
+                <th><div>{$lang->version}</div></th>
+                <th><div>{$lang->author}</div></th>
+                <th><div>{$lang->table_count}</div></th>
+                <th><div>{$lang->module_action}</div></th>
+                <th><div>&nbsp;</div></th>
+            </tr>
+        </thead>
+        <tbody>
+        <!--@foreach($module_list as $key => $val)-->
+            <tr class="bg{$cycle_idx-1}">
+                <td><a href="{getUrl('','module','admin','act',$val->admin_index_act)}" title="{trim(htmlspecialchars($val->description))}">{$val->title}</a> ({$val->module})</td>
+                <td>{$val->version}</td>
+                <td>
+                    <!--@foreach($val->author as $author)-->
+                    <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
+                    <!--@endforeach-->
+                </td>
+                <td <!--@if($val->created_table_count != $val->table_count)-->class="alert"<!--@end-->>
+                    {$val->created_table_count}/{$val->table_count}
+                </td>
+                <td <!--@if($val->need_install || $val->need_update)-->class="alert"<!--@end-->>
+                    <!--@if($val->need_install)-->
+                        <a href="#" onclick="doInstallModule('{$val->module}');return false;" title="{htmlspecialchars($lang->cmd_install)}">{$lang->cmd_install}</a>
+                    <!--@elseif($val->need_update)-->
+                        <a href="#" onclick="doUpdateModule('{$val->module}'); return false;" title="{htmlspecialchars($lang->cmd_update)}">{$lang->cmd_update}</a>
+                    <!--@else-->
+                        -
+                    <!--@end-->
+                </td>
+                <td><a href="{getUrl('','module','module','act','dispModuleAdminInfo','selected_module',$val->module)}" onclick="popopen(this.href,'module_info');return false" title="{htmlspecialchars($lang->module_info)}" class="buttonSet buttonInfo"><span>{$lang->module_info}</span></a></td>
+            </tr>
+            <!--@end-->
+        </tbody>
+        </table>
+    </div>
+
+    <div id="xeAddons" style="display:none;">
+
+        <form id="fo_addon" action="./" method="get">
+            <input type="hidden" name="addon" value="" />
+        </form>
+        <table cellspacing="0" class="rowTable">
+        <thead>
+            <tr>
+                <th><div>{$lang->addon}</div></th>
+                <th><div>{$lang->cmd_setup}</div></th>
+                <th><div>{$lang->status}</div></th>
+            </tr>
+        </thead>
+        <tbody>
+        <!--@foreach($addon_list as $key => $val)-->
         <tr>
-            <th class="wide" colspan="2"><div>{$lang->module_name}</div></th>
-            <th><div>{$lang->version}</div></th>
-            <th><div>{$lang->author}</div></th>
-            <th><div>{$lang->table_count}</div></th>
-            <th><div>{$lang->module_action}</div></th>
-        </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($module_list as $key => $val)-->
-        <tr>
-            <td class="circle"><a href="{getUrl('','module','admin','act',$val->admin_index_act)}" title="{trim(htmlspecialchars($val->description))}">{$val->title}</a> ({$val->module})</td>
-            <td class="view">
-                <a href="{getUrl('','module','module','act','dispModuleAdminInfo','selected_module',$val->module)}" onclick="popopen(this.href,'module_info');return false">{$lang->module_info}</a>
-            </td>
-            <td class="number center">{$val->version}</td>
-            <td class="nowrap">
-                <!--@foreach($val->author as $author)-->
-                <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
-                <!--@endforeach-->
-            </td>
-            <td class="number center <!--@if($val->created_table_count != $val->table_count)-->alert<!--@end-->">
-                {$val->created_table_count}/{$val->table_count}
-            </td>
-            <td class="nowrap center <!--@if($val->need_install || $val->need_update)-->alert<!--@end-->">
-                <!--@if($val->need_install)-->
-                    <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->cmd_install}</a>
-                <!--@elseif($val->need_update)-->
-                    <a href="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->cmd_update}</a>
+            <td class="wide"><a href="{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{$val->title}</a></td>
+            <td><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+            <td>
+                <!--@if($val->activated)-->
+                <a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
                 <!--@else-->
-                    -
+                <a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
                 <!--@end-->
             </td>
         </tr>
         <!--@end-->
-    </tbody>
-    </table>
+        </tbody>
+        </table>
+    </div>
 </div>
 
-<div class="adminRightExtra">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->released_version}</caption>
-    <tr>
-        <td class="center">
-            <!--@if($current_version < $released_version)-->
-            <strong class="alert">{$released_version}</strong> [<a href="{$download_link}" onclick="window.open(this.href);return false;">download</a>]
-            <p>{nl2br($lang->about_download_link)}</p>
-            <!--@else-->
-            <strong>{$released_version}</strong> [<a href="{$download_link}" onclick="window.open(this.href);return false;">{$lang->cmd_view}</a>]
-            <!--@end-->
-        </td>
-    </tr>
-    </table>
+<div class="extension e2">
+    <div class="section">
+        <h4 class="xeAdmin">{$lang->status} <span class="date">{zdate(date("Ymd"),"Y.m.d")}</h4>
+        <table cellspacing="0" class="crossTable">
+        <thead>
+        <tr>
+            <th class="wide"><div>&nbsp;</div></th>
+            <th><div>{$lang->yesterday}</div></th>
+            <th><div>{$lang->today}</div></th>
+            <th><div>{$lang->total}</div></th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <th><a href="{getUrl('act','dispMemberAdminList')}">{$lang->member}</a></th>
+            <td class="number center">{number_format($status->member->yesterday)}</td>
+            <td class="number center">{number_format($status->member->today)}</td>
+            <td class="number center">{number_format($status->member->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document}</a></th>
+            <td class="number center">{number_format($status->document->yesterday)}</td>
+            <td class="number center">{number_format($status->document->today)}</td>
+            <td class="number center">{number_format($status->document->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispCommentAdminList')}">{$lang->comment}</a></th>
+            <td class="number center">{number_format($status->comment->yesterday)}</td>
+            <td class="number center">{number_format($status->comment->today)}</td>
+            <td class="number center">{number_format($status->comment->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispTrackbackAdminList')}">{$lang->trackback}</a></th>
+            <td class="number center">{number_format($status->trackback->yesterday)}</td>
+            <td class="number center">{number_format($status->trackback->today)}</td>
+            <td class="number center">{number_format($status->trackback->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispFileAdminList')}">{$lang->file}</a></th>
+            <td class="number center">{number_format($status->file->yesterday)}</td>
+            <td class="number center">{number_format($status->file->today)}</td>
+            <td class="number center">{number_format($status->file->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispDocumentAdminDeclared')}">{$lang->document.' '.$lang->cmd_declare}</a></th>
+            <td class="number center">{number_format($status->documentDeclared->yesterday)}</td>
+            <td class="number center">{number_format($status->documentDeclared->today)}</td>
+            <td class="number center">{number_format($status->documentDeclared->total)}</td>
+        </tr>
+        <tr>
+            <th><a href="{getUrl('act','dispCommentAdminDeclared')}">{$lang->comment.' '.$lang->cmd_declare}</a></th>
+            <td class="number center">{number_format($status->commentDeclared->yesterday)}</td>
+            <td class="number center">{number_format($status->commentDeclared->today)}</td>
+            <td class="number center">{number_format($status->commentDeclared->total)}</td>
+        </tr>
+        </tbody>
+        </table>
 
-    <!--@if($news)-->
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->newest_news}</caption>
-    <tbody>
-    <!--@foreach($news as $key => $val)-->
-    <tr>
-        <td class="paper">
-            <a href="{$val->url}" onclick="window.open(this.href);return false;" class="fl">{$val->title}</a>
-            <span class="date fr">{zdate($val->date,"Y-m-d")}</span> 
-        </td>
-    </tr>
-    <!--@endforeach-->
-    </tbody>
-    </table>
-    <!--@endif-->
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->status}</caption>
-    <thead>
-    <tr>
-        <th class="wide"><div>{$lang->target}</div></th>
-        <th><div>{$lang->yesterday}</div></th>
-        <th><div>{$lang->today}</div></th>
-        <th><div>{$lang->total}</div></th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispMemberAdminList')}">{$lang->member}</a></td>
-        <td class="number center">{number_format($status->member->yesterday)}</td>
-        <td class="number center">{number_format($status->member->today)}</td>
-        <td class="number center">{number_format($status->member->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document}</a></td>
-        <td class="number center">{number_format($status->document->yesterday)}</td>
-        <td class="number center">{number_format($status->document->today)}</td>
-        <td class="number center">{number_format($status->document->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispCommentAdminList')}">{$lang->comment}</a></td>
-        <td class="number center">{number_format($status->comment->yesterday)}</td>
-        <td class="number center">{number_format($status->comment->today)}</td>
-        <td class="number center">{number_format($status->comment->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispTrackbackAdminList')}">{$lang->trackback}</a></td>
-        <td class="number center">{number_format($status->trackback->yesterday)}</td>
-        <td class="number center">{number_format($status->trackback->today)}</td>
-        <td class="number center">{number_format($status->trackback->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispFileAdminList')}">{$lang->file}</a></td>
-        <td class="number center">{number_format($status->file->yesterday)}</td>
-        <td class="number center">{number_format($status->file->today)}</td>
-        <td class="number center">{number_format($status->file->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispDocumentAdminDeclared')}">{$lang->document.' '.$lang->cmd_declare}</a></td>
-        <td class="number center">{number_format($status->documentDeclared->yesterday)}</td>
-        <td class="number center">{number_format($status->documentDeclared->today)}</td>
-        <td class="number center">{number_format($status->documentDeclared->total)}</td>
-    </tr>
-    <tr>
-        <td class="circle"><a href="{getUrl('act','dispCommentAdminDeclared')}">{$lang->comment.' '.$lang->cmd_declare}</a></td>
-        <td class="number center">{number_format($status->commentDeclared->yesterday)}</td>
-        <td class="number center">{number_format($status->commentDeclared->today)}</td>
-        <td class="number center">{number_format($status->commentDeclared->total)}</td>
-    </tr>
-    </tbody>
-    </table>
+        <h4 class="xeAdmin">{$lang->env_information}</h4>
+        <!--@if($current_version < $released_version)-->
+        <p class="summary red">{nl2br($lang->about_download_link)} [<a href="{$download_link}" onclick="window.open(this.href);return false;">{$lang->cmd_download}</a>]</p>
+        <!--@end-->
+        <table cellspacing="0" class="rowTable">
+        <tbody>
+        <tr>
+            <th><div>{$lang->current_version}</div></th>
+            <td>
+                <strong>{$released_version}</strong> [<a href="{$download_link}" onclick="window.open(this.href);return false;">{$lang->cmd_view}</a>]
+            </td>
+        </tr>
+        <tr>
+            <th><div>{$lang->current_path}</div></th>
+            <td>{$installed_path}/</td>
+        </tr>
+        <tr>
+            <th><div>{$lang->time_zone}</div></th>
+            <td><!--@foreach($time_zone_list as $key => $val)--><!--@if($time_zone==$key)-->{substr($val,1,10)}<!--@end--><!--@endforeach--></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->use_rewrite}</div></th>
+            <td><!--@if($use_rewrite=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->use_optimizer}</div></th>
+            <td><!--@if($use_optimizer=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
+        </tr>
+        <tr>
+            <th><div>Language</div></th>
+            <td><!--@foreach($lang_supported as $key => $val)--><!--@if($key == $selected_lang)-->{$val}<!--@endif--><!--@endforeach--></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->qmail_compatibility}</div></th>
+            <td><!--@if($qmail_compatibility=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
+        </tr>
+        </tbody>
+        </table>
 
-    <form id="fo_addon" action="./" method="get">
-        <input type="hidden" name="addon" value="" />
-    </form>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->addon}</caption>
-    <col width="" />
-    <col width="25" />
-    <col width="25" />
-    <tbody>
-    <!--@foreach($addon_list as $key => $val)-->
-    <tr>
-        <td class="circle">
-            <a href="{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{$val->title}</a>
-        </td>
-        <td class="nowrap center"><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false"><img src="./images/n_setup.gif" alt="setup" /></a></td>
-        <td class="nowrap center <!--@if($val->activated)-->activated<!--@else-->deactivated<!--@end-->">
-            <!--@if($val->activated)-->
-            <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->use}</a>
-            <!--@else-->
-            <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->notuse}</a>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-    </tbody>
-    </table>
+
+        <!--@if($news)-->
+        <h4 class="xeAdmin">{$lang->newest_news}</h4>
+        <table cellspacing="0" class="rowTable">
+        <tbody>
+        <!--@foreach($news as $key => $val)-->
+        <tr>
+            <td>
+                <a href="{$val->url}" onclick="window.open(this.href);return false;" class="fl">{$val->title}</a>
+                <span class="date fr">{zdate($val->date,"Y-m-d")}</span> 
+            </td>
+        </tr>
+        <!--@endforeach-->
+        </tbody>
+        </table>
+        <!--@endif-->
+    </div>
 </div>
+
+<!--#include("_footer.html")-->
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 706b0b047..c2b3aa8b1 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -4,54 +4,48 @@
  * @brief  admin 모듈의 javascript
  **/
 
-jQuery(document).click(showXESubMenu);
-var openedSubMenus = null;
-
-function showXESubMenu(evt) {
-    if(evt.target && /^adminMainMenu/.test(evt.target.id)) {
-        var key = evt.target.id.split('_')[1];
-        var obj = jQuery('#adminSubMenu'+key).get(0);
-        if(!obj) return;
-        if(openedSubMenus) openedSubMenus.style.visibility = 'hidden';
-        if(openedSubMenus == obj) {
-            openedSubMenus = null;
-            return;
-        }
-        openedSubMenus = obj;
-        //xLeft(obj, xPageX(e.target) + (xWidth(e.target)-xWidth(obj))/2);
-        //if(xLeft(obj) + xWidth(obj) + 10 > xClientWidth()) xLeft(obj, xClientWidth() - xWidth(obj) - 10);
-        //xTop(obj, xPageY(e.target)+28);
-        obj.style.visibility = 'visible';
-        return;
-    } else if(openedSubMenus) {
-        openedSubMenus.style.visibility = 'hidden';
-        openedSubMenus = null;
-    }
-}
-
-// open/close Main Navigator
-function toggleXEMainNavigator() {
-    var obj = jQuery('.xeAdmin').get(0);
-    var btnObj = jQuery('#btnFolder').get(0);
-    if(!obj) return;
-    if(obj.style.display == 'none') {
-        obj.style.display = 'block';
-        btnObj.src = btnObj.src.replace(/btn_off.png/,'btn.png');
-    } else {
-        obj.style.display = 'none';
-        btnObj.src = btnObj.src.replace(/btn.png/,'btn_off.png');
-    }
-    var expire = new Date();
-    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-    xSetCookie('XEMN', obj.style.display, expire);
-}
-
 // 캐시파일 모두 재 생성
 function doRecompileCacheFile() {
     exec_xml("admin","procAdminRecompileCacheFile", new Array(), completeMessage);
 }
 
+// 모듈 목록 오픈
+function toggleModuleMenu(category) {
+    var obj = xGetElementById('module_'+category);
+    if(obj.className == 'open') obj.className = '';
+    else obj.className = 'open';
+}
+
+// 메인 모듈/ 애드온 토글
+function toggleModuleAddon(target) {
+    if(target == 'module') {
+        xGetElementById('moduleOn').className = 'on';
+        xGetElementById('xeModules').style.display = 'block';
+        xGetElementById('addonOn').className = '';
+        xGetElementById('xeAddons').style.display = 'none';
+    } else {
+        xGetElementById('addonOn').className = 'on';
+        xGetElementById('xeAddons').style.display = 'block';
+        xGetElementById('moduleOn').className = '';
+        xGetElementById('xeModules').style.display = 'none';
+    }
+}
+
+// 언어 목록 toggle
+function toggleAdminLang() {
+    var obj = xGetElementById("adminLang");
+    if(!obj) return;
+    if(obj.style.display == 'block') obj.style.display = 'none';
+    else obj.style.display = 'block';
+}
+
 
 jQuery(function(){
-    jQuery("table.adminTable tr").attr('class','').filter(":nth-child(even)").attr('class','row2');
-});
\ No newline at end of file
+    jQuery("table.rowTable tr").attr('class','').filter(":nth-child(even)").attr('class','bg1');
+});
+
+
+// 로그아웃
+function doAdminLogout() {
+    exec_xml('admin','procAdminLogout',new Array(), function() { location.reload(); });
+}
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 97013c84a..0873f9da2 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -1,53 +1,19 @@
-<!--%import("css/admin_layout.css")-->
-<!--%import("js/admin.js")-->
+<!--#include("./_header.html")-->
 
-<div class="xeAdmin" <!--@if($_COOKIE['XEMN']=='none')-->style="display:none;"<!--@end-->>
-<h1><a href="{getUrl('','module','admin')}"><img src="./images/n_logo.png" alt="XpressEngine" /></a></h1>
-    <ul class="globalNavigator">
-        <!--@if($logged_info->is_admin=='Y')--><li><a href="{getUrl('','module','admin','act','dispAdminConfig')}">{$lang->cmd_setup}</a></li><!--@end-->
-        <li><a href="{getUrl('','module','admin','act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
-    </ul>
-    <!--@if($logged_info->is_admin=='Y')-->
-    <div class="mainNavigator">
-        <ul class="mainNavigator">
-            <!--@foreach($lang->module_category_title as $key => $val)-->
-            <li <!--@if(!$__mNIdx)-->class="first"{@$__mNIdx=1}<!--@end-->><a href="#adminSubMenu{$key}" id="adminMainMenu_{$key}" onclick="return false">{$val}</a>
-			
-                <ul class="adminSubMenu" id="adminSubMenu{$key}">
-                {@ $__mNIdx = 0; }
-                <!--@foreach($installed_module_list as $k => $v)-->
-                    <!--@if($v->category == $key)-->
-                        <!--@if($v->admin_index_act)-->
-                        <li <!--@if(!$__mNIdx)-->class="first"{@$__mNIdx++}<!--@end-->>
-                            <a href="{getUrl('','module','admin','act',$v->admin_index_act)}" title="{trim($v->description)}" class="adminMenu">{$v->title}</a>
-                        </li>
-                        <!--@endif-->
-                    <!--@endif-->
-                <!--@endforeach-->
-                </ul>
-			</li>
+		<div class="content">
+            <!--@if($logged_info->is_admin == 'Y')-->
+            <p class="path">
+                <a href="{getUrl('','module','admin')}">{$lang->admin_index}</a> 
+                <!--@if($selected_module_info)-->
+                &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$selected_module_info->admin_index_act)}">{$selected_module_info->title}</a>
+                <!--@end-->
+                <!--@if($module_info)-->
+                &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$selected_module_info->admin_index_act)}">{$module_info->browser_title}</a>
+                [<a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href);return false;">{$lang->cmd_view}</a>]
+                <!--@end-->
+            </p>
             <!--@end-->
-        </ul>
-    </div>
-    <!--@end-->
-</div>
+            {$content}
+        </div>
 
-<div class="adminFolder"><a href="#" onclick="toggleXEMainNavigator(); return false;"><img src="./images/n_folder_btn<!--@if($_COOKIE['XEMN']=='none')-->_off<!--@end-->.png" alt="folding" id="btnFolder"/></a></div>
-
-<div class="adminPackage">
-    <ul>
-        <!--@if($logged_info->is_admin=='Y')-->
-        <li class="admin <!--@if(!$act||in_array($act,array('dispAdminIndex','dispAdminConfig')))-->active<!--@end-->"><a href="{getUrl('','module','admin')}">{$lang->admin_index}</a></li>
-        <!--@end-->
-        <!--@foreach($installed_module_list as $k => $v)-->
-        <!--@if($v->category=='package')-->
-        <li <!--@if(in_array($act, $v->actions))-->class="active"<!--@end-->><a href="{getUrl('','module','admin','act',$v->admin_index_act)}" title="{trim($v->description)}" class="adminMenu">{$v->title}</a></li>
-        <!--@end-->
-        <!--@end-->
-    </ul>
-</div>
-
-<div class="adminContentBody">{$content}</div>
-<div class="adminFooter">
-	<address><a href="http://www.zeroboard.com" onclick="window.open(this.href);return false;">Powered by <strong>X</strong>press <strong>E</strong>ngine</a></address>
-</div>
+<!--#include("./_footer.html")-->
diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php
index ed821c8fd..8db783ae1 100644
--- a/modules/board/board.admin.controller.php
+++ b/modules/board/board.admin.controller.php
@@ -13,114 +13,6 @@
         function init() {
         }
 
-        /**
-         * @brief 권한 추가
-         **/
-        function procBoardAdminInsertGrant() {
-            $module_srl = Context::get('module_srl');
-
-            // 현 모듈의 권한 목록을 가져옴
-            $grant_list = $this->xml_info->grant;
-
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_srl, $grants);
-
-            $this->add('module_srl',Context::get('module_srl'));
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 스킨 정보 업데이트
-         **/
-        function procBoardAdminUpdateSkinInfo() {
-            // module_srl에 해당하는 정보들을 가져오기
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            $skin = $module_info->skin;
-
-            // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($module_info->{$vars->name});
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) {
-                        $obj->{$vars->name} = $module_info->{$vars->name};
-                        continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    unset($obj->{$vars->name});
-                    $obj->{$vars->name} = $filename;
-                }
-            }
-
-            // serialize하여 저장
-            $skin_vars = serialize($obj);
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleSkinVars($module_srl, $skin_vars);
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
         /**
          * @brief 게시판 추가
          **/
@@ -129,110 +21,29 @@
             $oModuleController = &getController('module');
             $oModuleModel = &getModel('module');
 
-            // 만약 module_srl이 , 로 연결되어 있다면 일괄 정보 수정으로 처리
-            if(strpos(Context::get('module_srl'),',')!==false) {
-                // 대상 모듈들을 구해옴
-                $modules = $oModuleModel->getModulesInfo(Context::get('module_srl'));
-                $args = Context::getRequestVars();
-
-                for($i=0;$i<count($modules);$i++) {
-                    $obj = $extra_vars = null;
-
-                    $obj = $modules[$i];
-                    $extra_vars = unserialize($obj->extra_vars);
-
-                    $obj->module = 'board';
-                    $obj->module_category_srl = $args->module_category_srl;
-                    $obj->layout_srl = $args->layout_srl;
-                    $obj->skin = $args->skin;
-                    $obj->description = $args->description;
-                    $obj->header_text = $args->header_text;
-                    $obj->footer_text = $args->footer_text;
-                    $obj->admin_id = $args->admin_id;
-
-                    $extra_vars->use_category = $args->use_category=='Y'?'Y':'N';
-                    $extra_vars->list_count = $args->list_count;
-                    $extra_vars->search_list_count = $args->search_list_count;
-                    $extra_vars->except_notice = $args->except_notice!='Y'?'N':'Y';
-                    $extra_vars->consultation = $args->consultation!='Y'?'N':'Y';
-                    $extra_vars->secret = $args->secret!='Y'?'N':'Y';
-                    $extra_vars->admin_mail = $args->admin_mail;
-                    $extra_vars->page_count = $args->page_count;
-
-                    $obj->extra_vars = serialize($extra_vars);
-
-                    $output = $oModuleController->updateModule($obj);
-                    if(!$output->toBool()) return $output;
-                }
-
-                return new Object(0,'success_updated');
-            }
-
-            // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            if(!$args) {
-                $args = Context::gets('module_srl','module_category_srl','board_name','layout_srl','skin','browser_title','description','is_default','header_text','footer_text','admin_id');
-                $extra_var = delObjectVars(Context::getRequestVars(), $args);
-            }
-
+            // 게시판 모듈의 정보 설정
+            $args = Context::getRequestVars();
             $args->module = 'board';
             $args->mid = $args->board_name;
             unset($args->board_name);
-            if($args->is_default!='Y') $args->is_default = 'N';
 
             // 기본 값외의 것들을 정리
-            if($extra_var->use_category!='Y') $extra_var->use_category = 'N';
-            if($extra_var->except_notice!='Y') $extra_var->except_notice = 'N';
-            if($extra_var->consultation!='Y') $extra_var->consultation = 'N';
-            if(!in_array($extra_var->order_target,$this->order_target)) $extra_var->order_target = 'list_order';
-            if(!in_array($extra_var->order_type,array('asc','desc'))) $extra_var->order_type = 'asc';
-            unset($extra_var->act);
-            unset($extra_var->page);
-            unset($extra_var->board_name);
-            unset($extra_var->module_srl);
-
-            // 확장변수(20개로 제한된 고정 변수) 체크
-            $user_defined_extra_vars = array();
-            foreach($extra_var as $key => $val) {
-                if(substr($key,0,11)!='extra_vars_') continue;
-                preg_match('/^extra_vars_([0-9]+)_(.*)$/i', $key, $matches);
-                if(!$matches[1] || !$matches[2]) continue;
-
-                $user_defined_extra_vars[$matches[1]]->{$matches[2]} = $val;
-                unset($extra_var->{$key});
-            }
-            for($i=1;$i<=20;$i++) if(!$user_defined_extra_vars[$i]->name) unset($user_defined_extra_vars[$i]);
-            $extra_var->extra_vars = $user_defined_extra_vars;
+            if($args->use_category!='Y') $args->use_category = 'N';
+            if($args->except_notice!='Y') $args->except_notice = 'N';
+            if($args->consultation!='Y') $args->consultation = 'N';
+            if(!in_array($args->order_target,$this->order_target)) $args->order_target = 'list_order';
+            if(!in_array($args->order_type,array('asc','desc'))) $args->order_type = 'asc';
 
             // module_srl이 넘어오면 원 모듈이 있는지 확인
             if($args->module_srl) {
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-                // 만약 원래 모듈이 없으면 새로 입력하기 위한 처리
                 if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // $extra_var를 serialize
-            $args->extra_vars = serialize($extra_var);
-
-            // is_default=='Y' 이면
-            if($args->is_default=='Y') $oModuleController->clearDefaultModule();
-
             // module_srl의 값에 따라 insert/update
             if(!$args->module_srl) {
                 $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-
-                // 파일업로드, 댓글 파일업로드, 관리에 대한 권한 지정
-                if($output->toBool()) {
-                    $oMemberModel = &getModel('member');
-                    $admin_group = $oMemberModel->getAdminGroup();
-                    $admin_group_srl = $admin_group->group_srl;
-
-                    $module_srl = $output->get('module_srl');
-                    $grants = serialize(array('manager'=>array($admin_group_srl)));
-
-                    $oModuleController->updateModuleGrant($module_srl, $grants);
-                }
             } else {
                 $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
@@ -262,208 +73,23 @@
         }
 
         /**
-         * @brief 카테고리 추가
+         * @brief 게시판 목록 지정
          **/
-        function procBoardAdminInsertCategory($args = null) {
-            // 입력할 변수 정리
-            if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','title','expand','group_srls','color');
-
-            if($args->expand !="Y") $args->expand = "N";
-            $args->group_srls = str_replace('|@|',',',$args->group_srls);
-            $args->parent_srl = (int)$args->parent_srl;
-
-            $oDocumentController = &getController('document');
-            $oDocumentModel = &getModel('document');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 이미 존재하는지를 확인
-            if($args->category_srl) {
-                $category_info = $oDocumentModel->getCategory($args->category_srl);
-                if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
-            }
-
-            // 존재하게 되면 update를 해준다
-            if($args->category_srl) {
-                $output = $oDocumentController->updateCategory($args);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-
-            // 존재하지 않으면 insert를 해준다
-            } else {
-                $output = $oDocumentController->insertCategory($args);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-            }
-
-            // XML 파일을 갱신하고 위치을 넘겨 받음
-            $xml_file = $oDocumentController->makeCategoryFile($args->module_srl);
-
-            $oDB->commit();
-
-            $this->add('xml_file', $xml_file);
-            $this->add('module_srl', $args->module_srl);
-            $this->add('category_srl', $args->category_srl);
-            $this->add('parent_srl', $args->parent_srl);
-        }
-
-
-        /**
-         * @brief 카테고리 삭제
-         **/
-        function procBoardAdminDeleteCategory() {
-            // 변수 정리
-            $args = Context::gets('module_srl','category_srl');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $oDocumentModel = &getModel('document');
-
-            // 원정보를 가져옴
-            $category_info = $oDocumentModel->getCategory($args->category_srl);
-            if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
-
-            // 자식 노드가 있는지 체크하여 있으면 삭제 못한다는 에러 출력
-            if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
-
-            // DB에서 삭제
-            $oDocumentController = &getController('document');
-            $output = $oDocumentController->deleteCategory($args->category_srl);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // XML 파일을 갱신하고 위치을 넘겨 받음
-            $xml_file = $oDocumentController->makeCategoryFile($args->module_srl);
-
-            $oDB->commit();
-
-            $this->add('xml_file', $xml_file);
-            $this->add('category_srl', $parent_srl);
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 카테고리 이동
-         **/
-/*
-        function procBoardAdminMoveCategory() {
-            $source_category_srl = Context::get('source_category_srl');
-            $target_category_srl = Context::get('target_category_srl');
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-
-            $target_category = $oDocumentModel->getCategory($target_category_srl);
-            $source_category = $oDocumentModel->getCategory($source_category_srl);
-
-            // target_category의 list_order값을 +1해 준다
-            $output = $oDocumentController->updateCategoryListOrder($target_category->module_srl, $target_category->list_order);
-            if(!$output->toBool()) return $output;
-
-            // source_category에 target_category_srl의 parent_srl, list_order 값을 입력
-            $source_args->category_srl = $source_category_srl;
-            $source_args->parent_srl = $target_category->parent_srl;
-            $source_args->list_order = $target_category->list_order;
-            $output = $oDocumentController->updateCategory($source_args);
-            if(!$output->toBool()) return $output;
-
-            // xml파일 재생성
-            $xml_file = $oDocumentController->makeCategoryFile($source_category->module_srl);
-
-            // return 변수 설정
-            $this->add('xml_file', $xml_file);
-            $this->add('source_category_srl', $source_category_srl);
-        }
-*/
-
-        function procBoardAdminMoveCategory() {
-            $source_category_srl = Context::get('source_srl');
-
-            // parent_srl 이 있으면 첫 자식으로 들어간다
-            $parent_category_srl = Context::get('parent_srl');
-
-            // target_srl 이 있으면 target_srl 아래로 형제로 들어간다
-            $target_category_srl = Context::get('target_srl');
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-            $source_category = $oDocumentModel->getCategory($source_category_srl);
-
-
-            //parent_category_srl 의 첫 자식으로 넣자
-            if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0)){
-                $parent_category = $oDocumentModel->getCategory($parent_category_srl);
-
-                $args->module_srl = $source_category->module_srl;
-                $args->parent_srl = $parent_category_srl;
-                $output = executeQuery('document.getChildCategoryMinListOrder', $args);
-
-                if(!$output->toBool()) return $output;
-                $args->list_order = (int)$output->data->list_order;
-                if(!$args->list_order) $args->list_order = 0;
-                $args->list_order--;
-
-
-                $source_args->category_srl = $source_category_srl;
-                $source_args->parent_srl = $parent_category_srl;
-                $source_args->list_order = $args->list_order;
-                $output = $oDocumentController->updateCategory($source_args);
-                if(!$output->toBool()) return $output;
-
-
-            // $target_category_srl의 아래동생으로
-            }else if($target_category_srl > 0){
-                $target_category = $oDocumentModel->getCategory($target_category_srl);
-
-                //$target_category의 아래 동생을 모두 내린다
-                $output = $oDocumentController->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-                if(!$output->toBool()) return $output;
-
-
-                $source_args->category_srl = $source_category_srl;
-                $source_args->parent_srl = $target_category->parent_srl;
-                $source_args->list_order = $target_category->list_order+1;
-                $output = $oDocumentController->updateCategory($source_args);
-                if(!$output->toBool()) return $output;
-
-            }
-
-
-            // xml파일 재생성
-            $xml_file = $oDocumentController->makeCategoryFile($source_category->module_srl);
-
-            // return 변수 설정
-            $this->add('xml_file', $xml_file);
-            $this->add('source_category_srl', $source_category_srl);
-
-        }
-
-
-
-        /**
-         * @brief xml 파일을 갱신
-         * 관리자페이지에서 메뉴 구성 후 간혹 xml파일이 재생성 안되는 경우가 있는데\n
-         * 이럴 경우 관리자의 수동 갱신 기능을 구현해줌\n
-         * 개발 중간의 문제인 것 같고 현재는 문제가 생기지 않으나 굳이 없앨 필요 없는 기능
-         **/
-        function procBoardAdminMakeXmlFile() {
-            // 입력값을 체크
+        function procBoardAdminInsertListConfig() {
             $module_srl = Context::get('module_srl');
+            $list = explode(',',Context::get('list'));
+            if(!count($list)) return new Object(-1, 'msg_invalid_request');
 
-            // xml파일 재생성
-            $oDocumentController = &getController('document');
-            $xml_file = $oDocumentController->makeCategoryFile($module_srl);
+            $list_arr = array();
+            foreach($list as $val) {
+                $val = trim($val);
+                if(!$val) continue;
+                if(substr($val,0,10)=='extra_vars') $val = substr($val,10);
+                $list_arr[] = $val;
+            }
 
-            // return 값 설정
-            $this->add('xml_file',$xml_file);
+            $oModuleController = &getController('module');
+            $oModuleController->insertModulePartConfig('board', $module_srl, $list_arr);
         }
     }
 ?>
diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php
index a0ccb8f20..b04ec1e57 100644
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@@ -36,6 +36,8 @@
                 }
             }
 
+            if($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
+
             // 모듈 카테고리 목록을 구함
             $module_category = $oModuleModel->getModuleCategories();
             Context::set('module_category', $module_category);
@@ -58,7 +60,7 @@
             // 등록된 board 모듈을 불러와 세팅
             $args->sort_index = "module_srl";
             $args->page = Context::get('page');
-            $args->list_count = 40;
+            $args->list_count = 20;
             $args->page_count = 10;
             $args->s_module_category_srl = Context::get('module_category_srl');
             $output = executeQueryArray('board.getBoardList', $args);
@@ -77,10 +79,9 @@
         }
 
         /**
-         * @brief 선택된 게시판의 정보 출력
+         * @brief 선택된 게시판의 정보 출력 (바로 정보 입력으로 변경)
          **/
         function dispBoardAdminBoardInfo() {
-
             $this->dispBoardAdminInsertBoard();
         }
 
@@ -128,7 +129,6 @@
          * @brief 게시판 삭제 화면 출력
          **/
         function dispBoardAdminDeleteBoard() {
-
             if(!Context::get('module_srl')) return $this->dispBoardAdminContent();
             if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
                 return $this->alertMessage('msg_invalid_request');
@@ -147,58 +147,29 @@
         }
 
         /**
-         * @brief 스킨 정보 보여줌
+         * @brief 게시판의 목록 설정
          **/
-        function dispBoardAdminSkinInfo() {
-            if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
-                return $this->alertMessage('msg_invalid_request');
-            }
+        function dispBoardAdminListSetup() {
+            $oBoardModel = &getModel('board');
 
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $module_info = Context::get('module_info');
-            $skin = $module_info->skin;
+            // 대상 항목을 구함
+            Context::set('extra_vars', $oBoardModel->getDefaultListConfig($this->module_info->module_srl));
 
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-            if(!$skin_info) {
-                $skin = 'xe_board';
-                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-            }
+            // 설정 항목 추출 (설정항목이 없을 경우 기본 값을 세팅)
+            Context::set('list_config', $oBoardModel->getListConfig($this->module_info->module_srl));
 
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $group = $val->group;
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $module_info->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
-            $this->setTemplateFile('skin_info');
+            $this->setTemplateFile('list_setting');
         }
 
         /**
          * @brief 카테고리의 정보 출력
          **/
         function dispBoardAdminCategoryInfo() {
-            // module_srl을 구함
-            $module_srl = $this->module_info->module_srl;
-            if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
-                return $this->alertMessage('msg_invalid_request');
-            }
-
-            // 카테고리 정보를 가져옴
             $oDocumentModel = &getModel('document');
-            $category_xml_file = $oDocumentModel->getCategoryXmlFile($module_srl);
+            $catgegory_content = $oDocumentModel->getCategoryHTML($this->module_info->module_srl);
+            Context::set('category_content', $catgegory_content);
 
-            Context::set('category_xml_file', $category_xml_file);
-            Context::addJsFile('./common/js/tree_menu.js');
-
-//            Context::set('layout','none');
+            Context::set('module_info', $this->module_info);
             $this->setTemplateFile('category_list');
         }
 
@@ -206,24 +177,41 @@
          * @brief 권한 목록 출력
          **/
         function dispBoardAdminGrantInfo() {
-            // module_srl을 구함
-            $module_srl = Context::get('module_srl');
-            if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
-                return $this->alertMessage('msg_invalid_request');
-            }
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
 
             $this->setTemplateFile('grant_list');
         }
 
+        /**
+         * @brief 확장 변수 설정
+         **/
+        function dispBoardAdminExtraVars() {
+            $oDocumentAdminModel = &getModel('document');
+            $extra_vars_content = $oDocumentAdminModel->getExtraVarsHTML($this->module_info->module_srl);
+            Context::set('extra_vars_content', $extra_vars_content);
+
+            $this->setTemplateFile('extra_vars');
+        }
+
+        /**
+         * @brief 스킨 정보 보여줌
+         **/
+        function dispBoardAdminSkinInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
+
+            $this->setTemplateFile('skin_info');
+        }
+
+
+        /**
+         * @brief board module용 메시지 출력
+         **/
         function alertMessage($message) {
             $script =  sprintf('<script type="text/javascript"> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
             Context::addHtmlHeader( $script );
diff --git a/modules/board/board.api.php b/modules/board/board.api.php
index ff594f2eb..c10f4f844 100644
--- a/modules/board/board.api.php
+++ b/modules/board/board.api.php
@@ -24,7 +24,8 @@
          * @brief 컨텐츠 목록
          **/
         function dispBoardContentList(&$oModule) {
-            $oModule->add('document_list',$this->arrangeContentList(Context::get('document_list')));
+            $document_list = $this->arrangeContentList(Context::get('document_list'));
+            $oModule->add('document_list',$document_list);
             $oModule->add('page_navigation',Context::get('page_navigation'));
         }
 
@@ -40,7 +41,10 @@
          * @brief 게시물 보기
          **/
         function dispBoardContentView(&$oModule) {
-            $oModule->add('oDocument',$this->arrangeContent(Context::get('oDocument')));
+            $oDocument = Context::get('oDocument');
+            $extra_vars = $oDocument->getExtraVars();
+            $oDocument->add('extra_vars',$this->arrangeExtraVars($extra_vars));
+            $oModule->add('oDocument',$this->arrangeContent($oDocument));
         }
 
 
@@ -78,14 +82,14 @@
         function arrangeContent($content) {
             $output = null;
             if($content){
-                $output= $content->gets('document_srl','category_srl','is_secret','nick_name','user_id','user_name','title','content','tags','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars1','extra_vars2','extra_vars3','extra_vars4','extra_vars5','extra_vars6','extra_vars7','extra_vars8','extra_vars9','extra_vars10','extra_vars11','extra_vars12','extra_vars13','extra_vars14','extra_vars15','extra_vars16','extra_vars17','extra_vars18','extra_vars19','extra_vars20');
+                $output= $content->gets('document_srl','category_srl','is_secret','nick_name','user_id','user_name','title','content','tags','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars');
             }
             return $output;
         }
 
         function arrangeComment($comment_list) {
             $output = array();
-            if(count($comment_list)) {
+            if(count($comment_list) > 0 ) {
                 foreach($comment_list as $key => $val){
                     $item = null;
                     $item = $val->gets('comment_srl','parent_srl','depth','is_secret','content','voted_count','blamed_count','user_id','user_name','nick_name','email_address','homepage','regdate','last_update');
@@ -98,7 +102,7 @@
 
         function arrangeFile($file_list) {
             $output = array();
-            if(count($file_list)) {
+            if(count($file_list) > 0) {
                 foreach($file_list as $key => $val){
                     $item = null;
                     $item->sid = $val->sid;
@@ -113,5 +117,20 @@
             }
             return $output;
         }
+
+        function arrangeExtraVars($list) {
+            $output = array();
+            if(count($list)) {
+                foreach($list as $key => $val){
+                    $item = null;
+                    $item->name = $val->name;
+                    $item->type = $val->type;
+                    $item->desc = $val->desc;
+                    $item->value = $val->value;
+                    $output[] = $item;
+                }
+            }
+            return $output;
+        }
     }
 ?>
diff --git a/modules/board/board.class.php b/modules/board/board.class.php
index 4b9c7134a..e9d684db8 100644
--- a/modules/board/board.class.php
+++ b/modules/board/board.class.php
@@ -23,21 +23,10 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminContent');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardTagList');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminBoardInfo');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminInsertBoard');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminDeleteBoard');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminSkinInfo');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminCategoryInfo');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminGrantInfo');
-            $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminBoardAdditionSetup');
-            $oModuleController->insertActionForward('board', 'controller', 'procBoardAdminUpdateSkinInfo');
 
             // 2007. 10. 17 아이디 클릭시 나타나는 팝업메뉴에 작성글 보기 기능 추가
             $oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 
-
             // 기본 게시판 생성
             $output = executeQuery('module.getDefaultMidInfo');
             if($output->data) return new Object();
@@ -48,19 +37,22 @@
 
             // 기본 모듈이 없으면 새로 등록
             if(!$module_info->module_srl) {
-                $args->board_name = 'board';
+                $args->mid = 'board';
+                $args->module = 'board';
                 $args->browser_title = 'test module';
                 $args->is_default = 'Y';
                 $args->skin = 'xe_default';
+                $args->site_srl = 0;
 
                 // board 라는 이름의 모듈이 있는지 확인
                 $module_info = $oModuleModel->getModuleInfoByMid($args->board_name);
-                if($module_info->module_srl) $args->module_srl = $module_info->module_srl;
-                else $args->module_srl = 0;
-
-                // 게시판 controller 생성
-                $oBoardController = &getAdminController('board');
-                $oBoardController->procBoardAdminInsertBoard($args);
+                if($module_info->module_srl) {
+                    $args->module_srl = $module_info->module_srl;
+                    $oModuleController->updateModule($args);
+                } else {
+                    $args->module_srl = 0;
+                    $oModuleController->insertModule($args);
+                }
             }
 
             return new Object();
@@ -74,17 +66,6 @@
 
             // 2007. 10. 17 아이디 클릭시 나타나는 팝업메뉴에 작성글 보기 기능 추가
             if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
-
-            /**
-             * 2007. 10. 17 : 게시판 모듈설정에 추가 설정 액션 설정
-             **/
-            if(!$oModuleModel->getActionForward('dispBoardAdminBoardAdditionSetup')) return true;
-
-            /**
-             * 2007. 11. 27 : 태그 목록 보기 액션 설정
-             **/
-            if(!$oModuleModel->getActionForward('dispBoardTagList')) return true;
-
             return false;
         }
 
@@ -99,18 +80,6 @@
             if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
                 $oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 
-            /**
-             * 2007. 10. 17 : 게시판 모듈설정에 추가 설정 액션 설정
-             **/
-            if(!$oModuleModel->getActionForward('dispBoardAdminBoardAdditionSetup'))
-                $oModuleController->insertActionForward('board', 'view', 'dispBoardAdminBoardAdditionSetup');
-
-            /**
-             * 2007. 11. 27 : 태그 목록 보기 액션 설정
-             **/
-            if(!$oModuleModel->getActionForward('dispBoardTagList')) 
-                $oModuleController->insertActionForward('board', 'view', 'dispBoardTagList');
-
             return new Object(0, 'success_updated');
         }
 
@@ -120,22 +89,5 @@
         function recompileCache() {
         }
 
-        /**
-         * @brief Action중 Admin이 들어갔을 경우 권한 체크
-         **/
-        function checkAdminActionGrant() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin=='Y') return true;
-
-            $actions = array('getBoardAdminCategoryTplInfo','dispBoardAdminCategoryInfo','procBoardAdminInsertCategory','procBoardAdminUpdateCategory','procBoardAdminDeleteCategory','procBoardAdminMoveCategory');
-            if(!in_array($this->act, $actions)) return false;
-
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isSiteAdmin()) return true;
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index adaf4e49c..ff5bf9e8b 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -27,6 +27,8 @@
 
             settype($obj->title, "string");
             if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+            //그래도 없으면 Untitled
+            if($obj->title == '') $obj->title = 'Untitled';
 
             // 관리자가 아니라면 게시글 색상/굵기 제거
             if(!$this->grant->manager) {
@@ -139,8 +141,8 @@
             $oCommentController = &getController('comment');
 
             // comment_srl이 존재하는지 체크
-			// 만일 comment_srl이 n/a라면 getNextSequence()로 값을 얻어온다.
-			if(!$obj->comment_srl) {
+			      // 만일 comment_srl이 n/a라면 getNextSequence()로 값을 얻어온다.
+			      if(!$obj->comment_srl) {
                 $obj->comment_srl = getNextSequence();
             } else {
                 $comment = $oCommentModel->getComment($obj->comment_srl, $this->grant->manager);
diff --git a/modules/board/board.model.php b/modules/board/board.model.php
new file mode 100644
index 000000000..70cfd2981
--- /dev/null
+++ b/modules/board/board.model.php
@@ -0,0 +1,58 @@
+<?php
+    /**
+     * @class  boardModel
+     * @author zero (zero@nzeo.com)
+     * @brief  board 모듈의 Model class
+     **/
+
+    class boardModel extends module {
+        /**
+         * @brief 초기화
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief 목록 설정 값을 가져옴
+         **/
+        function getListConfig($module_srl) {
+            $oModuleModel = &getModel('module');
+            $oDocumentModel = &getModel('document');
+
+            // 저장된 목록 설정값을 구하고 없으면 기본 값으로 설정
+            $list_config = $oModuleModel->getModulePartConfig('board', $module_srl);
+            if(!$list_config || !count($list_config)) $list_config = array( 'no', 'title', 'nick_name','regdate','readed_count');
+
+            // 사용자 선언 확장변수 구해와서 배열 변환후 return
+            $inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);
+
+            foreach($list_config as $key) {
+                if(preg_match('/^([0-9]+)$/',$key)) $output['extra_vars'.$key] = $inserted_extra_vars[$key];
+                else $output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
+            }
+            return $output;
+        }
+
+        /** 
+         * @brief 기본 목록 설정값을 return
+         **/
+        function getDefaultListConfig($module_srl) {
+            // 가상번호, 제목, 등록일, 수정일, 닉네임, 아이디, 이름, 조회수, 추천수 추가
+            $virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'nick_name', 'user_id', 'user_name', 'readed_count', 'voted_count' );
+            foreach($virtual_vars as $key) {
+                $extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
+            }
+
+            // 사용자 선언 확장변수 정리
+            $oDocumentModel = &getModel('document');
+            $inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);
+
+            if(count($inserted_extra_vars)) foreach($inserted_extra_vars as $obj) $extra_vars['extra_vars'.$obj->idx] = $obj;
+
+            return $extra_vars;
+
+        }
+
+
+    }
+?>
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 644ea1dbc..2654e00d1 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -9,33 +9,23 @@
 
         /**
          * @brief 초기화
-         *
          * board 모듈은 일반 사용과 관리자용으로 나누어진다.\n
          **/
         function init() {
             /**
-             * 스킨등에서 사용될 module_srl이나 module_info등을 context set
+             * 기본 모듈 정보들 설정 (list_count, page_count는 게시판 모듈 전용 정보이고 기본 값에 대한 처리를 함)
              **/
-            // 템플릿에서 사용할 변수를 Context::set()
-            if($this->module_srl) Context::set('module_srl',$this->module_srl);
-
-            // 현재 호출된 게시판의 모듈 정보를 module_info 라는 이름으로 context setting
-            Context::set('module_info',$this->module_info);
-        
-            // 기본 모듈 정보들 설정 (list_count, page_count는 게시판 모듈 전용 정보이고 기본 값에 대한 처리를 함)
             if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;
             if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;
             if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;
+            $this->except_notice = $this->module_info->except_notice == 'N' ? false : true;
 
-            // 일반 목록에서 공지사항을 제외하는 기능의 체크
-            if($this->module_info->except_notice == 'N') $this->except_notice = false; 
-            else $this->except_notice = true;
-
-            // 상담 기능 체크. 현재 게시판의 관리자이면 상담기능을 off시킴
+            /**
+             * 상담 기능 체크. 현재 게시판의 관리자이면 상담기능을 off시킴
+             * 현재 사용자가 비로그인 사용자라면 글쓰기/댓글쓰기/목록보기/글보기 권한을 제거함
+             **/
             if($this->module_info->consultation == 'Y' && !$this->grant->manager) {
                 $this->consultation = true; 
-
-                // 현재 사용자가 비로그인 사용자라면 글쓰기/댓글쓰기/목록보기/글보기 권한을 제거함
                 if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
             } else {
                 $this->consultation = false;
@@ -43,16 +33,27 @@
 
             /**
              * 스킨 경로를 미리 template_path 라는 변수로 설정함
+             * 스킨이 존재하지 않는다면 xe_board로 변경
              **/
             $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
-
-            // 만약 스킨 경로가 없다면 xe_board로 변경
             if(!is_dir($template_path)) {
                 $this->module_info->skin = 'xe_board';
                 $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
             }
-
             $this->setTemplatePath($template_path);
+
+            /**
+             * 확장 변수 사용시 미리 확장변수의 대상 키들을 가져와서 context set
+             **/
+            $oDocumentModel = &getModel('document');
+            $extra_keys = $oDocumentModel->getExtraKeys($this->module_info->module_srl);
+            Context::set('extra_keys', $extra_keys);
+
+            /** 
+             * 게시판 전반적으로 사용되는 javascript, JS 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');
+            Context::addJsFile($this->module_path.'tpl/js/board.js');
         }
 
         /**
@@ -62,7 +63,7 @@
             /**
              * 목록보기 권한 체크 (모든 권한은 ModuleObject에서 xml 정보와 module_info의 grant 값을 비교하여 미리 설정하여 놓음)
              **/
-            if(!$this->grant->list) return $this->dispBoardMessage('msg_not_permitted');
+            if(!$this->grant->access || !$this->grant->list) return $this->dispBoardMessage('msg_not_permitted');
 
             /**
              * 카테고리를 사용하는지 확인후 사용시 카테고리 목록을 구해와서 Context에 세팅
@@ -71,19 +72,18 @@
 
             /**
              * 목록이 노출될때 같이 나오는 검색 옵션을 정리하여 스킨에서 쓸 수 있도록 context set
+             * 확장변수에서 검색 선택된 항목이 있으면 역시 추가
              **/
             // 템플릿에서 사용할 검색옵션 세팅 (검색옵션 key값은 미리 선언되어 있는데 이에 대한 언어별 변경을 함)
             foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
-
-            // 모듈정보를 확인하여 확장변수에서도 검색이 설정되어 있는지 확인
-            for($i=1;$i<=20;$i++) {
-                $ex_name = trim($this->module_info->extra_vars[$i]->name);
-                if(!$ex_name) continue;
-                if($this->module_info->extra_vars[$i]->search == 'Y') $search_option['extra_vars'.$i] = $ex_name;
+            $extra_keys = Context::get('extra_keys');
+            if($extra_keys) {
+                foreach($extra_keys as $key => $val) {
+                    if($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
+                }
             }
             Context::set('search_option', $search_option);
 
-
             // 게시글을 가져옴
             $this->dispBoardContentView();
 
@@ -93,88 +93,106 @@
             // 목록
             $this->dispBoardContentList();
 
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'search.xml');
+
             // template_file을 list.html로 지정
             $this->setTemplateFile('list');
         }
 
+        /**
+         * @brief 카테고리 항목을 구해와서 스킨에서 사용할 수 있도록 세팅
+         **/
         function dispBoardCategoryList(){
+            // 카테고리를 사용할때에만 데이터를 추출
             if($this->module_info->use_category=='Y') {
                 $oDocumentModel = &getModel('document');
                 Context::set('category_list', $oDocumentModel->getCategoryList($this->module_srl));
             }
         }
 
+        /**
+         * @brief 선택된 게시글이 있을 경우 글을 가져와서 스킨에서 사용하도록 세팅
+         **/
         function dispBoardContentView(){
-            $oDocumentModel = &getModel('document');
-            $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl
-
-            // 목록 구현에 필요한 변수들을 가져온다
+            // 요청된 변수 값들을 정리
             $document_srl = Context::get('document_srl');
             $page = Context::get('page');
 
-            // 혹시 선택된 문서가 있다면 해당 문서에 대한 객체를 생성함 
-            // (일단 빈객체를 만드는 것은 선택된 글이 없을때 스킨에서 object 오류발생하는 것을 막기 위함)
-            $oDocument = $oDocumentModel->getDocument(0);
+            // document model 객체 생성 
+            $oDocumentModel = &getModel('document');
 
-            // document_srl이 있다면 해당 글을 구해와서 $oDocument로 세팅
+            /**
+             * 요청된 문서 번호가 있다면 문서를 구함
+             **/
             if($document_srl) {
+                $oDocument = $oDocumentModel->getDocument($document_srl);
 
-                // 글에 대한 정보를 구함
-                $oDocument->setDocument($document_srl);
-
-                // 상담기능이 사용되고 공지사항이 아니고 사용자의 글도 아니면 무시
-                if($oDocument->isExists() && $this->consultation && !$oDocument->isNotice()) {
-                    $logged_info = Context::get('logged_info');
-                    if($oDocument->get('member_srl')!=$logged_info->member_srl) $oDocument = new DocumentItem();
-                }
-
-                // 글이 존재하지 않으면 글이 존재 하지 않는다는 오류 메세지 출력
-                if(!$oDocument->isExists()) {
-
-                    unset($document_srl);
-
-                    Context::set('document_srl','',true);
-
-                    $this->alertMessage('msg_not_founded');
-
-                // 글이 존재하면 글 보기 권한에 대한 확인과 조회수증가/ 브라우저 타이틀의 설정을 함
-                } else {
+                // 해당 문서가 존재할 경우 필요한 처리를 함
+                if($oDocument->isExists()) {
 
                     // 글과 요청된 모듈이 다르다면 오류 표시
-                    if($oDocument->get('module_srl')!=Context::get('module_srl') ) return $this->stop('msg_invalid_request');
+                    if($oDocument->get('module_srl')!=$this->module_info->module_srl ) return $this->stop('msg_invalid_request');
 
                     // 관리 권한이 있다면 권한을 부여
                     if($this->grant->manager) $oDocument->setGrant();
 
-                    // 글 보기 권한을 체크해서 권한이 없으면 오류 메세지 출력하도록 처리
-                    if(!$this->grant->view && !$oDocument->isGranted()) {
-                        $oDocument = null;
-                        $oDocument = $oDocumentModel->getDocument(0);
-                        Context::set('document_srl','',true);
-                        $this->alertMessage('msg_not_permitted');
-                    } else {
-                        // 브라우저 타이틀에 글의 제목을 추가
-                        Context::addBrowserTitle($oDocument->getTitleText());
-
-                        // 조회수 증가 (비밀글일 경우 권한 체크)
-                        if(!$oDocument->isSecret() || $oDocument->isGranted()) $oDocument->updateReadedCount();
-
-                        // 비밀글일때 컨텐츠를 보여주지 말자.
-                        if($oDocument->isSecret() && !$oDocument->isGranted()){
-                           $oDocument->add('content',Context::getLang('thisissecret'));
-                            $obj = null;
-                            for($i=1;$i<=20;$i++) $obj->{"extra_vars".$i} = '';
-                            $oDocument->adds($obj);
-                         }
+                    // 상담기능이 사용되고 공지사항이 아니고 사용자의 글도 아니면 무시
+                    if($this->consultation && !$oDocument->isNotice()) {
+                        $logged_info = Context::get('logged_info');
+                        if($oDocument->get('member_srl')!=$logged_info->member_srl) $oDocument = $oDocumentModel->getDocument(0);
                     }
+
+                // 요청된 문서번호의 문서가 없으면 document_srl null 처리 및 경고 메세지 출력
+                } else {
+                    Context::set('document_srl','',true);
+                    $this->alertMessage('msg_not_founded');
+                }
+
+            /**
+             * 요청된 문서 번호가 아예 없다면 빈 문서 객체 생성
+             **/
+            } else {
+                $oDocument = $oDocumentModel->getDocument(0);
+            }
+
+            /**
+             * 글 보기 권한을 체크해서 권한이 없으면 오류 메세지 출력하도록 처리
+             **/
+            if($oDocument->isExists()) {
+                if(!$this->grant->view && !$oDocument->isGranted()) {
+                    $oDocument = $oDocumentModel->getDocument(0);
+                    Context::set('document_srl','',true);
+                    $this->alertMessage('msg_not_permitted');
+                } else {
+                    // 브라우저 타이틀에 글의 제목을 추가
+                    Context::addBrowserTitle($oDocument->getTitleText());
+
+                    // 조회수 증가 (비밀글일 경우 권한 체크)
+                    if(!$oDocument->isSecret() || $oDocument->isGranted()) $oDocument->updateReadedCount();
+
+                    // 비밀글일때 컨텐츠를 보여주지 말자.
+                    if($oDocument->isSecret() && !$oDocument->isGranted()) $oDocument->add('content',Context::getLang('thisissecret'));
                 }
             }
 
-            // 스킨에서 사용하기 위해 context set
+            // 스킨에서 사용할 oDocument 변수 세팅
             Context::set('oDocument', $oDocument);
+            $oDocument->add('module_srl', $this->module_srl);
+
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+        
+//            return new Object();
         }
 
-
+        /**
+         * @brief 선택된 글이 있을 경우 첨부파일에 대한 정보를 API 에서 사용할 수 있도록 세팅
+         **/
         function dispBoardContentFileList(){
             $oDocumentModel = &getModel('document');
             $document_srl = Context::get('document_srl');
@@ -182,6 +200,9 @@
             Context::set('file_list',$oDocument->getUploadedFiles());
         }
 
+        /**
+         * @brief 선택된 글이 있을 경우 그 글의 댓글 목록을 API 에서 사용할 수 있도록 세팅
+         **/
         function dispBoardContentCommentList(){
             $oDocumentModel = &getModel('document');
             $document_srl = Context::get('document_srl');
@@ -197,42 +218,61 @@
             Context::set('comment_list',$comment_list);
         }
 
+        /**
+         * @brief 공지사항이 있을 경우 API에서 사용할 수 있게 하기 위해서 세팅
+         **/
         function dispBoardNoticeList(){
             $oDocumentModel = &getModel('document');
-            $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl
+            $args->module_srl = $this->module_srl; 
             $notice_output = $oDocumentModel->getNoticeList($args);
             Context::set('notice_list', $notice_output->data);
         }
 
+        /**
+         * @brief 게시글 목록
+         **/
         function dispBoardContentList(){
+            // 만약 목록 보기 권한이 없을 경우 목록을 보여주지 않음
+            if(!$this->grant->list) {
+                Context::set('document_list', array());
+                Context::set('total_count', 0);
+                Context::set('total_page', 1);
+                Context::set('page', 1);
+                Context::set('page_navigation', new PageHandler(0,0,1,10));
+                return;
+            }
+
             $oDocumentModel = &getModel('document');
-            $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl
 
             // 목록을 구하기 위한 대상 모듈/ 페이지 수/ 목록 수/ 페이지 목록 수에 대한 옵션 설정
-            $args->page = Context::get('page');; ///< 페이지
-            $args->list_count = $this->list_count; ///< 한페이지에 보여줄 글 수
-            $args->page_count = $this->page_count; ///< 페이지 네비게이션에 나타날 페이지의 수
+            $args->module_srl = $this->module_srl; 
+            $args->page = Context::get('page');
+            $args->list_count = $this->list_count; 
+            $args->page_count = $this->page_count; 
 
             // 검색과 정렬을 위한 변수 설정
-            $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
-            $args->search_keyword = Context::get('search_keyword'); ///< 검색어
+            $args->search_target = Context::get('search_target'); 
+            $args->search_keyword = Context::get('search_keyword'); 
 
+            // 카테고리를 사용한다면 카테고리 값을 받음
             if($this->module_info->use_category=='Y') $args->category_srl = Context::get('category'); ///< 카테고리 사용시 선택된 카테고리
 
+            // 지정된 정렬값이 없다면 스킨에서 설정한 정렬 값을 이용함
             $args->sort_index = Context::get('sort_index');
             $args->order_type = Context::get('order_type');
-
-            // 지정된 정렬값이 없다면 스킨에서 설정한 정렬 값을 이용함
             if(!in_array($args->sort_index, $this->order_target)) $args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';
             if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';
 
-            $oDocument = $oDocumentModel->getDocument(Context::get('document_srl'));
-
             // 특정 문서의 permalink로 직접 접속할 경우 page값을 직접 구함
-            if(count($_GET)==1 && isset($_GET['document_srl']) && $oDocument->isExists() && !$oDocument->isNotice()) {
-                $page = $oDocumentModel->getDocumentPage($oDocument, $args);
-                Context::set('page', $page);
-                $args->page = $page;
+            $_get = $_GET;
+            if(count($_get)==2) unset($_get['mid']);
+            if(count($_get)==1 && ($_GET['document_srl'] || $_GET['entry'])) {
+                $oDocument = $oDocumentModel->getDocument(Context::get('document_srl'));
+                if($oDocument->isExists() && !$oDocument->isNotice()) {
+                    $page = $oDocumentModel->getDocumentPage($oDocument, $args);
+                    Context::set('page', $page);
+                    $args->page = $page;
+                }
             }
 
             // 만약 카테고리가 있거나 검색어가 있으면list_count를 search_list_count 로 이용
@@ -251,8 +291,11 @@
             Context::set('total_page', $output->total_page);
             Context::set('page', $output->page);
             Context::set('page_navigation', $output->page_navigation);
-        }
 
+            // 목록 설정값을 세팅
+            $oBoardModel = &getModel('board');
+            Context::set('list_config', $oBoardModel->getListConfig($this->module_info->module_srl));
+        }
 
         /**
          * @brief 태그 목록 모두 보기
@@ -298,7 +341,6 @@
              * 카테고리를 사용하는지 확인후 사용시 카테고리 목록을 구해와서 Context에 세팅, 권한도 함께 체크
              **/
             if($this->module_info->use_category=='Y') {
-
                 // 로그인한 사용자의 그룹 정보를 구함
                 if(Context::get('is_logged')) {
                     $logged_info = Context::get('logged_info');
@@ -327,30 +369,21 @@
 
             // GET parameter에서 document_srl을 가져옴
             $document_srl = Context::get('document_srl');
-
             $oDocument = $oDocumentModel->getDocument(0, $this->grant->manager);
             $oDocument->setDocument($document_srl);
             $oDocument->add('module_srl', $this->module_srl);
 
             // 글을 수정하려고 할 경우 권한이 없는 경우 비밀번호 입력화면으로
             if($oDocument->isExists()&&!$oDocument->isGranted()) return $this->setTemplateFile('input_password_form');
-            if(!$oDocument->isExists())
-            {
+            if(!$oDocument->isExists()) {
                 $oModuleModel = &getModel('module');
                 $point_config = $oModuleModel->getModulePartConfig('point',$this->module_srl);
                 $logged_info = Context::get('logged_info');
                 $oPointModel = &getModel('point');
                 $pointForInsert = $point_config["insert_document"];
-                if($pointForInsert < 0)
-                {
-                    if( !$logged_info )
-                    {
-                        return $this->dispBoardMessage('msg_not_permitted');
-                    }
-                    else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 )
-                    {
-                        return $this->dispBoardMessage('msg_not_enough_point');
-                    }
+                if($pointForInsert < 0) {
+                    if( !$logged_info ) return $this->dispBoardMessage('msg_not_permitted');
+                    else if (($oPointModel->getPoint($logged_info->member_srl) + $pointForInsert )< 0 ) return $this->dispBoardMessage('msg_not_enough_point');
                 }
             }
 
@@ -359,7 +392,15 @@
 
             // 확장변수처리를 위해 xml_js_filter를 직접 header에 적용
             $oDocumentController = &getController('document');
-            $oDocumentController->addXmlJsFilter($this->module_info);
+            $oDocumentController->addXmlJsFilter($this->module_info->module_srl);
+
+            // 존재하는 글이면 확장변수 값을 context set
+            if($oDocument->isExists()) Context::set('extra_keys', $oDocument->getExtraVars());
+
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
 
             $this->setTemplateFile('write_form');
         }
@@ -388,6 +429,11 @@
 
             Context::set('oDocument',$oDocument);
 
+            /** 
+             * 필요한 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_document.xml');
+
             $this->setTemplateFile('delete_form');
         }
 
@@ -416,6 +462,11 @@
             Context::set('oSourceComment',$oSourceComment);
             Context::set('oComment',$oComment);
 
+            /** 
+             * 필요한 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+
             $this->setTemplateFile('comment_form');
         }
 
@@ -449,6 +500,11 @@
             Context::set('oSourceComment',$oSourceComment);
             Context::set('oComment',$oComment);
 
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+
             $this->setTemplateFile('comment_form');
         }
 
@@ -480,6 +536,11 @@
             Context::set('oSourceComment', $oCommentModel->getComment());
             Context::set('oComment', $oComment);
 
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+
             $this->setTemplateFile('comment_form');
         }
 
@@ -507,6 +568,11 @@
 
             Context::set('oComment',$oComment);
 
+            /** 
+             * 필요한 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_comment.xml');
+
             $this->setTemplateFile('delete_comment_form');
         }
 
@@ -527,6 +593,11 @@
 
             Context::set('trackback',$trackback);
 
+            /** 
+             * 필요한 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_trackback.xml');
+
             $this->setTemplateFile('delete_trackback_form');
         }
 
diff --git a/modules/board/conf/info.xml b/modules/board/conf/info.xml
index 2e4e1927b..cce374c91 100644
--- a/modules/board/conf/info.xml
+++ b/modules/board/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">게시판</title>
-    <title xml:lang="zh-CN">版面</title>
+    <title xml:lang="zh-CN">版面管理</title>
     <title xml:lang="en">Board</title>
     <title xml:lang="es">Tablero</title>
     <title xml:lang="jp">掲示板</title>
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index f51274914..f8cad72b1 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -33,51 +33,17 @@
             <title xml:lang="es">Escribir comentario</title>
             <title xml:lang="zh-TW">發表評論</title>
         </grant>
-        <grant name="manager" default="root">
-            <title xml:lang="ko">관리</title>
-            <title xml:lang="zh-CN">管理</title>
-            <title xml:lang="jp">管理</title>
-            <title xml:lang="en">manager</title>
-            <title xml:lang="es">Administrador</title>
-            <title xml:lang="zh-TW">管理</title>
-        </grant>
     </grants>
     <permissions>
-        <permission action="dispBoardContent" target="manager" />
-        <permission action="dispBoardTagList" target="manager" />
-        <permission action="dispBoardWrite" target="manager" />
-        <permission action="dispBoardDelete" target="manager" />
-        <permission action="dispBoardWriteComment" target="manager" />
-        <permission action="dispBoardReplyComment" target="manager" />
-        <permission action="dispBoardModifyComment" target="manager" />
-        <permission action="dispBoardDeleteComment" target="manager" />
-        <permission action="dispBoardDeleteTrackback" target="manager" />
-        <permission action="dispBoardMessage" target="manager" />
-
-        <permission action="procBoardInsertDocument" target="manager" />
-        <permission action="procBoardDeleteDocument" target="manager" />
-        <permission action="procBoardInsertComment" target="manager" />
-        <permission action="procBoardDeleteComment" target="manager" />
-        <permission action="procBoardDeleteTrackback" target="manager" />
-        <permission action="procBoardDeleteFile" target="manager" />
-        <permission action="procBoardUploadFile" target="manager" />
-        <permission action="procBoardDownloadFile" target="manager" />
-
-        <permission action="getBoardAdminCategoryTplInfo" target="manager" />
-
         <permission action="dispBoardAdminInsertBoard" target="manager" />
         <permission action="dispBoardAdminBoardInfo" target="manager" />
+        <permission action="dispBoardAdminExtraVars" target="manager" />
         <permission action="dispBoardAdminBoardAdditionSetup" target="manager" />
         <permission action="dispBoardAdminSkinInfo" target="manager" />
-        <permission action="dispBoardAdminCategoryInfo" target="manager" />
+        <permission action="dispBoardAdminListSetup" target="manager" />
 
         <permission action="procBoardAdminInsertBoard" target="manager" />
-        <permission action="procBoardAdminUpdateSkinInfo" target="manager" />
-        <permission action="procBoardAdminInsertCategory" target="manager" />
-        <permission action="procBoardAdminUpdateCategory" target="manager" />
-        <permission action="procBoardAdminDeleteCategory" target="manager" />
-        <permission action="procBoardAdminMakeXmlFile" target="manager" />
-        <permission action="procBoardAdminMoveCategory" target="manager" />
+        <permission action="procBoardAdminInsertListConfig" target="manager" />
     </permissions>
     <actions>
         <action name="dispBoardContent" type="view" index="true" />
@@ -109,25 +75,18 @@
         <action name="procBoardUploadFile" type="controller" />
         <action name="procBoardDownloadFile" type="controller" />
 
-        <action name="getBoardAdminCategoryTplInfo" type="model" standalone="true" />
-
         <action name="dispBoardAdminContent" type="view" standalone="true" admin_index="true" />
         <action name="dispBoardAdminBoardInfo" type="view" standalone="true" />
+        <action name="dispBoardAdminExtraVars" type="view" standalone="true" />
         <action name="dispBoardAdminBoardAdditionSetup" type="view" standalone="true" />
         <action name="dispBoardAdminInsertBoard" type="view" standalone="true" />
         <action name="dispBoardAdminDeleteBoard" type="view" standalone="true" />
         <action name="dispBoardAdminSkinInfo" type="view" standalone="true" />
-        <action name="dispBoardAdminCategoryInfo" type="view" standalone="true" />
         <action name="dispBoardAdminGrantInfo" type="view" standalone="true" />
-
-        <action name="procBoardAdminInsertGrant" type="controller" standalone="true" />
-        <action name="procBoardAdminUpdateSkinInfo" type="controller" standalone="true" />
+        <action name="dispBoardAdminListSetup" type="view" standalone="true" />
+        <action name="dispBoardAdminCategoryInfo" type="view" />
         <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="procBoardAdminDeleteCategory" type="controller" standalone="true" />
-        <action name="procBoardAdminMakeXmlFile" type="controller" standalone="true" />
-        <action name="procBoardAdminMoveCategory" type="controller" standalone="true" />
+        <action name="procBoardAdminInsertListConfig" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/board/lang/en.lang.php b/modules/board/lang/en.lang.php
index fe1d4a717..a6ae29727 100644
--- a/modules/board/lang/en.lang.php
+++ b/modules/board/lang/en.lang.php
@@ -10,15 +10,10 @@
     $lang->except_notice = 'Exclude Notices';
 
     $lang->cmd_manage_menu = 'Manage Menus';
-    $lang->cmd_make_child = 'Add Child Category';
-    $lang->cmd_enable_move_category = "Change Category Position (Drag the top menu after selection)";
+    $lang->list_target_item = 'Target Item';
+    $lang->list_display_item = 'Display Item';
 
     // Item
-    $lang->parent_category_title = 'Parent Category';
-    $lang->category_title = 'Category';
-    $lang->category_color = 'Category Font Color';
-    $lang->expand = 'Expand';
-    $lang->category_group_srls = 'Accessable Group';
     $lang->search_result = 'Search Result';
     $lang->consultation = 'Consultation';
     $lang->secret = 'Secret';
@@ -29,11 +24,9 @@
     $lang->cmd_board_list = 'Boards List';
     $lang->cmd_module_config = 'Common Board Setting';
     $lang->cmd_view_info = 'Board Info';
+    $lang->cmd_list_setting = 'List Setting';
 
     // blah blah..
-    $lang->about_category_title = 'Please input category name';
-    $lang->about_expand = 'By selecting this option, it will be always expanded';
-    $lang->about_category_group_srls = 'Only selected group will be able to use current category';
     $lang->about_layout_setup = 'You can manually modify board layout code. Insert or manage the widget code anywhere you want';
     $lang->about_board_category = 'You can make board categories.<br />When board category is broken, try rebuilding the cache file manually.';
     $lang->about_except_notice = 'Notice articles will not be displayed on normal list.';
@@ -41,8 +34,7 @@
     $lang->about_consultation = "Non-administrator members would see their own articles.\nNon-members would not be able to write articles when using consultation.";
     $lang->about_secret = 'Users will be able to write secret articles or comments.';
     $lang->about_admin_mail = 'A mail will be sent when an article or comment is submitted.<br />Multiple mails can be sent with commas(,).';
-
-    $lang->about_category_color = 'You can set font color of category.';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
     $lang->msg_not_enough_point = 'Your point is not enough to write an article in this board.';
 ?>
diff --git a/modules/board/lang/es.lang.php b/modules/board/lang/es.lang.php
index a6ff4ce58..725177ecd 100644
--- a/modules/board/lang/es.lang.php
+++ b/modules/board/lang/es.lang.php
@@ -9,20 +9,15 @@
 
     $lang->except_notice = 'Excluir Avisos';
     $lang->cmd_manage_menu = 'Manejo del menú';
-    $lang->cmd_make_child = 'Agregar sub categoría';
-    $lang->cmd_enable_move_category = "Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)";
+    $lang->list_target_item = 'Target Item';
+    $lang->list_display_item = 'Display Item';
     $lang->cmd_remake_cache = 'Rehacer archivo caché';
     $lang->cmd_layout_setup = 'Configuración del diseño';
     $lang->cmd_layout_edit = 'Editar el diseño';
 
     // Artículos
-    $lang->parent_category_title = 'Categoría Superior';
-    $lang->category_title = 'Nombre de la categoría';
-    $lang->category_color = '분류 폰트색깔';
-    $lang->expand = 'Expandir';
-    $lang->category_group_srls = 'Limitar el grupo';
-    $lang->search_result = 'Resultado de la búsqueda';
     $lang->consultation = '상담 기능';
+    $lang->search_result = 'Resultado de la búsqueda';
     $lang->secret = '비밀글 기능';
     $lang->thisissecret = '비밀글입니다.';
     $lang->admin_mail = '관리자 메일';
@@ -31,11 +26,9 @@
     $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->cmd_list_setting = 'List Setting';
 
     // bla bla...
-    $lang->about_category_title = 'Ingresar el nombre de la categoría.';
-    $lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'Puede modificar manualmente el código del diseño de tableros. Insertar o modificar el código de widget.';
     $lang->about_board_category = 'Puede crear las categorias de tableros.<br />Cuando no funciona la categoría de tableros, rehacer el archivo caché manualmente para solucionar.';
     $lang->about_except_notice = 'Aviso de los artículos no se mostrará en la lista normal.';
@@ -43,7 +36,7 @@
     $lang->about_consultation = "No administrador de los miembros que consideran que su propia artocles. \ NNon miembros no serían capaces de escribir artículos al utilizar la consulta.";
     $lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
     $lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
     $lang->msg_not_enough_point = 'Your point is not enough to write an article in this board.';
 ?>
diff --git a/modules/board/lang/fr.lang.php b/modules/board/lang/fr.lang.php
index 43d56d08c..d6138d6a9 100644
--- a/modules/board/lang/fr.lang.php
+++ b/modules/board/lang/fr.lang.php
@@ -10,14 +10,9 @@
     $lang->except_notice = 'Exclure des Notices';
 
     $lang->cmd_manage_menu = 'Administration de Menu';
-    $lang->cmd_make_child = 'Ajouter une catégorie inférieure';
-    $lang->cmd_enable_move_category = "Bouger la position de la catégorie (Cochez la case et puis glisser la catégorie que vous voulez déplacer)";
-
+    $lang->list_target_item = 'Target Item';
+    $lang->list_display_item = 'Display Item';
     // Item
-    $lang->parent_category_title = 'catégorie supérieure';
-    $lang->category_title = 'Catégorie';
-    $lang->expand = 'Etendre';
-    $lang->category_group_srls = 'Groupe Accessible';
     $lang->search_result = 'Résultat de la Recherche';
     $lang->consultation = 'Consultation';
     $lang->secret = '비밀글 기능';
@@ -28,11 +23,9 @@
     $lang->cmd_board_list = 'Liste des Panneaux';
     $lang->cmd_module_config = 'Configuration commun pour les Panneaux';
     $lang->cmd_view_info = 'Information des Panneaux';
+    $lang->cmd_list_setting = 'List Setting';
 
     // murmure..
-    $lang->about_category_title = 'Entrez le nom de la catégorie, S.V.P.';
-    $lang->about_expand = 'Si vous cochez la case à cocher, ce sera toujours tendu';
-    $lang->about_category_group_srls = 'Le groupe choisi seulement pourra utiliser la catégorie courante';
     $lang->about_layout_setup = 'Vous pouvez manuellement modifier le code de Mise en Page du blogue. Insérez ou administrez le code de Gadget n\'importe où vous voulez.';
     $lang->about_board_category = 'Vous pouvez créer des catégories de Panneau d\'Affichage. Quand la catégorie d\'affichage est cassé, essayez manuellement rétablir l\'antémémoire du fichier.';
     $lang->about_except_notice = "Le titre de Notice dont l'article se représentera toujours en tête de la liste ne sera exposé sur la liste générale.";
@@ -40,7 +33,7 @@
     $lang->about_consultation = "Les membres non-administratifs verront seulement les ariticles d\'eux-même.\nNon-membres ne pourraient pas écrire des articles quand la Consultation est appliqué.";
     $lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
     $lang->about_admin_mail = 'Un message éléctronique sera envoyé à l\'adresse inscrite quand un article ou commentaire se soumet. <br />On peut inscrire multiple adresses délimité par les virgules.';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
-    $lang->about_category_color = 'You can set font color of category.';
     $lang->msg_not_enough_point = 'Your point is not enough to write an article in this board.';
 ?>
diff --git a/modules/board/lang/jp.lang.php b/modules/board/lang/jp.lang.php
index 21696a236..d18a7db7d 100644
--- a/modules/board/lang/jp.lang.php
+++ b/modules/board/lang/jp.lang.php
@@ -10,16 +10,10 @@
     $lang->except_notice = 'お知らせの非表示機能';
 
     $lang->cmd_manage_menu = 'メニュー管理';
-    $lang->cmd_make_child = '下位カテゴリ追加';
-    $lang->cmd_enable_move_category = "カテゴリ位置変更（選択後上のメニューをドラッグして下さい）";
+    $lang->list_target_item = 'Target Item';
+    $lang->list_display_item = 'Display Item';
 
     // 項目
-    $lang->parent_category_title = '上位カテゴリ名';
-    $lang->category_title = 'カテゴリ名';
-    $lang->category_color = 'カテゴリフォント色';
-    
-    $lang->expand = '拡張表示';
-    $lang->category_group_srls = 'グループ制限';
     $lang->search_result = '検索結果';
     $lang->consultation = '相談機能';
     $lang->secret = '秘密文機能';
@@ -32,11 +26,9 @@
     $lang->cmd_board_list = '掲示板リスト';
     $lang->cmd_module_config = '掲示板共通設定';
     $lang->cmd_view_info = '掲示板情報';
+    $lang->cmd_list_setting = 'List Setting';
 
     // その他
-    $lang->about_category_title = 'カテゴリ名を入力して下さい。';
-    $lang->about_expand = 'チェックすると常に展開された状態になります。';
-    $lang->about_category_group_srls = '選択したグループのみ、現在のカテゴリの指定が出来ます。';
     $lang->about_layout_setup = 'ブログのレイアウトのコードを直接修正します。ウィジェットコードを好きなところに入力、又は管理して下さい。';
     $lang->about_board_category = 'ブログのカテゴリを作成します。<br />ブログのカテゴリが誤作動する場合、「キャッシュファイルの再生性」を手動で行うことで解決できます。';
     $lang->about_except_notice = "リストの上段に常に表示されるお知らせの書き込みを一般リストからお知らせの書き込みが表示されないようにします。";
@@ -44,8 +36,8 @@
     $lang->about_consultation = "相談機能とは、管理権限のない会員に本人の書き込みだけを表示する機能です。\n但し、相談機能を使用する際は、非会員の書き込みは自動的に禁止されます。";
     $lang->about_secret = '掲示板およびコメントの秘密文を登録できるようにします。';
     $lang->about_admin_mail = '書き込みやコメントが掲載される時、登録メールアドレス宛にメールが送信されます。<br /> 複数のメールアドレスへ送信する場合は「,」(半額コンマ)区切りで登録して下さい。';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
-    $lang->about_category_color = 'カテゴリのフォント色を設定します。';
 
     $lang->msg_not_enough_point = '書き込みするためのポイントが足りません。';
 ?>
diff --git a/modules/board/lang/ko.lang.php b/modules/board/lang/ko.lang.php
index 61bb5eb66..2c86f93f4 100644
--- a/modules/board/lang/ko.lang.php
+++ b/modules/board/lang/ko.lang.php
@@ -6,37 +6,26 @@
      **/
 
     $lang->board = '게시판';
-
     $lang->except_notice = '공지사항 제외';
-
     $lang->cmd_manage_menu = '메뉴관리';
-    $lang->cmd_make_child = '하위 카테고리 추가';
-    $lang->cmd_enable_move_category = "카테고리 위치 변경 (선택후 위 메뉴를 드래그하세요)";
+    $lang->list_target_item = '대상 항목';
+    $lang->list_display_item = '표시 항목';
+
 
     // 항목
-    $lang->parent_category_title = '상위 카테고리명';
-    $lang->category_title = '분류명';
-    $lang->category_color = '분류 폰트색깔';
-    
-    $lang->expand = '펼침';
-    $lang->category_group_srls = '그룹제한';
     $lang->search_result = '검색결과';
     $lang->consultation = '상담 기능';
     $lang->secret = '비밀글 기능';
     $lang->thisissecret = '비밀글입니다.';
     $lang->admin_mail = '관리자 메일';
 
-
-
     // 버튼에 사용되는 언어
     $lang->cmd_board_list = '게시판 목록';
     $lang->cmd_module_config = '게시판 공통 설정';
     $lang->cmd_view_info = '게시판 정보';
+    $lang->cmd_list_setting = '목록설정';
 
     // 주절 주절..
-    $lang->about_category_title = '카테고리 이름을 입력해주세요';
-    $lang->about_expand = '선택하시면 늘 펼쳐진 상태로 있게 합니다';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = '블로그의 레이아웃 코드를 직접 수정할 수 있습니다. 위젯 코드를 원하는 곳에 삽입하시거나 관리하세요';
     $lang->about_board_category = '분류를 만드실 수 있습니다.<br />분류가 오동작을 할 경우 캐시파일 재생성을 수동으로 해주시면 해결이 될 수 있습니다.';
     $lang->about_except_notice = '목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.';
@@ -44,8 +33,7 @@
     $lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.";
     $lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
     $lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
-
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
     $lang->msg_not_enough_point = '포인트가 부족합니다';
 ?>
diff --git a/modules/board/lang/ru.lang.php b/modules/board/lang/ru.lang.php
index d1a243fff..47e902789 100644
--- a/modules/board/lang/ru.lang.php
+++ b/modules/board/lang/ru.lang.php
@@ -10,6 +10,8 @@
     $lang->except_notice = '공지사항 제외';
 
     $lang->cmd_manage_menu = 'Управление меню';
+    $lang->list_target_item = 'Target Item';
+    $lang->list_display_item = 'Display Item';
     $lang->cmd_make_child = 'Добавить дочернюю категорию';
     $lang->cmd_enable_move_category = "Изменить позицию категории (Перетащите верхнее меню после выделения)";
     $lang->cmd_remake_cache = 'Перепостроить файл кеша';
@@ -17,12 +19,6 @@
     $lang->cmd_layout_edit = 'Редактировать лейаут';
 
     // Объект
-    $lang->parent_category_title = 'Родительская категория';
-    $lang->category_title = 'Категория';
-    $lang->category_color = '분류 폰트색깔';
-
-    $lang->expand = 'Расширить';
-    $lang->category_group_srls = 'Доступные группы';
     $lang->search_result = 'Результат поиска';
     $lang->consultation = '상담 기능';
     $lang->secret = '비밀글 기능';
@@ -33,11 +29,9 @@
     $lang->cmd_board_list = 'Список форумов';
     $lang->cmd_module_config = 'Общие настройки форума';
     $lang->cmd_view_info = 'Информация форума';
+    $lang->cmd_list_setting = 'List Setting';
 
     // blah blah.. или чушь всякая... ;)
-    $lang->about_category_title = 'Пожалуйста, введите название категории';
-    $lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
     $lang->about_layout_setup = 'Вы можете вручную изменять лейаут код блога. Вставляйте или управляйте кодом виджетов везде, где хотите';
     $lang->about_board_category = 'Вы можете сделать категории блога.<br />Когда категория блога испорчена, попробуйте перепостроить файл кеша вручную.';
     $lang->about_except_notice = "목록 상단에 늘 나타나는 공지사항을 일반 목록에서 공지사항을 출력하지 않도록 합니다.";
@@ -45,7 +39,7 @@
     $lang->about_consultation = "상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다\n단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.";
     $lang->about_secret = '게시판 및 댓글의 비밀글 사용할 수 있도록 합니다.';
     $lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다<br /> ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
+    $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다.<br />단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다<br />대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
     $lang->msg_not_enough_point = 'Your point is not enough to write an article in this board.';
 ?>
diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php
index ce15b76c7..7b9804ca5 100644
--- a/modules/board/lang/zh-CN.lang.php
+++ b/modules/board/lang/zh-CN.lang.php
@@ -6,38 +6,26 @@
      **/
 
     $lang->board = "版面";
-
     $lang->except_notice = "公告选项";
-
     $lang->cmd_manage_menu = '菜单管理';
-    $lang->cmd_make_child = '添加下级分类';
-    $lang->cmd_enable_move_category = "分类顺序(勾选后用鼠标拖动分类项)";
-    $lang->cmd_remake_cache = '重新生成缓冲文件';
-    $lang->cmd_layout_setup = '布局设置';
-    $lang->cmd_layout_edit = '编辑布局';
+    $lang->list_target_item = '备选项';
+    $lang->list_display_item = '显示项';
+
 
     // 项目
-    $lang->parent_category_title = '上级分类名';
-    $lang->category_title = '分类名';
-    $lang->category_color = '分类颜色';
-    $lang->expand = '展开';
-    $lang->category_group_srls = '用户组';
     $lang->search_result = '搜索结果';
     $lang->consultation = '咨询功能';
     $lang->secret = '密帖';
-    $lang->thisissecret = '비밀글입니다.';
+    $lang->thisissecret = '此为密帖。';
     $lang->admin_mail = '管理员电子邮件';
 
     // 按钮语言
     $lang->cmd_board_list = '版面目录';
     $lang->cmd_module_config = '版面共同设置';
     $lang->cmd_view_info = '版面信息';
-
+    $lang->cmd_list_setting = '列表设置';
 
     // 信息、提示..
-    $lang->about_category_title = '请输入分类名。';
-    $lang->about_expand = '选择此项将维持展开状态。';
-    $lang->about_category_group_srls = '被选的用户组才可以查看此分类。';
     $lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
     $lang->about_board_category = '可以添加/删除分类项<br />分类有异常情况时，可以尝试重新生成缓冲文件。';
     $lang->about_except_notice = "设置公告目录项不再重复显示到普通目录当中。";
@@ -45,6 +33,7 @@
     $lang->about_consultation = "咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。\n使用咨询功能时系统将自动禁止非会员的发表主题权限。";
     $lang->about_secret = '设置主题及评论当中使用密帖与否。';
     $lang->about_admin_mail = '有新的主题或评论时，将自动发电子邮件来通知管理员。<br />多数电子邮件由逗号(,)来分隔。';
-    $lang->about_category_color = '请指定分类颜色（必须带#符号）。ex）#ff0000';
-    $lang->msg_not_enough_point = 'Your point is not enough to write an article in this board.';
+    $lang->about_list_config = '设置使用目录型目录页面时要显示的项目。<br />前提是使用的皮肤也支持此功能。<br />添加/删除项目，双击备选项/显示项即可。';
+
+    $lang->msg_not_enough_point = '很遗憾！您的积分不够。';
 ?>
diff --git a/modules/board/lang/zh-TW.lang.php b/modules/board/lang/zh-TW.lang.php
index 23b49e40b..a09e5f699 100644
--- a/modules/board/lang/zh-TW.lang.php
+++ b/modules/board/lang/zh-TW.lang.php
@@ -2,38 +2,30 @@
     /**
      * @file   zh-TW.lang.php
      * @author zero (zero@nzeo.com) 翻譯：royallin
-     * @brief  討論板(board) 模組語言
+     * @brief  討論板(board)模組語言
      **/
 
     $lang->board = '討論板';
-
     $lang->except_notice = '公告選項';
-
     $lang->cmd_manage_menu = '選單管理';
-    $lang->cmd_make_child = '新增子分類';
-    $lang->cmd_enable_move_category = "分類順序(勾選後用滑鼠拖曳分類項目)";
+    $lang->list_target_item = '目標項目';
+    $lang->list_display_item = '顯示項目';
+
 
     // 項目
-    $lang->parent_category_title = '主分類';
-    $lang->category_title = '分類名稱';
-    $lang->category_color = '分類顏色';
-    $lang->expand = '展開';
-    $lang->category_group_srls = '用戶組';
     $lang->search_result = '搜尋結果';
     $lang->consultation = '咨詢功能';
     $lang->secret = '秘密';
-    $lang->thisissecret = '비밀글입니다.';
+    $lang->thisissecret = '這是秘密文。';
     $lang->admin_mail = '管理員電子郵件';
 
     // 按鈕語言
     $lang->cmd_board_list = '討論板列表';
     $lang->cmd_module_config = '討論板共同設置';
     $lang->cmd_view_info = '討論板資料';
+    $lang->cmd_list_setting = '列表設定';
 
     // 信息、提示..
-    $lang->about_category_title = '請輸入分類名稱。';
-    $lang->about_expand = '選擇此項將維持展開狀態。';
-    $lang->about_category_group_srls = '被選擇的用戶組才可以檢視此分類。';
     $lang->about_layout_setup = '可直接編輯部落格版面設計原始碼。可把控件原始碼插入到您喜歡的位置。';
     $lang->about_board_category = '可以新增/刪除分類項目<br />分類有異常情況時，可以嘗試重新建立暫存檔。';
     $lang->about_except_notice = '設置公告列表項目，不再重複顯示到普通列表當中。';
@@ -41,6 +33,6 @@
     $lang->about_consultation = "咨詢功能是指除有管理權限的會員以外，其他會員只能瀏覽自己發表的主題。\n使用咨詢功能時系統將自動禁止非會員的發表主題權限。";
     $lang->about_secret = '可用於討論板或回覆時選擇是否使用。';
     $lang->about_admin_mail = '有新的主題或評論時，將自動發電子郵件來通知管理員。<br />多數電子郵件由逗號(,)區隔。';
-    $lang->about_category_color = '設定分類顏色。';
+    $lang->about_list_config = '可以放置想要的項目種類。<br />當所使用的面板支援此功能時才可會正常實現。<br />對目標項目/顯示項目中的物件案兩下可新增或移除。';
     $lang->msg_not_enough_point = '你的點數不夠在此討論板發表主題。';
 ?>
diff --git a/modules/board/skins/xe_board/comment.html b/modules/board/skins/xe_board/comment.html
index 5898b7d02..3efba95b6 100644
--- a/modules/board/skins/xe_board/comment.html
+++ b/modules/board/skins/xe_board/comment.html
@@ -22,7 +22,7 @@
             <div class="date">
 
                 <strong>{$comment->getRegdate('Y.m.d')}</strong> {$comment->getRegdate('H:i:s')}
-                <!--@if($grant->is_admin || $module_info->display_ip_address!='N')-->({$comment->getIpaddress()})<!--@end-->
+                <!--@if($grant->manager|| $module_info->display_ip_address!='N')-->({$comment->getIpaddress()})<!--@end-->
             </div>
 
             <div class="author">
@@ -48,7 +48,6 @@
 
             <div class="replyContent">
                 <!--@if(!$comment->isAccessible())-->
-                    <!--%import("filter/input_password.xml")-->
                     <div class="secretContent">
                         <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
                         <input type="hidden" name="mid" value="{$mid}" />
diff --git a/modules/board/skins/xe_board/comment_form.html b/modules/board/skins/xe_board/comment_form.html
index 4edf41f4e..6fb227b7f 100644
--- a/modules/board/skins/xe_board/comment_form.html
+++ b/modules/board/skins/xe_board/comment_form.html
@@ -7,7 +7,7 @@
         <div class="author"><div class="member_{$oSourceComment->getMemberSrl()}">{$oSourceComment->getNickName()}</div></div>
         <div class="date">
             {$oSourceComment->getRegdate("Y.m.d H:i")}
-            <!--@if($grant->is_admin)-->
+            <!--@if($grant->manager)-->
                 ({$oSourceComment->get('ipaddress')})
             <!--@end-->
         </div>
@@ -21,7 +21,6 @@
 <!--@end-->
 
 <!-- 글쓰기 폼 -->
-<!--%import("filter/insert_comment.xml")-->
 <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
diff --git a/modules/board/skins/xe_board/css/common.css b/modules/board/skins/xe_board/css/common.css
index f6d79e9ba..10431fc3c 100644
--- a/modules/board/skins/xe_board/css/common.css
+++ b/modules/board/skins/xe_board/css/common.css
@@ -56,7 +56,7 @@ Jeong, Chan Myeong 070601~070630
 
 .boardRead .titleAndUser .userInfo { float:right; white-space:nowrap; margin-top:11px; }
 .boardRead .titleAndUser .userInfo .author { color:#3074a5; }
-.boardRead .titleAndUser .userInfo .author a { font-size:.9em; color:#3074a5; text-decoration:none; }
+.boardRead .titleAndUser .userInfo .author a { color:#3074a5; text-decoration:none; }
 
 .boardRead .dateAndCount { clear:both; white-space:nowrap; color:#444444; margin:5px 0 0 0; font-size:.9em; font-family:tahoma; line-height:17px; padding-bottom:10px; }
 
@@ -112,7 +112,7 @@ Jeong, Chan Myeong 070601~070630
 .replyBox { padding:10px; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
 .replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
 .replyBox p { display:inline; margin-bottom:1em;}
-.replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
+.replyBox .author { float:left; padding:0 .3em 0 0; color:#3074a5; margin:0 .3em .5em 0;}
 .replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
 .replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;}
 .replyBox .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
@@ -147,6 +147,7 @@ Jeong, Chan Myeong 070601~070630
 .boardList tbody td { white-space:nowrap; }
 .boardList tbody td.title { white-space:normal; }
 .boardList tbody td.webzineTitle { white-space:normal; }
+.boardList tbody td.wrap { white-space:normal; }
 
 .boardListNoTopBorder { border:none; }
 .boardList th { color:#3e3f3e; font-weight:normal; border-top:1px solid #e0e1db; border-bottom:1px solid #ffffff; white-space:nowrap; padding-top:5px; height:28px; overflow:hidden;}
@@ -187,13 +188,13 @@ html:not([lang*=""]) .boardList th { height:33px; }
 .boardList td.topic strong a { font-size:1em; font-weight:normal; text-decoration:none; color:#222222; }
 .boardList td.topic strong a:visited { color:#777777; }
 .boardList td.topic .category { background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left 3px; padding-left:.5em; margin-left:.5em; color:#AAAAAA; }
-.boardList td.topic div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; }
-.boardList td.topic div.author strong { font-size:1.2em; font-weight:normal; color:#666666; }
+.boardList td.topic div.author { margin-top:.5em; color:#BBBBBB; }
+.boardList td.topic div.author strong { font-weight:normal; color:#666666; }
 .boardList td.commentCount { font:bold .8em Tahoma; color:#888888; text-align:center; }
 
 .boardList td.latestPost { color:#888888; }
-.boardList td.latestPost div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; }
-.boardList td.latestPost div.author strong { font-size:1.2em; font-weight:normal; color:#666666; }
+.boardList td.latestPost div.author { margin-top:.5em; color:#BBBBBB; }
+.boardList td.latestPost div.author strong { font-weight:normal; color:#666666; }
 .boardList td.latestPost div.date { font-size:0.8em; margin-top:.5em; }
 .boardList td.latestPost div.date strong { font-family:Tahoma; font-weight:normal; color:#666666; }
 
@@ -214,8 +215,8 @@ html:not([lang*=""]) .boardList th { height:33px; }
 .boardList td .replyAndTrackback img.trackback { margin-bottom:-.1em;}
 .boardList td .replyAndTrackback strong { font:bold 1em Tahoma;}
 .boardList td .replyAndTrackback { font:.8em Tahoma; }
-.boardList td.author { color:#333333; font-size:.95em; padding-left:1em;}
-.boardList td.author a { font-size:1em; color:#333333;}
+.boardList td.author { color:#333333; padding-left:1em;}
+.boardList td.author a { color:#333333;}
 .boardList td.reading { font:.8em Tahoma; color:#999999; text-align:center;}
 .boardList td.recommend { font:bold .8em Tahoma; text-align:center;}
 .boardList td.date { font:.8em Tahoma; color:#999999; text-align:center; white-space:nowrap;}
@@ -287,7 +288,7 @@ html:not([lang*=""]) .boardList th { height:33px; }
 .boardWrite .extraVarsList p { margin:5px 0 0 0; padding:0; }
 .boardWrite .extraVarsList ul { margin:0; padding:0; }
 
-.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; padding-bottom:10px; }
 .smallBox.w268 { width:268px;}
 .smallBox .header { margin:0; padding:0; position:relative; _width:100%; background:#ffffff url(../images/common/bgH3.gif) no-repeat left bottom; overflow:hidden;}
 .smallBox .header h3 { margin:0; padding:0; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
@@ -295,7 +296,7 @@ html:not([lang*=""]) .boardList th { height:33px; }
 .smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 2em;}
 .smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em; width:8em;}
 .smallBox .inputPassword legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
-.smallBox .messageBox { background-color:#F3F3F3; padding:20px; border-bottom:1px solid #EEEEEE;}
+.smallBox .messageBox { background-color:#F3F3F3; padding:10px; border-bottom:1px solid #EEEEEE;}
 
 /* Pagination Reset */
 .pagination{ padding:15px 0; margin:0; text-align:center;}
@@ -385,3 +386,15 @@ html:not([lang*=""]) .boardList th { height:33px; }
 .replyBox .xe_content { display:inline; }
 
 .display_date {  cursor:pointer; width:80px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px;  margin-right:10px;}
+
+/* 확장 변수 폼 */
+.extraVarsList tr td .text { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; }
+.extraVarsList tr td .email_address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .homepage { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .tel { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:40px; margin-right:10px;}
+.extraVarsList tr td .textarea { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; height:80px; font-size:12px;}
+.extraVarsList tr td ul { margin:0; padding:0; list-style:none; }
+.extraVarsList tr td ul li { display:inline-block; margin-right:10px; }
+.extraVarsList tr td ul li input { margin-right:5px; vertical-align:middle;}
+.extraVarsList tr td .date { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:100px; }
+.extraVarsList tr td .address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
diff --git a/modules/board/skins/xe_board/delete_comment_form.html b/modules/board/skins/xe_board/delete_comment_form.html
index 7946ba4dc..04c371f45 100644
--- a/modules/board/skins/xe_board/delete_comment_form.html
+++ b/modules/board/skins/xe_board/delete_comment_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_comment.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_board/delete_form.html b/modules/board/skins/xe_board/delete_form.html
index 0cd4ebe26..b2589a6a7 100644
--- a/modules/board/skins/xe_board/delete_form.html
+++ b/modules/board/skins/xe_board/delete_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_document.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_board/delete_trackback_form.html b/modules/board/skins/xe_board/delete_trackback_form.html
index 0cf4eabbd..1296fea22 100644
--- a/modules/board/skins/xe_board/delete_trackback_form.html
+++ b/modules/board/skins/xe_board/delete_trackback_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_trackback.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_board/extra_var_form.html b/modules/board/skins/xe_board/extra_var_form.html
deleted file mode 100644
index fb0befc23..000000000
--- a/modules/board/skins/xe_board/extra_var_form.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--// 이 파일은 extra_vars의 form을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-
-<!--// type=select,checkbox이고 기본값이 , 로 연결되어 있으면 배열로 만든다 -->
-<!--@if(in_array($val->type, array('select', 'checkbox')))-->
-    {@ $val->default = explode(',', $val->default) }
-<!--@end-->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oDocument->getExtraValue($key)}
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!-- Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="inputTypeText" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="inputTypeText" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="inputTypeText" />
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    <textarea name="{$val->column_name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if($val->default)-->
-        <ul>
-        <!--@foreach($val->default as $v)-->
-            <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if($v==$val->value||is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/> {$v}</li>
-        <!--@end-->
-        </ul>
-    <!--@end-->
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    <select name="{$val->column_name}">
-    <!--@if($val->default)-->
-        <!--@foreach($val->default as $v)-->
-            <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-        <!--@end-->
-    <!--@end-->
-    </select>
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-    <!--// datepicker javascript plugin load -->
-    <!--%load_js_plugin("ui.datepicker")-->
-
-    <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-    <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
-
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-</script>
-<!--@end-->
-
-<!--@if($val->desc)-->
-<p class="info">{$val->desc}</p>
-<!--@end-->
diff --git a/modules/board/skins/xe_board/extra_var_value.html b/modules/board/skins/xe_board/extra_var_value.html
deleted file mode 100644
index 78fff79df..000000000
--- a/modules/board/skins/xe_board/extra_var_value.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--// 이 파일은 extra_vars의 결과값을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oDocument->getExtraValue($key)}
-{@ $_tmp_value = array(); }
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')--> 
-    {htmlspecialchars($val->value)}
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <!--@if($val->value)-->
-        <a href="{htmlspecialchars($val->value)}" onclick="window.open(this.href);return false;">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <!--@if($val->value)-->
-        <a href="mailto:{htmlspecialchars($val->value)}">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    {htmlspecialchars($val->value[0])} 
-    <!--@if($val->value[1])-->-<!--@end-->
-    {htmlspecialchars($val->value[1])} 
-    <!--@if($val->value[2])-->-<!--@end-->
-    {htmlspecialchars($val->value[2])} 
-    &nbsp;
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    {nl2br(htmlspecialchars($val->value))}
-    &nbsp;
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if(!is_array($val->value))-->{@ $val->value = array($val->value) }<!--@end-->
-    <!--@foreach($val->value as $v)-->
-        {@ $_tmp_value[] = htmlspecialchars($v)}
-    <!--@end-->
-    {implode(",",$_tmp_value)}
-    &nbsp;
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    {htmlspecialchars($val->value)}
-    &nbsp;
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-    {zdate($val->value,"Y-m-d")}
-    &nbsp;
-<!--@end-->
-
-<!--@if(!$val->value)-->&nbsp;<!--@end-->
diff --git a/modules/board/skins/xe_board/header.html b/modules/board/skins/xe_board/header.html
index bac12966b..8be241362 100644
--- a/modules/board/skins/xe_board/header.html
+++ b/modules/board/skins/xe_board/header.html
@@ -1,6 +1,3 @@
-<!--// JS 파일 로드 -->
-    <!--%import("js/board.js")-->
-
 <!--// 컬러셋 체크 -->
     <!--@if(!$module_info->colorset)-->
         {@$module_info->colorset = "white"}
@@ -81,7 +78,7 @@
         <!--@if($is_logged)-->
 
             <!--// 관리자이면 설정 버튼 출력 -->
-            <!--@if($logged_info->is_admin=='Y' && $module_info->display_setup_button != 'N')-->
+            <!--@if($grant->manager && $module_info->display_setup_button != 'N')-->
             <li class="setup"><a href="{getUrl('act','dispBoardAdminBoardInfo')}">{$lang->cmd_setup}</a></li>
             <!--@end-->
 
diff --git a/modules/board/skins/xe_board/input_password_form.html b/modules/board/skins/xe_board/input_password_form.html
index 5781b8ead..6959973ff 100644
--- a/modules/board/skins/xe_board/input_password_form.html
+++ b/modules/board/skins/xe_board/input_password_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/input_password.xml")-->
 <!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w400">
diff --git a/modules/board/skins/xe_board/list.html b/modules/board/skins/xe_board/list.html
index fa5df0cf3..f27fac0d5 100644
--- a/modules/board/skins/xe_board/list.html
+++ b/modules/board/skins/xe_board/list.html
@@ -1,9 +1,6 @@
 <!--// header.html include -->
     <!--#include("header.html")-->
 
-<!--// 검색을 위한 xml filter import-->
-    <!--%import("filter/search.xml")-->
-
 <!--// 선택된 게시물이 있고 권한이 있으면 내용 출력 -->
     <!--@if($oDocument->isExists() && $module_info->default_style != 'blog')-->
     <div class="viewDocument">
@@ -28,8 +25,8 @@
 
     <!-- 글쓰기, 목록 버튼 -->
         <div class="leftButtonBox">
-            <!--@if($grant->is_admin)-->
-                <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button {$btn_class}"><span>{$lang->cmd_manage_document}</span></a>
+            <!--@if($grant->manager)-->
+                <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button {$btn_class}"><span>{$lang->cmd_manage_document}</span></a>
             <!--@end-->
             <!--@if($module_info->default_style != 'blog')-->
             <a href="{getUrl('','mid',$mid,'page',$page,'document_srl','','listStyle',$listStyle)}" class="button {$btn_class}"><span>{$lang->cmd_list}</span></a>
@@ -43,15 +40,15 @@
 
     <!-- 페이지 네비게이션 -->
         <div class="pagination a1">
-            <a href="{getUrl('page','','document_srl','','division',$division,'last_division',$last_division)}" class="prevEnd">{$lang->first_page}</a> 
+            <a href="{getUrl('page','','document_srl','','division',$division,'last_division',$last_division,'entry','')}" class="prevEnd">{$lang->first_page}</a> 
             <!--@while($page_no = $page_navigation->getNextPage())-->
                 <!--@if($page == $page_no)-->
                     <strong>{$page_no}</strong> 
                 <!--@else-->
-                    <a href="{getUrl('page',$page_no,'document_srl','','division',$division,'last_division',$last_division)}">{$page_no}</a>
+                    <a href="{getUrl('page',$page_no,'document_srl','','division',$division,'last_division',$last_division,'entry','')}">{$page_no}</a>
                 <!--@end-->
             <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','','division',$division,'last_division',$last_division)}" class="nextEnd">{$lang->last_page}</a>
+            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','','division',$division,'last_division',$last_division,'entry','')}" class="nextEnd">{$lang->last_page}</a>
         </div>
 
 
@@ -69,7 +66,7 @@
                 </select>
                 <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText"/>
                 <!--@if($last_division)-->
-                    <a href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="button {$btn_class}"><span>{$lang->cmd_search_next}</span></a>
+                    <a href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','','entry','')}" class="button {$btn_class}"><span>{$lang->cmd_search_next}</span></a>
                 <!--@end-->
                 <a href="#" onclick="xGetElementById('fo_search').submit();return false;" class="button {$btn_class}"><span>{$lang->cmd_search}</span></a>
                 <a href="{getUrl('','mid',$mid,'listStyle',$listStyle)}" class="button {$btn_class}"><span>{$lang->cmd_cancel}</span></a>
diff --git a/modules/board/skins/xe_board/skin.xml b/modules/board/skins/xe_board/skin.xml
index 8f59ff8fb..febcd17f4 100644
--- a/modules/board/skins/xe_board/skin.xml
+++ b/modules/board/skins/xe_board/skin.xml
@@ -409,7 +409,7 @@
             <title xml:lang="jp">IPアドレス表示</title>
             <title xml:lang="zh-CN">显示IP地址</title>
             <title xml:lang="es-CN">Display ip address</title>
-            <title xml:lang="zh-TW">顯示IP地址</title>
+            <title xml:lang="zh-TW">顯示IP位址</title>
             <options value="Y">
                 <title xml:lang="ko">출력</title>
                 <title xml:lang="en">display</title>
@@ -452,6 +452,36 @@
             </options>
             <description />
         </var>
+        <var name="display_sign" type="select">
+            <title xml:lang="ko">서명 표시</title>
+            <title xml:lang="jp">서명 표시</title>
+            <title xml:lang="zh-CN">显示签名</title>
+            <title xml:lang="en">서명 표시</title>
+            <title xml:lang="es">서명 표시</title>
+            <title xml:lang="zh-TW">顯示簽名檔</title>
+            <description xml:lang="ko">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="jp">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="zh-CN">可以设置主题发布者的个人签名及个性头像显示与否。</description>
+            <description xml:lang="en">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="es">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="zh-TW">可選擇是否在文章中顯示個人圖片和簽名檔。</description>
+            <options value="Y">
+                <title xml:lang="ko">출력</title>
+                <title xml:lang="en">display</title>
+                <title xml:lang="jp">表示</title>
+                <title xml:lang="zh-CN">显示</title>
+                <title xml:lang="es">display</title>
+                <title xml:lang="zh-TW">顯示</title>
+            </options>
+            <options value="N">
+                <title xml:lang="ko">출력하지 않음</title>
+                <title xml:lang="en">not display</title>
+                <title xml:lang="jp">非表示</title>
+                <title xml:lang="zh-CN">不显示</title>
+                <title xml:lang="es">not display</title>
+                <title xml:lang="zh-TW">隱藏</title>
+            </options>
+        </var>
         <var name="duration_new" type="text" default="24">
             <title xml:lang="ko">new표시 시간 (hours)</title>
             <title xml:lang="jp">Newの表示時間 (Hours)</title>
diff --git a/modules/board/skins/xe_board/style.forum.html b/modules/board/skins/xe_board/style.forum.html
index 4741e08fe..53ad4bb83 100644
--- a/modules/board/skins/xe_board/style.forum.html
+++ b/modules/board/skins/xe_board/style.forum.html
@@ -5,7 +5,7 @@
         <thead>
             {@ $no_line_class = " no_line" }
             <tr>
-                <!--@if($grant->is_admin)--> 
+                <!--@if($grant->manager)--> 
                 <th scope="col" class="checkbox{$no_line_class}"><div>
                     <input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" />
                 </div></th>
@@ -51,7 +51,7 @@
         <!--@if(!$document_list && !$notice_list)-->
             <!--// 게시물이 없으면 등록된 글이 없음을 표시 -->
             <tr class="bg0 tCenter">
-                <td colspan="<!--@if($grant->is_admin)-->5<!--@else-->4<!--@end-->" class="title">
+                <td colspan="<!--@if($grant->manager)-->5<!--@else-->4<!--@end-->" class="title">
                     {$lang->no_documents}
                 </td>
             </tr>
@@ -60,7 +60,7 @@
             <!--// 공지사항 출력 -->
             <!--@foreach($notice_list as $no => $document)-->
                 <tr class="notice">
-                    <!--@if($grant->is_admin)-->
+                    <!--@if($grant->manager)-->
                     <td class="checkbox">
                         <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> />
                     </td>
@@ -100,7 +100,7 @@
             <!--// 일반 글 출력 -->
             <!--@foreach($document_list as $no => $document)-->
                 <tr class="bg{($no+1)%2+1}">
-                    <!--@if($grant->is_admin)-->
+                    <!--@if($grant->manager)-->
                     <td class="checkbox">
                         <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> />
                     </td>
diff --git a/modules/board/skins/xe_board/style.gallery.html b/modules/board/skins/xe_board/style.gallery.html
index 85c3a1745..65200d4b4 100644
--- a/modules/board/skins/xe_board/style.gallery.html
+++ b/modules/board/skins/xe_board/style.gallery.html
@@ -6,7 +6,7 @@
     <div class="boardSubMenu">
         <!--@if($module_info->use_category == "Y")-->
         <div class="fl">
-            <!--@if($grant->is_admin)--><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /><!--@end-->
+            <!--@if($grant->manager)--><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /><!--@end-->
         <!--// 카테고리 사용시 카테고리 선택 표시 -->
                 <select name="category" id="board_category">
                     <option value="">{$lang->category}</option>
@@ -45,7 +45,7 @@
             <!--@foreach($notice_list as $no => $document)-->
                 <table cellspacing="0" summary="" class="boardList boardListNoTopBorder">
                 <!--@if($module_info->display_number!='N')--><col width="80" />{@ $_col_count++}<!--@end-->
-                <!--@if($grant->is_admin)--><col width="30" />{@ $_col_count++}<!--@end-->
+                <!--@if($grant->manager)--><col width="30" />{@ $_col_count++}<!--@end-->
                 <col />
                 <!--@if($module_info->display_author!='N')--><col width="120" />{@ $_col_count++}<!--@end-->
                 <!--@if($module_info->display_readed_count!='N')--><col width="70" />{@ $_col_count++}<!--@end-->
@@ -55,7 +55,7 @@
                 <tbody>
                     <tr class="notice">
                         <!--@if($module_info->display_number!='N')--><td class="notice">{$lang->notice}</td><!--@end-->
-                        <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                        <!--@if($grant->manager)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
                         <td class="title">
                             <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                             <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
@@ -106,7 +106,7 @@
                         <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong><br />
                         <!--@end-->
 
-                        <!--@if($grant->is_admin)-->
+                        <!--@if($grant->manager)-->
                             <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
                         <!--@end-->
 
diff --git a/modules/board/skins/xe_board/style.list.html b/modules/board/skins/xe_board/style.list.html
index 0c303672c..b6f0a4e84 100644
--- a/modules/board/skins/xe_board/style.list.html
+++ b/modules/board/skins/xe_board/style.list.html
@@ -1,25 +1,32 @@
 <!-- 목록 출력 -->
-    {@ $_col_count = 1; }
-    <!--@if($module_info->display_number!='N')-->{@ $_col_count++}<!--@end-->
-    <!--@if($grant->is_admin)-->{@ $_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 == 'Y')-->{@ $_col_count++}<!--@end-->
-    <form action="./" method="get">
+<form action="./" method="get">
+    <table cellspacing="0" summary="" class="boardList">
+    <thead>
+    <tr>
+        <!--// 관리자일 경우 게시글 선택 checkbox 표시 -->
+        <!--@if($grant->manager)-->
+            <th scope="col" class="no_line"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>
+        <!--@end-->
 
-        <table cellspacing="0" summary="" class="boardList">
-        <!--@if($_col_count>1)-->
-        <thead>
-            {@ $no_line_class = " no_line" }
-            <tr>
-                <!--@if($module_info->display_number!='N')--><th scope="col" class="num{$no_line_class}"><div>{$lang->no}</div></th>{@ $no_line_class=""}<!--@end-->
+    <!--// 목록 설정으로 table theader 생성 -->
+    {@ $_line_idx = 0;}
+    <!--@foreach($list_config as $key => $val)-->
+        <!--// 디자인 요소를 위한 내부 변수 설정(첫번째 th의 no_line 클래스 부여) -->
+        <!--@if(!$grant->manager && $_line_idx==0)-->
+            {@$_lc = 'class="no_line"';$_l = "no_line"}
+        <!--@else-->
+            {@$_lc = $_l = ""}
+        <!--@end-->
 
-                <!--@if($grant->is_admin)--><th scope="col" class="checkbox{$no_line_class}"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
+        <!--// 기본 컨텐츠일 경우 -->
+        <!--@if($val->idx == -1)-->
 
-                <th scope="col" class="<!--@if($module_info->use_category == 'Y')-->category<!--@else-->title<!--@end-->{$no_line_class}"><div>
-                    
+            <!--// 컨텐츠 종류에 따라서 출력 -->
+            <!--@if($val->type == 'no')-->
+                <th scope="col" {$_lc}><div>{$lang->no}</div></th>
+            <!--@elseif($val->type == 'title')-->
+                <th scope="col" class="<!--@if($module_info->use_category == 'Y')-->category<!--@else-->title<!--@end--> {$_l}">
+                    <div>
                     <!--@if($module_info->use_category == "Y")-->
                     <!--// 카테고리 사용시 카테고리 선택 표시 -->
                             <select name="category" id="board_category">
@@ -32,93 +39,168 @@
                     <!--@else-->
                     {$lang->title}
                     <!--@end-->
-                </div></th>
+                    </div>
+                </th>
+            <!--@elseif($val->type == 'regdate')-->
+                <th scope="col" class="date {$_l}"><div><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></div></th>
+            <!--@elseif($val->type == 'last_update')-->
+                <th scope="col" class="date {$_l}"><div><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></div></th>
+            <!--@elseif($val->type == 'nick_name')-->
+                <th class="author" scope="col" {$_lc}><div>{$lang->writer}</div></th>
+            <!--@elseif($val->type == 'user_id')-->
+                <th class="author" scope="col" {$_lc}><div>{$lang->user_id}</div></th>
+            <!--@elseif($val->type == 'user_name')-->
+                <th class="author" scope="col" {$_lc}><div>{$lang->user_name}</div></th>
+            <!--@elseif($val->type == 'readed_count')-->
+                <th class="reading" scope="col" {$_lc}><div><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></div></th>
+            <!--@elseif($val->type == 'voted_count')-->
+                <th class="recommend" scope="col" {$_lc}><div><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></div></th>
+            <!--@end-->
 
-                <!--@if($module_info->display_author!='N')--><th class="author" scope="col"><div>{$lang->writer}</div></th><!--@end-->
-
-                <!--@if($module_info->display_readed_count!='N')--><th class="reading" scope="col"><div><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></div></th><!--@end-->
-
-                <!--@if($module_info->display_voted_count!='N')--><th class="recommend" scope="col"><div><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></div></th><!--@end-->
-
-                <!--@if($module_info->display_regdate != 'N')--><th scope="col" class="date"><div><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></div></th><!--@end-->
-
-                <!--@if($module_info->display_last_update=='Y')--><th scope="col" class="date"><div><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></div></th><!--@end-->
-            </tr>
-        </thead>
-        <!--@end-->
-
-        <tbody>
-
-        <!--@if(!$document_list && !$notice_list)-->
-            <!--// 게시물이 없으면 등록된 글이 없음을 표시 -->
-            <tr class="bg0 tCenter">
-                <td colspan="{$_col_count}" class="title">
-                    {$lang->no_documents}
-                </td>
-            </tr>
+        <!--// 사용자 선언 확장변수일 경우 -->
         <!--@else-->
-            <!--// 공지사항 출력 -->
-            <!--@foreach($notice_list as $no => $document)-->
-                <tr class="notice">
-                    <!--@if($module_info->display_number!='N')--><td class="notice"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" border="0" alt="" /><!--@else-->{$lang->notice}<!--@end--></td><!--@end-->
-                    <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
-                    <td class="title">
-                        <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
-                        <strong class="category" <!--@if($category_list[$document->get('category_srl')]->color)-->style="color:{$category_list[$document->get('category_srl')]->color};"<!--@end-->>{$category_list[$document->get('category_srl')]->title}</strong>
-                        <!--@end-->
-
-                        <a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
-                        
-                        <!--@if($document->getCommentCount())-->
-                            <span class="replyAndTrackback" title="Replies"><img src="./images/{$module_info->colorset}/iconReply.gif" alt="" width="12" height="12" class="icon" /> <strong>{$document->getCommentCount()}</strong></span>
-                        <!--@end-->
-
-                        <!--@if($document->getTrackbackCount())-->
-                            <span class="replyAndTrackback" title="Trackbacks"><img src="./images/{$module_info->colorset}/iconTrackback.gif" alt="" width="12" height="13" class="trackback icon" /> <strong>{$document->getTrackbackCount()}</strong></span>
-                        <!--@end-->
-
-                        {$document->printExtraImages(60*60*$module_info->duration_new)}
-                    </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>
-            <!--@end-->
-
-            <!--// 일반 글 출력 -->
-            <!--@foreach($document_list as $no => $document)-->
-                <tr class="bg{($no+1)%2+1}">
-                    <!--@if($module_info->display_number!='N')--><td class="num"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" border="0" alt="" /><!--@else-->{$no}<!--@end--></td><!--@end-->
-                    <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
-                    <td class="title">
-                        <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
-                        <strong class="category" <!--@if($category_list[$document->get('category_srl')]->color)-->style="color:{$category_list[$document->get('category_srl')]->color};"<!--@end-->>{$category_list[$document->get('category_srl')]->title}</strong>
-                        <!--@end-->
-
-                        <a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
-                        
-                        <!--@if($document->getCommentCount())-->
-                            <span class="replyAndTrackback" title="Replies"><img src="./images/{$module_info->colorset}/iconReply.gif" alt="" width="12" height="12" class="icon" /> <strong>{$document->getCommentCount()}</strong></span>
-                        <!--@end-->
-
-                        <!--@if($document->getTrackbackCount())-->
-                            <span class="replyAndTrackback" title="Trackbacks"><img src="./images/{$module_info->colorset}/iconTrackback.gif" alt="" width="12" height="13" class="trackback icon" /> <strong>{$document->getTrackbackCount()}</strong></span>
-                        <!--@end-->
-
-                        {$document->printExtraImages(60*60*$module_info->duration_new)}
-                    </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>
-            <!--@end-->
+                <th scope="col" {$_lc}><div>{$val->name}</div></th>
         <!--@end-->
 
-        </tbody>
-        </table>
-    </form>
+        {@ $_line_idx++;}
+    <!--@end-->
+    </tr>
+    </thead>
+    <tbody>
 
+    <!--// 게시물이 없으면 등록된 글이 없음을 표시 -->
+    <!--@if(!$document_list && !$notice_list)-->
+    <tr class="bg0 tCenter">
+        <td colspan="<!--@if($grant->manager)-->{count($list_config)+1}<!--@else-->{count($list_config)}<!--@end-->" class="title">
+            {$lang->no_documents}
+        </td>
+    </tr>
+    <!--@else-->
+
+        <!--// 공지사항 출력 -->
+        <!--@foreach($notice_list as $no => $document)-->
+        <tr class="notice">
+
+            <!--// 관리자일 경우 게시글 선택 checkbox 표시 -->
+            <!--@if($grant->manager)-->
+                <td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td>
+            <!--@end-->
+
+            <!--// 목록 설정으로 table theader 생성 -->
+            <!--@foreach($list_config as $key => $val)-->
+
+                <!--// 기본 컨텐츠일 경우 -->
+                <!--@if($val->idx == -1)-->
+
+                    <!--// 컨텐츠 종류에 따라서 출력 -->
+                    <!--@if($val->type == 'no')-->
+                        <td class="notice"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" border="0" alt="" /><!--@else-->{$lang->notice}<!--@end--></td>
+                    <!--@elseif($val->type == 'title')-->
+                        <td class="title">
+                            <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
+                            <strong class="category" <!--@if($category_list[$document->get('category_srl')]->color)-->style="color:{$category_list[$document->get('category_srl')]->color};"<!--@end-->>{$category_list[$document->get('category_srl')]->title}</strong>
+                            <!--@end-->
+
+                            <a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
+                            
+                            <!--@if($document->getCommentCount())-->
+                                <span class="replyAndTrackback" title="Replies"><img src="./images/{$module_info->colorset}/iconReply.gif" alt="" width="12" height="12" class="icon" /> <strong>{$document->getCommentCount()}</strong></span>
+                            <!--@end-->
+
+                            <!--@if($document->getTrackbackCount())-->
+                                <span class="replyAndTrackback" title="Trackbacks"><img src="./images/{$module_info->colorset}/iconTrackback.gif" alt="" width="12" height="13" class="trackback icon" /> <strong>{$document->getTrackbackCount()}</strong></span>
+                            <!--@end-->
+
+                            {$document->printExtraImages(60*60*$module_info->duration_new)}
+                        </td>
+                    <!--@elseif($val->type == 'regdate')-->
+                        <td class="date">{$document->getRegdate('Y-m-d')}</td>
+                    <!--@elseif($val->type == 'last_update')-->
+                        <td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td>
+                    <!--@elseif($val->type == 'nick_name')-->
+                        <td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td>
+                    <!--@elseif($val->type == 'user_id')-->
+                        <td class="author">{$document->getUserID()}</td>
+                    <!--@elseif($val->type == 'user_name')-->
+                        <td class="author">{$document->getUserName()}</td>
+                    <!--@elseif($val->type == 'readed_count')-->
+                        <td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td>
+                    <!--@elseif($val->type == 'voted_count')-->
+                        <td class="recommend">{$document->get('voted_count')!=0?$document->get('voted_count'):'&nbsp;'}</td>
+                    <!--@end-->
+
+                <!--// 사용자 선언 확장변수일 경우 -->
+                <!--@else-->
+                        <td>{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+                <!--@end-->
+
+            <!--@end-->
+        </tr>
+        <!--@end-->
+
+        <!--// 일반 글 출력 -->
+        <!--@foreach($document_list as $no => $document)-->
+        <tr class="bg{($no+1)%2+1}">
+        
+            <!--// 관리자일 경우 게시글 선택 checkbox 표시 -->
+            <!--@if($grant->manager)-->
+                <td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td>
+            <!--@end-->
+
+            <!--// 목록 설정으로 table theader 생성 -->
+            <!--@foreach($list_config as $key => $val)-->
+
+                <!--// 기본 컨텐츠일 경우 -->
+                <!--@if($val->idx == -1)-->
+
+                    <!--// 컨텐츠 종류에 따라서 출력 -->
+                    <!--@if($val->type == 'no')-->
+                        <td class="num"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" border="0" alt="" /><!--@else-->{$no}<!--@end--></td>
+                    <!--@elseif($val->type == 'title')-->
+                        <td class="title">
+                            <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
+                            <strong class="category" <!--@if($category_list[$document->get('category_srl')]->color)-->style="color:{$category_list[$document->get('category_srl')]->color};"<!--@end-->>{$category_list[$document->get('category_srl')]->title}</strong>
+                            <!--@end-->
+
+                            <a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
+                            
+                            <!--@if($document->getCommentCount())-->
+                                <span class="replyAndTrackback" title="Replies"><img src="./images/{$module_info->colorset}/iconReply.gif" alt="" width="12" height="12" class="icon" /> <strong>{$document->getCommentCount()}</strong></span>
+                            <!--@end-->
+
+                            <!--@if($document->getTrackbackCount())-->
+                                <span class="replyAndTrackback" title="Trackbacks"><img src="./images/{$module_info->colorset}/iconTrackback.gif" alt="" width="12" height="13" class="trackback icon" /> <strong>{$document->getTrackbackCount()}</strong></span>
+                            <!--@end-->
+
+                            {$document->printExtraImages(60*60*$module_info->duration_new)}
+                        </td>
+                    <!--@elseif($val->type == 'regdate')-->
+                        <td class="date">{$document->getRegdate('Y-m-d')}</td>
+                    <!--@elseif($val->type == 'last_update')-->
+                        <td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td>
+                    <!--@elseif($val->type == 'nick_name')-->
+                        <td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td>
+                    <!--@elseif($val->type == 'user_id')-->
+                        <td class="author">{$document->getUserID()}</td>
+                    <!--@elseif($val->type == 'user_name')-->
+                        <td class="author">{$document->getUserName()}</td>
+                    <!--@elseif($val->type == 'readed_count')-->
+                        <td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td>
+                    <!--@elseif($val->type == 'voted_count')-->
+                        <td class="recommend">{$document->get('voted_count')!=0?$document->get('voted_count'):'&nbsp;'}</td>
+                    <!--@end-->
+
+                <!--// 사용자 선언 확장변수일 경우 -->
+                <!--@else-->
+                        <td>{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+                <!--@end-->
+
+            <!--@end-->
+        <!--@end-->
+        </tr>
+
+    <!--@end-->
+
+    </tbody>
+    </table>
+</form>
diff --git a/modules/board/skins/xe_board/style.webzine.html b/modules/board/skins/xe_board/style.webzine.html
index 2c3620396..2f16cb991 100644
--- a/modules/board/skins/xe_board/style.webzine.html
+++ b/modules/board/skins/xe_board/style.webzine.html
@@ -2,7 +2,7 @@
     <form action="./" method="get">
     {@ $_col_count = 2; }
     <!--@if($module_info->display_number!='N')-->{@ $_col_count++ }<!--@end-->
-    <!--@if($grant->is_admin)-->{@ $_col_count++}<!--@end-->
+    <!--@if($grant->manager)-->{@ $_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-->
@@ -16,7 +16,7 @@
             <tr>
                 <!--@if($module_info->display_number!='N')--><th scope="col" class="num{$no_line_class}"><div>{$lang->no}</div></th>{@ $no_line_class=""}<!--@end-->
 
-                <!--@if($grant->is_admin)--><th scope="col" class="checkbox{$no_line_class}"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
+                <!--@if($grant->manager)--><th scope="col" class="checkbox{$no_line_class}"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
 
                 <th scope="col" colspan="2" class="<!--@if($module_info->use_category=='Y')-->category<!--@else-->title<!--@end-->{$no_line_class}"><div>
 
@@ -59,7 +59,7 @@
             <!--@foreach($notice_list as $no => $document)-->
                 <tr class="notice">
                     <!--@if($module_info->display_number!='N')--><td class="notice">{$lang->notice}</td><!--@end-->
-                    <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                    <!--@if($grant->manager)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
                     <td class="title" colspan="2">
                         <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                         <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
@@ -91,7 +91,7 @@
 
                     <!--@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($grant->is_admin)--><td class="checkbox" rowspan="2"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                    <!--@if($grant->manager)--><td class="checkbox" rowspan="2"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@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,'listStyle',$listStyle, 'cpage','')}"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" /></a></td>
diff --git a/modules/board/skins/xe_board/view_document.html b/modules/board/skins/xe_board/view_document.html
index 8bb18a59a..8795d9c77 100644
--- a/modules/board/skins/xe_board/view_document.html
+++ b/modules/board/skins/xe_board/view_document.html
@@ -32,7 +32,7 @@
                 <div class="uri" title="{$lang->document_url}"><a href="{$oDocument->getPermanentUrl()}">{$oDocument->getPermanentUrl()}</a></div>
 
                 <div class="date" title="{$lang->regdate}">
-                    <strong>{$oDocument->getRegdate('Y.m.d')}</strong> {$oDocument->getRegdate('H:i:s')} <!--@if($grant->is_admin || $module_info->display_ip_address!='N')-->({$oDocument->getIpaddress()})<!--@end-->
+                    <strong>{$oDocument->getRegdate('Y.m.d')}</strong> {$oDocument->getRegdate('H:i:s')} <!--@if($grant->manager || $module_info->display_ip_address!='N')-->({$oDocument->getIpaddress()})<!--@end-->
                 </div>
 
                 <div class="readedCount" title="{$lang->readed_count}">{$oDocument->get('readed_count')}</div>
@@ -63,21 +63,15 @@
         </div>
 
         <div class="clear"></div>
-
         <!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
         <table cellspacing="0" summary="" class="extraVarsList">
         <col width="150" />
         <col />
-        <!--@foreach($module_info->extra_vars as $key => $val)-->
-            <!--@if($val->name)-->
+        <!--@foreach($oDocument->getExtraVars() as $key => $val)-->
         <tr>
-            <th scope="row">{$val->name}</th>
-            <td>
-                <!--// 확장변수(extra_var)의 type에 따른 값을 출력하기 위해서 특별히 제작된 파일을 include 한다 -->
-                <!--#include("./extra_var_value.html")-->
-            </td>
+            <th>{$val->name}</th>
+            <td>{$val->getValueHTML()}</td>
         </tr>
-            <!--@end-->
         <!--@end-->
         </table>
         <!--@end-->
@@ -86,7 +80,6 @@
             <div class="contentBody">
 
                 <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
-                    <!--%import("filter/input_password.xml")-->
                     <div class="secretContent">
                         <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
                         <input type="hidden" name="mid" value="{$mid}" />
@@ -103,7 +96,7 @@
                 <!--@end-->
 
                 <!-- 서명 / 프로필 이미지 출력 -->
-                <!--@if($oDocument->getProfileImage() || $oDocument->getSignature())-->
+                <!--@if($module_info->display_sign != 'N' && ($oDocument->getProfileImage() || $oDocument->getSignature()))-->
                     <div class="memberSignature">
                     <!--@if($oDocument->getProfileImage())-->
                         <div class="profile"><img src="{$oDocument->getProfileImage()}" alt="profile" /></div>
@@ -166,7 +159,6 @@
 
 <!-- 댓글 입력 폼 -->
 <!--@if($grant->write_comment && $oDocument->isEnableComment() )-->
-    <!--%import("filter/insert_comment.xml")-->
     <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
@@ -190,10 +182,10 @@
                 <input type="checkbox" name="notify_message" value="Y" id="notify_message" />
                 <label for="notify_message">{$lang->notify}</label>
                 <!--@end-->
-
+                <!--@if($module_info->secret=="Y")-->
                 <input type="checkbox" name="is_secret" value="Y" id="is_secret" />
                 <label for="is_secret">{$lang->secret}</label>
-
+                <!--@end-->
             </div>
 
             <div class="editor">{$oDocument->getCommentEditor()}</div>
diff --git a/modules/board/skins/xe_board/write_form.html b/modules/board/skins/xe_board/write_form.html
index cee49c1e6..c4f0d3968 100644
--- a/modules/board/skins/xe_board/write_form.html
+++ b/modules/board/skins/xe_board/write_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/insert.xml")-->
 <!--#include("header.html")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert)" id="fo_write">
@@ -83,17 +82,15 @@
         <!--@end-->
     </dl>
 
-    <!--@if($module_info->extra_vars)-->
+    <!--@if(count($extra_keys))-->
     <table cellspacing="0" summary="" class="extraVarsList">
     <col width="150" />
     <col />
-    <!--@foreach($module_info->extra_vars as $key => $val)-->
-        <!--@if($val->name)-->
+    <!--@foreach($extra_keys as $key => $val)-->
     <tr>
         <th scope="row">{$val->name} <!--@if($val->is_required=='Y')-->*<!--@end--></th>
-        <td><!--#include("./extra_var_form.html")--></td>
+        <td>{$val->getFormHTML()}</td>
     </tr>
-        <!--@endif-->
     <!--@endforeach-->
     </table>
     <!--@endif-->
diff --git a/modules/board/skins/xe_default/_extra_var_form.html b/modules/board/skins/xe_default/_extra_var_form.html
deleted file mode 100644
index e054d216c..000000000
--- a/modules/board/skins/xe_default/_extra_var_form.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!--@if(in_array($val->type, array('select', 'checkbox')))-->
-    {@ $val->default = explode(',', $val->default) }
-<!--@end-->
-
-{@ $val->column_name = "extra_vars".$key}
-
-{@ $val->value = $oDocument->getExtraValue($key)}
-
-<!--@if($val->type == 'text')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputText" />
-
-<!--@elseif($val->type == 'homepage')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputText" />
-
-<!--@elseif($val->type == 'email_address')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputText" />
-
-<!--@elseif($val->type == 'tel')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="inputNum" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="inputNum" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="inputNum" />
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    <textarea name="{$val->column_name}" rows="5" cols="20">{htmlspecialchars($val->value)}</textarea>
-
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if($val->default)-->
-        <ul>
-        <!--@foreach($val->default as $v)-->
-            <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if($v==$val->value||is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end--> class="inputCheck" /> {$v}</li>
-        <!--@end-->
-        </ul>
-    <!--@end-->
-
-<!--@elseif($val->type == 'select')-->
-    <select name="{$val->column_name}">
-    <!--@if($val->default)-->
-        <!--@foreach($val->default as $v)-->
-            <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-        <!--@end-->
-    <!--@end-->
-    </select>
-
-<!--@elseif($val->type == 'date')-->
-    <!--// datepicker javascript plugin load -->
-    <!--%load_js_plugin("ui.datepicker")-->
-
-    <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-    <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
-
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-</script>
-<!--@end-->
-
-<!--@if($val->desc)-->
-<p class="info">{$val->desc}</p>
-<!--@end-->
diff --git a/modules/board/skins/xe_default/_extra_var_value.html b/modules/board/skins/xe_default/_extra_var_value.html
deleted file mode 100644
index 3a6ad6b3a..000000000
--- a/modules/board/skins/xe_default/_extra_var_value.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{@ $val->column_name = "extra_vars".$key}
-
-{@ $val->value = $oDocument->getExtraValue($key)}
-{@ $_tmp_value = array(); }
-
-<!--@if($val->type == 'text')--> 
-    {htmlspecialchars($val->value)}
-
-<!--@elseif($val->type == 'homepage')-->
-    <!--@if($val->value)-->
-        <a href="{htmlspecialchars($val->value)}" onclick="window.open(this.href);return false;">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--@elseif($val->type == 'email_address')-->
-    <!--@if($val->value)-->
-        <a href="mailto:{htmlspecialchars($val->value)}">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--@elseif($val->type == 'tel')-->
-    {htmlspecialchars($val->value[0])} 
-    <!--@if($val->value[1])-->-<!--@end-->
-    {htmlspecialchars($val->value[1])} 
-    <!--@if($val->value[2])-->-<!--@end-->
-    {htmlspecialchars($val->value[2])} 
-    &nbsp;
-
-<!--@elseif($val->type == 'textarea')-->
-    {nl2br(htmlspecialchars($val->value))}
-    &nbsp;
-
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if(!is_array($val->value))-->{@ $val->value = array($val->value) }<!--@end-->
-    <!--@foreach($val->value as $v)-->
-        {@ $_tmp_value[] = htmlspecialchars($v)}
-    <!--@end-->
-    {implode(",",$_tmp_value)}
-    &nbsp;
-
-<!--@elseif($val->type == 'select')-->
-    {htmlspecialchars($val->value)}
-    &nbsp;
-
-<!--@elseif($val->type == 'date')-->
-    {zdate($val->value,"Y-m-d")}
-    &nbsp;
-<!--@end-->
-
-<!--@if(!$val->value)-->&nbsp;<!--@end-->
diff --git a/modules/board/skins/xe_default/_header.html b/modules/board/skins/xe_default/_header.html
index 2093318ec..35db7ad3a 100644
--- a/modules/board/skins/xe_default/_header.html
+++ b/modules/board/skins/xe_default/_header.html
@@ -1,5 +1,3 @@
-<!--%import("js/board.js")-->
-
 <!--@if(!$module_info->colorset)-->
     {@$module_info->colorset = "white"}
 <!--@end-->
@@ -64,7 +62,7 @@
 		<div class="infoRight">
 			<ul>
 			<!--@if($is_logged)-->
-				<!--@if($logged_info->is_admin=='Y' && $module_info->display_setup_button != 'N')-->
+				<!--@if($grant->manager && $module_info->display_setup_button != 'N')-->
 				<li class="setup"><a href="{getUrl('act','dispBoardAdminBoardInfo')}">{$lang->cmd_setup}</a></li>
 				<!--@end-->
 				<!--@if($module_info->display_login_info != 'N')-->
diff --git a/modules/board/skins/xe_default/_style.forum.html b/modules/board/skins/xe_default/_style.forum.html
index 6213b74e9..3297c9367 100644
--- a/modules/board/skins/xe_default/_style.forum.html
+++ b/modules/board/skins/xe_default/_style.forum.html
@@ -5,7 +5,7 @@
 		<thead>
 			{@ $no_line_class = " no_line" }
 			<tr>
-				<!--@if($grant->is_admin)--> 
+				<!--@if($grant->manager)--> 
 				<th scope="col">
 					<input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" />
 				</th>
@@ -37,7 +37,7 @@
 	
         <!--@if(!$document_list && !$notice_list)-->
             <tr>
-                <td colspan="<!--@if($grant->is_admin)-->5<!--@else-->4<!--@end-->">
+                <td colspan="<!--@if($grant->manager)-->5<!--@else-->4<!--@end-->">
                     {$lang->no_documents}
                 </td>
             </tr>
@@ -45,7 +45,7 @@
 
 		<!--@foreach($notice_list as $no => $document)-->
 			<tr class="notice">
-				<!--@if($grant->is_admin)-->
+				<!--@if($grant->manager)-->
 				<td class="check">
 					<input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> />
 				</td>
@@ -82,7 +82,7 @@
 
 		<!--@foreach($document_list as $no => $document)-->
 			<tr class="bg{($no+1)%2+1}">
-				<!--@if($grant->is_admin)-->
+				<!--@if($grant->manager)-->
 				<td class="check">
 					<input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> />
 				</td>
diff --git a/modules/board/skins/xe_default/_style.gallery.html b/modules/board/skins/xe_default/_style.gallery.html
index 64e89d547..ba7ed4972 100644
--- a/modules/board/skins/xe_default/_style.gallery.html
+++ b/modules/board/skins/xe_default/_style.gallery.html
@@ -4,7 +4,7 @@
 
             <div class="thumbHeader">
                 <div class="left">
-                    <!--@if($grant->is_admin)--><span><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></span>{@ $no_line_class=""}<!--@end-->
+                    <!--@if($grant->manager)--><span><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></span>{@ $no_line_class=""}<!--@end-->
 
                     <!--@if($module_info->use_category == "Y")-->
                     <span class="jumpTo">
@@ -42,7 +42,7 @@
             <tbody>
                 <tr class="notice">
                 <!--@if($module_info->display_number!='N')--><td class="notice">{$lang->notice}</td><!--@end-->
-                <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                <!--@if($grant->manager)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
                 <td class="title">
                     <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                     <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
@@ -102,7 +102,7 @@
                     </div>
 
                     <div class="title">
-                        <!--@if($grant->is_admin)-->
+                        <!--@if($grant->manager)-->
                             <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
                         <!--@end-->
 
diff --git a/modules/board/skins/xe_default/_style.list.html b/modules/board/skins/xe_default/_style.list.html
index 101b15cce..b9abb2f11 100644
--- a/modules/board/skins/xe_default/_style.list.html
+++ b/modules/board/skins/xe_default/_style.list.html
@@ -2,118 +2,178 @@
     <fieldset>
         <legend>List of Articles</legend>
 
-        {@ $_col_count = 1; }
-        <!--@if($module_info->display_number!='N')-->{@ $_col_count++}<!--@end-->
-        <!--@if($grant->is_admin)-->{@ $_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 == 'Y')-->{@ $_col_count++}<!--@end-->
-
         <table cellspacing="0" border="1" summary="List of Articles" class="boardList">
-        <!--@if($_col_count>1)-->
         <thead>
-            {@ $no_line_class = " no_line" }
             <tr>
-                <!--@if($module_info->display_number!='N')--><th scope="col">{$lang->no}</th>{@ $no_line_class=""}<!--@end-->
+                <!--@if($grant->manager)--><th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th><!--@end-->
 
-                <!--@if($grant->is_admin)--><th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
+                <!--// 목록 설정으로 table theader 생성 -->
+                <!--@foreach($list_config as $key => $val)-->
+                    <!--// 기본 컨텐츠일 경우 -->
+                    <!--@if($val->idx == -1)-->
 
-                <th scope="col" class="title">
-                    <!--@if($module_info->use_category == "Y")-->
-                    <span class="jumpTo">
-                        <select name="category" id="board_category">
-                            <option value="">{$lang->category}</option>
-                            <!--@foreach($category_list as $val)-->
-                            <option value="{$val->category_srl}" <!--@if($category==$val->category_srl)-->selected="selected"<!--@end-->>{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} <!--@if($val->document_count)-->({$val->document_count})<!--@end--></option>
-                            <!--@end-->
-                        </select>
-                        <button type="button" name="go_button" id="go_button" onclick="doChangeCategory(); return false;" class="button">Go</button>
-                    </span>
+                        <!--// 컨텐츠 종류에 따라서 출력 -->
+                        <!--@if($val->type == 'no')-->
+                            <th scope="col">{$lang->no}</th>
+                        <!--@elseif($val->type == 'title')-->
+                            <th scope="col" class="title">
+                                <!--@if($module_info->use_category == "Y")-->
+                                <span class="jumpTo">
+                                    <select name="category" id="board_category">
+                                        <option value="">{$lang->category}</option>
+                                        <!--@foreach($category_list as $val)-->
+                                        <option value="{$val->category_srl}" <!--@if($category==$val->category_srl)-->selected="selected"<!--@end-->>{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} <!--@if($val->document_count)-->({$val->document_count})<!--@end--></option>
+                                        <!--@end-->
+                                    </select>
+                                    <button type="button" name="go_button" id="go_button" onclick="doChangeCategory(); return false;" class="button">Go</button>
+                                </span>
+                                <!--@end-->
+                                {$lang->title}
+                            </th>
+                        <!--@elseif($val->type == 'regdate')-->
+                            <th scope="col"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="sort" width="5" height="3" class="sort" /><!--@end--></a></th>
+                        <!--@elseif($val->type == 'last_update')-->
+                            <th scope="col"><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="sort" width="5" height="3" class="sort" /><!--@end--></a></th>
+                        <!--@elseif($val->type == 'nick_name')-->
+                            <th scope="col">{$lang->writer}</th>
+                        <!--@elseif($val->type == 'user_id')-->
+                            <th scope="col">{$lang->user_id}</th>
+                        <!--@elseif($val->type == 'user_name')-->
+                            <th scope="col">{$lang->user_name}</th>
+                        <!--@elseif($val->type == 'readed_count')-->
+                            <th 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="sort" width="5" height="3" class="sort" /><!--@end--></a></th>
+                        <!--@elseif($val->type == 'voted_count')-->
+                            <th 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="sort" width="5" height="3" class="sort" /><!--@end--></a></th>
+                        <!--@end-->
+                    <!--// 사용자 선언 확장변수일 경우 -->
+                    <!--@else-->
+                            <th scope="col"><div>{$val->name}</div></th>
                     <!--@end-->
-                    {$lang->title}
-                </th>
-
-                <!--@if($module_info->display_author!='N')--><th scope="col">{$lang->writer}</th><!--@end-->
-                <!--@if($module_info->display_readed_count!='N')--><th 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="sort" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
-                <!--@if($module_info->display_voted_count!='N')--><th 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="sort" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
-                <!--@if($module_info->display_regdate != 'N')--><th scope="col"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="sort" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
-                <!--@if($module_info->display_last_update=='Y')--><th scope="col"><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="sort" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
+                <!--@end-->
             </tr>
         </thead>
-        <!--@end-->
 
         <tbody>
 
         <!--@if(!$document_list && !$notice_list)-->
             <tr>
-                <td colspan="{$_col_count}">
+                <td colspan="<!--@if($grant->manager)-->{count($list_config)+1}<!--@else-->{count($list_config)}<!--@end-->">
                     {$lang->no_documents}
                 </td>
             </tr>
         <!--@else-->
         
-        <!--@foreach($notice_list as $no => $document)-->
-            <tr class="notice">
-                <!--@if($module_info->display_number!='N')--><td class="notice"><!--@if($document_srl == $document->document_srl)-->&raquo;<!--@else-->{$lang->notice}<!--@end--></td><!--@end-->
-                <!--@if($grant->is_admin)--><td class="check"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
-                <td class="title">
-                    
-                    <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
-                    <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
+            <!--@foreach($notice_list as $no => $document)-->
+                <tr class="notice">
+                    <!--@if($grant->manager)-->
+                        <td class="check"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td>
                     <!--@end-->
 
-                    <a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
-                    
-                    <!--@if($document->getCommentCount())-->
-                        <a href="{getUrl('document_srl', $document->document_srl)}#comment"><span class="replyNum" title="Replies"><strong>[{$document->getCommentCount()}]</strong></span></a>
+                    <!--// 목록 설정으로 table theader 생성 -->
+                    <!--@foreach($list_config as $key => $val)-->
+
+                        <!--// 기본 컨텐츠일 경우 -->
+                        <!--@if($val->idx == -1)-->
+
+                            <!--// 컨텐츠 종류에 따라서 출력 -->
+                            <!--@if($val->type == 'no')-->
+                                <td class="notice"><!--@if($document_srl == $document->document_srl)-->&raquo;<!--@else-->{$lang->notice}<!--@end--></td>
+                            <!--@elseif($val->type == 'title')-->
+                                <td class="title">
+                                    
+                                    <!--@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, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
+                                    
+                                    <!--@if($document->getCommentCount())-->
+                                        <a href="{getUrl('document_srl', $document->document_srl)}#comment"><span class="replyNum" title="Replies"><strong>[{$document->getCommentCount()}]</strong></span></a>
+                                    <!--@end-->
+
+                                    <!--@if($document->getTrackbackCount())-->
+                                        <a href="{getUrl('document_srl', $document->document_srl)}#trackback"><span class="replyNum" title="Trackbacks"><strong class="trackback">[{$document->getTrackbackCount()}]</strong></span></a>
+                                    <!--@end-->
+
+                                    {$document->printExtraImages(60*60*$module_info->duration_new)}
+                                </td>
+                            <!--@elseif($val->type == 'regdate')-->
+                                <td class="date">{$document->getRegdate('Y-m-d')}</td>
+                            <!--@elseif($val->type == 'last_update')-->
+                                <td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td>
+                            <!--@elseif($val->type == 'nick_name')-->
+                                <td class="author"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
+                            <!--@elseif($val->type == 'user_id')-->
+                                <td class="author">{$document->getUserID()}</a></td>
+                            <!--@elseif($val->type == 'user_name')-->
+                                <td class="author">{$document->getUserName()}</a></td>
+                            <!--@elseif($val->type == 'readed_count')-->
+                                <td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td>
+                            <!--@elseif($val->type == 'voted_count')-->
+                                <td class="recommend">{$document->get('voted_count')!=0?$document->get('voted_count'):'&nbsp;'}</td>
+                            <!--@end-->
+
+                        <!--// 사용자 선언 확장변수일 경우 -->
+                        <!--@else-->
+                                <td>{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+                        <!--@end-->
                     <!--@end-->
+                </tr>
+            <!--@end-->
 
-                    <!--@if($document->getTrackbackCount())-->
-                        <a href="{getUrl('document_srl', $document->document_srl)}#trackback"><span class="replyNum" title="Trackbacks"><strong class="trackback">[{$document->getTrackbackCount()}]</strong></span></a>
+            <!--@foreach($document_list as $no => $document)-->
+                <tr class="bg{($no+1)%2+1}">
+                    <!--@if($grant->manager)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                    <!--// 목록 설정으로 table theader 생성 -->
+                    <!--@foreach($list_config as $key => $val)-->
+
+                        <!--// 기본 컨텐츠일 경우 -->
+                        <!--@if($val->idx == -1)-->
+
+                            <!--// 컨텐츠 종류에 따라서 출력 -->
+                            <!--@if($val->type == 'no')-->
+                                <td class="num"><!--@if($document_srl == $document->document_srl)-->&raquo;<!--@else-->{$no}<!--@end--></td>
+                            <!--@elseif($val->type == 'title')-->
+                                <td class="title">
+                                    <!--@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, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
+                                    
+                                    <!--@if($document->getCommentCount())-->
+                                        <a href="{getUrl('document_srl', $document->document_srl)}#comment"><span class="replyNum" title="Replies"><strong>[{$document->getCommentCount()}]</strong></span></a>
+                                    <!--@end-->
+
+                                    <!--@if($document->getTrackbackCount())-->
+                                        <a href="{getUrl('document_srl', $document->document_srl)}#trackback"><span class="replyNum" title="Trackbacks"><strong class="trackback">[{$document->getTrackbackCount()}]</strong></span></a>
+                                    <!--@end-->
+
+                                    {$document->printExtraImages(60*60*$module_info->duration_new)}
+                                </td>
+                            <!--@elseif($val->type == 'nick_name')-->
+                                <td class="author"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
+                            <!--@elseif($val->type == 'user_id')-->
+                                <td class="author">{$document->getUserID()}</a></td>
+                            <!--@elseif($val->type == 'user_name')-->
+                                <td class="author">{$document->getUserName()}</a></td>
+                            <!--@elseif($val->type == 'regdate')-->
+                                <td class="date">{$document->getRegdate('Y-m-d')}</td>
+                            <!--@elseif($val->type == 'last_update')-->
+                                <td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td>
+                            <!--@elseif($val->type == 'readed_count')-->
+                                <td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td>
+                            <!--@elseif($val->type == 'voted_count')-->
+                                <td class="recommend">{$document->get('voted_count')!=0?$document->get('voted_count'):'&nbsp;'}</td>
+                            <!--@end-->
+
+                        <!--// 사용자 선언 확장변수일 경우 -->
+                        <!--@else-->
+                                <td>{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+                        <!--@end-->
                     <!--@end-->
-
-                    {$document->printExtraImages(60*60*$module_info->duration_new)}
-                </td>
-                <!--@if($module_info->display_author!='N')--><td class="author"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></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>
-        <!--@end-->
-
-        <!--@foreach($document_list as $no => $document)-->
-            <tr class="bg{($no+1)%2+1}">
-                <!--@if($module_info->display_number!='N')--><td class="num"><!--@if($document_srl == $document->document_srl)-->&raquo;<!--@else-->{$no}<!--@end--></td><!--@end-->
-                <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
-                <td class="title">
-                    <!--@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, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle($module_info->subject_cut_size)}</a>
-                    
-                    <!--@if($document->getCommentCount())-->
-                        <a href="{getUrl('document_srl', $document->document_srl)}#comment"><span class="replyNum" title="Replies"><strong>[{$document->getCommentCount()}]</strong></span></a>
-                    <!--@end-->
-
-                    <!--@if($document->getTrackbackCount())-->
-                        <a href="{getUrl('document_srl', $document->document_srl)}#trackback"><span class="replyNum" title="Trackbacks"><strong class="trackback">[{$document->getTrackbackCount()}]</strong></span></a>
-                    <!--@end-->
-
-                    {$document->printExtraImages(60*60*$module_info->duration_new)}
-                </td>
-                <!--@if($module_info->display_author!='N')--><td class="author"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></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>
-        <!--@end-->
+                </tr>
+            <!--@end-->
         <!--@end-->
 
         </tbody>
diff --git a/modules/board/skins/xe_default/_style.webzine.html b/modules/board/skins/xe_default/_style.webzine.html
index 500dcc9e0..57837bcb9 100644
--- a/modules/board/skins/xe_default/_style.webzine.html
+++ b/modules/board/skins/xe_default/_style.webzine.html
@@ -4,7 +4,7 @@
 
         {@ $_col_count = 2; }
         <!--@if($module_info->display_number!='N')-->{@ $_col_count++ }<!--@end-->
-        <!--@if($grant->is_admin)-->{@ $_col_count++}<!--@end-->
+        <!--@if($grant->manager)-->{@ $_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-->
@@ -18,7 +18,7 @@
             <tr>
                 <!--@if($module_info->display_number!='N')--><th scope="col">{$lang->no}</th>{@ $no_line_class=""}<!--@end-->
 
-                <!--@if($grant->is_admin)--><th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
+                <!--@if($grant->manager)--><th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></th>{@ $no_line_class=""}<!--@end-->
 
                 <th scope="col" class="title">
 
@@ -57,7 +57,7 @@
         <!--@foreach($notice_list as $no => $document)-->
         <tr class="notice">
             <!--@if($module_info->display_number!='N')--><td class="notice">{$lang->notice}</td><!--@end-->
-            <!--@if($grant->is_admin)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+            <!--@if($grant->manager)--><td class="checkbox"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
             <td class="title">
                 <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                 <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
@@ -89,7 +89,7 @@
 
                 <!--@if($module_info->display_number!='N')--><td class="num" rowspan="2"><!--@if($document_srl == $document->document_srl)-->&raquo;<!--@else-->{$no}<!--@end--></td><!--@end-->
 
-                <!--@if($grant->is_admin)--><td class="check" rowspan="2"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
+                <!--@if($grant->manager)--><td class="check" rowspan="2"><input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /></td><!--@end-->
 
                 <td class="title">
                     <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
diff --git a/modules/board/skins/xe_default/comment.html b/modules/board/skins/xe_default/comment.html
index fedad19b7..a91527234 100644
--- a/modules/board/skins/xe_default/comment.html
+++ b/modules/board/skins/xe_default/comment.html
@@ -33,7 +33,7 @@
 						<dd>
 							{$comment->getRegdate('H:i:s')}
 						</dd>
-                        <!--@if($grant->is_admin || $module_info->display_ip_address!='N')-->
+                        <!--@if($grant->manager || $module_info->display_ip_address!='N')-->
 						<dd>
                             ({$comment->getIpaddress()})
 						</dd>
@@ -43,7 +43,6 @@
                     <a name="comment_{$comment->get('comment_srl')}"></a>
                     <div class="itemContent">
 					<!--@if(!$comment->isAccessible())-->
-					<!--%import("filter/input_password.xml")-->
 						<form action="./" method="get" onsubmit="return procFilter(this, input_password)" class="secretMessage">
 						<input type="hidden" name="mid" value="{$mid}" />
 						<input type="hidden" name="page" value="{$page}" />
diff --git a/modules/board/skins/xe_default/comment_form.html b/modules/board/skins/xe_default/comment_form.html
index 11536dc70..f4d870cc4 100644
--- a/modules/board/skins/xe_default/comment_form.html
+++ b/modules/board/skins/xe_default/comment_form.html
@@ -7,7 +7,7 @@
         <dl class="time">
 			<dt>Time :</dt>
             <dd>{$oSourceComment->getRegdate("Y.m.d H:i")}</dd>
-            <!--@if($grant->is_admin)-->
+            <!--@if($grant->manager)-->
 			<dd>({$oSourceComment->get('ipaddress')})</dd>
             <!--@end-->
         </dl>
@@ -18,7 +18,6 @@
 </div>
 <!--@end-->
 
-<!--%import("filter/insert_comment.xml")-->
 <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
diff --git a/modules/board/skins/xe_default/css/board.css b/modules/board/skins/xe_default/css/board.css
index 1de4d8ece..5da6de8bc 100644
--- a/modules/board/skins/xe_default/css/board.css
+++ b/modules/board/skins/xe_default/css/board.css
@@ -285,7 +285,7 @@
 .extraVarsList td{ border:0; padding:5px 10px; text-align:left; border-top:1px solid; vertical-align:top;}
 .extraVarsList th{ white-space:nowrap;}
 .extraVarsList td{ width:100%;}
-.extraVarsList td p{ display:inline-block; *display:inline; margin:3px 0;}
+.extraVarsList td p{ display:block; *display:block; margin:3px 0;}
 .extraVarsList td *{ vertical-align:middle;}
 .extraVarsList td li{ display:inline; margin-right:10px;}
 .extraVarsList td .inputText{ padding:3px 4px; font-size:12px; width:96%; display:block;}
@@ -310,3 +310,15 @@
 
 
 .smallBox .header { text-align:center; }
+
+/* 확장 변수 폼 */
+.extraVarsList tr td .text { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; }
+.extraVarsList tr td .email_address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .homepage { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .tel { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:40px; margin-right:10px;}
+.extraVarsList tr td .textarea { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; height:80px; }
+.extraVarsList tr td ul { margin:0; padding:0; list-style:none; }
+.extraVarsList tr td ul li { display:inline-block; margin-right:10px; }
+.extraVarsList tr td ul li input { margin-right:5px; vertical-align:middle;}
+.extraVarsList tr td .date { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:100px; }
+.extraVarsList tr td .address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
diff --git a/modules/board/skins/xe_default/delete_comment_form.html b/modules/board/skins/xe_default/delete_comment_form.html
index 463d06328..95cce97af 100644
--- a/modules/board/skins/xe_default/delete_comment_form.html
+++ b/modules/board/skins/xe_default/delete_comment_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_comment.xml")-->
 <!--#include("_header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_default/delete_form.html b/modules/board/skins/xe_default/delete_form.html
index 76cfe3c0b..89cfa02f0 100644
--- a/modules/board/skins/xe_default/delete_form.html
+++ b/modules/board/skins/xe_default/delete_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_document.xml")-->
 <!--#include("_header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_default/delete_trackback_form.html b/modules/board/skins/xe_default/delete_trackback_form.html
index 8891b6fbb..ac3c48b56 100644
--- a/modules/board/skins/xe_default/delete_trackback_form.html
+++ b/modules/board/skins/xe_default/delete_trackback_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_trackback.xml")-->
 <!--#include("_header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_default/filter/delete_document.xml b/modules/board/skins/xe_default/filter/delete_document.xml
deleted file mode 100644
index 7627f5a63..000000000
--- a/modules/board/skins/xe_default/filter/delete_document.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<filter name="delete_document" module="board" act="procBoardDeleteDocument">
-  <form>
-    <node target="document_srl" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="page" target="page" />
-    <param name="document_srl" target="document_srl" />
-  </parameter>
-  <response callback_func="completeDeleteDocument">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="page" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/filter/delete_trackback.xml b/modules/board/skins/xe_default/filter/delete_trackback.xml
deleted file mode 100644
index 2140675f8..000000000
--- a/modules/board/skins/xe_default/filter/delete_trackback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<filter name="delete_trackback" module="board" act="procBoardDeleteTrackback">
-  <form>
-    <node target="trackback_srl" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="page" target="page" />
-    <param name="document_srl" target="document_srl" />
-    <param name="trackback_srl" target="trackback_srl" />
-  </parameter>
-  <response callback_func="completeDeleteTrackback">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="document_srl" />
-    <tag name="page" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/filter/input_password.xml b/modules/board/skins/xe_default/filter/input_password.xml
deleted file mode 100644
index 55cb6d8e0..000000000
--- a/modules/board/skins/xe_default/filter/input_password.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<filter name="input_password" module="board" act="procBoardVerificationPassword" >
-  <form>
-    <node target="document_srl" required="true" />
-    <node target="password" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="document_srl" target="document_srl" />
-    <param name="comment_srl" target="comment_srl" />
-    <param name="password" target="password" />
-  </parameter>
-  <response>
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/filter/insert.xml b/modules/board/skins/xe_default/filter/insert.xml
deleted file mode 100644
index 51e420825..000000000
--- a/modules/board/skins/xe_default/filter/insert.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<filter name="insert" module="board" act="procBoardInsertDocument" confirm_msg_code="">
-  <form>
-    <node target="nick_name" required="true" />
-    <node target="password" required="true" />
-    <node target="email_address" maxlength="250" />
-    <node target="homepage" maxlength="250"/>
-    <node target="title" required="true" maxlength="250" />
-    <node target="content" required="true" />
-  </form>
-  <response callback_func="completeDocumentInserted">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="document_srl" />
-    <tag name="category_srl" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/filter/search.xml b/modules/board/skins/xe_default/filter/search.xml
deleted file mode 100644
index 6c85e1254..000000000
--- a/modules/board/skins/xe_default/filter/search.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<filter name="search" module="board">
-  <form>
-    <node target="search_target" required="true" />
-    <node target="search_keyword" minlegnth="2" maxlength="40" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="search_target" target="search_target" />
-    <param name="search_keyword" target="search_keyword" />
-  </parameter>
-  <response callback_func="completeSearch">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/filter/vote.xml b/modules/board/skins/xe_default/filter/vote.xml
deleted file mode 100644
index 0870a7551..000000000
--- a/modules/board/skins/xe_default/filter/vote.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<filter name="vote" module="board" act="procBoardVoteDocument" confirm_msg_code="confirm_vote">
-  <form>
-    <node target="document_srl" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="document_srl" target="document_srl" />
-  </parameter>
-  <response callback_func="completeVote">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_default/input_password_form.html b/modules/board/skins/xe_default/input_password_form.html
index 411cb7758..586a292e6 100644
--- a/modules/board/skins/xe_default/input_password_form.html
+++ b/modules/board/skins/xe_default/input_password_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/input_password.xml")-->
 <!--@if(!$form_include)--><!--#include("_header.html")--><!--@end-->
 
 <div class="smallBox w400">
diff --git a/modules/board/skins/xe_default/list.html b/modules/board/skins/xe_default/list.html
index e4f297c48..dcc974a5f 100644
--- a/modules/board/skins/xe_default/list.html
+++ b/modules/board/skins/xe_default/list.html
@@ -1,7 +1,5 @@
 <!--#include("_header.html")-->
 
-<!--%import("filter/search.xml")-->
-
 <!--@if($oDocument->isExists() && $module_info->default_style != 'blog')-->
 <div class="viewDocument">
     <!--#include("./view_document.html")-->
@@ -23,8 +21,8 @@
 <div class="boardNavigation">
 
     <div class="buttonLeft">
-        <!--@if($grant->is_admin)-->
-            <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
+        <!--@if($grant->manager)-->
+            <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
         <!--@end-->
         <!--@if($module_info->default_style != 'blog')-->
         <a href="{getUrl('','mid',$mid,'page',$page,'document_srl','','listStyle',$listStyle)}" class="button"><span>{$lang->cmd_list}</span></a>
diff --git a/modules/board/skins/xe_default/skin.xml b/modules/board/skins/xe_default/skin.xml
index 19fd4336d..0c9bb23f2 100644
--- a/modules/board/skins/xe_default/skin.xml
+++ b/modules/board/skins/xe_default/skin.xml
@@ -376,7 +376,7 @@
             <title xml:lang="jp">IPアドレス表示</title>
             <title xml:lang="zh-CN">显示IP地址</title>
             <title xml:lang="es-CN">Display ip address</title>
-            <title xml:lang="zh-TW">顯示IP地址</title>
+            <title xml:lang="zh-TW">顯示IP位址</title>
             <options value="Y">
                 <title xml:lang="ko">출력</title>
                 <title xml:lang="en">display</title>
@@ -419,6 +419,36 @@
             </options>
             <description />
         </var>
+        <var name="display_sign" type="select">
+            <title xml:lang="ko">서명 표시</title>
+            <title xml:lang="jp">서명 표시</title>
+            <title xml:lang="zh-CN">显示签名</title>
+            <title xml:lang="en">서명 표시</title>
+            <title xml:lang="es">서명 표시</title>
+            <title xml:lang="zh-TW">顯示簽名檔</title>
+            <description xml:lang="ko">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="jp">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="zh-CN">可以设置主题发布者的个人签名及个性头像显示与否。</description>
+            <description xml:lang="en">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="es">글내용 사용자의 서명과 프로필 이미지를 표시하거나 숨길 수 있습니다.</description>
+            <description xml:lang="zh-TW">可選擇是否在文章中顯示個人圖片和簽名檔</description>
+            <options value="Y">
+                <title xml:lang="ko">출력</title>
+                <title xml:lang="en">display</title>
+                <title xml:lang="jp">表示</title>
+                <title xml:lang="zh-CN">显示</title>
+                <title xml:lang="es">display</title>
+                <title xml:lang="zh-TW">顯示</title>
+            </options>
+            <options value="N">
+                <title xml:lang="ko">출력하지 않음</title>
+                <title xml:lang="en">not display</title>
+                <title xml:lang="jp">非表示</title>
+                <title xml:lang="zh-CN">不显示</title>
+                <title xml:lang="es">not display</title>
+                <title xml:lang="zh-TW">隱藏</title>
+            </options>
+        </var>
         <var name="duration_new" type="text" default="24">
             <title xml:lang="ko">new표시 시간 (hours)</title>
             <title xml:lang="jp">Newの表示時間 (Hours)</title>
diff --git a/modules/board/skins/xe_default/view_document.html b/modules/board/skins/xe_default/view_document.html
index 789407c32..72222695b 100644
--- a/modules/board/skins/xe_default/view_document.html
+++ b/modules/board/skins/xe_default/view_document.html
@@ -22,22 +22,17 @@
 
 	<!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
     <table border="1" cellspacing="0" summary="Extra Form" class="extraVarsList">
-	<!--@foreach($module_info->extra_vars as $key => $val)-->
-		<!--@if($val->name)-->
-	<tr>
-		<th scope="row">{$val->name}</th>
-		<td>
-			<!--#include("./_extra_var_value.html")-->
-		</td>
-	</tr>
-		<!--@end-->
-	<!--@end-->
+    <!--@foreach($oDocument->getExtraVars() as $key => $val)-->
+    <tr>
+        <th>{$val->name} :</th>
+        <td>{$val->getValueHTML()}</td>
+    </tr>
+    <!--@end-->
 	</table>
 	<!--@end-->
 
 	<div class="boardReadBody">
 		<!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
-			<!--%import("filter/input_password.xml")-->
 			<form action="./" method="get" onsubmit="return procFilter(this, input_password)" class="secretMessage">
 			<input type="hidden" name="mid" value="{$mid}" />
 			<input type="hidden" name="page" value="{$page}" />
@@ -54,7 +49,7 @@
 			{$oDocument->getContent()}
 		<!--@end-->
 
-		<!--@if($oDocument->getProfileImage() || $oDocument->getSignature())-->
+        <!--@if($module_info->display_sign != 'N' && ($oDocument->getProfileImage() || $oDocument->getSignature()))-->
 			<div class="memberSignature">
 			<!--@if($oDocument->getProfileImage())-->
 				<img src="{$oDocument->getProfileImage()}" alt="profile" class="profile" />
@@ -111,7 +106,7 @@
 				<!--@end-->
 				<dt>{$lang->regdate} :</dt>
 				<dd title="{$lang->regdate}">{$oDocument->getRegdate('Y.m.d')}</dd>
-				<dd>{$oDocument->getRegdate('H:i:s')} <!--@if($grant->is_admin || $module_info->display_ip_address!='N')-->({$oDocument->getIpaddress()})<!--@end--></dd>
+				<dd>{$oDocument->getRegdate('H:i:s')} <!--@if($grant->manager || $module_info->display_ip_address!='N')-->({$oDocument->getIpaddress()})<!--@end--></dd>
 			</dl>
 			
 			<dl>
@@ -153,7 +148,6 @@
     <!--#include("./comment.html")-->
 
     <!--@if($grant->write_comment && $oDocument->isEnableComment() )-->
-        <!--%import("filter/insert_comment.xml")-->
         <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
         <input type="hidden" name="mid" value="{$mid}" />
         <input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
diff --git a/modules/board/skins/xe_default/write_form.html b/modules/board/skins/xe_default/write_form.html
index 5b275cf40..1a7ab5cd0 100644
--- a/modules/board/skins/xe_default/write_form.html
+++ b/modules/board/skins/xe_default/write_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/insert.xml")-->
 <!--#include("_header.html")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, window.insert)" id="fo_write" class="boardWrite">
@@ -27,16 +26,14 @@
 	
 	</div>
 
-    <!--@if($module_info->extra_vars)-->
+    <!--@if(count($extra_keys))-->
     <table border="1" cellspacing="0" summary="Extra Form" class="extraVarsList">
 	<caption><em>*</em> : {$lang->is_required}</caption>
-    <!--@foreach($module_info->extra_vars as $key => $val)-->
-        <!--@if($val->name)-->
+    <!--@foreach($extra_keys as $key => $val)-->
     <tr>
         <th scope="row">{$val->name} <!--@if($val->is_required=='Y')--><em>*</em><!--@end--></th>
-        <td><!--#include("./_extra_var_form.html")--></td>
+        <td>{$val->getFormHTML()}</td>
     </tr>
-        <!--@endif-->
     <!--@endforeach-->
     </table>
     <!--@endif-->
diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html
index 2e030778a..131b7f152 100644
--- a/modules/board/skins/xe_guestbook/comment.html
+++ b/modules/board/skins/xe_guestbook/comment.html
@@ -1,7 +1,7 @@
 <!--@if($oDocument->getCommentCount())-->
 <div class="replyBox">
 
-    <a name="comment_{$comment->comment_srl}"></a>
+    <a name="comment<!--@if($comment->comment_srl)-->_{$comment->comment_srl}<!--@end-->"></a>
     {@ $_comment_list = $oDocument->getComments() }
     <!--@foreach($_comment_list as $key => $comment)-->
 
@@ -35,7 +35,7 @@
 
                 <strong>{$comment->getRegdate('Y.m.d')}</strong> {$comment->getRegdate('H:i:s')}
 
-                <!--@if($grant->is_admin)-->
+                <!--@if($grant->manager)-->
                     ({$comment->get('ipaddress')})
                 <!--@end-->
             </div>
@@ -51,7 +51,6 @@
 
             <div class="replyContent">
                 <!--@if(!$comment->isAccessible())-->
-                    <!--%import("filter/input_password.xml")-->
                     <div class="secretContent">
                         <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
                         <input type="hidden" name="mid" value="{$mid}" />
diff --git a/modules/board/skins/xe_guestbook/comment_form.html b/modules/board/skins/xe_guestbook/comment_form.html
index e33a263b4..1c4f0923d 100644
--- a/modules/board/skins/xe_guestbook/comment_form.html
+++ b/modules/board/skins/xe_guestbook/comment_form.html
@@ -7,7 +7,7 @@
         <div class="author"><div class="member_{$oSourceComment->getMemberSrl()}">{$oSourceComment->getNickName()}</div></div>
         <div class="date">
             {$oSourceComment->getRegdate("Y.m.d H:i")}
-            <!--@if($grant->is_admin)-->
+            <!--@if($grant->manager)-->
                 ({$oSourceComment->get('ipaddress')})
             <!--@end-->
         </div>
@@ -25,7 +25,7 @@
         <div class="author"><div class="member_{$oDocument->getMemberSrl()}">{$oDocument->getNickName()}</div></div>
         <div class="date">
             {$oDocument->getRegdate("Y.m.d H:i")}
-            <!--@if($grant->is_admin)-->
+            <!--@if($grant->manager)-->
                 ({$oDocument->get('ipaddress')})
             <!--@end-->
         </div>
@@ -39,7 +39,6 @@
 <!--@end-->
 
 <!-- 글쓰기 폼 -->
-<!--%import("filter/insert_comment.xml")-->
 <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
@@ -86,7 +85,7 @@
   <div class="editor">{$oComment->getEditor()}</div>
 
   <div class="commentButton tRight">
-      <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'"/></span>
+      <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','','document_srl','')}'"/></span>
       <span class="button"><input type="submit" value="{$lang->cmd_comment_registration}" accesskey="s" /></span>
   </div>
 
diff --git a/modules/board/skins/xe_guestbook/css/common.css b/modules/board/skins/xe_guestbook/css/common.css
index 45e849388..b13eec80e 100644
--- a/modules/board/skins/xe_guestbook/css/common.css
+++ b/modules/board/skins/xe_guestbook/css/common.css
@@ -333,3 +333,15 @@ h5 { padding:2px; }
 .listWrite { margin-bottom:20px; }
 
 .display_date {  cursor:pointer; width:80px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px;  margin-right:10px;}
+
+
+/* 확장 변수 폼 */
+.extraVarsList tr td .text { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; }
+.extraVarsList tr td .email_address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .homepage { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarsList tr td .tel { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:40px; margin-right:10px;}
+.extraVarsList tr td .textarea { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; height:80px; }
+.extraVarsList tr td ul { margin:0; padding:0; list-style:none; }
+.extraVarsList tr td ul li { display:inline-block; margin-right:10px; }
+.extraVarsList tr td .date { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:100px; }
+.extraVarsList tr td .address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
diff --git a/modules/board/skins/xe_guestbook/delete_comment_form.html b/modules/board/skins/xe_guestbook/delete_comment_form.html
index d2d0ba4e2..eebe61bb9 100644
--- a/modules/board/skins/xe_guestbook/delete_comment_form.html
+++ b/modules/board/skins/xe_guestbook/delete_comment_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_comment.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_guestbook/delete_form.html b/modules/board/skins/xe_guestbook/delete_form.html
index 1ca638c93..810d40d54 100644
--- a/modules/board/skins/xe_guestbook/delete_form.html
+++ b/modules/board/skins/xe_guestbook/delete_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_document.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_guestbook/delete_trackback_form.html b/modules/board/skins/xe_guestbook/delete_trackback_form.html
index f907b6793..1a879c05e 100644
--- a/modules/board/skins/xe_guestbook/delete_trackback_form.html
+++ b/modules/board/skins/xe_guestbook/delete_trackback_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_trackback.xml")-->
 <!--#include("header.html")-->
 
 <div class="smallBox w268">
diff --git a/modules/board/skins/xe_guestbook/extra_var_form.html b/modules/board/skins/xe_guestbook/extra_var_form.html
deleted file mode 100644
index ed78fe633..000000000
--- a/modules/board/skins/xe_guestbook/extra_var_form.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--// 이 파일은 extra_vars의 form을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-<!--// type=select,checkbox이고 기본값이 , 로 연결되어 있으면 배열로 만든다 -->
-<!--@if(in_array($val->type, array('select', 'checkbox')))-->
-    {@ $val->default = explode(',', $val->default) }
-<!--@end-->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oDocument->getExtraValue($key)}
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!--// Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="inputTypeText" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="inputTypeText" />
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="inputTypeText" />
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    <textarea name="{$val->column_name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if($val->default)-->
-        <ul style="padding:0;margin:0;list-style:none;">
-        <!--@foreach($val->default as $v)-->
-            <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if($v==$val->value||is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/> {$v}</li>
-        <!--@end-->
-        </ul>
-    <!--@end-->
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    <select name="{$val->column_name}">
-    <!--@if($val->default)-->
-        <!--@foreach($val->default as $v)-->
-            <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-        <!--@end-->
-    <!--@end-->
-    </select>
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-    <!--// datepicker javascript plugin load -->
-    <!--%load_js_plugin("ui.datepicker")-->
-
-    <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-    <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
-
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-</script>
-<!--@end-->
-
-
-<!--@if($val->desc)-->
-<p class="info">{$val->desc}</p>
-<!--@end-->
diff --git a/modules/board/skins/xe_guestbook/extra_var_value.html b/modules/board/skins/xe_guestbook/extra_var_value.html
deleted file mode 100644
index 78fff79df..000000000
--- a/modules/board/skins/xe_guestbook/extra_var_value.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--// 이 파일은 extra_vars의 결과값을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oDocument->getExtraValue($key)}
-{@ $_tmp_value = array(); }
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')--> 
-    {htmlspecialchars($val->value)}
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <!--@if($val->value)-->
-        <a href="{htmlspecialchars($val->value)}" onclick="window.open(this.href);return false;">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <!--@if($val->value)-->
-        <a href="mailto:{htmlspecialchars($val->value)}">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    {htmlspecialchars($val->value[0])} 
-    <!--@if($val->value[1])-->-<!--@end-->
-    {htmlspecialchars($val->value[1])} 
-    <!--@if($val->value[2])-->-<!--@end-->
-    {htmlspecialchars($val->value[2])} 
-    &nbsp;
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    {nl2br(htmlspecialchars($val->value))}
-    &nbsp;
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if(!is_array($val->value))-->{@ $val->value = array($val->value) }<!--@end-->
-    <!--@foreach($val->value as $v)-->
-        {@ $_tmp_value[] = htmlspecialchars($v)}
-    <!--@end-->
-    {implode(",",$_tmp_value)}
-    &nbsp;
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    {htmlspecialchars($val->value)}
-    &nbsp;
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-    {zdate($val->value,"Y-m-d")}
-    &nbsp;
-<!--@end-->
-
-<!--@if(!$val->value)-->&nbsp;<!--@end-->
diff --git a/modules/board/skins/xe_guestbook/filter/delete_document.xml b/modules/board/skins/xe_guestbook/filter/delete_document.xml
deleted file mode 100644
index 7627f5a63..000000000
--- a/modules/board/skins/xe_guestbook/filter/delete_document.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<filter name="delete_document" module="board" act="procBoardDeleteDocument">
-  <form>
-    <node target="document_srl" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="page" target="page" />
-    <param name="document_srl" target="document_srl" />
-  </parameter>
-  <response callback_func="completeDeleteDocument">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="page" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_guestbook/filter/delete_trackback.xml b/modules/board/skins/xe_guestbook/filter/delete_trackback.xml
deleted file mode 100644
index 2140675f8..000000000
--- a/modules/board/skins/xe_guestbook/filter/delete_trackback.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<filter name="delete_trackback" module="board" act="procBoardDeleteTrackback">
-  <form>
-    <node target="trackback_srl" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="page" target="page" />
-    <param name="document_srl" target="document_srl" />
-    <param name="trackback_srl" target="trackback_srl" />
-  </parameter>
-  <response callback_func="completeDeleteTrackback">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="document_srl" />
-    <tag name="page" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_guestbook/filter/input_password.xml b/modules/board/skins/xe_guestbook/filter/input_password.xml
deleted file mode 100644
index 55cb6d8e0..000000000
--- a/modules/board/skins/xe_guestbook/filter/input_password.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<filter name="input_password" module="board" act="procBoardVerificationPassword" >
-  <form>
-    <node target="document_srl" required="true" />
-    <node target="password" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="document_srl" target="document_srl" />
-    <param name="comment_srl" target="comment_srl" />
-    <param name="password" target="password" />
-  </parameter>
-  <response>
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_guestbook/filter/insert.xml b/modules/board/skins/xe_guestbook/filter/insert.xml
index 9a9d0ffa2..4e7850ad6 100644
--- a/modules/board/skins/xe_guestbook/filter/insert.xml
+++ b/modules/board/skins/xe_guestbook/filter/insert.xml
@@ -1,16 +1,16 @@
-<filter name="insert" module="board" act="procBoardInsertDocument" confirm_msg_code="confirm_submit">
-  <form>
-    <node target="nick_name" required="true" />
-    <node target="password" required="true" />
-    <node target="email_address" maxlength="250" />
-    <node target="homepage" maxlength="250"/>
-    <node target="content" required="true" />
-  </form>
-  <response callback_func="completeDocumentInserted">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="document_srl" />
-    <tag name="category_srl" />
-  </response>
-</filter>
+<filter name="insert" module="board" act="procBoardInsertDocument" confirm_msg_code="confirm_submit">
+  <form>
+    <node target="nick_name" required="true" />
+    <node target="password" required="true" />
+    <node target="email_address" maxlength="250" />
+    <node target="homepage" maxlength="250"/>
+    <node target="content" required="true" minlength="1" />
+    <node target="category_srl" required="true" />
+  </form>
+  <response callback_func="completeDocumentInserted">
+    <tag name="error" />
+    <tag name="message" />
+    <tag name="mid" />
+    <tag name="category_srl" />
+  </response>
+</filter>
diff --git a/modules/board/skins/xe_guestbook/filter/insert_comment.xml b/modules/board/skins/xe_guestbook/filter/insert_comment.xml
deleted file mode 100644
index 7bbdc3610..000000000
--- a/modules/board/skins/xe_guestbook/filter/insert_comment.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<filter name="insert_comment" module="board" act="procBoardInsertComment" confirm_msg_code="confirm_submit">
-  <form>
-    <node target="document_srl" required="true" />
-    <node target="nick_name" required="true" />
-    <node target="password" required="true" />
-    <node target="email_address" maxlength="250" />
-    <node target="homepage" maxlength="250"/>
-    <node target="content" required="true" minlength="1" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="document_srl" target="document_srl" />
-    <param name="comment_srl" target="comment_srl" />
-    <param name="parent_srl" target="parent_srl" />
-    <param name="nick_name" target="nick_name" />
-    <param name="password" target="password" />
-    <param name="email_address" target="email_address" />
-    <param name="homepage" target="homepage" />
-    <param name="content" target="content" />
-    <param name="is_secret" target="is_secret" />
-    <param name="notify_message" target="notify_message" />
-  </parameter>
-  <response callback_func="completeInsertComment">
-    <tag name="error" />
-    <tag name="message" />
-    <tag name="mid" />
-    <tag name="document_srl" />
-    <tag name="comment_srl" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_guestbook/filter/search.xml b/modules/board/skins/xe_guestbook/filter/search.xml
deleted file mode 100644
index 6c85e1254..000000000
--- a/modules/board/skins/xe_guestbook/filter/search.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<filter name="search" module="board">
-  <form>
-    <node target="search_target" required="true" />
-    <node target="search_keyword" minlegnth="2" maxlength="40" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="search_target" target="search_target" />
-    <param name="search_keyword" target="search_keyword" />
-  </parameter>
-  <response callback_func="completeSearch">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/board/skins/xe_guestbook/header.html b/modules/board/skins/xe_guestbook/header.html
index cf27a394b..b49c686ec 100644
--- a/modules/board/skins/xe_guestbook/header.html
+++ b/modules/board/skins/xe_guestbook/header.html
@@ -1,6 +1,3 @@
-<!--// JS 파일 로드 -->
-    <!--%import("js/board.js")-->
-
 <!--// 컬러셋 체크 -->
     <!--@if(!$module_info->colorset)-->
         {@$module_info->colorset = "white"}
@@ -49,7 +46,7 @@
         <!--@if($is_logged)-->
 
             <!--// 관리자이면 설정 버튼 출력 -->
-            <!--@if($grant->is_admin)-->
+            <!--@if($grant->manager)-->
             <li class="setup"><a href="{getUrl('act','dispBoardAdminBoardInfo')}">{$lang->cmd_setup}</a></li>
             <!--@end-->
 
diff --git a/modules/board/skins/xe_guestbook/input_password_form.html b/modules/board/skins/xe_guestbook/input_password_form.html
index 2617d680b..9b661831c 100644
--- a/modules/board/skins/xe_guestbook/input_password_form.html
+++ b/modules/board/skins/xe_guestbook/input_password_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/input_password.xml")-->
 <!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 sadf
diff --git a/modules/board/skins/xe_guestbook/js/board.js b/modules/board/skins/xe_guestbook/js/board.js
deleted file mode 100644
index 4cb59078e..000000000
--- a/modules/board/skins/xe_guestbook/js/board.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @file   modules/board/js/board.js
- * @author zero (zero@nzeo.com)
- * @brief  board 모듈의 javascript
- **/
-
-/* 글쓰기 작성후 */
-function completeDocumentInserted(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var mid = ret_obj['mid'];
-    var document_srl = ret_obj['document_srl'];
-    var category_srl = ret_obj['category_srl'];
-
-    //alert(message);
-
-    var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','').setQuery('rnd',document_srl);
-    if(category_srl) url = url.setQuery('category',category_srl);
-    location.href = url+'#document_'+document_srl;
-}
-
-/* 글 삭제 */
-function completeDeleteDocument(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var mid = ret_obj['mid'];
-    var page = ret_obj['page'];
-
-    var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','');
-    if(page) url = url.setQuery('page',page);
-
-    //alert(message);
-
-    location.href = url;
-}
-
-/* 검색 실행 */
-function completeSearch(fo_obj, params) {
-    fo_obj.submit();
-}
-
-function completeVote(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    alert(message);
-    location.href = location.href;
-}
-
-// 현재 페이지 reload
-function completeReload(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    location.href = location.href;
-}
-
-/* 댓글 글쓰기 작성후 */
-function completeInsertComment(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var mid = ret_obj['mid'];
-    var document_srl = ret_obj['document_srl'];
-    var comment_srl = ret_obj['comment_srl'];
-
-    var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','');
-    if(comment_srl) url = url.setQuery('rnd',comment_srl)+"#comment_"+comment_srl;
-
-    //alert(message);
-
-    location.href = url;
-}
-
-/* 댓글 삭제 */
-function completeDeleteComment(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var mid = ret_obj['mid'];
-    var document_srl = ret_obj['document_srl'];
-    var page = ret_obj['page'];
-
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act','').setQuery('rnd',document_srl);
-    if(page) url = url.setQuery('page',page);
-
-    //alert(message);
-
-    location.href = url+'#document_'+document_srl;
-}
-
-/* 트랙백 삭제 */
-function completeDeleteTrackback(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var mid = ret_obj['mid'];
-    var document_srl = ret_obj['document_srl'];
-    var page = ret_obj['page'];
-
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act','');
-    if(page) url = url.setQuery('page',page);
-
-    //alert(message);
-
-    location.href = url;
-}
-
-/* 카테고리 이동 */
-function doChangeCategory() {
-    var category_srl = jQuery('#board_category option:selected').val();
-    location.href = decodeURI(current_url).setQuery('category',category_srl);
-}
-
-/* 스크랩 */
-function doScrap(document_srl) {
-    var params = new Array();
-    params["document_srl"] = document_srl;
-    exec_xml("member","procMemberScrapDocument", params, null);
-}
diff --git a/modules/board/skins/xe_guestbook/list.html b/modules/board/skins/xe_guestbook/list.html
index 03f5cbc5e..c71c50a3b 100644
--- a/modules/board/skins/xe_guestbook/list.html
+++ b/modules/board/skins/xe_guestbook/list.html
@@ -1,9 +1,6 @@
 <!--// header.html include -->
     <!--#include("header.html")-->
 
-<!--// 검색을 위한 xml filter import-->
-    <!--%import("filter/search.xml")-->
-
 <!--// 선택된 게시물이 있고 권한이 있으면 내용 출력 -->
     
 <!--// 글 쓰기 폼 출력 -->
diff --git a/modules/board/skins/xe_guestbook/view_document.html b/modules/board/skins/xe_guestbook/view_document.html
index b38463bea..5fe964372 100644
--- a/modules/board/skins/xe_guestbook/view_document.html
+++ b/modules/board/skins/xe_guestbook/view_document.html
@@ -29,7 +29,7 @@
 
                 <div class="date" title="{$lang->regdate}">
                     <strong>{$oDocument->getRegdate('Y.m.d')}</strong> {$oDocument->getRegdate('H:i:s')}
-                    <!--@if($grant->is_admin)-->
+                    <!--@if($grant->manager)-->
                     ({$oDocument->get('ipaddress')})
                     <!--@end-->
                 </div>
@@ -46,16 +46,11 @@
         <table cellspacing="0" summary="" class="extraVarsList">
         <col width="150" />
         <col />
-        <!--@foreach($module_info->extra_vars as $key => $val)-->
-            <!--@if($val->name)-->
+        <!--@foreach($oDocument->getExtraVars() as $key => $val)-->
         <tr>
-            <th scope="row">{$val->name}</th>
-            <td>
-                <!--// 확장변수(extra_var)의 type에 따른 값을 출력하기 위해서 특별히 제작된 파일을 include 한다 -->
-                <!--#include("./extra_var_value.html")-->
-            </td>
+            <th>{$val->name}</th>
+            <td>{$val->getValueHTML()}</td>
         </tr>
-            <!--@end-->
         <!--@end-->
         </table>
         <!--@end-->
@@ -65,7 +60,6 @@
                 <a name="document_{$oDocument->document_srl}"></a>
 
                 <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
-                    <!--%import("filter/input_password.xml")-->
                     <div class="secretContent">
                         <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
                         <input type="hidden" name="mid" value="{$mid}" />
diff --git a/modules/board/skins/xe_guestbook/write_form.html b/modules/board/skins/xe_guestbook/write_form.html
index 7668469dd..2f7083be6 100644
--- a/modules/board/skins/xe_guestbook/write_form.html
+++ b/modules/board/skins/xe_guestbook/write_form.html
@@ -1,8 +1,9 @@
 <!--@if($act=="dispBoardWrite")-->
     <!--#include("header.html")-->
+<!--@else-->
+    <!--%import("filter/insert.xml")-->
 <!--@end-->
 
-<!--%import("filter/insert.xml")-->
 <form action="./" method="post" onsubmit="return procFilter(this, window.insert)" id="fo_write">
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="content" value="{$oDocument->getContentText()}" />
@@ -69,17 +70,15 @@
             <!--@end-->
         </dl>
 
-        <!--@if($module_info->extra_vars)-->
+        <!--@if($extra_keys)-->
         <table cellspacing="0" summary="" class="extraVarsList">
         <col width="150" />
         <col />
-        <!--@foreach($module_info->extra_vars as $key => $val)-->
-            <!--@if($val->name)-->
+        <!--@foreach($extra_keys as $key => $val)-->
         <tr>
             <th scope="row">{$val->name} <!--@if($val->is_required=='Y')-->*<!--@end--></th>
-            <td><!--#include("./extra_var_form.html")--></td>
+            <td>{$val->getFormHTML()}</td>
         </tr>
-            <!--@end-->
         <!--@end-->
         </table>
         <!--@end-->
diff --git a/modules/board/tpl/board_delete.html b/modules/board/tpl/board_delete.html
index c3cd4e88d..08e3a2e68 100644
--- a/modules/board/tpl/board_delete.html
+++ b/modules/board/tpl/board_delete.html
@@ -6,8 +6,8 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h3 class="xeAdmin">{$lang->confirm_delete}</h3>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$module_info->mid}</td>
@@ -21,10 +21,10 @@
         <td>{$module_info->document_count}</td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <a href="{getUrl('act','dispBoardAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index 81909b4d4..5e14e6a62 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -4,30 +4,28 @@
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert_board)" enctype="multipart/form-data">
 <input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl?$module_srl:$module_srls}" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 <!--@if($module_info->is_default=='Y')-->
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
 
-    <!--@if(!$module_srls)-->
-        <tr>
-            <th scope="row"><div>{$lang->mid}</div></th>
-            <td>
-                <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
-                <p>{$lang->about_mid}</p>
-            </td>
-        </tr>
-        <!--@if($module_info->is_default!='Y')-->
-        <tr>
-            <th scope="row"><div>{$lang->is_default}</div></th>
-            <td>
-                <input type="checkbox" name="is_default" value="Y" <!--@if($module_info->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default"  class="checkbox" />
-                <label for="fld_for_default">{$lang->about_default}</label>
-            </td>
-        </tr>
-        <!--@end-->
+    <tr>
+        <th scope="row"><div>{$lang->mid}</div></th>
+        <td>
+            <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
+            <p>{$lang->about_mid}</p>
+        </td>
+    </tr>
+    <!--@if($module_info->is_default!='Y')-->
+    <tr>
+        <th scope="row"><div>{$lang->is_default}</div></th>
+        <td>
+            <input type="checkbox" name="is_default" value="Y" <!--@if($module_info->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default"  class="checkbox" />
+            <label for="fld_for_default">{$lang->about_default}</label>
+        </td>
+    </tr>
     <!--@end-->
     <tr>
         <th scope="row"><div>{$lang->module_category}</div></th>
@@ -42,15 +40,14 @@
         </td>
     </tr>
 
-    <!--@if(!$module_srls)-->
     <tr>
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td>
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
-    <!--@end-->
 
     <tr>
         <th scope="row"><div>{$lang->layout}</div></th>
@@ -154,95 +151,31 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->description)}</textarea>
             <p>{$lang->about_description}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->header_text}</div></th>
         <td>
-            <textarea name="header_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->header_text)}</textarea>
+            <textarea name="header_text" class="inputTypeTextArea fullWidth" id="header_text">{htmlspecialchars($module_info->header_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','header_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_header_text}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->footer_text}</div></th>
         <td>
-            <textarea name="footer_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <textarea name="footer_text" class="inputTypeTextArea fullWidth" id="footer_text">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','footer_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_footer_text}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row"><div>{$lang->admin_id}</div></th>
-        <td>
-            <textarea name="admin_id" class="inputTypeTextArea fixWidth"><!--@if($module_info->admin_id)-->{implode(",",$module_info->admin_id)}<!--@end--></textarea>
-            <p>{$lang->about_admin_id}</p>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="2" class="center">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
             <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
-        </td>
+        </th>
     </table>
 
-    <!--@if(!$module_srls)-->
-        <!--@for($i=1;$i<=20;$i++)-->
-            <div class="gap1"></div>
-            {@ $extra_vars_name = ''}
-            {@ $extra_vars_type = ''}
-            {@ $extra_vars_is_required = ''}
-            {@ $extra_vars_default_value = ''}
-            {@ $extra_vars_desc = ''}
-            {@ $extra_vars_search = ''}
-            <!--@if($module_info->extra_vars[$i])-->
-                {@ $extra_vars_name = $module_info->extra_vars[$i]->name}
-                {@ $extra_vars_type = $module_info->extra_vars[$i]->type}
-                {@ $extra_vars_is_required = $module_info->extra_vars[$i]->is_required}
-                {@ $extra_vars_default_value = $module_info->extra_vars[$i]->default}
-                {@ $extra_vars_desc = $module_info->extra_vars[$i]->desc}
-                {@ $extra_vars_search = $module_info->extra_vars[$i]->search}
-            <!--@end-->
-        <table cellspacing="0" class="adminTable ">
-        <caption>{$lang->extra_vars} {$i}</caption>
-        <tr>
-            <th><div>{$lang->column_name}</div></th>
-            <td class="wide"><input type="text" name="extra_vars_{$i}_name" value="{$extra_vars_name}" class="inputTypeText w200" /> </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->column_type}</div></th>
-            <td>
-                <select name="extra_vars_{$i}_type">
-                    <!--@foreach($lang->column_type_list as $key => $val)-->
-                        <!--@if($key != 'kr_zip')-->
-                        <option value="{$key}" <!--@if($extra_vars_type==$key)-->selected="selected"<!--@end-->>{$lang->column_type_list[$key]}</option>
-                        <!--@end-->
-                    <!--@end-->
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->is_required}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_is_required" value="Y" <!--@if($extra_vars_is_required=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->default_value}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_default" value="{$extra_vars_default_value}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->description}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_desc" value="{$extra_vars_desc}" class="inputTypeText w400" /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->cmd_search}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_search" value="Y" <!--@if($extra_vars_search=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></div></th>
-        </tr>
-        </table>
-        <!--@end-->
-    <!--@end-->
-
-
 </form>
diff --git a/modules/board/tpl/category_info.html b/modules/board/tpl/category_info.html
deleted file mode 100644
index faee29b33..000000000
--- a/modules/board/tpl/category_info.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<input type="hidden" name="category_srl" value="{$category_info->category_srl}" />
-<input type="hidden" name="parent_srl" value="{$category_info->parent_srl}" />
-
-<table cellspacing="0" class="adminTable">
-<!--@if($category_info->parent_category_title)-->
-<tr>
-    <th scope="row"><div>{$lang->parent_category_title}</div></th>
-    <td class="wide">{$category_info->parent_category_title}</td>
-</tr>
-<!--@end-->
-<tr>
-    <th scope="row"><div>{$lang->category_title}</div></th>
-    <td>
-        <input type="text" name="category_title" value="{htmlspecialchars($category_info->title)}" class="inputTypeText" />
-        <p>{$lang->about_category_title}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->category_color}</div></th>
-    <td>
-        <input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="inputTypeText" />
-        <p>{$lang->about_category_color}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->expand}</div></th>
-    <td>
-        <input type="checkbox" name="expand" value="Y" <!--@if($category_info->expand=="Y")-->checked="checked"<!--@end--> class="checkbox" />
-        <p>{$lang->about_expand}</p>
-    </td>
-</tr>
-<tr >
-    <th scope="row2"><div>{$lang->category_group_srls} <input type="checkbox" onclick="XE.checkboxToggleAll('group_srls'); return false;" /></div></th>
-    <td>
-        <!--@foreach($group_list as $key=>$val)-->
-        <div><input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($category_info->group_srls)&&in_array($key, $category_info->group_srls))-->checked="checked"<!--@end--> class="checkbox" /> <label for="group_{$key}">{$val->title}</label></div>
-        <!--@end-->
-        <p>{$lang->about_category_group_srls}</p>
-    </td>
-</tr>
-<tr>
-    <td scope="row" colspan="2" class="right">
-
-
-        <span class="button green"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button red"><input type="button" onclick="hideCategoryInfo();return false" value="{$lang->cmd_close}" /></span>
-
-    </td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/modules/board/tpl/category_list.html b/modules/board/tpl/category_list.html
index c4349ab5a..f7f8ad050 100644
--- a/modules/board/tpl/category_list.html
+++ b/modules/board/tpl/category_list.html
@@ -1,41 +1,3 @@
 <!--#include("./header.html")-->
-<!--%import("filter/insert_category.xml")-->
-<!--%import("filter/delete_category.xml")-->
-<!--%import("filter/move_category.xml")-->
 
-<!--// tree javascript plugin load -->
-<!--%load_js_plugin("ui.tree")-->
-
-<!--%import("js/board_admin.js")-->
-<!--%import("js/board_category.js")-->
-<script type="text/javascript">
-    var category_title = "{$lang->category}";
-</script>
-
-    <h3>{$lang->board} <span class="gray">{$lang->cmd_management}</span></h3>
-    <div class="infoText">{nl2br($lang->about_board_category)}
-    </div>
-<span style="float:right"><a href="#"  onclick="doReloadTreeCategory('{$module_info->module_srl}');return false;" class="button"><span>{$lang->cmd_remake_cache}</span></a></span>
-
-    <div class="gap1">
-        <form id="fo_category" action="./" method="get" onsubmit="return procFilter(this, insert_category)">
-        <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-        <input type="hidden" name="xml_file" value="{$category_xml_file}" />
-
-        <div id="menu">
-            <ul class="simpleTree">
-                <li class="root" id='tree_0'><span>{$lang->category}</span></li>
-            </ul>
-        </div>
-            <div id="category_info"></div>
-        </form>
-    </div>
-
-
-        <script type="text/javascript">
-var simpleTreeCollection;
-var max_menu_depth = 999;
-var lang_confirm_delete = "{$lang->confirm_delete}";
-var xml_url = "{$category_xml_file}";
-Tree(xml_url);
-        </script>
+{$category_content}
diff --git a/modules/board/tpl/category_update_form.html b/modules/board/tpl/category_update_form.html
deleted file mode 100644
index c6d078e0c..000000000
--- a/modules/board/tpl/category_update_form.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--%import("filter/update_category.xml")-->
-
-<!--#include("./header.html")-->
-
-<!-- 카테고리 수정 -->
-
-<!--@if($selected_category)-->
-<form action="./" method="post" onsubmit="return procFilter(this, update_category)" enctype="multipart/form-data">
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-    <input type="hidden" name="category_srl" value="{$selected_category->category_srl}" />
-    <input type="hidden" name="mode" value="update" />
-
-    <table cellspacing="0" class="adminTable">
-    <col width="150" />
-    <col />
-    <col width="100" />
-    <tr>
-        <th scope="row">{$lang->category_title}</th>
-        <td>
-            <input type="text" name="category_title" class="inputTypeText w100"  value="{htmlspecialchars($selected_category->title)}" />
-        </td>
-        <th scope="row" class="centerButton">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
-<!--@end-->
diff --git a/modules/board/tpl/css/board.css b/modules/board/tpl/css/board.css
index 613a74b4a..5983446ce 100644
--- a/modules/board/tpl/css/board.css
+++ b/modules/board/tpl/css/board.css
@@ -1,11 +1,11 @@
 @charset "utf-8";
 
-body { margin:10px; }
+.aboutListConfig { border:1px solid #ccc; padding:5px; line-height:160%; margin-bottom:20px; }
 
-.menuListZone { table-layout:fixed; }
-.menuListZone td { vertical-align:top; }
-.menuListZone td.category_zone { padding-right:10px; }
+.targetItem strong , .displayItem strong { margin-bottom:5px; display:block;}
+.targetItem { float:left; width:250px; overflow:hidden; *zoom:1; margin-left:30px; }
+.displayItem { float:left; width:250px; overflow:hidden; *zoom:1; }
+.displayItem select, .targetItem  select { width:99%;  overflow:hidden; *zoom:1;}
 
-#category_list { padding:.5em 0 .5em 0; margin-bottom:2em; width:250px; overflow:hidden; float:left; position:absolute; left:10px;}
-#category_info { margin-left:10px; width:560px; _width:540px; float:left; position:absolute; right:10px;}
-*:first-child+html #category_info { width:550px; }
+.displayButton { float:left; width:40px; text-align:center; margin-top:80px; }
+.displayButton a { margin-bottom:10px; }
diff --git a/modules/board/tpl/extra_vars.html b/modules/board/tpl/extra_vars.html
new file mode 100644
index 000000000..7a45ee47b
--- /dev/null
+++ b/modules/board/tpl/extra_vars.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$extra_vars_content}
diff --git a/modules/board/skins/xe_board/filter/delete_comment.xml b/modules/board/tpl/filter/delete_comment.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/delete_comment.xml
rename to modules/board/tpl/filter/delete_comment.xml
diff --git a/modules/board/skins/xe_board/filter/delete_document.xml b/modules/board/tpl/filter/delete_document.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/delete_document.xml
rename to modules/board/tpl/filter/delete_document.xml
diff --git a/modules/board/skins/xe_board/filter/delete_trackback.xml b/modules/board/tpl/filter/delete_trackback.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/delete_trackback.xml
rename to modules/board/tpl/filter/delete_trackback.xml
diff --git a/modules/board/skins/xe_board/filter/input_password.xml b/modules/board/tpl/filter/input_password.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/input_password.xml
rename to modules/board/tpl/filter/input_password.xml
diff --git a/modules/board/skins/xe_board/filter/insert.xml b/modules/board/tpl/filter/insert.xml
similarity index 90%
rename from modules/board/skins/xe_board/filter/insert.xml
rename to modules/board/tpl/filter/insert.xml
index 412fd77a7..9c80d9326 100644
--- a/modules/board/skins/xe_board/filter/insert.xml
+++ b/modules/board/tpl/filter/insert.xml
@@ -6,6 +6,7 @@
     <node target="homepage" maxlength="250"/>
     <node target="title" required="true" minlength="1" maxlength="250" />
     <node target="content" required="true" />
+    <node target="category_srl" required="true" />
   </form>
   <response callback_func="completeDocumentInserted">
     <tag name="error" />
diff --git a/modules/board/tpl/filter/insert_board.xml b/modules/board/tpl/filter/insert_board.xml
index 62f97dabf..5de11e7a8 100644
--- a/modules/board/tpl/filter/insert_board.xml
+++ b/modules/board/tpl/filter/insert_board.xml
@@ -27,127 +27,6 @@
         <param name="description" target="description" />
         <param name="header_text" target="header_text" />
         <param name="footer_text" target="footer_text" />
-        <param name="admin_id" target="admin_id" />
-        <param name="extra_vars_1_name" target="extra_vars_1_name" />
-        <param name="extra_vars_1_type" target="extra_vars_1_type" />
-        <param name="extra_vars_1_is_required" target="extra_vars_1_is_required" />
-        <param name="extra_vars_1_search" target="extra_vars_1_search" />
-        <param name="extra_vars_1_default" target="extra_vars_1_default" />
-        <param name="extra_vars_1_desc" target="extra_vars_1_desc" />
-        <param name="extra_vars_2_name" target="extra_vars_2_name" />
-        <param name="extra_vars_2_type" target="extra_vars_2_type" />
-        <param name="extra_vars_2_is_required" target="extra_vars_2_is_required" />
-        <param name="extra_vars_2_search" target="extra_vars_2_search" />
-        <param name="extra_vars_2_default" target="extra_vars_2_default" />
-        <param name="extra_vars_2_desc" target="extra_vars_2_desc" />
-        <param name="extra_vars_3_name" target="extra_vars_3_name" />
-        <param name="extra_vars_3_type" target="extra_vars_3_type" />
-        <param name="extra_vars_3_is_required" target="extra_vars_3_is_required" />
-        <param name="extra_vars_3_search" target="extra_vars_3_search" />
-        <param name="extra_vars_3_default" target="extra_vars_3_default" />
-        <param name="extra_vars_3_desc" target="extra_vars_3_desc" />
-        <param name="extra_vars_4_name" target="extra_vars_4_name" />
-        <param name="extra_vars_4_type" target="extra_vars_4_type" />
-        <param name="extra_vars_4_is_required" target="extra_vars_4_is_required" />
-        <param name="extra_vars_4_search" target="extra_vars_4_search" />
-        <param name="extra_vars_4_default" target="extra_vars_4_default" />
-        <param name="extra_vars_4_desc" target="extra_vars_4_desc" />
-        <param name="extra_vars_5_name" target="extra_vars_5_name" />
-        <param name="extra_vars_5_type" target="extra_vars_5_type" />
-        <param name="extra_vars_5_is_required" target="extra_vars_5_is_required" />
-        <param name="extra_vars_5_search" target="extra_vars_5_search" />
-        <param name="extra_vars_5_default" target="extra_vars_5_default" />
-        <param name="extra_vars_5_desc" target="extra_vars_5_desc" />
-        <param name="extra_vars_6_name" target="extra_vars_6_name" />
-        <param name="extra_vars_6_type" target="extra_vars_6_type" />
-        <param name="extra_vars_6_is_required" target="extra_vars_6_is_required" />
-        <param name="extra_vars_6_search" target="extra_vars_6_search" />
-        <param name="extra_vars_6_default" target="extra_vars_6_default" />
-        <param name="extra_vars_6_desc" target="extra_vars_6_desc" />
-        <param name="extra_vars_7_name" target="extra_vars_7_name" />
-        <param name="extra_vars_7_type" target="extra_vars_7_type" />
-        <param name="extra_vars_7_is_required" target="extra_vars_7_is_required" />
-        <param name="extra_vars_7_search" target="extra_vars_7_search" />
-        <param name="extra_vars_7_default" target="extra_vars_7_default" />
-        <param name="extra_vars_7_desc" target="extra_vars_7_desc" />
-        <param name="extra_vars_8_name" target="extra_vars_8_name" />
-        <param name="extra_vars_8_type" target="extra_vars_8_type" />
-        <param name="extra_vars_8_is_required" target="extra_vars_8_is_required" />
-        <param name="extra_vars_8_search" target="extra_vars_8_search" />
-        <param name="extra_vars_8_default" target="extra_vars_8_default" />
-        <param name="extra_vars_8_desc" target="extra_vars_8_desc" />
-        <param name="extra_vars_9_name" target="extra_vars_9_name" />
-        <param name="extra_vars_9_type" target="extra_vars_9_type" />
-        <param name="extra_vars_9_is_required" target="extra_vars_9_is_required" />
-        <param name="extra_vars_9_search" target="extra_vars_9_search" />
-        <param name="extra_vars_9_default" target="extra_vars_9_default" />
-        <param name="extra_vars_9_desc" target="extra_vars_9_desc" />
-        <param name="extra_vars_10_name" target="extra_vars_10_name" />
-        <param name="extra_vars_10_type" target="extra_vars_10_type" />
-        <param name="extra_vars_10_is_required" target="extra_vars_10_is_required" />
-        <param name="extra_vars_10_search" target="extra_vars_10_search" />
-        <param name="extra_vars_10_default" target="extra_vars_10_default" />
-        <param name="extra_vars_10_desc" target="extra_vars_10_desc" />
-        <param name="extra_vars_11_name" target="extra_vars_11_name" />
-        <param name="extra_vars_11_type" target="extra_vars_11_type" />
-        <param name="extra_vars_11_is_required" target="extra_vars_11_is_required" />
-        <param name="extra_vars_11_search" target="extra_vars_11_search" />
-        <param name="extra_vars_11_default" target="extra_vars_11_default" />
-        <param name="extra_vars_11_desc" target="extra_vars_11_desc" />
-        <param name="extra_vars_12_name" target="extra_vars_12_name" />
-        <param name="extra_vars_12_type" target="extra_vars_12_type" />
-        <param name="extra_vars_12_is_required" target="extra_vars_12_is_required" />
-        <param name="extra_vars_12_search" target="extra_vars_12_search" />
-        <param name="extra_vars_12_default" target="extra_vars_12_default" />
-        <param name="extra_vars_12_desc" target="extra_vars_12_desc" />
-        <param name="extra_vars_13_name" target="extra_vars_13_name" />
-        <param name="extra_vars_13_type" target="extra_vars_13_type" />
-        <param name="extra_vars_13_is_required" target="extra_vars_13_is_required" />
-        <param name="extra_vars_13_search" target="extra_vars_13_search" />
-        <param name="extra_vars_13_default" target="extra_vars_13_default" />
-        <param name="extra_vars_13_desc" target="extra_vars_13_desc" />
-        <param name="extra_vars_14_name" target="extra_vars_14_name" />
-        <param name="extra_vars_14_type" target="extra_vars_14_type" />
-        <param name="extra_vars_14_is_required" target="extra_vars_14_is_required" />
-        <param name="extra_vars_14_search" target="extra_vars_14_search" />
-        <param name="extra_vars_14_default" target="extra_vars_14_default" />
-        <param name="extra_vars_14_desc" target="extra_vars_14_desc" />
-        <param name="extra_vars_15_name" target="extra_vars_15_name" />
-        <param name="extra_vars_15_type" target="extra_vars_15_type" />
-        <param name="extra_vars_15_is_required" target="extra_vars_15_is_required" />
-        <param name="extra_vars_15_search" target="extra_vars_15_search" />
-        <param name="extra_vars_15_default" target="extra_vars_15_default" />
-        <param name="extra_vars_15_desc" target="extra_vars_15_desc" />
-        <param name="extra_vars_16_name" target="extra_vars_16_name" />
-        <param name="extra_vars_16_type" target="extra_vars_16_type" />
-        <param name="extra_vars_16_is_required" target="extra_vars_16_is_required" />
-        <param name="extra_vars_16_search" target="extra_vars_16_search" />
-        <param name="extra_vars_16_default" target="extra_vars_16_default" />
-        <param name="extra_vars_16_desc" target="extra_vars_16_desc" />
-        <param name="extra_vars_17_name" target="extra_vars_17_name" />
-        <param name="extra_vars_17_type" target="extra_vars_17_type" />
-        <param name="extra_vars_17_is_required" target="extra_vars_17_is_required" />
-        <param name="extra_vars_17_search" target="extra_vars_17_search" />
-        <param name="extra_vars_17_default" target="extra_vars_17_default" />
-        <param name="extra_vars_17_desc" target="extra_vars_17_desc" />
-        <param name="extra_vars_18_name" target="extra_vars_18_name" />
-        <param name="extra_vars_18_type" target="extra_vars_18_type" />
-        <param name="extra_vars_18_is_required" target="extra_vars_18_is_required" />
-        <param name="extra_vars_18_search" target="extra_vars_18_search" />
-        <param name="extra_vars_18_default" target="extra_vars_18_default" />
-        <param name="extra_vars_18_desc" target="extra_vars_18_desc" />
-        <param name="extra_vars_19_name" target="extra_vars_19_name" />
-        <param name="extra_vars_19_type" target="extra_vars_19_type" />
-        <param name="extra_vars_19_is_required" target="extra_vars_19_is_required" />
-        <param name="extra_vars_19_search" target="extra_vars_19_search" />
-        <param name="extra_vars_19_default" target="extra_vars_19_default" />
-        <param name="extra_vars_19_desc" target="extra_vars_19_desc" />
-        <param name="extra_vars_20_name" target="extra_vars_20_name" />
-        <param name="extra_vars_20_type" target="extra_vars_20_type" />
-        <param name="extra_vars_20_is_required" target="extra_vars_20_is_required" />
-        <param name="extra_vars_20_search" target="extra_vars_20_search" />
-        <param name="extra_vars_20_default" target="extra_vars_20_default" />
-        <param name="extra_vars_20_desc" target="extra_vars_20_desc" />
     </parameter>
     <response callback_func="completeInsertBoard">
         <tag name="error" />
diff --git a/modules/board/skins/xe_board/filter/insert_comment.xml b/modules/board/tpl/filter/insert_comment.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/insert_comment.xml
rename to modules/board/tpl/filter/insert_comment.xml
diff --git a/modules/board/tpl/filter/insert_grant.xml b/modules/board/tpl/filter/insert_grant.xml
deleted file mode 100644
index 7d95b83a6..000000000
--- a/modules/board/tpl/filter/insert_grant.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<filter name="insert_grant" module="board" act="procBoardAdminInsertGrant" confirm_msg_code="confirm_submit">
-    <form>
-        <node target="module_srl" required="true" />
-    </form>
-    <response callback_func="completeInsertGrant">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="page" />
-        <tag name="module_srl" />
-    </response>
-</filter>
diff --git a/modules/board/skins/xe_board/filter/search.xml b/modules/board/tpl/filter/search.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/search.xml
rename to modules/board/tpl/filter/search.xml
diff --git a/modules/board/skins/xe_board/filter/vote.xml b/modules/board/tpl/filter/vote.xml
similarity index 100%
rename from modules/board/skins/xe_board/filter/vote.xml
rename to modules/board/tpl/filter/vote.xml
diff --git a/modules/board/tpl/grant_list.html b/modules/board/tpl/grant_list.html
index 36f90bbbe..b0d8b0c53 100644
--- a/modules/board/tpl/grant_list.html
+++ b/modules/board/tpl/grant_list.html
@@ -1,39 +1,3 @@
 <!--#include("./header.html")-->
-<!--%import("filter/insert_grant.xml")-->
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl?$module_srl:$module_srls}" />
-
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->about_grant}</caption>
-<thead>
-<tr>
-    <th scope="col"><div>{$lang->grant}</div></th>
-    <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-</tr>
-</thead>
-
-<tbody>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true });return false;">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false });return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
-        </td>
-    </tr>
-</tbody>
-</table>
-</form>
+{$grant_content}
diff --git a/modules/board/tpl/header.html b/modules/board/tpl/header.html
index 071da9b9c..f735ecad9 100644
--- a/modules/board/tpl/header.html
+++ b/modules/board/tpl/header.html
@@ -1,13 +1,13 @@
 <!--%import("js/board_admin.js")-->
 
-<h3>{$lang->board} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->board} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_board)}</div>
 
 <!--@if($module_info)-->
 <div class="header4">
     <!--@if($module_info->mid)-->
-    <h4>{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
+    <h4 class="xeAdmin">{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
     <!--@end-->
 
     <ul class="localNavigation">
@@ -17,9 +17,11 @@
         <li><a href="{getUrl('act','')}">{$lang->cmd_back}</a></li>
         <!--@end-->
         <li <!--@if($act=='dispBoardAdminBoardInfo'||$act=='dispBoardAdminInsertBoard')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminBoardInfo')}">{$lang->cmd_view_info}</a></li>
-        <li <!--@if($act=='dispBoardAdminBoardAdditionSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminBoardAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
         <li <!--@if($act=='dispBoardAdminCategoryInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminCategoryInfo')}">{$lang->cmd_manage_category}</a></li>
+        <li <!--@if($act=='dispBoardAdminExtraVars')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminExtraVars')}">{$lang->extra_vars}</a></li>
+        <li <!--@if($act=='dispBoardAdminListSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminListSetup')}">{$lang->cmd_list_setting}</a></li>
         <li <!--@if($act=='dispBoardAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
+        <li <!--@if($act=='dispBoardAdminBoardAdditionSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminBoardAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
         <li <!--@if($act=='dispBoardAdminSkinInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispBoardAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>
     </ul>
 </div>
diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html
index 810c93f96..d142f966f 100644
--- a/modules/board/tpl/index.html
+++ b/modules/board/tpl/index.html
@@ -7,7 +7,7 @@
 
 <!-- 목록 -->
 <form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -16,7 +16,7 @@
             <div>
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="module_category_srl" class="w120">
+                <select name="module_category_srl" class="fullWidth">
                     <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>
@@ -30,9 +30,7 @@
         <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_view}</div></th>
-        <th scope="col"><div>{$lang->cmd_copy}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th scope="col" colspan="3"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
@@ -42,31 +40,37 @@
         <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
+                <!--@if($val->site_srl)-->
+                {$lang->virtual_site}
+                <!--@else-->
                 {$lang->not_exists}
+                <!--@end-->
             <!--@else-->
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view center"><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="copy center"><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="delete center"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="./?module=module&amp;act=dispModuleAdminCopyModule&amp;module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else-->-<!--@end--></td>
     </tr>
     <!--@end-->
 </tbody>
 </table>
 </form>
 
-<!-- 버튼 -->
-<div class="fl gap1">
-    <a href="#" onclick="doCartSetup('dispBoardAdminInsertBoard'); return false;" class="button"><span>{$lang->cmd_setup}</span></a>
-    <a href="#" onclick="doCartSetup('dispBoardAdminBoardAdditionSetup'); return false;" class="button"><span>{$lang->cmd_addition_setup}</span></a>
-    <a href="#" onclick="doCartSetup('dispBoardAdminGrantInfo'); return false;" class="button"><span>{$lang->cmd_manage_grant}</span></a>
-</div>
-<div class="fr gap1">
-    <a href="{getUrl('act','dispBoardAdminInsertBoard','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleAdditionSetup')}" onclick="doCartSetup(this.href); return false;" class="button red"><span>{$lang->cmd_addition_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+
+    <div class="fr">
+        <a href="{getUrl('act','dispBoardAdminInsertBoard','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
 </div>
 
 <!-- 페이지 네비게이션 -->
@@ -81,3 +85,5 @@
     <!--@end-->
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
+
+
diff --git a/modules/board/skins/xe_board/js/board.js b/modules/board/tpl/js/board.js
similarity index 94%
rename from modules/board/skins/xe_board/js/board.js
rename to modules/board/tpl/js/board.js
index afade30cd..f571d2d57 100644
--- a/modules/board/skins/xe_board/js/board.js
+++ b/modules/board/tpl/js/board.js
@@ -14,7 +14,15 @@ function completeDocumentInserted(ret_obj) {
 
     //alert(message);
 
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
+    var url;
+    if(!document_srl)
+    {
+        url = current_url.setQuery('mid',mid).setQuery('act','');
+    }
+    else
+    {
+        url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
+    }
     if(category_srl) url = url.setQuery('category',category_srl);
     location.href = url;
 }
diff --git a/modules/board/tpl/js/board_admin.js b/modules/board/tpl/js/board_admin.js
index b3d33fb2f..9709faa6a 100644
--- a/modules/board/tpl/js/board_admin.js
+++ b/modules/board/tpl/js/board_admin.js
@@ -57,29 +57,8 @@ function completeUpdateCategory(ret_obj) {
     location.href = url;
 }
 
-/* 권한 관련 */
-function completeInsertGrant(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-}
-
-/* 카테고리 이동 */
-function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
-    if(module_category_srl==-1) {
-        location.href = current_url.setQuery('act','dispModuleAdminCategory');
-        return false;
-    }
-    return true;
-}
-
-
 /* 일괄 설정 */
-function doCartSetup(act_type) {
+function doCartSetup(url) {
     var module_srl = new Array();
     jQuery('#fo_list input[name=cart]:checked').each(function() {
         module_srl[module_srl.length] = jQuery(this).val();
@@ -87,6 +66,75 @@ function doCartSetup(act_type) {
 
     if(module_srl.length<1) return;
 
-    var url = current_url.setQuery('act',act_type).setQuery('module_srl','').setQuery('module_srls',module_srl.join(','));
-    location.href = url;
-}
\ No newline at end of file
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
+
+/* 목록 설정 */
+function doInsertItem() {
+    var target_obj = xGetElementById('targetItem');
+    var display_obj = xGetElementById('displayItem');
+    if(!target_obj || !display_obj) return;
+
+    var text = target_obj.options[target_obj.selectedIndex].text;
+    var value = target_obj.options[target_obj.selectedIndex].value;
+
+    for(var i=0;i<display_obj.options.length;i++) if(display_obj.options[i].value == value) return;
+
+    var obj = new Option(text, value, true, true);
+    display_obj.options[display_obj.options.length] = obj;
+
+}
+function doDeleteItem() {
+    var sel_obj = xGetElementById('displayItem');
+    var idx = sel_obj.selectedIndex;
+    if(idx<0 || sel_obj.options.length<2) return;
+    sel_obj.remove(idx);
+    sel_obj.selectedIndex = idx-1;
+}
+function doMoveUpItem() {
+    var sel_obj = xGetElementById('displayItem');
+    var idx = sel_obj.selectedIndex;
+    if(idx<1 || !idx) return;
+
+    var text = sel_obj.options[idx].text;
+    var value = sel_obj.options[idx].value;
+
+    sel_obj.options[idx].text = sel_obj.options[idx-1].text;
+    sel_obj.options[idx].value = sel_obj.options[idx-1].value;
+    sel_obj.options[idx-1].text = text;
+    sel_obj.options[idx-1].value = value;
+    sel_obj.selectedIndex = idx-1;
+}
+function doMoveDownItem() {
+    var sel_obj = xGetElementById('displayItem');
+    var idx = sel_obj.selectedIndex;
+    if(idx>=sel_obj.options.length-1) return;
+
+    var text = sel_obj.options[idx].text;
+    var value = sel_obj.options[idx].value;
+
+    sel_obj.options[idx].text = sel_obj.options[idx+1].text;
+    sel_obj.options[idx].value = sel_obj.options[idx+1].value;
+    sel_obj.options[idx+1].text = text;
+    sel_obj.options[idx+1].value = value;
+    sel_obj.selectedIndex = idx+1;
+}
+
+function doSaveListConfig(module_srl) {
+    if(!module_srl) return;
+    var sel_obj = xGetElementById('displayItem');
+    var idx = sel_obj.selectedIndex;
+
+    var list = new Array();
+    for(var i=0;i<sel_obj.options.length;i++) list[list.length] = sel_obj.options[i].value;
+    if(list.length<1) return;
+    
+    var params = new Array();
+    params['module_srl'] = module_srl;
+    params['list'] = list.join(',');
+
+    var response_tags = new Array('error','message');
+
+    exec_xml('board','procBoardAdminInsertListConfig', params, function() { location.reload(); });
+}
diff --git a/modules/board/tpl/list_setting.html b/modules/board/tpl/list_setting.html
new file mode 100644
index 000000000..3c89139a9
--- /dev/null
+++ b/modules/board/tpl/list_setting.html
@@ -0,0 +1,34 @@
+<!--#include("./header.html")-->
+<!--%import("css/board.css")-->
+
+<h4 class="xeAdmin">{$lang->cmd_list_setting}</h4>
+<p class="summary">{$lang->about_list_config}</p>
+
+<div class="targetItem">
+    <strong>{$lang->list_target_item}</strong>
+    <select size="{count($extra_vars)}" name="targetItem" id="targetItem" ondblclick="doInsertItem(); return false;">
+    <!--@foreach($extra_vars as $key => $val)-->
+    <option value="{$key}">{$val->name}</option>
+    <!--@end-->
+    </select>
+</div>
+
+<div class="displayButton">
+    <a href="#" onclick="doInsertItem(); return false;" class="buttonSet buttonRight"><span>{$lang->cmd_insert}</span></a><br />
+    <a href="#" onclick="doDeleteItem(); return false;" class="buttonSet buttonLeft"><span>{$lang->cmd_delete}</span></a><br />
+    <a href="#" onclick="doMoveUpItem(); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><br />
+    <a href="#" onclick="doMoveDownItem(); return false;" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a>
+</div>
+
+<div class="displayItem">
+    <strong>{$lang->list_display_item}</strong>
+    <select size="{count($extra_vars)}" name="displayItem" id="displayItem" ondblclick="doDeleteItem();">
+    <!--@foreach($list_config as $key => $val)-->
+    <option value="{$key}">{$val->name}</option>
+    <!--@end-->
+    </select>
+
+    <div class="gap1">
+        <span class="button black strong"><button onclick="doSaveListConfig('{$module_srl}'); return false;" type="button">{$lang->cmd_save}</button></span>
+    </div>
+</div>
diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html
index 36fede0b1..0ad67b69f 100644
--- a/modules/board/tpl/skin_info.html
+++ b/modules/board/tpl/skin_info.html
@@ -1,149 +1,3 @@
 <!--#include("./header.html")-->
 
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="{$module_info->module}" />
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procBoardAdminUpdateSkinInfo" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide" >{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-<!--@if($skin_info->homepage)-->
-    <tr>
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
-    </tr><!--@end-->
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}&nbsp;</td>
-    </tr>
-<!--@if($skin_info->license || $skin_info->license_link)-->
-    <tr>
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-        </td>
-    </tr><!--@end-->
-<!--@if($skin_info->description)-->
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br(trim($skin_info->description))}</td>
-    </tr><!--@end-->
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
-
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td class="wide">
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-            <!--@if($val->screenshot)-->
-            {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-            <!--@else-->
-            {@ $_width = 200; $_height = 20; $_talign = "left"; }
-            <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-            <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>
-            <label for="colorset_{$key}">{$val->title}</label>
-            <!--@if($val->screenshot)-->
-            <br />
-            <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-            <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
-    <!--@end-->
-
-    <tr>
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
-    </tr>
-    </table>
-
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+{$skin_content}
diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
index c0495a929..d65f89429 100644
--- a/modules/comment/comment.admin.view.php
+++ b/modules/comment/comment.admin.view.php
@@ -19,48 +19,23 @@
         function dispCommentAdminList() {
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'list_order'; ///< 소팅 값
 
             $args->module_srl = Context::get('module_srl');
 
-            // mid목록을 구함
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
-
             // 목록 구함, comment->getCommentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
             $oCommentModel = &getModel('comment');
             $output = $oCommentModel->getTotalCommentList($args);
 
-            // 목록의 loop를 돌면서 mid를 구하기 위한 module_srl값을 구함
-            $comment_count = count($output->data);
-            if($comment_count) {
-                $module_srl_list = array();
-                foreach($output->data as $key => $val) {
-                    $module_srl = $val->module_srl;
-                    if(!in_array($module_srl, $module_srl_list)) $module_srl_list[] = $module_srl;
-                }
-                if(count($module_srl_list)) {
-                    $args->module_srls = implode(',',$module_srl_list);
-                    $mid_output = executeQuery('module.getModuleInfoByModuleSrl', $args);
-                    if($mid_output->data && !is_array($mid_output->data)) $mid_output->data = array($mid_output->data);
-                    for($i=0;$i<count($mid_output->data);$i++) {
-                        $mid_info = $mid_output->data[$i];
-                        $module_list[$mid_info->module_srl] = $mid_info;
-                    }
-                }
-            }
-
             // 템플릿에 쓰기 위해서 comment_model::getTotalCommentList() 의 return object에 있는 값들을 세팅
             Context::set('total_count', $output->total_count);
             Context::set('total_page', $output->total_page);
             Context::set('page', $output->page);
             Context::set('comment_list', $output->data);
             Context::set('page_navigation', $output->page_navigation);
-            Context::set('module_list', $module_list);
 
             // 템플릿 지정
             $this->setTemplatePath($this->module_path.'tpl');
@@ -73,7 +48,7 @@
         function dispCommentAdminDeclared() {
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'comment_declared.declared_count'; ///< 소팅 값
diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php
index a91565427..6d82c7c53 100644
--- a/modules/comment/comment.class.php
+++ b/modules/comment/comment.class.php
@@ -15,8 +15,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('comment', 'view', 'dispCommentAdminList');
-            $oModuleController->insertActionForward('comment', 'view', 'dispCommentAdminDeclared');
 
             // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
             $oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
@@ -47,8 +45,6 @@
             if(!$oDB->isColumnExists("comments","voted_count")) return true;
             if(!$oDB->isColumnExists("comments","notify_message")) return true;
 
-            if(!$oModuleModel->getActionForward('dispCommentAdminDeclared')) return true;
-
             // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) return true;
 
@@ -85,9 +81,6 @@
                 $oDB->addColumn("comments","notify_message", "char","1");
             }
 
-            if(!$oModuleModel->getActionForward('dispCommentAdminDeclared'))
-                $oModuleController->insertActionForward('comment', 'view', 'dispCommentAdminDeclared');
-
             // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
             if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) 
                 $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 68b5dd811..000bf8503 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -118,6 +118,9 @@
                 }
             }
 
+            // 로그인정보가 없고 사용자 이름이 없으면 오류 표시
+            if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
+
             if(!$obj->comment_srl) $obj->comment_srl = getNextSequence();
 
             // 순서를 정함
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index c867acf05..111e4c165 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -115,7 +115,7 @@
 
             // 변수 정리
             if($type) $title = "[".$type."] ";
-            $title .= cut_str(strip_tags($content), 10, '...');
+            $title .= cut_str(strip_tags($content), 30, '...');
             $content = sprintf('%s<br /><br />from : <a href="%s#comment_%s" onclick="window.open(this.href);return false;">%s</a>',$content, $oDocument->getPermanentUrl(), $this->get('comment_srl'), $oDocument->getPermanentUrl());
             $receiver_srl = $this->get('member_srl');
             $sender_member_srl = $logged_info->member_srl;
@@ -238,6 +238,11 @@
             return zdate($this->get('last_update'), $format);
         }
 
+        function getPermanentUrl() {
+            return getUrl('','document_srl',$this->get('document_srl')).'#comment_'.$this->get('comment_srl');
+        }
+
+
         function getUpdateTime() {
             $year = substr($this->get('last_update'),0,4);
             $month = substr($this->get('last_update'),4,2);
@@ -310,5 +315,95 @@
 
             return $signature;
         }
+
+        function thumbnailExists($width = 80, $height = 0, $type = '') {
+            if(!$this->comment_srl) return false;
+            if(!$this->getThumbnail($width, $height, $type)) return false;
+            return true;
+        }
+
+        function getThumbnail($width = 80, $height = 0, $thumbnail_type = '') {
+            // 존재하지 않는 문서일 경우 return false
+            if(!$this->comment_srl) return;
+
+            // 높이 지정이 별도로 없으면 정사각형으로 생성
+            if(!$height) $height = $width;
+
+            // 첨부파일이 없거나 내용중 이미지가 없으면 return false;
+            if(!$this->hasUploadedFiles() && !preg_match("!<img!is", $this->get('content'))) return;
+
+            // 문서 모듈의 기본 설정에서 Thumbnail의 생성 방법을 구함
+            if(!in_array($thumbnail_type, array('crop','ratio'))) $thumbnail_type = 'crop';
+
+            // 썸네일 정보 정의 
+            $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($this->comment_srl, 3));
+            $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
+            $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
+
+            // 썸네일 파일이 있을 경우 파일의 크기가 0 이면 return false 아니면 경로 return
+            if(file_exists($thumbnail_file)) {
+                if(filesize($thumbnail_file)<1) return false;
+                else return $thumbnail_url;
+            }
+
+            // 대상 파일
+            $source_file = null;
+            $is_tmp_file = false;
+
+            // 첨부된 파일중 이미지 파일이 있으면 찾음
+            if($this->hasUploadedFiles()) {
+                $file_list = $this->getUploadedFiles();
+                if(count($file_list)) {
+                    foreach($file_list as $file) {
+                        if($file->direct_download!='Y') continue;
+                        if(!preg_match("/\.(jpg|png|jpeg|gif|bmp)$/i",$file->source_filename)) continue;
+
+                        $source_file = $file->uploaded_filename;
+                        if(!file_exists($source_file)) $source_file = null;
+                        else break;
+                    }
+                }
+            }
+
+            // 첨부된 파일이 없으면 내용중 이미지 파일을 구함
+            if(!$source_file) {
+                $content = $this->get('content');
+                $target_src = null;
+                preg_match_all("!src=(\"|')([^\"' ]*?)(\"|')!is", $content, $matches, PREG_SET_ORDER);
+                $cnt = count($matches);
+                for($i=0;$i<$cnt;$i++) {
+                    $target_src = $matches[$i][2];
+                    if(preg_match('/\/(common|modules|widgets|addons|layouts)\//i', $target_src)) continue;
+                    else {
+                        if(!preg_match('/^(http|https):\/\//i',$target_src)) $target_src = Context::getRequestUri().$target_src;
+                        $tmp_file = sprintf('./files/cache/tmp/%d', md5(rand(111111,999999).$this->comment_srl));
+                        if(!is_dir('./files/cache/tmp')) FileHandler::makeDir('./files/cache/tmp');
+                        FileHandler::getRemoteFile($target_src, $tmp_file);
+                        if(!file_exists($tmp_file)) continue;
+                        else {
+                            list($_w, $_h, $_t, $_a) = @getimagesize($tmp_file);
+                            if($_w<$width || $_h<$height) continue;
+
+                            $source_file = $tmp_file;
+                            $is_tmp_file = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            $output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
+
+            if($is_tmp_file) FileHandler::removeFile($source_file);
+
+            // 썸네일 생성 성공시 경로 return
+            if($output) return $thumbnail_url;
+
+            // 차후 다시 썸네일 생성을 시도하지 않기 위해 빈 파일을 생성
+            else FileHandler::writeFile($thumbnail_file, '','w');
+
+            return;
+        }
+
     }
 ?>
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 261457a16..bb8783fcb 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -333,8 +333,8 @@
             $args->s_module_srl = $obj->module_srl;
 
             // 검색 옵션 정리
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
             if($search_target && $search_keyword) {
                 switch($search_target) {
                     case 'content' :
@@ -393,7 +393,7 @@
         function getCommentConfig($module_srl) {
             $oModuleModel = &getModel('module');
             $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-            if(!isset($comment_config->comment_count)) $comment_count->comment_count = 50;
+            if(!isset($comment_config->comment_count)) $comment_config->comment_count = 50;
             return $comment_config;
         }
 
diff --git a/modules/comment/conf/info.xml b/modules/comment/conf/info.xml
index 76ea86361..0b33a969b 100644
--- a/modules/comment/conf/info.xml
+++ b/modules/comment/conf/info.xml
@@ -2,7 +2,7 @@
 <module version="0.2">
     <title xml:lang="ko">댓글</title>
     <title xml:lang="jp">コメント</title>
-    <title xml:lang="zh-CN">评论</title>
+    <title xml:lang="zh-CN">评论管理</title>
     <title xml:lang="en">Comment</title>
     <title xml:lang="es">Commentarios</title>
     <title xml:lang="ru">Комментарии</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理討論板或部落格評論的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>utility</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/comment/conf/module.xml b/modules/comment/conf/module.xml
index deb521861..9775f95cc 100644
--- a/modules/comment/conf/module.xml
+++ b/modules/comment/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="getCommentMenu" type="model" standalone="true"/>
         <action name="dispCommentAdminList" type="view" admin_index="true" standalone="true" />
diff --git a/modules/comment/lang/zh-TW.lang.php b/modules/comment/lang/zh-TW.lang.php
index 56dd113c7..36ab7a284 100644
--- a/modules/comment/lang/zh-TW.lang.php
+++ b/modules/comment/lang/zh-TW.lang.php
@@ -27,6 +27,6 @@
         'homepage' => '主頁',
         'regdate' => '日期',
         'last_update' => '最後更新',
-        'ipaddress' => 'IP 位址',
+        'ipaddress' => 'IP位址',
     );
 ?>
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index 555311ba2..a660c769e 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -6,7 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="module_srl" var="s_module_srl" />
+        <condition operation="in" column="module_srl" var="s_module_srl" />
         <group pipe="and">
             <condition operation="like" column="content" var="s_content" pipe="or" />
             <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 2245ff497..dfd9843b6 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -1,63 +1,59 @@
 <!--%import("filter/delete_checked.xml")-->
 <!--#include("./header.html")-->
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+<!-- 검색 -->
+<div class="fl">
+    <form action="./" method="get" class="adminSearch">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+        <fieldset>
+            <select name="search_target">
+                <option value="">{$lang->search_target}</option>
+                <!--@foreach($lang->search_target_list as $key => $val)-->
+                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
+            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
+        </fieldset>
+    </form>
 </div>
 
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
+<!-- 모듈 선택 -->
+<div class="fr">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
+    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_comment}" /></span>
+</div>
+
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable clear">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide">
-            <div>
-                    <select name="module_srl" id="module_srl">
-                        <option value="">{$lang->module}</option>
-                        <!--@foreach($mid_list as $key => $val)-->
-                        <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
-                        <!--@end-->
-                </select>
-                <input type="button" name="go_button" id="go_button" value="GO" class="buttonTypeGo" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;"/>
-            </div>
-        </th>
+        <th scope="col" class="wide"><div>{$lang->comment}</div></th>
         <th scope="col"><div>{$lang->nick_name}</div></th>
         <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->last_update}</div></th>
         <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->cmd_move}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($comment_list as $no => $val)-->
     <tr>
-        <td rowspan="2" class="number center">{$no}</td>
-        <td colspan="2"><a href="./?mid={$module_list[$val->module_srl]->mid}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$val->module_srl]->browser_title)}</a>&nbsp;</td>
+        <td class="number center">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->comment_srl}" /></td>
+        <td class="left"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;">{cut_str(htmlspecialchars(strip_tags($val->content)),200,'...')}</a></td>
         <td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
         <td class="date center nowrap">{(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>
-        <td class="date center nowrap"><!--@if($val->last_update)-->{(zdate($val->last_update, "Y-m-d\nH:i:s"))}<!--@else-->&nbsp;<!--@end--></td>
-        <td class="number center nowrap">{$val->ipaddress}</td>
-        <td class="view center"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;">{$lang->cmd_move}</a></td>
-    </tr>
-    <tr>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->comment_srl}" /></td>
-        <td colspan="6" class="left">
-            {cut_str(htmlspecialchars(strip_tags($val->content)),100,'...')}
-        </td>
+        <td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="8">
-            <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
-            <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_comment}" /></span>
-        </td>
-    </tr>
 </tbody>
 </table>
 
@@ -76,21 +72,3 @@
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
 </div>
 
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <fieldset>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="{getUrl('','module',$module,'act',$act)}" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html
index 6b88410e6..b2a03b802 100644
--- a/modules/comment/tpl/comment_module_config.html
+++ b/modules/comment/tpl/comment_module_config.html
@@ -3,19 +3,19 @@
 <form action="./" method="post" onsubmit="return procFilter(this, insert_comment_module_config)">
 <input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->comment}</caption>
+    <h4 class="xeAdmin">{$lang->comment}</h4>
+    <p class="summary">{$lang->about_comment_count}</p>
+    <table cellspacing="0" class="rowTable">
     <tr>    
         <th><div>{$lang->comment_count}</div></th>
         <td class="wide">
             <input type="text" name="comment_count" value="{$comment_config->comment_count}" class="inputTypeText w80" />
-            <p>{$lang->about_comment_count}</p>
         </td>
     </tr>
     <tr>
-        <td class="right" colspan="2">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}"/></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html
index 4fc17ae10..aaa6990a5 100644
--- a/modules/comment/tpl/declared_list.html
+++ b/modules/comment/tpl/declared_list.html
@@ -1,16 +1,12 @@
 <!--%import("filter/delete_checked.xml")-->
 <!--#include("header.html")-->
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
-
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
@@ -19,28 +15,26 @@
         <th scope="col"><div>{$lang->date}</div></th>
         <th scope="col"><div>{$lang->cmd_declare}</div></th>
         <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->cmd_move}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($comment_list as $no => $oComment)-->
     <tr>
-        <td class="number center">{$no}</td>
-        <td><input type="checkbox" name="cart" value="{$oComment->get('comment_srl')}" /> {$oComment->getSummary(100)}</td>
+        <td>{$no}</td>
+        <td><input type="checkbox" name="cart" value="{$oComment->get('comment_srl')}" /> <a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$oComment->getSummary(100)}</a></td>
         <td><span class="member_{$oComment->getMemberSrl()}">{$oComment->getNickName()}</span></td>
-        <td class="date nowrap center">{$oComment->getRegdate("Y-m-d")}</td>
-        <td class="alert center number"><strong>{$oComment->get('declared_count')}</strong></td>
-        <td class="number center">{$oComment->get('ipaddress')}</td>
-        <td class="view center"><a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$lang->cmd_move}</a></td>
+        <td>{$oComment->getRegdate("Y-m-d")}</td>
+        <td><strong>{$oComment->get('declared_count')}</strong></td>
+        <td>{$oComment->get('ipaddress')}</td>
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="7" class="right">
-            <a href="#" onclick="doCancelDeclare();return false;" class="button"><span>{$lang->cmd_cancel_declare}</span></a>
+        <th colspan="6" class="button">
+            <a href="#" onclick="doCancelDeclare();return false;" class="button strong black"><span>{$lang->cmd_cancel_declare}</span></a>
             <a href="javascript:XE.checkboxToggleAll({ checked:true })" class="button"><span>{$lang->cmd_select_all}</span></a>
             <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
             <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_comment}" /></span>
-        </td>
+        </th>
     </tr>
 </tbody>
 </table>
diff --git a/modules/comment/tpl/header.html b/modules/comment/tpl/header.html
index 88670b0b2..0c77ba665 100644
--- a/modules/comment/tpl/header.html
+++ b/modules/comment/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/comment_admin.js")-->
 
-<h3>{$lang->comment} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->comment} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
     <ul class="localNavigation">
diff --git a/modules/comment/tpl/js/comment_admin.js b/modules/comment/tpl/js/comment_admin.js
index 57b99158c..7c964af60 100644
--- a/modules/comment/tpl/js/comment_admin.js
+++ b/modules/comment/tpl/js/comment_admin.js
@@ -12,3 +12,7 @@ function doCancelDeclare() {
 
     exec_xml('comment','procCommentAdminCancelDeclare', params, function() { location.reload(); });
 }
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    location.href = current_url.setQuery('module_srl',module_srl);
+}
diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php
index 73d8d6a99..bcf44e2ec 100644
--- a/modules/communication/communication.class.php
+++ b/modules/communication/communication.class.php
@@ -13,14 +13,6 @@
         function moduleInstall() {
             // 새쪽지 알림을 위한 임시 파일 저장소 생성
             FileHandler::makeDir('./files/member_extra_info/new_message_flags');
-
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationAdminConfig');
-
-            $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationMessages');
-            $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationFriend');
-
             return new Object();
         }
 
@@ -29,14 +21,6 @@
          **/
         function checkUpdate() {
             if(!is_dir("./files/member_extra_info/new_message_flags")) return true;
-
-            $oModuleModel = &getModel('module');
-
-            if(!$oModuleModel->getActionForward('dispCommunicationAdminConfig')) return true;
-
-            if(!$oModuleModel->getActionForward('dispCommunicationMessages')) return true;
-            if(!$oModuleModel->getActionForward('dispCommunicationFriend')) return true;
-
             return false;
         }
 
@@ -46,19 +30,6 @@
         function moduleUpdate() {
             if(!is_dir("./files/member_extra_info/new_message_flags")) 
                 FileHandler::makeDir('./files/member_extra_info/new_message_flags');
-
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            if(!$oModuleModel->getActionForward('dispCommunicationAdminConfig')) 
-                $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationAdminConfig');
-
-            if(!$oModuleModel->getActionForward('dispCommunicationMessages')) 
-                $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationMessages');
-
-            if(!$oModuleModel->getActionForward('dispCommunicationFriend')) 
-                $oModuleController->insertActionForward('communication', 'view', 'dispCommunicationFriend');
-
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/communication/conf/info.xml b/modules/communication/conf/info.xml
index 34a92e53c..ff6b94be0 100644
--- a/modules/communication/conf/info.xml
+++ b/modules/communication/conf/info.xml
@@ -12,7 +12,7 @@
     <description xml:lang="zh-TW">管理線上會員間短訊及好友功能的模組。</description>
     <version>0.1</version>
     <date>2008-05-30</date>
-    <category>utility</category>
+    <category>member</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/communication/conf/module.xml b/modules/communication/conf/module.xml
index 8f6a0b3a1..f219a0d33 100644
--- a/modules/communication/conf/module.xml
+++ b/modules/communication/conf/module.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
-
         <action name="dispCommunicationMessages" type="view" standalone="true" />
         <action name="dispCommunicationSendMessage" type="view" standalone="true" />
         <action name="dispCommunicationNewMessage" type="view" standalone="true" />
diff --git a/modules/communication/lang/ko.lang.php b/modules/communication/lang/ko.lang.php
index 387580adc..4a42bbabb 100644
--- a/modules/communication/lang/ko.lang.php
+++ b/modules/communication/lang/ko.lang.php
@@ -21,7 +21,7 @@
         'T' => '보관함',
     );
 
-    $lang->readed_date = "읽은 시간"; 
+    $lang->readed_date = '읽은 시간'; 
 
     $lang->sender = '보낸이';
     $lang->receiver = '받는이';
@@ -33,7 +33,7 @@
     $lang->cmd_view_friend = '친구 보기';
     $lang->cmd_add_friend = '친구 등록';
     $lang->cmd_view_message_box = '쪽지함 보기';
-    $lang->cmd_store = "보관";
+    $lang->cmd_store = '보관';
     $lang->cmd_add_friend_group = '친구 그룹 추가';
     $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
 
diff --git a/modules/communication/lang/zh-CN.lang.php b/modules/communication/lang/zh-CN.lang.php
index 0963c54fc..0f8360d43 100644
--- a/modules/communication/lang/zh-CN.lang.php
+++ b/modules/communication/lang/zh-CN.lang.php
@@ -30,9 +30,9 @@
 
     $lang->cmd_send_message = '发送短消息';
     $lang->cmd_reply_message = '回复短消息';
-    $lang->cmd_view_friend = '查看好友';
+    $lang->cmd_view_friend = '我的好友';
     $lang->cmd_add_friend = '加为好友';
-    $lang->cmd_view_message_box = '查看短信箱';
+    $lang->cmd_view_message_box = '短信箱';
     $lang->cmd_store = "保管";
     $lang->cmd_add_friend_group = '添加好友组';
     $lang->cmd_rename_friend_group = '修改好友组名称';
diff --git a/modules/communication/skins/default/add_friend.html b/modules/communication/skins/default/add_friend.html
index 385054afa..8cd739c1c 100644
--- a/modules/communication/skins/default/add_friend.html
+++ b/modules/communication/skins/default/add_friend.html
@@ -1,49 +1,44 @@
-<!--#include("./common_header.html")-->
 <!--%import("filter/add_friend.xml")-->
+<!--%import("js/communication.js")-->
 
-<div class="memberSmallBox w500pop">
-    <div class="header">
-        <h3>{$lang->cmd_add_friend}</h3>
-    </div>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_add_friend}</h3>
+</div>
 
-    <form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
-    <input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
+<form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
+<input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
 
-        <div class="complex">
-            <table cellspacing="0" class="leftHeaderType">
-            <col width="110" />
-            <col />
-            <tr>
-                <th scope="row">{$lang->user_id}</th>
-                <td>{$target_info->user_id}</td>
-            </tr>
-            <tr>
-                <th scope="row">{$lang->user_name}</th>
-                <td>{$target_info->user_name}</td>
-            </tr>
-            <tr>
-                <th scope="row">{$lang->nick_name}</th>
-                <td><div class="member_{$target_info->member_srl}">{$target_info->nick_name}</div></td>
-            </tr>
-            </table>
+<div id="popBody">
 
-            <div class="group">
+        <table cellspacing="0" class="rowTable">
+        <tr>
+            <th><div>{$lang->user_id}</div></th>
+            <td class="wide">{$target_info->user_id}</td>
+        </tr>
+        <tr>
+            <th><div>{$lang->user_name}</div></th>
+            <td>{$target_info->user_name}</td>
+        </tr>
+        <tr>
+            <th><div>{$lang->nick_name}</div></th>
+            <td><div class="member_{$target_info->member_srl}">{$target_info->nick_name}</div></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->friend_group}</div></th>
+            <td colspan="2">
                 <select name="friend_group_srl" class="fl">
                     <option value="">{$lang->default_friend_group}</option>
                     <!--@foreach($friend_group_list as $key => $val)-->
                     <option value="{$val->friend_group_srl}">{$val->title}</option>
                     <!--@end-->
-                </select>
-                <span class="fr"><a href="{getUrl('act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="button"><span>{$lang->cmd_add_friend_group}</span></a></span>
-            </div>
-        </div>
-
-        <div class="tCenter help">
-            <span class="button"><input type="submit" value="{$lang->cmd_add_friend}" /></span>
-            <a href="#" onclick="window.close();return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        </div>
-
-    </form>
+                </select> <a href="{getUrl('act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_add_friend_group}</span></a></span>
+            </td>
+        </tr>
+        </table>
 </div>
 
-<!--#include("./common_footer.html")-->
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_add_friend}" /></span>
+</div>
+
+</form>
diff --git a/modules/communication/skins/default/add_friend_group.html b/modules/communication/skins/default/add_friend_group.html
index 9749500cb..8283a8740 100644
--- a/modules/communication/skins/default/add_friend_group.html
+++ b/modules/communication/skins/default/add_friend_group.html
@@ -1,34 +1,30 @@
-<!--#include("./common_header.html")-->
 <!--%import("filter/add_friend_group.xml")-->
+<!--%import("js/communication.js")-->
 
-<div class="memberSmallBox w500pop">
-    <form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
-    <input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
+<div id="popHeader">
+    <h3 class="xeAdmin">
+        <!--@if($friend_group->friend_group_srl)-->
+            {$lang->cmd_rename_friend_group}
+        <!--@else-->
+            {$lang->cmd_add_friend_group}
+        <!--@end-->
+    </h3>
+</div>
+<form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
+<input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
 
-        <div class="header">
-            <h3>
-                <!--@if($friend_group->friend_group_srl)-->
-                    {$lang->cmd_rename_friend_group}
-                <!--@else-->
-                    {$lang->cmd_add_friend_group}
-                <!--@end-->
-            </h3>
-        </div>
+<div id="popBody">
 
         <div class="text">
             <p>{$lang->msg_insert_group_name}</p>
             <input name="title" type="text" class="inputTypeText" value="{htmlspecialchars($friend_group->title)}"/>
         </div>
-
-        <div class="help tCenter">
-            <!--@if($friend_group->friend_group_srl)-->
-            <span class="button"><input type="submit" value="{$lang->cmd_modify}" /></span>
-            <!--@else-->
-            <span class="button"><input type="submit" value="{$lang->cmd_insert}" /></span>
-            <!--@end-->
-            <a href="#" onclick="window.close();return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        </div>
-    </form>
 </div>
-
-<!--#include("./common_footer.html")-->
+<div id="popFooter">
+    <!--@if($friend_group->friend_group_srl)-->
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" /></span>
+    <!--@else-->
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_insert}" /></span>
+    <!--@end-->
+</div>
+</form>
diff --git a/modules/communication/skins/default/common_header.html b/modules/communication/skins/default/common_header.html
index 622f194bf..7eaeb6c65 100644
--- a/modules/communication/skins/default/common_header.html
+++ b/modules/communication/skins/default/common_header.html
@@ -1,35 +1,11 @@
 <!--%import("js/communication.js")-->
+<!--%import("css/default.css")-->
 
-<!--%import("css/common.css")-->
-<!--@if($communication_config->colorset=="purple")-->
-    <!--%import("css/purple.css")-->
-<!--@elseif($communication_config->colorset=="green")-->
-    <!--%import("css/green.css")-->
-<!--@elseif($communication_config->colorset=="red")-->
-    <!--%import("css/red.css")-->
-<!--@elseif($communication_config->colorset=="cyan")-->
-    <!--%import("css/cyan.css")-->
-<!--@elseif($communication_config->colorset=="black")-->
-    <!--%import("css/black.css")-->
-<!--@else-->
-    <!--%import("css/white.css")-->
-<!--@end-->
-
-<div id="memberModule">
-
-    <!--@if($member_title)-->
-    <div class="boardHeader">
-        <h3>{$member_title}</h3>
-
-        <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
-        <div class="member_option">
-            <select name="act" id="selected_act">
-                <!--@foreach($logged_info->menu_list as $key => $val)-->
-                <option value="{$key}" <!--@if($key == $act)-->selected="selected"<!--@end-->>{Context::getLang($val)}</option>
-                <!--@end-->
-            </select>
-            <a href="#" onclick="location.href=current_url.setQuery('act', xGetElementById('selected_act').options[xGetElementById('selected_act').selectedIndex].value); return false;"><img src="./images/button_go.gif" border="0" alt="" class="button_go" /></a>
-        </div>
+<div id="communicationModule">
+    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
+    <ul class="localNavigation">
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+        <li <!--@if($key == $act)-->class="on"<!--@end-->><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
         <!--@end-->
-    </div>
+    </ul>
     <!--@end-->
diff --git a/modules/communication/skins/default/css/black.css b/modules/communication/skins/default/css/black.css
deleted file mode 100644
index 1be682e2b..000000000
--- a/modules/communication/skins/default/css/black.css
+++ /dev/null
@@ -1,59 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border:none; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-/* button */
-a.button,
-a.button span,
-span.button,
-span.button button,
-span.button input { background-image:url(../../../../../common/tpl/images/buttonBlack.gif); color:#fff;}
-
-.inputTypeText { background-color:transparent !important; color:#AAAAAA !important; }
-.inputTypeText:hover, .inputTypeText:focus { background-color:transparent; color:#AAAAAA; }
-
-/* replace color */
-.memberSmallBox { border:1px solid #888888; }
-.memberSmallBox .header { background:transparent url("../images/black/bgH3.gif") no-repeat left bottom; }
-.memberSmallBox .header h3 { background:transparent url("../images/black/lineH3.gif") no-repeat right bottom; color:#888888; border-bottom:3px solid #888888; }
-.memberSmallBox .openid_user_id { color:#AAAAAA; background:transparent url("../images/black/openid_input_bg.gif") no-repeat left 50% !important; }
-.memberSmallBox .help { background-color:transparent; }
-
-.readMessage { background:#000; border:1px solid #444444;}
-.readMessage .messageHeader h4 { color:#BBBBBB; }
-.readMessage .messageBody a { color:#BBBBBB;}
-.readMessage .deleteOrKeep { background:#282829; border-top:1px solid #444444;}
-
-.memberInfoTable tr.first-child th, .memberInfoTable tr.first-child td { background-color:transparent; color:#AAAAAA; }
-.memberInfoTable tr th, .memberInfoTable tr td { background-color:transparent; color:#AAAAAA; }
-.memberInfoTable td input { background-color:transparent; color:#AAAAAA; }
-.memberInfoTable caption  { color:#AAAAAA; }
-div.checkValue { color:#BBBBBB !important; }
-
-.boardHeader { border:1px solid #888888; }
-.boardHeader { background:transparent url("../images/black/bgH3.gif") no-repeat left bottom; }
-.boardHeader h3 { border:none; background:transparent url("../images/black/lineH3.gif") no-repeat right bottom; color:#888888; border-bottom:3px solid #888888; }
-
-table.list { background:#000; border:1px solid #000000 !important; }
-table.list th { background:#282829 url("../images/black/lineBoardListTh.gif") no-repeat left bottom; border:1px solid #444444 !important; color:#AAAAAA; }
-table.list tr { background-color:transparent !important; }
-table.list tr td.title { color:#BBBBBB !important; }
-table.list tr td.title a { color:#BBBBBB !important; }
-table.list tr td { border-top:1px solid #888888 !important; }
-table .list tr td, table.list tr td * { color:#BBBBBB; }
-
-/* Pagination*/
-.pagination a, .pagination strong{ color:#888; }
-.pagination a:hover, .pagination a:active, .pagination a:focus{ background-color:#555 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination.a1 a, .pagination.a1 strong{ background:#000; border-left:1px solid #555; border-right:1px solid #666; color:#888;}
-.pagination.a1 a.prev, .pagination.a1 a.prevEnd, .pagination.a1 a.next, .pagination.a1 a.nextEnd { background:#000; }
-
-.pagination.a2 a, .pagination.a2 strong{ background:#000; border-left:1px solid #555; border-right:1px solid #666; color:#888; }
-.pagination.a2 a.prev, .pagination.a2 a.prevEnd, .pagination.a2 a.next, .pagination.a2 a.nextEnd { background:#000; }
-
-.memberSmallBox .leftHeaderType th { background:transparent; color:#AAAAAA; }
-.memberSmallBox .leftHeaderType td { color:#AAAAAA; }
-
-#popup_content { background-color:#000000; }
diff --git a/modules/communication/skins/default/css/common.css b/modules/communication/skins/default/css/common.css
deleted file mode 100644
index 53c218185..000000000
--- a/modules/communication/skins/default/css/common.css
+++ /dev/null
@@ -1,235 +0,0 @@
-@charset "utf-8";
-
-/* common */
-.memberSmallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
-.memberSmallBox fieldset { border:0; margin:0; }
-
-.memberSmallBox.w400 { width:400px;}
-.memberSmallBox.w500 { width:500px;}
-
-.memberSmallBox.w400pop { width:400px; margin:0; padding:0;}
-.memberSmallBox.w500pop { width:500px; margin:0; padding:0;}
-.memberSmallBox.w600pop { width:600px; margin:0; padding:0;}
-
-.memberSmallBox .header { position:relative; _width:100%; background:#ffffff url(../images/common/bgH3.gif) no-repeat left bottom; overflow:hidden;}
-
-.boardInformation { font:normal 11px Tahoma; width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666; height:28px;}
-.boardInformation strong { font:bold 11px Tahoma; color:#ff6600;}
-
-.boardHeader { position:relative; _width:100%; border-top:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;}
-.boardHeader .member_option { float:right; position:relative; top:0.5em; right:1em; }
-.boardHeader select { vertical-align:bottom; }
-.boardHeader input { vertical-align:bottom; _padding-bottom:1px;}
-.boardHeader .essential { position:absolute; top:1.5em; right:1em; color:#54564b; font-size:.9em;}
-.boardHeader .essential:first-letter { color:#ff0000;}
-
-/* list */
-.list { width:100%; border:1px solid #e0e1db; }
-
-.list thead tr th { width:10px; padding:8px !important; }
-.list thead tr th div { white-space:nowrap; margin:0;}
-.list thead tr th.wide { width:100%; }
-.list thead tr th.half_wide { width:50%; }
-.list tbody tr td { white-space:normal; padding:5px; }
-.list tbody tr td.nowrap { white-space:nowrap !important; }
-
-.list tr:first-child td, .list tr.first-child td { border-top:1px solid #e0e1db; white-space:nowrap;}
-.list tr.bg1 { background:#ffffff}
-.list tr.bg2 { background:#fbfbfb;}
-.list th { color:#3e3f3e; font-weight:white; border-bottom:1px solid #ffffff;  background:#ffffff url(../images/common/lineBoardListTh.gif) no-repeat left bottom; white-space:nowrap;}
-.list th a { color:#3e3f3e;}
-.list th:first-child, .list th.first-child { background-position:-3px bottom; border-left:1px solid #ffffff;}
-.list th select, .list th input { vertical-align:middle;}
-.list td { border-top:1px solid #eff0ed; height:35px;}
-.list td.registDate { font:.8em Tahoma; color:#999999; text-align:center;}
-.list td.num { font:.8em Tahoma; color:#999999; text-align:center;}
-.list td.check { text-align:center;}
-.list td.user { color:#333333; font-size:.9em; text-align:left;}
-.list td.user a { color:#333333;}
-.list td.userId { font:.9em Tahoma;}
-.list td.userNick { font-size:.9em; color:#999999;}
-.list td.sendMessage { text-align:center; padding:0;}
-.list td.sendMessage .buttonFixedLeft { float:left; position:relative; margin-left:1em;}
-.list td input { _margin:-3px;}
-.list td.title { text-align:left; }
-.list td.title.bold { font-size:1.2em; font-weight:bold;}
-.list td.title.bold a { position:relative; top:.3em;}
-.list td.title * { vertical-align:middle;} 
-.list td.title, .list td.title a { color:#444444; text-decoration:none;}
-.list td.title a:visited { color:#777777; text-decoration:none;}
-.list td.checkDate { font:.8em Tahoma; color:#333333; text-align:center;}
-.list td.subject { font-size:1em; text-align:left; color:#555555; }
-.list td.subject a { text-decoration:none; color:#555555; }
-.memberSelect { margin-top:2px; }
-
-.saved_content { margin-top:1em; padding-top:1em; border-top:1px dotted #DDDDDD; }
-
-/* login */
-.memberSmallBox .login { border:none; padding:2em 0 1.5em 2em;}
-.memberSmallBox .login legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
-.memberSmallBox .login dl { margin:0; padding:0; overflow:hidden; float:left; margin-right:10px; width:250px;}
-.memberSmallBox .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px;}
-.memberSmallBox .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; }
-.memberSmallBox .login .keep { clear:both; white-space:nowrap; margin-left:100px;}
-.memberSmallBox .login .keep input { vertical-align:middle;}
-.memberSmallBox .login .keep label { margin:0; padding:0; font-size:11px; color:#999999;}
-.memberSmallBox .openid_user_id { background: url(../images/openid_input_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;}
-.memberSmallBox .help { background:#f5f5f3; color:#666666; border-top:1px solid #eaebe7; overflow:hidden; padding:1.1em; }
-
-/* logout */
-.memberSmallBox .text { color:#54564b; text-align:center; padding:4em 2em 5em 2em;}
-.memberSmallBox .text p { margin:0; padding:0; margin-bottom:.5em;}
-
-/* friend */
-.friendNum { float:left; background:url(../images/common/iconFriend.gif) no-repeat .5em .4em; padding:.4em 0 0 2em;}
-.friendNum strong { font:bold 11px Tahoma; color:#ff6600;}
-
-/* message */
-.readMessage { background:#FFF; border:1px solid #e0e1db; border-top:none; margin-bottom:2em;}
-.readMessage .messageHeader { padding:1.5em; height:1em; overflow:hidden;}
-.readMessage .messageHeader h4 { margin:0; padding:0; float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;}
-.readMessage .messageHeader address { float:right; white-space:nowrap;}
-.readMessage .messageHeader address em { font-size:1em; font-style:white; color:#333333; margin-right:.3em; float:left;}
-.readMessage .messageHeader address em a { color:#333333;}
-.readMessage .messageHeader address .date { font:.8em Tahoma; color:#999999; margin-left:10px;}
-.readMessage .messageBody { border:1px solid #e0e1db; margin:0 1.5em 1.5em 1.5em; padding:1em; color:#666666;}
-.readMessage .deleteOrKeep { padding:.5em 0; overflow:hidden; background:#f5f5f3; border-top:1px solid #eaebe7; _width:100%;}
-.messageSetup { float:left; overflow:hidden; }
-.instantMessage { float:right; overflow:hidden;}
-.instantMessage li { float:left; padding:0 .8em 0 .8em; margin-left:-1px; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left center; list-style:none; }
-.instantMessage li a { text-decoration:none; display:block; float:left; height:1em; height:1.1em; overflow:hidden; font-size:1em; white-space:nowrap; color:#666666; padding-left:1.8em; background:url(../images/common/iconInstantMessage.gif) no-repeat left top;}
-.instantMessage li.on a { background-position:left -14px; font-weight:bold;}
-.instantMessage li a strong { color:#ff6600;}
-
-/* member info */
-.memberInfoTable { width:100%; border:1px solid #e0e1db; margin-bottom:10px;}
-.memberInfoTable caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/common/iconH3.gif) no-repeat .5em 2em;}
-.memberInfoTable tr.first-child th, .memberInfoTable tr.first-child td { border-top:none;}
-.memberInfoTable th, .memberInfoTable td { border-top:1px solid #eaebe7; padding:.5em;}
-.memberInfoTable th { background:#f5f5f3; text-align:left; padding:.5em 1em;}
-.memberInfoTable td { border-left:1px solid #eaebe7;}
-.memberInfoTable td input { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1em; line-height:1em; background:#fbfbfb; vertical-align:middle; margin-right:.5em; margin-bottom:.5em; color:#666666;}
-.memberInfoTable td input.radio, .memberInfoTable td input.check { border:none; padding:0; margin:0; background:none; margin-top:.4em;}
-.memberInfoTable td input.w4em { width:4em;}
-.memberInfoTable td input.w2em { width:2em;}
-.memberInfoTable td select { margin-right:.5em;}
-.memberInfoTable td checkbox { border:0; }
-.memberInfoTable td .fl { margin-right:.5em;}
-.memberInfoTable td br { clear:both;}
-.memberInfoTable td p { clear:both; margin:0; padding:0; font-size:.9em; color:#999999; padding-top:.5em; margin-right:.5em;}
-.memberInfoTable td label { color:#3f4040; padding-top:.3em; margin-right:.5em;}
-.memberInfoTable td ul { list-style:none; }
-.memberInfoTable td .checkbox { border:none; }
-
-/* 아이디, 이름, 이메일 주소 중복 체크후 중복되면 출력되는 메세지의 className */
-.memberInfoTable td .checkValue { margin-top:5px; font-weight:bold; color:#444444; }
-
-/* modify/ insert member info */
-.memberImage { clear:both; }
-.memberImage .info { margin-bottom:1.5em; float:left; margin-right:1em;}
-.memberImage .form { float:left; }
-.memberImage .form input { height:1.5em; margin:0 .3em 0 0; padding:0;}
-
-.checkbox li {  float:left; margin-right:2em; }
-.checkbox li input {  border:none; } 
-
-.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; }
-
-.krZip .address2 { clear:both; margin-top:10px;}
-
-.extendDesc { clear:both; margin-top:0; font-size:.9em; color:#999999; }
-
-.extendPublic { clear:both; margin-top:5px; padding:0; font-size:.9em; color:#999999; }
-.extendPublic input { padding:0; margin:0; }
-
-.publicItem { display:block; margin-top:5px;}
-.publicItem input { margin:0; padding:0;}
-.publicItem label { font-weight:normal; margin:0; padding:0; color:#666666;}
-span.publicItem { display:inline; margin:0; font-weight:normal; color:#666666; }
-span.privateItem { display:inline; margin:0; font-weight:normal; color:#666666; }
-
-.agreementBox { border:1px solid #AAAAAA; margin:.5em 0 0 0; padding:1em; border-bottom:none; height:200px; overflow-y:scroll;}
-.agreementButton { background-color:#EEEEEE; padding:1em; border:1px solid #AAAAAA; border-top:none;}
-
-/* popup common */
-.memberSmallBox .complex { padding:1.5em 2em 2em 2em;}
-.memberSmallBox .leftHeaderType { border-top:1px solid #e0e1db; border-left:1px solid #e0e1db; width:100%;}
-.memberSmallBox .leftHeaderType th, .memberSmallBox .leftHeaderType td { border-right:1px solid #e0e1db; border-bottom:1px solid #e0e1db; padding:.8em 1em .6em 1em;}
-.memberSmallBox .leftHeaderType th { color:#333333; text-align:left; background:#f5f5f3;}
-.memberSmallBox .leftHeaderType td { color:#444444;}
-.memberSmallBox .group { border:1px solid #e0e1db; border-width:1px 0; overflow:hidden; padding:.5em 0; margin-top:.7em; height:23px;}
-.memberSmallBox .group select { width:11em; margin-top:1px;}
-.memberSmallBox .editor { margin:10px 0 0 0; _height:400px; }
-
-/* password change */
-.memberSmallBox .pwModify { border:none;}
-.memberSmallBox .pwModify legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
-.memberSmallBox .pwModify input { width:9em;}
-.memberSmallBox .pwModify br { display:block; margin-bottom:.2em}
-.memberSmallBox .pwModify p { margin:0; padding:0; text-align:center; margin-top:1em; color:#54564b;}
-
-/* Own Document */
-img.button_go { position:relative; bottom:-4px; }
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/common/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/common/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-.pagination.a2 a,
-.pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-.pagination.a2 a.prev{ padding-left:10px; background:#fff url(../images/common/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../images/common/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a2 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
-.pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-.pagination.b1 a,
-.pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-.pagination.b1 a.prev{ padding-left:16px; background:url(../images/common/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b1 a.next{ padding-right:16px; background:url(../images/common/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-.pagination.b2 a,
-.pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-.pagination.b2 a.prev{ padding-left:12px; background:url(../images/common/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b2 a.next{ padding-right:12px; background:url(../images/common/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-.pagination.c1 a,
-.pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-.pagination.c1 a.prev,
-.pagination.c1 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c1 a.prev{ background:url(../images/common/arrowPrevC1.gif) no-repeat center;}
-.pagination.c1 a.next{ background:url(../images/common/arrowNextC1.gif) no-repeat center;}
-.pagination.c1 a.prev span,
-.pagination.c1 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-.pagination.c2 a,
-.pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-.pagination.c2 a.prev,
-.pagination.c2 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c2 a.prev{ background:url(../images/common/arrowPrevC1.gif) no-repeat center;}
-.pagination.c2 a.next{ background:url(../images/common/arrowNextC1.gif) no-repeat center;}
-.pagination.c2 a.prev span,
-.pagination.c2 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
diff --git a/modules/communication/skins/default/css/cyan.css b/modules/communication/skins/default/css/cyan.css
deleted file mode 100644
index b7a0567ae..000000000
--- a/modules/communication/skins/default/css/cyan.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/communication/skins/default/css/default.css b/modules/communication/skins/default/css/default.css
new file mode 100644
index 000000000..0f8a18c46
--- /dev/null
+++ b/modules/communication/skins/default/css/default.css
@@ -0,0 +1,123 @@
+@charset "utf-8";
+
+#communicationModule h3 {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
+#communicationModule h4 {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
+#communicationModule h4 span.vr { font-size:11px; color:#AAA; }
+#communicationModule h4 a.view { font-size:11px; font-family:vertical; color:#777e86; }
+#communicationModule p.summary, 
+#communicationModule div.infoText { margin:0 0 15px 0; line-height:1.6;}
+#communicationModule p.summary{ color:#888;}
+#communicationModule p.summary a { text-decoration:none; color:#888; }
+#communicationModule p.summary.red { color:#A54D4D; }
+#communicationModule p.summary.red a { text-decoration:none; color:#A54D4D; }
+#communicationModule div.infoText { color:#888;}
+
+#communicationModule .agreementBox { border:1px solid #CCC; margin:10px 0 0 0; padding:10px; border-bottom:none; height:200px; overflow-y:scroll;}
+#communicationModule .agreementButton { background-color:#EFEFEF; padding:10px; border:1px solid #CCC; border-top:none; margin-bottom:10px;}
+
+#communicationModule .localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; }
+#communicationModule .localNavigation:after {content:""; display:block; clear:both;}
+#communicationModule .localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
+#communicationModule .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x;}
+#communicationModule .localNavigation li a{ text-decoration:none !important; color:#666;}
+#communicationModule .localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
+#communicationModule .localNavigation li.on { margin-bottom:-1px;}
+#communicationModule .localNavigation li.on a{ height:19px; background:none;}
+
+#communicationModule .layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
+#communicationModule .layer * { margin:0; padding:0; font-size:12px; }
+#communicationModule .layer h4 { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
+#communicationModule .layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
+#communicationModule .layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
+#communicationModule .layer .layerBody{ margin:15px;}
+
+#communicationModule .crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+#communicationModule .crossTable th div { white-space:nowrap; }
+#communicationModule .crossTable th,
+#communicationModule .crossTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
+#communicationModule .crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+#communicationModule .crossTable thead th:first-child{ background-image:none;}
+#communicationModule .crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
+#communicationModule .crossTable td{ border-bottom:1px solid #f0f0f0;}
+
+#communicationModule .colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+#communicationModule .colTable th div { white-space:nowrap; }
+#communicationModule .colTable th,
+#communicationModule .colTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
+#communicationModule .colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+#communicationModule .colTable th:first-child{ background-image:none;}
+#communicationModule .colTable td{ border-bottom:1px solid #f0f0f0;}
+
+#communicationModule .rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
+#communicationModule .rowTable th div { white-space:nowrap; }
+#communicationModule .rowTable th,
+#communicationModule .rowTable td{ border:0; padding:10px 10px; text-align:left; vertical-align:top; font-weight:normal;}
+#communicationModule .rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
+#communicationModule .rowTable td{ border-bottom:1px solid #e5e5e5;}
+
+#communicationModule .rowTable th.button, 
+#communicationModule .colTable th.button, 
+#communicationModule .crossTable th.button { text-align:right; background:#EAEAEA; }
+
+#communicationModule .colTable td a,
+#communicationModule .rowTable td a,
+#communicationModule .crossTable td a { color:#000; text-decoration:none; }
+
+#communicationModule .colTable td.wide, 
+#communicationModule .rowTable td.wide, 
+#communicationModule .crossTable td.wide { width:100%;}
+
+#communicationModule .rowTable th.title,
+#communicationModule .crossTable th.title,
+#communicationModule .colTable th.title { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
+
+#communicationModule .rowTable th.title *,
+#communicationModule .crossTable th.title *,
+#communicationModule .colTable th.title * { padding:0; margin:0; vertical-align:middle; }
+
+#communicationModule p { color:#AAA; margin:3px 0 0 0; padding:0;}
+#dummy_check_nick_name { color:red; margin:3px 0 0 0; padding:0; }
+#communicationModule .require { color:red; font-size:10px; font-family:tahoma; font-weight:bold; margin-left:5px; }
+#communicationModule .publicItem { margin:5px 0 0 0; padding:0; color:#aaa; }
+#communicationModule .publicItem input { padding:0; margin: 0; }
+
+#communicationModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
+
+#communicationModule td.openids div { float:left; margin-right:10px; margin-bottom:10px; }
+#communicationModule td.openids div a { color:#AAA; text-decoration:none;}
+#communicationModule .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:200px;}
+#communicationModule .insertOpenID { clear:both; margin-top:10px; }
+#communicationModule .savedContent { margin-top:10px; border:1px solid #EEE; padding:10px; }
+
+#communicationModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
+#communicationModule .pagination *{ margin:0; padding:0;}
+#communicationModule .pagination img{ border:0;}
+#communicationModule .pagination a,
+#communicationModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+#communicationModule .pagination a:hover,
+#communicationModule .pagination a:active,
+#communicationModule .pagination a:focus{ background-color:#f4f4f4 !important; }
+#communicationModule .pagination strong{ color:#ff6600 !important;}
+#communicationModule .pagination a.prev,
+#communicationModule .pagination a.prevEnd,
+#communicationModule .pagination a.next,
+#communicationModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+#communicationModule .pagination.a1 a,
+#communicationModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+#communicationModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
+#communicationModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
+#communicationModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
+#communicationModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
+
+#communicationModule .regdate { font-size:10px; font-family:tahoma; color:#AAA; }
+#communicationModule .readed_date  { font-size:10px; font-family:tahoma; color:#888; letter-spacing:-1px;}
+
+#communicationModule .xeMessages ,
+#communicationModule .xeGroups { position:relative; }
+#communicationModule .xeMessages select ,
+#communicationModule .xeGroups select { margin:0; padding:0; vertical-align:middle; }
+#communicationModule .xeGroups .setupGroup, 
+#communicationModule .xeMessages .setupMessage { position:absolute; right:0; top:0;}
+
+#communicationModule .jumpMenu { margin-bottom:5px; text-align:right; }
diff --git a/modules/communication/skins/default/css/green.css b/modules/communication/skins/default/css/green.css
deleted file mode 100644
index 68325b48a..000000000
--- a/modules/communication/skins/default/css/green.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/communication/skins/default/css/purple.css b/modules/communication/skins/default/css/purple.css
deleted file mode 100644
index 79dd2e074..000000000
--- a/modules/communication/skins/default/css/purple.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/communication/skins/default/css/red.css b/modules/communication/skins/default/css/red.css
deleted file mode 100644
index 12c08b486..000000000
--- a/modules/communication/skins/default/css/red.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/communication/skins/default/css/white.css b/modules/communication/skins/default/css/white.css
deleted file mode 100644
index a78b5fbdc..000000000
--- a/modules/communication/skins/default/css/white.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border:none; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
diff --git a/modules/communication/skins/default/friends.html b/modules/communication/skins/default/friends.html
index cb7779998..d64a30875 100644
--- a/modules/communication/skins/default/friends.html
+++ b/modules/communication/skins/default/friends.html
@@ -1,95 +1,88 @@
-{@ $member_title = $lang->cmd_view_friend }
-
 <!--#include("./common_header.html")-->
 
 <!--%import("filter/delete_checked_friend.xml")-->
 <!--%import("filter/delete_friend_group.xml")-->
 <!--%import("filter/move_friend.xml")-->
 
-<form id="fo_friend_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
+<div class="xeGroups">
 
-    <div class="boardInformation">
-            <span class="friendNum">{$lang->friend} : <strong>{$total_count}</strong></span> 
-            <div class="fr">
-                <select name="friend_group_list" id="friend_group_list">
-                    <!--@foreach($friend_group_list as $key => $val)-->
-                    <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
-                    <!--@end-->
-                </select>
-                <a href="#" onclick="doRenameFriendGroup();return false;" class="button"><span>{$lang->cmd_modify}</span></a>
-                <a href="#" onclick="doDeleteFriendGroup();return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-                <a href="{getUrl('module','communication','act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="button"><span>{$lang->cmd_add_friend_group}</span></a>
-            </div>
-    </div>
+    <h3>{$member_title = $lang->cmd_view_friend } ({$total_count})</h3>
 
-    <table cellspacing="0" class="list">
-    <thead>
+    <form id="fo_friend_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
+
+        <div class="setupGroup">
+            <select name="friend_group_list" id="friend_group_list">
+                <!--@foreach($friend_group_list as $key => $val)-->
+                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                <!--@end-->
+            </select>
+            <a href="#" onclick="doRenameFriendGroup();return false;" class="button small blue"><span>{$lang->cmd_modify}</span></a>
+            <a href="#" onclick="doDeleteFriendGroup();return false;" class="button small red"><span>{$lang->cmd_delete}</span></a>
+            <a href="{getUrl('module','communication','act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="button small black strong"><span>{$lang->cmd_add_friend_group}</span></a>
+        </div>
+
+        <div class="jumpMenu">
+            <select name="jumpMenu" id="jumpMenu">
+                <option value="">{$lang->default_friend_group}</option>
+                <!--@foreach($friend_group_list as $key => $val)-->
+                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                <!--@end-->
+            </select><a href="#" onclick="doJumpFriendGroup(); return false;" class="small button"><span>{$lang->cmd_move}</span></a>
+        </div>
+
+        <table cellspacing="0" class="colTable">
         <tr>
-            <th scope="col" class="check first-child"><div><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' }); return false;" /><div></th>
-            <th scope="col" class="friendGroup">
-                <div>
-                    <select name="jumpMenu" id="jumpMenu" class="w100">
-                        <option value="">{$lang->default_friend_group}</option>
+            <th class="title"><div>{$lang->friend_group}<div></th>
+            <th class="title"><div><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' }); return false;" /> {$lang->nick_name}<div></th>
+            <th class="title"><div>{$lang->user_id} / {$lang->user_name}<div></th>
+            <th class="title"><div>{$lang->regdate}<div></th>
+        </tr>
+        <tbody>
+            <!--@foreach($friend_list as $no => $val)-->
+            <tr>
+                <td class="nowrap">{$val->group_title?$val->group_title:"&nbsp;"}</td>
+                <td class="nowrap"><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /><span class="member_{$val->target_srl}">{$val->nick_name}</span></td>
+                <td class="nowrap wide">{$val->user_id} / {$val->user_name}</td>
+                <td class="nowrap"><span class="regdate">{zdate($val->regdate,"Y-m-d")}</span></td>
+            </tr>
+            <!--@end-->
+            <tr>
+                <th class="button" colspan="4">
+                    <select name="target_friend_group_srl">
                         <!--@foreach($friend_group_list as $key => $val)-->
-                        <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                        <option value="{$val->friend_group_srl}">{$val->title}</option>
                         <!--@end-->
-                    </select><a href="#" onclick="doJumpFriendGroup(); return false;"><img src="./images/button_go.gif" alt="" align="absmiddle" /></a>
-                <div>
-            </th>
-            <th scope="col" class="half_wide"><div>{$lang->nick_name}<div></th>
-            <th scope="col" class="half_wide"><div>{$lang->user_id} / {$lang->user_name}<div></th>
-            <th scope="col" class="registDate"><div>{$lang->regdate}<div></th>
-        </tr>
-    </thead>
-    <tbody>
-        <!--@foreach($friend_list as $no => $val)-->
-        <tr class="bg{($no+1)%2+1}">
-            <td class="check"><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /></td>
-            <td class="friendGroup">{$val->group_title?$val->group_title:"&nbsp;"}</td>
-            <td class="userNick"><div class="member_{$val->target_srl}">{$val->nick_name}</div></td>
-            <td class="userName">{$val->user_id} / {$val->user_name}</td>
-            <td class="registDate">{zdate($val->regdate,"Y-m-d")}</td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
+                    </select>
+                    <a href="#" onclick="doMoveFriend();return false;" class="small button blue"><span>{$lang->cmd_move}</span></a>
+                    <span class="small button red"><input type="submit" value="{$lang->cmd_delete}" /></span>
+                    <a href="{getUrl('act','','message_type','','friend_gruop_srl','')}" class="small button"><span>{$lang->cmd_back}</span></a>
+                </th>
+            </tr>
+        </tbody>
+        </table>
 
-    <!-- 페이지 네비게이션 -->
-    <div class="pagination a1">
-        <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-        <!--@while($page_no = $page_navigation->getNextPage())-->
-            <!--@if($page == $page_no)-->
-                <strong>{$page_no}</strong> 
-            <!--@else-->
-                <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+        <!-- 페이지 네비게이션 -->
+        <div class="pagination a1">
+            <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+                <!--@end-->
             <!--@end-->
-        <!--@end-->
-        <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
-    </div>
-
-    <div class="fl memberSelect">
-        <select name="target_friend_group_srl">
-            <!--@foreach($friend_group_list as $key => $val)-->
-            <option value="{$val->friend_group_srl}">{$val->title}</option>
-            <!--@end-->
-        </select>
-    </div>
-    <div class="fl">
-        <a href="#" onclick="doMoveFriend();return false;" class="button"><span>{$lang->cmd_move}</span></a>
-        <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-    </div>
-
-    <div class="fr">
-        <a href="{getUrl('act','','message_type','','friend_gruop_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
-
-</form>
+            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
+        </div>
 
 
-<!-- 그룹 삭제를 위한 빈 form -->
-<form action="./" method="get" id="for_delete_group">
-    <input type="hidden" name="friend_group_srl" value="" />
-</form>
+    </form>
+
+
+    <!-- 그룹 삭제를 위한 빈 form -->
+    <form action="./" method="get" id="for_delete_group">
+        <input type="hidden" name="friend_group_srl" value="" />
+    </form>
+</div>
 
 
 <!--#include("./common_footer.html")-->
diff --git a/modules/communication/skins/default/images/black/bgH3.gif b/modules/communication/skins/default/images/black/bgH3.gif
deleted file mode 100755
index 4e85c1b68..000000000
Binary files a/modules/communication/skins/default/images/black/bgH3.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/black/lineBoardListTh.gif b/modules/communication/skins/default/images/black/lineBoardListTh.gif
deleted file mode 100755
index 0e78f40a2..000000000
Binary files a/modules/communication/skins/default/images/black/lineBoardListTh.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/black/lineH3.gif b/modules/communication/skins/default/images/black/lineH3.gif
deleted file mode 100755
index 18d85c0b2..000000000
Binary files a/modules/communication/skins/default/images/black/lineH3.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/black/openid_input_bg.gif b/modules/communication/skins/default/images/black/openid_input_bg.gif
deleted file mode 100755
index ae9940666..000000000
Binary files a/modules/communication/skins/default/images/black/openid_input_bg.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/blank.gif b/modules/communication/skins/default/images/blank.gif
deleted file mode 100644
index 35d42e808..000000000
Binary files a/modules/communication/skins/default/images/blank.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/button_go.gif b/modules/communication/skins/default/images/button_go.gif
deleted file mode 100755
index 895d1a078..000000000
Binary files a/modules/communication/skins/default/images/button_go.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/arrowNextC1.gif b/modules/communication/skins/default/images/common/arrowNextC1.gif
deleted file mode 100644
index 82deddc7b..000000000
Binary files a/modules/communication/skins/default/images/common/arrowNextC1.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/arrowPrevB1.gif b/modules/communication/skins/default/images/common/arrowPrevB1.gif
deleted file mode 100644
index a95ce58df..000000000
Binary files a/modules/communication/skins/default/images/common/arrowPrevB1.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/arrowPrevC1.gif b/modules/communication/skins/default/images/common/arrowPrevC1.gif
deleted file mode 100644
index 0bab510b5..000000000
Binary files a/modules/communication/skins/default/images/common/arrowPrevC1.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/bgH3.gif b/modules/communication/skins/default/images/common/bgH3.gif
deleted file mode 100644
index 0d07bb456..000000000
Binary files a/modules/communication/skins/default/images/common/bgH3.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/buttonTypeInput24.gif b/modules/communication/skins/default/images/common/buttonTypeInput24.gif
deleted file mode 100644
index 0dcfc0e3d..000000000
Binary files a/modules/communication/skins/default/images/common/buttonTypeInput24.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconAdd.gif b/modules/communication/skins/default/images/common/iconAdd.gif
deleted file mode 100644
index f2bdb7868..000000000
Binary files a/modules/communication/skins/default/images/common/iconAdd.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconArrow99.gif b/modules/communication/skins/default/images/common/iconArrow99.gif
deleted file mode 100644
index 15c36291e..000000000
Binary files a/modules/communication/skins/default/images/common/iconArrow99.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconCheck.gif b/modules/communication/skins/default/images/common/iconCheck.gif
deleted file mode 100644
index c4fb37ae0..000000000
Binary files a/modules/communication/skins/default/images/common/iconCheck.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconFriend.gif b/modules/communication/skins/default/images/common/iconFriend.gif
deleted file mode 100644
index 1daf6c66d..000000000
Binary files a/modules/communication/skins/default/images/common/iconFriend.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconH3.gif b/modules/communication/skins/default/images/common/iconH3.gif
deleted file mode 100644
index 8ea0cec82..000000000
Binary files a/modules/communication/skins/default/images/common/iconH3.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconInstantMessage.gif b/modules/communication/skins/default/images/common/iconInstantMessage.gif
deleted file mode 100644
index d63a69506..000000000
Binary files a/modules/communication/skins/default/images/common/iconInstantMessage.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/iconInstantMessage2.gif b/modules/communication/skins/default/images/common/iconInstantMessage2.gif
deleted file mode 100644
index 380548e91..000000000
Binary files a/modules/communication/skins/default/images/common/iconInstantMessage2.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/lineBoardListTh.gif b/modules/communication/skins/default/images/common/lineBoardListTh.gif
deleted file mode 100644
index 6d891d82c..000000000
Binary files a/modules/communication/skins/default/images/common/lineBoardListTh.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/lineH3.gif b/modules/communication/skins/default/images/common/lineH3.gif
deleted file mode 100644
index fe42fe378..000000000
Binary files a/modules/communication/skins/default/images/common/lineH3.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/line_1x10_e0e0e0.gif b/modules/communication/skins/default/images/common/line_1x10_e0e0e0.gif
deleted file mode 100644
index 6a848dd58..000000000
Binary files a/modules/communication/skins/default/images/common/line_1x10_e0e0e0.gif and /dev/null differ
diff --git a/modules/communication/skins/default/images/common/arrowNextA1.gif b/modules/communication/skins/default/img/arrowNextA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/communication/skins/default/images/common/arrowNextA1.gif
rename to modules/communication/skins/default/img/arrowNextA1.gif
diff --git a/modules/communication/skins/default/images/common/arrowNextEndA1.gif b/modules/communication/skins/default/img/arrowNextEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/communication/skins/default/images/common/arrowNextEndA1.gif
rename to modules/communication/skins/default/img/arrowNextEndA1.gif
diff --git a/modules/communication/skins/default/images/common/arrowPrevA1.gif b/modules/communication/skins/default/img/arrowPrevA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/communication/skins/default/images/common/arrowPrevA1.gif
rename to modules/communication/skins/default/img/arrowPrevA1.gif
diff --git a/modules/communication/skins/default/images/common/arrowPrevEndA1.gif b/modules/communication/skins/default/img/arrowPrevEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/communication/skins/default/images/common/arrowPrevEndA1.gif
rename to modules/communication/skins/default/img/arrowPrevEndA1.gif
diff --git a/modules/communication/skins/default/img/bgTab.gif b/modules/communication/skins/default/img/bgTab.gif
new file mode 100755
index 000000000..8835361b8
Binary files /dev/null and b/modules/communication/skins/default/img/bgTab.gif differ
diff --git a/modules/communication/skins/default/img/buttonClose.gif b/modules/communication/skins/default/img/buttonClose.gif
new file mode 100755
index 000000000..5bdbbc1ef
Binary files /dev/null and b/modules/communication/skins/default/img/buttonClose.gif differ
diff --git a/modules/communication/skins/default/img/iconH2.gif b/modules/communication/skins/default/img/iconH2.gif
new file mode 100755
index 000000000..457867741
Binary files /dev/null and b/modules/communication/skins/default/img/iconH2.gif differ
diff --git a/modules/communication/skins/default/img/iconH3.gif b/modules/communication/skins/default/img/iconH3.gif
new file mode 100755
index 000000000..889e2818e
Binary files /dev/null and b/modules/communication/skins/default/img/iconH3.gif differ
diff --git a/modules/communication/skins/default/img/lineVrText.gif b/modules/communication/skins/default/img/lineVrText.gif
new file mode 100755
index 000000000..27566578d
Binary files /dev/null and b/modules/communication/skins/default/img/lineVrText.gif differ
diff --git a/modules/communication/skins/default/js/communication.js b/modules/communication/skins/default/js/communication.js
index ee4b94929..3d398c2aa 100644
--- a/modules/communication/skins/default/js/communication.js
+++ b/modules/communication/skins/default/js/communication.js
@@ -6,7 +6,7 @@ function completeSendMessage(ret_obj) {
 
 function doSendMessage(member_srl, message_srl) {
     if(typeof(message_srl)=='undefined') message_srl = 0;
-    var url = current_url.setQuery('module','communication').setQuery('act','dispCommunicationSendMessage').setQuery('receiver_srl',member_srl).setQuery('message_srl',message_srl);
+    var url = request_uri.setQuery('module','communication').setQuery('act','dispCommunicationSendMessage').setQuery('receiver_srl',member_srl).setQuery('message_srl',message_srl);
     popopen(url, 'sendMessage');
 }
 
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index ca19f6c24..b2dc72e50 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -1,131 +1,123 @@
-<!--@foreach($lang->message_box as $key => $val)-->
-    <!--@if($key == $message_type)-->
-        {@ $member_title = $val}
-    <!--@end-->
-<!--@end-->
-
 <!--#include("./common_header.html")-->
-
 <!--%import("filter/delete_checked_message.xml")-->
 <!--%import("filter/update_allow_message.xml")-->
 
+<div class="xeMessages">
+    <form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)" class="setupMessage">
+        <select name="allow_message">
+            <!--@foreach($lang->allow_message_type as $key => $val)-->
+            <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
+            <!--@end-->
+        </select>
+        <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
+    </form>
+
+
+    <form action="./" method="GET" onsubmit="location.href=current_url.setQuery('message_srl','').setQuery('message_type',this.message_box.options[this.message_box.selectedIndex].value); return false;">
+    <h3>
+        <select name="message_box">
+            <!--@foreach($lang->message_box as $key => $val)-->
+            <option <!--@if($key==$message_type)-->selected="selected"<!--@end--> value="{$key}" >{$val}</option>
+            <!--@end-->
+        </select>
+        <span class="button"><input type="submit" value="{$lang->cmd_select}" /></span>
+    </h3>
+    </form>
+
+
     <!--@if($message)-->
-    <div class="readMessage">
-        <div class="messageHeader">
-            <h4>{$message->title}</h4>
-            <address>
-                <em>
-                    <!--@if($message->member_srl == $logged_info->member_srl)-->
-                        &nbsp;
-                    <!--@else-->
-                        {$message->nick_name} ({$message->user_id}) 
-                    <!--@end-->
-                    <span class="date">{zdate($message->regdate, "Y.m.d H:i:s")}</span>
-                </em>
-            </address>
-        </div>
-
-        <div class="messageBody xe_content">{$message->content}</div>
-
-        <div class="deleteOrKeep tCenter">
+    <table class="colTable">
+    <tr>
+        <th class="title"><div>{$message->title}</div></th>
+    </tr>
+    <tr>
+        <td>
+            <span class="member_{$message->sender_srl}">{$message->nick_name}</span> ({$message->user_id}) 
+            <span class="regdate">{zdate($message->regdate, "Y.m.d H:i:s")}</span>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <div class="xe_content">{$message->content}</div>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
             <!--@if($message->message_type != "S" && $message->member_srl != $logged_info->member_srl)-->
-            <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_reply}</span></a>
+            <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button black strong"><span>{$lang->cmd_reply}</span></a>
             <!--@end-->
             <!--@if($message->message_type == "R")-->
-            <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_store}</span></a>
+            <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button green"><span>{$lang->cmd_store}</span></a>
             <!--@end-->
-            <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        </div>
-    </div>
+            <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+        </th>
+    </tr>
+    </table>
     <!--@end-->
 
-	<div class="boardInformation">
-        <div class="messageSetup">
-            <form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)">
-                <select name="allow_message">
-                    <!--@foreach($lang->allow_message_type as $key => $val)-->
-                    <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
-                    <!--@end-->
-                </select>
-                <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
-            </form>
-        </div>
-        <ul class="instantMessage">
-            <!--@foreach($lang->message_box as $key => $val)-->
-                <!--@if($key == $message_type)-->
-                    <li class="on"><a href="{getUrl('message_type',$key,'message_srl','','page','')}">{$val} : <strong>{$total_count}</strong></a></li>
-                <!--@else-->
-                    <li><a href="{getUrl('message_type',$key,'message_srl','','page','')}">{$val}</a></li>
-                <!--@end-->
-            <!--@end-->
-        </ul>
-    </div>
-
     <form action="./" method="get" onsubmit="return procFilter(this, delete_checked_message)" id="fo_message_list">
     <input type="hidden" name="message_type" value="{$message_type}" />
 
-        <table cellspacing="0" class="list">
+        <table cellspacing="0" class="rowTable">
         <thead>
         <tr>
-            <th scope="col" class="check first-child"><div><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list', { wrap:'fo_message_list' }); return false;" /></div></th>
-            <th scope="col" class="user"><div>
+            <th class="title"><div>
+                <input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list', { wrap:'fo_message_list' }); return false;" />
+                {$lang->title}
+            </div></th>
+            <th class="title"><div>
                 <!--@if($message_type == "S")-->
                     {$lang->receiver}
                 <!--@else-->
                     {$lang->sender}
                 <!--@end-->
             </div></th>
-            <th scope="col" class="wide title"><div>{$lang->title}</div></th>
-            <th scope="col" class="registDate"><div>{$lang->regdate}</div></th>
-            <th scope="col" class="checkDate last-child"><div>{$lang->readed_date}</div></th>
+            <th class="title"><div>{$lang->regdate}</div></th>
         </tr>
         </thead>
 
         <tbody>
             <!--@foreach($message_list as $no => $val)-->
-            <tr class="bg{($no+1)%2+1}">
-                <td class="check"><input name="message_srl_list" type="checkbox" value="{$val->message_srl}" /></td>
-                <td class="user">
-                    <!--@if($val->member_srl == $logged_info->member_srl)-->
-                        &nbsp;
-                    <!--@else-->
-                        <div class="member_{$val->member_srl}">{$val->nick_name} ({$val->user_id})</div></td>
-                    <!--@end-->
-                </td>
-                <td class="title">
+            <tr>
+                <td class="wide">
+                    <input name="message_srl_list" type="checkbox" value="{$val->message_srl}" />
                     <!--@if($val->readed=='Y')-->
                         <a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a>
                     <!--@else-->
                         <span style="font-weight:bold"><a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a></span>
                     <!--@end-->
                 </td>
-                <td class="registDate nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-                <td class="checkDate nowrap"><!--@if($val->readed=="Y")-->{zdate($val->readed_date,"Y-m-d H:i:s")}<!--@else-->&nbsp;<!--@end--></td>
+                <td class="nowrap">
+                    <div class="member_{$val->member_srl}">{$val->nick_name}</div></td>
+                </td>
+                <td class="nowrap">
+                    <div class="regdate">{zdate($val->regdate,"Y-m-d")}</div>
+                    <!--@if($val->readed=="Y")--><div class="readed_date">{zdate($val->readed_date,"Y-m-d H:i:s")}</div><!--@end-->
+                </td>
             </tr>
             <!--@end-->
+            <tr>
+                <th colspan="4" class="button">
+                    <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
+                </th>
+            </tr>
         </tbody>
         </table>
 
-        <!-- 페이지 네비게이션 -->
-        <div class="pagination a1">
-            <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong> 
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
-        </div>
-
-        <div class="fr">
-            <a href="{getUrl('act','','message_type','','target_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </div>
-        <div class="fl">
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </div>
-
     </form>
 
+    <!-- 페이지 네비게이션 -->
+    <div class="pagination a1">
+        <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+        <!--@while($page_no = $page_navigation->getNextPage())-->
+            <!--@if($page == $page_no)-->
+                <strong>{$page_no}</strong> 
+            <!--@else-->
+                <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+            <!--@end-->
+        <!--@end-->
+        <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
+    </div>
+</div>
+
 <!--#include("./common_footer.html")-->
diff --git a/modules/communication/skins/default/new_message.html b/modules/communication/skins/default/new_message.html
index 2fdcdbc63..3a0cccc03 100644
--- a/modules/communication/skins/default/new_message.html
+++ b/modules/communication/skins/default/new_message.html
@@ -1,46 +1,39 @@
-<!--#include("./common_header.html")-->
-
-<!--%import("js/member.js")-->
+<!--%import("js/communication.js")-->
 <!--@if($message)-->
-<div id="popup_content" class="memberSmallBox w600pop">
-
-    <div class="header">
-        <h3>{$lang->message_received}</h3>
-    </div>
-
-    <div id="popBody" class="complex">
-        <table cellspacing="0" class="leftHeaderType">
-        <col width="100" />
-        <col />
-        <!--@if($message->member_srl != $logged_info->member_srl)-->
-        <tr>
-            <th scope="row">{$lang->sender}</th>
-            <td><div class="member_{$message->member_srl}">{$message->nick_name} ({$message->user_id})</div></td>
-        </tr>
-        <!--@end-->
-        <tr>
-            <th scope="row">{$lang->title}</th>
-            <td>{htmlspecialchars($message->title)}</td>
-        </tr>
-        <tr>
-            <td colspan="2">{$message->content}</td>
-        </tr>
-        </table>
-    </div>
-
-    <div class="tCenter help">
-        <!--@if($message->member_srl != $logged_info->member_srl)-->
-            <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_reply_message}</span></a>
-        <!--@end-->
-        <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_store}</span></a>
-        <a href="#" onclick="location.href=location.href;return false;" class="button"><span>{$lang->cmd_next}</span></a>
-    </div>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->message_received}</h3>
 </div>
+
+<div id="popBody">
+
+    <table cellspacing="0" class="rowTable">
+    <!--@if($message->member_srl != $logged_info->member_srl)-->
+    <tr>
+        <th><div>{$lang->sender}</div></th>
+        <td><div class="member_{$message->member_srl}">{$message->nick_name} ({$message->user_id})</div></td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th><div>{$lang->title}</div></th>
+        <td>{htmlspecialchars($message->title)}</td>
+    </tr>
+    <tr>
+        <td colspan="2">{$message->content}</td>
+    </tr>
+    </table>
+</div>
+
+<div id="popFooter">
+    <a href="#" onclick="location.href=location.href;return false;" class="button black strong"><span>{$lang->cmd_next}</span></a>
+    <!--@if($message->member_srl != $logged_info->member_srl)-->
+        <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_reply_message}</span></a>
+    <!--@end-->
+    <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button blue"><span>{$lang->cmd_store}</span></a>
+    <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+</div>
+
 <!--@else-->
 <script type="text/javascript">
     window.close();
 </script>
 <!--@end-->
-
-<!--#include("./common_footer.html")-->
diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html
index f80880033..ba25c2e35 100644
--- a/modules/communication/skins/default/send_message.html
+++ b/modules/communication/skins/default/send_message.html
@@ -1,51 +1,41 @@
-<!--#include("./common_header.html")-->
 <!--%import("filter/send_message.xml")-->
-<!--%import("js/member.js")-->
+<!--%import("js/communication.js")-->
 
-<div class="memberSmallBox w600pop">
-
-    <div class="header">
-        <h3>{$lang->cmd_send_message}</h3>
-    </div>
-
-    <form action="./" method="get" onsubmit="return procFilter(this, send_message)">
-    <input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
-    <input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
-
-        <div class="complex">
-            <table cellspacing="0" class="leftHeaderType">
-            <col width="110" />
-            <col />
-            <tr>
-                <th scope="row"><label for="textfield1">{$lang->receiver}</label></th>
-                <td><div class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name} ({$receiver_info->user_id})</div></td>
-            </tr>
-            <tr>
-                <th scope="row">{$lang->title}</th>
-                <td><input type="text" name="title" id="message_title" class="inputTypeText w300" value="{$source_message->title}"/></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">
-                {$editor}
-            </div>
-
-        </div>
-
-        <div class="tCenter help">
-            <span class="button"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" accesskey="s" /></span>
-            <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        </div>
-
-    </form>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_send_message}</h3>
 </div>
 
+<form action="./" method="get" onsubmit="return procFilter(this, send_message)">
+<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
+<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
+
+<div id="popBody">
+
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th><div><label for="textfield1">{$lang->receiver}</label></div></th>
+        <td><div class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name} ({$receiver_info->user_id})</div></td>
+    </tr>
+    <tr>
+        <th><div>{$lang->title}</div></th>
+        <td><input type="text" name="title" id="message_title" class="inputTypeText w300" value="{$source_message->title}"/></td>
+    </tr>
+    <tr>
+        <th><div>{$lang->cmd_option}</div></th>
+        <td><input type="checkbox" value="Y" name="send_mail"  /> {$lang->cmd_send_mail}</td>
+    </tr>
+    </table>
+
+    {$editor}
+
+</div>
+
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" accesskey="s" /></span>
+</div>
+
+</form>
+
 <script type="text/javascript">
     xAddEventListener(window, 'load', function() { xGetElementById("message_title").focus(); });
 </script>
-
-<!--#include("./common_footer.html")-->
diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html
index 270509e70..a10080639 100644
--- a/modules/communication/tpl/index.html
+++ b/modules/communication/tpl/index.html
@@ -2,13 +2,13 @@
 <!--%import("../../editor/tpl/js/editor_module_config.js",optimized=false)-->
 <!--%import("filter/insert_config.xml")-->
 
-<h3>{$lang->communication} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->communication} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_communication)}</div>
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->editor_skin}</div></th>
         <td>
@@ -41,8 +41,8 @@
     </tr>
 
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
+        <th colspan="2" class="button">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" /></span>
         </th>
     </tr>
     </table>
diff --git a/modules/counter/conf/info.xml b/modules/counter/conf/info.xml
index d262a7515..92840c7ac 100644
--- a/modules/counter/conf/info.xml
+++ b/modules/counter/conf/info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
-    <title xml:lang="ko">기본 카운터</title>
+    <title xml:lang="ko">접속통계</title>
     <title xml:lang="zh-CN">访问统计</title>
-    <title xml:lang="en">Basic Counter</title>
-    <title xml:lang="es">Contador Básico</title>
+    <title xml:lang="en">Counter</title>
+    <title xml:lang="es">Contador</title>
     <title xml:lang="jp">デフォルトアクセスカウンター</title>
     <title xml:lang="ru">Базовый счетчик</title>
     <title xml:lang="zh-TW">基本統計</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">預設的統計程式。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>accessory</category>
+    <category>statistics</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/counter/conf/module.xml b/modules/counter/conf/module.xml
index 8b9f46eca..2f7d1db01 100644
--- a/modules/counter/conf/module.xml
+++ b/modules/counter/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispCounterAdminIndex" type="view" standalone="true" admin_index="true" />
         <action name="procCounterExecute" type="controller" standalone="true" />
diff --git a/modules/counter/counter.admin.view.php b/modules/counter/counter.admin.view.php
index dd40e0cbb..62c556d62 100644
--- a/modules/counter/counter.admin.view.php
+++ b/modules/counter/counter.admin.view.php
@@ -28,7 +28,8 @@
             $oCounterModel = &getModel('counter');
 
             // 전체 카운터 및 지정된 일자의 현황 가져오기
-            $status = $oCounterModel->getStatus(array(0,$selected_date));
+            $site_module_info = Context::get('site_module_info');
+            $status = $oCounterModel->getStatus(array(0,$selected_date),$site_module_info->site_srl);
             Context::set('total_counter', $status[0]);
             Context::set('selected_day_counter', $status[$selected_date]);
 
@@ -38,7 +39,7 @@
                 $type = 'day';
                 Context::set('type',$type);
             }
-            $detail_status = $oCounterModel->getHourlyStatus($type, $selected_date);
+            $detail_status = $oCounterModel->getHourlyStatus($type, $selected_date, $site_module_info->site_srl);
             Context::set('detail_status', $detail_status);
             
             // 표시
diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php
index 4030ba45e..fac1fc42d 100644
--- a/modules/counter/counter.class.php
+++ b/modules/counter/counter.class.php
@@ -11,17 +11,13 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('counter', 'view', 'dispCounterAdminIndex');
-
             $oCounterController = &getController('counter');
 
             // 0 일자로 기록될 전체 방문 기록 row 추가
-            $oCounterController->insertTotalStatus();
+            //$oCounterController->insertTotalStatus();
 
             // 오늘자 row입력
-            $oCounterController->insertTodayStatus();
+            //$oCounterController->insertTodayStatus();
 
             return new Object();
         }
@@ -30,6 +26,10 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            // 카운터에 site_srl추가
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists('counter_log', 'site_srl')) return true;
+            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) return true;
             return false;
         }
 
@@ -37,7 +37,14 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            return new Object();
+            // 카운터에 site_srl추가
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists('counter_log', 'site_srl')) 
+                $oDB->addColumn('counter_log','site_srl','number',11,0,true);
+            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) 
+                $oDB->addIndex('counter_log','idx_site_counter_log',array('site_srl','ipaddress'),false);
+
+            return new Object(0, 'success_updated');
         }
 
         /**
diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php
index 86f3654d4..5dd49cd64 100644
--- a/modules/counter/counter.controller.php
+++ b/modules/counter/counter.controller.php
@@ -20,26 +20,29 @@
             $oDB = &DB::getInstance();
             $oDB->begin();
 
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
             // 로그를 검사
             $oCounterModel = &getModel('counter');
 
             // 오늘자 row가 있는지 체크하여 없으면 등록
-            if(!$oCounterModel->isInsertedTodayStatus()) {
-                $this->insertTodayStatus();
+            if(!$oCounterModel->isInsertedTodayStatus($site_srl)) {
+                $this->insertTodayStatus(0,$site_srl);
 
             // 기존 row가 있으면 사용자 체크 
             } else {
 
                 // 등록되어 있지 않은 아이피일 경우
-                if(!$oCounterModel->isLogged()) {
+                if(!$oCounterModel->isLogged($site_srl)) {
                     // 로그 등록
-                    $this->insertLog();
+                    $this->insertLog($site_srl);
 
                     // unique 및 pageview 등록
-                    $this->insertUniqueVisitor();
+                    $this->insertUniqueVisitor($site_srl);
                 } else {
                     // pageview 등록
-                    $this->insertPageView();
+                    $this->insertPageView($site_srl);
                 }
             }
 
@@ -49,50 +52,84 @@
         /**
          * @brief 로그 등록 
          **/
-        function insertLog() {
+        function insertLog($site_srl=0) {
             $args->regdate = date("YmdHis");
             $args->user_agent = $_SERVER['HTTP_USER_AGENT'];
+            $args->site_srl = $site_srl;
             return executeQuery('counter.insertCounterLog', $args);
         }
 
         /**
          * @brief unique visitor 등록
          **/
-        function insertUniqueVisitor() {
-            $args->regdate = date("Ymd");
-            executeQuery('counter.updateCounterUnique', $args);
-            executeQuery('counter.updateTotalCounterUnique');
+        function insertUniqueVisitor($site_srl=0) {
+            $args->regdate = '0,'.date("Ymd");
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.updateSiteCounterUnique', $args);
+            } else {
+                $output = executeQuery('counter.updateCounterUnique', $args);
+            }
         }
 
         /**
          * @brief pageview 등록
          **/
-        function insertPageView() {
+        function insertPageView($site_srl=0) {
             $args->regdate = '0, '.date('Ymd');
-            executeQuery('counter.updateCounterPageview', $args);
+            if($site_srl) { 
+                $args->site_srl = $site_srl;
+                executeQuery('counter.updateSiteCounterPageview', $args);
+            } else {
+                executeQuery('counter.updateCounterPageview', $args);
+            }
         }
 
         /**
          * @brief 전체 카운터 status 추가
          **/
-        function insertTotalStatus() {
+        function insertTotalStatus($site_srl=0) {
             $args->regdate = 0;
-            executeQuery('counter.insertTodayStatus', $args);
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                executeQuery('counter.insertSiteTodayStatus', $args);
+            } else {
+                executeQuery('counter.insertTodayStatus', $args);
+            }
         }
 
         /**
          * @brief 오늘자 카운터 status 추가
          **/
-        function insertTodayStatus($regdate = 0) {
+        function insertTodayStatus($regdate = 0, $site_srl=0) {
             if($regdate) $args->regdate = $regdate;
             else $args->regdate = date("Ymd");
-            executeQuery('counter.insertTodayStatus', $args);
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $query_id = 'counter.insertSiteTodayStatus';
+
+                $u_args->site_srl = $site_srl; ///< 일별 row입력시 전체 row (regdate=0)도 같이 입력 시도
+                executeQuery($query_id, $u_args);
+            } else {
+                $query_id = 'counter.insertTodayStatus';
+                executeQuery($query_id); ///< 일별 row입력시 전체 row (regdate=0)도 같이 입력 시도
+            }
+            $output = executeQuery($query_id, $args);
 
             // 로그 등록
-            $this->insertLog();
+            $this->insertLog($site_srl);
 
             // unique 및 pageview 등록
-            $this->insertUniqueVisitor();
+            $this->insertUniqueVisitor($site_srl);
+        }
+
+        /**
+         * @brief 특정 가상 사이트의 카운터 로그 삭제
+         **/
+        function deleteSiteCounterLogs($site_srl) {
+            $args->site_srl = $site_srl;
+            executeQuery('counter.deleteSiteCounter',$args);
+            executeQuery('counter.deleteSiteCounterLog',$args);
         }
     }
 ?>
diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php
index 8e7d60d76..733178605 100644
--- a/modules/counter/counter.model.php
+++ b/modules/counter/counter.model.php
@@ -16,9 +16,10 @@
         /**
          * @brief 로그 검사
          **/
-        function isLogged() {
+        function isLogged($site_srl=0) {
             $args->regdate = date("Ymd");
             $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            $args->site_srl = $site_srl;
             $output = executeQuery('counter.getCounterLog', $args);
             return $output->data->count?true:false;
         }
@@ -26,16 +27,21 @@
         /**
          * @brief 오늘자 카운터 현황 row 있는지 체크
          **/
-        function isInsertedTodayStatus() {
+        function isInsertedTodayStatus($site_srl=0) {
             $args->regdate = date("Ymd");
-            $output = executeQuery('counter.getTodayStatus', $args);
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.getSiteTodayStatus', $args);
+            } else {
+                $output = executeQuery('counter.getTodayStatus', $args);
+            }
             return $output->data->count?true:false;
         }
 
         /**
          * @brief 특정 일의 접속 통계를 가져옴
          **/
-        function getStatus($selected_date) {
+        function getStatus($selected_date, $site_srl=0) {
             // 여러개의 날짜 로그를 가져올 경우
             if(is_array($selected_date)) {
                 $date_count = count($selected_date);
@@ -47,7 +53,12 @@
                 $args->regdate = $selected_date;
             }
 
-            $output = executeQuery('counter.getCounterStatus', $args);
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.getSiteCounterStatusDays', $args);
+            } else {
+                $output = executeQuery('counter.getCounterStatusDays', $args);
+            }
             $status = $output->data;
 
             if(!is_array($selected_date)) return $status;
@@ -64,21 +75,31 @@
         /**
          * @brief 지정된 일자의 시간대별 로그 가져오기
          **/
-        function getHourlyStatus($type='hour', $selected_date) {
+        function getHourlyStatus($type='hour', $selected_date, $site_srl=0) {
             $max = 0;
             $sum = 0;
             switch($type) {
                 case 'year' :
                         // 카운터 시작일 구함
-                        $output = executeQuery('counter.getStartLogDate');
+                        if($site_srl) {
+                            $args->site_srl = $site_srl;
+                            $output = executeQuery('counter.getSiteStartLogDate', $args);
+                        } else {
+                            $output = executeQuery('counter.getStartLogDate');
+                        }
                         $start_year = substr($output->data->regdate,0,4);
                         if(!$start_year) $start_year = date("Y");
                         for($i=$start_year;$i<=date("Y");$i++) {
                             unset($args);
                             $args->start_date = sprintf('%04d0000', $i);
                             $args->end_date = sprintf('%04d1231', $i);
-                            $output = executeQuery('counter.getCounterLogStatus', $args);
-                            $count = (int)$output->data->count;
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
                             $status->list[$i] = $count;
                             if($count>$max) $max = $count;
                             $sum += $count;
@@ -91,8 +112,13 @@
                             unset($args);
                             $args->start_date = sprintf('%04d%02d00', $year, $i);
                             $args->end_date = sprintf('%04d%02d31', $year, $i);
-                            $output = executeQuery('counter.getCounterLogStatus', $args);
-                            $count = (int)$output->data->count;
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
                             $status->list[$i] = (int)$count;
                             if($count>$max) $max = $count;
                             $sum += $count;
@@ -101,8 +127,15 @@
                 case 'hour' :
                         for($i=0;$i<24;$i++) {
                             unset($args);
-                            $args->regdate = sprintf('%08d%02d', $selected_date, $i);
-                            $output = executeQuery('counter.getCounterLog', $args);
+                            $args->start_date = sprintf('%08d%02d0000', $selected_date, $i);
+                            $args->end_date = sprintf('%08d%02d5959', $selected_date, $i);
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterLogStatus', $args);
+                            } else { 
+                                $args->site_srl = 0;
+                                $output = executeQuery('counter.getCounterLogStatus', $args);
+                            }
                             $count = (int)$output->data->count;
                             $status->list[$i] = $count;
                             if($count>$max) $max = $count;
@@ -117,8 +150,13 @@
                             unset($args);
                             $args->start_date = sprintf('%04d%02d%02d', $year, $month, $i);
                             $args->end_date = sprintf('%04d%02d%02d', $year, $month, $i);
-                            $output = executeQuery('counter.getCounterLogStatus', $args);
-                            $count = (int)$output->data->count;
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
                             $status->list[$i] = $count;
                             if($count>$max) $max = $count;
                             $sum += $count;
diff --git a/modules/counter/lang/en.lang.php b/modules/counter/lang/en.lang.php
index 20fffb303..a83ae5668 100644
--- a/modules/counter/lang/en.lang.php
+++ b/modules/counter/lang/en.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = 'Visitors';
     $lang->pageview = 'Pageview';
+
+    $lang->today = 'today';
+    $lang->yesterday = 'yesterday';
 ?>
diff --git a/modules/counter/lang/es.lang.php b/modules/counter/lang/es.lang.php
index 9b081d1ae..53b551706 100644
--- a/modules/counter/lang/es.lang.php
+++ b/modules/counter/lang/es.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = 'visitante';
     $lang->pageview = 'Ver página';
+
+    $lang->today = 'today';
+    $lang->yesterday = 'yesterday';
 ?>
diff --git a/modules/counter/lang/fr.lang.php b/modules/counter/lang/fr.lang.php
index d769ab4a4..dd1f0b7e9 100644
--- a/modules/counter/lang/fr.lang.php
+++ b/modules/counter/lang/fr.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = 'Visiteurs';
     $lang->pageview = 'Vues';
+
+    $lang->today = 'today';
+    $lang->yesterday = 'yesterday';
 ?>
diff --git a/modules/counter/lang/jp.lang.php b/modules/counter/lang/jp.lang.php
index 5c7f5d386..37d57844c 100644
--- a/modules/counter/lang/jp.lang.php
+++ b/modules/counter/lang/jp.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = '訪問者';
     $lang->pageview = 'ページビュー';
+
+    $lang->today = 'today';
+    $lang->yesterday = 'yesterday';
 ?>
diff --git a/modules/counter/lang/ko.lang.php b/modules/counter/lang/ko.lang.php
index b55e4c71f..6b6820cc7 100644
--- a/modules/counter/lang/ko.lang.php
+++ b/modules/counter/lang/ko.lang.php
@@ -5,7 +5,7 @@
      * @brief  한국어 언어팩 (기본적인 내용만 수록)
      **/
 
-    $lang->counter = "카운터";
+    $lang->counter = '접속 통계';
     $lang->cmd_select_date = '날짜 선택';
     $lang->cmd_select_counter_type = array(
         'hour' => '시간대별',
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = '방문자';
     $lang->pageview = '페이지뷰';
+
+    $lang->today = '오늘';
+    $lang->yesterday = '어제';
 ?>
diff --git a/modules/counter/lang/ru.lang.php b/modules/counter/lang/ru.lang.php
index d58b3fa15..1a066276c 100644
--- a/modules/counter/lang/ru.lang.php
+++ b/modules/counter/lang/ru.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = 'Посетителей';
     $lang->pageview = 'Просмотров страниц';
+
+    $lang->today = 'today';
+    $lang->yesterday = 'yesterday';
 ?>
diff --git a/modules/counter/lang/zh-CN.lang.php b/modules/counter/lang/zh-CN.lang.php
index 80768766f..7561e8503 100644
--- a/modules/counter/lang/zh-CN.lang.php
+++ b/modules/counter/lang/zh-CN.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = '访问者';
     $lang->pageview = '页面浏览';
+
+    $lang->today = '今日';
+    $lang->yesterday = '昨日';
 ?>
diff --git a/modules/counter/lang/zh-TW.lang.php b/modules/counter/lang/zh-TW.lang.php
index 4eb56eba8..53e2a6028 100644
--- a/modules/counter/lang/zh-TW.lang.php
+++ b/modules/counter/lang/zh-TW.lang.php
@@ -19,4 +19,7 @@
 
     $lang->unique_visitor = '訪問者';
     $lang->pageview = '頁面瀏覽';
+
+    $lang->today = '今天';
+    $lang->yesterday = '昨天';
 ?>
diff --git a/modules/counter/queries/deleteSiteCounter.xml b/modules/counter/queries/deleteSiteCounter.xml
new file mode 100644
index 000000000..63cfb957f
--- /dev/null
+++ b/modules/counter/queries/deleteSiteCounter.xml
@@ -0,0 +1,8 @@
+<query id="deleteSiteCounter" action="delete">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/deleteSiteCounterLog.xml b/modules/counter/queries/deleteSiteCounterLog.xml
new file mode 100644
index 000000000..01f78192d
--- /dev/null
+++ b/modules/counter/queries/deleteSiteCounterLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteSiteCounterLog" action="delete">
+    <tables>
+        <table name="counter_log" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getCounterLog.xml b/modules/counter/queries/getCounterLog.xml
index c71d3907a..9c8e1384c 100644
--- a/modules/counter/queries/getCounterLog.xml
+++ b/modules/counter/queries/getCounterLog.xml
@@ -6,7 +6,8 @@
         <column name="count(*)" alias="count"/>
     </columns>
     <conditions>
-        <condition operation="equal" column="ipaddress" var="ipaddress" />
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="equal" column="ipaddress" var="ipaddress" pipe="and" />
         <condition operation="like_prefix" column="regdate" var="regdate" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/counter/queries/getCounterLogStatus.xml b/modules/counter/queries/getCounterLogStatus.xml
index 31e3b5a92..aea31ad4a 100644
--- a/modules/counter/queries/getCounterLogStatus.xml
+++ b/modules/counter/queries/getCounterLogStatus.xml
@@ -1,11 +1,12 @@
 <query id="getCounterLogStatus" action="select">
     <tables>
-        <table name="counter_status" />
+        <table name="counter_log" />
     </tables>
     <columns>
-        <column name="sum(unique_visitor)" alias="count"/>
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" pipe="and" />
         <condition operation="more" column="regdate" var="start_date" notnull="notnull" pipe="and" />
         <condition operation="less" column="regdate" var="end_date" notnull="notnull" pipe="and" />
     </conditions>
diff --git a/modules/counter/queries/getCounterStatus.xml b/modules/counter/queries/getCounterStatus.xml
index 475629fdc..41a3f0a12 100644
--- a/modules/counter/queries/getCounterStatus.xml
+++ b/modules/counter/queries/getCounterStatus.xml
@@ -3,9 +3,11 @@
         <table name="counter_status" />
     </tables>
     <columns>
-        <column name="*" />
+        <column name="sum(unique_visitor)" alias="unique_visitor" />
+        <column name="sum(pageview)" alias="pageview" />
     </columns>
     <conditions>
-        <condition operation="in" column="regdate" var="regdate" notnull="notnull" />
+        <condition operation="more" column="regdate" var="start_date" notnull="notnull" pipe="and" />
+        <condition operation="less" column="regdate" var="end_date" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/counter/queries/getCounterStatusDays.xml b/modules/counter/queries/getCounterStatusDays.xml
new file mode 100644
index 000000000..78c9e7bd3
--- /dev/null
+++ b/modules/counter/queries/getCounterStatusDays.xml
@@ -0,0 +1,11 @@
+<query id="getSiteCounterStatus" action="select">
+    <tables>
+        <table name="counter_status" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteCounterLogStatus.xml b/modules/counter/queries/getSiteCounterLogStatus.xml
new file mode 100644
index 000000000..25558043d
--- /dev/null
+++ b/modules/counter/queries/getSiteCounterLogStatus.xml
@@ -0,0 +1,13 @@
+<query id="getSiteCounterLogStatus" action="select">
+    <tables>
+        <table name="counter_log" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" pipe="and" />
+        <condition operation="more" column="regdate" var="start_date" notnull="notnull" pipe="and" />
+        <condition operation="less" column="regdate" var="end_date" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteCounterStatus.xml b/modules/counter/queries/getSiteCounterStatus.xml
new file mode 100644
index 000000000..e69609ec8
--- /dev/null
+++ b/modules/counter/queries/getSiteCounterStatus.xml
@@ -0,0 +1,14 @@
+<query id="getSiteCounterStatus" action="select">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="sum(unique_visitor)" alias="unique_visitor" />
+        <column name="sum(pageview)" alias="pageview" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" />
+        <condition operation="more" column="regdate" var="start_date" notnull="notnull" pipe="and" />
+        <condition operation="less" column="regdate" var="end_date" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteCounterStatusDays.xml b/modules/counter/queries/getSiteCounterStatusDays.xml
new file mode 100644
index 000000000..79e85c5a2
--- /dev/null
+++ b/modules/counter/queries/getSiteCounterStatusDays.xml
@@ -0,0 +1,12 @@
+<query id="getSiteCounterStatus" action="select">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" />
+        <condition operation="in" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteLogDate.xml b/modules/counter/queries/getSiteLogDate.xml
new file mode 100644
index 000000000..eaff3ed82
--- /dev/null
+++ b/modules/counter/queries/getSiteLogDate.xml
@@ -0,0 +1,12 @@
+<query id="getSiteStartLogDate" action="select">
+    <tables>
+        <table name="counter_status" />
+    </tables>
+    <columns>
+        <column name="min(regdate)" alias="regdate" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="excess" column="regdate" default="1" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteStartLogDate.xml b/modules/counter/queries/getSiteStartLogDate.xml
new file mode 100644
index 000000000..74f170c30
--- /dev/null
+++ b/modules/counter/queries/getSiteStartLogDate.xml
@@ -0,0 +1,12 @@
+<query id="getSiteStartLogDate" action="select">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="min(regdate)" alias="regdate" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+        <condition operation="excess" column="regdate" default="1" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/getSiteTodayStatus.xml b/modules/counter/queries/getSiteTodayStatus.xml
new file mode 100644
index 000000000..9ff01fcd1
--- /dev/null
+++ b/modules/counter/queries/getSiteTodayStatus.xml
@@ -0,0 +1,12 @@
+<query id="getSiteTodayStatus" action="select">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count"/>
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" />
+        <condition operation="equal" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/insertCounterLog.xml b/modules/counter/queries/insertCounterLog.xml
index d46a6739d..5e1131b3e 100644
--- a/modules/counter/queries/insertCounterLog.xml
+++ b/modules/counter/queries/insertCounterLog.xml
@@ -3,6 +3,7 @@
         <table name="counter_log" />
     </tables>
     <columns>
+        <column name="site_srl" var="site_srl" notnull="notnull" default="0" />
         <column name="regdate" var="regdate" default="curdate()" notnull="notnull"/>
         <column name="ipaddress" var="ipaddress" notnull="notnull" default="ipaddress()" />
         <column name="user_agent" var="user_agent" />
diff --git a/modules/counter/queries/insertSiteTodayStatus.xml b/modules/counter/queries/insertSiteTodayStatus.xml
new file mode 100644
index 000000000..59f9c33b5
--- /dev/null
+++ b/modules/counter/queries/insertSiteTodayStatus.xml
@@ -0,0 +1,11 @@
+<query id="insertSiteTodayStatus" action="insert">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="site_srl" var="site_srl" notnull="notnull" default="0" />
+        <column name="regdate" var="regdate" default="0" notnull="notnull" />
+        <column name="unique_visitor" default="0" />
+        <column name="pageview" default="0" />
+    </columns>
+</query>
diff --git a/modules/counter/queries/insertTodayStatus.xml b/modules/counter/queries/insertTodayStatus.xml
index e1d1bdbb2..1aa8d85f6 100644
--- a/modules/counter/queries/insertTodayStatus.xml
+++ b/modules/counter/queries/insertTodayStatus.xml
@@ -3,7 +3,7 @@
         <table name="counter_status" />
     </tables>
     <columns>
-        <column name="regdate" var="regdate" notnull="notnull" />
+        <column name="regdate" var="regdate" default="0" notnull="notnull" />
         <column name="unique_visitor" default="0" />
         <column name="pageview" default="0" />
     </columns>
diff --git a/modules/counter/queries/updateCounterUnique.xml b/modules/counter/queries/updateCounterUnique.xml
index 2cdfe6048..3f39afc4f 100644
--- a/modules/counter/queries/updateCounterUnique.xml
+++ b/modules/counter/queries/updateCounterUnique.xml
@@ -7,6 +7,6 @@
         <column name="pageview" default="plus(1)" />
     </columns>
     <conditions>
-        <condition operation="equal" column="regdate" var="regdate" notnull="notnull" />
+        <condition operation="in" column="regdate" var="regdate" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/counter/queries/updateSiteCounterPageview.xml b/modules/counter/queries/updateSiteCounterPageview.xml
new file mode 100644
index 000000000..6c9351ffe
--- /dev/null
+++ b/modules/counter/queries/updateSiteCounterPageview.xml
@@ -0,0 +1,12 @@
+<query id="updateSiteCounterPageview" action="update">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="pageview" default="plus(1)" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="in" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/updateSiteCounterUnique.xml b/modules/counter/queries/updateSiteCounterUnique.xml
new file mode 100644
index 000000000..18332934b
--- /dev/null
+++ b/modules/counter/queries/updateSiteCounterUnique.xml
@@ -0,0 +1,13 @@
+<query id="updateSiteCounterUnique" action="update">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="unique_visitor" default="plus(1)" />
+        <column name="pageview" default="plus(1)" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+        <condition operation="in" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/updateSiteTotalCounterUnique.xml b/modules/counter/queries/updateSiteTotalCounterUnique.xml
new file mode 100644
index 000000000..7fc6228cb
--- /dev/null
+++ b/modules/counter/queries/updateSiteTotalCounterUnique.xml
@@ -0,0 +1,13 @@
+<query id="updateSiteTotalCounterUnique" action="update">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="unique_visitor" default="plus(1)" />
+        <column name="pageview" default="plus(1)" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+        <condition operation="equal" column="regdate" default="00000000" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/counter/queries/updateTotalCounterUnique.xml b/modules/counter/queries/updateTotalCounterUnique.xml
index 5c4e99d7d..73c61eb8a 100644
--- a/modules/counter/queries/updateTotalCounterUnique.xml
+++ b/modules/counter/queries/updateTotalCounterUnique.xml
@@ -7,6 +7,6 @@
         <column name="pageview" default="plus(1)" />
     </columns>
     <conditions>
-        <condition operation="in" column="regdate" default="00000000" notnull="notnull" />
+        <condition operation="in" column="regdate" default="0" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/counter/schemas/counter_log.xml b/modules/counter/schemas/counter_log.xml
index 305d6c704..b832add3e 100644
--- a/modules/counter/schemas/counter_log.xml
+++ b/modules/counter/schemas/counter_log.xml
@@ -1,5 +1,6 @@
 <table name="counter_log">
-    <column name="ipaddress" type="varchar" size="250" notnull="notnull" index="idx_counter_log" />
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" index="idx_site_counter_log" />
+    <column name="ipaddress" type="varchar" size="250" notnull="notnull" index="idx_site_counter_log" />
     <column name="regdate" type="date" index="idx_counter_log" />
     <column name="user_agent" type="varchar" size="250" />
 </table>
diff --git a/modules/counter/schemas/counter_site_status.xml b/modules/counter/schemas/counter_site_status.xml
new file mode 100644
index 000000000..ad867115d
--- /dev/null
+++ b/modules/counter/schemas/counter_site_status.xml
@@ -0,0 +1,6 @@
+<table name="counter_site_status">
+    <column name="site_srl" type="number" size="11" notnull="notnull" unique="site_status" />
+    <column name="regdate" type="number" size="11" notnull="notnull" unique="site_status" />
+    <column name="unique_visitor" type="number" size="11" default="0" />
+    <column name="pageview" type="number" size="11" default="0" />
+</table>
diff --git a/modules/counter/tpl/css/counter.css b/modules/counter/tpl/css/counter.css
deleted file mode 100644
index b2c23c51c..000000000
--- a/modules/counter/tpl/css/counter.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@charset "utf-8";
-
-.adminTable.counter th { font-size:.9em; text-align:center; padding:0;}
-.adminTable.counter th em { font:normal 1em Tahoma;}
-.adminTable td .graph { width:90%; position:relative;}
-.adminTable td .graph .bar { width:100%; position:absolute; margin-top:4px;}
-.adminTable td .graph .num { position:relative; background:#ffffff; color:#636363; font:.9em Tahoma; padding-left:10px; white-space:nowrap;}
-#str_selected_date { font-size:9pt; font-family:tahoma; }
-#trigger_calendar { vertical-align:middle; }
diff --git a/modules/counter/tpl/images/iconBar.gif b/modules/counter/tpl/images/iconBar.gif
index 4d944ff48..8193ad5f7 100644
Binary files a/modules/counter/tpl/images/iconBar.gif and b/modules/counter/tpl/images/iconBar.gif differ
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 9fa2e8986..b1a98bd10 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -12,7 +12,7 @@
 </script>
 
 
-<h3>{$lang->counter} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->counter} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
 
@@ -21,7 +21,7 @@
     <input type="hidden" name="act" value="{$act}" />
     <input type="hidden" name="selected_date" id="selected_date" value="{zDate('Ymd',$selected_date)}" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="colTable">
     <thead>
     <tr>
         <th scope="row" class="half_wide"><div>{$lang->total_counter}</div></th>
@@ -82,11 +82,11 @@
 
 
 <!-- unique visitor 그래프 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <!--@foreach($detail_status->list as $key => $val)-->
     <!--@if($detail_status->sum>0)-->
         {@$percent = sprintf("%0.2f", $val / $detail_status->sum * 100 )}
-        {@$img_width = sprintf("%0.0f", $val / $detail_status->max * 100 )}
+        {@$img_width = sprintf("%d", $val / $detail_status->max * 100 )}
     <!--@else-->
         {@$percent = 0}
         {@$img_width = 1}
@@ -123,13 +123,14 @@
         </div>
     </th>
     <!--@end-->
-    <td>
-        <div class="graph">
-            <img src="./images/iconBar.gif" alt="" width="12" height="6" class="bar" />
-            <div class="num" style="left:{$percent}%;width:{100-$percent}%;">
-                <strong>{number_format($val)}</strong> ({$percent}%)
-            </div>
-        </div>
+    <td class="wide">
+        {@$img_percent = $img_width-30}
+        <!--@if($img_percent<1)-->
+            <img class="graphHr" style="width:3px;" alt="" src="./images/iconBar.gif" />
+        <!--@else-->
+            <img class="graphHr" style="width:{$img_percent}%;" alt="" src="./images/iconBar.gif" />
+        <!--@end-->
+        {number_format($val)}({$percent}%)
     </td>
 </tr>
 <!--@end-->
diff --git a/modules/counter/tpl/js/counter.js b/modules/counter/tpl/js/counter.js
deleted file mode 100644
index ef8446462..000000000
--- a/modules/counter/tpl/js/counter.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @brief 카운터 정보 수집 javascript
- * window.onload 이벤트 후에 counter 모듈을 호출한다.
- **/
-
-// 이벤트 등록
-jQuery(doCallCounter);
-
-// counter 모듈을 호출하는 함수
-function doCallCounter() {
-    show_waiting_message = false;
-    exec_xml('counter','procCounterExecute');
-    show_waiting_message = true;
-}
diff --git a/modules/document/conf/info.xml b/modules/document/conf/info.xml
index 3226adda9..b4abddb41 100644
--- a/modules/document/conf/info.xml
+++ b/modules/document/conf/info.xml
@@ -3,7 +3,7 @@
     <title xml:lang="ko">문서</title>
     <title xml:lang="en">Document</title>
     <title xml:lang="es">Documento</title>
-    <title xml:lang="zh-CN">主题</title>
+    <title xml:lang="zh-CN">主题管理</title>
     <title xml:lang="jp">ドキュメント</title>
     <title xml:lang="ru">Документы</title>
     <title xml:lang="zh-TW">主題</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理討論板，部落格等主題的模組。 </description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>utility</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index f380b9e91..60efeb36c 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -2,31 +2,43 @@
 <module>
     <grants />
     <permissions>
-        <permission action="dispDocumentAdminManageDocument" target="manager" />
-        <permission action="getDocumentCategories" target="manager" />
-        <permission action="procDocumentAdminAddCart" target="manager" />
-        <permission action="procDocumentAdminManageCheckedDocument" target="manager" />
+        <permission action="dispDocumentManageDocument" target="member" />
+        <permission action="getDocumentCategories" target="member" />
+        <permission action="procDocumentAddCart" target="member" />
+        <permission action="procDocumentManageCheckedDocument" target="member" />
     </permissions>
     <actions>
         <action name="dispDocumentPrint" type="view" standalone="true" />
         <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="dispDocumentAdminDeclared" type="view" standalone="true" />
-
-        <action name="dispDocumentAdminManageDocument" type="view" standalone="true"/>
-
-        <action name="procDocumentVoteUp" type="controller" standalone="true" />
-        <action name="procDocumentVoteDown" type="controller" standalone="true" />
-        <action name="procDocumentDeclare" type="controller" standalone="true" />
+        <action name="dispDocumentManageDocument" type="view" standalone="true"/>
 
         <action name="getDocumentCategories" type="model" standalone="true"/>
         <action name="getDocumentMenu" type="model" standalone="true"/>
 
-        <action name="procDocumentAdminAddCart" type="controller" standalone="true" />
-        <action name="procDocumentAdminManageCheckedDocument" type="controller" standalone="true" />
+        <action name="procDocumentVoteUp" type="controller" standalone="true" />
+        <action name="procDocumentVoteDown" type="controller" standalone="true" />
+        <action name="procDocumentDeclare" type="controller" standalone="true" />
+        <action name="procDocumentAddCart" type="controller" standalone="true" />
+        <action name="procDocumentManageCheckedDocument" type="controller" standalone="true" />
+        <action name="procDocumentInsertModuleConfig" type="controller" standalone="true" />
 
+        <action name="dispDocumentAdminList" type="view" admin_index="true" standalone="true" />
+        <action name="dispDocumentAdminConfig" type="view" standalone="true" />
+        <action name="dispDocumentAdminAlias" type="view" standalone="true" />
+        <action name="dispDocumentAdminDeclared" type="view" standalone="true" />
+
+        <action name="getDocumentAdminCategoryTplInfo" type="model" standalone="true"/>
+
+        <action name="procDocumentAdminInsertCategory" type="controller" standalone="true"/>
+        <action name="procDocumentAdminDeleteCategory" type="controller" standalone="true"/>
+        <action name="procDocumentAdminMoveCategory" type="controller" standalone="true"/>
+        <action name="procDocumentAdminMakeXmlFile" type="controller" standalone="true"/>
+        <action name="procDocumentAdminInsertAlias" type="controller" standalone="true"/>
+        <action name="procDocumentAdminDeleteAlias" type="controller" standalone="true"/>
+        <action name="procAdminMoveExtraVar" type="controller" standalone="true"/>
+
+        <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" />
+        <action name="procDocumentAdminDeleteExtraVar" 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 cd4b3cab5..28dc097bf 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -36,98 +36,6 @@
             $this->setMessage( sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
         }
 
-        /**
-         * @brief 관리자가 글 선택시 세션에 담음
-         **/
-        function procDocumentAdminAddCart() {
-            $document_srls = explode(',',Context::get('srls'));
-            $cnt = count($document_srls);
-            for($i=0;$i<$cnt;$i++) {
-                $document_srl = (int)trim($document_srls[$i]);
-                if(!$document_srls) continue;
-                if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
-                else $_SESSION['document_management'][$document_srl] = true;
-            }
-        }
-
-        /**
-         * @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) {
-
-                $oCommunicationController = &getController('communication');
-                $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(false, false, false));
-
-                    $oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
-                }
-            }
-
-            // 스팸 처리가 되지 않도록 스팸필터 설정
-            $oSpamController = &getController('spamfilter');
-            $oSpamController->setAvoidLog();
-
-            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 특정 게시물들의 소속 모듈 변경 (게시글 이동시에 사용)
          **/
@@ -182,6 +90,11 @@
                     $oFileController->setFilesValid($obj->document_srl);
                 }
 
+                if($module_srl != $obj->module_srl)
+                {
+                    $oDocumentController->deleteDocumentAliasByDocument($obj->document_srl);
+                }
+
                 // 게시물의 모듈 이동
                 $obj->module_srl = $module_srl;
                 $obj->category_srl = $category_srl;
@@ -411,6 +324,303 @@
             }
             $directory->close();
         }
+
+        /**
+         * @brief 모듈의 확장 변수 추가 또는 수정
+         **/
+        function procDocumentAdminInsertExtraVar() {
+            $module_srl = Context::get('module_srl');
+            $var_idx = Context::get('var_idx');
+            $name = Context::get('name');
+            $type = Context::get('type');
+            $is_required = Context::get('is_required');
+            $default = Context::get('default');
+            $desc = Context::get('desc');
+            $search = Context::get('search');
+
+            if(!$module_srl || !$name) return new Object(-1,'msg_invalid_request');
+
+            // idx가 지정되어 있지 않으면 최고 값을 지정
+            if(!$var_idx) {
+                $obj->module_srl = $module_srl;
+                $output = executeQuery('document.getDocumentMaxExtraKeyIdx', $obj);
+                $var_idx = $output->data->var_idx+1;
+            }
+
+            // insert or update
+            $oDocumentController = &getController('document');
+            $output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief 모듈의 확장 변수 삭제
+         **/
+        function procDocumentAdminDeleteExtraVar() {
+            $module_srl = Context::get('module_srl');
+            $var_idx = Context::get('var_idx');
+            if(!$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request');
+
+            $oDocumentController = &getController('document');
+            $output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+        }
  
+        /**
+         * @brief 카테고리 추가
+         **/
+        function procDocumentAdminInsertCategory($args = null) {
+            // 입력할 변수 정리
+            if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','title','expand','group_srls','color');
+
+            if($args->expand !="Y") $args->expand = "N";
+            $args->group_srls = str_replace('|@|',',',$args->group_srls);
+            $args->parent_srl = (int)$args->parent_srl;
+
+            $oDocumentController = &getController('document');
+            $oDocumentModel = &getModel('document');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            // 이미 존재하는지를 확인
+            if($args->category_srl) {
+                $category_info = $oDocumentModel->getCategory($args->category_srl);
+                if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+            }
+
+            // 존재하게 되면 update를 해준다
+            if($args->category_srl) {
+                $output = $oDocumentController->updateCategory($args);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+
+            // 존재하지 않으면 insert를 해준다
+            } else {
+                $output = $oDocumentController->insertCategory($args);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+            }
+
+            // XML 파일을 갱신하고 위치을 넘겨 받음
+            $xml_file = $oDocumentController->makeCategoryFile($args->module_srl);
+
+            $oDB->commit();
+
+            $this->add('xml_file', $xml_file);
+            $this->add('module_srl', $args->module_srl);
+            $this->add('category_srl', $args->category_srl);
+            $this->add('parent_srl', $args->parent_srl);
+        }
+
+
+        /**
+         * @brief 카테고리 삭제
+         **/
+        function procDocumentAdminDeleteCategory() {
+            // 변수 정리
+            $args = Context::gets('module_srl','category_srl');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $oDocumentModel = &getModel('document');
+
+            // 원정보를 가져옴
+            $category_info = $oDocumentModel->getCategory($args->category_srl);
+            if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+
+            // 자식 노드가 있는지 체크하여 있으면 삭제 못한다는 에러 출력
+            if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
+
+            // DB에서 삭제
+            $oDocumentController = &getController('document');
+            $output = $oDocumentController->deleteCategory($args->category_srl);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            // XML 파일을 갱신하고 위치을 넘겨 받음
+            $xml_file = $oDocumentController->makeCategoryFile($args->module_srl);
+
+            $oDB->commit();
+
+            $this->add('xml_file', $xml_file);
+            $this->add('category_srl', $parent_srl);
+            $this->setMessage('success_deleted');
+        }
+
+        function procDocumentAdminMoveCategory() {
+            $source_category_srl = Context::get('source_srl');
+
+            // parent_srl 이 있으면 첫 자식으로 들어간다
+            $parent_category_srl = Context::get('parent_srl');
+
+            // target_srl 이 있으면 target_srl 아래로 형제로 들어간다
+            $target_category_srl = Context::get('target_srl');
+
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+            $source_category = $oDocumentModel->getCategory($source_category_srl);
+
+
+            //parent_category_srl 의 첫 자식으로 넣자
+            if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0)){
+                $parent_category = $oDocumentModel->getCategory($parent_category_srl);
+
+                $args->module_srl = $source_category->module_srl;
+                $args->parent_srl = $parent_category_srl;
+                $output = executeQuery('document.getChildCategoryMinListOrder', $args);
+
+                if(!$output->toBool()) return $output;
+                $args->list_order = (int)$output->data->list_order;
+                if(!$args->list_order) $args->list_order = 0;
+                $args->list_order--;
+
+
+                $source_args->category_srl = $source_category_srl;
+                $source_args->parent_srl = $parent_category_srl;
+                $source_args->list_order = $args->list_order;
+                $output = $oDocumentController->updateCategory($source_args);
+                if(!$output->toBool()) return $output;
+
+
+            // $target_category_srl의 아래동생으로
+            }else if($target_category_srl > 0){
+                $target_category = $oDocumentModel->getCategory($target_category_srl);
+
+                //$target_category의 아래 동생을 모두 내린다
+                $output = $oDocumentController->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
+                if(!$output->toBool()) return $output;
+
+
+                $source_args->category_srl = $source_category_srl;
+                $source_args->parent_srl = $target_category->parent_srl;
+                $source_args->list_order = $target_category->list_order+1;
+                $output = $oDocumentController->updateCategory($source_args);
+                if(!$output->toBool()) return $output;
+
+            }
+
+
+            // xml파일 재생성
+            $xml_file = $oDocumentController->makeCategoryFile($source_category->module_srl);
+
+            // return 변수 설정
+            $this->add('xml_file', $xml_file);
+            $this->add('source_category_srl', $source_category_srl);
+
+        }
+
+        /**
+         * @brief xml 파일을 갱신
+         * 관리자페이지에서 메뉴 구성 후 간혹 xml파일이 재생성 안되는 경우가 있는데\n
+         * 이럴 경우 관리자의 수동 갱신 기능을 구현해줌\n
+         * 개발 중간의 문제인 것 같고 현재는 문제가 생기지 않으나 굳이 없앨 필요 없는 기능
+         **/
+        function procDocumentAdminMakeXmlFile() {
+            // 입력값을 체크
+            $module_srl = Context::get('module_srl');
+
+            // xml파일 재생성
+            $oDocumentController = &getController('document');
+            $xml_file = $oDocumentController->makeCategoryFile($module_srl);
+
+            // return 값 설정
+            $this->add('xml_file',$xml_file);
+        }
+
+        /**
+         * @brief 확장변수 순서 조절
+         **/
+        function procAdminMoveExtraVar() {
+            $type = Context::get('type');
+            $module_srl = Context::get('module_srl');
+            $var_idx = Context::get('var_idx');
+
+            if(!$type || !$module_srl || !$var_idx) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if(!$module_info->module_srl) return new Object(-1,'msg_invalid_request');
+
+            $oDocumentModel = &getModel('document');
+            $extra_keys = $oDocumentModel->getExtraKeys($module_srl);
+            if(!$extra_keys[$var_idx]) return new Object(-1,'msg_invalid_request');
+
+            if($type == 'up') $new_idx = $var_idx-1;
+            else $new_idx = $var_idx+1;
+            if($new_idx<1) return new Object(-1,'msg_invalid_request');
+
+            // 바꿀 idx가 없으면 바로 업데이트
+            if(!$extra_keys[$new_idx]) {
+                $args->module_srl = $module_srl;
+                $args->var_idx = $var_idx;
+                $args->new_idx = $new_idx;
+                $output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
+                if(!$output->toBool()) return $output;
+                $output = executeQuery('document.updateDocumentExtraVarIdx', $args);
+                if(!$output->toBool()) return $output;
+            // 있으면 기존의 꺼랑 교체
+            } else {
+                $args->module_srl = $module_srl;
+                $args->var_idx = $new_idx;
+                $args->new_idx = -1;
+                $output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
+                if(!$output->toBool()) return $output;
+                $output = executeQuery('document.updateDocumentExtraVarIdx', $args);
+                if(!$output->toBool()) return $output;
+
+                $args->var_idx = $var_idx;
+                $args->new_idx = $new_idx;
+                $output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
+                if(!$output->toBool()) return $output;
+                $output = executeQuery('document.updateDocumentExtraVarIdx', $args);
+                if(!$output->toBool()) return $output;
+
+                $args->var_idx = -1;
+                $args->new_idx = $var_idx;
+                $output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
+                if(!$output->toBool()) return $output;
+                $output = executeQuery('document.updateDocumentExtraVarIdx', $args);
+                if(!$output->toBool()) return $output;
+            }
+        }
+
+        function procDocumentAdminInsertAlias() {
+            $args = Context::gets('module_srl','document_srl', 'alias_title');
+            $alias_srl = Context::get('alias_srl');
+            if(!$alias_srl) 
+            {
+                $args->alias_srl = getNextSequence();
+                $query = "document.insertAlias";
+            }
+            else 
+            {
+                $args->alias_srl = $alias_srl;
+                $query = "document.updateAlias";
+            }
+            $output = executeQuery($query, $args);
+            if(!$output->toBool())
+            {
+                return $output;
+            }
+        }
+
+        function procDocumentAdminDeleteAlias() {
+            $alias_srl = Context::get('alias_srl');
+            $args->alias_srl = $alias_srl;
+            $output = executeQuery("document.deleteAlias", $args);
+        }
+
     }
 ?>
diff --git a/modules/board/board.admin.model.php b/modules/document/document.admin.model.php
similarity index 75%
rename from modules/board/board.admin.model.php
rename to modules/document/document.admin.model.php
index f547ab1a0..f0bccc047 100644
--- a/modules/board/board.admin.model.php
+++ b/modules/document/document.admin.model.php
@@ -1,12 +1,12 @@
 <?php
     /**
-     * @class  boardAdminModel
+     * @class  documentAdminModel
      * @author zero (zero@nzeo.com)
      * @version 0.1
-     * @brief  board 모듈의 admin model class
+     * @brief  document 모듈의 admin model class
      **/
 
-    class boardAdminModel extends board {
+    class documentAdminModel extends document {
 
         /**
          * @brief 초기화
@@ -18,14 +18,19 @@
          * @brief 특정 카테고리의 정보를 이용하여 템플릿을 구한후 return
          * 관리자 페이지에서 특정 메뉴의 정보를 추가하기 위해 서버에서 tpl을 컴파일 한후 컴파일 된 html을 직접 return
          **/
-        function getBoardAdminCategoryTplInfo() {
+        function getDocumentAdminCategoryTplInfo() {
             // 해당 메뉴의 정보를 가져오기 위한 변수 설정
+            $module_srl = Context::get('module_srl');
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+
             $category_srl = Context::get('category_srl');
             $parent_srl = Context::get('parent_srl');
 
             // 회원 그룹의 목록을 가져옴
             $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
             Context::set('group_list', $group_list);
 
             $oDocumentModel = &getModel('document');
@@ -51,12 +56,21 @@
                 }
             }
 
+
+            $category_info->title = htmlspecialchars($category_info->title);
             Context::set('category_info', $category_info);
 
             // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
             $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'category_info');
+            $tpl = $oTemplate->compile('./modules/document/tpl', 'category_info');
             $tpl = str_replace("\n",'',$tpl);
+
+            // 사용자 정의 언어 변경
+            $oModuleController = &getController('module');
+            $oModuleController->replaceDefinedLangCode($tpl);
+
+
+
             // return 할 변수 설정
             $this->add('tpl', $tpl);
         }
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 0bc5357ee..9bd7c8dbf 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -19,7 +19,7 @@
         function dispDocumentAdminList() {
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
@@ -29,41 +29,16 @@
 
             $args->module_srl = Context::get('module_srl');
 
-            // mid목록을 구함
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
-
             // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
             $oDocumentModel = &getModel('document');
             $output = $oDocumentModel->getDocumentList($args);
 
-            // 목록의 loop를 돌면서 mid를 구하기 위한 module_srl값을 구함
-            $document_count = count($output->data);
-            $module_srl_list = array();
-            if($document_count) {
-                foreach($output->data as $key => $val) {
-                    $module_srl = $val->module_srl;
-                    if(!in_array($module_srl, $module_srl_list)) $module_srl_list[] = $module_srl;
-                }
-                if(count($module_srl_list)) {
-                    $args->module_srls = implode(',',$module_srl_list);
-                    $mid_output = executeQuery('module.getModuleInfoByModuleSrl', $args);
-                    if($mid_output->data && !is_array($mid_output->data)) $mid_output->data = array($mid_output->data);
-                    for($i=0;$i<count($mid_output->data);$i++) {
-                        $mid_info = $mid_output->data[$i];
-                        $module_list[$mid_info->module_srl] = $mid_info;
-                    }
-                }
-            }
-
             // 템플릿에 쓰기 위해서 document_model::getDocumentList() 의 return object에 있는 값들을 세팅
             Context::set('total_count', $output->total_count);
             Context::set('total_page', $output->total_page);
             Context::set('page', $output->page);
             Context::set('document_list', $output->data);
             Context::set('page_navigation', $output->page_navigation);
-            Context::set('module_list', $module_list);
 
             // 템플릿에서 사용할 검색옵션 세팅
             $count_search_option = count($this->search_option);
@@ -90,46 +65,13 @@
             $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);
-            }
-
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록과 모듈 목록의 조합
-            if(count($module_list)>1) Context::set('module_list', $module_categories);
-
-            // 팝업 레이아웃 선택
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('popup_layout');
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('checked_list');
-        }
-
         /**
          * @brief 관리자 페이지의 신고 목록 보기
          **/
         function dispDocumentAdminDeclared() {
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'document_declared.declared_count'; ///< 소팅 값
@@ -160,5 +102,31 @@
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('declared_list');
         }
+
+        function dispDocumentAdminAlias() {
+            $args->document_srl = Context::get('document_srl');
+            if(!$args->document_srl) return $this->dispDocumentAdminList();
+
+            $oModel = &getModel('document');
+            $oDocument = $oModel->getDocument($args->document_srl);
+            if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
+            Context::set('oDocument', $oDocument);
+
+            $output = executeQueryArray('document.getAliases', $args);
+            if(!$output->data)
+            {
+                $aliases = array();
+            }
+            else
+            {
+                $aliases = $output->data; 
+            }
+
+
+            Context::set('aliases', $aliases);
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_alias');
+        }
     }
 ?>
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index feeb4f7fa..b4d8441c9 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -18,11 +18,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminList');
-            $oModuleController->insertActionForward('document', 'view', 'dispDocumentPrint');
-            $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminConfig');
-            $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminManageDocument');
-            $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminDeclared');
 
             $oDB = &DB::getInstance();
             $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
@@ -32,10 +27,15 @@
             $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
             $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
             $oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
+            $oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
+            $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
 
             // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
             $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
+            // 2009. 01. 29 Added a trigger for additional setup
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+
             return new Object();
         }
 
@@ -46,11 +46,6 @@
             $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
 
-            /**
-             * 2007. 7. 23 : 확장변수(extra_vars1~20까지 추가)
-             **/
-            if(!$oDB->isColumnExists("documents","extra_vars20")) return true;
-
             /**
              * 2007. 7. 25 : 알림 필드(notify_message) 추가
              **/
@@ -64,20 +59,9 @@
             if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
             if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
 
-            /**
-             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가, 게시글 관리 action 추가
-             **/
-            if(!$oModuleModel->getActionForward('dispDocumentAdminConfig')) return true;
-            if(!$oModuleModel->getActionForward('dispDocumentAdminManageDocument')) return true;
-
             // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
             if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
 
-            /**
-             * 2007. 10. 18 : 관리자 페이지의 신고된 목록 보기 action 추가
-             **/
-            if(!$oModuleModel->getActionForward('dispDocumentAdminDeclared')) return true;
-
             // 2007. 10. 25 문서 분류에 parent_srl, expand를 추가
             if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
             if(!$oDB->isColumnExists("document_categories","expand")) return true;
@@ -99,10 +83,22 @@
             if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
             if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
 
-
             // 2008-12-15 문서 분류에 color를 추가
             if(!$oDB->isColumnExists("document_categories", "color")) return true;
 
+            /**
+             * 2009. 01. 29 : 확장변수 값 테이블에 lang_code가 없을 경우 추가
+             **/
+            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+
+            // 2009. 03. 09 documents에 lang_code 컬럼 추가
+            if(!$oDB->isColumnExists("documents","lang_code")) return true;
+
+            // 2009. 03. 11 확장변수 값 테이블의 인덱스 점검
+            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+
             return false;
         }
 
@@ -114,16 +110,6 @@
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
 
-            /**
-             * 2007. 7. 23 : 확장변수(extra_vars1~20까지 추가)
-             **/
-            if(!$oDB->isColumnExists("documents","extra_vars20")) {
-                for($i=1;$i<=20;$i++) {
-                    $column_name = "extra_vars".$i;
-                    $oDB->addColumn('documents',$column_name,'text');
-                }
-            }
-
             /**
              * 2007. 7. 25 : 알림 필드(notify_message) 추가
              **/
@@ -150,24 +136,10 @@
                 $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
             }
 
-            /**
-             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가, 게시글 관리 action 추가
-             **/
-            if(!$oModuleModel->getActionForward('dispDocumentAdminConfig'))
-                $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminConfig');
-            if(!$oModuleModel->getActionForward('dispDocumentAdminManageDocument'))
-                $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminManageDocument');
-
             // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
             if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
                 $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
-            /**
-             * 2007. 10. 18 : 관리자 페이지의 신고된 목록 보기 action 추가
-             **/
-            if(!$oModuleModel->getActionForward('dispDocumentAdminDeclared'))
-                $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminDeclared');
-
             // 2007. 10. 25 문서 분류에 parent_srl, expand를 추가
             if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
             if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
@@ -202,6 +174,32 @@
 
             if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
 
+            /**
+             * 2009. 01. 29 : 확장변수 값 테이블에 lang_code가 없을 경우 추가
+             **/
+            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+
+            // 2009. 01. 29 Added a trigger for additional setup
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+
+            // 2009. 03. 09 documents에 lang_code 컬럼 추가
+            if(!$oDB->isColumnExists("documents","lang_code")) {
+                $db_info = Context::getDBInfo();
+                $oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+                $obj->lang_code = $db_info->lang_type;
+                executeQuery('document.updateDocumentsLangCode', $obj);
+            }
+
+            // 2009. 03. 11 확장변수 값 테이블의 인덱스 점검
+            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) {
+                $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+            }
+
+            if($oDB->isIndexExists("document_extra_vars", "unique_module_vars")) {
+                $oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
+            }
+
             return new Object(0,'success_updated');
 
         }
@@ -214,92 +212,5 @@
             FileHandler::removeFilesInDir(_XE_PATH_."files/cache/document_category");
         }
 
-        /**
-         * @brief Action중 Admin이 들어갔을 경우 권한 체크
-         **/
-        function checkAdminActionGrant() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin=='Y') return true;
-
-            $actions = array('procDocumentAdminAddCart','dispDocumentAdminManageDocument','procDocumentAdminManageCheckedDocument');
-            if(in_array($this->act, $actions)) return true;
-
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isSiteAdmin()) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                // 게시글 목록에서 글을 체크하는 경우 해당 글의 모듈 정보를 구해서 관리자 여부를 체크
-                case 'procDocumentAdminAddCart' :
-                        if(!$args->srls) return false;
-
-                        $oModuleModel = &getModel('module');
-
-                        list($srl) = explode(',',$args->srls);
-                        if(!$srl) return false;
-                        $module_info = $oModuleModel->getModuleInfoByDocumentSrl($srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true;
-                    break;
-
-                // 체크된 게시글을 관리하는 action
-                case 'dispDocumentAdminManageDocument' :
-                        // 세션 정보에 게시글이 담겨 있으면 return true 해줌
-                        $flag_list = $_SESSION['document_management'];
-                        if(count($flag_list)) return true;
-                    break;
-
-                // 체크된 게시글을 다른 모듈로 이동 또는 복사, 삭제 할때
-                case 'procDocumentAdminManageCheckedDocument' :
-                        switch($args->type) {
-                            // 이동과 복사의 경우에는 대상 모듈의 정보를 체크
-                            case 'move' :
-                            case 'copy' :
-                                    if($args->target_module) {
-
-                                        $oModuleModel = &getModel('module');
-                                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module);
-                                        if(!$module_info) return false;
-
-                                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true;
-                                    }
-                                break;
-
-
-                            // 삭제일 경우는 세션에 저장된 글이 있으면 return true
-                            case 'delete' :
-                                    $flag_list = $_SESSION['document_management'];
-                                    if(count($flag_list)) return true;
-                                break;
-                        }
-                    break;
-
-            }
-            return false;
-        }
     }
 ?>
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 53b3dca23..10217e079 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -26,6 +26,16 @@
             return $this->updateVotedCount($document_srl, $point);
         }
 
+        function insertAlias($module_srl, $document_srl, $alias_title) {
+            $args->alias_srl = getNextSequence();
+            $args->module_srl = $module_srl;
+            $args->document_srl = $document_srl;
+            $args->alias_title = $alias_title;
+            $query = "document.insertAlias";
+            $output = executeQuery($query, $args);
+            return $output;
+        }
+
         /**
          * @breif 게시글의 추천을 처리하는 action (Down)
          **/
@@ -51,6 +61,27 @@
             return $this->declaredDocument($document_srl);
         }
 
+        function deleteDocumentAliasByModule($module_srl)
+        {
+            $args->module_srl = $module_srl;
+            executeQuery("document.deleteAlias", $args);
+        }
+
+        function deleteDocumentAliasByDocument($document_srl)
+        {
+            $args->document_srl = $document_srl;
+            executeQuery("document.deleteAlias", $args);
+        }
+
+        function deleteDocumentHistory($history_srl, $document_srl, $module_srl)
+        {
+            $args->history_srl = $history_srl;
+            $args->module_srl = $module_srl;
+            $args->document_srl = $document_srl;
+            if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+            executeQuery("document.deleteHistory", $args);
+        }
+
         /**
          * @brief 모듈이 삭제될때 등록된 모든 글을 삭제하는 trigger
          **/
@@ -68,6 +99,15 @@
             $output = $oDocumentController->deleteModuleCategory($module_srl);
             if(!$output->toBool()) return $output;
 
+            // 확장변수 삭제
+            $this->deleteDocumentExtraVars($module_srl);
+
+            // remove aliases
+            $this->deleteDocumentAliasByModule($module_srl);
+
+            // remove histories
+            $this->deleteDocumentHistory(null, null, $module_srl);
+
             return new Object();
         }
 
@@ -83,10 +123,6 @@
          * @brief 문서 입력
          **/
         function insertDocument($obj, $manual_inserted = false) {
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-            if(!$output->toBool()) return $output;
-
             // begin transaction
             $oDB = &DB::getInstance();
             $oDB->begin();
@@ -111,9 +147,14 @@
             // 주어진 문서 번호가 없으면 문서 번호 등록
             if(!$obj->document_srl) $obj->document_srl = getNextSequence();
 
+            // trigger 호출 (before)
+            $output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
+            if(!$output->toBool()) return $output;
+
+            $oDocumentModel = &getModel('document');
+
             // 카테고리가 있나 검사하여 없는 카테고리면 0으로 세팅
             if($obj->category_srl) {
-                $oDocumentModel = &getModel('document');
                 $category_list = $oDocumentModel->getCategoryList($obj->module_srl);
                 if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
             }
@@ -139,6 +180,8 @@
             // 제목이 없으면 내용에서 추출
             settype($obj->title, "string");
             if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+            //그래도 없으면 Untitled
+            if($obj->title == '') $obj->title = 'Untitled';
 
             // 내용에서 XE만의 태그를 삭제
             $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
@@ -146,6 +189,11 @@
             // 세션에서 최고 관리자가 아니면 iframe, script 제거
             if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
 
+            // 로그인정보가 없고 사용자 이름이 없으면 오류 표시
+            if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
+
+            $obj->lang_code = Context::getLangType();
+
             // DB에 입력
             $output = executeQuery('document.insertDocument', $obj);
             if(!$output->toBool()) {
@@ -153,9 +201,24 @@
                 return $output;
             }
 
+            // 등록 성공시 확장 변수 등록
+            $extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
+            if(count($extra_keys)) {
+                foreach($extra_keys as $idx => $extra_item) {
+                    $value = '';
+                    if(isset($obj->{'extra_vars'.$idx})) $value = trim($obj->{'extra_vars'.$idx});
+                    elseif(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+                    if(!isset($value)) continue;
+                    $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value);
+                }
+            }
+
             // 성공하였을 경우 category_srl이 있으면 카테고리 update
             if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 
+            // 공지사항 글이면 공지사항 캐시 업데이트
+            if($obj->is_notice == 'Y') $this->updateDocumentNoticeCache($obj->module_srl);
+
             // trigger 호출 (after)
             if($output->toBool()) {
 	            $trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
@@ -187,6 +250,24 @@
             $oDB = &DB::getInstance();
             $oDB->begin();
 
+            $oModuleModel = &getModel('module');
+            $module_srl = $source_obj->get('module_srl');
+            $document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+            if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+            $bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
+
+            if($bUseHistory) {
+                $args->history_srl = getNextSequence();
+                $args->document_srl = $obj->document_srl;
+                $args->module_srl = $module_srl;
+                if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+                $args->nick_name = $source_obj->get('nick_name');
+                $args->member_srl = $source_obj->get('member_srl');
+                $args->regdate = $source_obj->get('last_update');
+                $args->ipaddress = $source_obj->get('ipaddress');
+                $output = executeQuery("document.insertHistory", $args);
+            }
+
             // 기본 변수들 정리
             if($obj->is_secret!='Y') $obj->is_secret = 'N';
             if($obj->allow_comment!='Y') $obj->allow_comment = 'N';
@@ -204,9 +285,10 @@
             unset($obj->_saved_doc_content);
             unset($obj->_saved_doc_message);
 
+            $oDocumentModel = &getModel('document');
+
             // 카테고리가 변경되었으면 검사후 없는 카테고리면 0으로 세팅
             if($source_obj->get('category_srl')!=$obj->category_srl) {
-                $oDocumentModel = &getModel('document');
                 $category_list = $oDocumentModel->getCategoryList($obj->module_srl);
                 if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
             }
@@ -217,10 +299,10 @@
             // 비밀번호가 있으면 md5 hash
             if($obj->password) $obj->password = md5($obj->password);
 
-            // 원본 작성인과 수정하려는 수정인이 동일할 시에 로그인 회원의 정보를 입력
+            // 원본 작성인과 수정하려는 수정인이 동일할 시에 또는 History를 사용하면 로그인된 사용자 정보를 입력
             if(Context::get('is_logged')) {
                 $logged_info = Context::get('logged_info');
-                if($source_obj->get('member_srl')==$logged_info->member_srl) {
+                if($source_obj->get('member_srl')==$logged_info->member_srl || $bUseHistory) {
                     $obj->member_srl = $logged_info->member_srl;
                     $obj->user_name = $logged_info->user_name;
                     $obj->nick_name = $logged_info->nick_name;
@@ -241,10 +323,20 @@
             // 제목이 없으면 내용에서 추출
             settype($obj->title, "string");
             if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+            //그래도 없으면 Untitled
+            if($obj->title == '') $obj->title = 'Untitled';
 
             // 내용에서 XE만의 태그를 삭제
             $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
+            // 글쓴이의 언어변수와 원문의 언어변수가 다르면 확장변수로 처리
+            if($source_obj->lang_code != Context::getLangType()) {
+                $extra_content->title = $obj->title;
+                $extra_content->content = $obj->content;
+                $obj->title = $source_obj->title;
+                $obj->content = $source_obj->content;
+            }
+
             // 세션에서 최고 관리자가 아니면 iframe, script 제거
             if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
 
@@ -255,12 +347,34 @@
                 return $output;
             }
 
+            // 모든 확장 변수 삭제
+            $this->deleteDocumentExtraVars($obj->module_srl, $obj->document_srl, null, Context::getLangType());
+
+            // 등록 성공시 확장 변수 등록
+            $extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
+            if(count($extra_keys)) {
+                foreach($extra_keys as $idx => $extra_item) {
+                    $value = '';
+                    if(isset($obj->{'extra_vars'.$idx})) $value = trim($obj->{'extra_vars'.$idx});
+                    elseif(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+                    if(!isset($value)) continue;
+                    $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value);
+                }
+            }
+
+            // 제목/내용의 다국어 확장변수 등록
+            if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title);
+            if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content);
+
             // 성공하였을 경우 category_srl이 있으면 카테고리 update
             if($source_obj->get('category_srl')!=$obj->category_srl) {
                 if($source_obj->get('category_srl')) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
                 if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
             }
 
+            // 공지사항 글이면 공지사항 캐시 업데이트
+            if($source_obj->is_notice == 'Y' || $obj->is_notice == 'Y') $this->updateDocumentNoticeCache($obj->module_srl);
+
             // trigger 호출 (after)
             if($output->toBool()) {
                 $trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
@@ -311,12 +425,22 @@
                 return $output;
             }
 
+            $this->deleteDocumentAliasByDocument($document_srl);
+
+            $this->deleteDocumentHistory(null, $document_srl, null);
+
             // 카테고리가 있으면 카테고리 정보 변경
             if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
 
             // 신고 삭제
             executeQuery('document.deleteDeclared', $args);
 
+            // 확장 변수 삭제
+            $this->deleteDocumentExtraVars($oDocument->get('module_srl'), $oDocument->document_srl);
+
+            // 공지사항 글이면 공지사항 캐시 업데이트
+            if($oDocument->get('is_notice') == 'Y') $this->updateDocumentNoticeCache($oDocument->get('module_srl'));
+
             // trigger 호출 (after)
             if($output->toBool()) {
                 $trigger_obj = $oDocument->getObjectVars();
@@ -336,6 +460,22 @@
             return $output;
         }
 
+        /**
+         * @brief 특정 모듈의 공지사항 글에 대해 캐시
+         **/
+        function updateDocumentNoticeCache($module_srl) {
+            $cache_file = _XE_PATH_.'files/cache/document_notice/'.getNumberingPath($module_srl,4).$module_srl.'.txt';
+            FileHandler::removeFile($cache_file);
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('document.getNoticeList', $args);
+            if(!$output->toBool()|| !$output->data) return;
+
+            foreach($output->data as $key => $val) {
+                $document_srls[] = $val->document_srl;
+            }
+            FileHandler::writeFile($cache_file, implode(',',$document_srls));
+        }
+
         /**
          * @brief 해당 document의 조회수 증가
          **/
@@ -370,6 +510,69 @@
             $_SESSION['readed_document'][$document_srl] = true;
         }
 
+        /**
+         * @breif documents 테이블의 확장 변수 등록
+         **/
+        function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '') {
+            if(!$module_srl || !$var_idx || !$var_name || !$var_type) return new Object(-1,'msg_invalid_request');
+    
+            $obj->module_srl = $module_srl;
+            $obj->var_idx = $var_idx;
+            $obj->var_name = $var_name;
+            $obj->var_type = $var_type;
+            $obj->var_is_required = $var_is_required=='Y'?'Y':'N';
+            $obj->var_search = $var_search=='Y'?'Y':'N';
+            $obj->var_default = $var_default;
+            $obj->var_desc = $var_desc;
+
+            $output = executeQuery('document.getDocumentExtraKeys', $obj);
+            if(!$output->data) return executeQuery('document.insertDocumentExtraKey', $obj);
+            $output = executeQuery('document.updateDocumentExtraKey', $obj);
+            return $output;
+        }
+
+        /**
+         * @brief documents 확장변수 제거
+         **/
+        function deleteDocumentExtraKeys($module_srl, $var_idx = null) {
+            if(!$module_srl) return new Object(-1,'msg_invalid_request');
+            $obj->module_srl = $module_srl;
+            if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+            $output = executeQuery('document.deleteDocumentExtraKeys', $obj);
+            if(!$output->toBool()) return $output;
+
+            return executeQuery('document.deleteDocumentExtraVars', $obj);
+        }
+
+        /**
+         * @breif documents 테이블의 확장 변수 값 등록
+         **/
+        function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $lang_code = '') {
+            if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request');
+            if(!$lang_code) $lang_code = Context::getLangType();
+    
+            $obj->module_srl = $module_srl;
+            $obj->document_srl = $document_srl;
+            $obj->var_idx = $var_idx;
+            $obj->value = $value;
+            $obj->lang_code = $lang_code ;
+
+            executeQuery('document.insertDocumentExtraVar', $obj);
+        }
+
+        /**
+         * @brief documents 확장변수 값 제거
+         **/
+        function deleteDocumentExtraVars($module_srl, $document_srl = null, $var_idx = null, $lang_code = null) {
+            $obj->module_srl = $module_srl;
+            if(!is_null($document_srl)) $obj->document_srl = $document_srl;
+            if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+            if(!is_null($lang_code)) $obj->lang_code = $lang_code;
+            $output = executeQuery('document.deleteDocumentExtraVars', $obj);
+            return $output;
+        }
+        
+
         /**
          * @brief 해당 document의 추천수 증가
          **/
@@ -730,20 +933,22 @@
         }
 
         /**
-         * @brief document의 20개 확장변수를 xml js filter 적용을 위해 직접 적용
-         * 모듈정보를 받아서 20개의 확장변수를 체크하여 type, required등의 값을 체크하여 header에 javascript 코드 추가
+         * @brief 특정 module_srl에 해당하는 document_extra_keys type, required등의 값을 체크하여 header에 javascript 코드 추가
          **/
-        function addXmlJsFilter($module_info) {
-            $extra_vars = $module_info->extra_vars;
-            if(!$extra_vars) return;
+        function addXmlJsFilter($module_srl) {
+            $oDocumentModel = &getModel('document');
+            $extra_keys = $oDocumentModel->getExtraKeys($module_srl);
+            if(!count($extra_keys)) return;
 
             $js_code = "";
 
-            foreach($extra_vars as $key => $val) {
-                $js_code .= sprintf('alertMsg["extra_vars%d"] = "%s";', $key, $val->name);
-                $js_code .= sprintf('extra_vars[extra_vars.length] = "extra_vars%d";', $key);
-                $js_code .= sprintf('target_type_list["extra_vars%d"] = "%s";', $key, $val->type);
-                if($val->is_required == 'Y') $js_code .= sprintf('notnull_list[notnull_list.length] = "extra_vars%s";',$key);
+            $logged_info = Context::get('logged_info');
+
+            foreach($extra_keys as $idx => $val) {
+                $js_code .= sprintf('alertMsg["extra_vars%s"] = "%s";', $val->idx, $val->name);
+                $js_code .= sprintf('target_type_list["extra_vars%s"] = "%s";', $val->idx, $val->type);
+                $js_code .= sprintf('extra_vars[extra_vars.length] = "extra_vars%s";', $val->idx);
+                if($val->is_required == 'Y' && $logged_info->is_admin != 'Y') $js_code .= sprintf('notnull_list[notnull_list.length] = "extra_vars%s";',$val->idx);
             }
 
             $js_code = "<script type=\"text/javascript\">//<![CDATA[\n".$js_code."\n//]]></script>";
@@ -819,9 +1024,11 @@
                 '} else { '.
                     '$is_admin = false; '.
                     '$group_srsl = array(); '.
-                '} ';
+                '} '."\n";
 
             // xml 캐시 파일 생성 (xml캐시는 따로 동작하기에 session 지정을 해주어야 함)
+            $xml_header_buff = '';
+            $xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff);
             $xml_buff = sprintf(
                 '<?php '.
                 'define(\'__ZBXE__\', true); '.
@@ -835,14 +1042,16 @@
                 'header("Cache-Control: post-check=0, pre-check=0", false); '.
                 'header("Pragma: no-cache"); '.
                 '%s'.
+                '%s'.
                 '?>'.
                 '<root>%s</root>', 
                 $header_script,
-                $this->getXmlTree($tree[0], $tree)
+                $xml_header_buff,
+                $xml_body_buff
             );
 
             // php 캐시 파일 생성
-            $php_output = $this->getPhpCacheCode($tree[0], $tree, 0);
+            $php_output = $this->getPhpCacheCode($tree[0], $tree, $module_info->site_srl, $php_header_buff);
             $php_buff = sprintf(
                 '<?php '.
                 'if(!defined("__ZBXE__")) exit(); '.
@@ -851,7 +1060,7 @@
                 '$menu->list = array(%s); '.
                 '?>', 
                 $header_script,
-                $php_output['category_title_str'], 
+                $php_header_buff,
                 $php_output['buff']
             );
 
@@ -866,17 +1075,16 @@
          * 메뉴 xml파일은 node라는 tag가 중첩으로 사용되며 이 xml doc으로 관리자 페이지에서 메뉴를 구성해줌\n
          * (tree_menu.js 에서 xml파일을 바로 읽고 tree menu를 구현)
          **/
-        function getXmlTree($source_node, $tree) {
+        function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff) {
             if(!$source_node) return;
-
+            
             foreach($source_node as $category_srl => $node) {
                 $child_buff = "";
 
                 // 자식 노드의 데이터 가져옴
-                if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree);
+                if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
 
                 // 변수 정리
-                $title = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->title);
                 $expand = $node->expand;
                 $group_srls = $node->group_srls;
                 $mid = $node->mid;
@@ -887,15 +1095,20 @@
                 if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
                 else $group_check_code = "true";
 
+                $title = $node->title;
+                $oModuleAdminModel = &getAdminModel('module');
+                $langs = $oModuleAdminModel->getLangCode($site_srl, $title);
+                if(count($langs)) foreach($langs as $key => $val) $xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',$val));
+
                 $attribute = sprintf(
-                        'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?"%s":"")?>" url="%s" expand="%s" color="%s" document_count="%d" ',
+                        'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?($_titles[%d][$lang_type]):"")?>" url="%s" expand="%s" color="%s" document_count="%d" ',
                         $mid,
                         $module_srl,
                         $category_srl,
                         $parent_srl,
                         $category_srl,
                         $group_check_code,
-                        $title,
+                        $category_srl,
                         getUrl('','mid',$node->mid,'category',$category_srl),
                         $expand,
                         $color,
@@ -914,7 +1127,7 @@
          * php로 된 캐시파일을 만들어서 db이용없이 바로 메뉴 정보를 구할 수 있도록 한다
          * 이 캐시는 ModuleHandler::displayContent() 에서 include하여 Context::set() 한다
          **/
-        function getPhpCacheCode($source_node, $tree) {
+        function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff) {
             $output = array("buff"=>"", "category_srl_list"=>array());
             if(!$source_node) return $output;
 
@@ -922,12 +1135,9 @@
             foreach($source_node as $category_srl => $node) {
 
                 // 자식 노드가 있으면 자식 노드의 데이터를 먼저 얻어옴 
-                if($category_srl&&$tree[$category_srl]) $child_output = $this->getPhpCacheCode($tree[$category_srl], $tree);
+                if($category_srl&&$tree[$category_srl]) $child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
                 else $child_output = array("buff"=>"", "category_srl_list"=>array());
 
-                // 변수 정리 
-                $category_title_str = sprintf('$_category_title[%d] = "%s"; %s', $node->category_srl, $node->title, $child_output['category_title_str']);
-
                 // 현재 노드의 url값이 공란이 아니라면 category_srl_list 배열값에 입력
                 $child_output['category_srl_list'][] = $node->category_srl;
                 $output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
@@ -941,9 +1151,14 @@
                 $child_buff = $child_output['buff'];
                 $expand = $node->expand;
 
+                $title = $node->title;
+                $oModuleAdminModel = &getAdminModel('module');
+                $langs = $oModuleAdminModel->getLangCode($site_srl, $title);
+                if(count($langs)) foreach($langs as $key => $val) $php_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',$val));
+
                 // 속성을 생성한다 ( category_srl_list를 이용해서 선택된 메뉴의 노드에 속하는지를 검사한다. 꽁수지만 빠르고 강력하다고 생각;;)
                 $attribute = sprintf(
-                    '"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_category_title[%d],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s", "list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
+                    '"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_titles[%d][$lang_type],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s", "list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
                     $node->mid,
                     $node->module_srl,
                     $node->category_srl,
@@ -960,7 +1175,6 @@
                 
                 // buff 데이터를 생성한다
                 $output['buff'] .=  sprintf('%s=>array(%s),', $node->category_srl, $attribute);
-                $output['category_title_str'] .= $category_title_str;
             }
             return $output;
         }
@@ -981,6 +1195,163 @@
             Context::set('document_popup_menu_list', $document_popup_menu_list);
         }
 
+        /**
+         * @brief 관리자가 글 선택시 세션에 담음
+         **/
+        function procDocumentAddCart() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+
+            // 게시글 번호 구함
+            $srls = explode(',',Context::get('srls'));
+            for($i=0;$i<count($srls);$i++) {
+                $srl = trim($srls[$i]);
+                if(!$srl) continue;
+                $document_srls[] = $srl;
+            }
+            if(!count($document_srls)) return;
+
+            // 게시글들의 모듈 번호를 구함
+            $args->list_count = count($document_srls);
+            $args->document_srls = implode(',',$document_srls);
+            $args->order_type = 'asc';
+            $output = executeQueryArray('document.getDocuments', $args);
+            if(!$output->data) return new Object();
+
+            unset($document_srls);
+            foreach($output->data as $key => $val) {
+                $document_srls[$val->module_srl][] = $val->document_srl;
+            }
+            if(!$document_srls || !count($document_srls)) return new Object();
+
+            // 각 문서들의 모듈 관리자 여부 확인
+            $oModuleModel = &getModel('module');
+            $module_srls = array_keys($document_srls);
+            for($i=0;$i<count($module_srls);$i++) {
+                $module_srl = $module_srls[$i];
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if(!$module_info) {
+                    unset($document_srls[$module_srl]);
+                    continue;
+                }
+                $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
+                if(!$grant->manager) {
+                    unset($document_srls[$module_srl]);
+                    continue;
+                }
+
+            }
+            if(!count($document_srls)) return new Object();
+
+            foreach($document_srls as $module_srl => $documents) {
+                $cnt = count($documents);
+                for($i=0;$i<$cnt;$i++) {
+                    $document_srl = (int)trim($documents[$i]);
+                    if(!$document_srls) continue;
+                    if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
+                    else $_SESSION['document_management'][$document_srl] = true;
+                }
+            }
+        }
+
+        /**
+         * @brief 세션에 담긴 선택글의 이동/ 삭제
+         **/
+        function procDocumentManageCheckedDocument() {
+            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+
+            $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) {
+
+                $oCommunicationController = &getController('communication');
+                $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(false, false, false));
+
+                    $oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
+                }
+            }
+
+            // 스팸 처리가 되지 않도록 스팸필터 설정
+            $oSpamController = &getController('spamfilter');
+            $oSpamController->setAvoidLog();
+            $oDocumentAdminController = &getAdminController('document');
+
+            if($type == 'move') {
+                if(!$module_srl) return new Object(-1, 'fail_to_move');
+
+                $output = $oDocumentAdminController->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 = $oDocumentAdminController->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();
+                for($i=0;$i<$document_srl_count;$i++) {
+                    $document_srl = $document_srl_list[$i];
+                    $output = $this->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);
+        }
+
+        function procDocumentInsertModuleConfig()
+        {
+            $module_srl = Context::get('target_module_srl');
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+
+            $document_config = null;
+            $document_config->use_history = Context::get('use_history');
+            if(!$document_config->use_history) $document_config->user_history = 'N';
+
+            $oModuleController = &getController('module');
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
+            }
+            $this->setError(-1);
+            $this->setMessage('success_updated');
+        }
 
     }
 ?>
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 13a56d4db..e27afcb81 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -8,34 +8,37 @@
     class documentItem extends Object {
 
         var $document_srl = 0;
+        var $lang_code = null;
 
         var $allow_trackback_status = null;
 
-        function documentItem($document_srl = 0) {
+        function documentItem($document_srl = 0, $load_extra_vars = true) {
             $this->document_srl = $document_srl;
-            $this->_loadFromDB();
+
+            $this->_loadFromDB($load_extra_vars);
         }
 
-        function setDocument($document_srl) {
+        function setDocument($document_srl, $load_extra_vars = true) {
             $this->document_srl = $document_srl;
-            $this->_loadFromDB();
+            $this->_loadFromDB($load_extra_vars);
         }
 
-        function _loadFromDB() {
+        function _loadFromDB($load_extra_vars=true) {
             if(!$this->document_srl) return;
 
             $args->document_srl = $this->document_srl;
             $output = executeQuery('document.getDocument', $args);
 
-            $this->setAttribute($output->data);
+            $this->setAttribute($output->data,$load_extra_vars);
         }
 
-        function setAttribute($attribute) {
+        function setAttribute($attribute,$load_extra_vars=true) {
             if(!$attribute->document_srl) {
                 $this->document_srl = null;
                 return;
             }
             $this->document_srl = $attribute->document_srl;
+            $this->lang_code = $attribute->lang_code;
             $this->adds($attribute);
 
             // 태그 정리
@@ -45,6 +48,10 @@
                 for($i=0;$i<$tag_count;$i++) if(trim($tags[$i])) $tag_list[] = trim($tags[$i]);
                 $this->add('tag_list', $tag_list);
             }
+
+            $oDocumentModel = &getModel('document');
+            $GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl] = $this;
+            if($load_extra_vars) $oDocumentModel->setToAllDocumentExtraVars();
         }
 
         function isExists() {
@@ -163,6 +170,10 @@
             $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
         }
 
+        function getLangCode() {
+            return $this->get('lang_code');
+        }
+
         function getIpaddress() {
             if($this->isGranted()) return $this->get('ipaddress');
             return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress'));
@@ -370,16 +381,32 @@
         }
 
         function isExtraVarsExists() {
-            for($i=1;$i<=20;$i++) {
-                if($this->get('extra_vars'.$i)) return true;
-            }
-            return false;
+            if(!$this->get('module_srl')) return false;
+            $oDocumentModel = &getModel('document');
+            $extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
+            return count($extra_keys)?true:false;
         }
 
-        function getExtraValue($key) {
-            $val = $this->get('extra_vars'.$key);
-            if(strpos($val,'|@|')!==false) $val = explode('|@|', $val);
-            return $val;
+        function getExtraVars() {
+            if(!$this->get('module_srl') || !$this->document_srl) return null;
+
+            $oDocumentModel = &getModel('document');
+            return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
+        }
+
+        function getExtraValue($idx) {
+            $extra_vars = $this->getExtraVars();
+            return $extra_vars[$idx]->value;
+        }
+
+        function getExtraValueHTML($idx) {
+            $extra_vars = $this->getExtraVars();
+            if(array_key_exists($idx,$extra_vars)){
+                return $extra_vars[$idx]->getValueHTML();
+            }else{
+                return '';
+            }
+
         }
 
         function getExtraVarsValue($key) {
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index dade66bc0..d98536037 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -20,94 +20,70 @@
             return $_SESSION['own_document'][$document_srl];
         }
 
+        /**
+         * @brief 확장변수를 매 문서마다 처리하지 않기 위해 매크로성으로 일괄 select 및 적용 
+         **/
+        function setToAllDocumentExtraVars() {
+            // XE에서 모든 문서 객체는 XE_DOCUMENT_LIST라는 전역 변수에 세팅을 함
+            if(!count($GLOBALS['XE_DOCUMENT_LIST'])) continue;
+
+            // 모든 호출된 문서 객체를 찾아서 확장변수가 설정되었는지를 확인
+            $document_srls = array();
+            foreach($GLOBALS['XE_DOCUMENT_LIST'] as $key => $val) {
+                if(!$val->document_srl || isset($GLOBALS['XE_EXTRA_VARS'][$val->document_srl])) continue;
+                $document_srls[$key] = $val->document_srl;
+            }
+
+            // 검출된 문서 번호가 없으면 return
+            if(!count($document_srls)) return;
+
+            $lang_code = Context::getLangType();
+
+            // 확장변수 미지정된 문서에 대해서 일단 현재 접속자의 언어코드로 확장변수를 검색
+            $obj->document_srl = implode(',',$document_srls);
+            $output = executeQueryArray('document.getDocumentsExtraVars', $obj);
+            if($output->toBool() && $output->data) {
+                $setted = array();
+                foreach($output->data as $key => $val) {
+                    if(!$val->document_srl) continue;
+
+                    if($val->idx<0 && $val->lang_code == $lang_code) {
+                        if($val->idx == -1) $GLOBALS['XE_DOCUMENT_LIST'][$val->document_srl]->add('title', $val->value);
+                        else if($val->idx == -2) $GLOBALS['XE_DOCUMENT_LIST'][$val->document_srl]->add('content', $val->value);
+                    } elseif($val->idx>0) {
+                        if($lang_code == $val->lang_code) {
+                            $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value);
+                            $GLOBALS['XE_EXTRA_VARS'][$val->document_srl][$val->idx] = $obj;
+                        } else if($lang_code == $GLOBALS['XE_DOCUMENT_LIST'][$val->document_srl]->lang_code && !isset($GLOBALS['XE_EXTRA_VARS'][$val->document_srl][$val->idx])) {
+                            $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value);
+                            $GLOBALS['XE_EXTRA_VARS'][$val->document_srl][$val->idx] = $obj;
+                        } else if(!isset($GLOBALS['XE_EXTRA_VARS'][$val->document_srl][$val->idx])) {
+                            $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value);
+                            $GLOBALS['XE_EXTRA_VARS'][$val->document_srl][$val->idx] = $obj;
+                        }
+                    }
+                }
+            }
+            foreach($document_srls as $key => $document_srl) {
+                if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) $GLOBALS['XE_EXTRA_VARS'][$document_srl] = array();
+            }
+
+        }
+
         /**
          * @brief 문서 가져오기
          **/
         function getDocument($document_srl=0, $is_admin = false) {
             if(!$document_srl) return new documentItem();
 
-            if(!$GLOBALS['__DocumentItem__'][$document_srl]) {
-                $oDocument = new documentItem($document_srl);
-                if($is_admin) $oDocument->setGrant();
-                $GLOBALS['__DocumentItem__'][$document_srl] = $oDocument;
-            }
+            if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) {
+                $oDocument = new documentItem($document_srl, true);
+                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                $this->setToAllDocumentExtraVars();
+            } 
+            if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
-            return $GLOBALS['__DocumentItem__'][$document_srl];
-       }
-
-        /**
-         * @brief 선택된 게시물의 팝업메뉴 표시
-         *
-         * 인쇄, 스크랩, 추천, 비추천, 신고 기능 추가
-         **/
-        function getDocumentMenu() {
-
-            // 요청된 게시물 번호와 현재 로그인 정보 구함
-            $document_srl = Context::get('target_srl');
-            $mid = Context::get('cur_mid');
-            $logged_info = Context::get('logged_info');
-            $act = Context::get('cur_act');
-            
-            // menu_list 에 "표시할글,target,url" 을 배열로 넣는다
-            $menu_list = array();
-
-            // trigger 호출
-            ModuleHandler::triggerCall('document.getDocumentMenu', 'before', $menu_list);
-
-            $oDocumentController = &getController('document');
-
-            // 회원이어야만 가능한 기능
-            if($logged_info->member_srl) {
-
-                // 추천 버튼 추가
-                $url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_vote','./modules/document/tpl/icons/vote_up.gif','javascript');
-
-                // 비추천 버튼 추가
-                $url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','./modules/document/tpl/icons/vote_down.gif','javascript');
-
-                // 신고 기능 추가
-                $url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_declare','./modules/document/tpl/icons/declare.gif','javascript');
-
-                // 스크랩 버튼 추가
-                $url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','./modules/document/tpl/icons/scrap.gif','javascript');
-            }
-
-            // 인쇄 버튼 추가
-            $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-            $oDocumentController->addDocumentPopupMenu($url,'cmd_print','./modules/document/tpl/icons/print.gif','printDocument');
-
-            // trigger 호출 (after)
-            ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-
-            // 관리자일 경우 ip로 글 찾기
-            if($logged_info->is_admin == 'Y') {
-                $oDocumentModel = &getModel('document');
-                $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                if($oDocument->isExists()) {
-                    // ip주소에 해당하는 글 찾기
-                    $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'));
-                    $icon_path = './modules/member/tpl/images/icon_management.gif';
-                    $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
-
-                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument-> getIpAddress());
-                    $oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript');
-                }
-            }
-
-            // 팝업메뉴의 언어 변경
-            $menus = Context::get('document_popup_menu_list');
-            $menus_count = count($menus);
-            for($i=0;$i<$menus_count;$i++) {
-                $menus[$i]->str = Context::getLang($menus[$i]->str);
-            }
-
-            // 최종적으로 정리된 팝업메뉴 목록을 구함
-            $this->add('menus', $menus);
+            return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
         }
 
         /**
@@ -134,11 +110,14 @@
                 if(!$attribute->document_srl) continue;
                 $oDocument = null;
                 $oDocument = new documentItem();
-                $oDocument->setAttribute($attribute);
+                $oDocument->setAttribute($attribute, false);
                 if($is_admin) $oDocument->setGrant();
 
                 $result[$attribute->document_srl] = $oDocument;
+
+                $GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl] = $oDocument;
             }
+            $this->setToAllDocumentExtraVars();
             return $result;
         }
 
@@ -244,10 +223,11 @@
                             $query_id = 'document.getDocumentListWithinTag';
                         break;
                     default :
-                            preg_match('/^extra_vars([0-9]+)$/',$search_target,$matches);
-                            if($matches[1]) {
-                                $args->{"s_extra_vars".$matches[1]} = $search_keyword;
-                                $use_division = true;
+                            if(strpos($search_target,'extra_vars')!==false) {
+                                $args->var_idx = substr($search_target, strlen('extra_vars'));
+                                $args->var_value = str_replace(' ','%',$search_keyword);
+                                $args->sort_index = 'documents.'.$args->sort_index;
+                                $query_id = 'document.getDocumentListWithExtraVars';
                             }
                         break;
                 }
@@ -367,13 +347,16 @@
                 $document_srl = $attribute->document_srl;
                 $oDocument = null;
                 $oDocument = new documentItem();
-                $oDocument->setAttribute($attribute);
+                $oDocument->setAttribute($attribute, false);
                 if($is_admin) $oDocument->setGrant();
 
+                $GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl] = $oDocument;
+
                 $output->data[$virtual_number] = $oDocument;
                 $virtual_number --;
             
             }
+            $this->setToAllDocumentExtraVars();
             return $output;
         }
 
@@ -381,27 +364,136 @@
          * @brief module_srl값을 가지는 문서의 공지사항만 가져옴
          **/
         function getNoticeList($obj) {
-            $args->module_srl = $obj->module_srl;
-            $args->category_srl = $obj->category_srl;
-            $args->sort_index = 'list_order';
+            $cache_file = _XE_PATH_.'files/cache/document_notice/'.getNumberingPath($obj->module_srl,4).$obj->module_srl.'.txt';
+            if(!file_exists($cache_file)) {
+                $oDocumentController = &getController('document');
+                $oDocumentController->updateDocumentNoticeCache($obj->module_srl);
+            }
+
+            $document_srls = FileHandler::readFile($cache_file);
+            if(!$document_srls) return;
+
+            $list_count = count(explode(',',$document_srls));
+            $args->document_srls = $document_srls;
+            $args->list_count = $list_count;
+            $args->list_order = 'list_order';
             $args->order_type = 'asc';
-
-            $output = executeQueryArray('document.getNoticeList', $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-
-            foreach($output->data as $key => $attribute) {
-                $document_srl = $attribute->document_srl;
-
+            $output = executeQueryArray('document.getDocuments', $args);
+            if(!$output->toBool()||!$output->data) return;
+            foreach($output->data as $key => $val) {
+                if(!$val->document_srl) continue;
                 $oDocument = null;
                 $oDocument = new documentItem();
-                $oDocument->setAttribute($attribute);
-
-                $output->data[$key] = $oDocument;
-            
+                $oDocument->setAttribute($val, false);
+                $GLOBALS['XE_DOCUMENT_LIST'][$val->document_srl] = $oDocument;
+                $result->data[$val->document_srl] = $oDocument;
             }
-            return $output;
+            $this->setToAllDocumentExtraVars();
+            return $result;
+        }
+
+
+        /**
+         * @brief document의 확장 변수 키값을 가져오는 함수
+         * $form_include : 글 작성시에 필요한 확장변수의 input form 추가 여부
+         **/
+        function getExtraKeys($module_srl) {
+            $oExtraVar = &ExtraVar::getInstance($module_srl);
+            if(!$oExtraVar->isSettedExtraVars()) {
+                $obj->module_srl = $module_srl;
+                $obj->sort_index = 'var_idx';
+                $obj->order = 'asc';
+                $output = executeQueryArray('document.getDocumentExtraKeys', $obj);
+                $oExtraVar->setExtraVarKeys($output->data);
+            }
+            return $oExtraVar->getExtraVars();
+        }
+
+        /**
+         * @brief 특정 document의 확장 변수 값을 가져오는 함수
+         **/
+        function getExtraVars($module_srl, $document_srl) {
+            if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+                $oDocument = $this->getDocument($document_srl, false);
+                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                $this->setToAllDocumentExtraVars();
+            }
+            return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
+        }
+
+        /**
+         * @brief 선택된 게시물의 팝업메뉴 표시
+         *
+         * 인쇄, 스크랩, 추천, 비추천, 신고 기능 추가
+         **/
+        function getDocumentMenu() {
+
+            // 요청된 게시물 번호와 현재 로그인 정보 구함
+            $document_srl = Context::get('target_srl');
+            $mid = Context::get('cur_mid');
+            $logged_info = Context::get('logged_info');
+            $act = Context::get('cur_act');
+            
+            // menu_list 에 "표시할글,target,url" 을 배열로 넣는다
+            $menu_list = array();
+
+            // trigger 호출
+            ModuleHandler::triggerCall('document.getDocumentMenu', 'before', $menu_list);
+
+            $oDocumentController = &getController('document');
+
+            // 회원이어야만 가능한 기능
+            if($logged_info->member_srl) {
+
+                // 추천 버튼 추가
+                $url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_vote','./modules/document/tpl/icons/vote_up.gif','javascript');
+
+                // 비추천 버튼 추가
+                $url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','./modules/document/tpl/icons/vote_down.gif','javascript');
+
+                // 신고 기능 추가
+                $url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_declare','./modules/document/tpl/icons/declare.gif','javascript');
+
+                // 스크랩 버튼 추가
+                $url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','./modules/document/tpl/icons/scrap.gif','javascript');
+            }
+
+            // 인쇄 버튼 추가
+            $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
+            $oDocumentController->addDocumentPopupMenu($url,'cmd_print','./modules/document/tpl/icons/print.gif','printDocument');
+
+            // trigger 호출 (after)
+            ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
+
+            // 관리자일 경우 ip로 글 찾기
+            if($logged_info->is_admin == 'Y') {
+                $oDocumentModel = &getModel('document');
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+
+                if($oDocument->isExists()) {
+                    // ip주소에 해당하는 글 찾기
+                    $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'));
+                    $icon_path = './modules/member/tpl/images/icon_management.gif';
+                    $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+
+                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument-> getIpAddress());
+                    $oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript');
+                }
+            }
+
+            // 팝업메뉴의 언어 변경
+            $menus = Context::get('document_popup_menu_list');
+            $menus_count = count($menus);
+            for($i=0;$i<$menus_count;$i++) {
+                $menus[$i]->str = Context::getLang($menus[$i]->str);
+            }
+
+            // 최종적으로 정리된 팝업메뉴 목록을 구함
+            $this->add('menus', $menus);
         }
 
         /**
@@ -496,26 +588,21 @@
          * 속도나 여러가지 상황을 고려해서 카테고리 목록은 php로 생성된 script를 include하여 사용하는 것을 원칙으로 함
          **/
         function getCategoryList($module_srl) {
-            // 한 페이지에서 여러번 호출될 경우를 대비해서 static var로 보관 (php4때문에 다른 방법으로 구현)
-            if(!isset($this->category_list[$module_srl])) {
+            // 대상 모듈의 카테고리 파일을 불러옴
+            $filename = sprintf("./files/cache/document_category/%s.php", $module_srl);
 
-                // 대상 모듈의 카테고리 파일을 불러옴
-                $filename = sprintf("./files/cache/document_category/%s.php", $module_srl);
-
-                // 대상 파일이 없으면 카테고리 캐시 파일을 재생성
-                if(!file_exists($filename)) {
-                    $oDocumentController = &getController('document');
-                    if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
-                }
-
-                @include($filename);
-
-                // 카테고리의 정리
-                $document_category = array();
-                $this->_arrangeCategory($document_category, $menu->list, 0);
-                $this->category_list[$module_srl] = $document_category;
+            // 대상 파일이 없으면 카테고리 캐시 파일을 재생성
+            if(!file_exists($filename)) {
+                $oDocumentController = &getController('document');
+                if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
             }
-            return $this->category_list[$module_srl];
+
+            @include($filename);
+
+            // 카테고리의 정리
+            $document_category = array();
+            $this->_arrangeCategory($document_category, $menu->list, 0);
+            return $document_category;
         }
 
         /**
@@ -655,6 +742,7 @@
          * @brief 특정 모듈의 분류를 구함
          **/
         function getDocumentCategories() {
+            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
             $module_srl = Context::get('module_srl');
             $categories= $this->getCategoryList($module_srl);
             $lang = Context::get('lang');
@@ -673,13 +761,58 @@
          * @brief 문서 설정 정보를 구함
          **/
         function getDocumentConfig() {
-            if(!$GLOBLAS['__document_config__']) {
+            if(!$GLOBALS['__document_config__']) {
                 $oModuleModel = &getModel('module');
                 $config = $oModuleModel->getModuleConfig('document');
                 if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
-                $GLOBLAS['__document_config__'] = $config;
+                $GLOBALS['__document_config__'] = $config;
             }
-            return $GLOBLAS['__document_config__'];
+            return $GLOBALS['__document_config__'];
+        }
+
+        /**
+         * @brief 공통 :: 모듈의 확장 변수 관리
+         * 모듈의 확장변수 관리는  모든 모듈에서 document module instance를 이용할때 사용할 수 있음
+         **/
+        function getExtraVarsHTML($module_srl) {
+            // 기존의 extra_keys 가져옴
+            $extra_keys = $this->getExtraKeys($module_srl);
+            Context::set('extra_keys', $extra_keys);
+
+            // grant 정보를 추출
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'extra_keys');
+        }
+
+        /**
+         * @brief 공통 :: 모듈의 카테고리 변수 관리
+         **/
+        function getCategoryHTML($module_srl) {
+            $category_xml_file = $this->getCategoryXmlFile($module_srl);
+
+            Context::set('category_xml_file', $category_xml_file);
+            Context::addJsFile('./common/js/tree_menu.js');
+
+            // grant 정보를 추출
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'category_list');
+        }
+
+        function getDocumentSrlByAlias($mid, $alias)
+        {
+            if(!$mid || !$alias) return null;
+            $args->mid = $mid;
+            $args->alias_title = $alias;
+            $output = executeQuery('document.getDocumentSrlByAlias', $args);
+            if(!$output->data) return null;
+            else return $output->data->document_srl;
+        }
+
+        function getHistories($document_srl)
+        {
+            $args->document_srl = $document_srl;
+            $output = executeQueryArray('document.getHistories', $args);
+            return $output->data;
         }
     }
 ?>
diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index 7fb35b2e2..3ed31e505 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -31,18 +31,6 @@
             // 권한 체크
             if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
 
-
-            // 설정된 확장 변수를 찾는다.
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
-            $extra_vars = array();
-            foreach($module_info->extra_vars as $key => $extra_var){
-                $extra_vars[$key]->name = $extra_var->name;
-                $extra_vars[$key]->value = $oDocument->getExtraValue($key);
-                if(is_array($extra_vars[$key]->value)) $extra_vars[$key]->value = join("",$extra_vars[$key]->value);
-            }
-            Context::set('extra_vars', $extra_vars);
-
             // 브라우저 타이틀 설정
             Context::setBrowserTitle($oDocument->getTitleText());
             Context::set('oDocument', $oDocument);
@@ -63,5 +51,62 @@
             $this->setTemplateFile('preview_page');
         }
         
+        /**
+         * @brief 관리자가 선택한 문서에 대한 관리
+         **/
+        function dispDocumentManageDocument() {
+            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+
+            // 선택한 목록을 세션에서 가져옴
+            $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);
+            }
+
+            $oModuleModel = &getModel('module');
+
+            // 모듈 카테고리 목록과 모듈 목록의 조합
+            if(count($module_list)>1) Context::set('module_list', $module_categories);
+
+            // 팝업 레이아웃 선택
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('checked_list');
+        }
+
+        function triggerDispDocumentAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // 선택된 모듈의 정보를 가져옴
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+
+            $oModuleModel = &getModel('module');
+            $document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+            if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+            Context::set('document_config', $document_config);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'document_module_config');
+            $obj .= $tpl;
+            
+            return new Object();
+        }
+
     }
 ?>
diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php
index 144ba4d03..85114ed93 100644
--- a/modules/document/lang/en.lang.php
+++ b/modules/document/lang/en.lang.php
@@ -13,6 +13,21 @@
     $lang->move_target_module = "Target module ";
     $lang->title_bold = 'Bold';
     $lang->title_color = 'Color';
+    $lang->new_document_count = '새글';
+
+    $lang->parent_category_title = 'Parent Category';
+    $lang->category_title = 'Category';
+    $lang->category_color = 'Category Font Color';
+    $lang->expand = 'Expand';
+    $lang->category_group_srls = 'Accessable Group';
+
+    $lang->cmd_make_child = 'Add Child Category';
+    $lang->cmd_enable_move_category = "Change Category Position (Drag the top menu after selection)";
+
+    $lang->about_category_title = 'Please input category name';
+    $lang->about_expand = 'By selecting this option, it will be always expanded';
+    $lang->about_category_group_srls = 'Only selected group will be able to use current category';
+    $lang->about_category_color = 'You can set font color of category.';
 
     $lang->cmd_search_next = 'Search Next';
 
@@ -49,4 +64,9 @@
         'last_update' => 'Last Modified Date',
         'ipaddress' => 'IP Address',
     );
+
+    $lang->alias = "Alias";
+    $lang->history = "History";
+    $lang->about_use_history = "Determine whether to enable history feature, if it is enabled, update history would be stored and possible to restore old revisions.";
+    $lang->trace_only = "Trace only";
 ?>
diff --git a/modules/document/lang/es.lang.php b/modules/document/lang/es.lang.php
index 481c2c34f..c7557ab8f 100644
--- a/modules/document/lang/es.lang.php
+++ b/modules/document/lang/es.lang.php
@@ -13,6 +13,19 @@
     $lang->move_target_module = "Módulo para cambiar de posición";
     $lang->title_bold = 'Bold';
     $lang->title_color = 'Color';
+    $lang->new_document_count = '새글';
+
+    $lang->parent_category_title = 'Categoría Superior';
+    $lang->category_title = 'Nombre de la categoría';
+    $lang->category_color = '분류 폰트색깔';
+    $lang->expand = 'Expandir';
+    $lang->category_group_srls = 'Limitar el grupo';
+    $lang->cmd_make_child = 'Agregar sub categoría';
+    $lang->cmd_enable_move_category = "Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)";
+    $lang->about_category_title = 'Ingresar el nombre de la categoría.';
+    $lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
+    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
 
     $lang->cmd_search_next = 'Buscar siguiente';
 
@@ -49,4 +62,8 @@
         'last_update' => 'Día de la última actualización',
         'ipaddress' => 'Dirección IP',
     );
+    $lang->alias = "Alias";
+    $lang->history = "히스토리";
+    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
+    $lang->trace_only = "흔적만 남김";
 ?>
diff --git a/modules/document/lang/fr.lang.php b/modules/document/lang/fr.lang.php
index 733cd0f14..49b18fba7 100644
--- a/modules/document/lang/fr.lang.php
+++ b/modules/document/lang/fr.lang.php
@@ -12,6 +12,19 @@
     $lang->cmd_delete_all_thumbnail = 'Supprimer toutes les vignettes';
     $lang->title_bold = 'Gras';
     $lang->title_color = 'Couleur';
+    $lang->new_document_count = '새글';
+
+    $lang->parent_category_title = 'catégorie supérieure';
+    $lang->category_title = 'Catégorie';
+    $lang->category_color = '분류 폰트색깔';
+    $lang->expand = 'Etendre';
+    $lang->category_group_srls = 'Groupe Accessible';
+    $lang->cmd_make_child = 'Ajouter une catégorie inférieure';
+    $lang->cmd_enable_move_category = "Bouger la position de la catégorie (Cochez la case et puis glisser la catégorie que vous voulez déplacer)";
+    $lang->about_category_title = 'Entrez le nom de la catégorie, S.V.P.';
+    $lang->about_expand = 'Si vous cochez la case à cocher, ce sera toujours tendu';
+    $lang->about_category_group_srls = 'Le groupe choisi seulement pourra utiliser la catégorie courante';
+    $lang->about_category_color = 'You can set font color of category.';
 
     $lang->cmd_search_next = 'Recherche Suivante';
 
@@ -50,4 +63,8 @@
         'last_update' => 'La Dernière Mise à Jour',
         'ipaddress' => 'Adresse IP',
     );
+    $lang->alias = "Alias";
+    $lang->history = "히스토리";
+    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
+    $lang->trace_only = "흔적만 남김";
 ?>
diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php
index 97e9a7ec3..449f54bed 100644
--- a/modules/document/lang/jp.lang.php
+++ b/modules/document/lang/jp.lang.php
@@ -12,6 +12,19 @@
     $lang->cmd_delete_all_thumbnail = 'すべてのサムネール削除';
     $lang->title_bold = 'タイトル太字';
     $lang->title_color = 'タイトルの色';
+    $lang->new_document_count = '새글';
+
+    $lang->parent_category_title = '上位カテゴリ名';
+    $lang->category_title = 'カテゴリ名';
+    $lang->category_color = 'カテゴリフォント色';
+    $lang->expand = '拡張表示';
+    $lang->category_group_srls = 'グループ制限';
+    $lang->cmd_make_child = '下位カテゴリ追加';
+    $lang->cmd_enable_move_category = "カテゴリ位置変更（選択後上のメニューをドラッグして下さい）";
+    $lang->about_category_title = 'カテゴリ名を入力して下さい。';
+    $lang->about_expand = 'チェックすると常に展開された状態になります。';
+    $lang->about_category_group_srls = '選択したグループのみ、現在のカテゴリの指定が出来ます。';
+    $lang->about_category_color = 'カテゴリのフォント色を設定します。';
 
     $lang->cmd_search_next = '継続検索';
 
@@ -50,4 +63,8 @@
         'last_update' => '最近修正日',
         'ipaddress' => 'IPアドレス',
     );
+    $lang->alias = "Alias";
+    $lang->history = "히스토리";
+    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
+    $lang->trace_only = "흔적만 남김";
 ?>
diff --git a/modules/document/lang/ko.lang.php b/modules/document/lang/ko.lang.php
index be3eceecc..77a091390 100644
--- a/modules/document/lang/ko.lang.php
+++ b/modules/document/lang/ko.lang.php
@@ -12,6 +12,21 @@
     $lang->cmd_delete_all_thumbnail = '썸네일 모두 삭제';
     $lang->title_bold = '제목 굵게';
     $lang->title_color = '제목 색깔';
+    $lang->new_document_count = '새글';
+
+    $lang->parent_category_title = '상위 카테고리명';
+    $lang->category_title = '분류명';
+    $lang->category_color = '분류 폰트색깔';
+    $lang->expand = '펼침';
+    $lang->category_group_srls = '그룹제한';
+
+    $lang->cmd_make_child = '하위 카테고리 추가';
+    $lang->cmd_enable_move_category = '카테고리 위치 변경 (선택후 위 메뉴를 드래그하세요)';
+
+    $lang->about_category_title = '카테고리 이름을 입력해주세요';
+    $lang->about_expand = '선택하시면 늘 펼쳐진 상태로 있게 합니다';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
+    $lang->about_category_color = '분류 폰트색깔을 지정합니다. 예) red 또는 #ff0000';
 
     $lang->cmd_search_next = '계속 검색';
 
@@ -26,7 +41,7 @@
     $lang->msg_is_secret = '비밀글입니다';
     $lang->msg_checked_document_is_deleted = '%d개의 글이 삭제되었습니다';
 
-    $lang->move_target_module = "대상 모듈";
+    $lang->move_target_module = '대상 모듈';
 
     // 관리자 페이지에서 검색할 대상
     $lang->search_target_list = array(
@@ -50,4 +65,9 @@
         'last_update' => '최근수정일',
         'ipaddress' => 'IP 주소',
     );
+
+    $lang->alias = 'Alias';
+    $lang->history = '히스토리';
+    $lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
+    $lang->trace_only = '흔적만 남김';
 ?>
diff --git a/modules/document/lang/ru.lang.php b/modules/document/lang/ru.lang.php
index 55a2f0b1e..88b83c1cd 100644
--- a/modules/document/lang/ru.lang.php
+++ b/modules/document/lang/ru.lang.php
@@ -13,7 +13,18 @@
     $lang->move_target_module = "Переместить в";
     $lang->title_bold = 'Жирное название';
     $lang->title_color = 'Цвет названия';
+    $lang->new_document_count = '새글';
 
+    $lang->parent_category_title = 'Родительская категория';
+    $lang->category_title = 'Категория';
+    $lang->category_color = '분류 폰트색깔';
+    $lang->expand = 'Расширить';
+    $lang->category_group_srls = 'Доступные группы';
+    $lang->about_category_title = 'Пожалуйста, введите название категории';
+    $lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
+    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
+
+    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
     $lang->cmd_temp_save = 'Сохранить временно';
 
 	$lang->cmd_toggle_checked_document = 'Перевернуть выбранные объекты';
@@ -47,4 +58,8 @@
         'last_update' => 'Последнее Обновление',
         'ipaddress' => 'IP-Адрес',
     );
+    $lang->alias = "Alias";
+    $lang->history = "히스토리";
+    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
+    $lang->trace_only = "흔적만 남김";
 ?>
diff --git a/modules/document/lang/zh-CN.lang.php b/modules/document/lang/zh-CN.lang.php
index 351101ba6..b1664b8d3 100644
--- a/modules/document/lang/zh-CN.lang.php
+++ b/modules/document/lang/zh-CN.lang.php
@@ -13,6 +13,19 @@
     $lang->move_target_module = "移动目标模块";
     $lang->title_bold = '粗标题';
     $lang->title_color = '标题颜色';
+    $lang->new_document_count = '新帖';
+
+    $lang->parent_category_title = '上级分类名';
+    $lang->category_title = '分类名';
+    $lang->category_color = '分类颜色';
+    $lang->expand = '展开';
+    $lang->category_group_srls = '用户组';
+    $lang->cmd_make_child = '添加下级分类';
+    $lang->cmd_enable_move_category = "分类顺序(勾选后用鼠标拖动分类项)";
+    $lang->about_category_title = '请输入分类名。';
+    $lang->about_expand = '选择此项将维持展开状态。';
+    $lang->about_category_group_srls = '所选用户组才可以查看此分类。';
+    $lang->about_category_color = '请指定分类颜色（必须带#符号）。ex）#ff0000';
 
     $lang->cmd_search_next = '继续搜索';
 
@@ -49,4 +62,8 @@
         'last_update' => '最近更新日期',
         'ipaddress' => 'IP 地址',
     );
+    $lang->alias = "Alias";
+    $lang->history = "编辑记录";
+    $lang->about_use_history = "设置启用编辑记录与否。启用将记录修改主题版本，并可以复原。";
+    $lang->trace_only = "只留痕迹";
 ?>
diff --git a/modules/document/lang/zh-TW.lang.php b/modules/document/lang/zh-TW.lang.php
index df5dab68f..4d183dcc4 100644
--- a/modules/document/lang/zh-TW.lang.php
+++ b/modules/document/lang/zh-TW.lang.php
@@ -10,9 +10,23 @@
     $lang->thumbnail_crop = '裁減';
     $lang->thumbnail_ratio = '比例';
     $lang->cmd_delete_all_thumbnail = '刪除全部縮圖';
-    $lang->move_target_module = "移到";
     $lang->title_bold = '粗體';
     $lang->title_color = '標題顏色';
+    $lang->new_document_count = 'N';
+
+    $lang->parent_category_title = '主分類';
+    $lang->category_title = '分類名稱';
+    $lang->category_color = '分類顏色';
+    $lang->expand = '展開';
+    $lang->category_group_srls = '群組';
+
+    $lang->cmd_make_child = '新增子分類';
+    $lang->cmd_enable_move_category = '分類順序(勾選後用滑鼠拖曳分類項目)';
+
+    $lang->about_category_title = '請輸入分類名稱。';
+    $lang->about_expand = '選擇此項將維持展開狀態。';
+    $lang->about_category_group_srls = '被選擇的群組才可以檢視此分類。';
+    $lang->about_category_color = '設定分類顏色。例)#ff0000';
 
     $lang->cmd_search_next = '繼續搜尋';
 
@@ -27,7 +41,9 @@
     $lang->msg_is_secret = '秘密！';
     $lang->msg_checked_document_is_deleted = '刪除了%d個文章。';
 
-    // 管理頁面尋找的對象
+    $lang->move_target_module = '移到';
+
+    // 管理頁面搜尋的目標
     $lang->search_target_list = array(
         'title' => '標題',
         'content' => '內容',
@@ -47,6 +63,11 @@
         'uploaded_count ' => '上傳檔案數(以上)',
         'regdate' => '登錄日期',
         'last_update' => '最近更新日期',
-        'ipaddress' => 'IP 位址',
+        'ipaddress' => 'IP位址',
     );
+
+    $lang->alias = "別名";
+    $lang->history = "歷史紀錄";
+    $lang->about_use_history = "選擇是否使用歷史記錄功能。選擇使用，將能夠編輯歷史紀錄並還原。";
+    $lang->trace_only = "追蹤";
 ?>
diff --git a/modules/document/queries/deleteAlias.xml b/modules/document/queries/deleteAlias.xml
new file mode 100644
index 000000000..10e2ca3c6
--- /dev/null
+++ b/modules/document/queries/deleteAlias.xml
@@ -0,0 +1,10 @@
+<query id="deleteAlias" action="delete">
+    <tables>
+        <table name="document_aliases" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="alias_srl" var="alias_srl" filter="number" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/deleteDocumentExtraKeys.xml b/modules/document/queries/deleteDocumentExtraKeys.xml
new file mode 100644
index 000000000..f0f653447
--- /dev/null
+++ b/modules/document/queries/deleteDocumentExtraKeys.xml
@@ -0,0 +1,10 @@
+<query id="deleteDocumentExtraKeys" action="delete">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/deleteDocumentExtraVars.xml b/modules/document/queries/deleteDocumentExtraVars.xml
new file mode 100644
index 000000000..4d146f4de
--- /dev/null
+++ b/modules/document/queries/deleteDocumentExtraVars.xml
@@ -0,0 +1,11 @@
+<query id="deleteDocumentExtraVars" action="delete">
+    <tables>
+        <table name="document_extra_vars" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" pipe="and" />
+        <condition operation="equal" column="lang_code" var="lang_code" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/deleteHistory.xml b/modules/document/queries/deleteHistory.xml
new file mode 100644
index 000000000..64a81b967
--- /dev/null
+++ b/modules/document/queries/deleteHistory.xml
@@ -0,0 +1,10 @@
+<query id="deleteHistory" action="delete">
+    <tables>
+        <table name="document_histories" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="history_srl" var="history_srl" filter="number" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getAliases.xml b/modules/document/queries/getAliases.xml
new file mode 100644
index 000000000..b359fc086
--- /dev/null
+++ b/modules/document/queries/getAliases.xml
@@ -0,0 +1,11 @@
+<query id="getAliases" action="select">
+    <tables>
+        <table name="document_aliases" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getDocumentExtraKeys.xml b/modules/document/queries/getDocumentExtraKeys.xml
new file mode 100644
index 000000000..cea78b74b
--- /dev/null
+++ b/modules/document/queries/getDocumentExtraKeys.xml
@@ -0,0 +1,22 @@
+<query id="getDocumentExtraKeys" action="select">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <columns>
+        <column name="module_srl" alias="module_srl" />
+        <column name="var_idx" alias="idx" />
+        <column name="var_name" alias="name" />
+        <column name="var_type" alias="type" />
+        <column name="var_is_required" alias="is_required" />
+        <column name="var_search" alias="search" />
+        <column name="var_default" alias="default" />
+        <column name="var_desc" alias="desc" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="var_idx" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentExtraVars.xml b/modules/document/queries/getDocumentExtraVars.xml
new file mode 100644
index 000000000..58fd59136
--- /dev/null
+++ b/modules/document/queries/getDocumentExtraVars.xml
@@ -0,0 +1,34 @@
+<query id="getDocumentExtraVars" action="select">
+    <tables>
+        <table name="document_extra_keys" alias="extra_keys" />
+        <table name="document_extra_vars" alias="extra_vars" type="left join">
+            <conditions>
+                <condition operation="equal" column="extra_vars.module_srl" default="extra_keys.module_srl" />
+                <condition operation="in" column="extra_vars.document_srl" var="document_srl" pipe="and" notnull="notnull" />
+                <condition operation="equal" column="extra_vars.var_idx" default="extra_keys.var_idx" pipe="and" />
+                <condition operation="equal" column="extra_vars.lang_code" var="lang_code" pipe="and" />
+                <condition operation="in" column="extra_vars.lang_code" var="lang_codes" pipe="and" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="extra_keys.module_srl" alias="module_srl" />
+        <column name="extra_keys.var_idx" alias="idx" />
+        <column name="extra_keys.var_name" alias="name" />
+        <column name="extra_keys.var_type" alias="type" />
+        <column name="extra_keys.var_is_required" alias="is_required" />
+        <column name="extra_keys.var_search" alias="search" />
+        <column name="extra_keys.var_default" alias="default" />
+        <column name="extra_keys.var_desc" alias="desc" />
+        <column name="extra_vars.document_srl" alias="document_srl" />
+        <column name="extra_vars.lang_code" alias="lang_code" />
+        <column name="extra_vars.value" alias="value" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="extra_keys.module_srl" var="module_srl" pipe="and" notnull="notnull" />
+        <condition operation="equal" column="extra_keys.var_idx" var="var_idx" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="extra_keys.var_idx" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml
index f2dc839a1..82338e103 100644
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@@ -33,26 +33,6 @@
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
             <condition operation="like_prefix" column="last_update" var="s_last_update" pipe="or" />
             <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
-            <condition operation="like" column="extra_vars1" var="s_extra_vars1" pipe="or" />
-            <condition operation="like" column="extra_vars2" var="s_extra_vars2" pipe="or" />
-            <condition operation="like" column="extra_vars3" var="s_extra_vars3" pipe="or" />
-            <condition operation="like" column="extra_vars4" var="s_extra_vars4" pipe="or" />
-            <condition operation="like" column="extra_vars5" var="s_extra_vars5" pipe="or" />
-            <condition operation="like" column="extra_vars6" var="s_extra_vars6" pipe="or" />
-            <condition operation="like" column="extra_vars7" var="s_extra_vars7" pipe="or" />
-            <condition operation="like" column="extra_vars8" var="s_extra_vars8" pipe="or" />
-            <condition operation="like" column="extra_vars9" var="s_extra_vars9" pipe="or" />
-            <condition operation="like" column="extra_vars10" var="s_extra_vars10" pipe="or" />
-            <condition operation="like" column="extra_vars11" var="s_extra_vars11" pipe="or" />
-            <condition operation="like" column="extra_vars12" var="s_extra_vars12" pipe="or" />
-            <condition operation="like" column="extra_vars13" var="s_extra_vars13" pipe="or" />
-            <condition operation="like" column="extra_vars14" var="s_extra_vars14" pipe="or" />
-            <condition operation="like" column="extra_vars15" var="s_extra_vars15" pipe="or" />
-            <condition operation="like" column="extra_vars16" var="s_extra_vars16" pipe="or" />
-            <condition operation="like" column="extra_vars17" var="s_extra_vars17" pipe="or" />
-            <condition operation="like" column="extra_vars18" var="s_extra_vars18" pipe="or" />
-            <condition operation="like" column="extra_vars19" var="s_extra_vars19" pipe="or" />
-            <condition operation="like" column="extra_vars20" var="s_extra_vars20" pipe="or" />
         </group>
         <group pipe="and">
             <condition operation="more" column="last_update" var="start_date" pipe="and" />
diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
new file mode 100644
index 000000000..a919e8651
--- /dev/null
+++ b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -0,0 +1,23 @@
+<query id="getDocumentListWithExtraVars" action="select">
+    <tables>
+        <table name="documents" />
+        <table name="document_extra_vars" alias="extra_vars" />
+    </tables>
+    <columns>
+        <column name="documents.*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
+        <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.var_idx" var="var_idx" notnull="notnull" pipe="and" />
+        <condition operation="like" column="extra_vars.value" var="var_value" notnull="notnull" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="documents.list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentMaxExtraKeyIdx.xml b/modules/document/queries/getDocumentMaxExtraKeyIdx.xml
new file mode 100644
index 000000000..d4c512386
--- /dev/null
+++ b/modules/document/queries/getDocumentMaxExtraKeyIdx.xml
@@ -0,0 +1,11 @@
+<query id="getDocumentMaxExtraKeyIdx" action="select">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <columns>
+        <column name="max(var_idx)" alias="var_idx" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getDocumentSrlByAlias.xml b/modules/document/queries/getDocumentSrlByAlias.xml
new file mode 100644
index 000000000..baac51464
--- /dev/null
+++ b/modules/document/queries/getDocumentSrlByAlias.xml
@@ -0,0 +1,14 @@
+<query id="getDocumentSrlByAlias" action="select">
+    <tables>
+        <table name="document_aliases" />
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="document_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="alias_title" var="alias_title" filter="number" notnull="notnull" />
+        <condition operation="equal" column="modules.mid" var="mid" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" var="document_aliases.module_srl" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getDocumentsExtraVars.xml b/modules/document/queries/getDocumentsExtraVars.xml
new file mode 100644
index 000000000..ed0f09b1e
--- /dev/null
+++ b/modules/document/queries/getDocumentsExtraVars.xml
@@ -0,0 +1,27 @@
+<query id="getDocumentsExtraVars" action="select">
+    <tables>
+        <table name="document_extra_vars" alias="extra_vars" />
+        <table name="document_extra_keys" alias="extra_keys" type="left join">
+            <conditions>
+                <condition operation="equal" column="extra_keys.module_srl" default="extra_vars.module_srl" />
+                <condition operation="equal" column="extra_keys.var_idx" default="extra_vars.var_idx" pipe="and" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="extra_keys.module_srl" alias="module_srl" />
+        <column name="extra_keys.var_name" alias="name" />
+        <column name="extra_keys.var_type" alias="type" />
+        <column name="extra_keys.var_is_required" alias="is_required" />
+        <column name="extra_keys.var_search" alias="search" />
+        <column name="extra_keys.var_default" alias="default" />
+        <column name="extra_keys.var_desc" alias="desc" />
+        <column name="extra_vars.var_idx" alias="idx" />
+        <column name="extra_vars.document_srl" alias="document_srl" />
+        <column name="extra_vars.lang_code" alias="lang_code" />
+        <column name="extra_vars.value" alias="value" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="extra_vars.document_srl" var="document_srl" pipe="and"  />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getHistories.xml b/modules/document/queries/getHistories.xml
new file mode 100644
index 000000000..6f76ed2e0
--- /dev/null
+++ b/modules/document/queries/getHistories.xml
@@ -0,0 +1,15 @@
+<query id="getHistories" action="select">
+    <tables>
+        <table name="document_histories" />
+    </tables>
+    <columns>
+        <column name="history_srl" />
+        <column name="nick_name" />
+        <column name="member_srl" />
+        <column name="regdate" />
+        <column name="ipaddress" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/insertAlias.xml b/modules/document/queries/insertAlias.xml
new file mode 100644
index 000000000..d38a46f62
--- /dev/null
+++ b/modules/document/queries/insertAlias.xml
@@ -0,0 +1,11 @@
+<query id="insertAlias" action="insert">
+    <tables>
+        <table name="document_aliases" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" default="0" notnull="notnull" />
+        <column name="document_srl" var="document_srl" filter="number" default="0" notnull="notnull" />
+        <column name="alias_title" var="alias_title" notnull="notnull" minlength="1" maxlength="250" />
+        <column name="alias_srl" var="alias_srl" filter="number" default="0" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml
index 9aae18a41..0cb032c57 100644
--- a/modules/document/queries/insertDocument.xml
+++ b/modules/document/queries/insertDocument.xml
@@ -6,6 +6,7 @@
         <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
         <column name="module_srl" var="module_srl" filter="number" default="0" />
         <column name="category_srl" var="category_srl" filter="number" default="0" />
+        <column name="lang_code" var="lang_code" default="" />
         <column name="is_notice" var="is_notice" notnull="notnull" default="N" />
         <column name="is_secret" var="is_secret" notnull="notnull" default="N" />
         <column name="title" var="title" notnull="notnull" minlength="1" maxlength="250" />
@@ -36,25 +37,5 @@
         <column name="lock_comment" var="lock_comment" default="N" />
         <column name="allow_trackback" var="allow_trackback" default="Y" />
         <column name="notify_message" var="notify_message" default="N" />
-        <column name="extra_vars1" var="extra_vars1" />
-        <column name="extra_vars2" var="extra_vars2" />
-        <column name="extra_vars3" var="extra_vars3" />
-        <column name="extra_vars4" var="extra_vars4" />
-        <column name="extra_vars5" var="extra_vars5" />
-        <column name="extra_vars6" var="extra_vars6" />
-        <column name="extra_vars7" var="extra_vars7" />
-        <column name="extra_vars8" var="extra_vars8" />
-        <column name="extra_vars9" var="extra_vars9" />
-        <column name="extra_vars10" var="extra_vars10" />
-        <column name="extra_vars11" var="extra_vars11" />
-        <column name="extra_vars12" var="extra_vars12" />
-        <column name="extra_vars13" var="extra_vars13" />
-        <column name="extra_vars14" var="extra_vars14" />
-        <column name="extra_vars15" var="extra_vars15" />
-        <column name="extra_vars16" var="extra_vars16" />
-        <column name="extra_vars17" var="extra_vars17" />
-        <column name="extra_vars18" var="extra_vars18" />
-        <column name="extra_vars19" var="extra_vars19" />
-        <column name="extra_vars20" var="extra_vars20" />
     </columns>
 </query>
diff --git a/modules/document/queries/insertDocumentExtraKey.xml b/modules/document/queries/insertDocumentExtraKey.xml
new file mode 100644
index 000000000..0103e7f2f
--- /dev/null
+++ b/modules/document/queries/insertDocumentExtraKey.xml
@@ -0,0 +1,15 @@
+<query id="insertDocumentExtraKeys" action="insert">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="var_idx" var="var_idx" filter="number" notnull="notnull" />
+        <column name="var_name" var="var_name" notnull="notnull" />
+        <column name="var_type" var="var_type" notnull="notnull" />
+        <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
+        <column name="var_search" var="var_search" default="N" notnull="notnull" />
+        <column name="var_default" var="var_default" notnull="notnull" />
+        <column name="var_desc" var="var_desc" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/document/queries/insertDocumentExtraVar.xml b/modules/document/queries/insertDocumentExtraVar.xml
new file mode 100644
index 000000000..32528617b
--- /dev/null
+++ b/modules/document/queries/insertDocumentExtraVar.xml
@@ -0,0 +1,12 @@
+<query id="insertDocumentExtraVar" action="insert">
+    <tables>
+        <table name="document_extra_vars" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
+        <column name="var_idx" var="var_idx" filter="number" notnull="notnull" />
+        <column name="value" var="value" notnull="notnull" />
+        <column name="lang_code" var="lang_code" />
+    </columns>
+</query>
diff --git a/modules/document/queries/insertHistory.xml b/modules/document/queries/insertHistory.xml
new file mode 100644
index 000000000..0abe8cc32
--- /dev/null
+++ b/modules/document/queries/insertHistory.xml
@@ -0,0 +1,15 @@
+<query id="insertHistory" action="insert">
+    <tables>
+        <table name="document_histories" />
+    </tables>
+    <columns>
+        <column name="history_srl" var="history_srl" filter="number" notnull="notnull" />
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
+        <column name="content" var="content" />
+        <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
+        <column name="member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <column name="regdate" var="regdate" notnull="notnull" />
+        <column name="ipaddress" var="ipaddress" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/document/queries/updateDocument.xml b/modules/document/queries/updateDocument.xml
index d7b55d357..02d0153f3 100644
--- a/modules/document/queries/updateDocument.xml
+++ b/modules/document/queries/updateDocument.xml
@@ -28,26 +28,6 @@
         <column name="lock_comment" var="lock_comment" default="N" />
         <column name="allow_trackback" var="allow_trackback" default="Y" />
         <column name="notify_message" var="notify_message" default="N" />
-        <column name="extra_vars1" var="extra_vars1" />
-        <column name="extra_vars2" var="extra_vars2" />
-        <column name="extra_vars3" var="extra_vars3" />
-        <column name="extra_vars4" var="extra_vars4" />
-        <column name="extra_vars5" var="extra_vars5" />
-        <column name="extra_vars6" var="extra_vars6" />
-        <column name="extra_vars7" var="extra_vars7" />
-        <column name="extra_vars8" var="extra_vars8" />
-        <column name="extra_vars9" var="extra_vars9" />
-        <column name="extra_vars10" var="extra_vars10" />
-        <column name="extra_vars11" var="extra_vars11" />
-        <column name="extra_vars12" var="extra_vars12" />
-        <column name="extra_vars13" var="extra_vars13" />
-        <column name="extra_vars14" var="extra_vars14" />
-        <column name="extra_vars15" var="extra_vars15" />
-        <column name="extra_vars16" var="extra_vars16" />
-        <column name="extra_vars17" var="extra_vars17" />
-        <column name="extra_vars18" var="extra_vars18" />
-        <column name="extra_vars19" var="extra_vars19" />
-        <column name="extra_vars20" var="extra_vars20" />
     </columns>
     <conditions>
         <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
diff --git a/modules/document/queries/updateDocumentExtraKey.xml b/modules/document/queries/updateDocumentExtraKey.xml
new file mode 100644
index 000000000..af0fb57d2
--- /dev/null
+++ b/modules/document/queries/updateDocumentExtraKey.xml
@@ -0,0 +1,17 @@
+<query id="updateDocumentExtraKey" action="update">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <columns>
+        <column name="var_name" var="var_name" notnull="notnull" />
+        <column name="var_type" var="var_type" notnull="notnull" />
+        <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
+        <column name="var_search" var="var_search" default="N" notnull="notnull" />
+        <column name="var_default" var="var_default" notnull="notnull" />
+        <column name="var_desc" var="var_desc" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/updateDocumentExtraKeyIdx.xml b/modules/document/queries/updateDocumentExtraKeyIdx.xml
new file mode 100644
index 000000000..c99ed6ee6
--- /dev/null
+++ b/modules/document/queries/updateDocumentExtraKeyIdx.xml
@@ -0,0 +1,12 @@
+<query id="updateDocumentExtraKeyIdx" action="update">
+    <tables>
+        <table name="document_extra_keys" />
+    </tables>
+    <columns>
+        <column name="var_idx" var="new_idx" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/updateDocumentExtraVar.xml b/modules/document/queries/updateDocumentExtraVar.xml
new file mode 100644
index 000000000..818b28147
--- /dev/null
+++ b/modules/document/queries/updateDocumentExtraVar.xml
@@ -0,0 +1,14 @@
+<query id="updateDocumentExtraVar" action="update">
+    <tables>
+        <table name="document_extra_vars" />
+    </tables>
+    <columns>
+        <column name="value" var="value" notnull="notnull" />
+        <column name="lang_code" var="lang_code" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdx.xml b/modules/document/queries/updateDocumentExtraVarIdx.xml
new file mode 100644
index 000000000..1620b2132
--- /dev/null
+++ b/modules/document/queries/updateDocumentExtraVarIdx.xml
@@ -0,0 +1,12 @@
+<query id="updateDocumentExtraVarIdx" action="update">
+    <tables>
+        <table name="document_extra_vars" />
+    </tables>
+    <columns>
+        <column name="var_idx" var="new_idx" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/updateDocumentsLangCode.xml b/modules/document/queries/updateDocumentsLangCode.xml
new file mode 100644
index 000000000..b5728aecc
--- /dev/null
+++ b/modules/document/queries/updateDocumentsLangCode.xml
@@ -0,0 +1,8 @@
+<query id="updateDocumentsLangCode" action="update">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="lang_code" var="lang_code" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/document/schemas/document_aliases.xml b/modules/document/schemas/document_aliases.xml
new file mode 100644
index 000000000..8be2d3735
--- /dev/null
+++ b/modules/document/schemas/document_aliases.xml
@@ -0,0 +1,6 @@
+<table name="document_aliases">
+    <column name="alias_srl" type="number" size="11" default="0" notnull="notnull" primary_key="primary_key" />
+    <column name="module_srl" type="number" size="11" default="0" notnull="notnull" index="idx_module_srl" />
+    <column name="document_srl" type="number" size="11" default="0" notnull="notnull" index="idx_document_srl" />
+    <column name="alias_title" type="varchar" size="250" notnull="notnull" index="idx_alias_title" />
+</table>
diff --git a/modules/document/schemas/document_extra_keys.xml b/modules/document/schemas/document_extra_keys.xml
new file mode 100644
index 000000000..96d1026c2
--- /dev/null
+++ b/modules/document/schemas/document_extra_keys.xml
@@ -0,0 +1,10 @@
+<table name="document_extra_keys">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module_keys" />
+    <column name="var_idx" type="number" size="11" notnull="notnull" unique="unique_module_keys" />
+    <column name="var_name" type="varchar" size="250" notnull="notnull" />
+    <column name="var_type" type="varchar" size="50" notnull="notnull" />
+    <column name="var_is_required" type="char" size="1" default="N" notnull="notnull" />
+    <column name="var_search" type="char" size="1" default="N" notnull="notnull" />
+    <column name="var_default" type="text" />
+    <column name="var_desc" type="text" />
+</table>
diff --git a/modules/document/schemas/document_extra_vars.xml b/modules/document/schemas/document_extra_vars.xml
new file mode 100644
index 000000000..d7b2e0efd
--- /dev/null
+++ b/modules/document/schemas/document_extra_vars.xml
@@ -0,0 +1,7 @@
+<table name="document_extra_vars">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_extra_vars" />
+    <column name="document_srl" type="number" size="11" notnull="notnull" unique="unique_extra_vars" />
+    <column name="var_idx" type="number" size="11" notnull="notnull" unique="unique_extra_vars" />
+    <column name="lang_code" type="varchar" size="10" notnull="notnull" unique="unique_extra_vars" />
+    <column name="value" type="bigtext" />
+</table>
diff --git a/modules/document/schemas/document_histories.xml b/modules/document/schemas/document_histories.xml
new file mode 100644
index 000000000..26661951a
--- /dev/null
+++ b/modules/document/schemas/document_histories.xml
@@ -0,0 +1,10 @@
+<table name="document_histories">
+    <column name="history_srl" type="number" size="11" default="0" notnull="notnull" primary_key="primary_key" />
+    <column name="module_srl" type="number" size="11" default="0" notnull="notnull" index="idx_module_srl" />
+    <column name="document_srl" type="number" size="11" default="0" notnull="notnull" index="idx_document_srl" />
+    <column name="content" type="bigtext" />
+    <column name="nick_name" type="varchar" size="80" notnull="notnull" />
+    <column name="member_srl" type="number" size="11" />
+    <column name="regdate" type="date" index="idx_regdate" />
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress"/>
+</table>
diff --git a/modules/document/schemas/documents.xml b/modules/document/schemas/documents.xml
index 290e3b5f1..b77a45e36 100644
--- a/modules/document/schemas/documents.xml
+++ b/modules/document/schemas/documents.xml
@@ -2,6 +2,7 @@
     <column name="document_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="module_srl" type="number" size="11" default="0" notnull="notnull" index="idx_module_srl" />
     <column name="category_srl" type="number" size="11" default="0" notnull="notnull" index="idx_category_srl" />
+    <column name="lang_code" type="varchar" size="10" default="" notnull="notnull" />
     <column name="is_notice" type="char" size="1" default="N" notnull="notnull" index="idx_is_notice" />
     <column name="is_secret" type="char" size="1" default="N" notnull="notnull" index="idx_is_secret" />
     <column name="title" type="varchar" size="250" />
@@ -33,24 +34,4 @@
     <column name="lock_comment" type="char" size="1" default="N" notnull="notnull" />
     <column name="allow_trackback" type="char" size="1" default="Y" notnull="notnull" />
     <column name="notify_message" type="char" size="1" default="N" notnull="notnull" />
-    <column name="extra_vars1" type="text" />
-    <column name="extra_vars2" type="text" />
-    <column name="extra_vars3" type="text" />
-    <column name="extra_vars4" type="text" />
-    <column name="extra_vars5" type="text" />
-    <column name="extra_vars6" type="text" />
-    <column name="extra_vars7" type="text" />
-    <column name="extra_vars8" type="text" />
-    <column name="extra_vars9" type="text" />
-    <column name="extra_vars10" type="text" />
-    <column name="extra_vars11" type="text" />
-    <column name="extra_vars12" type="text" />
-    <column name="extra_vars13" type="text" />
-    <column name="extra_vars14" type="text" />
-    <column name="extra_vars15" type="text" />
-    <column name="extra_vars16" type="text" />
-    <column name="extra_vars17" type="text" />
-    <column name="extra_vars18" type="text" />
-    <column name="extra_vars19" type="text" />
-    <column name="extra_vars20" type="text" />
 </table>
diff --git a/modules/document/tpl/category_info.html b/modules/document/tpl/category_info.html
new file mode 100644
index 000000000..b90066f26
--- /dev/null
+++ b/modules/document/tpl/category_info.html
@@ -0,0 +1,62 @@
+
+<input type="hidden" name="category_srl" value="{$category_info->category_srl}" />
+<input type="hidden" name="parent_srl" value="{$category_info->parent_srl}" />
+
+<div class="layer boxModelController" style="display:block">
+
+    <h4 class="xeAdmin">{$lang->category}</h4>
+    <button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button>
+
+    <div class="layerBody">
+
+        <table cellspacing="0" class="rowTable">
+        <!--@if($category_info->parent_category_title)-->
+        <tr>
+            <th scope="row"><div>{$lang->parent_category_title}</div></th>
+            <td class="wide">{$category_info->parent_category_title}</td>
+        </tr>
+        <!--@end-->
+        <tr>
+            <th scope="row"><div>{$lang->category_title}</div></th>
+            <td>
+                <input type="text" name="category_title" id="category_name" value="{$category_info->title}" class="inputTypeText" />
+                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','category_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->category_color}</div></th>
+            <td>
+                <input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="color-indicator inputTypeText" />
+                <p>{$lang->about_category_color}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->expand}</div></th>
+            <td>
+                <input type="checkbox" name="expand" value="Y" <!--@if($category_info->expand=="Y")-->checked="checked"<!--@end--> class="checkbox" />
+                <p>{$lang->about_expand}</p>
+            </td>
+        </tr>
+        <tr >
+            <th scope="row2"><div>{$lang->category_group_srls} <input type="checkbox" onclick="XE.checkboxToggleAll('group_srls'); return false;" /></div></th>
+            <td>
+                <!--@foreach($group_list as $key=>$val)-->
+                <div><input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($category_info->group_srls)&&in_array($key, $category_info->group_srls))-->checked="checked"<!--@end--> class="checkbox" /> <label for="group_{$key}">{$val->title}</label></div>
+                <!--@end-->
+                <p>{$lang->about_category_group_srls}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row" colspan="2" class="button">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+            </th>
+        </tr>
+        </table>
+
+    </div>
+</div>
+<script type="text/javascript">
+jQuery(function(){
+    jQuery('input.color-indicator').xe_colorpicker();
+});
+</script>
\ No newline at end of file
diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html
new file mode 100644
index 000000000..dafce23a3
--- /dev/null
+++ b/modules/document/tpl/category_list.html
@@ -0,0 +1,38 @@
+<!--%import("filter/insert_category.xml")-->
+<!--%import("filter/delete_category.xml")-->
+<!--%import("filter/move_category.xml")-->
+
+<!--// tree javascript plugin load -->
+<!--%load_js_plugin("ui.tree")-->
+
+<!--%import("js/document_category.js")-->
+<!--%import("css/document.css")-->
+<!--%load_js_plugin("ui.colorpicker")-->
+<script type="text/javascript">
+    var category_title = "{$lang->category}";
+</script>
+
+<span style="float:right"><a href="#"  onclick="doReloadTreeCategory('{$module_info->module_srl}');return false;" class="button black"><span>{$lang->cmd_remake_cache}</span></a></span>
+
+    <div class="gap1">
+        <form id="fo_category" action="./" method="get" onsubmit="return procFilter(this, insert_category)">
+        <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+        <input type="hidden" name="xml_file" value="{$category_xml_file}" />
+            <div id="category_info"></div>
+        </form>
+            <div id="menu">
+                <ul class="simpleTree">
+                    <li class="root" id='tree_0'><span>{$lang->category}</span></li>
+                </ul>
+            </div>
+    </div>
+
+
+<script type="text/javascript">
+    var simpleTreeCollection;
+    var max_menu_depth = 999;
+    var lang_confirm_delete = "{$lang->confirm_delete}";
+    var xml_url = "{$category_xml_file}";
+    doCategoryFormMove();
+    Tree(xml_url);
+</script>
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index 8e53a9b2d..e8a754eb6 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -1,15 +1,15 @@
 <!--%import("filter/manage_checked_document.xml")-->
 <!--%import("js/document_admin.js")-->
 <!--%import("css/document.css")-->
-<div id="popHeadder">
-    <h3>{$lang->cmd_manage_document}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_manage_document}</h3>
 </div>
 
 <form action="./" method="get" id="fo_management">
 <input type="hidden" name="type" value="" />
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></div></th>
         <td>
@@ -30,7 +30,7 @@
         <th scope="row"><div>{$lang->move_target_module}</div></th>
         <td>
             <input type="hidden" name="target_module" id="target_module" value="" />
-            <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="" /><a href="{getUrl('','module','module','act','dispModuleAdminSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
+            <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="" readonly="readonly" /><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
         </td>
     </tr>
     <tr>
@@ -50,18 +50,13 @@
     </table>
 </div>
 
+<!--@if(count($document_list))-->
 <div id="popFooter">
-    <div class="tRight gap1">
-        <!--@if(count($document_list))-->
-
-        <a href="#" onclick="doManageDocument('move');return false;" class="button blue"><span>{$lang->cmd_move}</span></a>
-        <a href="#" onclick="doManageDocument('copy');return false;" class="button green"><span>{$lang->cmd_copy}</span></a>
-
-        <a href="#" onclick="doManageDocument('delete');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
-        <!--@end-->
-        <a href="#" onclick="window.close(); return false;" class="button black"><span>{$lang->cmd_close}</span></a>
-    </div>
+    <a href="#" onclick="doManageDocument('delete');return false;" class="button black strong"><span>{$lang->cmd_delete}</span></a>
+    <a href="#" onclick="doManageDocument('move');return false;" class="button blue"><span>{$lang->cmd_move}</span></a>
+    <a href="#" onclick="doManageDocument('copy');return false;" class="button green"><span>{$lang->cmd_copy}</span></a>
 </div>
+<!--@end-->
 
 <script type="text/javascript">
     jQuery(function() { doGetCategoryFromModule(jQuery('#target_module').get(0)); } );
diff --git a/modules/document/tpl/css/document.css b/modules/document/tpl/css/document.css
index 8440784e1..fb3c10560 100644
--- a/modules/document/tpl/css/document.css
+++ b/modules/document/tpl/css/document.css
@@ -1,8 +1,20 @@
+@charset "utf-8";
+
 ul.document_list_box { margin:0; padding:0; list-style:none; }
-.document_list_box { height:230px; overflow-y:scroll; overflow-x:hidden;}
+.document_list_box { height:160px; 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 { }
 
 div.printContent { padding:20px; }
+input.btnSubmit { background:url("../images/buttonInsert.gif") no-repeat 3px 2px; line-height:150%; height:23px; padding:2px 3px 2px 18px; border:1px solid; border-color:#d8d8d8 #a6a6a6 #a6a6a6 #d8d8d8; }
+
+#menu {margin:10px; }
+
+.menuListZone { table-layout:fixed; }
+.menuListZone td { vertical-align:top; }
+.menuListZone td.category_zone { padding-right:10px; }
+
+#category_list { padding:.5em 0 .5em 0; margin-bottom:2em; width:250px; overflow:hidden; float:left; position:absolute; left:10px;}
+#category_info { width:560px; position:absolute; margin:0 auto; left:0; right:0; z-index:9999;}
diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html
index cb2518f01..e49b4320b 100644
--- a/modules/document/tpl/declared_list.html
+++ b/modules/document/tpl/declared_list.html
@@ -2,17 +2,12 @@
 <!--%import("filter/manage_checked_document.xml")-->
 <!--#include("header.html")-->
 
-
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
-
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -28,8 +23,8 @@
 <tbody>
     <!--@foreach($document_list as $no => $oDocument)-->
     <tr>
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
+        <td>{$no}</td>
+        <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
         <td>
             <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitleText()}</a>
 
@@ -42,17 +37,17 @@
             <!--@end-->
         </td>
         <td><span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></td>
-        <td class="alert number center"><strong>{$oDocument->get('declared_count')}</strong></td>
-        <td class="number center alert">{$oDocument->get('readed_count')}</td>
-        <td class="number center">{$oDocument->get('voted_count')}</td>
-        <td class="date center nowrap">{$oDocument->getRegdate("Y-m-d")}</td>
+        <td><strong>{$oDocument->get('declared_count')}</strong></td>
+        <td>{$oDocument->get('readed_count')}</td>
+        <td>{$oDocument->get('voted_count')}</td>
+        <td>{$oDocument->getRegdate("Y-m-d")}</td>
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="8" class="right">
+        <th colspan="8" class="button">
+            <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button black strong"><span>{$lang->cmd_manage_document}</span></a>
             <a href="#" onclick="doCancelDeclare();return false;" class="button"><span>{$lang->cmd_cancel_declare}</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>
-        </td>
+        </th>
     </tr>
 </tbody>
 </table>
diff --git a/modules/document/tpl/document_alias.html b/modules/document/tpl/document_alias.html
new file mode 100644
index 000000000..9a29902e5
--- /dev/null
+++ b/modules/document/tpl/document_alias.html
@@ -0,0 +1,49 @@
+<!--#include("header.html")-->
+<!--%import("css/document.css")-->
+<!--%import("filter/insert_alias.xml")-->
+<!--%import("filter/delete_alias.xml")-->
+
+<form id="deleteForm" action="./" method="POST">
+<input type="hidden" id="target_srl" name="target_srl" value="" />
+</form>
+
+<form action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, insert_alias)">
+<input type="hidden" name="document_srl" value="{$document_srl}" />
+<input type="hidden" name="module_srl" value="{$oDocument->get('module_srl')}" />
+
+<h4 class="xeAdmin">{$lang->alias}</h4>
+
+<table cellspacing="0" class="crossTable">
+<thead>
+<tr>
+    <th scope="col" class="half_wide"><div>{$lang->title}</div></th>
+    <th scope="col" class="half_wide"><div>{$lang->alias}</div></th>
+    <th scope="col"></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+    <td rowspan="{count($aliases)+1}">{$oDocument->getTitle()}</td>
+    {@ $bFirst = true; }
+    <!--@foreach($aliases as $val)-->
+    <!--@if(!$bFirst)-->
+<tr>
+    {@ $bFirst = false; }
+    <!--@end-->
+    <td>{$val->alias_title}</td>
+    <td><a href="#" onclick="deleteByFilter('{$val->alias_srl}', delete_alias);"><img src="images/buttonDeleteX.gif" alt="" /></a>
+    </td>
+</tr>
+    <!--@end-->
+    <!--@if(!$bFirst)-->
+<tr>
+    <!--@end-->
+    <td>
+    <input type="text" class="inputTypeText fixWidth" name="alias_title" />
+    </td>
+    <td><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" /></span></td>
+</tr>
+</tbody>
+</table>
+
+</form>
diff --git a/modules/document/tpl/document_config.html b/modules/document/tpl/document_config.html
index 3b9fbe2ed..762ac444b 100644
--- a/modules/document/tpl/document_config.html
+++ b/modules/document/tpl/document_config.html
@@ -2,7 +2,7 @@
 <!--%import("filter/insert_config.xml")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col"><div>{$lang->thumbnail_type}</div></th>
     </tr>
@@ -13,13 +13,13 @@
         </td>
     </tr>
     <tr>
-        <td class="right"><span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></td>
+        <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></th>
     </tr>
     </table>
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <td class="right"><span class="button"><input type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail(); return false;"/></span></td>
+        <th class="button"><span class="button black strong"><input type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail(); return false;"/></span></th>
     </tr>
     </table>
 
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 97284813d..892fb39e6 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -3,50 +3,58 @@
 <!--#include("header.html")-->
 
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+<!-- 검색 -->
+<div class="fl">
+    <form action="./" method="get" class="adminSearch">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+
+        <fieldset>
+            <select name="search_target">
+                <option value="">{$lang->search_target}</option>
+                <!--@foreach($lang->search_target_list as $key => $val)-->
+                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
+            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
+        </fieldset>
+    </form>
 </div>
 
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
+<!-- 모듈 선택 -->
+<div class="fr">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
+    <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button blue"><span>{$lang->cmd_manage_document}</span></a>
+</div>
+
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable clear">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></div></th>
-        <th scope="col" class="wide">
-            <div>
-                <select name="module_srl" id="module_srl">
-                    <option value="">{$lang->module}</option>
-                    <!--@foreach($mid_list as $key => $val)-->
-                    <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
-                    <!--@end-->
-                </select>
-                <input type="button" name="go_button" id="go_button" value="GO" class="buttonTypeGo" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;"/>
-            </div>
-        </th>
+        <th scope="col" class="wide"><div>{$lang->document}</div></th>
         <th scope="col"><div>{$lang->nick_name}</div></th>
         <th scope="col"><div>{$lang->readed_count}</div></th>
         <th scope="col"><div>{$lang->voted_count}</div></th>
         <th scope="col"><div>{$lang->date}</div></th>
+        <th scope="col"><div>{$lang->ipaddress}</div></th>
+        <th scope="col"><div>{$lang->alias}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($document_list as $no => $oDocument)-->
     <tr>
-        <td class="number center" rowspan="2">{$no}</td>
-        <td colspan="2"><!--@if($oDocument->get('module_srl')!=$oDocument->get('member_srl'))--><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><!--@else-->-<!--@end--></td>
-        <td class="nowrap"><span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></td>
-        <td class="number center">{$oDocument->get('readed_count')}</td>
-        <td class="number center">{$oDocument->get('voted_count')} / {$oDocument->get('blamed_count')}</td>
-        <td class="date center nowrap">{$oDocument->getRegdate("Y-m-d H:i:s")}</td>
-    </tr>
-    <tr>
+        <td class="number center">{$no}</td>
         <td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
-        <td class="left subject" colspan="5">
+        <td class="left subject">
             <!--@if($oDocument->get('module_srl')==$oDocument->get('member_srl'))-->
                 {$lang->cmd_save}
             <!--@else-->
@@ -61,16 +69,17 @@
                 [{$oDocument->getTrackbackCount()}]
             <!--@end-->
         </td>
+        <td class="nowrap"><span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></td>
+        <td class="number center">{$oDocument->get('readed_count')}</td>
+        <td class="number center">{$oDocument->get('voted_count')} / {$oDocument->get('blamed_count')}</td>
+        <td class="date center nowrap">{$oDocument->getRegdate("Y-m-d H:i:s")}</td>
+        <td class="number center nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'))}">{$oDocument->get('ipaddress')}</a></td>
+        <td class="center"><a href="{getUrl('act','dispDocumentAdminAlias','document_srl',$oDocument->document_srl)}">{$lang->alias}</a>
     </tr>
     <!--@end-->
 </tbody>
 </table>
 
-<!-- 버튼 -->
-<div class="fr gap1">
-    <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>
 
 <!-- 페이지 네비게이션 -->
@@ -85,22 +94,3 @@
     <!--@end-->
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
 </div>
-
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <fieldset>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="{getUrl('','module',$module,'act',$act)}" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
diff --git a/modules/document/tpl/document_module_config.html b/modules/document/tpl/document_module_config.html
new file mode 100644
index 000000000..47b848ff9
--- /dev/null
+++ b/modules/document/tpl/document_module_config.html
@@ -0,0 +1,26 @@
+<!--%import("filter/insert_document_module_config.xml")-->
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert_document_module_config)">
+<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+
+    <h4 class="xeAdmin">{$lang->document}</h4>
+    <p class="summary">{$lang->about_use_history}</p>
+    <table cellspacing="0" class="rowTable">
+    <tr>    
+        <th><div>{$lang->history}</div></th>
+        <td class="wide">
+            <select name="use_history" class="w100">
+                <option value="N" <!--@if($document_config->use_history=='N')-->selected<!--@end-->>{$lang->notuse}</option>
+                <option value="Y" <!--@if($document_config->use_history=='Y')-->selected<!--@end-->>{$lang->use}</option>
+                <option value="Trace" <!--@if($document_config->use_history=='Trace')-->selected<!--@end-->>{$lang->trace_only}</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span>
+        </th>
+    </tr>
+    </table>
+
+</form>
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
new file mode 100644
index 000000000..e92bf7508
--- /dev/null
+++ b/modules/document/tpl/extra_keys.html
@@ -0,0 +1,114 @@
+<!--%import("js/document_admin.js")-->
+<!--%import("filter/insert_extra_var.xml")-->
+<!--%import("filter/delete_extra_var.xml")-->
+<!--%import("js/module_admin.js")-->
+
+<!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
+    {@ $selected_var = $extra_keys[$selected_var_idx] }
+<!--@end-->
+
+<!--@if($type == 'insertExtraForm' || $selected_var_idx)-->
+    <form action="./" method="post" onsubmit="return procFilter(this, insert_extra_var)">
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+    <input type="hidden" name="var_idx" value="{$selected_var_idx}" />
+
+        <h4 class="xeAdmin">{$lang->extra_vars} {$selected_var_idx}</h4>
+        <table cellspacing="0" class="crossTable ">
+        <tr>
+            <th><div>{$lang->column_name}</div></th>
+            <td class="wide">
+                <input type="text" name="name" value="{$selected_var->name}" class="inputTypeText w200" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> 
+            </td>
+        </tr>
+        <tr>
+            <th><div>{$lang->column_type}</div></th>
+            <td>
+                <select name="type">
+                    <!--@foreach($lang->column_type_list as $k => $v)-->
+                        <!--@if($key != 'kr_zip')-->
+                        <option value="{$k}" <!--@if($selected_var->type==$k)-->selected="selected"<!--@end-->>{$lang->column_type_list[$k]}</option>
+                        <!--@end-->
+                    <!--@end-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th><div>{$lang->is_required}</div></th>
+            <td><input type="checkbox" name="is_required" value="Y" <!--@if($selected_var->is_required=='Y')-->checked="checked"<!--@end--> /></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->default_value}</div></th>
+            <td><input type="text" name="default" value="{$selected_var->default}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->description}</div></th>
+            <td><input type="text" name="desc" value="{$selected_var->desc}" id="desc" class="inputTypeText w400" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','desc')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->cmd_search}</div></th>
+            <td><input type="checkbox" name="search" value="Y" <!--@if($selected_var->search=='Y')-->checked="checked"<!--@end--> /></td>
+        </tr>
+        <tr>
+            <th colspan="2" class="button">
+                <!--@if($selected_var)-->
+                <span class="button strong black"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
+                <!--@else-->
+                <span class="button strong black"><input type="submit" value="{$lang->cmd_insert}" accesskey="s" /></span>
+                <!--@end-->
+                <a href="{getUrl('type','','selected_var_idx','')}"  class="button"><span>{$lang->cmd_back}</span></a>
+            </th>
+        </tr>
+        </table>
+
+    </form>
+<!--@else-->
+
+    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
+    <table cellspacing="0" class="crossTable ">
+    <thead>
+    <tr>
+        <th><div>{$lang->no}</div></th>
+        <th><div>{$lang->column_name}</div></th>
+        <th><div>{$lang->column_type}</div></th>
+        <th><div>{$lang->is_required}</div></th>
+        <th><div>{$lang->cmd_search}</div></th>
+        <th><div>&nbsp;</div></th>
+    </tr>
+    </thead>
+    <tbody>
+    <!--@foreach($extra_keys as $key => $val)-->
+    <tr>
+        <td rowspan="3">{$val->idx}</td>
+        <td class="nowrap"><b>{$val->name}</b></td>
+        <td class="nowrap">{$lang->column_type_list[$val->type]}</td>
+        <td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
+        <td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
+        <td rowspan="3" class="nowrap">
+            <!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_modify}</span></a><!--@end-->
+            <a href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown"><span>{$lang->cmd_modify}</a></span>
+            <a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a>
+            <a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
+        </td>
+    </tr>
+    <tr>
+        <td>{$lang->default_value}</td>
+        <td class="wide">{$val->default}&nbsp;</td>
+    </tr>
+    <tr>
+        <td>{$lang->description}</td>
+        <td class="wide">{$val->desc}&nbsp;</td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th colspan="9" class="button">
+            <a href="{getUrl('type','insertExtraForm','selected_var_idx','')}" class="button black strong"><span>{$lang->cmd_insert}</span></a>
+        </th>
+    </tr>
+    </tbody>
+    </table>
+<!--@end-->
+
+<form id="fo_delete" name="fo_delete" method="post" action="./">
+<input type="hidden" name="module_srl" value="" />
+<input type="hidden" name="var_idx" value="" />
+<form>
diff --git a/modules/document/tpl/filter/delete_alias.xml b/modules/document/tpl/filter/delete_alias.xml
new file mode 100644
index 000000000..c07c53c67
--- /dev/null
+++ b/modules/document/tpl/filter/delete_alias.xml
@@ -0,0 +1,12 @@
+<filter name="delete_alias" module="document" act="procDocumentAdminDeleteAlias" confirm_msg_code="confirm_delete">
+    <form>
+        <node target="target_srl" required="true" />
+    </form>
+    <parameter>
+        <param name="alias_srl" target="target_srl" />
+    </parameter>
+    <response callback_func="completeInsertAlias">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/board/tpl/filter/delete_category.xml b/modules/document/tpl/filter/delete_category.xml
similarity index 70%
rename from modules/board/tpl/filter/delete_category.xml
rename to modules/document/tpl/filter/delete_category.xml
index 81863350c..7b942667c 100644
--- a/modules/board/tpl/filter/delete_category.xml
+++ b/modules/document/tpl/filter/delete_category.xml
@@ -1,4 +1,4 @@
-<filter name="delete_category" module="board" act="procBoardAdminDeleteCategory" confirm_msg_code="confirm_delete">
+<filter name="delete_category" module="document" act="procDocumentAdminDeleteCategory" confirm_msg_code="confirm_delete">
     <form>
         <node target="category_srl" required="true" />
     </form>
diff --git a/modules/document/tpl/filter/delete_extra_var.xml b/modules/document/tpl/filter/delete_extra_var.xml
new file mode 100644
index 000000000..82db03020
--- /dev/null
+++ b/modules/document/tpl/filter/delete_extra_var.xml
@@ -0,0 +1,11 @@
+<filter name="delete_extra_var" module="document" act="procDocumentAdminDeleteExtraVar" confirm_msg_code="confirm_delete">
+    <form>
+        <node target="module_srl" required="true" />
+        <node target="var_idx" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeInsertExtraVar">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/document/tpl/filter/insert_alias.xml b/modules/document/tpl/filter/insert_alias.xml
new file mode 100644
index 000000000..66a154bb7
--- /dev/null
+++ b/modules/document/tpl/filter/insert_alias.xml
@@ -0,0 +1,14 @@
+<filter name="insert_alias" module="document" act="procDocumentAdminInsertAlias" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="module_srl" required="true" />
+        <node target="document_srl" required="true" />
+        <node target="alias_title" required="true" />
+    </form>
+    <parameter>
+    </parameter>
+    <response callback_func="completeInsertAlias">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
+
diff --git a/modules/board/tpl/filter/insert_category.xml b/modules/document/tpl/filter/insert_category.xml
similarity index 87%
rename from modules/board/tpl/filter/insert_category.xml
rename to modules/document/tpl/filter/insert_category.xml
index 0a2b71bae..331038028 100644
--- a/modules/board/tpl/filter/insert_category.xml
+++ b/modules/document/tpl/filter/insert_category.xml
@@ -1,4 +1,4 @@
-<filter name="insert_category" module="board" act="procBoardAdminInsertCategory" confirm_msg_code="confirm_submit">
+<filter name="insert_category" module="document" act="procDocumentAdminInsertCategory" confirm_msg_code="confirm_submit">
     <form>
         <node target="module_srl" required="true" />
         <node target="category_srl" required="true" />
diff --git a/modules/document/tpl/filter/insert_document_module_config.xml b/modules/document/tpl/filter/insert_document_module_config.xml
new file mode 100644
index 000000000..d6260b7b6
--- /dev/null
+++ b/modules/document/tpl/filter/insert_document_module_config.xml
@@ -0,0 +1,7 @@
+<filter name="insert_document_module_config" module="document" act="procDocumentInsertModuleConfig" confirm_msg_code="confirm_submit">
+    <form />
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/document/tpl/filter/insert_extra_var.xml b/modules/document/tpl/filter/insert_extra_var.xml
new file mode 100644
index 000000000..0b8e3d96d
--- /dev/null
+++ b/modules/document/tpl/filter/insert_extra_var.xml
@@ -0,0 +1,11 @@
+<filter name="insert_extra_var" module="document" act="procDocumentAdminInsertExtraVar" confirm_msg_code="confirm_insert">
+    <form>
+        <node target="name" required="true" />
+        <node target="module_srl" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeInsertExtraVar">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/document/tpl/filter/manage_checked_document.xml b/modules/document/tpl/filter/manage_checked_document.xml
index 0c8383093..4f2b5c490 100644
--- a/modules/document/tpl/filter/manage_checked_document.xml
+++ b/modules/document/tpl/filter/manage_checked_document.xml
@@ -1,4 +1,4 @@
-<filter name="manage_checked_document" module="document" act="procDocumentAdminManageCheckedDocument">
+<filter name="manage_checked_document" module="document" act="procDocumentManageCheckedDocument">
     <form />
     <response callback_func="completeManageDocument">
         <tag name="error" />
diff --git a/modules/board/tpl/filter/move_category.xml b/modules/document/tpl/filter/move_category.xml
similarity index 67%
rename from modules/board/tpl/filter/move_category.xml
rename to modules/document/tpl/filter/move_category.xml
index e229cc64e..322299eeb 100644
--- a/modules/board/tpl/filter/move_category.xml
+++ b/modules/document/tpl/filter/move_category.xml
@@ -1,4 +1,4 @@
-<filter name="move_category" module="board" act="procBoardAdminMoveCategory" confirm_msg_code="confirm_move">
+<filter name="move_category" module="document" act="procDocumentAdminMoveCategory" confirm_msg_code="confirm_move">
     <form />
     <parameter />
     <response callback_func="completeMoveCategory">
diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html
index 8d298d7ac..40d58b2c5 100644
--- a/modules/document/tpl/header.html
+++ b/modules/document/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/document_admin.js")-->
 
-<h3>{$lang->document} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->document} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
     <ul class="localNavigation">
diff --git a/modules/document/tpl/images/btnDelete.gif b/modules/document/tpl/images/btnDelete.gif
new file mode 100644
index 000000000..c066e49be
Binary files /dev/null and b/modules/document/tpl/images/btnDelete.gif differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_delete.gif b/modules/document/tpl/images/buttonDeleteX.gif
similarity index 100%
rename from modules/homepage/skins/xe_official/images/n_icon_delete.gif
rename to modules/document/tpl/images/buttonDeleteX.gif
diff --git a/modules/document/tpl/images/buttonInsert.gif b/modules/document/tpl/images/buttonInsert.gif
new file mode 100644
index 000000000..5e661616f
Binary files /dev/null and b/modules/document/tpl/images/buttonInsert.gif differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_modify.gif b/modules/document/tpl/images/buttonModify.gif
similarity index 100%
rename from modules/homepage/skins/xe_official/images/n_icon_modify.gif
rename to modules/document/tpl/images/buttonModify.gif
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index 59f2ccd5f..f7187eb36 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -90,3 +90,49 @@ function insertSelectedModule(id, module_srl, mid, browser_title) {
     obj.value = browser_title+' ('+mid+')';
     doGetCategoryFromModule(module_srl);
 }
+
+function completeInsertExtraVar(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = current_url.setQuery('type','').setQuery('selected_var_idx','');
+}
+
+function completeInsertAlias(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = current_url;
+}
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    if(current_url.getQuery('act')=='dispDocumentManageDocument') {
+        var obj= xGetElementById('_'+id);
+        var sObj = xGetElementById(id);
+        sObj.value = module_srl;
+        obj.value = browser_title+' ('+mid+')';
+        doGetCategoryFromModule(module_srl);
+    } else {
+        location.href = current_url.setQuery('module_srl',module_srl);
+    }
+}
+
+function deleteByFilter(target_srl, filter)
+{
+    var e = xGetElementById('target_srl');
+    e.value= target_srl;
+    var hF = xGetElementById("deleteForm");
+    procFilter(hF, filter);
+}
+
+function doDeleteExtraKey(module_srl, var_idx) {
+    var fo_obj = xGetElementById('fo_delete');
+    fo_obj.module_srl.value = module_srl;
+    fo_obj.var_idx.value = var_idx;
+    return procFilter(fo_obj, delete_extra_var);
+}
+
+function moveVar(type, module_srl, var_idx) {
+    var params = new Array();
+    params['type'] = type;
+    params['module_srl'] = module_srl;
+    params['var_idx'] = var_idx;
+    var response_tags = new Array('error','message');
+    exec_xml('document','procAdminMoveExtraVar', params, function() { location.reload(); });
+}
diff --git a/modules/board/tpl/js/board_category.js b/modules/document/tpl/js/document_category.js
similarity index 83%
rename from modules/board/tpl/js/board_category.js
rename to modules/document/tpl/js/document_category.js
index 06e601f6d..87e9527b1 100644
--- a/modules/board/tpl/js/board_category.js
+++ b/modules/document/tpl/js/document_category.js
@@ -1,7 +1,7 @@
 /**
- * @file   modules/board/tpl/js/board_category.js
+ * @file   modules/document/tpl/js/document_category.js
  * @author sol (sol@ngleader.com)
- * @brief  board 모듈의 category tree javascript
+ * @brief  document 모듈의 category tree javascript
  **/
 
 function Tree(url){
@@ -88,7 +88,7 @@ function Tree(url){
                     parent_srl = 0;
                 }
 
-                jQuery.exec_json("board.procBoardAdminMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
+                jQuery.exec_json("board.procDocumentAdminMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
                 function(data){
                     jQuery('#category_info').html('');
                    if(data.error > 0) Tree(xml_url);
@@ -126,8 +126,8 @@ function addNode(node,e){
             ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
             };
 
-    jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
-        jQuery('#category_info').html(data.tpl);
+    jQuery.exec_json('document.getDocumentAdminCategoryTplInfo', params, function(data){
+        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
     });
 }
 
@@ -138,8 +138,8 @@ function modifyNode(node,e){
             ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
             };
 
-    jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
-        jQuery('#category_info').html(data.tpl);
+    jQuery.exec_json('document.getDocumentAdminCategoryTplInfo', params, function(data){
+        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
     });
 }
 
@@ -159,7 +159,7 @@ function deleteNode(node){
                 ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
                 };
 
-        jQuery.exec_json('board.procBoardAdminDeleteCategory', params, function(data){
+        jQuery.exec_json('document.procDocumentAdminDeleteCategory', params, function(data){
             if(data.error==0) Tree(xml_url);
         });
     }
@@ -182,5 +182,9 @@ function doReloadTreeCategory(module_srl) {
 
     // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다.
     var response_tags = new Array('error','message', 'xml_file');
-    exec_xml('board', 'procBoardAdminMakeXmlFile', params, completeInsertCategory, response_tags, params);
-}
\ No newline at end of file
+    exec_xml('document', 'procDocumentAdminMakeXmlFile', params, completeInsertCategory, response_tags, params);
+}
+
+function doCategoryFormMove() {
+    xAddEventListener(window,'load',function() { window.document.body.appendChild(xGetElementById('fo_category')); xGetElementById('category_info').style.width = "550px"; } );
+}
diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html
index ef348a4be..9ef5da8aa 100644
--- a/modules/document/tpl/print_page.html
+++ b/modules/document/tpl/print_page.html
@@ -3,21 +3,23 @@
 
 <div class="printContent">
 
-    <div><h3>{$oDocument->getTitleText()}</h3></div>
+    <div><h3 class="xeAdmin">{$oDocument->getTitleText()}</h3></div>
 
     <div class="member_{$oDocument->get('member_srl')} gap1 fl">{$oDocument->get('nick_name')}</div>
     <div class="gap1 fr">{$oDocument->getRegdate()}</div>
     <div class="clear"></div>
 
 
-<!--@foreach($extra_vars as $key => $extra_var)-->
-    <div class="gap1">{$extra_var->name} : {$extra_var->value}</div>
+    <!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
+    <!--@foreach($oDocument->getExtraVars() as $key => $val)-->
+    <div class="gap1">{$val->name} : {$val->getValueHtml()}</div>
     <div class="clear"></div>
-<!--@end-->
+    <!--@end-->
+    <!--@end-->
     <div class="gap1">{$oDocument->getContent(false, false)}</div>
 
 </div>
 
 <script type="text/javascript">//<![CDATA[
     jQuery(window).load(function() { window.print(); } );
-//]]></script>
\ No newline at end of file
+//]]></script>
diff --git a/modules/editor/components/cc_license/tpl/popup.html b/modules/editor/components/cc_license/tpl/popup.html
index 1850232bf..aadb0ebe2 100755
--- a/modules/editor/components/cc_license/tpl/popup.html
+++ b/modules/editor/components/cc_license/tpl/popup.html
@@ -1,13 +1,13 @@
 <!--%import("popup.js")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="120" />
         <col />
         <tr>
@@ -34,9 +34,8 @@
         </table>
     </div>
 
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertCode()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="insertCode()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/components/code_highlighter/code.png b/modules/editor/components/code_highlighter/code.png
new file mode 100644
index 000000000..b2b401363
Binary files /dev/null and b/modules/editor/components/code_highlighter/code.png differ
diff --git a/modules/editor/components/code_highlighter/code_highlighter.class.php b/modules/editor/components/code_highlighter/code_highlighter.class.php
new file mode 100644
index 000000000..012ce236e
--- /dev/null
+++ b/modules/editor/components/code_highlighter/code_highlighter.class.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @brief Code Highlighter
+ * @class  code_highlighter
+ **/
+
+class code_highlighter extends EditorHandler {
+
+    // editor_sequence 는 에디터에서 필수로 달고 다녀야 함
+    var $editor_sequence = 0;
+    var $component_path = '';
+
+    /**
+     * @brief editor_sequence과 컴포넌트의 경로를 받음
+     **/
+    function code_highlighter($editor_sequence, $component_path) {
+        $this->editor_sequence = $editor_sequence;
+        $this->component_path = $component_path;
+    }
+
+    /**
+     * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
+     **/
+    function getPopupContent() {
+        // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
+        $tpl_path = $this->component_path.'tpl';
+        $tpl_file = 'popup.html';
+
+        Context::set('tpl_path', $tpl_path);
+
+        $oTemplate = &TemplateHandler::getInstance();
+        return $oTemplate->compile($tpl_path, $tpl_file);
+    }
+
+    /**
+     * @brief 에디터 컴포넌트가 별도의 고유 코드를 이용한다면 그 코드를 html로 변경하여 주는 method
+     *
+     * 이미지나 멀티미디어, 설문등 고유 코드가 필요한 에디터 컴포넌트는 고유코드를 내용에 추가하고 나서
+     * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경
+     **/
+    function transHTML($xml_obj) {
+        $code_type = $xml_obj->attrs->code_type;
+        $option_file_path = $xml_obj->attrs->file_path;
+        $option_description = $xml_obj->attrs->description;
+        $option_first_line = $xml_obj->attrs->first_line;
+        $option_collapse = $xml_obj->attrs->collapse;
+        $option_nogutter = $xml_obj->attrs->nogutter;
+        $option_nocontrols = $xml_obj->attrs->nocontrols;
+        if($option_collapse == 'true') $option = $option.'collapse: true;';
+        if($option_nogutter == 'true') $option = $option.'gutter: false;';
+        if($option_nocontrols == 'true' && $option_collapse != 'true') $option = $option.'toolbar: false;';
+        if($option_first_line > 1) $option = $option."first-line: ".$option_first_line.";";
+        $body = $xml_obj->body;
+
+
+        $body = preg_replace('@(<br\\s?/?>)(\n)?@i' , "\n", $body);
+        $body = strip_tags($body);
+
+        if(!$GLOBALS['_called_editor_component_code_highlighter_']) {
+            $GLOBALS['_called_editor_component_code_highlighter_'] = true;
+            $js_code = <<<dpScript
+<script type="text/javascript">
+SyntaxHighlighter.config.clipboardSwf = '{$this->component_path}script/clipboard.swf';
+SyntaxHighlighter.all();
+</script>
+dpScript;
+
+            Context::addHtmlFooter($js_code);
+            Context::addCSSFile($this->component_path.'style/shCore.css');
+            Context::addCSSFile($this->component_path.'style/shThemeDefault.css');
+            Context::addJsFile($this->component_path.'script/shCore.js');
+        }
+
+        Context::addJsFile($this->component_path.'script/shBrush'.$code_type.'.js');
+
+        $output = null;
+        if($option_file_path != null || $option_description != null) {
+            $output .= '<div class="ch_infobox">';
+            if($option_file_path != null) $output .= '<span class="file_path">'.$option_file_path.'</span>';
+            if($option_description != null) $output .= '<span class="description">'.$option_description.'</span>';
+            $output .= '</div>';
+        }
+        $output .= sprintf('<pre class="brush: %s;%s">%s</pre>', strtolower($code_type), $option, $body);
+        return $output;
+    }
+}
diff --git a/modules/editor/components/code_highlighter/component_icon.gif b/modules/editor/components/code_highlighter/component_icon.gif
new file mode 100644
index 000000000..6c91bbf56
Binary files /dev/null and b/modules/editor/components/code_highlighter/component_icon.gif differ
diff --git a/modules/editor/components/code_highlighter/icon.gif b/modules/editor/components/code_highlighter/icon.gif
new file mode 100644
index 000000000..4b542c04e
Binary files /dev/null and b/modules/editor/components/code_highlighter/icon.gif differ
diff --git a/modules/editor/components/code_highlighter/info.xml b/modules/editor/components/code_highlighter/info.xml
new file mode 100644
index 000000000..35fe1fbab
--- /dev/null
+++ b/modules/editor/components/code_highlighter/info.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="ko">Code Highlighter</title>
+    <title xml:lang="jp">コードハイライト</title>
+    <title xml:lang="zh-CN">代码高亮显示</title>
+    <title xml:lang="en">Code Highlighter</title>
+    <title xml:lang="es">Código para resaltar</title>
+    <title xml:lang="ru">Подсветка кода</title>
+    <title xml:lang="zh-TW">語法高亮度顯示</title>
+    <description xml:lang="ko">코드를 보기 좋게 출력합니다.</description>
+    <description xml:lang="jp">ソースコードを見やすく表示します。</description>
+    <description xml:lang="en">It displays code in good shape.</description>
+    <description xml:lang="es">Muestra el código en buena forma.</description>
+    <description xml:lang="ru">Компонент служащий для подсветки кода</description>
+    <description xml:lang="zh-CN">高亮显示所选代码。</description>
+    <description xml:lang="zh-TW">將所選取的語法高亮度顯示。</description>
+    <version>0.5</version>
+    <date>2009-01-20</date>
+    <license link="http://creativecommons.org/licenses/LGPL/2.1/">LGPL 2.1</license>
+
+    <author link="http://www.zeroboard.com/">
+        <name xml:lang="ko">XE Open Source Project</name>
+        <name xml:lang="jp">XE Open Source Project</name>
+        <name xml:lang="en">XE Open Source Project</name>
+        <name xml:lang="es">XE Open Source Project</name>
+        <name xml:lang="ru">XE Open Source Project</name>
+        <name xml:lang="zh-CN">XE Open Source Project</name>
+        <name xml:lang="zh-TW">XE Open Source Project</name>
+    </author>
+</component>
\ No newline at end of file
diff --git a/modules/editor/components/code_highlighter/lang/en.lang.php b/modules/editor/components/code_highlighter/lang/en.lang.php
new file mode 100644
index 000000000..cfea5e482
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/en.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
+ **/
+$lang->code_type = 'Code Type';
+
+$lang->used_collapse = 'Use Folding';
+$lang->hidden_linenumber = 'Hide Line Number';
+$lang->hidden_controls = 'Hide Toolbar';
+
+$lang->file_path = 'File Path';
+$lang->description = 'Description';
+$lang->first_line = 'First Line';
diff --git a/modules/editor/components/code_highlighter/lang/es.lang.php b/modules/editor/components/code_highlighter/lang/es.lang.php
new file mode 100644
index 000000000..866fd0ada
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/es.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
+ **/
+$lang->code_type = 'Código Tipo';
+
+$lang->used_collapse = 'Utilice Folding';
+$lang->hidden_linenumber = 'Ocultar número de línea';
+$lang->hidden_controls = 'Ocultar barra de herramientas';
+
+$lang->file_path = 'Ruta del archivo';
+$lang->description = 'Descripción';
+$lang->first_line = 'Primera Línea';
diff --git a/modules/editor/components/code_highlighter/lang/jp.lang.php b/modules/editor/components/code_highlighter/lang/jp.lang.php
new file mode 100644
index 000000000..2d4951475
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/jp.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author ミニミ
+ **/
+$lang->code_type = '言語種類';
+
+$lang->used_collapse = '折りたたみ機能を使う';
+$lang->hidden_linenumber = '行番号を隠す';
+$lang->hidden_controls = 'ツールバーを隠す';
+
+$lang->file_path = 'ファイルパス';
+$lang->description = '説明';
+$lang->first_line = '開始する行番号';
diff --git a/modules/editor/components/code_highlighter/lang/ko.lang.php b/modules/editor/components/code_highlighter/lang/ko.lang.php
new file mode 100644
index 000000000..37894834e
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/ko.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author BNU <bnufactory@gmail.com>
+ **/
+$lang->code_type = '언어 종류';
+
+$lang->used_collapse = '접기 기능 사용';
+$lang->hidden_linenumber = '줄 번호 감추기';
+$lang->hidden_controls = '도구바 감추기';
+
+$lang->file_path = '파일경로';
+$lang->description = '설명';
+$lang->first_line = '시작 줄 번호';
diff --git a/modules/editor/components/code_highlighter/lang/ru.lang.php b/modules/editor/components/code_highlighter/lang/ru.lang.php
new file mode 100644
index 000000000..c222c73dc
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/ru.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
+ **/
+$lang->code_type = 'Тип кода';
+
+$lang->used_collapse = 'Использованное сокращение';
+$lang->hidden_linenumber = 'Скрытый номер строки';
+$lang->hidden_controls = 'Скрытый контрол';
+
+$lang->file_path = 'Путь файла';
+$lang->description = 'Описание';
+$lang->first_line = 'Первая строка';
diff --git a/modules/editor/components/code_highlighter/lang/zh-CN.lang.php b/modules/editor/components/code_highlighter/lang/zh-CN.lang.php
new file mode 100644
index 000000000..d1264da4c
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/zh-CN.lang.php
@@ -0,0 +1,16 @@
+<?php
+    /**
+     * @file   /modules/editor/components/code_highlighter/lang/ko.lang.php
+     * @author BNU <bnufactory@gamil.com> 翻译：guny
+     * @brief  编辑器(editor) 模块 >  代码高亮显示(code_highlighter)组件简体中文语言包
+     **/
+    $lang->code_type = '语言类型';
+
+    $lang->used_collapse = '使用代码折叠';
+    $lang->hidden_linenumber = '隐藏行号';
+    $lang->hidden_controls = '隐藏工具栏';
+
+    $lang->file_path = '文件路径';
+    $lang->description = '说明';
+    $lang->first_line = '首行行号';
+?>
\ No newline at end of file
diff --git a/modules/editor/components/code_highlighter/lang/zh-TW.lang.php b/modules/editor/components/code_highlighter/lang/zh-TW.lang.php
new file mode 100644
index 000000000..3a75eb88f
--- /dev/null
+++ b/modules/editor/components/code_highlighter/lang/zh-TW.lang.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @author royallin
+ **/
+$lang->code_type = '語法類型';
+
+$lang->used_collapse = '使用收合';
+$lang->hidden_linenumber = '隱藏行號';
+$lang->hidden_controls = '隱藏控制';
+
+$lang->file_path = '檔案路徑';
+$lang->description = '說明';
+$lang->first_line = '第一行';
diff --git a/modules/editor/components/code_highlighter/script/clipboard.swf b/modules/editor/components/code_highlighter/script/clipboard.swf
new file mode 100644
index 000000000..1b4d90a0f
Binary files /dev/null and b/modules/editor/components/code_highlighter/script/clipboard.swf differ
diff --git a/modules/editor/components/code_highlighter/script/shBrushAbap.js b/modules/editor/components/code_highlighter/script/shBrushAbap.js
new file mode 100644
index 000000000..eef3f0d73
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushAbap.js
@@ -0,0 +1,26 @@
+dp.sh.Brushes.Abap = function()
+{
+ var datatypes =
+ 'ACCP CHAR CLNT CUKY CURR DATS DEC FLTP INT1 INT2 INT4 LANG LCHR LRAW NUMC PREC QUAN RAW RAWSTRING SSTRING STRING TIMS UNIT';
+
+ var keywords =
+ 'IF RETURN WHILE CASE DEFAULT DO ELSE FOR ENDIF ELSEIF EQ NOT AND DATA TYPES SELETION-SCREEN PARAMETERS ' +
+ 'FIELD-SYMBOLS EXTERN INLINE REPORT WRITE APPEND SELECT ENDSELECT CALL METHOD CALL FUNCTION LOOP ENDLOOP ' +
+ 'RAISE READ TABLE CONCATENATE SPLIT SHIFT CONDENSE DESCRIBE CLEAR ENDFUNCTION ASSIGN CREATE DATA TRANSLATE ' +
+ 'CONTINUE START-OF-SELECTION AT SELECTION-SCREEN MODIFY CALL SCREEN CREATE OBJECT PERFORM FORM ENDFORM ' +
+ 'REUSE_ALV_BLOCK_LIST_INIT ZBCIALV INCLUDE TYPE REF TO TYPE BEGIN\SOF END\SOF LIKE INTO FROM WHERE ORDER BY ' +
+ 'WITH KEY INTO STRING SEPARATED BY EXPORTING IMPORTING TO UPPER CASE TO EXCEPTIONS TABLES USING CHANGING';
+
+ this.regexList = [
+  { regex: new RegExp('^\\*.*$', 'gm'),						css: 'comment' },   // one line comments
+  { regex: new RegExp('\\".*$', 'gm'),						css: 'comment' },   // one line comments
+  { regex: dp.sh.RegexLib.SingleQuotedString,				css: 'string' },   // strings
+  { regex: new RegExp(this.GetKeywords(datatypes), 'gm'),	css: 'datatypes' },
+  { regex: new RegExp(this.GetKeywords(keywords), 'gm'),	css: 'keyword' }
+  ];
+
+ this.CssClass = 'dp-abap';
+}
+
+dp.sh.Brushes.Abap.prototype = new dp.sh.Highlighter();
+dp.sh.Brushes.Abap.Aliases = ['abap', 'Abap'];
\ No newline at end of file
diff --git a/modules/editor/components/code_highlighter/script/shBrushBash.js b/modules/editor/components/code_highlighter/script/shBrushBash.js
new file mode 100644
index 000000000..8bc123815
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushBash.js
@@ -0,0 +1,51 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Bash = function()
+{
+	var keywords =	'if fi then elif else for do done until while break continue case function return in eq ne gt lt ge le';
+	var commands =  'alias apropos awk bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
+					'cksum clear cmp comm command cp cron crontab csplit cut date dc dd ddrescue declare df ' +
+					'diff diff3 dig dir dircolors dirname dirs du echo egrep eject enable env ethtool eval ' +
+					'exec exit expand export expr false fdformat fdisk fg fgrep file find fmt fold format ' +
+					'free fsck ftp gawk getopts grep groups gzip hash head history hostname id ifconfig ' +
+					'import install join kill less let ln local locate logname logout look lpc lpr lprint ' +
+					'lprintd lprintq lprm ls lsof make man mkdir mkfifo mkisofs mknod more mount mtools ' +
+					'mv netstat nice nl nohup nslookup open op passwd paste pathchk ping popd pr printcap ' +
+					'printenv printf ps pushd pwd quota quotacheck quotactl ram rcp read readonly renice ' +
+					'remsync rm rmdir rsync screen scp sdiff sed select seq set sftp shift shopt shutdown ' +
+					'sleep sort source split ssh strace su sudo sum symlink sync tail tar tee test time ' +
+					'times touch top traceroute trap tr true tsort tty type ulimit umask umount unalias ' +
+					'uname unexpand uniq units unset unshar useradd usermod users uuencode uudecode v vdir ' +
+					'vi watch wc whereis which who whoami Wget xargs yes'
+					;
+    
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLinePerlComments,		css: 'comments' },		// one line comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,			css: 'string' },		// double quoted strings
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),			css: 'keyword' },		// keywords
+		{ regex: new RegExp(this.getKeywords(commands), 'gm'),			css: 'functions' }		// commands
+		];
+}
+
+SyntaxHighlighter.brushes.Bash.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Bash.aliases		= ['bash', 'shell'];
+
diff --git a/modules/editor/components/code_highlighter/script/shBrushCSharp.js b/modules/editor/components/code_highlighter/script/shBrushCSharp.js
new file mode 100644
index 000000000..f90422d8c
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushCSharp.js
@@ -0,0 +1,56 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.CSharp = function()
+{
+	var keywords =	'abstract as base bool break byte case catch char checked class const ' +
+					'continue decimal default delegate do double else enum event explicit ' +
+					'extern false finally fixed float for foreach get goto if implicit in int ' +
+					'interface internal is lock long namespace new null object operator out ' +
+					'override params private protected public readonly ref return sbyte sealed set ' +
+					'short sizeof stackalloc static string struct switch this throw true try ' +
+					'typeof uint ulong unchecked unsafe ushort using virtual void while';
+
+	function fixComments(match, regexInfo)
+	{
+		var css = (match[0].indexOf("///") == 0)
+			? 'color1'
+			: 'comments'
+			;
+			
+		return [new SyntaxHighlighter.Match(match[0], match.index, css)];
+	}
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	func : fixComments },		// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// strings
+		{ regex: /^\s*#.*/gm,										css: 'preprocessor' },		// preprocessor tags like #region and #endregion
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// c# keyword
+		];
+		
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+};
+
+SyntaxHighlighter.brushes.CSharp.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.CSharp.aliases	= ['c#', 'c-sharp', 'csharp'];
+
diff --git a/modules/editor/components/code_highlighter/script/shBrushCpp.js b/modules/editor/components/code_highlighter/script/shBrushCpp.js
new file mode 100644
index 000000000..f6b4be666
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushCpp.js
@@ -0,0 +1,91 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Cpp = function()
+{
+	// Copyright 2006 Shin, YoungJin
+	
+	var datatypes =	'ATOM BOOL BOOLEAN BYTE CHAR COLORREF DWORD DWORDLONG DWORD_PTR ' +
+					'DWORD32 DWORD64 FLOAT HACCEL HALF_PTR HANDLE HBITMAP HBRUSH ' +
+					'HCOLORSPACE HCONV HCONVLIST HCURSOR HDC HDDEDATA HDESK HDROP HDWP ' +
+					'HENHMETAFILE HFILE HFONT HGDIOBJ HGLOBAL HHOOK HICON HINSTANCE HKEY ' +
+					'HKL HLOCAL HMENU HMETAFILE HMODULE HMONITOR HPALETTE HPEN HRESULT ' +
+					'HRGN HRSRC HSZ HWINSTA HWND INT INT_PTR INT32 INT64 LANGID LCID LCTYPE ' +
+					'LGRPID LONG LONGLONG LONG_PTR LONG32 LONG64 LPARAM LPBOOL LPBYTE LPCOLORREF ' +
+					'LPCSTR LPCTSTR LPCVOID LPCWSTR LPDWORD LPHANDLE LPINT LPLONG LPSTR LPTSTR ' +
+					'LPVOID LPWORD LPWSTR LRESULT PBOOL PBOOLEAN PBYTE PCHAR PCSTR PCTSTR PCWSTR ' +
+					'PDWORDLONG PDWORD_PTR PDWORD32 PDWORD64 PFLOAT PHALF_PTR PHANDLE PHKEY PINT ' +
+					'PINT_PTR PINT32 PINT64 PLCID PLONG PLONGLONG PLONG_PTR PLONG32 PLONG64 POINTER_32 ' +
+					'POINTER_64 PSHORT PSIZE_T PSSIZE_T PSTR PTBYTE PTCHAR PTSTR PUCHAR PUHALF_PTR ' +
+					'PUINT PUINT_PTR PUINT32 PUINT64 PULONG PULONGLONG PULONG_PTR PULONG32 PULONG64 ' +
+					'PUSHORT PVOID PWCHAR PWORD PWSTR SC_HANDLE SC_LOCK SERVICE_STATUS_HANDLE SHORT ' +
+					'SIZE_T SSIZE_T TBYTE TCHAR UCHAR UHALF_PTR UINT UINT_PTR UINT32 UINT64 ULONG ' +
+					'ULONGLONG ULONG_PTR ULONG32 ULONG64 USHORT USN VOID WCHAR WORD WPARAM WPARAM WPARAM ' +
+					'char bool short int __int32 __int64 __int8 __int16 long float double __wchar_t ' +
+					'clock_t _complex _dev_t _diskfree_t div_t ldiv_t _exception _EXCEPTION_POINTERS ' +
+					'FILE _finddata_t _finddatai64_t _wfinddata_t _wfinddatai64_t __finddata64_t ' +
+					'__wfinddata64_t _FPIEEE_RECORD fpos_t _HEAPINFO _HFILE lconv intptr_t ' +
+					'jmp_buf mbstate_t _off_t _onexit_t _PNH ptrdiff_t _purecall_handler ' +
+					'sig_atomic_t size_t _stat __stat64 _stati64 terminate_function ' +
+					'time_t __time64_t _timeb __timeb64 tm uintptr_t _utimbuf ' +
+					'va_list wchar_t wctrans_t wctype_t wint_t signed';
+
+	var keywords =	'break case catch class const __finally __exception __try ' +
+					'const_cast continue private public protected __declspec ' +
+					'default delete deprecated dllexport dllimport do dynamic_cast ' +
+					'else enum explicit extern if for friend goto inline ' +
+					'mutable naked namespace new noinline noreturn nothrow ' +
+					'register reinterpret_cast return selectany ' +
+					'sizeof static static_cast struct switch template this ' +
+					'thread throw true false try typedef typeid typename union ' +
+					'using uuid virtual void volatile whcar_t while';
+					
+	var functions =	'assert isalnum isalpha iscntrl isdigit isgraph islower isprint' +
+					'ispunct isspace isupper isxdigit tolower toupper errno localeconv ' +
+					'setlocale acos asin atan atan2 ceil cos cosh exp fabs floor fmod ' +
+					'frexp ldexp log log10 modf pow sin sinh sqrt tan tanh jmp_buf ' +
+					'longjmp setjmp raise signal sig_atomic_t va_arg va_end va_start ' +
+					'clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen ' +
+					'fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell ' +
+					'fwrite getc getchar gets perror printf putc putchar puts remove ' +
+					'rename rewind scanf setbuf setvbuf sprintf sscanf tmpfile tmpnam ' +
+					'ungetc vfprintf vprintf vsprintf abort abs atexit atof atoi atol ' +
+					'bsearch calloc div exit free getenv labs ldiv malloc mblen mbstowcs ' +
+					'mbtowc qsort rand realloc srand strtod strtol strtoul system ' +
+					'wcstombs wctomb memchr memcmp memcpy memmove memset strcat strchr ' +
+					'strcmp strcoll strcpy strcspn strerror strlen strncat strncmp ' +
+					'strncpy strpbrk strrchr strspn strstr strtok strxfrm asctime ' +
+					'clock ctime difftime gmtime localtime mktime strftime time';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// strings
+		{ regex: /^ *#.*/gm,										css: 'preprocessor' },
+		{ regex: new RegExp(this.getKeywords(datatypes), 'gm'),		css: 'color1 bold' },
+		{ regex: new RegExp(this.getKeywords(functions), 'gm'),		css: 'functions bold' },
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword bold' }
+		];
+};
+
+SyntaxHighlighter.brushes.Cpp.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Cpp.aliases	= ['cpp', 'c'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushCss.js b/modules/editor/components/code_highlighter/script/shBrushCss.js
new file mode 100644
index 000000000..f0925cc1c
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushCss.js
@@ -0,0 +1,85 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.CSS = function()
+{
+	function getKeywordsCSS(str)
+	{
+		return '\\b([a-z_]|)' + str.replace(/ /g, '(?=:)\\b|\\b([a-z_\\*]|\\*|)') + '(?=:)\\b';
+	};
+	
+	function getValuesCSS(str)
+	{
+		return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b';
+	};
+
+	var keywords =	'ascent azimuth background-attachment background-color background-image background-position ' +
+					'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' +
+					'border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color ' +
+					'border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width ' +
+					'border-bottom-width border-left-width border-width border bottom cap-height caption-side centerline clear clip color ' +
+					'content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent direction display ' +
+					'elevation empty-cells float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font ' +
+					'height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top ' +
+					'margin-right margin-bottom margin-left margin marker-offset marks mathline max-height max-width min-height min-width orphans ' +
+					'outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page ' +
+					'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' +
+					'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' +
+					'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' +
+					'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index';
+
+	var values =	'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+
+					'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+
+					'continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double '+
+					'embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia '+
+					'gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside invert italic '+
+					'justify landscape large larger left-side left leftwards level lighter lime line-through list-item local loud lower-alpha '+
+					'lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower '+
+					'navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once open-quote outset '+
+					'outside overline pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side '+
+					'rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow '+
+					'small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize '+
+					'table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal '+
+					'text-bottom text-top thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin '+
+					'upper-roman url visible wait white wider w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow';
+
+	var fonts =		'[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif';
+	
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },	// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },	// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },	// single quoted strings
+		{ regex: /\#[a-fA-F0-9]{3,6}/g,								css: 'value' },		// html colors
+		{ regex: /(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)/g,				css: 'value' },		// sizes
+		{ regex: /!important/g,										css: 'color3' },	// !important
+		{ regex: new RegExp(getKeywordsCSS(keywords), 'gm'),		css: 'keyword' },	// keywords
+		{ regex: new RegExp(getValuesCSS(values), 'g'),				css: 'value' },		// values
+		{ regex: new RegExp(this.getKeywords(fonts), 'g'),			css: 'color1' }		// fonts
+		];
+
+	this.forHtmlScript({ 
+		left: /(&lt;|<)\s*style.*?(&gt;|>)/gi, 
+		right: /(&lt;|<)\/\s*style\s*(&gt;|>)/gi 
+		});
+};
+
+SyntaxHighlighter.brushes.CSS.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.CSS.aliases	= ['css'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushDelphi.js b/modules/editor/components/code_highlighter/script/shBrushDelphi.js
new file mode 100644
index 000000000..beb0a7dc2
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushDelphi.js
@@ -0,0 +1,49 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Delphi = function()
+{
+	var keywords =	'abs addr and ansichar ansistring array as asm begin boolean byte cardinal ' +
+					'case char class comp const constructor currency destructor div do double ' +
+					'downto else end except exports extended false file finalization finally ' +
+					'for function goto if implementation in inherited int64 initialization ' +
+					'integer interface is label library longint longword mod nil not object ' +
+					'of on or packed pansichar pansistring pchar pcurrency pdatetime pextended ' +
+					'pint64 pointer private procedure program property pshortstring pstring ' +
+					'pvariant pwidechar pwidestring protected public published raise real real48 ' +
+					'record repeat set shl shortint shortstring shr single smallint string then ' +
+					'threadvar to true try type unit until uses val var varirnt while widechar ' +
+					'widestring with word write writeln xor';
+
+	this.regexList = [
+		{ regex: /\(\*[\s\S]*?\*\)/gm,								css: 'comments' },  	// multiline comments (* *)
+		{ regex: /{(?!\$)[\s\S]*?}/gm,								css: 'comments' },  	// multiline comments { }
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },  	// one line
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// strings
+		{ regex: /\{\$[a-zA-Z]+ .+\}/g,								css: 'color1' },		// compiler Directives and Region tags
+		{ regex: /\b[\d\.]+\b/g,									css: 'value' },			// numbers 12345
+		{ regex: /\$[a-zA-Z0-9]+\b/g,								css: 'value' },			// numbers $F5D3
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }		// keyword
+		];
+};
+
+SyntaxHighlighter.brushes.Delphi.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Delphi.aliases	= ['delphi', 'pascal'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushDiff.js b/modules/editor/components/code_highlighter/script/shBrushDiff.js
new file mode 100644
index 000000000..fbdde3fb5
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushDiff.js
@@ -0,0 +1,35 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Diff = function()
+{
+	this.regexList = [
+		{ regex: /^\+\+\+.*$/gm,		css: 'color2' },
+		{ regex: /^\-\-\-.*$/gm,		css: 'color2' },
+		{ regex: /^\s.*$/gm,			css: 'color1' },
+		{ regex: /^@@.*@@$/gm,			css: 'variable' },
+		{ regex: /^\+[^\+]{1}.*$/gm,	css: 'string' },
+		{ regex: /^\-[^\-]{1}.*$/gm,	css: 'comments' }
+		];
+};
+
+SyntaxHighlighter.brushes.Diff.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Diff.aliases		= ['diff', 'patch'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushGroovy.js b/modules/editor/components/code_highlighter/script/shBrushGroovy.js
new file mode 100644
index 000000000..7f94ff2e2
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushGroovy.js
@@ -0,0 +1,61 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Groovy = function()
+{
+	// Contributed by Andres Almiray
+	// http://jroller.com/aalmiray/entry/nice_source_code_syntax_highlighter
+
+	var keywords =	'as assert break case catch class continue def default do else extends finally ' +
+					'if in implements import instanceof interface new package property return switch ' +
+					'throw throws try while public protected private static';
+	var types    =  'void boolean byte char short int long float double';
+	var constants = 'null';
+	var methods   = 'allProperties count get size '+
+					'collect each eachProperty eachPropertyName eachWithIndex find findAll ' +
+					'findIndexOf grep inject max min reverseEach sort ' +
+					'asImmutable asSynchronized flatten intersect join pop reverse subMap toList ' +
+					'padRight padLeft contains eachMatch toCharacter toLong toUrl tokenize ' +
+					'eachFile eachFileRecurse eachB yte eachLine readBytes readLine getText ' +
+					'splitEachLine withReader append encodeBase64 decodeBase64 filterLine ' +
+					'transformChar transformLine withOutputStream withPrintWriter withStream ' +
+					'withStreams withWriter withWriterAppend write writeLine '+
+					'dump inspect invokeMethod print println step times upto use waitForOrKill '+
+					'getText';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,				css: 'comments' },		// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,					css: 'comments' },		// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,					css: 'string' },		// strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,					css: 'string' },		// strings
+		{ regex: /""".*"""/g,													css: 'string' },		// GStrings
+		{ regex: new RegExp('\\b([\\d]+(\\.[\\d]+)?|0x[a-f0-9]+)\\b', 'gi'),	css: 'value' },			// numbers
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),					css: 'keyword' },		// goovy keyword
+		{ regex: new RegExp(this.getKeywords(types), 'gm'),						css: 'color1' },		// goovy/java type
+		{ regex: new RegExp(this.getKeywords(constants), 'gm'),					css: 'constants' },		// constants
+		{ regex: new RegExp(this.getKeywords(methods), 'gm'),					css: 'functions' }		// methods
+		];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+}
+
+SyntaxHighlighter.brushes.Groovy.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Groovy.aliases	= ['groovy'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushJScript.js b/modules/editor/components/code_highlighter/script/shBrushJScript.js
new file mode 100644
index 000000000..40905a7f3
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushJScript.js
@@ -0,0 +1,43 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.JScript = function()
+{
+	var keywords =	'abstract boolean break byte case catch char class const continue debugger ' +
+					'default delete do double else enum export extends false final finally float ' +
+					'for function goto if implements import in instanceof int interface long native ' +
+					'new null package private protected public return short static super switch ' +
+					'synchronized this throw throws transient true try typeof var void volatile while with';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// single quoted strings
+		{ regex: /\s*#.*/gm,										css: 'preprocessor' },		// preprocessor tags like #region and #endregion
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// keywords
+		];
+	
+	this.forHtmlScript(SyntaxHighlighter.regexLib.scriptScriptTags);
+};
+
+SyntaxHighlighter.brushes.JScript.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.JScript.aliases	= ['js', 'jscript', 'javascript'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushJava.js b/modules/editor/components/code_highlighter/script/shBrushJava.js
new file mode 100644
index 000000000..fb77c5264
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushJava.js
@@ -0,0 +1,47 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Java = function()
+{
+	var keywords =	'abstract assert boolean break byte case catch char class const ' +
+					'continue default do double else enum extends ' +
+					'false final finally float for goto if implements import ' +
+					'instanceof int interface long native new null ' +
+					'package private protected public return ' +
+					'short static strictfp super switch synchronized this throw throws true ' +
+					'transient try void volatile while';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },		// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },		// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },		// strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// strings
+		{ regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi,				css: 'value' },			// numbers
+		{ regex: /(?!\@interface\b)\@[\$\w]+\b/g,					css: 'color1' },		// annotation @anno
+		{ regex: /\@interface\b/g,									css: 'color2' },		// @interface keyword
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }		// java keyword
+		];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+};
+
+SyntaxHighlighter.brushes.Java.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Java.aliases		= ['java'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushPhp.js b/modules/editor/components/code_highlighter/script/shBrushPhp.js
new file mode 100644
index 000000000..91653c26e
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushPhp.js
@@ -0,0 +1,83 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Php = function()
+{
+	var funcs	=	'abs acos acosh addcslashes addslashes ' +
+					'array_change_key_case array_chunk array_combine array_count_values array_diff '+
+					'array_diff_assoc array_diff_key array_diff_uassoc array_diff_ukey array_fill '+
+					'array_filter array_flip array_intersect array_intersect_assoc array_intersect_key '+
+					'array_intersect_uassoc array_intersect_ukey array_key_exists array_keys array_map '+
+					'array_merge array_merge_recursive array_multisort array_pad array_pop array_product '+
+					'array_push array_rand array_reduce array_reverse array_search array_shift '+
+					'array_slice array_splice array_sum array_udiff array_udiff_assoc '+
+					'array_udiff_uassoc array_uintersect array_uintersect_assoc '+
+					'array_uintersect_uassoc array_unique array_unshift array_values array_walk '+
+					'array_walk_recursive atan atan2 atanh base64_decode base64_encode base_convert '+
+					'basename bcadd bccomp bcdiv bcmod bcmul bindec bindtextdomain bzclose bzcompress '+
+					'bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite ceil chdir '+
+					'checkdate checkdnsrr chgrp chmod chop chown chr chroot chunk_split class_exists '+
+					'closedir closelog copy cos cosh count count_chars date decbin dechex decoct '+
+					'deg2rad delete ebcdic2ascii echo empty end ereg ereg_replace eregi eregi_replace error_log '+
+					'error_reporting escapeshellarg escapeshellcmd eval exec exit exp explode extension_loaded '+
+					'feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents '+
+					'fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype '+
+					'floatval flock floor flush fmod fnmatch fopen fpassthru fprintf fputcsv fputs fread fscanf '+
+					'fseek fsockopen fstat ftell ftok getallheaders getcwd getdate getenv gethostbyaddr gethostbyname '+
+					'gethostbynamel getimagesize getlastmod getmxrr getmygid getmyinode getmypid getmyuid getopt '+
+					'getprotobyname getprotobynumber getrandmax getrusage getservbyname getservbyport gettext '+
+					'gettimeofday gettype glob gmdate gmmktime ini_alter ini_get ini_get_all ini_restore ini_set '+
+					'interface_exists intval ip2long is_a is_array is_bool is_callable is_dir is_double '+
+					'is_executable is_file is_finite is_float is_infinite is_int is_integer is_link is_long '+
+					'is_nan is_null is_numeric is_object is_readable is_real is_resource is_scalar is_soap_fault '+
+					'is_string is_subclass_of is_uploaded_file is_writable is_writeable mkdir mktime nl2br '+
+					'parse_ini_file parse_str parse_url passthru pathinfo readlink realpath rewind rewinddir rmdir '+
+					'round str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split '+
+					'str_word_count strcasecmp strchr strcmp strcoll strcspn strftime strip_tags stripcslashes '+
+					'stripos stripslashes stristr strlen strnatcasecmp strnatcmp strncasecmp strncmp strpbrk '+
+					'strpos strptime strrchr strrev strripos strrpos strspn strstr strtok strtolower strtotime '+
+					'strtoupper strtr strval substr substr_compare';
+
+	var keywords =	'and or xor array as break case ' +
+					'cfunction class const continue declare default die do else ' +
+					'elseif empty enddeclare endfor endforeach endif endswitch endwhile ' +
+					'extends for foreach function include include_once global if ' +
+					'new old_function return static switch use require require_once ' +
+					'var while abstract interface public implements extends private protected throw';
+	
+	var constants	= '__FILE__ __LINE__ __METHOD__ __FUNCTION__ __CLASS__';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// single quoted strings
+		{ regex: /\$\w+/g,											css: 'variable' },			// variables
+		{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),		css: 'functions' },			// common functions
+		{ regex: new RegExp(this.getKeywords(constants), 'gmi'),	css: 'constants' },			// constants
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// keyword
+		];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
+};
+
+SyntaxHighlighter.brushes.Php.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Php.aliases	= ['php'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushPlain.js b/modules/editor/components/code_highlighter/script/shBrushPlain.js
new file mode 100644
index 000000000..ce1e8b75e
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushPlain.js
@@ -0,0 +1,27 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Plain = function()
+{
+};
+
+SyntaxHighlighter.brushes.Plain.prototype = new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Plain.aliases = ['text', 'plain'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushPython.js b/modules/editor/components/code_highlighter/script/shBrushPython.js
new file mode 100644
index 000000000..07bf8cd0a
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushPython.js
@@ -0,0 +1,48 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Python = function()
+{
+	// Contributed by Gheorghe Milas
+	
+    var keywords =  'and assert break class continue def del elif else ' +
+                    'except exec finally for from global if import in is ' +
+                    'lambda not or pass print raise return try yield while';
+
+    var special =  'None True False self cls class_';
+
+    this.regexList = [
+        { regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' },
+        { regex: /^\s*@\w+/gm, 										css: 'decorator' },
+        { regex: /(['\"]{3})([^\1])*?\1/gm, 						css: 'comments' },
+        { regex: /"(?!")(?:\.|\\\"|[^\""\n])*"/gm, 					css: 'string' },
+        { regex: /'(?!')(?:\.|(\\\')|[^\''\n])*'/gm, 				css: 'string' },
+        { regex: /\+|\-|\*|\/|\%|=|==/gm, 								css: 'keyword' },
+        { regex: /\b\d+\.?\w*/g, 									css: 'value' },
+        { regex: new RegExp(this.getKeywords(keywords), 'gm'), 		css: 'keyword' },
+        { regex: new RegExp(this.getKeywords(special), 'gm'), 		css: 'color1' }
+        ];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+};
+
+SyntaxHighlighter.brushes.Python.prototype  = new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Python.aliases    = ['py', 'python'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushRuby.js b/modules/editor/components/code_highlighter/script/shBrushRuby.js
new file mode 100644
index 000000000..af978150f
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushRuby.js
@@ -0,0 +1,49 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Ruby = function()
+{
+	// Contributed by Erik Peterson.
+	
+	var keywords =	'alias and BEGIN begin break case class def define_method defined do each else elsif ' +
+					'END end ensure false for if in module new next nil not or raise redo rescue retry return ' +
+					'self super then throw true undef unless until when while yield';
+
+	var builtins =	'Array Bignum Binding Class Continuation Dir Exception FalseClass File::Stat File Fixnum Fload ' +
+					'Hash Integer IO MatchData Method Module NilClass Numeric Object Proc Range Regexp String Struct::TMS Symbol ' +
+					'ThreadGroup Thread Time TrueClass';
+
+	this.regexList = [
+		{ regex: SyntaxHighlighter.regexLib.singleLinePerlComments,	css: 'comments' },		// one line comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },		// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },		// single quoted strings
+		{ regex: /\b[A-Z0-9_]+\b/g,									css: 'constants' },		// constants
+		{ regex: /:[a-z][A-Za-z0-9_]*/g,							css: 'color2' },		// symbols
+		{ regex: /(\$|@@|@)\w+/g,									css: 'variable bold' },	// $global, @instance, and @@class variables
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' },		// keywords
+		{ regex: new RegExp(this.getKeywords(builtins), 'gm'),		css: 'color1' }			// builtins
+		];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+};
+
+SyntaxHighlighter.brushes.Ruby.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Ruby.aliases		= ['ruby', 'rails', 'ror'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushScala.js b/modules/editor/components/code_highlighter/script/shBrushScala.js
new file mode 100644
index 000000000..6aa94fdec
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushScala.js
@@ -0,0 +1,46 @@
+/**
+ * Code Syntax Highlighter.
+ * Version 1.5.2
+ * Copyright (C) 2004-2008 Alex Gorbatchev
+ * http://www.dreamprojections.com/syntaxhighlighter/
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** Contributed by Yegor Jbanov and David Bernard. */
+dp.sh.Brushes.Scala = function()
+{
+	var keywords =	'val sealed case def true trait implicit forSome import match object null finally super ' +
+	                'override try lazy for var catch throw type extends class while with new final yield abstract ' +
+	                'else do if return protected private this package false';
+
+	var keyops =	'[_:=><%#@]+';
+
+	this.regexList = [
+		{ regex: dp.sh.RegexLib.SingleLineCComments,							css: 'comment' },		// one line comments
+		{ regex: dp.sh.RegexLib.MultiLineCComments,								css: 'comment' },		// multiline comments
+		{ regex: new RegExp("(['\"]{3})([^\\1])*?\\1", 'gm'),                   css: 'string'  },		// multi-line strings
+		{ regex: new RegExp('"(?!")(?:\\.|\\\\\\"|[^\\""\\n\\r])*"', 'gm'),     css: 'string'  },       // double-quoted string
+		{ regex: dp.sh.RegexLib.SingleQuotedString,								css: 'string'  },		// strings
+		{ regex: new RegExp('\\b([\\d]+(\\.[\\d]+)?|0x[a-f0-9]+)\\b', 'gi'),	css: 'number'  },		// numbers
+		{ regex: new RegExp(this.GetKeywords(keywords), 'gm'),					css: 'keyword' },		// keywords
+		{ regex: new RegExp(keyops, 'gm'),										css: 'keyword' }		                    // scala keyword
+		];
+
+	this.CssClass = 'dp-j';
+	this.Style =	'.dp-j .annotation { color: #646464; }' +
+					'.dp-j .number { color: #C00000; }';
+}
+
+dp.sh.Brushes.Scala.prototype	= new dp.sh.Highlighter();
+dp.sh.Brushes.Scala.Aliases		= ['scala'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushSql.js b/modules/editor/components/code_highlighter/script/shBrushSql.js
new file mode 100644
index 000000000..566f8c0ea
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushSql.js
@@ -0,0 +1,60 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Sql = function()
+{
+	var funcs	=	'abs avg case cast coalesce convert count current_timestamp ' +
+					'current_user day isnull left lower month nullif replace right ' +
+					'session_user space substring sum system_user upper user year';
+
+	var keywords =	'absolute action add after alter as asc at authorization begin bigint ' +
+					'binary bit by cascade char character check checkpoint close collate ' +
+					'column commit committed connect connection constraint contains continue ' +
+					'create cube current current_date current_time cursor database date ' +
+					'deallocate dec decimal declare default delete desc distinct double drop ' +
+					'dynamic else end end-exec escape except exec execute false fetch first ' +
+					'float for force foreign forward free from full function global goto grant ' +
+					'group grouping having hour ignore index inner insensitive insert instead ' +
+					'int integer intersect into is isolation key last level load local max min ' +
+					'minute modify move name national nchar next no numeric of off on only ' +
+					'open option order out output partial password precision prepare primary ' +
+					'prior privileges procedure public read real references relative repeatable ' +
+					'restrict return returns revoke rollback rollup rows rule schema scroll ' +
+					'second section select sequence serializable set size smallint static ' +
+					'statistics table temp temporary then time timestamp to top transaction ' +
+					'translation trigger true truncate uncommitted union unique update values ' +
+					'varchar varying view when where with work';
+
+	var operators =	'all and any between cross in join like not null or outer some';
+
+	this.regexList = [
+		{ regex: /--(.*)$/gm,												css: 'comments' },			// one line and multiline comments
+		{ regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString,	css: 'string' },			// double quoted strings
+		{ regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString,	css: 'string' },			// single quoted strings
+		{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),				css: 'color2' },			// functions
+		{ regex: new RegExp(this.getKeywords(operators), 'gmi'),			css: 'color1' },			// operators and such
+		{ regex: new RegExp(this.getKeywords(keywords), 'gmi'),				css: 'keyword' }			// keyword
+		];
+};
+
+SyntaxHighlighter.brushes.Sql.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Sql.aliases	= ['sql'];
+
diff --git a/modules/editor/components/code_highlighter/script/shBrushVb.js b/modules/editor/components/code_highlighter/script/shBrushVb.js
new file mode 100644
index 000000000..879305fea
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushVb.js
@@ -0,0 +1,50 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Vb = function()
+{
+	var keywords =	'AddHandler AddressOf AndAlso Alias And Ansi As Assembly Auto ' +
+					'Boolean ByRef Byte ByVal Call Case Catch CBool CByte CChar CDate ' +
+					'CDec CDbl Char CInt Class CLng CObj Const CShort CSng CStr CType ' +
+					'Date Decimal Declare Default Delegate Dim DirectCast Do Double Each ' +
+					'Else ElseIf End Enum Erase Error Event Exit False Finally For Friend ' +
+					'Function Get GetType GoSub GoTo Handles If Implements Imports In ' +
+					'Inherits Integer Interface Is Let Lib Like Long Loop Me Mod Module ' +
+					'MustInherit MustOverride MyBase MyClass Namespace New Next Not Nothing ' +
+					'NotInheritable NotOverridable Object On Option Optional Or OrElse ' +
+					'Overloads Overridable Overrides ParamArray Preserve Private Property ' +
+					'Protected Public RaiseEvent ReadOnly ReDim REM RemoveHandler Resume ' +
+					'Return Select Set Shadows Shared Short Single Static Step Stop String ' +
+					'Structure Sub SyncLock Then Throw To True Try TypeOf Unicode Until ' +
+					'Variant When While With WithEvents WriteOnly Xor';
+
+	this.regexList = [
+		{ regex: /'.*$/gm,										css: 'comments' },			// one line comments
+		{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,	css: 'string' },			// strings
+		{ regex: /^\s*#.*$/gm,									css: 'preprocessor' },		// preprocessor tags like #region and #endregion
+		{ regex: new RegExp(this.getKeywords(keywords), 'gm'),	css: 'keyword' }			// vb keyword
+		];
+
+	this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+};
+
+SyntaxHighlighter.brushes.Vb.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Vb.aliases	= ['vb', 'vbnet'];
diff --git a/modules/editor/components/code_highlighter/script/shBrushXml.js b/modules/editor/components/code_highlighter/script/shBrushXml.js
new file mode 100644
index 000000000..e35ffd0f0
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shBrushXml.js
@@ -0,0 +1,63 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+SyntaxHighlighter.brushes.Xml = function()
+{
+	function process(match, regexInfo)
+	{
+		var constructor = SyntaxHighlighter.Match,
+			code = match[0],
+			tag = new XRegExp('(&lt;|<)[\\s\\/\\?]*(?<name>[:\\w-\\.]+)', 'xg').exec(code),
+			result = []
+			;
+		
+		if (match.attributes != null) 
+		{
+			var attributes,
+				regex = new XRegExp('(?<name> [\\w:\\-\\.]+)' +
+									'\\s*=\\s*' +
+									'(?<value> ".*?"|\'.*?\'|\\w+)',
+									'xg');
+
+			while ((attributes = regex.exec(code)) != null) 
+			{
+				result.push(new constructor(attributes.name, match.index + attributes.index, 'color1'));
+				result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string'));
+			}
+		}
+
+		if (tag != null)
+			result.push(
+				new constructor(tag.name, match.index + tag[0].indexOf(tag.name), 'keyword')
+			);
+
+		return result;
+	}
+	
+	this.regexList = [
+		{ regex: new XRegExp('(\\&lt;|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\&gt;|>)', 'gm'),			css: 'color2' },	// <![ ... [ ... ]]>
+		{ regex: new XRegExp('(\\&lt;|<)!--\\s*.*?\\s*--(\\&gt;|>)', 'gm'),								css: 'comments' },	// <!-- ... -->
+		{ regex: new XRegExp('(&lt;|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(&gt;|>)', 'sg'), func: process }
+	];
+};
+
+SyntaxHighlighter.brushes.Xml.prototype	= new SyntaxHighlighter.Highlighter();
+SyntaxHighlighter.brushes.Xml.aliases	= ['xml', 'xhtml', 'xslt', 'html', 'xhtml'];
diff --git a/modules/editor/components/code_highlighter/script/shCore.js b/modules/editor/components/code_highlighter/script/shCore.js
new file mode 100644
index 000000000..85f8c0b11
--- /dev/null
+++ b/modules/editor/components/code_highlighter/script/shCore.js
@@ -0,0 +1,22 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('f(!1h.2I){l 2I=h(){l p={61:{"1b-1d":"","7f-2R":1,"1W-1P":u,"1B":u,"85-6L":U,"1H-1P":4,"5p":M,"5z":U,"1u":U,"5E":M,"7R-6e":U,"6n":M},R:{59:u,4x:16,4P:16,8h:M,7I:"4p",1n:{4t:"98 1c",4o:"99 1c",67:"97 96 7C",6y:"93 I 94 2a 95 7C 9a",38:"38",6B:"?",1q:"2I\\n\\n",6t:"9b\'t 9h 7J C: ",6b:"9i 9g\'t 9f C 2c-2q 9c: ",77:"<!9d 2c 9e \\"-//92//7d 91 1.0 8P//8Q\\" \\"2j://8e.8f.8c/8R/7e/7d/7e-8O.8N\\"><2c 8K=\\"2j://8e.8f.8c/8L/8M\\"><84><8S 2j-8T=\\"8Z-90\\" 5u=\\"2g/2c; 8Y=8X-8\\" /><4O>8U 2I</4O></84><2E 1g=\\"1W-6l:8V,\\"6g 8W 9j\\",6g,5Y;9k-4H:#9J;4H:#9K;1W-1P:9I;2g-6r:6p;\\"><z 1g=\\"2g-6r:6p;5v-4S:9H;\\"><z 1g=\\"1W-6l:9E,9F,8J,9L-5Y;1W-1P:9M-9S;\\">2I</z><z 1g=\\"1W-1P:.9T;5v-9R:9Q;\\"><z>5T 2.0.9N (9O 9P 6C)</z><z><a 2e=\\"2j://74.58\\" 9D=\\"55\\" 1g=\\"4H:#9C;2g-9q:9r;\\">2j://74.58</a></z></z><z>9s I 9p 9o.</z><z>9l 9m-6C 9n 9t.</z></z></2E></2c>"},7F:M},1t:{5j:u,3w:u,3f:u,5F:{}},2T:{},7b:{9u:/\\/\\*[\\s\\S]*?\\*\\//4G,9A:/\\/\\/.*$/4G,9B:/#.*$/4G,9y:/"(?:\\.|(\\\\\\")|[^\\""\\n])*"/g,9v:/\'(?:\\.|(\\\\\\\')|[^\\\'\'\\n])*\'/g,9w:/"(?:\\.|(\\\\\\")|[^\\""])*"/g,9x:/\'(?:\\.|(\\\\\\\')|[^\\\'\'])*\'/g,3L:/\\w+:\\/\\/[\\w-.\\/?%&=]*/g,9U:{D:/(&1I;|<)\\?=?/g,19:/\\?(&2x;|>)/g},8r:{D:/(&1I;|<)%=?/g,19:/%(&2x;|>)/g},8s:{D:/(&1I;|<)\\s*2q.*?(&2x;|>)/4l,19:/(&1I;|<)\\/\\s*2q\\s*(&2x;|>)/4l}},1u:{18:h(3G){l 3E=J.1w("39"),4F=p.1u.7V;3E.Z="1u";C(l 2J 2a 4F){l 6J=4F[2J],4D=Q 6J(3G),1V=4D.18();3G.5o[2J]=4D;f(1V==u){1O}f(8I(1V)=="8H"){1V=p.1u.6T(1V,3G.1j,2J)}1V.Z+="8z "+2J;3E.1K(1V)}q 3E},6T:h(4M,6Y,4N){l a=J.1w("a"),4L=a.1g,4J=p.R,4K=4J.4x,4C=4J.4P;a.2e="#"+4N;a.4O=4M;a.4Q=6Y;a.6q=4N;a.1x=4M;f(5r(4K)==M){4L.1M=4K+"5q"}f(5r(4C)==M){4L.2i=4C+"5q"}a.8p=h(e){8k{p.1u.6W(c,e||1h.68,c.4Q,c.6q)}8l(e){p.B.1q(e.6M)}q M};q a},6W:h(7Z,89,81,86,7W){l 4B=p.1t.5F[81],4s;f(4B==u||(4s=4B.5o[86])==u){q u}q 4s.2f(7Z,89,7W)},7V:{4t:h(4r){c.18=h(){f(4r.T("5E")!=U){q}q p.R.1n.4t};c.2f=h(4q,8C,8w){l z=4r.z;4q.7x.4j(4q);z.Z=z.Z.E("5D","")}},4o:h(7N){c.18=h(){q p.R.1n.4o};c.2f=h(8o,8E,8x){l 3C=p.B.3y(7N.5B).E(/</g,"&1I;"),2d=p.B.4R("","55",8F,8v,"70=0, 8n=1, 8u=0, 75=1");3C=p.B.2z(3C);2d.J.35("<4p>"+3C+"</4p>");2d.J.54()}},67:h(5c){l 3c,9G,5a=5c.1j;c.18=h(){l 2K=p.R;f(1h.70.a8=="b8:"||2K.59==u){q u}h 1y(4u){l 4A="";C(l 4v 2a 4u){4A+="<b7 1d=\'"+4v+"\' 1N=\'"+4u[4v]+"\'/>"}q 4A};h 2k(4z){l 4w="";C(l 4y 2a 4z){4w+=" "+4y+"=\'"+4z[4y]+"\'"}q 4w};l 56={1M:2K.4x,2i:2K.4P,1j:5a+"b6",6w:"b4/x-6c-6o"},57={b5:"b9",ba:"bf",be:"4Q="+5a,bd:"M"},5b=2K.59,3a;f(/bc/i.1X(80.83)){3a="<5R"+2k({b3:"b2:aU-aT-aS-aQ-aR",aW:"2j://b0.aZ.58/aX/6c/bh/6o/bg.bm#5T=9,0,0,0"})+2k(56)+">"+1y(57)+1y({bD:5b})+"</5R>"}F{3a="<bB"+2k(56)+2k(57)+2k({bC:5b})+"/>"}3c=J.1w("z");3c.1x=3a;q 3c};c.2f=h(bE,bF,5g){l 71=5g.by;6V(71){2H"5Q":l 5h=p.B.2z(p.B.3y(5c.5B).E(/&1I;/g,"<").E(/&2x;/g,">").E(/&bw;/g,"&"));f(1h.6P){1h.6P.bx("2g",5h)}F{q p.B.2z(5h)}2H"bl":p.B.1q(p.R.1n.6y);30;2H"bk":p.B.1q(5g.6M);30}}},bi:h(5f){c.18=h(){q p.R.1n.38};c.2f=h(bj,bo,9V){l 1U=J.1w("bv"),1J=u;f(p.1t.3f!=u){J.2E.4j(p.1t.3f)}p.1t.3f=1U;1U.1g.bu="bt:bq;1M:6H;2i:6H;D:-6G;4S:-6G;";J.2E.1K(1U);1J=1U.5d.J;6F(1J,1h.J);1J.35("<z 1b=\\""+5f.z.Z.E("5D","")+" bs\\">"+5f.z.1x+"</z>");1J.54();1U.5d.52();1U.5d.38();h 6F(6x,6E){l 2L=6E.7v("5e");C(l i=0;i<2L.v;i++){f(2L[i].6v.aP()=="6z"&&/ac\\.12$/.1X(2L[i].2e)){6x.35("<5e 6w=\\"2g/12\\" 6v=\\"6z\\" 2e=\\""+2L[i].2e+"\\"></5e>")}}}}},af:h(ag){c.18=h(){q p.R.1n.6B};c.2f=h(al,ak){l 2d=p.B.4R("","55",ah,ai,"75=0"),1J=2d.J;1J.35(p.R.1n.77);1J.54();2d.52()}}}},B:{5w:h(6Z){q 6Z+3I.a0(3I.9Y()*9W).2t()},5H:h(4V,4U){l 3g={},20;C(20 2a 4V){3g[20]=4V[20]}C(20 2a 4U){3g[20]=4U[20]}q 3g},5V:h(4T){6V(4T){2H"U":q U;2H"M":q M}q 4T},4R:h(3L,63,4W,4n,2G){l x=(79.1M-4W)/2,y=(79.2i-4n)/2;2G+=", D="+x+", 4S="+y+", 1M="+4W+", 2i="+4n;2G=2G.E(/^,/,"");l 51=1h.a2(3L,63,2G);51.52();q 51},7D:h(1L,23,1Z){f(1L.5X){1L["e"+23+1Z]=1Z;1L[23+1Z]=h(){1L["e"+23+1Z](1h.68)};1L.5X("a6"+23,1L[23+1Z])}F{1L.a3(23,1Z,M)}},1q:h(A){1q(p.R.1n.1q+A)},41:h(4Z,65){l 2y=p.1t.5j,3l=u;f(2y==u){2y={};C(l 4Y 2a p.2T){l 3k=p.2T[4Y].am;f(3k==u){1O}C(l i=0;i<3k.v;i++){2y[3k[i]]=4Y}}p.1t.5j=2y}3l=p.2T[2y[4Z]];f(3l==u&&65!=M){p.B.1q(p.R.1n.6t+4Z)}q 3l},4a:h(A,6m){l 2C=A.27("\\n");C(l i=0;i<2C.v;i++){2C[i]=6m(2C[i])}q 2C.5n("\\n")},7q:h(){l z=J.1w("z"),3m=J.1w("z"),6s=10,i=1;1S(i<=aE){f(i%6s===0){z.1x+=i;i+=(i+"").v}F{z.1x+="&aC;";i++}}3m.Z="5p 2R";3m.1K(z);q 3m},6D:h(A){q A.E(/^[ ]*[\\n]+|[\\n]*[ ]*$/g,"")},7H:h(A){l 3i,3V={},5i=Q O("^\\\\[(?<4f>(.*?))\\\\]$"),6k=Q O("(?<1d>[\\\\w-]+)"+"\\\\s*:\\\\s*"+"(?<1N>"+"[\\\\w-%#]+|"+"\\\\[.*?\\\\]|"+"\\".*?\\"|"+"\'.*?\'"+")\\\\s*;?","g");1S((3i=6k.N(A))!=u){l 2u=3i.1N.E(/^[\'"]|[\'"]$/g,"");f(2u!=u&&5i.1X(2u)){l m=5i.N(2u);2u=m.4f.v>0?m.4f.27(/\\s*,\\s*/):[]}3V[3i.1d]=2u}q 3V},6a:h(A,12){f(A==u||A.v==0||A=="\\n"){q A}A=A.E(/</g,"&1I;");A=A.E(/ {2,}/g,h(m){l 3U="";C(l i=0;i<m.v-1;i++){3U+="&1R;"}q 3U+" "});f(12!=u){A=p.B.4a(A,h(2s){f(2s.v==0){q""}l 3r="";2s=2s.E(/^(&1R;| )+/,h(s){3r=s;q""});f(2s.v==0){q 3r}q 3r+"<I 1b=\\""+12+"\\">"+2s+"</I>"})}q A},7P:h(6f,7a){l 2D=6f.2t();1S(2D.v<7a){2D="0"+2D}q 2D},5G:h(){l 36=J.1w("z"),3h,37=0,4i=J.2E,1j=p.B.5w("5G"),2F="<z 1b=\\"",2M="</z>",4h="</1Q>";36.1x=2F+"6u\\">"+2F+"28\\">"+2F+"2R\\">"+2F+"5u"+"\\"><1Q 1b=\\"7Q\\"><1Q 1j=\\""+1j+"\\">&1R;"+4h+4h+2M+2M+2M+2M;4i.1K(36);3h=J.aJ(1j);f(/aK/i.1X(80.83)){l 87=1h.aB(3h,u);37=7i(87.aA("1M"))}F{37=3h.as}4i.4j(36);q 37},72:h(7U,7T){l 1H="";C(l i=0;i<7T;i++){1H+=" "}q 7U.E(/\\t/g,1H)},6A:h(2N,4c){l ar=2N.27("\\n"),1H="\\t",47="";C(l i=0;i<50;i++){47+="                    "}h 8j(3e,17,88){q 3e.22(0,17)+47.22(0,88)+3e.22(17+1,3e.v)};2N=p.B.4a(2N,h(24){f(24.1e(1H)==-1){q 24}l 17=0;1S((17=24.1e(1H))!=-1){l 8g=4c-17%4c;24=8j(24,17,8g)}q 24});q 2N},3y:h(A){q(p.R.8h==U)?A.E(/<br\\s*\\/?>|&1I;br\\s*\\/?&2x;/4l,"\\n"):A},3O:h(A){q A.E(/\\s*$/g,"").E(/^\\s*/,"")},2z:h(A){l 29=p.B.3y(A).27("\\n"),az=Q 5A(),7X=/^\\s*/,25=ay;C(l i=0;i<29.v&&25>0;i++){l 43=29[i];f(p.B.3O(43).v==0){1O}l 44=7X.N(43);f(44==u){q A}25=3I.25(44[0].v,25)}f(25>0){C(l i=0;i<29.v;i++){29[i]=29[i].22(25)}}q 29.5n("\\n")},7K:h(2U,2V){f(2U.H<2V.H){q-1}F{f(2U.H>2V.H){q 1}F{f(2U.v<2V.v){q-1}F{f(2U.v>2V.v){q 1}}}}q 0},2Q:h(7l,2Y){h 7r(3X,7s){q[Q p.4m(3X[0],3X.H,7s.12)]};l av=0,4e=u,3M=[],7k=2Y.3R?2Y.3R:7r;1S((4e=2Y.3D.N(7l))!=u){3M=3M.2P(7k(4e,2Y))}q 3M},6d:h(7c){q 7c.E(p.7b.3L,h(m){q"<a 2e=\\""+m+"\\">"+m+"</a>"})}},1B:h(7G,46){h 7u(4g){l 49=[];C(l i=0;i<4g.v;i++){49.K(4g[i])}q 49};l 3J=46?[46]:7u(J.7v(p.R.7I)),7M="1x",2l=u;f(3J.v===0){q}C(l i=0;i<3J.v;i++){l 2B=3J[i],2b=p.B.7H(2B.Z),2W;2b=p.B.5H(7G,2b);2W=2b["7J"];f(2W==u){1O}f(2b["2c-2q"]=="U"){2l=Q p.4X(2W)}F{l 48=p.B.41(2W);f(48){2l=Q 48()}F{1O}}2l.1B(2B[7M],2b);l 2h=2l.z;f(p.R.7F){2h=J.1w("an");2h.1N=2l.z.1x;2h.1g.1M="a4";2h.1g.2i="a7"}2B.7x.a1(2h,2B)}},9Z:h(7B){p.B.7D(1h,"ae",h(){p.1B(7B)})}};p.4m=h(45,6i,12){c.1N=45;c.H=6i;c.v=45.v;c.12=12};p.4m.Y.2t=h(){q c.1N};p.4X=h(3S){l 1C=p.B.41(3S),3Q=Q p.2T.aO(),bn=u;f(1C==u){q}1C=Q 1C();c.5O=3Q;f(1C.3z==u){p.B.1q(p.R.1n.6b+3S);q}3Q.5s.K({3D:1C.3z.I,3R:66});h 3F(42,5Z){C(l j=0;j<42.v;j++){42[j].H+=5Z}};h 66(13,bA){l 6X=13.I,1D=[],3Y=1C.5s,6Q=13.H+13.D.v,2S=1C.3z,1o;C(l i=0;i<3Y.v;i++){1o=p.B.2Q(6X,3Y[i]);3F(1o,6Q);1D=1D.2P(1o)}f(2S.D!=u&&13.D!=u){1o=p.B.2Q(13.D,2S.D);3F(1o,13.H);1D=1D.2P(1o)}f(2S.19!=u&&13.19!=u){1o=p.B.2Q(13.19,2S.19);3F(1o,13.H+13[0].aV(13.19));1D=1D.2P(1o)}q 1D}};p.4X.Y.1B=h(6O,6R){c.5O.1B(6O,6R);c.z=c.5O.z};p.6U=h(){};p.6U.Y={T:h(64,69){l 5M=c.1y[64];q p.B.5V(5M==u?69:5M)},18:h(7j){q J.1w(7j)},7h:h(5N){C(l i=0;i<c.26.v;i++){l 2O=c.26[i];f(2O===u){1O}f((5N.H>2O.H)&&(5N.H<2O.H+2O.v)){q U}}q M},7y:h(3A,7L){l 2v=[];f(3A!=u){C(l i=0;i<3A.v;i++){2v=2v.2P(p.B.2Q(7L,3A[i]))}}2v=2v.aF(p.B.7K);q 2v},7w:h(){C(l i=0;i<c.26.v;i++){f(c.7h(c.26[i])){c.26[i]=u}}},7A:h(2X){l 3N=2X.27(/\\n/g),3x=7i(c.T("7f-2R")),7o=(3x+3N.v).2t().v,7O=c.T("1B",[]);2X="";C(l i=0;i<3N.v;i++){l 1v=3N[i],2r=/^(&1R;|\\s)+/.N(1v),5t="2R aw"+(i%2==0?1:2),8i=p.B.7P(3x+i,7o),8d=7O.1e((3x+i).2t())!=-1,1A=u;f(2r!=u){1A=2r[0].2t();1v=1v.22(1A.v);1A=1A.E(/&1R;/g," ");2r=p.1t.3w*1A.v}F{2r=0}1v=p.B.3O(1v);f(1v.v==0){1v="&1R;"}f(8d){5t+=" au"}2X+="<z 1b=\\""+5t+"\\">"+"<I 1b=\\"ap\\">"+8i+".</I>"+"<1Q 1b=\\"5u\\">"+(1A!=u?"<I 1b=\\"ao\\">"+1A.E(/\\s/g,"&1R;")+"</I>":"")+"<1Q 1b=\\"7Q\\" 1g=\\"5v-D: "+2r+"5q;\\">"+1v+"</1Q>"+"</1Q>"+"</z>"}q 2X},7z:h(5k,5l){l 17=0,3o="",3j=p.B.6a;C(l i=0;i<5l.v;i++){l 1z=5l[i];f(1z===u||1z.v===0){1O}3o+=3j(5k.22(17,1z.H-17),"6j")+3j(1z.1N,1z.12);17=1z.H+1z.v}3o+=3j(5k.22(17),"6j");q 3o},1B:h(1a,62){l aG=p.R,3v=p.1t,z,3d;c.1y={};c.z=u;c.28=u;c.I=u;c.2n=u;c.5o={};c.1j=p.B.5w("a5");3v.5F[c.1j]=c;f(1a===u){1a=""}f(3v.3w===u){3v.3w=p.B.5G()}c.1y=p.B.5H(p.61,62||{});f(c.T("6n")==U){c.1y.1u=c.1y.5z=M}c.z=z=c.18("39");c.28=c.18("39");c.28.Z="28";z.Z="6u";z.1j=c.1j;f(c.T("5E")){z.Z+=" 5D"}f(c.T("5z")==M){z.Z+=" a9"}z.Z+=" "+c.T("1b-1d");z.1g.aj=c.T("1W-1P","");c.5B=1a;c.I=p.B.6D(1a).E(/\\r/g," ");3d=c.T("1H-1P");c.I=c.T("85-6L")==U?p.B.6A(c.I,3d):p.B.72(c.I,3d);c.I=p.B.2z(c.I);f(c.T("1u")){c.2n=c.18("39");c.2n.Z="2n";c.2n.1K(p.1u.18(c));z.1K(c.2n)}f(c.T("5p")){z.1K(p.B.7q())}z.1K(c.28);c.26=c.7y(c.5s,c.I);c.7w();1a=c.7z(c.I,c.26);1a=c.7A(p.B.3O(1a));f(c.T("7R-6e")){1a=p.B.6d(1a)}c.28.1x=1a},8t:h(A){A=A.E(/^\\s+|\\s+$/g,"").E(/\\s+/g,"\\\\b|\\\\b");q"\\\\b"+A+"\\\\b"},8q:h(2A){c.3z={D:{3D:2A.D,12:"2q"},19:{3D:2A.19,12:"2q"},I:Q O("(?<D>"+2A.D.1c+")"+"(?<I>.*?)"+"(?<19>"+2A.19.1c+")","8y")}}};q p}()}f(!5A.1e){5A.Y.1e=h(73,3H){3H=3I.8D(3H||0,0);C(l i=3H;i<c.v;i++){f(c[i]==73){q i}}q-1}}f(!1h.O){(h(){l 2o={N:W.Y.N,6N:5C.Y.6N,E:5C.Y.E,27:5C.Y.27},1E={X:/(?:[^\\\\([#\\s.]+|\\\\(?!k<[\\w$]+>|[5U]{[^}]+})[\\S\\s]?|\\((?=\\?(?!#|<[\\w$]+>)))+|(\\()(?:\\?(?:(#)[^)]*\\)|<([$\\w]+)>))?|\\\\(?:k<([\\w$]+)>|[5U]{([^}]+)})|(\\[\\^?)|([\\S\\s])/g,9z:/(?:[^$]+|\\$(?![1-9$&`\']|{[$\\w]+}))+|\\$(?:([1-9]\\d*|[$&`\'])|{([$\\w]+)})/g,3b:/^(?:\\s+|#.*)+/,5I:/^(?:[?*+]|{\\d+(?:,\\d*)?})/,6S:/&&\\[\\^?/g,6K:/]/g},5W=h(5x,5P,60){C(l i=60||0;i<5x.v;i++){f(5x[i]===5P){q i}}q-1},7t=/()??/.N("")[1]!==33,3t={};O=h(1f,21){f(1f 4k W){f(21!==33){32 7n("4d\'t 4b 8B 82 8m 7p W 8G 8A")}q 1f.3B()}l 21=21||"",78=21.1e("s")>-1,76=21.1e("x")>-1,5m=M,3n=[],15=[],X=1E.X,G,34,3s,3P,3q;X.L=0;1S(G=2o.N.2p(X,1f)){f(G[2]){f(!1E.5I.1X(1f.14(X.L))){15.K("(?:)")}}F{f(G[1]){3n.K(G[3]||u);f(G[3]){5m=U}15.K("(")}F{f(G[4]){3P=5W(3n,G[4]);15.K(3P>-1?"\\\\"+(3P+1)+(5r(1f.5y(X.L))?"":"(?:)"):G[0])}F{f(G[5]){15.K(3t.7g?3t.7g.5Q(G[5],G[0].5y(1)==="P"):G[0])}F{f(G[6]){f(1f.5y(X.L)==="]"){15.K(G[6]==="["?"(?!)":"[\\\\S\\\\s]");X.L++}F{34=O.7Y("&&"+1f.14(G.H),1E.6S,1E.6K,"",{8a:"\\\\"})[0];15.K(G[6]+34+"]");X.L+=34.v+1}}F{f(G[7]){f(78&&G[7]==="."){15.K("[\\\\S\\\\s]")}F{f(76&&1E.3b.1X(G[7])){3s=2o.N.2p(1E.3b,1f.14(X.L-1))[0].v;f(!1E.5I.1X(1f.14(X.L-1+3s))){15.K("(?:)")}X.L+=3s-1}F{15.K(G[7])}}}F{15.K(G[0])}}}}}}}3q=W(15.5n(""),2o.E.2p(21,/[aD]+/g,""));3q.1r={1c:1f,2m:5m?3n:u};q 3q};O.aH=h(1d,o){3t[1d]=o};W.Y.N=h(A){l 1i=2o.N.2p(c,A),1d,i,5K;f(1i){f(7t&&1i.v>1){5K=Q W("^"+c.1c+"$(?!\\\\s)",c.5J());2o.E.2p(1i[0],5K,h(){C(i=1;i<7S.v-2;i++){f(7S[i]===33){1i[i]=33}}})}f(c.1r&&c.1r.2m){C(i=1;i<1i.v;i++){1d=c.1r.2m[i-1];f(1d){1i[1d]=1i[i]}}}f(c.3K&&c.L>(1i.H+1i[0].v)){c.L--}}q 1i}})()}W.Y.5J=h(){q(c.3K?"g":"")+(c.aq?"i":"")+(c.6h?"m":"")+(c.3b?"x":"")+(c.aI?"y":"")};W.Y.3B=h(7E){l 5L=Q O(c.1c,(7E||"")+c.5J());f(c.1r){5L.1r={1c:c.1r.1c,2m:c.1r.2m?c.1r.2m.14(0):u}}q 5L};W.Y.2p=h(bG,A){q c.N(A)};W.Y.bH=h(bp,6I){q c.N(6I[0])};O.3W=h(3Z,3T){l 40="/"+3Z+"/"+(3T||"");q O.3W[40]||(O.3W[40]=Q O(3Z,3T))};O.3u=h(A){q A.E(/[-[\\]{}()*+?.\\\\^$|,#\\s]/g,"\\\\$&")};O.7Y=h(A,D,V,1k,31){l 31=31||{},2Z=31.8a,11=31.9X,1k=1k||"",4I=1k.1e("g")>-1,5S=1k.1e("i")>-1,7m=1k.1e("m")>-1,4E=1k.1e("y")>-1,1k=1k.E(/y/g,""),D=D 4k W?(D.3K?D:D.3B("g")):Q O(D,"g"+1k),V=V 4k W?(V.3K?V:V.3B("g")):Q O(V,"g"+1k),1F=[],2w=0,1l=0,1m=0,1p=0,1T,1Y,1s,1G,3p,53;f(2Z){f(2Z.v>1){32 at("4d\'t 4b ad ax 7p 3u 8b")}f(7m){32 7n("4d\'t 4b 3u 8b 82 aL aM 6h aN")}3p=O.3u(2Z);53=Q W("^(?:"+3p+"[\\\\S\\\\s]|(?:(?!"+D.1c+"|"+V.1c+")[^"+3p+"])+)+",5S?"i":"")}1S(U){D.L=V.L=1m+(2Z?(53.N(A.14(1m))||[""])[0].v:0);1s=D.N(A);1G=V.N(A);f(1s&&1G){f(1s.H<=1G.H){1G=u}F{1s=u}}f(1s||1G){1l=(1s||1G).H;1m=(1s?D:V).L}F{f(!2w){30}}f(4E&&!2w&&1l>1p){30}f(1s){f(!2w++){1T=1l;1Y=1m}}F{f(1G&&2w){f(!--2w){f(11){f(11[0]&&1T>1p){1F.K([11[0],A.14(1p,1T),1p,1T])}f(11[1]){1F.K([11[1],A.14(1T,1Y),1T,1Y])}f(11[2]){1F.K([11[2],A.14(1Y,1l),1Y,1l])}f(11[3]){1F.K([11[3],A.14(1l,1m),1l,1m])}}F{1F.K(A.14(1Y,1l))}1p=1m;f(!4I){30}}}F{D.L=V.L=0;32 ab("aa aY bz b1 bb")}}f(1l===1m){1m++}}f(4I&&!4E&&11&&11[0]&&A.v>1p){1F.K([11[0],A.14(1p),1p,A.v])}D.L=V.L=0;q 1F};',62,726,'||||||||||||this|||if||function||||var||||sh|return||||null|length||||div|str|utils|for|left|replace|else|_109|index|code|document|push|lastIndex|false|exec|XRegExp||new|config||getParam|true|_121|RegExp|part|prototype|className||vN|css|_c3|slice|_107||pos|create|right|_ed|class|source|name|indexOf|_101|style|window|_111|id|_122|_12c|_12d|strings|_ca|_12e|alert|_x|_131|vars|toolbar|_e0|createElement|innerHTML|params|_ec|_e5|highlight|_bd|_c6|lib|_12a|_132|tab|lt|doc|appendChild|obj|width|value|continue|size|span|nbsp|while|_12f|_3c|_8|font|test|_130|_57|_4b|_102|substr|_56|_91|min|matches|split|lines|_97|in|_b4|html|wnd|href|execute|text|_b7|height|http|attributes|_b1|captureNames|bar|_f8|call|script|_e1|_75|toString|_6e|_d7|_12b|gt|_5b|unindent|_f4|_b3|_62|_7a|body|_80|_51|case|SyntaxHighlighter|_5|_28|_40|_81|_88|_d4|concat|getMatches|line|_c9|brushes|m1|m2|_b5|_da|_a1|_124|break|_123|throw|undefined|cc|write|_7b|_7d|print|DIV|_32|extended|_25|_f2|_8e|printFrame|_4a|_7c|_6a|_ea|_5e|_5c|_65|_106|_e9|_133|_10d|_76|len|_100|escape|_f0|spaceWidth|_dc|fixForBlogger|htmlScript|_d5|addFlags|_22|regex|_3|offsetMatches|_2|_f6|Math|_af|global|url|_a6|_db|trim|_10c|_be|func|_bc|_11c|_73|_6b|cache|_a2|_c7|_11b|key|findBrush|_c0|_9c|_9d|_b9|_ab|_8c|_b6|_ad|eachLine|supply|_89|can|_a5|values|_ac|_82|_7e|removeChild|instanceof|gi|Match|_50|viewSource|pre|_1a|_19|_18|expandSource|_29|_2b|_2d|toolbarItemWidth|_2e|_2c|_2a|_17|_10|_7|_129|_4|gm|color|_126|_e|_f|_d|_9|_b|title|toolbarItemHeight|highlighterId|popup|top|_4c|_49|_48|_4f|HtmlScript|_5d|_59||win|focus|esc|close|_blank|_2f|_30|com|clipboardSwf|_27|swf|_24|contentWindow|link|_38|_35|_37|_6c|discoveredBrushes|_e6|_e7|_105|join|toolbarCommands|ruler|px|isNaN|regexList|_e2|content|margin|guid|_fb|charAt|gutter|Array|originalCode|String|collapsed|collapse|highlighters|measureSpace|merge|quantifier|getNativeFlags|r2|_116|_d0|_d2|xmlBrush|_fc|get|object|_127|version|pP|toBoolean|_fa|attachEvent|serif|_c1|_fd|defaults|_ee|_4e|_ce|_5a|process|copyToClipboard|event|_cf|decorate|brushNotHtmlScript|shockwave|processUrls|links|_78|Times|multiline|_ba|plain|_6d|family|_61|light|flash|center|commandName|align|_66|noBrush|syntaxhighlighter|rel|type|_3e|copyToClipboardConfirmation|stylesheet|processSmartTabs|help|2009|trimFirstAndLastLines|_3f|copyStyles|500px|0px|args|_6|classRight|tabs|message|match|_cc|clipboardData|_c8|_cd|classLeft|createButton|Highlighter|switch|executeCommand|_c5|_a|_47|location|_36|processTabs|_f5|alexgorbatchev|scrollbars|_104|aboutDialog|_103|screen|_79|regexLib|_a8|DTD|xhtml1|first|unicode|isMatchNested|parseInt|_d1|_a7|_a0|_128|TypeError|_dd|one|createRuler|defaultAdd|_a3|_ff|toArray|getElementsByTagName|removeNestedMatches|parentNode|findMatches|processMatches|createDisplayLines|_b8|clipboard|addEvent|_115|debug|_aa|parseParams|tagName|brush|matchesSortCallback|_d6|_b0|_1e|_de|padNumber|block|auto|arguments|_85|_84|items|_16|_99|matchRecursive|_12|navigator|_14|when|userAgent|head|smart|_15|_83|_90|_13|escapeChar|character|org|_e4|www|w3|_93|bloggerMode|_e3|insertSpaces|try|catch|constructing|resizable|_1f|onclick|forHtmlScript|aspScriptTags|scriptScriptTags|getKeywords|menubar|400|_1c|_21|sgi|item|another|flags|_1b|max|_20|750|from|string|typeof|Helvetica|xmlns|1999|xhtml|dtd|transitional|Transitional|EN|TR|meta|equiv|About|Georgia|New|utf|charset|Content|Type|XHTML|W3C|The|is|your|to|copy|expand|view|now|Can|option|DOCTYPE|PUBLIC|configured|wasn|find|Brush|Roman|background|Copyright|2004|Alex|highlighter|syntax|decoration|none|JavaScript|Gorbatchev|multiLineCComments|singleQuotedString|multiLineDoubleQuotedString|multiLineSingleQuotedString|doubleQuotedString|replaceVar|singleLineCComments|singleLinePerlComments|0099FF|target|Geneva|Arial|_26|3em|1em|fff|000|sans|xx|287|February|06|4em|bottom|large|75em|phpScriptTags|_3b|1000000|valueNames|random|all|round|replaceChild|open|addEventListener|70em|highlighter_|on|30em|protocol|nogutter|subject|Error|shCore|more|load|about|_42|500|250|fontSize|_44|_43|aliases|textarea|spaces|number|ignoreCase|_8a|offsetWidth|SyntaxError|highlighted|_a4|alt|than|1000|_98|getPropertyValue|getComputedStyle|middot|sx|150|sort|_ef|addPlugin|sticky|getElementById|opera|using|the|flag|Xml|toLowerCase|96b8|444553540000|11cf|ae6d|d27cdb6e|lastIndexOf|codebase|pub|data|macromedia|download|unbalanced|clsid|classid|application|allowScriptAccess|_clipboard|param|file|always|wmode|delimiters|msie|menu|flashVars|transparent|swflash|cabs|printSource|_39|error|ok|cab|_bf|_3a|_119|absolute||printing|position|cssText|IFRAME|amp|setData|command|contains|_c4|embed|src|movie|_33|_34|_117|apply'.split('|'),0,{}))
diff --git a/modules/editor/components/code_highlighter/style/SyntaxHighlighter.css b/modules/editor/components/code_highlighter/style/SyntaxHighlighter.css
new file mode 100644
index 000000000..753510002
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/SyntaxHighlighter.css
@@ -0,0 +1,310 @@
+.dp-highlighter
+{
+	font-family: "Consolas", "Courier New", "Courier", "mono", "serif";
+	font-size: 12px;
+	background-color: #E7E5DC;
+	width: 99%;
+	overflow: auto;
+	padding-top: 1px; /* adds a little border on top when controls are hidden */
+}
+
+/* clear styles */
+.dp-highlighter ol,
+.dp-highlighter ol li,
+.dp-highlighter ol li span
+{
+	margin: 0;
+	padding: 0;
+	border: none;
+}
+
+.dp-highlighter a,
+.dp-highlighter a:hover
+{
+	background: none;
+	border: none;
+	padding: 0;
+	margin: 0;
+}
+
+.dp-highlighter .bar
+{
+	padding-left: 45px;
+}
+
+.dp-highlighter.collapsed .bar,
+.dp-highlighter.nogutter .bar
+{
+	padding-left: 0px;
+}
+
+.dp-highlighter ol
+{
+	list-style: decimal; /* for ie */
+	background-color: #fff;
+	margin: 0px 0px 1px 45px !important; /* 1px bottom margin seems to fix occasional Firefox scrolling */
+	padding: 0px;
+	color: #5C5C5C;
+}
+
+.dp-highlighter.nogutter ol,
+.dp-highlighter.nogutter ol li
+{
+	list-style: none !important;
+	margin-left: 0px !important;
+}
+
+.dp-highlighter ol li,
+.dp-highlighter .columns div
+{
+	list-style: decimal; /* better look for others, override cascade from OL */
+	list-style-position: outside !important;
+	background-color: #F8F8F8;
+	color: #5C5C5C;
+	padding: 0 3px 0 10px !important;
+	margin: 0 !important;
+	line-height: 14px;
+}
+
+.dp-highlighter.nogutter ol li,
+.dp-highlighter.nogutter .columns div
+{
+	border: 0;
+}
+
+.dp-highlighter .columns
+{
+	background-color: #F8F8F8;
+	color: gray;
+	overflow: hidden;
+	width: 100%;
+}
+
+.dp-highlighter .columns div
+{
+	padding-bottom: 5px;
+}
+
+.dp-highlighter ol li.alt
+{
+	background-color: #FFF;
+	color: inherit;
+}
+
+.dp-highlighter ol li span
+{
+	color: black;
+	background-color: inherit;
+}
+
+/* Adjust some properties when collapsed */
+
+.dp-highlighter.collapsed ol
+{
+	margin: 0px;
+}
+
+.dp-highlighter.collapsed ol li
+{
+	display: none;
+}
+
+/* Additional modifications when in print-view */
+
+.dp-highlighter.printing
+{
+	border: none;
+}
+
+.dp-highlighter.printing .tools
+{
+	display: none !important;
+}
+
+.dp-highlighter.printing li
+{
+	display: list-item !important;
+}
+
+/* Styles for the tools */
+
+.dp-highlighter .tools
+{
+	padding: 3px 8px 3px 10px;
+	font: 9px Verdana, Geneva, Arial, Helvetica, sans-serif;
+	color: silver;
+	background-color: #f8f8f8;
+	padding-bottom: 10px;
+}
+
+.dp-highlighter.nogutter .tools
+{
+	border-left: 0;
+}
+
+.dp-highlighter.collapsed .tools
+{
+	border-bottom: 0;
+}
+
+.dp-highlighter .tools a
+{
+	font-size: 9px;
+	color: #a0a0a0;
+	background-color: inherit;
+	text-decoration: none;
+	margin-right: 10px;
+}
+
+.dp-highlighter .tools a:hover
+{
+	color: red;
+	background-color: inherit;
+	text-decoration: underline;
+}
+
+/* About dialog styles */
+
+.dp-about { background-color: #fff; color: #333; margin: 0px; padding: 0px; }
+.dp-about table { width: 100%; height: 100%; font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; }
+.dp-about td { padding: 10px; vertical-align: top; }
+.dp-about .copy { border-bottom: 1px solid #ACA899; height: 95%; }
+.dp-about .title { color: red; background-color: inherit; font-weight: bold; }
+.dp-about .para { margin: 0 0 4px 0; }
+.dp-about .footer { background-color: #ECEADB; color: #333; border-top: 1px solid #fff; text-align: right; }
+.dp-about .close { font-size: 11px; font-family: Tahoma, Verdana, Arial, sans-serif !important; background-color: #ECEADB; color: #333; width: 60px; height: 22px; }
+
+/* Language specific styles */
+
+.dp-highlighter .comment,
+.dp-highlighter .comments { color: #008200; background-color: inherit; }
+.dp-highlighter .string { color: #FF00FF; background-color: inherit; }
+.dp-highlighter .keyword { color: #0000FF; background-color: inherit; }
+.dp-highlighter .preprocessor { color: gray; background-color: inherit; }
+.dp-highlighter .func { color: #FF0000; }
+.dp-highlighter .vars { color: #008080; }
+
+
+/* Language specific styles */
+
+.dp-c {}
+.dp-c .comment { color: green; }
+.dp-c .string { color: blue; }
+.dp-c .preprocessor { color: gray; }
+.dp-c .keyword { color: blue; }
+.dp-c .vars { color: #d00; }
+
+.dp-vb {}
+.dp-vb .comment { color: green; }
+.dp-vb .string { color: blue; }
+.dp-vb .preprocessor { color: gray; }
+.dp-vb .keyword { color: blue; }
+
+.dp-sql {}
+.dp-sql .comment { color: green; }
+.dp-sql .string { color: red; }
+.dp-sql .keyword { color: blue; }
+.dp-sql .func { color: #ff1493; }
+.dp-sql .op { color: #808080; }
+
+.dp-xml {}
+.dp-xml .cdata { color: #ff1493; }
+.dp-xml .comments { color: green; }
+.dp-xml .tag { margin: 0; padding: 0; background: none; font-weight: bold; color: blue; }
+.dp-xml .tag-name { color: black; font-weight: bold; }
+.dp-xml .attribute { color: red; }
+.dp-xml .attribute-value { color: blue; }
+
+.dp-delphi {}
+.dp-delphi .comment { color: #008200; font-style: italic; }
+.dp-delphi .string { color: blue; }
+.dp-delphi .number { color: blue; }
+.dp-delphi .directive { color: #008284; }
+.dp-delphi .keyword { font-weight: bold; color: navy; }
+.dp-delphi .vars { color: #000; }
+
+.dp-py {}
+.dp-py .comment { color: green; }
+.dp-py .string { color: red; }
+.dp-py .docstring { color: green; }
+.dp-py .keyword { color: blue; font-weight: bold;}
+.dp-py .builtins { color: #ff1493; }
+.dp-py .magicmethods { color: #808080; }
+.dp-py .exceptions { color: brown; }
+.dp-py .types { color: brown; font-style: italic; }
+.dp-py .commonlibs { color: #8A2BE2; font-style: italic; }
+
+.dp-rb {}
+.dp-rb .comment { color: #c00; }
+.dp-rb .string  { color: #f0c; }
+.dp-rb .symbol  { color: #02b902; }
+.dp-rb .keyword { color: #069; }
+.dp-rb .variable { color: #6cf; }
+
+.dp-css {}
+.dp-css .comment { color: green; }
+.dp-css .string { color: red; }
+.dp-css .value { color: red; }
+.dp-css .keyword { color: blue; }
+.dp-css .colors { color: darkred; }
+.dp-css .vars { color: #d00; }
+
+.dp-j {}
+.dp-j .comment { color: rgb(63,127,95); }
+.dp-j .string { color: rgb(42,0,255); }
+.dp-j .keyword { color: rgb(127,0,85); font-weight: bold }
+.dp-j .annotation { color: #646464; }
+.dp-j .number { color: #C00000; }
+
+.dp-cpp {}
+.dp-cpp .comment { color: #e00; }
+.dp-cpp .string { color: red; }
+.dp-cpp .preprocessor { color: #CD00CD; font-weight: bold; }
+.dp-cpp .keyword { color: #5697D9; font-weight: bold; }
+.dp-cpp .datatypes { color: #2E8B57; font-weight: bold; }
+
+.dp-php { color: #800000; }
+.dp-php .comment { color: #008000; }
+.dp-php .keyword { color: #4B00FB; }
+.dp-php .string { color: #FB00FB; }
+.dp-php .func { color: #FF0000; }
+.dp-php .vars { color: #008080; }
+.dp-php .zbxe_funcs { color: #FF6820; }
+.dp-php .zbxe_class { color: #FF6820; font-weight: bold; }
+
+
+.dp-abap { color: #800000; }
+.dp-abap .comment { color: #008000; }
+.dp-abap .keyword { color: #4B00FB; }
+.dp-abap .string { color: #FB00FB; }
+.dp-abap .datatypes { color: #2E8B57; font-weight: bold; }
+
+
+pre[name='code'] {
+    max-height: 300px;
+    font-size: 1.1em;
+    border: #666666 dotted 1px;
+    border-left: #22AAEE solid 5px;
+    padding: 5px;
+    overflow: auto;
+}
+
+
+.ch_infobox {
+    padding: 5px 0;
+    width: 99%;
+    background-color: #F8F8F8;
+    border-top: 1px solid #E7E5DC;
+}
+
+.ch_infobox .file_path {
+    font-size: 0.9em;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+.ch_infobox .description {
+    color: #AAA;
+    font-size: 0.9em;
+    margin-left: 10px;
+}
\ No newline at end of file
diff --git a/modules/editor/components/code_highlighter/style/help.png b/modules/editor/components/code_highlighter/style/help.png
new file mode 100644
index 000000000..5c870176d
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/help.png differ
diff --git a/modules/editor/components/code_highlighter/style/magnifier.png b/modules/editor/components/code_highlighter/style/magnifier.png
new file mode 100644
index 000000000..cf3d97f75
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/magnifier.png differ
diff --git a/modules/editor/components/code_highlighter/style/page_white_code.png b/modules/editor/components/code_highlighter/style/page_white_code.png
new file mode 100644
index 000000000..0c76bd129
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/page_white_code.png differ
diff --git a/modules/editor/components/code_highlighter/style/page_white_copy.png b/modules/editor/components/code_highlighter/style/page_white_copy.png
new file mode 100644
index 000000000..a9f31a278
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/page_white_copy.png differ
diff --git a/modules/editor/components/code_highlighter/style/printer.png b/modules/editor/components/code_highlighter/style/printer.png
new file mode 100644
index 000000000..a350d1871
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/printer.png differ
diff --git a/modules/editor/components/code_highlighter/style/shCore.css b/modules/editor/components/code_highlighter/style/shCore.css
new file mode 100644
index 000000000..74156dd24
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shCore.css
@@ -0,0 +1,344 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+.syntaxhighlighter,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter span,
+.syntaxhighlighter .bold,
+.syntaxhighlighter .italic,
+.syntaxhighlighter .line,
+.syntaxhighlighter .line .number,
+.syntaxhighlighter .line .content,
+.syntaxhighlighter .line .content .block,
+.syntaxhighlighter .line .content .spaces,
+.syntaxhighlighter .bar,
+.syntaxhighlighter .ruler,
+.syntaxhighlighter .toolbar,
+.syntaxhighlighter .toolbar a,
+.syntaxhighlighter .toolbar a:hover
+{
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	background: none;
+	text-align: left;
+	float: none;
+	vertical-align: baseline;
+	position: static;
+	left: auto;
+	top: auto;
+	right: auto;
+	bottom: auto;
+	height: auto;
+	width: auto;
+	line-height: normal;
+	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	font-weight: normal;
+	font-style: normal;
+	font-size: 100%;
+}
+
+.syntaxhighlighter
+{
+	width: 100%;
+	margin: 1em 0 1em 0;
+	padding: 1px; /* adds a little border on top and bottom */
+	position: relative;
+}
+
+.syntaxhighlighter .bold {
+	font-weight: bold;
+}
+
+.syntaxhighlighter .italic {
+	font-style: italic;
+}
+
+.syntaxhighlighter .line .number
+{
+	float: left; 
+	width: 3em; 
+	padding-right: .3em;
+	text-align: right;
+	display: block;
+}
+
+/* Disable numbers when no gutter option is set */
+.syntaxhighlighter.nogutter .line .number
+{
+	display: none;
+}
+
+.syntaxhighlighter .line .content
+{
+	margin-left: 3.3em; 
+	padding-left: .5em;
+	display: block;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	display: block;
+	padding-left: 1.5em;
+	text-indent: -1.5em;
+}
+
+.syntaxhighlighter .line .content .spaces
+{
+	display: none;
+}
+
+/* Disable border and margin on the lines when no gutter option is set */
+.syntaxhighlighter.nogutter .line .content
+{
+	margin-left: 0; 
+	border-left: none;
+}
+
+.syntaxhighlighter .bar
+{
+}
+
+.syntaxhighlighter.collapsed .bar
+{
+
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	margin-left: 0;
+	padding-left: 0;
+}
+
+.syntaxhighlighter .ruler
+{
+	padding: 0 0 .5em .5em;
+	margin-left: 3.3em;
+	overflow: hidden;
+}
+
+/* Adjust some properties when collapsed */
+
+.syntaxhighlighter.collapsed .lines,
+.syntaxhighlighter.collapsed .ruler
+{
+	display: none;
+}
+
+/* Styles for the toolbar */
+
+.syntaxhighlighter .toolbar
+{
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	font-size: 1px;
+	padding: 8px 8px 8px 0; /* in px because images don't scale with ems */
+}
+
+.syntaxhighlighter.collapsed .toolbar
+{
+	font-size: 80%;
+	padding: .2em 0 .5em .5em;
+	position: static;
+}
+
+.syntaxhighlighter .toolbar a.item,
+.syntaxhighlighter .toolbar .item
+{
+	display: block;
+	float: left;
+	margin-left: 8px;
+	background-repeat: no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
+}
+
+.syntaxhighlighter.collapsed .toolbar .item
+{
+	display: none;
+}
+
+.syntaxhighlighter.collapsed .toolbar .item.expandSource
+{
+	background-image: url(magnifier.png);
+	display: inline;
+	text-indent: 0;
+	width: auto;
+	float: none;
+	height: 16px;
+	padding-left: 20px;
+}
+
+.syntaxhighlighter .toolbar .item.viewSource
+{
+	background-image: url(page_white_code.png);
+}
+
+.syntaxhighlighter .toolbar .item.printSource
+{
+	background-image: url(printer.png);
+}
+
+.syntaxhighlighter .toolbar .item.copyToClipboard
+{
+	text-indent: 0;
+	background: none;
+	overflow: visible;
+}
+
+.syntaxhighlighter .toolbar .item.about
+{
+	background-image: url(help.png);
+}
+
+/** 
+ * Print view.
+ * Colors are based on the default theme without background.
+ */
+
+.syntaxhighlighter.printing,
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content,
+.syntaxhighlighter.printing .line .content .block
+{
+	background: none;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter.printing .line .number
+{
+	color: #bbb;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter.printing .line .content
+{
+	color: #000;
+}
+
+/* Toolbar when visible */
+.syntaxhighlighter.printing .toolbar,
+.syntaxhighlighter.printing .ruler
+{
+	display: none;
+}
+
+.syntaxhighlighter.printing a
+{
+	text-decoration: none;
+}
+
+.syntaxhighlighter.printing .plain,
+.syntaxhighlighter.printing .plain a
+{ 
+	color: #000;
+}
+
+.syntaxhighlighter.printing .comments,
+.syntaxhighlighter.printing .comments a
+{ 
+	color: #008200;
+}
+
+.syntaxhighlighter.printing .string,
+.syntaxhighlighter.printing .string a
+{
+	color: blue; 
+}
+
+.syntaxhighlighter.printing .keyword
+{ 
+	color: #069; 
+	font-weight: bold; 
+}
+
+.syntaxhighlighter.printing .preprocessor 
+{ 
+	color: gray; 
+}
+
+.syntaxhighlighter.printing .variable 
+{ 
+	color: #a70; 
+}
+
+.syntaxhighlighter.printing .value
+{ 
+	color: #090; 
+}
+
+.syntaxhighlighter.printing .functions
+{ 
+	color: #ff1493; 
+}
+
+.syntaxhighlighter.printing .constants
+{ 
+	color: #0066CC; 
+}
+
+.syntaxhighlighter.printing .script
+{
+	font-weight: bold;
+}
+
+.syntaxhighlighter.printing .color1,
+.syntaxhighlighter.printing .color1 a
+{ 
+	color: #808080; 
+}
+
+.syntaxhighlighter.printing .color2,
+.syntaxhighlighter.printing .color2 a
+{ 
+	color: #ff1493; 
+}
+
+.syntaxhighlighter.printing .color3,
+.syntaxhighlighter.printing .color3 a
+{ 
+	color: red; 
+}
+
+.ch_infobox {
+    padding: 5px 0;
+    width: 99%;
+    background-color: #F8F8F8;
+    border-top: 1px solid #E7E5DC;
+}
+
+.ch_infobox .file_path {
+    font-size: 0.9em;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+.ch_infobox .description {
+    color: #AAA;
+    font-size: 0.9em;
+    margin-left: 10px;
+}
\ No newline at end of file
diff --git a/modules/editor/components/code_highlighter/style/shThemeDefault.css b/modules/editor/components/code_highlighter/style/shThemeDefault.css
new file mode 100644
index 000000000..2068d2c85
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeDefault.css
@@ -0,0 +1,183 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/************************************
+ * Default Syntax Highlighter theme.
+ * 
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #E7E5DC;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #6CE26C;
+	color: black;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted.alt1 .content,
+.syntaxhighlighter .line.highlighted.alt2 .content
+{
+	background-color: #6CE26C;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #5C5C5C;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #6CE26C;
+	color: #000;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+	background-color: #fff;
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #F8F8F8;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: silver;
+	background-color: #F8F8F8;
+	border-left: 3px solid #6CE26C;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #F8F8F8;
+	border: #E7E5DC solid 1px;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #a0a0a0;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: red;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #000;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #008200;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: blue; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #069; 
+	font-weight: bold; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: gray; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #a70; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #090; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #ff1493; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #0066CC; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: yellow !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #808080; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #ff1493; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: red; 
+}
diff --git a/modules/editor/components/code_highlighter/style/shThemeDjango.css b/modules/editor/components/code_highlighter/style/shThemeDjango.css
new file mode 100644
index 000000000..def5797e7
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeDjango.css
@@ -0,0 +1,184 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/**
+ * Django SyntaxHighlighter theme
+ */
+
+/************************************
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #0B2F20;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #336442;
+	color: #fff;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted .content
+{
+	background-color: #336442 !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #497958;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #41A83E;
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #0a2b1d;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: #C4B14A;
+	background-color: #245032;
+	border-left: 3px solid #41A83E;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #245032;
+	border: #0B2F20 solid 1px;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #C4B14A;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: #FFE862;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{
+	color: #F8F8F8;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #336442;
+	font-style: italic;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: #9DF39F; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #96DD3B; 
+	font-weight: bold !important;
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: #91BB9E; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #F7E741; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #E0E8FF; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: #497958 !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #EB939A; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #91BB9E; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: #EDEF7D; 
+}
diff --git a/modules/editor/components/code_highlighter/style/shThemeEmacs.css b/modules/editor/components/code_highlighter/style/shThemeEmacs.css
new file mode 100644
index 000000000..91a5c7697
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeEmacs.css
@@ -0,0 +1,183 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/**
+ * Emacs SyntaxHighlighter theme based on theme by Joshua Emmons
+ * http://www.skia.net/
+ */
+
+/************************************
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #000000;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #435A5F;
+	color: #fff;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted .content
+{
+	background-color: #435A5F !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #D3D3D3;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #990000;
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #0f0f0f;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: silver;
+	background-color: #000000;
+	border-left: 3px solid #990000;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #000000;
+	border: #000000 solid 1px;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #646763;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: #9CCFF4;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #D3D3D3;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #FF7D27;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: #FF9E7B; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #00FFFF; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: #AEC4DE; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #090; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #81CEF9; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #FF9E7B; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: #990000 !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #EBDB8D; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #FF7D27; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: #AEC4DE; 
+}
diff --git a/modules/editor/components/code_highlighter/style/shThemeFadeToGrey.css b/modules/editor/components/code_highlighter/style/shThemeFadeToGrey.css
new file mode 100644
index 000000000..8f7160967
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeFadeToGrey.css
@@ -0,0 +1,184 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/**
+ * Fade to Grey SyntaxHighlighter theme based on theme by Brasten Sager
+ * http://www.ibrasten.com/
+ */
+
+/************************************
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #121212;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #3A3A00;
+	color: #fff;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted .content
+{
+	background-color: #3A3A00 !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #C3C3C3;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #3185B9;
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #000000;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: silver;
+	border-left: 3px solid #3185B9;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #000000;
+	border: #000000 solid 1px;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #808080;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: #96DAFF;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #FFFFFF;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #696854;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: #E3E658; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #D01D33; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: #435A5F; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #898989; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #090; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #AAAAAA;
+	font-weight: bold !important;
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #96DAFF; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: #C3C3C3 !important;
+	color: #000;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #FFC074; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #4A8CDB; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: #96DAFF; 
+}
diff --git a/modules/editor/components/code_highlighter/style/shThemeMidnight.css b/modules/editor/components/code_highlighter/style/shThemeMidnight.css
new file mode 100644
index 000000000..8171ca3e8
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeMidnight.css
@@ -0,0 +1,183 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/**
+ * Midnight SyntaxHighlighter theme based on theme by J.D. Myers
+ * http://webdesign.lsnjd.com/
+ */
+
+/************************************
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #0F192A;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #253E5A;
+	color: #fff;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted .content
+{
+	background-color: #253E5A !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #38566F;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #435A5F;
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+	background-color: #0F192A;
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #0F192A;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: #38566F;
+	background-color: #0F192A;
+	border-left: 3px solid #435A5F;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #0F192A;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #38566F;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: #8AA6C1;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #D1EDFF;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #428BDD;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: #1DC116; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #B43D3D; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: #8AA6C1; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #F7E741; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #E0E8FF; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: #404040 !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #F8BB00; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #FFFFFF; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: #FFAA3E; 
+}
diff --git a/modules/editor/components/code_highlighter/style/shThemeRDark.css b/modules/editor/components/code_highlighter/style/shThemeRDark.css
new file mode 100644
index 000000000..a390c2a68
--- /dev/null
+++ b/modules/editor/components/code_highlighter/style/shThemeRDark.css
@@ -0,0 +1,183 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * @version
+ * 2.0.287 (February 06 2009)
+ *
+ * @author
+ * Alex Gorbatchev
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * Licensed under a GNU Lesser General Public License.
+ * http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ * SyntaxHighlighter is donationware. You are allowed to download, modify and distribute 
+ * the source code in accordance with LGPL 2.1 license, however if you want to use 
+ * SyntaxHighlighter on your site or include it in your product, you must donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ */
+/**
+ * RDark SyntaxHighlighter theme based on theme by Radu Dineiu
+ * http://www.vim.org/scripts/script.php?script_id=1732
+ */
+
+/************************************
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	background-color: #1B2426;
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	background-color: #435A5F;
+	color: #fff;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted .content
+{
+	background-color: #435A5F !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #B9BDB6;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: 3px solid #435A5F;
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1 .content
+{
+	background-color: #1B2426;
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2 .content
+{
+	background-color: #1B2426;
+}
+
+.syntaxhighlighter .line .content .block
+{
+	background: url(wrapping.png) 0 1.1em no-repeat;
+}
+
+.syntaxhighlighter .ruler
+{
+	color: silver;
+	background-color: #1B2426;
+	border-left: 3px solid #435A5F;
+}
+
+.syntaxhighlighter.nogutter .ruler
+{
+	border: 0;
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #1B2426;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #646763;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: #E0E8FF;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #B9BDB6;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #878A85;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: #5CE638; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #5BA1CF; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: #435A5F; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #090; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #FFAA3E; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #E0E8FF; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: #435A5F !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #E0E8FF; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #FFFFFF; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: #FFAA3E; 
+}
diff --git a/modules/editor/components/code_highlighter/style/wrapping.png b/modules/editor/components/code_highlighter/style/wrapping.png
new file mode 100644
index 000000000..6972c5e59
Binary files /dev/null and b/modules/editor/components/code_highlighter/style/wrapping.png differ
diff --git a/modules/admin/tpl/images/blank.gif b/modules/editor/components/code_highlighter/tpl/images/blank.gif
similarity index 100%
rename from modules/admin/tpl/images/blank.gif
rename to modules/editor/components/code_highlighter/tpl/images/blank.gif
diff --git a/modules/editor/components/code_highlighter/tpl/images/border_dotted.gif b/modules/editor/components/code_highlighter/tpl/images/border_dotted.gif
new file mode 100644
index 000000000..eaf1ae738
Binary files /dev/null and b/modules/editor/components/code_highlighter/tpl/images/border_dotted.gif differ
diff --git a/modules/editor/components/code_highlighter/tpl/images/border_left_dotted.gif b/modules/editor/components/code_highlighter/tpl/images/border_left_dotted.gif
new file mode 100644
index 000000000..101259cb7
Binary files /dev/null and b/modules/editor/components/code_highlighter/tpl/images/border_left_dotted.gif differ
diff --git a/modules/editor/components/code_highlighter/tpl/images/border_left_solid.gif b/modules/editor/components/code_highlighter/tpl/images/border_left_solid.gif
new file mode 100644
index 000000000..10b7e789f
Binary files /dev/null and b/modules/editor/components/code_highlighter/tpl/images/border_left_solid.gif differ
diff --git a/modules/editor/components/code_highlighter/tpl/images/border_solid.gif b/modules/editor/components/code_highlighter/tpl/images/border_solid.gif
new file mode 100644
index 000000000..9fbf79f57
Binary files /dev/null and b/modules/editor/components/code_highlighter/tpl/images/border_solid.gif differ
diff --git a/modules/editor/components/code_highlighter/tpl/popup.css b/modules/editor/components/code_highlighter/tpl/popup.css
new file mode 100644
index 000000000..29361e224
--- /dev/null
+++ b/modules/editor/components/code_highlighter/tpl/popup.css
@@ -0,0 +1,24 @@
+@charset "utf-8";
+@import url(../../../../../modules/admin/tpl/css/admin.css);
+
+#folder_area { clear:left; }
+
+.border_type { float:left; margin-right:1em; width:120px; }
+
+img.color_icon { width:14px; height:14px; border:1px solid #FFFFFF; }
+
+img.color_icon_over { width:14px; height:14px; border:1px solid #000000; cursor:pointer; }
+
+img.border_preview_color { width:30px; height:16px; border:1px solid #EEEEEE; background-color:#88EE22; }
+
+img.border_preview_none_color { width:30px; height:12px; border:1px solid #EEEEEE; background-color:#FFFFFF; }
+
+img.bg_preview_color { width:30px; height:16px; border:1px solid #000000; background-color:#FFFFFF; }
+
+.editor_color_box { clear:both; height:65px; width:400px; border:1px solid #DDDDDD; padding:2px; }
+
+.editor_link_type { float:left; margin-right:.5em; vertical-align:middle; white-space:nowrap; }
+
+.editor_color_input { clear:both; }
+
+li { list-style:none; float:left; margin:5px 10px 0px 0;}
diff --git a/modules/editor/components/code_highlighter/tpl/popup.html b/modules/editor/components/code_highlighter/tpl/popup.html
new file mode 100644
index 000000000..69c7b8315
--- /dev/null
+++ b/modules/editor/components/code_highlighter/tpl/popup.html
@@ -0,0 +1,77 @@
+<!--%import("popup.js")-->
+<!--%import("popup.css")-->
+<!--%import("../lang")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
+</div>
+
+<form action="./" method="get" onSubmit="return false" id="fo">
+    <div id="popBody">
+        <table cellspacing="0" class="rowTable">
+        <col width="150" />
+        <col />
+        <tr>
+            <th scope="row"><div>{$lang->code_type}</div></th>
+            <td>
+                <select id="code_type" name="code_type">
+                    <option value="Php">PHP</option>
+                    <option value="Xml">HTML/XML</option>
+                    <option value="Css">CSS</option>
+                    <option value="JScript">Javascript</option>
+                    <option value="Plain">Plain Text</option>
+                    <option value="Diff">Diff</option>
+                    <option value="Cpp">C++</option>
+                    <option value="CSharp">C#</option>
+                    <option value="Vb">Visual Basic</option>
+                    <option value="Java">Java</option>
+                    <option value="Delphi">Delphi</option>
+                    <option value="Python">Python</option>
+                    <option value="Ruby">Ruby</option>
+                    <option value="Sql">SQL</option>
+                    <option value="Abap">Abap</option>
+                    <option value="Bash">Bash/shell</option>
+                    <option value="Groovy">Groovy</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->file_path}</div></th>
+            <td>
+                <input type="text" id="file_path" name="file_path" class="inputTypeText w400" />
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->description}</div></th>
+            <td>
+                <input type="text" id="description" name="description" class="inputTypeText w400" />
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->first_line}</div></th>
+            <td>
+                <input type="text" id="first_line" name="first_line" value="1" class="inputTypeText w40" />
+                <input type="checkbox" id="nogutter" name="nogutter" value="Y" /> <label for="nogutter">{$lang->hidden_linenumber}</label>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->used_collapse}</div></th>
+            <td>
+                <input type="checkbox" id="collapse" name="collapse" value="Y" />
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->hidden_controls}</div></th>
+            <td>
+                <input type="checkbox" id="nocontrols" name="nocontrols" value="Y" />
+            </td>
+        </tr>
+        </table>
+    </div>
+
+    <div id="popFooter">
+        <a href="#" onclick="insertCode()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
+        <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+    </div>
+
+</form>
diff --git a/modules/editor/components/code_highlighter/tpl/popup.js b/modules/editor/components/code_highlighter/tpl/popup.js
new file mode 100644
index 000000000..3a6286fac
--- /dev/null
+++ b/modules/editor/components/code_highlighter/tpl/popup.js
@@ -0,0 +1,78 @@
+/**
+ * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
+ * 있으면 가져와서 원하는 곳에 삽입
+ **/
+var selected_node = null;
+function getCode() {
+    // 부모 위지윅 에디터에서 선택된 영역이 있는지 확인
+    if(typeof(opener)=='undefined') return;
+
+    var node = opener.editorPrevNode;
+    if(!node || node.nodeName != 'DIV') return;
+
+    selected_node = node;
+
+    var code_type = node.getAttribute('code_type');
+    var file_path = node.getAttribute('file_path');
+    var description = node.getAttribute('description');
+    var first_line = node.getAttribute('first_line');
+    var collapse = node.getAttribute('collapse');
+    var nogutter = node.getAttribute('nogutter');
+    var nocontrols = node.getAttribute('nocontrols');
+
+    jQuery('#code_type').val(code_type);
+    jQuery('#file_path').val(file_path);
+    jQuery('#description').val(description);
+    if(!first_line) jQuery('#first_line').val('1');
+    else jQuery('#first_line').val(first_line);
+    if(collapse == 'Y' || collapse == 'true') jQuery('#collapse').attr('checked', true);
+    if(nogutter == 'Y' || nogutter == 'true') jQuery('#nogutter').attr('checked', true);
+    if(nocontrols == 'Y' || nocontrols == 'true') jQuery('#nocontrols').attr('checked', true);
+}
+
+/* 추가 버튼 클릭시 부모창의 위지윅 에디터에 인용구 추가 */
+function insertCode() {
+    if(typeof(opener)=='undefined') return;
+
+    var code_type = jQuery('#code_type').val();
+    var file_path = jQuery('#file_path').val();
+    var description = jQuery('#description').val();
+    var first_line = jQuery('#first_line').val();
+    var collapse = jQuery('#collapse').attr('checked');
+    var nogutter = jQuery('#nogutter').attr('checked');
+    var nocontrols = jQuery('#nocontrols').attr('checked');
+
+    var content = '';
+    if(selected_node) content = jQuery(selected_node).html();
+    else content = opener.editorGetSelectedHtml(opener.editorPrevSrl);
+
+    var style = "border: #666666 1px dotted; border-left: #22aaee 5px solid; padding: 5px; background: #FAFAFA url('./modules/editor/components/code_highlighter/code.png') no-repeat top right;";
+
+    if(!content) content = "&nbsp;";
+
+    var text = '<div editor_component="code_highlighter" code_type="'+code_type+'" file_path="'+file_path+'" description="'+description+'" first_line="'+first_line+'" collapse="'+collapse+'" nogutter="'+nogutter+'" nocontrols="'+nocontrols+'" style="'+style+'">'+content+'</div>'+"<br />";
+
+    if(selected_node) {
+        selected_node.setAttribute('code_type', code_type);
+        selected_node.setAttribute('file_path', file_path);
+        selected_node.setAttribute('description', description);
+        selected_node.setAttribute('first_line', first_line);
+        selected_node.setAttribute("collapse", collapse);
+        selected_node.setAttribute('nogutter', nogutter);
+        selected_node.setAttribute('nocontrols', nocontrols);
+        selected_node.setAttribute('style', style);
+        opener.editorFocus(opener.editorPrevSrl);
+
+    } else {
+
+        opener.editorFocus(opener.editorPrevSrl);
+        var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
+        opener.editorReplaceHTML(iframe_obj, text);
+        opener.editorFocus(opener.editorPrevSrl);
+    }
+
+    window.close();
+}
+
+jQuery(getCode);
+
diff --git a/modules/editor/components/emoticon/tpl/popup.css b/modules/editor/components/emoticon/tpl/popup.css
index 778090d0d..2227a0deb 100644
--- a/modules/editor/components/emoticon/tpl/popup.css
+++ b/modules/editor/components/emoticon/tpl/popup.css
@@ -4,6 +4,6 @@
 
 img.emoticon { margin:10px; cursor:pointer; }
 
-.emoticonList { position:absolute; top:20px; _top:17px; right:20px; }
-*:first-child+html .emoticonList { top:15px; }
+.emoticonList { position:absolute; top:9px; right:30px; }
+*:first-child+html .emoticonList { top:9px; }
 
diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index d1aadf18d..31758f7fe 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -1,8 +1,8 @@
 <!--%import("popup.js")-->
 <!--%import("popup.css")-->
 
-<div id="popHeadder">
-    <h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">
         {$component_info->title} ver. {$component_info->version}
     </h3>
 </div>
@@ -21,7 +21,3 @@
     <!--@end-->
 
 </div>
-
-<div id="popFooter" class="tCenter">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html
index c23c121d3..c5e893f2d 100644
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@@ -2,8 +2,8 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
@@ -11,7 +11,7 @@
 
     <div id="popBody">
 
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="120" />
         <col />
         <tr>
@@ -80,9 +80,8 @@
         </table>
     </div>
 
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertSlideShow()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="insertSlideShow()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/components/image_link/lang/zh-CN.lang.php b/modules/editor/components/image_link/lang/zh-CN.lang.php
index c936ab8d9..2dcd9c656 100644
--- a/modules/editor/components/image_link/lang/zh-CN.lang.php
+++ b/modules/editor/components/image_link/lang/zh-CN.lang.php
@@ -14,9 +14,10 @@
     $lang->image_align_middle = "居中";
     $lang->image_align_right = "内容右侧";
     $lang->image_border = "边框粗细";
-    $lang->urllink_url = "URL";
-    $lang->image_margin = 'Image Margin';
+    $lang->image_margin = '外边距';
 
+    $lang->urllink_open_window = '新窗口打开';
     $lang->about_url_link_open_window = "将在新窗口中打开链接。";
+
     $lang->cmd_get_scale = "获得图片大小";
 ?>
diff --git a/modules/editor/components/image_link/lang/zh-TW.lang.php b/modules/editor/components/image_link/lang/zh-TW.lang.php
index 355cd395f..f3873b679 100644
--- a/modules/editor/components/image_link/lang/zh-TW.lang.php
+++ b/modules/editor/components/image_link/lang/zh-TW.lang.php
@@ -2,7 +2,7 @@
     /**
      * @file   /modules/editor/components/image_link/lang/zh-TW.lang.php
      * @author zero <zero@nzeo.com> 翻譯：royallin
-     * @brief  網頁編輯器(editor) 模組 > 圖片連結(image_link) 組件的語言
+     * @brief  網頁編輯器(editor)模組 > 圖片連結(image_link)組件語言
      **/
 
     $lang->image_url = "圖片路徑";
@@ -15,7 +15,7 @@
     $lang->image_align_right = "靠右";
     $lang->image_border = "邊框粗細";
     $lang->urllink_url = "網址";
-    $lang->image_margin = 'Image Margin';
+    $lang->image_margin = '圖片邊距';
 
     $lang->about_url_link_open_window = "開啟連結於新視窗。";
     $lang->cmd_get_scale = "取得圖片大小";
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index 85d3cf5f4..8631487bc 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -2,14 +2,14 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
 
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="100" />
         <col />
 
@@ -86,8 +86,7 @@
         </table>
     </div>
     <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertImage()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+        <a href="#" onclick="insertImage()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/components/multimedia_link/tpl/popup.html b/modules/editor/components/multimedia_link/tpl/popup.html
index 8a8f2f803..269435a03 100644
--- a/modules/editor/components/multimedia_link/tpl/popup.html
+++ b/modules/editor/components/multimedia_link/tpl/popup.html
@@ -2,13 +2,13 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="150" />
         <col />
         <tr>
@@ -33,9 +33,8 @@
         </tr>
         </table>
     </div>
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertMultimedia()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="insertMultimedia()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/components/naver_map/info.xml b/modules/editor/components/naver_map/info.xml
index 1b3d18f63..a3da76063 100644
--- a/modules/editor/components/naver_map/info.xml
+++ b/modules/editor/components/naver_map/info.xml
@@ -1,48 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="ko">네이버맵 연동</title>
-    <title xml:lang="jp">ネイバーマップ連動</title>
-    <title xml:lang="zh-CN">NAVER 地图</title>
-    <title xml:lang="en">Naver Map Open Api</title>
-    <title xml:lang="es">Naver mapa abierto api</title>
-    <title xml:lang="ru">Открытые API карт Naver</title>
-    <title xml:lang="zh-TW">NAVER 地圖 Open API</title>
-    <description xml:lang="ko">네이버에서 제공하는 네이버 지도 open api를 이용하여 에디터에 원하는 곳의 지도를 추가하거나 수정할 수 있습니다.\n네이버 지도 open api키를 발급 받아서 등록을 해주셔야 정상적인 사용이 가능합니다.</description>
-    <description xml:lang="jp">ネイバーから提供されるネイバーマップのOpenAPIを利用してエディターに表示したい地図を追加したり、修正したりすることができます。ネイバーマップは、OpenAPIキーを取得して登録すれば使用することができます。</description>
-    <description xml:lang="zh-CN">naver提供的naver地图，利用open api在编辑器里添加或修改您所需要的地图。\n为了使用naver地图首先要取得open api key,然后登录此key才可正常使用。</description>
-    <description xml:lang="en">You can add a map to the editor or modify it by using Naver Map open api provided by Naver.\nYou would be able to use it when you register Naver Map api key after you get it from http://www.naver.com.</description>
-    <description xml:lang="es">Puede poner un mapa para el editor o modificarlo utilizando Naver Mapa abierta api proporcionada por Naver. \ NSe se podrá hacer uso del mismo cuando se registra Naver Mapa api clave se obtiene después de http://www.naver.com .</description>
-    <description xml:lang="ru">Вы можете добавить карту в редактор или изменить ее, используя Naver Map open api, предлагаемые Naver.\nВы сможете использовать это после регистрации ключа Naver Map API, полученного с http://www.naver.com.</description>
-    <description xml:lang="zh-TW">naver所提供的地圖，利用Open API在編輯器中，新增或修改成您所需要的地圖。\n使用 naver地圖要先獲得 Open API key，然後登錄 key才能正常使用。</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
-        <name xml:lang="ko">zero</name>
-        <name xml:lang="jp">zero</name>
-        <name xml:lang="zh-CN">zero</name>
-        <name xml:lang="en">zero</name>
-        <name xml:lang="es">zero</name>
-        <name xml:lang="ru">zero</name>
-        <name xml:lang="zh-TW">zero</name>
-    </author>
-
-    <extra_vars>
-        <var name="api_key">
-            <title xml:lang="ko">네이버지도 api key</title>
-            <title xml:lang="jp">ネイバーマップＡＰＩキー</title>
-            <title xml:lang="zh-CN">naver地图 api key</title>
-            <title xml:lang="en">Naver Map api key</title>
-            <title xml:lang="es">Naver Map api key</title>
-            <title xml:lang="ru">Naver Map API Ключ</title>
-            <title xml:lang="zh-TW">naver地圖 API key</title>
-            <description xml:lang="ko">http://www.naver.com/ 에서 네이버 지도 API key를 발급 받으신 후 입력해주세요.</description>
-            <description xml:lang="jp">http://www.naver.com/ からネイバーマップのＡＰＩキーを取得してから入力してください。</description>
-            <description xml:lang="zh-CN">在http://www.naver.com/ 取得naver地图 API key后输入。</description>
-            <description xml:lang="en">Please get Naver Map API key from http://www.naver.com first and then input the key.</description>
-            <description xml:lang="es">Por favor Naver Mapa clave de la API de http://www.naver.com primero y luego ingrese la clave.</description>
-            <description xml:lang="ru">Пожалуйста, получите ключ Naver Map API с http://www.naver.com и введите его.</description>
-            <description xml:lang="zh-TW">先在 http://www.naver.com/ 網址取得 naver地圖 API key之後輸入。</description>
-        </var>
-    </extra_vars>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="ko">네이버맵 연동</title>
+    <title xml:lang="jp">ネイバーマップ連動</title>
+    <title xml:lang="zh-CN">NAVER 地图</title>
+    <title xml:lang="en">Naver Map Open Api</title>
+    <title xml:lang="es">Naver mapa abierto api</title>
+    <title xml:lang="ru">Открытые API карт Naver</title>
+    <title xml:lang="zh-TW">NAVER 地圖 Open API</title>
+    <description xml:lang="ko">네이버에서 제공하는 네이버 지도 open api를 이용하여 에디터에 원하는 곳의 지도를 추가하거나 수정할 수 있습니다.\n네이버 지도 open api키를 발급 받아서 등록을 해주셔야 정상적인 사용이 가능합니다.</description>
+    <description xml:lang="jp">ネイバーから提供されるネイバーマップのOpenAPIを利用してエディターに表示したい地図を追加したり、修正したりすることができます。ネイバーマップは、OpenAPIキーを取得して登録すれば使用することができます。</description>
+    <description xml:lang="zh-CN">naver提供的naver地图，利用open api在编辑器里添加或修改您所需要的地图。\n为了使用naver地图首先要取得open api key,然后登录此key才可正常使用。</description>
+    <description xml:lang="en">You can add a map to the editor or modify it by using Naver Map open api provided by Naver.\nYou would be able to use it when you register Naver Map api key after you get it from http://www.naver.com.</description>
+    <description xml:lang="es">Puede poner un mapa para el editor o modificarlo utilizando Naver Mapa abierta api proporcionada por Naver. \ NSe se podrá hacer uso del mismo cuando se registra Naver Mapa api clave se obtiene después de http://www.naver.com .</description>
+    <description xml:lang="ru">Вы можете добавить карту в редактор или изменить ее, используя Naver Map open api, предлагаемые Naver.\nВы сможете использовать это после регистрации ключа Naver Map API, полученного с http://www.naver.com.</description>
+    <description xml:lang="zh-TW">naver所提供的地圖，利用Open API在編輯器中，新增或修改成您所需要的地圖。\n使用 naver地圖要先獲得 Open API key，然後登錄 key才能正常使用。</description>
+    <version>0.1</version>
+    <date>2009-02-23</date>
+
+    <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
+        <name xml:lang="ko">zero</name>
+        <name xml:lang="jp">zero</name>
+        <name xml:lang="zh-CN">zero</name>
+        <name xml:lang="en">zero</name>
+        <name xml:lang="es">zero</name>
+        <name xml:lang="ru">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+    <author email_address="misol221@paran.com" link="http://www.imsoo.net">
+        <name xml:lang="ko">misol</name>
+        <name xml:lang="jp">misol</name>
+        <name xml:lang="zh-CN">misol</name>
+        <name xml:lang="en">misol</name>
+        <name xml:lang="es">misol</name>
+        <name xml:lang="ru">misol</name>
+        <name xml:lang="zh-TW">misol</name>
+    </author>
+
+    <extra_vars>
+        <var name="api_key">
+            <title xml:lang="ko">네이버지도 api key</title>
+            <title xml:lang="jp">ネイバーマップＡＰＩキー</title>
+            <title xml:lang="zh-CN">naver地图 api key</title>
+            <title xml:lang="en">Naver Map api key</title>
+            <title xml:lang="es">Naver Map api key</title>
+            <title xml:lang="ru">Naver Map API Ключ</title>
+            <title xml:lang="zh-TW">naver地圖 API key</title>
+            <description xml:lang="ko">http://www.naver.com/ 에서 네이버 지도 API key를 발급 받으신 후 입력해주세요.</description>
+            <description xml:lang="jp">http://www.naver.com/ からネイバーマップのＡＰＩキーを取得してから入力してください。</description>
+            <description xml:lang="zh-CN">在http://www.naver.com/ 取得naver地图 API key后输入。</description>
+            <description xml:lang="en">Please get Naver Map API key from http://www.naver.com first and then input the key.</description>
+            <description xml:lang="es">Por favor Naver Mapa clave de la API de http://www.naver.com primero y luego ingrese la clave.</description>
+            <description xml:lang="ru">Пожалуйста, получите ключ Naver Map API с http://www.naver.com и введите его.</description>
+            <description xml:lang="zh-TW">先在 http://www.naver.com/ 網址取得 naver地圖 API key之後輸入。</description>
+        </var>
+    </extra_vars>
+</component>
diff --git a/modules/editor/components/naver_map/naver_map.class.php b/modules/editor/components/naver_map/naver_map.class.php
index 007209851..572f439bf 100644
--- a/modules/editor/components/naver_map/naver_map.class.php
+++ b/modules/editor/components/naver_map/naver_map.class.php
@@ -20,6 +20,7 @@
         function naver_map($upload_target_srl, $component_path) {
             $this->upload_target_srl = $upload_target_srl;
             $this->component_path = $component_path;
+            Context::loadLang($component_path.'lang');
         }
 
         /**
@@ -48,7 +49,8 @@
             Context::loadLang($this->component_path."lang");
 
             // 지정된 서버에 요청을 시도한다
-            $query_string = iconv("UTF-8","EUC-KR",sprintf('/api/geocode.php?key=%s&query=%s', $this->api_key, $address));
+            $address = urlencode(iconv("UTF-8","EUC-KR",$address));
+            $query_string = sprintf('/api/geocode.php?key=%s&query=%s', $this->api_key, $address);
 
             $fp = fsockopen('maps.naver.com', 80, $errno, $errstr);
             if(!$fp) return new Object(-1, 'msg_fail_to_socket_open');
@@ -71,6 +73,10 @@
             $oXmlParser = new XmlParser();
             $xml_doc = $oXmlParser->parse($buff);
 
+            //If a Naver OpenApi Error message exists.
+            if($xml_doc->error->error_code->body || $xml_doc->error->message->body) return new Object(-1, 'NAVER OpenAPI Error'."\n".'Code : '.$xml_doc->error->error_code->body."\n".'Message : '.$xml_doc->error->message->body);
+
+            if($xml_doc->geocode->total->body == 0) return new Object(-1,'msg_no_result');
             $addrs = $xml_doc->geocode->item;
             if(!is_array($addrs)) $addrs = array($addrs);
             $addrs_count = count($addrs);
@@ -99,6 +105,7 @@
         function transHTML($xml_obj) {
             $x = $xml_obj->attrs->x;
             $y = $xml_obj->attrs->y;
+            $zoom = $xml_obj->attrs->zoom;
             $marker = urlencode($xml_obj->attrs->marker);
             $style = $xml_obj->attrs->style;
 
@@ -108,7 +115,7 @@
             if(!$width) $width = 400;
             if(!$height) $height = 400;
 
-            $body_code = sprintf('<div style="width:%dpx;height:%dpx;margin-bottom:5px;"><iframe src="%s?module=editor&amp;act=procEditorCall&amp;method=displayMap&amp;component=naver_map&amp;width=%d&amp;height=%d&amp;x=%f&amp;y=%f&amp;marker=%s" frameBorder="0" style="padding:1px; border:1px solid #AAAAAA;width:%dpx;height:%dpx;margin:0px;"></iframe></div>', $width, $height, Context::getRequestUri(), $width, $height, $x, $y, $marker, $width, $height);
+            $body_code = sprintf('<div style="width:%dpx;height:%dpx;margin-bottom:5px;"><iframe src="%s?module=editor&amp;act=procEditorCall&amp;method=displayMap&amp;component=naver_map&amp;width=%d&amp;height=%d&amp;x=%f&amp;y=%f&amp;zoom=%d&amp;marker=%s" frameBorder="0" style="padding:1px; border:1px solid #AAAAAA;width:%dpx;height:%dpx;margin:0px;"></iframe></div>', $width, $height, Context::getRequestUri(), $width, $height, $x, $y, $zoom, $marker, $width, $height);
             return $body_code;
         }
 
@@ -131,23 +138,31 @@
             if(!$y) $y = 529730;
             settype($y,"int");
 
+            $zoom = Context::get('zoom');
+            if(!$zoom) $zoom = 3;
+            settype($zoom,"int");
+
             $marker = Context::get('marker');
 
             $html = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'.
                     '<html>'.
                     '<head>'.
                     '<title></title>'.
-                    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'.
+                    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.
                     '<script type="text/javascript" src="./common/js/x.js"></script>'.
                     '<script type="text/javascript" src="http://maps.naver.com/js/naverMap.naver?key='.$this->api_key.'"></script>'.
-                    '<script type="text/javascript">'.
-                    'function moveMap(x,y,scale) {mapObj.setCenterAndZoom(new NPoint(x,y),scale);}'.
+                    '<script type="text/javascript">'."\n".
+                    '//<!--'."\n".
+                    'function moveMap(x,y,scale) { mapObj.setCenterAndZoom(new NPoint(x,y),scale); }'.
+                    'function showInfo(x,y,content) { infowin.hideWindow(); infowin = new NInfoWindow(); infowin.set(new NPoint(x,y), \'<div style="background-color:#FFFFFF;"><strong>\'+content+\'</strong></div>\'); infowin.setOpacity(0.6); mapObj.addOverlay(infowin); infowin.showWindow(); infowin.delayHideWindow(2000); }'.
                     'function createMarker(pos) { if(typeof(top.addMarker)=="function") { if(!top.addMarker(pos)) return; var iconUrl = "http://static.naver.com/local/map_img/set/icos_free_"+String.fromCharCode(96+top.marker_count-1)+".gif"; var marker = new NMark(pos,new NIcon(iconUrl,new NSize(15,14))); mapObj.addOverlay(marker); } }'.
+                    "\n".'//-->'."\n".
                     '</script>'.
                     '</head>'.
                     '<body style="margin:0px;">'.
                     '<div id="'.$id.'" style="width:'.$width.'px;height:'.$height.'px;"></div>'.
                     '<script type="text/javascript">'.
+                    '//<!--'."\n".
                     'var mapObj = new NMap(document.getElementById("'.$id.'"));'.
                     'mapObj.addControl(new NSaveBtn());'.
                     'var zoom = new NZoomControl();'.
@@ -156,9 +171,9 @@
                     'var infowin = new NInfoWindow();'.
                     'mapObj.addOverlay(infowin);'.
                     'NEvent.addListener(mapObj,"click",createMarker);'.
-                    '';
+                    "\n";
 
-            if($x&&$y) $html .= 'mapObj.setCenterAndZoom(new NPoint('.$x.','.$y.'),3);';
+            if($x&&$y) $html .= 'mapObj.setCenterAndZoom(new NPoint('.$x.','.$y.'),'.$zoom.');';
 
             if($marker) {
                 $marker_list = explode('|@|', $marker);
@@ -167,6 +182,7 @@
                     $marker_list[$i] = explode(',', $marker_list[$i]);
                     settype($marker_list[$i][0],"int");
                     settype($marker_list[$i][1],"int");
+                    if(!$marker_list[$i][0] || !$marker_list[$i][1]) continue;
                     $marker_list[$i] = $marker_list[$i][0].','.$marker_list[$i][1];
                     $pos = trim($marker_list[$i]);
                     if(!$pos) continue;
@@ -178,8 +194,7 @@
 
             $html .= ''.
                      //'mapObj.enableWheelZoom();'.
-                     'NEvent.addListener(mapObj, "click", function(pos) { if(typeof(top.mapClicked)!="undefined") top.mapClicked(pos); });'.
-                     'NEvent.addListener(mapObj, "mouseup", function(pos) { if(typeof(top.mapClicked)!="undefined") top.mapClicked(pos); });'.
+                     "\n".'//-->'."\n".
                      '</script>'.
                      '</body>'.
                      '</html>';
diff --git a/modules/editor/components/naver_map/tpl/popup.css b/modules/editor/components/naver_map/tpl/popup.css
index 6080afd51..7553a9ba5 100644
--- a/modules/editor/components/naver_map/tpl/popup.css
+++ b/modules/editor/components/naver_map/tpl/popup.css
@@ -5,7 +5,8 @@
 #address { width:100px; }
 .about_address { clear:both; color:#DDDDDD; }
 
-.address_list_box { color:#AAAAAA; margin-top:1em; clear:both;}
+.address_list_box { color:#AAAAAA; margin-top:1em; clear:both; padding:5px; height:110px; overflow-y:scroll }
 .address_list_box a { color:#AAAAAA; }
+.address_lists { list-style:none; }
 
-#display_map { width:400px; height:400px; border:0px; border:1px solid #DDDDDD; margin-left:10px; }
+#display_map { width:400px; height:300px; border:1px solid #DDDDDD; }
diff --git a/modules/editor/components/naver_map/tpl/popup.html b/modules/editor/components/naver_map/tpl/popup.html
index bd7458d5f..40d349952 100644
--- a/modules/editor/components/naver_map/tpl/popup.html
+++ b/modules/editor/components/naver_map/tpl/popup.html
@@ -1,39 +1,35 @@
 <!--%import("popup.js")-->
 <!--%import("popup.css")-->
-<!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <div id="popBody">
-
-    <table border="0">
+    <table border="0" class="colTable">
     <col width="190" />
     <col />
     <tr valign="top">
         <td>
             <div class="search">
                 <form action="./" method="get" onSubmit="search_address(); return false;" id="fo">
-                <input type="hidden" id="map_x" name="x" value="" />
-                <input type="hidden" id="map_y" name="x" value="" />
                 <input type="hidden" id="marker" name="marker_1" value="" />
 
-                <table border="0">
+                <table border="0" class="rowTable">
                 <tr>
                     <td><input type="text" class="inputTypeText" id="address" value="" /></td>
                     <td><span class="button"><input type="submit" value="{$lang->cmd_search}" /></span></td>
                 </tr>
                 </table>
 
-                <div class="about_address">{$lang->about_address}</div>
+                <p class="summary">{$lang->about_address}</p>
 
                 </form>
             </div>
 
             <div class="address_list_box" id="address_list">{$lang->about_address_use}</div>
 
-            <table cellspacing="0" class="tableType5 gap1">
+            <table cellspacing="0" class="rowTable">
             <tr>
                 <th scope="row"><div>{$lang->map_width}</div></th>
                 <td><input type="text" class="inputTypeText" size="3" id="map_width" value="400" />px</td>
@@ -44,14 +40,13 @@
             </table>
         </td>
         <td>
-            <iframe name="display_map" id="display_map" frameBorder="0" src="./?module=editor&amp;component=naver_map&amp;act=procEditorCall&amp;method=displayMap&amp;width=400&amp;height=400"></iframe>
+            <iframe name="display_map" id="display_map" frameBorder="0" src="./?module=editor&amp;component=naver_map&amp;act=procEditorCall&amp;method=displayMap&amp;width=400&amp;height=300"></iframe>
         </td>
     </tr>
     </table>
 </div>
 
 <div id="popFooter" class="tCenter">
-    <a href="#" onclick="insertNaverMap()" class="button"><span>{$lang->cmd_insert}</span></a>
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <a href="#" onclick="insertNaverMap()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
     <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
 </div>
diff --git a/modules/editor/components/naver_map/tpl/popup.js b/modules/editor/components/naver_map/tpl/popup.js
index 1e301f25e..667d4c104 100644
--- a/modules/editor/components/naver_map/tpl/popup.js
+++ b/modules/editor/components/naver_map/tpl/popup.js
@@ -14,11 +14,15 @@ function getNaverMap() {
     var width = xWidth(node);
     var height = xHeight(node);
     var address = node.getAttribute("address");
+    var zoom = node.getAttribute("zoom");
 
     if(x&&y) {
-        xGetElementById("map_x").value = x;
-        xGetElementById("map_y").value = y;
-        moveMap(x,y,3);
+        if(zoom) {
+            moveMap(x,y,zoom);
+        }
+        else {
+            moveMap(x,y,3);
+        }
     }
     if(address) {
         xGetElementById("address").value = address;
@@ -31,16 +35,17 @@ function getNaverMap() {
 
 function insertNaverMap(obj) {
     if(typeof(opener)=="undefined") return;
-    
-    var x = xGetElementById("map_x").value;
-    var y = xGetElementById("map_y").value;
+
+    var x = display_map.mapObj.getCenter().x;
+    var y = display_map.mapObj.getCenter().y;
     var marker = xGetElementById("marker").value;
     var address = xGetElementById("address").value;
+    var zoom = display_map.mapObj.getZoom();
 
     var width = xGetElementById("map_width").value;
     var height = xGetElementById("map_height").value;
 
-    var text = "<img src=\"./common/tpl/images/blank.gif\" editor_component=\"naver_map\"  address=\""+address+"\" x=\""+x+"\" y=\""+y+"\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;border:2px dotted #3CBC2f;background:url(./modules/editor/components/naver_map/tpl/navermap_component.gif) no-repeat center;\" marker=\""+marker+"\" />";
+    var text = "<img src=\"./common/tpl/images/blank.gif\" editor_component=\"naver_map\"  address=\""+address+"\" x=\""+x+"\" y=\""+y+"\" zoom=\""+zoom+"\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;border:2px dotted #3CBC2f;background:url(./modules/editor/components/naver_map/tpl/navermap_component.gif) no-repeat center;\" marker=\""+marker+"\" />";
 
     opener.editorFocus(opener.editorPrevSrl);
 
@@ -52,8 +57,6 @@ function insertNaverMap(obj) {
     window.close();
 }
 
-xAddEventListener(window, "load", getNaverMap);
-
 /* 네이버의 map openapi로 주소에 따른 좌표를 요청 */
 function search_address(selected_address) {
   if(typeof(selected_address)=="undefined") selected_address = null;
@@ -73,12 +76,13 @@ function moveMap(x,y,scale) {
     display_map.moveMap(x,y,scale);
 }
 
-function mapClicked(pos) {
-    xGetElementById("map_x").value = pos.x;
-    xGetElementById("map_y").value = pos.y;
+function selectPoint(i) {
+    moveMap(item[i][0],item[i][1],3);
+    display_map.showInfo(item[i][0],item[i][1],item[i][2]);
 }
 
 var naver_address_list = new Array();
+var item = new Array();
 function complete_search_address(ret_obj, response_tags, selected_address) {
   var address_list = ret_obj['address_list'];
   if(!address_list) return;
@@ -87,11 +91,18 @@ function complete_search_address(ret_obj, response_tags, selected_address) {
 
   var html = "";
   var address_list = address_list.split("\n");
-  for(var i=0;i<address_list.length;i++) {
-    var item = address_list[i].split(",");
+  if(address_list.length) {
+    item = new Array();
+    for(var i=0;i<address_list.length;i++) {
+      item[i] = new Array();
+      item[i] = address_list[i].split(",");
 
-    naver_address_list[naver_address_list.length] = item;
-    html += "<a href='#' onclick=\"moveMap('"+item[0]+"','"+item[1]+"');return false;\">"+item[2]+"</a><br />";
+      naver_address_list[naver_address_list.length] = item;
+      html += "<li class=\"address_lists\"><a href='#' onclick=\"selectPoint("+i+");return false;\">"+item[i][2]+"</a></li>";
+    }
+  }
+  if(address_list.length == 1) {
+    selectPoint(0);
   }
 
   var list_zone = xGetElementById("address_list");
@@ -106,3 +117,4 @@ function addMarker(pos) {
     marker_count++;
     return true;
 }
+xAddEventListener(window, "load", getNaverMap);
diff --git a/modules/editor/components/poll_maker/tpl/popup.css b/modules/editor/components/poll_maker/tpl/popup.css
index 43eb2c09a..78e6b2d36 100644
--- a/modules/editor/components/poll_maker/tpl/popup.css
+++ b/modules/editor/components/poll_maker/tpl/popup.css
@@ -17,3 +17,4 @@ li a { text-decoration:none; color:#666666;}
 
 #popFooter .fl { margin-left:10px; }
 #popFooter .fr { margin-right:10px; }
+.poll_box { margin-bottom:15px; }
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 1b70a98d3..bca76fa21 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -10,8 +10,8 @@
     var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
 </script>
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="post" id="fo_component" onSubmit="procFilter(this, insert_poll); return false;">
@@ -22,7 +22,7 @@
 
     <div id="popBody">
 
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="100" />
         <col />
         <tr>
@@ -59,12 +59,15 @@
                 </select>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
+            <td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
         </table>
 
         <div id="poll_source" class="clear" style="display:none">
             <div class="clear"></div>
 
-            <table cellspacing="0" class="adminTable gap1">
+            <table cellspacing="0" class="rowTable gap1">
             <col width="100" />
             <col />
             <tr>
@@ -83,30 +86,16 @@
             </tr>
             </table>
 
-            <div class="pollButton clear">
-                <div class="fl">
-                    <label>{$lang->poll_chk_count}</label>
-                    <input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" />
-                </div>
-                <div class="fr">
-                    <a href="#" onclick="doPollDelete(this); return false;" class="delPoll">{$lang->cmd_del_poll}</a> |
-                    <a href="#" onclick="doPollAddItem(this); return false;">{$lang->cmd_add_item}</a>
-                </div>
-                <div class="clear"></div>
-            </div>
+            <a href="#" onclick="doPollAddItem(this); return false;" class="button black small"><span>{$lang->cmd_add_item}</span></a>
+            <a href="#" onclick="doPollDelete(this); return false;" class="button red small"><span>{$lang->cmd_del_poll}</span></a> 
         </div>
 
     </div>
 
-    <div id="popFooter" class="tCenter clear">
-        <div class="fl">
-            <a href="#" onclick="doPollAdd(); return false;" class="button"><span>{$lang->cmd_add_poll}</span></a>
-        </div>
-        <div class="fr">
-            <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
-            <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_submit}" /></span>
+            <a href="#" onclick="doPollAdd(); return false;" class="button blue"><span>{$lang->cmd_add_poll}</span></a>
             <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
-        </div>
     </div>
 
 
diff --git a/modules/editor/components/poll_maker/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
index 80981a6bc..351c9a837 100644
--- a/modules/editor/components/poll_maker/tpl/popup.js
+++ b/modules/editor/components/poll_maker/tpl/popup.js
@@ -82,7 +82,8 @@ function doPollAdd() {
  * 항목 삭제
  **/
 function doPollDelete(obj) {
-    var pobj = obj.parentNode.parentNode.parentNode;
+    var pobj = xPrevSib(xPrevSib(obj)).lastChild.lastChild;
+    if(!pobj || typeof(pobj.id)=='undefined') return;
     var tmp_arr = pobj.id.split('_');
     var index = tmp_arr[1];
     if(index==1) return;
@@ -106,7 +107,7 @@ function doPollDelete(obj) {
  * 새 항목 추가
  **/
 function doPollAddItem(obj) {
-    var tbl = xPrevSib(obj.parentNode.parentNode);
+    var tbl = xPrevSib(obj);
     var tbody = tbl.lastChild;
     var tmp = tbody.firstChild;
     var source = null;
diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html
index cf1bc5d92..495289009 100644
--- a/modules/editor/components/quotation/tpl/popup.html
+++ b/modules/editor/components/quotation/tpl/popup.html
@@ -2,13 +2,13 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="120" />
         <col />
         <col />
@@ -21,7 +21,7 @@
                 <input type="checkbox" id="quotation_use" value="Y" onclick="toggle_folder(this)" />
 
                 <div id="folder_area" style="display:none">
-                    <table cellspacing="0" class="adminTable gap1">
+                    <table cellspacing="0" class="colTable gap1">
                     <col width="150" />
                     <col />
                     <tr>
@@ -142,9 +142,8 @@
         </table>
     </div>
 
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertQuotation()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="insertQuotation()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/components/table_maker/tpl/popup.html b/modules/editor/components/table_maker/tpl/popup.html
index 720905d62..75a8c8987 100644
--- a/modules/editor/components/table_maker/tpl/popup.html
+++ b/modules/editor/components/table_maker/tpl/popup.html
@@ -2,8 +2,8 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" onSubmit="return false" id="fo">
@@ -18,7 +18,7 @@
 
         <div id="table_attribute" style="display:none">
             <div class="" id="col_row_area" style="display:none" >
-                <table cellspacing="0" class="adminTable">
+                <table cellspacing="0" class="rowTable">
                 <col width="25%" />
                 <col width="25%" />
                 <col width="25%" />
@@ -32,7 +32,7 @@
                 </table>
             </div>
 
-            <table cellspacing="0" class="adminTable">
+            <table cellspacing="0" class="rowTable">
             <col width="25%" />
             <col />
             <tr>
@@ -47,7 +47,7 @@
 
         </div>
 
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="25%" />
         <col width="25%" />
         <col width="25%" />
@@ -130,9 +130,8 @@
         </div>
     </div>
 
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="insertTable()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="insertTable()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 </form>
diff --git a/modules/editor/components/url_link/tpl/popup.html b/modules/editor/components/url_link/tpl/popup.html
index 777dacfbb..6f0edb8bd 100644
--- a/modules/editor/components/url_link/tpl/popup.html
+++ b/modules/editor/components/url_link/tpl/popup.html
@@ -2,14 +2,14 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div id="popHeadder">
-    <h3>{$component_info->title} ver. {$component_info->version}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
 </div>
 
 <form action="./" method="get" id="fo_component" onSubmit="return false">
 
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <col width="100" />
         <col />
 
@@ -56,9 +56,8 @@
         </tr>
         </table>
     </div>
-    <div id="popFooter" class="tCenter">
-        <a href="#" onclick="setText()" class="button"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <a href="#" onclick="setText()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
         <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
     </div>
 
diff --git a/modules/editor/conf/module.xml b/modules/editor/conf/module.xml
index 64b478ddd..66ee7d9f2 100644
--- a/modules/editor/conf/module.xml
+++ b/modules/editor/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispEditorPopup" type="view" standalone="true" />
         <action name="dispEditorComponentInfo" type="view" standalone="true" />
diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php
index 4394e013c..56df8317d 100644
--- a/modules/editor/editor.admin.controller.php
+++ b/modules/editor/editor.admin.controller.php
@@ -17,11 +17,18 @@
          * @brief 컴포넌트의 활성화
          **/
         function procEditorAdminEnableComponent() {
+            $site_module_info = Context::get('site_module_info');
+
             $args->component_name = Context::get('component_name');
             $args->enabled = 'Y';
-            $output = executeQuery('editor.updateComponent', $args);
+            $args->site_srl = (int)$site_module_info->site_srl;
+            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+            else $output = executeQuery('editor.updateSiteComponent', $args);
             if(!$output->toBool()) return $output;
 
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($args->site_srl);
+
             $this->setMessage('success_updated');
         }
 
@@ -29,11 +36,18 @@
          * @brief 컴포넌트의 비활성화
          **/
         function procEditorAdminDisableComponent() {
+            $site_module_info = Context::get('site_module_info');
+
             $args->component_name = Context::get('component_name');
             $args->enabled = 'N';
-            $output = executeQuery('editor.updateComponent', $args);
+            $args->site_srl = (int)$site_module_info->site_srl;
+            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+            else $output = executeQuery('editor.updateSiteComponent', $args);
             if(!$output->toBool()) return $output;
 
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($args->site_srl);
+
             $this->setMessage('success_updated');
         }
 
@@ -41,11 +55,15 @@
          * @brief 컴포넌트의 위치 변경
          **/
         function procEditorAdminMoveListOrder() {
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
             $args->component_name = Context::get('component_name');
             $mode = Context::get('mode');
 
             // DB에서 전체 목록 가져옴
-            $output = executeQuery('editor.getComponentList', $args);
+            if(!$args->site_srl) $output = executeQuery('editor.getComponentList', $args);
+            else $output = executeQuery('editor.getSiteComponentList', $args);
+
             $db_list = $output->data;
             foreach($db_list as $key => $val) {
                 if($val->component_name == $args->component_name) break;
@@ -56,23 +74,36 @@
 
                 $prev_args->component_name = $db_list[$key-1]->component_name;
                 $prev_args->list_order = $db_list[$key]->list_order;
-                executeQuery('editor.updateComponent', $prev_args);
+                $prev_args->site_srl = $args->site_srl;
+                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $prev_args);
+                else $output = executeQuery('editor.updateSiteComponent', $prev_args);
 
                 $cur_args->component_name = $db_list[$key]->component_name;
                 $cur_args->list_order = $db_list[$key-1]->list_order;
-                executeQuery('editor.updateComponent', $cur_args);
+                if($prev_args->list_order == $cur_args->list_order) $cur_args->list_order--;
+                $cur_args->site_srl = $args->site_srl;
+                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $cur_args);
+                else $output = executeQuery('editor.updateSiteComponent', $cur_args);
             } else {
                 if($key == count($db_list)-1) return new Object(-1,'msg_component_is_last_order');
 
                 $next_args->component_name = $db_list[$key+1]->component_name;
                 $next_args->list_order = $db_list[$key]->list_order;
-                executeQuery('editor.updateComponent', $next_args);
+                $next_args->site_srl = $args->site_srl;
+                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $next_args);
+                else $output = executeQuery('editor.updateSiteComponent', $next_args);
 
                 $cur_args->component_name = $db_list[$key]->component_name;
                 $cur_args->list_order = $db_list[$key+1]->list_order;
-                executeQuery('editor.updateComponent', $cur_args);
+                $cur_args->site_srl = $args->site_srl;
+                if($next_args->list_order == $cur_args->list_order) $cur_args->list_order++;
+                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $cur_args);
+                else $output = executeQuery('editor.updateSiteComponent', $cur_args);
             }
 
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($args->site_srl);
+
             $this->setMessage('success_updated');
         }
 
@@ -80,6 +111,8 @@
          * @brief 컴포넌트 설정
          **/
         function procEditorAdminSetupComponent() {
+            $site_module_info = Context::get('site_module_info');
+
             $component_name = Context::get('component_name');
             $extra_vars = Context::getRequestVars();
             unset($extra_vars->component_name);
@@ -92,30 +125,41 @@
 
             $args->component_name = $component_name;
             $args->extra_vars = serialize($extra_vars);
+            $args->site_srl = (int)$site_module_info->site_srl;
 
-            $output = executeQuery('editor.updateComponent', $args);
+            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+            else $output = executeQuery('editor.updateSiteComponent', $args);
             if(!$output->toBool()) return $output;
 
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($args->site_srl);
+
             $this->setMessage('success_updated');
         }
 
         /**
          * @brief 컴포넌트를 DB에 추가
          **/
-        function insertComponent($component_name, $enabled = false) {
+        function insertComponent($component_name, $enabled = false, $site_srl = 0) {
             if($enabled) $enabled = 'Y';
             else $enabled = 'N';
 
             $args->component_name = $component_name;
             $args->enabled = $enabled;
+            $args->site_srl = $site_srl;
 
             // 컴포넌트가 있는지 확인
-            $output = executeQuery('editor.isComponentInserted', $args);
+            if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
+            else $output = executeQuery('editor.isSiteComponentInserted', $args);
             if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
 
             // 입력
             $args->list_order = getNextSequence();
-            $output = executeQuery('editor.insertComponent', $args);
+            if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
+            else $output = executeQuery('editor.insertSiteComponent', $args);
+
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($site_srl);
             return $output;
         }
     }
diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php
index 08bc29c9c..0b437d7cb 100644
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@@ -18,9 +18,12 @@
          * 에디터 컴포넌트의 on/off 및 설정을 담당
          **/
         function dispEditorAdminIndex() {
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
             // 컴포넌트의 종류를 구해옴
             $oEditorModel = &getModel('editor');
-            $component_list = $oEditorModel->getComponentList(false);
+            $component_list = $oEditorModel->getComponentList(false, $site_srl);
 
             Context::set('component_list', $component_list);
 
@@ -32,28 +35,32 @@
          * @brief 컴퍼넌트 setup
          **/
         function dispEditorAdminSetupComponent() {
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
             $component_name = Context::get('component_name');
 
             // 에디터 컴포넌트의 정보를 구함
             $oEditorModel = &getModel('editor');
-            $component = $oEditorModel->getComponent($component_name);
+            $component = $oEditorModel->getComponent($component_name,$site_srl);
             Context::set('component', $component);
 
             // 그룹 설정을 위한 그룹 목록을 구함
             $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
+            $group_list = $oMemberModel->getGroups($site_srl);
             Context::set('group_list', $group_list);
 
             // mid 목록을 가져옴
             $oModuleModel = &getModel('module');
 
-            // 모듈 카테고리 목록을 구함
-            $module_categories = $oModuleModel->getModuleCategories();
-
-            $mid_list = $oModuleModel->getMidList();
+            $args->site_srl = $site_srl;
+            $mid_list = $oModuleModel->getMidList($args);
 
             // module_category와 module의 조합
-            if($module_categories) {
+            if(!$args->site_srl) {
+                // 모듈 카테고리 목록을 구함
+                $module_categories = $oModuleModel->getModuleCategories();
+
                 foreach($mid_list as $module_srl => $module) {
                     $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
                 }
diff --git a/modules/editor/editor.class.php b/modules/editor/editor.class.php
index 50392dd00..a631b47ed 100644
--- a/modules/editor/editor.class.php
+++ b/modules/editor/editor.class.php
@@ -13,8 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('editor', 'view', 'dispEditorAdminIndex');
-            $oModuleController->insertActionForward('editor', 'view', 'dispEditorAdminSetupComponent');
 
             // 기본 에디터 컴포넌트를 추가
             $oEditorController = &getAdminController('editor');
@@ -85,39 +83,5 @@
             // 에디터 컴포넌트 캐시 파일 삭제
             FileHandler::removeFilesInDir("./files/cache/editor");
         }
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procEditorAdminInsertModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 4467791ca..16928ec26 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -171,5 +171,134 @@
             $this->setMessage('success_updated');
         }
 
+        /**
+         * @brief 가상 사이트에서 사용된 에디터 컴포넌트 정보를 제거
+         **/
+        function removeEditorConfig($site_srl) {
+            $args->site_srl = $site_srl;
+            executeQuery('editor.deleteSiteComponent', $args);
+        }
+
+        /**
+         * @brief 에디터 컴포넌트 목록 캐싱 (editorModel::getComponentList)
+         * 에디터 컴포넌트 목록의 경우 DB query + Xml Parsing 때문에 캐싱 파일을 이용하도록 함
+         **/
+        function makeCache($filter_enabled = true, $site_srl) {
+            $oEditorModel = &getModel('editor');
+
+            if($filter_enabled) $args->enabled = "Y";
+
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('editor.getSiteComponentList', $args);
+            } else $output = executeQuery('editor.getComponentList', $args);
+            $db_list = $output->data;
+
+            // 파일목록을 구함
+            $downloaded_list = FileHandler::readDir(_XE_PATH_.'modules/editor/components');
+
+            // 로그인 여부 및 소속 그룹 구함
+            $is_logged = Context::get('is_logged');
+            if($is_logged) {
+                $logged_info = Context::get('logged_info');
+                if($logged_info->group_list && is_array($logged_info->group_list)) {
+                    $group_list = array_keys($logged_info->group_list);
+                } else $group_list = array();
+            }
+
+            // DB 목록을 loop돌면서 xml정보까지 구함
+            if(!is_array($db_list)) $db_list = array($db_list);
+            foreach($db_list as $component) {
+                if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+
+                $component_name = $component->component_name;
+                if(!$component_name) continue;
+
+                if(!in_array($component_name, $downloaded_list)) continue;
+
+                unset($xml_info);
+                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
+                $xml_info->enabled = $component->enabled;
+
+                if($component->extra_vars) {
+                    $extra_vars = unserialize($component->extra_vars);
+
+                    // 사용권한이 있으면 권한 체크
+                    if($extra_vars->target_group) {
+                        // 사용권한이 체크되어 있는데 로그인이 되어 있지 않으면 무조건 사용 중지
+                        if(!$is_logged) continue;
+
+                        // 대상 그룹을 구해서 현재 로그인 사용자의 그룹과 비교
+                        $target_group = $extra_vars->target_group;
+                        unset($extra_vars->target_group);
+
+                        $is_granted = false;
+                        foreach($group_list as $group_srl) {
+                            if(in_array($group_srl, $target_group)) {
+                                $is_granted = true;
+                                break;
+                            }
+                        }
+                        if(!$is_granted) continue;
+                    }
+
+                    // 대상 모듈이 있으면 체크
+                    if($extra_vars->mid_list && count($extra_vars->mid_list) && Context::get('mid')) {
+                        if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
+                    }
+
+                    // 에디터 컴포넌트의 설정 정보를 체크
+                    if($xml_info->extra_vars) {
+                        foreach($xml_info->extra_vars as $key => $val) {
+                            $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
+                        }
+                    }
+                }
+
+                $component_list->{$component_name} = $xml_info;
+            }
+
+            // enabled만 체크하도록 하였으면 그냥 return
+            if($filter_enabled) {
+                $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
+                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+                FileHandler::writeFile($cache_file, $buff);
+                return $component_list;
+            }
+
+            // 다운로드된 목록의 xml_info를 마저 구함
+            foreach($downloaded_list as $component_name) {
+                if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+
+                // 설정된 것이라면 패스
+                if($component_list->{$component_name}) continue;
+
+                // DB에 입력
+                $oEditorController = &getAdminController('editor');
+                $oEditorController->insertComponent($component_name, false, $site_srl);
+
+                // component_list에 추가
+                unset($xml_info);
+                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
+                $xml_info->enabled = 'N';
+
+                $component_list->{$component_name} = $xml_info;
+            }
+
+            $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
+            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+            FileHandler::writeFile($cache_file, $buff);
+
+            return $component_list;
+        }
+
+        /**
+         * @brief 캐시 파일 삭제
+         **/
+        function removeCache($site_srl = 0) {
+            $oEditorModel = &getModel('editor');
+            FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
+            FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
+        }
     }
 ?>
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 412e720a1..72b665bfa 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -23,13 +23,13 @@
          * @brief 모듈별 에디터 설정을 return
          **/
         function getEditorConfig($module_srl) {
-            if(!$GLOBLAS['__editor_module_config__'][$module_srl]) {
+            if(!$GLOBALS['__editor_module_config__'][$module_srl]) {
                 // 선택된 모듈의 trackback설정을 가져옴
                 $oModuleModel = &getModel('module');
-                $GLOBLAS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
+                $GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
             }
 
-            $editor_config = $GLOBLAS['__editor_module_config__'][$module_srl];
+            $editor_config = $GLOBALS['__editor_module_config__'][$module_srl];
 
             if(!is_object($editor_config)) $editor_config = null;
 
@@ -158,9 +158,11 @@
             /**
              * 에디터 컴포넌트 체크
              **/
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
             if($enable_component) {
                 if(!Context::get('component_list')) {
-                    $component_list = $this->getComponentList();
+                    $component_list = $this->getComponentList(true, $site_srl);
                     Context::set('component_list', $component_list);
                 }
             }
@@ -345,7 +347,7 @@
         /**
          * @brief component의 객체 생성
          **/
-        function getComponentObject($component, $editor_sequence = 0) {
+        function getComponentObject($component, $editor_sequence = 0, $site_srl = 0) {
             if(!$this->loaded_component_list[$component][$editor_sequence]) {
                 // 해당 컴포넌트의 객체를 생성해서 실행
                 $class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
@@ -359,7 +361,7 @@
                 if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
                 // 설정 정보를 추가
-                $component_info = $this->getComponent($component);
+                $component_info = $this->getComponent($component, $site_srl);
                 $oComponent->setInfo($component_info);
                 $this->loaded_component_list[$component][$editor_sequence] = $oComponent;
             }
@@ -374,111 +376,47 @@
             return FileHandler::readDir('./modules/editor/skins');
         }
 
+        /**
+         * @brief 에디터 컴포넌트 목록 캐시 파일 이름 return
+         **/
+        function getCacheFile($filter_enabled= true, $site_srl = 0) {
+            $cache_path = _XE_PATH_.'files/cache/editor/cache/';
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+            $cache_file = $cache_path.'component_list.';
+            if($filter_enabled) $cache_file .= 'filter.';
+            if($site_srl) $cache_file .= $site_srl.'.';
+            $cache_file .= 'php';
+            return $cache_file;
+        }
+
         /**
          * @brief component 목록을 return (DB정보 보함)
          **/
-        function getComponentList($filter_enabled = true) {
-            if($filter_enabled) $args->enabled = "Y";
-
-            $output = executeQuery('editor.getComponentList', $args);
-            $db_list = $output->data;
-
-            // 파일목록을 구함
-            $downloaded_list = FileHandler::readDir($this->module_path.'components');
-
-            // 로그인 여부 및 소속 그룹 구함
-            $is_logged = Context::get('is_logged');
-            if($is_logged) {
-                $logged_info = Context::get('logged_info');
-                if($logged_info->group_list && is_array($logged_info->group_list)) {
-                    $group_list = array_keys($logged_info->group_list);
-                } else $group_list = array();
+        function getComponentList($filter_enabled = true, $site_srl=0) {
+            $cache_file = $this->getCacheFile($filter_enabled, $site_srl);
+            if(!file_exists($cache_file)) {
+                $oEditorController = &getController('editor');
+                $oEditorController->makeCache($filter_enabled, $site_srl);
             }
 
-            // DB 목록을 loop돌면서 xml정보까지 구함
-            if(!is_array($db_list)) $db_list = array($db_list);
-            foreach($db_list as $component) {
-                if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
-
-                $component_name = $component->component_name;
-                if(!$component_name) continue;
-
-                if(!in_array($component_name, $downloaded_list)) continue;
-
-                unset($xml_info);
-                $xml_info = $this->getComponentXmlInfo($component_name);
-                $xml_info->enabled = $component->enabled;
-
-                if($component->extra_vars) {
-                    $extra_vars = unserialize($component->extra_vars);
-
-                    // 사용권한이 있으면 권한 체크
-                    if($extra_vars->target_group) {
-                        // 사용권한이 체크되어 있는데 로그인이 되어 있지 않으면 무조건 사용 중지
-                        if(!$is_logged) continue;
-
-                        // 대상 그룹을 구해서 현재 로그인 사용자의 그룹과 비교
-                        $target_group = $extra_vars->target_group;
-                        unset($extra_vars->target_group);
-
-                        $is_granted = false;
-                        foreach($group_list as $group_srl) {
-                            if(in_array($group_srl, $target_group)) {
-                                $is_granted = true;
-                                break;
-                            }
-                        }
-                        if(!$is_granted) continue;
-                    }
-
-                    // 대상 모듈이 있으면 체크
-                    if($extra_vars->mid_list && count($extra_vars->mid_list) ) {
-                        if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
-                    }
-
-                    // 에디터 컴포넌트의 설정 정보를 체크
-                    if($xml_info->extra_vars) {
-                        foreach($xml_info->extra_vars as $key => $val) {
-                            $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
-                        }
-                    }
-                }
-
-                $component_list->{$component_name} = $xml_info;
-            }
-
-            // enabled만 체크하도록 하였으면 그냥 return
-            if($filter_enabled) return $component_list;
-
-            // 다운로드된 목록의 xml_info를 마저 구함
-            foreach($downloaded_list as $component_name) {
-                if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
-
-                // 설정된 것이라면 패스
-                if($component_list->{$component_name}) continue;
-
-                // DB에 입력
-                $oEditorController = &getAdminController('editor');
-                $oEditorController->insertComponent($component_name, false);
-
-                // component_list에 추가
-                unset($xml_info);
-                $xml_info = $this->getComponentXmlInfo($component_name);
-                $xml_info->enabled = 'N';
-
-                $component_list->{$component_name} = $xml_info;
-            }
+            if(!file_exists($cache_file)) return;
 
+            @include($cache_file);
             return $component_list;
         }
 
         /**
          * @brief compnent의 xml+db정보를 구함
          **/
-        function getComponent($component_name) {
+        function getComponent($component_name, $site_srl = 0) {
             $args->component_name = $component_name;
 
-            $output = executeQuery('editor.getComponent', $args);
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('editor.getSiteComponent', $args);
+            } else {
+                $output = executeQuery('editor.getComponent', $args);
+            }
             $component = $output->data;
 
             $component_name = $component->component_name;
@@ -512,7 +450,6 @@
                 }
             }
 
-
             return $xml_info;
         }
 
@@ -648,6 +585,7 @@
 
             FileHandler::writeFile($cache_file, $buff, "w");
 
+            include($cache_file);
             return $xml_info;
         }
     }
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index 1467dba62..33eb235ff 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -24,9 +24,12 @@
             $editor_sequence = Context::get('editor_sequence ');
             $component = Context::get('component');
 
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
             // component 객체를 받음
             $oEditorModel = &getModel('editor');
-            $oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence);
+            $oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
             if(!$oComponent->toBool()) {
                 Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
                 $this->setTemplatePath($this->module_path.'tpl');
@@ -52,8 +55,11 @@
         function dispEditorComponentInfo() {
             $component_name = Context::get('component_name');
 
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
             $oEditorModel = &getModel('editor');
-            $component = $oEditorModel->getComponent($component_name);
+            $component = $oEditorModel->getComponent($component_name, $site_srl);
             Context::set('component', $component);
 
             $this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php
index a60c9579a..20cc36f9c 100644
--- a/modules/editor/lang/ko.lang.php
+++ b/modules/editor/lang/ko.lang.php
@@ -26,10 +26,10 @@
     $lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫번째에 위치하고 있습니다.';
     $lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다.';
     $lang->msg_load_saved_doc = "자동 저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동 저장본은 사라집니다.";
-    $lang->msg_auto_saved = "자동 저장되었습니다.";
+    $lang->msg_auto_saved = '자동 저장되었습니다.';
 
-    $lang->cmd_disable = "비활성";
-    $lang->cmd_enable = "활성";
+    $lang->cmd_disable = '비활성';
+    $lang->cmd_enable = '활성';
 
     $lang->editor_skin = '에디터 스킨';
     $lang->upload_file_grant = '파일 첨부 권한';
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
index 9f3c4888c..c9b639892 100644
--- a/modules/editor/lang/zh-CN.lang.php
+++ b/modules/editor/lang/zh-CN.lang.php
@@ -25,7 +25,7 @@
     $lang->msg_component_is_inserted = '您选择的组件已插入！';
     $lang->msg_component_is_first_order = '您选择的组件已到最上端位置！';
     $lang->msg_component_is_last_order = '您选择的组件已到最下端位置！';
-    $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n保存内容后，自动保存的文本将会被删除。";
+    $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n发布主题后，自动保存的文本将会被删除。";
     $lang->msg_auto_saved = '已自动保存！';
 
     $lang->cmd_disable = '非激活';
@@ -52,10 +52,12 @@
     $lang->edit->fontsize = '大小';
     $lang->edit->use_paragraph = '段落功能';
     $lang->edit->fontlist = array(
-    '仿宋_GB2312'=>'仿宋_GB2312',
-    '黑体'=>'黑体',
-    '楷体_GB2312'=>'楷体_GB2312',
     '宋体'=>'宋体',
+    '黑体'=>'黑体',
+    '楷体_GB2312'=>'楷体',
+    '仿宋_GB2312'=>'仿宋',
+    '隶书'=>'隶书',
+    '幼圆'=>'幼圆',
     'Arial'=>'Arial',
     'Arial Black'=>'Arial Black',
     'Tahoma'=>'Tahoma',
@@ -79,25 +81,25 @@
 
     $lang->edit->submit = '确认';
 
-    $lang->edit->fontcolor = 'Text Color';
-    $lang->edit->fontbgcolor = 'Background Color';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Style Remover';
+    $lang->edit->fontcolor = '文本颜色';
+    $lang->edit->fontbgcolor = '背景颜色';
+    $lang->edit->bold = '粗体';
+    $lang->edit->italic = '斜体';
+    $lang->edit->underline = '下划线';
+    $lang->edit->strike = '取消线';
+    $lang->edit->sup = '上标';
+    $lang->edit->sub = '下标';
+    $lang->edit->redo = '恢复';
+    $lang->edit->undo = '撤销';
+    $lang->edit->align_left = '左对齐';
+    $lang->edit->align_center = '居中对齐';
+    $lang->edit->align_right = '右对齐';
+    $lang->edit->align_justify = '两端对齐';
+    $lang->edit->add_indent = '增加缩进';
+    $lang->edit->remove_indent = '减少缩进';
+    $lang->edit->list_number = '有序列表';
+    $lang->edit->list_bullet = '无序列表';
+    $lang->edit->remove_format = '删除文字格式';
 
     $lang->edit->help_fontcolor = '文本颜色';
     $lang->edit->help_fontbgcolor = '背景颜色';
@@ -105,29 +107,29 @@
     $lang->edit->help_italic = '斜体';
     $lang->edit->help_underline = '下划线';
     $lang->edit->help_strike = '取消线';
-    $lang->edit->help_sup = 'Sup';
-    $lang->edit->help_sub = 'Sub';
-    $lang->edit->help_redo = '重新操作';
-    $lang->edit->help_undo = '返回操作';
+    $lang->edit->help_sup = '上标';
+    $lang->edit->help_sub = '下标';
+    $lang->edit->help_redo = '恢复';
+    $lang->edit->help_undo = '撤销';
     $lang->edit->help_align_left = '左对齐';
     $lang->edit->help_align_center = '居中对齐';
     $lang->edit->help_align_right = '右对齐';
-    $lang->edit->help_add_indent = '缩进';
-    $lang->edit->help_remove_indent = '清除缩进';
+    $lang->edit->help_add_indent = '增加缩进';
+    $lang->edit->help_remove_indent = '减少缩进';
     $lang->edit->help_list_number = '有序列表';
     $lang->edit->help_list_bullet = '无序列表';
     $lang->edit->help_use_paragraph = '分段请按 ctrl＋回车． (发表主题快捷键：alt＋S)';
 
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
+    $lang->edit->url = '插入链接';
+    $lang->edit->blockquote = '插入注释框';
+    $lang->edit->table = '表格';
+    $lang->edit->image = '图片';
+    $lang->edit->multimedia = '视频';
+    $lang->edit->emoticon = '表情图标';
 
     $lang->edit->upload = '上传';
     $lang->edit->upload_file = '上传附件';
-    $lang->edit->link_file = '插入内容';
+    $lang->edit->link_file = '插入附件';
     $lang->edit->delete_selected = '删除所选';
 
     $lang->edit->icon_align_article = '占一个段落';
diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php
index 2ac4f735e..25f1f917b 100644
--- a/modules/editor/lang/zh-TW.lang.php
+++ b/modules/editor/lang/zh-TW.lang.php
@@ -2,7 +2,7 @@
     /**
      * @file   modules/editor/lang/zh-TW.lang.php
      * @author zero <zero@nzeo.com> 翻譯：royallin
-     * @brief  網頁編輯器(editor) 模組語言
+     * @brief  網頁編輯器(editor)模組語言
      **/
 
     $lang->editor = '網頁編輯器';
@@ -46,7 +46,7 @@
     $lang->about_editor_height = '指定編輯器的預設高度。';
     $lang->about_editor_height_resizable = '允許用戶拖曳編輯器高度。';
     $lang->about_enable_html_grant = 'HTML原始碼編輯權限設置。';
-    $lang->about_enable_autosave = '發表主題時，啟動內容自動儲存功能。';
+    $lang->about_enable_autosave = '發表主題時，開啟內容自動儲存功能。';
 
     $lang->edit->fontname = '字體';
     $lang->edit->fontsize = '大小';
@@ -78,25 +78,25 @@
 
     $lang->edit->submit = '確認';
 
-    $lang->edit->fontcolor = 'Text Color';
-    $lang->edit->fontbgcolor = 'Background Color';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Style Remover';
+    $lang->edit->fontcolor = '文字顏色';
+    $lang->edit->fontbgcolor = '背景顏色';
+    $lang->edit->bold = '粗體';
+    $lang->edit->italic = '斜體';
+    $lang->edit->underline = '底線';
+    $lang->edit->strike = '虛線';
+    $lang->edit->sup = '上標';
+    $lang->edit->sub = '下標';
+    $lang->edit->redo = '重新操作';
+    $lang->edit->undo = '返回操作';
+    $lang->edit->align_left = '靠左對齊';
+    $lang->edit->align_center = '置中對齊';
+    $lang->edit->align_right = '靠右對齊';
+    $lang->edit->align_justify = '左右對齊';
+    $lang->edit->add_indent = '縮排';
+    $lang->edit->remove_indent = '凸排';
+    $lang->edit->list_number = '編號';
+    $lang->edit->list_bullet = '清單符號';
+    $lang->edit->remove_format = '移除格式';
 
     $lang->edit->help_remove_format = '移除格式';
     $lang->edit->help_strike_through = '文字刪除線';
@@ -108,8 +108,8 @@
     $lang->edit->help_italic = '斜體';
     $lang->edit->help_underline = '底線';
     $lang->edit->help_strike = '虛線';
-    $lang->edit->help_sup = 'Sup';
-    $lang->edit->help_sub = 'Sub';
+    $lang->edit->help_sup = '上標';
+    $lang->edit->help_sub = '下標';
     $lang->edit->help_redo = '重新操作';
     $lang->edit->help_undo = '返回操作';
     $lang->edit->help_align_left = '靠左對齊';
@@ -119,14 +119,14 @@
     $lang->edit->help_remove_indent = '凸排';
     $lang->edit->help_list_number = '編號';
     $lang->edit->help_list_bullet = '清單符號';
-    $lang->edit->help_use_paragraph = '換行請按 ctrl+backspace (快速發表主題：alt+S)';
+    $lang->edit->help_use_paragraph = '換行請按 Ctrl+Backspace (快速發表主題：Alt+S)';
 
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
+    $lang->edit->url = '連結';
+    $lang->edit->blockquote = '引用';
+    $lang->edit->table = '表格';
+    $lang->edit->image = '圖片';
+    $lang->edit->multimedia = '影片';
+    $lang->edit->emoticon = '表情符號';
 
     $lang->edit->upload = '上傳';
     $lang->edit->upload_file = '上傳附檔';
@@ -138,10 +138,10 @@
     $lang->edit->icon_align_middle = '置中';
     $lang->edit->icon_align_right = '靠右';
 
-    $lang->about_dblclick_in_editor = '對背景, 文字, 圖片, 引用等組件按兩下，即可對其相關組件進行詳細設置。';
+    $lang->about_dblclick_in_editor = '對背景，文字，圖片，引用等組件按兩下，即可對其相關組件進行詳細設置。';
 
 
-    $lang->edit->rich_editor = '所見即所得';
+    $lang->edit->rich_editor = '所見即得';
     $lang->edit->html_editor = 'HTML';
     $lang->edit->extension ='延伸組件';
     $lang->edit->help = '使用說明';
diff --git a/modules/editor/queries/deleteSiteComponent.xml b/modules/editor/queries/deleteSiteComponent.xml
new file mode 100644
index 000000000..4ea54e565
--- /dev/null
+++ b/modules/editor/queries/deleteSiteComponent.xml
@@ -0,0 +1,8 @@
+<query id="deleteSiteComponent" action="delete">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" />
+    </conditions>
+</query>
diff --git a/modules/editor/queries/getSiteComponent.xml b/modules/editor/queries/getSiteComponent.xml
new file mode 100644
index 000000000..9e0198805
--- /dev/null
+++ b/modules/editor/queries/getSiteComponent.xml
@@ -0,0 +1,12 @@
+<query id="getSiteComponent" action="select">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and"/>
+    </conditions>
+</query>
diff --git a/modules/editor/queries/getSiteComponentList.xml b/modules/editor/queries/getSiteComponentList.xml
new file mode 100644
index 000000000..718aa7906
--- /dev/null
+++ b/modules/editor/queries/getSiteComponentList.xml
@@ -0,0 +1,15 @@
+<query id="getSiteComponentList" action="select">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="enabled" var="enabled" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="list_order" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/editor/queries/insertSiteComponent.xml b/modules/editor/queries/insertSiteComponent.xml
new file mode 100644
index 000000000..f843e84c2
--- /dev/null
+++ b/modules/editor/queries/insertSiteComponent.xml
@@ -0,0 +1,11 @@
+<query id="insertSiteComponent" action="insert">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <columns>
+        <column name="site_srl" var="site_srl" notnull="notnull" />
+        <column name="component_name" var="component_name" notnull="notnull" />
+        <column name="enabled" var="enabled" default="N" />
+        <column name="list_order" var="list_order" default="sequence()" />
+    </columns>
+</query>
diff --git a/modules/editor/queries/isSiteComponentInserted.xml b/modules/editor/queries/isSiteComponentInserted.xml
new file mode 100644
index 000000000..b92d16dfb
--- /dev/null
+++ b/modules/editor/queries/isSiteComponentInserted.xml
@@ -0,0 +1,12 @@
+<query id="isSiteComponentInserted" action="select">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/editor/queries/updateSiteComponent.xml b/modules/editor/queries/updateSiteComponent.xml
new file mode 100644
index 000000000..bf3a3b9d6
--- /dev/null
+++ b/modules/editor/queries/updateSiteComponent.xml
@@ -0,0 +1,14 @@
+<query id="updateSiteComponent" action="update">
+    <tables>
+        <table name="editor_components_site" />
+    </tables>
+    <columns>
+        <column name="enabled" var="enabled" />
+        <column name="extra_vars" var="extra_vars" />
+        <column name="list_order" var="list_order" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull"/>
+        <condition operation="equal" column="component_name" var="component_name" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/editor/schemas/editor_components_site.xml b/modules/editor/schemas/editor_components_site.xml
new file mode 100644
index 000000000..0613eae46
--- /dev/null
+++ b/modules/editor/schemas/editor_components_site.xml
@@ -0,0 +1,7 @@
+<table name="editor_components_site">
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" unique="unique_component_site" />
+    <column name="component_name" type="varchar" size="250" notnull="notnull" unique="unique_component_site" />
+    <column name="enabled" type="char" size="1" default="N" notnull="notnull" />
+    <column name="extra_vars" type="text"/>
+    <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
+</table>
diff --git a/modules/editor/skins/default/css/editor.css b/modules/editor/skins/default/css/editor.css
index 521aa716a..8a167c1f1 100644
--- a/modules/editor/skins/default/css/editor.css
+++ b/modules/editor/skins/default/css/editor.css
@@ -46,8 +46,8 @@ a.skipToolBox:active span{ width:auto; height:auto; padding:3px 15px; font-weigh
 .toolBox:after{ content:""; display:block; clear:both;}
 .toolBox .item{ float:left; margin:0 5px 5px 0;}
 .toolBox .item li{ float:left;}
-.toolBox .item li button{ display:block; border:0; width:21px; height:21px; background-position:no-repeat; cursor:pointer;}
-.toolBox .item li button span{ position:relative; z-index:-1; font-size:0; line-height:0;}
+.toolBox .item li button{ display:block; border:0; width:21px; height:21px; background-position:no-repeat; cursor:pointer; overflow:hidden; }
+.toolBox .item li button span {position:relative !important; z-index:-1 !important; font-size:0 !important; line-height:0 !important;}
 
 .toolBox .extension2{ float:left; position:relative; margin:0 5px 5px 0;}
 .toolBox .extension2 .exButton{ float:left; border:0; width:68px; height:21px; background-repeat:no-repeat; background-position:-579px 0; cursor:pointer;}
diff --git a/modules/editor/skins/default/skin.xml b/modules/editor/skins/default/skin.xml
index 0542409cc..bceb8cf27 100644
--- a/modules/editor/skins/default/skin.xml
+++ b/modules/editor/skins/default/skin.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <skin version="0.2">
     <title xml:lang="ko">XE 기본 에디터</title>
+    <title xml:lang="es">XE básico Editor</title>
+    <title xml:lang="en">XE default Editor</title>
     <title xml:lang="zh-CN">XE编辑器默认皮肤</title>
     <title xml:lang="jp">XE基本エディター</title>
     <title xml:lang="zh-TW">XE預設編輯器面板</title>
     <description xml:lang="ko">개발 : zero (http://blog.nzeo.com)</description>
+    <description xml:lang="en">Developer : zero (http://blog.nzeo.com)</description>
+    <description xml:lang="es">Desarrollo : zero (http://blog.nzeo.com)</description>
     <description xml:lang="zh-CN">程序 : zero (http://blog.nzeo.com)</description>
     <description xml:lang="jp">開発 : zero (http://blog.nzeo.com)</description>
     <description xml:lang="zh-TW">開發 : zero (http://blog.nzeo.com)</description>
@@ -15,6 +19,8 @@
         <name xml:lang="ko">zero</name>
         <name xml:lang="zh-CN">Zero</name>
         <name xml:lang="jp">zero</name>
+	<name xml:lang="es">zero</name>
+	<name xml:lang="en">zero</name>
         <name xml:lang="zh-TW">zero</name>
     </author>
     <colorset>
@@ -40,8 +46,8 @@
             <title xml:lang="jp">白色テキストエディター(自動に改行を入れる)</title>
             <title xml:lang="en">White Text Editor(Auto Line Break)</title>
             <title xml:lang="ru">White Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">White Text Editor(Auto Line Break)</title>
-            <title xml:lang="zh-CN">White Text Editor(Auto Line Break)</title>
+            <title xml:lang="es">Editor de texto en blanco (Auto de línea)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(自动换行)</title>
             <title xml:lang="zh-TW">白色文字編輯器(Auto Line Break)</title>
         </color>
         <color name="black_texteditor">
@@ -49,8 +55,8 @@
             <title xml:lang="jp">黒色テキストエディター(自動に改行を入れる)</title>
             <title xml:lang="en">Black Text Editor(Auto Line Break)</title>
             <title xml:lang="ru">Black Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">Black Text Editor(Auto Line Break)</title>
-            <title xml:lang="zh-CN">Black Text Editor(Auto Line Break)</title>
+            <title xml:lang="es">Editor de texto negro (salto de línea automático)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(自动换行)</title>
             <title xml:lang="zh-TW">黑色文字編輯器(Auto Line Break)</title>
         </color>
         <color name="white_text_usehtml">
@@ -58,8 +64,8 @@
             <title xml:lang="jp">白色テキストエディター(HTMLタグを使う)</title>
             <title xml:lang="en">White Text Editor(Use HTML)</title>
             <title xml:lang="ru">White Text Editor(Use HTML)</title>
-            <title xml:lang="es">White Text Editor(Use HTML)</title>
-            <title xml:lang="zh-CN">White Text Editor(Use HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (Uso de HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(使用HTML)</title>
             <title xml:lang="zh-TW">白色文字編輯器(Use HTML)</title>
         </color>
         <color name="black_text_usehtml">
@@ -67,8 +73,8 @@
             <title xml:lang="jp">黒色テキストエディター(HTMLタグを使う)</title>
             <title xml:lang="en">Black Text Editor(Use HTML)</title>
             <title xml:lang="ru">Black Text Editor(Use HTML)</title>
-            <title xml:lang="es">Black Text Editor(Use HTML)</title>
-            <title xml:lang="zh-CN">Black Text Editor(Use HTML)</title>
+            <title xml:lang="es">Editor de texto negro (Uso de HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML)</title>
             <title xml:lang="zh-TW">黑色文字編輯器(Use HTML)</title>
         </color>
         <color name="white_text_nohtml">
@@ -76,8 +82,8 @@
             <title xml:lang="jp">白色テキストエディター(HTMLタグを使わない)</title>
             <title xml:lang="en">White Text Editor(No HTML)</title>
             <title xml:lang="ru">White Text Editor(No HTML)</title>
-            <title xml:lang="es">White Text Editor(No HTML)</title>
-            <title xml:lang="zh-CN">White Text Editor(No HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (no HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(不使用HTML)</title>
             <title xml:lang="zh-TW">白色文字編輯器(No HTML)</title>
         </color>
         <color name="black_text_nohtml">
@@ -85,8 +91,8 @@
             <title xml:lang="jp">黒色テキストエディター(HTMLタグを使わない)</title>
             <title xml:lang="en">Black Text Editor(No HTML)</title>
             <title xml:lang="ru">Black Text Editor(No HTML)</title>
-            <title xml:lang="es">Black Text Editor(No HTML)</title>
-            <title xml:lang="zh-CN">Black Text Editor(No HTML)</title>
+            <title xml:lang="es">Editor de texto negro (no HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(不使用HTML)</title>
             <title xml:lang="zh-TW">黑色文字編輯器(No HTML)</title>
         </color>
     </colorset>
diff --git a/modules/editor/skins/fckeditor/editor.html b/modules/editor/skins/fckeditor/editor.html
new file mode 100644
index 000000000..efaf4a4f0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor.html
@@ -0,0 +1,99 @@
+<!--// 스킨 css 로드 -->
+<!--%import("../default/css/editor.css")-->
+<!--%import("../default/css/white.css")-->
+<script type="text/javascript">
+    var editor_path = "{$editor_path}";
+</script>
+
+
+
+<!--// 기본 js/언어파일 로드 -->
+<!--%import("fckeditor.js",optimized=false)-->
+<!--%import("../../tpl/js/editor_common.js",optimized=false)-->
+<!--%import("js/xe_interface.js",optimized=false)-->
+
+<!-- 자동저장용 폼 -->
+<!--@if($enable_autosave)-->
+<input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
+<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
+<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
+<!--@end-->
+
+<div class="xeEditor">
+        <!--@if($enable_autosave)-->
+        <p class="editor_autosaved_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
+        <!--@end-->
+    <!-- 에디터 출력 -->
+    <textarea id="fckeditor_{$editor_sequence}">qweqwe</textarea>
+
+    <!--@if($enable_component)-->
+    <!-- 확장 컴포넌트 출력 -->
+    <div style="display:none" id="editorExtension_{$editor_sequence}">
+        <ul id="editor_component_{$editor_sequence}" class="editorComponent">
+            <!--@foreach($component_list as $component_name => $component)-->
+                <!--@if(!in_array($component_name,array('colorpicker_bg','colorpicker_text','emoticon','image_link','multimedia_link','quotation','table_maker','url_link')))-->
+                    <li><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}"><img src="../../components/{$component_name}/component_icon.gif" alt="" /> {$component->title}</a></li>
+                <!--@end-->
+            <!--@end-->
+        </ul>
+    </div>
+    <!--@end-->
+
+<script type="text/javascript">//<![CDATA[
+
+    var fck_{$editor_sequence};
+    var auto_saved_msg = "{$lang->msg_auto_saved}";
+    if(document.getElementById("comment_{$editor_sequence}") == null || document.getElementById("comment_{$editor_sequence}").style.display != 'none') {
+
+        fck_{$editor_sequence} = editorStart_fck(
+            fck_{$editor_sequence}
+            ,document.getElementById("fckeditor_{$editor_sequence}")
+            ,{$editor_sequence}
+            ,"{$editor_content_key_name}"
+            ,"{$editor_height}px"
+            ,"{$editor_primary_key_name}"
+            ,editor_path
+            );
+    }
+
+    function getEditorExtension(editor_sequence){
+        return document.getElementById('editorExtension_'+editor_sequence).innerHTML;
+    };
+//]]></script>
+
+
+    <!--@if($allow_fileupload)-->
+        <!-- 첨부파일 영역 -->
+        <!--%import("../../tpl/js/uploader.js",optimized=false)-->
+        <!--%import("../../tpl/js/swfupload.js",optimized=false)-->
+        <script type="text/javascript">//<![CDATA[
+            editorUploadInit(
+                {
+                    "editorSequence" : {$editor_sequence},
+                    "sessionName" : "{session_name()}",
+                    "allowedFileSize" : "{$file_config->allowed_filesize}",
+                    "allowedFileTypes" : "{$file_config->allowed_filetypes}",
+                    "allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
+                    "insertedFiles" : {(int)$files_count},
+                    "replaceButtonID" : "swfUploadButton{$editor_sequence}",
+                    "fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
+                    "previewAreaID" : "preview_uploaded_{$editor_sequence}",
+                    "uploaderStatusID" : "uploader_status_{$editor_sequence}"
+                }
+            );
+        //]]></script>
+        <!-- 파일 업로드 영역 -->
+        <div id="fileUploader_{$editor_sequence}" class="fileUploader">
+            <div class="preview" id="preview_uploaded_{$editor_sequence}"></div>
+            <div class="fileListArea">
+                <select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="fileList" title="Attached File List"><option></option></select>
+            </div>
+            <div class="fileUploadControl">
+                <span class="button" id="swfUploadButton{$editor_sequence}"><button type="button">{$lang->edit->upload_file}</button></span>
+                <span class="button"><button type="button" onclick="removeUploadedFile('{$editor_sequence}');return false;">{$lang->edit->delete_selected}</button></span>
+                <span class="button"><button type="button" onclick="insertUploadedFile('{$editor_sequence}');return false;">{$lang->edit->link_file}</button></span>
+            </div>
+            <div class="file_attach_info" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
+        </div>
+    <!--@end-->
+</div>
\ No newline at end of file
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckcontextmenu.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckcontextmenu.js
new file mode 100644
index 000000000..1575c49f0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckcontextmenu.js
@@ -0,0 +1,223 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKContextMenu Class: renders an control a context menu.
+ */
+
+var FCKContextMenu = function( parentWindow, langDir )
+{
+	this.CtrlDisable = false ;
+
+	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
+	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
+	oPanel.IsContextMenu = true ;
+
+	// The FCKTools.DisableSelection doesn't seems to work to avoid dragging of the icons in Mozilla
+	// so we stop the start of the dragging
+	if ( FCKBrowserInfo.IsGecko )
+		oPanel.Document.addEventListener( 'draggesture', function(e) {e.preventDefault(); return false;}, true ) ;
+
+	var oMenuBlock = this._MenuBlock = new FCKMenuBlock() ;
+	oMenuBlock.Panel = oPanel ;
+	oMenuBlock.OnClick = FCKTools.CreateEventListener( FCKContextMenu_MenuBlock_OnClick, this ) ;
+
+	this._Redraw = true ;
+}
+
+
+FCKContextMenu.prototype.SetMouseClickWindow = function( mouseClickWindow )
+{
+	if ( !FCKBrowserInfo.IsIE )
+	{
+		this._Document = mouseClickWindow.document ;
+		if ( FCKBrowserInfo.IsOpera && !( 'oncontextmenu' in document.createElement('foo') ) )
+		{
+			this._Document.addEventListener( 'mousedown', FCKContextMenu_Document_OnMouseDown, false ) ;
+			this._Document.addEventListener( 'mouseup', FCKContextMenu_Document_OnMouseUp, false ) ;
+		}
+		this._Document.addEventListener( 'contextmenu', FCKContextMenu_Document_OnContextMenu, false ) ;
+	}
+}
+
+/**
+ The customData parameter is just a value that will be send to the command that is executed,
+ so it's possible to reuse the same command for several items just by assigning different data for each one.
+*/
+FCKContextMenu.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
+{
+	var oItem = this._MenuBlock.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
+	this._Redraw = true ;
+	return oItem ;
+}
+
+FCKContextMenu.prototype.AddSeparator = function()
+{
+	this._MenuBlock.AddSeparator() ;
+	this._Redraw = true ;
+}
+
+FCKContextMenu.prototype.RemoveAllItems = function()
+{
+	this._MenuBlock.RemoveAllItems() ;
+	this._Redraw = true ;
+}
+
+FCKContextMenu.prototype.AttachToElement = function( element )
+{
+	if ( FCKBrowserInfo.IsIE )
+		FCKTools.AddEventListenerEx( element, 'contextmenu', FCKContextMenu_AttachedElement_OnContextMenu, this ) ;
+	else
+		element._FCKContextMenu = this ;
+}
+
+function FCKContextMenu_Document_OnContextMenu( e )
+{
+	if ( FCKConfig.BrowserContextMenu )
+		return true ;
+
+	var el = e.target ;
+
+	while ( el )
+	{
+		if ( el._FCKContextMenu )
+		{
+			if ( el._FCKContextMenu.CtrlDisable && ( e.ctrlKey || e.metaKey ) )
+				return true ;
+
+			FCKTools.CancelEvent( e ) ;
+			FCKContextMenu_AttachedElement_OnContextMenu( e, el._FCKContextMenu, el ) ;
+			return false ;
+		}
+		el = el.parentNode ;
+	}
+	return true ;
+}
+
+var FCKContextMenu_OverrideButton ;
+
+function FCKContextMenu_Document_OnMouseDown( e )
+{
+	if( !e || e.button != 2 )
+		return false ;
+
+	if ( FCKConfig.BrowserContextMenu )
+		return true ;
+
+	var el = e.target ;
+
+	while ( el )
+	{
+		if ( el._FCKContextMenu )
+		{
+			if ( el._FCKContextMenu.CtrlDisable && ( e.ctrlKey || e.metaKey ) )
+				return true ;
+
+			var overrideButton = FCKContextMenu_OverrideButton ;
+			if( !overrideButton )
+			{
+				var doc = FCKTools.GetElementDocument( e.target ) ;
+				overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ;
+				overrideButton.type = 'button' ;
+				var buttonHolder = doc.createElement('p') ;
+				doc.body.appendChild( buttonHolder ) ;
+				buttonHolder.appendChild( overrideButton ) ;
+			}
+
+			overrideButton.style.cssText = 'position:absolute;top:' + ( e.clientY - 2 ) +
+				'px;left:' + ( e.clientX - 2 ) +
+				'px;width:5px;height:5px;opacity:0.01' ;
+		}
+		el = el.parentNode ;
+	}
+	return false ;
+}
+
+function FCKContextMenu_Document_OnMouseUp( e )
+{
+	if ( FCKConfig.BrowserContextMenu )
+		return true ;
+
+	var overrideButton = FCKContextMenu_OverrideButton ;
+
+	if ( overrideButton )
+	{
+		var parent = overrideButton.parentNode ;
+		parent.parentNode.removeChild( parent ) ;
+		FCKContextMenu_OverrideButton = undefined ;
+
+		if( e && e.button == 2 )
+		{
+			FCKContextMenu_Document_OnContextMenu( e ) ;
+			return false ;
+		}
+	}
+	return true ;
+}
+
+function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
+{
+	if ( ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) || FCKConfig.BrowserContextMenu )
+		return true ;
+
+	var eTarget = el || this ;
+
+	if ( fckContextMenu.OnBeforeOpen )
+		fckContextMenu.OnBeforeOpen.call( fckContextMenu, eTarget ) ;
+
+	if ( fckContextMenu._MenuBlock.Count() == 0 )
+		return false ;
+
+	if ( fckContextMenu._Redraw )
+	{
+		fckContextMenu._MenuBlock.Create( fckContextMenu._Panel.MainNode ) ;
+		fckContextMenu._Redraw = false ;
+	}
+
+	// This will avoid that the content of the context menu can be dragged in IE
+	// as the content of the panel is recreated we need to do it every time
+	FCKTools.DisableSelection( fckContextMenu._Panel.Document.body ) ;
+
+	var x = 0 ;
+	var y = 0 ;
+	if ( FCKBrowserInfo.IsIE )
+	{
+		x = ev.screenX ;
+		y = ev.screenY ;
+	}
+	else if ( FCKBrowserInfo.IsSafari )
+	{
+		x = ev.clientX ;
+		y = ev.clientY ;
+	}
+	else
+	{
+		x = ev.pageX ;
+		y = ev.pageY ;
+	}
+	fckContextMenu._Panel.Show( x, y, ev.currentTarget || null ) ;
+
+	return false ;
+}
+
+function FCKContextMenu_MenuBlock_OnClick( menuItem, contextMenu )
+{
+	contextMenu._Panel.Hide() ;
+	FCKTools.RunFunction( contextMenu.OnItemClick, contextMenu, menuItem ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdataprocessor.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdataprocessor.js
new file mode 100644
index 000000000..c8726c570
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdataprocessor.js
@@ -0,0 +1,119 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * The Data Processor is responsible for transforming the input and output data
+ * in the editor. For more info:
+ * http://dev.fckeditor.net/wiki/Components/DataProcessor
+ *
+ * The default implementation offers the base XHTML compatibility features of
+ * FCKeditor. Further Data Processors may be implemented for other purposes.
+ *
+ */
+
+var FCKDataProcessor = function()
+{}
+
+FCKDataProcessor.prototype =
+{
+	/*
+	 * Returns a string representing the HTML format of "data". The returned
+	 * value will be loaded in the editor.
+	 * The HTML must be from <html> to </html>, including <head>, <body> and
+	 * eventually the DOCTYPE.
+	 * Note: HTML comments may already be part of the data because of the
+	 * pre-processing made with ProtectedSource.
+	 *     @param {String} data The data to be converted in the
+	 *            DataProcessor specific format.
+	 */
+	ConvertToHtml : function( data )
+	{
+		// The default data processor must handle two different cases depending
+		// on the FullPage setting. Custom Data Processors will not be
+		// compatible with FullPage, much probably.
+		if ( FCKConfig.FullPage )
+		{
+			// Save the DOCTYPE.
+			FCK.DocTypeDeclaration = data.match( FCKRegexLib.DocTypeTag ) ;
+
+			// Check if the <body> tag is available.
+			if ( !FCKRegexLib.HasBodyTag.test( data ) )
+				data = '<body>' + data + '</body>' ;
+
+			// Check if the <html> tag is available.
+			if ( !FCKRegexLib.HtmlOpener.test( data ) )
+				data = '<html dir="' + FCKConfig.ContentLangDirection + '">' + data + '</html>' ;
+
+			// Check if the <head> tag is available.
+			if ( !FCKRegexLib.HeadOpener.test( data ) )
+				data = data.replace( FCKRegexLib.HtmlOpener, '$&<head><title></title></head>' ) ;
+
+			return data ;
+		}
+		else
+		{
+			var html =
+				FCKConfig.DocType +
+				'<html dir="' + FCKConfig.ContentLangDirection + '"' ;
+
+			// On IE, if you are using a DOCTYPE different of HTML 4 (like
+			// XHTML), you must force the vertical scroll to show, otherwise
+			// the horizontal one may appear when the page needs vertical scrolling.
+			// TODO : Check it with IE7 and make it IE6- if it is the case.
+			if ( FCKBrowserInfo.IsIE && FCKConfig.DocType.length > 0 && !FCKRegexLib.Html4DocType.test( FCKConfig.DocType ) )
+				html += ' style="overflow-y: scroll"' ;
+
+			html += '><head><title></title></head>' +
+				'<body' + FCKConfig.GetBodyAttributes() + '>' +
+				data +
+				'</body></html>' ;
+
+			return html ;
+		}
+	},
+
+	/*
+	 * Converts a DOM (sub-)tree to a string in the data format.
+	 *     @param {Object} rootNode The node that contains the DOM tree to be
+	 *            converted to the data format.
+	 *     @param {Boolean} excludeRoot Indicates that the root node must not
+	 *            be included in the conversion, only its children.
+	 *     @param {Boolean} format Indicates that the data must be formatted
+	 *            for human reading. Not all Data Processors may provide it.
+	 */
+	ConvertToDataFormat : function( rootNode, excludeRoot, ignoreIfEmptyParagraph, format )
+	{
+		var data = FCKXHtml.GetXHTML( rootNode, !excludeRoot, format ) ;
+
+		if ( ignoreIfEmptyParagraph && FCKRegexLib.EmptyOutParagraph.test( data ) )
+			return '' ;
+
+		return data ;
+	},
+
+	/*
+	 * Makes any necessary changes to a piece of HTML for insertion in the
+	 * editor selection position.
+	 *     @param {String} html The HTML to be fixed.
+	 */
+	FixHtml : function( html )
+	{
+		return html ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
new file mode 100644
index 000000000..992ec386b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
@@ -0,0 +1,53 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is a generic Document Fragment object. It is not intended to provide
+ * the W3C implementation, but is a way to fix the missing of a real Document
+ * Fragment in IE (where document.createDocumentFragment() returns a normal
+ * document instead), giving a standard interface for it.
+ * (IE Implementation)
+ */
+
+var FCKDocumentFragment = function( parentDocument, baseDocFrag )
+{
+	this.RootNode = baseDocFrag || parentDocument.createDocumentFragment() ;
+}
+
+FCKDocumentFragment.prototype =
+{
+
+	// Append the contents of this Document Fragment to another element.
+	AppendTo : function( targetNode )
+	{
+		targetNode.appendChild( this.RootNode ) ;
+	},
+
+	AppendHtml : function( html )
+	{
+		var eTmpDiv = this.RootNode.ownerDocument.createElement( 'div' ) ;
+		eTmpDiv.innerHTML = html ;
+		FCKDomTools.MoveChildren( eTmpDiv, this.RootNode ) ;
+	},
+
+	InsertAfterNode : function( existingNode )
+	{
+		FCKDomTools.InsertAfterNode( existingNode, this.RootNode ) ;
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
new file mode 100644
index 000000000..4a50cf441
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
@@ -0,0 +1,58 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is a generic Document Fragment object. It is not intended to provide
+ * the W3C implementation, but is a way to fix the missing of a real Document
+ * Fragment in IE (where document.createDocumentFragment() returns a normal
+ * document instead), giving a standard interface for it.
+ * (IE Implementation)
+ */
+
+var FCKDocumentFragment = function( parentDocument )
+{
+	this._Document = parentDocument ;
+	this.RootNode = parentDocument.createElement( 'div' ) ;
+}
+
+// Append the contents of this Document Fragment to another node.
+FCKDocumentFragment.prototype =
+{
+
+	AppendTo : function( targetNode )
+	{
+		FCKDomTools.MoveChildren( this.RootNode, targetNode ) ;
+	},
+
+	AppendHtml : function( html )
+	{
+		var eTmpDiv = this._Document.createElement( 'div' ) ;
+		eTmpDiv.innerHTML = html ;
+		FCKDomTools.MoveChildren( eTmpDiv, this.RootNode ) ;
+	},
+
+	InsertAfterNode : function( existingNode )
+	{
+		var eRoot = this.RootNode ;
+		var eLast ;
+
+		while( ( eLast = eRoot.lastChild ) )
+			FCKDomTools.InsertAfterNode( existingNode, eRoot.removeChild( eLast ) ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange.js
new file mode 100644
index 000000000..7e032da40
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange.js
@@ -0,0 +1,935 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Class for working with a selection range, much like the W3C DOM Range, but
+ * it is not intended to be an implementation of the W3C interface.
+ */
+
+var FCKDomRange = function( sourceWindow )
+{
+	this.Window = sourceWindow ;
+	this._Cache = {} ;
+}
+
+FCKDomRange.prototype =
+{
+
+	_UpdateElementInfo : function()
+	{
+		var innerRange = this._Range ;
+
+		if ( !innerRange )
+			this.Release( true ) ;
+		else
+		{
+			// For text nodes, the node itself is the StartNode.
+			var eStart	= innerRange.startContainer ;
+
+			var oElementPath = new FCKElementPath( eStart ) ;
+			this.StartNode			= eStart.nodeType == 3 ? eStart : eStart.childNodes[ innerRange.startOffset ] ;
+			this.StartContainer		= eStart ;
+			this.StartBlock			= oElementPath.Block ;
+			this.StartBlockLimit	= oElementPath.BlockLimit ;
+
+			if ( innerRange.collapsed )
+			{
+				this.EndNode		= this.StartNode ;
+				this.EndContainer	= this.StartContainer ;
+				this.EndBlock		= this.StartBlock ;
+				this.EndBlockLimit	= this.StartBlockLimit ;
+			}
+			else
+			{
+				var eEnd	= innerRange.endContainer ;
+
+				if ( eStart != eEnd )
+					oElementPath = new FCKElementPath( eEnd ) ;
+
+				// The innerRange.endContainer[ innerRange.endOffset ] is not
+				// usually part of the range, but the marker for the range end. So,
+				// let's get the previous available node as the real end.
+				var eEndNode = eEnd ;
+				if ( innerRange.endOffset == 0 )
+				{
+					while ( eEndNode && !eEndNode.previousSibling )
+						eEndNode = eEndNode.parentNode ;
+
+					if ( eEndNode )
+						eEndNode = eEndNode.previousSibling ;
+				}
+				else if ( eEndNode.nodeType == 1 )
+					eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
+
+				this.EndNode			= eEndNode ;
+				this.EndContainer		= eEnd ;
+				this.EndBlock			= oElementPath.Block ;
+				this.EndBlockLimit		= oElementPath.BlockLimit ;
+			}
+		}
+
+		this._Cache = {} ;
+	},
+
+	CreateRange : function()
+	{
+		return new FCKW3CRange( this.Window.document ) ;
+	},
+
+	DeleteContents : function()
+	{
+		if ( this._Range )
+		{
+			this._Range.deleteContents() ;
+			this._UpdateElementInfo() ;
+		}
+	},
+
+	ExtractContents : function()
+	{
+		if ( this._Range )
+		{
+			var docFrag = this._Range.extractContents() ;
+			this._UpdateElementInfo() ;
+			return docFrag ;
+		}
+		return null ;
+	},
+
+	CheckIsCollapsed : function()
+	{
+		if ( this._Range )
+			return this._Range.collapsed ;
+
+		return false ;
+	},
+
+	Collapse : function( toStart )
+	{
+		if ( this._Range )
+			this._Range.collapse( toStart ) ;
+
+		this._UpdateElementInfo() ;
+	},
+
+	Clone : function()
+	{
+		var oClone = FCKTools.CloneObject( this ) ;
+
+		if ( this._Range )
+			oClone._Range = this._Range.cloneRange() ;
+
+		return oClone ;
+	},
+
+	MoveToNodeContents : function( targetNode )
+	{
+		if ( !this._Range )
+			this._Range = this.CreateRange() ;
+
+		this._Range.selectNodeContents( targetNode ) ;
+
+		this._UpdateElementInfo() ;
+	},
+
+	MoveToElementStart : function( targetElement )
+	{
+		this.SetStart(targetElement,1) ;
+		this.SetEnd(targetElement,1) ;
+	},
+
+	// Moves to the first editing point inside a element. For example, in a
+	// element tree like "<p><b><i></i></b> Text</p>", the start editing point
+	// is "<p><b><i>^</i></b> Text</p>" (inside <i>).
+	MoveToElementEditStart : function( targetElement )
+	{
+		var editableElement ;
+
+		while ( targetElement && targetElement.nodeType == 1 )
+		{
+			if ( FCKDomTools.CheckIsEditable( targetElement ) )
+				editableElement = targetElement ;
+			else if ( editableElement )
+				break ;		// If we already found an editable element, stop the loop.
+
+			targetElement = targetElement.firstChild ;
+		}
+
+		if ( editableElement )
+			this.MoveToElementStart( editableElement ) ;
+	},
+
+	InsertNode : function( node )
+	{
+		if ( this._Range )
+			this._Range.insertNode( node ) ;
+	},
+
+	CheckIsEmpty : function()
+	{
+		if ( this.CheckIsCollapsed() )
+			return true ;
+
+		// Inserts the contents of the range in a div tag.
+		var eToolDiv = this.Window.document.createElement( 'div' ) ;
+		this._Range.cloneContents().AppendTo( eToolDiv ) ;
+
+		FCKDomTools.TrimNode( eToolDiv ) ;
+
+		return ( eToolDiv.innerHTML.length == 0 ) ;
+	},
+
+	/**
+	 * Checks if the start boundary of the current range is "visually" (like a
+	 * selection caret) at the beginning of the block. It means that some
+	 * things could be brefore the range, like spaces or empty inline elements,
+	 * but it would still be considered at the beginning of the block.
+	 */
+	CheckStartOfBlock : function()
+	{
+		var cache = this._Cache ;
+		var bIsStartOfBlock = cache.IsStartOfBlock ;
+
+		if ( bIsStartOfBlock != undefined )
+			return bIsStartOfBlock ;
+
+		// Take the block reference.
+		var block = this.StartBlock || this.StartBlockLimit ;
+
+		var container	= this._Range.startContainer ;
+		var offset		= this._Range.startOffset ;
+		var currentNode ;
+
+		if ( offset > 0 )
+		{
+			// First, check the start container. If it is a text node, get the
+			// substring of the node value before the range offset.
+			if ( container.nodeType == 3 )
+			{
+				var textValue = container.nodeValue.substr( 0, offset ).Trim() ;
+
+				// If we have some text left in the container, we are not at
+				// the end for the block.
+				if ( textValue.length != 0 )
+					return cache.IsStartOfBlock = false ;
+			}
+			else
+				currentNode = container.childNodes[ offset - 1 ] ;
+		}
+
+		// We'll not have a currentNode if the container was a text node, or
+		// the offset is zero.
+		if ( !currentNode )
+			currentNode = FCKDomTools.GetPreviousSourceNode( container, true, null, block ) ;
+
+		while ( currentNode )
+		{
+			switch ( currentNode.nodeType )
+			{
+				case 1 :
+					// It's not an inline element.
+					if ( !FCKListsLib.InlineChildReqElements[ currentNode.nodeName.toLowerCase() ] )
+						return cache.IsStartOfBlock = false ;
+
+					break ;
+
+				case 3 :
+					// It's a text node with real text.
+					if ( currentNode.nodeValue.Trim().length > 0 )
+						return cache.IsStartOfBlock = false ;
+			}
+
+			currentNode = FCKDomTools.GetPreviousSourceNode( currentNode, false, null, block ) ;
+		}
+
+		return cache.IsStartOfBlock = true ;
+	},
+
+	/**
+	 * Checks if the end boundary of the current range is "visually" (like a
+	 * selection caret) at the end of the block. It means that some things
+	 * could be after the range, like spaces, empty inline elements, or a
+	 * single <br>, but it would still be considered at the end of the block.
+	 */
+	CheckEndOfBlock : function( refreshSelection )
+	{
+		var isEndOfBlock = this._Cache.IsEndOfBlock ;
+
+		if ( isEndOfBlock != undefined )
+			return isEndOfBlock ;
+
+		// Take the block reference.
+		var block = this.EndBlock || this.EndBlockLimit ;
+
+		var container	= this._Range.endContainer ;
+		var offset			= this._Range.endOffset ;
+		var currentNode ;
+
+		// First, check the end container. If it is a text node, get the
+		// substring of the node value after the range offset.
+		if ( container.nodeType == 3 )
+		{
+			var textValue = container.nodeValue ;
+			if ( offset < textValue.length )
+			{
+				textValue = textValue.substr( offset ) ;
+
+				// If we have some text left in the container, we are not at
+				// the end for the block.
+				if ( textValue.Trim().length != 0 )
+					return this._Cache.IsEndOfBlock = false ;
+			}
+		}
+		else
+			currentNode = container.childNodes[ offset ] ;
+
+		// We'll not have a currentNode if the container was a text node, of
+		// the offset is out the container children limits (after it probably).
+		if ( !currentNode )
+			currentNode = FCKDomTools.GetNextSourceNode( container, true, null, block ) ;
+
+		var hadBr = false ;
+
+		while ( currentNode )
+		{
+			switch ( currentNode.nodeType )
+			{
+				case 1 :
+					var nodeName = currentNode.nodeName.toLowerCase() ;
+
+					// It's an inline element.
+					if ( FCKListsLib.InlineChildReqElements[ nodeName ] )
+						break ;
+
+					// It is the first <br> found.
+					if ( nodeName == 'br' && !hadBr )
+					{
+						hadBr = true ;
+						break ;
+					}
+
+					return this._Cache.IsEndOfBlock = false ;
+
+				case 3 :
+					// It's a text node with real text.
+					if ( currentNode.nodeValue.Trim().length > 0 )
+						return this._Cache.IsEndOfBlock = false ;
+			}
+
+			currentNode = FCKDomTools.GetNextSourceNode( currentNode, false, null, block ) ;
+		}
+
+		if ( refreshSelection )
+			this.Select() ;
+
+		return this._Cache.IsEndOfBlock = true ;
+	},
+
+	// This is an "intrusive" way to create a bookmark. It includes <span> tags
+	// in the range boundaries. The advantage of it is that it is possible to
+	// handle DOM mutations when moving back to the bookmark.
+	// Attention: the inclusion of nodes in the DOM is a design choice and
+	// should not be changed as there are other points in the code that may be
+	// using those nodes to perform operations. See GetBookmarkNode.
+	// For performance, includeNodes=true if intended to SelectBookmark.
+	CreateBookmark : function( includeNodes )
+	{
+		// Create the bookmark info (random IDs).
+		var oBookmark =
+		{
+			StartId	: (new Date()).valueOf() + Math.floor(Math.random()*1000) + 'S',
+			EndId	: (new Date()).valueOf() + Math.floor(Math.random()*1000) + 'E'
+		} ;
+
+		var oDoc = this.Window.document ;
+		var eStartSpan ;
+		var eEndSpan ;
+		var oClone ;
+
+		// For collapsed ranges, add just the start marker.
+		if ( !this.CheckIsCollapsed() )
+		{
+			eEndSpan = oDoc.createElement( 'span' ) ;
+			eEndSpan.style.display = 'none' ;
+			eEndSpan.id = oBookmark.EndId ;
+			eEndSpan.setAttribute( '_fck_bookmark', true ) ;
+
+			// For IE, it must have something inside, otherwise it may be
+			// removed during DOM operations.
+//			if ( FCKBrowserInfo.IsIE )
+				eEndSpan.innerHTML = '&nbsp;' ;
+
+			oClone = this.Clone() ;
+			oClone.Collapse( false ) ;
+			oClone.InsertNode( eEndSpan ) ;
+		}
+
+		eStartSpan = oDoc.createElement( 'span' ) ;
+		eStartSpan.style.display = 'none' ;
+		eStartSpan.id = oBookmark.StartId ;
+		eStartSpan.setAttribute( '_fck_bookmark', true ) ;
+
+		// For IE, it must have something inside, otherwise it may be removed
+		// during DOM operations.
+//		if ( FCKBrowserInfo.IsIE )
+			eStartSpan.innerHTML = '&nbsp;' ;
+
+		oClone = this.Clone() ;
+		oClone.Collapse( true ) ;
+		oClone.InsertNode( eStartSpan ) ;
+
+		if ( includeNodes )
+		{
+			oBookmark.StartNode = eStartSpan ;
+			oBookmark.EndNode = eEndSpan ;
+		}
+
+		// Update the range position.
+		if ( eEndSpan )
+		{
+			this.SetStart( eStartSpan, 4 ) ;
+			this.SetEnd( eEndSpan, 3 ) ;
+		}
+		else
+			this.MoveToPosition( eStartSpan, 4 ) ;
+
+		return oBookmark ;
+	},
+
+	// This one should be a part of a hypothetic "bookmark" object.
+	GetBookmarkNode : function( bookmark, start )
+	{
+		var doc = this.Window.document ;
+
+		if ( start )
+			return bookmark.StartNode || doc.getElementById( bookmark.StartId ) ;
+		else
+			return bookmark.EndNode || doc.getElementById( bookmark.EndId ) ;
+	},
+
+	MoveToBookmark : function( bookmark, preserveBookmark )
+	{
+		var eStartSpan	= this.GetBookmarkNode( bookmark, true ) ;
+		var eEndSpan	= this.GetBookmarkNode( bookmark, false ) ;
+
+		this.SetStart( eStartSpan, 3 ) ;
+
+		if ( !preserveBookmark )
+			FCKDomTools.RemoveNode( eStartSpan ) ;
+
+		// If collapsed, the end span will not be available.
+		if ( eEndSpan )
+		{
+			this.SetEnd( eEndSpan, 3 ) ;
+
+			if ( !preserveBookmark )
+				FCKDomTools.RemoveNode( eEndSpan ) ;
+		}
+		else
+			this.Collapse( true ) ;
+
+		this._UpdateElementInfo() ;
+	},
+
+	// Non-intrusive bookmark algorithm
+	CreateBookmark2 : function()
+	{
+		// If there is no range then get out of here.
+		// It happens on initial load in Safari #962 and if the editor it's hidden also in Firefox
+		if ( ! this._Range )
+			return { "Start" : 0, "End" : 0 } ;
+
+		// First, we record down the offset values
+		var bookmark =
+		{
+			"Start" : [ this._Range.startOffset ],
+			"End" : [ this._Range.endOffset ]
+		} ;
+		// Since we're treating the document tree as normalized, we need to backtrack the text lengths
+		// of previous text nodes into the offset value.
+		var curStart = this._Range.startContainer.previousSibling ;
+		var curEnd = this._Range.endContainer.previousSibling ;
+
+		// Also note that the node that we use for "address base" would change during backtracking.
+		var addrStart = this._Range.startContainer ;
+		var addrEnd = this._Range.endContainer ;
+		while ( curStart && addrStart.nodeType == 3 )
+		{
+			bookmark.Start[0] += curStart.length ;
+			addrStart = curStart ;
+			curStart = curStart.previousSibling ;
+		}
+		while ( curEnd && addrEnd.nodeType == 3 )
+		{
+			bookmark.End[0] += curEnd.length ;
+			addrEnd = curEnd ;
+			curEnd = curEnd.previousSibling ;
+		}
+
+		// If the object pointed to by the startOffset and endOffset are text nodes, we need
+		// to backtrack and add in the text offset to the bookmark addresses.
+		if ( addrStart.nodeType == 1 && addrStart.childNodes[bookmark.Start[0]] && addrStart.childNodes[bookmark.Start[0]].nodeType == 3 )
+		{
+			var curNode = addrStart.childNodes[bookmark.Start[0]] ;
+			var offset = 0 ;
+			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
+			{
+				curNode = curNode.previousSibling ;
+				offset += curNode.length ;
+			}
+			addrStart = curNode ;
+			bookmark.Start[0] = offset ;
+		}
+		if ( addrEnd.nodeType == 1 && addrEnd.childNodes[bookmark.End[0]] && addrEnd.childNodes[bookmark.End[0]].nodeType == 3 )
+		{
+			var curNode = addrEnd.childNodes[bookmark.End[0]] ;
+			var offset = 0 ;
+			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
+			{
+				curNode = curNode.previousSibling ;
+				offset += curNode.length ;
+			}
+			addrEnd = curNode ;
+			bookmark.End[0] = offset ;
+		}
+
+		// Then, we record down the precise position of the container nodes
+		// by walking up the DOM tree and counting their childNode index
+		bookmark.Start = FCKDomTools.GetNodeAddress( addrStart, true ).concat( bookmark.Start ) ;
+		bookmark.End = FCKDomTools.GetNodeAddress( addrEnd, true ).concat( bookmark.End ) ;
+		return bookmark;
+	},
+
+	MoveToBookmark2 : function( bookmark )
+	{
+		// Reverse the childNode counting algorithm in CreateBookmark2()
+		var curStart = FCKDomTools.GetNodeFromAddress( this.Window.document, bookmark.Start.slice( 0, -1 ), true ) ;
+		var curEnd = FCKDomTools.GetNodeFromAddress( this.Window.document, bookmark.End.slice( 0, -1 ), true ) ;
+
+		// Generate the W3C Range object and update relevant data
+		this.Release( true ) ;
+		this._Range = new FCKW3CRange( this.Window.document ) ;
+		var startOffset = bookmark.Start[ bookmark.Start.length - 1 ] ;
+		var endOffset = bookmark.End[ bookmark.End.length - 1 ] ;
+		while ( curStart.nodeType == 3 && startOffset > curStart.length )
+		{
+			if ( ! curStart.nextSibling || curStart.nextSibling.nodeType != 3 )
+				break ;
+			startOffset -= curStart.length ;
+			curStart = curStart.nextSibling ;
+		}
+		while ( curEnd.nodeType == 3 && endOffset > curEnd.length )
+		{
+			if ( ! curEnd.nextSibling || curEnd.nextSibling.nodeType != 3 )
+				break ;
+			endOffset -= curEnd.length ;
+			curEnd = curEnd.nextSibling ;
+		}
+		this._Range.setStart( curStart, startOffset ) ;
+		this._Range.setEnd( curEnd, endOffset ) ;
+		this._UpdateElementInfo() ;
+	},
+
+	MoveToPosition : function( targetElement, position )
+	{
+		this.SetStart( targetElement, position ) ;
+		this.Collapse( true ) ;
+	},
+
+	/*
+	 * Moves the position of the start boundary of the range to a specific position
+	 * relatively to a element.
+	 *		@position:
+	 *			1 = After Start		<target>^contents</target>
+	 *			2 = Before End		<target>contents^</target>
+	 *			3 = Before Start	^<target>contents</target>
+	 *			4 = After End		<target>contents</target>^
+	 */
+	SetStart : function( targetElement, position, noInfoUpdate )
+	{
+		var oRange = this._Range ;
+		if ( !oRange )
+			oRange = this._Range = this.CreateRange() ;
+
+		switch( position )
+		{
+			case 1 :		// After Start		<target>^contents</target>
+				oRange.setStart( targetElement, 0 ) ;
+				break ;
+
+			case 2 :		// Before End		<target>contents^</target>
+				oRange.setStart( targetElement, targetElement.childNodes.length ) ;
+				break ;
+
+			case 3 :		// Before Start		^<target>contents</target>
+				oRange.setStartBefore( targetElement ) ;
+				break ;
+
+			case 4 :		// After End		<target>contents</target>^
+				oRange.setStartAfter( targetElement ) ;
+		}
+
+		if ( !noInfoUpdate )
+			this._UpdateElementInfo() ;
+	},
+
+	/*
+	 * Moves the position of the start boundary of the range to a specific position
+	 * relatively to a element.
+	 *		@position:
+	 *			1 = After Start		<target>^contents</target>
+	 *			2 = Before End		<target>contents^</target>
+	 *			3 = Before Start	^<target>contents</target>
+	 *			4 = After End		<target>contents</target>^
+	 */
+	SetEnd : function( targetElement, position, noInfoUpdate )
+	{
+		var oRange = this._Range ;
+		if ( !oRange )
+			oRange = this._Range = this.CreateRange() ;
+
+		switch( position )
+		{
+			case 1 :		// After Start		<target>^contents</target>
+				oRange.setEnd( targetElement, 0 ) ;
+				break ;
+
+			case 2 :		// Before End		<target>contents^</target>
+				oRange.setEnd( targetElement, targetElement.childNodes.length ) ;
+				break ;
+
+			case 3 :		// Before Start		^<target>contents</target>
+				oRange.setEndBefore( targetElement ) ;
+				break ;
+
+			case 4 :		// After End		<target>contents</target>^
+				oRange.setEndAfter( targetElement ) ;
+		}
+
+		if ( !noInfoUpdate )
+			this._UpdateElementInfo() ;
+	},
+
+	Expand : function( unit )
+	{
+		var oNode, oSibling ;
+
+		switch ( unit )
+		{
+			// Expand the range to include all inline parent elements if we are
+			// are in their boundary limits.
+			// For example (where [ ] are the range limits):
+			//	Before =>		Some <b>[<i>Some sample text]</i></b>.
+			//	After =>		Some [<b><i>Some sample text</i></b>].
+			case 'inline_elements' :
+				// Expand the start boundary.
+				if ( this._Range.startOffset == 0 )
+				{
+					oNode = this._Range.startContainer ;
+
+					if ( oNode.nodeType != 1 )
+						oNode = oNode.previousSibling ? null : oNode.parentNode ;
+
+					if ( oNode )
+					{
+						while ( FCKListsLib.InlineNonEmptyElements[ oNode.nodeName.toLowerCase() ] )
+						{
+							this._Range.setStartBefore( oNode ) ;
+
+							if ( oNode != oNode.parentNode.firstChild )
+								break ;
+
+							oNode = oNode.parentNode ;
+						}
+					}
+				}
+
+				// Expand the end boundary.
+				oNode = this._Range.endContainer ;
+				var offset = this._Range.endOffset ;
+
+				if ( ( oNode.nodeType == 3 && offset >= oNode.nodeValue.length ) || ( oNode.nodeType == 1 && offset >= oNode.childNodes.length ) || ( oNode.nodeType != 1 && oNode.nodeType != 3 ) )
+				{
+					if ( oNode.nodeType != 1 )
+						oNode = oNode.nextSibling ? null : oNode.parentNode ;
+
+					if ( oNode )
+					{
+						while ( FCKListsLib.InlineNonEmptyElements[ oNode.nodeName.toLowerCase() ] )
+						{
+							this._Range.setEndAfter( oNode ) ;
+
+							if ( oNode != oNode.parentNode.lastChild )
+								break ;
+
+							oNode = oNode.parentNode ;
+						}
+					}
+				}
+
+				break ;
+
+			case 'block_contents' :
+			case 'list_contents' :
+				var boundarySet = FCKListsLib.BlockBoundaries ;
+				if ( unit == 'list_contents' || FCKConfig.EnterMode == 'br' )
+					boundarySet = FCKListsLib.ListBoundaries ;
+
+				if ( this.StartBlock && FCKConfig.EnterMode != 'br' && unit == 'block_contents' )
+					this.SetStart( this.StartBlock, 1 ) ;
+				else
+				{
+					// Get the start node for the current range.
+					oNode = this._Range.startContainer ;
+
+					// If it is an element, get the node right before of it (in source order).
+					if ( oNode.nodeType == 1 )
+					{
+						var lastNode = oNode.childNodes[ this._Range.startOffset ] ;
+						if ( lastNode )
+							oNode = FCKDomTools.GetPreviousSourceNode( lastNode, true ) ;
+						else
+							oNode = oNode.lastChild || oNode ;
+					}
+
+					// We must look for the left boundary, relative to the range
+					// start, which is limited by a block element.
+					while ( oNode
+							&& ( oNode.nodeType != 1
+								|| ( oNode != this.StartBlockLimit
+									&& !boundarySet[ oNode.nodeName.toLowerCase() ] ) ) )
+					{
+						this._Range.setStartBefore( oNode ) ;
+						oNode = oNode.previousSibling || oNode.parentNode ;
+					}
+				}
+
+				if ( this.EndBlock && FCKConfig.EnterMode != 'br' && unit == 'block_contents' && this.EndBlock.nodeName.toLowerCase() != 'li' )
+					this.SetEnd( this.EndBlock, 2 ) ;
+				else
+				{
+					oNode = this._Range.endContainer ;
+					if ( oNode.nodeType == 1 )
+						oNode = oNode.childNodes[ this._Range.endOffset ] || oNode.lastChild ;
+
+					// We must look for the right boundary, relative to the range
+					// end, which is limited by a block element.
+					while ( oNode
+							&& ( oNode.nodeType != 1
+								|| ( oNode != this.StartBlockLimit
+									&& !boundarySet[ oNode.nodeName.toLowerCase() ] ) ) )
+					{
+						this._Range.setEndAfter( oNode ) ;
+						oNode = oNode.nextSibling || oNode.parentNode ;
+					}
+
+					// In EnterMode='br', the end <br> boundary element must
+					// be included in the expanded range.
+					if ( oNode && oNode.nodeName.toLowerCase() == 'br' )
+						this._Range.setEndAfter( oNode ) ;
+				}
+
+				this._UpdateElementInfo() ;
+		}
+	},
+
+	/**
+	 * Split the block element for the current range. It deletes the contents
+	 * of the range and splits the block in the collapsed position, resulting
+	 * in two sucessive blocks. The range is then positioned in the middle of
+	 * them.
+	 *
+	 * It returns and object with the following properties:
+	 *		- PreviousBlock	: a reference to the block element that preceeds
+	 *		  the range after the split.
+	 *		- NextBlock : a reference to the block element that follows the
+	 *		  range after the split.
+	 *		- WasStartOfBlock : a boolean indicating that the range was
+	 *		  originaly at the start of the block.
+	 *		- WasEndOfBlock : a boolean indicating that the range was originaly
+	 *		  at the end of the block.
+	 *
+	 * If the range was originaly at the start of the block, no split will happen
+	 * and the PreviousBlock value will be null. The same is valid for the
+	 * NextBlock value if the range was at the end of the block.
+	 */
+	SplitBlock : function( forceBlockTag )
+	{
+		var blockTag = forceBlockTag || FCKConfig.EnterMode ;
+
+		if ( !this._Range )
+			this.MoveToSelection() ;
+
+		// The range boundaries must be in the same "block limit" element.
+		if ( this.StartBlockLimit == this.EndBlockLimit )
+		{
+			// Get the current blocks.
+			var eStartBlock		= this.StartBlock ;
+			var eEndBlock		= this.EndBlock ;
+			var oElementPath	= null ;
+
+			if ( blockTag != 'br' )
+			{
+				if ( !eStartBlock )
+				{
+					eStartBlock = this.FixBlock( true, blockTag ) ;
+					eEndBlock	= this.EndBlock ;	// FixBlock may have fixed the EndBlock too.
+				}
+
+				if ( !eEndBlock )
+					eEndBlock = this.FixBlock( false, blockTag ) ;
+			}
+
+			// Get the range position.
+			var bIsStartOfBlock	= ( eStartBlock != null && this.CheckStartOfBlock() ) ;
+			var bIsEndOfBlock	= ( eEndBlock != null && this.CheckEndOfBlock() ) ;
+
+			// Delete the current contents.
+			if ( !this.CheckIsEmpty() )
+				this.DeleteContents() ;
+
+			if ( eStartBlock && eEndBlock && eStartBlock == eEndBlock )
+			{
+				if ( bIsEndOfBlock )
+				{
+					oElementPath = new FCKElementPath( this.StartContainer ) ;
+					this.MoveToPosition( eEndBlock, 4 ) ;
+					eEndBlock = null ;
+				}
+				else if ( bIsStartOfBlock )
+				{
+					oElementPath = new FCKElementPath( this.StartContainer ) ;
+					this.MoveToPosition( eStartBlock, 3 ) ;
+					eStartBlock = null ;
+				}
+				else
+				{
+					// Extract the contents of the block from the selection point to the end of its contents.
+					this.SetEnd( eStartBlock, 2 ) ;
+					var eDocFrag = this.ExtractContents() ;
+
+					// Duplicate the block element after it.
+					eEndBlock = eStartBlock.cloneNode( false ) ;
+					eEndBlock.removeAttribute( 'id', false ) ;
+
+					// Place the extracted contents in the duplicated block.
+					eDocFrag.AppendTo( eEndBlock ) ;
+
+					FCKDomTools.InsertAfterNode( eStartBlock, eEndBlock ) ;
+
+					this.MoveToPosition( eStartBlock, 4 ) ;
+
+					// In Gecko, the last child node must be a bogus <br>.
+					// Note: bogus <br> added under <ul> or <ol> would cause lists to be incorrectly rendered.
+					if ( FCKBrowserInfo.IsGecko &&
+							! eStartBlock.nodeName.IEquals( ['ul', 'ol'] ) )
+						FCKTools.AppendBogusBr( eStartBlock ) ;
+				}
+			}
+
+			return {
+				PreviousBlock	: eStartBlock,
+				NextBlock		: eEndBlock,
+				WasStartOfBlock : bIsStartOfBlock,
+				WasEndOfBlock	: bIsEndOfBlock,
+				ElementPath		: oElementPath
+			} ;
+		}
+
+		return null ;
+	},
+
+	// Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
+	FixBlock : function( isStart, blockTag )
+	{
+		// Bookmark the range so we can restore it later.
+		var oBookmark = this.CreateBookmark() ;
+
+		// Collapse the range to the requested ending boundary.
+		this.Collapse( isStart ) ;
+
+		// Expands it to the block contents.
+		this.Expand( 'block_contents' ) ;
+
+		// Create the fixed block.
+		var oFixedBlock = this.Window.document.createElement( blockTag ) ;
+
+		// Move the contents of the temporary range to the fixed block.
+		this.ExtractContents().AppendTo( oFixedBlock ) ;
+		FCKDomTools.TrimNode( oFixedBlock ) ;
+
+		// If the fixed block is empty (not counting bookmark nodes)
+		// Add a <br /> inside to expand it.
+		if ( FCKDomTools.CheckIsEmptyElement(oFixedBlock, function( element ) { return element.getAttribute('_fck_bookmark') != 'true' ; } )
+				&& FCKBrowserInfo.IsGeckoLike )
+				FCKTools.AppendBogusBr( oFixedBlock ) ;
+
+		// Insert the fixed block into the DOM.
+		this.InsertNode( oFixedBlock ) ;
+
+		// Move the range back to the bookmarked place.
+		this.MoveToBookmark( oBookmark ) ;
+
+		return oFixedBlock ;
+	},
+
+	Release : function( preserveWindow )
+	{
+		if ( !preserveWindow )
+			this.Window = null ;
+
+		this.StartNode = null ;
+		this.StartContainer = null ;
+		this.StartBlock = null ;
+		this.StartBlockLimit = null ;
+		this.EndNode = null ;
+		this.EndContainer = null ;
+		this.EndBlock = null ;
+		this.EndBlockLimit = null ;
+		this._Range = null ;
+		this._Cache = null ;
+	},
+
+	CheckHasRange : function()
+	{
+		return !!this._Range ;
+	},
+
+	GetTouchedStartNode : function()
+	{
+		var range = this._Range ;
+		var container = range.startContainer ;
+
+		if ( range.collapsed || container.nodeType != 1 )
+			return container ;
+
+		return container.childNodes[ range.startOffset ] || container ;
+	},
+
+	GetTouchedEndNode : function()
+	{
+		var range = this._Range ;
+		var container = range.endContainer ;
+
+		if ( range.collapsed || container.nodeType != 1 )
+			return container ;
+
+		return container.childNodes[ range.endOffset - 1 ] || container ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_gecko.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_gecko.js
new file mode 100644
index 000000000..ddffb1301
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_gecko.js
@@ -0,0 +1,104 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Class for working with a selection range, much like the W3C DOM Range, but
+ * it is not intended to be an implementation of the W3C interface.
+ * (Gecko Implementation)
+ */
+
+FCKDomRange.prototype.MoveToSelection = function()
+{
+	this.Release( true ) ;
+
+	var oSel = this.Window.getSelection() ;
+
+	if ( oSel && oSel.rangeCount > 0 )
+	{
+		this._Range = FCKW3CRange.CreateFromRange( this.Window.document, oSel.getRangeAt(0) ) ;
+		this._UpdateElementInfo() ;
+	}
+	else
+		if ( this.Window.document )
+			this.MoveToElementStart( this.Window.document.body ) ;
+}
+
+FCKDomRange.prototype.Select = function()
+{
+	var oRange = this._Range ;
+	if ( oRange )
+	{
+		var startContainer = oRange.startContainer ;
+
+		// If we have a collapsed range, inside an empty element, we must add
+		// something to it, otherwise the caret will not be visible.
+		if ( oRange.collapsed && startContainer.nodeType == 1 && startContainer.childNodes.length == 0 )
+			startContainer.appendChild( oRange._Document.createTextNode('') ) ;
+
+		var oDocRange = this.Window.document.createRange() ;
+		oDocRange.setStart( startContainer, oRange.startOffset ) ;
+
+		try
+		{
+			oDocRange.setEnd( oRange.endContainer, oRange.endOffset ) ;
+		}
+		catch ( e )
+		{
+			// There is a bug in Firefox implementation (it would be too easy
+			// otherwise). The new start can't be after the end (W3C says it can).
+			// So, let's create a new range and collapse it to the desired point.
+			if ( e.toString().Contains( 'NS_ERROR_ILLEGAL_VALUE' ) )
+			{
+				oRange.collapse( true ) ;
+				oDocRange.setEnd( oRange.endContainer, oRange.endOffset ) ;
+			}
+			else
+				throw( e ) ;
+		}
+
+		var oSel = this.Window.getSelection() ;
+		oSel.removeAllRanges() ;
+
+		// We must add a clone otherwise Firefox will have rendering issues.
+		oSel.addRange( oDocRange ) ;
+	}
+}
+
+// Not compatible with bookmark created with CreateBookmark2.
+// The bookmark nodes will be deleted from the document.
+FCKDomRange.prototype.SelectBookmark = function( bookmark )
+{
+	var domRange = this.Window.document.createRange() ;
+
+	var startNode	= this.GetBookmarkNode( bookmark, true ) ;
+	var endNode		= this.GetBookmarkNode( bookmark, false ) ;
+
+	domRange.setStart( startNode.parentNode, FCKDomTools.GetIndexOf( startNode ) ) ;
+	FCKDomTools.RemoveNode( startNode ) ;
+
+	if ( endNode )
+	{
+		domRange.setEnd( endNode.parentNode, FCKDomTools.GetIndexOf( endNode ) ) ;
+		FCKDomTools.RemoveNode( endNode ) ;
+	}
+
+	var selection = this.Window.getSelection() ;
+	selection.removeAllRanges() ;
+	selection.addRange( domRange ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_ie.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_ie.js
new file mode 100644
index 000000000..3ebe2b9a3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrange_ie.js
@@ -0,0 +1,199 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Class for working with a selection range, much like the W3C DOM Range, but
+ * it is not intended to be an implementation of the W3C interface.
+ * (IE Implementation)
+ */
+
+FCKDomRange.prototype.MoveToSelection = function()
+{
+	this.Release( true ) ;
+
+	this._Range = new FCKW3CRange( this.Window.document ) ;
+
+	var oSel = this.Window.document.selection ;
+
+	if ( oSel.type != 'Control' )
+	{
+		var eMarkerStart	= this._GetSelectionMarkerTag( true ) ;
+		var eMarkerEnd		= this._GetSelectionMarkerTag( false ) ;
+
+		if ( !eMarkerStart && !eMarkerEnd )
+		{
+			this._Range.setStart( this.Window.document.body, 0 ) ;
+			this._UpdateElementInfo() ;
+			return ;
+		}
+
+		// Set the start boundary.
+		this._Range.setStart( eMarkerStart.parentNode, FCKDomTools.GetIndexOf( eMarkerStart ) ) ;
+		eMarkerStart.parentNode.removeChild( eMarkerStart ) ;
+
+		// Set the end boundary.
+		this._Range.setEnd( eMarkerEnd.parentNode, FCKDomTools.GetIndexOf( eMarkerEnd ) ) ;
+		eMarkerEnd.parentNode.removeChild( eMarkerEnd ) ;
+
+		this._UpdateElementInfo() ;
+	}
+	else
+	{
+		var oControl = oSel.createRange().item(0) ;
+
+		if ( oControl )
+		{
+			this._Range.setStartBefore( oControl ) ;
+			this._Range.setEndAfter( oControl ) ;
+			this._UpdateElementInfo() ;
+		}
+	}
+}
+
+FCKDomRange.prototype.Select = function( forceExpand )
+{
+	if ( this._Range )
+		this.SelectBookmark( this.CreateBookmark( true ), forceExpand ) ;
+}
+
+// Not compatible with bookmark created with CreateBookmark2.
+// The bookmark nodes will be deleted from the document.
+FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
+{
+	var bIsCollapsed = this.CheckIsCollapsed() ;
+	var bIsStartMakerAlone ;
+	var dummySpan ;
+
+	// Create marker tags for the start and end boundaries.
+	var eStartMarker = this.GetBookmarkNode( bookmark, true ) ;
+
+	if ( !eStartMarker )
+		return ;
+
+	var eEndMarker ;
+	if ( !bIsCollapsed )
+		eEndMarker = this.GetBookmarkNode( bookmark, false ) ;
+
+	// Create the main range which will be used for the selection.
+	var oIERange = this.Window.document.body.createTextRange() ;
+
+	// Position the range at the start boundary.
+	oIERange.moveToElementText( eStartMarker ) ;
+	oIERange.moveStart( 'character', 1 ) ;
+
+	if ( eEndMarker )
+	{
+		// Create a tool range for the end.
+		var oIERangeEnd = this.Window.document.body.createTextRange() ;
+
+		// Position the tool range at the end.
+		oIERangeEnd.moveToElementText( eEndMarker ) ;
+
+		// Move the end boundary of the main range to match the tool range.
+		oIERange.setEndPoint( 'EndToEnd', oIERangeEnd ) ;
+		oIERange.moveEnd( 'character', -1 ) ;
+	}
+	else
+	{
+		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
+
+		// Append a temporary <span>&#65279;</span> before the selection.
+		// This is needed to avoid IE destroying selections inside empty
+		// inline elements, like <b></b> (#253).
+		// It is also needed when placing the selection right after an inline
+		// element to avoid the selection moving inside of it.
+		dummySpan = this.Window.document.createElement( 'span' ) ;
+		dummySpan.innerHTML = '&#65279;' ;	// Zero Width No-Break Space (U+FEFF). See #1359.
+		eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ;
+
+		if ( bIsStartMakerAlone )
+		{
+			// To expand empty blocks or line spaces after <br>, we need
+			// instead to have any char, which will be later deleted using the
+			// selection.
+			// \ufeff = Zero Width No-Break Space (U+FEFF). See #1359.
+			eStartMarker.parentNode.insertBefore( this.Window.document.createTextNode( '\ufeff' ), eStartMarker ) ;
+		}
+	}
+
+	if ( !this._Range )
+		this._Range = this.CreateRange() ;
+
+	// Remove the markers (reset the position, because of the changes in the DOM tree).
+	this._Range.setStartBefore( eStartMarker ) ;
+	eStartMarker.parentNode.removeChild( eStartMarker ) ;
+
+	if ( bIsCollapsed )
+	{
+		if ( bIsStartMakerAlone )
+		{
+			// Move the selection start to include the temporary &#65279;.
+			oIERange.moveStart( 'character', -1 ) ;
+
+			oIERange.select() ;
+
+			// Remove our temporary stuff.
+			this.Window.document.selection.clear() ;
+		}
+		else
+			oIERange.select() ;
+
+		FCKDomTools.RemoveNode( dummySpan ) ;
+	}
+	else
+	{
+		this._Range.setEndBefore( eEndMarker ) ;
+		eEndMarker.parentNode.removeChild( eEndMarker ) ;
+		oIERange.select() ;
+	}
+}
+
+FCKDomRange.prototype._GetSelectionMarkerTag = function( toStart )
+{
+	var doc = this.Window.document ;
+	var selection = doc.selection ;
+
+	// Get a range for the start boundary.
+	var oRange ;
+
+	// IE may throw an "unspecified error" on some cases (it happened when
+	// loading _samples/default.html), so try/catch.
+	try
+	{
+		oRange = selection.createRange() ;
+	}
+	catch (e)
+	{
+		return null ;
+	}
+
+	// IE might take the range object to the main window instead of inside the editor iframe window.
+	// This is known to happen when the editor window has not been selected before (See #933).
+	// We need to avoid that.
+	if ( oRange.parentElement().document != doc )
+		return null ;
+
+	oRange.collapse( toStart === true ) ;
+
+	// Paste a marker element at the collapsed range and get it from the DOM.
+	var sMarkerId = 'fck_dom_range_temp_' + (new Date()).valueOf() + '_' + Math.floor(Math.random()*1000) ;
+	oRange.pasteHTML( '<span id="' + sMarkerId + '"></span>' ) ;
+
+	return doc.getElementById( sMarkerId ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrangeiterator.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrangeiterator.js
new file mode 100644
index 000000000..8aa668b0c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckdomrangeiterator.js
@@ -0,0 +1,327 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This class can be used to interate through nodes inside a range.
+ *
+ * During interation, the provided range can become invalid, due to document
+ * mutations, so CreateBookmark() used to restore it after processing, if
+ * needed.
+ */
+
+var FCKDomRangeIterator = function( range )
+{
+	/**
+	 * The FCKDomRange object that marks the interation boundaries.
+	 */
+	this.Range = range ;
+
+	/**
+	 * Indicates that <br> elements must be used as paragraph boundaries.
+	 */
+	this.ForceBrBreak = false ;
+
+	/**
+	 * Guarantees that the iterator will always return "real" block elements.
+	 * If "false", elements like <li>, <th> and <td> are returned. If "true", a
+	 * dedicated block element block element will be created inside those
+	 * elements to hold the selected content.
+	 */
+	this.EnforceRealBlocks = false ;
+}
+
+FCKDomRangeIterator.CreateFromSelection = function( targetWindow )
+{
+	var range = new FCKDomRange( targetWindow ) ;
+	range.MoveToSelection() ;
+	return new FCKDomRangeIterator( range ) ;
+}
+
+FCKDomRangeIterator.prototype =
+{
+	/**
+	 * Get the next paragraph element. It automatically breaks the document
+	 * when necessary to generate block elements for the paragraphs.
+	 */
+	GetNextParagraph : function()
+	{
+		// The block element to be returned.
+		var block ;
+
+		// The range object used to identify the paragraph contents.
+		var range ;
+
+		// Indicated that the current element in the loop is the last one.
+		var isLast ;
+
+		// Instructs to cleanup remaining BRs.
+		var removePreviousBr ;
+		var removeLastBr ;
+
+		var boundarySet = this.ForceBrBreak ? FCKListsLib.ListBoundaries : FCKListsLib.BlockBoundaries ;
+
+		// This is the first iteration. Let's initialize it.
+		if ( !this._LastNode )
+		{
+			var range = this.Range.Clone() ;
+			range.Expand( this.ForceBrBreak ? 'list_contents' : 'block_contents' ) ;
+
+			this._NextNode = range.GetTouchedStartNode() ;
+			this._LastNode = range.GetTouchedEndNode() ;
+
+			// Let's reuse this variable.
+			range = null ;
+		}
+
+		var currentNode = this._NextNode ;
+		var lastNode = this._LastNode ;
+
+		this._NextNode = null ;
+
+		while ( currentNode )
+		{
+			// closeRange indicates that a paragraph boundary has been found,
+			// so the range can be closed.
+			var closeRange = false ;
+
+			// includeNode indicates that the current node is good to be part
+			// of the range. By default, any non-element node is ok for it.
+			var includeNode = ( currentNode.nodeType != 1 ) ;
+
+			var continueFromSibling = false ;
+
+			// If it is an element node, let's check if it can be part of the
+			// range.
+			if ( !includeNode )
+			{
+				var nodeName = currentNode.nodeName.toLowerCase() ;
+
+				if ( boundarySet[ nodeName ] && ( !FCKBrowserInfo.IsIE || currentNode.scopeName == 'HTML' ) )
+				{
+					// <br> boundaries must be part of the range. It will
+					// happen only if ForceBrBreak.
+					if ( nodeName == 'br' )
+						includeNode = true ;
+					else if ( !range && currentNode.childNodes.length == 0 && nodeName != 'hr' )
+					{
+						// If we have found an empty block, and haven't started
+						// the range yet, it means we must return this block.
+						block = currentNode ;
+						isLast = currentNode == lastNode ;
+						break ;
+					}
+
+					// The range must finish right before the boundary,
+					// including possibly skipped empty spaces. (#1603)
+					if ( range )
+					{
+						range.SetEnd( currentNode, 3, true ) ;
+
+						// The found boundary must be set as the next one at this
+						// point. (#1717)
+						if ( nodeName != 'br' )
+							this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) ;
+					}
+
+					closeRange = true ;
+				}
+				else
+				{
+					// If we have child nodes, let's check them.
+					if ( currentNode.firstChild )
+					{
+						// If we don't have a range yet, let's start it.
+						if ( !range )
+						{
+							range = new FCKDomRange( this.Range.Window ) ;
+							range.SetStart( currentNode, 3, true ) ;
+						}
+
+						currentNode = currentNode.firstChild ;
+						continue ;
+					}
+					includeNode = true ;
+				}
+			}
+			else if ( currentNode.nodeType == 3 )
+			{
+				// Ignore normal whitespaces (i.e. not including &nbsp; or
+				// other unicode whitespaces) before/after a block node.
+				if ( /^[\r\n\t ]+$/.test( currentNode.nodeValue ) )
+					includeNode = false ;
+			}
+
+			// The current node is good to be part of the range and we are
+			// starting a new range, initialize it first.
+			if ( includeNode && !range )
+			{
+				range = new FCKDomRange( this.Range.Window ) ;
+				range.SetStart( currentNode, 3, true ) ;
+			}
+
+			// The last node has been found.
+			isLast = ( ( !closeRange || includeNode ) && currentNode == lastNode ) ;
+//			isLast = ( currentNode == lastNode && ( currentNode.nodeType != 1 || currentNode.childNodes.length == 0 ) ) ;
+
+			// If we are in an element boundary, let's check if it is time
+			// to close the range, otherwise we include the parent within it.
+			if ( range && !closeRange )
+			{
+				while ( !currentNode.nextSibling && !isLast )
+				{
+					var parentNode = currentNode.parentNode ;
+
+					if ( boundarySet[ parentNode.nodeName.toLowerCase() ] )
+					{
+						closeRange = true ;
+						isLast = isLast || ( parentNode == lastNode ) ;
+						break ;
+					}
+
+					currentNode = parentNode ;
+					includeNode = true ;
+					isLast = ( currentNode == lastNode ) ;
+					continueFromSibling = true ;
+				}
+			}
+
+			// Now finally include the node.
+			if ( includeNode )
+				range.SetEnd( currentNode, 4, true ) ;
+
+			// We have found a block boundary. Let's close the range and move out of the
+			// loop.
+			if ( ( closeRange || isLast ) && range )
+			{
+				range._UpdateElementInfo() ;
+
+				if ( range.StartNode == range.EndNode
+						&& range.StartNode.parentNode == range.StartBlockLimit
+						&& range.StartNode.getAttribute && range.StartNode.getAttribute( '_fck_bookmark' ) )
+					range = null ;
+				else
+					break ;
+			}
+
+			if ( isLast )
+				break ;
+
+			currentNode = FCKDomTools.GetNextSourceNode( currentNode, continueFromSibling, null, lastNode ) ;
+		}
+
+		// Now, based on the processed range, look for (or create) the block to be returned.
+		if ( !block )
+		{
+			// If no range has been found, this is the end.
+			if ( !range )
+			{
+				this._NextNode = null ;
+				return null ;
+			}
+
+			block = range.StartBlock ;
+
+			if ( !block
+				&& !this.EnforceRealBlocks
+				&& range.StartBlockLimit.nodeName.IEquals( 'DIV', 'TH', 'TD' )
+				&& range.CheckStartOfBlock()
+				&& range.CheckEndOfBlock() )
+			{
+				block = range.StartBlockLimit ;
+			}
+			else if ( !block || ( this.EnforceRealBlocks && block.nodeName.toLowerCase() == 'li' ) )
+			{
+				// Create the fixed block.
+				block = this.Range.Window.document.createElement( FCKConfig.EnterMode == 'p' ? 'p' : 'div' ) ;
+
+				// Move the contents of the temporary range to the fixed block.
+				range.ExtractContents().AppendTo( block ) ;
+				FCKDomTools.TrimNode( block ) ;
+
+				// Insert the fixed block into the DOM.
+				range.InsertNode( block ) ;
+
+				removePreviousBr = true ;
+				removeLastBr = true ;
+			}
+			else if ( block.nodeName.toLowerCase() != 'li' )
+			{
+				// If the range doesn't includes the entire contents of the
+				// block, we must split it, isolating the range in a dedicated
+				// block.
+				if ( !range.CheckStartOfBlock() || !range.CheckEndOfBlock() )
+				{
+					// The resulting block will be a clone of the current one.
+					block = block.cloneNode( false ) ;
+
+					// Extract the range contents, moving it to the new block.
+					range.ExtractContents().AppendTo( block ) ;
+					FCKDomTools.TrimNode( block ) ;
+
+					// Split the block. At this point, the range will be in the
+					// right position for our intents.
+					var splitInfo = range.SplitBlock() ;
+
+					removePreviousBr = !splitInfo.WasStartOfBlock ;
+					removeLastBr = !splitInfo.WasEndOfBlock ;
+
+					// Insert the new block into the DOM.
+					range.InsertNode( block ) ;
+				}
+			}
+			else if ( !isLast )
+			{
+				// LIs are returned as is, with all their children (due to the
+				// nested lists). But, the next node is the node right after
+				// the current range, which could be an <li> child (nested
+				// lists) or the next sibling <li>.
+
+				this._NextNode = block == lastNode ? null : FCKDomTools.GetNextSourceNode( range.EndNode, true, null, lastNode ) ;
+				return block ;
+			}
+		}
+
+		if ( removePreviousBr )
+		{
+			var previousSibling = block.previousSibling ;
+			if ( previousSibling && previousSibling.nodeType == 1 )
+			{
+				if ( previousSibling.nodeName.toLowerCase() == 'br' )
+					previousSibling.parentNode.removeChild( previousSibling ) ;
+				else if ( previousSibling.lastChild && previousSibling.lastChild.nodeName.IEquals( 'br' ) )
+					previousSibling.removeChild( previousSibling.lastChild ) ;
+			}
+		}
+
+		if ( removeLastBr )
+		{
+			var lastChild = block.lastChild ;
+			if ( lastChild && lastChild.nodeType == 1 && lastChild.nodeName.toLowerCase() == 'br' )
+				block.removeChild( lastChild ) ;
+		}
+
+		// Get a reference for the next element. This is important because the
+		// above block can be removed or changed, so we can rely on it for the
+		// next interation.
+		if ( !this._NextNode )
+			this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
+
+		return block ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckeditingarea.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckeditingarea.js
new file mode 100644
index 000000000..66d93e12a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckeditingarea.js
@@ -0,0 +1,368 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKEditingArea Class: renders an editable area.
+ */
+
+/**
+ * @constructor
+ * @param {String} targetElement The element that will hold the editing area. Any child element present in the target will be deleted.
+ */
+var FCKEditingArea = function( targetElement )
+{
+	this.TargetElement = targetElement ;
+	this.Mode = FCK_EDITMODE_WYSIWYG ;
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( this, FCKEditingArea_Cleanup ) ;
+}
+
+
+/**
+ * @param {String} html The complete HTML for the page, including DOCTYPE and the <html> tag.
+ */
+FCKEditingArea.prototype.Start = function( html, secondCall )
+{
+	var eTargetElement	= this.TargetElement ;
+	var oTargetDocument	= FCKTools.GetElementDocument( eTargetElement ) ;
+
+	// Remove all child nodes from the target.
+	while( eTargetElement.firstChild )
+		eTargetElement.removeChild( eTargetElement.firstChild ) ;
+
+	if ( this.Mode == FCK_EDITMODE_WYSIWYG )
+	{
+		// For FF, document.domain must be set only when different, otherwhise
+		// we'll strangely have "Permission denied" issues.
+		if ( FCK_IS_CUSTOM_DOMAIN )
+			html = '<script>document.domain="' + FCK_RUNTIME_DOMAIN + '";</script>' + html ;
+
+		// IE has a bug with the <base> tag... it must have a </base> closer,
+		// otherwise the all successive tags will be set as children nodes of the <base>.
+		if ( FCKBrowserInfo.IsIE )
+			html = html.replace( /(<base[^>]*?)\s*\/?>(?!\s*<\/base>)/gi, '$1></base>' ) ;
+		else if ( !secondCall )
+		{
+			// Gecko moves some tags out of the body to the head, so we must use
+			// innerHTML to set the body contents (SF BUG 1526154).
+
+			// Extract the BODY contents from the html.
+			var oMatchBefore = html.match( FCKRegexLib.BeforeBody ) ;
+			var oMatchAfter = html.match( FCKRegexLib.AfterBody ) ;
+
+			if ( oMatchBefore && oMatchAfter )
+			{
+				var sBody = html.substr( oMatchBefore[1].length,
+					       html.length - oMatchBefore[1].length - oMatchAfter[1].length ) ;	// This is the BODY tag contents.
+
+				html =
+					oMatchBefore[1] +			// This is the HTML until the <body...> tag, inclusive.
+					'&nbsp;' +
+					oMatchAfter[1] ;			// This is the HTML from the </body> tag, inclusive.
+
+				// If nothing in the body, place a BOGUS tag so the cursor will appear.
+				if ( FCKBrowserInfo.IsGecko && ( sBody.length == 0 || FCKRegexLib.EmptyParagraph.test( sBody ) ) )
+					sBody = '<br type="_moz">' ;
+
+				this._BodyHTML = sBody ;
+
+			}
+			else
+				this._BodyHTML = html ;			// Invalid HTML input.
+		}
+
+		// Create the editing area IFRAME.
+		var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
+
+		// IE: Avoid JavaScript errors thrown by the editing are source (like tags events).
+		// See #1055.
+		var sOverrideError = '<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>' ;
+
+		oIFrame.frameBorder = 0 ;
+		oIFrame.style.width = oIFrame.style.height = '100%' ;
+
+		if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
+		{
+			window._FCKHtmlToLoad = html.replace( /<head>/i, '<head>' + sOverrideError ) ;
+			oIFrame.src = 'javascript:void( (function(){' +
+				'document.open() ;' +
+				'document.domain="' + document.domain + '" ;' +
+				'document.write( window.parent._FCKHtmlToLoad );' +
+				'document.close() ;' +
+				'window.parent._FCKHtmlToLoad = null ;' +
+				'})() )' ;
+		}
+		else if ( !FCKBrowserInfo.IsGecko )
+		{
+			// Firefox will render the tables inside the body in Quirks mode if the
+			// source of the iframe is set to javascript. see #515
+			oIFrame.src = 'javascript:void(0)' ;
+		}
+
+		// Append the new IFRAME to the target. For IE, it must be done after
+		// setting the "src", to avoid the "secure/unsecure" message under HTTPS.
+		eTargetElement.appendChild( oIFrame ) ;
+
+		// Get the window and document objects used to interact with the newly created IFRAME.
+		this.Window = oIFrame.contentWindow ;
+
+		// IE: Avoid JavaScript errors thrown by the editing are source (like tags events).
+		// TODO: This error handler is not being fired.
+		// this.Window.onerror = function() { alert( 'Error!' ) ; return true ; }
+
+		if ( !FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
+		{
+			var oDoc = this.Window.document ;
+
+			oDoc.open() ;
+			oDoc.write( html.replace( /<head>/i, '<head>' + sOverrideError ) ) ;
+			oDoc.close() ;
+		}
+
+		if ( FCKBrowserInfo.IsAIR )
+			FCKAdobeAIR.EditingArea_Start( oDoc, html ) ;
+
+		// Firefox 1.0.x is buggy... ohh yes... so let's do it two times and it
+		// will magically work.
+		if ( FCKBrowserInfo.IsGecko10 && !secondCall )
+		{
+			this.Start( html, true ) ;
+			return ;
+		}
+
+		if ( oIFrame.readyState && oIFrame.readyState != 'completed' )
+		{
+			var editArea = this ;
+
+			// Using a IE alternative for DOMContentLoaded, similar to the
+			// solution proposed at http://javascript.nwbox.com/IEContentLoaded/
+			setTimeout( function()
+					{
+						try
+						{
+							editArea.Window.document.documentElement.doScroll("left") ;
+						}
+						catch(e)
+						{
+							setTimeout( arguments.callee, 0 ) ;
+							return ;
+						}
+						editArea.Window._FCKEditingArea = editArea ;
+						FCKEditingArea_CompleteStart.call( editArea.Window ) ;
+					}, 0 ) ;
+		}
+		else
+		{
+			this.Window._FCKEditingArea = this ;
+
+			// FF 1.0.x is buggy... we must wait a lot to enable editing because
+			// sometimes the content simply disappears, for example when pasting
+			// "bla1!<img src='some_url'>!bla2" in the source and then switching
+			// back to design.
+			if ( FCKBrowserInfo.IsGecko10 )
+				this.Window.setTimeout( FCKEditingArea_CompleteStart, 500 ) ;
+			else
+				FCKEditingArea_CompleteStart.call( this.Window ) ;
+		}
+	}
+	else
+	{
+		var eTextarea = this.Textarea = oTargetDocument.createElement( 'textarea' ) ;
+		eTextarea.className = 'SourceField' ;
+		eTextarea.dir = 'ltr' ;
+		FCKDomTools.SetElementStyles( eTextarea,
+			{
+				width	: '100%',
+				height	: '100%',
+				border	: 'none',
+				resize	: 'none',
+				outline	: 'none'
+			} ) ;
+		eTargetElement.appendChild( eTextarea ) ;
+
+		eTextarea.value = html  ;
+
+		// Fire the "OnLoad" event.
+		FCKTools.RunFunction( this.OnLoad ) ;
+	}
+}
+
+// "this" here is FCKEditingArea.Window
+function FCKEditingArea_CompleteStart()
+{
+	// On Firefox, the DOM takes a little to become available. So we must wait for it in a loop.
+	if ( !this.document.body )
+	{
+		this.setTimeout( FCKEditingArea_CompleteStart, 50 ) ;
+		return ;
+	}
+
+	var oEditorArea = this._FCKEditingArea ;
+
+	// Save this reference to be re-used later.
+	oEditorArea.Document = oEditorArea.Window.document ;
+
+	oEditorArea.MakeEditable() ;
+
+	// Fire the "OnLoad" event.
+	FCKTools.RunFunction( oEditorArea.OnLoad ) ;
+}
+
+FCKEditingArea.prototype.MakeEditable = function()
+{
+	var oDoc = this.Document ;
+
+	if ( FCKBrowserInfo.IsIE )
+	{
+		// Kludge for #141 and #523
+		oDoc.body.disabled = true ;
+		oDoc.body.contentEditable = true ;
+		oDoc.body.removeAttribute( "disabled" ) ;
+
+		/* The following commands don't throw errors, but have no effect.
+		oDoc.execCommand( 'AutoDetect', false, false ) ;
+		oDoc.execCommand( 'KeepSelection', false, true ) ;
+		*/
+	}
+	else
+	{
+		try
+		{
+			// Disable Firefox 2 Spell Checker.
+			oDoc.body.spellcheck = ( this.FFSpellChecker !== false ) ;
+
+			if ( this._BodyHTML )
+			{
+				oDoc.body.innerHTML = this._BodyHTML ;
+				oDoc.body.offsetLeft ;		// Don't remove, this is a hack to fix Opera 9.50, see #2264.
+				this._BodyHTML = null ;
+			}
+
+			oDoc.designMode = 'on' ;
+
+			// Tell Gecko (Firefox 1.5+) to enable or not live resizing of objects (by Alfonso Martinez)
+			oDoc.execCommand( 'enableObjectResizing', false, !FCKConfig.DisableObjectResizing ) ;
+
+			// Disable the standard table editing features of Firefox.
+			oDoc.execCommand( 'enableInlineTableEditing', false, !FCKConfig.DisableFFTableHandles ) ;
+		}
+		catch (e)
+		{
+			// In Firefox if the iframe is initially hidden it can't be set to designMode and it raises an exception
+			// So we set up a DOM Mutation event Listener on the HTML, as it will raise several events when the document is  visible again
+			FCKTools.AddEventListener( this.Window.frameElement, 'DOMAttrModified', FCKEditingArea_Document_AttributeNodeModified ) ;
+		}
+
+	}
+}
+
+// This function processes the notifications of the DOM Mutation event on the document
+// We use it to know that the document will be ready to be editable again (or we hope so)
+function FCKEditingArea_Document_AttributeNodeModified( evt )
+{
+	var editingArea = evt.currentTarget.contentWindow._FCKEditingArea ;
+
+	// We want to run our function after the events no longer fire, so we can know that it's a stable situation
+	if ( editingArea._timer )
+		window.clearTimeout( editingArea._timer ) ;
+
+	editingArea._timer = FCKTools.SetTimeout( FCKEditingArea_MakeEditableByMutation, 1000, editingArea ) ;
+}
+
+// This function ideally should be called after the document is visible, it does clean up of the
+// mutation tracking and tries again to make the area editable.
+function FCKEditingArea_MakeEditableByMutation()
+{
+	// Clean up
+	delete this._timer ;
+	// Now we don't want to keep on getting this event
+	FCKTools.RemoveEventListener( this.Window.frameElement, 'DOMAttrModified', FCKEditingArea_Document_AttributeNodeModified ) ;
+	// Let's try now to set the editing area editable
+	// If it fails it will set up the Mutation Listener again automatically
+	this.MakeEditable() ;
+}
+
+FCKEditingArea.prototype.Focus = function()
+{
+	try
+	{
+		if ( this.Mode == FCK_EDITMODE_WYSIWYG )
+		{
+			if ( FCKBrowserInfo.IsIE )
+				this._FocusIE() ;
+			else
+				this.Window.focus() ;
+		}
+		else
+		{
+			var oDoc = FCKTools.GetElementDocument( this.Textarea ) ;
+			if ( (!oDoc.hasFocus || oDoc.hasFocus() ) && oDoc.activeElement == this.Textarea )
+				return ;
+
+			this.Textarea.focus() ;
+		}
+	}
+	catch(e) {}
+}
+
+FCKEditingArea.prototype._FocusIE = function()
+{
+	// In IE it can happen that the document is in theory focused but the
+	// active element is outside of it.
+	this.Document.body.setActive() ;
+
+	this.Window.focus() ;
+
+	// Kludge for #141... yet more code to workaround IE bugs
+	var range = this.Document.selection.createRange() ;
+
+	var parentNode = range.parentElement() ;
+	var parentTag = parentNode.nodeName.toLowerCase() ;
+
+	// Only apply the fix when in a block, and the block is empty.
+	if ( parentNode.childNodes.length > 0 ||
+		 !( FCKListsLib.BlockElements[parentTag] ||
+		    FCKListsLib.NonEmptyBlockElements[parentTag] ) )
+	{
+		return ;
+	}
+
+	// Force the selection to happen, in this way we guarantee the focus will
+	// be there.
+	range = new FCKDomRange( this.Window ) ;
+	range.MoveToElementEditStart( parentNode ) ;
+	range.Select() ;
+}
+
+function FCKEditingArea_Cleanup()
+{
+	if ( this.Document )
+		this.Document.body.innerHTML = "" ;
+	this.TargetElement = null ;
+	this.IFrame = null ;
+	this.Document = null ;
+	this.Textarea = null ;
+
+	if ( this.Window )
+	{
+		this.Window._FCKEditingArea = null ;
+		this.Window = null ;
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckelementpath.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckelementpath.js
new file mode 100644
index 000000000..2bf4eb3e9
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckelementpath.js
@@ -0,0 +1,89 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Manages the DOM ascensors element list of a specific DOM node
+ * (limited to body, inclusive).
+ */
+
+var FCKElementPath = function( lastNode )
+{
+	var eBlock = null ;
+	var eBlockLimit = null ;
+
+	var aElements = new Array() ;
+
+	var e = lastNode ;
+	while ( e )
+	{
+		if ( e.nodeType == 1 )
+		{
+			if ( !this.LastElement )
+				this.LastElement = e ;
+
+			var sElementName = e.nodeName.toLowerCase() ;
+			if ( FCKBrowserInfo.IsIE && e.scopeName != 'HTML' )
+				sElementName = e.scopeName.toLowerCase() + ':' + sElementName ;
+
+			if ( !eBlockLimit )
+			{
+				if ( !eBlock && FCKListsLib.PathBlockElements[ sElementName ] != null )
+					eBlock = e ;
+
+				if ( FCKListsLib.PathBlockLimitElements[ sElementName ] != null )
+				{
+					// DIV is considered the Block, if no block is available (#525)
+					// and if it doesn't contain other blocks.
+					if ( !eBlock && sElementName == 'div' && !FCKElementPath._CheckHasBlock( e ) )
+						eBlock = e ;
+					else
+						eBlockLimit = e ;
+				}
+			}
+
+			aElements.push( e ) ;
+
+			if ( sElementName == 'body' )
+				break ;
+		}
+		e = e.parentNode ;
+	}
+
+	this.Block = eBlock ;
+	this.BlockLimit = eBlockLimit ;
+	this.Elements = aElements ;
+}
+
+/**
+ * Check if an element contains any block element.
+ */
+FCKElementPath._CheckHasBlock = function( element )
+{
+	var childNodes = element.childNodes ;
+
+	for ( var i = 0, count = childNodes.length ; i < count ; i++ )
+	{
+		var child = childNodes[i] ;
+
+		if ( child.nodeType == 1 && FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] )
+			return true ;
+	}
+
+	return false ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckenterkey.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckenterkey.js
new file mode 100644
index 000000000..49f64bea7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckenterkey.js
@@ -0,0 +1,688 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Controls the [Enter] keystroke behavior in a document.
+ */
+
+/*
+ *	Constructor.
+ *		@targetDocument : the target document.
+ *		@enterMode : the behavior for the <Enter> keystroke.
+ *			May be "p", "div", "br". Default is "p".
+ *		@shiftEnterMode : the behavior for the <Shift>+<Enter> keystroke.
+ *			May be "p", "div", "br". Defaults to "br".
+ */
+var FCKEnterKey = function( targetWindow, enterMode, shiftEnterMode, tabSpaces )
+{
+	this.Window			= targetWindow ;
+	this.EnterMode		= enterMode || 'p' ;
+	this.ShiftEnterMode	= shiftEnterMode || 'br' ;
+
+	// Setup the Keystroke Handler.
+	var oKeystrokeHandler = new FCKKeystrokeHandler( false ) ;
+	oKeystrokeHandler._EnterKey = this ;
+	oKeystrokeHandler.OnKeystroke = FCKEnterKey_OnKeystroke ;
+
+	oKeystrokeHandler.SetKeystrokes( [
+		[ 13		, 'Enter' ],
+		[ SHIFT + 13, 'ShiftEnter' ],
+		[ 8			, 'Backspace' ],
+		[ CTRL + 8	, 'CtrlBackspace' ],
+		[ 46		, 'Delete' ]
+	] ) ;
+
+	this.TabText = '' ;
+
+	// Safari by default inserts 4 spaces on TAB, while others make the editor
+	// loose focus. So, we need to handle it here to not include those spaces.
+	if ( tabSpaces > 0 || FCKBrowserInfo.IsSafari )
+	{
+		while ( tabSpaces-- )
+			this.TabText += '\xa0' ;
+
+		oKeystrokeHandler.SetKeystrokes( [ 9, 'Tab' ] );
+	}
+
+	oKeystrokeHandler.AttachToElement( targetWindow.document ) ;
+}
+
+
+function FCKEnterKey_OnKeystroke(  keyCombination, keystrokeValue )
+{
+	var oEnterKey = this._EnterKey ;
+
+	try
+	{
+		switch ( keystrokeValue )
+		{
+			case 'Enter' :
+				return oEnterKey.DoEnter() ;
+				break ;
+			case 'ShiftEnter' :
+				return oEnterKey.DoShiftEnter() ;
+				break ;
+			case 'Backspace' :
+				return oEnterKey.DoBackspace() ;
+				break ;
+			case 'Delete' :
+				return oEnterKey.DoDelete() ;
+				break ;
+			case 'Tab' :
+				return oEnterKey.DoTab() ;
+				break ;
+			case 'CtrlBackspace' :
+				return oEnterKey.DoCtrlBackspace() ;
+				break ;
+		}
+	}
+	catch (e)
+	{
+		// If for any reason we are not able to handle it, go
+		// ahead with the browser default behavior.
+	}
+
+	return false ;
+}
+
+/*
+ * Executes the <Enter> key behavior.
+ */
+FCKEnterKey.prototype.DoEnter = function( mode, hasShift )
+{
+	// Save an undo snapshot before doing anything
+	FCKUndo.SaveUndoStep() ;
+
+	this._HasShift = ( hasShift === true ) ;
+
+	var parentElement = FCKSelection.GetParentElement() ;
+	var parentPath = new FCKElementPath( parentElement ) ;
+	var sMode = mode || this.EnterMode ;
+
+	if ( sMode == 'br' || parentPath.Block && parentPath.Block.tagName.toLowerCase() == 'pre' )
+		return this._ExecuteEnterBr() ;
+	else
+		return this._ExecuteEnterBlock( sMode ) ;
+}
+
+/*
+ * Executes the <Shift>+<Enter> key behavior.
+ */
+FCKEnterKey.prototype.DoShiftEnter = function()
+{
+	return this.DoEnter( this.ShiftEnterMode, true ) ;
+}
+
+/*
+ * Executes the <Backspace> key behavior.
+ */
+FCKEnterKey.prototype.DoBackspace = function()
+{
+	var bCustom = false ;
+
+	// Get the current selection.
+	var oRange = new FCKDomRange( this.Window ) ;
+	oRange.MoveToSelection() ;
+
+	// Kludge for #247
+	if ( FCKBrowserInfo.IsIE && this._CheckIsAllContentsIncluded( oRange, this.Window.document.body ) )
+	{
+		this._FixIESelectAllBug( oRange ) ;
+		return true ;
+	}
+
+	var isCollapsed = oRange.CheckIsCollapsed() ;
+
+	if ( !isCollapsed )
+	{
+		// Bug #327, Backspace with an img selection would activate the default action in IE.
+		// Let's override that with our logic here.
+		if ( FCKBrowserInfo.IsIE && this.Window.document.selection.type.toLowerCase() == "control" )
+		{
+			var controls = this.Window.document.selection.createRange() ;
+			for ( var i = controls.length - 1 ; i >= 0 ; i-- )
+			{
+				var el = controls.item( i ) ;
+				el.parentNode.removeChild( el ) ;
+			}
+			return true ;
+		}
+
+		return false ;
+	}
+
+	// On IE, it is better for us handle the deletion if the caret is preceeded
+	// by a <br> (#1383).
+	if ( FCKBrowserInfo.IsIE )
+	{
+		var previousElement = FCKDomTools.GetPreviousSourceElement( oRange.StartNode, true ) ;
+
+		if ( previousElement && previousElement.nodeName.toLowerCase() == 'br' )
+		{
+			// Create a range that starts after the <br> and ends at the
+			// current range position.
+			var testRange = oRange.Clone() ;
+			testRange.SetStart( previousElement, 4 ) ;
+
+			// If that range is empty, we can proceed cleaning that <br> manually.
+			if ( testRange.CheckIsEmpty() )
+			{
+				previousElement.parentNode.removeChild( previousElement ) ;
+				return true ;
+			}
+		}
+	}
+
+	var oStartBlock = oRange.StartBlock ;
+	var oEndBlock = oRange.EndBlock ;
+
+	// The selection boundaries must be in the same "block limit" element
+	if ( oRange.StartBlockLimit == oRange.EndBlockLimit && oStartBlock && oEndBlock )
+	{
+		if ( !isCollapsed )
+		{
+			var bEndOfBlock = oRange.CheckEndOfBlock() ;
+
+			oRange.DeleteContents() ;
+
+			if ( oStartBlock != oEndBlock )
+			{
+				oRange.SetStart(oEndBlock,1) ;
+				oRange.SetEnd(oEndBlock,1) ;
+
+//				if ( bEndOfBlock )
+//					oEndBlock.parentNode.removeChild( oEndBlock ) ;
+			}
+
+			oRange.Select() ;
+
+			bCustom = ( oStartBlock == oEndBlock ) ;
+		}
+
+		if ( oRange.CheckStartOfBlock() )
+		{
+			var oCurrentBlock = oRange.StartBlock ;
+
+			var ePrevious = FCKDomTools.GetPreviousSourceElement( oCurrentBlock, true, [ 'BODY', oRange.StartBlockLimit.nodeName ], ['UL','OL'] ) ;
+
+			bCustom = this._ExecuteBackspace( oRange, ePrevious, oCurrentBlock ) ;
+		}
+		else if ( FCKBrowserInfo.IsGeckoLike )
+		{
+			// Firefox and Opera (#1095) loose the selection when executing
+			// CheckStartOfBlock, so we must reselect.
+			oRange.Select() ;
+		}
+	}
+
+	oRange.Release() ;
+	return bCustom ;
+}
+
+FCKEnterKey.prototype.DoCtrlBackspace = function()
+{
+	FCKUndo.SaveUndoStep() ;
+	var oRange = new FCKDomRange( this.Window ) ;
+	oRange.MoveToSelection() ;
+	if ( FCKBrowserInfo.IsIE && this._CheckIsAllContentsIncluded( oRange, this.Window.document.body ) )
+	{
+		this._FixIESelectAllBug( oRange ) ;
+		return true ;
+	}
+	return false ;
+}
+
+FCKEnterKey.prototype._ExecuteBackspace = function( range, previous, currentBlock )
+{
+	var bCustom = false ;
+
+	// We could be in a nested LI.
+	if ( !previous && currentBlock && currentBlock.nodeName.IEquals( 'LI' ) && currentBlock.parentNode.parentNode.nodeName.IEquals( 'LI' ) )
+	{
+		this._OutdentWithSelection( currentBlock, range ) ;
+		return true ;
+	}
+
+	if ( previous && previous.nodeName.IEquals( 'LI' ) )
+	{
+		var oNestedList = FCKDomTools.GetLastChild( previous, ['UL','OL'] ) ;
+
+		while ( oNestedList )
+		{
+			previous = FCKDomTools.GetLastChild( oNestedList, 'LI' ) ;
+			oNestedList = FCKDomTools.GetLastChild( previous, ['UL','OL'] ) ;
+		}
+	}
+
+	if ( previous && currentBlock )
+	{
+		// If we are in a LI, and the previous block is not an LI, we must outdent it.
+		if ( currentBlock.nodeName.IEquals( 'LI' ) && !previous.nodeName.IEquals( 'LI' ) )
+		{
+			this._OutdentWithSelection( currentBlock, range ) ;
+			return true ;
+		}
+
+		// Take a reference to the parent for post processing cleanup.
+		var oCurrentParent = currentBlock.parentNode ;
+
+		var sPreviousName = previous.nodeName.toLowerCase() ;
+		if ( FCKListsLib.EmptyElements[ sPreviousName ] != null || sPreviousName == 'table' )
+		{
+			FCKDomTools.RemoveNode( previous ) ;
+			bCustom = true ;
+		}
+		else
+		{
+			// Remove the current block.
+			FCKDomTools.RemoveNode( currentBlock ) ;
+
+			// Remove any empty tag left by the block removal.
+			while ( oCurrentParent.innerHTML.Trim().length == 0 )
+			{
+				var oParent = oCurrentParent.parentNode ;
+				oParent.removeChild( oCurrentParent ) ;
+				oCurrentParent = oParent ;
+			}
+
+			// Cleanup the previous and the current elements.
+			FCKDomTools.LTrimNode( currentBlock ) ;
+			FCKDomTools.RTrimNode( previous ) ;
+
+			// Append a space to the previous.
+			// Maybe it is not always desirable...
+			// previous.appendChild( this.Window.document.createTextNode( ' ' ) ) ;
+
+			// Set the range to the end of the previous element and bookmark it.
+			range.SetStart( previous, 2, true ) ;
+			range.Collapse( true ) ;
+			var oBookmark = range.CreateBookmark( true ) ;
+
+			// Move the contents of the block to the previous element and delete it.
+			// But for some block types (e.g. table), moving the children to the previous block makes no sense.
+			// So a check is needed. (See #1081)
+			if ( ! currentBlock.tagName.IEquals( [ 'TABLE' ] ) )
+				FCKDomTools.MoveChildren( currentBlock, previous ) ;
+
+			// Place the selection at the bookmark.
+			range.SelectBookmark( oBookmark ) ;
+
+			bCustom = true ;
+		}
+	}
+
+	return bCustom ;
+}
+
+/*
+ * Executes the <Delete> key behavior.
+ */
+FCKEnterKey.prototype.DoDelete = function()
+{
+	// Save an undo snapshot before doing anything
+	// This is to conform with the behavior seen in MS Word
+	FCKUndo.SaveUndoStep() ;
+
+	// The <Delete> has the same effect as the <Backspace>, so we have the same
+	// results if we just move to the next block and apply the same <Backspace> logic.
+
+	var bCustom = false ;
+
+	// Get the current selection.
+	var oRange = new FCKDomRange( this.Window ) ;
+	oRange.MoveToSelection() ;
+
+	// Kludge for #247
+	if ( FCKBrowserInfo.IsIE && this._CheckIsAllContentsIncluded( oRange, this.Window.document.body ) )
+	{
+		this._FixIESelectAllBug( oRange ) ;
+		return true ;
+	}
+
+	// There is just one special case for collapsed selections at the end of a block.
+	if ( oRange.CheckIsCollapsed() && oRange.CheckEndOfBlock( FCKBrowserInfo.IsGeckoLike ) )
+	{
+		var oCurrentBlock = oRange.StartBlock ;
+		var eCurrentCell = FCKTools.GetElementAscensor( oCurrentBlock, 'td' );
+
+		var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ],
+				['UL','OL','TR'], true ) ;
+
+		// Bug #1323 : if we're in a table cell, and the next node belongs to a different cell, then don't
+		// delete anything.
+		if ( eCurrentCell )
+		{
+			var eNextCell = FCKTools.GetElementAscensor( eNext, 'td' );
+			if ( eNextCell != eCurrentCell )
+				return true ;
+		}
+
+		bCustom = this._ExecuteBackspace( oRange, oCurrentBlock, eNext ) ;
+	}
+
+	oRange.Release() ;
+	return bCustom ;
+}
+
+/*
+ * Executes the <Tab> key behavior.
+ */
+FCKEnterKey.prototype.DoTab = function()
+{
+	var oRange = new FCKDomRange( this.Window );
+	oRange.MoveToSelection() ;
+
+	// If the user pressed <tab> inside a table, we should give him the default behavior ( moving between cells )
+	// instead of giving him more non-breaking spaces. (Bug #973)
+	var node = oRange._Range.startContainer ;
+	while ( node )
+	{
+		if ( node.nodeType == 1 )
+		{
+			var tagName = node.tagName.toLowerCase() ;
+			if ( tagName == "tr" || tagName == "td" || tagName == "th" || tagName == "tbody" || tagName == "table" )
+				return false ;
+			else
+				break ;
+		}
+		node = node.parentNode ;
+	}
+
+	if ( this.TabText )
+	{
+		oRange.DeleteContents() ;
+		oRange.InsertNode( this.Window.document.createTextNode( this.TabText ) ) ;
+		oRange.Collapse( false ) ;
+		oRange.Select() ;
+	}
+	return true ;
+}
+
+FCKEnterKey.prototype._ExecuteEnterBlock = function( blockTag, range )
+{
+	// Get the current selection.
+	var oRange = range || new FCKDomRange( this.Window ) ;
+
+	var oSplitInfo = oRange.SplitBlock( blockTag ) ;
+
+	if ( oSplitInfo )
+	{
+		// Get the current blocks.
+		var ePreviousBlock	= oSplitInfo.PreviousBlock ;
+		var eNextBlock		= oSplitInfo.NextBlock ;
+
+		var bIsStartOfBlock	= oSplitInfo.WasStartOfBlock ;
+		var bIsEndOfBlock	= oSplitInfo.WasEndOfBlock ;
+
+		// If there is one block under a list item, modify the split so that the list item gets split as well. (Bug #1647)
+		if ( eNextBlock )
+		{
+			if ( eNextBlock.parentNode.nodeName.IEquals( 'li' ) )
+			{
+				FCKDomTools.BreakParent( eNextBlock, eNextBlock.parentNode ) ;
+				FCKDomTools.MoveNode( eNextBlock, eNextBlock.nextSibling, true ) ;
+			}
+		}
+		else if ( ePreviousBlock && ePreviousBlock.parentNode.nodeName.IEquals( 'li' ) )
+		{
+			FCKDomTools.BreakParent( ePreviousBlock, ePreviousBlock.parentNode ) ;
+			oRange.MoveToElementEditStart( ePreviousBlock.nextSibling );
+			FCKDomTools.MoveNode( ePreviousBlock, ePreviousBlock.previousSibling ) ;
+		}
+
+		// If we have both the previous and next blocks, it means that the
+		// boundaries were on separated blocks, or none of them where on the
+		// block limits (start/end).
+		if ( !bIsStartOfBlock && !bIsEndOfBlock )
+		{
+			// If the next block is an <li> with another list tree as the first child
+			// We'll need to append a placeholder or the list item wouldn't be editable. (Bug #1420)
+			if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild
+					&& eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) )
+				eNextBlock.insertBefore( FCKTools.GetElementDocument( eNextBlock ).createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
+			// Move the selection to the end block.
+			if ( eNextBlock )
+				oRange.MoveToElementEditStart( eNextBlock ) ;
+		}
+		else
+		{
+			if ( bIsStartOfBlock && bIsEndOfBlock && ePreviousBlock.tagName.toUpperCase() == 'LI' )
+			{
+				oRange.MoveToElementStart( ePreviousBlock ) ;
+				this._OutdentWithSelection( ePreviousBlock, oRange ) ;
+				oRange.Release() ;
+				return true ;
+			}
+
+			var eNewBlock ;
+
+			if ( ePreviousBlock )
+			{
+				var sPreviousBlockTag = ePreviousBlock.tagName.toUpperCase() ;
+
+				// If is a header tag, or we are in a Shift+Enter (#77),
+				// create a new block element (later in the code).
+				if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) )
+				{
+					// Otherwise, duplicate the previous block.
+					eNewBlock = FCKDomTools.CloneElement( ePreviousBlock ) ;
+				}
+			}
+			else if ( eNextBlock )
+				eNewBlock = FCKDomTools.CloneElement( eNextBlock ) ;
+
+			if ( !eNewBlock )
+				eNewBlock = this.Window.document.createElement( blockTag ) ;
+
+			// Recreate the inline elements tree, which was available
+			// before the hitting enter, so the same styles will be
+			// available in the new block.
+			var elementPath = oSplitInfo.ElementPath ;
+			if ( elementPath )
+			{
+				for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ )
+				{
+					var element = elementPath.Elements[i] ;
+
+					if ( element == elementPath.Block || element == elementPath.BlockLimit )
+						break ;
+
+					if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
+					{
+						element = FCKDomTools.CloneElement( element ) ;
+						FCKDomTools.MoveChildren( eNewBlock, element ) ;
+						eNewBlock.appendChild( element ) ;
+					}
+				}
+			}
+
+			if ( FCKBrowserInfo.IsGeckoLike )
+				FCKTools.AppendBogusBr( eNewBlock ) ;
+
+			oRange.InsertNode( eNewBlock ) ;
+
+			// This is tricky, but to make the new block visible correctly
+			// we must select it.
+			if ( FCKBrowserInfo.IsIE )
+			{
+				// Move the selection to the new block.
+				oRange.MoveToElementEditStart( eNewBlock ) ;
+				oRange.Select() ;
+			}
+
+			// Move the selection to the new block.
+			oRange.MoveToElementEditStart( bIsStartOfBlock && !bIsEndOfBlock ? eNextBlock : eNewBlock ) ;
+		}
+
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
+
+		oRange.Select() ;
+	}
+
+	// Release the resources used by the range.
+	oRange.Release() ;
+
+	return true ;
+}
+
+FCKEnterKey.prototype._ExecuteEnterBr = function( blockTag )
+{
+	// Get the current selection.
+	var oRange = new FCKDomRange( this.Window ) ;
+	oRange.MoveToSelection() ;
+
+	// The selection boundaries must be in the same "block limit" element.
+	if ( oRange.StartBlockLimit == oRange.EndBlockLimit )
+	{
+		oRange.DeleteContents() ;
+
+		// Get the new selection (it is collapsed at this point).
+		oRange.MoveToSelection() ;
+
+		var bIsStartOfBlock	= oRange.CheckStartOfBlock() ;
+		var bIsEndOfBlock	= oRange.CheckEndOfBlock() ;
+
+		var sStartBlockTag = oRange.StartBlock ? oRange.StartBlock.tagName.toUpperCase() : '' ;
+
+		var bHasShift = this._HasShift ;
+		var bIsPre = false ;
+
+		if ( !bHasShift && sStartBlockTag == 'LI' )
+			return this._ExecuteEnterBlock( null, oRange ) ;
+
+		// If we are at the end of a header block.
+		if ( !bHasShift && bIsEndOfBlock && (/^H[1-6]$/).test( sStartBlockTag ) )
+		{
+			// Insert a BR after the current paragraph.
+			FCKDomTools.InsertAfterNode( oRange.StartBlock, this.Window.document.createElement( 'br' ) ) ;
+
+			// The space is required by Gecko only to make the cursor blink.
+			if ( FCKBrowserInfo.IsGecko )
+				FCKDomTools.InsertAfterNode( oRange.StartBlock, this.Window.document.createTextNode( '' ) ) ;
+
+			// IE and Gecko have different behaviors regarding the position.
+			oRange.SetStart( oRange.StartBlock.nextSibling, FCKBrowserInfo.IsIE ? 3 : 1 ) ;
+		}
+		else
+		{
+			var eLineBreak ;
+			bIsPre = sStartBlockTag.IEquals( 'pre' ) ;
+			if ( bIsPre )
+				eLineBreak = this.Window.document.createTextNode( FCKBrowserInfo.IsIE ? '\r' : '\n' ) ;
+			else
+				eLineBreak = this.Window.document.createElement( 'br' ) ;
+
+			oRange.InsertNode( eLineBreak ) ;
+
+			// The space is required by Gecko only to make the cursor blink.
+			if ( FCKBrowserInfo.IsGecko )
+				FCKDomTools.InsertAfterNode( eLineBreak, this.Window.document.createTextNode( '' ) ) ;
+
+			// If we are at the end of a block, we must be sure the bogus node is available in that block.
+			if ( bIsEndOfBlock && FCKBrowserInfo.IsGeckoLike )
+				FCKTools.AppendBogusBr( eLineBreak.parentNode ) ;
+
+			if ( FCKBrowserInfo.IsIE )
+				oRange.SetStart( eLineBreak, 4 ) ;
+			else
+				oRange.SetStart( eLineBreak.nextSibling, 1 ) ;
+
+			if ( ! FCKBrowserInfo.IsIE )
+			{
+				var dummy = null ;
+				if ( FCKBrowserInfo.IsOpera )
+					dummy = this.Window.document.createElement( 'span' ) ;
+				else
+					dummy = this.Window.document.createElement( 'br' ) ;
+
+				eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ;
+
+				FCKDomTools.ScrollIntoView( dummy, false ) ;
+
+				dummy.parentNode.removeChild( dummy ) ;
+			}
+		}
+
+		// This collapse guarantees the cursor will be blinking.
+		oRange.Collapse( true ) ;
+
+		oRange.Select( bIsPre ) ;
+	}
+
+	// Release the resources used by the range.
+	oRange.Release() ;
+
+	return true ;
+}
+
+// Outdents a LI, maintaining the selection defined on a range.
+FCKEnterKey.prototype._OutdentWithSelection = function( li, range )
+{
+	var oBookmark = range.CreateBookmark() ;
+
+	FCKListHandler.OutdentListItem( li ) ;
+
+	range.MoveToBookmark( oBookmark ) ;
+	range.Select() ;
+}
+
+// Is all the contents under a node included by a range?
+FCKEnterKey.prototype._CheckIsAllContentsIncluded = function( range, node )
+{
+	var startOk = false ;
+	var endOk = false ;
+
+	/*
+	FCKDebug.Output( 'sc='+range.StartContainer.nodeName+
+			',so='+range._Range.startOffset+
+			',ec='+range.EndContainer.nodeName+
+			',eo='+range._Range.endOffset ) ;
+	*/
+	if ( range.StartContainer == node || range.StartContainer == node.firstChild )
+		startOk = ( range._Range.startOffset == 0 ) ;
+
+	if ( range.EndContainer == node || range.EndContainer == node.lastChild )
+	{
+		var nodeLength = range.EndContainer.nodeType == 3 ? range.EndContainer.length : range.EndContainer.childNodes.length ;
+		endOk = ( range._Range.endOffset == nodeLength ) ;
+	}
+
+	return startOk && endOk ;
+}
+
+// Kludge for #247
+FCKEnterKey.prototype._FixIESelectAllBug = function( range )
+{
+	var doc = this.Window.document ;
+	doc.body.innerHTML = '' ;
+	var editBlock ;
+	if ( FCKConfig.EnterMode.IEquals( ['div', 'p'] ) )
+	{
+		editBlock = doc.createElement( FCKConfig.EnterMode ) ;
+		doc.body.appendChild( editBlock ) ;
+	}
+	else
+		editBlock = doc.body ;
+
+	range.MoveToNodeContents( editBlock ) ;
+	range.Collapse( true ) ;
+	range.Select() ;
+	range.Release() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckevents.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckevents.js
new file mode 100644
index 000000000..ef2e10f6e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckevents.js
@@ -0,0 +1,71 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKEvents Class: used to handle events is a advanced way.
+ */
+
+var FCKEvents = function( eventsOwner )
+{
+	this.Owner = eventsOwner ;
+	this._RegisteredEvents = new Object() ;
+}
+
+FCKEvents.prototype.AttachEvent = function( eventName, functionPointer )
+{
+	var aTargets ;
+
+	if ( !( aTargets = this._RegisteredEvents[ eventName ] ) )
+		this._RegisteredEvents[ eventName ] = [ functionPointer ] ;
+	else
+	{
+		// Check that the event handler isn't already registered with the same listener
+		// It doesn't detect function pointers belonging to an object (at least in Gecko)
+		if ( aTargets.IndexOf( functionPointer ) == -1 )
+			aTargets.push( functionPointer ) ;
+	}
+}
+
+FCKEvents.prototype.FireEvent = function( eventName, params )
+{
+	var bReturnValue = true ;
+
+	var oCalls = this._RegisteredEvents[ eventName ] ;
+
+	if ( oCalls )
+	{
+		for ( var i = 0 ; i < oCalls.length ; i++ )
+		{
+			try
+			{
+				bReturnValue = ( oCalls[ i ]( this.Owner, params ) && bReturnValue ) ;
+			}
+			catch(e)
+			{
+				// Ignore the following error. It may happen if pointing to a
+				// script not anymore available (#934):
+				// -2146823277 = Can't execute code from a freed script
+				if ( e.number != -2146823277 )
+					throw e ;
+			}
+		}
+	}
+
+	return bReturnValue ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckhtmliterator.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckhtmliterator.js
new file mode 100644
index 000000000..9f184b7c1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckhtmliterator.js
@@ -0,0 +1,142 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This class can be used to interate through nodes inside a range.
+ *
+ * During interation, the provided range can become invalid, due to document
+ * mutations, so CreateBookmark() used to restore it after processing, if
+ * needed.
+ */
+
+var FCKHtmlIterator = function( source )
+{
+	this._sourceHtml = source ;
+}
+FCKHtmlIterator.prototype =
+{
+	Next : function()
+	{
+		var sourceHtml = this._sourceHtml ;
+		if ( sourceHtml == null )
+			return null ;
+
+		var match = FCKRegexLib.HtmlTag.exec( sourceHtml ) ;
+		var isTag = false ;
+		var value = "" ;
+		if ( match )
+		{
+			if ( match.index > 0 )
+			{
+				value = sourceHtml.substr( 0, match.index ) ;
+				this._sourceHtml = sourceHtml.substr( match.index ) ;
+			}
+			else
+			{
+				isTag = true ;
+				value = match[0] ;
+				this._sourceHtml = sourceHtml.substr( match[0].length ) ;
+			}
+		}
+		else
+		{
+			value = sourceHtml ;
+			this._sourceHtml = null ;
+		}
+		return { 'isTag' : isTag, 'value' : value } ;
+	},
+
+	Each : function( func )
+	{
+		var chunk ;
+		while ( ( chunk = this.Next() ) )
+			func( chunk.isTag, chunk.value ) ;
+	}
+} ;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This class can be used to interate through nodes inside a range.
+ *
+ * During interation, the provided range can become invalid, due to document
+ * mutations, so CreateBookmark() used to restore it after processing, if
+ * needed.
+ */
+
+var FCKHtmlIterator = function( source )
+{
+	this._sourceHtml = source ;
+}
+FCKHtmlIterator.prototype =
+{
+	Next : function()
+	{
+		var sourceHtml = this._sourceHtml ;
+		if ( sourceHtml == null )
+			return null ;
+
+		var match = FCKRegexLib.HtmlTag.exec( sourceHtml ) ;
+		var isTag = false ;
+		var value = "" ;
+		if ( match )
+		{
+			if ( match.index > 0 )
+			{
+				value = sourceHtml.substr( 0, match.index ) ;
+				this._sourceHtml = sourceHtml.substr( match.index ) ;
+			}
+			else
+			{
+				isTag = true ;
+				value = match[0] ;
+				this._sourceHtml = sourceHtml.substr( match[0].length ) ;
+			}
+		}
+		else
+		{
+			value = sourceHtml ;
+			this._sourceHtml = null ;
+		}
+		return { 'isTag' : isTag, 'value' : value } ;
+	},
+
+	Each : function( func )
+	{
+		var chunk ;
+		while ( ( chunk = this.Next() ) )
+			func( chunk.isTag, chunk.value ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckicon.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckicon.js
new file mode 100644
index 000000000..89719f6e1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckicon.js
@@ -0,0 +1,103 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKIcon Class: renders an icon from a single image, a strip or even a
+ * spacer.
+ */
+
+var FCKIcon = function( iconPathOrStripInfoArray )
+{
+	var sTypeOf = iconPathOrStripInfoArray ? typeof( iconPathOrStripInfoArray ) : 'undefined' ;
+	switch ( sTypeOf )
+	{
+		case 'number' :
+			this.Path = FCKConfig.SkinPath + 'fck_strip.gif' ;
+			this.Size = 16 ;
+			this.Position = iconPathOrStripInfoArray ;
+			break ;
+
+		case 'undefined' :
+			this.Path = FCK_SPACER_PATH ;
+			break ;
+
+		case 'string' :
+			this.Path = iconPathOrStripInfoArray ;
+			break ;
+
+		default :
+			// It is an array in the format [ StripFilePath, IconSize, IconPosition ]
+			this.Path		= iconPathOrStripInfoArray[0] ;
+			this.Size		= iconPathOrStripInfoArray[1] ;
+			this.Position	= iconPathOrStripInfoArray[2] ;
+	}
+}
+
+FCKIcon.prototype.CreateIconElement = function( document )
+{
+	var eIcon, eIconImage ;
+
+	if ( this.Position )		// It is using an icons strip image.
+	{
+		var sPos = '-' + ( ( this.Position - 1 ) * this.Size ) + 'px' ;
+
+		if ( FCKBrowserInfo.IsIE )
+		{
+			// <div class="TB_Button_Image"><img src="strip.gif" style="top:-16px"></div>
+
+			eIcon = document.createElement( 'DIV' ) ;
+
+			eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ;
+			eIconImage.src = this.Path ;
+			eIconImage.style.top = sPos ;
+		}
+		else
+		{
+			// <img class="TB_Button_Image" src="spacer.gif" style="background-position: 0px -16px;background-image: url(strip.gif);">
+
+			eIcon = document.createElement( 'IMG' ) ;
+			eIcon.src = FCK_SPACER_PATH ;
+			eIcon.style.backgroundPosition	= '0px ' + sPos ;
+			eIcon.style.backgroundImage		= 'url("' + this.Path + '")' ;
+		}
+	}
+	else					// It is using a single icon image.
+	{
+		if ( FCKBrowserInfo.IsIE )
+		{
+			// IE makes the button 1px higher if using the <img> directly, so we
+			// are changing to the <div> system to clip the image correctly.
+			eIcon = document.createElement( 'DIV' ) ;
+
+			eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ;
+			eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ;
+		}
+		else
+		{
+			// This is not working well with IE. See notes above.
+			// <img class="TB_Button_Image" src="smiley.gif">
+			eIcon = document.createElement( 'IMG' ) ;
+			eIcon.src = this.Path ? this.Path : FCK_SPACER_PATH ;
+		}
+	}
+
+	eIcon.className = 'TB_Button_Image' ;
+
+	return eIcon ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckiecleanup.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckiecleanup.js
new file mode 100644
index 000000000..9a0900546
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckiecleanup.js
@@ -0,0 +1,68 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKIECleanup Class: a generic class used as a tool to remove IE leaks.
+ */
+
+var	FCKIECleanup = function( attachWindow )
+{
+	// If the attachWindow already have a cleanup object, just use that one.
+	if ( attachWindow._FCKCleanupObj )
+		this.Items = attachWindow._FCKCleanupObj.Items ;
+	else
+	{
+		this.Items = new Array() ;
+
+		attachWindow._FCKCleanupObj = this ;
+		FCKTools.AddEventListenerEx( attachWindow, 'unload', FCKIECleanup_Cleanup ) ;
+//		attachWindow.attachEvent( 'onunload', FCKIECleanup_Cleanup ) ;
+	}
+}
+
+FCKIECleanup.prototype.AddItem = function( dirtyItem, cleanupFunction )
+{
+	this.Items.push( [ dirtyItem, cleanupFunction ] ) ;
+}
+
+function FCKIECleanup_Cleanup()
+{
+	if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) )
+		return ;
+
+	var aItems = this._FCKCleanupObj.Items ;
+
+	while ( aItems.length > 0 )
+	{
+
+		// It is important to remove from the end to the beginning (pop()),
+		// because of the order things get created in the editor. In the code,
+		// elements in deeper position in the DOM are placed at the end of the
+		// cleanup function, so we must cleanup then first, otherwise IE could
+		// throw some crazy memory errors (IE bug).
+		var oItem = aItems.pop() ;
+		if ( oItem )
+			oItem[1].call( oItem[0] ) ;
+	}
+
+	this._FCKCleanupObj = null ;
+
+	if ( CollectGarbage )
+		CollectGarbage() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckimagepreloader.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckimagepreloader.js
new file mode 100644
index 000000000..92fd305e3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckimagepreloader.js
@@ -0,0 +1,64 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Preload a list of images, firing an event when complete.
+ */
+
+var FCKImagePreloader = function()
+{
+	this._Images = new Array() ;
+}
+
+FCKImagePreloader.prototype =
+{
+	AddImages : function( images )
+	{
+		if ( typeof( images ) == 'string' )
+			images = images.split( ';' ) ;
+
+		this._Images = this._Images.concat( images ) ;
+	},
+
+	Start : function()
+	{
+		var aImages = this._Images ;
+		this._PreloadCount = aImages.length ;
+
+		for ( var i = 0 ; i < aImages.length ; i++ )
+		{
+			var eImg = document.createElement( 'img' ) ;
+			FCKTools.AddEventListenerEx( eImg, 'load', _FCKImagePreloader_OnImage, this ) ;
+			FCKTools.AddEventListenerEx( eImg, 'error', _FCKImagePreloader_OnImage, this ) ;
+			eImg.src = aImages[i] ;
+
+			_FCKImagePreloader_ImageCache.push( eImg ) ;
+		}
+	}
+};
+
+// All preloaded images must be placed in a global array, otherwise the preload
+// magic will not happen.
+var _FCKImagePreloader_ImageCache = new Array() ;
+
+function _FCKImagePreloader_OnImage( ev, imagePreloader )
+{
+	if ( (--imagePreloader._PreloadCount) == 0 && imagePreloader.OnComplete )
+		imagePreloader.OnComplete() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckkeystrokehandler.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckkeystrokehandler.js
new file mode 100644
index 000000000..31c341ba7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckkeystrokehandler.js
@@ -0,0 +1,141 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Control keyboard keystroke combinations.
+ */
+
+var FCKKeystrokeHandler = function( cancelCtrlDefaults )
+{
+	this.Keystrokes = new Object() ;
+	this.CancelCtrlDefaults = ( cancelCtrlDefaults !== false ) ;
+}
+
+/*
+ * Listen to keystroke events in an element or DOM document object.
+ *		@target: The element or document to listen to keystroke events.
+ */
+FCKKeystrokeHandler.prototype.AttachToElement = function( target )
+{
+	// For newer browsers, it is enough to listen to the keydown event only.
+	// Some browsers instead, don't cancel key events in the keydown, but in the
+	// keypress. So we must do a longer trip in those cases.
+	FCKTools.AddEventListenerEx( target, 'keydown', _FCKKeystrokeHandler_OnKeyDown, this ) ;
+	if ( FCKBrowserInfo.IsGecko10 || FCKBrowserInfo.IsOpera || ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac ) )
+		FCKTools.AddEventListenerEx( target, 'keypress', _FCKKeystrokeHandler_OnKeyPress, this ) ;
+}
+
+/*
+ * Sets a list of keystrokes. It can receive either a single array or "n"
+ * arguments, each one being an array of 1 or 2 elemenst. The first element
+ * is the keystroke combination, and the second is the value to assign to it.
+ * If the second element is missing, the keystroke definition is removed.
+ */
+FCKKeystrokeHandler.prototype.SetKeystrokes = function()
+{
+	// Look through the arguments.
+	for ( var i = 0 ; i < arguments.length ; i++ )
+	{
+		var keyDef = arguments[i] ;
+
+		// If the configuration for the keystrokes is missing some element or has any extra comma
+		// this item won't be valid, so skip it and keep on processing.
+		if ( !keyDef )
+			continue ;
+
+		if ( typeof( keyDef[0] ) == 'object' )		// It is an array with arrays defining the keystrokes.
+			this.SetKeystrokes.apply( this, keyDef ) ;
+		else
+		{
+			if ( keyDef.length == 1 )		// If it has only one element, remove the keystroke.
+				delete this.Keystrokes[ keyDef[0] ] ;
+			else							// Otherwise add it.
+				this.Keystrokes[ keyDef[0] ] = keyDef[1] === true ? true : keyDef ;
+		}
+	}
+}
+
+function _FCKKeystrokeHandler_OnKeyDown( ev, keystrokeHandler )
+{
+	// Get the key code.
+	var keystroke = ev.keyCode || ev.which ;
+
+	// Combine it with the CTRL, SHIFT and ALT states.
+	var keyModifiers = 0 ;
+
+	if ( ev.ctrlKey || ev.metaKey )
+		keyModifiers += CTRL ;
+
+	if ( ev.shiftKey )
+		keyModifiers += SHIFT ;
+
+	if ( ev.altKey )
+		keyModifiers += ALT ;
+
+	var keyCombination = keystroke + keyModifiers ;
+
+	var cancelIt = keystrokeHandler._CancelIt = false ;
+
+	// Look for its definition availability.
+	var keystrokeValue = keystrokeHandler.Keystrokes[ keyCombination ] ;
+
+//	FCKDebug.Output( 'KeyDown: ' + keyCombination + ' - Value: ' + keystrokeValue ) ;
+
+	// If the keystroke is defined
+	if ( keystrokeValue )
+	{
+		// If the keystroke has been explicitly set to "true" OR calling the
+		// "OnKeystroke" event, it doesn't return "true", the default behavior
+		// must be preserved.
+		if ( keystrokeValue === true || !( keystrokeHandler.OnKeystroke && keystrokeHandler.OnKeystroke.apply( keystrokeHandler, keystrokeValue ) ) )
+			return true ;
+
+		cancelIt = true ;
+	}
+
+	// By default, it will cancel all combinations with the CTRL key only (except positioning keys).
+	if ( cancelIt || ( keystrokeHandler.CancelCtrlDefaults && keyModifiers == CTRL && ( keystroke < 33 || keystroke > 40 ) ) )
+	{
+		keystrokeHandler._CancelIt = true ;
+
+		if ( ev.preventDefault )
+			return ev.preventDefault() ;
+
+		ev.returnValue = false ;
+		ev.cancelBubble = true ;
+		return false ;
+	}
+
+	return true ;
+}
+
+function _FCKKeystrokeHandler_OnKeyPress( ev, keystrokeHandler )
+{
+	if ( keystrokeHandler._CancelIt )
+	{
+//		FCKDebug.Output( 'KeyPress Cancel', 'Red') ;
+
+		if ( ev.preventDefault )
+			return ev.preventDefault() ;
+
+		return false ;
+	}
+
+	return true ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublock.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublock.js
new file mode 100644
index 000000000..1cd710dcc
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublock.js
@@ -0,0 +1,153 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Renders a list of menu items.
+ */
+
+var FCKMenuBlock = function()
+{
+	this._Items	= new Array() ;
+}
+
+
+FCKMenuBlock.prototype.Count = function()
+{
+	return this._Items.length ;
+}
+
+FCKMenuBlock.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
+{
+	var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
+
+	oItem.OnClick		= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnClick, this ) ;
+	oItem.OnActivate	= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnActivate, this ) ;
+
+	this._Items.push( oItem ) ;
+
+	return oItem ;
+}
+
+FCKMenuBlock.prototype.AddSeparator = function()
+{
+	this._Items.push( new FCKMenuSeparator() ) ;
+}
+
+FCKMenuBlock.prototype.RemoveAllItems = function()
+{
+	this._Items = new Array() ;
+
+	var eItemsTable = this._ItemsTable ;
+	if ( eItemsTable )
+	{
+		while ( eItemsTable.rows.length > 0 )
+			eItemsTable.deleteRow( 0 ) ;
+	}
+}
+
+FCKMenuBlock.prototype.Create = function( parentElement )
+{
+	if ( !this._ItemsTable )
+	{
+		if ( FCK.IECleanup )
+			FCK.IECleanup.AddItem( this, FCKMenuBlock_Cleanup ) ;
+
+		this._Window = FCKTools.GetElementWindow( parentElement ) ;
+
+		var oDoc = FCKTools.GetElementDocument( parentElement ) ;
+
+		var eTable = parentElement.appendChild( oDoc.createElement( 'table' ) ) ;
+		eTable.cellPadding = 0 ;
+		eTable.cellSpacing = 0 ;
+
+		FCKTools.DisableSelection( eTable ) ;
+
+		var oMainElement = eTable.insertRow(-1).insertCell(-1) ;
+		oMainElement.className = 'MN_Menu' ;
+
+		var eItemsTable = this._ItemsTable = oMainElement.appendChild( oDoc.createElement( 'table' ) ) ;
+		eItemsTable.cellPadding = 0 ;
+		eItemsTable.cellSpacing = 0 ;
+	}
+
+	for ( var i = 0 ; i < this._Items.length ; i++ )
+		this._Items[i].Create( this._ItemsTable ) ;
+}
+
+/* Events */
+
+function FCKMenuBlock_Item_OnClick( clickedItem, menuBlock )
+{
+	if ( menuBlock.Hide )
+		menuBlock.Hide() ;
+
+	FCKTools.RunFunction( menuBlock.OnClick, menuBlock, [ clickedItem ] ) ;
+}
+
+function FCKMenuBlock_Item_OnActivate( menuBlock )
+{
+	var oActiveItem = menuBlock._ActiveItem ;
+
+	if ( oActiveItem && oActiveItem != this )
+	{
+		// Set the focus to this menu block window (to fire OnBlur on opened panels).
+		if ( !FCKBrowserInfo.IsIE && oActiveItem.HasSubMenu && !this.HasSubMenu )
+		{
+			menuBlock._Window.focus() ;
+
+			// Due to the event model provided by Opera, we need to set
+			// HasFocus here as the above focus() call will not fire the focus
+			// event in the panel immediately (#1200).
+			menuBlock.Panel.HasFocus = true ;
+		}
+
+		oActiveItem.Deactivate() ;
+	}
+
+	menuBlock._ActiveItem = this ;
+}
+
+function FCKMenuBlock_Cleanup()
+{
+	this._Window = null ;
+	this._ItemsTable = null ;
+}
+
+// ################# //
+
+var FCKMenuSeparator = function()
+{}
+
+FCKMenuSeparator.prototype.Create = function( parentTable )
+{
+	var oDoc = FCKTools.GetElementDocument( parentTable ) ;
+
+	var r = parentTable.insertRow(-1) ;
+
+	var eCell = r.insertCell(-1) ;
+	eCell.className = 'MN_Separator MN_Icon' ;
+
+	eCell = r.insertCell(-1) ;
+	eCell.className = 'MN_Separator' ;
+	eCell.appendChild( oDoc.createElement( 'DIV' ) ).className = 'MN_Separator_Line' ;
+
+	eCell = r.insertCell(-1) ;
+	eCell.className = 'MN_Separator' ;
+	eCell.appendChild( oDoc.createElement( 'DIV' ) ).className = 'MN_Separator_Line' ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublockpanel.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublockpanel.js
new file mode 100644
index 000000000..9dbc4803b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenublockpanel.js
@@ -0,0 +1,54 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This class is a menu block that behaves like a panel. It's a mix of the
+ * FCKMenuBlock and FCKPanel classes.
+ */
+
+var FCKMenuBlockPanel = function()
+{
+	// Call the "base" constructor.
+	FCKMenuBlock.call( this ) ;
+}
+
+FCKMenuBlockPanel.prototype = new FCKMenuBlock() ;
+
+
+// Override the create method.
+FCKMenuBlockPanel.prototype.Create = function()
+{
+	var oPanel = this.Panel = ( this.Parent && this.Parent.Panel ? this.Parent.Panel.CreateChildPanel() : new FCKPanel() ) ;
+	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
+
+	// Call the "base" implementation.
+	FCKMenuBlock.prototype.Create.call( this, oPanel.MainNode ) ;
+}
+
+FCKMenuBlockPanel.prototype.Show = function( x, y, relElement )
+{
+	if ( !this.Panel.CheckIsOpened() )
+		this.Panel.Show( x, y, relElement ) ;
+}
+
+FCKMenuBlockPanel.prototype.Hide = function()
+{
+	if ( this.Panel.CheckIsOpened() )
+		this.Panel.Hide() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckmenuitem.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenuitem.js
new file mode 100644
index 000000000..038146d24
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckmenuitem.js
@@ -0,0 +1,161 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines and renders a menu items in a menu block.
+ */
+
+var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled, customData )
+{
+	this.Name		= name ;
+	this.Label		= label || name ;
+	this.IsDisabled	= isDisabled ;
+
+	this.Icon = new FCKIcon( iconPathOrStripInfoArray ) ;
+
+	this.SubMenu			= new FCKMenuBlockPanel() ;
+	this.SubMenu.Parent		= parentMenuBlock ;
+	this.SubMenu.OnClick	= FCKTools.CreateEventListener( FCKMenuItem_SubMenu_OnClick, this ) ;
+	this.CustomData = customData ;
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( this, FCKMenuItem_Cleanup ) ;
+}
+
+
+FCKMenuItem.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
+{
+	this.HasSubMenu = true ;
+	return this.SubMenu.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
+}
+
+FCKMenuItem.prototype.AddSeparator = function()
+{
+	this.SubMenu.AddSeparator() ;
+}
+
+FCKMenuItem.prototype.Create = function( parentTable )
+{
+	var bHasSubMenu = this.HasSubMenu ;
+
+	var oDoc = FCKTools.GetElementDocument( parentTable ) ;
+
+	// Add a row in the table to hold the menu item.
+	var r = this.MainElement = parentTable.insertRow(-1) ;
+	r.className = this.IsDisabled ? 'MN_Item_Disabled' : 'MN_Item' ;
+
+	// Set the row behavior.
+	if ( !this.IsDisabled )
+	{
+		FCKTools.AddEventListenerEx( r, 'mouseover', FCKMenuItem_OnMouseOver, [ this ] ) ;
+		FCKTools.AddEventListenerEx( r, 'click', FCKMenuItem_OnClick, [ this ] ) ;
+
+		if ( !bHasSubMenu )
+			FCKTools.AddEventListenerEx( r, 'mouseout', FCKMenuItem_OnMouseOut, [ this ] ) ;
+	}
+
+	// Create the icon cell.
+	var eCell = r.insertCell(-1) ;
+	eCell.className = 'MN_Icon' ;
+	eCell.appendChild( this.Icon.CreateIconElement( oDoc ) ) ;
+
+	// Create the label cell.
+	eCell = r.insertCell(-1) ;
+	eCell.className = 'MN_Label' ;
+	eCell.noWrap = true ;
+	eCell.appendChild( oDoc.createTextNode( this.Label ) ) ;
+
+	// Create the arrow cell and setup the sub menu panel (if needed).
+	eCell = r.insertCell(-1) ;
+	if ( bHasSubMenu )
+	{
+		eCell.className = 'MN_Arrow' ;
+
+		// The arrow is a fixed size image.
+		var eArrowImg = eCell.appendChild( oDoc.createElement( 'IMG' ) ) ;
+		eArrowImg.src = FCK_IMAGES_PATH + 'arrow_' + FCKLang.Dir + '.gif' ;
+		eArrowImg.width	 = 4 ;
+		eArrowImg.height = 7 ;
+
+		this.SubMenu.Create() ;
+		this.SubMenu.Panel.OnHide = FCKTools.CreateEventListener( FCKMenuItem_SubMenu_OnHide, this ) ;
+	}
+}
+
+FCKMenuItem.prototype.Activate = function()
+{
+	this.MainElement.className = 'MN_Item_Over' ;
+
+	if ( this.HasSubMenu )
+	{
+		// Show the child menu block. The ( +2, -2 ) correction is done because
+		// of the padding in the skin. It is not a good solution because one
+		// could change the skin and so the final result would not be accurate.
+		// For now it is ok because we are controlling the skin.
+		this.SubMenu.Show( this.MainElement.offsetWidth + 2, -2, this.MainElement ) ;
+	}
+
+	FCKTools.RunFunction( this.OnActivate, this ) ;
+}
+
+FCKMenuItem.prototype.Deactivate = function()
+{
+	this.MainElement.className = 'MN_Item' ;
+
+	if ( this.HasSubMenu )
+		this.SubMenu.Hide() ;
+}
+
+/* Events */
+
+function FCKMenuItem_SubMenu_OnClick( clickedItem, listeningItem )
+{
+	FCKTools.RunFunction( listeningItem.OnClick, listeningItem, [ clickedItem ] ) ;
+}
+
+function FCKMenuItem_SubMenu_OnHide( menuItem )
+{
+	menuItem.Deactivate() ;
+}
+
+function FCKMenuItem_OnClick( ev, menuItem )
+{
+	if ( menuItem.HasSubMenu )
+		menuItem.Activate() ;
+	else
+	{
+		menuItem.Deactivate() ;
+		FCKTools.RunFunction( menuItem.OnClick, menuItem, [ menuItem ] ) ;
+	}
+}
+
+function FCKMenuItem_OnMouseOver( ev, menuItem )
+{
+	menuItem.Activate() ;
+}
+
+function FCKMenuItem_OnMouseOut( ev, menuItem )
+{
+	menuItem.Deactivate() ;
+}
+
+function FCKMenuItem_Cleanup()
+{
+	this.MainElement = null ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckpanel.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckpanel.js
new file mode 100644
index 000000000..f041339ab
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckpanel.js
@@ -0,0 +1,386 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Component that creates floating panels. It is used by many
+ * other components, like the toolbar items, context menu, etc...
+ */
+
+var FCKPanel = function( parentWindow )
+{
+	this.IsRTL			= ( FCKLang.Dir == 'rtl' ) ;
+	this.IsContextMenu	= false ;
+	this._LockCounter	= 0 ;
+
+	this._Window = parentWindow || window ;
+
+	var oDocument ;
+
+	if ( FCKBrowserInfo.IsIE )
+	{
+		// Create the Popup that will hold the panel.
+		// The popup has to be created before playing with domain hacks, see #1666.
+		this._Popup	= this._Window.createPopup() ;
+
+		// this._Window cannot be accessed while playing with domain hacks, but local variable is ok.
+		// See #1666.
+		var pDoc = this._Window.document ;
+
+		// This is a trick to IE6 (not IE7). The original domain must be set
+		// before creating the popup, so we are able to take a refence to the
+		// document inside of it, and the set the proper domain for it. (#123)
+		if ( FCK_IS_CUSTOM_DOMAIN && !FCKBrowserInfo.IsIE7 )
+		{
+			pDoc.domain = FCK_ORIGINAL_DOMAIN ;
+			document.domain = FCK_ORIGINAL_DOMAIN ;
+		}
+
+		oDocument = this.Document = this._Popup.document ;
+
+		// Set the proper domain inside the popup.
+		if ( FCK_IS_CUSTOM_DOMAIN )
+		{
+			oDocument.domain = FCK_RUNTIME_DOMAIN ;
+			pDoc.domain = FCK_RUNTIME_DOMAIN ;
+			document.domain = FCK_RUNTIME_DOMAIN ;
+		}
+
+		FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ;
+	}
+	else
+	{
+		var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ;
+		FCKTools.ResetStyles( oIFrame );
+		oIFrame.src					= 'javascript:void(0)' ;
+		oIFrame.allowTransparency	= true ;
+		oIFrame.frameBorder			= '0' ;
+		oIFrame.scrolling			= 'no' ;
+		oIFrame.style.width = oIFrame.style.height = '0px' ;
+		FCKDomTools.SetElementStyles( oIFrame,
+			{
+				position	: 'absolute',
+				zIndex		: FCKConfig.FloatingPanelsZIndex
+			} ) ;
+
+		this._Window.document.body.appendChild( oIFrame ) ;
+
+		var oIFrameWindow = oIFrame.contentWindow ;
+
+		oDocument = this.Document = oIFrameWindow.document ;
+
+		// Workaround for Safari 12256. Ticket #63
+		var sBase = '' ;
+		if ( FCKBrowserInfo.IsSafari )
+			sBase = '<base href="' + window.document.location + '">' ;
+
+		// Initialize the IFRAME document body.
+		oDocument.open() ;
+		oDocument.write( '<html><head>' + sBase + '<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>' ) ;
+		oDocument.close() ;
+
+		if( FCKBrowserInfo.IsAIR )
+			FCKAdobeAIR.Panel_Contructor( oDocument, window.document.location ) ;
+
+		FCKTools.AddEventListenerEx( oIFrameWindow, 'focus', FCKPanel_Window_OnFocus, this ) ;
+		FCKTools.AddEventListenerEx( oIFrameWindow, 'blur', FCKPanel_Window_OnBlur, this ) ;
+	}
+
+	oDocument.dir = FCKLang.Dir ;
+
+	FCKTools.AddEventListener( oDocument, 'contextmenu', FCKTools.CancelEvent ) ;
+
+
+	// Create the main DIV that is used as the panel base.
+	this.MainNode = oDocument.body.appendChild( oDocument.createElement('DIV') ) ;
+
+	// The "float" property must be set so Firefox calculates the size correctly.
+	this.MainNode.style.cssFloat = this.IsRTL ? 'right' : 'left' ;
+}
+
+
+FCKPanel.prototype.AppendStyleSheet = function( styleSheet )
+{
+	FCKTools.AppendStyleSheet( this.Document, styleSheet ) ;
+}
+
+FCKPanel.prototype.Preload = function( x, y, relElement )
+{
+	// The offsetWidth and offsetHeight properties are not available if the
+	// element is not visible. So we must "show" the popup with no size to
+	// be able to use that values in the second call (IE only).
+	if ( this._Popup )
+		this._Popup.show( x, y, 0, 0, relElement ) ;
+}
+
+FCKPanel.prototype.Show = function( x, y, relElement, width, height )
+{
+	var iMainWidth ;
+	var eMainNode = this.MainNode ;
+
+	if ( this._Popup )
+	{
+		// The offsetWidth and offsetHeight properties are not available if the
+		// element is not visible. So we must "show" the popup with no size to
+		// be able to use that values in the second call.
+		this._Popup.show( x, y, 0, 0, relElement ) ;
+
+		// The following lines must be place after the above "show", otherwise it
+		// doesn't has the desired effect.
+		FCKDomTools.SetElementStyles( eMainNode,
+			{
+				width	: width ? width + 'px' : '',
+				height	: height ? height + 'px' : ''
+			} ) ;
+
+		iMainWidth = eMainNode.offsetWidth ;
+
+		if ( this.IsRTL )
+		{
+			if ( this.IsContextMenu )
+				x  = x - iMainWidth + 1 ;
+			else if ( relElement )
+				x  = ( x * -1 ) + relElement.offsetWidth - iMainWidth ;
+		}
+
+		// Second call: Show the Popup at the specified location, with the correct size.
+		this._Popup.show( x, y, iMainWidth, eMainNode.offsetHeight, relElement ) ;
+
+		if ( this.OnHide )
+		{
+			if ( this._Timer )
+				CheckPopupOnHide.call( this, true ) ;
+
+			this._Timer = FCKTools.SetInterval( CheckPopupOnHide, 100, this ) ;
+		}
+	}
+	else
+	{
+		// Do not fire OnBlur while the panel is opened.
+		if ( typeof( FCK.ToolbarSet.CurrentInstance.FocusManager ) != 'undefined' )
+			FCK.ToolbarSet.CurrentInstance.FocusManager.Lock() ;
+
+		if ( this.ParentPanel )
+		{
+			this.ParentPanel.Lock() ;
+
+			// Due to a bug on FF3, we must ensure that the parent panel will
+			// blur (#1584).
+			FCKPanel_Window_OnBlur( null, this.ParentPanel ) ;
+		}
+
+		// Toggle the iframe scrolling attribute to prevent the panel
+		// scrollbars from disappearing in FF Mac. (#191)
+		if ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )
+		{
+			this._IFrame.scrolling = '' ;
+			FCKTools.RunFunction( function(){ this._IFrame.scrolling = 'no'; }, this ) ;
+		}
+
+		// Be sure we'll not have more than one Panel opened at the same time.
+		// Do not unlock focus manager here because we're displaying another floating panel
+		// instead of returning the editor to a "no panel" state (Bug #1514).
+		if ( FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel &&
+				FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel != this )
+			FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel.Hide( false, true ) ;
+
+		FCKDomTools.SetElementStyles( eMainNode,
+			{
+				width	: width ? width + 'px' : '',
+				height	: height ? height + 'px' : ''
+			} ) ;
+
+		iMainWidth = eMainNode.offsetWidth ;
+
+		if ( !width )	this._IFrame.width	= 1 ;
+		if ( !height )	this._IFrame.height	= 1 ;
+
+		// This is weird... but with Firefox, we must get the offsetWidth before
+		// setting the _IFrame size (which returns "0"), and then after that,
+		// to return the correct width. Remove the first step and it will not
+		// work when the editor is in RTL.
+		//
+		// The "|| eMainNode.firstChild.offsetWidth" part has been added
+		// for Opera compatibility (see #570).
+		iMainWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
+
+		// Base the popup coordinates upon the coordinates of relElement.
+		var oPos = FCKTools.GetDocumentPosition( this._Window,
+			relElement.nodeType == 9 ?
+				( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) :
+				relElement ) ;
+
+		// Minus the offsets provided by any positioned parent element of the panel iframe.
+		var positionedAncestor = FCKDomTools.GetPositionedAncestor( this._IFrame.parentNode ) ;
+		if ( positionedAncestor )
+		{
+			var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ;
+			oPos.x -= nPos.x ;
+			oPos.y -= nPos.y ;
+		}
+
+		if ( this.IsRTL && !this.IsContextMenu )
+			x = ( x * -1 ) ;
+
+		x += oPos.x ;
+		y += oPos.y ;
+
+		if ( this.IsRTL )
+		{
+			if ( this.IsContextMenu )
+				x  = x - iMainWidth + 1 ;
+			else if ( relElement )
+				x  = x + relElement.offsetWidth - iMainWidth ;
+		}
+		else
+		{
+			var oViewPaneSize = FCKTools.GetViewPaneSize( this._Window ) ;
+			var oScrollPosition = FCKTools.GetScrollPosition( this._Window ) ;
+
+			var iViewPaneHeight	= oViewPaneSize.Height + oScrollPosition.Y ;
+			var iViewPaneWidth	= oViewPaneSize.Width + oScrollPosition.X ;
+
+			if ( ( x + iMainWidth ) > iViewPaneWidth )
+				x -= x + iMainWidth - iViewPaneWidth ;
+
+			if ( ( y + eMainNode.offsetHeight ) > iViewPaneHeight )
+				y -= y + eMainNode.offsetHeight - iViewPaneHeight ;
+		}
+
+		// Set the context menu DIV in the specified location.
+		FCKDomTools.SetElementStyles( this._IFrame,
+			{
+				left	: x + 'px',
+				top		: y + 'px'
+			} ) ;
+
+		// Move the focus to the IFRAME so we catch the "onblur".
+		this._IFrame.contentWindow.focus() ;
+		this._IsOpened = true ;
+
+		var me = this ;
+		this._resizeTimer = setTimeout( function()
+			{
+				var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
+				var iHeight = eMainNode.offsetHeight ;
+				me._IFrame.style.width = iWidth + 'px' ;
+				me._IFrame.style.height = iHeight + 'px' ;
+
+			}, 0 ) ;
+
+		FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ;
+	}
+
+	FCKTools.RunFunction( this.OnShow, this ) ;
+}
+
+FCKPanel.prototype.Hide = function( ignoreOnHide, ignoreFocusManagerUnlock )
+{
+	if ( this._Popup )
+		this._Popup.hide() ;
+	else
+	{
+		if ( !this._IsOpened || this._LockCounter > 0 )
+			return ;
+
+		// Enable the editor to fire the "OnBlur".
+		if ( typeof( FCKFocusManager ) != 'undefined' && !ignoreFocusManagerUnlock )
+			FCKFocusManager.Unlock() ;
+
+		// It is better to set the sizes to 0, otherwise Firefox would have
+		// rendering problems.
+		this._IFrame.style.width = this._IFrame.style.height = '0px' ;
+
+		this._IsOpened = false ;
+
+		if ( this._resizeTimer )
+		{
+			clearTimeout( this._resizeTimer ) ;
+			this._resizeTimer = null ;
+		}
+
+		if ( this.ParentPanel )
+			this.ParentPanel.Unlock() ;
+
+		if ( !ignoreOnHide )
+			FCKTools.RunFunction( this.OnHide, this ) ;
+	}
+}
+
+FCKPanel.prototype.CheckIsOpened = function()
+{
+	if ( this._Popup )
+		return this._Popup.isOpen ;
+	else
+		return this._IsOpened ;
+}
+
+FCKPanel.prototype.CreateChildPanel = function()
+{
+	var oWindow = this._Popup ? FCKTools.GetDocumentWindow( this.Document ) : this._Window ;
+
+	var oChildPanel = new FCKPanel( oWindow ) ;
+	oChildPanel.ParentPanel = this ;
+
+	return oChildPanel ;
+}
+
+FCKPanel.prototype.Lock = function()
+{
+	this._LockCounter++ ;
+}
+
+FCKPanel.prototype.Unlock = function()
+{
+	if ( --this._LockCounter == 0 && !this.HasFocus )
+		this.Hide() ;
+}
+
+/* Events */
+
+function FCKPanel_Window_OnFocus( e, panel )
+{
+	panel.HasFocus = true ;
+}
+
+function FCKPanel_Window_OnBlur( e, panel )
+{
+	panel.HasFocus = false ;
+
+	if ( panel._LockCounter == 0 )
+		FCKTools.RunFunction( panel.Hide, panel ) ;
+}
+
+function CheckPopupOnHide( forceHide )
+{
+	if ( forceHide || !this._Popup.isOpen )
+	{
+		window.clearInterval( this._Timer ) ;
+		this._Timer = null ;
+
+		FCKTools.RunFunction( this.OnHide, this ) ;
+	}
+}
+
+function FCKPanel_Cleanup()
+{
+	this._Popup = null ;
+	this._Window = null ;
+	this.Document = null ;
+	this.MainNode = null ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckplugin.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckplugin.js
new file mode 100644
index 000000000..16300d133
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckplugin.js
@@ -0,0 +1,56 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKPlugin Class: Represents a single plugin.
+ */
+
+var FCKPlugin = function( name, availableLangs, basePath )
+{
+	this.Name = name ;
+	this.BasePath = basePath ? basePath : FCKConfig.PluginsPath ;
+	this.Path = this.BasePath + name + '/' ;
+
+	if ( !availableLangs || availableLangs.length == 0 )
+		this.AvailableLangs = new Array() ;
+	else
+		this.AvailableLangs = availableLangs.split(',') ;
+}
+
+FCKPlugin.prototype.Load = function()
+{
+	// Load the language file, if defined.
+	if ( this.AvailableLangs.length > 0 )
+	{
+		var sLang ;
+
+		// Check if the plugin has the language file for the active language.
+		if ( this.AvailableLangs.IndexOf( FCKLanguageManager.ActiveLanguage.Code ) >= 0 )
+			sLang = FCKLanguageManager.ActiveLanguage.Code ;
+		else
+			// Load the default language file (first one) if the current one is not available.
+			sLang = this.AvailableLangs[0] ;
+
+		// Add the main plugin script.
+		LoadScript( this.Path + 'lang/' + sLang + '.js' ) ;
+	}
+
+	// Add the main plugin script.
+	LoadScript( this.Path + 'fckplugin.js' ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckspecialcombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckspecialcombo.js
new file mode 100644
index 000000000..72263895f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckspecialcombo.js
@@ -0,0 +1,376 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKSpecialCombo Class: represents a special combo.
+ */
+
+var FCKSpecialCombo = function( caption, fieldWidth, panelWidth, panelMaxHeight, parentWindow )
+{
+	// Default properties values.
+	this.FieldWidth		= fieldWidth || 100 ;
+	this.PanelWidth		= panelWidth || 150 ;
+	this.PanelMaxHeight	= panelMaxHeight || 150 ;
+	this.Label			= '&nbsp;' ;
+	this.Caption		= caption ;
+	this.Tooltip		= caption ;
+	this.Style			= FCK_TOOLBARITEM_ICONTEXT ;
+
+	this.Enabled = true ;
+
+	this.Items = new Object() ;
+
+	this._Panel = new FCKPanel( parentWindow || window ) ;
+	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
+	this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;
+	this._PanelBox.className = 'SC_Panel' ;
+	this._PanelBox.style.width = this.PanelWidth + 'px' ;
+
+	this._PanelBox.innerHTML = '<table cellpadding="0" cellspacing="0" width="100%" style="TABLE-LAYOUT: fixed"><tr><td nowrap></td></tr></table>' ;
+
+	this._ItemsHolderEl = this._PanelBox.getElementsByTagName('TD')[0] ;
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( this, FCKSpecialCombo_Cleanup ) ;
+
+//	this._Panel.StyleSheet = FCKConfig.SkinPath + 'fck_contextmenu.css' ;
+//	this._Panel.Create() ;
+//	this._Panel.PanelDiv.className += ' SC_Panel' ;
+//	this._Panel.PanelDiv.innerHTML = '<table cellpadding="0" cellspacing="0" width="100%" style="TABLE-LAYOUT: fixed"><tr><td nowrap></td></tr></table>' ;
+//	this._ItemsHolderEl = this._Panel.PanelDiv.getElementsByTagName('TD')[0] ;
+}
+
+function FCKSpecialCombo_ItemOnMouseOver()
+{
+	this.className += ' SC_ItemOver' ;
+}
+
+function FCKSpecialCombo_ItemOnMouseOut()
+{
+	this.className = this.originalClass ;
+}
+
+function FCKSpecialCombo_ItemOnClick( ev, specialCombo, itemId )
+{
+	this.className = this.originalClass ;
+
+	specialCombo._Panel.Hide() ;
+
+	specialCombo.SetLabel( this.FCKItemLabel ) ;
+
+	if ( typeof( specialCombo.OnSelect ) == 'function' )
+		specialCombo.OnSelect( itemId, this ) ;
+}
+
+FCKSpecialCombo.prototype.ClearItems = function ()
+{
+	if ( this.Items )
+		this.Items = {} ;
+
+	var itemsholder = this._ItemsHolderEl ;
+	while ( itemsholder.firstChild )
+		itemsholder.removeChild( itemsholder.firstChild ) ;
+}
+
+FCKSpecialCombo.prototype.AddItem = function( id, html, label, bgColor )
+{
+	// <div class="SC_Item" onmouseover="this.className='SC_Item SC_ItemOver';" onmouseout="this.className='SC_Item';"><b>Bold 1</b></div>
+	var oDiv = this._ItemsHolderEl.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;
+	oDiv.className = oDiv.originalClass = 'SC_Item' ;
+	oDiv.innerHTML = html ;
+	oDiv.FCKItemLabel = label || id ;
+	oDiv.Selected = false ;
+
+	// In IE, the width must be set so the borders are shown correctly when the content overflows.
+	if ( FCKBrowserInfo.IsIE )
+		oDiv.style.width = '100%' ;
+
+	if ( bgColor )
+		oDiv.style.backgroundColor = bgColor ;
+
+	FCKTools.AddEventListenerEx( oDiv, 'mouseover', FCKSpecialCombo_ItemOnMouseOver ) ;
+	FCKTools.AddEventListenerEx( oDiv, 'mouseout', FCKSpecialCombo_ItemOnMouseOut ) ;
+	FCKTools.AddEventListenerEx( oDiv, 'click', FCKSpecialCombo_ItemOnClick, [ this, id ] ) ;
+
+	this.Items[ id.toString().toLowerCase() ] = oDiv ;
+
+	return oDiv ;
+}
+
+FCKSpecialCombo.prototype.SelectItem = function( item )
+{
+	if ( typeof item == 'string' )
+		item = this.Items[ item.toString().toLowerCase() ] ;
+
+	if ( item )
+	{
+		item.className = item.originalClass = 'SC_ItemSelected' ;
+		item.Selected = true ;
+	}
+}
+
+FCKSpecialCombo.prototype.SelectItemByLabel = function( itemLabel, setLabel )
+{
+	for ( var id in this.Items )
+	{
+		var oDiv = this.Items[id] ;
+
+		if ( oDiv.FCKItemLabel == itemLabel )
+		{
+			oDiv.className = oDiv.originalClass = 'SC_ItemSelected' ;
+			oDiv.Selected = true ;
+
+			if ( setLabel )
+				this.SetLabel( itemLabel ) ;
+		}
+	}
+}
+
+FCKSpecialCombo.prototype.DeselectAll = function( clearLabel )
+{
+	for ( var i in this.Items )
+	{
+		if ( !this.Items[i] ) continue;
+		this.Items[i].className = this.Items[i].originalClass = 'SC_Item' ;
+		this.Items[i].Selected = false ;
+	}
+
+	if ( clearLabel )
+		this.SetLabel( '' ) ;
+}
+
+FCKSpecialCombo.prototype.SetLabelById = function( id )
+{
+	id = id ? id.toString().toLowerCase() : '' ;
+
+	var oDiv = this.Items[ id ] ;
+	this.SetLabel( oDiv ? oDiv.FCKItemLabel : '' ) ;
+}
+
+FCKSpecialCombo.prototype.SetLabel = function( text )
+{
+	text = ( !text || text.length == 0 ) ? '&nbsp;' : text ;
+
+	if ( text == this.Label )
+		return ;
+
+	this.Label = text ;
+
+	var labelEl = this._LabelEl ;
+	if ( labelEl )
+	{
+		labelEl.innerHTML = text ;
+
+		// It may happen that the label is some HTML, including tags. This
+		// would be a problem because when the user click on those tags, the
+		// combo will get the selection from the editing area. So we must
+		// disable any kind of selection here.
+		FCKTools.DisableSelection( labelEl ) ;
+	}
+}
+
+FCKSpecialCombo.prototype.SetEnabled = function( isEnabled )
+{
+	this.Enabled = isEnabled ;
+
+	// In IE it can happen when the page is reloaded that _OuterTable is null, so check its existence
+	if ( this._OuterTable )
+		this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ;
+}
+
+FCKSpecialCombo.prototype.Create = function( targetElement )
+{
+	var oDoc = FCKTools.GetElementDocument( targetElement ) ;
+	var eOuterTable = this._OuterTable = targetElement.appendChild( oDoc.createElement( 'TABLE' ) ) ;
+	eOuterTable.cellPadding = 0 ;
+	eOuterTable.cellSpacing = 0 ;
+
+	eOuterTable.insertRow(-1) ;
+
+	var sClass ;
+	var bShowLabel ;
+
+	switch ( this.Style )
+	{
+		case FCK_TOOLBARITEM_ONLYICON :
+			sClass = 'TB_ButtonType_Icon' ;
+			bShowLabel = false;
+			break ;
+		case FCK_TOOLBARITEM_ONLYTEXT :
+			sClass = 'TB_ButtonType_Text' ;
+			bShowLabel = false;
+			break ;
+		case FCK_TOOLBARITEM_ICONTEXT :
+			bShowLabel = true;
+			break ;
+	}
+
+	if ( this.Caption && this.Caption.length > 0 && bShowLabel )
+	{
+		var oCaptionCell = eOuterTable.rows[0].insertCell(-1) ;
+		oCaptionCell.innerHTML = this.Caption ;
+		oCaptionCell.className = 'SC_FieldCaption' ;
+	}
+
+	// Create the main DIV element.
+	var oField = FCKTools.AppendElement( eOuterTable.rows[0].insertCell(-1), 'div' ) ;
+	if ( bShowLabel )
+	{
+		oField.className = 'SC_Field' ;
+		oField.style.width = this.FieldWidth + 'px' ;
+		oField.innerHTML = '<table width="100%" cellpadding="0" cellspacing="0" style="TABLE-LAYOUT: fixed;"><tbody><tr><td class="SC_FieldLabel"><label>&nbsp;</label></td><td class="SC_FieldButton">&nbsp;</td></tr></tbody></table>' ;
+
+		this._LabelEl = oField.getElementsByTagName('label')[0] ;		// Memory Leak
+		this._LabelEl.innerHTML = this.Label ;
+	}
+	else
+	{
+		oField.className = 'TB_Button_Off' ;
+		//oField.innerHTML = '<span className="SC_FieldCaption">' + this.Caption + '<table cellpadding="0" cellspacing="0" style="TABLE-LAYOUT: fixed;"><tbody><tr><td class="SC_FieldButton" style="border-left: none;">&nbsp;</td></tr></tbody></table>' ;
+		//oField.innerHTML = '<table cellpadding="0" cellspacing="0" style="TABLE-LAYOUT: fixed;"><tbody><tr><td class="SC_FieldButton" style="border-left: none;">&nbsp;</td></tr></tbody></table>' ;
+
+		// Gets the correct CSS class to use for the specified style (param).
+		oField.innerHTML = '<table title="' + this.Tooltip + '" class="' + sClass + '" cellspacing="0" cellpadding="0" border="0">' +
+				'<tr>' +
+					//'<td class="TB_Icon"><img src="' + FCKConfig.SkinPath + 'toolbar/' + this.Command.Name.toLowerCase() + '.gif" width="21" height="21"></td>' +
+					'<td><img class="TB_Button_Padding" src="' + FCK_SPACER_PATH + '" /></td>' +
+					'<td class="TB_Text">' + this.Caption + '</td>' +
+					'<td><img class="TB_Button_Padding" src="' + FCK_SPACER_PATH + '" /></td>' +
+					'<td class="TB_ButtonArrow"><img src="' + FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif" width="5" height="3"></td>' +
+					'<td><img class="TB_Button_Padding" src="' + FCK_SPACER_PATH + '" /></td>' +
+				'</tr>' +
+			'</table>' ;
+	}
+
+
+	// Events Handlers
+
+	FCKTools.AddEventListenerEx( oField, 'mouseover', FCKSpecialCombo_OnMouseOver, this ) ;
+	FCKTools.AddEventListenerEx( oField, 'mouseout', FCKSpecialCombo_OnMouseOut, this ) ;
+	FCKTools.AddEventListenerEx( oField, 'click', FCKSpecialCombo_OnClick, this ) ;
+
+	FCKTools.DisableSelection( this._Panel.Document.body ) ;
+}
+
+function FCKSpecialCombo_Cleanup()
+{
+	this._LabelEl = null ;
+	this._OuterTable = null ;
+	this._ItemsHolderEl = null ;
+	this._PanelBox = null ;
+
+	if ( this.Items )
+	{
+		for ( var key in this.Items )
+			this.Items[key] = null ;
+	}
+}
+
+function FCKSpecialCombo_OnMouseOver( ev, specialCombo )
+{
+	if ( specialCombo.Enabled )
+	{
+		switch ( specialCombo.Style )
+		{
+			case FCK_TOOLBARITEM_ONLYICON :
+				this.className = 'TB_Button_On_Over';
+				break ;
+			case FCK_TOOLBARITEM_ONLYTEXT :
+				this.className = 'TB_Button_On_Over';
+				break ;
+			case FCK_TOOLBARITEM_ICONTEXT :
+				this.className = 'SC_Field SC_FieldOver' ;
+				break ;
+		}
+	}
+}
+
+function FCKSpecialCombo_OnMouseOut( ev, specialCombo )
+{
+	switch ( specialCombo.Style )
+	{
+		case FCK_TOOLBARITEM_ONLYICON :
+			this.className = 'TB_Button_Off';
+			break ;
+		case FCK_TOOLBARITEM_ONLYTEXT :
+			this.className = 'TB_Button_Off';
+			break ;
+		case FCK_TOOLBARITEM_ICONTEXT :
+			this.className='SC_Field' ;
+			break ;
+	}
+}
+
+function FCKSpecialCombo_OnClick( e, specialCombo )
+{
+	// For Mozilla we must stop the event propagation to avoid it hiding
+	// the panel because of a click outside of it.
+//	if ( e )
+//	{
+//		e.stopPropagation() ;
+//		FCKPanelEventHandlers.OnDocumentClick( e ) ;
+//	}
+
+	if ( specialCombo.Enabled )
+	{
+		var oPanel			= specialCombo._Panel ;
+		var oPanelBox		= specialCombo._PanelBox ;
+		var oItemsHolder	= specialCombo._ItemsHolderEl ;
+		var iMaxHeight		= specialCombo.PanelMaxHeight ;
+
+		if ( specialCombo.OnBeforeClick )
+			specialCombo.OnBeforeClick( specialCombo ) ;
+
+		// This is a tricky thing. We must call the "Load" function, otherwise
+		// it will not be possible to retrieve "oItemsHolder.offsetHeight" (IE only).
+		if ( FCKBrowserInfo.IsIE )
+			oPanel.Preload( 0, this.offsetHeight, this ) ;
+
+		if ( oItemsHolder.offsetHeight > iMaxHeight )
+//		{
+			oPanelBox.style.height = iMaxHeight + 'px' ;
+
+//			if ( FCKBrowserInfo.IsGecko )
+//				oPanelBox.style.overflow = '-moz-scrollbars-vertical' ;
+//		}
+		else
+			oPanelBox.style.height = '' ;
+
+//		oPanel.PanelDiv.style.width = specialCombo.PanelWidth + 'px' ;
+
+		oPanel.Show( 0, this.offsetHeight, this ) ;
+	}
+
+//	return false ;
+}
+
+/*
+Sample Combo Field HTML output:
+
+<div class="SC_Field" style="width: 80px;">
+	<table width="100%" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
+		<tbody>
+			<tr>
+				<td class="SC_FieldLabel"><label>&nbsp;</label></td>
+				<td class="SC_FieldButton">&nbsp;</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+*/
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckstyle.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckstyle.js
new file mode 100644
index 000000000..756fd6782
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckstyle.js
@@ -0,0 +1,1500 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKStyle Class: contains a style definition, and all methods to work with
+ * the style in a document.
+ */
+
+/**
+ * @param {Object} styleDesc A "style descriptor" object, containing the raw
+ * style definition in the following format:
+ *		'<style name>' : {
+ *			Element : '<element name>',
+ *			Attributes : {
+ *				'<att name>' : '<att value>',
+ *				...
+ *			},
+ *			Styles : {
+ *				'<style name>' : '<style value>',
+ *				...
+ *			},
+ *			Overrides : '<element name>'|{
+ *				Element : '<element name>',
+ *				Attributes : {
+ *					'<att name>' : '<att value>'|/<att regex>/
+ *				},
+ *				Styles : {
+ *					'<style name>' : '<style value>'|/<style regex>/
+ *				},
+ *			}
+ *		}
+ */
+var FCKStyle = function( styleDesc )
+{
+	this.Element = ( styleDesc.Element || 'span' ).toLowerCase() ;
+	this._StyleDesc = styleDesc ;
+}
+
+FCKStyle.prototype =
+{
+	/**
+	 * Get the style type, based on its element name:
+	 *		- FCK_STYLE_BLOCK  (0): Block Style
+	 *		- FCK_STYLE_INLINE (1): Inline Style
+	 *		- FCK_STYLE_OBJECT (2): Object Style
+	 */
+	GetType : function()
+	{
+		var type = this.GetType_$ ;
+
+		if ( type != undefined )
+			return type ;
+
+		var elementName = this.Element ;
+
+		if ( elementName == '#' || FCKListsLib.StyleBlockElements[ elementName ] )
+			type = FCK_STYLE_BLOCK ;
+		else if ( FCKListsLib.StyleObjectElements[ elementName ] )
+			type = FCK_STYLE_OBJECT ;
+		else
+			type = FCK_STYLE_INLINE ;
+
+		return ( this.GetType_$ = type ) ;
+	},
+
+	/**
+	 * Apply the style to the current selection.
+	 */
+	ApplyToSelection : function( targetWindow )
+	{
+		// Create a range for the current selection.
+		var range = new FCKDomRange( targetWindow ) ;
+		range.MoveToSelection() ;
+
+		this.ApplyToRange( range, true ) ;
+	},
+
+	/**
+	 * Apply the style to a FCKDomRange.
+	 */
+	ApplyToRange : function( range, selectIt, updateRange )
+	{
+		// ApplyToRange is not valid for FCK_STYLE_OBJECT types.
+		// Use ApplyToObject instead.
+
+		switch ( this.GetType() )
+		{
+			case FCK_STYLE_BLOCK :
+				this.ApplyToRange = this._ApplyBlockStyle ;
+				break ;
+			case FCK_STYLE_INLINE :
+				this.ApplyToRange = this._ApplyInlineStyle ;
+				break ;
+			default :
+				return ;
+		}
+
+		this.ApplyToRange( range, selectIt, updateRange ) ;
+	},
+
+	/**
+	 * Apply the style to an object. Valid for FCK_STYLE_BLOCK types only.
+	 */
+	ApplyToObject : function( objectElement )
+	{
+		if ( !objectElement )
+			return ;
+
+		this.BuildElement( null, objectElement ) ;
+	},
+
+	/**
+	 * Remove the style from the current selection.
+	 */
+	RemoveFromSelection : function( targetWindow )
+	{
+		// Create a range for the current selection.
+		var range = new FCKDomRange( targetWindow ) ;
+		range.MoveToSelection() ;
+
+		this.RemoveFromRange( range, true ) ;
+	},
+
+	/**
+	 * Remove the style from a FCKDomRange. Block type styles will have no
+	 * effect.
+	 */
+	RemoveFromRange : function( range, selectIt, updateRange )
+	{
+		var bookmark ;
+
+		// Create the attribute list to be used later for element comparisons.
+		var styleAttribs = this._GetAttribsForComparison() ;
+		var styleOverrides = this._GetOverridesForComparison() ;
+
+		// If collapsed, we are removing all conflicting styles from the range
+		// parent tree.
+		if ( range.CheckIsCollapsed() )
+		{
+			// Bookmark the range so we can re-select it after processing.
+			var bookmark = range.CreateBookmark( true ) ;
+
+			// Let's start from the bookmark <span> parent.
+			var bookmarkStart = range.GetBookmarkNode( bookmark, true ) ;
+
+			var path = new FCKElementPath( bookmarkStart.parentNode ) ;
+
+			// While looping through the path, we'll be saving references to
+			// parent elements if the range is in one of their boundaries. In
+			// this way, we are able to create a copy of those elements when
+			// removing a style if the range is in a boundary limit (see #1270).
+			var boundaryElements = [] ;
+
+			// Check if the range is in the boundary limits of an element
+			// (related to #1270).
+			var isBoundaryRight = !FCKDomTools.GetNextSibling( bookmarkStart ) ;
+			var isBoundary = isBoundaryRight || !FCKDomTools.GetPreviousSibling( bookmarkStart ) ;
+
+			// This is the last element to be removed in the boundary situation
+			// described at #1270.
+			var lastBoundaryElement ;
+			var boundaryLimitIndex = -1 ;
+
+			for ( var i = 0 ; i < path.Elements.length ; i++ )
+			{
+				var pathElement = path.Elements[i] ;
+				if ( this.CheckElementRemovable( pathElement ) )
+				{
+					if ( isBoundary
+						&& !FCKDomTools.CheckIsEmptyElement( pathElement,
+								function( el )
+								{
+									return ( el != bookmarkStart ) ;
+								} )
+						)
+					{
+						lastBoundaryElement = pathElement ;
+
+						// We'll be continuously including elements in the
+						// boundaryElements array, but only those added before
+						// setting lastBoundaryElement must be used later, so
+						// let's mark the current index here.
+						boundaryLimitIndex = boundaryElements.length - 1 ;
+					}
+					else
+					{
+						var pathElementName = pathElement.nodeName.toLowerCase() ;
+
+						if ( pathElementName == this.Element )
+						{
+							// Remove any attribute that conflict with this style, no
+							// matter their values.
+							for ( var att in styleAttribs )
+							{
+								if ( FCKDomTools.HasAttribute( pathElement, att ) )
+								{
+									switch ( att )
+									{
+										case 'style' :
+											this._RemoveStylesFromElement( pathElement ) ;
+											break ;
+
+										case 'class' :
+											// The 'class' element value must match (#1318).
+											if ( FCKDomTools.GetAttributeValue( pathElement, att ) != this.GetFinalAttributeValue( att ) )
+												continue ;
+
+											/*jsl:fallthru*/
+
+										default :
+											FCKDomTools.RemoveAttribute( pathElement, att ) ;
+									}
+								}
+							}
+						}
+
+						// Remove overrides defined to the same element name.
+						this._RemoveOverrides( pathElement, styleOverrides[ pathElementName ] ) ;
+
+						// Remove the element if no more attributes are available and it's an inline style element
+						if ( this.GetType() == FCK_STYLE_INLINE)
+							this._RemoveNoAttribElement( pathElement ) ;
+					}
+				}
+				else if ( isBoundary )
+					boundaryElements.push( pathElement ) ;
+
+				// Check if we are still in a boundary (at the same side).
+				isBoundary = isBoundary && ( ( isBoundaryRight && !FCKDomTools.GetNextSibling( pathElement ) ) || ( !isBoundaryRight && !FCKDomTools.GetPreviousSibling( pathElement ) ) ) ;
+
+				// If we are in an element that is not anymore a boundary, or
+				// we are at the last element, let's move things outside the
+				// boundary (if available).
+				if ( lastBoundaryElement && ( !isBoundary || ( i == path.Elements.length - 1 ) ) )
+				{
+					// Remove the bookmark node from the DOM.
+					var currentElement = FCKDomTools.RemoveNode( bookmarkStart ) ;
+
+					// Build the collapsed group of elements that are not
+					// removed by this style, but share the boundary.
+					// (see comment 1 and 2 at #1270)
+					for ( var j = 0 ; j <= boundaryLimitIndex ; j++ )
+					{
+						var newElement = FCKDomTools.CloneElement( boundaryElements[j] ) ;
+						newElement.appendChild( currentElement ) ;
+						currentElement = newElement ;
+					}
+
+					// Re-insert the bookmark node (and the collapsed elements)
+					// in the DOM, in the new position next to the styled element.
+					if ( isBoundaryRight )
+						FCKDomTools.InsertAfterNode( lastBoundaryElement, currentElement ) ;
+					else
+						lastBoundaryElement.parentNode.insertBefore( currentElement, lastBoundaryElement ) ;
+
+					isBoundary = false ;
+					lastBoundaryElement = null ;
+				}
+			}
+
+				// Re-select the original range.
+			if ( selectIt )
+				range.SelectBookmark( bookmark ) ;
+
+			if ( updateRange )
+				range.MoveToBookmark( bookmark ) ;
+
+			return ;
+		}
+
+		// Expand the range, if inside inline element boundaries.
+		range.Expand( 'inline_elements' ) ;
+
+		// Bookmark the range so we can re-select it after processing.
+		bookmark = range.CreateBookmark( true ) ;
+
+		// The style will be applied within the bookmark boundaries.
+		var startNode	= range.GetBookmarkNode( bookmark, true ) ;
+		var endNode		= range.GetBookmarkNode( bookmark, false ) ;
+
+		range.Release( true ) ;
+
+		// We need to check the selection boundaries (bookmark spans) to break
+		// the code in a way that we can properly remove partially selected nodes.
+		// For example, removing a <b> style from
+		//		<b>This is [some text</b> to show <b>the] problem</b>
+		// ... where [ and ] represent the selection, must result:
+		//		<b>This is </b>[some text to show the]<b> problem</b>
+		// The strategy is simple, we just break the partial nodes before the
+		// removal logic, having something that could be represented this way:
+		//		<b>This is </b>[<b>some text</b> to show <b>the</b>]<b> problem</b>
+
+		// Let's start checking the start boundary.
+		var path = new FCKElementPath( startNode ) ;
+		var pathElements = path.Elements ;
+		var pathElement ;
+
+		for ( var i = 1 ; i < pathElements.length ; i++ )
+		{
+			pathElement = pathElements[i] ;
+
+			if ( pathElement == path.Block || pathElement == path.BlockLimit )
+				break ;
+
+			// If this element can be removed (even partially).
+			if ( this.CheckElementRemovable( pathElement ) )
+				FCKDomTools.BreakParent( startNode, pathElement, range ) ;
+		}
+
+		// Now the end boundary.
+		path = new FCKElementPath( endNode ) ;
+		pathElements = path.Elements ;
+
+		for ( var i = 1 ; i < pathElements.length ; i++ )
+		{
+			pathElement = pathElements[i] ;
+
+			if ( pathElement == path.Block || pathElement == path.BlockLimit )
+				break ;
+
+			elementName = pathElement.nodeName.toLowerCase() ;
+
+			// If this element can be removed (even partially).
+			if ( this.CheckElementRemovable( pathElement ) )
+				FCKDomTools.BreakParent( endNode, pathElement, range ) ;
+		}
+
+		// Navigate through all nodes between the bookmarks.
+		var currentNode = FCKDomTools.GetNextSourceNode( startNode, true ) ;
+
+		while ( currentNode )
+		{
+			// Cache the next node to be processed. Do it now, because
+			// currentNode may be removed.
+			var nextNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+
+			// Remove elements nodes that match with this style rules.
+			if ( currentNode.nodeType == 1 )
+			{
+				var elementName = currentNode.nodeName.toLowerCase() ;
+
+				var mayRemove = ( elementName == this.Element ) ;
+				if ( mayRemove )
+				{
+					// Remove any attribute that conflict with this style, no matter
+					// their values.
+					for ( var att in styleAttribs )
+					{
+						if ( FCKDomTools.HasAttribute( currentNode, att ) )
+						{
+							switch ( att )
+							{
+								case 'style' :
+									this._RemoveStylesFromElement( currentNode ) ;
+									break ;
+
+								case 'class' :
+									// The 'class' element value must match (#1318).
+									if ( FCKDomTools.GetAttributeValue( currentNode, att ) != this.GetFinalAttributeValue( att ) )
+										continue ;
+
+									/*jsl:fallthru*/
+
+								default :
+									FCKDomTools.RemoveAttribute( currentNode, att ) ;
+							}
+						}
+					}
+				}
+				else
+					mayRemove = !!styleOverrides[ elementName ] ;
+
+				if ( mayRemove )
+				{
+					// Remove overrides defined to the same element name.
+					this._RemoveOverrides( currentNode, styleOverrides[ elementName ] ) ;
+
+					// Remove the element if no more attributes are available.
+					this._RemoveNoAttribElement( currentNode ) ;
+				}
+			}
+
+			// If we have reached the end of the selection, stop looping.
+			if ( nextNode == endNode )
+				break ;
+
+			currentNode = nextNode ;
+		}
+
+		this._FixBookmarkStart( startNode ) ;
+
+		// Re-select the original range.
+		if ( selectIt )
+			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
+	},
+
+	/**
+	 * Checks if an element, or any of its attributes, is removable by the
+	 * current style definition.
+	 */
+	CheckElementRemovable : function( element, fullMatch )
+	{
+		if ( !element )
+			return false ;
+
+		var elementName = element.nodeName.toLowerCase() ;
+
+		// If the element name is the same as the style name.
+		if ( elementName == this.Element )
+		{
+			// If no attributes are defined in the element.
+			if ( !fullMatch && !FCKDomTools.HasAttributes( element ) )
+				return true ;
+
+			// If any attribute conflicts with the style attributes.
+			var attribs = this._GetAttribsForComparison() ;
+			var allMatched = ( attribs._length == 0 ) ;
+			for ( var att in attribs )
+			{
+				if ( att == '_length' )
+					continue ;
+
+				if ( this._CompareAttributeValues( att, FCKDomTools.GetAttributeValue( element, att ), ( this.GetFinalAttributeValue( att ) || '' ) ) )
+				{
+					allMatched = true ;
+					if ( !fullMatch )
+						break ;
+				}
+				else
+				{
+					allMatched = false ;
+					if ( fullMatch )
+						return false ;
+				}
+			}
+			if ( allMatched )
+				return true ;
+		}
+
+		// Check if the element can be somehow overriden.
+		var override = this._GetOverridesForComparison()[ elementName ] ;
+		if ( override )
+		{
+			// If no attributes have been defined, remove the element.
+			if ( !( attribs = override.Attributes ) ) // Only one "="
+				return true ;
+
+			for ( var i = 0 ; i < attribs.length ; i++ )
+			{
+				var attName = attribs[i][0] ;
+				if ( FCKDomTools.HasAttribute( element, attName ) )
+				{
+					var attValue = attribs[i][1] ;
+
+					// Remove the attribute if:
+					//    - The override definition value is null ;
+					//    - The override definition valie is a string that
+					//      matches the attribute value exactly.
+					//    - The override definition value is a regex that
+					//      has matches in the attribute value.
+					if ( attValue == null ||
+							( typeof attValue == 'string' && FCKDomTools.GetAttributeValue( element, attName ) == attValue ) ||
+							attValue.test( FCKDomTools.GetAttributeValue( element, attName ) ) )
+						return true ;
+				}
+			}
+		}
+
+		return false ;
+	},
+
+	/**
+	 * Get the style state for an element path. Returns "true" if the element
+	 * is active in the path.
+	 */
+	CheckActive : function( elementPath )
+	{
+		switch ( this.GetType() )
+		{
+			case FCK_STYLE_BLOCK :
+				return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit, true ) ;
+
+			case FCK_STYLE_INLINE :
+
+				var elements = elementPath.Elements ;
+
+				for ( var i = 0 ; i < elements.length ; i++ )
+				{
+					var element = elements[i] ;
+
+					if ( element == elementPath.Block || element == elementPath.BlockLimit )
+						continue ;
+
+					if ( this.CheckElementRemovable( element, true ) )
+						return true ;
+				}
+		}
+		return false ;
+	},
+
+	/**
+	 * Removes an inline style from inside an element tree. The element node
+	 * itself is not checked or removed, only the child tree inside of it.
+	 */
+	RemoveFromElement : function( element )
+	{
+		var attribs = this._GetAttribsForComparison() ;
+		var overrides = this._GetOverridesForComparison() ;
+
+		// Get all elements with the same name.
+		var innerElements = element.getElementsByTagName( this.Element ) ;
+
+		for ( var i = innerElements.length - 1 ; i >= 0 ; i-- )
+		{
+			var innerElement = innerElements[i] ;
+
+			// Remove any attribute that conflict with this style, no matter
+			// their values.
+			for ( var att in attribs )
+			{
+				if ( FCKDomTools.HasAttribute( innerElement, att ) )
+				{
+					switch ( att )
+					{
+						case 'style' :
+							this._RemoveStylesFromElement( innerElement ) ;
+							break ;
+
+						case 'class' :
+							// The 'class' element value must match (#1318).
+							if ( FCKDomTools.GetAttributeValue( innerElement, att ) != this.GetFinalAttributeValue( att ) )
+								continue ;
+
+							/*jsl:fallthru*/
+
+						default :
+							FCKDomTools.RemoveAttribute( innerElement, att ) ;
+					}
+				}
+			}
+
+			// Remove overrides defined to the same element name.
+			this._RemoveOverrides( innerElement, overrides[ this.Element ] ) ;
+
+			// Remove the element if no more attributes are available.
+			this._RemoveNoAttribElement( innerElement ) ;
+		}
+
+		// Now remove any other element with different name that is
+		// defined to be overriden.
+		for ( var overrideElement in overrides )
+		{
+			if ( overrideElement != this.Element )
+			{
+				// Get all elements.
+				innerElements = element.getElementsByTagName( overrideElement ) ;
+
+				for ( var i = innerElements.length - 1 ; i >= 0 ; i-- )
+				{
+					var innerElement = innerElements[i] ;
+					this._RemoveOverrides( innerElement, overrides[ overrideElement ] ) ;
+					this._RemoveNoAttribElement( innerElement ) ;
+				}
+			}
+		}
+	},
+
+	_RemoveStylesFromElement : function( element )
+	{
+		var elementStyle = element.style.cssText ;
+		var pattern = this.GetFinalStyleValue() ;
+
+		if ( elementStyle.length > 0 && pattern.length == 0 )
+			return ;
+
+		pattern = '(^|;)\\s*(' +
+			pattern.replace( /\s*([^ ]+):.*?(;|$)/g, '$1|' ).replace( /\|$/, '' ) +
+			'):[^;]+' ;
+
+		var regex = new RegExp( pattern, 'gi' ) ;
+
+		elementStyle = elementStyle.replace( regex, '' ).Trim() ;
+
+		if ( elementStyle.length == 0 || elementStyle == ';' )
+			FCKDomTools.RemoveAttribute( element, 'style' ) ;
+		else
+			element.style.cssText = elementStyle.replace( regex, '' ) ;
+	},
+
+	/**
+	 * Remove all attributes that are defined to be overriden,
+	 */
+	_RemoveOverrides : function( element, override )
+	{
+		var attributes = override && override.Attributes ;
+
+		if ( attributes )
+		{
+			for ( var i = 0 ; i < attributes.length ; i++ )
+			{
+				var attName = attributes[i][0] ;
+
+				if ( FCKDomTools.HasAttribute( element, attName ) )
+				{
+					var attValue	= attributes[i][1] ;
+
+					// Remove the attribute if:
+					//    - The override definition value is null ;
+					//    - The override definition valie is a string that
+					//      matches the attribute value exactly.
+					//    - The override definition value is a regex that
+					//      has matches in the attribute value.
+					if ( attValue == null ||
+							( attValue.test && attValue.test( FCKDomTools.GetAttributeValue( element, attName ) ) ) ||
+							( typeof attValue == 'string' && FCKDomTools.GetAttributeValue( element, attName ) == attValue ) )
+						FCKDomTools.RemoveAttribute( element, attName ) ;
+				}
+			}
+		}
+	},
+
+	/**
+	 * If the element has no more attributes, remove it.
+	 */
+	_RemoveNoAttribElement : function( element )
+	{
+		// If no more attributes remained in the element, remove it,
+		// leaving its children.
+		if ( !FCKDomTools.HasAttributes( element ) )
+		{
+			// Removing elements may open points where merging is possible,
+			// so let's cache the first and last nodes for later checking.
+			var firstChild	= element.firstChild ;
+			var lastChild	= element.lastChild ;
+
+			FCKDomTools.RemoveNode( element, true ) ;
+
+			// Check the cached nodes for merging.
+			this._MergeSiblings( firstChild ) ;
+
+			if ( firstChild != lastChild )
+				this._MergeSiblings( lastChild ) ;
+		}
+	},
+
+	/**
+	 * Creates a DOM element for this style object.
+	 */
+	BuildElement : function( targetDoc, element )
+	{
+		// Create the element.
+		var el = element || targetDoc.createElement( this.Element ) ;
+
+		// Assign all defined attributes.
+		var attribs	= this._StyleDesc.Attributes ;
+		var attValue ;
+		if ( attribs )
+		{
+			for ( var att in attribs )
+			{
+				attValue = this.GetFinalAttributeValue( att ) ;
+
+				if ( att.toLowerCase() == 'class' )
+					el.className = attValue ;
+				else
+					el.setAttribute( att, attValue ) ;
+			}
+		}
+
+		// Assign the style attribute.
+		if ( this._GetStyleText().length > 0 )
+			el.style.cssText = this.GetFinalStyleValue() ;
+
+		return el ;
+	},
+
+	_CompareAttributeValues : function( attName, valueA, valueB )
+	{
+		if ( attName == 'style' && valueA && valueB )
+		{
+			valueA = valueA.replace( /;$/, '' ).toLowerCase() ;
+			valueB = valueB.replace( /;$/, '' ).toLowerCase() ;
+		}
+
+		// Return true if they match or if valueA is null and valueB is an empty string
+		return ( valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
+	},
+
+	GetFinalAttributeValue : function( attName )
+	{
+		var attValue = this._StyleDesc.Attributes ;
+		var attValue = attValue ? attValue[ attName ] : null ;
+
+		if ( !attValue && attName == 'style' )
+			return this.GetFinalStyleValue() ;
+
+		if ( attValue && this._Variables )
+			// Using custom Replace() to guarantee the correct scope.
+			attValue = attValue.Replace( FCKRegexLib.StyleVariableAttName, this._GetVariableReplace, this ) ;
+
+		return attValue ;
+	},
+
+	GetFinalStyleValue : function()
+	{
+		var attValue = this._GetStyleText() ;
+
+		if ( attValue.length > 0 && this._Variables )
+		{
+			// Using custom Replace() to guarantee the correct scope.
+			attValue = attValue.Replace( FCKRegexLib.StyleVariableAttName, this._GetVariableReplace, this ) ;
+			attValue = FCKTools.NormalizeCssText( attValue ) ;
+		}
+
+		return attValue ;
+	},
+
+	_GetVariableReplace : function()
+	{
+		// The second group in the regex is the variable name.
+		return this._Variables[ arguments[2] ] || arguments[0] ;
+	},
+
+	/**
+	 * Set the value of a variable attribute or style, to be used when
+	 * appliying the style.
+	 */
+	SetVariable : function( name, value )
+	{
+		var variables = this._Variables ;
+
+		if ( !variables )
+			variables = this._Variables = {} ;
+
+		this._Variables[ name ] = value ;
+	},
+
+	/**
+	 * Converting from a PRE block to a non-PRE block in formatting operations.
+	 */
+	_FromPre : function( doc, block, newBlock )
+	{
+		var innerHTML = block.innerHTML ;
+
+		// Trim the first and last linebreaks immediately after and before <pre>, </pre>,
+		// if they exist.
+		// This is done because the linebreaks are not rendered.
+		innerHTML = innerHTML.replace( /(\r\n|\r)/g, '\n' ) ;
+		innerHTML = innerHTML.replace( /^[ \t]*\n/, '' ) ;
+		innerHTML = innerHTML.replace( /\n$/, '' ) ;
+
+		// 1. Convert spaces or tabs at the beginning or at the end to &nbsp;
+		innerHTML = innerHTML.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+				{
+					if ( match.length == 1 )	// one space, preserve it
+						return '&nbsp;' ;
+					else if ( offset == 0 )		// beginning of block
+						return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+					else				// end of block
+						return ' ' + new Array( match.length ).join( '&nbsp;' ) ;
+				} ) ;
+
+		// 2. Convert \n to <BR>.
+		// 3. Convert contiguous (i.e. non-singular) spaces or tabs to &nbsp;
+		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+		var results = [] ;
+		htmlIterator.Each( function( isTag, value )
+			{
+				if ( !isTag )
+				{
+					value = value.replace( /\n/g, '<br>' ) ;
+					value = value.replace( /[ \t]{2,}/g,
+							function ( match )
+							{
+								return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+							} ) ;
+				}
+				results.push( value ) ;
+			} ) ;
+		newBlock.innerHTML = results.join( '' ) ;
+		return newBlock ;
+	},
+
+	/**
+	 * Converting from a non-PRE block to a PRE block in formatting operations.
+	 */
+	_ToPre : function( doc, block, newBlock )
+	{
+		// Handle converting from a regular block to a <pre> block.
+		var innerHTML = block.innerHTML.Trim() ;
+
+		// 1. Delete ANSI whitespaces immediately before and after <BR> because
+		//    they are not visible.
+		// 2. Mark down any <BR /> nodes here so they can be turned into \n in
+		//    the next step and avoid being compressed.
+		innerHTML = innerHTML.replace( /[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi, '<br />' ) ;
+
+		// 3. Compress other ANSI whitespaces since they're only visible as one
+		//    single space previously.
+		// 4. Convert &nbsp; to spaces since &nbsp; is no longer needed in <PRE>.
+		// 5. Convert any <BR /> to \n. This must not be done earlier because
+		//    the \n would then get compressed.
+		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+		var results = [] ;
+		htmlIterator.Each( function( isTag, value )
+			{
+				if ( !isTag )
+					value = value.replace( /([ \t\n\r]+|&nbsp;)/g, ' ' ) ;
+				else if ( isTag && value == '<br />' )
+					value = '\n' ;
+				results.push( value ) ;
+			} ) ;
+
+		// Assigning innerHTML to <PRE> in IE causes all linebreaks to be
+		// reduced to spaces.
+		// Assigning outerHTML to <PRE> in IE doesn't work if the <PRE> isn't
+		// contained in another node since the node reference is changed after
+		// outerHTML assignment.
+		// So, we need some hacks to workaround IE bugs here.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			var temp = doc.createElement( 'div' ) ;
+			temp.appendChild( newBlock ) ;
+			newBlock.outerHTML = '<pre>\n' + results.join( '' ) + '</pre>' ;
+			newBlock = temp.removeChild( temp.firstChild ) ;
+		}
+		else
+			newBlock.innerHTML = results.join( '' ) ;
+
+		return newBlock ;
+	},
+
+	/**
+	 * Merge a <pre> block with a previous <pre> block, if available.
+	 */
+	_CheckAndMergePre : function( previousBlock, preBlock )
+	{
+		// Check if the previous block and the current block are next
+		// to each other.
+		if ( previousBlock != FCKDomTools.GetPreviousSourceElement( preBlock, true ) )
+			return ;
+
+		// Merge the previous <pre> block contents into the current <pre>
+		// block.
+		//
+		// Another thing to be careful here is that currentBlock might contain
+		// a '\n' at the beginning, and previousBlock might contain a '\n'
+		// towards the end. These new lines are not normally displayed but they
+		// become visible after merging.
+		var innerHTML = previousBlock.innerHTML.replace( /\n$/, '' ) + '\n\n' +
+				preBlock.innerHTML.replace( /^\n/, '' ) ;
+
+		// Buggy IE normalizes innerHTML from <pre>, breaking whitespaces.
+		if ( FCKBrowserInfo.IsIE )
+			preBlock.outerHTML = '<pre>' + innerHTML + '</pre>' ;
+		else
+			preBlock.innerHTML = innerHTML ;
+
+		// Remove the previous <pre> block.
+		//
+		// The preBlock must not be moved or deleted from the DOM tree. This
+		// guarantees the FCKDomRangeIterator in _ApplyBlockStyle would not
+		// get lost at the next iteration.
+		FCKDomTools.RemoveNode( previousBlock ) ;
+	},
+
+	_CheckAndSplitPre : function( newBlock )
+	{
+		var lastNewBlock ;
+
+		var cursor = newBlock.firstChild ;
+
+		// We are not splitting <br><br> at the beginning of the block, so
+		// we'll start from the second child.
+		cursor = cursor && cursor.nextSibling ;
+
+		while ( cursor )
+		{
+			var next = cursor.nextSibling ;
+
+			// If we have two <BR>s, and they're not at the beginning or the end,
+			// then we'll split up the contents following them into another block.
+			// Stop processing if we are at the last child couple.
+			if ( next && next.nextSibling && cursor.nodeName.IEquals( 'br' ) && next.nodeName.IEquals( 'br' ) )
+			{
+				// Remove the first <br>.
+				FCKDomTools.RemoveNode( cursor ) ;
+
+				// Move to the node after the second <br>.
+				cursor = next.nextSibling ;
+
+				// Remove the second <br>.
+				FCKDomTools.RemoveNode( next ) ;
+
+				// Create the block that will hold the child nodes from now on.
+				lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || newBlock, FCKDomTools.CloneElement( newBlock ) ) ;
+
+				continue ;
+			}
+
+			// If we split it, then start moving the nodes to the new block.
+			if ( lastNewBlock )
+			{
+				cursor = cursor.previousSibling ;
+				FCKDomTools.MoveNode(cursor.nextSibling, lastNewBlock ) ;
+			}
+
+			cursor = cursor.nextSibling ;
+		}
+	},
+
+	/**
+	 * Apply an inline style to a FCKDomRange.
+	 *
+	 * TODO
+	 *	- Implement the "#" style handling.
+	 *	- Properly handle block containers like <div> and <blockquote>.
+	 */
+	_ApplyBlockStyle : function( range, selectIt, updateRange )
+	{
+		// Bookmark the range so we can re-select it after processing.
+		var bookmark ;
+
+		if ( selectIt )
+			bookmark = range.CreateBookmark() ;
+
+		var iterator = new FCKDomRangeIterator( range ) ;
+		iterator.EnforceRealBlocks = true ;
+
+		var block ;
+		var doc = range.Window.document ;
+		var previousPreBlock ;
+
+		while( ( block = iterator.GetNextParagraph() ) )		// Only one =
+		{
+			// Create the new node right before the current one.
+			var newBlock = this.BuildElement( doc ) ;
+
+			// Check if we are changing from/to <pre>.
+			var newBlockIsPre	= newBlock.nodeName.IEquals( 'pre' ) ;
+			var blockIsPre		= block.nodeName.IEquals( 'pre' ) ;
+
+			var toPre	= newBlockIsPre && !blockIsPre ;
+			var fromPre	= !newBlockIsPre && blockIsPre ;
+
+			// Move everything from the current node to the new one.
+			if ( toPre )
+				newBlock = this._ToPre( doc, block, newBlock ) ;
+			else if ( fromPre )
+				newBlock = this._FromPre( doc, block, newBlock ) ;
+			else	// Convering from a regular block to another regular block.
+				FCKDomTools.MoveChildren( block, newBlock ) ;
+
+			// Replace the current block.
+			block.parentNode.insertBefore( newBlock, block ) ;
+			FCKDomTools.RemoveNode( block ) ;
+
+			// Complete other tasks after inserting the node in the DOM.
+			if ( newBlockIsPre )
+			{
+				if ( previousPreBlock )
+					this._CheckAndMergePre( previousPreBlock, newBlock ) ;	// Merge successive <pre> blocks.
+				previousPreBlock = newBlock ;
+			}
+			else if ( fromPre )
+				this._CheckAndSplitPre( newBlock ) ;	// Split <br><br> in successive <pre>s.
+		}
+
+		// Re-select the original range.
+		if ( selectIt )
+			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
+	},
+
+	/**
+	 * Apply an inline style to a FCKDomRange.
+	 *
+	 * TODO
+	 *	- Merge elements, when applying styles to similar elements that enclose
+	 *    the entire selection, outputing:
+	 *        <span style="color: #ff0000; background-color: #ffffff">XYZ</span>
+	 *    instead of:
+	 *        <span style="color: #ff0000;"><span style="background-color: #ffffff">XYZ</span></span>
+	 */
+	_ApplyInlineStyle : function( range, selectIt, updateRange )
+	{
+		var doc = range.Window.document ;
+
+		if ( range.CheckIsCollapsed() )
+		{
+			// Create the element to be inserted in the DOM.
+			var collapsedElement = this.BuildElement( doc ) ;
+			range.InsertNode( collapsedElement ) ;
+			range.MoveToPosition( collapsedElement, 2 ) ;
+			range.Select() ;
+
+			return ;
+		}
+
+		// The general idea here is navigating through all nodes inside the
+		// current selection, working on distinct range blocks, defined by the
+		// DTD compatibility between the style element and the nodes inside the
+		// ranges.
+		//
+		// For example, suppose we have the following selection (where [ and ]
+		// are the boundaries), and we apply a <b> style there:
+		//
+		//		<p>Here we [have <b>some</b> text.<p>
+		//		<p>And some here] here.</p>
+		//
+		// Two different ranges will be detected:
+		//
+		//		"have <b>some</b> text."
+		//		"And some here"
+		//
+		// Both ranges will be extracted, moved to a <b> element, and
+		// re-inserted, resulting in the following output:
+		//
+		//		<p>Here we [<b>have some text.</b><p>
+		//		<p><b>And some here</b>] here.</p>
+		//
+		// Note that the <b> element at <b>some</b> is also removed because it
+		// is not needed anymore.
+
+		var elementName = this.Element ;
+
+		// Get the DTD definition for the element. Defaults to "span".
+		var elementDTD = FCK.DTD[ elementName ] || FCK.DTD.span ;
+
+		// Create the attribute list to be used later for element comparisons.
+		var styleAttribs = this._GetAttribsForComparison() ;
+		var styleNode ;
+
+		// Expand the range, if inside inline element boundaries.
+		range.Expand( 'inline_elements' ) ;
+
+		// Bookmark the range so we can re-select it after processing.
+		var bookmark = range.CreateBookmark( true ) ;
+
+		// The style will be applied within the bookmark boundaries.
+		var startNode	= range.GetBookmarkNode( bookmark, true ) ;
+		var endNode		= range.GetBookmarkNode( bookmark, false ) ;
+
+		// We'll be reusing the range to apply the styles. So, release it here
+		// to indicate that it has not been initialized.
+		range.Release( true ) ;
+
+		// Let's start the nodes lookup from the node right after the bookmark
+		// span.
+		var currentNode = FCKDomTools.GetNextSourceNode( startNode, true ) ;
+
+		while ( currentNode )
+		{
+			var applyStyle = false ;
+
+			var nodeType = currentNode.nodeType ;
+			var nodeName = nodeType == 1 ? currentNode.nodeName.toLowerCase() : null ;
+
+			// Check if the current node can be a child of the style element.
+			if ( !nodeName || elementDTD[ nodeName ] )
+			{
+				// Check if the style element can be a child of the current
+				// node parent or if the element is not defined in the DTD.
+				if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] || !FCK.DTD[ elementName ] )
+				{
+					// This node will be part of our range, so if it has not
+					// been started, place its start right before the node.
+					if ( !range.CheckHasRange() )
+						range.SetStart( currentNode, 3 ) ;
+
+					// Non element nodes, or empty elements can be added
+					// completely to the range.
+					if ( nodeType != 1 || currentNode.childNodes.length == 0 )
+					{
+						var includedNode = currentNode ;
+						var parentNode = includedNode.parentNode ;
+
+						// This node is about to be included completelly, but,
+						// if this is the last node in its parent, we must also
+						// check if the parent itself can be added completelly
+						// to the range.
+						while ( includedNode == parentNode.lastChild
+							&& elementDTD[ parentNode.nodeName.toLowerCase() ] )
+						{
+							includedNode = parentNode ;
+						}
+
+						range.SetEnd( includedNode, 4 ) ;
+
+						// If the included node is the last node in its parent
+						// and its parent can't be inside the style node, apply
+						// the style immediately.
+						if ( includedNode == includedNode.parentNode.lastChild && !elementDTD[ includedNode.parentNode.nodeName.toLowerCase() ] )
+							applyStyle = true ;
+					}
+					else
+					{
+						// Element nodes will not be added directly. We need to
+						// check their children because the selection could end
+						// inside the node, so let's place the range end right
+						// before the element.
+						range.SetEnd( currentNode, 3 ) ;
+					}
+				}
+				else
+					applyStyle = true ;
+			}
+			else
+				applyStyle = true ;
+
+			// Get the next node to be processed.
+			currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+
+			// If we have reached the end of the selection, just apply the
+			// style ot the range, and stop looping.
+			if ( currentNode == endNode )
+			{
+				currentNode = null ;
+				applyStyle = true ;
+			}
+
+			// Apply the style if we have something to which apply it.
+			if ( applyStyle && range.CheckHasRange() && !range.CheckIsCollapsed() )
+			{
+				// Build the style element, based on the style object definition.
+				styleNode = this.BuildElement( doc ) ;
+
+				// Move the contents of the range to the style element.
+				range.ExtractContents().AppendTo( styleNode ) ;
+
+				// If it is not empty.
+				if ( styleNode.innerHTML.RTrim().length > 0 )
+				{
+					// Insert it in the range position (it is collapsed after
+					// ExtractContents.
+					range.InsertNode( styleNode ) ;
+
+					// Here we do some cleanup, removing all duplicated
+					// elements from the style element.
+					this.RemoveFromElement( styleNode ) ;
+
+					// Let's merge our new style with its neighbors, if possible.
+					this._MergeSiblings( styleNode, this._GetAttribsForComparison() ) ;
+
+					// As the style system breaks text nodes constantly, let's normalize
+					// things for performance.
+					// With IE, some paragraphs get broken when calling normalize()
+					// repeatedly. Also, for IE, we must normalize body, not documentElement.
+					// IE is also known for having a "crash effect" with normalize().
+					// We should try to normalize with IE too in some way, somewhere.
+					if ( !FCKBrowserInfo.IsIE )
+						styleNode.normalize() ;
+				}
+
+				// Style applied, let's release the range, so it gets marked to
+				// re-initialization in the next loop.
+				range.Release( true ) ;
+			}
+		}
+
+		this._FixBookmarkStart( startNode ) ;
+
+		// Re-select the original range.
+		if ( selectIt )
+			range.SelectBookmark( bookmark ) ;
+
+		if ( updateRange )
+			range.MoveToBookmark( bookmark ) ;
+	},
+
+	_FixBookmarkStart : function( startNode )
+	{
+		// After appliying or removing an inline style, the start boundary of
+		// the selection must be placed inside all inline elements it is
+		// bordering.
+		var startSibling ;
+		while ( ( startSibling = startNode.nextSibling ) )	// Only one "=".
+		{
+			if ( startSibling.nodeType == 1
+				&& FCKListsLib.InlineNonEmptyElements[ startSibling.nodeName.toLowerCase() ] )
+			{
+				// If it is an empty inline element, we can safely remove it.
+				if ( !startSibling.firstChild )
+					FCKDomTools.RemoveNode( startSibling ) ;
+				else
+					FCKDomTools.MoveNode( startNode, startSibling, true ) ;
+				continue ;
+			}
+
+			// Empty text nodes can be safely removed to not disturb.
+			if ( startSibling.nodeType == 3 && startSibling.length == 0 )
+			{
+				FCKDomTools.RemoveNode( startSibling ) ;
+				continue ;
+			}
+
+			break ;
+		}
+	},
+
+	/**
+	 * Merge an element with its similar siblings.
+	 * "attribs" is and object computed with _CreateAttribsForComparison.
+	 */
+	_MergeSiblings : function( element, attribs )
+	{
+		if ( !element || element.nodeType != 1 || !FCKListsLib.InlineNonEmptyElements[ element.nodeName.toLowerCase() ] )
+			return ;
+
+		this._MergeNextSibling( element, attribs ) ;
+		this._MergePreviousSibling( element, attribs ) ;
+	},
+
+	/**
+	 * Merge an element with its similar siblings after it.
+	 * "attribs" is and object computed with _CreateAttribsForComparison.
+	 */
+	_MergeNextSibling : function( element, attribs )
+	{
+		// Check the next sibling.
+		var sibling = element.nextSibling ;
+
+		// Check if the next sibling is a bookmark element. In this case, jump it.
+		var hasBookmark = ( sibling && sibling.nodeType == 1 && sibling.getAttribute( '_fck_bookmark' ) ) ;
+		if ( hasBookmark )
+			sibling = sibling.nextSibling ;
+
+		if ( sibling && sibling.nodeType == 1 && sibling.nodeName == element.nodeName )
+		{
+			if ( !attribs )
+				attribs = this._CreateElementAttribsForComparison( element ) ;
+
+			if ( this._CheckAttributesMatch( sibling, attribs ) )
+			{
+				// Save the last child to be checked too (to merge things like <b><i></i></b><b><i></i></b>).
+				var innerSibling = element.lastChild ;
+
+				if ( hasBookmark )
+					FCKDomTools.MoveNode( element.nextSibling, element ) ;
+
+				// Move contents from the sibling.
+				FCKDomTools.MoveChildren( sibling, element ) ;
+				FCKDomTools.RemoveNode( sibling ) ;
+
+				// Now check the last inner child (see two comments above).
+				if ( innerSibling )
+					this._MergeNextSibling( innerSibling ) ;
+			}
+		}
+	},
+
+	/**
+	 * Merge an element with its similar siblings before it.
+	 * "attribs" is and object computed with _CreateAttribsForComparison.
+	 */
+	_MergePreviousSibling : function( element, attribs )
+	{
+		// Check the previous sibling.
+		var sibling = element.previousSibling ;
+
+		// Check if the previous sibling is a bookmark element. In this case, jump it.
+		var hasBookmark = ( sibling && sibling.nodeType == 1 && sibling.getAttribute( '_fck_bookmark' ) ) ;
+		if ( hasBookmark )
+			sibling = sibling.previousSibling ;
+
+		if ( sibling && sibling.nodeType == 1 && sibling.nodeName == element.nodeName )
+		{
+			if ( !attribs )
+				attribs = this._CreateElementAttribsForComparison( element ) ;
+
+			if ( this._CheckAttributesMatch( sibling, attribs ) )
+			{
+				// Save the first child to be checked too (to merge things like <b><i></i></b><b><i></i></b>).
+				var innerSibling = element.firstChild ;
+
+				if ( hasBookmark )
+					FCKDomTools.MoveNode( element.previousSibling, element, true ) ;
+
+				// Move contents to the sibling.
+				FCKDomTools.MoveChildren( sibling, element, true ) ;
+				FCKDomTools.RemoveNode( sibling ) ;
+
+				// Now check the first inner child (see two comments above).
+				if ( innerSibling )
+					this._MergePreviousSibling( innerSibling ) ;
+			}
+		}
+	},
+
+	/**
+	 * Build the cssText based on the styles definition.
+	 */
+	_GetStyleText : function()
+	{
+		var stylesDef = this._StyleDesc.Styles ;
+
+		// Builds the StyleText.
+		var stylesText = ( this._StyleDesc.Attributes ? this._StyleDesc.Attributes['style'] || '' : '' ) ;
+
+		if ( stylesText.length > 0 )
+			stylesText += ';' ;
+
+		for ( var style in stylesDef )
+			stylesText += style + ':' + stylesDef[style] + ';' ;
+
+		// Browsers make some changes to the style when applying them. So, here
+		// we normalize it to the browser format. We'll not do that if there
+		// are variables inside the style.
+		if ( stylesText.length > 0 && !( /#\(/.test( stylesText ) ) )
+		{
+			stylesText = FCKTools.NormalizeCssText( stylesText ) ;
+		}
+
+		return (this._GetStyleText = function() { return stylesText ; })() ;
+	},
+
+	/**
+	 * Get the the collection used to compare the attributes defined in this
+	 * style with attributes in an element. All information in it is lowercased.
+	 */
+	_GetAttribsForComparison : function()
+	{
+		// If we have already computed it, just return it.
+		var attribs = this._GetAttribsForComparison_$ ;
+		if ( attribs )
+			return attribs ;
+
+		attribs = new Object() ;
+
+		// Loop through all defined attributes.
+		var styleAttribs = this._StyleDesc.Attributes ;
+		if ( styleAttribs )
+		{
+			for ( var styleAtt in styleAttribs )
+			{
+				attribs[ styleAtt.toLowerCase() ] = styleAttribs[ styleAtt ].toLowerCase() ;
+			}
+		}
+
+		// Includes the style definitions.
+		if ( this._GetStyleText().length > 0 )
+		{
+			attribs['style'] = this._GetStyleText().toLowerCase() ;
+		}
+
+		// Appends the "length" information to the object.
+		FCKTools.AppendLengthProperty( attribs, '_length' ) ;
+
+		// Return it, saving it to the next request.
+		return ( this._GetAttribsForComparison_$ = attribs ) ;
+	},
+
+	/**
+	 * Get the the collection used to compare the elements and attributes,
+	 * defined in this style overrides, with other element. All information in
+	 * it is lowercased.
+	 */
+	_GetOverridesForComparison : function()
+	{
+		// If we have already computed it, just return it.
+		var overrides = this._GetOverridesForComparison_$ ;
+		if ( overrides )
+			return overrides ;
+
+		overrides = new Object() ;
+
+		var overridesDesc = this._StyleDesc.Overrides ;
+
+		if ( overridesDesc )
+		{
+			// The override description can be a string, object or array.
+			// Internally, well handle arrays only, so transform it if needed.
+			if ( !FCKTools.IsArray( overridesDesc ) )
+				overridesDesc = [ overridesDesc ] ;
+
+			// Loop through all override definitions.
+			for ( var i = 0 ; i < overridesDesc.length ; i++ )
+			{
+				var override = overridesDesc[i] ;
+				var elementName ;
+				var overrideEl ;
+				var attrs ;
+
+				// If can be a string with the element name.
+				if ( typeof override == 'string' )
+					elementName = override.toLowerCase() ;
+				// Or an object.
+				else
+				{
+					elementName = override.Element ? override.Element.toLowerCase() : this.Element ;
+					attrs = override.Attributes ;
+				}
+
+				// We can have more than one override definition for the same
+				// element name, so we attempt to simply append information to
+				// it if it already exists.
+				overrideEl = overrides[ elementName ] || ( overrides[ elementName ] = {} ) ;
+
+				if ( attrs )
+				{
+					// The returning attributes list is an array, because we
+					// could have different override definitions for the same
+					// attribute name.
+					var overrideAttrs = ( overrideEl.Attributes = overrideEl.Attributes || new Array() ) ;
+					for ( var attName in attrs )
+					{
+						// Each item in the attributes array is also an array,
+						// where [0] is the attribute name and [1] is the
+						// override value.
+						overrideAttrs.push( [ attName.toLowerCase(), attrs[ attName ] ] ) ;
+					}
+				}
+			}
+		}
+
+		return ( this._GetOverridesForComparison_$ = overrides ) ;
+	},
+
+	/*
+	 * Create and object containing all attributes specified in an element,
+	 * added by a "_length" property. All values are lowercased.
+	 */
+	_CreateElementAttribsForComparison : function( element )
+	{
+		var attribs = new Object() ;
+		var attribsCount = 0 ;
+
+		for ( var i = 0 ; i < element.attributes.length ; i++ )
+		{
+			var att = element.attributes[i] ;
+
+			if ( att.specified )
+			{
+				attribs[ att.nodeName.toLowerCase() ] = FCKDomTools.GetAttributeValue( element, att ).toLowerCase() ;
+				attribsCount++ ;
+			}
+		}
+
+		attribs._length = attribsCount ;
+
+		return attribs ;
+	},
+
+	/**
+	 * Checks is the element attributes have a perfect match with the style
+	 * attributes.
+	 */
+	_CheckAttributesMatch : function( element, styleAttribs )
+	{
+		// Loop through all specified attributes. The same number of
+		// attributes must be found and their values must match to
+		// declare them as equal.
+
+		var elementAttrbs = element.attributes ;
+		var matchCount = 0 ;
+
+		for ( var i = 0 ; i < elementAttrbs.length ; i++ )
+		{
+			var att = elementAttrbs[i] ;
+			if ( att.specified )
+			{
+				var attName = att.nodeName.toLowerCase() ;
+				var styleAtt = styleAttribs[ attName ] ;
+
+				// The attribute is not defined in the style.
+				if ( !styleAtt )
+					break ;
+
+				// The values are different.
+				if ( styleAtt != FCKDomTools.GetAttributeValue( element, att ).toLowerCase() )
+					break ;
+
+				matchCount++ ;
+			}
+		}
+
+		return ( matchCount == styleAttribs._length ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbar.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbar.js
new file mode 100644
index 000000000..129cef18b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbar.js
@@ -0,0 +1,103 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbar Class: represents a toolbar in the toolbarset. It is a group of
+ * toolbar items.
+ */
+
+var FCKToolbar = function()
+{
+	this.Items = new Array() ;
+}
+
+FCKToolbar.prototype.AddItem = function( item )
+{
+	return this.Items[ this.Items.length ] = item ;
+}
+
+FCKToolbar.prototype.AddButton = function( name, label, tooltip, iconPathOrStripInfoArrayOrIndex, style, state )
+{
+	if ( typeof( iconPathOrStripInfoArrayOrIndex ) == 'number' )
+		 iconPathOrStripInfoArrayOrIndex = [ this.DefaultIconsStrip, this.DefaultIconSize, iconPathOrStripInfoArrayOrIndex ] ;
+
+	var oButton = new FCKToolbarButtonUI( name, label, tooltip, iconPathOrStripInfoArrayOrIndex, style, state ) ;
+	oButton._FCKToolbar = this ;
+	oButton.OnClick = FCKToolbar_OnItemClick ;
+
+	return this.AddItem( oButton ) ;
+}
+
+function FCKToolbar_OnItemClick( item )
+{
+	var oToolbar = item._FCKToolbar ;
+
+	if ( oToolbar.OnItemClick )
+		oToolbar.OnItemClick( oToolbar, item ) ;
+}
+
+FCKToolbar.prototype.AddSeparator = function()
+{
+	this.AddItem( new FCKToolbarSeparator() ) ;
+}
+
+FCKToolbar.prototype.Create = function( parentElement )
+{
+	var oDoc = FCKTools.GetElementDocument( parentElement ) ;
+
+	var e = oDoc.createElement( 'table' ) ;
+	e.className = 'TB_Toolbar' ;
+	e.style.styleFloat = e.style.cssFloat = ( FCKLang.Dir == 'ltr' ? 'left' : 'right' ) ;
+	e.dir = FCKLang.Dir ;
+	e.cellPadding = 0 ;
+	e.cellSpacing = 0 ;
+
+	var targetRow = e.insertRow(-1) ;
+
+	// Insert the start cell.
+	var eCell ;
+
+	if ( !this.HideStart )
+	{
+		eCell = targetRow.insertCell(-1) ;
+		eCell.appendChild( oDoc.createElement( 'div' ) ).className = 'TB_Start' ;
+	}
+
+	for ( var i = 0 ; i < this.Items.length ; i++ )
+	{
+		this.Items[i].Create( targetRow.insertCell(-1) ) ;
+	}
+
+	// Insert the ending cell.
+	if ( !this.HideEnd )
+	{
+		eCell = targetRow.insertCell(-1) ;
+		eCell.appendChild( oDoc.createElement( 'div' ) ).className = 'TB_End' ;
+	}
+
+	parentElement.appendChild( e ) ;
+}
+
+var FCKToolbarSeparator = function()
+{}
+
+FCKToolbarSeparator.prototype.Create = function( parentElement )
+{
+	FCKTools.AppendElement( parentElement, 'div' ).className = 'TB_Separator' ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
new file mode 100644
index 000000000..f47f98f74
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
@@ -0,0 +1,36 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarBreak Class: breaks the toolbars.
+ * It makes it possible to force the toolbar to break to a new line.
+ * This is the Gecko specific implementation.
+ */
+
+var FCKToolbarBreak = function()
+{}
+
+FCKToolbarBreak.prototype.Create = function( targetElement )
+{
+	var oBreakDiv = targetElement.ownerDocument.createElement( 'div' ) ;
+
+	oBreakDiv.style.clear = oBreakDiv.style.cssFloat = FCKLang.Dir == 'rtl' ? 'right' : 'left' ;
+
+	targetElement.appendChild( oBreakDiv ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
new file mode 100644
index 000000000..c915fb718
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
@@ -0,0 +1,38 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarBreak Class: breaks the toolbars.
+ * It makes it possible to force the toolbar to break to a new line.
+ * This is the IE specific implementation.
+ */
+
+var FCKToolbarBreak = function()
+{}
+
+FCKToolbarBreak.prototype.Create = function( targetElement )
+{
+	var oBreakDiv = FCKTools.GetElementDocument( targetElement ).createElement( 'div' ) ;
+
+	oBreakDiv.className = 'TB_Break' ;
+
+	oBreakDiv.style.clear = FCKLang.Dir == 'rtl' ? 'left' : 'right' ;
+
+	targetElement.appendChild( oBreakDiv ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbutton.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbutton.js
new file mode 100644
index 000000000..1615f2334
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbutton.js
@@ -0,0 +1,81 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarButton Class: represents a button in the toolbar.
+ */
+
+var FCKToolbarButton = function( commandName, label, tooltip, style, sourceView, contextSensitive, icon )
+{
+	this.CommandName		= commandName ;
+	this.Label				= label ;
+	this.Tooltip			= tooltip ;
+	this.Style				= style ;
+	this.SourceView			= sourceView ? true : false ;
+	this.ContextSensitive	= contextSensitive ? true : false ;
+
+	if ( icon == null )
+		this.IconPath = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ;
+	else if ( typeof( icon ) == 'number' )
+		this.IconPath = [ FCKConfig.SkinPath + 'fck_strip.gif', 16, icon ] ;
+	else
+		this.IconPath = icon ;
+}
+
+FCKToolbarButton.prototype.Create = function( targetElement )
+{
+	this._UIButton = new FCKToolbarButtonUI( this.CommandName, this.Label, this.Tooltip, this.IconPath, this.Style ) ;
+	this._UIButton.OnClick = this.Click ;
+	this._UIButton._ToolbarButton = this ;
+	this._UIButton.Create( targetElement ) ;
+}
+
+FCKToolbarButton.prototype.RefreshState = function()
+{
+	var uiButton = this._UIButton ;
+
+	if ( !uiButton )
+		return ;
+
+	// Gets the actual state.
+	var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
+
+	// If there are no state changes than do nothing and return.
+	if ( eState == uiButton.State ) return ;
+
+	// Sets the actual state.
+	uiButton.ChangeState( eState ) ;
+}
+
+FCKToolbarButton.prototype.Click = function()
+{
+	var oToolbarButton = this._ToolbarButton || this ;
+	FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oToolbarButton.CommandName ).Execute() ;
+}
+
+FCKToolbarButton.prototype.Enable = function()
+{
+	this.RefreshState() ;
+}
+
+FCKToolbarButton.prototype.Disable = function()
+{
+	// Sets the actual state.
+	this._UIButton.ChangeState( FCK_TRISTATE_DISABLED ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
new file mode 100644
index 000000000..addee94e5
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
@@ -0,0 +1,198 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarButtonUI Class: interface representation of a toolbar button.
+ */
+
+var FCKToolbarButtonUI = function( name, label, tooltip, iconPathOrStripInfoArray, style, state )
+{
+	this.Name		= name ;
+	this.Label		= label || name ;
+	this.Tooltip	= tooltip || this.Label ;
+	this.Style		= style || FCK_TOOLBARITEM_ONLYICON ;
+	this.State		= state || FCK_TRISTATE_OFF ;
+
+	this.Icon = new FCKIcon( iconPathOrStripInfoArray ) ;
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( this, FCKToolbarButtonUI_Cleanup ) ;
+}
+
+
+FCKToolbarButtonUI.prototype._CreatePaddingElement = function( document )
+{
+	var oImg = document.createElement( 'IMG' ) ;
+	oImg.className = 'TB_Button_Padding' ;
+	oImg.src = FCK_SPACER_PATH ;
+	return oImg ;
+}
+
+FCKToolbarButtonUI.prototype.Create = function( parentElement )
+{
+	var oDoc = FCKTools.GetElementDocument( parentElement ) ;
+
+	// Create the Main Element.
+	var oMainElement = this.MainElement = oDoc.createElement( 'DIV' ) ;
+	oMainElement.title = this.Tooltip ;
+
+	// The following will prevent the button from catching the focus.
+	if ( FCKBrowserInfo.IsGecko )
+		 oMainElement.onmousedown	= FCKTools.CancelEvent ;
+
+	FCKTools.AddEventListenerEx( oMainElement, 'mouseover', FCKToolbarButtonUI_OnMouseOver, this ) ;
+	FCKTools.AddEventListenerEx( oMainElement, 'mouseout', FCKToolbarButtonUI_OnMouseOut, this ) ;
+	FCKTools.AddEventListenerEx( oMainElement, 'click', FCKToolbarButtonUI_OnClick, this ) ;
+
+	this.ChangeState( this.State, true ) ;
+
+	if ( this.Style == FCK_TOOLBARITEM_ONLYICON && !this.ShowArrow )
+	{
+		// <td><div class="TB_Button_On" title="Smiley">{Image}</div></td>
+
+		oMainElement.appendChild( this.Icon.CreateIconElement( oDoc ) ) ;
+	}
+	else
+	{
+		// <td><div class="TB_Button_On" title="Smiley"><table cellpadding="0" cellspacing="0"><tr><td>{Image}</td><td nowrap>Toolbar Button</td><td><img class="TB_Button_Padding"></td></tr></table></div></td>
+		// <td><div class="TB_Button_On" title="Smiley"><table cellpadding="0" cellspacing="0"><tr><td><img class="TB_Button_Padding"></td><td nowrap>Toolbar Button</td><td><img class="TB_Button_Padding"></td></tr></table></div></td>
+
+		var oTable = oMainElement.appendChild( oDoc.createElement( 'TABLE' ) ) ;
+		oTable.cellPadding = 0 ;
+		oTable.cellSpacing = 0 ;
+
+		var oRow = oTable.insertRow(-1) ;
+
+		// The Image cell (icon or padding).
+		var oCell = oRow.insertCell(-1) ;
+
+		if ( this.Style == FCK_TOOLBARITEM_ONLYICON || this.Style == FCK_TOOLBARITEM_ICONTEXT )
+			oCell.appendChild( this.Icon.CreateIconElement( oDoc ) ) ;
+		else
+			oCell.appendChild( this._CreatePaddingElement( oDoc ) ) ;
+
+		if ( this.Style == FCK_TOOLBARITEM_ONLYTEXT || this.Style == FCK_TOOLBARITEM_ICONTEXT )
+		{
+			// The Text cell.
+			oCell = oRow.insertCell(-1) ;
+			oCell.className = 'TB_Button_Text' ;
+			oCell.noWrap = true ;
+			oCell.appendChild( oDoc.createTextNode( this.Label ) ) ;
+		}
+
+		if ( this.ShowArrow )
+		{
+			if ( this.Style != FCK_TOOLBARITEM_ONLYICON )
+			{
+				// A padding cell.
+				oRow.insertCell(-1).appendChild( this._CreatePaddingElement( oDoc ) ) ;
+			}
+
+			oCell = oRow.insertCell(-1) ;
+			var eImg = oCell.appendChild( oDoc.createElement( 'IMG' ) ) ;
+			eImg.src	= FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ;
+			eImg.width	= 5 ;
+			eImg.height	= 3 ;
+		}
+
+		// The last padding cell.
+		oCell = oRow.insertCell(-1) ;
+		oCell.appendChild( this._CreatePaddingElement( oDoc ) ) ;
+	}
+
+	parentElement.appendChild( oMainElement ) ;
+}
+
+FCKToolbarButtonUI.prototype.ChangeState = function( newState, force )
+{
+	if ( !force && this.State == newState )
+		return ;
+
+	var e = this.MainElement ;
+
+	// In IE it can happen when the page is reloaded that MainElement is null, so exit here
+	if ( !e )
+		return ;
+
+	switch ( parseInt( newState, 10 ) )
+	{
+		case FCK_TRISTATE_OFF :
+			e.className		= 'TB_Button_Off' ;
+			break ;
+
+		case FCK_TRISTATE_ON :
+			e.className		= 'TB_Button_On' ;
+			break ;
+
+		case FCK_TRISTATE_DISABLED :
+			e.className		= 'TB_Button_Disabled' ;
+			break ;
+	}
+
+	this.State = newState ;
+}
+
+function FCKToolbarButtonUI_OnMouseOver( ev, button )
+{
+	if ( button.State == FCK_TRISTATE_OFF )
+		this.className = 'TB_Button_Off_Over' ;
+	else if ( button.State == FCK_TRISTATE_ON )
+		this.className = 'TB_Button_On_Over' ;
+}
+
+function FCKToolbarButtonUI_OnMouseOut( ev, button )
+{
+	if ( button.State == FCK_TRISTATE_OFF )
+		this.className = 'TB_Button_Off' ;
+	else if ( button.State == FCK_TRISTATE_ON )
+		this.className = 'TB_Button_On' ;
+}
+
+function FCKToolbarButtonUI_OnClick( ev, button )
+{
+	if ( button.OnClick && button.State != FCK_TRISTATE_DISABLED )
+		button.OnClick( button ) ;
+}
+
+function FCKToolbarButtonUI_Cleanup()
+{
+	// This one should not cause memory leak, but just for safety, let's clean
+	// it up.
+	this.MainElement = null ;
+}
+
+/*
+	Sample outputs:
+
+	This is the base structure. The variation is the image that is marked as {Image}:
+		<td><div class="TB_Button_On" title="Smiley">{Image}</div></td>
+		<td><div class="TB_Button_On" title="Smiley"><table cellpadding="0" cellspacing="0"><tr><td>{Image}</td><td nowrap>Toolbar Button</td><td><img class="TB_Button_Padding"></td></tr></table></div></td>
+		<td><div class="TB_Button_On" title="Smiley"><table cellpadding="0" cellspacing="0"><tr><td><img class="TB_Button_Padding"></td><td nowrap>Toolbar Button</td><td><img class="TB_Button_Padding"></td></tr></table></div></td>
+
+	These are samples of possible {Image} values:
+
+		Strip - IE version:
+			<div class="TB_Button_Image"><img src="strip.gif" style="top:-16px"></div>
+
+		Strip : Firefox, Safari and Opera version
+			<img class="TB_Button_Image" style="background-position: 0px -16px;background-image: url(strip.gif);">
+
+		No-Strip : Browser independent:
+			<img class="TB_Button_Image" src="smiley.gif">
+*/
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
new file mode 100644
index 000000000..a4f18911b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
@@ -0,0 +1,139 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarPanelButton Class: Handles the Fonts combo selector.
+ */
+
+var FCKToolbarFontFormatCombo = function( tooltip, style )
+{
+	if ( tooltip === false )
+		return ;
+
+	this.CommandName = 'FontFormat' ;
+	this.Label		= this.GetLabel() ;
+	this.Tooltip	= tooltip ? tooltip : this.Label ;
+	this.Style		= style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+	this.NormalLabel = 'Normal' ;
+
+	this.PanelWidth = 190 ;
+
+	this.DefaultLabel = FCKConfig.DefaultFontFormatLabel || '' ;
+}
+
+// Inherit from FCKToolbarSpecialCombo.
+FCKToolbarFontFormatCombo.prototype = new FCKToolbarStyleCombo( false ) ;
+
+FCKToolbarFontFormatCombo.prototype.GetLabel = function()
+{
+	return FCKLang.FontFormat ;
+}
+
+FCKToolbarFontFormatCombo.prototype.GetStyles = function()
+{
+	var styles = {} ;
+
+	// Get the format names from the language file.
+	var aNames = FCKLang['FontFormats'].split(';') ;
+	var oNames = {
+		p		: aNames[0],
+		pre		: aNames[1],
+		address	: aNames[2],
+		h1		: aNames[3],
+		h2		: aNames[4],
+		h3		: aNames[5],
+		h4		: aNames[6],
+		h5		: aNames[7],
+		h6		: aNames[8],
+		div		: aNames[9] || ( aNames[0] + ' (DIV)')
+	} ;
+
+	// Get the available formats from the configuration file.
+	var elements = FCKConfig.FontFormats.split(';') ;
+
+	for ( var i = 0 ; i < elements.length ; i++ )
+	{
+		var elementName = elements[ i ] ;
+		var style = FCKStyles.GetStyle( '_FCK_' + elementName ) ;
+		if ( style )
+		{
+			style.Label = oNames[ elementName ] ;
+			styles[ '_FCK_' + elementName ] = style ;
+		}
+		else
+			alert( "The FCKConfig.CoreStyles['" + elementName + "'] setting was not found. Please check the fckconfig.js file" ) ;
+	}
+
+	return styles ;
+}
+
+FCKToolbarFontFormatCombo.prototype.RefreshActiveItems = function( targetSpecialCombo )
+{
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
+
+	if ( startElement )
+	{
+		var path = new FCKElementPath( startElement ) ;
+		var blockElement = path.Block ;
+
+		if ( blockElement )
+		{
+			for ( var i in targetSpecialCombo.Items )
+			{
+				var item = targetSpecialCombo.Items[i] ;
+				var style = item.Style ;
+
+				if ( style.CheckElementRemovable( blockElement ) )
+				{
+					targetSpecialCombo.SetLabel( style.Label ) ;
+					return ;
+				}
+			}
+		}
+	}
+
+	targetSpecialCombo.SetLabel( this.DefaultLabel ) ;
+}
+
+FCKToolbarFontFormatCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecialCombo )
+{
+	// Clear the current selection.
+	targetSpecialCombo.DeselectAll() ;
+
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
+
+	if ( startElement )
+	{
+		var path = new FCKElementPath( startElement ) ;
+		var blockElement = path.Block ;
+
+		for ( var i in targetSpecialCombo.Items )
+		{
+			var item = targetSpecialCombo.Items[i] ;
+			var style = item.Style ;
+
+			if ( style.CheckElementRemovable( blockElement ) )
+			{
+				targetSpecialCombo.SelectItem( item ) ;
+				return ;
+			}
+		}
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
new file mode 100644
index 000000000..93655e6fb
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
@@ -0,0 +1,98 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarPanelButton Class: Handles the Fonts combo selector.
+ */
+
+var FCKToolbarFontsCombo = function( tooltip, style )
+{
+	this.CommandName	= 'FontName' ;
+	this.Label		= this.GetLabel() ;
+	this.Tooltip	= tooltip ? tooltip : this.Label ;
+	this.Style		= style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+	this.DefaultLabel = FCKConfig.DefaultFontLabel || '' ;
+}
+
+// Inherit from FCKToolbarSpecialCombo.
+FCKToolbarFontsCombo.prototype = new FCKToolbarFontFormatCombo( false ) ;
+
+FCKToolbarFontsCombo.prototype.GetLabel = function()
+{
+	return FCKLang.Font ;
+}
+
+FCKToolbarFontsCombo.prototype.GetStyles = function()
+{
+	var baseStyle = FCKStyles.GetStyle( '_FCK_FontFace' ) ;
+
+	if ( !baseStyle )
+	{
+		alert( "The FCKConfig.CoreStyles['Size'] setting was not found. Please check the fckconfig.js file" ) ;
+		return {} ;
+	}
+
+	var styles = {} ;
+
+	var fonts = FCKConfig.FontNames.split(';') ;
+
+	for ( var i = 0 ; i < fonts.length ; i++ )
+	{
+		var fontParts = fonts[i].split('/') ;
+		var font = fontParts[0] ;
+		var caption = fontParts[1] || font ;
+
+		var style = FCKTools.CloneObject( baseStyle ) ;
+
+		style.SetVariable( 'Font', font ) ;
+		style.Label = caption ;
+
+		styles[ caption ] = style ;
+	}
+
+	return styles ;
+}
+
+FCKToolbarFontsCombo.prototype.RefreshActiveItems = FCKToolbarStyleCombo.prototype.RefreshActiveItems ;
+
+FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecialCombo )
+{
+	// Clear the current selection.
+	targetSpecialCombo.DeselectAll() ;
+
+	var startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+
+	if ( startElement )
+	{
+		var path = new FCKElementPath( startElement ) ;
+
+		for ( var i in targetSpecialCombo.Items )
+		{
+			var item = targetSpecialCombo.Items[i] ;
+			var style = item.Style ;
+
+			if ( style.CheckActive( path ) )
+			{
+				targetSpecialCombo.SelectItem( item ) ;
+				return ;
+			}
+		}
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
new file mode 100644
index 000000000..fb7e23138
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
@@ -0,0 +1,76 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarPanelButton Class: Handles the Fonts combo selector.
+ */
+
+var FCKToolbarFontSizeCombo = function( tooltip, style )
+{
+	this.CommandName	= 'FontSize' ;
+	this.Label		= this.GetLabel() ;
+	this.Tooltip	= tooltip ? tooltip : this.Label ;
+	this.Style		= style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+	this.DefaultLabel = FCKConfig.DefaultFontSizeLabel || '' ;
+
+	this.FieldWidth = 70 ;
+}
+
+// Inherit from FCKToolbarSpecialCombo.
+FCKToolbarFontSizeCombo.prototype = new FCKToolbarFontFormatCombo( false ) ;
+
+FCKToolbarFontSizeCombo.prototype.GetLabel = function()
+{
+	return FCKLang.FontSize ;
+}
+
+FCKToolbarFontSizeCombo.prototype.GetStyles = function()
+{
+	var baseStyle = FCKStyles.GetStyle( '_FCK_Size' ) ;
+
+	if ( !baseStyle )
+	{
+		alert( "The FCKConfig.CoreStyles['FontFace'] setting was not found. Please check the fckconfig.js file" ) ;
+		return {} ;
+	}
+
+	var styles = {} ;
+
+	var fonts = FCKConfig.FontSizes.split(';') ;
+
+	for ( var i = 0 ; i < fonts.length ; i++ )
+	{
+		var fontParts = fonts[i].split('/') ;
+		var font = fontParts[0] ;
+		var caption = fontParts[1] || font ;
+
+		var style = FCKTools.CloneObject( baseStyle ) ;
+		style.SetVariable( 'Size', font ) ;
+		style.Label = caption ;
+
+		styles[ caption ] = style ;
+	}
+
+	return styles ;
+}
+
+FCKToolbarFontSizeCombo.prototype.RefreshActiveItems = FCKToolbarStyleCombo.prototype.RefreshActiveItems ;
+
+FCKToolbarFontSizeCombo.prototype.StyleCombo_OnBeforeClick = FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
new file mode 100644
index 000000000..0c087c752
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
@@ -0,0 +1,103 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarPanelButton Class: represents a special button in the toolbar
+ * that shows a panel when pressed.
+ */
+
+var FCKToolbarPanelButton = function( commandName, label, tooltip, style, icon )
+{
+	this.CommandName = commandName ;
+
+	var oIcon ;
+
+	if ( icon == null )
+		oIcon = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ;
+	else if ( typeof( icon ) == 'number' )
+		oIcon = [ FCKConfig.SkinPath + 'fck_strip.gif', 16, icon ] ;
+
+	var oUIButton = this._UIButton = new FCKToolbarButtonUI( commandName, label, tooltip, oIcon, style ) ;
+	oUIButton._FCKToolbarPanelButton = this ;
+	oUIButton.ShowArrow = true ;
+	oUIButton.OnClick = FCKToolbarPanelButton_OnButtonClick ;
+}
+
+FCKToolbarPanelButton.prototype.TypeName = 'FCKToolbarPanelButton' ;
+
+FCKToolbarPanelButton.prototype.Create = function( parentElement )
+{
+	parentElement.className += 'Menu' ;
+
+	this._UIButton.Create( parentElement ) ;
+
+	var oPanel = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName )._Panel ;
+	this.RegisterPanel( oPanel ) ;
+}
+
+FCKToolbarPanelButton.prototype.RegisterPanel = function( oPanel )
+{
+	if ( oPanel._FCKToolbarPanelButton )
+		return ;
+
+	oPanel._FCKToolbarPanelButton = this ;
+
+	var eLineDiv = oPanel.Document.body.appendChild( oPanel.Document.createElement( 'div' ) ) ;
+	eLineDiv.style.position = 'absolute' ;
+	eLineDiv.style.top = '0px' ;
+
+	var eLine = oPanel._FCKToolbarPanelButtonLineDiv = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ;
+	eLine.className = 'TB_ConnectionLine' ;
+	eLine.style.position = 'absolute' ;
+//	eLine.style.backgroundColor = 'Red' ;
+	eLine.src = FCK_SPACER_PATH ;
+
+	oPanel.OnHide = FCKToolbarPanelButton_OnPanelHide ;
+}
+
+/*
+	Events
+*/
+
+function FCKToolbarPanelButton_OnButtonClick( toolbarButton )
+{
+	var oButton = this._FCKToolbarPanelButton ;
+	var e = oButton._UIButton.MainElement ;
+
+	oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ;
+
+	// oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ;
+
+	var oCommand = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName ) ;
+	var oPanel = oCommand._Panel ;
+	oPanel._FCKToolbarPanelButtonLineDiv.style.width = ( e.offsetWidth - 2 ) + 'px' ;
+	oCommand.Execute( 0, e.offsetHeight - 1, e ) ; // -1 to be over the border
+}
+
+function FCKToolbarPanelButton_OnPanelHide()
+{
+	var oMenuButton = this._FCKToolbarPanelButton ;
+	oMenuButton._UIButton.ChangeState( FCK_TRISTATE_OFF ) ;
+}
+
+// The Panel Button works like a normal button so the refresh state functions
+// defined for the normal button can be reused here.
+FCKToolbarPanelButton.prototype.RefreshState	= FCKToolbarButton.prototype.RefreshState ;
+FCKToolbarPanelButton.prototype.Enable			= FCKToolbarButton.prototype.Enable ;
+FCKToolbarPanelButton.prototype.Disable			= FCKToolbarButton.prototype.Disable ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
new file mode 100644
index 000000000..add03416e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
@@ -0,0 +1,146 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarSpecialCombo Class: This is a "abstract" base class to be used
+ * by the special combo toolbar elements like font name, font size, paragraph format, etc...
+ *
+ * The following properties and methods must be implemented when inheriting from
+ * this class:
+ * 	- Property:	CommandName							[ The command name to be executed ]
+ * 	- Method:	GetLabel()							[ Returns the label ]
+ * 	-			CreateItems( targetSpecialCombo )	[ Add all items in the special combo ]
+ */
+
+var FCKToolbarSpecialCombo = function()
+{
+	this.SourceView			= false ;
+	this.ContextSensitive	= true ;
+	this.FieldWidth			= null ;
+	this.PanelWidth			= null ;
+	this.PanelMaxHeight		= null ;
+	//this._LastValue			= null ;
+}
+
+
+FCKToolbarSpecialCombo.prototype.DefaultLabel = '' ;
+
+function FCKToolbarSpecialCombo_OnSelect( itemId, item )
+{
+	FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).Execute( itemId, item ) ;
+}
+
+FCKToolbarSpecialCombo.prototype.Create = function( targetElement )
+{
+	this._Combo = new FCKSpecialCombo( this.GetLabel(), this.FieldWidth, this.PanelWidth, this.PanelMaxHeight, FCKBrowserInfo.IsIE ? window : FCKTools.GetElementWindow( targetElement ).parent ) ;
+
+	/*
+	this._Combo.FieldWidth		= this.FieldWidth		!= null ? this.FieldWidth		: 100 ;
+	this._Combo.PanelWidth		= this.PanelWidth		!= null ? this.PanelWidth		: 150 ;
+	this._Combo.PanelMaxHeight	= this.PanelMaxHeight	!= null ? this.PanelMaxHeight	: 150 ;
+	*/
+
+	//this._Combo.Command.Name = this.Command.Name;
+//	this._Combo.Label	= this.Label ;
+	this._Combo.Tooltip	= this.Tooltip ;
+	this._Combo.Style	= this.Style ;
+
+	this.CreateItems( this._Combo ) ;
+
+	this._Combo.Create( targetElement ) ;
+
+	this._Combo.CommandName = this.CommandName ;
+
+	this._Combo.OnSelect = FCKToolbarSpecialCombo_OnSelect ;
+}
+
+function FCKToolbarSpecialCombo_RefreshActiveItems( combo, value )
+{
+	combo.DeselectAll() ;
+	combo.SelectItem( value ) ;
+	combo.SetLabelById( value ) ;
+}
+
+FCKToolbarSpecialCombo.prototype.RefreshState = function()
+{
+	// Gets the actual state.
+	var eState ;
+
+//	if ( FCK.EditMode == FCK_EDITMODE_SOURCE && ! this.SourceView )
+//		eState = FCK_TRISTATE_DISABLED ;
+//	else
+//	{
+		var sValue = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
+
+//		FCKDebug.Output( 'RefreshState of Special Combo "' + this.TypeOf + '" - State: ' + sValue ) ;
+
+		if ( sValue != FCK_TRISTATE_DISABLED )
+		{
+			eState = FCK_TRISTATE_ON ;
+
+			if ( this.RefreshActiveItems )
+				this.RefreshActiveItems( this._Combo, sValue ) ;
+			else
+			{
+				if ( this._LastValue !== sValue)
+				{
+					this._LastValue = sValue ;
+
+					if ( !sValue || sValue.length == 0 )
+					{
+						this._Combo.DeselectAll() ;
+						this._Combo.SetLabel( this.DefaultLabel ) ;
+					}
+					else
+						FCKToolbarSpecialCombo_RefreshActiveItems( this._Combo, sValue ) ;
+				}
+			}
+		}
+		else
+			eState = FCK_TRISTATE_DISABLED ;
+//	}
+
+	// If there are no state changes then do nothing and return.
+	if ( eState == this.State ) return ;
+
+	if ( eState == FCK_TRISTATE_DISABLED )
+	{
+		this._Combo.DeselectAll() ;
+		this._Combo.SetLabel( '' ) ;
+	}
+
+	// Sets the actual state.
+	this.State = eState ;
+
+	// Updates the graphical state.
+	this._Combo.SetEnabled( eState != FCK_TRISTATE_DISABLED ) ;
+}
+
+FCKToolbarSpecialCombo.prototype.Enable = function()
+{
+	this.RefreshState() ;
+}
+
+FCKToolbarSpecialCombo.prototype.Disable = function()
+{
+	this.State = FCK_TRISTATE_DISABLED ;
+	this._Combo.DeselectAll() ;
+	this._Combo.SetLabel( '' ) ;
+	this._Combo.SetEnabled( false ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
new file mode 100644
index 000000000..e6686cb24
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
@@ -0,0 +1,200 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKToolbarPanelButton Class: Handles the Fonts combo selector.
+ */
+
+var FCKToolbarStyleCombo = function( tooltip, style )
+{
+	if ( tooltip === false )
+		return ;
+
+	this.CommandName = 'Style' ;
+	this.Label		= this.GetLabel() ;
+	this.Tooltip	= tooltip ? tooltip : this.Label ;
+	this.Style		= style ? style : FCK_TOOLBARITEM_ICONTEXT ;
+
+	this.DefaultLabel = FCKConfig.DefaultStyleLabel || '' ;
+}
+
+// Inherit from FCKToolbarSpecialCombo.
+FCKToolbarStyleCombo.prototype = new FCKToolbarSpecialCombo ;
+
+FCKToolbarStyleCombo.prototype.GetLabel = function()
+{
+	return FCKLang.Style ;
+}
+
+FCKToolbarStyleCombo.prototype.GetStyles = function()
+{
+	var styles = {} ;
+	var allStyles = FCK.ToolbarSet.CurrentInstance.Styles.GetStyles() ;
+
+	for ( var styleName in allStyles )
+	{
+		var style = allStyles[ styleName ] ;
+		if ( !style.IsCore )
+			styles[ styleName ] = style ;
+	}
+	return styles ;
+}
+
+FCKToolbarStyleCombo.prototype.CreateItems = function( targetSpecialCombo )
+{
+	var targetDoc = targetSpecialCombo._Panel.Document ;
+
+	// Add the Editor Area CSS to the panel so the style classes are previewed correctly.
+	FCKTools.AppendStyleSheet( targetDoc, FCKConfig.ToolbarComboPreviewCSS ) ;
+	FCKTools.AppendStyleString( targetDoc, FCKConfig.EditorAreaStyles ) ;
+	targetDoc.body.className += ' ForceBaseFont' ;
+
+	// Add ID and Class to the body.
+	FCKConfig.ApplyBodyAttributes( targetDoc.body ) ;
+
+	// Get the styles list.
+	var styles = this.GetStyles() ;
+
+	for ( var styleName in styles )
+	{
+		var style = styles[ styleName ] ;
+
+		// Object type styles have no preview.
+		var caption = style.GetType() == FCK_STYLE_OBJECT ?
+			styleName :
+			FCKToolbarStyleCombo_BuildPreview( style, style.Label || styleName ) ;
+
+		var item = targetSpecialCombo.AddItem( styleName, caption ) ;
+
+		item.Style = style ;
+	}
+
+	// We must prepare the list before showing it.
+	targetSpecialCombo.OnBeforeClick = this.StyleCombo_OnBeforeClick ;
+}
+
+FCKToolbarStyleCombo.prototype.RefreshActiveItems = function( targetSpecialCombo )
+{
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
+
+	if ( startElement )
+	{
+		var path = new FCKElementPath( startElement ) ;
+		var elements = path.Elements ;
+
+		for ( var e = 0 ; e < elements.length ; e++ )
+		{
+			for ( var i in targetSpecialCombo.Items )
+			{
+				var item = targetSpecialCombo.Items[i] ;
+				var style = item.Style ;
+
+				if ( style.CheckElementRemovable( elements[ e ], true ) )
+				{
+					targetSpecialCombo.SetLabel( style.Label || style.Name ) ;
+					return ;
+				}
+			}
+		}
+	}
+
+	targetSpecialCombo.SetLabel( this.DefaultLabel ) ;
+}
+
+FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecialCombo )
+{
+	// Two things are done here:
+	//	- In a control selection, get the element name, so we'll display styles
+	//	  for that element only.
+	//	- Select the styles that are active for the current selection.
+
+	// Clear the current selection.
+	targetSpecialCombo.DeselectAll() ;
+
+	var startElement ;
+	var path ;
+	var tagName ;
+
+	var selection = FCK.ToolbarSet.CurrentInstance.Selection ;
+
+	if ( selection.GetType() == 'Control' )
+	{
+		startElement = selection.GetSelectedElement() ;
+		tagName = startElement.nodeName.toLowerCase() ;
+	}
+	else
+	{
+		startElement = selection.GetBoundaryParentElement( true ) ;
+		path = new FCKElementPath( startElement ) ;
+	}
+
+	for ( var i in targetSpecialCombo.Items )
+	{
+		var item = targetSpecialCombo.Items[i] ;
+		var style = item.Style ;
+
+		if ( ( tagName && style.Element == tagName ) || ( !tagName && style.GetType() != FCK_STYLE_OBJECT ) )
+		{
+			item.style.display = '' ;
+
+			if ( ( path && style.CheckActive( path ) ) || ( !path && style.CheckElementRemovable( startElement, true ) ) )
+				targetSpecialCombo.SelectItem( style.Name ) ;
+		}
+		else
+			item.style.display = 'none' ;
+	}
+}
+
+function FCKToolbarStyleCombo_BuildPreview( style, caption )
+{
+	var styleType = style.GetType() ;
+	var html = [] ;
+
+	if ( styleType == FCK_STYLE_BLOCK )
+		html.push( '<div class="BaseFont">' ) ;
+
+	var elementName = style.Element ;
+
+	// Avoid <bdo> in the preview.
+	if ( elementName == 'bdo' )
+		elementName = 'span' ;
+
+	html = [ '<', elementName ] ;
+
+	// Assign all defined attributes.
+	var attribs	= style._StyleDesc.Attributes ;
+	if ( attribs )
+	{
+		for ( var att in attribs )
+		{
+			html.push( ' ', att, '="', style.GetFinalAttributeValue( att ), '"' ) ;
+		}
+	}
+
+	// Assign the style attribute.
+	if ( style._GetStyleText().length > 0 )
+		html.push( ' style="', style.GetFinalStyleValue(), '"' ) ;
+
+	html.push( '>', caption, '</', elementName, '>' ) ;
+
+	if ( styleType == FCK_STYLE_BLOCK )
+		html.push( '</div>' ) ;
+
+	return html.join( '' ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckw3crange.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckw3crange.js
new file mode 100644
index 000000000..369d04485
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckw3crange.js
@@ -0,0 +1,451 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This class partially implements the W3C DOM Range for browser that don't
+ * support the standards (like IE):
+ * http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html
+ */
+
+var FCKW3CRange = function( parentDocument )
+{
+	this._Document = parentDocument ;
+
+	this.startContainer	= null ;
+	this.startOffset	= null ;
+	this.endContainer	= null ;
+	this.endOffset		= null ;
+	this.collapsed		= true ;
+}
+
+FCKW3CRange.CreateRange = function( parentDocument )
+{
+	// We could opt to use the Range implementation of the browsers. The problem
+	// is that every browser have different bugs on their implementations,
+	// mostly related to different interpretations of the W3C specifications.
+	// So, for now, let's use our implementation and pray for browsers fixings
+	// soon. Otherwise will go crazy on trying to find out workarounds.
+	/*
+	// Get the browser implementation of the range, if available.
+	if ( parentDocument.createRange )
+	{
+		var range = parentDocument.createRange() ;
+		if ( typeof( range.startContainer ) != 'undefined' )
+			return range ;
+	}
+	*/
+	return new FCKW3CRange( parentDocument ) ;
+}
+
+FCKW3CRange.CreateFromRange = function( parentDocument, sourceRange )
+{
+	var range = FCKW3CRange.CreateRange( parentDocument ) ;
+	range.setStart( sourceRange.startContainer, sourceRange.startOffset ) ;
+	range.setEnd( sourceRange.endContainer, sourceRange.endOffset ) ;
+	return range ;
+}
+
+FCKW3CRange.prototype =
+{
+
+	_UpdateCollapsed : function()
+	{
+      this.collapsed = ( this.startContainer == this.endContainer && this.startOffset == this.endOffset ) ;
+	},
+
+	// W3C requires a check for the new position. If it is after the end
+	// boundary, the range should be collapsed to the new start. It seams we
+	// will not need this check for our use of this class so we can ignore it for now.
+	setStart : function( refNode, offset )
+	{
+		this.startContainer	= refNode ;
+		this.startOffset	= offset ;
+
+		if ( !this.endContainer )
+		{
+			this.endContainer	= refNode ;
+			this.endOffset		= offset ;
+		}
+
+		this._UpdateCollapsed() ;
+	},
+
+	// W3C requires a check for the new position. If it is before the start
+	// boundary, the range should be collapsed to the new end. It seams we
+	// will not need this check for our use of this class so we can ignore it for now.
+	setEnd : function( refNode, offset )
+	{
+		this.endContainer	= refNode ;
+		this.endOffset		= offset ;
+
+		if ( !this.startContainer )
+		{
+			this.startContainer	= refNode ;
+			this.startOffset	= offset ;
+		}
+
+		this._UpdateCollapsed() ;
+	},
+
+	setStartAfter : function( refNode )
+	{
+		this.setStart( refNode.parentNode, FCKDomTools.GetIndexOf( refNode ) + 1 ) ;
+	},
+
+	setStartBefore : function( refNode )
+	{
+		this.setStart( refNode.parentNode, FCKDomTools.GetIndexOf( refNode ) ) ;
+	},
+
+	setEndAfter : function( refNode )
+	{
+		this.setEnd( refNode.parentNode, FCKDomTools.GetIndexOf( refNode ) + 1 ) ;
+	},
+
+	setEndBefore : function( refNode )
+	{
+		this.setEnd( refNode.parentNode, FCKDomTools.GetIndexOf( refNode ) ) ;
+	},
+
+	collapse : function( toStart )
+	{
+		if ( toStart )
+		{
+			this.endContainer	= this.startContainer ;
+			this.endOffset		= this.startOffset ;
+		}
+		else
+		{
+			this.startContainer	= this.endContainer ;
+			this.startOffset	= this.endOffset ;
+		}
+
+		this.collapsed = true ;
+	},
+
+	selectNodeContents : function( refNode )
+	{
+		this.setStart( refNode, 0 ) ;
+		this.setEnd( refNode, refNode.nodeType == 3 ? refNode.data.length : refNode.childNodes.length ) ;
+	},
+
+	insertNode : function( newNode )
+	{
+		var startContainer = this.startContainer ;
+		var startOffset = this.startOffset ;
+
+		// If we are in a text node.
+		if ( startContainer.nodeType == 3 )
+		{
+			startContainer.splitText( startOffset ) ;
+
+			// Check if it is necessary to update the end boundary.
+			if ( startContainer == this.endContainer )
+				this.setEnd( startContainer.nextSibling, this.endOffset - this.startOffset ) ;
+
+			// Insert the new node it after the text node.
+			FCKDomTools.InsertAfterNode( startContainer, newNode ) ;
+
+			return ;
+		}
+		else
+		{
+			// Simply insert the new node before the current start node.
+			startContainer.insertBefore( newNode, startContainer.childNodes[ startOffset ] || null ) ;
+
+			// Check if it is necessary to update the end boundary.
+			if ( startContainer == this.endContainer )
+			{
+				this.endOffset++ ;
+				this.collapsed = false ;
+			}
+		}
+	},
+
+	deleteContents : function()
+	{
+		if ( this.collapsed )
+			return ;
+
+		this._ExecContentsAction( 0 ) ;
+	},
+
+	extractContents : function()
+	{
+		var docFrag = new FCKDocumentFragment( this._Document ) ;
+
+		if ( !this.collapsed )
+			this._ExecContentsAction( 1, docFrag ) ;
+
+		return docFrag ;
+	},
+
+	// The selection may be lost when cloning (due to the splitText() call).
+	cloneContents : function()
+	{
+		var docFrag = new FCKDocumentFragment( this._Document ) ;
+
+		if ( !this.collapsed )
+			this._ExecContentsAction( 2, docFrag ) ;
+
+		return docFrag ;
+	},
+
+	_ExecContentsAction : function( action, docFrag )
+	{
+		var startNode	= this.startContainer ;
+		var endNode		= this.endContainer ;
+
+		var startOffset	= this.startOffset ;
+		var endOffset	= this.endOffset ;
+
+		var removeStartNode	= false ;
+		var removeEndNode	= false ;
+
+		// Check the start and end nodes and make the necessary removals or changes.
+
+		// Start from the end, otherwise DOM mutations (splitText) made in the
+		// start boundary may interfere on the results here.
+
+		// For text containers, we must simply split the node and point to the
+		// second part. The removal will be handled by the rest of the code .
+		if ( endNode.nodeType == 3 )
+			endNode = endNode.splitText( endOffset ) ;
+		else
+		{
+			// If the end container has children and the offset is pointing
+			// to a child, then we should start from it.
+			if ( endNode.childNodes.length > 0 )
+			{
+				// If the offset points after the last node.
+				if ( endOffset > endNode.childNodes.length - 1 )
+				{
+					// Let's create a temporary node and mark it for removal.
+					endNode = FCKDomTools.InsertAfterNode( endNode.lastChild, this._Document.createTextNode('') ) ;
+					removeEndNode = true ;
+				}
+				else
+					endNode = endNode.childNodes[ endOffset ] ;
+			}
+		}
+
+		// For text containers, we must simply split the node. The removal will
+		// be handled by the rest of the code .
+		if ( startNode.nodeType == 3 )
+		{
+			startNode.splitText( startOffset ) ;
+
+			// In cases the end node is the same as the start node, the above
+			// splitting will also split the end, so me must move the end to
+			// the second part of the split.
+			if ( startNode == endNode )
+				endNode = startNode.nextSibling ;
+		}
+		else
+		{
+			// If the start container has children and the offset is pointing
+			// to a child, then we should start from its previous sibling.
+
+			// If the offset points to the first node, we don't have a
+			// sibling, so let's use the first one, but mark it for removal.
+			if ( startOffset == 0 )
+			{
+				// Let's create a temporary node and mark it for removal.
+				startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
+				removeStartNode = true ;
+			}
+			else if ( startOffset > startNode.childNodes.length - 1 )
+			{
+				// Let's create a temporary node and mark it for removal.
+				startNode = startNode.appendChild( this._Document.createTextNode('') ) ;
+				removeStartNode = true ;
+			}
+			else
+				startNode = startNode.childNodes[ startOffset ].previousSibling ;
+		}
+
+		// Get the parent nodes tree for the start and end boundaries.
+		var startParents	= FCKDomTools.GetParents( startNode ) ;
+		var endParents		= FCKDomTools.GetParents( endNode ) ;
+
+		// Compare them, to find the top most siblings.
+		var i, topStart, topEnd ;
+
+		for ( i = 0 ; i < startParents.length ; i++ )
+		{
+			topStart	= startParents[i] ;
+			topEnd		= endParents[i] ;
+
+			// The compared nodes will match until we find the top most
+			// siblings (different nodes that have the same parent).
+			// "i" will hold the index in the parents array for the top
+			// most element.
+			if ( topStart != topEnd )
+				break ;
+		}
+
+		var clone, levelStartNode, levelClone, currentNode, currentSibling ;
+
+		if ( docFrag )
+			clone = docFrag.RootNode ;
+
+		// Remove all successive sibling nodes for every node in the
+		// startParents tree.
+		for ( var j = i ; j < startParents.length ; j++ )
+		{
+			levelStartNode = startParents[j] ;
+
+			// For Extract and Clone, we must clone this level.
+			if ( clone && levelStartNode != startNode )		// action = 0 = Delete
+				levelClone = clone.appendChild( levelStartNode.cloneNode( levelStartNode == startNode ) ) ;
+
+			currentNode = levelStartNode.nextSibling ;
+
+			while( currentNode )
+			{
+				// Stop processing when the current node matches a node in the
+				// endParents tree or if it is the endNode.
+				if ( currentNode == endParents[j] || currentNode == endNode )
+					break ;
+
+				// Cache the next sibling.
+				currentSibling = currentNode.nextSibling ;
+
+				// If cloning, just clone it.
+				if ( action == 2 )	// 2 = Clone
+					clone.appendChild( currentNode.cloneNode( true ) ) ;
+				else
+				{
+					// Both Delete and Extract will remove the node.
+					currentNode.parentNode.removeChild( currentNode ) ;
+
+					// When Extracting, move the removed node to the docFrag.
+					if ( action == 1 )	// 1 = Extract
+						clone.appendChild( currentNode ) ;
+				}
+
+				currentNode = currentSibling ;
+			}
+
+			if ( clone )
+				clone = levelClone ;
+		}
+
+		if ( docFrag )
+			clone = docFrag.RootNode ;
+
+		// Remove all previous sibling nodes for every node in the
+		// endParents tree.
+		for ( var k = i ; k < endParents.length ; k++ )
+		{
+			levelStartNode = endParents[k] ;
+
+			// For Extract and Clone, we must clone this level.
+			if ( action > 0 && levelStartNode != endNode )		// action = 0 = Delete
+				levelClone = clone.appendChild( levelStartNode.cloneNode( levelStartNode == endNode ) ) ;
+
+			// The processing of siblings may have already been done by the parent.
+			if ( !startParents[k] || levelStartNode.parentNode != startParents[k].parentNode )
+			{
+				currentNode = levelStartNode.previousSibling ;
+
+				while( currentNode )
+				{
+					// Stop processing when the current node matches a node in the
+					// startParents tree or if it is the startNode.
+					if ( currentNode == startParents[k] || currentNode == startNode )
+						break ;
+
+					// Cache the next sibling.
+					currentSibling = currentNode.previousSibling ;
+
+					// If cloning, just clone it.
+					if ( action == 2 )	// 2 = Clone
+						clone.insertBefore( currentNode.cloneNode( true ), clone.firstChild ) ;
+					else
+					{
+						// Both Delete and Extract will remove the node.
+						currentNode.parentNode.removeChild( currentNode ) ;
+
+						// When Extracting, mode the removed node to the docFrag.
+						if ( action == 1 )	// 1 = Extract
+							clone.insertBefore( currentNode, clone.firstChild ) ;
+					}
+
+					currentNode = currentSibling ;
+				}
+			}
+
+			if ( clone )
+				clone = levelClone ;
+		}
+
+		if ( action == 2 )		// 2 = Clone.
+		{
+			// No changes in the DOM should be done, so fix the split text (if any).
+
+			var startTextNode = this.startContainer ;
+			if ( startTextNode.nodeType == 3 )
+			{
+				startTextNode.data += startTextNode.nextSibling.data ;
+				startTextNode.parentNode.removeChild( startTextNode.nextSibling ) ;
+			}
+
+			var endTextNode = this.endContainer ;
+			if ( endTextNode.nodeType == 3 && endTextNode.nextSibling )
+			{
+				endTextNode.data += endTextNode.nextSibling.data ;
+				endTextNode.parentNode.removeChild( endTextNode.nextSibling ) ;
+			}
+		}
+		else
+		{
+			// Collapse the range.
+
+			// If a node has been partially selected, collapse the range between
+			// topStart and topEnd. Otherwise, simply collapse it to the start. (W3C specs).
+			if ( topStart && topEnd && ( startNode.parentNode != topStart.parentNode || endNode.parentNode != topEnd.parentNode ) )
+			{
+				var endIndex = FCKDomTools.GetIndexOf( topEnd ) ;
+
+				// If the start node is to be removed, we must correct the
+				// index to reflect the removal.
+				if ( removeStartNode && topEnd.parentNode == startNode.parentNode )
+					endIndex-- ;
+
+				this.setStart( topEnd.parentNode, endIndex ) ;
+			}
+
+			// Collapse it to the start.
+			this.collapse( true ) ;
+		}
+
+		// Cleanup any marked node.
+		if( removeStartNode )
+			startNode.parentNode.removeChild( startNode ) ;
+
+		if( removeEndNode && endNode.parentNode )
+			endNode.parentNode.removeChild( endNode ) ;
+	},
+
+	cloneRange : function()
+	{
+		return FCKW3CRange.CreateFromRange( this._Document, this ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckxml.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml.js
new file mode 100644
index 000000000..a76e973ec
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml.js
@@ -0,0 +1,108 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKXml Class: class to load and manipulate XML files.
+ * (IE specific implementation)
+ */
+
+var FCKXml = function()
+{
+	this.Error = false ;
+}
+
+FCKXml.GetAttribute = function( node, attName, defaultValue )
+{
+	var attNode = node.attributes.getNamedItem( attName ) ;
+	return attNode ? attNode.value : defaultValue ;
+}
+
+/**
+ * Transforms a XML element node in a JavaScript object. Attributes defined for
+ * the element will be available as properties, as long as child  element
+ * nodes, but the later will generate arrays with property names prefixed with "$".
+ *
+ * For example, the following XML element:
+ *
+ *		<SomeNode name="Test" key="2">
+ *			<MyChild id="10">
+ *				<OtherLevel name="Level 3" />
+ *			</MyChild>
+ *			<MyChild id="25" />
+ *			<AnotherChild price="499" />
+ *		</SomeNode>
+ *
+ * ... results in the following object:
+ *
+ *		{
+ *			name : "Test",
+ *			key : "2",
+ *			$MyChild :
+ *			[
+ *				{
+ *					id : "10",
+ *					$OtherLevel :
+ *					{
+ *						name : "Level 3"
+ *					}
+ *				},
+ *				{
+ *					id : "25"
+ *				}
+ *			],
+ *			$AnotherChild :
+ *			[
+ *				{
+ *					price : "499"
+ *				}
+ *			]
+ *		}
+ */
+FCKXml.TransformToObject = function( element )
+{
+	if ( !element )
+		return null ;
+
+	var obj = {} ;
+
+	var attributes = element.attributes ;
+	for ( var i = 0 ; i < attributes.length ; i++ )
+	{
+		var att = attributes[i] ;
+		obj[ att.name ] = att.value ;
+	}
+
+	var childNodes = element.childNodes ;
+	for ( i = 0 ; i < childNodes.length ; i++ )
+	{
+		var child = childNodes[i] ;
+
+		if ( child.nodeType == 1 )
+		{
+			var childName = '$' + child.nodeName ;
+			var childList = obj[ childName ] ;
+			if ( !childList )
+				childList = obj[ childName ] = [] ;
+
+			childList.push( this.TransformToObject( child ) ) ;
+		}
+	}
+
+	return obj ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_gecko.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_gecko.js
new file mode 100644
index 000000000..fc27de1fe
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_gecko.js
@@ -0,0 +1,106 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKXml Class: class to load and manipulate XML files.
+ */
+
+FCKXml.prototype =
+{
+	LoadUrl : function( urlToCall )
+	{
+		this.Error = false ;
+
+		var oXml ;
+		var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ;
+		oXmlHttp.open( 'GET', urlToCall, false ) ;
+		oXmlHttp.send( null ) ;
+
+		if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) )
+		{
+			oXml = oXmlHttp.responseXML ;
+			// #1426: Fallback if responseXML isn't set for some
+			// reason (e.g. improperly configured web server)
+			if ( !oXml )
+				oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+		}
+		else
+			oXml = null ;
+
+		if ( oXml )
+		{
+			// Try to access something on it.
+			try
+			{
+				var test = oXml.firstChild ;
+			}
+			catch (e)
+			{
+				// If document.domain has been changed (#123), we'll have a security
+				// error at this point. The workaround here is parsing the responseText:
+				// http://alexander.kirk.at/2006/07/27/firefox-15-xmlhttprequest-reqresponsexml-and-documentdomain/
+				oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+			}
+		}
+
+		if ( !oXml || !oXml.firstChild )
+		{
+			this.Error = true ;
+			if ( window.confirm( 'Error loading "' + urlToCall + '" (HTTP Status: ' + oXmlHttp.status + ').\r\nDo you want to see the server response dump?' ) )
+				alert( oXmlHttp.responseText ) ;
+		}
+
+		this.DOMDocument = oXml ;
+	},
+
+	SelectNodes : function( xpath, contextNode )
+	{
+		if ( this.Error )
+			return new Array() ;
+
+		var aNodeArray = new Array();
+
+		var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument,
+				this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ;
+		if ( xPathResult )
+		{
+			var oNode = xPathResult.iterateNext() ;
+			while( oNode )
+			{
+				aNodeArray[aNodeArray.length] = oNode ;
+				oNode = xPathResult.iterateNext();
+			}
+		}
+		return aNodeArray ;
+	},
+
+	SelectSingleNode : function( xpath, contextNode )
+	{
+		if ( this.Error )
+			return null ;
+
+		var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument,
+				this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), 9, null);
+
+		if ( xPathResult && xPathResult.singleNodeValue )
+			return xPathResult.singleNodeValue ;
+		else
+			return null ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_ie.js b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_ie.js
new file mode 100644
index 000000000..4d87105fc
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/classes/fckxml_ie.js
@@ -0,0 +1,93 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKXml Class: class to load and manipulate XML files.
+ * (IE specific implementation)
+ */
+
+FCKXml.prototype =
+{
+	LoadUrl : function( urlToCall )
+	{
+		this.Error = false ;
+
+		var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ;
+
+		if ( !oXmlHttp )
+		{
+			this.Error = true ;
+			return ;
+		}
+
+		oXmlHttp.open( "GET", urlToCall, false ) ;
+
+		oXmlHttp.send( null ) ;
+
+		if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) )
+		{
+			this.DOMDocument = oXmlHttp.responseXML ;
+
+			// #1426: Fallback if responseXML isn't set for some
+			// reason (e.g. improperly configured web server)
+			if ( !this.DOMDocument || this.DOMDocument.firstChild == null )
+			{
+				this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ;
+				this.DOMDocument.async = false ;
+				this.DOMDocument.resolveExternals = false ;
+				this.DOMDocument.loadXML( oXmlHttp.responseText ) ;
+			}
+		}
+		else
+		{
+			this.DOMDocument = null ;
+		}
+
+		if ( this.DOMDocument == null || this.DOMDocument.firstChild == null )
+		{
+			this.Error = true ;
+			if (window.confirm( 'Error loading "' + urlToCall + '"\r\nDo you want to see more info?' ) )
+				alert( 'URL requested: "' + urlToCall + '"\r\n' +
+							'Server response:\r\nStatus: ' + oXmlHttp.status + '\r\n' +
+							'Response text:\r\n' + oXmlHttp.responseText ) ;
+		}
+	},
+
+	SelectNodes : function( xpath, contextNode )
+	{
+		if ( this.Error )
+			return new Array() ;
+
+		if ( contextNode )
+			return contextNode.selectNodes( xpath ) ;
+		else
+			return this.DOMDocument.selectNodes( xpath ) ;
+	},
+
+	SelectSingleNode : function( xpath, contextNode )
+	{
+		if ( this.Error )
+			return null ;
+
+		if ( contextNode )
+			return contextNode.selectSingleNode( xpath ) ;
+		else
+			return this.DOMDocument.selectSingleNode( xpath ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fck_othercommands.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fck_othercommands.js
new file mode 100644
index 000000000..77086b810
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fck_othercommands.js
@@ -0,0 +1,634 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Definition of other commands that are not available internaly in the
+ * browser (see FCKNamedCommand).
+ */
+
+// ### General Dialog Box Commands.
+var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam, customValue )
+{
+	this.Name	= name ;
+	this.Title	= title ;
+	this.Url	= url ;
+	this.Width	= width ;
+	this.Height	= height ;
+	this.CustomValue = customValue ;
+
+	this.GetStateFunction	= getStateFunction ;
+	this.GetStateParam		= getStateParam ;
+
+	this.Resizable = false ;
+}
+
+FCKDialogCommand.prototype.Execute = function()
+{
+	FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ;
+}
+
+FCKDialogCommand.prototype.GetState = function()
+{
+	if ( this.GetStateFunction )
+		return this.GetStateFunction( this.GetStateParam ) ;
+	else
+		return FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+}
+
+// Generic Undefined command (usually used when a command is under development).
+var FCKUndefinedCommand = function()
+{
+	this.Name = 'Undefined' ;
+}
+
+FCKUndefinedCommand.prototype.Execute = function()
+{
+	alert( FCKLang.NotImplemented ) ;
+}
+
+FCKUndefinedCommand.prototype.GetState = function()
+{
+	return FCK_TRISTATE_OFF ;
+}
+
+
+// ### FormatBlock
+var FCKFormatBlockCommand = function()
+{}
+
+FCKFormatBlockCommand.prototype =
+{
+	Name : 'FormatBlock',
+
+	Execute : FCKStyleCommand.prototype.Execute,
+
+	GetState : function()
+	{
+		return FCK.EditorDocument ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+	}
+};
+
+// ### FontName
+
+var FCKFontNameCommand = function()
+{}
+
+FCKFontNameCommand.prototype =
+{
+	Name		: 'FontName',
+	Execute		: FCKStyleCommand.prototype.Execute,
+	GetState	: FCKFormatBlockCommand.prototype.GetState
+};
+
+// ### FontSize
+var FCKFontSizeCommand = function()
+{}
+
+FCKFontSizeCommand.prototype =
+{
+	Name		: 'FontSize',
+	Execute		: FCKStyleCommand.prototype.Execute,
+	GetState	: FCKFormatBlockCommand.prototype.GetState
+};
+
+// ### Preview
+var FCKPreviewCommand = function()
+{
+	this.Name = 'Preview' ;
+}
+
+FCKPreviewCommand.prototype.Execute = function()
+{
+     FCK.Preview() ;
+}
+
+FCKPreviewCommand.prototype.GetState = function()
+{
+	return FCK_TRISTATE_OFF ;
+}
+
+// ### Save
+var FCKSaveCommand = function()
+{
+	this.Name = 'Save' ;
+}
+
+FCKSaveCommand.prototype.Execute = function()
+{
+	// Get the linked field form.
+	var oForm = FCK.GetParentForm() ;
+
+	if ( typeof( oForm.onsubmit ) == 'function' )
+	{
+		var bRet = oForm.onsubmit() ;
+		if ( bRet != null && bRet === false )
+			return ;
+	}
+
+	// Submit the form.
+	// If there's a button named "submit" then the form.submit() function is masked and
+	// can't be called in Mozilla, so we call the click() method of that button.
+	if ( typeof( oForm.submit ) == 'function' )
+		oForm.submit() ;
+	else
+		oForm.submit.click() ;
+}
+
+FCKSaveCommand.prototype.GetState = function()
+{
+	return FCK_TRISTATE_OFF ;
+}
+
+// ### NewPage
+var FCKNewPageCommand = function()
+{
+	this.Name = 'NewPage' ;
+}
+
+FCKNewPageCommand.prototype.Execute = function()
+{
+	FCKUndo.SaveUndoStep() ;
+	FCK.SetData( '' ) ;
+	FCKUndo.Typing = true ;
+	FCK.Focus() ;
+}
+
+FCKNewPageCommand.prototype.GetState = function()
+{
+	return FCK_TRISTATE_OFF ;
+}
+
+// ### Source button
+var FCKSourceCommand = function()
+{
+	this.Name = 'Source' ;
+}
+
+FCKSourceCommand.prototype.Execute = function()
+{
+	if ( FCKConfig.SourcePopup )	// Until v2.2, it was mandatory for FCKBrowserInfo.IsGecko.
+	{
+		var iWidth	= FCKConfig.ScreenWidth * 0.65 ;
+		var iHeight	= FCKConfig.ScreenHeight * 0.65 ;
+		FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, null, true ) ;
+	}
+	else
+	    FCK.SwitchEditMode() ;
+}
+
+FCKSourceCommand.prototype.GetState = function()
+{
+	return ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_ON ) ;
+}
+
+// ### Undo
+var FCKUndoCommand = function()
+{
+	this.Name = 'Undo' ;
+}
+
+FCKUndoCommand.prototype.Execute = function()
+{
+	FCKUndo.Undo() ;
+}
+
+FCKUndoCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return ( FCKUndo.CheckUndoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
+}
+
+// ### Redo
+var FCKRedoCommand = function()
+{
+	this.Name = 'Redo' ;
+}
+
+FCKRedoCommand.prototype.Execute = function()
+{
+	FCKUndo.Redo() ;
+}
+
+FCKRedoCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return ( FCKUndo.CheckRedoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
+}
+
+// ### Page Break
+var FCKPageBreakCommand = function()
+{
+	this.Name = 'PageBreak' ;
+}
+
+FCKPageBreakCommand.prototype.Execute = function()
+{
+	// Take an undo snapshot before changing the document
+	FCKUndo.SaveUndoStep() ;
+
+//	var e = FCK.EditorDocument.createElement( 'CENTER' ) ;
+//	e.style.pageBreakAfter = 'always' ;
+
+	// Tidy was removing the empty CENTER tags, so the following solution has
+	// been found. It also validates correctly as XHTML 1.0 Strict.
+	var e = FCK.EditorDocument.createElement( 'DIV' ) ;
+	e.style.pageBreakAfter = 'always' ;
+	e.innerHTML = '<span style="DISPLAY:none">&nbsp;</span>' ;
+
+	var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ;
+	var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+	oRange.MoveToSelection() ;
+	var oSplitInfo = oRange.SplitBlock() ;
+	oRange.InsertNode( oFakeImage ) ;
+
+	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+}
+
+FCKPageBreakCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return 0 ; // FCK_TRISTATE_OFF
+}
+
+// FCKUnlinkCommand - by Johnny Egeland (johnny@coretrek.com)
+var FCKUnlinkCommand = function()
+{
+	this.Name = 'Unlink' ;
+}
+
+FCKUnlinkCommand.prototype.Execute = function()
+{
+	// Take an undo snapshot before changing the document
+	FCKUndo.SaveUndoStep() ;
+
+	if ( FCKBrowserInfo.IsGeckoLike )
+	{
+		var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+		// The unlink command can generate a span in Firefox, so let's do it our way. See #430
+		if ( oLink )
+			FCKTools.RemoveOuterTags( oLink ) ;
+
+		return ;
+	}
+
+	FCK.ExecuteNamedCommand( this.Name ) ;
+}
+
+FCKUnlinkCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	var state = FCK.GetNamedCommandState( this.Name ) ;
+
+	// Check that it isn't an anchor
+	if ( state == FCK_TRISTATE_OFF && FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+		var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+		if ( bIsAnchor )
+			state = FCK_TRISTATE_DISABLED ;
+	}
+
+	return state ;
+}
+
+FCKVisitLinkCommand = function()
+{
+	this.Name = 'VisitLink';
+}
+FCKVisitLinkCommand.prototype =
+{
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+		var state = FCK.GetNamedCommandState( 'Unlink' ) ;
+
+		if ( state == FCK_TRISTATE_OFF )
+		{
+			var el = FCKSelection.MoveToAncestorNode( 'A' ) ;
+			if ( !el.href )
+				state = FCK_TRISTATE_DISABLED ;
+		}
+
+		return state ;
+	},
+
+	Execute : function()
+	{
+		var el = FCKSelection.MoveToAncestorNode( 'A' ) ;
+		var url = el.getAttribute( '_fcksavedurl' ) || el.getAttribute( 'href', 2 ) ;
+
+		// Check if it's a full URL.
+		// If not full URL, we'll need to apply the BaseHref setting.
+		if ( ! /:\/\//.test( url ) )
+		{
+			var baseHref = FCKConfig.BaseHref ;
+			var parentWindow = FCK.GetInstanceObject( 'parent' ) ;
+			if ( !baseHref )
+			{
+				baseHref = parentWindow.document.location.href ;
+				baseHref = baseHref.substring( 0, baseHref.lastIndexOf( '/' ) + 1 ) ;
+			}
+
+			if ( /^\//.test( url ) )
+			{
+				try
+				{
+					baseHref = baseHref.match( /^.*:\/\/+[^\/]+/ )[0] ;
+				}
+				catch ( e )
+				{
+					baseHref = parentWindow.document.location.protocol + '://' + parentWindow.parent.document.location.host ;
+				}
+			}
+
+			url = baseHref + url ;
+		}
+
+		if ( !window.open( url, '_blank' ) )
+			alert( FCKLang.VisitLinkBlocked ) ;
+	}
+} ;
+
+// FCKSelectAllCommand
+var FCKSelectAllCommand = function()
+{
+	this.Name = 'SelectAll' ;
+}
+
+FCKSelectAllCommand.prototype.Execute = function()
+{
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		FCK.ExecuteNamedCommand( 'SelectAll' ) ;
+	}
+	else
+	{
+		// Select the contents of the textarea
+		var textarea = FCK.EditingArea.Textarea ;
+		if ( FCKBrowserInfo.IsIE )
+		{
+			textarea.createTextRange().execCommand( 'SelectAll' ) ;
+		}
+		else
+		{
+			textarea.selectionStart = 0 ;
+			textarea.selectionEnd = textarea.value.length ;
+		}
+		textarea.focus() ;
+	}
+}
+
+FCKSelectAllCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return FCK_TRISTATE_OFF ;
+}
+
+// FCKPasteCommand
+var FCKPasteCommand = function()
+{
+	this.Name = 'Paste' ;
+}
+
+FCKPasteCommand.prototype =
+{
+	Execute : function()
+	{
+		if ( FCKBrowserInfo.IsIE )
+			FCK.Paste() ;
+		else
+			FCK.ExecuteNamedCommand( 'Paste' ) ;
+	},
+
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+		return FCK.GetNamedCommandState( 'Paste' ) ;
+	}
+} ;
+
+// FCKRuleCommand
+var FCKRuleCommand = function()
+{
+	this.Name = 'Rule' ;
+}
+
+FCKRuleCommand.prototype =
+{
+	Execute : function()
+	{
+		FCKUndo.SaveUndoStep() ;
+		FCK.InsertElement( 'hr' ) ;
+	},
+
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+		return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
+	}
+} ;
+
+// FCKCutCopyCommand
+var FCKCutCopyCommand = function( isCut )
+{
+	this.Name = isCut ? 'Cut' : 'Copy' ;
+}
+
+FCKCutCopyCommand.prototype =
+{
+	Execute : function()
+	{
+		var enabled = false ;
+
+		if ( FCKBrowserInfo.IsIE )
+		{
+			// The following seems to be the only reliable way to detect that
+			// cut/copy is enabled in IE. It will fire the oncut/oncopy event
+			// only if the security settings enabled the command to execute.
+
+			var onEvent = function()
+			{
+				enabled = true ;
+			} ;
+
+			var eventName = 'on' + this.Name.toLowerCase() ;
+
+			FCK.EditorDocument.body.attachEvent( eventName, onEvent ) ;
+			FCK.ExecuteNamedCommand( this.Name ) ;
+			FCK.EditorDocument.body.detachEvent( eventName, onEvent ) ;
+		}
+		else
+		{
+			try
+			{
+				// Other browsers throw an error if the command is disabled.
+				FCK.ExecuteNamedCommand( this.Name ) ;
+				enabled = true ;
+			}
+			catch(e){}
+		}
+
+		if ( !enabled )
+			alert( FCKLang[ 'PasteError' + this.Name ] ) ;
+	},
+
+	GetState : function()
+	{
+		// Strangely, the Cut command happens to have the correct states for
+		// both Copy and Cut in all browsers.
+		return FCK.EditMode != FCK_EDITMODE_WYSIWYG ?
+				FCK_TRISTATE_DISABLED :
+				FCK.GetNamedCommandState( 'Cut' ) ;
+	}
+};
+
+var FCKAnchorDeleteCommand = function()
+{
+	this.Name = 'AnchorDelete' ;
+}
+
+FCKAnchorDeleteCommand.prototype =
+{
+	Execute : function()
+	{
+		if (FCK.Selection.GetType() == 'Control')
+		{
+			FCK.Selection.Delete();
+		}
+		else
+		{
+			var oFakeImage = FCK.Selection.GetSelectedElement() ;
+			if ( oFakeImage )
+			{
+				if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckanchor') )
+					oAnchor = FCK.GetRealElement( oFakeImage ) ;
+				else
+					oFakeImage = null ;
+			}
+
+			//Search for a real anchor
+			if ( !oFakeImage )
+			{
+				oAnchor = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+				if ( oAnchor )
+					FCK.Selection.SelectNode( oAnchor ) ;
+			}
+
+			// If it's also a link, then just remove the name and exit
+			if ( oAnchor.href.length != 0 )
+			{
+				oAnchor.removeAttribute( 'name' ) ;
+				// Remove temporary class for IE
+				if ( FCKBrowserInfo.IsIE )
+					oAnchor.className = oAnchor.className.replace( FCKRegexLib.FCK_Class, '' ) ;
+				return ;
+			}
+
+			// We need to remove the anchor
+			// If we got a fake image, then just remove it and we're done
+			if ( oFakeImage )
+			{
+				oFakeImage.parentNode.removeChild( oFakeImage ) ;
+				return ;
+			}
+			// Empty anchor, so just remove it
+			if ( oAnchor.innerHTML.length == 0 )
+			{
+				oAnchor.parentNode.removeChild( oAnchor ) ;
+				return ;
+			}
+			// Anchor with content, leave the content
+			FCKTools.RemoveOuterTags( oAnchor ) ;
+		}
+		if ( FCKBrowserInfo.IsGecko )
+			FCK.Selection.Collapse( true ) ;
+	},
+
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+		return FCK.GetNamedCommandState( 'Unlink') ;
+	}
+};
+
+var FCKDeleteDivCommand = function()
+{
+}
+FCKDeleteDivCommand.prototype =
+{
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+
+		var node = FCKSelection.GetParentElement() ;
+		var path = new FCKElementPath( node ) ;
+		return path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+	},
+
+	Execute : function()
+	{
+		// Create an undo snapshot before doing anything.
+		FCKUndo.SaveUndoStep() ;
+
+		// Find out the nodes to delete.
+		var nodes = FCKDomTools.GetSelectedDivContainers() ;
+
+		// Remember the current selection position.
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+		var bookmark = range.CreateBookmark() ;
+
+		// Delete the container DIV node.
+		for ( var i = 0 ; i < nodes.length ; i++)
+			FCKDomTools.RemoveNode( nodes[i], true ) ;
+
+		// Restore selection.
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+	}
+} ;
+
+// FCKRuleCommand
+var FCKNbsp = function()
+{
+	this.Name = 'Non Breaking Space' ;
+}
+
+FCKNbsp.prototype =
+{
+	Execute : function()
+	{
+		FCK.InsertHtml( '&nbsp;' ) ;
+	},
+
+	GetState : function()
+	{
+		return ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_DISABLED : FCK_TRISTATE_OFF ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
new file mode 100644
index 000000000..8c555ee53
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
@@ -0,0 +1,250 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKBlockQuoteCommand Class: adds or removes blockquote tags.
+ */
+
+var FCKBlockQuoteCommand = function()
+{
+}
+
+FCKBlockQuoteCommand.prototype =
+{
+	Execute : function()
+	{
+		FCKUndo.SaveUndoStep() ;
+
+		var state = this.GetState() ;
+
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+
+		var bookmark = range.CreateBookmark() ;
+
+		// Kludge for #1592: if the bookmark nodes are in the beginning of
+		// blockquote, then move them to the nearest block element in the
+		// blockquote.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			var bStart	= range.GetBookmarkNode( bookmark, true ) ;
+			var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
+
+			var cursor ;
+
+			if ( bStart
+					&& bStart.parentNode.nodeName.IEquals( 'blockquote' )
+					&& !bStart.previousSibling )
+			{
+				cursor = bStart ;
+				while ( ( cursor = cursor.nextSibling ) )
+				{
+					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+						FCKDomTools.MoveNode( bStart, cursor, true ) ;
+				}
+			}
+
+			if ( bEnd
+					&& bEnd.parentNode.nodeName.IEquals( 'blockquote' )
+					&& !bEnd.previousSibling )
+			{
+				cursor = bEnd ;
+				while ( ( cursor = cursor.nextSibling ) )
+				{
+					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+					{
+						if ( cursor.firstChild == bStart )
+							FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
+						else
+							FCKDomTools.MoveNode( bEnd, cursor, true ) ;
+					}
+				}
+			}
+		}
+
+		var iterator = new FCKDomRangeIterator( range ) ;
+		var block ;
+
+		if ( state == FCK_TRISTATE_OFF )
+		{
+			iterator.EnforceRealBlocks = true ;
+			var paragraphs = [] ;
+			while ( ( block = iterator.GetNextParagraph() ) )
+				paragraphs.push( block ) ;
+
+			// If no paragraphs, create one from the current selection position.
+			if ( paragraphs.length < 1 )
+			{
+				para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
+				range.InsertNode( para ) ;
+				para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
+				range.MoveToBookmark( bookmark ) ;
+				range.MoveToNodeContents( para ) ;
+				range.Collapse( true ) ;
+				bookmark = range.CreateBookmark() ;
+				paragraphs.push( para ) ;
+			}
+
+			// Make sure all paragraphs have the same parent.
+			var commonParent = paragraphs[0].parentNode ;
+			var tmp = [] ;
+			for ( var i = 0 ; i < paragraphs.length ; i++ )
+			{
+				block = paragraphs[i] ;
+				commonParent = FCKDomTools.GetCommonParents( block.parentNode, commonParent ).pop() ;
+			}
+			var lastBlock = null ;
+			while ( paragraphs.length > 0 )
+			{
+				block = paragraphs.shift() ;
+				while ( block.parentNode != commonParent )
+					block = block.parentNode ;
+				if ( block != lastBlock )
+					tmp.push( block ) ;
+				lastBlock = block ;
+			}
+
+			// If any of the selected blocks is a blockquote, remove it to prevent nested blockquotes.
+			while ( tmp.length > 0 )
+			{
+				block = tmp.shift() ;
+				if ( block.nodeName.IEquals( 'blockquote' ) )
+				{
+					var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
+					while ( block.firstChild )
+					{
+						docFrag.appendChild( block.removeChild( block.firstChild ) ) ;
+						paragraphs.push( docFrag.lastChild ) ;
+					}
+					block.parentNode.replaceChild( docFrag, block ) ;
+				}
+				else
+					paragraphs.push( block ) ;
+			}
+
+			// Now we have all the blocks to be included in a new blockquote node.
+			var bqBlock = range.Window.document.createElement( 'blockquote' ) ;
+			commonParent.insertBefore( bqBlock, paragraphs[0] ) ;
+			while ( paragraphs.length > 0 )
+			{
+				block = paragraphs.shift() ;
+				bqBlock.appendChild( block ) ;
+			}
+		}
+		else if ( state == FCK_TRISTATE_ON )
+		{
+			var moveOutNodes = [] ;
+			while ( ( block = iterator.GetNextParagraph() ) )
+			{
+				var bqParent = null ;
+				var bqChild = null ;
+				while ( block.parentNode )
+				{
+					if ( block.parentNode.nodeName.IEquals( 'blockquote' ) )
+					{
+						bqParent = block.parentNode ;
+						bqChild = block ;
+						break ;
+					}
+					block = block.parentNode ;
+				}
+
+				if ( bqParent && bqChild )
+					moveOutNodes.push( bqChild ) ;
+			}
+
+			var movedNodes = [] ;
+			while ( moveOutNodes.length > 0 )
+			{
+				var node = moveOutNodes.shift() ;
+				var bqBlock = node.parentNode ;
+
+				// If the node is located at the beginning or the end, just take it out without splitting.
+				// Otherwise, split the blockquote node and move the paragraph in between the two blockquote nodes.
+				if ( node == node.parentNode.firstChild )
+				{
+					bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock ) ;
+					if ( ! bqBlock.firstChild )
+						bqBlock.parentNode.removeChild( bqBlock ) ;
+				}
+				else if ( node == node.parentNode.lastChild )
+				{
+					bqBlock.parentNode.insertBefore( bqBlock.removeChild( node ), bqBlock.nextSibling ) ;
+					if ( ! bqBlock.firstChild )
+						bqBlock.parentNode.removeChild( bqBlock ) ;
+				}
+				else
+					FCKDomTools.BreakParent( node, node.parentNode, range ) ;
+
+				movedNodes.push( node ) ;
+			}
+
+			if ( FCKConfig.EnterMode.IEquals( 'br' ) )
+			{
+				while ( movedNodes.length )
+				{
+					var node = movedNodes.shift() ;
+					var firstTime = true ;
+					if ( node.nodeName.IEquals( 'div' ) )
+					{
+						var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
+						var needBeginBr = firstTime && node.previousSibling &&
+							!FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
+						if ( firstTime && needBeginBr )
+							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
+						var needEndBr = node.nextSibling &&
+							!FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
+						while ( node.firstChild )
+							docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
+						if ( needEndBr )
+							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
+						node.parentNode.replaceChild( docFrag, node ) ;
+						firstTime = false ;
+					}
+				}
+			}
+		}
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		// Disabled if not WYSIWYG.
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+			return FCK_TRISTATE_DISABLED ;
+
+		var path = new FCKElementPath( FCKSelection.GetBoundaryParentElement( true ) ) ;
+		var firstBlock = path.Block || path.BlockLimit ;
+
+		if ( !firstBlock || firstBlock.nodeName.toLowerCase() == 'body' )
+			return FCK_TRISTATE_OFF ;
+
+		// See if the first block has a blockquote parent.
+		for ( var i = 0 ; i < path.Elements.length ; i++ )
+		{
+			if ( path.Elements[i].nodeName.IEquals( 'blockquote' ) )
+				return FCK_TRISTATE_ON ;
+		}
+		return FCK_TRISTATE_OFF ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
new file mode 100644
index 000000000..0cf81f7e3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
@@ -0,0 +1,61 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKCoreStyleCommand Class: controls the execution of a core style. Core
+ * styles are usually represented as buttons in the toolbar., like Bold and
+ * Italic.
+ */
+
+ var FCKCoreStyleCommand = function( coreStyleName )
+ {
+ 	this.Name = 'CoreStyle' ;
+ 	this.StyleName = '_FCK_' + coreStyleName ;
+ 	this.IsActive = false ;
+
+ 	FCKStyles.AttachStyleStateChange( this.StyleName, this._OnStyleStateChange, this ) ;
+ }
+
+ FCKCoreStyleCommand.prototype =
+ {
+	Execute : function()
+	{
+		FCKUndo.SaveUndoStep() ;
+
+		if ( this.IsActive )
+			FCKStyles.RemoveStyle( this.StyleName ) ;
+		else
+			FCKStyles.ApplyStyle( this.StyleName ) ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+		return this.IsActive ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
+	},
+
+	_OnStyleStateChange : function( styleName, isActive )
+	{
+		this.IsActive = isActive ;
+	}
+ };
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckfitwindow.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckfitwindow.js
new file mode 100644
index 000000000..93ef7dc1c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckfitwindow.js
@@ -0,0 +1,190 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Stretch the editor to full window size and back.
+ */
+
+var FCKFitWindow = function()
+{
+	this.Name = 'FitWindow' ;
+}
+
+FCKFitWindow.prototype.Execute = function()
+{
+	var eEditorFrame		= window.frameElement ;
+	var eEditorFrameStyle	= eEditorFrame.style ;
+
+	var eMainWindow			= parent ;
+	var eDocEl				= eMainWindow.document.documentElement ;
+	var eBody				= eMainWindow.document.body ;
+	var eBodyStyle			= eBody.style ;
+	var eParent ;
+
+	// Save the current selection and scroll position.
+	var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+	oRange.MoveToSelection() ;
+	var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+
+	// No original style properties known? Go fullscreen.
+	if ( !this.IsMaximized )
+	{
+		// Registering an event handler when the window gets resized.
+		if( FCKBrowserInfo.IsIE )
+			eMainWindow.attachEvent( 'onresize', FCKFitWindow_Resize ) ;
+		else
+			eMainWindow.addEventListener( 'resize', FCKFitWindow_Resize, true ) ;
+
+		// Save the scrollbars position.
+		this._ScrollPos = FCKTools.GetScrollPosition( eMainWindow ) ;
+
+		// Save and reset the styles for the entire node tree. They could interfere in the result.
+		eParent = eEditorFrame ;
+		// The extra () is to avoid a warning with strict error checking. This is ok.
+		while( (eParent = eParent.parentNode) )
+		{
+			if ( eParent.nodeType == 1 )
+			{
+				eParent._fckSavedStyles = FCKTools.SaveStyles( eParent ) ;
+				eParent.style.zIndex = FCKConfig.FloatingPanelsZIndex - 1 ;
+			}
+		}
+
+		// Hide IE scrollbars (in strict mode).
+		if ( FCKBrowserInfo.IsIE )
+		{
+			this.documentElementOverflow = eDocEl.style.overflow ;
+			eDocEl.style.overflow	= 'hidden' ;
+			eBodyStyle.overflow		= 'hidden' ;
+		}
+		else
+		{
+			// Hide the scroolbars in Firefox.
+			eBodyStyle.overflow = 'hidden' ;
+			eBodyStyle.width = '0px' ;
+			eBodyStyle.height = '0px' ;
+		}
+
+		// Save the IFRAME styles.
+		this._EditorFrameStyles = FCKTools.SaveStyles( eEditorFrame ) ;
+
+		// Resize.
+		var oViewPaneSize = FCKTools.GetViewPaneSize( eMainWindow ) ;
+
+		eEditorFrameStyle.position	= "absolute";
+		eEditorFrame.offsetLeft ;		// Kludge for Safari 3.1 browser bug, do not remove. See #2066.
+		eEditorFrameStyle.zIndex	= FCKConfig.FloatingPanelsZIndex - 1;
+		eEditorFrameStyle.left		= "0px";
+		eEditorFrameStyle.top		= "0px";
+		eEditorFrameStyle.width		= oViewPaneSize.Width + "px";
+		eEditorFrameStyle.height	= oViewPaneSize.Height + "px";
+
+		// Giving the frame some (huge) borders on his right and bottom
+		// side to hide the background that would otherwise show when the
+		// editor is in fullsize mode and the window is increased in size
+		// not for IE, because IE immediately adapts the editor on resize,
+		// without showing any of the background oddly in firefox, the
+		// editor seems not to fill the whole frame, so just setting the
+		// background of it to white to cover the page laying behind it anyway.
+		if ( !FCKBrowserInfo.IsIE )
+		{
+			eEditorFrameStyle.borderRight = eEditorFrameStyle.borderBottom = "9999px solid white" ;
+			eEditorFrameStyle.backgroundColor		= "white";
+		}
+
+		// Scroll to top left.
+		eMainWindow.scrollTo(0, 0);
+
+		// Is the editor still not on the top left? Let's find out and fix that as well. (Bug #174)
+		var editorPos = FCKTools.GetWindowPosition( eMainWindow, eEditorFrame ) ;
+		if ( editorPos.x != 0 )
+			eEditorFrameStyle.left = ( -1 * editorPos.x ) + "px" ;
+		if ( editorPos.y != 0 )
+			eEditorFrameStyle.top = ( -1 * editorPos.y ) + "px" ;
+
+		this.IsMaximized = true ;
+	}
+	else	// Resize to original size.
+	{
+		// Remove the event handler of window resizing.
+		if( FCKBrowserInfo.IsIE )
+			eMainWindow.detachEvent( "onresize", FCKFitWindow_Resize ) ;
+		else
+			eMainWindow.removeEventListener( "resize", FCKFitWindow_Resize, true ) ;
+
+		// Restore the CSS position for the entire node tree.
+		eParent = eEditorFrame ;
+		// The extra () is to avoid a warning with strict error checking. This is ok.
+		while( (eParent = eParent.parentNode) )
+		{
+			if ( eParent._fckSavedStyles )
+			{
+				FCKTools.RestoreStyles( eParent, eParent._fckSavedStyles ) ;
+				eParent._fckSavedStyles = null ;
+			}
+		}
+
+		// Restore IE scrollbars
+		if ( FCKBrowserInfo.IsIE )
+			eDocEl.style.overflow = this.documentElementOverflow ;
+
+		// Restore original size
+		FCKTools.RestoreStyles( eEditorFrame, this._EditorFrameStyles ) ;
+
+		// Restore the window scroll position.
+		eMainWindow.scrollTo( this._ScrollPos.X, this._ScrollPos.Y ) ;
+
+		this.IsMaximized = false ;
+	}
+
+	FCKToolbarItems.GetItem('FitWindow').RefreshState() ;
+
+	// It seams that Firefox restarts the editing area when making this changes.
+	// On FF 1.0.x, the area is not anymore editable. On FF 1.5+, the special
+	//configuration, like DisableFFTableHandles and DisableObjectResizing get
+	//lost, so we must reset it. Also, the cursor position and selection are
+	//also lost, even if you comment the following line (MakeEditable).
+	// if ( FCKBrowserInfo.IsGecko10 )	// Initially I thought it was a FF 1.0 only problem.
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+		FCK.EditingArea.MakeEditable() ;
+
+	FCK.Focus() ;
+
+	// Restore the selection and scroll position of inside the document.
+	oRange.Select() ;
+	FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
+}
+
+FCKFitWindow.prototype.GetState = function()
+{
+	if ( FCKConfig.ToolbarLocation != 'In' )
+		return FCK_TRISTATE_DISABLED ;
+	else
+		return ( this.IsMaximized ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF );
+}
+
+function FCKFitWindow_Resize()
+{
+	var oViewPaneSize = FCKTools.GetViewPaneSize( parent ) ;
+
+	var eEditorFrameStyle = window.frameElement.style ;
+
+	eEditorFrameStyle.width		= oViewPaneSize.Width + 'px' ;
+	eEditorFrameStyle.height	= oViewPaneSize.Height + 'px' ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckindentcommands.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckindentcommands.js
new file mode 100644
index 000000000..aaf0b57c5
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckindentcommands.js
@@ -0,0 +1,282 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKIndentCommand Class: controls block indentation.
+ */
+
+var FCKIndentCommand = function( name, offset )
+{
+	this.Name = name ;
+	this.Offset = offset ;
+	this.IndentCSSProperty = FCKConfig.ContentLangDirection.IEquals( 'ltr' ) ? 'marginLeft' : 'marginRight' ;
+}
+
+FCKIndentCommand._InitIndentModeParameters = function()
+{
+	if ( FCKConfig.IndentClasses && FCKConfig.IndentClasses.length > 0 )
+	{
+		this._UseIndentClasses = true ;
+		this._IndentClassMap = {} ;
+		for ( var i = 0 ; i < FCKConfig.IndentClasses.length ;i++ )
+			this._IndentClassMap[FCKConfig.IndentClasses[i]] = i + 1 ;
+		this._ClassNameRegex = new RegExp( '(?:^|\\s+)(' + FCKConfig.IndentClasses.join( '|' ) + ')(?=$|\\s)' ) ;
+	}
+	else
+		this._UseIndentClasses = false ;
+}
+
+
+FCKIndentCommand.prototype =
+{
+	Execute : function()
+	{
+		// Save an undo snapshot before doing anything.
+		FCKUndo.SaveUndoStep() ;
+
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+		var bookmark = range.CreateBookmark() ;
+
+		// Two cases to handle here: either we're in a list, or not.
+		// If we're in a list, then the indent/outdent operations would be done on the list nodes.
+		// Otherwise, apply the operation on the nearest block nodes.
+		var nearestListBlock = FCKDomTools.GetCommonParentNode( range.StartNode || range.StartContainer ,
+				range.EndNode || range.EndContainer,
+				['ul', 'ol'] ) ;
+		if ( nearestListBlock )
+			this._IndentList( range, nearestListBlock ) ;
+		else
+			this._IndentBlock( range ) ;
+
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		// Disabled if not WYSIWYG.
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+			return FCK_TRISTATE_DISABLED ;
+
+		// Initialize parameters if not already initialzed.
+		if ( FCKIndentCommand._UseIndentClasses == undefined )
+			FCKIndentCommand._InitIndentModeParameters() ;
+
+		// If we're not in a list, and the starting block's indentation is zero, and the current
+		// command is the outdent command, then we should return FCK_TRISTATE_DISABLED.
+		var startContainer = FCKSelection.GetBoundaryParentElement( true ) ;
+		var endContainer = FCKSelection.GetBoundaryParentElement( false ) ;
+		var listNode = FCKDomTools.GetCommonParentNode( startContainer, endContainer, ['ul','ol'] ) ;
+
+		if ( listNode )
+		{
+			if ( this.Name.IEquals( 'outdent' ) )
+				return FCK_TRISTATE_OFF ;
+			var firstItem = FCKTools.GetElementAscensor( startContainer, 'li' ) ;
+			if ( !firstItem || !firstItem.previousSibling )
+				return FCK_TRISTATE_DISABLED ;
+			return FCK_TRISTATE_OFF ;
+		}
+		if ( ! FCKIndentCommand._UseIndentClasses && this.Name.IEquals( 'indent' ) )
+			return FCK_TRISTATE_OFF;
+
+		var path = new FCKElementPath( startContainer ) ;
+		var firstBlock = path.Block || path.BlockLimit ;
+		if ( !firstBlock )
+			return FCK_TRISTATE_DISABLED ;
+
+		if ( FCKIndentCommand._UseIndentClasses )
+		{
+			var indentClass = firstBlock.className.match( FCKIndentCommand._ClassNameRegex ) ;
+			var indentStep = 0 ;
+			if ( indentClass != null )
+			{
+				indentClass = indentClass[1] ;
+				indentStep = FCKIndentCommand._IndentClassMap[indentClass] ;
+			}
+			if ( ( this.Name == 'outdent' && indentStep == 0 ) ||
+					( this.Name == 'indent' && indentStep == FCKConfig.IndentClasses.length ) )
+				return FCK_TRISTATE_DISABLED ;
+			return FCK_TRISTATE_OFF ;
+		}
+		else
+		{
+			var indent = parseInt( firstBlock.style[this.IndentCSSProperty], 10 ) ;
+			if ( isNaN( indent ) )
+				indent = 0 ;
+			if ( indent <= 0 )
+				return FCK_TRISTATE_DISABLED ;
+			return FCK_TRISTATE_OFF ;
+		}
+	},
+
+	_IndentBlock : function( range )
+	{
+		var iterator = new FCKDomRangeIterator( range ) ;
+		iterator.EnforceRealBlocks = true ;
+
+		range.Expand( 'block_contents' ) ;
+		var commonParents = FCKDomTools.GetCommonParents( range.StartContainer, range.EndContainer ) ;
+		var nearestParent = commonParents[commonParents.length - 1] ;
+		var block ;
+
+		while ( ( block = iterator.GetNextParagraph() ) )
+		{
+			// We don't want to indent subtrees recursively, so only perform the indent operation
+			// if the block itself is the nearestParent, or the block's parent is the nearestParent.
+			if ( ! ( block == nearestParent || block.parentNode == nearestParent ) )
+				continue ;
+
+			if ( FCKIndentCommand._UseIndentClasses )
+			{
+				// Transform current class name to indent step index.
+				var indentClass = block.className.match( FCKIndentCommand._ClassNameRegex ) ;
+				var indentStep = 0 ;
+				if ( indentClass != null )
+				{
+					indentClass = indentClass[1] ;
+					indentStep = FCKIndentCommand._IndentClassMap[indentClass] ;
+				}
+
+				// Operate on indent step index, transform indent step index back to class name.
+				if ( this.Name.IEquals( 'outdent' ) )
+					indentStep-- ;
+				else if ( this.Name.IEquals( 'indent' ) )
+					indentStep++ ;
+				indentStep = Math.min( indentStep, FCKConfig.IndentClasses.length ) ;
+				indentStep = Math.max( indentStep, 0 ) ;
+				var className = block.className.replace( FCKIndentCommand._ClassNameRegex, '' ) ;
+				if ( indentStep < 1 )
+					block.className = className ;
+				else
+					block.className = ( className.length > 0 ? className + ' ' : '' ) +
+						FCKConfig.IndentClasses[indentStep - 1] ;
+			}
+			else
+			{
+				// Offset distance is assumed to be in pixels for now.
+				var currentOffset = parseInt( block.style[this.IndentCSSProperty], 10 ) ;
+				if ( isNaN( currentOffset ) )
+					currentOffset = 0 ;
+				currentOffset += this.Offset ;
+				currentOffset = Math.max( currentOffset, 0 ) ;
+				currentOffset = Math.ceil( currentOffset / this.Offset ) * this.Offset ;
+				block.style[this.IndentCSSProperty] = currentOffset ? currentOffset + FCKConfig.IndentUnit : '' ;
+				if ( block.getAttribute( 'style' ) == '' )
+					block.removeAttribute( 'style' ) ;
+			}
+		}
+	},
+
+	_IndentList : function( range, listNode )
+	{
+		// Our starting and ending points of the range might be inside some blocks under a list item...
+		// So before playing with the iterator, we need to expand the block to include the list items.
+		var startContainer = range.StartContainer ;
+		var endContainer = range.EndContainer ;
+		while ( startContainer && startContainer.parentNode != listNode )
+			startContainer = startContainer.parentNode ;
+		while ( endContainer && endContainer.parentNode != listNode )
+			endContainer = endContainer.parentNode ;
+
+		if ( ! startContainer || ! endContainer )
+			return ;
+
+		// Now we can iterate over the individual items on the same tree depth.
+		var block = startContainer ;
+		var itemsToMove = [] ;
+		var stopFlag = false ;
+		while ( stopFlag == false )
+		{
+			if ( block == endContainer )
+				stopFlag = true ;
+			itemsToMove.push( block ) ;
+			block = block.nextSibling ;
+		}
+		if ( itemsToMove.length < 1 )
+			return ;
+
+		// Do indent or outdent operations on the array model of the list, not the list's DOM tree itself.
+		// The array model demands that it knows as much as possible about the surrounding lists, we need
+		// to feed it the further ancestor node that is still a list.
+		var listParents = FCKDomTools.GetParents( listNode ) ;
+		for ( var i = 0 ; i < listParents.length ; i++ )
+		{
+			if ( listParents[i].nodeName.IEquals( ['ul', 'ol'] ) )
+			{
+				listNode = listParents[i] ;
+				break ;
+			}
+		}
+		var indentOffset = this.Name.IEquals( 'indent' ) ? 1 : -1 ;
+		var startItem = itemsToMove[0] ;
+		var lastItem = itemsToMove[ itemsToMove.length - 1 ] ;
+		var markerObj = {} ;
+
+		// Convert the list DOM tree into a one dimensional array.
+		var listArray = FCKDomTools.ListToArray( listNode, markerObj ) ;
+
+		// Apply indenting or outdenting on the array.
+		var baseIndent = listArray[lastItem._FCK_ListArray_Index].indent ;
+		for ( var i = startItem._FCK_ListArray_Index ; i <= lastItem._FCK_ListArray_Index ; i++ )
+			listArray[i].indent += indentOffset ;
+		for ( var i = lastItem._FCK_ListArray_Index + 1 ; i < listArray.length && listArray[i].indent > baseIndent ; i++ )
+			listArray[i].indent += indentOffset ;
+
+		/* For debug use only
+		var PrintArray = function( listArray, doc )
+		{
+			var s = [] ;
+			for ( var i = 0 ; i < listArray.length ; i++ )
+			{
+				for ( var j in listArray[i] )
+				{
+					if ( j != 'contents' )
+						s.push( j + ":" + listArray[i][j] + "; " ) ;
+					else
+					{
+						var docFrag = doc.createDocumentFragment() ;
+						var tmpNode = doc.createElement( 'span' ) ;
+						for ( var k = 0 ; k < listArray[i][j].length ; k++ )
+							docFrag.appendChild( listArray[i][j][k].cloneNode( true ) ) ;
+						tmpNode.appendChild( docFrag ) ;
+						s.push( j + ":" + tmpNode.innerHTML + "; ") ;
+					}
+				}
+				s.push( '\n' ) ;
+			}
+			alert( s.join('') ) ;
+		}
+		PrintArray( listArray, FCK.EditorDocument ) ;
+		*/
+
+		// Convert the array back to a DOM forest (yes we might have a few subtrees now).
+		// And replace the old list with the new forest.
+		var newList = FCKDomTools.ArrayToList( listArray ) ;
+		if ( newList )
+			listNode.parentNode.replaceChild( newList.listNode, listNode ) ;
+
+		// Clean up the markers.
+		FCKDomTools.ClearAllMarkers( markerObj ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckjustifycommands.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
new file mode 100644
index 000000000..0f9f304f0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
@@ -0,0 +1,173 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKJustifyCommand Class: controls block justification.
+ */
+
+var FCKJustifyCommand = function( alignValue )
+{
+	this.AlignValue = alignValue ;
+
+	// Detect whether this is the instance for the default alignment.
+	var contentDir = FCKConfig.ContentLangDirection.toLowerCase() ;
+	this.IsDefaultAlign = ( alignValue == 'left' && contentDir == 'ltr' ) ||
+						  ( alignValue == 'right' && contentDir == 'rtl' ) ;
+
+	// Get the class name to be used by this instance.
+	var cssClassName = this._CssClassName = ( function()
+	{
+		var classes = FCKConfig.JustifyClasses ;
+		if ( classes )
+		{
+			switch ( alignValue )
+			{
+				case 'left' :
+					return classes[0] || null ;
+				case 'center' :
+					return classes[1] || null ;
+				case 'right' :
+					return classes[2] || null ;
+				case 'justify' :
+					return classes[3] || null ;
+			}
+		}
+		return null ;
+	} )() ;
+
+	if ( cssClassName && cssClassName.length > 0 )
+		this._CssClassRegex = new RegExp( '(?:^|\\s+)' + cssClassName + '(?=$|\\s)' ) ;
+}
+
+FCKJustifyCommand._GetClassNameRegex = function()
+{
+	var regex = FCKJustifyCommand._ClassRegex ;
+	if ( regex != undefined )
+		return regex ;
+
+	var names = [] ;
+
+	var classes = FCKConfig.JustifyClasses ;
+	if ( classes )
+	{
+		for ( var i = 0 ; i < 4 ; i++ )
+		{
+			var className = classes[i] ;
+			if ( className && className.length > 0 )
+				names.push( className ) ;
+		}
+	}
+
+	if ( names.length > 0 )
+		regex = new RegExp( '(?:^|\\s+)(?:' + names.join( '|' ) + ')(?=$|\\s)' ) ;
+	else
+		regex = null ;
+
+	return FCKJustifyCommand._ClassRegex = regex ;
+}
+
+FCKJustifyCommand.prototype =
+{
+	Execute : function()
+	{
+		// Save an undo snapshot before doing anything.
+		FCKUndo.SaveUndoStep() ;
+
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+
+		var currentState = this.GetState() ;
+		if ( currentState == FCK_TRISTATE_DISABLED )
+			return ;
+
+		// Store a bookmark of the selection since the paragraph iterator might
+		// change the DOM tree and break selections.
+		var bookmark = range.CreateBookmark() ;
+
+		var cssClassName = this._CssClassName ;
+
+		// Apply alignment setting for each paragraph.
+		var iterator = new FCKDomRangeIterator( range ) ;
+		var block ;
+		while ( ( block = iterator.GetNextParagraph() ) )
+		{
+			block.removeAttribute( 'align' ) ;
+
+			if ( cssClassName )
+			{
+				// Remove the any of the alignment classes from the className.
+				var className = block.className.replace( FCKJustifyCommand._GetClassNameRegex(), '' ) ;
+
+				// Append the desired class name.
+				if ( currentState == FCK_TRISTATE_OFF )
+				{
+					if ( className.length > 0 )
+						className += ' ' ;
+					block.className = className + cssClassName ;
+				}
+				else if ( className.length == 0 )
+					FCKDomTools.RemoveAttribute( block, 'class' ) ;
+			}
+			else
+			{
+				var style = block.style ;
+				if ( currentState == FCK_TRISTATE_OFF )
+					style.textAlign = this.AlignValue ;
+				else
+				{
+					style.textAlign = '' ;
+					if ( style.cssText.length == 0 )
+						block.removeAttribute( 'style' ) ;
+				}
+			}
+		}
+
+		// Restore previous selection.
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		// Disabled if not WYSIWYG.
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+			return FCK_TRISTATE_DISABLED ;
+
+		// Retrieve the first selected block.
+		var path = new FCKElementPath( FCKSelection.GetBoundaryParentElement( true ) ) ;
+		var firstBlock = path.Block || path.BlockLimit ;
+
+		if ( !firstBlock || firstBlock.nodeName.toLowerCase() == 'body' )
+			return FCK_TRISTATE_OFF ;
+
+		// Check if the desired style is already applied to the block.
+		var currentAlign ;
+		if ( FCKBrowserInfo.IsIE )
+			currentAlign = firstBlock.currentStyle.textAlign ;
+		else
+			currentAlign = FCK.EditorWindow.getComputedStyle( firstBlock, '' ).getPropertyValue( 'text-align' );
+		currentAlign = currentAlign.replace( /(-moz-|-webkit-|start|auto)/i, '' );
+		if ( ( !currentAlign && this.IsDefaultAlign ) || currentAlign == this.AlignValue )
+			return FCK_TRISTATE_ON ;
+		return FCK_TRISTATE_OFF ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcklistcommands.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcklistcommands.js
new file mode 100644
index 000000000..e796fd4f0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcklistcommands.js
@@ -0,0 +1,382 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Implementation for the "Insert/Remove Ordered/Unordered List" commands.
+ */
+
+var FCKListCommand = function( name, tagName )
+{
+	this.Name = name ;
+	this.TagName = tagName ;
+}
+
+FCKListCommand.prototype =
+{
+	GetState : function()
+	{
+		// Disabled if not WYSIWYG.
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+			return FCK_TRISTATE_DISABLED ;
+
+		// We'll use the style system's convention to determine list state here...
+		// If the starting block is a descendant of an <ol> or <ul> node, then we're in a list.
+		var startContainer = FCKSelection.GetBoundaryParentElement( true ) ;
+		var listNode = startContainer ;
+		while ( listNode )
+		{
+			if ( listNode.nodeName.IEquals( [ 'ul', 'ol' ] ) )
+				break ;
+			listNode = listNode.parentNode ;
+		}
+		if ( listNode && listNode.nodeName.IEquals( this.TagName ) )
+			return FCK_TRISTATE_ON ;
+		else
+			return FCK_TRISTATE_OFF ;
+	},
+
+	Execute : function()
+	{
+		FCKUndo.SaveUndoStep() ;
+
+		var doc = FCK.EditorDocument ;
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+		var state = this.GetState() ;
+
+		// Midas lists rule #1 says we can create a list even in an empty document.
+		// But FCKDomRangeIterator wouldn't run if the document is really empty.
+		// So create a paragraph if the document is empty and we're going to create a list.
+		if ( state == FCK_TRISTATE_OFF )
+		{
+			FCKDomTools.TrimNode( doc.body ) ;
+			if ( ! doc.body.firstChild )
+			{
+				var paragraph = doc.createElement( 'p' ) ;
+				doc.body.appendChild( paragraph ) ;
+				range.MoveToNodeContents( paragraph ) ;
+			}
+		}
+
+		var bookmark = range.CreateBookmark() ;
+
+		// Group the blocks up because there are many cases where multiple lists have to be created,
+		// or multiple lists have to be cancelled.
+		var listGroups = [] ;
+		var markerObj = {} ;
+		var iterator = new FCKDomRangeIterator( range ) ;
+		var block ;
+
+		iterator.ForceBrBreak = ( state == FCK_TRISTATE_OFF ) ;
+		var nextRangeExists = true ;
+		var rangeQueue = null ;
+		while ( nextRangeExists )
+		{
+			while ( ( block = iterator.GetNextParagraph() ) )
+			{
+				var path = new FCKElementPath( block ) ;
+				var listNode = null ;
+				var processedFlag = false ;
+				var blockLimit = path.BlockLimit ;
+
+				// First, try to group by a list ancestor.
+				for ( var i = path.Elements.length - 1 ; i >= 0 ; i-- )
+				{
+					var el = path.Elements[i] ;
+					if ( el.nodeName.IEquals( ['ol', 'ul'] ) )
+					{
+						// If we've encountered a list inside a block limit
+						// The last group object of the block limit element should
+						// no longer be valid. Since paragraphs after the list
+						// should belong to a different group of paragraphs before
+						// the list. (Bug #1309)
+						if ( blockLimit._FCK_ListGroupObject )
+							blockLimit._FCK_ListGroupObject = null ;
+
+						var groupObj = el._FCK_ListGroupObject ;
+						if ( groupObj )
+							groupObj.contents.push( block ) ;
+						else
+						{
+							groupObj = { 'root' : el, 'contents' : [ block ] } ;
+							listGroups.push( groupObj ) ;
+							FCKDomTools.SetElementMarker( markerObj, el, '_FCK_ListGroupObject', groupObj ) ;
+						}
+						processedFlag = true ;
+						break ;
+					}
+				}
+
+				if ( processedFlag )
+					continue ;
+
+				// No list ancestor? Group by block limit.
+				var root = blockLimit ;
+				if ( root._FCK_ListGroupObject )
+					root._FCK_ListGroupObject.contents.push( block ) ;
+				else
+				{
+					var groupObj = { 'root' : root, 'contents' : [ block ] } ;
+					FCKDomTools.SetElementMarker( markerObj, root, '_FCK_ListGroupObject', groupObj ) ;
+					listGroups.push( groupObj ) ;
+				}
+			}
+
+			if ( FCKBrowserInfo.IsIE )
+				nextRangeExists = false ;
+			else
+			{
+				if ( rangeQueue == null )
+				{
+					rangeQueue = [] ;
+					var selectionObject = FCKSelection.GetSelection() ;
+					if ( selectionObject && listGroups.length == 0 )
+						rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
+					for ( var i = 1 ; selectionObject && i < selectionObject.rangeCount ; i++ )
+						rangeQueue.push( selectionObject.getRangeAt( i ) ) ;
+				}
+				if ( rangeQueue.length < 1 )
+					nextRangeExists = false ;
+				else
+				{
+					var internalRange = FCKW3CRange.CreateFromRange( doc, rangeQueue.shift() ) ;
+					range._Range = internalRange ;
+					range._UpdateElementInfo() ;
+					if ( range.StartNode.nodeName.IEquals( 'td' ) )
+						range.SetStart( range.StartNode, 1 ) ;
+					if ( range.EndNode.nodeName.IEquals( 'td' ) )
+						range.SetEnd( range.EndNode, 2 ) ;
+					iterator = new FCKDomRangeIterator( range ) ;
+					iterator.ForceBrBreak = ( state == FCK_TRISTATE_OFF ) ;
+				}
+			}
+		}
+
+		// Now we have two kinds of list groups, groups rooted at a list, and groups rooted at a block limit element.
+		// We either have to build lists or remove lists, for removing a list does not makes sense when we are looking
+		// at the group that's not rooted at lists. So we have three cases to handle.
+		var listsCreated = [] ;
+		while ( listGroups.length > 0 )
+		{
+			var groupObj = listGroups.shift() ;
+			if ( state == FCK_TRISTATE_OFF )
+			{
+				if ( groupObj.root.nodeName.IEquals( ['ul', 'ol'] ) )
+					this._ChangeListType( groupObj, markerObj, listsCreated ) ;
+				else
+					this._CreateList( groupObj, listsCreated ) ;
+			}
+			else if ( state == FCK_TRISTATE_ON && groupObj.root.nodeName.IEquals( ['ul', 'ol'] ) )
+				this._RemoveList( groupObj, markerObj ) ;
+		}
+
+		// For all new lists created, merge adjacent, same type lists.
+		for ( var i = 0 ; i < listsCreated.length ; i++ )
+		{
+			var listNode = listsCreated[i] ;
+			var stopFlag = false ;
+			var currentNode = listNode ;
+			while ( ! stopFlag )
+			{
+				currentNode = currentNode.nextSibling ;
+				if ( currentNode && currentNode.nodeType == 3 && currentNode.nodeValue.search( /^[\n\r\t ]*$/ ) == 0 )
+					continue ;
+				stopFlag = true ;
+			}
+
+			if ( currentNode && currentNode.nodeName.IEquals( this.TagName ) )
+			{
+				currentNode.parentNode.removeChild( currentNode ) ;
+				while ( currentNode.firstChild )
+					listNode.appendChild( currentNode.removeChild( currentNode.firstChild ) ) ;
+			}
+
+			stopFlag = false ;
+			currentNode = listNode ;
+			while ( ! stopFlag )
+			{
+				currentNode = currentNode.previousSibling ;
+				if ( currentNode && currentNode.nodeType == 3 && currentNode.nodeValue.search( /^[\n\r\t ]*$/ ) == 0 )
+					continue ;
+				stopFlag = true ;
+			}
+			if ( currentNode && currentNode.nodeName.IEquals( this.TagName ) )
+			{
+				currentNode.parentNode.removeChild( currentNode ) ;
+				while ( currentNode.lastChild )
+					listNode.insertBefore( currentNode.removeChild( currentNode.lastChild ),
+						       listNode.firstChild ) ;
+			}
+		}
+
+		// Clean up, restore selection and update toolbar button states.
+		FCKDomTools.ClearAllMarkers( markerObj ) ;
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	_ChangeListType : function( groupObj, markerObj, listsCreated )
+	{
+		// This case is easy...
+		// 1. Convert the whole list into a one-dimensional array.
+		// 2. Change the list type by modifying the array.
+		// 3. Recreate the whole list by converting the array to a list.
+		// 4. Replace the original list with the recreated list.
+		var listArray = FCKDomTools.ListToArray( groupObj.root, markerObj ) ;
+		var selectedListItems = [] ;
+		for ( var i = 0 ; i < groupObj.contents.length ; i++ )
+		{
+			var itemNode = groupObj.contents[i] ;
+			itemNode = FCKTools.GetElementAscensor( itemNode, 'li' ) ;
+			if ( ! itemNode || itemNode._FCK_ListItem_Processed )
+				continue ;
+			selectedListItems.push( itemNode ) ;
+			FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
+		}
+		var fakeParent = FCKTools.GetElementDocument( groupObj.root ).createElement( this.TagName ) ;
+		for ( var i = 0 ; i < selectedListItems.length ; i++ )
+		{
+			var listIndex = selectedListItems[i]._FCK_ListArray_Index ;
+			listArray[listIndex].parent = fakeParent ;
+		}
+		var newList = FCKDomTools.ArrayToList( listArray, markerObj ) ;
+		for ( var i = 0 ; i < newList.listNode.childNodes.length ; i++ )
+		{
+			if ( newList.listNode.childNodes[i].nodeName.IEquals( this.TagName ) )
+				listsCreated.push( newList.listNode.childNodes[i] ) ;
+		}
+		groupObj.root.parentNode.replaceChild( newList.listNode, groupObj.root ) ;
+	},
+
+	_CreateList : function( groupObj, listsCreated )
+	{
+		var contents = groupObj.contents ;
+		var doc = FCKTools.GetElementDocument( groupObj.root ) ;
+		var listContents = [] ;
+
+		// It is possible to have the contents returned by DomRangeIterator to be the same as the root.
+		// e.g. when we're running into table cells.
+		// In such a case, enclose the childNodes of contents[0] into a <div>.
+		if ( contents.length == 1 && contents[0] == groupObj.root )
+		{
+			var divBlock = doc.createElement( 'div' );
+			while ( contents[0].firstChild )
+				divBlock.appendChild( contents[0].removeChild( contents[0].firstChild ) ) ;
+			contents[0].appendChild( divBlock ) ;
+			contents[0] = divBlock ;
+		}
+
+		// Calculate the common parent node of all content blocks.
+		var commonParent = groupObj.contents[0].parentNode ;
+		for ( var i = 0 ; i < contents.length ; i++ )
+			commonParent = FCKDomTools.GetCommonParents( commonParent, contents[i].parentNode ).pop() ;
+
+		// We want to insert things that are in the same tree level only, so calculate the contents again
+		// by expanding the selected blocks to the same tree level.
+		for ( var i = 0 ; i < contents.length ; i++ )
+		{
+			var contentNode = contents[i] ;
+			while ( contentNode.parentNode )
+			{
+				if ( contentNode.parentNode == commonParent )
+				{
+					listContents.push( contentNode ) ;
+					break ;
+				}
+				contentNode = contentNode.parentNode ;
+			}
+		}
+
+		if ( listContents.length < 1 )
+			return ;
+
+		// Insert the list to the DOM tree.
+		var insertAnchor = listContents[listContents.length - 1].nextSibling ;
+		var listNode = doc.createElement( this.TagName ) ;
+		listsCreated.push( listNode ) ;
+		while ( listContents.length )
+		{
+			var contentBlock = listContents.shift() ;
+			var docFrag = doc.createDocumentFragment() ;
+			while ( contentBlock.firstChild )
+				docFrag.appendChild( contentBlock.removeChild( contentBlock.firstChild ) ) ;
+			contentBlock.parentNode.removeChild( contentBlock ) ;
+			var listItem = doc.createElement( 'li' ) ;
+			listItem.appendChild( docFrag ) ;
+			listNode.appendChild( listItem ) ;
+		}
+		commonParent.insertBefore( listNode, insertAnchor ) ;
+	},
+
+	_RemoveList : function( groupObj, markerObj )
+	{
+		// This is very much like the change list type operation.
+		// Except that we're changing the selected items' indent to -1 in the list array.
+		var listArray = FCKDomTools.ListToArray( groupObj.root, markerObj ) ;
+		var selectedListItems = [] ;
+		for ( var i = 0 ; i < groupObj.contents.length ; i++ )
+		{
+			var itemNode = groupObj.contents[i] ;
+			itemNode = FCKTools.GetElementAscensor( itemNode, 'li' ) ;
+			if ( ! itemNode || itemNode._FCK_ListItem_Processed )
+				continue ;
+			selectedListItems.push( itemNode ) ;
+			FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
+		}
+
+		var lastListIndex = null ;
+		for ( var i = 0 ; i < selectedListItems.length ; i++ )
+		{
+			var listIndex = selectedListItems[i]._FCK_ListArray_Index ;
+			listArray[listIndex].indent = -1 ;
+			lastListIndex = listIndex ;
+		}
+
+		// After cutting parts of the list out with indent=-1, we still have to maintain the array list
+		// model's nextItem.indent <= currentItem.indent + 1 invariant. Otherwise the array model of the
+		// list cannot be converted back to a real DOM list.
+		for ( var i = lastListIndex + 1; i < listArray.length ; i++ )
+		{
+			if ( listArray[i].indent > listArray[i-1].indent + 1 )
+			{
+				var indentOffset = listArray[i-1].indent + 1 - listArray[i].indent ;
+				var oldIndent = listArray[i].indent ;
+				while ( listArray[i] && listArray[i].indent >= oldIndent)
+				{
+					listArray[i].indent += indentOffset ;
+					i++ ;
+				}
+				i-- ;
+			}
+		}
+
+		var newList = FCKDomTools.ArrayToList( listArray, markerObj ) ;
+		// If groupObj.root is the last element in its parent, or its nextSibling is a <br>, then we should
+		// not add a <br> after the final item. So, check for the cases and trim the <br>.
+		if ( groupObj.root.nextSibling == null || groupObj.root.nextSibling.nodeName.IEquals( 'br' ) )
+		{
+			if ( newList.listNode.lastChild.nodeName.IEquals( 'br' ) )
+				newList.listNode.removeChild( newList.listNode.lastChild ) ;
+		}
+		groupObj.root.parentNode.replaceChild( newList.listNode, groupObj.root ) ;
+	}
+};
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcknamedcommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
new file mode 100644
index 000000000..b4822cd68
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
@@ -0,0 +1,39 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKNamedCommand Class: represents an internal browser command.
+ */
+
+var FCKNamedCommand = function( commandName )
+{
+	this.Name = commandName ;
+}
+
+FCKNamedCommand.prototype.Execute = function()
+{
+	FCK.ExecuteNamedCommand( this.Name ) ;
+}
+
+FCKNamedCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return FCK.GetNamedCommandState( this.Name ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
new file mode 100644
index 000000000..43da007d6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
@@ -0,0 +1,40 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKPastePlainTextCommand Class: represents the
+ * "Paste as Plain Text" command.
+ */
+
+var FCKPastePlainTextCommand = function()
+{
+	this.Name = 'PasteText' ;
+}
+
+FCKPastePlainTextCommand.prototype.Execute = function()
+{
+	FCK.PasteAsPlainText() ;
+}
+
+FCKPastePlainTextCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return FCK.GetNamedCommandState( 'Paste' ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
new file mode 100644
index 000000000..23371dcc3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
@@ -0,0 +1,40 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKPasteWordCommand Class: represents the "Paste from Word" command.
+ */
+
+var FCKPasteWordCommand = function()
+{
+	this.Name = 'PasteWord' ;
+}
+
+FCKPasteWordCommand.prototype.Execute = function()
+{
+	FCK.PasteFromWord() ;
+}
+
+FCKPasteWordCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || FCKConfig.ForcePasteAsPlainText )
+		return FCK_TRISTATE_DISABLED ;
+	else
+		return FCK.GetNamedCommandState( 'Paste' ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
new file mode 100644
index 000000000..2f0c9616e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
@@ -0,0 +1,45 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKRemoveFormatCommand Class: controls the execution of a core style. Core
+ * styles are usually represented as buttons in the toolbar., like Bold and
+ * Italic.
+ */
+
+ var FCKRemoveFormatCommand = function()
+ {
+ 	this.Name = 'RemoveFormat' ;
+ }
+
+ FCKRemoveFormatCommand.prototype =
+ {
+	Execute : function()
+	{
+		FCKStyles.RemoveAll() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		return FCK.EditorWindow ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+	}
+ };
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckshowblocks.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckshowblocks.js
new file mode 100644
index 000000000..3958c6040
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckshowblocks.js
@@ -0,0 +1,91 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKShowBlockCommand Class: the "Show Blocks" command.
+ */
+
+var FCKShowBlockCommand = function( name, defaultState )
+{
+	this.Name = name ;
+	if ( defaultState != undefined )
+		this._SavedState = defaultState ;
+	else
+		this._SavedState = null ;
+}
+
+FCKShowBlockCommand.prototype.Execute = function()
+{
+	var state = this.GetState() ;
+
+	if ( state == FCK_TRISTATE_DISABLED )
+		return ;
+
+	var body = FCK.EditorDocument.body ;
+
+	if ( state == FCK_TRISTATE_ON )
+		body.className = body.className.replace( /(^| )FCK__ShowBlocks/g, '' ) ;
+	else
+		body.className += ' FCK__ShowBlocks' ;
+
+	if ( FCKBrowserInfo.IsIE )
+	{
+		try
+		{
+			FCK.EditorDocument.selection.createRange().select() ;
+		}
+		catch ( e )
+		{}
+	}
+	else
+	{
+		var focus = FCK.EditorWindow.getSelection().focusNode ;
+		if ( focus.nodeType != 1 )
+			focus = focus.parentNode ;
+		FCKDomTools.ScrollIntoView( focus, false ) ;
+	}
+
+	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+}
+
+FCKShowBlockCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+
+	// On some cases FCK.EditorDocument.body is not yet available
+	if ( !FCK.EditorDocument )
+		return FCK_TRISTATE_OFF ;
+
+	if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) )
+		return FCK_TRISTATE_ON ;
+
+	return FCK_TRISTATE_OFF ;
+}
+
+FCKShowBlockCommand.prototype.SaveState = function()
+{
+	this._SavedState = this.GetState() ;
+}
+
+FCKShowBlockCommand.prototype.RestoreState = function()
+{
+	if ( this._SavedState != null && this.GetState() != this._SavedState )
+		this.Execute() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
new file mode 100644
index 000000000..9d8e514d3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
@@ -0,0 +1,41 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKStyleCommand Class: represents the "Spell Check" command.
+ * (Gecko specific implementation)
+ */
+
+var FCKSpellCheckCommand = function()
+{
+	this.Name = 'SpellCheck' ;
+	this.IsEnabled = ( FCKConfig.SpellChecker == 'SpellerPages' ) ;
+}
+
+FCKSpellCheckCommand.prototype.Execute = function()
+{
+	FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ;
+}
+
+FCKSpellCheckCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
new file mode 100644
index 000000000..c92ddb154
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
@@ -0,0 +1,69 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKStyleCommand Class: represents the "Spell Check" command.
+ * (IE specific implementation)
+ */
+
+var FCKSpellCheckCommand = function()
+{
+	this.Name = 'SpellCheck' ;
+	this.IsEnabled = ( FCKConfig.SpellChecker == 'ieSpell' || FCKConfig.SpellChecker == 'SpellerPages' ) ;
+}
+
+FCKSpellCheckCommand.prototype.Execute = function()
+{
+	switch ( FCKConfig.SpellChecker )
+	{
+		case 'ieSpell' :
+			this._RunIeSpell() ;
+			break ;
+
+		case 'SpellerPages' :
+			FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ;
+			break ;
+	}
+}
+
+FCKSpellCheckCommand.prototype._RunIeSpell = function()
+{
+	try
+	{
+		var oIeSpell = new ActiveXObject( "ieSpell.ieSpellExtension" ) ;
+		oIeSpell.CheckAllLinkedDocuments( FCK.EditorDocument ) ;
+	}
+	catch( e )
+	{
+		if( e.number == -2146827859 )
+		{
+			if ( confirm( FCKLang.IeSpellDownload ) )
+				window.open( FCKConfig.IeSpellDownloadUrl , 'IeSpellDownload' ) ;
+		}
+		else
+			alert( 'Error Loading ieSpell: ' + e.message + ' (' + e.number + ')' ) ;
+	}
+}
+
+FCKSpellCheckCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckstylecommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckstylecommand.js
new file mode 100644
index 000000000..2ba19f1cf
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fckstylecommand.js
@@ -0,0 +1,60 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKStyleCommand Class: represents the "Style" command.
+ */
+
+var FCKStyleCommand = function()
+{}
+
+FCKStyleCommand.prototype =
+{
+	Name : 'Style',
+
+	Execute : function( styleName, styleComboItem )
+	{
+		FCKUndo.SaveUndoStep() ;
+
+		if ( styleComboItem.Selected )
+			FCK.Styles.RemoveStyle( styleComboItem.Style ) ;
+		else
+			FCK.Styles.ApplyStyle( styleComboItem.Style ) ;
+
+		FCKUndo.SaveUndoStep() ;
+
+		FCK.Focus() ;
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || !FCK.EditorDocument )
+			return FCK_TRISTATE_DISABLED ;
+
+		if ( FCKSelection.GetType() == 'Control' )
+		{
+			var el = FCKSelection.GetSelectedElement() ;
+			if ( !el || !FCKStyles.CheckHasObjectStyle( el.nodeName.toLowerCase() ) )
+				return FCK_TRISTATE_DISABLED ;
+		}
+
+		return FCK_TRISTATE_OFF ;
+	}
+};
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktablecommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktablecommand.js
new file mode 100644
index 000000000..8004a202f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktablecommand.js
@@ -0,0 +1,106 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKPastePlainTextCommand Class: represents the
+ * "Paste as Plain Text" command.
+ */
+
+var FCKTableCommand = function( command )
+{
+	this.Name = command ;
+}
+
+FCKTableCommand.prototype.Execute = function()
+{
+	FCKUndo.SaveUndoStep() ;
+
+	if ( ! FCKBrowserInfo.IsGecko )
+	{
+		switch ( this.Name )
+		{
+			case 'TableMergeRight' :
+				return FCKTableHandler.MergeRight() ;
+			case 'TableMergeDown' :
+				return FCKTableHandler.MergeDown() ;
+		}
+	}
+
+	switch ( this.Name )
+	{
+		case 'TableInsertRowAfter' :
+			return FCKTableHandler.InsertRow( false ) ;
+		case 'TableInsertRowBefore' :
+			return FCKTableHandler.InsertRow( true ) ;
+		case 'TableDeleteRows' :
+			return FCKTableHandler.DeleteRows() ;
+		case 'TableInsertColumnAfter' :
+			return FCKTableHandler.InsertColumn( false ) ;
+		case 'TableInsertColumnBefore' :
+			return FCKTableHandler.InsertColumn( true ) ;
+		case 'TableDeleteColumns' :
+			return FCKTableHandler.DeleteColumns() ;
+		case 'TableInsertCellAfter' :
+			return FCKTableHandler.InsertCell( null, false ) ;
+		case 'TableInsertCellBefore' :
+			return FCKTableHandler.InsertCell( null, true ) ;
+		case 'TableDeleteCells' :
+			return FCKTableHandler.DeleteCells() ;
+		case 'TableMergeCells' :
+			return FCKTableHandler.MergeCells() ;
+		case 'TableHorizontalSplitCell' :
+			return FCKTableHandler.HorizontalSplitCell() ;
+		case 'TableVerticalSplitCell' :
+			return FCKTableHandler.VerticalSplitCell() ;
+		case 'TableDelete' :
+			return FCKTableHandler.DeleteTable() ;
+		default :
+			return alert( FCKLang.UnknownCommand.replace( /%1/g, this.Name ) ) ;
+	}
+}
+
+FCKTableCommand.prototype.GetState = function()
+{
+	if ( FCK.EditorDocument != null && FCKSelection.HasAncestorNode( 'TABLE' ) )
+	{
+		switch ( this.Name )
+		{
+			case 'TableHorizontalSplitCell' :
+			case 'TableVerticalSplitCell' :
+				if ( FCKTableHandler.GetSelectedCells().length == 1 )
+					return FCK_TRISTATE_OFF ;
+				else
+					return FCK_TRISTATE_DISABLED ;
+			case 'TableMergeCells' :
+				if ( FCKTableHandler.CheckIsSelectionRectangular()
+						&& FCKTableHandler.GetSelectedCells().length > 1 )
+					return FCK_TRISTATE_OFF ;
+				else
+					return FCK_TRISTATE_DISABLED ;
+			case 'TableMergeRight' :
+				return FCKTableHandler.GetMergeRightTarget() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+			case 'TableMergeDown' :
+				return FCKTableHandler.GetMergeDownTarget() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+			default :
+				return FCK_TRISTATE_OFF ;
+		}
+	}
+	else
+		return FCK_TRISTATE_DISABLED;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
new file mode 100644
index 000000000..53949c1a1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
@@ -0,0 +1,201 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * FCKTextColorCommand Class: represents the text color comand. It shows the
+ * color selection panel.
+ */
+
+// FCKTextColorCommand Constructor
+//		type: can be 'ForeColor' or 'BackColor'.
+var FCKTextColorCommand = function( type )
+{
+	this.Name = type == 'ForeColor' ? 'TextColor' : 'BGColor' ;
+	this.Type = type ;
+
+	var oWindow ;
+
+	if ( FCKBrowserInfo.IsIE )
+		oWindow = window ;
+	else if ( FCK.ToolbarSet._IFrame )
+		oWindow = FCKTools.GetElementWindow( FCK.ToolbarSet._IFrame ) ;
+	else
+		oWindow = window.parent ;
+
+	this._Panel = new FCKPanel( oWindow ) ;
+	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
+	this._Panel.MainNode.className = 'FCK_Panel' ;
+	this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ;
+	FCK.ToolbarSet.ToolbarItems.GetItem( this.Name ).RegisterPanel( this._Panel ) ;
+
+	FCKTools.DisableSelection( this._Panel.Document.body ) ;
+}
+
+FCKTextColorCommand.prototype.Execute = function( panelX, panelY, relElement )
+{
+	// Show the Color Panel at the desired position.
+	this._Panel.Show( panelX, panelY, relElement ) ;
+}
+
+FCKTextColorCommand.prototype.SetColor = function( color )
+{
+	FCKUndo.SaveUndoStep() ;
+
+	var style = FCKStyles.GetStyle( '_FCK_' +
+		( this.Type == 'ForeColor' ? 'Color' : 'BackColor' ) ) ;
+
+	if ( !color || color.length == 0 )
+		FCK.Styles.RemoveStyle( style ) ;
+	else
+	{
+		style.SetVariable( 'Color', color ) ;
+		FCKStyles.ApplyStyle( style ) ;
+	}
+
+	FCKUndo.SaveUndoStep() ;
+
+	FCK.Focus() ;
+	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+}
+
+FCKTextColorCommand.prototype.GetState = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return FCK_TRISTATE_DISABLED ;
+	return FCK_TRISTATE_OFF ;
+}
+
+function FCKTextColorCommand_OnMouseOver()
+{
+	this.className = 'ColorSelected' ;
+}
+
+function FCKTextColorCommand_OnMouseOut()
+{
+	this.className = 'ColorDeselected' ;
+}
+
+function FCKTextColorCommand_OnClick( ev, command, color )
+{
+	this.className = 'ColorDeselected' ;
+	command.SetColor( color ) ;
+	command._Panel.Hide() ;
+}
+
+function FCKTextColorCommand_AutoOnClick( ev, command )
+{
+	this.className = 'ColorDeselected' ;
+	command.SetColor( '' ) ;
+	command._Panel.Hide() ;
+}
+
+function FCKTextColorCommand_MoreOnClick( ev, command )
+{
+	this.className = 'ColorDeselected' ;
+	command._Panel.Hide() ;
+	FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320,
+			FCKTools.Bind( command, command.SetColor ) ) ;
+}
+
+FCKTextColorCommand.prototype._CreatePanelBody = function( targetDocument, targetDiv )
+{
+	function CreateSelectionDiv()
+	{
+		var oDiv = targetDocument.createElement( "DIV" ) ;
+		oDiv.className = 'ColorDeselected' ;
+		FCKTools.AddEventListenerEx( oDiv, 'mouseover', FCKTextColorCommand_OnMouseOver ) ;
+		FCKTools.AddEventListenerEx( oDiv, 'mouseout', FCKTextColorCommand_OnMouseOut ) ;
+
+		return oDiv ;
+	}
+
+	// Create the Table that will hold all colors.
+	var oTable = targetDiv.appendChild( targetDocument.createElement( "TABLE" ) ) ;
+	oTable.className = 'ForceBaseFont' ;		// Firefox 1.5 Bug.
+	oTable.style.tableLayout = 'fixed' ;
+	oTable.cellPadding = 0 ;
+	oTable.cellSpacing = 0 ;
+	oTable.border = 0 ;
+	oTable.width = 150 ;
+
+	var oCell = oTable.insertRow(-1).insertCell(-1) ;
+	oCell.colSpan = 8 ;
+
+	// Create the Button for the "Automatic" color selection.
+	var oDiv = oCell.appendChild( CreateSelectionDiv() ) ;
+	oDiv.innerHTML =
+		'<table cellspacing="0" cellpadding="0" width="100%" border="0">\
+			<tr>\
+				<td><div class="ColorBoxBorder"><div class="ColorBox" style="background-color: #000000"></div></div></td>\
+				<td nowrap width="100%" align="center">' + FCKLang.ColorAutomatic + '</td>\
+			</tr>\
+		</table>' ;
+
+	FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_AutoOnClick, this ) ;
+
+	// Dirty hack for Opera, Safari and Firefox 3.
+	if ( !FCKBrowserInfo.IsIE )
+		oDiv.style.width = '96%' ;
+
+	// Create an array of colors based on the configuration file.
+	var aColors = FCKConfig.FontColors.toString().split(',') ;
+
+	// Create the colors table based on the array.
+	var iCounter = 0 ;
+	while ( iCounter < aColors.length )
+	{
+		var oRow = oTable.insertRow(-1) ;
+
+		for ( var i = 0 ; i < 8 ; i++, iCounter++ )
+		{
+			// The div will be created even if no more colors are available.
+			// Extra divs will be hidden later in the code. (#1597)
+			if ( iCounter < aColors.length )
+			{
+				var colorParts = aColors[iCounter].split('/') ;
+				var colorValue = '#' + colorParts[0] ;
+				var colorName = colorParts[1] || colorValue ;
+			}
+
+			oDiv = oRow.insertCell(-1).appendChild( CreateSelectionDiv() ) ;
+			oDiv.innerHTML = '<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: ' + colorValue + '"></div></div>' ;
+
+			if ( iCounter >= aColors.length )
+				oDiv.style.visibility = 'hidden' ;
+			else
+				FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
+		}
+	}
+
+	// Create the Row and the Cell for the "More Colors..." button.
+	if ( FCKConfig.EnableMoreFontColors )
+	{
+		oCell = oTable.insertRow(-1).insertCell(-1) ;
+		oCell.colSpan = 8 ;
+
+		oDiv = oCell.appendChild( CreateSelectionDiv() ) ;
+		oDiv.innerHTML = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">' + FCKLang.ColorMoreColors + '</td></tr></table>' ;
+
+		FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ;
+	}
+
+	// Dirty hack for Opera, Safari and Firefox 3.
+	if ( !FCKBrowserInfo.IsIE )
+		oDiv.style.width = '96%' ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/fckconstants.js b/modules/editor/skins/fckeditor/editor/_source/fckconstants.js
new file mode 100644
index 000000000..3d1c6a9df
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/fckconstants.js
@@ -0,0 +1,56 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines some constants used by the editor. These constants are also
+ * globally available in the page where the editor is placed.
+ */
+
+// Editor Instance Status.
+var FCK_STATUS_NOTLOADED	= window.parent.FCK_STATUS_NOTLOADED	= 0 ;
+var FCK_STATUS_ACTIVE		= window.parent.FCK_STATUS_ACTIVE		= 1 ;
+var FCK_STATUS_COMPLETE		= window.parent.FCK_STATUS_COMPLETE		= 2 ;
+
+// Tristate Operations.
+var FCK_TRISTATE_OFF		= window.parent.FCK_TRISTATE_OFF		= 0 ;
+var FCK_TRISTATE_ON			= window.parent.FCK_TRISTATE_ON			= 1 ;
+var FCK_TRISTATE_DISABLED	= window.parent.FCK_TRISTATE_DISABLED	= -1 ;
+
+// For unknown values.
+var FCK_UNKNOWN				= window.parent.FCK_UNKNOWN				= -9 ;
+
+// Toolbar Items Style.
+var FCK_TOOLBARITEM_ONLYICON	= window.parent.FCK_TOOLBARITEM_ONLYICON	= 0 ;
+var FCK_TOOLBARITEM_ONLYTEXT	= window.parent.FCK_TOOLBARITEM_ONLYTEXT	= 1 ;
+var FCK_TOOLBARITEM_ICONTEXT	= window.parent.FCK_TOOLBARITEM_ICONTEXT	= 2 ;
+
+// Edit Mode
+var FCK_EDITMODE_WYSIWYG	= window.parent.FCK_EDITMODE_WYSIWYG	= 0 ;
+var FCK_EDITMODE_SOURCE		= window.parent.FCK_EDITMODE_SOURCE		= 1 ;
+
+var FCK_IMAGES_PATH = 'images/' ;		// Check usage.
+var FCK_SPACER_PATH = 'images/spacer.gif' ;
+
+var CTRL	= 1000 ;
+var SHIFT	= 2000 ;
+var ALT		= 4000 ;
+
+var FCK_STYLE_BLOCK		= 0 ;
+var FCK_STYLE_INLINE	= 1 ;
+var FCK_STYLE_OBJECT	= 2 ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/fckeditorapi.js b/modules/editor/skins/fckeditor/editor/_source/fckeditorapi.js
new file mode 100644
index 000000000..d6501d1b5
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/fckeditorapi.js
@@ -0,0 +1,178 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Create the FCKeditorAPI object that is available as a global object in
+ * the page where the editor is placed in.
+ */
+
+var FCKeditorAPI ;
+
+function InitializeAPI()
+{
+	var oParentWindow = window.parent ;
+
+	if ( !( FCKeditorAPI = oParentWindow.FCKeditorAPI ) )
+	{
+		// Make the FCKeditorAPI object available in the parent window. Use
+		// eval so this core runs in the parent's scope and so it will still be
+		// available if the editor instance is removed ("Can't execute code
+		// from a freed script" error).
+
+		// Note: we check the existence of oEditor.GetParentForm because some external
+		// code (like JSON) can extend the Object prototype and we get then extra oEditor
+		// objects that aren't really FCKeditor instances.
+		var sScript =
+			'window.FCKeditorAPI = {' +
+				'Version : "2.6.3",' +
+				'VersionBuild : "19836",' +
+				'Instances : new Object(),' +
+
+				'GetInstance : function( name )' +
+				'{' +
+					'return this.Instances[ name ];' +
+				'},' +
+
+				'_FormSubmit : function()' +
+				'{' +
+					'for ( var name in FCKeditorAPI.Instances )' +
+					'{' +
+						'var oEditor = FCKeditorAPI.Instances[ name ] ;' +
+						'if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )' +
+							'oEditor.UpdateLinkedField() ;' +
+					'}' +
+					'this._FCKOriginalSubmit() ;' +
+				'},' +
+
+				'_FunctionQueue	: {' +
+					'Functions : new Array(),' +
+					'IsRunning : false,' +
+
+					'Add : function( f )' +
+					'{' +
+						'this.Functions.push( f );' +
+						'if ( !this.IsRunning )' +
+							'this.StartNext();' +
+					'},' +
+
+					'StartNext : function()' +
+					'{' +
+						'var aQueue = this.Functions ;' +
+						'if ( aQueue.length > 0 )' +
+						'{' +
+							'this.IsRunning = true;' +
+							'aQueue[0].call();' +
+						'}' +
+						'else ' +
+							'this.IsRunning = false;' +
+					'},' +
+
+					'Remove : function( f )' +
+					'{' +
+						'var aQueue = this.Functions;' +
+						'var i = 0, fFunc;' +
+						'while( (fFunc = aQueue[ i ]) )' +
+						'{' +
+							'if ( fFunc == f )' +
+								'aQueue.splice( i,1 );' +
+							'i++ ;' +
+						'}' +
+						'this.StartNext();' +
+					'}' +
+				'}' +
+			'}' ;
+
+		// In IE, the "eval" function is not always available (it works with
+		// the JavaScript samples, but not with the ASP ones, for example).
+		// So, let's use the execScript instead.
+		if ( oParentWindow.execScript )
+			oParentWindow.execScript( sScript, 'JavaScript' ) ;
+		else
+		{
+			if ( FCKBrowserInfo.IsGecko10 )
+			{
+				// FF 1.0.4 gives an error with the request bellow. The
+				// following seams to work well.
+				eval.call( oParentWindow, sScript ) ;
+			}
+			else if( FCKBrowserInfo.IsAIR )
+			{
+				FCKAdobeAIR.FCKeditorAPI_Evaluate( oParentWindow, sScript ) ;
+			}
+			else if ( FCKBrowserInfo.IsSafari )
+			{
+				// oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
+				// environment, instead of the parent one. The following should make it work.
+				var oParentDocument = oParentWindow.document ;
+				var eScript = oParentDocument.createElement('script') ;
+				eScript.appendChild( oParentDocument.createTextNode( sScript ) ) ;
+				oParentDocument.documentElement.appendChild( eScript ) ;
+			}
+			else
+				oParentWindow.eval( sScript ) ;
+		}
+
+		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
+
+		// The __Instances properly has been changed to the public Instances,
+		// but we should still have the "deprecated" version of it.
+		FCKeditorAPI.__Instances = FCKeditorAPI.Instances ;
+	}
+
+	// Add the current instance to the FCKeditorAPI's instances collection.
+	FCKeditorAPI.Instances[ FCK.Name ] = FCK ;
+}
+
+// Attach to the form onsubmit event and to the form.submit().
+function _AttachFormSubmitToAPI()
+{
+	// Get the linked field form.
+	var oForm = FCK.GetParentForm() ;
+
+	if ( oForm )
+	{
+		// Attach to the onsubmit event.
+		FCKTools.AddEventListener( oForm, 'submit', FCK.UpdateLinkedField ) ;
+
+		// IE sees oForm.submit function as an 'object'.
+		if ( !oForm._FCKOriginalSubmit && ( typeof( oForm.submit ) == 'function' || ( !oForm.submit.tagName && !oForm.submit.length ) ) )
+		{
+			// Save the original submit.
+			oForm._FCKOriginalSubmit = oForm.submit ;
+
+			// Create our replacement for the submit.
+			oForm.submit = FCKeditorAPI._FormSubmit ;
+		}
+	}
+}
+
+function FCKeditorAPI_Cleanup()
+{
+	if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat
+			&& !window.FCKUnloadFlag )
+		return ;
+	delete FCKeditorAPI.Instances[ FCK.Name ] ;
+}
+function FCKeditorAPI_ConfirmCleanup()
+{
+	if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat )
+		window.FCKUnloadFlag = true ;
+}
+FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
+FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/fckjscoreextensions.js b/modules/editor/skins/fckeditor/editor/_source/fckjscoreextensions.js
new file mode 100644
index 000000000..2c2c0397e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/fckjscoreextensions.js
@@ -0,0 +1,166 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Extensions to the JavaScript Core.
+ *
+ * All custom extensions functions are PascalCased to differ from the standard
+ * camelCased ones.
+ */
+
+String.prototype.Contains = function( textToCheck )
+{
+	return ( this.indexOf( textToCheck ) > -1 ) ;
+}
+
+String.prototype.Equals = function()
+{
+	var aArgs = arguments ;
+
+	// The arguments could also be a single array.
+	if ( aArgs.length == 1 && aArgs[0].pop )
+		aArgs = aArgs[0] ;
+
+	for ( var i = 0 ; i < aArgs.length ; i++ )
+	{
+		if ( this == aArgs[i] )
+			return true ;
+	}
+	return false ;
+}
+
+String.prototype.IEquals = function()
+{
+	var thisUpper = this.toUpperCase() ;
+
+	var aArgs = arguments ;
+
+	// The arguments could also be a single array.
+	if ( aArgs.length == 1 && aArgs[0].pop )
+		aArgs = aArgs[0] ;
+
+	for ( var i = 0 ; i < aArgs.length ; i++ )
+	{
+		if ( thisUpper == aArgs[i].toUpperCase() )
+			return true ;
+	}
+	return false ;
+}
+
+String.prototype.ReplaceAll = function( searchArray, replaceArray )
+{
+	var replaced = this ;
+
+	for ( var i = 0 ; i < searchArray.length ; i++ )
+	{
+		replaced = replaced.replace( searchArray[i], replaceArray[i] ) ;
+	}
+
+	return replaced ;
+}
+
+String.prototype.StartsWith = function( value )
+{
+	return ( this.substr( 0, value.length ) == value ) ;
+}
+
+// Extends the String object, creating a "EndsWith" method on it.
+String.prototype.EndsWith = function( value, ignoreCase )
+{
+	var L1 = this.length ;
+	var L2 = value.length ;
+
+	if ( L2 > L1 )
+		return false ;
+
+	if ( ignoreCase )
+	{
+		var oRegex = new RegExp( value + '$' , 'i' ) ;
+		return oRegex.test( this ) ;
+	}
+	else
+		return ( L2 == 0 || this.substr( L1 - L2, L2 ) == value ) ;
+}
+
+String.prototype.Remove = function( start, length )
+{
+	var s = '' ;
+
+	if ( start > 0 )
+		s = this.substring( 0, start ) ;
+
+	if ( start + length < this.length )
+		s += this.substring( start + length , this.length ) ;
+
+	return s ;
+}
+
+String.prototype.Trim = function()
+{
+	// We are not using \s because we don't want "non-breaking spaces to be caught".
+	return this.replace( /(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '' ) ;
+}
+
+String.prototype.LTrim = function()
+{
+	// We are not using \s because we don't want "non-breaking spaces to be caught".
+	return this.replace( /^[ \t\n\r]*/g, '' ) ;
+}
+
+String.prototype.RTrim = function()
+{
+	// We are not using \s because we don't want "non-breaking spaces to be caught".
+	return this.replace( /[ \t\n\r]*$/g, '' ) ;
+}
+
+String.prototype.ReplaceNewLineChars = function( replacement )
+{
+	return this.replace( /\n/g, replacement ) ;
+}
+
+String.prototype.Replace = function( regExp, replacement, thisObj )
+{
+	if ( typeof replacement == 'function' )
+	{
+		return this.replace( regExp,
+			function()
+			{
+				return replacement.apply( thisObj || this, arguments ) ;
+			} ) ;
+	}
+	else
+		return this.replace( regExp, replacement ) ;
+}
+
+Array.prototype.AddItem = function( item )
+{
+	var i = this.length ;
+	this[ i ] = item ;
+	return i ;
+}
+
+Array.prototype.IndexOf = function( value )
+{
+	for ( var i = 0 ; i < this.length ; i++ )
+	{
+		if ( this[i] == value )
+			return i ;
+	}
+	return -1 ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/fckscriptloader.js b/modules/editor/skins/fckeditor/editor/_source/fckscriptloader.js
new file mode 100644
index 000000000..fd5aa6d9a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/fckscriptloader.js
@@ -0,0 +1,122 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is a utility object which can be used to load specific components of
+ * FCKeditor, including all dependencies.
+ */
+
+var FCK_GENERIC = 1 ;
+var FCK_GENERIC_SPECIFIC = 2 ;
+var FCK_SPECIFIC = 3 ;
+
+var FCKScriptLoader = new Object() ;
+FCKScriptLoader.FCKeditorPath = '/fckeditor/' ;
+
+FCKScriptLoader._Scripts = new Object() ;
+FCKScriptLoader._LoadedScripts = new Object() ;
+
+FCKScriptLoader._IsIE = (/msie/).test( navigator.userAgent.toLowerCase() ) ;
+
+FCKScriptLoader.Load = function( scriptName )
+{
+	// Check if the script has already been loaded.
+	if ( scriptName in FCKScriptLoader._LoadedScripts )
+		return ;
+
+	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
+
+	var oScriptInfo = this._Scripts[ scriptName ] ;
+
+	if ( !oScriptInfo )
+	{
+		alert( 'FCKScriptLoader: The script "' + scriptName + '" could not be loaded' ) ;
+		return ;
+	}
+
+	for ( var i = 0 ; i < oScriptInfo.Dependency.length ; i++ )
+	{
+		this.Load( oScriptInfo.Dependency[i] ) ;
+	}
+
+	var sBaseScriptName = oScriptInfo.BasePath + scriptName.toLowerCase() ;
+
+	if ( oScriptInfo.Compatibility == FCK_GENERIC || oScriptInfo.Compatibility == FCK_GENERIC_SPECIFIC )
+		this._LoadScript( sBaseScriptName + '.js' ) ;
+
+	if ( oScriptInfo.Compatibility == FCK_SPECIFIC || oScriptInfo.Compatibility == FCK_GENERIC_SPECIFIC )
+	{
+		if ( this._IsIE )
+			this._LoadScript( sBaseScriptName + '_ie.js' ) ;
+		else
+			this._LoadScript( sBaseScriptName + '_gecko.js' ) ;
+	}
+}
+
+FCKScriptLoader._LoadScript = function( scriptPathFromSource )
+{
+	document.write( '<script type="text/javascript" src="' + this.FCKeditorPath + 'editor/_source/' + scriptPathFromSource + '"><\/script>' ) ;
+}
+
+FCKScriptLoader.AddScript = function( scriptName, scriptBasePath, dependency, compatibility )
+{
+	this._Scripts[ scriptName ] =
+	{
+		BasePath : scriptBasePath || '',
+		Dependency : dependency || [],
+		Compatibility : compatibility || FCK_GENERIC
+	} ;
+}
+
+/*
+ * ####################################
+ * ### Scripts Definition List
+ */
+
+FCKScriptLoader.AddScript( 'FCKConstants' ) ;
+FCKScriptLoader.AddScript( 'FCKJSCoreExtensions' ) ;
+
+FCKScriptLoader.AddScript( 'FCK_Xhtml10Transitional', '../dtd/' ) ;
+
+FCKScriptLoader.AddScript( 'FCKDataProcessor'	, 'classes/'	, ['FCKConfig','FCKBrowserInfo','FCKRegexLib','FCKXHtml'] ) ;
+FCKScriptLoader.AddScript( 'FCKDocumentFragment', 'classes/'	, ['FCKDomTools'], FCK_SPECIFIC ) ;
+FCKScriptLoader.AddScript( 'FCKDomRange'		, 'classes/'	, ['FCKBrowserInfo','FCKJSCoreExtensions','FCKW3CRange','FCKElementPath','FCKDomTools','FCKTools','FCKDocumentFragment'], FCK_GENERIC_SPECIFIC ) ;
+FCKScriptLoader.AddScript( 'FCKDomRangeIterator', 'classes/'	, ['FCKDomRange','FCKListsLib'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKElementPath'		, 'classes/'	, ['FCKListsLib'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKEnterKey'		, 'classes/'	, ['FCKDomRange','FCKDomTools','FCKTools','FCKKeystrokeHandler','FCKListHandler'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKPanel'			, 'classes/'	, ['FCKBrowserInfo','FCKConfig','FCKTools'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKImagePreloader'	, 'classes/' ) ;
+FCKScriptLoader.AddScript( 'FCKKeystrokeHandler', 'classes/'	, ['FCKConstants','FCKBrowserInfo','FCKTools'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKStyle'			, 'classes/'	, ['FCKConstants','FCKDomRange','FCKDomRangeIterator','FCKDomTools','FCKListsLib','FCK_Xhtml10Transitional'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKW3CRange'		, 'classes/'	, ['FCKDomTools','FCKTools','FCKDocumentFragment'], FCK_GENERIC ) ;
+
+FCKScriptLoader.AddScript( 'FCKBrowserInfo'		, 'internals/'	, ['FCKJSCoreExtensions'] ) ;
+FCKScriptLoader.AddScript( 'FCKCodeFormatter'	, 'internals/' ) ;
+FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
+FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
+FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools','FCKDomRange'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
+FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKRegexLib'		, 'internals/' ) ;
+FCKScriptLoader.AddScript( 'FCKStyles'			, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKDomRange','FCKDomTools','FCKElementPath','FCKTools'], FCK_GENERIC ) ;
+FCKScriptLoader.AddScript( 'FCKTools'			, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo'], FCK_GENERIC_SPECIFIC ) ;
+FCKScriptLoader.AddScript( 'FCKXHtml'			, 'internals/'	, ['FCKBrowserInfo','FCKCodeFormatter','FCKConfig','FCKDomTools','FCKListsLib','FCKRegexLib','FCKTools','FCKXHtmlEntities'], FCK_GENERIC_SPECIFIC ) ;
+FCKScriptLoader.AddScript( 'FCKXHtmlEntities'	, 'internals/'	, ['FCKConfig'] ) ;
+
+// ####################################
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fck.js b/modules/editor/skins/fckeditor/editor/_source/internals/fck.js
new file mode 100644
index 000000000..af3c455fd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fck.js
@@ -0,0 +1,1252 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Creation and initialization of the "FCK" object. This is the main object
+ * that represents an editor instance.
+ */
+
+// FCK represents the active editor instance.
+var FCK =
+{
+	Name			: FCKURLParams[ 'InstanceName' ],
+	Status			: FCK_STATUS_NOTLOADED,
+	EditMode		: FCK_EDITMODE_WYSIWYG,
+	Toolbar			: null,
+	HasFocus		: false,
+	DataProcessor	: new FCKDataProcessor(),
+
+	GetInstanceObject	: (function()
+	{
+		var w = window ;
+		return function( name )
+		{
+			return w[name] ;
+		}
+	})(),
+
+	AttachToOnSelectionChange : function( functionPointer )
+	{
+		this.Events.AttachEvent( 'OnSelectionChange', functionPointer ) ;
+	},
+
+	GetLinkedFieldValue : function()
+	{
+		return this.LinkedField.value ;
+	},
+
+	GetParentForm : function()
+	{
+		return this.LinkedField.form ;
+	} ,
+
+	// # START : IsDirty implementation
+
+	StartupValue : '',
+
+	IsDirty : function()
+	{
+		if ( this.EditMode == FCK_EDITMODE_SOURCE )
+			return ( this.StartupValue != this.EditingArea.Textarea.value ) ;
+		else
+		{
+			// It can happen switching between design and source mode in Gecko
+			if ( ! this.EditorDocument )
+				return false ;
+
+			return ( this.StartupValue != this.EditorDocument.body.innerHTML ) ;
+		}
+	},
+
+	ResetIsDirty : function()
+	{
+		if ( this.EditMode == FCK_EDITMODE_SOURCE )
+			this.StartupValue = this.EditingArea.Textarea.value ;
+		else if ( this.EditorDocument.body )
+			this.StartupValue = this.EditorDocument.body.innerHTML ;
+	},
+
+	// # END : IsDirty implementation
+
+	StartEditor : function()
+	{
+		this.TempBaseTag = FCKConfig.BaseHref.length > 0 ? '<base href="' + FCKConfig.BaseHref + '" _fcktemp="true"></base>' : '' ;
+
+		// Setup the keystroke handler.
+		var oKeystrokeHandler = FCK.KeystrokeHandler = new FCKKeystrokeHandler() ;
+		oKeystrokeHandler.OnKeystroke = _FCK_KeystrokeHandler_OnKeystroke ;
+
+		// Set the config keystrokes.
+		oKeystrokeHandler.SetKeystrokes( FCKConfig.Keystrokes ) ;
+
+		// In IE7, if the editor tries to access the clipboard by code, a dialog is
+		// shown to the user asking if the application is allowed to access or not.
+		// Due to the IE implementation of it, the KeystrokeHandler will not work
+		//well in this case, so we must leave the pasting keys to have their default behavior.
+		if ( FCKBrowserInfo.IsIE7 )
+		{
+			if ( ( CTRL + 86 /*V*/ ) in oKeystrokeHandler.Keystrokes )
+				oKeystrokeHandler.SetKeystrokes( [ CTRL + 86, true ] ) ;
+
+			if ( ( SHIFT + 45 /*INS*/ ) in oKeystrokeHandler.Keystrokes )
+				oKeystrokeHandler.SetKeystrokes( [ SHIFT + 45, true ] ) ;
+		}
+
+		// Retain default behavior for Ctrl-Backspace. (Bug #362)
+		oKeystrokeHandler.SetKeystrokes( [ CTRL + 8, true ] ) ;
+
+		this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ;
+		this.EditingArea.FFSpellChecker = FCKConfig.FirefoxSpellChecker ;
+
+		// Set the editor's startup contents.
+		this.SetData( this.GetLinkedFieldValue(), true ) ;
+
+		// Tab key handling for source mode.
+		FCKTools.AddEventListener( document, "keydown", this._TabKeyHandler ) ;
+
+		// Add selection change listeners. They must be attached only once.
+		this.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
+		if ( FCKBrowserInfo.IsGecko )
+			this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ;
+
+	},
+
+	Focus : function()
+	{
+		FCK.EditingArea.Focus() ;
+	},
+
+	SetStatus : function( newStatus )
+	{
+		this.Status = newStatus ;
+
+		if ( newStatus == FCK_STATUS_ACTIVE )
+		{
+			FCKFocusManager.AddWindow( window, true ) ;
+
+			if ( FCKBrowserInfo.IsIE )
+				FCKFocusManager.AddWindow( window.frameElement, true ) ;
+
+			// Force the focus in the editor.
+			if ( FCKConfig.StartupFocus )
+				FCK.Focus() ;
+		}
+
+		this.Events.FireEvent( 'OnStatusChange', newStatus ) ;
+
+	},
+
+	// Fixes the body by moving all inline and text nodes to appropriate block
+	// elements.
+	FixBody : function()
+	{
+		var sBlockTag = FCKConfig.EnterMode ;
+
+		// In 'br' mode, no fix must be done.
+		if ( sBlockTag != 'p' && sBlockTag != 'div' )
+			return ;
+
+		var oDocument = this.EditorDocument ;
+
+		if ( !oDocument )
+			return ;
+
+		var oBody = oDocument.body ;
+
+		if ( !oBody )
+			return ;
+
+		FCKDomTools.TrimNode( oBody ) ;
+
+		var oNode = oBody.firstChild ;
+		var oNewBlock ;
+
+		while ( oNode )
+		{
+			var bMoveNode = false ;
+
+			switch ( oNode.nodeType )
+			{
+				// Element Node.
+				case 1 :
+					var nodeName = oNode.nodeName.toLowerCase() ;
+					if ( !FCKListsLib.BlockElements[ nodeName ] &&
+							nodeName != 'li' &&
+							!oNode.getAttribute('_fckfakelement') &&
+							oNode.getAttribute('_moz_dirty') == null )
+						bMoveNode = true ;
+					break ;
+
+				// Text Node.
+				case 3 :
+					// Ignore space only or empty text.
+					if ( oNewBlock || oNode.nodeValue.Trim().length > 0 )
+						bMoveNode = true ;
+					break;
+
+				// Comment Node
+				case 8 :
+					if ( oNewBlock )
+						bMoveNode = true ;
+					break;
+			}
+
+			if ( bMoveNode )
+			{
+				var oParent = oNode.parentNode ;
+
+				if ( !oNewBlock )
+					oNewBlock = oParent.insertBefore( oDocument.createElement( sBlockTag ), oNode ) ;
+
+				oNewBlock.appendChild( oParent.removeChild( oNode ) ) ;
+
+				oNode = oNewBlock.nextSibling ;
+			}
+			else
+			{
+				if ( oNewBlock )
+				{
+					FCKDomTools.TrimNode( oNewBlock ) ;
+					oNewBlock = null ;
+				}
+				oNode = oNode.nextSibling ;
+			}
+		}
+
+		if ( oNewBlock )
+			FCKDomTools.TrimNode( oNewBlock ) ;
+	},
+
+	GetData : function( format )
+	{
+		// We assume that if the user is in source editing, the editor value must
+		// represent the exact contents of the source, as the user wanted it to be.
+		if ( FCK.EditMode == FCK_EDITMODE_SOURCE )
+				return FCK.EditingArea.Textarea.value ;
+
+		this.FixBody() ;
+
+		var oDoc = FCK.EditorDocument ;
+		if ( !oDoc )
+			return null ;
+
+		var isFullPage = FCKConfig.FullPage ;
+
+		// Call the Data Processor to generate the output data.
+		var data = FCK.DataProcessor.ConvertToDataFormat(
+			isFullPage ? oDoc.documentElement : oDoc.body,
+			!isFullPage,
+			FCKConfig.IgnoreEmptyParagraphValue,
+			format ) ;
+
+		// Restore protected attributes.
+		data = FCK.ProtectEventsRestore( data ) ;
+
+		if ( FCKBrowserInfo.IsIE )
+			data = data.replace( FCKRegexLib.ToReplace, '$1' ) ;
+
+		if ( isFullPage )
+		{
+			if ( FCK.DocTypeDeclaration && FCK.DocTypeDeclaration.length > 0 )
+				data = FCK.DocTypeDeclaration + '\n' + data ;
+
+			if ( FCK.XmlDeclaration && FCK.XmlDeclaration.length > 0 )
+				data = FCK.XmlDeclaration + '\n' + data ;
+		}
+
+		return FCKConfig.ProtectedSource.Revert( data ) ;
+	},
+
+	UpdateLinkedField : function()
+	{
+		var value = FCK.GetXHTML( FCKConfig.FormatOutput ) ;
+
+		if ( FCKConfig.HtmlEncodeOutput )
+			value = FCKTools.HTMLEncode( value ) ;
+
+		FCK.LinkedField.value = value ;
+		FCK.Events.FireEvent( 'OnAfterLinkedFieldUpdate' ) ;
+	},
+
+	RegisteredDoubleClickHandlers : new Object(),
+
+	OnDoubleClick : function( element )
+	{
+		var oCalls = FCK.RegisteredDoubleClickHandlers[ element.tagName.toUpperCase() ] ;
+
+		if ( oCalls )
+		{
+			for ( var i = 0 ; i < oCalls.length ; i++ )
+				oCalls[ i ]( element ) ;
+		}
+
+		// Generic handler for any element
+		oCalls = FCK.RegisteredDoubleClickHandlers[ '*' ] ;
+
+		if ( oCalls )
+		{
+			for ( var i = 0 ; i < oCalls.length ; i++ )
+				oCalls[ i ]( element ) ;
+		}
+
+	},
+
+	// Register objects that can handle double click operations.
+	RegisterDoubleClickHandler : function( handlerFunction, tag )
+	{
+		var nodeName = tag || '*' ;
+		nodeName = nodeName.toUpperCase() ;
+
+		var aTargets ;
+
+		if ( !( aTargets = FCK.RegisteredDoubleClickHandlers[ nodeName ] ) )
+			FCK.RegisteredDoubleClickHandlers[ nodeName ] = [ handlerFunction ] ;
+		else
+		{
+			// Check that the event handler isn't already registered with the same listener
+			// It doesn't detect function pointers belonging to an object (at least in Gecko)
+			if ( aTargets.IndexOf( handlerFunction ) == -1 )
+				aTargets.push( handlerFunction ) ;
+		}
+
+	},
+
+	OnAfterSetHTML : function()
+	{
+		FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+		FCKUndo.SaveUndoStep() ;
+
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+		FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
+	},
+
+	// Saves URLs on links and images on special attributes, so they don't change when
+	// moving around.
+	ProtectUrls : function( html )
+	{
+		// <A> href
+		html = html.replace( FCKRegexLib.ProtectUrlsA	, '$& _fcksavedurl=$1' ) ;
+
+		// <IMG> src
+		html = html.replace( FCKRegexLib.ProtectUrlsImg	, '$& _fcksavedurl=$1' ) ;
+
+		// <AREA> href
+		html = html.replace( FCKRegexLib.ProtectUrlsArea	, '$& _fcksavedurl=$1' ) ;
+
+		return html ;
+	},
+
+	// Saves event attributes (like onclick) so they don't get executed while
+	// editing.
+	ProtectEvents : function( html )
+	{
+		return html.replace( FCKRegexLib.TagsWithEvent, _FCK_ProtectEvents_ReplaceTags ) ;
+	},
+
+	ProtectEventsRestore : function( html )
+	{
+		return html.replace( FCKRegexLib.ProtectedEvents, _FCK_ProtectEvents_RestoreEvents ) ;
+	},
+
+	ProtectTags : function( html )
+	{
+		var sTags = FCKConfig.ProtectedTags ;
+
+		// IE doesn't support <abbr> and it breaks it. Let's protect it.
+		if ( FCKBrowserInfo.IsIE )
+			sTags += sTags.length > 0 ? '|ABBR|XML|EMBED|OBJECT' : 'ABBR|XML|EMBED|OBJECT' ;
+
+		var oRegex ;
+		if ( sTags.length > 0 )
+		{
+			oRegex = new RegExp( '<(' + sTags + ')(?!\w|:)', 'gi' ) ;
+			html = html.replace( oRegex, '<FCK:$1' ) ;
+
+			oRegex = new RegExp( '<\/(' + sTags + ')>', 'gi' ) ;
+			html = html.replace( oRegex, '<\/FCK:$1>' ) ;
+		}
+
+		// Protect some empty elements. We must do it separately because the
+		// original tag may not contain the closing slash, like <hr>:
+		//		- <meta> tags get executed, so if you have a redirect meta, the
+		//		  content will move to the target page.
+		//		- <hr> may destroy the document structure if not well
+		//		  positioned. The trick is protect it here and restore them in
+		//		  the FCKDocumentProcessor.
+		sTags = 'META' ;
+		if ( FCKBrowserInfo.IsIE )
+			sTags += '|HR' ;
+
+		oRegex = new RegExp( '<((' + sTags + ')(?=\\s|>|/)[\\s\\S]*?)/?>', 'gi' ) ;
+		html = html.replace( oRegex, '<FCK:$1 />' ) ;
+
+		return html ;
+	},
+
+	SetData : function( data, resetIsDirty )
+	{
+		this.EditingArea.Mode = FCK.EditMode ;
+
+		// If there was an onSelectionChange listener in IE we must remove it to avoid crashes #1498
+		if ( FCKBrowserInfo.IsIE && FCK.EditorDocument )
+		{
+			FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
+		}
+
+		FCKTempBin.Reset();
+
+		if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+		{
+			// Save the resetIsDirty for later use (async)
+			this._ForceResetIsDirty = ( resetIsDirty === true ) ;
+
+			// Protect parts of the code that must remain untouched (and invisible)
+			// during editing.
+			data = FCKConfig.ProtectedSource.Protect( data ) ;
+
+			// Call the Data Processor to transform the data.
+			data = FCK.DataProcessor.ConvertToHtml( data ) ;
+
+			// Fix for invalid self-closing tags (see #152).
+			data = data.replace( FCKRegexLib.InvalidSelfCloseTags, '$1></$2>' ) ;
+
+			// Protect event attributes (they could get fired in the editing area).
+			data = FCK.ProtectEvents( data ) ;
+
+			// Protect some things from the browser itself.
+			data = FCK.ProtectUrls( data ) ;
+			data = FCK.ProtectTags( data ) ;
+
+			// Insert the base tag (FCKConfig.BaseHref), if not exists in the source.
+			// The base must be the first tag in the HEAD, to get relative
+			// links on styles, for example.
+			if ( FCK.TempBaseTag.length > 0 && !FCKRegexLib.HasBaseTag.test( data ) )
+				data = data.replace( FCKRegexLib.HeadOpener, '$&' + FCK.TempBaseTag ) ;
+
+			// Build the HTML for the additional things we need on <head>.
+			var sHeadExtra = '' ;
+
+			if ( !FCKConfig.FullPage )
+				sHeadExtra += _FCK_GetEditorAreaStyleTags() ;
+
+			if ( FCKBrowserInfo.IsIE )
+				sHeadExtra += FCK._GetBehaviorsStyle() ;
+			else if ( FCKConfig.ShowBorders )
+				sHeadExtra += FCKTools.GetStyleHtml( FCK_ShowTableBordersCSS, true ) ;
+
+			sHeadExtra += FCKTools.GetStyleHtml( FCK_InternalCSS, true ) ;
+
+			// Attention: do not change it before testing it well (sample07)!
+			// This is tricky... if the head ends with <meta ... content type>,
+			// Firefox will break. But, it works if we place our extra stuff as
+			// the last elements in the HEAD.
+			data = data.replace( FCKRegexLib.HeadCloser, sHeadExtra + '$&' ) ;
+
+			// Load the HTML in the editing area.
+			this.EditingArea.OnLoad = _FCK_EditingArea_OnLoad ;
+			this.EditingArea.Start( data ) ;
+		}
+		else
+		{
+			// Remove the references to the following elements, as the editing area
+			// IFRAME will be removed.
+			FCK.EditorWindow	= null ;
+			FCK.EditorDocument	= null ;
+			FCKDomTools.PaddingNode = null ;
+
+			this.EditingArea.OnLoad = null ;
+			this.EditingArea.Start( data ) ;
+
+			// Enables the context menu in the textarea.
+			this.EditingArea.Textarea._FCKShowContextMenu = true ;
+
+			// Removes the enter key handler.
+			FCK.EnterKeyHandler = null ;
+
+			if ( resetIsDirty )
+				this.ResetIsDirty() ;
+
+			// Listen for keystroke events.
+			FCK.KeystrokeHandler.AttachToElement( this.EditingArea.Textarea ) ;
+
+			this.EditingArea.Textarea.focus() ;
+
+			FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
+		}
+
+		if ( FCKBrowserInfo.IsGecko )
+			window.onresize() ;
+	},
+
+	// This collection is used by the browser specific implementations to tell
+	// which named commands must be handled separately.
+	RedirectNamedCommands : new Object(),
+
+	ExecuteNamedCommand : function( commandName, commandParameter, noRedirect, noSaveUndo )
+	{
+		if ( !noSaveUndo )
+			FCKUndo.SaveUndoStep() ;
+
+		if ( !noRedirect && FCK.RedirectNamedCommands[ commandName ] != null )
+			FCK.ExecuteRedirectedNamedCommand( commandName, commandParameter ) ;
+		else
+		{
+			FCK.Focus() ;
+			FCK.EditorDocument.execCommand( commandName, false, commandParameter ) ;
+			FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+		}
+
+		if ( !noSaveUndo )
+		FCKUndo.SaveUndoStep() ;
+	},
+
+	GetNamedCommandState : function( commandName )
+	{
+		try
+		{
+
+			// Bug #50 : Safari never returns positive state for the Paste command, override that.
+			if ( FCKBrowserInfo.IsSafari && FCK.EditorWindow && commandName.IEquals( 'Paste' ) )
+				return FCK_TRISTATE_OFF ;
+
+			if ( !FCK.EditorDocument.queryCommandEnabled( commandName ) )
+				return FCK_TRISTATE_DISABLED ;
+			else
+			{
+				return FCK.EditorDocument.queryCommandState( commandName ) ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
+			}
+		}
+		catch ( e )
+		{
+			return FCK_TRISTATE_OFF ;
+		}
+	},
+
+	GetNamedCommandValue : function( commandName )
+	{
+		var sValue = '' ;
+		var eState = FCK.GetNamedCommandState( commandName ) ;
+
+		if ( eState == FCK_TRISTATE_DISABLED )
+			return null ;
+
+		try
+		{
+			sValue = this.EditorDocument.queryCommandValue( commandName ) ;
+		}
+		catch(e) {}
+
+		return sValue ? sValue : '' ;
+	},
+
+	Paste : function( _callListenersOnly )
+	{
+		// First call 'OnPaste' listeners.
+		if ( FCK.Status != FCK_STATUS_COMPLETE || !FCK.Events.FireEvent( 'OnPaste' ) )
+			return false ;
+
+		// Then call the default implementation.
+		return _callListenersOnly || FCK._ExecPaste() ;
+	},
+
+	PasteFromWord : function()
+	{
+		FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.PasteFromWord, 'dialog/fck_paste.html', 400, 330, 'Word' ) ;
+	},
+
+	Preview : function()
+	{
+		var sHTML ;
+
+		if ( FCKConfig.FullPage )
+		{
+			if ( FCK.TempBaseTag.length > 0 )
+				sHTML = FCK.TempBaseTag + FCK.GetXHTML() ;
+			else
+				sHTML = FCK.GetXHTML() ;
+		}
+		else
+		{
+			sHTML =
+				FCKConfig.DocType +
+				'<html dir="' + FCKConfig.ContentLangDirection + '">' +
+				'<head>' +
+				FCK.TempBaseTag +
+				'<title>' + FCKLang.Preview + '</title>' +
+				_FCK_GetEditorAreaStyleTags() +
+				'</head><body' + FCKConfig.GetBodyAttributes() + '>' +
+				FCK.GetXHTML() +
+				'</body></html>' ;
+		}
+
+		var iWidth	= FCKConfig.ScreenWidth * 0.8 ;
+		var iHeight	= FCKConfig.ScreenHeight * 0.7 ;
+		var iLeft	= ( FCKConfig.ScreenWidth - iWidth ) / 2 ;
+
+		var sOpenUrl = '' ;
+		if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE)
+		{
+			window._FCKHtmlToLoad = sHTML ;
+			sOpenUrl = 'javascript:void( (function(){' +
+				'document.open() ;' +
+				'document.domain="' + document.domain + '" ;' +
+				'document.write( window.opener._FCKHtmlToLoad );' +
+				'document.close() ;' +
+				'window.opener._FCKHtmlToLoad = null ;' +
+				'})() )' ;
+		}
+
+		var oWindow = window.open( sOpenUrl, null, 'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=' + iWidth + ',height=' + iHeight + ',left=' + iLeft ) ;
+
+		if ( !FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE)
+		{
+			oWindow.document.write( sHTML );
+			oWindow.document.close();
+		}
+
+	},
+
+	SwitchEditMode : function( noUndo )
+	{
+		var bIsWysiwyg = ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) ;
+
+		// Save the current IsDirty state, so we may restore it after the switch.
+		var bIsDirty = FCK.IsDirty() ;
+
+		var sHtml ;
+
+		// Update the HTML in the view output to show, also update
+		// FCKTempBin for IE to avoid #2263.
+		if ( bIsWysiwyg )
+		{
+			FCKCommands.GetCommand( 'ShowBlocks' ).SaveState() ;
+			if ( !noUndo && FCKBrowserInfo.IsIE )
+				FCKUndo.SaveUndoStep() ;
+
+			sHtml = FCK.GetXHTML( FCKConfig.FormatSource ) ;
+
+			if ( FCKBrowserInfo.IsIE )
+				FCKTempBin.ToHtml() ;
+
+			if ( sHtml == null )
+				return false ;
+		}
+		else
+			sHtml = this.EditingArea.Textarea.value ;
+
+		FCK.EditMode = bIsWysiwyg ? FCK_EDITMODE_SOURCE : FCK_EDITMODE_WYSIWYG ;
+
+		FCK.SetData( sHtml, !bIsDirty ) ;
+
+		// Set the Focus.
+		FCK.Focus() ;
+
+		// Update the toolbar (Running it directly causes IE to fail).
+		FCKTools.RunFunction( FCK.ToolbarSet.RefreshModeState, FCK.ToolbarSet ) ;
+
+		return true ;
+	},
+
+	InsertElement : function( element )
+	{
+		// The parameter may be a string (element name), so transform it in an element.
+		if ( typeof element == 'string' )
+			element = this.EditorDocument.createElement( element ) ;
+
+		var elementName = element.nodeName.toLowerCase() ;
+
+		FCKSelection.Restore() ;
+
+		// Create a range for the selection. V3 will have a new selection
+		// object that may internally supply this feature.
+		var range = new FCKDomRange( this.EditorWindow ) ;
+
+		// Move to the selection and delete it.
+		range.MoveToSelection() ;
+		range.DeleteContents() ;
+
+		if ( FCKListsLib.BlockElements[ elementName ] != null )
+		{
+			if ( range.StartBlock )
+			{
+				if ( range.CheckStartOfBlock() )
+					range.MoveToPosition( range.StartBlock, 3 ) ;
+				else if ( range.CheckEndOfBlock() )
+					range.MoveToPosition( range.StartBlock, 4 ) ;
+				else
+					range.SplitBlock() ;
+			}
+
+			range.InsertNode( element ) ;
+
+			var next = FCKDomTools.GetNextSourceElement( element, false, null, [ 'hr','br','param','img','area','input' ], true ) ;
+
+			// Be sure that we have something after the new element, so we can move the cursor there.
+			if ( !next && FCKConfig.EnterMode != 'br')
+			{
+				next = this.EditorDocument.body.appendChild( this.EditorDocument.createElement( FCKConfig.EnterMode ) ) ;
+
+				if ( FCKBrowserInfo.IsGeckoLike )
+					FCKTools.AppendBogusBr( next ) ;
+			}
+
+			if ( FCKListsLib.EmptyElements[ elementName ] == null )
+				range.MoveToElementEditStart( element ) ;
+			else if ( next )
+				range.MoveToElementEditStart( next ) ;
+			else
+				range.MoveToPosition( element, 4 ) ;
+
+			if ( FCKBrowserInfo.IsGeckoLike )
+			{
+				if ( next )
+					FCKDomTools.ScrollIntoView( next, false );
+				FCKDomTools.ScrollIntoView( element, false );
+			}
+		}
+		else
+		{
+			// Insert the node.
+			range.InsertNode( element ) ;
+
+			// Move the selection right after the new element.
+			// DISCUSSION: Should we select the element instead?
+			range.SetStart( element, 4 ) ;
+			range.SetEnd( element, 4 ) ;
+		}
+
+		range.Select() ;
+		range.Release() ;
+
+		// REMOVE IT: The focus should not really be set here. It is up to the
+		// calling code to reset the focus if needed.
+		this.Focus() ;
+
+		return element ;
+	},
+
+	_InsertBlockElement : function( blockElement )
+	{
+	},
+
+	_IsFunctionKey : function( keyCode )
+	{
+		// keys that are captured but do not change editor contents
+		if ( keyCode >= 16 && keyCode <= 20 )
+			// shift, ctrl, alt, pause, capslock
+			return true ;
+		if ( keyCode == 27 || ( keyCode >= 33 && keyCode <= 40 ) )
+			// esc, page up, page down, end, home, left, up, right, down
+			return true ;
+		if ( keyCode == 45 )
+			// insert, no effect on FCKeditor, yet
+			return true ;
+		return false ;
+	},
+
+	_KeyDownListener : function( evt )
+	{
+		if (! evt)
+			evt = FCK.EditorWindow.event ;
+		if ( FCK.EditorWindow )
+		{
+			if ( !FCK._IsFunctionKey(evt.keyCode) // do not capture function key presses, like arrow keys or shift/alt/ctrl
+					&& !(evt.ctrlKey || evt.metaKey) // do not capture Ctrl hotkeys, as they have their snapshot capture logic
+					&& !(evt.keyCode == 46) ) // do not capture Del, it has its own capture logic in fckenterkey.js
+				FCK._KeyDownUndo() ;
+		}
+		return true ;
+	},
+
+	_KeyDownUndo : function()
+	{
+		if ( !FCKUndo.Typing )
+		{
+			FCKUndo.SaveUndoStep() ;
+			FCKUndo.Typing = true ;
+			FCK.Events.FireEvent( "OnSelectionChange" ) ;
+		}
+
+		FCKUndo.TypesCount++ ;
+		FCKUndo.Changed = 1 ;
+
+		if ( FCKUndo.TypesCount > FCKUndo.MaxTypes )
+		{
+			FCKUndo.TypesCount = 0 ;
+			FCKUndo.SaveUndoStep() ;
+		}
+	},
+
+	_TabKeyHandler : function( evt )
+	{
+		if ( ! evt )
+			evt = window.event ;
+
+		var keystrokeValue = evt.keyCode ;
+
+		// Pressing <Tab> in source mode should produce a tab space in the text area, not
+		// changing the focus to something else.
+		if ( keystrokeValue == 9 && FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		{
+			if ( FCKBrowserInfo.IsIE )
+			{
+				var range = document.selection.createRange() ;
+				if ( range.parentElement() != FCK.EditingArea.Textarea )
+					return true ;
+				range.text = '\t' ;
+				range.select() ;
+			}
+			else
+			{
+				var a = [] ;
+				var el = FCK.EditingArea.Textarea ;
+				var selStart = el.selectionStart ;
+				var selEnd = el.selectionEnd ;
+				a.push( el.value.substr(0, selStart ) ) ;
+				a.push( '\t' ) ;
+				a.push( el.value.substr( selEnd ) ) ;
+				el.value = a.join( '' ) ;
+				el.setSelectionRange( selStart + 1, selStart + 1 ) ;
+			}
+
+			if ( evt.preventDefault )
+				return evt.preventDefault() ;
+
+			return evt.returnValue = false ;
+		}
+
+		return true ;
+	}
+} ;
+
+FCK.Events = new FCKEvents( FCK ) ;
+
+// DEPRECATED in favor or "GetData".
+FCK.GetHTML	= FCK.GetXHTML = FCK.GetData ;
+
+// DEPRECATED in favor of "SetData".
+FCK.SetHTML = FCK.SetData ;
+
+// InsertElementAndGetIt and CreateElement are Deprecated : returns the same value as InsertElement.
+FCK.InsertElementAndGetIt = FCK.CreateElement = FCK.InsertElement ;
+
+// Replace all events attributes (like onclick).
+function _FCK_ProtectEvents_ReplaceTags( tagMatch )
+{
+	return tagMatch.replace( FCKRegexLib.EventAttributes, _FCK_ProtectEvents_ReplaceEvents ) ;
+}
+
+// Replace an event attribute with its respective __fckprotectedatt attribute.
+// The original event markup will be encoded and saved as the value of the new
+// attribute.
+function _FCK_ProtectEvents_ReplaceEvents( eventMatch, attName )
+{
+	return ' ' + attName + '_fckprotectedatt="' + encodeURIComponent( eventMatch ) + '"' ;
+}
+
+function _FCK_ProtectEvents_RestoreEvents( match, encodedOriginal )
+{
+	return decodeURIComponent( encodedOriginal ) ;
+}
+
+function _FCK_MouseEventsListener( evt )
+{
+	if ( ! evt )
+		evt = window.event ;
+	if ( evt.type == 'mousedown' )
+		FCK.MouseDownFlag = true ;
+	else if ( evt.type == 'mouseup' )
+		FCK.MouseDownFlag = false ;
+	else if ( evt.type == 'mousemove' )
+		FCK.Events.FireEvent( 'OnMouseMove', evt ) ;
+}
+
+function _FCK_PaddingNodeListener()
+{
+	if ( FCKConfig.EnterMode.IEquals( 'br' ) )
+		return ;
+	FCKDomTools.EnforcePaddingNode( FCK.EditorDocument, FCKConfig.EnterMode ) ;
+
+	if ( ! FCKBrowserInfo.IsIE && FCKDomTools.PaddingNode )
+	{
+		// Prevent the caret from going between the body and the padding node in Firefox.
+		// i.e. <body>|<p></p></body>
+		var sel = FCKSelection.GetSelection() ;
+		if ( sel && sel.rangeCount == 1 )
+		{
+			var range = sel.getRangeAt( 0 ) ;
+			if ( range.collapsed && range.startContainer == FCK.EditorDocument.body && range.startOffset == 0 )
+			{
+				range.selectNodeContents( FCKDomTools.PaddingNode ) ;
+				range.collapse( true ) ;
+				sel.removeAllRanges() ;
+				sel.addRange( range ) ;
+			}
+		}
+	}
+	else if ( FCKDomTools.PaddingNode )
+	{
+		// Prevent the caret from going into an empty body but not into the padding node in IE.
+		// i.e. <body><p></p>|</body>
+		var parentElement = FCKSelection.GetParentElement() ;
+		var paddingNode = FCKDomTools.PaddingNode ;
+		if ( parentElement && parentElement.nodeName.IEquals( 'body' ) )
+		{
+			if ( FCK.EditorDocument.body.childNodes.length == 1
+					&& FCK.EditorDocument.body.firstChild == paddingNode )
+			{
+				/*
+				 * Bug #1764: Don't move the selection if the
+				 * current selection isn't in the editor
+				 * document.
+				 */
+				if ( FCKSelection._GetSelectionDocument( FCK.EditorDocument.selection ) != FCK.EditorDocument )
+					return ;
+
+				var range = FCK.EditorDocument.body.createTextRange() ;
+				var clearContents = false ;
+				if ( !paddingNode.childNodes.firstChild )
+				{
+					paddingNode.appendChild( FCKTools.GetElementDocument( paddingNode ).createTextNode( '\ufeff' ) ) ;
+					clearContents = true ;
+				}
+				range.moveToElementText( paddingNode ) ;
+				range.select() ;
+				if ( clearContents )
+					range.pasteHTML( '' ) ;
+			}
+		}
+	}
+}
+
+function _FCK_EditingArea_OnLoad()
+{
+	// Get the editor's window and document (DOM)
+	FCK.EditorWindow	= FCK.EditingArea.Window ;
+	FCK.EditorDocument	= FCK.EditingArea.Document ;
+
+	if ( FCKBrowserInfo.IsIE )
+		FCKTempBin.ToElements() ;
+
+	FCK.InitializeBehaviors() ;
+
+	// Listen for mousedown and mouseup events for tracking drag and drops.
+	FCK.MouseDownFlag = false ;
+	FCKTools.AddEventListener( FCK.EditorDocument, 'mousemove', _FCK_MouseEventsListener ) ;
+	FCKTools.AddEventListener( FCK.EditorDocument, 'mousedown', _FCK_MouseEventsListener ) ;
+	FCKTools.AddEventListener( FCK.EditorDocument, 'mouseup', _FCK_MouseEventsListener ) ;
+
+	// Most of the CTRL key combos do not work under Safari for onkeydown and onkeypress (See #1119)
+	// But we can use the keyup event to override some of these...
+	if ( FCKBrowserInfo.IsSafari )
+	{
+		var undoFunc = function( evt )
+		{
+			if ( ! ( evt.ctrlKey || evt.metaKey ) )
+				return ;
+			if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+				return ;
+			switch ( evt.keyCode )
+			{
+				case 89:
+					FCKUndo.Redo() ;
+					break ;
+				case 90:
+					FCKUndo.Undo() ;
+					break ;
+			}
+		}
+
+		FCKTools.AddEventListener( FCK.EditorDocument, 'keyup', undoFunc ) ;
+	}
+
+	// Create the enter key handler
+	FCK.EnterKeyHandler = new FCKEnterKey( FCK.EditorWindow, FCKConfig.EnterMode, FCKConfig.ShiftEnterMode, FCKConfig.TabSpaces ) ;
+
+	// Listen for keystroke events.
+	FCK.KeystrokeHandler.AttachToElement( FCK.EditorDocument ) ;
+
+	if ( FCK._ForceResetIsDirty )
+		FCK.ResetIsDirty() ;
+
+	// This is a tricky thing for IE. In some cases, even if the cursor is
+	// blinking in the editing, the keystroke handler doesn't catch keyboard
+	// events. We must activate the editing area to make it work. (#142).
+	if ( FCKBrowserInfo.IsIE && FCK.HasFocus )
+		FCK.EditorDocument.body.setActive() ;
+
+	FCK.OnAfterSetHTML() ;
+
+	// Restore show blocks status.
+	FCKCommands.GetCommand( 'ShowBlocks' ).RestoreState() ;
+
+	// Check if it is not a startup call, otherwise complete the startup.
+	if ( FCK.Status != FCK_STATUS_NOTLOADED )
+		return ;
+
+	FCK.SetStatus( FCK_STATUS_ACTIVE ) ;
+}
+
+function _FCK_GetEditorAreaStyleTags()
+{
+	return FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) +
+		FCKTools.GetStyleHtml( FCKConfig.EditorAreaStyles ) ;
+}
+
+function _FCK_KeystrokeHandler_OnKeystroke( keystroke, keystrokeValue )
+{
+	if ( FCK.Status != FCK_STATUS_COMPLETE )
+		return false ;
+
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		switch ( keystrokeValue )
+		{
+			case 'Paste' :
+				return !FCK.Paste() ;
+
+			case 'Cut' :
+				FCKUndo.SaveUndoStep() ;
+				return false ;
+		}
+	}
+	else
+	{
+		// In source mode, some actions must have their default behavior.
+		if ( keystrokeValue.Equals( 'Paste', 'Undo', 'Redo', 'SelectAll', 'Cut' ) )
+			return false ;
+	}
+
+	// The return value indicates if the default behavior of the keystroke must
+	// be cancelled. Let's do that only if the Execute() call explicitly returns "false".
+	var oCommand = FCK.Commands.GetCommand( keystrokeValue ) ;
+
+	// If the command is disabled then ignore the keystroke
+	if ( oCommand.GetState() == FCK_TRISTATE_DISABLED )
+		return false ;
+
+	return ( oCommand.Execute.apply( oCommand, FCKTools.ArgumentsToArray( arguments, 2 ) ) !== false ) ;
+}
+
+// Set the FCK.LinkedField reference to the field that will be used to post the
+// editor data.
+(function()
+{
+	// There is a bug on IE... getElementById returns any META tag that has the
+	// name set to the ID you are looking for. So the best way in to get the array
+	// by names and look for the correct one.
+	// As ASP.Net generates a ID that is different from the Name, we must also
+	// look for the field based on the ID (the first one is the ID).
+
+	var oDocument = window.parent.document ;
+
+	// Try to get the field using the ID.
+	var eLinkedField = oDocument.getElementById( FCK.Name ) ;
+
+	var i = 0;
+	while ( eLinkedField || i == 0 )
+	{
+		if ( eLinkedField && eLinkedField.tagName.toLowerCase().Equals( 'input', 'textarea' ) )
+		{
+			FCK.LinkedField = eLinkedField ;
+			break ;
+		}
+
+		eLinkedField = oDocument.getElementsByName( FCK.Name )[i++] ;
+	}
+})() ;
+
+var FCKTempBin =
+{
+	Elements : new Array(),
+
+	AddElement : function( element )
+	{
+		var iIndex = this.Elements.length ;
+		this.Elements[ iIndex ] = element ;
+		return iIndex ;
+	},
+
+	RemoveElement : function( index )
+	{
+		var e = this.Elements[ index ] ;
+		this.Elements[ index ] = null ;
+		return e ;
+	},
+
+	Reset : function()
+	{
+		var i = 0 ;
+		while ( i < this.Elements.length )
+			this.Elements[ i++ ] = null ;
+		this.Elements.length = 0 ;
+	},
+
+	ToHtml : function()
+	{
+		for ( var i = 0 ; i < this.Elements.length ; i++ )
+		{
+			this.Elements[i] = '<div>&nbsp;' + this.Elements[i].outerHTML + '</div>' ;
+			this.Elements[i].isHtml = true ;
+		}
+	},
+
+	ToElements : function()
+	{
+		var node = FCK.EditorDocument.createElement( 'div' ) ;
+		for ( var i = 0 ; i < this.Elements.length ; i++ )
+		{
+			if ( this.Elements[i].isHtml )
+			{
+				node.innerHTML = this.Elements[i] ;
+				this.Elements[i] = node.firstChild.removeChild( node.firstChild.lastChild ) ;
+			}
+		}
+	}
+} ;
+
+
+
+// # Focus Manager: Manages the focus in the editor.
+var FCKFocusManager = FCK.FocusManager =
+{
+	IsLocked : false,
+
+	AddWindow : function( win, sendToEditingArea )
+	{
+		var oTarget ;
+
+		if ( FCKBrowserInfo.IsIE )
+			oTarget = win.nodeType == 1 ? win : win.frameElement ? win.frameElement : win.document ;
+		else if ( FCKBrowserInfo.IsSafari )
+			oTarget = win ;
+		else
+			oTarget = win.document ;
+
+		FCKTools.AddEventListener( oTarget, 'blur', FCKFocusManager_Win_OnBlur ) ;
+		FCKTools.AddEventListener( oTarget, 'focus', sendToEditingArea ? FCKFocusManager_Win_OnFocus_Area : FCKFocusManager_Win_OnFocus ) ;
+	},
+
+	RemoveWindow : function( win )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			oTarget = win.nodeType == 1 ? win : win.frameElement ? win.frameElement : win.document ;
+		else
+			oTarget = win.document ;
+
+		FCKTools.RemoveEventListener( oTarget, 'blur', FCKFocusManager_Win_OnBlur ) ;
+		FCKTools.RemoveEventListener( oTarget, 'focus', FCKFocusManager_Win_OnFocus_Area ) ;
+		FCKTools.RemoveEventListener( oTarget, 'focus', FCKFocusManager_Win_OnFocus ) ;
+	},
+
+	Lock : function()
+	{
+		this.IsLocked = true ;
+	},
+
+	Unlock : function()
+	{
+		if ( this._HasPendingBlur )
+			FCKFocusManager._Timer = window.setTimeout( FCKFocusManager_FireOnBlur, 100 ) ;
+
+		this.IsLocked = false ;
+	},
+
+	_ResetTimer : function()
+	{
+		this._HasPendingBlur = false ;
+
+		if ( this._Timer )
+		{
+			window.clearTimeout( this._Timer ) ;
+			delete this._Timer ;
+		}
+	}
+} ;
+
+function FCKFocusManager_Win_OnBlur()
+{
+	if ( typeof(FCK) != 'undefined' && FCK.HasFocus )
+	{
+		FCKFocusManager._ResetTimer() ;
+		FCKFocusManager._Timer = window.setTimeout( FCKFocusManager_FireOnBlur, 100 ) ;
+	}
+}
+
+function FCKFocusManager_FireOnBlur()
+{
+	if ( FCKFocusManager.IsLocked )
+		FCKFocusManager._HasPendingBlur = true ;
+	else
+	{
+		FCK.HasFocus = false ;
+		FCK.Events.FireEvent( "OnBlur" ) ;
+	}
+}
+
+function FCKFocusManager_Win_OnFocus_Area()
+{
+	// Check if we are already focusing the editor (to avoid loops).
+	if ( FCKFocusManager._IsFocusing )
+		return ;
+
+	FCKFocusManager._IsFocusing = true ;
+
+	FCK.Focus() ;
+	FCKFocusManager_Win_OnFocus() ;
+
+	// The above FCK.Focus() call may trigger other focus related functions.
+	// So, to avoid a loop, we delay the focusing mark removal, so it get
+	// executed after all othre functions have been run.
+	FCKTools.RunFunction( function()
+		{
+			delete FCKFocusManager._IsFocusing ;
+		} ) ;
+}
+
+function FCKFocusManager_Win_OnFocus()
+{
+	FCKFocusManager._ResetTimer() ;
+
+	if ( !FCK.HasFocus && !FCKFocusManager.IsLocked )
+	{
+		FCK.HasFocus = true ;
+		FCK.Events.FireEvent( "OnFocus" ) ;
+	}
+}
+
+/*
+ * #1633 : Protect the editor iframe from external styles.
+ * Notice that we can't use FCKTools.ResetStyles here since FCKTools isn't
+ * loaded yet.
+ */
+(function()
+{
+	var el = window.frameElement ;
+	var width = el.width ;
+	var height = el.height ;
+	if ( /^\d+$/.test( width ) ) width += 'px' ;
+	if ( /^\d+$/.test( height ) ) height += 'px' ;
+	var style = el.style ;
+	style.border = style.padding = style.margin = 0 ;
+	style.backgroundColor = 'transparent';
+	style.backgroundImage = 'none';
+	style.width = width ;
+	style.height = height ;
+})() ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fck_contextmenu.js b/modules/editor/skins/fckeditor/editor/_source/internals/fck_contextmenu.js
new file mode 100644
index 000000000..9ed344afb
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fck_contextmenu.js
@@ -0,0 +1,342 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCK.ContextMenu object that is responsible for all
+ * Context Menu operations in the editing area.
+ */
+
+FCK.ContextMenu = new Object() ;
+FCK.ContextMenu.Listeners = new Array() ;
+
+FCK.ContextMenu.RegisterListener = function( listener )
+{
+	if ( listener )
+		this.Listeners.push( listener ) ;
+}
+
+function FCK_ContextMenu_Init()
+{
+	var oInnerContextMenu = FCK.ContextMenu._InnerContextMenu = new FCKContextMenu( FCKBrowserInfo.IsIE ? window : window.parent, FCKLang.Dir ) ;
+	oInnerContextMenu.CtrlDisable	= FCKConfig.BrowserContextMenuOnCtrl ;
+	oInnerContextMenu.OnBeforeOpen	= FCK_ContextMenu_OnBeforeOpen ;
+	oInnerContextMenu.OnItemClick	= FCK_ContextMenu_OnItemClick ;
+
+	// Get the registering function.
+	var oMenu = FCK.ContextMenu ;
+
+	// Register all configured context menu listeners.
+	for ( var i = 0 ; i < FCKConfig.ContextMenu.length ; i++ )
+		oMenu.RegisterListener( FCK_ContextMenu_GetListener( FCKConfig.ContextMenu[i] ) ) ;
+}
+
+function FCK_ContextMenu_GetListener( listenerName )
+{
+	switch ( listenerName )
+	{
+		case 'Generic' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				menu.AddItem( 'Cut'		, FCKLang.Cut	, 7, FCKCommands.GetCommand( 'Cut' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+				menu.AddItem( 'Copy'	, FCKLang.Copy	, 8, FCKCommands.GetCommand( 'Copy' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+				menu.AddItem( 'Paste'	, FCKLang.Paste	, 9, FCKCommands.GetCommand( 'Paste' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+			}} ;
+
+		case 'Table' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				var bIsTable	= ( tagName == 'TABLE' ) ;
+				var bIsCell		= ( !bIsTable && FCKSelection.HasAncestorNode( 'TABLE' ) ) ;
+
+				if ( bIsCell )
+				{
+					menu.AddSeparator() ;
+					var oItem = menu.AddItem( 'Cell'	, FCKLang.CellCM ) ;
+					oItem.AddItem( 'TableInsertCellBefore'	, FCKLang.InsertCellBefore, 69 ) ;
+					oItem.AddItem( 'TableInsertCellAfter'	, FCKLang.InsertCellAfter, 58 ) ;
+					oItem.AddItem( 'TableDeleteCells'	, FCKLang.DeleteCells, 59 ) ;
+					if ( FCKBrowserInfo.IsGecko )
+						oItem.AddItem( 'TableMergeCells'	, FCKLang.MergeCells, 60,
+							FCKCommands.GetCommand( 'TableMergeCells' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+					else
+					{
+						oItem.AddItem( 'TableMergeRight'	, FCKLang.MergeRight, 60,
+							FCKCommands.GetCommand( 'TableMergeRight' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+						oItem.AddItem( 'TableMergeDown'		, FCKLang.MergeDown, 60,
+							FCKCommands.GetCommand( 'TableMergeDown' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+					}
+					oItem.AddItem( 'TableHorizontalSplitCell'	, FCKLang.HorizontalSplitCell, 61,
+						FCKCommands.GetCommand( 'TableHorizontalSplitCell' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+					oItem.AddItem( 'TableVerticalSplitCell'	, FCKLang.VerticalSplitCell, 61,
+						FCKCommands.GetCommand( 'TableVerticalSplitCell' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+					oItem.AddSeparator() ;
+					oItem.AddItem( 'TableCellProp'		, FCKLang.CellProperties, 57,
+						FCKCommands.GetCommand( 'TableCellProp' ).GetState() == FCK_TRISTATE_DISABLED ) ;
+
+					menu.AddSeparator() ;
+					oItem = menu.AddItem( 'Row'			, FCKLang.RowCM ) ;
+					oItem.AddItem( 'TableInsertRowBefore'		, FCKLang.InsertRowBefore, 70 ) ;
+					oItem.AddItem( 'TableInsertRowAfter'		, FCKLang.InsertRowAfter, 62 ) ;
+					oItem.AddItem( 'TableDeleteRows'	, FCKLang.DeleteRows, 63 ) ;
+
+					menu.AddSeparator() ;
+					oItem = menu.AddItem( 'Column'		, FCKLang.ColumnCM ) ;
+					oItem.AddItem( 'TableInsertColumnBefore', FCKLang.InsertColumnBefore, 71 ) ;
+					oItem.AddItem( 'TableInsertColumnAfter'	, FCKLang.InsertColumnAfter, 64 ) ;
+					oItem.AddItem( 'TableDeleteColumns'	, FCKLang.DeleteColumns, 65 ) ;
+				}
+
+				if ( bIsTable || bIsCell )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'TableDelete'			, FCKLang.TableDelete ) ;
+					menu.AddItem( 'TableProp'			, FCKLang.TableProperties, 39 ) ;
+				}
+			}} ;
+
+		case 'Link' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				var bInsideLink = ( tagName == 'A' || FCKSelection.HasAncestorNode( 'A' ) ) ;
+
+				if ( bInsideLink || FCK.GetNamedCommandState( 'Unlink' ) != FCK_TRISTATE_DISABLED )
+				{
+					// Go up to the anchor to test its properties
+					var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+					var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ;
+					// If it isn't a link then don't add the Link context menu
+					if ( bIsAnchor )
+						return ;
+
+					menu.AddSeparator() ;
+					menu.AddItem( 'VisitLink', FCKLang.VisitLink ) ;
+					menu.AddSeparator() ;
+					if ( bInsideLink )
+						menu.AddItem( 'Link', FCKLang.EditLink		, 34 ) ;
+					menu.AddItem( 'Unlink'	, FCKLang.RemoveLink	, 35 ) ;
+				}
+			}} ;
+
+		case 'Image' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'IMG' && !tag.getAttribute( '_fckfakelement' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Image', FCKLang.ImageProperties, 37 ) ;
+				}
+			}} ;
+
+		case 'Anchor' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				// Go up to the anchor to test its properties
+				var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ;
+				var bIsAnchor = ( oLink && oLink.name.length > 0 ) ;
+
+				if ( bIsAnchor || ( tagName == 'IMG' && tag.getAttribute( '_fckanchor' ) ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Anchor', FCKLang.AnchorProp, 36 ) ;
+					menu.AddItem( 'AnchorDelete', FCKLang.AnchorDelete ) ;
+				}
+			}} ;
+
+		case 'Flash' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'IMG' && tag.getAttribute( '_fckflash' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Flash', FCKLang.FlashProperties, 38 ) ;
+				}
+			}} ;
+
+		case 'Form' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( FCKSelection.HasAncestorNode('FORM') )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Form', FCKLang.FormProp, 48 ) ;
+				}
+			}} ;
+
+		case 'Checkbox' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'INPUT' && tag.type == 'checkbox' )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Checkbox', FCKLang.CheckboxProp, 49 ) ;
+				}
+			}} ;
+
+		case 'Radio' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'INPUT' && tag.type == 'radio' )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Radio', FCKLang.RadioButtonProp, 50 ) ;
+				}
+			}} ;
+
+		case 'TextField' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'INPUT' && ( tag.type == 'text' || tag.type == 'password' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'TextField', FCKLang.TextFieldProp, 51 ) ;
+				}
+			}} ;
+
+		case 'HiddenField' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'IMG' && tag.getAttribute( '_fckinputhidden' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'HiddenField', FCKLang.HiddenFieldProp, 56 ) ;
+				}
+			}} ;
+
+		case 'ImageButton' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'INPUT' && tag.type == 'image' )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'ImageButton', FCKLang.ImageButtonProp, 55 ) ;
+				}
+			}} ;
+
+		case 'Button' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'INPUT' && ( tag.type == 'button' || tag.type == 'submit' || tag.type == 'reset' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Button', FCKLang.ButtonProp, 54 ) ;
+				}
+			}} ;
+
+		case 'Select' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'SELECT' )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Select', FCKLang.SelectionFieldProp, 53 ) ;
+				}
+			}} ;
+
+		case 'Textarea' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( tagName == 'TEXTAREA' )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'Textarea', FCKLang.TextareaProp, 52 ) ;
+				}
+			}} ;
+
+		case 'BulletedList' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( FCKSelection.HasAncestorNode('UL') )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'BulletedList', FCKLang.BulletedListProp, 27 ) ;
+				}
+			}} ;
+
+		case 'NumberedList' :
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				if ( FCKSelection.HasAncestorNode('OL') )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'NumberedList', FCKLang.NumberedListProp, 26 ) ;
+				}
+			}} ;
+
+		case 'DivContainer':
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				var currentBlocks = FCKDomTools.GetSelectedDivContainers() ;
+
+				if ( currentBlocks.length > 0 )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'EditDiv', FCKLang.EditDiv, 75 ) ;
+					menu.AddItem( 'DeleteDiv', FCKLang.DeleteDiv, 76 ) ;
+				}
+			}} ;
+
+	}
+	return null ;
+}
+
+function FCK_ContextMenu_OnBeforeOpen()
+{
+	// Update the UI.
+	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+
+	// Get the actual selected tag (if any).
+	var oTag, sTagName ;
+
+	// The extra () is to avoid a warning with strict error checking. This is ok.
+	if ( (oTag = FCKSelection.GetSelectedElement()) )
+		sTagName = oTag.tagName ;
+
+	// Cleanup the current menu items.
+	var oMenu = FCK.ContextMenu._InnerContextMenu ;
+	oMenu.RemoveAllItems() ;
+
+	// Loop through the listeners.
+	var aListeners = FCK.ContextMenu.Listeners ;
+	for ( var i = 0 ; i < aListeners.length ; i++ )
+		aListeners[i].AddItems( oMenu, oTag, sTagName ) ;
+}
+
+function FCK_ContextMenu_OnItemClick( item )
+{
+	FCK.Focus() ;
+	FCKCommands.GetCommand( item.Name ).Execute( item.CustomData ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fck_gecko.js b/modules/editor/skins/fckeditor/editor/_source/internals/fck_gecko.js
new file mode 100644
index 000000000..622179343
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fck_gecko.js
@@ -0,0 +1,493 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Creation and initialization of the "FCK" object. This is the main
+ * object that represents an editor instance.
+ * (Gecko specific implementations)
+ */
+
+FCK.Description = "FCKeditor for Gecko Browsers" ;
+
+FCK.InitializeBehaviors = function()
+{
+	// When calling "SetData", the editing area IFRAME gets a fixed height. So we must recalculate it.
+	if ( window.onresize )		// Not for Safari/Opera.
+		window.onresize() ;
+
+	FCKFocusManager.AddWindow( this.EditorWindow ) ;
+
+	this.ExecOnSelectionChange = function()
+	{
+		FCK.Events.FireEvent( "OnSelectionChange" ) ;
+	}
+
+	this._ExecDrop = function( evt )
+	{
+		if ( FCK.MouseDownFlag )
+		{
+			FCK.MouseDownFlag = false ;
+			return ;
+		}
+
+		if ( FCKConfig.ForcePasteAsPlainText )
+		{
+			if ( evt.dataTransfer )
+			{
+				var text = evt.dataTransfer.getData( 'Text' ) ;
+				text = FCKTools.HTMLEncode( text ) ;
+				text = FCKTools.ProcessLineBreaks( window, FCKConfig, text ) ;
+				FCK.InsertHtml( text ) ;
+			}
+			else if ( FCKConfig.ShowDropDialog )
+				FCK.PasteAsPlainText() ;
+
+			evt.preventDefault() ;
+			evt.stopPropagation() ;
+		}
+	}
+
+	this._ExecCheckCaret = function( evt )
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return ;
+
+		if ( evt.type == 'keypress' )
+		{
+			var keyCode = evt.keyCode ;
+			// ignore if positioning key is not pressed.
+			// left or up arrow keys need to be processed as well, since <a> links can be expanded in Gecko's editor
+			// when the caret moved left or up from another block element below.
+			if ( keyCode < 33 || keyCode > 40 )
+				return ;
+		}
+
+		var blockEmptyStop = function( node )
+		{
+			if ( node.nodeType != 1 )
+				return false ;
+			var tag = node.tagName.toLowerCase() ;
+			return ( FCKListsLib.BlockElements[tag] || FCKListsLib.EmptyElements[tag] ) ;
+		}
+
+		var moveCursor = function()
+		{
+			var selection = FCKSelection.GetSelection() ;
+			var range = selection.getRangeAt(0) ;
+			if ( ! range || ! range.collapsed )
+				return ;
+
+			var node = range.endContainer ;
+
+			// only perform the patched behavior if we're at the end of a text node.
+			if ( node.nodeType != 3 )
+				return ;
+
+			if ( node.nodeValue.length != range.endOffset )
+				return ;
+
+			// only perform the patched behavior if we're in an <a> tag, or the End key is pressed.
+			var parentTag = node.parentNode.tagName.toLowerCase() ;
+			if ( ! (  parentTag == 'a' || ( !FCKBrowserInfo.IsOpera && String(node.parentNode.contentEditable) == 'false' ) ||
+					( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
+					  && keyCode == 35 ) ) )
+				return ;
+
+			// our caret has moved to just after the last character of a text node under an unknown tag, how to proceed?
+			// first, see if there are other text nodes by DFS walking from this text node.
+			// 	- if the DFS has scanned all nodes under my parent, then go the next step.
+			//	- if there is a text node after me but still under my parent, then do nothing and return.
+			var nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode, blockEmptyStop ) ;
+			if ( nextTextNode )
+				return ;
+
+			// we're pretty sure we need to move the caret forcefully from here.
+			range = FCK.EditorDocument.createRange() ;
+
+			nextTextNode = FCKTools.GetNextTextNode( node, node.parentNode.parentNode, blockEmptyStop ) ;
+			if ( nextTextNode )
+			{
+				// Opera thinks the dummy empty text node we append beyond the end of <a> nodes occupies a caret
+				// position. So if the user presses the left key and we reset the caret position here, the user
+				// wouldn't be able to go back.
+				if ( FCKBrowserInfo.IsOpera && keyCode == 37 )
+					return ;
+
+				// now we want to get out of our current parent node, adopt the next parent, and move the caret to
+				// the appropriate text node under our new parent.
+				// our new parent might be our current parent's siblings if we are lucky.
+				range.setStart( nextTextNode, 0 ) ;
+				range.setEnd( nextTextNode, 0 ) ;
+			}
+			else
+			{
+				// no suitable next siblings under our grandparent! what to do next?
+				while ( node.parentNode
+					&& node.parentNode != FCK.EditorDocument.body
+					&& node.parentNode != FCK.EditorDocument.documentElement
+					&& node == node.parentNode.lastChild
+					&& ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()]
+					  && ! FCKListsLib.NonEmptyBlockElements[node.parentNode.tagName.toLowerCase()] ) )
+					node = node.parentNode ;
+
+
+				if ( FCKListsLib.BlockElements[ parentTag ]
+						|| FCKListsLib.EmptyElements[ parentTag ]
+						|| node == FCK.EditorDocument.body )
+				{
+					// if our parent is a block node, move to the end of our parent.
+					range.setStart( node, node.childNodes.length ) ;
+					range.setEnd( node, node.childNodes.length ) ;
+				}
+				else
+				{
+					// things are a little bit more interesting if our parent is not a block node
+					// due to the weired ways how Gecko's caret acts...
+					var stopNode = node.nextSibling ;
+
+					// find out the next block/empty element at our grandparent, we'll
+					// move the caret just before it.
+					while ( stopNode )
+					{
+						if ( stopNode.nodeType != 1 )
+						{
+							stopNode = stopNode.nextSibling ;
+							continue ;
+						}
+
+						var stopTag = stopNode.tagName.toLowerCase() ;
+						if ( FCKListsLib.BlockElements[stopTag] || FCKListsLib.EmptyElements[stopTag]
+							|| FCKListsLib.NonEmptyBlockElements[stopTag] )
+							break ;
+						stopNode = stopNode.nextSibling ;
+					}
+
+					// note that the dummy marker below is NEEDED, otherwise the caret's behavior will
+					// be broken in Gecko.
+					var marker = FCK.EditorDocument.createTextNode( '' ) ;
+					if ( stopNode )
+						node.parentNode.insertBefore( marker, stopNode ) ;
+					else
+						node.parentNode.appendChild( marker ) ;
+					range.setStart( marker, 0 ) ;
+					range.setEnd( marker, 0 ) ;
+				}
+			}
+
+			selection.removeAllRanges() ;
+			selection.addRange( range ) ;
+			FCK.Events.FireEvent( "OnSelectionChange" ) ;
+		}
+
+		setTimeout( moveCursor, 1 ) ;
+	}
+
+	this.ExecOnSelectionChangeTimer = function()
+	{
+		if ( FCK.LastOnChangeTimer )
+			window.clearTimeout( FCK.LastOnChangeTimer ) ;
+
+		FCK.LastOnChangeTimer = window.setTimeout( FCK.ExecOnSelectionChange, 100 ) ;
+	}
+
+	this.EditorDocument.addEventListener( 'mouseup', this.ExecOnSelectionChange, false ) ;
+
+	// On Gecko, firing the "OnSelectionChange" event on every key press started to be too much
+	// slow. So, a timer has been implemented to solve performance issues when typing to quickly.
+	this.EditorDocument.addEventListener( 'keyup', this.ExecOnSelectionChangeTimer, false ) ;
+
+	this._DblClickListener = function( e )
+	{
+		FCK.OnDoubleClick( e.target ) ;
+		e.stopPropagation() ;
+	}
+	this.EditorDocument.addEventListener( 'dblclick', this._DblClickListener, true ) ;
+
+	// Record changes for the undo system when there are key down events.
+	this.EditorDocument.addEventListener( 'keydown', this._KeyDownListener, false ) ;
+
+	// Hooks for data object drops
+	if ( FCKBrowserInfo.IsGecko )
+	{
+		this.EditorWindow.addEventListener( 'dragdrop', this._ExecDrop, true ) ;
+	}
+	else if ( FCKBrowserInfo.IsSafari )
+	{
+		var cancelHandler = function( evt ){ if ( ! FCK.MouseDownFlag ) evt.returnValue = false ; }
+		this.EditorDocument.addEventListener( 'dragenter', cancelHandler, true ) ;
+		this.EditorDocument.addEventListener( 'dragover', cancelHandler, true ) ;
+		this.EditorDocument.addEventListener( 'drop', this._ExecDrop, true ) ;
+		this.EditorDocument.addEventListener( 'mousedown',
+			function( ev )
+			{
+				var element = ev.srcElement ;
+
+				if ( element.nodeName.IEquals( 'IMG', 'HR', 'INPUT', 'TEXTAREA', 'SELECT' ) )
+				{
+					FCKSelection.SelectNode( element ) ;
+				}
+			}, true ) ;
+
+		this.EditorDocument.addEventListener( 'mouseup',
+			function( ev )
+			{
+				if ( ev.srcElement.nodeName.IEquals( 'INPUT', 'TEXTAREA', 'SELECT' ) )
+					ev.preventDefault()
+			}, true ) ;
+
+		this.EditorDocument.addEventListener( 'click',
+			function( ev )
+			{
+				if ( ev.srcElement.nodeName.IEquals( 'INPUT', 'TEXTAREA', 'SELECT' ) )
+					ev.preventDefault()
+			}, true ) ;
+	}
+
+	// Kludge for buggy Gecko caret positioning logic (Bug #393 and #1056)
+	if ( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsOpera )
+	{
+		this.EditorDocument.addEventListener( 'keypress', this._ExecCheckCaret, false ) ;
+		this.EditorDocument.addEventListener( 'click', this._ExecCheckCaret, false ) ;
+	}
+
+	// Reset the context menu.
+	FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow( FCK.EditorWindow ) ;
+	FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument ) ;
+}
+
+FCK.MakeEditable = function()
+{
+	this.EditingArea.MakeEditable() ;
+}
+
+// Disable the context menu in the editor (outside the editing area).
+function Document_OnContextMenu( e )
+{
+	if ( !e.target._FCKShowContextMenu )
+		e.preventDefault() ;
+}
+document.oncontextmenu = Document_OnContextMenu ;
+
+// GetNamedCommandState overload for Gecko.
+FCK._BaseGetNamedCommandState = FCK.GetNamedCommandState ;
+FCK.GetNamedCommandState = function( commandName )
+{
+	switch ( commandName )
+	{
+		case 'Unlink' :
+			return FCKSelection.HasAncestorNode('A') ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+		default :
+			return FCK._BaseGetNamedCommandState( commandName ) ;
+	}
+}
+
+// Named commands to be handled by this browsers specific implementation.
+FCK.RedirectNamedCommands =
+{
+	Print	: true,
+	Paste	: true
+} ;
+
+// ExecuteNamedCommand overload for Gecko.
+FCK.ExecuteRedirectedNamedCommand = function( commandName, commandParameter )
+{
+	switch ( commandName )
+	{
+		case 'Print' :
+			FCK.EditorWindow.print() ;
+			break ;
+		case 'Paste' :
+			try
+			{
+				// Force the paste dialog for Safari (#50).
+				if ( FCKBrowserInfo.IsSafari )
+					throw '' ;
+
+				if ( FCK.Paste() )
+					FCK.ExecuteNamedCommand( 'Paste', null, true ) ;
+			}
+			catch (e)	{ FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security' ) ; }
+			break ;
+		default :
+			FCK.ExecuteNamedCommand( commandName, commandParameter ) ;
+	}
+}
+
+FCK._ExecPaste = function()
+{
+	// Save a snapshot for undo before actually paste the text
+	FCKUndo.SaveUndoStep() ;
+
+	if ( FCKConfig.ForcePasteAsPlainText )
+	{
+		FCK.PasteAsPlainText() ;
+		return false ;
+	}
+
+	/* For now, the AutoDetectPasteFromWord feature is IE only. */
+	return true ;
+}
+
+//**
+// FCK.InsertHtml: Inserts HTML at the current cursor location. Deletes the
+// selected content if any.
+FCK.InsertHtml = function( html )
+{
+	var doc = FCK.EditorDocument,
+		range;
+
+	html = FCKConfig.ProtectedSource.Protect( html ) ;
+	html = FCK.ProtectEvents( html ) ;
+	html = FCK.ProtectUrls( html ) ;
+	html = FCK.ProtectTags( html ) ;
+
+	// Save an undo snapshot first.
+	FCKUndo.SaveUndoStep() ;
+
+	if ( FCKBrowserInfo.IsGecko )
+	{
+		html = html.replace( /&nbsp;$/, '$&<span _fcktemp="1"/>' ) ;
+
+		var docFrag = new FCKDocumentFragment( this.EditorDocument ) ;
+		docFrag.AppendHtml( html ) ;
+
+		var lastNode = docFrag.RootNode.lastChild ;
+
+		range = new FCKDomRange( this.EditorWindow ) ;
+		range.MoveToSelection() ;
+		range.DeleteContents() ;
+		range.InsertNode( docFrag.RootNode ) ;
+
+		range.MoveToPosition( lastNode, 4 ) ;
+	}
+	else
+		doc.execCommand( 'inserthtml', false, html ) ;
+
+	this.Focus() ;
+
+	// Save the caret position before calling document processor.
+	if ( !range )
+	{
+		range = new FCKDomRange( this.EditorWindow ) ;
+		range.MoveToSelection() ;
+	}
+	var bookmark = range.CreateBookmark() ;
+
+	FCKDocumentProcessor.Process( doc ) ;
+
+	// Restore caret position, ignore any errors in case the document
+	// processor removed the bookmark <span>s for some reason.
+	try
+	{
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+	}
+	catch ( e ) {}
+
+	// For some strange reason the SaveUndoStep() call doesn't activate the undo button at the first InsertHtml() call.
+	this.Events.FireEvent( "OnSelectionChange" ) ;
+}
+
+FCK.PasteAsPlainText = function()
+{
+	// TODO: Implement the "Paste as Plain Text" code.
+
+	// If the function is called immediately Firefox 2 does automatically paste the contents as soon as the new dialog is created
+	// so we run it in a Timeout and the paste event can be cancelled
+	FCKTools.RunFunction( FCKDialog.OpenDialog, FCKDialog, ['FCKDialog_Paste', FCKLang.PasteAsText, 'dialog/fck_paste.html', 400, 330, 'PlainText'] ) ;
+
+/*
+	var sText = FCKTools.HTMLEncode( clipboardData.getData("Text") ) ;
+	sText = sText.replace( /\n/g, '<BR>' ) ;
+	this.InsertHtml( sText ) ;
+*/
+}
+/*
+FCK.PasteFromWord = function()
+{
+	// TODO: Implement the "Paste as Plain Text" code.
+
+	FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.PasteFromWord, 'dialog/fck_paste.html', 400, 330, 'Word' ) ;
+
+//	FCK.CleanAndPaste( FCK.GetClipboardHTML() ) ;
+}
+*/
+FCK.GetClipboardHTML = function()
+{
+	return '' ;
+}
+
+FCK.CreateLink = function( url, noUndo )
+{
+	// Creates the array that will be returned. It contains one or more created links (see #220).
+	var aCreatedLinks = new Array() ;
+
+	// Only for Safari, a collapsed selection may create a link. All other
+	// browser will have no links created. So, we check it here and return
+	// immediatelly, having the same cross browser behavior.
+	if ( FCKSelection.GetSelection().isCollapsed )
+		return aCreatedLinks ;
+
+	FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ;
+
+	if ( url.length > 0 )
+	{
+		// Generate a temporary name for the link.
+		var sTempUrl = 'javascript:void(0);/*' + ( new Date().getTime() ) + '*/' ;
+
+		// Use the internal "CreateLink" command to create the link.
+		FCK.ExecuteNamedCommand( 'CreateLink', sTempUrl, false, !!noUndo ) ;
+
+		// Retrieve the just created links using XPath.
+		var oLinksInteractor = this.EditorDocument.evaluate("//a[@href='" + sTempUrl + "']", this.EditorDocument.body, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null) ;
+
+		// Add all links to the returning array.
+		for ( var i = 0 ; i < oLinksInteractor.snapshotLength ; i++ )
+		{
+			var oLink = oLinksInteractor.snapshotItem( i ) ;
+			oLink.href = url ;
+
+			aCreatedLinks.push( oLink ) ;
+		}
+	}
+
+	return aCreatedLinks ;
+}
+
+FCK._FillEmptyBlock = function( emptyBlockNode )
+{
+	if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 )
+		return ;
+	var nodeTag = emptyBlockNode.tagName.toLowerCase() ;
+	if ( nodeTag != 'p' && nodeTag != 'div' )
+		return ;
+	if ( emptyBlockNode.firstChild )
+		return ;
+	FCKTools.AppendBogusBr( emptyBlockNode ) ;
+}
+
+FCK._ExecCheckEmptyBlock = function()
+{
+	FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
+	var sel = FCKSelection.GetSelection() ;
+	if ( !sel || sel.rangeCount < 1 )
+		return ;
+	var range = sel.getRangeAt( 0 );
+	FCK._FillEmptyBlock( range.startContainer ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fck_ie.js b/modules/editor/skins/fckeditor/editor/_source/internals/fck_ie.js
new file mode 100644
index 000000000..f641774f1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fck_ie.js
@@ -0,0 +1,456 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Creation and initialization of the "FCK" object. This is the main
+ * object that represents an editor instance.
+ * (IE specific implementations)
+ */
+
+FCK.Description = "FCKeditor for Internet Explorer 5.5+" ;
+
+FCK._GetBehaviorsStyle = function()
+{
+	if ( !FCK._BehaviorsStyle )
+	{
+		var sBasePath = FCKConfig.BasePath ;
+		var sTableBehavior = '' ;
+		var sStyle ;
+
+		// The behaviors should be pointed using the BasePath to avoid security
+		// errors when using a different BaseHref.
+		sStyle = '<style type="text/css" _fcktemp="true">' ;
+
+		if ( FCKConfig.ShowBorders )
+			sTableBehavior = 'url(' + sBasePath + 'css/behaviors/showtableborders.htc)' ;
+
+		// Disable resize handlers.
+		sStyle += 'INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden' ;
+
+		if ( FCKConfig.DisableObjectResizing )
+		{
+			sStyle += ',IMG' ;
+			sTableBehavior += ' url(' + sBasePath + 'css/behaviors/disablehandles.htc)' ;
+		}
+
+		sStyle += ' { behavior: url(' + sBasePath + 'css/behaviors/disablehandles.htc) ; }' ;
+
+		if ( sTableBehavior.length > 0 )
+			sStyle += 'TABLE { behavior: ' + sTableBehavior + ' ; }' ;
+
+		sStyle += '</style>' ;
+		FCK._BehaviorsStyle = sStyle ;
+	}
+
+	return FCK._BehaviorsStyle ;
+}
+
+function Doc_OnMouseUp()
+{
+	if ( FCK.EditorWindow.event.srcElement.tagName == 'HTML' )
+	{
+		FCK.Focus() ;
+		FCK.EditorWindow.event.cancelBubble	= true ;
+		FCK.EditorWindow.event.returnValue	= false ;
+	}
+}
+
+function Doc_OnPaste()
+{
+	var body = FCK.EditorDocument.body ;
+
+	body.detachEvent( 'onpaste', Doc_OnPaste ) ;
+
+	var ret = FCK.Paste( !FCKConfig.ForcePasteAsPlainText && !FCKConfig.AutoDetectPasteFromWord ) ;
+
+	body.attachEvent( 'onpaste', Doc_OnPaste ) ;
+
+	return ret ;
+}
+
+function Doc_OnDblClick()
+{
+	FCK.OnDoubleClick( FCK.EditorWindow.event.srcElement ) ;
+	FCK.EditorWindow.event.cancelBubble = true ;
+}
+
+function Doc_OnSelectionChange()
+{
+	// Don't fire the event if no document is loaded.
+	if ( !FCK.IsSelectionChangeLocked && FCK.EditorDocument )
+		FCK.Events.FireEvent( "OnSelectionChange" ) ;
+}
+
+function Doc_OnDrop()
+{
+	if ( FCK.MouseDownFlag )
+	{
+		FCK.MouseDownFlag = false ;
+		return ;
+	}
+
+	if ( FCKConfig.ForcePasteAsPlainText )
+	{
+		var evt = FCK.EditorWindow.event ;
+
+		if ( FCK._CheckIsPastingEnabled() || FCKConfig.ShowDropDialog )
+			FCK.PasteAsPlainText( evt.dataTransfer.getData( 'Text' ) ) ;
+
+		evt.returnValue = false ;
+		evt.cancelBubble = true ;
+	}
+}
+
+FCK.InitializeBehaviors = function( dontReturn )
+{
+	// Set the focus to the editable area when clicking in the document area.
+	// TODO: The cursor must be positioned at the end.
+	this.EditorDocument.attachEvent( 'onmouseup', Doc_OnMouseUp ) ;
+
+	// Intercept pasting operations
+	this.EditorDocument.body.attachEvent( 'onpaste', Doc_OnPaste ) ;
+
+	// Intercept drop operations
+	this.EditorDocument.body.attachEvent( 'ondrop', Doc_OnDrop ) ;
+
+	// Reset the context menu.
+	FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ;
+
+	this.EditorDocument.attachEvent("onkeydown", FCK._KeyDownListener ) ;
+
+	this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;
+
+	this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save( true ) ; } ) ;
+
+	// Catch cursor selection changes.
+	this.EditorDocument.attachEvent("onselectionchange", Doc_OnSelectionChange ) ;
+
+	FCKTools.AddEventListener( FCK.EditorDocument, 'mousedown', Doc_OnMouseDown ) ;
+}
+
+FCK.InsertHtml = function( html )
+{
+	html = FCKConfig.ProtectedSource.Protect( html ) ;
+	html = FCK.ProtectEvents( html ) ;
+	html = FCK.ProtectUrls( html ) ;
+	html = FCK.ProtectTags( html ) ;
+
+//	FCK.Focus() ;
+	FCKSelection.Restore() ;
+	FCK.EditorWindow.focus() ;
+
+	FCKUndo.SaveUndoStep() ;
+
+	// Gets the actual selection.
+	var oSel = FCKSelection.GetSelection() ;
+
+	// Deletes the actual selection contents.
+	if ( oSel.type.toLowerCase() == 'control' )
+		oSel.clear() ;
+
+	// Using the following trick, any comment in the beginning of the HTML will
+	// be preserved.
+	html = '<span id="__fakeFCKRemove__" style="display:none;">fakeFCKRemove</span>' + html ;
+
+	// Insert the HTML.
+	oSel.createRange().pasteHTML( html ) ;
+
+	// Remove the fake node
+	FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode( true ) ;
+
+	FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+
+	// For some strange reason the SaveUndoStep() call doesn't activate the undo button at the first InsertHtml() call.
+	this.Events.FireEvent( "OnSelectionChange" ) ;
+}
+
+FCK.SetInnerHtml = function( html )		// IE Only
+{
+	var oDoc = FCK.EditorDocument ;
+	// Using the following trick, any comment in the beginning of the HTML will
+	// be preserved.
+	oDoc.body.innerHTML = '<div id="__fakeFCKRemove__">&nbsp;</div>' + html ;
+	oDoc.getElementById('__fakeFCKRemove__').removeNode( true ) ;
+}
+
+function FCK_PreloadImages()
+{
+	var oPreloader = new FCKImagePreloader() ;
+
+	// Add the configured images.
+	oPreloader.AddImages( FCKConfig.PreloadImages ) ;
+
+	// Add the skin icons strip.
+	oPreloader.AddImages( FCKConfig.SkinPath + 'fck_strip.gif' ) ;
+
+	oPreloader.OnComplete = LoadToolbarSetup ;
+	oPreloader.Start() ;
+}
+
+// Disable the context menu in the editor (outside the editing area).
+function Document_OnContextMenu()
+{
+	return ( event.srcElement._FCKShowContextMenu == true ) ;
+}
+document.oncontextmenu = Document_OnContextMenu ;
+
+function FCK_Cleanup()
+{
+	this.LinkedField = null ;
+	this.EditorWindow = null ;
+	this.EditorDocument = null ;
+}
+
+FCK._ExecPaste = function()
+{
+	// As we call ExecuteNamedCommand('Paste'), it would enter in a loop. So, let's use a semaphore.
+	if ( FCK._PasteIsRunning )
+		return true ;
+
+	if ( FCKConfig.ForcePasteAsPlainText )
+	{
+		FCK.PasteAsPlainText() ;
+		return false ;
+	}
+
+	var sHTML = FCK._CheckIsPastingEnabled( true ) ;
+
+	if ( sHTML === false )
+		FCKTools.RunFunction( FCKDialog.OpenDialog, FCKDialog, ['FCKDialog_Paste', FCKLang.Paste, 'dialog/fck_paste.html', 400, 330, 'Security'] ) ;
+	else
+	{
+		if ( FCKConfig.AutoDetectPasteFromWord && sHTML.length > 0 )
+		{
+			var re = /<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi ;
+			if ( re.test( sHTML ) )
+			{
+				if ( confirm( FCKLang.PasteWordConfirm ) )
+				{
+					FCK.PasteFromWord() ;
+					return false ;
+				}
+			}
+		}
+
+		// Instead of inserting the retrieved HTML, let's leave the OS work for us,
+		// by calling FCK.ExecuteNamedCommand( 'Paste' ). It could give better results.
+
+		// Enable the semaphore to avoid a loop.
+		FCK._PasteIsRunning = true ;
+
+		FCK.ExecuteNamedCommand( 'Paste' ) ;
+
+		// Removes the semaphore.
+		delete FCK._PasteIsRunning ;
+	}
+
+	// Let's always make a custom implementation (return false), otherwise
+	// the new Keyboard Handler may conflict with this code, and the CTRL+V code
+	// could result in a simple "V" being pasted.
+	return false ;
+}
+
+FCK.PasteAsPlainText = function( forceText )
+{
+	if ( !FCK._CheckIsPastingEnabled() )
+	{
+		FCKDialog.OpenDialog( 'FCKDialog_Paste', FCKLang.PasteAsText, 'dialog/fck_paste.html', 400, 330, 'PlainText' ) ;
+		return ;
+	}
+
+	// Get the data available in the clipboard in text format.
+	var sText = null ;
+	if ( ! forceText )
+		sText = clipboardData.getData("Text") ;
+	else
+		sText = forceText ;
+
+	if ( sText && sText.length > 0 )
+	{
+		// Replace the carriage returns with <BR>
+		sText = FCKTools.HTMLEncode( sText ) ;
+		sText = FCKTools.ProcessLineBreaks( window, FCKConfig, sText ) ;
+
+		var closeTagIndex = sText.search( '</p>' ) ;
+		var startTagIndex = sText.search( '<p>' ) ;
+
+		if ( ( closeTagIndex != -1 && startTagIndex != -1 && closeTagIndex < startTagIndex )
+				|| ( closeTagIndex != -1 && startTagIndex == -1 ) )
+		{
+			var prefix = sText.substr( 0, closeTagIndex ) ;
+			sText = sText.substr( closeTagIndex + 4 ) ;
+			this.InsertHtml( prefix ) ;
+		}
+
+		// Insert the resulting data in the editor.
+		FCKUndo.SaveLocked = true ;
+		this.InsertHtml( sText ) ;
+		FCKUndo.SaveLocked = false ;
+	}
+}
+
+FCK._CheckIsPastingEnabled = function( returnContents )
+{
+	// The following seams to be the only reliable way to check is script
+	// pasting operations are enabled in the security settings of IE6 and IE7.
+	// It adds a little bit of overhead to the check, but so far that's the
+	// only way, mainly because of IE7.
+
+	FCK._PasteIsEnabled = false ;
+
+	document.body.attachEvent( 'onpaste', FCK_CheckPasting_Listener ) ;
+
+	// The execCommand in GetClipboardHTML will fire the "onpaste", only if the
+	// security settings are enabled.
+	var oReturn = FCK.GetClipboardHTML() ;
+
+	document.body.detachEvent( 'onpaste', FCK_CheckPasting_Listener ) ;
+
+	if ( FCK._PasteIsEnabled )
+	{
+		if ( !returnContents )
+			oReturn = true ;
+	}
+	else
+		oReturn = false ;
+
+	delete FCK._PasteIsEnabled ;
+
+	return oReturn ;
+}
+
+function FCK_CheckPasting_Listener()
+{
+	FCK._PasteIsEnabled = true ;
+}
+
+FCK.GetClipboardHTML = function()
+{
+	var oDiv = document.getElementById( '___FCKHiddenDiv' ) ;
+
+	if ( !oDiv )
+	{
+		oDiv = document.createElement( 'DIV' ) ;
+		oDiv.id = '___FCKHiddenDiv' ;
+
+		var oDivStyle = oDiv.style ;
+		oDivStyle.position		= 'absolute' ;
+		oDivStyle.visibility	= oDivStyle.overflow	= 'hidden' ;
+		oDivStyle.width			= oDivStyle.height		= 1 ;
+
+		document.body.appendChild( oDiv ) ;
+	}
+
+	oDiv.innerHTML = '' ;
+
+	var oTextRange = document.body.createTextRange() ;
+	oTextRange.moveToElementText( oDiv ) ;
+	oTextRange.execCommand( 'Paste' ) ;
+
+	var sData = oDiv.innerHTML ;
+	oDiv.innerHTML = '' ;
+
+	return sData ;
+}
+
+FCK.CreateLink = function( url, noUndo )
+{
+	// Creates the array that will be returned. It contains one or more created links (see #220).
+	var aCreatedLinks = new Array() ;
+
+	// Remove any existing link in the selection.
+	FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ;
+
+	if ( url.length > 0 )
+	{
+		// If there are several images, and you try to link each one, all the images get inside the link:
+		// <img><img> -> <a><img></a><img> -> <a><img><img></a> due to the call to 'CreateLink' (bug in IE)
+		if (FCKSelection.GetType() == 'Control')
+		{
+			// Create a link
+			var oLink = this.EditorDocument.createElement( 'A' ) ;
+			oLink.href = url ;
+
+			// Get the selected object
+			var oControl = FCKSelection.GetSelectedElement() ;
+			// Put the link just before the object
+			oControl.parentNode.insertBefore(oLink, oControl) ;
+			// Move the object inside the link
+			oControl.parentNode.removeChild( oControl ) ;
+			oLink.appendChild( oControl ) ;
+
+			return [ oLink ] ;
+		}
+
+		// Generate a temporary name for the link.
+		var sTempUrl = 'javascript:void(0);/*' + ( new Date().getTime() ) + '*/' ;
+
+		// Use the internal "CreateLink" command to create the link.
+		FCK.ExecuteNamedCommand( 'CreateLink', sTempUrl, false, !!noUndo ) ;
+
+		// Look for the just create link.
+		var oLinks = this.EditorDocument.links ;
+
+		for ( i = 0 ; i < oLinks.length ; i++ )
+		{
+			var oLink = oLinks[i] ;
+
+			// Check it this a newly created link.
+			// getAttribute must be used. oLink.url may cause problems with IE7 (#555).
+			if ( oLink.getAttribute( 'href', 2 ) == sTempUrl )
+			{
+				var sInnerHtml = oLink.innerHTML ;	// Save the innerHTML (IE changes it if it is like an URL).
+				oLink.href = url ;
+				oLink.innerHTML = sInnerHtml ;		// Restore the innerHTML.
+
+				// If the last child is a <br> move it outside the link or it
+				// will be too easy to select this link again #388.
+				var oLastChild = oLink.lastChild ;
+				if ( oLastChild && oLastChild.nodeName == 'BR' )
+				{
+					// Move the BR after the link.
+					FCKDomTools.InsertAfterNode( oLink, oLink.removeChild( oLastChild ) ) ;
+				}
+
+				aCreatedLinks.push( oLink ) ;
+			}
+		}
+	}
+
+	return aCreatedLinks ;
+}
+
+function _FCK_RemoveDisabledAtt()
+{
+	this.removeAttribute( 'disabled' ) ;
+}
+
+function Doc_OnMouseDown( evt )
+{
+	var e = evt.srcElement ;
+
+	// Radio buttons and checkboxes should not be allowed to be triggered in IE
+	// in editable mode. Otherwise the whole browser window may be locked by
+	// the buttons. (#1782)
+	if ( e.nodeName.IEquals( 'input' ) && e.type.IEquals( ['radio', 'checkbox'] ) && !e.disabled )
+	{
+		e.disabled = true ;
+		FCKTools.SetTimeout( _FCK_RemoveDisabledAtt, 1, e ) ;
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckbrowserinfo.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckbrowserinfo.js
new file mode 100644
index 000000000..d600ced93
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckbrowserinfo.js
@@ -0,0 +1,61 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Contains browser detection information.
+ */
+
+var s = navigator.userAgent.toLowerCase() ;
+
+var FCKBrowserInfo =
+{
+	IsIE		: /*@cc_on!@*/false,
+	IsIE7		: /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ),
+	IsIE6		: /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ),
+	IsSafari	: s.Contains(' applewebkit/'),		// Read "IsWebKit"
+	IsOpera		: !!window.opera,
+	IsAIR		: s.Contains(' adobeair/'),
+	IsMac		: s.Contains('macintosh')
+} ;
+
+// Completes the browser info with further Gecko information.
+(function( browserInfo )
+{
+	browserInfo.IsGecko = ( navigator.product == 'Gecko' ) && !browserInfo.IsSafari && !browserInfo.IsOpera ;
+	browserInfo.IsGeckoLike = ( browserInfo.IsGecko || browserInfo.IsSafari || browserInfo.IsOpera ) ;
+
+	if ( browserInfo.IsGecko )
+	{
+		var geckoMatch = s.match( /rv:(\d+\.\d+)/ ) ;
+		var geckoVersion = geckoMatch && parseFloat( geckoMatch[1] ) ;
+
+		// Actually "10" refers to Gecko versions before Firefox 1.5, when
+		// Gecko 1.8 (build 20051111) has been released.
+
+		// Some browser (like Mozilla 1.7.13) may have a Gecko build greater
+		// than 20051111, so we must also check for the revision number not to
+		// be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111).
+
+		if ( geckoVersion )
+		{
+			browserInfo.IsGecko10 = ( geckoVersion < 1.8 ) ;
+			browserInfo.IsGecko19 = ( geckoVersion > 1.8 ) ;
+		}
+	}
+})(FCKBrowserInfo) ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckcodeformatter.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckcodeformatter.js
new file mode 100644
index 000000000..8a7f1526d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckcodeformatter.js
@@ -0,0 +1,100 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Format the HTML.
+ */
+
+var FCKCodeFormatter = new Object() ;
+
+FCKCodeFormatter.Init = function()
+{
+	var oRegex = this.Regex = new Object() ;
+
+	// Regex for line breaks.
+	oRegex.BlocksOpener = /\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
+	oRegex.BlocksCloser = /\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi ;
+
+	oRegex.NewLineTags	= /\<(BR|HR)[^\>]*\>/gi ;
+
+	oRegex.MainTags = /\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi ;
+
+	oRegex.LineSplitter = /\s*\n+\s*/g ;
+
+	// Regex for indentation.
+	oRegex.IncreaseIndent = /^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i ;
+	oRegex.DecreaseIndent = /^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i ;
+	oRegex.FormatIndentatorRemove = new RegExp( '^' + FCKConfig.FormatIndentator ) ;
+
+	oRegex.ProtectedTags = /(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi ;
+}
+
+FCKCodeFormatter._ProtectData = function( outer, opener, data, closer )
+{
+	return opener + '___FCKpd___' + FCKCodeFormatter.ProtectedData.AddItem( data ) + closer ;
+}
+
+FCKCodeFormatter.Format = function( html )
+{
+	if ( !this.Regex )
+		this.Init() ;
+
+	// Protected content that remain untouched during the
+	// process go in the following array.
+	FCKCodeFormatter.ProtectedData = new Array() ;
+
+	var sFormatted = html.replace( this.Regex.ProtectedTags, FCKCodeFormatter._ProtectData ) ;
+
+	// Line breaks.
+	sFormatted		= sFormatted.replace( this.Regex.BlocksOpener, '\n$&' ) ;
+	sFormatted		= sFormatted.replace( this.Regex.BlocksCloser, '$&\n' ) ;
+	sFormatted		= sFormatted.replace( this.Regex.NewLineTags, '$&\n' ) ;
+	sFormatted		= sFormatted.replace( this.Regex.MainTags, '\n$&\n' ) ;
+
+	// Indentation.
+	var sIndentation = '' ;
+
+	var asLines = sFormatted.split( this.Regex.LineSplitter ) ;
+	sFormatted = '' ;
+
+	for ( var i = 0 ; i < asLines.length ; i++ )
+	{
+		var sLine = asLines[i] ;
+
+		if ( sLine.length == 0 )
+			continue ;
+
+		if ( this.Regex.DecreaseIndent.test( sLine ) )
+			sIndentation = sIndentation.replace( this.Regex.FormatIndentatorRemove, '' ) ;
+
+		sFormatted += sIndentation + sLine + '\n' ;
+
+		if ( this.Regex.IncreaseIndent.test( sLine ) )
+			sIndentation += FCKConfig.FormatIndentator ;
+	}
+
+	// Now we put back the protected data.
+	for ( var j = 0 ; j < FCKCodeFormatter.ProtectedData.length ; j++ )
+	{
+		var oRegex = new RegExp( '___FCKpd___' + j ) ;
+		sFormatted = sFormatted.replace( oRegex, FCKCodeFormatter.ProtectedData[j].replace( /\$/g, '$$$$' ) ) ;
+	}
+
+	return sFormatted.Trim() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckcommands.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckcommands.js
new file mode 100644
index 000000000..aca203744
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckcommands.js
@@ -0,0 +1,172 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Define all commands available in the editor.
+ */
+
+var FCKCommands = FCK.Commands = new Object() ;
+FCKCommands.LoadedCommands = new Object() ;
+
+FCKCommands.RegisterCommand = function( commandName, command )
+{
+	this.LoadedCommands[ commandName ] = command ;
+}
+
+FCKCommands.GetCommand = function( commandName )
+{
+	var oCommand = FCKCommands.LoadedCommands[ commandName ] ;
+
+	if ( oCommand )
+		return oCommand ;
+
+	switch ( commandName )
+	{
+		case 'Bold'			:
+		case 'Italic'		:
+		case 'Underline'	:
+		case 'StrikeThrough':
+		case 'Subscript'	:
+		case 'Superscript'	: oCommand = new FCKCoreStyleCommand( commandName ) ; break ;
+
+		case 'RemoveFormat'	: oCommand = new FCKRemoveFormatCommand() ; break ;
+
+		case 'DocProps'		: oCommand = new FCKDialogCommand( 'DocProps'	, FCKLang.DocProps				, 'dialog/fck_docprops.html'	, 400, 380, FCKCommands.GetFullPageState ) ; break ;
+		case 'Templates'	: oCommand = new FCKDialogCommand( 'Templates'	, FCKLang.DlgTemplatesTitle		, 'dialog/fck_template.html'	, 380, 450 ) ; break ;
+		case 'Link'			: oCommand = new FCKDialogCommand( 'Link'		, FCKLang.DlgLnkWindowTitle		, 'dialog/fck_link.html'		, 400, 300 ) ; break ;
+		case 'Unlink'		: oCommand = new FCKUnlinkCommand() ; break ;
+		case 'VisitLink'	: oCommand = new FCKVisitLinkCommand() ; break ;
+		case 'Anchor'		: oCommand = new FCKDialogCommand( 'Anchor'		, FCKLang.DlgAnchorTitle		, 'dialog/fck_anchor.html'		, 370, 160 ) ; break ;
+		case 'AnchorDelete'	: oCommand = new FCKAnchorDeleteCommand() ; break ;
+		case 'BulletedList'	: oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp		, 'dialog/fck_listprop.html?UL'	, 370, 160 ) ; break ;
+		case 'NumberedList'	: oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp		, 'dialog/fck_listprop.html?OL'	, 370, 160 ) ; break ;
+		case 'About'		: oCommand = new FCKDialogCommand( 'About'		, FCKLang.About					, 'dialog/fck_about.html'		, 420, 330, function(){ return FCK_TRISTATE_OFF ; } ) ; break ;
+		case 'Find'			: oCommand = new FCKDialogCommand( 'Find'		, FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html'		, 340, 230, null, null, 'Find' ) ; break ;
+		case 'Replace'		: oCommand = new FCKDialogCommand( 'Replace'	, FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html'		, 340, 230, null, null, 'Replace' ) ; break ;
+
+		case 'Image'		: oCommand = new FCKDialogCommand( 'Image'		, FCKLang.DlgImgTitle			, 'dialog/fck_image.html'		, 450, 390 ) ; break ;
+		case 'Flash'		: oCommand = new FCKDialogCommand( 'Flash'		, FCKLang.DlgFlashTitle			, 'dialog/fck_flash.html'		, 450, 390 ) ; break ;
+		case 'SpecialChar'	: oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle	, 'dialog/fck_specialchar.html'	, 400, 290 ) ; break ;
+		case 'Smiley'		: oCommand = new FCKDialogCommand( 'Smiley'		, FCKLang.DlgSmileyTitle		, 'dialog/fck_smiley.html'		, FCKConfig.SmileyWindowWidth, FCKConfig.SmileyWindowHeight ) ; break ;
+		case 'Table'		: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html'		, 480, 250 ) ; break ;
+		case 'TableProp'	: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html?Parent', 480, 250 ) ; break ;
+		case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell'	, FCKLang.DlgCellTitle			, 'dialog/fck_tablecell.html'	, 550, 240 ) ; break ;
+
+		case 'Style'		: oCommand = new FCKStyleCommand() ; break ;
+
+		case 'FontName'		: oCommand = new FCKFontNameCommand() ; break ;
+		case 'FontSize'		: oCommand = new FCKFontSizeCommand() ; break ;
+		case 'FontFormat'	: oCommand = new FCKFormatBlockCommand() ; break ;
+
+		case 'Source'		: oCommand = new FCKSourceCommand() ; break ;
+		case 'Preview'		: oCommand = new FCKPreviewCommand() ; break ;
+		case 'Save'			: oCommand = new FCKSaveCommand() ; break ;
+		case 'NewPage'		: oCommand = new FCKNewPageCommand() ; break ;
+		case 'PageBreak'	: oCommand = new FCKPageBreakCommand() ; break ;
+		case 'Rule'			: oCommand = new FCKRuleCommand() ; break ;
+		case 'Nbsp'			: oCommand = new FCKNbsp() ; break ;
+
+		case 'TextColor'	: oCommand = new FCKTextColorCommand('ForeColor') ; break ;
+		case 'BGColor'		: oCommand = new FCKTextColorCommand('BackColor') ; break ;
+
+		case 'Paste'		: oCommand = new FCKPasteCommand() ; break ;
+		case 'PasteText'	: oCommand = new FCKPastePlainTextCommand() ; break ;
+		case 'PasteWord'	: oCommand = new FCKPasteWordCommand() ; break ;
+
+		case 'JustifyLeft'	: oCommand = new FCKJustifyCommand( 'left' ) ; break ;
+		case 'JustifyCenter'	: oCommand = new FCKJustifyCommand( 'center' ) ; break ;
+		case 'JustifyRight'	: oCommand = new FCKJustifyCommand( 'right' ) ; break ;
+		case 'JustifyFull'	: oCommand = new FCKJustifyCommand( 'justify' ) ; break ;
+		case 'Indent'	: oCommand = new FCKIndentCommand( 'indent', FCKConfig.IndentLength ) ; break ;
+		case 'Outdent'	: oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; break ;
+		case 'Blockquote'	: oCommand = new FCKBlockQuoteCommand() ; break ;
+		case 'CreateDiv'	: oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.CreateDiv, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
+		case 'EditDiv'		: oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.EditDiv, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
+		case 'DeleteDiv'	: oCommand = new FCKDeleteDivCommand() ; break ;
+
+		case 'TableInsertRowAfter'		: oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;
+		case 'TableInsertRowBefore'		: oCommand = new FCKTableCommand('TableInsertRowBefore') ; break ;
+		case 'TableDeleteRows'			: oCommand = new FCKTableCommand('TableDeleteRows') ; break ;
+		case 'TableInsertColumnAfter'	: oCommand = new FCKTableCommand('TableInsertColumnAfter') ; break ;
+		case 'TableInsertColumnBefore'	: oCommand = new FCKTableCommand('TableInsertColumnBefore') ; break ;
+		case 'TableDeleteColumns'		: oCommand = new FCKTableCommand('TableDeleteColumns') ; break ;
+		case 'TableInsertCellAfter'		: oCommand = new FCKTableCommand('TableInsertCellAfter') ; break ;
+		case 'TableInsertCellBefore'	: oCommand = new FCKTableCommand('TableInsertCellBefore') ; break ;
+		case 'TableDeleteCells'			: oCommand = new FCKTableCommand('TableDeleteCells') ; break ;
+		case 'TableMergeCells'			: oCommand = new FCKTableCommand('TableMergeCells') ; break ;
+		case 'TableMergeRight'			: oCommand = new FCKTableCommand('TableMergeRight') ; break ;
+		case 'TableMergeDown'			: oCommand = new FCKTableCommand('TableMergeDown') ; break ;
+		case 'TableHorizontalSplitCell'	: oCommand = new FCKTableCommand('TableHorizontalSplitCell') ; break ;
+		case 'TableVerticalSplitCell'	: oCommand = new FCKTableCommand('TableVerticalSplitCell') ; break ;
+		case 'TableDelete'				: oCommand = new FCKTableCommand('TableDelete') ; break ;
+
+		case 'Form'			: oCommand = new FCKDialogCommand( 'Form'		, FCKLang.Form			, 'dialog/fck_form.html'		, 380, 210 ) ; break ;
+		case 'Checkbox'		: oCommand = new FCKDialogCommand( 'Checkbox'	, FCKLang.Checkbox		, 'dialog/fck_checkbox.html'	, 380, 200 ) ; break ;
+		case 'Radio'		: oCommand = new FCKDialogCommand( 'Radio'		, FCKLang.RadioButton	, 'dialog/fck_radiobutton.html'	, 380, 200 ) ; break ;
+		case 'TextField'	: oCommand = new FCKDialogCommand( 'TextField'	, FCKLang.TextField		, 'dialog/fck_textfield.html'	, 380, 210 ) ; break ;
+		case 'Textarea'		: oCommand = new FCKDialogCommand( 'Textarea'	, FCKLang.Textarea		, 'dialog/fck_textarea.html'	, 380, 210 ) ; break ;
+		case 'HiddenField'	: oCommand = new FCKDialogCommand( 'HiddenField', FCKLang.HiddenField	, 'dialog/fck_hiddenfield.html'	, 380, 190 ) ; break ;
+		case 'Button'		: oCommand = new FCKDialogCommand( 'Button'		, FCKLang.Button		, 'dialog/fck_button.html'		, 380, 210 ) ; break ;
+		case 'Select'		: oCommand = new FCKDialogCommand( 'Select'		, FCKLang.SelectionField, 'dialog/fck_select.html'		, 400, 340 ) ; break ;
+		case 'ImageButton'	: oCommand = new FCKDialogCommand( 'ImageButton', FCKLang.ImageButton	, 'dialog/fck_image.html?ImageButton', 450, 390 ) ; break ;
+
+		case 'SpellCheck'	: oCommand = new FCKSpellCheckCommand() ; break ;
+		case 'FitWindow'	: oCommand = new FCKFitWindow() ; break ;
+
+		case 'Undo'	: oCommand = new FCKUndoCommand() ; break ;
+		case 'Redo'	: oCommand = new FCKRedoCommand() ; break ;
+		case 'Copy'	: oCommand = new FCKCutCopyCommand( false ) ; break ;
+		case 'Cut'	: oCommand = new FCKCutCopyCommand( true ) ; break ;
+
+		case 'SelectAll'			: oCommand = new FCKSelectAllCommand() ; break ;
+		case 'InsertOrderedList'	: oCommand = new FCKListCommand( 'insertorderedlist', 'ol' ) ; break ;
+		case 'InsertUnorderedList'	: oCommand = new FCKListCommand( 'insertunorderedlist', 'ul' ) ; break ;
+		case 'ShowBlocks' : oCommand = new FCKShowBlockCommand( 'ShowBlocks', FCKConfig.StartupShowBlocks ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ) ; break ;
+
+		// Generic Undefined command (usually used when a command is under development).
+		case 'Undefined'	: oCommand = new FCKUndefinedCommand() ; break ;
+
+		// By default we assume that it is a named command.
+		default:
+			if ( FCKRegexLib.NamedCommands.test( commandName ) )
+				oCommand = new FCKNamedCommand( commandName ) ;
+			else
+			{
+				alert( FCKLang.UnknownCommand.replace( /%1/g, commandName ) ) ;
+				return null ;
+			}
+	}
+
+	FCKCommands.LoadedCommands[ commandName ] = oCommand ;
+
+	return oCommand ;
+}
+
+// Gets the state of the "Document Properties" button. It must be enabled only
+// when "Full Page" editing is available.
+FCKCommands.GetFullPageState = function()
+{
+	return FCKConfig.FullPage ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+}
+
+
+FCKCommands.GetBooleanState = function( isDisabled )
+{
+	return isDisabled ? FCK_TRISTATE_DISABLED : FCK_TRISTATE_OFF ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckconfig.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckconfig.js
new file mode 100644
index 000000000..adcbacb52
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckconfig.js
@@ -0,0 +1,237 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Creates and initializes the FCKConfig object.
+ */
+
+var FCKConfig = FCK.Config = new Object() ;
+
+/*
+	For the next major version (probably 3.0) we should move all this stuff to
+	another dedicated object and leave FCKConfig as a holder object for settings only).
+*/
+
+// Editor Base Path
+if ( document.location.protocol == 'file:' )
+{
+	FCKConfig.BasePath = decodeURIComponent( document.location.pathname.substr(1) ) ;
+	FCKConfig.BasePath = FCKConfig.BasePath.replace( /\\/gi, '/' ) ;
+
+	// The way to address local files is different according to the OS.
+	// In Windows it is file:// but in MacOs it is file:/// so let's get it automatically
+	var sFullProtocol = document.location.href.match( /^(file\:\/{2,3})/ )[1] ;
+	// #945 Opera does strange things with files loaded from the disk, and it fails in Mac to load xml files
+	if ( FCKBrowserInfo.IsOpera )
+		sFullProtocol += 'localhost/' ;
+
+	FCKConfig.BasePath = sFullProtocol + FCKConfig.BasePath.substring( 0, FCKConfig.BasePath.lastIndexOf( '/' ) + 1) ;
+}
+else
+	FCKConfig.BasePath = document.location.protocol + '//' + document.location.host +
+		document.location.pathname.substring( 0, document.location.pathname.lastIndexOf( '/' ) + 1) ;
+
+FCKConfig.FullBasePath = FCKConfig.BasePath ;
+
+FCKConfig.EditorPath = FCKConfig.BasePath.replace( /editor\/$/, '' ) ;
+
+// There is a bug in Gecko. If the editor is hidden on startup, an error is
+// thrown when trying to get the screen dimensions.
+try
+{
+	FCKConfig.ScreenWidth	= screen.width ;
+	FCKConfig.ScreenHeight	= screen.height ;
+}
+catch (e)
+{
+	FCKConfig.ScreenWidth	= 800 ;
+	FCKConfig.ScreenHeight	= 600 ;
+}
+
+// Override the actual configuration values with the values passed throw the
+// hidden field "<InstanceName>___Config".
+FCKConfig.ProcessHiddenField = function()
+{
+	this.PageConfig = new Object() ;
+
+	// Get the hidden field.
+	var oConfigField = window.parent.document.getElementById( FCK.Name + '___Config' ) ;
+
+	// Do nothing if the config field was not defined.
+	if ( ! oConfigField ) return ;
+
+	var aCouples = oConfigField.value.split('&') ;
+
+	for ( var i = 0 ; i < aCouples.length ; i++ )
+	{
+		if ( aCouples[i].length == 0 )
+			continue ;
+
+		var aConfig = aCouples[i].split( '=' ) ;
+		var sKey = decodeURIComponent( aConfig[0] ) ;
+		var sVal = decodeURIComponent( aConfig[1] ) ;
+
+		if ( sKey == 'CustomConfigurationsPath' )	// The Custom Config File path must be loaded immediately.
+			FCKConfig[ sKey ] = sVal ;
+
+		else if ( sVal.toLowerCase() == "true" )	// If it is a boolean TRUE.
+			this.PageConfig[ sKey ] = true ;
+
+		else if ( sVal.toLowerCase() == "false" )	// If it is a boolean FALSE.
+			this.PageConfig[ sKey ] = false ;
+
+		else if ( sVal.length > 0 && !isNaN( sVal ) )	// If it is a number.
+			this.PageConfig[ sKey ] = parseInt( sVal, 10 ) ;
+
+		else										// In any other case it is a string.
+			this.PageConfig[ sKey ] = sVal ;
+	}
+}
+
+function FCKConfig_LoadPageConfig()
+{
+	var oPageConfig = FCKConfig.PageConfig ;
+	for ( var sKey in oPageConfig )
+		FCKConfig[ sKey ] = oPageConfig[ sKey ] ;
+}
+
+function FCKConfig_PreProcess()
+{
+	var oConfig = FCKConfig ;
+
+	// Force debug mode if fckdebug=true in the QueryString (main page).
+	if ( oConfig.AllowQueryStringDebug )
+	{
+		try
+		{
+			if ( (/fckdebug=true/i).test( window.top.location.search ) )
+				oConfig.Debug = true ;
+		}
+		catch (e) { /* Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error). */ }
+	}
+
+	// Certifies that the "PluginsPath" configuration ends with a slash.
+	if ( !oConfig.PluginsPath.EndsWith('/') )
+		oConfig.PluginsPath += '/' ;
+
+	// If no ToolbarComboPreviewCSS, point it to EditorAreaCSS.
+	var sComboPreviewCSS = oConfig.ToolbarComboPreviewCSS ;
+	if ( !sComboPreviewCSS || sComboPreviewCSS.length == 0 )
+		oConfig.ToolbarComboPreviewCSS = oConfig.EditorAreaCSS ;
+
+	// Turn the attributes that will be removed in the RemoveFormat from a string to an array
+	oConfig.RemoveAttributesArray = (oConfig.RemoveAttributes || '').split( ',' );
+
+	if ( !FCKConfig.SkinEditorCSS || FCKConfig.SkinEditorCSS.length == 0 )
+		FCKConfig.SkinEditorCSS = FCKConfig.SkinPath + 'fck_editor.css' ;
+
+	if ( !FCKConfig.SkinDialogCSS || FCKConfig.SkinDialogCSS.length == 0 )
+		FCKConfig.SkinDialogCSS = FCKConfig.SkinPath + 'fck_dialog.css' ;
+}
+
+// Define toolbar sets collection.
+FCKConfig.ToolbarSets = new Object() ;
+
+// Defines the plugins collection.
+FCKConfig.Plugins = new Object() ;
+FCKConfig.Plugins.Items = new Array() ;
+
+FCKConfig.Plugins.Add = function( name, langs, path )
+{
+	FCKConfig.Plugins.Items.AddItem( [name, langs, path] ) ;
+}
+
+// FCKConfig.ProtectedSource: object that holds a collection of Regular
+// Expressions that defined parts of the raw HTML that must remain untouched
+// like custom tags, scripts, server side code, etc...
+FCKConfig.ProtectedSource = new Object() ;
+
+// Generates a string used to identify and locate the Protected Tags comments.
+FCKConfig.ProtectedSource._CodeTag = (new Date()).valueOf() ;
+
+// Initialize the regex array with the default ones.
+FCKConfig.ProtectedSource.RegexEntries = [
+	// First of any other protection, we must protect all comments to avoid
+	// loosing them (of course, IE related).
+	/<!--[\s\S]*?-->/g ,
+
+	// Script tags will also be forced to be protected, otherwise IE will execute them.
+	/<script[\s\S]*?<\/script>/gi,
+
+	// <noscript> tags (get lost in IE and messed up in FF).
+	/<noscript[\s\S]*?<\/noscript>/gi
+] ;
+
+FCKConfig.ProtectedSource.Add = function( regexPattern )
+{
+	this.RegexEntries.AddItem( regexPattern ) ;
+}
+
+FCKConfig.ProtectedSource.Protect = function( html )
+{
+	var codeTag = this._CodeTag ;
+	function _Replace( protectedSource )
+	{
+		var index = FCKTempBin.AddElement( protectedSource ) ;
+		return '<!--{' + codeTag + index + '}-->' ;
+	}
+
+	for ( var i = 0 ; i < this.RegexEntries.length ; i++ )
+	{
+		html = html.replace( this.RegexEntries[i], _Replace ) ;
+	}
+
+	return html ;
+}
+
+FCKConfig.ProtectedSource.Revert = function( html, clearBin )
+{
+	function _Replace( m, opener, index )
+	{
+		var protectedValue = clearBin ? FCKTempBin.RemoveElement( index ) : FCKTempBin.Elements[ index ] ;
+		// There could be protected source inside another one.
+		return FCKConfig.ProtectedSource.Revert( protectedValue, clearBin ) ;
+	}
+
+	var regex = new RegExp( "(<|&lt;)!--\\{" + this._CodeTag + "(\\d+)\\}--(>|&gt;)", "g" ) ;
+	return html.replace( regex, _Replace ) ;
+}
+
+// Returns a string with the attributes that must be appended to the body
+FCKConfig.GetBodyAttributes = function()
+{
+	var bodyAttributes = '' ;
+	// Add id and class to the body.
+	if ( this.BodyId && this.BodyId.length > 0 )
+		bodyAttributes += ' id="' + this.BodyId + '"' ;
+	if ( this.BodyClass && this.BodyClass.length > 0 )
+		bodyAttributes += ' class="' + this.BodyClass + '"' ;
+
+	return bodyAttributes ;
+}
+
+// Sets the body attributes directly on the node
+FCKConfig.ApplyBodyAttributes = function( oBody )
+{
+	// Add ID and Class to the body
+	if ( this.BodyId && this.BodyId.length > 0 )
+		oBody.id = FCKConfig.BodyId ;
+	if ( this.BodyClass && this.BodyClass.length > 0 )
+		oBody.className += ' ' + FCKConfig.BodyClass ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug.js
new file mode 100644
index 000000000..97abdd3f6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug.js
@@ -0,0 +1,59 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Debug window control and operations.
+ */
+
+// Public function defined here must be declared in fckdebug_empty.js.
+
+var FCKDebug =
+{
+	Output : function( message, color, noParse )
+	{
+		if ( ! FCKConfig.Debug )
+			return ;
+
+		try
+		{
+			this._GetWindow().Output( message, color ) ;
+		}
+		catch ( e ) {}	 // Ignore errors
+	},
+
+	OutputObject : function( anyObject, color )
+	{
+		if ( ! FCKConfig.Debug )
+			return ;
+
+		try
+		{
+			this._GetWindow().OutputObject( anyObject, color ) ;
+		}
+		catch ( e ) {}	 // Ignore errors
+	},
+
+	_GetWindow : function()
+	{
+		if ( !this.DebugWindow || this.DebugWindow.closed )
+			this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ;
+
+		return this.DebugWindow ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug_empty.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug_empty.js
new file mode 100644
index 000000000..1754344b6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckdebug_empty.js
@@ -0,0 +1,31 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Debug window control and operations (empty for the compressed files - #2043).
+ */
+
+var FCKDebug =
+{
+	Output : function()
+	{},
+
+	OutputObject : function()
+	{}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckdialog.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckdialog.js
new file mode 100644
index 000000000..b0622abf3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckdialog.js
@@ -0,0 +1,239 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Dialog windows operations.
+ */
+
+var FCKDialog = ( function()
+{
+	var topDialog ;
+	var baseZIndex ;
+	var cover ;
+
+	// The document that holds the dialog.
+	var topWindow = window.parent ;
+
+	while ( topWindow.parent && topWindow.parent != topWindow )
+	{
+		try
+		{
+			if ( topWindow.parent.document.domain != document.domain )
+				break ;
+			if ( topWindow.parent.document.getElementsByTagName( 'frameset' ).length > 0 )
+				break ;
+		}
+		catch ( e )
+		{
+			break ;
+		}
+		topWindow = topWindow.parent ;
+	}
+
+	var topDocument = topWindow.document ;
+
+	var getZIndex = function()
+	{
+		if ( !baseZIndex )
+			baseZIndex = FCKConfig.FloatingPanelsZIndex + 999 ;
+		return ++baseZIndex ;
+	}
+
+	// TODO : This logic is not actually working when reducing the window, only
+	// when enlarging it.
+	var resizeHandler = function()
+	{
+		if ( !cover )
+			return ;
+
+		var relElement = FCKTools.IsStrictMode( topDocument ) ? topDocument.documentElement : topDocument.body ;
+
+		FCKDomTools.SetElementStyles( cover,
+			{
+				'width' : Math.max( relElement.scrollWidth,
+					relElement.clientWidth,
+					topDocument.scrollWidth || 0 ) - 1 + 'px',
+				'height' : Math.max( relElement.scrollHeight,
+					relElement.clientHeight,
+					topDocument.scrollHeight || 0 ) - 1 + 'px'
+			} ) ;
+	}
+
+	return {
+		/**
+		 * Opens a dialog window using the standard dialog template.
+		 */
+		OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, parentWindow, resizable )
+		{
+			if ( !topDialog )
+				this.DisplayMainCover() ;
+
+			// Setup the dialog info to be passed to the dialog.
+			var dialogInfo =
+			{
+				Title : dialogTitle,
+				Page : dialogPage,
+				Editor : window,
+				CustomValue : customValue,		// Optional
+				TopWindow : topWindow
+			}
+
+			FCK.ToolbarSet.CurrentInstance.Selection.Save() ;
+
+			// Calculate the dialog position, centering it on the screen.
+			var viewSize = FCKTools.GetViewPaneSize( topWindow ) ;
+			var scrollPosition = { 'X' : 0, 'Y' : 0 } ;
+			var useAbsolutePosition = FCKBrowserInfo.IsIE && ( !FCKBrowserInfo.IsIE7 || !FCKTools.IsStrictMode( topWindow.document ) ) ;
+			if ( useAbsolutePosition )
+				scrollPosition = FCKTools.GetScrollPosition( topWindow ) ;
+			var iTop  = Math.max( scrollPosition.Y + ( viewSize.Height - height - 20 ) / 2, 0 ) ;
+			var iLeft = Math.max( scrollPosition.X + ( viewSize.Width - width - 20 )  / 2, 0 ) ;
+
+			// Setup the IFRAME that will hold the dialog.
+			var dialog = topDocument.createElement( 'iframe' ) ;
+			FCKTools.ResetStyles( dialog ) ;
+			dialog.src = FCKConfig.BasePath + 'fckdialog.html' ;
+
+			// Dummy URL for testing whether the code in fckdialog.js alone leaks memory.
+			// dialog.src = 'about:blank';
+
+			dialog.frameBorder = 0 ;
+			dialog.allowTransparency = true ;
+			FCKDomTools.SetElementStyles( dialog,
+					{
+						'position'	: ( useAbsolutePosition ) ? 'absolute' : 'fixed',
+						'top'		: iTop + 'px',
+						'left'		: iLeft + 'px',
+						'width'		: width + 'px',
+						'height'	: height + 'px',
+						'zIndex'	: getZIndex()
+					} ) ;
+
+			// Save the dialog info to be used by the dialog page once loaded.
+			dialog._DialogArguments = dialogInfo ;
+
+			// Append the IFRAME to the target document.
+			topDocument.body.appendChild( dialog ) ;
+
+			// Keep record of the dialog's parent/child relationships.
+			dialog._ParentDialog = topDialog ;
+			topDialog = dialog ;
+		},
+
+		/**
+		 * (For internal use)
+		 * Called when the top dialog is closed.
+		 */
+		OnDialogClose : function( dialogWindow )
+		{
+			var dialog = dialogWindow.frameElement ;
+			FCKDomTools.RemoveNode( dialog ) ;
+
+			if ( dialog._ParentDialog )		// Nested Dialog.
+			{
+				topDialog = dialog._ParentDialog ;
+				dialog._ParentDialog.contentWindow.SetEnabled( true ) ;
+			}
+			else							// First Dialog.
+			{
+				// Set the Focus in the browser, so the "OnBlur" event is not
+				// fired. In IE, there is no need to do that because the dialog
+				// already moved the selection to the editing area before
+				// closing (EnsureSelection). Also, the Focus() call here
+				// causes memory leak on IE7 (weird).
+				if ( !FCKBrowserInfo.IsIE )
+					FCK.Focus() ;
+
+				this.HideMainCover() ;
+				// Bug #1918: Assigning topDialog = null directly causes IE6 to crash.
+				setTimeout( function(){ topDialog = null ; }, 0 ) ;
+
+				// Release the previously saved selection.
+				FCK.ToolbarSet.CurrentInstance.Selection.Release() ;
+			}
+		},
+
+		DisplayMainCover : function()
+		{
+			// Setup the DIV that will be used to cover.
+			cover = topDocument.createElement( 'div' ) ;
+			FCKTools.ResetStyles( cover ) ;
+			FCKDomTools.SetElementStyles( cover,
+				{
+					'position' : 'absolute',
+					'zIndex' : getZIndex(),
+					'top' : '0px',
+					'left' : '0px',
+					'backgroundColor' : FCKConfig.BackgroundBlockerColor
+				} ) ;
+			FCKDomTools.SetOpacity( cover, FCKConfig.BackgroundBlockerOpacity ) ;
+
+			// For IE6-, we need to fill the cover with a transparent IFRAME,
+			// to properly block <select> fields.
+			if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+			{
+				var iframe = topDocument.createElement( 'iframe' ) ;
+				FCKTools.ResetStyles( iframe ) ;
+				iframe.hideFocus = true ;
+				iframe.frameBorder = 0 ;
+				iframe.src = FCKTools.GetVoidUrl() ;
+				FCKDomTools.SetElementStyles( iframe,
+					{
+						'width' : '100%',
+						'height' : '100%',
+						'position' : 'absolute',
+						'left' : '0px',
+						'top' : '0px',
+						'filter' : 'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'
+					} ) ;
+				cover.appendChild( iframe ) ;
+			}
+
+			// We need to manually adjust the cover size on resize.
+			FCKTools.AddEventListener( topWindow, 'resize', resizeHandler ) ;
+			resizeHandler() ;
+
+			topDocument.body.appendChild( cover ) ;
+
+			FCKFocusManager.Lock() ;
+
+			// Prevent the user from refocusing the disabled
+			// editing window by pressing Tab. (Bug #2065)
+			var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ;
+			el._fck_originalTabIndex = el.tabIndex ;
+			el.tabIndex = -1 ;
+		},
+
+		HideMainCover : function()
+		{
+			FCKDomTools.RemoveNode( cover ) ;
+			FCKFocusManager.Unlock() ;
+
+			// Revert the tab index hack. (Bug #2065)
+			var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ;
+			el.tabIndex = el._fck_originalTabIndex ;
+			FCKDomTools.ClearElementJSProperty( el, '_fck_originalTabIndex' ) ;
+		},
+
+		GetCover : function()
+		{
+			return cover ;
+		}
+	} ;
+} )() ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckdocumentprocessor.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckdocumentprocessor.js
new file mode 100644
index 000000000..a70c07fab
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckdocumentprocessor.js
@@ -0,0 +1,270 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Advanced document processors.
+ */
+
+var FCKDocumentProcessor = new Object() ;
+FCKDocumentProcessor._Items = new Array() ;
+
+FCKDocumentProcessor.AppendNew = function()
+{
+	var oNewItem = new Object() ;
+	this._Items.AddItem( oNewItem ) ;
+	return oNewItem ;
+}
+
+FCKDocumentProcessor.Process = function( document )
+{
+	var bIsDirty = FCK.IsDirty() ;
+	var oProcessor, i = 0 ;
+	while( ( oProcessor = this._Items[i++] ) )
+		oProcessor.ProcessDocument( document ) ;
+	if ( !bIsDirty )
+		FCK.ResetIsDirty() ;
+}
+
+var FCKDocumentProcessor_CreateFakeImage = function( fakeClass, realElement )
+{
+	var oImg = FCKTools.GetElementDocument( realElement ).createElement( 'IMG' ) ;
+	oImg.className = fakeClass ;
+	oImg.src = FCKConfig.BasePath + 'images/spacer.gif' ;
+	oImg.setAttribute( '_fckfakelement', 'true', 0 ) ;
+	oImg.setAttribute( '_fckrealelement', FCKTempBin.AddElement( realElement ), 0 ) ;
+	return oImg ;
+}
+
+// Link Anchors
+if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
+{
+	var FCKAnchorsProcessor = FCKDocumentProcessor.AppendNew() ;
+	FCKAnchorsProcessor.ProcessDocument = function( document )
+	{
+		var aLinks = document.getElementsByTagName( 'A' ) ;
+
+		var oLink ;
+		var i = aLinks.length - 1 ;
+		while ( i >= 0 && ( oLink = aLinks[i--] ) )
+		{
+			// If it is anchor. Doesn't matter if it's also a link (even better: we show that it's both a link and an anchor)
+			if ( oLink.name.length > 0 )
+			{
+				//if the anchor has some content then we just add a temporary class
+				if ( oLink.innerHTML !== '' )
+				{
+					if ( FCKBrowserInfo.IsIE )
+						oLink.className += ' FCK__AnchorC' ;
+				}
+				else
+				{
+					var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oLink.cloneNode(true) ) ;
+					oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
+
+					oLink.parentNode.insertBefore( oImg, oLink ) ;
+					oLink.parentNode.removeChild( oLink ) ;
+				}
+			}
+		}
+	}
+}
+
+// Page Breaks
+var FCKPageBreaksProcessor = FCKDocumentProcessor.AppendNew() ;
+FCKPageBreaksProcessor.ProcessDocument = function( document )
+{
+	var aDIVs = document.getElementsByTagName( 'DIV' ) ;
+
+	var eDIV ;
+	var i = aDIVs.length - 1 ;
+	while ( i >= 0 && ( eDIV = aDIVs[i--] ) )
+	{
+		if ( eDIV.style.pageBreakAfter == 'always' && eDIV.childNodes.length == 1 && eDIV.childNodes[0].style && eDIV.childNodes[0].style.display == 'none' )
+		{
+			var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', eDIV.cloneNode(true) ) ;
+
+			eDIV.parentNode.insertBefore( oFakeImage, eDIV ) ;
+			eDIV.parentNode.removeChild( eDIV ) ;
+		}
+	}
+/*
+	var aCenters = document.getElementsByTagName( 'CENTER' ) ;
+
+	var oCenter ;
+	var i = aCenters.length - 1 ;
+	while ( i >= 0 && ( oCenter = aCenters[i--] ) )
+	{
+		if ( oCenter.style.pageBreakAfter == 'always' && oCenter.innerHTML.Trim().length == 0 )
+		{
+			var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', oCenter.cloneNode(true) ) ;
+
+			oCenter.parentNode.insertBefore( oFakeImage, oCenter ) ;
+			oCenter.parentNode.removeChild( oCenter ) ;
+		}
+	}
+*/
+}
+
+// EMBED and OBJECT tags.
+FCKEmbedAndObjectProcessor = (function()
+{
+	var customProcessors = [] ;
+
+	var processElement = function( el )
+	{
+		var clone = el.cloneNode( true ) ;
+		var replaceElement ;
+		var fakeImg = replaceElement = FCKDocumentProcessor_CreateFakeImage( 'FCK__UnknownObject', clone ) ;
+		FCKEmbedAndObjectProcessor.RefreshView( fakeImg, el ) ;
+
+		for ( var i = 0 ; i < customProcessors.length ; i++ )
+			replaceElement = customProcessors[i]( el, replaceElement ) || replaceElement ;
+
+		if ( replaceElement != fakeImg )
+			FCKTempBin.RemoveElement( fakeImg.getAttribute( '_fckrealelement' ) ) ;
+
+		el.parentNode.replaceChild( replaceElement, el ) ;
+	}
+
+	var processElementsByName = function( elementName, doc )
+	{
+		var aObjects = doc.getElementsByTagName( elementName );
+		for ( var i = aObjects.length - 1 ; i >= 0 ; i-- )
+			processElement( aObjects[i] ) ;
+	}
+
+	var processObjectAndEmbed = function( doc )
+	{
+		processElementsByName( 'object', doc );
+		processElementsByName( 'embed', doc );
+	}
+
+	return FCKTools.Merge( FCKDocumentProcessor.AppendNew(),
+		       {
+				ProcessDocument : function( doc )
+				{
+					// Firefox 3 would sometimes throw an unknown exception while accessing EMBEDs and OBJECTs
+					// without the setTimeout().
+					if ( FCKBrowserInfo.IsGecko )
+						FCKTools.RunFunction( processObjectAndEmbed, this, [ doc ] ) ;
+					else
+						processObjectAndEmbed( doc ) ;
+				},
+
+				RefreshView : function( placeHolder, original )
+				{
+					if ( original.getAttribute( 'width' ) > 0 )
+						placeHolder.style.width = FCKTools.ConvertHtmlSizeToStyle( original.getAttribute( 'width' ) ) ;
+
+					if ( original.getAttribute( 'height' ) > 0 )
+						placeHolder.style.height = FCKTools.ConvertHtmlSizeToStyle( original.getAttribute( 'height' ) ) ;
+				},
+
+				AddCustomHandler : function( func )
+				{
+					customProcessors.push( func ) ;
+				}
+			} ) ;
+} )() ;
+
+FCK.GetRealElement = function( fakeElement )
+{
+	var e = FCKTempBin.Elements[ fakeElement.getAttribute('_fckrealelement') ] ;
+
+	if ( fakeElement.getAttribute('_fckflash') )
+	{
+		if ( fakeElement.style.width.length > 0 )
+				e.width = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.width ) ;
+
+		if ( fakeElement.style.height.length > 0 )
+				e.height = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.height ) ;
+	}
+
+	return e ;
+}
+
+// HR Processor.
+// This is a IE only (tricky) thing. We protect all HR tags before loading them
+// (see FCK.ProtectTags). Here we put the HRs back.
+if ( FCKBrowserInfo.IsIE )
+{
+	FCKDocumentProcessor.AppendNew().ProcessDocument = function( document )
+	{
+		var aHRs = document.getElementsByTagName( 'HR' ) ;
+
+		var eHR ;
+		var i = aHRs.length - 1 ;
+		while ( i >= 0 && ( eHR = aHRs[i--] ) )
+		{
+			// Create the replacement HR.
+			var newHR = document.createElement( 'hr' ) ;
+			newHR.mergeAttributes( eHR, true ) ;
+
+			// We must insert the new one after it. insertBefore will not work in all cases.
+			FCKDomTools.InsertAfterNode( eHR, newHR ) ;
+
+			eHR.parentNode.removeChild( eHR ) ;
+		}
+	}
+}
+
+// INPUT:hidden Processor.
+FCKDocumentProcessor.AppendNew().ProcessDocument = function( document )
+{
+	var aInputs = document.getElementsByTagName( 'INPUT' ) ;
+
+	var oInput ;
+	var i = aInputs.length - 1 ;
+	while ( i >= 0 && ( oInput = aInputs[i--] ) )
+	{
+		if ( oInput.type == 'hidden' )
+		{
+			var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oInput.cloneNode(true) ) ;
+			oImg.setAttribute( '_fckinputhidden', 'true', 0 ) ;
+
+			oInput.parentNode.insertBefore( oImg, oInput ) ;
+			oInput.parentNode.removeChild( oInput ) ;
+		}
+	}
+}
+
+// Flash handler.
+FCKEmbedAndObjectProcessor.AddCustomHandler( function( el, fakeImg )
+	{
+		if ( ! ( el.nodeName.IEquals( 'embed' ) && ( el.type == 'application/x-shockwave-flash' || /\.swf($|#|\?)/i.test( el.src ) ) ) )
+			return ;
+		fakeImg.className = 'FCK__Flash' ;
+		fakeImg.setAttribute( '_fckflash', 'true', 0 );
+	} ) ;
+
+// Buggy <span class="Apple-style-span"> tags added by Safari.
+if ( FCKBrowserInfo.IsSafari )
+{
+	FCKDocumentProcessor.AppendNew().ProcessDocument = function( doc )
+	{
+		var spans = doc.getElementsByClassName ?
+			doc.getElementsByClassName( 'Apple-style-span' ) :
+			Array.prototype.filter.call(
+					doc.getElementsByTagName( 'span' ),
+					function( item ){ return item.className == 'Apple-style-span' ; }
+					) ;
+		for ( var i = spans.length - 1 ; i >= 0 ; i-- )
+			FCKDomTools.RemoveNode( spans[i], true ) ;
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckdomtools.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckdomtools.js
new file mode 100644
index 000000000..af9d739fe
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckdomtools.js
@@ -0,0 +1,1057 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Utility functions to work with the DOM.
+ */
+
+var FCKDomTools =
+{
+	/**
+	 * Move all child nodes from one node to another.
+	 */
+	MoveChildren : function( source, target, toTargetStart )
+	{
+		if ( source == target )
+			return ;
+
+		var eChild ;
+
+		if ( toTargetStart )
+		{
+			while ( (eChild = source.lastChild) )
+				target.insertBefore( source.removeChild( eChild ), target.firstChild ) ;
+		}
+		else
+		{
+			while ( (eChild = source.firstChild) )
+				target.appendChild( source.removeChild( eChild ) ) ;
+		}
+	},
+
+	MoveNode : function( source, target, toTargetStart )
+	{
+		if ( toTargetStart )
+			target.insertBefore( FCKDomTools.RemoveNode( source ), target.firstChild ) ;
+		else
+			target.appendChild( FCKDomTools.RemoveNode( source ) ) ;
+	},
+
+	// Remove blank spaces from the beginning and the end of the contents of a node.
+	TrimNode : function( node )
+	{
+		this.LTrimNode( node ) ;
+		this.RTrimNode( node ) ;
+	},
+
+	LTrimNode : function( node )
+	{
+		var eChildNode ;
+
+		while ( (eChildNode = node.firstChild) )
+		{
+			if ( eChildNode.nodeType == 3 )
+			{
+				var sTrimmed = eChildNode.nodeValue.LTrim() ;
+				var iOriginalLength = eChildNode.nodeValue.length ;
+
+				if ( sTrimmed.length == 0 )
+				{
+					node.removeChild( eChildNode ) ;
+					continue ;
+				}
+				else if ( sTrimmed.length < iOriginalLength )
+				{
+					eChildNode.splitText( iOriginalLength - sTrimmed.length ) ;
+					node.removeChild( node.firstChild ) ;
+				}
+			}
+			break ;
+		}
+	},
+
+	RTrimNode : function( node )
+	{
+		var eChildNode ;
+
+		while ( (eChildNode = node.lastChild) )
+		{
+			if ( eChildNode.nodeType == 3 )
+			{
+				var sTrimmed = eChildNode.nodeValue.RTrim() ;
+				var iOriginalLength = eChildNode.nodeValue.length ;
+
+				if ( sTrimmed.length == 0 )
+				{
+					// If the trimmed text node is empty, just remove it.
+
+					// Use "eChildNode.parentNode" instead of "node" to avoid IE bug (#81).
+					eChildNode.parentNode.removeChild( eChildNode ) ;
+					continue ;
+				}
+				else if ( sTrimmed.length < iOriginalLength )
+				{
+					// If the trimmed text length is less than the original
+					// length, strip all spaces from the end by splitting
+					// the text and removing the resulting useless node.
+
+					eChildNode.splitText( sTrimmed.length ) ;
+					// Use "node.lastChild.parentNode" instead of "node" to avoid IE bug (#81).
+					node.lastChild.parentNode.removeChild( node.lastChild ) ;
+				}
+			}
+			break ;
+		}
+
+		if ( !FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsOpera )
+		{
+			eChildNode = node.lastChild ;
+
+			if ( eChildNode && eChildNode.nodeType == 1 && eChildNode.nodeName.toLowerCase() == 'br' )
+			{
+				// Use "eChildNode.parentNode" instead of "node" to avoid IE bug (#324).
+				eChildNode.parentNode.removeChild( eChildNode ) ;
+			}
+		}
+	},
+
+	RemoveNode : function( node, excludeChildren )
+	{
+		if ( excludeChildren )
+		{
+			// Move all children before the node.
+			var eChild ;
+			while ( (eChild = node.firstChild) )
+				node.parentNode.insertBefore( node.removeChild( eChild ), node ) ;
+		}
+
+		return node.parentNode.removeChild( node ) ;
+	},
+
+	GetFirstChild : function( node, childNames )
+	{
+		// If childNames is a string, transform it in a Array.
+		if ( typeof ( childNames ) == 'string' )
+			childNames = [ childNames ] ;
+
+		var eChild = node.firstChild ;
+		while( eChild )
+		{
+			if ( eChild.nodeType == 1 && eChild.tagName.Equals.apply( eChild.tagName, childNames ) )
+				return eChild ;
+
+			eChild = eChild.nextSibling ;
+		}
+
+		return null ;
+	},
+
+	GetLastChild : function( node, childNames )
+	{
+		// If childNames is a string, transform it in a Array.
+		if ( typeof ( childNames ) == 'string' )
+			childNames = [ childNames ] ;
+
+		var eChild = node.lastChild ;
+		while( eChild )
+		{
+			if ( eChild.nodeType == 1 && ( !childNames || eChild.tagName.Equals( childNames ) ) )
+				return eChild ;
+
+			eChild = eChild.previousSibling ;
+		}
+
+		return null ;
+	},
+
+	/*
+	 * Gets the previous element (nodeType=1) in the source order. Returns
+	 * "null" If no element is found.
+	 *		@param {Object} currentNode The node to start searching from.
+	 *		@param {Boolean} ignoreSpaceTextOnly Sets how text nodes will be
+	 *				handled. If set to "true", only white spaces text nodes
+	 *				will be ignored, while non white space text nodes will stop
+	 *				the search, returning null. If "false" or omitted, all
+	 *				text nodes are ignored.
+	 *		@param {string[]} stopSearchElements An array of element names that
+	 *				will cause the search to stop when found, returning null.
+	 *				May be omitted (or null).
+	 *		@param {string[]} ignoreElements An array of element names that
+	 *				must be ignored during the search.
+	 */
+	GetPreviousSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements )
+	{
+		if ( !currentNode )
+			return null ;
+
+		if ( stopSearchElements && currentNode.nodeType == 1 && currentNode.nodeName.IEquals( stopSearchElements ) )
+			return null ;
+
+		if ( currentNode.previousSibling )
+			currentNode = currentNode.previousSibling ;
+		else
+			return this.GetPreviousSourceElement( currentNode.parentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
+
+		while ( currentNode )
+		{
+			if ( currentNode.nodeType == 1 )
+			{
+				if ( stopSearchElements && currentNode.nodeName.IEquals( stopSearchElements ) )
+					break ;
+
+				if ( !ignoreElements || !currentNode.nodeName.IEquals( ignoreElements ) )
+					return currentNode ;
+			}
+			else if ( ignoreSpaceTextOnly && currentNode.nodeType == 3 && currentNode.nodeValue.RTrim().length > 0 )
+				break ;
+
+			if ( currentNode.lastChild )
+				currentNode = currentNode.lastChild ;
+			else
+				return this.GetPreviousSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
+		}
+
+		return null ;
+	},
+
+	/*
+	 * Gets the next element (nodeType=1) in the source order. Returns
+	 * "null" If no element is found.
+	 *		@param {Object} currentNode The node to start searching from.
+	 *		@param {Boolean} ignoreSpaceTextOnly Sets how text nodes will be
+	 *				handled. If set to "true", only white spaces text nodes
+	 *				will be ignored, while non white space text nodes will stop
+	 *				the search, returning null. If "false" or omitted, all
+	 *				text nodes are ignored.
+	 *		@param {string[]} stopSearchElements An array of element names that
+	 *				will cause the search to stop when found, returning null.
+	 *				May be omitted (or null).
+	 *		@param {string[]} ignoreElements An array of element names that
+	 *				must be ignored during the search.
+	 */
+	GetNextSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements, startFromSibling )
+	{
+		while( ( currentNode = this.GetNextSourceNode( currentNode, startFromSibling ) ) )	// Only one "=".
+		{
+			if ( currentNode.nodeType == 1 )
+			{
+				if ( stopSearchElements && currentNode.nodeName.IEquals( stopSearchElements ) )
+					break ;
+
+				if ( ignoreElements && currentNode.nodeName.IEquals( ignoreElements ) )
+					return this.GetNextSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
+
+				return currentNode ;
+			}
+			else if ( ignoreSpaceTextOnly && currentNode.nodeType == 3 && currentNode.nodeValue.RTrim().length > 0 )
+				break ;
+		}
+
+		return null ;
+	},
+
+	/*
+	 * Get the next DOM node available in source order.
+	 */
+	GetNextSourceNode : function( currentNode, startFromSibling, nodeType, stopSearchNode )
+	{
+		if ( !currentNode )
+			return null ;
+
+		var node ;
+
+		if ( !startFromSibling && currentNode.firstChild )
+			node = currentNode.firstChild ;
+		else
+		{
+			if ( stopSearchNode && currentNode == stopSearchNode )
+				return null ;
+
+			node = currentNode.nextSibling ;
+
+			if ( !node && ( !stopSearchNode || stopSearchNode != currentNode.parentNode ) )
+				return this.GetNextSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ;
+		}
+
+		if ( nodeType && node && node.nodeType != nodeType )
+			return this.GetNextSourceNode( node, false, nodeType, stopSearchNode ) ;
+
+		return node ;
+	},
+
+	/*
+	 * Get the next DOM node available in source order.
+	 */
+	GetPreviousSourceNode : function( currentNode, startFromSibling, nodeType, stopSearchNode )
+	{
+		if ( !currentNode )
+			return null ;
+
+		var node ;
+
+		if ( !startFromSibling && currentNode.lastChild )
+			node = currentNode.lastChild ;
+		else
+		{
+			if ( stopSearchNode && currentNode == stopSearchNode )
+				return null ;
+
+			node = currentNode.previousSibling ;
+
+			if ( !node && ( !stopSearchNode || stopSearchNode != currentNode.parentNode ) )
+				return this.GetPreviousSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ;
+		}
+
+		if ( nodeType && node && node.nodeType != nodeType )
+			return this.GetPreviousSourceNode( node, false, nodeType, stopSearchNode ) ;
+
+		return node ;
+	},
+
+	// Inserts a element after a existing one.
+	InsertAfterNode : function( existingNode, newNode )
+	{
+		return existingNode.parentNode.insertBefore( newNode, existingNode.nextSibling ) ;
+	},
+
+	GetParents : function( node )
+	{
+		var parents = new Array() ;
+
+		while ( node )
+		{
+			parents.unshift( node ) ;
+			node = node.parentNode ;
+		}
+
+		return parents ;
+	},
+
+	GetCommonParents : function( node1, node2 )
+	{
+		var p1 = this.GetParents( node1 ) ;
+		var p2 = this.GetParents( node2 ) ;
+		var retval = [] ;
+		for ( var i = 0 ; i < p1.length ; i++ )
+		{
+			if ( p1[i] == p2[i] )
+				retval.push( p1[i] ) ;
+		}
+		return retval ;
+	},
+
+	GetCommonParentNode : function( node1, node2, tagList )
+	{
+		var tagMap = {} ;
+		if ( ! tagList.pop )
+			tagList = [ tagList ] ;
+		while ( tagList.length > 0 )
+			tagMap[tagList.pop().toLowerCase()] = 1 ;
+
+		var commonParents = this.GetCommonParents( node1, node2 ) ;
+		var currentParent = null ;
+		while ( ( currentParent = commonParents.pop() ) )
+		{
+			if ( tagMap[currentParent.nodeName.toLowerCase()] )
+				return currentParent ;
+		}
+		return null ;
+	},
+
+	GetIndexOf : function( node )
+	{
+		var currentNode = node.parentNode ? node.parentNode.firstChild : null ;
+		var currentIndex = -1 ;
+
+		while ( currentNode )
+		{
+			currentIndex++ ;
+
+			if ( currentNode == node )
+				return currentIndex ;
+
+			currentNode = currentNode.nextSibling ;
+		}
+
+		return -1 ;
+	},
+
+	PaddingNode : null,
+
+	EnforcePaddingNode : function( doc, tagName )
+	{
+		// In IE it can happen when the page is reloaded that doc or doc.body is null, so exit here
+		try
+		{
+			if ( !doc || !doc.body )
+				return ;
+		}
+		catch (e)
+		{
+			return ;
+		}
+
+		this.CheckAndRemovePaddingNode( doc, tagName, true ) ;
+		try
+		{
+			if ( doc.body.lastChild && ( doc.body.lastChild.nodeType != 1
+					|| doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() ) )
+				return ;
+		}
+		catch (e)
+		{
+			return ;
+		}
+
+		var node = doc.createElement( tagName ) ;
+		if ( FCKBrowserInfo.IsGecko && FCKListsLib.NonEmptyBlockElements[ tagName ] )
+			FCKTools.AppendBogusBr( node ) ;
+		this.PaddingNode = node ;
+		if ( doc.body.childNodes.length == 1
+				&& doc.body.firstChild.nodeType == 1
+				&& doc.body.firstChild.tagName.toLowerCase() == 'br'
+				&& ( doc.body.firstChild.getAttribute( '_moz_dirty' ) != null
+					|| doc.body.firstChild.getAttribute( 'type' ) == '_moz' ) )
+			doc.body.replaceChild( node, doc.body.firstChild ) ;
+		else
+			doc.body.appendChild( node ) ;
+	},
+
+	CheckAndRemovePaddingNode : function( doc, tagName, dontRemove )
+	{
+		var paddingNode = this.PaddingNode ;
+		if ( ! paddingNode )
+			return ;
+
+		// If the padding node is changed, remove its status as a padding node.
+		try
+		{
+			if ( paddingNode.parentNode != doc.body
+				|| paddingNode.tagName.toLowerCase() != tagName
+				|| ( paddingNode.childNodes.length > 1 )
+				|| ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0'
+					&& String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) )
+			{
+				this.PaddingNode = null ;
+				return ;
+			}
+		}
+		catch (e)
+		{
+				this.PaddingNode = null ;
+				return ;
+		}
+
+		// Now we're sure the padding node exists, and it is unchanged, and it
+		// isn't the only node in doc.body, remove it.
+		if ( !dontRemove )
+		{
+			if ( paddingNode.parentNode.childNodes.length > 1 )
+				paddingNode.parentNode.removeChild( paddingNode ) ;
+			this.PaddingNode = null ;
+		}
+	},
+
+	HasAttribute : function( element, attributeName )
+	{
+		if ( element.hasAttribute )
+			return element.hasAttribute( attributeName ) ;
+		else
+		{
+			var att = element.attributes[ attributeName ] ;
+			return ( att != undefined && att.specified ) ;
+		}
+	},
+
+	/**
+	 * Checks if an element has "specified" attributes.
+	 */
+	HasAttributes : function( element )
+	{
+		var attributes = element.attributes ;
+
+		for ( var i = 0 ; i < attributes.length ; i++ )
+		{
+			if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' )
+			{
+				// IE has a strange bug. If calling removeAttribute('className'),
+				// the attributes collection will still contain the "class"
+				// attribute, which will be marked as "specified", even if the
+				// outerHTML of the element is not displaying the class attribute.
+				// Note : I was not able to reproduce it outside the editor,
+				// but I've faced it while working on the TC of #1391.
+				if ( element.className.length > 0 )
+					return true ;
+			}
+			else if ( attributes[i].specified )
+				return true ;
+		}
+
+		return false ;
+	},
+
+	/**
+	 * Remove an attribute from an element.
+	 */
+	RemoveAttribute : function( element, attributeName )
+	{
+		if ( FCKBrowserInfo.IsIE && attributeName.toLowerCase() == 'class' )
+			attributeName = 'className' ;
+
+		return element.removeAttribute( attributeName, 0 ) ;
+	},
+
+	/**
+	 * Removes an array of attributes from an element
+	 */
+	RemoveAttributes : function (element, aAttributes )
+	{
+		for ( var i = 0 ; i < aAttributes.length ; i++ )
+			this.RemoveAttribute( element, aAttributes[i] );
+	},
+
+	GetAttributeValue : function( element, att )
+	{
+		var attName = att ;
+
+		if ( typeof att == 'string' )
+			att = element.attributes[ att ] ;
+		else
+			attName = att.nodeName ;
+
+		if ( att && att.specified )
+		{
+			// IE returns "null" for the nodeValue of a "style" attribute.
+			if ( attName == 'style' )
+				return element.style.cssText ;
+			// There are two cases when the nodeValue must be used:
+			//		- for the "class" attribute (all browsers).
+			//		- for events attributes (IE only).
+			else if ( attName == 'class' || attName.indexOf('on') == 0 )
+				return att.nodeValue ;
+			else
+			{
+				// Use getAttribute to get its value  exactly as it is
+				// defined.
+				return element.getAttribute( attName, 2 ) ;
+			}
+		}
+		return null ;
+	},
+
+	/**
+	 * Checks whether one element contains the other.
+	 */
+	Contains : function( mainElement, otherElement )
+	{
+		// IE supports contains, but only for element nodes.
+		if ( mainElement.contains && otherElement.nodeType == 1 )
+			return mainElement.contains( otherElement ) ;
+
+		while ( ( otherElement = otherElement.parentNode ) )	// Only one "="
+		{
+			if ( otherElement == mainElement )
+				return true ;
+		}
+		return false ;
+	},
+
+	/**
+	 * Breaks a parent element in the position of one of its contained elements.
+	 * For example, in the following case:
+	 *		<b>This <i>is some<span /> sample</i> test text</b>
+	 * If element = <span />, we have these results:
+	 *		<b>This <i>is some</i><span /><i> sample</i> test text</b>			(If parent = <i>)
+	 *		<b>This <i>is some</i></b><span /><b><i> sample</i> test text</b>	(If parent = <b>)
+	 */
+	BreakParent : function( element, parent, reusableRange )
+	{
+		var range = reusableRange || new FCKDomRange( FCKTools.GetElementWindow( element ) ) ;
+
+		// We'll be extracting part of this element, so let's use our
+		// range to get the correct piece.
+		range.SetStart( element, 4 ) ;
+		range.SetEnd( parent, 4 ) ;
+
+		// Extract it.
+		var docFrag = range.ExtractContents() ;
+
+		// Move the element outside the broken element.
+		range.InsertNode( element.parentNode.removeChild( element ) ) ;
+
+		// Re-insert the extracted piece after the element.
+		docFrag.InsertAfterNode( element ) ;
+
+		range.Release( !!reusableRange ) ;
+	},
+
+	/**
+	 * Retrieves a uniquely identifiable tree address of a DOM tree node.
+	 * The tree address returns is an array of integers, with each integer
+	 * indicating a child index from a DOM tree node, starting from
+	 * document.documentElement.
+	 *
+	 * For example, assuming <body> is the second child from <html> (<head>
+	 * being the first), and we'd like to address the third child under the
+	 * fourth child of body, the tree address returned would be:
+	 * [1, 3, 2]
+	 *
+	 * The tree address cannot be used for finding back the DOM tree node once
+	 * the DOM tree structure has been modified.
+	 */
+	GetNodeAddress : function( node, normalized )
+	{
+		var retval = [] ;
+		while ( node && node != FCKTools.GetElementDocument( node ).documentElement )
+		{
+			var parentNode = node.parentNode ;
+			var currentIndex = -1 ;
+			for( var i = 0 ; i < parentNode.childNodes.length ; i++ )
+			{
+				var candidate = parentNode.childNodes[i] ;
+				if ( normalized === true &&
+						candidate.nodeType == 3 &&
+						candidate.previousSibling &&
+						candidate.previousSibling.nodeType == 3 )
+					continue;
+				currentIndex++ ;
+				if ( parentNode.childNodes[i] == node )
+					break ;
+			}
+			retval.unshift( currentIndex ) ;
+			node = node.parentNode ;
+		}
+		return retval ;
+	},
+
+	/**
+	 * The reverse transformation of FCKDomTools.GetNodeAddress(). This
+	 * function returns the DOM node pointed to by its index address.
+	 */
+	GetNodeFromAddress : function( doc, addr, normalized )
+	{
+		var cursor = doc.documentElement ;
+		for ( var i = 0 ; i < addr.length ; i++ )
+		{
+			var target = addr[i] ;
+			if ( ! normalized )
+			{
+				cursor = cursor.childNodes[target] ;
+				continue ;
+			}
+
+			var currentIndex = -1 ;
+			for (var j = 0 ; j < cursor.childNodes.length ; j++ )
+			{
+				var candidate = cursor.childNodes[j] ;
+				if ( normalized === true &&
+						candidate.nodeType == 3 &&
+						candidate.previousSibling &&
+						candidate.previousSibling.nodeType == 3 )
+					continue ;
+				currentIndex++ ;
+				if ( currentIndex == target )
+				{
+					cursor = candidate ;
+					break ;
+				}
+			}
+		}
+		return cursor ;
+	},
+
+	CloneElement : function( element )
+	{
+		element = element.cloneNode( false ) ;
+
+		// The "id" attribute should never be cloned to avoid duplication.
+		element.removeAttribute( 'id', false ) ;
+
+		return element ;
+	},
+
+	ClearElementJSProperty : function( element, attrName )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			element.removeAttribute( attrName ) ;
+		else
+			delete element[attrName] ;
+	},
+
+	SetElementMarker : function ( markerObj, element, attrName, value)
+	{
+		var id = String( parseInt( Math.random() * 0xffffffff, 10 ) ) ;
+		element._FCKMarkerId = id ;
+		element[attrName] = value ;
+		if ( ! markerObj[id] )
+			markerObj[id] = { 'element' : element, 'markers' : {} } ;
+		markerObj[id]['markers'][attrName] = value ;
+	},
+
+	ClearElementMarkers : function( markerObj, element, clearMarkerObj )
+	{
+		var id = element._FCKMarkerId ;
+		if ( ! id )
+			return ;
+		this.ClearElementJSProperty( element, '_FCKMarkerId' ) ;
+		for ( var j in markerObj[id]['markers'] )
+			this.ClearElementJSProperty( element, j ) ;
+		if ( clearMarkerObj )
+			delete markerObj[id] ;
+	},
+
+	ClearAllMarkers : function( markerObj )
+	{
+		for ( var i in markerObj )
+			this.ClearElementMarkers( markerObj, markerObj[i]['element'], true ) ;
+	},
+
+	/**
+	 * Convert a DOM list tree into a data structure that is easier to
+	 * manipulate. This operation should be non-intrusive in the sense that it
+	 * does not change the DOM tree, with the exception that it may add some
+	 * markers to the list item nodes when markerObj is specified.
+	 */
+	ListToArray : function( listNode, markerObj, baseArray, baseIndentLevel, grandparentNode )
+	{
+		if ( ! listNode.nodeName.IEquals( ['ul', 'ol'] ) )
+			return [] ;
+
+		if ( ! baseIndentLevel )
+			baseIndentLevel = 0 ;
+		if ( ! baseArray )
+			baseArray = [] ;
+		// Iterate over all list items to get their contents and look for inner lists.
+		for ( var i = 0 ; i < listNode.childNodes.length ; i++ )
+		{
+			var listItem = listNode.childNodes[i] ;
+			if ( ! listItem.nodeName.IEquals( 'li' ) )
+				continue ;
+			var itemObj = { 'parent' : listNode, 'indent' : baseIndentLevel, 'contents' : [] } ;
+			if ( ! grandparentNode )
+			{
+				itemObj.grandparent = listNode.parentNode ;
+				if ( itemObj.grandparent && itemObj.grandparent.nodeName.IEquals( 'li' ) )
+					itemObj.grandparent = itemObj.grandparent.parentNode ;
+			}
+			else
+				itemObj.grandparent = grandparentNode ;
+			if ( markerObj )
+				this.SetElementMarker( markerObj, listItem, '_FCK_ListArray_Index', baseArray.length ) ;
+			baseArray.push( itemObj ) ;
+			for ( var j = 0 ; j < listItem.childNodes.length ; j++ )
+			{
+				var child = listItem.childNodes[j] ;
+				if ( child.nodeName.IEquals( ['ul', 'ol'] ) )
+					// Note the recursion here, it pushes inner list items with
+					// +1 indentation in the correct order.
+					this.ListToArray( child, markerObj, baseArray, baseIndentLevel + 1, itemObj.grandparent ) ;
+				else
+					itemObj.contents.push( child ) ;
+			}
+		}
+		return baseArray ;
+	},
+
+	// Convert our internal representation of a list back to a DOM forest.
+	ArrayToList : function( listArray, markerObj, baseIndex )
+	{
+		if ( baseIndex == undefined )
+			baseIndex = 0 ;
+		if ( ! listArray || listArray.length < baseIndex + 1 )
+			return null ;
+		var doc = FCKTools.GetElementDocument( listArray[baseIndex].parent ) ;
+		var retval = doc.createDocumentFragment() ;
+		var rootNode = null ;
+		var currentIndex = baseIndex ;
+		var indentLevel = Math.max( listArray[baseIndex].indent, 0 ) ;
+		var currentListItem = null ;
+		while ( true )
+		{
+			var item = listArray[currentIndex] ;
+			if ( item.indent == indentLevel )
+			{
+				if ( ! rootNode || listArray[currentIndex].parent.nodeName != rootNode.nodeName )
+				{
+					rootNode = listArray[currentIndex].parent.cloneNode( false ) ;
+					retval.appendChild( rootNode ) ;
+				}
+				currentListItem = doc.createElement( 'li' ) ;
+				rootNode.appendChild( currentListItem ) ;
+				for ( var i = 0 ; i < item.contents.length ; i++ )
+					currentListItem.appendChild( item.contents[i].cloneNode( true ) ) ;
+				currentIndex++ ;
+			}
+			else if ( item.indent == Math.max( indentLevel, 0 ) + 1 )
+			{
+				var listData = this.ArrayToList( listArray, null, currentIndex ) ;
+				currentListItem.appendChild( listData.listNode ) ;
+				currentIndex = listData.nextIndex ;
+			}
+			else if ( item.indent == -1 && baseIndex == 0 && item.grandparent )
+			{
+				var currentListItem ;
+				if ( item.grandparent.nodeName.IEquals( ['ul', 'ol'] ) )
+					currentListItem = doc.createElement( 'li' ) ;
+				else
+				{
+					if ( FCKConfig.EnterMode.IEquals( ['div', 'p'] ) && ! item.grandparent.nodeName.IEquals( 'td' ) )
+						currentListItem = doc.createElement( FCKConfig.EnterMode ) ;
+					else
+						currentListItem = doc.createDocumentFragment() ;
+				}
+				for ( var i = 0 ; i < item.contents.length ; i++ )
+					currentListItem.appendChild( item.contents[i].cloneNode( true ) ) ;
+				if ( currentListItem.nodeType == 11 )
+				{
+					if ( currentListItem.lastChild &&
+							currentListItem.lastChild.getAttribute &&
+							currentListItem.lastChild.getAttribute( 'type' ) == '_moz' )
+						currentListItem.removeChild( currentListItem.lastChild );
+					currentListItem.appendChild( doc.createElement( 'br' ) ) ;
+				}
+				if ( currentListItem.nodeName.IEquals( FCKConfig.EnterMode ) && currentListItem.firstChild )
+				{
+					this.TrimNode( currentListItem ) ;
+					if ( FCKListsLib.BlockBoundaries[currentListItem.firstChild.nodeName.toLowerCase()] )
+					{
+						var tmp = doc.createDocumentFragment() ;
+						while ( currentListItem.firstChild )
+							tmp.appendChild( currentListItem.removeChild( currentListItem.firstChild ) ) ;
+						currentListItem = tmp ;
+					}
+				}
+				if ( FCKBrowserInfo.IsGeckoLike && currentListItem.nodeName.IEquals( ['div', 'p'] ) )
+					FCKTools.AppendBogusBr( currentListItem ) ;
+				retval.appendChild( currentListItem ) ;
+				rootNode = null ;
+				currentIndex++ ;
+			}
+			else
+				return null ;
+
+			if ( listArray.length <= currentIndex || Math.max( listArray[currentIndex].indent, 0 ) < indentLevel )
+			{
+				break ;
+			}
+		}
+
+		// Clear marker attributes for the new list tree made of cloned nodes, if any.
+		if ( markerObj )
+		{
+			var currentNode = retval.firstChild ;
+			while ( currentNode )
+			{
+				if ( currentNode.nodeType == 1 )
+					this.ClearElementMarkers( markerObj, currentNode ) ;
+				currentNode = this.GetNextSourceNode( currentNode ) ;
+			}
+		}
+
+		return { 'listNode' : retval, 'nextIndex' : currentIndex } ;
+	},
+
+	/**
+	 * Get the next sibling node for a node. If "includeEmpties" is false,
+	 * only element or non empty text nodes are returned.
+	 */
+	GetNextSibling : function( node, includeEmpties )
+	{
+		node = node.nextSibling ;
+
+		while ( node && !includeEmpties && node.nodeType != 1 && ( node.nodeType != 3 || node.nodeValue.length == 0 ) )
+			node = node.nextSibling ;
+
+		return node ;
+	},
+
+	/**
+	 * Get the previous sibling node for a node. If "includeEmpties" is false,
+	 * only element or non empty text nodes are returned.
+	 */
+	GetPreviousSibling : function( node, includeEmpties )
+	{
+		node = node.previousSibling ;
+
+		while ( node && !includeEmpties && node.nodeType != 1 && ( node.nodeType != 3 || node.nodeValue.length == 0 ) )
+			node = node.previousSibling ;
+
+		return node ;
+	},
+
+	/**
+	 * Checks if an element has no "useful" content inside of it
+	 * node tree. No "useful" content means empty text node or a signle empty
+	 * inline node.
+	 * elementCheckCallback may point to a function that returns a boolean
+	 * indicating that a child element must be considered in the element check.
+	 */
+	CheckIsEmptyElement : function( element, elementCheckCallback )
+	{
+		var child = element.firstChild ;
+		var elementChild ;
+
+		while ( child )
+		{
+			if ( child.nodeType == 1 )
+			{
+				if ( elementChild || !FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
+					return false ;
+
+				if ( !elementCheckCallback || elementCheckCallback( child ) === true )
+					elementChild = child ;
+			}
+			else if ( child.nodeType == 3 && child.nodeValue.length > 0 )
+				return false ;
+
+			child = child.nextSibling ;
+		}
+
+		return elementChild ? this.CheckIsEmptyElement( elementChild, elementCheckCallback ) : true ;
+	},
+
+	SetElementStyles : function( element, styleDict )
+	{
+		var style = element.style ;
+		for ( var styleName in styleDict )
+			style[ styleName ] = styleDict[ styleName ] ;
+	},
+
+	SetOpacity : function( element, opacity )
+	{
+		if ( FCKBrowserInfo.IsIE )
+		{
+			opacity = Math.round( opacity * 100 ) ;
+			element.style.filter = ( opacity > 100 ? '' : 'progid:DXImageTransform.Microsoft.Alpha(opacity=' + opacity + ')' ) ;
+		}
+		else
+			element.style.opacity = opacity ;
+	},
+
+	GetCurrentElementStyle : function( element, propertyName )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			return element.currentStyle[ propertyName ] ;
+		else
+			return element.ownerDocument.defaultView.getComputedStyle( element, '' ).getPropertyValue( propertyName ) ;
+	},
+
+	GetPositionedAncestor : function( element )
+	{
+		var currentElement = element ;
+
+		while ( currentElement != FCKTools.GetElementDocument( currentElement ).documentElement )
+		{
+			if ( this.GetCurrentElementStyle( currentElement, 'position' ) != 'static' )
+				return currentElement ;
+
+			if ( currentElement == FCKTools.GetElementDocument( currentElement ).documentElement
+					&& currentWindow != w )
+				currentElement = currentWindow.frameElement ;
+			else
+				currentElement = currentElement.parentNode ;
+		}
+
+		return null ;
+	},
+
+	/**
+	 * Current implementation for ScrollIntoView (due to #1462 and #2279). We
+	 * don't have a complete implementation here, just the things that fit our
+	 * needs.
+	 */
+	ScrollIntoView : function( element, alignTop )
+	{
+		// Get the element window.
+		var window = FCKTools.GetElementWindow( element ) ;
+		var windowHeight = FCKTools.GetViewPaneSize( window ).Height ;
+
+		// Starts the offset that will be scrolled with the negative value of
+		// the visible window height.
+		var offset = windowHeight * -1 ;
+
+		// Appends the height it we are about to align the bottoms.
+		if ( alignTop === false )
+		{
+			offset += element.offsetHeight || 0 ;
+
+			// Consider the margin in the scroll, which is ok for our current
+			// needs, but needs investigation if we will be using this function
+			// in other places.
+			offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) || 0 ;
+		}
+
+		// Appends the offsets for the entire element hierarchy.
+		var elementPosition = FCKTools.GetDocumentPosition( window, element ) ;
+		offset += elementPosition.y ;
+
+		// Scroll the window to the desired position, if not already visible.
+		var currentScroll = FCKTools.GetScrollPosition( window ).Y ;
+		if ( offset > 0 && ( offset > currentScroll || offset < currentScroll - windowHeight ) )
+			window.scrollTo( 0, offset ) ;
+	},
+
+	/**
+	 * Check if the element can be edited inside the browser.
+	 */
+	CheckIsEditable : function( element )
+	{
+		// Get the element name.
+		var nodeName = element.nodeName.toLowerCase() ;
+
+		// Get the element DTD (defaults to span for unknown elements).
+		var childDTD = FCK.DTD[ nodeName ] || FCK.DTD.span ;
+
+		// In the DTD # == text node.
+		return ( childDTD['#'] && !FCKListsLib.NonEditableElements[ nodeName ] ) ;
+	},
+
+	GetSelectedDivContainers : function()
+	{
+		var currentBlocks = [] ;
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+
+		var startNode = range.GetTouchedStartNode() ;
+		var endNode = range.GetTouchedEndNode() ;
+		var currentNode = startNode ;
+
+		if ( startNode == endNode )
+		{
+			while ( endNode.nodeType == 1 && endNode.lastChild )
+				endNode = endNode.lastChild ;
+			endNode = FCKDomTools.GetNextSourceNode( endNode ) ;
+		}
+
+		while ( currentNode && currentNode != endNode )
+		{
+			if ( currentNode.nodeType != 3 || !/^[ \t\n]*$/.test( currentNode.nodeValue ) )
+			{
+				var path = new FCKElementPath( currentNode ) ;
+				var blockLimit = path.BlockLimit ;
+				if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
+					currentBlocks.push( blockLimit ) ;
+			}
+
+			currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+		}
+
+		return currentBlocks ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcklanguagemanager.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcklanguagemanager.js
new file mode 100644
index 000000000..62eb3bd72
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcklanguagemanager.js
@@ -0,0 +1,164 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKLanguageManager object that is used for language
+ * operations.
+ */
+
+var FCKLanguageManager = FCK.Language =
+{
+	AvailableLanguages :
+	{
+		af		: 'Afrikaans',
+		ar		: 'Arabic',
+		bg		: 'Bulgarian',
+		bn		: 'Bengali/Bangla',
+		bs		: 'Bosnian',
+		ca		: 'Catalan',
+		cs		: 'Czech',
+		da		: 'Danish',
+		de		: 'German',
+		el		: 'Greek',
+		en		: 'English',
+		'en-au'	: 'English (Australia)',
+		'en-ca'	: 'English (Canadian)',
+		'en-uk'	: 'English (United Kingdom)',
+		eo		: 'Esperanto',
+		es		: 'Spanish',
+		et		: 'Estonian',
+		eu		: 'Basque',
+		fa		: 'Persian',
+		fi		: 'Finnish',
+		fo		: 'Faroese',
+		fr		: 'French',
+		'fr-ca'	: 'French (Canada)',
+		gl		: 'Galician',
+		gu		: 'Gujarati',
+		he		: 'Hebrew',
+		hi		: 'Hindi',
+		hr		: 'Croatian',
+		hu		: 'Hungarian',
+		it		: 'Italian',
+		ja		: 'Japanese',
+		km		: 'Khmer',
+		ko		: 'Korean',
+		lt		: 'Lithuanian',
+		lv		: 'Latvian',
+		mn		: 'Mongolian',
+		ms		: 'Malay',
+		nb		: 'Norwegian Bokmal',
+		nl		: 'Dutch',
+		no		: 'Norwegian',
+		pl		: 'Polish',
+		pt		: 'Portuguese (Portugal)',
+		'pt-br'	: 'Portuguese (Brazil)',
+		ro		: 'Romanian',
+		ru		: 'Russian',
+		sk		: 'Slovak',
+		sl		: 'Slovenian',
+		sr		: 'Serbian (Cyrillic)',
+		'sr-latn'	: 'Serbian (Latin)',
+		sv		: 'Swedish',
+		th		: 'Thai',
+		tr		: 'Turkish',
+		uk		: 'Ukrainian',
+		vi		: 'Vietnamese',
+		zh		: 'Chinese Traditional',
+		'zh-cn'	: 'Chinese Simplified'
+	},
+
+	GetActiveLanguage : function()
+	{
+		if ( FCKConfig.AutoDetectLanguage )
+		{
+			var sUserLang ;
+
+			// IE accepts "navigator.userLanguage" while Gecko "navigator.language".
+			if ( navigator.userLanguage )
+				sUserLang = navigator.userLanguage.toLowerCase() ;
+			else if ( navigator.language )
+				sUserLang = navigator.language.toLowerCase() ;
+			else
+			{
+				// Firefox 1.0 PR has a bug: it doens't support the "language" property.
+				return FCKConfig.DefaultLanguage ;
+			}
+
+			// Some language codes are set in 5 characters,
+			// like "pt-br" for Brazilian Portuguese.
+			if ( sUserLang.length >= 5 )
+			{
+				sUserLang = sUserLang.substr(0,5) ;
+				if ( this.AvailableLanguages[sUserLang] ) return sUserLang ;
+			}
+
+			// If the user's browser is set to, for example, "pt-br" but only the
+			// "pt" language file is available then get that file.
+			if ( sUserLang.length >= 2 )
+			{
+				sUserLang = sUserLang.substr(0,2) ;
+				if ( this.AvailableLanguages[sUserLang] ) return sUserLang ;
+			}
+		}
+
+		return this.DefaultLanguage ;
+	},
+
+	TranslateElements : function( targetDocument, tag, propertyToSet, encode )
+	{
+		var e = targetDocument.getElementsByTagName(tag) ;
+		var sKey, s ;
+		for ( var i = 0 ; i < e.length ; i++ )
+		{
+			// The extra () is to avoid a warning with strict error checking. This is ok.
+			if ( (sKey = e[i].getAttribute( 'fckLang' )) )
+			{
+				// The extra () is to avoid a warning with strict error checking. This is ok.
+				if ( (s = FCKLang[ sKey ]) )
+				{
+					if ( encode )
+						s = FCKTools.HTMLEncode( s ) ;
+					e[i][ propertyToSet ] = s ;
+				}
+			}
+		}
+	},
+
+	TranslatePage : function( targetDocument )
+	{
+		this.TranslateElements( targetDocument, 'INPUT', 'value' ) ;
+		this.TranslateElements( targetDocument, 'SPAN', 'innerHTML' ) ;
+		this.TranslateElements( targetDocument, 'LABEL', 'innerHTML' ) ;
+		this.TranslateElements( targetDocument, 'OPTION', 'innerHTML', true ) ;
+		this.TranslateElements( targetDocument, 'LEGEND', 'innerHTML' ) ;
+	},
+
+	Initialize : function()
+	{
+		if ( this.AvailableLanguages[ FCKConfig.DefaultLanguage ] )
+			this.DefaultLanguage = FCKConfig.DefaultLanguage ;
+		else
+			this.DefaultLanguage = 'en' ;
+
+		this.ActiveLanguage = new Object() ;
+		this.ActiveLanguage.Code = this.GetActiveLanguage() ;
+		this.ActiveLanguage.Name = this.AvailableLanguages[ this.ActiveLanguage.Code ] ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcklisthandler.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcklisthandler.js
new file mode 100644
index 000000000..1084f362b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcklisthandler.js
@@ -0,0 +1,152 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Tool object to manage HTML lists items (UL, OL and LI).
+ */
+
+var FCKListHandler =
+{
+	OutdentListItem : function( listItem )
+	{
+		var eParent = listItem.parentNode ;
+
+		// It may happen that a LI is not in a UL or OL (Orphan).
+		if ( eParent.tagName.toUpperCase().Equals( 'UL','OL' ) )
+		{
+			var oDocument = FCKTools.GetElementDocument( listItem ) ;
+			var oDogFrag = new FCKDocumentFragment( oDocument ) ;
+
+			// All children and successive siblings will be moved to a a DocFrag.
+			var eNextSiblings = oDogFrag.RootNode ;
+			var eHasLiSibling = false ;
+
+			// If we have nested lists inside it, let's move it to the list of siblings.
+			var eChildList = FCKDomTools.GetFirstChild( listItem, ['UL','OL'] ) ;
+			if ( eChildList )
+			{
+				eHasLiSibling = true ;
+
+				var eChild ;
+				// The extra () is to avoid a warning with strict error checking. This is ok.
+				while ( (eChild = eChildList.firstChild) )
+					eNextSiblings.appendChild( eChildList.removeChild( eChild ) ) ;
+
+				FCKDomTools.RemoveNode( eChildList ) ;
+			}
+
+			// Move all successive siblings.
+			var eSibling ;
+			var eHasSuccessiveLiSibling = false ;
+			// The extra () is to avoid a warning with strict error checking. This is ok.
+			while ( (eSibling = listItem.nextSibling) )
+			{
+				if ( !eHasLiSibling && eSibling.nodeType == 1 && eSibling.nodeName.toUpperCase() == 'LI' )
+					eHasSuccessiveLiSibling = eHasLiSibling = true ;
+
+				eNextSiblings.appendChild( eSibling.parentNode.removeChild( eSibling ) ) ;
+
+				// If a sibling is a incorrectly nested UL or OL, consider only its children.
+				if ( !eHasSuccessiveLiSibling && eSibling.nodeType == 1 && eSibling.nodeName.toUpperCase().Equals( 'UL','OL' ) )
+					FCKDomTools.RemoveNode( eSibling, true ) ;
+			}
+
+			// If we are in a list chain.
+			var sParentParentTag = eParent.parentNode.tagName.toUpperCase() ;
+			var bWellNested = ( sParentParentTag == 'LI' ) ;
+			if ( bWellNested || sParentParentTag.Equals( 'UL','OL' ) )
+			{
+				if ( eHasLiSibling )
+				{
+					var eChildList = eParent.cloneNode( false ) ;
+					oDogFrag.AppendTo( eChildList ) ;
+					listItem.appendChild( eChildList ) ;
+				}
+				else if ( bWellNested )
+					oDogFrag.InsertAfterNode( eParent.parentNode ) ;
+				else
+					oDogFrag.InsertAfterNode( eParent ) ;
+
+				// Move the LI after its parent.parentNode (the upper LI in the hierarchy).
+				if ( bWellNested )
+					FCKDomTools.InsertAfterNode( eParent.parentNode, eParent.removeChild( listItem ) ) ;
+				else
+					FCKDomTools.InsertAfterNode( eParent, eParent.removeChild( listItem ) ) ;
+			}
+			else
+			{
+				if ( eHasLiSibling )
+				{
+					var eNextList = eParent.cloneNode( false ) ;
+					oDogFrag.AppendTo( eNextList ) ;
+					FCKDomTools.InsertAfterNode( eParent, eNextList ) ;
+				}
+
+				var eBlock = oDocument.createElement( FCKConfig.EnterMode == 'p' ? 'p' : 'div' ) ;
+				FCKDomTools.MoveChildren( eParent.removeChild( listItem ), eBlock ) ;
+				FCKDomTools.InsertAfterNode( eParent, eBlock ) ;
+
+				if ( FCKConfig.EnterMode == 'br' )
+				{
+					// We need the bogus to make it work properly. In Gecko, we
+					// need it before the new block, on IE, after it.
+					if ( FCKBrowserInfo.IsGecko )
+						eBlock.parentNode.insertBefore( FCKTools.CreateBogusBR( oDocument ), eBlock ) ;
+					else
+						FCKDomTools.InsertAfterNode( eBlock, FCKTools.CreateBogusBR( oDocument ) ) ;
+
+					FCKDomTools.RemoveNode( eBlock, true ) ;
+				}
+			}
+
+			if ( this.CheckEmptyList( eParent ) )
+				FCKDomTools.RemoveNode( eParent, true ) ;
+		}
+	},
+
+	CheckEmptyList : function( listElement )
+	{
+		return ( FCKDomTools.GetFirstChild( listElement, 'LI' ) == null ) ;
+	},
+
+	// Check if the list has contents (excluding nested lists).
+	CheckListHasContents : function( listElement )
+	{
+		var eChildNode = listElement.firstChild ;
+
+		while ( eChildNode )
+		{
+			switch ( eChildNode.nodeType )
+			{
+				case 1 :
+					if ( !eChildNode.nodeName.IEquals( 'UL','LI' ) )
+						return true ;
+					break ;
+
+				case 3 :
+					if ( eChildNode.nodeValue.Trim().length > 0 )
+						return true ;
+			}
+
+			eChildNode = eChildNode.nextSibling ;
+		}
+
+		return false ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcklistslib.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcklistslib.js
new file mode 100644
index 000000000..dc2e386a2
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcklistslib.js
@@ -0,0 +1,63 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Library of keys collections.
+ *
+ * Test have shown that check for the existence of a key in an object is the
+ * most efficient list entry check (10x faster that regex). Example:
+ *		if ( FCKListsLib.<ListName>[key] != null )
+ */
+
+var FCKListsLib =
+{
+	// We are not handling <ins> and <del> as block elements, for now.
+	BlockElements : { address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },
+
+	// Block elements that may be filled with &nbsp; if empty.
+	NonEmptyBlockElements : { p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },
+
+	// Inline elements which MUST have child nodes.
+	InlineChildReqElements : { abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },
+
+	// Inline elements which are not marked as empty "Empty" in the XHTML DTD.
+	InlineNonEmptyElements : { a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },
+
+	// Elements marked as empty "Empty" in the XHTML DTD.
+	EmptyElements : { base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },
+
+	// Elements that may be considered the "Block boundary" in an element path.
+	PathBlockElements : { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },
+
+	// Elements that may be considered the "Block limit" in an element path.
+	PathBlockLimitElements : { body:1,div:1,td:1,th:1,caption:1,form:1 },
+
+	// Block elements for the Styles System.
+	StyleBlockElements : { address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },
+
+	// Object elements for the Styles System.
+	StyleObjectElements : { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },
+
+	// Elements that accept text nodes, but are not possible to edit in the browser.
+	NonEditableElements : { button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },
+
+	// Elements used to separate block contents.
+	BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },
+	ListBoundaries  : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckplugins.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckplugins.js
new file mode 100644
index 000000000..2323149fe
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckplugins.js
@@ -0,0 +1,46 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKPlugins object that is responsible for loading the Plugins.
+ */
+
+var FCKPlugins = FCK.Plugins = new Object() ;
+FCKPlugins.ItemsCount = 0 ;
+FCKPlugins.Items = new Object() ;
+
+FCKPlugins.Load = function()
+{
+	var oItems = FCKPlugins.Items ;
+
+	// build the plugins collection.
+	for ( var i = 0 ; i < FCKConfig.Plugins.Items.length ; i++ )
+	{
+		var oItem = FCKConfig.Plugins.Items[i] ;
+		var oPlugin = oItems[ oItem[0] ] = new FCKPlugin( oItem[0], oItem[1], oItem[2] ) ;
+		FCKPlugins.ItemsCount++ ;
+	}
+
+	// Load all items in the plugins collection.
+	for ( var s in oItems )
+		oItems[s].Load() ;
+
+	// This is a self destroyable function (must be called once).
+	FCKPlugins.Load = null ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckregexlib.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckregexlib.js
new file mode 100644
index 000000000..4f027a7e8
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckregexlib.js
@@ -0,0 +1,100 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * These are some Regular Expressions used by the editor.
+ */
+
+var FCKRegexLib =
+{
+// This is the Regular expression used by the SetData method for the "&apos;" entity.
+AposEntity		: /&apos;/gi ,
+
+// Used by the Styles combo to identify styles that can't be applied to text.
+ObjectElements	: /^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i ,
+
+// List all named commands (commands that can be interpreted by the browser "execCommand" method.
+NamedCommands	: /^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i ,
+
+BeforeBody	: /(^[\s\S]*\<body[^\>]*\>)/i,
+AfterBody	: /(\<\/body\>[\s\S]*$)/i,
+
+// Temporary text used to solve some browser specific limitations.
+ToReplace		: /___fcktoreplace:([\w]+)/ig ,
+
+// Get the META http-equiv attribute from the tag.
+MetaHttpEquiv	: /http-equiv\s*=\s*["']?([^"' ]+)/i ,
+
+HasBaseTag		: /<base /i ,
+HasBodyTag		: /<body[\s|>]/i ,
+
+HtmlOpener		: /<html\s?[^>]*>/i ,
+HeadOpener		: /<head\s?[^>]*>/i ,
+HeadCloser		: /<\/head\s*>/i ,
+
+// Temporary classes (Tables without border, Anchors with content) used in IE
+FCK_Class		: /\s*FCK__[^ ]*(?=\s+|$)/ ,
+
+// Validate element names (it must be in lowercase).
+ElementName		: /(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/ ,
+
+// Used in conjunction with the FCKConfig.ForceSimpleAmpersand configuration option.
+ForceSimpleAmpersand : /___FCKAmp___/g ,
+
+// Get the closing parts of the tags with no closing tags, like <br/>... gets the "/>" part.
+SpaceNoClose	: /\/>/g ,
+
+// Empty elements may be <p></p> or even a simple opening <p> (see #211).
+EmptyParagraph	: /^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/ ,
+
+EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/ ,
+
+TagBody			: /></ ,
+
+GeckoEntitiesMarker : /#\?-\:/g ,
+
+// We look for the "src" and href attribute with the " or ' or without one of
+// them. We have to do all in one, otherwise we will have problems with URLs
+// like "thumbnail.php?src=someimage.jpg" (SF-BUG 1554141).
+ProtectUrlsImg	: /<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectUrlsA	: /<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectUrlsArea	: /<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+
+Html4DocType	: /HTML 4\.0 Transitional/i ,
+DocTypeTag		: /<!DOCTYPE[^>]*>/i ,
+HtmlDocType		: /DTD HTML/ ,
+
+// These regex are used to save the original event attributes in the HTML.
+TagsWithEvent	: /<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g ,
+EventAttributes	: /\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,
+ProtectedEvents : /\s\w+_fckprotectedatt="([^"]+)"/g,
+
+StyleProperties : /\S+\s*:/g,
+
+// [a-zA-Z0-9:]+ seams to be more efficient than [\w:]+
+InvalidSelfCloseTags : /(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,
+
+// All variables defined in a style attribute or style definition. The variable
+// name is returned with $2.
+StyleVariableAttName : /#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,
+
+RegExp : /^\/(.*)\/([gim]*)$/,
+
+HtmlTag : /<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckselection.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection.js
new file mode 100644
index 000000000..e22f08b71
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection.js
@@ -0,0 +1,42 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Active selection functions.
+ */
+
+var FCKSelection = FCK.Selection =
+{
+	GetParentBlock : function()
+	{
+		var retval = this.GetParentElement() ;
+		while ( retval )
+		{
+			if ( FCKListsLib.BlockBoundaries[retval.nodeName.toLowerCase()] )
+				break ;
+			retval = retval.parentNode ;
+		}
+		return retval ;
+	},
+
+	ApplyStyle : function( styleDefinition )
+	{
+		FCKStyles.ApplyStyle( new FCKStyle( styleDefinition ) ) ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_gecko.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_gecko.js
new file mode 100644
index 000000000..cf6845c26
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_gecko.js
@@ -0,0 +1,228 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Active selection functions. (Gecko specific implementation)
+ */
+
+// Get the selection type (like document.select.type in IE).
+FCKSelection.GetType = function()
+{
+	// By default set the type to "Text".
+	var type = 'Text' ;
+
+	// Check if the actual selection is a Control (IMG, TABLE, HR, etc...).
+
+	var sel ;
+	try { sel = this.GetSelection() ; } catch (e) {}
+
+	if ( sel && sel.rangeCount == 1 )
+	{
+		var range = sel.getRangeAt(0) ;
+		if ( range.startContainer == range.endContainer
+			&& ( range.endOffset - range.startOffset ) == 1
+			&& range.startContainer.nodeType == 1
+			&& FCKListsLib.StyleObjectElements[ range.startContainer.childNodes[ range.startOffset ].nodeName.toLowerCase() ] )
+		{
+			type = 'Control' ;
+		}
+	}
+
+	return type ;
+}
+
+// Retrieves the selected element (if any), just in the case that a single
+// element (object like and image or a table) is selected.
+FCKSelection.GetSelectedElement = function()
+{
+	var selection = !!FCK.EditorWindow && this.GetSelection() ;
+	if ( !selection || selection.rangeCount < 1 )
+		return null ;
+
+	var range = selection.getRangeAt( 0 ) ;
+	if ( range.startContainer != range.endContainer || range.startContainer.nodeType != 1 || range.startOffset != range.endOffset - 1 )
+		return null ;
+
+	var node = range.startContainer.childNodes[ range.startOffset ] ;
+	if ( node.nodeType != 1 )
+		return null ;
+
+	return node ;
+}
+
+FCKSelection.GetParentElement = function()
+{
+	if ( this.GetType() == 'Control' )
+		return FCKSelection.GetSelectedElement().parentNode ;
+	else
+	{
+		var oSel = this.GetSelection() ;
+		if ( oSel )
+		{
+			// if anchorNode == focusNode, see if the selection is text only or including nodes.
+			// if text only, return the parent node.
+			// if the selection includes DOM nodes, then the anchorNode is the nearest container.
+			if ( oSel.anchorNode && oSel.anchorNode == oSel.focusNode )
+			{
+				var oRange = oSel.getRangeAt( 0 ) ;
+				if ( oRange.collapsed || oRange.startContainer.nodeType == 3 )
+					return oSel.anchorNode.parentNode ;
+				else
+					return oSel.anchorNode ;
+			}
+
+			// looks like we're having a large selection here. To make the behavior same as IE's TextRange.parentElement(),
+			// we need to find the nearest ancestor node which encapsulates both the beginning and the end of the selection.
+			// TODO: A simpler logic can be found.
+			var anchorPath = new FCKElementPath( oSel.anchorNode ) ;
+			var focusPath = new FCKElementPath( oSel.focusNode ) ;
+			var deepPath = null ;
+			var shallowPath = null ;
+			if ( anchorPath.Elements.length > focusPath.Elements.length )
+			{
+				deepPath = anchorPath.Elements ;
+				shallowPath = focusPath.Elements ;
+			}
+			else
+			{
+				deepPath = focusPath.Elements ;
+				shallowPath = anchorPath.Elements ;
+			}
+
+			var deepPathBase = deepPath.length - shallowPath.length ;
+			for( var i = 0 ; i < shallowPath.length ; i++)
+			{
+				if ( deepPath[deepPathBase + i] == shallowPath[i])
+					return shallowPath[i];
+			}
+			return null ;
+		}
+	}
+	return null ;
+}
+
+FCKSelection.GetBoundaryParentElement = function( startBoundary )
+{
+	if ( ! FCK.EditorWindow )
+		return null ;
+	if ( this.GetType() == 'Control' )
+		return FCKSelection.GetSelectedElement().parentNode ;
+	else
+	{
+		var oSel = this.GetSelection() ;
+		if ( oSel && oSel.rangeCount > 0 )
+		{
+			var range = oSel.getRangeAt( startBoundary ? 0 : ( oSel.rangeCount - 1 ) ) ;
+
+			var element = startBoundary ? range.startContainer : range.endContainer ;
+
+			return ( element.nodeType == 1 ? element : element.parentNode ) ;
+		}
+	}
+	return null ;
+}
+
+FCKSelection.SelectNode = function( element )
+{
+	var oRange = FCK.EditorDocument.createRange() ;
+	oRange.selectNode( element ) ;
+
+	var oSel = this.GetSelection() ;
+	oSel.removeAllRanges() ;
+	oSel.addRange( oRange ) ;
+}
+
+FCKSelection.Collapse = function( toStart )
+{
+	var oSel = this.GetSelection() ;
+
+	if ( toStart == null || toStart === true )
+		oSel.collapseToStart() ;
+	else
+		oSel.collapseToEnd() ;
+}
+
+// The "nodeTagName" parameter must be Upper Case.
+FCKSelection.HasAncestorNode = function( nodeTagName )
+{
+	var oContainer = this.GetSelectedElement() ;
+	if ( ! oContainer && FCK.EditorWindow )
+	{
+		try		{ oContainer = this.GetSelection().getRangeAt(0).startContainer ; }
+		catch(e){}
+	}
+
+	while ( oContainer )
+	{
+		if ( oContainer.nodeType == 1 && oContainer.nodeName.IEquals( nodeTagName ) ) return true ;
+		oContainer = oContainer.parentNode ;
+	}
+
+	return false ;
+}
+
+// The "nodeTagName" parameter must be Upper Case.
+FCKSelection.MoveToAncestorNode = function( nodeTagName )
+{
+	var oNode ;
+
+	var oContainer = this.GetSelectedElement() ;
+	if ( ! oContainer )
+		oContainer = this.GetSelection().getRangeAt(0).startContainer ;
+
+	while ( oContainer )
+	{
+		if ( oContainer.nodeName.IEquals( nodeTagName ) )
+			return oContainer ;
+
+		oContainer = oContainer.parentNode ;
+	}
+	return null ;
+}
+
+FCKSelection.Delete = function()
+{
+	// Gets the actual selection.
+	var oSel = this.GetSelection() ;
+
+	// Deletes the actual selection contents.
+	for ( var i = 0 ; i < oSel.rangeCount ; i++ )
+	{
+		oSel.getRangeAt(i).deleteContents() ;
+	}
+
+	return oSel ;
+}
+
+/**
+ * Returns the native selection object.
+ */
+FCKSelection.GetSelection = function()
+{
+	return FCK.EditorWindow.getSelection() ;
+}
+
+// The following are IE only features (we don't need then in other browsers
+// currently).
+FCKSelection.Save = function()
+{}
+FCKSelection.Restore = function()
+{}
+FCKSelection.Release = function()
+{}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_ie.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_ie.js
new file mode 100644
index 000000000..686dee061
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckselection_ie.js
@@ -0,0 +1,279 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Active selection functions. (IE specific implementation)
+ */
+
+// Get the selection type.
+FCKSelection.GetType = function()
+{
+	// It is possible that we can still get a text range object even when type=='None' is returned by IE.
+	// So we'd better check the object returned by createRange() rather than by looking at the type.
+	try
+	{
+		var ieType = FCKSelection.GetSelection().type ;
+		if ( ieType == 'Control' || ieType == 'Text' )
+			return ieType ;
+
+		if ( this.GetSelection().createRange().parentElement )
+			return 'Text' ;
+	}
+	catch(e)
+	{
+		// Nothing to do, it will return None properly.
+	}
+
+	return 'None' ;
+} ;
+
+// Retrieves the selected element (if any), just in the case that a single
+// element (object like and image or a table) is selected.
+FCKSelection.GetSelectedElement = function()
+{
+	if ( this.GetType() == 'Control' )
+	{
+		var oRange = this.GetSelection().createRange() ;
+
+		if ( oRange && oRange.item )
+			return this.GetSelection().createRange().item(0) ;
+	}
+	return null ;
+} ;
+
+FCKSelection.GetParentElement = function()
+{
+	switch ( this.GetType() )
+	{
+		case 'Control' :
+			var el = FCKSelection.GetSelectedElement() ;
+			return el ? el.parentElement : null ;
+
+		case 'None' :
+			return null ;
+
+		default :
+			return this.GetSelection().createRange().parentElement() ;
+	}
+} ;
+
+FCKSelection.GetBoundaryParentElement = function( startBoundary )
+{
+	switch ( this.GetType() )
+	{
+		case 'Control' :
+			var el = FCKSelection.GetSelectedElement() ;
+			return el ? el.parentElement : null ;
+
+		case 'None' :
+			return null ;
+
+		default :
+			var doc = FCK.EditorDocument ;
+
+			var range = doc.selection.createRange() ;
+			range.collapse( startBoundary !== false ) ;
+
+			var el = range.parentElement() ;
+
+			// It may happen that range is comming from outside "doc", so we
+			// must check it (#1204).
+			return FCKTools.GetElementDocument( el ) == doc ? el : null ;
+	}
+} ;
+
+FCKSelection.SelectNode = function( node )
+{
+	FCK.Focus() ;
+	this.GetSelection().empty() ;
+	var oRange ;
+	try
+	{
+		// Try to select the node as a control.
+		oRange = FCK.EditorDocument.body.createControlRange() ;
+		oRange.addElement( node ) ;
+	}
+	catch(e)
+	{
+		// If failed, select it as a text range.
+		oRange = FCK.EditorDocument.body.createTextRange() ;
+		oRange.moveToElementText( node ) ;
+	}
+
+	oRange.select() ;
+} ;
+
+FCKSelection.Collapse = function( toStart )
+{
+	FCK.Focus() ;
+	if ( this.GetType() == 'Text' )
+	{
+		var oRange = this.GetSelection().createRange() ;
+		oRange.collapse( toStart == null || toStart === true ) ;
+		oRange.select() ;
+	}
+} ;
+
+// The "nodeTagName" parameter must be Upper Case.
+FCKSelection.HasAncestorNode = function( nodeTagName )
+{
+	var oContainer ;
+
+	if ( this.GetSelection().type == "Control" )
+	{
+		oContainer = this.GetSelectedElement() ;
+	}
+	else
+	{
+		var oRange  = this.GetSelection().createRange() ;
+		oContainer = oRange.parentElement() ;
+	}
+
+	while ( oContainer )
+	{
+		if ( oContainer.nodeName.IEquals( nodeTagName ) ) return true ;
+		oContainer = oContainer.parentNode ;
+	}
+
+	return false ;
+} ;
+
+// The "nodeTagName" parameter must be UPPER CASE.
+FCKSelection.MoveToAncestorNode = function( nodeTagName )
+{
+	var oNode, oRange ;
+
+	if ( ! FCK.EditorDocument )
+		return null ;
+
+	if ( this.GetSelection().type == "Control" )
+	{
+		oRange = this.GetSelection().createRange() ;
+		for ( i = 0 ; i < oRange.length ; i++ )
+		{
+			if (oRange(i).parentNode)
+			{
+				oNode = oRange(i).parentNode ;
+				break ;
+			}
+		}
+	}
+	else
+	{
+		oRange  = this.GetSelection().createRange() ;
+		oNode = oRange.parentElement() ;
+	}
+
+	while ( oNode && oNode.nodeName != nodeTagName )
+		oNode = oNode.parentNode ;
+
+	return oNode ;
+} ;
+
+FCKSelection.Delete = function()
+{
+	// Gets the actual selection.
+	var oSel = this.GetSelection() ;
+
+	// Deletes the actual selection contents.
+	if ( oSel.type.toLowerCase() != "none" )
+	{
+		oSel.clear() ;
+	}
+
+	return oSel ;
+} ;
+
+/**
+ * Returns the native selection object.
+ */
+FCKSelection.GetSelection = function()
+{
+	this.Restore() ;
+	return FCK.EditorDocument.selection ;
+}
+
+FCKSelection.Save = function( noFocus )
+{
+	// Ensures the editor has the selection focus. (#1801)
+	if ( !noFocus )
+		FCK.Focus() ;
+
+	var editorDocument = FCK.EditorDocument ;
+
+	if ( !editorDocument )
+		return ;
+
+	var selection = editorDocument.selection ;
+	var range ;
+
+	if ( selection )
+	{
+		range = selection.createRange() ;
+
+		// Ensure that the range comes from the editor document.
+		if ( range )
+		{
+			if ( range.parentElement && FCKTools.GetElementDocument( range.parentElement() ) != editorDocument )
+				range = null ;
+			else if ( range.item && FCKTools.GetElementDocument( range.item(0) )!= editorDocument )
+				range = null ;
+		}
+	}
+
+	this.SelectionData = range ;
+}
+
+FCKSelection._GetSelectionDocument = function( selection )
+{
+	var range = selection.createRange() ;
+	if ( !range )
+		return null;
+	else if ( range.item )
+		return FCKTools.GetElementDocument( range.item( 0 ) ) ;
+	else
+		return FCKTools.GetElementDocument( range.parentElement() ) ;
+}
+
+FCKSelection.Restore = function()
+{
+	if ( this.SelectionData )
+	{
+		FCK.IsSelectionChangeLocked = true ;
+
+		try
+		{
+			// Don't repeat the restore process if the editor document is already selected.
+			if ( String( this._GetSelectionDocument( FCK.EditorDocument.selection ).body.contentEditable ) == 'true' )
+			{
+				FCK.IsSelectionChangeLocked = false ;
+				return ;
+			}
+			this.SelectionData.select() ;
+		}
+		catch ( e ) {}
+
+		FCK.IsSelectionChangeLocked = false ;
+	}
+}
+
+FCKSelection.Release = function()
+{
+	delete this.SelectionData ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckstyles.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckstyles.js
new file mode 100644
index 000000000..7fcf8085c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckstyles.js
@@ -0,0 +1,381 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Handles styles in a give document.
+ */
+
+var FCKStyles = FCK.Styles =
+{
+	_Callbacks : {},
+	_ObjectStyles : {},
+
+	ApplyStyle : function( style )
+	{
+		if ( typeof style == 'string' )
+			style = this.GetStyles()[ style ] ;
+
+		if ( style )
+		{
+			if ( style.GetType() == FCK_STYLE_OBJECT )
+				style.ApplyToObject( FCKSelection.GetSelectedElement() ) ;
+			else
+				style.ApplyToSelection( FCK.EditorWindow ) ;
+
+			FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+		}
+	},
+
+	RemoveStyle : function( style )
+	{
+		if ( typeof style == 'string' )
+			style = this.GetStyles()[ style ] ;
+
+		if ( style )
+		{
+			style.RemoveFromSelection( FCK.EditorWindow ) ;
+			FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+		}
+	},
+
+	/**
+	 * Defines a callback function to be called when the current state of a
+	 * specific style changes.
+	 */
+	AttachStyleStateChange : function( styleName, callback, callbackOwner )
+	{
+		var callbacks = this._Callbacks[ styleName ] ;
+
+		if ( !callbacks )
+			callbacks = this._Callbacks[ styleName ] = [] ;
+
+		callbacks.push( [ callback, callbackOwner ] ) ;
+	},
+
+	CheckSelectionChanges : function()
+	{
+		var startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+
+		if ( !startElement )
+			return ;
+
+		// Walks the start node parents path, checking all styles that are being listened.
+		var path = new FCKElementPath( startElement ) ;
+		var styles = this.GetStyles() ;
+
+		for ( var styleName in styles )
+		{
+			var callbacks = this._Callbacks[ styleName ] ;
+
+			if ( callbacks )
+			{
+				var style = styles[ styleName ] ;
+				var state = style.CheckActive( path ) ;
+
+				if ( state != ( style._LastState || null ) )
+				{
+					style._LastState = state ;
+
+					for ( var i = 0 ; i < callbacks.length ; i++ )
+					{
+						var callback = callbacks[i][0] ;
+						var callbackOwner = callbacks[i][1] ;
+
+						callback.call( callbackOwner || window, styleName, state ) ;
+					}
+				}
+			}
+		}
+	},
+
+	CheckStyleInSelection : function( styleName )
+	{
+		return false ;
+	},
+
+	_GetRemoveFormatTagsRegex : function ()
+	{
+		var regex = new RegExp( '^(?:' + FCKConfig.RemoveFormatTags.replace( /,/g,'|' ) + ')$', 'i' ) ;
+
+		return (this._GetRemoveFormatTagsRegex = function()
+		{
+			return regex ;
+		})
+		&& regex  ;
+	},
+
+	/**
+	 * Remove all styles from the current selection.
+	 * TODO:
+	 *  - This is almost a duplication of FCKStyle.RemoveFromRange. We should
+	 *    try to merge things.
+	 */
+	RemoveAll : function()
+	{
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+
+		if ( range.CheckIsCollapsed() )
+			return ;
+
+			// Expand the range, if inside inline element boundaries.
+		range.Expand( 'inline_elements' ) ;
+
+		// Get the bookmark nodes.
+		// Bookmark the range so we can re-select it after processing.
+		var bookmark = range.CreateBookmark( true ) ;
+
+		// The style will be applied within the bookmark boundaries.
+		var startNode	= range.GetBookmarkNode( bookmark, true ) ;
+		var endNode		= range.GetBookmarkNode( bookmark, false ) ;
+
+		range.Release( true ) ;
+
+		var tagsRegex = this._GetRemoveFormatTagsRegex() ;
+
+		// We need to check the selection boundaries (bookmark spans) to break
+		// the code in a way that we can properly remove partially selected nodes.
+		// For example, removing a <b> style from
+		//		<b>This is [some text</b> to show <b>the] problem</b>
+		// ... where [ and ] represent the selection, must result:
+		//		<b>This is </b>[some text to show the]<b> problem</b>
+		// The strategy is simple, we just break the partial nodes before the
+		// removal logic, having something that could be represented this way:
+		//		<b>This is </b>[<b>some text</b> to show <b>the</b>]<b> problem</b>
+
+		// Let's start checking the start boundary.
+		var path = new FCKElementPath( startNode ) ;
+		var pathElements = path.Elements ;
+		var pathElement ;
+
+		for ( var i = 1 ; i < pathElements.length ; i++ )
+		{
+			pathElement = pathElements[i] ;
+
+			if ( pathElement == path.Block || pathElement == path.BlockLimit )
+				break ;
+
+			// If this element can be removed (even partially).
+			if ( tagsRegex.test( pathElement.nodeName ) )
+				FCKDomTools.BreakParent( startNode, pathElement, range ) ;
+		}
+
+		// Now the end boundary.
+		path = new FCKElementPath( endNode ) ;
+		pathElements = path.Elements ;
+
+		for ( var i = 1 ; i < pathElements.length ; i++ )
+		{
+			pathElement = pathElements[i] ;
+
+			if ( pathElement == path.Block || pathElement == path.BlockLimit )
+				break ;
+
+			elementName = pathElement.nodeName.toLowerCase() ;
+
+			// If this element can be removed (even partially).
+			if ( tagsRegex.test( pathElement.nodeName ) )
+				FCKDomTools.BreakParent( endNode, pathElement, range ) ;
+		}
+
+		// Navigate through all nodes between the bookmarks.
+		var currentNode = FCKDomTools.GetNextSourceNode( startNode, true, 1 ) ;
+
+		while ( currentNode )
+		{
+			// If we have reached the end of the selection, stop looping.
+			if ( currentNode == endNode )
+				break ;
+
+			// Cache the next node to be processed. Do it now, because
+			// currentNode may be removed.
+			var nextNode = FCKDomTools.GetNextSourceNode( currentNode, false, 1 ) ;
+
+			// Remove elements nodes that match with this style rules.
+			if ( tagsRegex.test( currentNode.nodeName ) )
+				FCKDomTools.RemoveNode( currentNode, true ) ;
+			else
+				FCKDomTools.RemoveAttributes( currentNode, FCKConfig.RemoveAttributesArray );
+
+			currentNode = nextNode ;
+		}
+
+		range.SelectBookmark( bookmark ) ;
+
+		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	},
+
+	GetStyle : function( styleName )
+	{
+		return this.GetStyles()[ styleName ] ;
+	},
+
+	GetStyles : function()
+	{
+		var styles = this._GetStyles ;
+		if ( !styles )
+		{
+			styles = this._GetStyles = FCKTools.Merge(
+				this._LoadStylesCore(),
+				this._LoadStylesCustom(),
+				this._LoadStylesXml() ) ;
+		}
+		return styles ;
+	},
+
+	CheckHasObjectStyle : function( elementName )
+	{
+		return !!this._ObjectStyles[ elementName ] ;
+	},
+
+	_LoadStylesCore : function()
+	{
+		var styles = {};
+		var styleDefs = FCKConfig.CoreStyles ;
+
+		for ( var styleName in styleDefs )
+		{
+			// Core styles are prefixed with _FCK_.
+			var style = styles[ '_FCK_' + styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+			style.IsCore = true ;
+		}
+		return styles ;
+	},
+
+	_LoadStylesCustom : function()
+	{
+		var styles = {};
+		var styleDefs = FCKConfig.CustomStyles ;
+
+		if ( styleDefs )
+		{
+			for ( var styleName in styleDefs )
+			{
+				var style = styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+				style.Name = styleName ;
+			}
+		}
+
+		return styles ;
+	},
+
+	_LoadStylesXml : function()
+	{
+		var styles = {};
+
+		var stylesXmlPath = FCKConfig.StylesXmlPath ;
+
+		if ( !stylesXmlPath || stylesXmlPath.length == 0 )
+			return styles ;
+
+		// Load the XML file into a FCKXml object.
+		var xml = new FCKXml() ;
+		xml.LoadUrl( stylesXmlPath ) ;
+
+		var stylesXmlObj = FCKXml.TransformToObject( xml.SelectSingleNode( 'Styles' ) ) ;
+
+		// Get the "Style" nodes defined in the XML file.
+		var styleNodes = stylesXmlObj.$Style ;
+
+		// Check that it did contain some valid nodes
+		if ( !styleNodes )
+			return styles ;
+
+		// Add each style to our "Styles" collection.
+		for ( var i = 0 ; i < styleNodes.length ; i++ )
+		{
+			var styleNode = styleNodes[i] ;
+
+			var element = ( styleNode.element || '' ).toLowerCase() ;
+
+			if ( element.length == 0 )
+				throw( 'The element name is required. Error loading "' + stylesXmlPath + '"' ) ;
+
+			var styleDef = {
+				Element : element,
+				Attributes : {},
+				Styles : {},
+				Overrides : []
+			} ;
+
+			// Get the attributes defined for the style (if any).
+			var attNodes = styleNode.$Attribute || [] ;
+
+			// Add the attributes to the style definition object.
+			for ( var j = 0 ; j < attNodes.length ; j++ )
+			{
+				styleDef.Attributes[ attNodes[j].name ] = attNodes[j].value ;
+			}
+
+			// Get the styles defined for the style (if any).
+			var cssStyleNodes = styleNode.$Style || [] ;
+
+			// Add the attributes to the style definition object.
+			for ( j = 0 ; j < cssStyleNodes.length ; j++ )
+			{
+				styleDef.Styles[ cssStyleNodes[j].name ] = cssStyleNodes[j].value ;
+			}
+
+			// Load override definitions.
+			var cssStyleOverrideNodes = styleNode.$Override ;
+			if ( cssStyleOverrideNodes )
+			{
+				for ( j = 0 ; j < cssStyleOverrideNodes.length ; j++ )
+				{
+					var overrideNode = cssStyleOverrideNodes[j] ;
+					var overrideDef =
+					{
+						Element : overrideNode.element
+					} ;
+
+					var overrideAttNode = overrideNode.$Attribute ;
+					if ( overrideAttNode )
+					{
+						overrideDef.Attributes = {} ;
+						for ( var k = 0 ; k < overrideAttNode.length ; k++ )
+						{
+							var overrideAttValue = overrideAttNode[k].value || null ;
+							if ( overrideAttValue )
+							{
+								// Check if the override attribute value is a regular expression.
+								var regexMatch = overrideAttValue && FCKRegexLib.RegExp.exec( overrideAttValue ) ;
+								if ( regexMatch )
+									overrideAttValue = new RegExp( regexMatch[1], regexMatch[2] || '' ) ;
+							}
+							overrideDef.Attributes[ overrideAttNode[k].name ] = overrideAttValue ;
+						}
+					}
+
+					styleDef.Overrides.push( overrideDef ) ;
+				}
+			}
+
+			var style = new FCKStyle( styleDef ) ;
+			style.Name = styleNode.name || element ;
+
+			if ( style.GetType() == FCK_STYLE_OBJECT )
+				this._ObjectStyles[ element ] = true ;
+
+			// Add the style to the "Styles" collection using it's name as the key.
+			styles[ style.Name ] = style ;
+		}
+
+		return styles ;
+	}
+} ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler.js
new file mode 100644
index 000000000..57a6d170f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler.js
@@ -0,0 +1,872 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Manage table operations.
+ */
+
+var FCKTableHandler = new Object() ;
+
+FCKTableHandler.InsertRow = function( insertBefore )
+{
+	// Get the row where the selection is placed in.
+	var oRow = FCKSelection.MoveToAncestorNode( 'TR' ) ;
+	if ( !oRow ) return ;
+
+	// Create a clone of the row.
+	var oNewRow = oRow.cloneNode( true ) ;
+
+	// Insert the new row (copy) before of it.
+	oRow.parentNode.insertBefore( oNewRow, oRow ) ;
+
+	// Clean one of the rows to produce the illusion of inserting an empty row before or after.
+	FCKTableHandler.ClearRow( insertBefore ? oNewRow : oRow ) ;
+}
+
+FCKTableHandler.DeleteRows = function( row )
+{
+	// If no row has been passed as a parameter,
+	// then get the row( s ) containing the cells where the selection is placed in.
+	// If user selected multiple rows ( by selecting multiple cells ), walk
+	// the selected cell list and delete the rows containing the selected cells
+	if ( ! row )
+	{
+		var aCells = FCKTableHandler.GetSelectedCells() ;
+		var aRowsToDelete = new Array() ;
+		//queue up the rows -- it's possible ( and likely ) that we may get duplicates
+		for ( var i = 0; i < aCells.length; i++ )
+		{
+			var oRow = FCKTools.GetElementAscensor( aCells[i],'TR' ) ;
+			aRowsToDelete[oRow.rowIndex] = oRow ;
+		}
+		for ( var i = aRowsToDelete.length; i >= 0; i-- )
+		{
+			if ( aRowsToDelete[i] )
+				FCKTableHandler.DeleteRows( aRowsToDelete[i] );
+		}
+		return ;
+	}
+
+	// Get the row's table.
+	var oTable = FCKTools.GetElementAscensor( row, 'TABLE' ) ;
+
+	// If just one row is available then delete the entire table.
+	if ( oTable.rows.length == 1 )
+	{
+		FCKTableHandler.DeleteTable( oTable ) ;
+		return ;
+	}
+
+	// Delete the row.
+	row.parentNode.removeChild( row ) ;
+}
+
+FCKTableHandler.DeleteTable = function( table )
+{
+	// If no table has been passed as a parameter,
+	// then get the table where the selection is placed in.
+	if ( !table )
+	{
+		table = FCKSelection.GetSelectedElement() ;
+		if ( !table || table.tagName != 'TABLE' )
+			table = FCKSelection.MoveToAncestorNode( 'TABLE' ) ;
+	}
+	if ( !table ) return ;
+
+	// Delete the table.
+	FCKSelection.SelectNode( table ) ;
+	FCKSelection.Collapse();
+
+	// if the table is wrapped with a singleton <p> ( or something similar ), remove
+	// the surrounding tag -- which likely won't show after deletion anyway
+	if ( table.parentNode.childNodes.length == 1 )
+		table.parentNode.parentNode.removeChild( table.parentNode );
+	else
+		table.parentNode.removeChild( table  ) ;
+}
+
+FCKTableHandler.InsertColumn = function( insertBefore )
+{
+	// Get the cell where the selection is placed in.
+	var oCell = null ;
+	var nodes = this.GetSelectedCells() ;
+
+	if ( nodes && nodes.length )
+		oCell = nodes[ insertBefore ? 0 : ( nodes.length - 1 ) ] ;
+
+	if ( ! oCell )
+		return ;
+
+	// Get the cell's table.
+	var oTable = FCKTools.GetElementAscensor( oCell, 'TABLE' ) ;
+
+	var iIndex = oCell.cellIndex ;
+
+	// Loop throw all rows available in the table.
+	for ( var i = 0 ; i < oTable.rows.length ; i++ )
+	{
+		// Get the row.
+		var oRow = oTable.rows[i] ;
+
+		// If the row doens't have enough cells, ignore it.
+		if ( oRow.cells.length < ( iIndex + 1 ) )
+			continue ;
+
+		oCell = oRow.cells[iIndex].cloneNode(false) ;
+
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKTools.AppendBogusBr( oCell ) ;
+
+		// Get back the currently selected cell.
+		var oBaseCell = oRow.cells[iIndex] ;
+
+		if ( insertBefore )
+			oRow.insertBefore( oCell, oBaseCell ) ;
+		else if ( oBaseCell.nextSibling )
+			oRow.insertBefore( oCell, oBaseCell.nextSibling ) ;
+		else
+			oRow.appendChild( oCell ) ;
+	}
+}
+
+FCKTableHandler.DeleteColumns = function( oCell )
+{
+	// if user selected multiple cols ( by selecting multiple cells ), walk
+	// the selected cell list and delete the rows containing the selected cells
+	if ( !oCell  )
+	{
+		var aColsToDelete = FCKTableHandler.GetSelectedCells();
+		for ( var i = aColsToDelete.length; i >= 0; i--  )
+		{
+			if ( aColsToDelete[i]  )
+				FCKTableHandler.DeleteColumns( aColsToDelete[i]  );
+		}
+		return;
+	}
+
+	if ( !oCell ) return ;
+
+	// Get the cell's table.
+	var oTable = FCKTools.GetElementAscensor( oCell, 'TABLE' ) ;
+
+	// Get the cell index.
+	var iIndex = oCell.cellIndex ;
+
+	// Loop throw all rows (from down to up, because it's possible that some
+	// rows will be deleted).
+	for ( var i = oTable.rows.length - 1 ; i >= 0 ; i-- )
+	{
+		// Get the row.
+		var oRow = oTable.rows[i] ;
+
+		// If the cell to be removed is the first one and the row has just one cell.
+		if ( iIndex == 0 && oRow.cells.length == 1 )
+		{
+			// Remove the entire row.
+			FCKTableHandler.DeleteRows( oRow ) ;
+			continue ;
+		}
+
+		// If the cell to be removed exists the delete it.
+		if ( oRow.cells[iIndex] )
+			oRow.removeChild( oRow.cells[iIndex] ) ;
+	}
+}
+
+FCKTableHandler.InsertCell = function( cell, insertBefore )
+{
+	// Get the cell where the selection is placed in.
+	var oCell = null ;
+	var nodes = this.GetSelectedCells() ;
+	if ( nodes && nodes.length )
+		oCell = nodes[ insertBefore ? 0 : ( nodes.length - 1 ) ] ;
+	if ( ! oCell )
+		return null ;
+
+	// Create the new cell element to be added.
+	var oNewCell = FCK.EditorDocument.createElement( 'TD' ) ;
+	if ( FCKBrowserInfo.IsGeckoLike )
+		FCKTools.AppendBogusBr( oNewCell ) ;
+
+	if ( !insertBefore && oCell.cellIndex == oCell.parentNode.cells.length - 1 )
+		oCell.parentNode.appendChild( oNewCell ) ;
+	else
+		oCell.parentNode.insertBefore( oNewCell, insertBefore ? oCell : oCell.nextSibling ) ;
+
+	return oNewCell ;
+}
+
+FCKTableHandler.DeleteCell = function( cell )
+{
+	// If this is the last cell in the row.
+	if ( cell.parentNode.cells.length == 1 )
+	{
+		// Delete the entire row.
+		FCKTableHandler.DeleteRows( FCKTools.GetElementAscensor( cell, 'TR' ) ) ;
+		return ;
+	}
+
+	// Delete the cell from the row.
+	cell.parentNode.removeChild( cell ) ;
+}
+
+FCKTableHandler.DeleteCells = function()
+{
+	var aCells = FCKTableHandler.GetSelectedCells() ;
+
+	for ( var i = aCells.length - 1 ; i >= 0  ; i-- )
+	{
+		FCKTableHandler.DeleteCell( aCells[i] ) ;
+	}
+}
+
+FCKTableHandler._MarkCells = function( cells, label )
+{
+	for ( var i = 0 ; i < cells.length ; i++ )
+		cells[i][label] = true ;
+}
+
+FCKTableHandler._UnmarkCells = function( cells, label )
+{
+	for ( var i = 0 ; i < cells.length ; i++ )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			cells[i].removeAttribute( label ) ;
+		else
+			delete cells[i][label] ;
+	}
+}
+
+FCKTableHandler._ReplaceCellsByMarker = function( tableMap, marker, substitute )
+{
+	for ( var i = 0 ; i < tableMap.length ; i++ )
+	{
+		for ( var j = 0 ; j < tableMap[i].length ; j++ )
+		{
+			if ( tableMap[i][j][marker] )
+				tableMap[i][j] = substitute ;
+		}
+	}
+}
+
+FCKTableHandler._GetMarkerGeometry = function( tableMap, rowIdx, colIdx, markerName )
+{
+	var selectionWidth = 0 ;
+	var selectionHeight = 0 ;
+	var cellsLeft = 0 ;
+	var cellsUp = 0 ;
+	for ( var i = colIdx ; tableMap[rowIdx][i] && tableMap[rowIdx][i][markerName] ; i++ )
+		selectionWidth++ ;
+	for ( var i = colIdx - 1 ; tableMap[rowIdx][i] && tableMap[rowIdx][i][markerName] ; i-- )
+	{
+		selectionWidth++ ;
+		cellsLeft++ ;
+	}
+	for ( var i = rowIdx ; tableMap[i] && tableMap[i][colIdx] && tableMap[i][colIdx][markerName] ; i++ )
+		selectionHeight++ ;
+	for ( var i = rowIdx - 1 ; tableMap[i] && tableMap[i][colIdx] && tableMap[i][colIdx][markerName] ; i-- )
+	{
+		selectionHeight++ ;
+		cellsUp++ ;
+	}
+	return { 'width' : selectionWidth, 'height' : selectionHeight, 'x' : cellsLeft, 'y' : cellsUp } ;
+}
+
+FCKTableHandler.CheckIsSelectionRectangular = function()
+{
+	// If every row and column in an area on a plane are of the same width and height,
+	// Then the area is a rectangle.
+	var cells = FCKTableHandler.GetSelectedCells() ;
+	if ( cells.length < 1 )
+		return false ;
+
+	this._MarkCells( cells, '_CellSelected' ) ;
+
+	var tableMap = this._CreateTableMap( cells[0].parentNode.parentNode ) ;
+	var rowIdx = cells[0].parentNode.rowIndex ;
+	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, cells[0] ) ;
+
+	var geometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_CellSelected' ) ;
+	var baseColIdx = colIdx - geometry.x ;
+	var baseRowIdx = rowIdx - geometry.y ;
+
+	if ( geometry.width >= geometry.height )
+	{
+		for ( colIdx = baseColIdx ; colIdx < baseColIdx + geometry.width ; colIdx++ )
+		{
+			rowIdx = baseRowIdx + ( colIdx - baseColIdx ) % geometry.height ;
+			if ( ! tableMap[rowIdx] || ! tableMap[rowIdx][colIdx] )
+			{
+				this._UnmarkCells( cells, '_CellSelected' ) ;
+				return false ;
+			}
+			var g = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_CellSelected' ) ;
+			if ( g.width != geometry.width || g.height != geometry.height )
+			{
+				this._UnmarkCells( cells, '_CellSelected' ) ;
+				return false ;
+			}
+		}
+	}
+	else
+	{
+		for ( rowIdx = baseRowIdx ; rowIdx < baseRowIdx + geometry.height ; rowIdx++ )
+		{
+			colIdx = baseColIdx + ( rowIdx - baseRowIdx ) % geometry.width ;
+			if ( ! tableMap[rowIdx] || ! tableMap[rowIdx][colIdx] )
+			{
+				this._UnmarkCells( cells, '_CellSelected' ) ;
+				return false ;
+			}
+			var g = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_CellSelected' ) ;
+			if ( g.width != geometry.width || g.height != geometry.height )
+			{
+				this._UnmarkCells( cells, '_CellSelected' ) ;
+				return false ;
+			}
+		}
+	}
+
+	this._UnmarkCells( cells, '_CellSelected' ) ;
+	return true ;
+}
+
+FCKTableHandler.MergeCells = function()
+{
+	// Get all selected cells.
+	var cells = this.GetSelectedCells() ;
+	if ( cells.length < 2 )
+		return ;
+
+	// Assume the selected cells are already in a rectangular geometry.
+	// Because the checking is already done by FCKTableCommand.
+	var refCell = cells[0] ;
+	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var rowIdx = refCell.parentNode.rowIndex ;
+	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+
+	this._MarkCells( cells, '_SelectedCells' ) ;
+	var selectionGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SelectedCells' ) ;
+
+	var baseColIdx = colIdx - selectionGeometry.x ;
+	var baseRowIdx = rowIdx - selectionGeometry.y ;
+	var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ;
+	for ( var i = 0 ; i < selectionGeometry.height ; i++ )
+	{
+		var rowChildNodesCount = 0 ;
+		for ( var j = 0 ; j < selectionGeometry.width ; j++ )
+		{
+			var currentCell = tableMap[baseRowIdx + i][baseColIdx + j] ;
+			while ( currentCell.childNodes.length > 0 )
+			{
+				var node = currentCell.removeChild( currentCell.firstChild ) ;
+				if ( node.nodeType != 1
+					|| ( node.getAttribute( 'type', 2 ) != '_moz' && node.getAttribute( '_moz_dirty' ) != null ) )
+				{
+					cellContents.appendChild( node ) ;
+					rowChildNodesCount++ ;
+				}
+			}
+		}
+		if ( rowChildNodesCount > 0 )
+			cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ;
+	}
+
+	this._ReplaceCellsByMarker( tableMap, '_SelectedCells', refCell ) ;
+	this._UnmarkCells( cells, '_SelectedCells' ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+	refCell.appendChild( cellContents ) ;
+
+	if ( FCKBrowserInfo.IsGeckoLike && ( ! refCell.firstChild ) )
+		FCKTools.AppendBogusBr( refCell ) ;
+
+	this._MoveCaretToCell( refCell, false ) ;
+}
+
+FCKTableHandler.MergeRight = function()
+{
+	var target = this.GetMergeRightTarget() ;
+	if ( target == null )
+		return ;
+	var refCell = target.refCell ;
+	var tableMap = target.tableMap ;
+	var nextCell = target.nextCell ;
+
+	var cellContents = FCK.EditorDocument.createDocumentFragment() ;
+	while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 )
+		cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ;
+
+	nextCell.parentNode.removeChild( nextCell ) ;
+	refCell.appendChild( cellContents ) ;
+	this._MarkCells( [nextCell], '_Replace' ) ;
+	this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+
+	this._MoveCaretToCell( refCell, false ) ;
+}
+
+FCKTableHandler.MergeDown = function()
+{
+	var target = this.GetMergeDownTarget() ;
+	if ( target == null )
+		return ;
+	var refCell = target.refCell ;
+	var tableMap = target.tableMap ;
+	var nextCell = target.nextCell ;
+
+	var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ;
+	while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 )
+		cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ;
+	if ( cellContents.firstChild )
+		cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ;
+	refCell.appendChild( cellContents ) ;
+	this._MarkCells( [nextCell], '_Replace' ) ;
+	this._ReplaceCellsByMarker( tableMap, '_Replace', refCell ) ;
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+
+	this._MoveCaretToCell( refCell, false ) ;
+}
+
+FCKTableHandler.HorizontalSplitCell = function()
+{
+	var cells = FCKTableHandler.GetSelectedCells() ;
+	if ( cells.length != 1 )
+		return ;
+
+	var refCell = cells[0] ;
+	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var rowIdx = refCell.parentNode.rowIndex ;
+	var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+	var cellSpan = isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ;
+
+	if ( cellSpan > 1 )
+	{
+		// Splittng a multi-column cell - original cell gets ceil(colSpan/2) columns,
+		// new cell gets floor(colSpan/2).
+		var newCellSpan = Math.ceil( cellSpan / 2 ) ;
+		var newCell = FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ;
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKTools.AppendBogusBr( newCell ) ;
+		var startIdx = colIdx + newCellSpan ;
+		var endIdx = colIdx + cellSpan ;
+		var rowSpan = isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ;
+		for ( var r = rowIdx ; r < rowIdx + rowSpan ; r++ )
+		{
+			for ( var i = startIdx ; i < endIdx ; i++ )
+				tableMap[r][i] = newCell ;
+		}
+	}
+	else
+	{
+		// Splitting a single-column cell - add a new cell, and expand
+		// cells crossing the same column.
+		var newTableMap = [] ;
+		for ( var i = 0 ; i < tableMap.length ; i++ )
+		{
+			var newRow = tableMap[i].slice( 0, colIdx ) ;
+			if ( tableMap[i].length <= colIdx )
+			{
+				newTableMap.push( newRow ) ;
+				continue ;
+			}
+			if ( tableMap[i][colIdx] == refCell )
+			{
+				newRow.push( refCell ) ;
+				newRow.push( FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ) ;
+				if ( FCKBrowserInfo.IsGeckoLike )
+					FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ;
+			}
+			else
+			{
+				newRow.push( tableMap[i][colIdx] ) ;
+				newRow.push( tableMap[i][colIdx] ) ;
+			}
+			for ( var j = colIdx + 1 ; j < tableMap[i].length ; j++ )
+				newRow.push( tableMap[i][j] ) ;
+			newTableMap.push( newRow ) ;
+		}
+		tableMap = newTableMap ;
+	}
+
+	this._InstallTableMap( tableMap, refCell.parentNode.parentNode ) ;
+}
+
+FCKTableHandler.VerticalSplitCell = function()
+{
+	var cells = FCKTableHandler.GetSelectedCells() ;
+	if ( cells.length != 1 )
+		return ;
+
+	var currentCell = cells[0] ;
+	var tableMap = this._CreateTableMap( currentCell.parentNode.parentNode ) ;
+	var cellIndex = FCKTableHandler._GetCellIndexSpan( tableMap, currentCell.parentNode.rowIndex, currentCell ) ;
+	var currentRowSpan = currentCell.rowSpan ;
+	var currentRowIndex = currentCell.parentNode.rowIndex ;
+	if ( isNaN( currentRowSpan ) )
+		currentRowSpan = 1 ;
+
+	if ( currentRowSpan > 1 )
+	{
+		// 1. Set the current cell's rowSpan to 1.
+		currentCell.rowSpan = Math.ceil( currentRowSpan / 2 ) ;
+
+		// 2. Find the appropriate place to insert a new cell at the next row.
+		var newCellRowIndex = currentRowIndex + Math.ceil( currentRowSpan / 2 ) ;
+		var insertMarker = null ;
+		for ( var i = cellIndex+1 ; i < tableMap[newCellRowIndex].length ; i++ )
+		{
+			if ( tableMap[newCellRowIndex][i].parentNode.rowIndex == newCellRowIndex )
+			{
+				insertMarker = tableMap[newCellRowIndex][i] ;
+				break ;
+			}
+		}
+
+		// 3. Insert the new cell to the indicated place, with the appropriate rowSpan, next row.
+		var newCell = FCK.EditorDocument.createElement( 'td' ) ;
+		newCell.rowSpan = Math.floor( currentRowSpan / 2 ) ;
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKTools.AppendBogusBr( newCell ) ;
+		currentCell.parentNode.parentNode.rows[newCellRowIndex].insertBefore( newCell, insertMarker ) ;
+	}
+	else
+	{
+		// 1. Insert a new row.
+		var newCellRowIndex = currentRowIndex + 1 ;
+		var newRow = FCK.EditorDocument.createElement( 'tr' ) ;
+		var tBody = currentCell.parentNode.parentNode ;
+		if ( tBody.rows.length > newCellRowIndex )
+			tBody.insertBefore( newRow, tBody.rows[newCellRowIndex] ) ;
+		else
+			tBody.appendChild( newRow ) ;
+
+		// 2. +1 to rowSpan for all cells crossing currentCell's row.
+		for ( var i = 0 ; i < tableMap[currentRowIndex].length ; )
+		{
+			var colSpan = tableMap[currentRowIndex][i].colSpan ;
+			if ( isNaN( colSpan ) || colSpan < 1 )
+				colSpan = 1 ;
+			if ( i == cellIndex )
+			{
+				i += colSpan ;
+				continue ;
+			}
+			var rowSpan = tableMap[currentRowIndex][i].rowSpan ;
+			if ( isNaN( rowSpan ) )
+				rowSpan = 1 ;
+			tableMap[currentRowIndex][i].rowSpan = rowSpan + 1 ;
+			i += colSpan ;
+		}
+
+		// 3. Insert a new cell to new row.
+		var newCell = FCK.EditorDocument.createElement( 'td' ) ;
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKTools.AppendBogusBr( newCell	) ;
+		newRow.appendChild( newCell ) ;
+	}
+}
+
+// Get the cell index from a TableMap.
+FCKTableHandler._GetCellIndexSpan = function( tableMap, rowIndex, cell )
+{
+	if ( tableMap.length < rowIndex + 1 )
+		return null ;
+
+	var oRow = tableMap[ rowIndex ] ;
+
+	for ( var c = 0 ; c < oRow.length ; c++ )
+	{
+		if ( oRow[c] == cell )
+			return c ;
+	}
+
+	return null ;
+}
+
+// Get the cell location from a TableMap. Returns an array with an [x,y] location
+FCKTableHandler._GetCellLocation = function( tableMap, cell  )
+{
+	for ( var i = 0 ; i < tableMap.length; i++ )
+	{
+		for ( var c = 0 ; c < tableMap[i].length ; c++  )
+		{
+			if ( tableMap[i][c] == cell  ) return [i,c];
+		}
+	}
+	return null ;
+}
+
+// Get the cells available in a column of a TableMap.
+FCKTableHandler._GetColumnCells = function( tableMap, columnIndex )
+{
+	var aCollCells = new Array() ;
+
+	for ( var r = 0 ; r < tableMap.length ; r++ )
+	{
+		var oCell = tableMap[r][columnIndex] ;
+		if ( oCell && ( aCollCells.length == 0 || aCollCells[ aCollCells.length - 1 ] != oCell ) )
+			aCollCells[ aCollCells.length ] = oCell ;
+	}
+
+	return aCollCells ;
+}
+
+// This function is quite hard to explain. It creates a matrix representing all cells in a table.
+// The difference here is that the "spanned" cells (colSpan and rowSpan) are duplicated on the matrix
+// cells that are "spanned". For example, a row with 3 cells where the second cell has colSpan=2 and rowSpan=3
+// will produce a bi-dimensional matrix with the following values (representing the cells):
+//		Cell1, Cell2, Cell2, Cell 3
+//		Cell4, Cell2, Cell2, Cell 5
+FCKTableHandler._CreateTableMap = function( table )
+{
+	var aRows = table.rows ;
+
+	// Row and Column counters.
+	var r = -1 ;
+
+	var aMap = new Array() ;
+
+	for ( var i = 0 ; i < aRows.length ; i++ )
+	{
+		r++ ;
+		if ( !aMap[r] )
+			aMap[r] = new Array() ;
+
+		var c = -1 ;
+
+		for ( var j = 0 ; j < aRows[i].cells.length ; j++ )
+		{
+			var oCell = aRows[i].cells[j] ;
+
+			c++ ;
+			while ( aMap[r][c] )
+				c++ ;
+
+			var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;
+			var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;
+
+			for ( var rs = 0 ; rs < iRowSpan ; rs++ )
+			{
+				if ( !aMap[r + rs] )
+					aMap[r + rs] = new Array() ;
+
+				for ( var cs = 0 ; cs < iColSpan ; cs++ )
+				{
+					aMap[r + rs][c + cs] = aRows[i].cells[j] ;
+				}
+			}
+
+			c += iColSpan - 1 ;
+		}
+	}
+	return aMap ;
+}
+
+// This function is the inverse of _CreateTableMap - it takes in a table map and converts it to an HTML table.
+FCKTableHandler._InstallTableMap = function( tableMap, table )
+{
+	// Workaround for #1917 : MSIE will always report a cell's rowSpan as 1 as long
+	// as the cell is not attached to a row. So we'll need an alternative attribute
+	// for storing the calculated rowSpan in IE.
+	var rowSpanAttr = FCKBrowserInfo.IsIE ? "_fckrowspan" : "rowSpan" ;
+
+	// Clear the table of all rows first.
+	while ( table.rows.length > 0 )
+	{
+		var row = table.rows[0] ;
+		row.parentNode.removeChild( row ) ;
+	}
+
+	// Disconnect all the cells in tableMap from their parents, set all colSpan and rowSpan attributes to 1.
+	for ( var i = 0 ; i < tableMap.length ; i++ )
+	{
+		for ( var j = 0 ; j < tableMap[i].length ; j++ )
+		{
+			var cell = tableMap[i][j] ;
+			if ( cell.parentNode )
+				cell.parentNode.removeChild( cell ) ;
+			cell.colSpan = cell[rowSpanAttr] = 1 ;
+		}
+	}
+
+	// Scan by rows and set colSpan.
+	var maxCol = 0 ;
+	for ( var i = 0 ; i < tableMap.length ; i++ )
+	{
+		for ( var j = 0 ; j < tableMap[i].length ; j++ )
+		{
+			var cell = tableMap[i][j] ;
+			if ( ! cell)
+				continue ;
+			if ( j > maxCol )
+				maxCol = j ;
+			if ( cell._colScanned === true )
+				continue ;
+			if ( tableMap[i][j-1] == cell )
+				cell.colSpan++ ;
+			if ( tableMap[i][j+1] != cell )
+				cell._colScanned = true ;
+		}
+	}
+
+	// Scan by columns and set rowSpan.
+	for ( var i = 0 ; i <= maxCol ; i++ )
+	{
+		for ( var j = 0 ; j < tableMap.length ; j++ )
+		{
+			if ( ! tableMap[j] )
+				continue ;
+			var cell = tableMap[j][i] ;
+			if ( ! cell || cell._rowScanned === true )
+				continue ;
+			if ( tableMap[j-1] && tableMap[j-1][i] == cell )
+				cell[rowSpanAttr]++ ;
+			if ( ! tableMap[j+1] || tableMap[j+1][i] != cell )
+				cell._rowScanned = true ;
+		}
+	}
+
+	// Clear all temporary flags.
+	for ( var i = 0 ; i < tableMap.length ; i++ )
+	{
+		for ( var j = 0 ; j < tableMap[i].length ; j++)
+		{
+			var cell = tableMap[i][j] ;
+			if ( FCKBrowserInfo.IsIE )
+			{
+				cell.removeAttribute( '_colScanned' ) ;
+				cell.removeAttribute( '_rowScanned' ) ;
+			}
+			else
+			{
+				delete cell._colScanned ;
+				delete cell._rowScanned ;
+			}
+		}
+	}
+
+	// Insert physical rows and columns to the table.
+	for ( var i = 0 ; i < tableMap.length ; i++ )
+	{
+		var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ;
+		for ( var j = 0 ; j < tableMap[i].length ; )
+		{
+			var cell = tableMap[i][j] ;
+			if ( tableMap[i-1] && tableMap[i-1][j] == cell )
+			{
+				j += cell.colSpan ;
+				continue ;
+			}
+			rowObj.appendChild( cell ) ;
+			if ( rowSpanAttr != 'rowSpan' )
+			{
+				cell.rowSpan = cell[rowSpanAttr] ;
+				cell.removeAttribute( rowSpanAttr ) ;
+			}
+			j += cell.colSpan ;
+			if ( cell.colSpan == 1 )
+				cell.removeAttribute( 'colspan' ) ;
+			if ( cell.rowSpan == 1 )
+				cell.removeAttribute( 'rowspan' ) ;
+		}
+		table.appendChild( rowObj ) ;
+	}
+}
+
+FCKTableHandler._MoveCaretToCell = function ( refCell, toStart )
+{
+	var range = new FCKDomRange( FCK.EditorWindow ) ;
+	range.MoveToNodeContents( refCell ) ;
+	range.Collapse( toStart ) ;
+	range.Select() ;
+}
+
+FCKTableHandler.ClearRow = function( tr )
+{
+	// Get the array of row's cells.
+	var aCells = tr.cells ;
+
+	// Replace the contents of each cell with "nothing".
+	for ( var i = 0 ; i < aCells.length ; i++ )
+	{
+		aCells[i].innerHTML = '' ;
+
+		if ( FCKBrowserInfo.IsGeckoLike )
+			FCKTools.AppendBogusBr( aCells[i] ) ;
+	}
+}
+
+FCKTableHandler.GetMergeRightTarget = function()
+{
+	var cells = this.GetSelectedCells() ;
+	if ( cells.length != 1 )
+		return null ;
+
+	var refCell = cells[0] ;
+	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var rowIdx = refCell.parentNode.rowIndex ;
+	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+	var nextColIdx = colIdx + ( isNaN( refCell.colSpan ) ? 1 : refCell.colSpan ) ;
+	var nextCell = tableMap[rowIdx][nextColIdx] ;
+
+	if ( ! nextCell )
+		return null ;
+
+	// The two cells must have the same vertical geometry, otherwise merging does not make sense.
+	this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
+	var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
+	var nextGeometry = this._GetMarkerGeometry( tableMap, rowIdx, nextColIdx, '_SizeTest' ) ;
+	this._UnmarkCells( [refCell, nextCell], '_SizeTest' ) ;
+
+	if ( refGeometry.height != nextGeometry.height || refGeometry.y != nextGeometry.y )
+		return null ;
+
+	return { 'refCell' : refCell, 'nextCell' : nextCell, 'tableMap' : tableMap } ;
+}
+
+FCKTableHandler.GetMergeDownTarget = function()
+{
+	var cells = this.GetSelectedCells() ;
+	if ( cells.length != 1 )
+		return null ;
+
+	var refCell = cells[0] ;
+	var tableMap = this._CreateTableMap( refCell.parentNode.parentNode ) ;
+	var rowIdx = refCell.parentNode.rowIndex ;
+	var colIdx = this._GetCellIndexSpan( tableMap, rowIdx, refCell ) ;
+	var newRowIdx = rowIdx + ( isNaN( refCell.rowSpan ) ? 1 : refCell.rowSpan ) ;
+	if ( ! tableMap[newRowIdx] )
+		return null ;
+
+	var nextCell = tableMap[newRowIdx][colIdx] ;
+
+	if ( ! nextCell )
+		return null ;
+
+	// The two cells must have the same horizontal geometry, otherwise merging does not makes sense.
+	this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
+	var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
+	var nextGeometry = this._GetMarkerGeometry( tableMap, newRowIdx, colIdx, '_SizeTest' ) ;
+	this._UnmarkCells( [refCell, nextCell], '_SizeTest' ) ;
+
+	if ( refGeometry.width != nextGeometry.width || refGeometry.x != nextGeometry.x )
+		return null ;
+
+	return { 'refCell' : refCell, 'nextCell' : nextCell, 'tableMap' : tableMap } ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_gecko.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
new file mode 100644
index 000000000..9b3bb4267
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
@@ -0,0 +1,56 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Manage table operations (non-IE).
+ */
+
+FCKTableHandler.GetSelectedCells = function()
+{
+	var aCells = new Array() ;
+
+	var oSelection = FCKSelection.GetSelection() ;
+
+	// If the selection is a text.
+	if ( oSelection.rangeCount == 1 && oSelection.anchorNode.nodeType == 3 )
+	{
+		var oParent = FCKTools.GetElementAscensor( oSelection.anchorNode, 'TD,TH' ) ;
+
+		if ( oParent )
+			aCells[0] = oParent ;
+
+		return aCells ;
+	}
+
+	for ( var i = 0 ; i < oSelection.rangeCount ; i++ )
+	{
+		var oRange = oSelection.getRangeAt(i) ;
+		var oCell ;
+
+		if ( oRange.startContainer.tagName.Equals( 'TD', 'TH' ) )
+			oCell = oRange.startContainer ;
+		else
+			oCell = oRange.startContainer.childNodes[ oRange.startOffset ] ;
+
+		if ( oCell.tagName.Equals( 'TD', 'TH' ) )
+			aCells[aCells.length] = oCell ;
+	}
+
+	return aCells ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_ie.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_ie.js
new file mode 100644
index 000000000..b344389e4
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktablehandler_ie.js
@@ -0,0 +1,64 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Manage table operations (IE specific).
+ */
+
+FCKTableHandler.GetSelectedCells = function()
+{
+	if ( FCKSelection.GetType() == 'Control' )
+	{
+		var td = FCKSelection.MoveToAncestorNode( 'TD' ) ;
+		return td ? [ td ] : [] ;
+	}
+
+	var aCells = new Array() ;
+
+	var oRange = FCKSelection.GetSelection().createRange() ;
+//	var oParent = oRange.parentElement() ;
+	var oParent = FCKSelection.GetParentElement() ;
+
+	if ( oParent && oParent.tagName.Equals( 'TD', 'TH' ) )
+		aCells[0] = oParent ;
+	else
+	{
+		oParent = FCKSelection.MoveToAncestorNode( 'TABLE' ) ;
+
+		if ( oParent )
+		{
+			// Loops throw all cells checking if the cell is, or part of it, is inside the selection
+			// and then add it to the selected cells collection.
+			for ( var i = 0 ; i < oParent.cells.length ; i++ )
+			{
+				var oCellRange = FCK.EditorDocument.body.createTextRange() ;
+				oCellRange.moveToElementText( oParent.cells[i] ) ;
+
+				if ( oRange.inRange( oCellRange )
+					|| ( oRange.compareEndPoints('StartToStart',oCellRange) >= 0 &&  oRange.compareEndPoints('StartToEnd',oCellRange) <= 0 )
+					|| ( oRange.compareEndPoints('EndToStart',oCellRange) >= 0 &&  oRange.compareEndPoints('EndToEnd',oCellRange) <= 0 ) )
+				{
+					aCells[aCells.length] = oParent.cells[i] ;
+				}
+			}
+		}
+	}
+
+	return aCells ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbaritems.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbaritems.js
new file mode 100644
index 000000000..d59e1a7c7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbaritems.js
@@ -0,0 +1,124 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Toolbar items definitions.
+ */
+
+var FCKToolbarItems = new Object() ;
+FCKToolbarItems.LoadedItems = new Object() ;
+
+FCKToolbarItems.RegisterItem = function( itemName, item )
+{
+	this.LoadedItems[ itemName ] = item ;
+}
+
+FCKToolbarItems.GetItem = function( itemName )
+{
+	var oItem = FCKToolbarItems.LoadedItems[ itemName ] ;
+
+	if ( oItem )
+		return oItem ;
+
+	switch ( itemName )
+	{
+		case 'Source'			: oItem = new FCKToolbarButton( 'Source'	, FCKLang.Source, null, FCK_TOOLBARITEM_ICONTEXT, true, true, 1 ) ; break ;
+		case 'DocProps'			: oItem = new FCKToolbarButton( 'DocProps'	, FCKLang.DocProps, null, null, null, null, 2 ) ; break ;
+		case 'Save'				: oItem = new FCKToolbarButton( 'Save'		, FCKLang.Save, null, null, true, null, 3 ) ; break ;
+		case 'NewPage'			: oItem = new FCKToolbarButton( 'NewPage'	, FCKLang.NewPage, null, null, true, null, 4  ) ; break ;
+		case 'Preview'			: oItem = new FCKToolbarButton( 'Preview'	, FCKLang.Preview, null, null, true, null, 5  ) ; break ;
+		case 'Templates'		: oItem = new FCKToolbarButton( 'Templates'	, FCKLang.Templates, null, null, null, null, 6 ) ; break ;
+		case 'About'			: oItem = new FCKToolbarButton( 'About'		, FCKLang.About, null, null, true, null, 47  ) ; break ;
+
+		case 'Cut'				: oItem = new FCKToolbarButton( 'Cut'		, FCKLang.Cut, null, null, false, true, 7 ) ; break ;
+		case 'Copy'				: oItem = new FCKToolbarButton( 'Copy'		, FCKLang.Copy, null, null, false, true, 8 ) ; break ;
+		case 'Paste'			: oItem = new FCKToolbarButton( 'Paste'		, FCKLang.Paste, null, null, false, true, 9 ) ; break ;
+		case 'PasteText'		: oItem = new FCKToolbarButton( 'PasteText'	, FCKLang.PasteText, null, null, false, true, 10 ) ; break ;
+		case 'PasteWord'		: oItem = new FCKToolbarButton( 'PasteWord'	, FCKLang.PasteWord, null, null, false, true, 11 ) ; break ;
+		case 'Print'			: oItem = new FCKToolbarButton( 'Print'		, FCKLang.Print, null, null, false, true, 12 ) ; break ;
+		case 'SpellCheck'		: oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; break ;
+		case 'Undo'				: oItem = new FCKToolbarButton( 'Undo'		, FCKLang.Undo, null, null, false, true, 14 ) ; break ;
+		case 'Redo'				: oItem = new FCKToolbarButton( 'Redo'		, FCKLang.Redo, null, null, false, true, 15 ) ; break ;
+		case 'SelectAll'		: oItem = new FCKToolbarButton( 'SelectAll'	, FCKLang.SelectAll, null, null, true, null, 18 ) ; break ;
+		case 'RemoveFormat'		: oItem = new FCKToolbarButton( 'RemoveFormat', FCKLang.RemoveFormat, null, null, false, true, 19 ) ; break ;
+		case 'FitWindow'		: oItem = new FCKToolbarButton( 'FitWindow'	, FCKLang.FitWindow, null, null, true, true, 66 ) ; break ;
+
+		case 'Bold'				: oItem = new FCKToolbarButton( 'Bold'		, FCKLang.Bold, null, null, false, true, 20 ) ; break ;
+		case 'Italic'			: oItem = new FCKToolbarButton( 'Italic'	, FCKLang.Italic, null, null, false, true, 21 ) ; break ;
+		case 'Underline'		: oItem = new FCKToolbarButton( 'Underline'	, FCKLang.Underline, null, null, false, true, 22 ) ; break ;
+		case 'StrikeThrough'	: oItem = new FCKToolbarButton( 'StrikeThrough'	, FCKLang.StrikeThrough, null, null, false, true, 23 ) ; break ;
+		case 'Subscript'		: oItem = new FCKToolbarButton( 'Subscript'		, FCKLang.Subscript, null, null, false, true, 24 ) ; break ;
+		case 'Superscript'		: oItem = new FCKToolbarButton( 'Superscript'	, FCKLang.Superscript, null, null, false, true, 25 ) ; break ;
+
+		case 'OrderedList'		: oItem = new FCKToolbarButton( 'InsertOrderedList'		, FCKLang.NumberedListLbl, FCKLang.NumberedList, null, false, true, 26 ) ; break ;
+		case 'UnorderedList'	: oItem = new FCKToolbarButton( 'InsertUnorderedList'	, FCKLang.BulletedListLbl, FCKLang.BulletedList, null, false, true, 27 ) ; break ;
+		case 'Outdent'			: oItem = new FCKToolbarButton( 'Outdent'	, FCKLang.DecreaseIndent, null, null, false, true, 28 ) ; break ;
+		case 'Indent'			: oItem = new FCKToolbarButton( 'Indent'	, FCKLang.IncreaseIndent, null, null, false, true, 29 ) ; break ;
+		case 'Blockquote'			: oItem = new FCKToolbarButton( 'Blockquote'	, FCKLang.Blockquote, null, null, false, true, 73 ) ; break ;
+		case 'CreateDiv'			: oItem = new FCKToolbarButton( 'CreateDiv'	, FCKLang.CreateDiv, null, null, false, true, 74 ) ; break ;
+
+		case 'Link'				: oItem = new FCKToolbarButton( 'Link'		, FCKLang.InsertLinkLbl, FCKLang.InsertLink, null, false, true, 34 ) ; break ;
+		case 'Unlink'			: oItem = new FCKToolbarButton( 'Unlink'	, FCKLang.RemoveLink, null, null, false, true, 35 ) ; break ;
+		case 'Anchor'			: oItem = new FCKToolbarButton( 'Anchor'	, FCKLang.Anchor, null, null, null, null, 36 ) ; break ;
+
+		case 'Image'			: oItem = new FCKToolbarButton( 'Image'			, FCKLang.InsertImageLbl, FCKLang.InsertImage, null, false, true, 37 ) ; break ;
+		case 'Flash'			: oItem = new FCKToolbarButton( 'Flash'			, FCKLang.InsertFlashLbl, FCKLang.InsertFlash, null, false, true, 38 ) ; break ;
+		case 'Table'			: oItem = new FCKToolbarButton( 'Table'			, FCKLang.InsertTableLbl, FCKLang.InsertTable, null, false, true, 39 ) ; break ;
+		case 'SpecialChar'		: oItem = new FCKToolbarButton( 'SpecialChar'	, FCKLang.InsertSpecialCharLbl, FCKLang.InsertSpecialChar, null, false, true, 42 ) ; break ;
+		case 'Smiley'			: oItem = new FCKToolbarButton( 'Smiley'		, FCKLang.InsertSmileyLbl, FCKLang.InsertSmiley, null, false, true, 41 ) ; break ;
+		case 'PageBreak'		: oItem = new FCKToolbarButton( 'PageBreak'		, FCKLang.PageBreakLbl, FCKLang.PageBreak, null, false, true, 43 ) ; break ;
+
+		case 'Rule'				: oItem = new FCKToolbarButton( 'Rule'			, FCKLang.InsertLineLbl, FCKLang.InsertLine, null, false, true, 40 ) ; break ;
+
+		case 'JustifyLeft'		: oItem = new FCKToolbarButton( 'JustifyLeft'	, FCKLang.LeftJustify, null, null, false, true, 30 ) ; break ;
+		case 'JustifyCenter'	: oItem = new FCKToolbarButton( 'JustifyCenter'	, FCKLang.CenterJustify, null, null, false, true, 31 ) ; break ;
+		case 'JustifyRight'		: oItem = new FCKToolbarButton( 'JustifyRight'	, FCKLang.RightJustify, null, null, false, true, 32 ) ; break ;
+		case 'JustifyFull'		: oItem = new FCKToolbarButton( 'JustifyFull'	, FCKLang.BlockJustify, null, null, false, true, 33 ) ; break ;
+
+		case 'Style'			: oItem = new FCKToolbarStyleCombo() ; break ;
+		case 'FontName'			: oItem = new FCKToolbarFontsCombo() ; break ;
+		case 'FontSize'			: oItem = new FCKToolbarFontSizeCombo() ; break ;
+		case 'FontFormat'		: oItem = new FCKToolbarFontFormatCombo() ; break ;
+
+		case 'TextColor'		: oItem = new FCKToolbarPanelButton( 'TextColor', FCKLang.TextColor, null, null, 45 ) ; break ;
+		case 'BGColor'			: oItem = new FCKToolbarPanelButton( 'BGColor'	, FCKLang.BGColor, null, null, 46 ) ; break ;
+
+		case 'Find'				: oItem = new FCKToolbarButton( 'Find'		, FCKLang.Find, null, null, null, null, 16 ) ; break ;
+		case 'Replace'			: oItem = new FCKToolbarButton( 'Replace'	, FCKLang.Replace, null, null, null, null, 17 ) ; break ;
+
+		case 'Form'				: oItem = new FCKToolbarButton( 'Form'			, FCKLang.Form, null, null, null, null, 48 ) ; break ;
+		case 'Checkbox'			: oItem = new FCKToolbarButton( 'Checkbox'		, FCKLang.Checkbox, null, null, null, null, 49 ) ; break ;
+		case 'Radio'			: oItem = new FCKToolbarButton( 'Radio'			, FCKLang.RadioButton, null, null, null, null, 50 ) ; break ;
+		case 'TextField'		: oItem = new FCKToolbarButton( 'TextField'		, FCKLang.TextField, null, null, null, null, 51 ) ; break ;
+		case 'Textarea'			: oItem = new FCKToolbarButton( 'Textarea'		, FCKLang.Textarea, null, null, null, null, 52 ) ; break ;
+		case 'HiddenField'		: oItem = new FCKToolbarButton( 'HiddenField'	, FCKLang.HiddenField, null, null, null, null, 56 ) ; break ;
+		case 'Button'			: oItem = new FCKToolbarButton( 'Button'		, FCKLang.Button, null, null, null, null, 54 ) ; break ;
+		case 'Select'			: oItem = new FCKToolbarButton( 'Select'		, FCKLang.SelectionField, null, null, null, null, 53 ) ; break ;
+		case 'ImageButton'		: oItem = new FCKToolbarButton( 'ImageButton'	, FCKLang.ImageButton, null, null, null, null, 55 ) ; break ;
+		case 'ShowBlocks'		: oItem = new FCKToolbarButton( 'ShowBlocks'	, FCKLang.ShowBlocks, null, null, null, true, 72 ) ; break ;
+
+		default:
+			alert( FCKLang.UnknownToolbarItem.replace( /%1/g, itemName ) ) ;
+			return null ;
+	}
+
+	FCKToolbarItems.LoadedItems[ itemName ] = oItem ;
+
+	return oItem ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbarset.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbarset.js
new file mode 100644
index 000000000..dce59e58b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktoolbarset.js
@@ -0,0 +1,399 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKToolbarSet object that is used to load and draw the
+ * toolbar.
+ */
+
+function FCKToolbarSet_Create( overhideLocation )
+{
+	var oToolbarSet ;
+
+	var sLocation = overhideLocation || FCKConfig.ToolbarLocation ;
+	switch ( sLocation )
+	{
+		case 'In' :
+			document.getElementById( 'xToolbarRow' ).style.display = '' ;
+			oToolbarSet = new FCKToolbarSet( document ) ;
+			break ;
+		case 'None' :
+			oToolbarSet = new FCKToolbarSet( document ) ;
+			break ;
+
+//		case 'OutTop' :
+			// Not supported.
+
+		default :
+			FCK.Events.AttachEvent( 'OnBlur', FCK_OnBlur ) ;
+			FCK.Events.AttachEvent( 'OnFocus', FCK_OnFocus ) ;
+
+			var eToolbarTarget ;
+
+			// Out:[TargetWindow]([TargetId])
+			var oOutMatch = sLocation.match( /^Out:(.+)\((\w+)\)$/ ) ;
+			if ( oOutMatch )
+			{
+				if ( FCKBrowserInfo.IsAIR )
+					FCKAdobeAIR.ToolbarSet_GetOutElement( window, oOutMatch ) ;
+				else
+					eToolbarTarget = eval( 'parent.' + oOutMatch[1] ).document.getElementById( oOutMatch[2] ) ;
+			}
+			else
+			{
+				// Out:[TargetId]
+				oOutMatch = sLocation.match( /^Out:(\w+)$/ ) ;
+				if ( oOutMatch )
+					eToolbarTarget = parent.document.getElementById( oOutMatch[1] ) ;
+			}
+
+			if ( !eToolbarTarget )
+			{
+				alert( 'Invalid value for "ToolbarLocation"' ) ;
+				return arguments.callee( 'In' );
+			}
+
+			// If it is a shared toolbar, it may be already available in the target element.
+			oToolbarSet = eToolbarTarget.__FCKToolbarSet ;
+			if ( oToolbarSet )
+				break ;
+
+			// Create the IFRAME that will hold the toolbar inside the target element.
+			var eToolbarIFrame = FCKTools.GetElementDocument( eToolbarTarget ).createElement( 'iframe' ) ;
+			eToolbarIFrame.src = 'javascript:void(0)' ;
+			eToolbarIFrame.frameBorder = 0 ;
+			eToolbarIFrame.width = '100%' ;
+			eToolbarIFrame.height = '10' ;
+			eToolbarTarget.appendChild( eToolbarIFrame ) ;
+			eToolbarIFrame.unselectable = 'on' ;
+
+			// Write the basic HTML for the toolbar (copy from the editor main page).
+			var eTargetDocument = eToolbarIFrame.contentWindow.document ;
+
+			// Workaround for Safari 12256. Ticket #63
+			var sBase = '' ;
+			if ( FCKBrowserInfo.IsSafari )
+				sBase = '<base href="' + window.document.location + '">' ;
+
+			// Initialize the IFRAME document body.
+			eTargetDocument.open() ;
+			eTargetDocument.write( '<html><head>' + sBase + '<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; '
+					+ 'window.onresize = window.onload = '
+					+ 'function(){'		// poll scrollHeight until it no longer changes for 1 sec.
+					+ 'var timer = null;'
+					+ 'var lastHeight = -1;'
+					+ 'var lastChange = 0;'
+					+ 'var poller = function(){'
+					+ 'var currentHeight = document.body.scrollHeight || 0;'
+					+ 'var currentTime = (new Date()).getTime();'
+					+ 'if (currentHeight != lastHeight){'
+					+ 'lastChange = currentTime;'
+					+ 'adjust();'
+					+ 'lastHeight = document.body.scrollHeight;'
+					+ '}'
+					+ 'if (lastChange < currentTime - 1000) clearInterval(timer);'
+					+ '};'
+					+ 'timer = setInterval(poller, 100);'
+					+ '}'
+					+ '</script></head><body style="overflow: hidden">' + document.getElementById( 'xToolbarSpace' ).innerHTML + '</body></html>' ) ;
+			eTargetDocument.close() ;
+
+			if( FCKBrowserInfo.IsAIR )
+				FCKAdobeAIR.ToolbarSet_InitOutFrame( eTargetDocument ) ;
+
+			FCKTools.AddEventListener( eTargetDocument, 'contextmenu', FCKTools.CancelEvent ) ;
+
+			// Load external resources (must be done here, otherwise Firefox will not
+			// have the document DOM ready to be used right away.
+			FCKTools.AppendStyleSheet( eTargetDocument, FCKConfig.SkinEditorCSS ) ;
+
+			oToolbarSet = eToolbarTarget.__FCKToolbarSet = new FCKToolbarSet( eTargetDocument ) ;
+			oToolbarSet._IFrame = eToolbarIFrame ;
+
+			if ( FCK.IECleanup )
+				FCK.IECleanup.AddItem( eToolbarTarget, FCKToolbarSet_Target_Cleanup ) ;
+	}
+
+	oToolbarSet.CurrentInstance = FCK ;
+	if ( !oToolbarSet.ToolbarItems )
+		oToolbarSet.ToolbarItems = FCKToolbarItems ;
+
+	FCK.AttachToOnSelectionChange( oToolbarSet.RefreshItemsState ) ;
+
+	return oToolbarSet ;
+}
+
+function FCK_OnBlur( editorInstance )
+{
+	var eToolbarSet = editorInstance.ToolbarSet ;
+
+	if ( eToolbarSet.CurrentInstance == editorInstance )
+		eToolbarSet.Disable() ;
+}
+
+function FCK_OnFocus( editorInstance )
+{
+	var oToolbarset = editorInstance.ToolbarSet ;
+	var oInstance = editorInstance || FCK ;
+
+	// Unregister the toolbar window from the current instance.
+	oToolbarset.CurrentInstance.FocusManager.RemoveWindow( oToolbarset._IFrame.contentWindow ) ;
+
+	// Set the new current instance.
+	oToolbarset.CurrentInstance = oInstance ;
+
+	// Register the toolbar window in the current instance.
+	oInstance.FocusManager.AddWindow( oToolbarset._IFrame.contentWindow, true ) ;
+
+	oToolbarset.Enable() ;
+}
+
+function FCKToolbarSet_Cleanup()
+{
+	this._TargetElement = null ;
+	this._IFrame = null ;
+}
+
+function FCKToolbarSet_Target_Cleanup()
+{
+	this.__FCKToolbarSet = null ;
+}
+
+var FCKToolbarSet = function( targetDocument )
+{
+	this._Document = targetDocument ;
+
+	// Get the element that will hold the elements structure.
+	this._TargetElement	= targetDocument.getElementById( 'xToolbar' ) ;
+
+	// Setup the expand and collapse handlers.
+	var eExpandHandle	= targetDocument.getElementById( 'xExpandHandle' ) ;
+	var eCollapseHandle	= targetDocument.getElementById( 'xCollapseHandle' ) ;
+
+	eExpandHandle.title		= FCKLang.ToolbarExpand ;
+	FCKTools.AddEventListener( eExpandHandle, 'click', FCKToolbarSet_Expand_OnClick ) ;
+
+	eCollapseHandle.title	= FCKLang.ToolbarCollapse ;
+	FCKTools.AddEventListener( eCollapseHandle, 'click', FCKToolbarSet_Collapse_OnClick ) ;
+
+	// Set the toolbar state at startup.
+	if ( !FCKConfig.ToolbarCanCollapse || FCKConfig.ToolbarStartExpanded )
+		this.Expand() ;
+	else
+		this.Collapse() ;
+
+	// Enable/disable the collapse handler
+	eCollapseHandle.style.display = FCKConfig.ToolbarCanCollapse ? '' : 'none' ;
+
+	if ( FCKConfig.ToolbarCanCollapse )
+		eCollapseHandle.style.display = '' ;
+	else
+		targetDocument.getElementById( 'xTBLeftBorder' ).style.display = '' ;
+
+	// Set the default properties.
+	this.Toolbars = new Array() ;
+	this.IsLoaded = false ;
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( this, FCKToolbarSet_Cleanup ) ;
+}
+
+function FCKToolbarSet_Expand_OnClick()
+{
+	FCK.ToolbarSet.Expand() ;
+}
+
+function FCKToolbarSet_Collapse_OnClick()
+{
+	FCK.ToolbarSet.Collapse() ;
+}
+
+FCKToolbarSet.prototype.Expand = function()
+{
+	this._ChangeVisibility( false ) ;
+}
+
+FCKToolbarSet.prototype.Collapse = function()
+{
+	this._ChangeVisibility( true ) ;
+}
+
+FCKToolbarSet.prototype._ChangeVisibility = function( collapse )
+{
+	this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ;
+	this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ;
+
+	if ( FCKBrowserInfo.IsGecko )
+	{
+		// I had to use "setTimeout" because Gecko was not responding in a right
+		// way when calling window.onresize() directly.
+		FCKTools.RunFunction( window.onresize ) ;
+	}
+}
+
+FCKToolbarSet.prototype.Load = function( toolbarSetName )
+{
+	this.Name = toolbarSetName ;
+
+	this.Items = new Array() ;
+
+	// Reset the array of toolbar items that are active only on WYSIWYG mode.
+	this.ItemsWysiwygOnly = new Array() ;
+
+	// Reset the array of toolbar items that are sensitive to the cursor position.
+	this.ItemsContextSensitive = new Array() ;
+
+	// Cleanup the target element.
+	this._TargetElement.innerHTML = '' ;
+
+	var ToolbarSet = FCKConfig.ToolbarSets[toolbarSetName] ;
+
+	if ( !ToolbarSet )
+	{
+		alert( FCKLang.UnknownToolbarSet.replace( /%1/g, toolbarSetName ) ) ;
+		return ;
+	}
+
+	this.Toolbars = new Array() ;
+
+	for ( var x = 0 ; x < ToolbarSet.length ; x++ )
+	{
+		var oToolbarItems = ToolbarSet[x] ;
+
+		// If the configuration for the toolbar is missing some element or has any extra comma
+		// this item won't be valid, so skip it and keep on processing.
+		if ( !oToolbarItems )
+			continue ;
+
+		var oToolbar ;
+
+		if ( typeof( oToolbarItems ) == 'string' )
+		{
+			if ( oToolbarItems == '/' )
+				oToolbar = new FCKToolbarBreak() ;
+		}
+		else
+		{
+			oToolbar = new FCKToolbar() ;
+
+			for ( var j = 0 ; j < oToolbarItems.length ; j++ )
+			{
+				var sItem = oToolbarItems[j] ;
+
+				if ( sItem == '-')
+					oToolbar.AddSeparator() ;
+				else
+				{
+					var oItem = FCKToolbarItems.GetItem( sItem ) ;
+					if ( oItem )
+					{
+						oToolbar.AddItem( oItem ) ;
+
+						this.Items.push( oItem ) ;
+
+						if ( !oItem.SourceView )
+							this.ItemsWysiwygOnly.push( oItem ) ;
+
+						if ( oItem.ContextSensitive )
+							this.ItemsContextSensitive.push( oItem ) ;
+					}
+				}
+			}
+
+			// oToolbar.AddTerminator() ;
+		}
+
+		oToolbar.Create( this._TargetElement ) ;
+
+		this.Toolbars[ this.Toolbars.length ] = oToolbar ;
+	}
+
+	FCKTools.DisableSelection( this._Document.getElementById( 'xCollapseHandle' ).parentNode ) ;
+
+	if ( FCK.Status != FCK_STATUS_COMPLETE )
+		FCK.Events.AttachEvent( 'OnStatusChange', this.RefreshModeState ) ;
+	else
+		this.RefreshModeState() ;
+
+	this.IsLoaded = true ;
+	this.IsEnabled = true ;
+
+	FCKTools.RunFunction( this.OnLoad ) ;
+}
+
+FCKToolbarSet.prototype.Enable = function()
+{
+	if ( this.IsEnabled )
+		return ;
+
+	this.IsEnabled = true ;
+
+	var aItems = this.Items ;
+	for ( var i = 0 ; i < aItems.length ; i++ )
+		aItems[i].RefreshState() ;
+}
+
+FCKToolbarSet.prototype.Disable = function()
+{
+	if ( !this.IsEnabled )
+		return ;
+
+	this.IsEnabled = false ;
+
+	var aItems = this.Items ;
+	for ( var i = 0 ; i < aItems.length ; i++ )
+		aItems[i].Disable() ;
+}
+
+FCKToolbarSet.prototype.RefreshModeState = function( editorInstance )
+{
+	if ( FCK.Status != FCK_STATUS_COMPLETE )
+		return ;
+
+	var oToolbarSet = editorInstance ? editorInstance.ToolbarSet : this ;
+	var aItems = oToolbarSet.ItemsWysiwygOnly ;
+
+	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+	{
+		// Enable all buttons that are available on WYSIWYG mode only.
+		for ( var i = 0 ; i < aItems.length ; i++ )
+			aItems[i].Enable() ;
+
+		// Refresh the buttons state.
+		oToolbarSet.RefreshItemsState( editorInstance ) ;
+	}
+	else
+	{
+		// Refresh the buttons state.
+		oToolbarSet.RefreshItemsState( editorInstance ) ;
+
+		// Disable all buttons that are available on WYSIWYG mode only.
+		for ( var j = 0 ; j < aItems.length ; j++ )
+			aItems[j].Disable() ;
+	}
+}
+
+FCKToolbarSet.prototype.RefreshItemsState = function( editorInstance )
+{
+
+	var aItems = ( editorInstance ? editorInstance.ToolbarSet : this ).ItemsContextSensitive ;
+
+	for ( var i = 0 ; i < aItems.length ; i++ )
+		aItems[i].RefreshState() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktools.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools.js
new file mode 100644
index 000000000..99723402f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools.js
@@ -0,0 +1,749 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Utility functions.
+ */
+
+var FCKTools = new Object() ;
+
+FCKTools.CreateBogusBR = function( targetDocument )
+{
+	var eBR = targetDocument.createElement( 'br' ) ;
+//	eBR.setAttribute( '_moz_editor_bogus_node', 'TRUE' ) ;
+	eBR.setAttribute( 'type', '_moz' ) ;
+	return eBR ;
+}
+
+/**
+ * Fixes relative URL entries defined inside CSS styles by appending a prefix
+ * to them.
+ * @param (String) cssStyles The CSS styles definition possibly containing url()
+ *		paths.
+ * @param (String) urlFixPrefix The prefix to append to relative URLs.
+ */
+FCKTools.FixCssUrls = function( urlFixPrefix, cssStyles )
+{
+	if ( !urlFixPrefix || urlFixPrefix.length == 0 )
+		return cssStyles ;
+
+	return cssStyles.replace( /url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g, function( match, opener, path, closer )
+		{
+			if ( /^\/|^\w?:/.test( path ) )
+				return match ;
+			else
+				return 'url(' + opener + urlFixPrefix + path + closer + ')' ;
+		} ) ;
+}
+
+FCKTools._GetUrlFixedCss = function( cssStyles, urlFixPrefix )
+{
+	var match = cssStyles.match( /^([^|]+)\|([\s\S]*)/ ) ;
+
+	if ( match )
+		return FCKTools.FixCssUrls( match[1], match[2] ) ;
+	else
+		return cssStyles ;
+}
+
+/**
+ * Appends a <link css> or <style> element to the document.
+ * @param (Object) documentElement The DOM document object to which append the
+ *		stylesheet.
+ * @param (Variant) cssFileOrDef A String pointing to the CSS file URL or an
+ *		Array with many CSS file URLs or the CSS definitions for the <style>
+ *		element.
+ * @return {Array} An array containing all elements created in the target
+ *		document. It may include <link> or <style> elements, depending on the
+ *		value passed with cssFileOrDef.
+ */
+FCKTools.AppendStyleSheet = function( domDocument, cssFileOrArrayOrDef )
+{
+	if ( !cssFileOrArrayOrDef )
+		return [] ;
+
+	if ( typeof( cssFileOrArrayOrDef ) == 'string' )
+	{
+		// Test if the passed argument is an URL.
+		if ( /[\\\/\.][^{}]*$/.test( cssFileOrArrayOrDef ) )
+		{
+			// The string may have several URLs separated by comma.
+			return this.AppendStyleSheet( domDocument, cssFileOrArrayOrDef.split(',') ) ;
+		}
+		else
+			return [ this.AppendStyleString( domDocument, FCKTools._GetUrlFixedCss( cssFileOrArrayOrDef ) ) ] ;
+	}
+	else
+	{
+		var styles = [] ;
+		for ( var i = 0 ; i < cssFileOrArrayOrDef.length ; i++ )
+			styles.push( this._AppendStyleSheet( domDocument, cssFileOrArrayOrDef[i] ) ) ;
+		return styles ;
+	}
+}
+
+FCKTools.GetStyleHtml = (function()
+{
+	var getStyle = function( styleDef, markTemp )
+	{
+		if ( styleDef.length == 0 )
+			return '' ;
+
+		var temp = markTemp ? ' _fcktemp="true"' : '' ;
+		return '<' + 'style type="text/css"' + temp + '>' + styleDef + '<' + '/style>' ;
+	}
+
+	var getLink = function( cssFileUrl, markTemp )
+	{
+		if ( cssFileUrl.length == 0 )
+			return '' ;
+
+		var temp = markTemp ? ' _fcktemp="true"' : '' ;
+		return '<' + 'link href="' + cssFileUrl + '" type="text/css" rel="stylesheet" ' + temp + '/>' ;
+	}
+
+	return function( cssFileOrArrayOrDef, markTemp )
+	{
+		if ( !cssFileOrArrayOrDef )
+			return '' ;
+
+		if ( typeof( cssFileOrArrayOrDef ) == 'string' )
+		{
+			// Test if the passed argument is an URL.
+			if ( /[\\\/\.][^{}]*$/.test( cssFileOrArrayOrDef ) )
+			{
+				// The string may have several URLs separated by comma.
+				return this.GetStyleHtml( cssFileOrArrayOrDef.split(','), markTemp ) ;
+			}
+			else
+				return getStyle( this._GetUrlFixedCss( cssFileOrArrayOrDef ), markTemp ) ;
+		}
+		else
+		{
+			var html = '' ;
+
+			for ( var i = 0 ; i < cssFileOrArrayOrDef.length ; i++ )
+				html += getLink( cssFileOrArrayOrDef[i], markTemp ) ;
+
+			return html ;
+		}
+	}
+})() ;
+
+FCKTools.GetElementDocument = function ( element )
+{
+	return element.ownerDocument || element.document ;
+}
+
+// Get the window object where the element is placed in.
+FCKTools.GetElementWindow = function( element )
+{
+	return this.GetDocumentWindow( this.GetElementDocument( element ) ) ;
+}
+
+FCKTools.GetDocumentWindow = function( document )
+{
+	// With Safari, there is not way to retrieve the window from the document, so we must fix it.
+	if ( FCKBrowserInfo.IsSafari && !document.parentWindow )
+		this.FixDocumentParentWindow( window.top ) ;
+
+	return document.parentWindow || document.defaultView ;
+}
+
+/*
+	This is a Safari specific function that fix the reference to the parent
+	window from the document object.
+*/
+FCKTools.FixDocumentParentWindow = function( targetWindow )
+{
+	if ( targetWindow.document )
+		targetWindow.document.parentWindow = targetWindow ;
+
+	for ( var i = 0 ; i < targetWindow.frames.length ; i++ )
+		FCKTools.FixDocumentParentWindow( targetWindow.frames[i] ) ;
+}
+
+FCKTools.HTMLEncode = function( text )
+{
+	if ( !text )
+		return '' ;
+
+	text = text.replace( /&/g, '&amp;' ) ;
+	text = text.replace( /</g, '&lt;' ) ;
+	text = text.replace( />/g, '&gt;' ) ;
+
+	return text ;
+}
+
+FCKTools.HTMLDecode = function( text )
+{
+	if ( !text )
+		return '' ;
+
+	text = text.replace( /&gt;/g, '>' ) ;
+	text = text.replace( /&lt;/g, '<' ) ;
+	text = text.replace( /&amp;/g, '&' ) ;
+
+	return text ;
+}
+
+FCKTools._ProcessLineBreaksForPMode = function( oEditor, text, liState, node, strArray )
+{
+	var closeState = 0 ;
+	var blockStartTag = "<p>" ;
+	var blockEndTag = "</p>" ;
+	var lineBreakTag = "<br />" ;
+	if ( liState )
+	{
+		blockStartTag = "<li>" ;
+		blockEndTag = "</li>" ;
+		closeState = 1 ;
+	}
+
+	// Are we currently inside a <p> tag now?
+	// If yes, close it at the next double line break.
+	while ( node && node != oEditor.FCK.EditorDocument.body )
+	{
+		if ( node.tagName.toLowerCase() == 'p' )
+		{
+			closeState = 1 ;
+			break;
+		}
+		node = node.parentNode ;
+	}
+
+	for ( var i = 0 ; i < text.length ; i++ )
+	{
+		var c = text.charAt( i ) ;
+		if ( c == '\r' )
+			continue ;
+
+		if ( c != '\n' )
+		{
+			strArray.push( c ) ;
+			continue ;
+		}
+
+		// Now we have encountered a line break.
+		// Check if the next character is also a line break.
+		var n = text.charAt( i + 1 ) ;
+		if ( n == '\r' )
+		{
+			i++ ;
+			n = text.charAt( i + 1 ) ;
+		}
+		if ( n == '\n' )
+		{
+			i++ ;	// ignore next character - we have already processed it.
+			if ( closeState )
+				strArray.push( blockEndTag ) ;
+			strArray.push( blockStartTag ) ;
+			closeState = 1 ;
+		}
+		else
+			strArray.push( lineBreakTag ) ;
+	}
+}
+
+FCKTools._ProcessLineBreaksForDivMode = function( oEditor, text, liState, node, strArray )
+{
+	var closeState = 0 ;
+	var blockStartTag = "<div>" ;
+	var blockEndTag = "</div>" ;
+	if ( liState )
+	{
+		blockStartTag = "<li>" ;
+		blockEndTag = "</li>" ;
+		closeState = 1 ;
+	}
+
+	// Are we currently inside a <div> tag now?
+	// If yes, close it at the next double line break.
+	while ( node && node != oEditor.FCK.EditorDocument.body )
+	{
+		if ( node.tagName.toLowerCase() == 'div' )
+		{
+			closeState = 1 ;
+			break ;
+		}
+		node = node.parentNode ;
+	}
+
+	for ( var i = 0 ; i < text.length ; i++ )
+	{
+		var c = text.charAt( i ) ;
+		if ( c == '\r' )
+			continue ;
+
+		if ( c != '\n' )
+		{
+			strArray.push( c ) ;
+			continue ;
+		}
+
+		if ( closeState )
+		{
+			if ( strArray[ strArray.length - 1 ] == blockStartTag )
+			{
+				// A div tag must have some contents inside for it to be visible.
+				strArray.push( "&nbsp;" ) ;
+			}
+			strArray.push( blockEndTag ) ;
+		}
+		strArray.push( blockStartTag ) ;
+		closeState = 1 ;
+	}
+	if ( closeState )
+		strArray.push( blockEndTag ) ;
+}
+
+FCKTools._ProcessLineBreaksForBrMode = function( oEditor, text, liState, node, strArray )
+{
+	var closeState = 0 ;
+	var blockStartTag = "<br />" ;
+	var blockEndTag = "" ;
+	if ( liState )
+	{
+		blockStartTag = "<li>" ;
+		blockEndTag = "</li>" ;
+		closeState = 1 ;
+	}
+
+	for ( var i = 0 ; i < text.length ; i++ )
+	{
+		var c = text.charAt( i ) ;
+		if ( c == '\r' )
+			continue ;
+
+		if ( c != '\n' )
+		{
+			strArray.push( c ) ;
+			continue ;
+		}
+
+		if ( closeState && blockEndTag.length )
+			strArray.push ( blockEndTag ) ;
+		strArray.push( blockStartTag ) ;
+		closeState = 1 ;
+	}
+}
+
+FCKTools.ProcessLineBreaks = function( oEditor, oConfig, text )
+{
+	var enterMode = oConfig.EnterMode.toLowerCase() ;
+	var strArray = [] ;
+
+	// Is the caret or selection inside an <li> tag now?
+	var liState = 0 ;
+	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+	range.MoveToSelection() ;
+	var node = range._Range.startContainer ;
+	while ( node && node.nodeType != 1 )
+		node = node.parentNode ;
+	if ( node && node.tagName.toLowerCase() == 'li' )
+		liState = 1 ;
+
+	if ( enterMode == 'p' )
+		this._ProcessLineBreaksForPMode( oEditor, text, liState, node, strArray ) ;
+	else if ( enterMode == 'div' )
+		this._ProcessLineBreaksForDivMode( oEditor, text, liState, node, strArray ) ;
+	else if ( enterMode == 'br' )
+		this._ProcessLineBreaksForBrMode( oEditor, text, liState, node, strArray ) ;
+	return strArray.join( "" ) ;
+}
+
+/**
+ * Adds an option to a SELECT element.
+ */
+FCKTools.AddSelectOption = function( selectElement, optionText, optionValue )
+{
+	var oOption = FCKTools.GetElementDocument( selectElement ).createElement( "OPTION" ) ;
+
+	oOption.text	= optionText ;
+	oOption.value	= optionValue ;
+
+	selectElement.options.add(oOption) ;
+
+	return oOption ;
+}
+
+FCKTools.RunFunction = function( func, thisObject, paramsArray, timerWindow )
+{
+	if ( func )
+		this.SetTimeout( func, 0, thisObject, paramsArray, timerWindow ) ;
+}
+
+FCKTools.SetTimeout = function( func, milliseconds, thisObject, paramsArray, timerWindow )
+{
+	return ( timerWindow || window ).setTimeout(
+		function()
+		{
+			if ( paramsArray )
+				func.apply( thisObject, [].concat( paramsArray ) ) ;
+			else
+				func.apply( thisObject ) ;
+		},
+		milliseconds ) ;
+}
+
+FCKTools.SetInterval = function( func, milliseconds, thisObject, paramsArray, timerWindow )
+{
+	return ( timerWindow || window ).setInterval(
+		function()
+		{
+			func.apply( thisObject, paramsArray || [] ) ;
+		},
+		milliseconds ) ;
+}
+
+FCKTools.ConvertStyleSizeToHtml = function( size )
+{
+	return size.EndsWith( '%' ) ? size : parseInt( size, 10 ) ;
+}
+
+FCKTools.ConvertHtmlSizeToStyle = function( size )
+{
+	return size.EndsWith( '%' ) ? size : ( size + 'px' ) ;
+}
+
+// START iCM MODIFICATIONS
+// Amended to accept a list of one or more ascensor tag names
+// Amended to check the element itself before working back up through the parent hierarchy
+FCKTools.GetElementAscensor = function( element, ascensorTagNames )
+{
+//	var e = element.parentNode ;
+	var e = element ;
+	var lstTags = "," + ascensorTagNames.toUpperCase() + "," ;
+
+	while ( e )
+	{
+		if ( lstTags.indexOf( "," + e.nodeName.toUpperCase() + "," ) != -1 )
+			return e ;
+
+		e = e.parentNode ;
+	}
+	return null ;
+}
+// END iCM MODIFICATIONS
+
+FCKTools.CreateEventListener = function( func, params )
+{
+	var f = function()
+	{
+		var aAllParams = [] ;
+
+		for ( var i = 0 ; i < arguments.length ; i++ )
+			aAllParams.push( arguments[i] ) ;
+
+		func.apply( this, aAllParams.concat( params ) ) ;
+	}
+
+	return f ;
+}
+
+FCKTools.IsStrictMode = function( document )
+{
+	// There is no compatMode in Safari, but it seams that it always behave as
+	// CSS1Compat, so let's assume it as the default for that browser.
+	return ( 'CSS1Compat' == ( document.compatMode || ( FCKBrowserInfo.IsSafari ? 'CSS1Compat' : null ) ) ) ;
+}
+
+// Transforms a "arguments" object to an array.
+FCKTools.ArgumentsToArray = function( args, startIndex, maxLength )
+{
+	startIndex = startIndex || 0 ;
+	maxLength = maxLength || args.length ;
+
+	var argsArray = new Array() ;
+
+	for ( var i = startIndex ; i < startIndex + maxLength && i < args.length ; i++ )
+		argsArray.push( args[i] ) ;
+
+	return argsArray ;
+}
+
+FCKTools.CloneObject = function( sourceObject )
+{
+	var fCloneCreator = function() {} ;
+	fCloneCreator.prototype = sourceObject ;
+	return new fCloneCreator ;
+}
+
+// Appends a bogus <br> at the end of the element, if not yet available.
+FCKTools.AppendBogusBr = function( element )
+{
+	if ( !element )
+		return ;
+
+	var eLastChild = this.GetLastItem( element.getElementsByTagName('br') ) ;
+
+	if ( !eLastChild || ( eLastChild.getAttribute( 'type', 2 ) != '_moz' && eLastChild.getAttribute( '_moz_dirty' ) == null ) )
+	{
+		var doc = this.GetElementDocument( element ) ;
+
+		if ( FCKBrowserInfo.IsOpera )
+			element.appendChild( doc.createTextNode('') ) ;
+		else
+			element.appendChild( this.CreateBogusBR( doc ) ) ;
+	}
+}
+
+FCKTools.GetLastItem = function( list )
+{
+	if ( list.length > 0 )
+		return list[ list.length - 1 ] ;
+
+	return null ;
+}
+
+FCKTools.GetDocumentPosition = function( w, node )
+{
+	var x = 0 ;
+	var y = 0 ;
+	var curNode = node ;
+	var prevNode = null ;
+	var curWindow = FCKTools.GetElementWindow( curNode ) ;
+	while ( curNode && !( curWindow == w && ( curNode == w.document.body || curNode == w.document.documentElement ) ) )
+	{
+		x += curNode.offsetLeft - curNode.scrollLeft ;
+		y += curNode.offsetTop - curNode.scrollTop ;
+
+		if ( ! FCKBrowserInfo.IsOpera )
+		{
+			var scrollNode = prevNode ;
+			while ( scrollNode && scrollNode != curNode )
+			{
+				x -= scrollNode.scrollLeft ;
+				y -= scrollNode.scrollTop ;
+				scrollNode = scrollNode.parentNode ;
+			}
+		}
+
+		prevNode = curNode ;
+		if ( curNode.offsetParent )
+			curNode = curNode.offsetParent ;
+		else
+		{
+			if ( curWindow != w )
+			{
+				curNode = curWindow.frameElement ;
+				prevNode = null ;
+				if ( curNode )
+					curWindow = curNode.contentWindow.parent ;
+			}
+			else
+				curNode = null ;
+		}
+	}
+
+	// document.body is a special case when it comes to offsetTop and offsetLeft values.
+	// 1. It matters if document.body itself is a positioned element;
+	// 2. It matters is when we're in IE and the element has no positioned ancestor.
+	// Otherwise the values should be ignored.
+	if ( FCKDomTools.GetCurrentElementStyle( w.document.body, 'position') != 'static'
+			|| ( FCKBrowserInfo.IsIE && FCKDomTools.GetPositionedAncestor( node ) == null ) )
+	{
+		x += w.document.body.offsetLeft ;
+		y += w.document.body.offsetTop ;
+	}
+
+	return { "x" : x, "y" : y } ;
+}
+
+FCKTools.GetWindowPosition = function( w, node )
+{
+	var pos = this.GetDocumentPosition( w, node ) ;
+	var scroll = FCKTools.GetScrollPosition( w ) ;
+	pos.x -= scroll.X ;
+	pos.y -= scroll.Y ;
+	return pos ;
+}
+
+FCKTools.ProtectFormStyles = function( formNode )
+{
+	if ( !formNode || formNode.nodeType != 1 || formNode.tagName.toLowerCase() != 'form' )
+		return [] ;
+	var hijackRecord = [] ;
+	var hijackNames = [ 'style', 'className' ] ;
+	for ( var i = 0 ; i < hijackNames.length ; i++ )
+	{
+		var name = hijackNames[i] ;
+		if ( formNode.elements.namedItem( name ) )
+		{
+			var hijackNode = formNode.elements.namedItem( name ) ;
+			hijackRecord.push( [ hijackNode, hijackNode.nextSibling ] ) ;
+			formNode.removeChild( hijackNode ) ;
+		}
+	}
+	return hijackRecord ;
+}
+
+FCKTools.RestoreFormStyles = function( formNode, hijackRecord )
+{
+	if ( !formNode || formNode.nodeType != 1 || formNode.tagName.toLowerCase() != 'form' )
+		return ;
+	if ( hijackRecord.length > 0 )
+	{
+		for ( var i = hijackRecord.length - 1 ; i >= 0 ; i-- )
+		{
+			var node = hijackRecord[i][0] ;
+			var sibling = hijackRecord[i][1] ;
+			if ( sibling )
+				formNode.insertBefore( node, sibling ) ;
+			else
+				formNode.appendChild( node ) ;
+		}
+	}
+}
+
+// Perform a one-step DFS walk.
+FCKTools.GetNextNode = function( node, limitNode )
+{
+	if ( node.firstChild )
+		return node.firstChild ;
+	else if ( node.nextSibling )
+		return node.nextSibling ;
+	else
+	{
+		var ancestor = node.parentNode ;
+		while ( ancestor )
+		{
+			if ( ancestor == limitNode )
+				return null ;
+			if ( ancestor.nextSibling )
+				return ancestor.nextSibling ;
+			else
+				ancestor = ancestor.parentNode ;
+		}
+	}
+	return null ;
+}
+
+FCKTools.GetNextTextNode = function( textnode, limitNode, checkStop )
+{
+	node = this.GetNextNode( textnode, limitNode ) ;
+	if ( checkStop && node && checkStop( node ) )
+		return null ;
+	while ( node && node.nodeType != 3 )
+	{
+		node = this.GetNextNode( node, limitNode ) ;
+		if ( checkStop && node && checkStop( node ) )
+			return null ;
+	}
+	return node ;
+}
+
+/**
+ * Merge all objects passed by argument into a single object.
+ */
+FCKTools.Merge = function()
+{
+	var args = arguments ;
+	var o = args[0] ;
+
+	for ( var i = 1 ; i < args.length ; i++ )
+	{
+		var arg = args[i] ;
+		for ( var p in arg )
+			o[p] = arg[p] ;
+	}
+
+	return o ;
+}
+
+/**
+ * Check if the passed argument is a real Array. It may not working when
+ * calling it cross windows.
+ */
+FCKTools.IsArray = function( it )
+{
+	return ( it instanceof Array ) ;
+}
+
+/**
+ * Appends a "length" property to an object, containing the number of
+ * properties available on it, excluded the append property itself.
+ */
+FCKTools.AppendLengthProperty = function( targetObject, propertyName )
+{
+	var counter = 0 ;
+
+	for ( var n in targetObject )
+		counter++ ;
+
+	return targetObject[ propertyName || 'length' ] = counter ;
+}
+
+/**
+ * Gets the browser parsed version of a css text (style attribute value). On
+ * some cases, the browser makes changes to the css text, returning a different
+ * value. For example, hexadecimal colors get transformed to rgb().
+ */
+FCKTools.NormalizeCssText = function( unparsedCssText )
+{
+	// Injects the style in a temporary span object, so the browser parses it,
+	// retrieving its final format.
+	var tempSpan = document.createElement( 'span' ) ;
+	tempSpan.style.cssText = unparsedCssText ;
+	return tempSpan.style.cssText ;
+}
+
+/**
+ * Binding the "this" reference to an object for a function.
+ */
+FCKTools.Bind = function( subject, func )
+{
+  return function(){ return func.apply( subject, arguments ) ; } ;
+}
+
+/**
+ * Retrieve the correct "empty iframe" URL for the current browser, which
+ * causes the minimum fuzz (e.g. security warnings in HTTPS, DNS error in
+ * IE5.5, etc.) for that browser, making the iframe ready to DOM use whithout
+ * having to loading an external file.
+ */
+FCKTools.GetVoidUrl = function()
+{
+	if ( FCK_IS_CUSTOM_DOMAIN )
+		return "javascript: void( function(){" +
+			"document.open();" +
+			"document.write('<html><head><title></title></head><body></body></html>');" +
+			"document.domain = '" + FCK_RUNTIME_DOMAIN + "';" +
+			"document.close();" +
+			"}() ) ;";
+
+	if ( FCKBrowserInfo.IsIE )
+	{
+		if ( FCKBrowserInfo.IsIE7 || !FCKBrowserInfo.IsIE6 )
+			return "" ;					// IE7+ / IE5.5
+		else
+			return "javascript: '';" ;	// IE6+
+	}
+
+	return "javascript: void(0);" ;		// All other browsers.
+}
+
+FCKTools.ResetStyles = function( element )
+{
+	element.style.cssText = 'margin:0;' +
+		'padding:0;' +
+		'border:0;' +
+		'background-color:transparent;' +
+		'background-image:none;' ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_gecko.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_gecko.js
new file mode 100644
index 000000000..242c84366
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_gecko.js
@@ -0,0 +1,282 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Utility functions. (Gecko version).
+ */
+
+FCKTools.CancelEvent = function( e )
+{
+	if ( e )
+		e.preventDefault() ;
+}
+
+FCKTools.DisableSelection = function( element )
+{
+	if ( FCKBrowserInfo.IsGecko )
+		element.style.MozUserSelect		= 'none' ;	// Gecko only.
+	else if ( FCKBrowserInfo.IsSafari )
+		element.style.KhtmlUserSelect	= 'none' ;	// WebKit only.
+	else
+		element.style.userSelect		= 'none' ;	// CSS3 (not supported yet).
+}
+
+// Appends a CSS file to a document.
+FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
+{
+	var e = documentElement.createElement( 'LINK' ) ;
+	e.rel	= 'stylesheet' ;
+	e.type	= 'text/css' ;
+	e.href	= cssFileUrl ;
+	documentElement.getElementsByTagName("HEAD")[0].appendChild( e ) ;
+	return e ;
+}
+
+// Appends a CSS style string to a document.
+FCKTools.AppendStyleString = function( documentElement, cssStyles )
+{
+	if ( !cssStyles )
+		return null ;
+
+	var e = documentElement.createElement( "STYLE" ) ;
+	e.appendChild( documentElement.createTextNode( cssStyles ) ) ;
+	documentElement.getElementsByTagName( "HEAD" )[0].appendChild( e ) ;
+	return e ;
+}
+
+// Removes all attributes and values from the element.
+FCKTools.ClearElementAttributes = function( element )
+{
+	// Loop throw all attributes in the element
+	for ( var i = 0 ; i < element.attributes.length ; i++ )
+	{
+		// Remove the element by name.
+		element.removeAttribute( element.attributes[i].name, 0 ) ;	// 0 : Case Insensitive
+	}
+}
+
+// Returns an Array of strings with all defined in the elements inside another element.
+FCKTools.GetAllChildrenIds = function( parentElement )
+{
+	// Create the array that will hold all Ids.
+	var aIds = new Array() ;
+
+	// Define a recursive function that search for the Ids.
+	var fGetIds = function( parent )
+	{
+		for ( var i = 0 ; i < parent.childNodes.length ; i++ )
+		{
+			var sId = parent.childNodes[i].id ;
+
+			// Check if the Id is defined for the element.
+			if ( sId && sId.length > 0 ) aIds[ aIds.length ] = sId ;
+
+			// Recursive call.
+			fGetIds( parent.childNodes[i] ) ;
+		}
+	}
+
+	// Start the recursive calls.
+	fGetIds( parentElement ) ;
+
+	return aIds ;
+}
+
+// Replaces a tag with its contents. For example "<span>My <b>tag</b></span>"
+// will be replaced with "My <b>tag</b>".
+FCKTools.RemoveOuterTags = function( e )
+{
+	var oFragment = e.ownerDocument.createDocumentFragment() ;
+
+	for ( var i = 0 ; i < e.childNodes.length ; i++ )
+		oFragment.appendChild( e.childNodes[i].cloneNode(true) ) ;
+
+	e.parentNode.replaceChild( oFragment, e ) ;
+}
+
+FCKTools.CreateXmlObject = function( object )
+{
+	switch ( object )
+	{
+		case 'XmlHttp' :
+			return new XMLHttpRequest() ;
+
+		case 'DOMDocument' :
+			// Originaly, we were had the following here:
+			// return document.implementation.createDocument( '', '', null ) ;
+			// But that doesn't work if we're running under domain relaxation mode, so we need a workaround.
+			// See http://ajaxian.com/archives/xml-messages-with-cross-domain-json about the trick we're using.
+			var doc = ( new DOMParser() ).parseFromString( '<tmp></tmp>', 'text/xml' ) ;
+			FCKDomTools.RemoveNode( doc.firstChild ) ;
+			return doc ;
+	}
+	return null ;
+}
+
+FCKTools.GetScrollPosition = function( relativeWindow )
+{
+	return { X : relativeWindow.pageXOffset, Y : relativeWindow.pageYOffset } ;
+}
+
+FCKTools.AddEventListener = function( sourceObject, eventName, listener )
+{
+	sourceObject.addEventListener( eventName, listener, false ) ;
+}
+
+FCKTools.RemoveEventListener = function( sourceObject, eventName, listener )
+{
+	sourceObject.removeEventListener( eventName, listener, false ) ;
+}
+
+// Listeners attached with this function cannot be detached.
+FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray )
+{
+	sourceObject.addEventListener(
+		eventName,
+		function( e )
+		{
+			listener.apply( sourceObject, [ e ].concat( paramsArray || [] ) ) ;
+		},
+		false
+	) ;
+}
+
+// Returns and object with the "Width" and "Height" properties.
+FCKTools.GetViewPaneSize = function( win )
+{
+	return { Width : win.innerWidth, Height : win.innerHeight } ;
+}
+
+FCKTools.SaveStyles = function( element )
+{
+	var data = FCKTools.ProtectFormStyles( element ) ;
+
+	var oSavedStyles = new Object() ;
+
+	if ( element.className.length > 0 )
+	{
+		oSavedStyles.Class = element.className ;
+		element.className = '' ;
+	}
+
+	var sInlineStyle = element.getAttribute( 'style' ) ;
+
+	if ( sInlineStyle && sInlineStyle.length > 0 )
+	{
+		oSavedStyles.Inline = sInlineStyle ;
+		element.setAttribute( 'style', '', 0 ) ;	// 0 : Case Insensitive
+	}
+
+	FCKTools.RestoreFormStyles( element, data ) ;
+	return oSavedStyles ;
+}
+
+FCKTools.RestoreStyles = function( element, savedStyles )
+{
+	var data = FCKTools.ProtectFormStyles( element ) ;
+	element.className = savedStyles.Class || '' ;
+
+	if ( savedStyles.Inline )
+		element.setAttribute( 'style', savedStyles.Inline, 0 ) ;	// 0 : Case Insensitive
+	else
+		element.removeAttribute( 'style', 0 ) ;
+	FCKTools.RestoreFormStyles( element, data ) ;
+}
+
+FCKTools.RegisterDollarFunction = function( targetWindow )
+{
+	targetWindow.$ = function( id )
+	{
+		return targetWindow.document.getElementById( id ) ;
+	} ;
+}
+
+FCKTools.AppendElement = function( target, elementName )
+{
+	return target.appendChild( target.ownerDocument.createElement( elementName ) ) ;
+}
+
+// Get the coordinates of an element.
+//		@el : The element to get the position.
+//		@relativeWindow: The window to which we want the coordinates relative to.
+FCKTools.GetElementPosition = function( el, relativeWindow )
+{
+	// Initializes the Coordinates object that will be returned by the function.
+	var c = { X:0, Y:0 } ;
+
+	var oWindow = relativeWindow || window ;
+
+	var oOwnerWindow = FCKTools.GetElementWindow( el ) ;
+
+	var previousElement = null ;
+	// Loop throw the offset chain.
+	while ( el )
+	{
+		var sPosition = oOwnerWindow.getComputedStyle(el, '').position ;
+
+		// Check for non "static" elements.
+		// 'FCKConfig.FloatingPanelsZIndex' -- Submenus are under a positioned IFRAME.
+		if ( sPosition && sPosition != 'static' && el.style.zIndex != FCKConfig.FloatingPanelsZIndex )
+			break ;
+
+		/*
+		FCKDebug.Output( el.tagName + ":" + "offset=" + el.offsetLeft + "," + el.offsetTop + "  "
+				+ "scroll=" + el.scrollLeft + "," + el.scrollTop ) ;
+		*/
+
+		c.X += el.offsetLeft - el.scrollLeft ;
+		c.Y += el.offsetTop - el.scrollTop  ;
+
+		// Backtrack due to offsetParent's calculation by the browser ignores scrollLeft and scrollTop.
+		// Backtracking is not needed for Opera
+		if ( ! FCKBrowserInfo.IsOpera )
+		{
+			var scrollElement = previousElement ;
+			while ( scrollElement && scrollElement != el )
+			{
+				c.X -= scrollElement.scrollLeft ;
+				c.Y -= scrollElement.scrollTop ;
+				scrollElement = scrollElement.parentNode ;
+			}
+		}
+
+		previousElement = el ;
+		if ( el.offsetParent )
+			el = el.offsetParent ;
+		else
+		{
+			if ( oOwnerWindow != oWindow )
+			{
+				el = oOwnerWindow.frameElement ;
+				previousElement = null ;
+				if ( el )
+					oOwnerWindow = FCKTools.GetElementWindow( el ) ;
+			}
+			else
+			{
+				c.X += el.scrollLeft ;
+				c.Y += el.scrollTop  ;
+				break ;
+			}
+		}
+	}
+
+	// Return the Coordinates object
+	return c ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_ie.js b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_ie.js
new file mode 100644
index 000000000..182409740
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fcktools_ie.js
@@ -0,0 +1,234 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Utility functions. (IE version).
+ */
+
+FCKTools.CancelEvent = function( e )
+{
+	return false ;
+}
+
+// Appends one or more CSS files to a document.
+FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
+{
+	return documentElement.createStyleSheet( cssFileUrl ).owningElement ;
+}
+
+// Appends a CSS style string to a document.
+FCKTools.AppendStyleString = function( documentElement, cssStyles )
+{
+	if ( !cssStyles )
+		return null ;
+
+	var s = documentElement.createStyleSheet( "" ) ;
+	s.cssText = cssStyles ;
+	return s ;
+}
+
+// Removes all attributes and values from the element.
+FCKTools.ClearElementAttributes = function( element )
+{
+	element.clearAttributes() ;
+}
+
+FCKTools.GetAllChildrenIds = function( parentElement )
+{
+	var aIds = new Array() ;
+	for ( var i = 0 ; i < parentElement.all.length ; i++ )
+	{
+		var sId = parentElement.all[i].id ;
+		if ( sId && sId.length > 0 )
+			aIds[ aIds.length ] = sId ;
+	}
+	return aIds ;
+}
+
+FCKTools.RemoveOuterTags = function( e )
+{
+	e.insertAdjacentHTML( 'beforeBegin', e.innerHTML ) ;
+	e.parentNode.removeChild( e ) ;
+}
+
+FCKTools.CreateXmlObject = function( object )
+{
+	var aObjs ;
+
+	switch ( object )
+	{
+		case 'XmlHttp' :
+			// Try the native XMLHttpRequest introduced with IE7.
+			if ( document.location.protocol != 'file:' )
+				try { return new XMLHttpRequest() ; } catch (e) {}
+
+			aObjs = [ 'MSXML2.XmlHttp', 'Microsoft.XmlHttp' ] ;
+			break ;
+
+		case 'DOMDocument' :
+			aObjs = [ 'MSXML2.DOMDocument', 'Microsoft.XmlDom' ] ;
+			break ;
+	}
+
+	for ( var i = 0 ; i < 2 ; i++ )
+	{
+		try { return new ActiveXObject( aObjs[i] ) ; }
+		catch (e)
+		{}
+	}
+
+	if ( FCKLang.NoActiveX )
+	{
+		alert( FCKLang.NoActiveX ) ;
+		FCKLang.NoActiveX = null ;
+	}
+	return null ;
+}
+
+FCKTools.DisableSelection = function( element )
+{
+	element.unselectable = 'on' ;
+
+	var e, i = 0 ;
+	// The extra () is to avoid a warning with strict error checking. This is ok.
+	while ( (e = element.all[ i++ ]) )
+	{
+		switch ( e.tagName )
+		{
+			case 'IFRAME' :
+			case 'TEXTAREA' :
+			case 'INPUT' :
+			case 'SELECT' :
+				/* Ignore the above tags */
+				break ;
+			default :
+				e.unselectable = 'on' ;
+		}
+	}
+}
+
+FCKTools.GetScrollPosition = function( relativeWindow )
+{
+	var oDoc = relativeWindow.document ;
+
+	// Try with the doc element.
+	var oPos = { X : oDoc.documentElement.scrollLeft, Y : oDoc.documentElement.scrollTop } ;
+
+	if ( oPos.X > 0 || oPos.Y > 0 )
+		return oPos ;
+
+	// If no scroll, try with the body.
+	return { X : oDoc.body.scrollLeft, Y : oDoc.body.scrollTop } ;
+}
+
+FCKTools.AddEventListener = function( sourceObject, eventName, listener )
+{
+	sourceObject.attachEvent( 'on' + eventName, listener ) ;
+}
+
+FCKTools.RemoveEventListener = function( sourceObject, eventName, listener )
+{
+	sourceObject.detachEvent( 'on' + eventName, listener ) ;
+}
+
+// Listeners attached with this function cannot be detached.
+FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray )
+{
+	// Ok... this is a closures party, but is the only way to make it clean of memory leaks.
+	var o = new Object() ;
+	o.Source = sourceObject ;
+	o.Params = paramsArray || [] ;	// Memory leak if we have DOM objects here.
+	o.Listener = function( ev )
+	{
+		return listener.apply( o.Source, [ ev ].concat( o.Params ) ) ;
+	}
+
+	if ( FCK.IECleanup )
+		FCK.IECleanup.AddItem( null, function() { o.Source = null ; o.Params = null ; } ) ;
+
+	sourceObject.attachEvent( 'on' + eventName, o.Listener ) ;
+
+	sourceObject = null ;	// Memory leak cleaner (because of the above closure).
+	paramsArray = null ;	// Memory leak cleaner (because of the above closure).
+}
+
+// Returns and object with the "Width" and "Height" properties.
+FCKTools.GetViewPaneSize = function( win )
+{
+	var oSizeSource ;
+
+	var oDoc = win.document.documentElement ;
+	if ( oDoc && oDoc.clientWidth )				// IE6 Strict Mode
+		oSizeSource = oDoc ;
+	else
+		oSizeSource = win.document.body ;		// Other IEs
+
+	if ( oSizeSource )
+		return { Width : oSizeSource.clientWidth, Height : oSizeSource.clientHeight } ;
+	else
+		return { Width : 0, Height : 0 } ;
+}
+
+FCKTools.SaveStyles = function( element )
+{
+	var data = FCKTools.ProtectFormStyles( element ) ;
+
+	var oSavedStyles = new Object() ;
+
+	if ( element.className.length > 0 )
+	{
+		oSavedStyles.Class = element.className ;
+		element.className = '' ;
+	}
+
+	var sInlineStyle = element.style.cssText ;
+
+	if ( sInlineStyle.length > 0 )
+	{
+		oSavedStyles.Inline = sInlineStyle ;
+		element.style.cssText = '' ;
+	}
+
+	FCKTools.RestoreFormStyles( element, data ) ;
+	return oSavedStyles ;
+}
+
+FCKTools.RestoreStyles = function( element, savedStyles )
+{
+	var data = FCKTools.ProtectFormStyles( element ) ;
+	element.className		= savedStyles.Class || '' ;
+	element.style.cssText	= savedStyles.Inline || '' ;
+	FCKTools.RestoreFormStyles( element, data ) ;
+}
+
+FCKTools.RegisterDollarFunction = function( targetWindow )
+{
+	targetWindow.$ = targetWindow.document.getElementById ;
+}
+
+FCKTools.AppendElement = function( target, elementName )
+{
+	return target.appendChild( this.GetElementDocument( target ).createElement( elementName ) ) ;
+}
+
+// This function may be used by Regex replacements.
+FCKTools.ToLowerCase = function( strValue )
+{
+	return strValue.toLowerCase() ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckundo.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckundo.js
new file mode 100644
index 000000000..ee52f44c6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckundo.js
@@ -0,0 +1,223 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+var FCKUndo = new Object() ;
+
+FCKUndo.SavedData = new Array() ;
+FCKUndo.CurrentIndex = -1 ;
+FCKUndo.TypesCount = 0 ;
+FCKUndo.Changed = false ;	// Is the document changed in respect to its initial image?
+FCKUndo.MaxTypes = 25 ;
+FCKUndo.Typing = false ;
+FCKUndo.SaveLocked = false ;
+
+FCKUndo._GetBookmark = function()
+{
+	FCKSelection.Restore() ;
+
+	var range = new FCKDomRange( FCK.EditorWindow ) ;
+	try
+	{
+		// There are some tricky cases where this might fail (e.g. having a lone empty table in IE)
+		range.MoveToSelection() ;
+	}
+	catch ( e )
+	{
+		return null ;
+	}
+	if ( FCKBrowserInfo.IsIE )
+	{
+		var bookmark = range.CreateBookmark() ;
+		var dirtyHtml = FCK.EditorDocument.body.innerHTML ;
+		range.MoveToBookmark( bookmark ) ;
+		return [ bookmark, dirtyHtml ] ;
+	}
+	return range.CreateBookmark2() ;
+}
+
+FCKUndo._SelectBookmark = function( bookmark )
+{
+	if ( ! bookmark )
+		return ;
+
+	var range = new FCKDomRange( FCK.EditorWindow ) ;
+	if ( bookmark instanceof Object )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			range.MoveToBookmark( bookmark[0] ) ;
+		else
+			range.MoveToBookmark2( bookmark ) ;
+		try
+		{
+			// this does not always succeed, there are still some tricky cases where it fails
+			// e.g. add a special character at end of document, undo, redo -> error
+			range.Select() ;
+		}
+		catch ( e )
+		{
+			// if select restore fails, put the caret at the end of the document
+			range.MoveToPosition( FCK.EditorDocument.body, 4 ) ;
+			range.Select() ;
+		}
+	}
+}
+
+FCKUndo._CompareCursors = function( cursor1, cursor2 )
+{
+	for ( var i = 0 ; i < Math.min( cursor1.length, cursor2.length ) ; i++ )
+	{
+		if ( cursor1[i] < cursor2[i] )
+			return -1;
+		else if (cursor1[i] > cursor2[i] )
+			return 1;
+	}
+	if ( cursor1.length < cursor2.length )
+		return -1;
+	else if (cursor1.length > cursor2.length )
+		return 1;
+	return 0;
+}
+
+FCKUndo._CheckIsBookmarksEqual = function( bookmark1, bookmark2 )
+{
+	if ( ! ( bookmark1 && bookmark2 ) )
+		return false ;
+	if ( FCKBrowserInfo.IsIE )
+	{
+		var startOffset1 = bookmark1[1].search( bookmark1[0].StartId ) ;
+		var startOffset2 = bookmark2[1].search( bookmark2[0].StartId ) ;
+		var endOffset1 = bookmark1[1].search( bookmark1[0].EndId ) ;
+		var endOffset2 = bookmark2[1].search( bookmark2[0].EndId ) ;
+		return startOffset1 == startOffset2 && endOffset1 == endOffset2 ;
+	}
+	else
+	{
+		return this._CompareCursors( bookmark1.Start, bookmark2.Start ) == 0
+			&& this._CompareCursors( bookmark1.End, bookmark2.End ) == 0 ;
+	}
+}
+
+FCKUndo.SaveUndoStep = function()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || this.SaveLocked )
+		return ;
+
+	// Assume the editor content is changed when SaveUndoStep() is called after the first time.
+	// This also enables the undo button in toolbar.
+	if ( this.SavedData.length )
+		this.Changed = true ;
+
+	// Get the HTML content.
+	var sHtml = FCK.EditorDocument.body.innerHTML ;
+	var bookmark = this._GetBookmark() ;
+
+	// Shrink the array to the current level.
+	this.SavedData = this.SavedData.slice( 0, this.CurrentIndex + 1 ) ;
+
+	// Cancel operation if the new step is identical to the previous one.
+	if ( this.CurrentIndex > 0
+			&& sHtml == this.SavedData[ this.CurrentIndex ][0]
+			&& this._CheckIsBookmarksEqual( bookmark, this.SavedData[ this.CurrentIndex ][1] ) )
+		return ;
+	// Save the selection and caret position in the first undo level for the first change.
+	else if ( this.CurrentIndex == 0 && this.SavedData.length && sHtml == this.SavedData[0][0] )
+	{
+		this.SavedData[0][1] = bookmark ;
+		return ;
+	}
+
+	// If we reach the Maximum number of undo levels, we must remove the first
+	// entry of the list shifting all elements.
+	if ( this.CurrentIndex + 1 >= FCKConfig.MaxUndoLevels )
+		this.SavedData.shift() ;
+	else
+		this.CurrentIndex++ ;
+
+	// Save the new level in front of the actual position.
+	this.SavedData[ this.CurrentIndex ] = [ sHtml, bookmark ] ;
+
+	FCK.Events.FireEvent( "OnSelectionChange" ) ;
+}
+
+FCKUndo.CheckUndoState = function()
+{
+	return ( this.Changed || this.CurrentIndex > 0 ) ;
+}
+
+FCKUndo.CheckRedoState = function()
+{
+	return ( this.CurrentIndex < ( this.SavedData.length - 1 ) ) ;
+}
+
+FCKUndo.Undo = function()
+{
+	if ( this.CheckUndoState() )
+	{
+		// If it is the first step.
+		if ( this.CurrentIndex == ( this.SavedData.length - 1 ) )
+		{
+			// Save the actual state for a possible "Redo" call.
+			this.SaveUndoStep() ;
+		}
+
+		// Go a step back.
+		this._ApplyUndoLevel( --this.CurrentIndex ) ;
+
+		FCK.Events.FireEvent( "OnSelectionChange" ) ;
+	}
+}
+
+FCKUndo.Redo = function()
+{
+	if ( this.CheckRedoState() )
+	{
+		// Go a step forward.
+		this._ApplyUndoLevel( ++this.CurrentIndex ) ;
+
+		FCK.Events.FireEvent( "OnSelectionChange" ) ;
+	}
+}
+
+FCKUndo._ApplyUndoLevel = function( level )
+{
+	var oData = this.SavedData[ level ] ;
+
+	if ( !oData )
+		return ;
+
+	// Update the editor contents with that step data.
+	if ( FCKBrowserInfo.IsIE )
+	{
+		if ( oData[1] && oData[1][1] )
+			FCK.SetInnerHtml( oData[1][1] ) ;
+		else
+			FCK.SetInnerHtml( oData[0] ) ;
+	}
+	else
+		FCK.EditorDocument.body.innerHTML = oData[0] ;
+
+	// Restore the selection
+	this._SelectBookmark( oData[1] ) ;
+
+	this.TypesCount = 0 ;
+	this.Changed = false ;
+	this.Typing = false ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckurlparams.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckurlparams.js
new file mode 100644
index 000000000..911843958
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckurlparams.js
@@ -0,0 +1,39 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKURLParams object that is used to get all parameters
+ * passed by the URL QueryString (after the "?").
+ */
+
+// #### URLParams: holds all URL passed parameters (like ?Param1=Value1&Param2=Value2)
+var FCKURLParams = new Object() ;
+
+(function()
+{
+	var aParams = document.location.search.substr(1).split('&') ;
+	for ( var i = 0 ; i < aParams.length ; i++ )
+	{
+		var aParam = aParams[i].split('=') ;
+		var sParamName  = decodeURIComponent( aParam[0] ) ;
+		var sParamValue = decodeURIComponent( aParam[1] ) ;
+
+		FCKURLParams[ sParamName ] = sParamValue ;
+	}
+})();
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml.js
new file mode 100644
index 000000000..2b0dbd26e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml.js
@@ -0,0 +1,534 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKXHtml object, responsible for the XHTML operations.
+ */
+
+var FCKXHtml = new Object() ;
+
+FCKXHtml.CurrentJobNum = 0 ;
+
+FCKXHtml.GetXHTML = function( node, includeNode, format )
+{
+	FCKDomTools.CheckAndRemovePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ;
+	FCKXHtmlEntities.Initialize() ;
+
+	// Set the correct entity to use for empty blocks.
+	this._NbspEntity = ( FCKConfig.ProcessHTMLEntities? 'nbsp' : '#160' ) ;
+
+	// Save the current IsDirty state. The XHTML processor may change the
+	// original HTML, dirtying it.
+	var bIsDirty = FCK.IsDirty() ;
+
+	// Special blocks are blocks of content that remain untouched during the
+	// process. It is used for SCRIPTs and STYLEs.
+	FCKXHtml.SpecialBlocks = new Array() ;
+
+	// Create the XML DOMDocument object.
+	this.XML = FCKTools.CreateXmlObject( 'DOMDocument' ) ;
+
+	// Add a root element that holds all child nodes.
+	this.MainNode = this.XML.appendChild( this.XML.createElement( 'xhtml' ) ) ;
+
+	FCKXHtml.CurrentJobNum++ ;
+
+//	var dTimer = new Date() ;
+
+	if ( includeNode )
+		this._AppendNode( this.MainNode, node ) ;
+	else
+		this._AppendChildNodes( this.MainNode, node, false ) ;
+
+	// Get the resulting XHTML as a string.
+	var sXHTML = this._GetMainXmlString() ;
+
+//	alert( 'Time: ' + ( ( ( new Date() ) - dTimer ) ) + ' ms' ) ;
+
+	this.XML = null ;
+
+	// Safari adds xmlns="http://www.w3.org/1999/xhtml" to the root node (#963)
+	if ( FCKBrowserInfo.IsSafari )
+		sXHTML = sXHTML.replace( /^<xhtml.*?>/, '<xhtml>' ) ;
+
+	// Strip the "XHTML" root node.
+	sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ;
+
+	// According to the doctype set the proper end for self-closing tags
+	// HTML: <br>
+	// XHTML: Add a space, like <br/> -> <br />
+	if (FCKConfig.DocType.length > 0 && FCKRegexLib.HtmlDocType.test( FCKConfig.DocType ) )
+		sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, '>');
+	else
+		sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
+
+	if ( FCKConfig.ForceSimpleAmpersand )
+		sXHTML = sXHTML.replace( FCKRegexLib.ForceSimpleAmpersand, '&' ) ;
+
+	if ( format )
+		sXHTML = FCKCodeFormatter.Format( sXHTML ) ;
+
+	// Now we put back the SpecialBlocks contents.
+	for ( var i = 0 ; i < FCKXHtml.SpecialBlocks.length ; i++ )
+	{
+		var oRegex = new RegExp( '___FCKsi___' + i ) ;
+		sXHTML = sXHTML.replace( oRegex, FCKXHtml.SpecialBlocks[i] ) ;
+	}
+
+	// Replace entities marker with the ampersand.
+	sXHTML = sXHTML.replace( FCKRegexLib.GeckoEntitiesMarker, '&' ) ;
+
+	// Restore the IsDirty state if it was not dirty.
+	if ( !bIsDirty )
+		FCK.ResetIsDirty() ;
+
+	FCKDomTools.EnforcePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ;
+	return sXHTML ;
+}
+
+FCKXHtml._AppendAttribute = function( xmlNode, attributeName, attributeValue )
+{
+	try
+	{
+		if ( attributeValue == undefined || attributeValue == null )
+			attributeValue = '' ;
+		else if ( attributeValue.replace )
+		{
+			if ( FCKConfig.ForceSimpleAmpersand )
+				attributeValue = attributeValue.replace( /&/g, '___FCKAmp___' ) ;
+
+			// Entities must be replaced in the attribute values.
+			attributeValue = attributeValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ;
+		}
+
+		// Create the attribute.
+		var oXmlAtt = this.XML.createAttribute( attributeName ) ;
+		oXmlAtt.value = attributeValue ;
+
+		// Set the attribute in the node.
+		xmlNode.attributes.setNamedItem( oXmlAtt ) ;
+	}
+	catch (e)
+	{}
+}
+
+FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement )
+{
+	var oNode = htmlNode.firstChild ;
+
+	while ( oNode )
+	{
+		this._AppendNode( xmlNode, oNode ) ;
+		oNode = oNode.nextSibling ;
+	}
+
+	// Trim block elements. This is also needed to avoid Firefox leaving extra
+	// BRs at the end of them.
+	if ( isBlockElement && htmlNode.tagName && htmlNode.tagName.toLowerCase() != 'pre' )
+	{
+		FCKDomTools.TrimNode( xmlNode ) ;
+
+		if ( FCKConfig.FillEmptyBlocks )
+		{
+			var lastChild = xmlNode.lastChild ;
+			if ( lastChild && lastChild.nodeType == 1 && lastChild.nodeName == 'br' )
+				this._AppendEntity( xmlNode, this._NbspEntity ) ;
+		}
+	}
+
+	// If the resulting node is empty.
+	if ( xmlNode.childNodes.length == 0 )
+	{
+		if ( isBlockElement && FCKConfig.FillEmptyBlocks )
+		{
+			this._AppendEntity( xmlNode, this._NbspEntity ) ;
+			return xmlNode ;
+		}
+
+		var sNodeName = xmlNode.nodeName ;
+
+		// Some inline elements are required to have something inside (span, strong, etc...).
+		if ( FCKListsLib.InlineChildReqElements[ sNodeName ] )
+			return null ;
+
+		// We can't use short representation of empty elements that are not marked
+		// as empty in th XHTML DTD.
+		if ( !FCKListsLib.EmptyElements[ sNodeName ] )
+			xmlNode.appendChild( this.XML.createTextNode('') ) ;
+	}
+
+	return xmlNode ;
+}
+
+FCKXHtml._AppendNode = function( xmlNode, htmlNode )
+{
+	if ( !htmlNode )
+		return false ;
+
+	switch ( htmlNode.nodeType )
+	{
+		// Element Node.
+		case 1 :
+			// If we detect a <br> inside a <pre> in Gecko, turn it into a line break instead.
+			// This is a workaround for the Gecko bug here: https://bugzilla.mozilla.org/show_bug.cgi?id=92921
+			if ( FCKBrowserInfo.IsGecko
+					&& htmlNode.tagName.toLowerCase() == 'br'
+					&& htmlNode.parentNode.tagName.toLowerCase() == 'pre' )
+			{
+				var val = '\r' ;
+				if ( htmlNode == htmlNode.parentNode.firstChild )
+					val += '\r' ;
+				return FCKXHtml._AppendNode( xmlNode, this.XML.createTextNode( val ) ) ;
+			}
+
+			// Here we found an element that is not the real element, but a
+			// fake one (like the Flash placeholder image), so we must get the real one.
+			if ( htmlNode.getAttribute('_fckfakelement') )
+				return FCKXHtml._AppendNode( xmlNode, FCK.GetRealElement( htmlNode ) ) ;
+
+			// Ignore bogus BR nodes in the DOM.
+			if ( FCKBrowserInfo.IsGecko &&
+					( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) )
+			{
+				if ( htmlNode.nextSibling )
+					return false ;
+				else
+				{
+					htmlNode.removeAttribute( '_moz_editor_bogus_node' ) ;
+					htmlNode.removeAttribute( 'type' ) ;
+				}
+			}
+
+			// This is for elements that are instrumental to FCKeditor and
+			// must be removed from the final HTML.
+			if ( htmlNode.getAttribute('_fcktemp') )
+				return false ;
+
+			// Get the element name.
+			var sNodeName = htmlNode.tagName.toLowerCase()  ;
+
+			if ( FCKBrowserInfo.IsIE )
+			{
+				// IE doens't include the scope name in the nodeName. So, add the namespace.
+				if ( htmlNode.scopeName && htmlNode.scopeName != 'HTML' && htmlNode.scopeName != 'FCK' )
+					sNodeName = htmlNode.scopeName.toLowerCase() + ':' + sNodeName ;
+			}
+			else
+			{
+				if ( sNodeName.StartsWith( 'fck:' ) )
+					sNodeName = sNodeName.Remove( 0,4 ) ;
+			}
+
+			// Check if the node name is valid, otherwise ignore this tag.
+			// If the nodeName starts with a slash, it is a orphan closing tag.
+			// On some strange cases, the nodeName is empty, even if the node exists.
+			if ( !FCKRegexLib.ElementName.test( sNodeName ) )
+				return false ;
+
+			// The already processed nodes must be marked to avoid then to be duplicated (bad formatted HTML).
+			// So here, the "mark" is checked... if the element is Ok, then mark it.
+			if ( htmlNode._fckxhtmljob && htmlNode._fckxhtmljob == FCKXHtml.CurrentJobNum )
+				return false ;
+
+			var oNode = this.XML.createElement( sNodeName ) ;
+
+			// Add all attributes.
+			FCKXHtml._AppendAttributes( xmlNode, htmlNode, oNode, sNodeName ) ;
+
+			htmlNode._fckxhtmljob = FCKXHtml.CurrentJobNum ;
+
+			// Tag specific processing.
+			var oTagProcessor = FCKXHtml.TagProcessors[ sNodeName ] ;
+
+			if ( oTagProcessor )
+				oNode = oTagProcessor( oNode, htmlNode, xmlNode ) ;
+			else
+				oNode = this._AppendChildNodes( oNode, htmlNode, Boolean( FCKListsLib.NonEmptyBlockElements[ sNodeName ] ) ) ;
+
+			if ( !oNode )
+				return false ;
+
+			xmlNode.appendChild( oNode ) ;
+
+			break ;
+
+		// Text Node.
+		case 3 :
+			if ( htmlNode.parentNode && htmlNode.parentNode.nodeName.IEquals( 'pre' ) )
+				return this._AppendTextNode( xmlNode, htmlNode.nodeValue ) ;
+			return this._AppendTextNode( xmlNode, htmlNode.nodeValue.ReplaceNewLineChars(' ') ) ;
+
+		// Comment
+		case 8 :
+			// IE catches the <!DOTYPE ... > as a comment, but it has no
+			// innerHTML, so we can catch it, and ignore it.
+			if ( FCKBrowserInfo.IsIE && !htmlNode.innerHTML )
+				break ;
+
+			try { xmlNode.appendChild( this.XML.createComment( htmlNode.nodeValue ) ) ; }
+			catch (e) { /* Do nothing... probably this is a wrong format comment. */ }
+			break ;
+
+		// Unknown Node type.
+		default :
+			xmlNode.appendChild( this.XML.createComment( "Element not supported - Type: " + htmlNode.nodeType + " Name: " + htmlNode.nodeName ) ) ;
+			break ;
+	}
+	return true ;
+}
+
+// Append an item to the SpecialBlocks array and returns the tag to be used.
+FCKXHtml._AppendSpecialItem = function( item )
+{
+	return '___FCKsi___' + FCKXHtml.SpecialBlocks.AddItem( item ) ;
+}
+
+FCKXHtml._AppendEntity = function( xmlNode, entity )
+{
+	xmlNode.appendChild( this.XML.createTextNode( '#?-:' + entity + ';' ) ) ;
+}
+
+FCKXHtml._AppendTextNode = function( targetNode, textValue )
+{
+	var bHadText = textValue.length > 0 ;
+	if ( bHadText )
+		targetNode.appendChild( this.XML.createTextNode( textValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ) ) ;
+	return bHadText ;
+}
+
+// Retrieves a entity (internal format) for a given character.
+function FCKXHtml_GetEntity( character )
+{
+	// We cannot simply place the entities in the text, because the XML parser
+	// will translate & to &amp;. So we use a temporary marker which is replaced
+	// in the end of the processing.
+	var sEntity = FCKXHtmlEntities.Entities[ character ] || ( '#' + character.charCodeAt(0) ) ;
+	return '#?-:' + sEntity + ';' ;
+}
+
+// An object that hold tag specific operations.
+FCKXHtml.TagProcessors =
+{
+	a : function( node, htmlNode )
+	{
+		// Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878).
+		if ( htmlNode.innerHTML.Trim().length == 0 && !htmlNode.name )
+			return false ;
+
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
+
+
+		// Anchors with content has been marked with an additional class, now we must remove it.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			// Buggy IE, doesn't copy the name of changed anchors.
+			if ( htmlNode.name )
+				FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+		}
+
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+
+		return node ;
+	},
+
+	area : function( node, htmlNode )
+	{
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
+
+		// IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			if ( ! node.attributes.getNamedItem( 'coords' ) )
+			{
+				var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
+				if ( sCoords && sCoords != '0,0,0' )
+					FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
+			}
+
+			if ( ! node.attributes.getNamedItem( 'shape' ) )
+			{
+				var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
+				if ( sShape && sShape.length > 0 )
+					FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
+			}
+		}
+
+		return node ;
+	},
+
+	body : function( node, htmlNode )
+	{
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+		// Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351).
+		node.removeAttribute( 'spellcheck' ) ;
+		return node ;
+	},
+
+	// IE loses contents of iframes, and Gecko does give it back HtmlEncoded
+	// Note: Opera does lose the content and doesn't provide it in the innerHTML string
+	iframe : function( node, htmlNode )
+	{
+		var sHtml = htmlNode.innerHTML ;
+
+		// Gecko does give back the encoded html
+		if ( FCKBrowserInfo.IsGecko )
+			sHtml = FCKTools.HTMLDecode( sHtml );
+
+		// Remove the saved urls here as the data won't be processed as nodes
+		sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ;
+
+		return node ;
+	},
+
+	img : function( node, htmlNode )
+	{
+		// The "ALT" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'alt' ) )
+			FCKXHtml._AppendAttribute( node, 'alt', '' ) ;
+
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ;
+
+		// Bug #768 : If the width and height are defined inline CSS,
+		// don't define it again in the HTML attributes.
+		if ( htmlNode.style.width )
+			node.removeAttribute( 'width' ) ;
+		if ( htmlNode.style.height )
+			node.removeAttribute( 'height' ) ;
+
+		return node ;
+	},
+
+	// Fix orphaned <li> nodes (Bug #503).
+	li : function( node, htmlNode, targetNode )
+	{
+		// If the XML parent node is already a <ul> or <ol>, then add the <li> as usual.
+		if ( targetNode.nodeName.IEquals( ['ul', 'ol'] ) )
+			return FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+		var newTarget = FCKXHtml.XML.createElement( 'ul' ) ;
+
+		// Reset the _fckxhtmljob so the HTML node is processed again.
+		htmlNode._fckxhtmljob = null ;
+
+		// Loop through all sibling LIs, adding them to the <ul>.
+		do
+		{
+			FCKXHtml._AppendNode( newTarget, htmlNode ) ;
+
+			// Look for the next element following this <li>.
+			do
+			{
+				htmlNode = FCKDomTools.GetNextSibling( htmlNode ) ;
+
+			} while ( htmlNode && htmlNode.nodeType == 3 && htmlNode.nodeValue.Trim().length == 0 )
+
+		}	while ( htmlNode && htmlNode.nodeName.toLowerCase() == 'li' )
+
+		return newTarget ;
+	},
+
+	// Fix nested <ul> and <ol>.
+	ol : function( node, htmlNode, targetNode )
+	{
+		if ( htmlNode.innerHTML.Trim().length == 0 )
+			return false ;
+
+		var ePSibling = targetNode.lastChild ;
+
+		if ( ePSibling && ePSibling.nodeType == 3 )
+			ePSibling = ePSibling.previousSibling ;
+
+		if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' )
+		{
+			htmlNode._fckxhtmljob = null ;
+			FCKXHtml._AppendNode( ePSibling, htmlNode ) ;
+			return false ;
+		}
+
+		node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+		return node ;
+	},
+
+	pre : function ( node, htmlNode )
+	{
+		var firstChild = htmlNode.firstChild ;
+
+		if ( firstChild && firstChild.nodeType == 3 )
+			node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
+
+		FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+		return node ;
+	},
+
+	script : function( node, htmlNode )
+	{
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/javascript' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( htmlNode.text ) ) ) ;
+
+		return node ;
+	},
+
+	span : function( node, htmlNode )
+	{
+		// Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1084404).
+		if ( htmlNode.innerHTML.length == 0 )
+			return false ;
+
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+
+		return node ;
+	},
+
+	style : function( node, htmlNode )
+	{
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/css' ) ;
+
+		var cssText = htmlNode.innerHTML ;
+		if ( FCKBrowserInfo.IsIE )	// Bug #403 : IE always appends a \r\n to the beginning of StyleNode.innerHTML
+			cssText = cssText.replace( /^(\r\n|\n|\r)/, '' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( cssText ) ) ) ;
+
+		return node ;
+	},
+
+	title : function( node, htmlNode )
+	{
+		node.appendChild( FCKXHtml.XML.createTextNode( FCK.EditorDocument.title ) ) ;
+
+		return node ;
+	}
+} ;
+
+FCKXHtml.TagProcessors.ul = FCKXHtml.TagProcessors.ol ;
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_gecko.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_gecko.js
new file mode 100644
index 000000000..a3fb91389
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_gecko.js
@@ -0,0 +1,114 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKXHtml object, responsible for the XHTML operations.
+ * Gecko specific.
+ */
+
+FCKXHtml._GetMainXmlString = function()
+{
+	return ( new XMLSerializer() ).serializeToString( this.MainNode ) ;
+}
+
+FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node )
+{
+	var aAttributes = htmlNode.attributes ;
+
+	for ( var n = 0 ; n < aAttributes.length ; n++ )
+	{
+		var oAttribute = aAttributes[n] ;
+
+		if ( oAttribute.specified )
+		{
+			var sAttName = oAttribute.nodeName.toLowerCase() ;
+			var sAttValue ;
+
+			// Ignore any attribute starting with "_fck".
+			if ( sAttName.StartsWith( '_fck' ) )
+				continue ;
+			// There is a bug in Mozilla that returns '_moz_xxx' attributes as specified.
+			else if ( sAttName.indexOf( '_moz' ) == 0 )
+				continue ;
+			// There are one cases (on Gecko) when the oAttribute.nodeValue must be used:
+			//		- for the "class" attribute
+			else if ( sAttName == 'class' )
+			{
+				sAttValue = oAttribute.nodeValue.replace( FCKRegexLib.FCK_Class, '' ) ;
+				if ( sAttValue.length == 0 )
+					continue ;
+			}
+			// XHTML doens't support attribute minimization like "CHECKED". It must be transformed to checked="checked".
+			else if ( oAttribute.nodeValue === true )
+				sAttValue = sAttName ;
+			else
+				sAttValue = htmlNode.getAttribute( sAttName, 2 ) ;	// We must use getAttribute to get it exactly as it is defined.
+
+			this._AppendAttribute( node, sAttName, sAttValue ) ;
+		}
+	}
+}
+
+if ( FCKBrowserInfo.IsOpera )
+{
+	// Opera moves the <FCK:meta> element outside head (#1166).
+
+	// Save a reference to the XML <head> node, so we can use it for
+	// orphan <meta>s.
+	FCKXHtml.TagProcessors['head'] = function( node, htmlNode )
+	{
+		FCKXHtml.XML._HeadElement = node ;
+
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+		return node ;
+	}
+
+	// Check whether a <meta> element is outside <head>, and move it to the
+	// proper place.
+	FCKXHtml.TagProcessors['meta'] = function( node, htmlNode, xmlNode )
+	{
+		if ( htmlNode.parentNode.nodeName.toLowerCase() != 'head' )
+		{
+			var headElement = FCKXHtml.XML._HeadElement ;
+
+			if ( headElement && xmlNode != headElement )
+			{
+				delete htmlNode._fckxhtmljob ;
+				FCKXHtml._AppendNode( headElement, htmlNode ) ;
+				return null ;
+			}
+		}
+
+		return node ;
+	}
+}
+
+if ( FCKBrowserInfo.IsGecko )
+{
+	// #2162, some Firefox extensions might add references to internal links
+	FCKXHtml.TagProcessors['link'] = function( node, htmlNode )
+	{
+		if ( htmlNode.href.substr(0, 9).toLowerCase() == 'chrome://' )
+			return false ;
+
+		return node ;
+	}
+
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_ie.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_ie.js
new file mode 100644
index 000000000..10668802b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtml_ie.js
@@ -0,0 +1,213 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Defines the FCKXHtml object, responsible for the XHTML operations.
+ * IE specific.
+ */
+
+FCKXHtml._GetMainXmlString = function()
+{
+	return this.MainNode.xml ;
+}
+
+FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node, nodeName )
+{
+	var aAttributes = htmlNode.attributes,
+		bHasStyle ;
+
+	for ( var n = 0 ; n < aAttributes.length ; n++ )
+	{
+		var oAttribute = aAttributes[n] ;
+
+		if ( oAttribute.specified )
+		{
+			var sAttName = oAttribute.nodeName.toLowerCase() ;
+			var sAttValue ;
+
+			// Ignore any attribute starting with "_fck".
+			if ( sAttName.StartsWith( '_fck' ) )
+				continue ;
+			// The following must be done because of a bug on IE regarding the style
+			// attribute. It returns "null" for the nodeValue.
+			else if ( sAttName == 'style' )
+			{
+				// Just mark it to do it later in this function.
+				bHasStyle = true ;
+				continue ;
+			}
+			// There are two cases when the oAttribute.nodeValue must be used:
+			//		- for the "class" attribute
+			//		- for events attributes (on IE only).
+			else if ( sAttName == 'class' )
+			{
+				sAttValue = oAttribute.nodeValue.replace( FCKRegexLib.FCK_Class, '' ) ;
+				if ( sAttValue.length == 0 )
+					continue ;
+			}
+			else if ( sAttName.indexOf('on') == 0 )
+				sAttValue = oAttribute.nodeValue ;
+			else if ( nodeName == 'body' && sAttName == 'contenteditable' )
+				continue ;
+			// XHTML doens't support attribute minimization like "CHECKED". It must be transformed to checked="checked".
+			else if ( oAttribute.nodeValue === true )
+				sAttValue = sAttName ;
+			else
+			{
+				// We must use getAttribute to get it exactly as it is defined.
+				// There are some rare cases that IE throws an error here, so we must try/catch.
+				try
+				{
+					sAttValue = htmlNode.getAttribute( sAttName, 2 ) ;
+				}
+				catch (e) {}
+			}
+			this._AppendAttribute( node, sAttName, sAttValue || oAttribute.nodeValue ) ;
+		}
+	}
+
+	// IE loses the style attribute in JavaScript-created elements tags. (#2390)
+	if ( bHasStyle || htmlNode.style.cssText.length > 0 )
+	{
+		var data = FCKTools.ProtectFormStyles( htmlNode ) ;
+		var sStyleValue = htmlNode.style.cssText.replace( FCKRegexLib.StyleProperties, FCKTools.ToLowerCase ) ;
+		FCKTools.RestoreFormStyles( htmlNode, data ) ;
+		this._AppendAttribute( node, 'style', sStyleValue ) ;
+	}
+}
+
+// On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
+FCKXHtml.TagProcessors['div'] = function( node, htmlNode )
+{
+	if ( htmlNode.align.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+	return node ;
+}
+
+// IE automatically changes <FONT> tags to <FONT size=+0>.
+FCKXHtml.TagProcessors['font'] = function( node, htmlNode )
+{
+	if ( node.attributes.length == 0 )
+		node = FCKXHtml.XML.createDocumentFragment() ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
+
+FCKXHtml.TagProcessors['form'] = function( node, htmlNode )
+{
+	if ( htmlNode.acceptCharset && htmlNode.acceptCharset.length > 0 && htmlNode.acceptCharset != 'UNKNOWN' )
+		FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ;
+
+	// IE has a bug and htmlNode.attributes['name'].specified=false if there is
+	// no element with id="name" inside the form (#360 and SF-BUG-1155726).
+	var nameAtt = htmlNode.attributes['name'] ;
+
+	if ( nameAtt && nameAtt.value.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'name', nameAtt.value ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+	return node ;
+}
+
+// IE doens't see the value attribute as an attribute for the <INPUT> tag.
+FCKXHtml.TagProcessors['input'] = function( node, htmlNode )
+{
+	if ( htmlNode.name )
+		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+
+	if ( htmlNode.value && !node.attributes.getNamedItem( 'value' ) )
+		FCKXHtml._AppendAttribute( node, 'value', htmlNode.value ) ;
+
+	if ( !node.attributes.getNamedItem( 'type' ) )
+		FCKXHtml._AppendAttribute( node, 'type', 'text' ) ;
+
+	return node ;
+}
+
+FCKXHtml.TagProcessors['label'] = function( node, htmlNode )
+{
+	if ( htmlNode.htmlFor.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'for', htmlNode.htmlFor ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
+
+// Fix behavior for IE, it doesn't read back the .name on newly created maps
+FCKXHtml.TagProcessors['map'] = function( node, htmlNode )
+{
+	if ( ! node.attributes.getNamedItem( 'name' ) )
+	{
+		var name = htmlNode.name ;
+		if ( name )
+			FCKXHtml._AppendAttribute( node, 'name', name ) ;
+	}
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+	return node ;
+}
+
+FCKXHtml.TagProcessors['meta'] = function( node, htmlNode )
+{
+	var oHttpEquiv = node.attributes.getNamedItem( 'http-equiv' ) ;
+
+	if ( oHttpEquiv == null || oHttpEquiv.value.length == 0 )
+	{
+		// Get the http-equiv value from the outerHTML.
+		var sHttpEquiv = htmlNode.outerHTML.match( FCKRegexLib.MetaHttpEquiv ) ;
+
+		if ( sHttpEquiv )
+		{
+			sHttpEquiv = sHttpEquiv[1] ;
+			FCKXHtml._AppendAttribute( node, 'http-equiv', sHttpEquiv ) ;
+		}
+	}
+
+	return node ;
+}
+
+// IE ignores the "SELECTED" attribute so we must add it manually.
+FCKXHtml.TagProcessors['option'] = function( node, htmlNode )
+{
+	if ( htmlNode.selected && !node.attributes.getNamedItem( 'selected' ) )
+		FCKXHtml._AppendAttribute( node, 'selected', 'selected' ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
+
+// IE doens't hold the name attribute as an attribute for the <TEXTAREA> and <SELECT> tags.
+FCKXHtml.TagProcessors['textarea'] = FCKXHtml.TagProcessors['select'] = function( node, htmlNode )
+{
+	if ( htmlNode.name )
+		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtmlentities.js b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtmlentities.js
new file mode 100644
index 000000000..7e2e7134f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/_source/internals/fckxhtmlentities.js
@@ -0,0 +1,354 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This file define the HTML entities handled by the editor.
+ */
+
+var FCKXHtmlEntities = new Object() ;
+
+FCKXHtmlEntities.Initialize = function()
+{
+	if ( FCKXHtmlEntities.Entities )
+		return ;
+
+	var sChars = '' ;
+	var oEntities, e ;
+
+	if ( FCKConfig.ProcessHTMLEntities )
+	{
+		FCKXHtmlEntities.Entities = {
+			// Latin-1 Entities
+			' ':'nbsp',
+			'¡':'iexcl',
+			'¢':'cent',
+			'£':'pound',
+			'¤':'curren',
+			'¥':'yen',
+			'¦':'brvbar',
+			'§':'sect',
+			'¨':'uml',
+			'©':'copy',
+			'ª':'ordf',
+			'«':'laquo',
+			'¬':'not',
+			'­':'shy',
+			'®':'reg',
+			'¯':'macr',
+			'°':'deg',
+			'±':'plusmn',
+			'²':'sup2',
+			'³':'sup3',
+			'´':'acute',
+			'µ':'micro',
+			'¶':'para',
+			'·':'middot',
+			'¸':'cedil',
+			'¹':'sup1',
+			'º':'ordm',
+			'»':'raquo',
+			'¼':'frac14',
+			'½':'frac12',
+			'¾':'frac34',
+			'¿':'iquest',
+			'×':'times',
+			'÷':'divide',
+
+			// Symbols
+
+			'ƒ':'fnof',
+			'•':'bull',
+			'…':'hellip',
+			'′':'prime',
+			'″':'Prime',
+			'‾':'oline',
+			'⁄':'frasl',
+			'℘':'weierp',
+			'ℑ':'image',
+			'ℜ':'real',
+			'™':'trade',
+			'ℵ':'alefsym',
+			'←':'larr',
+			'↑':'uarr',
+			'→':'rarr',
+			'↓':'darr',
+			'↔':'harr',
+			'↵':'crarr',
+			'⇐':'lArr',
+			'⇑':'uArr',
+			'⇒':'rArr',
+			'⇓':'dArr',
+			'⇔':'hArr',
+			'∀':'forall',
+			'∂':'part',
+			'∃':'exist',
+			'∅':'empty',
+			'∇':'nabla',
+			'∈':'isin',
+			'∉':'notin',
+			'∋':'ni',
+			'∏':'prod',
+			'∑':'sum',
+			'−':'minus',
+			'∗':'lowast',
+			'√':'radic',
+			'∝':'prop',
+			'∞':'infin',
+			'∠':'ang',
+			'∧':'and',
+			'∨':'or',
+			'∩':'cap',
+			'∪':'cup',
+			'∫':'int',
+			'∴':'there4',
+			'∼':'sim',
+			'≅':'cong',
+			'≈':'asymp',
+			'≠':'ne',
+			'≡':'equiv',
+			'≤':'le',
+			'≥':'ge',
+			'⊂':'sub',
+			'⊃':'sup',
+			'⊄':'nsub',
+			'⊆':'sube',
+			'⊇':'supe',
+			'⊕':'oplus',
+			'⊗':'otimes',
+			'⊥':'perp',
+			'⋅':'sdot',
+			'\u2308':'lceil',
+			'\u2309':'rceil',
+			'\u230a':'lfloor',
+			'\u230b':'rfloor',
+			'\u2329':'lang',
+			'\u232a':'rang',
+			'◊':'loz',
+			'♠':'spades',
+			'♣':'clubs',
+			'♥':'hearts',
+			'♦':'diams',
+
+			// Other Special Characters
+
+			'"':'quot',
+		//	'&':'amp',		// This entity is automatically handled by the XHTML parser.
+		//	'<':'lt',		// This entity is automatically handled by the XHTML parser.
+		//	'>':'gt',		// This entity is automatically handled by the XHTML parser.
+			'ˆ':'circ',
+			'˜':'tilde',
+			' ':'ensp',
+			' ':'emsp',
+			' ':'thinsp',
+			'‌':'zwnj',
+			'‍':'zwj',
+			'‎':'lrm',
+			'‏':'rlm',
+			'–':'ndash',
+			'—':'mdash',
+			'‘':'lsquo',
+			'’':'rsquo',
+			'‚':'sbquo',
+			'“':'ldquo',
+			'”':'rdquo',
+			'„':'bdquo',
+			'†':'dagger',
+			'‡':'Dagger',
+			'‰':'permil',
+			'‹':'lsaquo',
+			'›':'rsaquo',
+			'€':'euro'
+		} ;
+
+		// Process Base Entities.
+		for ( e in FCKXHtmlEntities.Entities )
+			sChars += e ;
+
+		// Include Latin Letters Entities.
+		if ( FCKConfig.IncludeLatinEntities )
+		{
+			oEntities = {
+				'À':'Agrave',
+				'Á':'Aacute',
+				'Â':'Acirc',
+				'Ã':'Atilde',
+				'Ä':'Auml',
+				'Å':'Aring',
+				'Æ':'AElig',
+				'Ç':'Ccedil',
+				'È':'Egrave',
+				'É':'Eacute',
+				'Ê':'Ecirc',
+				'Ë':'Euml',
+				'Ì':'Igrave',
+				'Í':'Iacute',
+				'Î':'Icirc',
+				'Ï':'Iuml',
+				'Ð':'ETH',
+				'Ñ':'Ntilde',
+				'Ò':'Ograve',
+				'Ó':'Oacute',
+				'Ô':'Ocirc',
+				'Õ':'Otilde',
+				'Ö':'Ouml',
+				'Ø':'Oslash',
+				'Ù':'Ugrave',
+				'Ú':'Uacute',
+				'Û':'Ucirc',
+				'Ü':'Uuml',
+				'Ý':'Yacute',
+				'Þ':'THORN',
+				'ß':'szlig',
+				'à':'agrave',
+				'á':'aacute',
+				'â':'acirc',
+				'ã':'atilde',
+				'ä':'auml',
+				'å':'aring',
+				'æ':'aelig',
+				'ç':'ccedil',
+				'è':'egrave',
+				'é':'eacute',
+				'ê':'ecirc',
+				'ë':'euml',
+				'ì':'igrave',
+				'í':'iacute',
+				'î':'icirc',
+				'ï':'iuml',
+				'ð':'eth',
+				'ñ':'ntilde',
+				'ò':'ograve',
+				'ó':'oacute',
+				'ô':'ocirc',
+				'õ':'otilde',
+				'ö':'ouml',
+				'ø':'oslash',
+				'ù':'ugrave',
+				'ú':'uacute',
+				'û':'ucirc',
+				'ü':'uuml',
+				'ý':'yacute',
+				'þ':'thorn',
+				'ÿ':'yuml',
+				'Œ':'OElig',
+				'œ':'oelig',
+				'Š':'Scaron',
+				'š':'scaron',
+				'Ÿ':'Yuml'
+			} ;
+
+			for ( e in oEntities )
+			{
+				FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ;
+				sChars += e ;
+			}
+
+			oEntities = null ;
+		}
+
+		// Include Greek Letters Entities.
+		if ( FCKConfig.IncludeGreekEntities )
+		{
+			oEntities = {
+				'Α':'Alpha',
+				'Β':'Beta',
+				'Γ':'Gamma',
+				'Δ':'Delta',
+				'Ε':'Epsilon',
+				'Ζ':'Zeta',
+				'Η':'Eta',
+				'Θ':'Theta',
+				'Ι':'Iota',
+				'Κ':'Kappa',
+				'Λ':'Lambda',
+				'Μ':'Mu',
+				'Ν':'Nu',
+				'Ξ':'Xi',
+				'Ο':'Omicron',
+				'Π':'Pi',
+				'Ρ':'Rho',
+				'Σ':'Sigma',
+				'Τ':'Tau',
+				'Υ':'Upsilon',
+				'Φ':'Phi',
+				'Χ':'Chi',
+				'Ψ':'Psi',
+				'Ω':'Omega',
+				'α':'alpha',
+				'β':'beta',
+				'γ':'gamma',
+				'δ':'delta',
+				'ε':'epsilon',
+				'ζ':'zeta',
+				'η':'eta',
+				'θ':'theta',
+				'ι':'iota',
+				'κ':'kappa',
+				'λ':'lambda',
+				'μ':'mu',
+				'ν':'nu',
+				'ξ':'xi',
+				'ο':'omicron',
+				'π':'pi',
+				'ρ':'rho',
+				'ς':'sigmaf',
+				'σ':'sigma',
+				'τ':'tau',
+				'υ':'upsilon',
+				'φ':'phi',
+				'χ':'chi',
+				'ψ':'psi',
+				'ω':'omega',
+				'\u03d1':'thetasym',
+				'\u03d2':'upsih',
+				'\u03d6':'piv'
+			} ;
+
+			for ( e in oEntities )
+			{
+				FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ;
+				sChars += e ;
+			}
+
+			oEntities = null ;
+		}
+	}
+	else
+	{
+		FCKXHtmlEntities.Entities = {} ;
+
+		// Even if we are not processing the entities, we must render the &nbsp;
+		// correctly. As we don't want HTML entities, let's use its numeric
+		// representation (&#160).
+		sChars = ' ' ;
+	}
+
+	// Create the Regex used to find entities in the text.
+	var sRegexPattern = '[' + sChars + ']' ;
+
+	if ( FCKConfig.ProcessNumericEntities )
+		sRegexPattern = '[^ -~]|' + sRegexPattern ;
+
+	var sAdditional = FCKConfig.AdditionalNumericEntities ;
+
+	if ( sAdditional && sAdditional.length > 0 )
+		sRegexPattern += '|' + FCKConfig.AdditionalNumericEntities ;
+
+	FCKXHtmlEntities.EntitiesRegex = new RegExp( sRegexPattern, 'g' ) ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/css/behaviors/disablehandles.htc b/modules/editor/skins/fckeditor/editor/css/behaviors/disablehandles.htc
new file mode 100644
index 000000000..8dfb661de
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/css/behaviors/disablehandles.htc
@@ -0,0 +1,15 @@
+<public:component lightweight="true">
+
+<script language="javascript">
+
+function CancelEvent()
+{
+	return false ;
+}
+
+this.onresizestart = CancelEvent ;
+this.onbeforeeditfocus = CancelEvent ;
+
+</script>
+
+</public:component>
diff --git a/modules/editor/skins/fckeditor/editor/css/behaviors/showtableborders.htc b/modules/editor/skins/fckeditor/editor/css/behaviors/showtableborders.htc
new file mode 100644
index 000000000..77418b9ec
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/css/behaviors/showtableborders.htc
@@ -0,0 +1,36 @@
+<public:component lightweight="true">
+
+<public:attach event="oncontentready" onevent="ShowBorders()" />
+<public:attach event="onpropertychange" onevent="OnPropertyChange()" />
+
+<script language="javascript">
+
+var oClassRegex = /\s*FCK__ShowTableBorders/ ;
+
+function ShowBorders()
+{
+	if ( this.border == 0 )
+	{
+		if ( !oClassRegex.test( this.className ) )
+			this.className += ' FCK__ShowTableBorders' ;
+	}
+	else
+	{
+		if ( oClassRegex.test( this.className ) )
+		{
+			this.className = this.className.replace( oClassRegex, '' ) ;
+			if ( this.className.length == 0 )
+				this.removeAttribute( 'className', 0 ) ;
+		}
+	}
+}
+
+function OnPropertyChange()
+{
+	if ( event.propertyName == 'border' || event.propertyName == 'className' )
+		ShowBorders.call(this) ;
+}
+
+</script>
+
+</public:component>
diff --git a/modules/editor/skins/fckeditor/editor/css/fck_editorarea.css b/modules/editor/skins/fckeditor/editor/css/fck_editorarea.css
new file mode 100644
index 000000000..b1f5cad0c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/css/fck_editorarea.css
@@ -0,0 +1,110 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the default CSS file used by the editor area. It defines the
+ * initial font of the editor and background color.
+ *
+ * A user can configure the editor to use another CSS file. Just change
+ * the value of the FCKConfig.EditorAreaCSS key in the configuration
+ * file.
+ */
+
+/**
+ * The "body" styles should match your editor web site, mainly regarding
+ * background color and font family and size.
+ */
+
+body
+{
+	background-color: #ffffff;
+	padding: 5px 5px 5px 5px;
+	margin: 0px;
+}
+
+body, td
+{
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 12px;
+}
+
+a[href]
+{
+	color: -moz-hyperlinktext !important;		/* For Firefox... mark as important, otherwise it becomes black */
+	text-decoration: -moz-anchor-decoration;	/* For Firefox 3, otherwise no underline will be used */
+}
+
+/**
+ * Just uncomment the following block if you want to avoid spaces between
+ * paragraphs. Remember to apply the same style in your output front end page.
+ */
+
+/*
+p, ul, li
+{
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+*/
+
+/**
+ * Uncomment the following block, or only selected lines if appropriate,
+ * if you have some style items that would break the styles combo box.
+ * You can also write other CSS overrides inside the style block below
+ * as needed and they will be applied to inside the style combo only.
+ */
+
+/*
+.SC_Item *, .SC_ItemSelected *
+{
+	margin: 0px !important;
+	padding: 0px !important;
+	text-indent: 0px !important;
+	clip: auto !important;
+	position: static !important;
+}
+*/
+
+/**
+ * The following are some sample styles used in the "Styles" toolbar command.
+ * You should instead remove them, and include the styles used by the site
+ * you are using the editor in.
+ */
+
+.Bold
+{
+	font-weight: bold;
+}
+
+.Title
+{
+	font-weight: bold;
+	font-size: 18px;
+	color: #cc3300;
+}
+
+.Code
+{
+	border: #8b4513 1px solid;
+	padding-right: 5px;
+	padding-left: 5px;
+	color: #000066;
+	font-family: 'Courier New' , Monospace;
+	background-color: #ff9933;
+}
diff --git a/modules/editor/skins/fckeditor/editor/css/fck_internal.css b/modules/editor/skins/fckeditor/editor/css/fck_internal.css
new file mode 100644
index 000000000..210e7cb4d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/css/fck_internal.css
@@ -0,0 +1,199 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This CSS Style Sheet defines rules used by the editor for its internal use.
+ */
+
+/* #########
+ *  WARNING
+ * #########
+ * When changing this file, the minified version of it must be updated in the
+ * fckeditor.html file (see FCK_InternalCSS).
+ */
+
+/* Fix to allow putting the caret at the end of the content in Firefox if
+   clicking below the content. */
+html
+{
+	min-height: 100%;
+}
+
+table.FCK__ShowTableBorders, table.FCK__ShowTableBorders td, table.FCK__ShowTableBorders th
+{
+	border: #d3d3d3 1px solid;
+}
+
+form
+{
+	border: 1px dotted #FF0000;
+	padding: 2px;
+}
+
+.FCK__Flash
+{
+	border: #a9a9a9 1px solid;
+	background-position: center center;
+	background-image: url(images/fck_flashlogo.gif);
+	background-repeat: no-repeat;
+	width: 80px;
+	height: 80px;
+}
+
+.FCK__UnknownObject
+{
+	border: #a9a9a9 1px solid;
+	background-position: center center;
+	background-image: url(images/fck_plugin.gif);
+	background-repeat: no-repeat;
+	width: 80px;
+	height: 80px;
+}
+
+/* Empty anchors images */
+.FCK__Anchor
+{
+	border: 1px dotted #00F;
+	background-position: center center;
+	background-image: url(images/fck_anchor.gif);
+	background-repeat: no-repeat;
+	width: 16px;
+	height: 15px;
+	vertical-align: middle;
+}
+
+/* Anchors with content */
+.FCK__AnchorC
+{
+	border: 1px dotted #00F;
+	background-position: 1px center;
+	background-image: url(images/fck_anchor.gif);
+	background-repeat: no-repeat;
+	padding-left: 18px;
+}
+
+/* Any anchor for non-IE, if we combine it with the previous rule IE ignores all. */
+a[name]
+{
+	border: 1px dotted #00F;
+	background-position: 0 center;
+	background-image: url(images/fck_anchor.gif);
+	background-repeat: no-repeat;
+	padding-left: 18px;
+}
+
+.FCK__PageBreak
+{
+	background-position: center center;
+	background-image: url(images/fck_pagebreak.gif);
+	background-repeat: no-repeat;
+	clear: both;
+	display: block;
+	float: none;
+	width: 100%;
+	border-top: #999999 1px dotted;
+	border-bottom: #999999 1px dotted;
+	border-right: 0px;
+	border-left: 0px;
+	height: 5px;
+}
+
+/* Hidden fields */
+.FCK__InputHidden
+{
+	width: 19px;
+	height: 18px;
+	background-image: url(images/fck_hiddenfield.gif);
+	background-repeat: no-repeat;
+	vertical-align: text-bottom;
+	background-position: center center;
+}
+
+.FCK__ShowBlocks p,
+.FCK__ShowBlocks div,
+.FCK__ShowBlocks pre,
+.FCK__ShowBlocks address,
+.FCK__ShowBlocks blockquote,
+.FCK__ShowBlocks h1,
+.FCK__ShowBlocks h2,
+.FCK__ShowBlocks h3,
+.FCK__ShowBlocks h4,
+.FCK__ShowBlocks h5,
+.FCK__ShowBlocks h6
+{
+	background-repeat: no-repeat;
+	border: 1px dotted gray;
+	padding-top: 8px;
+	padding-left: 8px;
+}
+
+.FCK__ShowBlocks p
+{
+	background-image: url(images/block_p.png);
+}
+
+.FCK__ShowBlocks div
+{
+	background-image: url(images/block_div.png);
+}
+
+.FCK__ShowBlocks pre
+{
+	background-image: url(images/block_pre.png);
+}
+
+.FCK__ShowBlocks address
+{
+	background-image: url(images/block_address.png);
+}
+
+.FCK__ShowBlocks blockquote
+{
+	background-image: url(images/block_blockquote.png);
+}
+
+.FCK__ShowBlocks h1
+{
+	background-image: url(images/block_h1.png);
+}
+
+.FCK__ShowBlocks h2
+{
+	background-image: url(images/block_h2.png);
+}
+
+.FCK__ShowBlocks h3
+{
+	background-image: url(images/block_h3.png);
+}
+
+.FCK__ShowBlocks h4
+{
+	background-image: url(images/block_h4.png);
+}
+
+.FCK__ShowBlocks h5
+{
+	background-image: url(images/block_h5.png);
+}
+
+.FCK__ShowBlocks h6
+{
+	background-image: url(images/block_h6.png);
+}
diff --git a/modules/editor/skins/fckeditor/editor/css/fck_showtableborders_gecko.css b/modules/editor/skins/fckeditor/editor/css/fck_showtableborders_gecko.css
new file mode 100644
index 000000000..3166ed43d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/css/fck_showtableborders_gecko.css
@@ -0,0 +1,49 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This CSS Style Sheet defines the rules to show table borders on Gecko.
+ */
+
+/* #########
+ *  WARNING
+ * #########
+ * When changing this file, the minified version of it must be updated in the
+ * fckeditor.html file (see FCK_ShowTableBordersCSS).
+ */
+
+/* For tables with the "border" attribute set to "0" */
+table[border="0"],
+table[border="0"] > tr > td, table[border="0"] > tr > th,
+table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th,
+table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th,
+table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th
+{
+	border: #d3d3d3 1px dotted ;
+}
+
+/* For tables with no "border" attribute set */
+table:not([border]),
+table:not([border]) > tr > td, table:not([border]) > tr > th,
+table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th,
+table:not([border]) > thead > tr > td, table:not([border]) > thead > tr > th,
+table:not([border]) > tfoot > tr > td, table:not([border]) > tfoot > tr > th
+{
+	border: #d3d3d3 1px dotted ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_address.png b/modules/editor/skins/fckeditor/editor/css/images/block_address.png
new file mode 100644
index 000000000..8bbae6e5a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_address.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_blockquote.png b/modules/editor/skins/fckeditor/editor/css/images/block_blockquote.png
new file mode 100644
index 000000000..cf065ba6b
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_blockquote.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_div.png b/modules/editor/skins/fckeditor/editor/css/images/block_div.png
new file mode 100644
index 000000000..a2806b140
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_div.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h1.png b/modules/editor/skins/fckeditor/editor/css/images/block_h1.png
new file mode 100644
index 000000000..d43fbdbc0
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h1.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h2.png b/modules/editor/skins/fckeditor/editor/css/images/block_h2.png
new file mode 100644
index 000000000..27b547554
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h2.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h3.png b/modules/editor/skins/fckeditor/editor/css/images/block_h3.png
new file mode 100644
index 000000000..3c3034faf
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h3.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h4.png b/modules/editor/skins/fckeditor/editor/css/images/block_h4.png
new file mode 100644
index 000000000..ab3f64de6
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h4.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h5.png b/modules/editor/skins/fckeditor/editor/css/images/block_h5.png
new file mode 100644
index 000000000..93477d083
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h5.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_h6.png b/modules/editor/skins/fckeditor/editor/css/images/block_h6.png
new file mode 100644
index 000000000..11ea1c2ba
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_h6.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_p.png b/modules/editor/skins/fckeditor/editor/css/images/block_p.png
new file mode 100644
index 000000000..d055c514a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_p.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/block_pre.png b/modules/editor/skins/fckeditor/editor/css/images/block_pre.png
new file mode 100644
index 000000000..be8ad26a7
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/block_pre.png differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/fck_anchor.gif b/modules/editor/skins/fckeditor/editor/css/images/fck_anchor.gif
new file mode 100644
index 000000000..5aa797b22
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/fck_anchor.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/fck_flashlogo.gif b/modules/editor/skins/fckeditor/editor/css/images/fck_flashlogo.gif
new file mode 100644
index 000000000..141aac4ed
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/fck_flashlogo.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/fck_hiddenfield.gif b/modules/editor/skins/fckeditor/editor/css/images/fck_hiddenfield.gif
new file mode 100644
index 000000000..953f643b6
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/fck_hiddenfield.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/fck_pagebreak.gif b/modules/editor/skins/fckeditor/editor/css/images/fck_pagebreak.gif
new file mode 100644
index 000000000..8d1cffd64
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/fck_pagebreak.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/css/images/fck_plugin.gif b/modules/editor/skins/fckeditor/editor/css/images/fck_plugin.gif
new file mode 100644
index 000000000..7d5846345
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/css/images/fck_plugin.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.css b/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.css
new file mode 100644
index 000000000..528a32c25
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.css
@@ -0,0 +1,85 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the CSS file used for interface details in some dialog
+ * windows.
+ */
+
+/* #########
+ *  WARNING
+ * #########
+ * When changing this file, the minified version of it must be updated in the
+ * fck_dialog_common.js file (see GetCommonDialogCss).
+ */
+
+.ImagePreviewArea
+{
+	border: #000000 1px solid;
+	overflow: auto;
+	width: 100%;
+	height: 170px;
+	background-color: #ffffff;
+}
+
+.FlashPreviewArea
+{
+	border: #000000 1px solid;
+	padding: 5px;
+	overflow: auto;
+	width: 100%;
+	height: 170px;
+	background-color: #ffffff;
+}
+
+.BtnReset
+{
+	float: left;
+	background-position: center center;
+	background-image: url(images/reset.gif);
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	border: 1px none;
+	font-size: 1px ;
+}
+
+.BtnLocked, .BtnUnlocked
+{
+	float: left;
+	background-position: center center;
+	background-image: url(images/locked.gif);
+	width: 16px;
+	height: 16px;
+	background-repeat: no-repeat;
+	border: none 1px;
+	font-size: 1px ;
+}
+
+.BtnUnlocked
+{
+	background-image: url(images/unlocked.gif);
+}
+
+.BtnOver
+{
+	border: outset 1px;
+	cursor: pointer;
+	cursor: hand;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.js b/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.js
new file mode 100644
index 000000000..5e823417b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/common/fck_dialog_common.js
@@ -0,0 +1,311 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Useful functions used by almost all dialog window pages.
+ * Dialogs should link to this file as the very first script on the page.
+ */
+
+// Automatically detect the correct document.domain (#123).
+(function()
+{
+	var d = document.domain ;
+
+	while ( true )
+	{
+		// Test if we can access a parent property.
+		try
+		{
+			var test = window.parent.document.domain ;
+			break ;
+		}
+		catch( e ) {}
+
+		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+
+		if ( d.length == 0 )
+			break ;		// It was not able to detect the domain.
+
+		try
+		{
+			document.domain = d ;
+		}
+		catch (e)
+		{
+			break ;
+		}
+	}
+})() ;
+
+// Attention: FCKConfig must be available in the page.
+function GetCommonDialogCss( prefix )
+{
+	// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
+	return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ;
+}
+
+// Gets a element by its Id. Used for shorter coding.
+function GetE( elementId )
+{
+	return document.getElementById( elementId )  ;
+}
+
+function ShowE( element, isVisible )
+{
+	if ( typeof( element ) == 'string' )
+		element = GetE( element ) ;
+	element.style.display = isVisible ? '' : 'none' ;
+}
+
+function SetAttribute( element, attName, attValue )
+{
+	if ( attValue == null || attValue.length == 0 )
+		element.removeAttribute( attName, 0 ) ;			// 0 : Case Insensitive
+	else
+		element.setAttribute( attName, attValue, 0 ) ;	// 0 : Case Insensitive
+}
+
+function GetAttribute( element, attName, valueIfNull )
+{
+	var oAtt = element.attributes[attName] ;
+
+	if ( oAtt == null || !oAtt.specified )
+		return valueIfNull ? valueIfNull : '' ;
+
+	var oValue = element.getAttribute( attName, 2 ) ;
+
+	if ( oValue == null )
+		oValue = oAtt.nodeValue ;
+
+	return ( oValue == null ? valueIfNull : oValue ) ;
+}
+
+function SelectField( elementId )
+{
+	var element = GetE( elementId ) ;
+	element.focus() ;
+
+	// element.select may not be available for some fields (like <select>).
+	if ( element.select )
+		element.select() ;
+}
+
+// Functions used by text fields to accept numbers only.
+var IsDigit = ( function()
+	{
+		var KeyIdentifierMap =
+		{
+			End			: 35,
+			Home		: 36,
+			Left		: 37,
+			Right		: 39,
+			'U+00007F'	: 46		// Delete
+		} ;
+
+		return function ( e )
+			{
+				if ( !e )
+					e = event ;
+
+				var iCode = ( e.keyCode || e.charCode ) ;
+
+				if ( !iCode && e.keyIdentifier && ( e.keyIdentifier in KeyIdentifierMap ) )
+						iCode = KeyIdentifierMap[ e.keyIdentifier ] ;
+
+				return (
+						( iCode >= 48 && iCode <= 57 )		// Numbers
+						|| (iCode >= 35 && iCode <= 40)		// Arrows, Home, End
+						|| iCode == 8						// Backspace
+						|| iCode == 46						// Delete
+						|| iCode == 9						// Tab
+				) ;
+			}
+	} )() ;
+
+String.prototype.Trim = function()
+{
+	return this.replace( /(^\s*)|(\s*$)/g, '' ) ;
+}
+
+String.prototype.StartsWith = function( value )
+{
+	return ( this.substr( 0, value.length ) == value ) ;
+}
+
+String.prototype.Remove = function( start, length )
+{
+	var s = '' ;
+
+	if ( start > 0 )
+		s = this.substring( 0, start ) ;
+
+	if ( start + length < this.length )
+		s += this.substring( start + length , this.length ) ;
+
+	return s ;
+}
+
+String.prototype.ReplaceAll = function( searchArray, replaceArray )
+{
+	var replaced = this ;
+
+	for ( var i = 0 ; i < searchArray.length ; i++ )
+	{
+		replaced = replaced.replace( searchArray[i], replaceArray[i] ) ;
+	}
+
+	return replaced ;
+}
+
+function OpenFileBrowser( url, width, height )
+{
+	// oEditor must be defined.
+
+	var iLeft = ( oEditor.FCKConfig.ScreenWidth  - width ) / 2 ;
+	var iTop  = ( oEditor.FCKConfig.ScreenHeight - height ) / 2 ;
+
+	var sOptions = "toolbar=no,status=no,resizable=yes,dependent=yes,scrollbars=yes" ;
+	sOptions += ",width=" + width ;
+	sOptions += ",height=" + height ;
+	sOptions += ",left=" + iLeft ;
+	sOptions += ",top=" + iTop ;
+
+	window.open( url, 'FCKBrowseWindow', sOptions ) ;
+}
+
+/**
+ Utility function to create/update an element with a name attribute in IE, so it behaves properly when moved around
+ It also allows to change the name or other special attributes in an existing node
+	oEditor : instance of FCKeditor where the element will be created
+	oOriginal : current element being edited or null if it has to be created
+	nodeName : string with the name of the element to create
+	oAttributes : Hash object with the attributes that must be set at creation time in IE
+								Those attributes will be set also after the element has been
+								created for any other browser to avoid redudant code
+*/
+function CreateNamedElement( oEditor, oOriginal, nodeName, oAttributes )
+{
+	var oNewNode ;
+
+	// IE doesn't allow easily to change properties of an existing object,
+	// so remove the old and force the creation of a new one.
+	var oldNode = null ;
+	if ( oOriginal && oEditor.FCKBrowserInfo.IsIE )
+	{
+		// Force the creation only if some of the special attributes have changed:
+		var bChanged = false;
+		for( var attName in oAttributes )
+			bChanged |= ( oOriginal.getAttribute( attName, 2) != oAttributes[attName] ) ;
+
+		if ( bChanged )
+		{
+			oldNode = oOriginal ;
+			oOriginal = null ;
+		}
+	}
+
+	// If the node existed (and it's not IE), then we just have to update its attributes
+	if ( oOriginal )
+	{
+		oNewNode = oOriginal ;
+	}
+	else
+	{
+		// #676, IE doesn't play nice with the name or type attribute
+		if ( oEditor.FCKBrowserInfo.IsIE )
+		{
+			var sbHTML = [] ;
+			sbHTML.push( '<' + nodeName ) ;
+			for( var prop in oAttributes )
+			{
+				sbHTML.push( ' ' + prop + '="' + oAttributes[prop] + '"' ) ;
+			}
+			sbHTML.push( '>' ) ;
+			if ( !oEditor.FCKListsLib.EmptyElements[nodeName.toLowerCase()] )
+				sbHTML.push( '</' + nodeName + '>' ) ;
+
+			oNewNode = oEditor.FCK.EditorDocument.createElement( sbHTML.join('') ) ;
+			// Check if we are just changing the properties of an existing node: copy its properties
+			if ( oldNode )
+			{
+				CopyAttributes( oldNode, oNewNode, oAttributes ) ;
+				oEditor.FCKDomTools.MoveChildren( oldNode, oNewNode ) ;
+				oldNode.parentNode.removeChild( oldNode ) ;
+				oldNode = null ;
+
+				if ( oEditor.FCK.Selection.SelectionData )
+				{
+					// Trick to refresh the selection object and avoid error in
+					// fckdialog.html Selection.EnsureSelection
+					var oSel = oEditor.FCK.EditorDocument.selection ;
+					oEditor.FCK.Selection.SelectionData = oSel.createRange() ; // Now oSel.type will be 'None' reflecting the real situation
+				}
+			}
+			oNewNode = oEditor.FCK.InsertElement( oNewNode ) ;
+
+			// FCK.Selection.SelectionData is broken by now since we've
+			// deleted the previously selected element. So we need to reassign it.
+			if ( oEditor.FCK.Selection.SelectionData )
+			{
+				var range = oEditor.FCK.EditorDocument.body.createControlRange() ;
+				range.add( oNewNode ) ;
+				oEditor.FCK.Selection.SelectionData = range ;
+			}
+		}
+		else
+		{
+			oNewNode = oEditor.FCK.InsertElement( nodeName ) ;
+		}
+	}
+
+	// Set the basic attributes
+	for( var attName in oAttributes )
+		oNewNode.setAttribute( attName, oAttributes[attName], 0 ) ;	// 0 : Case Insensitive
+
+	return oNewNode ;
+}
+
+// Copy all the attributes from one node to the other, kinda like a clone
+// But oSkipAttributes is an object with the attributes that must NOT be copied
+function CopyAttributes( oSource, oDest, oSkipAttributes )
+{
+	var aAttributes = oSource.attributes ;
+
+	for ( var n = 0 ; n < aAttributes.length ; n++ )
+	{
+		var oAttribute = aAttributes[n] ;
+
+		if ( oAttribute.specified )
+		{
+			var sAttName = oAttribute.nodeName ;
+			// We can set the type only once, so do it with the proper value, not copying it.
+			if ( sAttName in oSkipAttributes )
+				continue ;
+
+			var sAttValue = oSource.getAttribute( sAttName, 2 ) ;
+			if ( sAttValue == null )
+				sAttValue = oAttribute.nodeValue ;
+
+			oDest.setAttribute( sAttName, sAttValue, 0 ) ;	// 0 : Case Insensitive
+		}
+	}
+	// The style:
+	oDest.style.cssText = oSource.style.cssText ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/common/images/locked.gif b/modules/editor/skins/fckeditor/editor/dialog/common/images/locked.gif
new file mode 100644
index 000000000..ea0787002
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/common/images/locked.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/common/images/reset.gif b/modules/editor/skins/fckeditor/editor/dialog/common/images/reset.gif
new file mode 100644
index 000000000..5e9a2fcb3
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/common/images/reset.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/common/images/unlocked.gif b/modules/editor/skins/fckeditor/editor/dialog/common/images/unlocked.gif
new file mode 100644
index 000000000..801e423c7
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/common/images/unlocked.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_about.html b/modules/editor/skins/fckeditor/editor/dialog/fck_about.html
new file mode 100644
index 000000000..7faf2280b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_about.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * "About" dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var oEditor = window.parent.InnerDialogLoaded() ;
+var FCKLang	= oEditor.FCKLang ;
+
+window.parent.AddTab( 'About', FCKLang.DlgAboutAboutTab ) ;
+window.parent.AddTab( 'License', FCKLang.DlgAboutLicenseTab ) ;
+window.parent.AddTab( 'BrowserInfo', FCKLang.DlgAboutBrowserInfoTab ) ;
+
+// Function called when a dialog tag is selected.
+function OnDialogTabChange( tabCode )
+{
+	ShowE('divAbout', ( tabCode == 'About' ) ) ;
+	ShowE('divLicense', ( tabCode == 'License' ) ) ;
+	ShowE('divInfo'	, ( tabCode == 'BrowserInfo' ) ) ;
+}
+
+function SendEMail()
+{
+	var eMail = 'mailto:' ;
+	eMail += 'fredck' ;
+	eMail += '@' ;
+	eMail += 'fckeditor' ;
+	eMail += '.' ;
+	eMail += 'net' ;
+
+	window.location = eMail ;
+}
+
+window.onload = function()
+{
+	// Translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	window.parent.SetAutoSize( true ) ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<div id="divAbout">
+		<table cellpadding="0" cellspacing="0" border="0" width="100%" style="height: 100%">
+			<tr>
+				<td colspan="2">
+					<img alt="" src="fck_about/logo_fckeditor.gif" width="236" height="41" align="left" />
+					<table width="80" border="0" cellspacing="0" cellpadding="5" bgcolor="#ffffff" align="right">
+						<tr>
+							<td align="center" nowrap="nowrap" style="border-right: #000000 1px solid; border-top: #000000 1px solid;
+								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
+								<span fcklang="DlgAboutVersion">version</span>
+								<br />
+								<b>2.6.3</b><br />
+								Build 19836</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr style="height: 100%">
+				<td align="center" valign="middle">
+					<span style="font-size: 14px" dir="ltr">
+						<b><a href="http://www.fckeditor.net/?about" target="_blank" title="Visit the FCKeditor web site">
+							Support <b>Open Source</b> Software</a></b> </span>
+					<div style="padding-top:15px">
+						<img alt="" src="fck_about/logo_fredck.gif" width="87" height="36" />
+					</div>
+				</td>
+				<td align="center" nowrap="nowrap" valign="middle">
+					<div>
+						<div style="margin-bottom:5px" dir="ltr">Selected Sponsor</div>
+						<a href="http://www.spellchecker.net/fckeditor/" target="_blank"><img alt="Selected Sponsor" border="0" src="fck_about/sponsors/spellchecker_net.gif" width="75" height="75" /></a>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td width="100%" nowrap="nowrap">
+					<span fcklang="DlgAboutInfo">For further information go to</span> <a href="http://www.fckeditor.net/?About"
+						target="_blank">http://www.fckeditor.net/</a>.
+					<br />
+					Copyright &copy; 2003-2008 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
+				</td>
+				<td align="center">
+					<a href="http://www.fckeditor.net/sponsors/apply" target="_blank">Become a Sponsor</a>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div id="divLicense" style="display: none">
+			<p>
+				Licensed under the terms of any of the following licenses at your
+				choice:
+			</p>
+			<ul>
+				<li style="margin-bottom:15px">
+					<b>GNU General Public License</b> Version 2 or later (the "GPL")<br />
+					<a href="http://www.gnu.org/licenses/gpl.html" target="_blank">http://www.gnu.org/licenses/gpl.html</a>
+				</li>
+				<li style="margin-bottom:15px">
+					<b>GNU Lesser General Public License</b> Version 2.1 or later (the "LGPL")<br />
+					<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>
+				</li>
+				<li>
+					<b>Mozilla Public License</b> Version 1.1 or later (the "MPL")<br />
+					<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>
+			   </li>
+			</ul>
+	</div>
+	<div id="divInfo" style="display: none" dir="ltr">
+		<table align="center" width="80%" border="0">
+			<tr>
+				<td>
+					<script type="text/javascript">
+<!--
+document.write( '<b>User Agent<\/b><br />' + window.navigator.userAgent + '<br /><br />' ) ;
+document.write( '<b>Browser<\/b><br />' + window.navigator.appName + ' ' + window.navigator.appVersion + '<br /><br />' ) ;
+document.write( '<b>Platform<\/b><br />' + window.navigator.platform + '<br /><br />' ) ;
+
+var sUserLang = '?' ;
+
+if ( window.navigator.language )
+	sUserLang = window.navigator.language.toLowerCase() ;
+else if ( window.navigator.userLanguage )
+	sUserLang = window.navigator.userLanguage.toLowerCase() ;
+
+document.write( '<b>User Language<\/b><br />' + sUserLang ) ;
+//-->
+					</script>
+				</td>
+			</tr>
+		</table>
+	</div>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
new file mode 100644
index 000000000..b7d6bc6fe
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fredck.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fredck.gif
new file mode 100644
index 000000000..3108dd9ec
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_about/logo_fredck.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif
new file mode 100644
index 000000000..f8586f906
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_anchor.html b/modules/editor/skins/fckeditor/editor/dialog/fck_anchor.html
new file mode 100644
index 000000000..602a6c8d0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_anchor.html
@@ -0,0 +1,220 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Anchor dialog window.
+-->
+<html>
+	<head>
+		<title>Anchor Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var dialog			= window.parent ;
+var oEditor			= dialog.InnerDialogLoaded() ;
+
+var FCK				= oEditor.FCK ;
+var FCKBrowserInfo	= oEditor.FCKBrowserInfo ;
+var FCKTools		= oEditor.FCKTools ;
+var FCKRegexLib		= oEditor.FCKRegexLib ;
+
+var oDOM			= FCK.EditorDocument ;
+
+var oFakeImage = dialog.Selection.GetSelectedElement() ;
+
+var oAnchor ;
+
+if ( oFakeImage )
+{
+	if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckanchor') )
+		oAnchor = FCK.GetRealElement( oFakeImage ) ;
+	else
+		oFakeImage = null ;
+}
+
+//Search for a real anchor
+if ( !oFakeImage )
+{
+	oAnchor = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+	if ( oAnchor )
+		FCK.Selection.SelectNode( oAnchor ) ;
+}
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oAnchor )
+		GetE('txtName').value = oAnchor.name ;
+	else
+		oAnchor = null ;
+
+	window.parent.SetOkButton( true ) ;
+	window.parent.SetAutoSize( true ) ;
+
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	var sNewName = GetE('txtName').value ;
+
+	// Remove any illegal character in a name attribute:
+	// A name should start with a letter, but the validator passes anyway.
+	sNewName = sNewName.replace( /[^\w-_\.:]/g, '_' ) ;
+
+	if ( sNewName.length == 0 )
+	{
+		// Remove the anchor if the user leaves the name blank
+		if ( oAnchor )
+		{
+			// Removes the current anchor from the document using the new command
+			FCK.Commands.GetCommand( 'AnchorDelete' ).Execute() ;
+			return true ;
+		}
+
+		alert( oEditor.FCKLang.DlgAnchorErrorName ) ;
+		return false ;
+	}
+
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	if ( oAnchor )	// Modifying an existent anchor.
+	{
+		ReadjustLinksToAnchor( oAnchor.name, sNewName );
+
+		// Buggy explorer, bad bad browser. http://alt-tag.com/blog/archives/2006/02/ie-dom-bugs/
+		// Instead of just replacing the .name for the existing anchor (in order to preserve the content), we must remove the .name
+		// and assign .name, although it won't appear until it's specially processed in fckxhtml.js
+
+		// We remove the previous name
+		oAnchor.removeAttribute( 'name' ) ;
+		// Now we set it, but later we must process it specially
+		oAnchor.name = sNewName ;
+
+		return true ;
+	}
+
+	// Create a new anchor preserving the current selection
+	var aNewAnchors = oEditor.FCK.CreateLink( '#' ) ;
+
+	if ( aNewAnchors.length == 0 )
+			aNewAnchors.push( oEditor.FCK.InsertElement( 'a' ) ) ;
+	else
+	{
+		// Remove the fake href
+		for ( var i = 0 ; i < aNewAnchors.length ; i++ )
+			aNewAnchors[i].removeAttribute( 'href' ) ;
+	}
+
+	// More than one anchors may have been created, so interact through all of them (see #220).
+	for ( var i = 0 ; i < aNewAnchors.length ; i++ )
+	{
+		oAnchor = aNewAnchors[i] ;
+
+		// Set the name
+		if ( FCKBrowserInfo.IsIE )
+		{
+			// Setting anchor names directly in IE will trash the HTML code stored
+			// in FCKTempBin after undos. See #2263.
+			var replaceAnchor = oEditor.FCK.EditorDocument.createElement( '<a name="' +
+					FCKTools.HTMLEncode( sNewName ).replace( '"', '&quot;' ) + '">' ) ;
+			oEditor.FCKDomTools.MoveChildren( oAnchor, replaceAnchor ) ;
+			oAnchor.parentNode.replaceChild( replaceAnchor, oAnchor ) ;
+			oAnchor = replaceAnchor ;
+		}
+		else
+			oAnchor.name = sNewName ;
+
+		// IE does require special processing to show the Anchor's image
+		// Opera doesn't allow to select empty anchors
+		if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
+		{
+			if ( oAnchor.innerHTML != '' )
+			{
+				if ( FCKBrowserInfo.IsIE )
+					oAnchor.className += ' FCK__AnchorC' ;
+			}
+			else
+			{
+				// Create a fake image for both IE and Opera
+				var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
+				oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
+
+				oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
+				oAnchor.parentNode.removeChild( oAnchor ) ;
+			}
+
+		}
+	}
+
+	return true ;
+}
+
+// Checks all the links in the current page pointing to the current name and changes them to the new name
+function ReadjustLinksToAnchor( sCurrent, sNew )
+{
+	var oDoc = FCK.EditorDocument ;
+
+	var aLinks = oDoc.getElementsByTagName( 'A' ) ;
+
+	var sReference = '#' + sCurrent ;
+	// The url of the document, so we check absolute and partial references.
+	var sFullReference = oDoc.location.href.replace( /(#.*$)/, '') ;
+	sFullReference += sReference ;
+
+	var oLink ;
+	var i = aLinks.length - 1 ;
+	while ( i >= 0 && ( oLink = aLinks[i--] ) )
+	{
+		var sHRef = oLink.getAttribute( '_fcksavedurl' ) ;
+		if ( sHRef == null )
+			sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
+
+		if ( sHRef == sReference || sHRef == sFullReference )
+		{
+			oLink.href = '#' + sNew ;
+			SetAttribute( oLink, '_fcksavedurl', '#' + sNew ) ;
+		}
+	}
+}
+
+		</script>
+	</head>
+	<body style="overflow: hidden">
+		<table height="100%" width="100%">
+			<tr>
+				<td align="center">
+					<table border="0" cellpadding="0" cellspacing="0" width="80%">
+						<tr>
+							<td>
+								<span fckLang="DlgAnchorName">Anchor Name</span><BR>
+								<input id="txtName" style="WIDTH: 100%" type="text">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_button.html b/modules/editor/skins/fckeditor/editor/dialog/fck_button.html
new file mode 100644
index 000000000..cc117a9e7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_button.html
@@ -0,0 +1,104 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Button dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Button Properties</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor	= dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl && oActiveEl.tagName.toUpperCase() == "INPUT" && ( oActiveEl.type == "button" || oActiveEl.type == "submit" || oActiveEl.type == "reset" ) )
+	{
+		GetE('txtName').value	= oActiveEl.name ;
+		GetE('txtValue').value	= oActiveEl.value ;
+		GetE('txtType').value	= oActiveEl.type ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
+
+	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table width="100%" style="height: 100%">
+		<tr>
+			<td align="center">
+				<table border="0" cellpadding="0" cellspacing="0" width="80%">
+					<tr>
+						<td colspan="">
+							<span fcklang="DlgCheckboxName">Name</span><br />
+							<input type="text" size="20" id="txtName" style="width: 100%" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgButtonText">Text (Value)</span><br />
+							<input type="text" id="txtValue" style="width: 100%" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgButtonType">Type</span><br />
+							<select id="txtType">
+								<option fcklang="DlgButtonTypeBtn" value="button" selected="selected">Button</option>
+								<option fcklang="DlgButtonTypeSbm" value="submit">Submit</option>
+								<option fcklang="DlgButtonTypeRst" value="reset">Reset</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_checkbox.html b/modules/editor/skins/fckeditor/editor/dialog/fck_checkbox.html
new file mode 100644
index 000000000..06d45496f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_checkbox.html
@@ -0,0 +1,104 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Checkbox dialog window.
+-->
+<html>
+	<head>
+		<title>Checkbox Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor	= dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'checkbox' )
+	{
+		GetE('txtName').value		= oActiveEl.name ;
+		GetE('txtValue').value		= oEditor.FCKBrowserInfo.IsIE ? oActiveEl.value : GetAttribute( oActiveEl, 'value' ) ;
+		GetE('txtSelected').checked	= oActiveEl.checked ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'checkbox' } ) ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+		oActiveEl.value = GetE('txtValue').value ;
+	else
+		SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
+
+	var bIsChecked = GetE('txtSelected').checked ;
+	SetAttribute( oActiveEl, 'checked', bIsChecked ? 'checked' : null ) ;	// For Firefox
+	oActiveEl.checked = bIsChecked ;
+
+	return true ;
+}
+
+		</script>
+	</head>
+	<body style="OVERFLOW: hidden" scroll="no">
+		<table height="100%" width="100%">
+			<tr>
+				<td align="center">
+					<table border="0" cellpadding="0" cellspacing="0" width="80%">
+						<tr>
+							<td>
+								<span fckLang="DlgCheckboxName">Name</span><br>
+								<input type="text" size="20" id="txtName" style="WIDTH: 100%">
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<span fckLang="DlgCheckboxValue">Value</span><br>
+								<input type="text" size="20" id="txtValue" style="WIDTH: 100%">
+							</td>
+						</tr>
+						<tr>
+							<td><input type="checkbox" id="txtSelected"><label for="txtSelected" fckLang="DlgCheckboxSelected">Checked</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_colorselector.html b/modules/editor/skins/fckeditor/editor/dialog/fck_colorselector.html
new file mode 100644
index 000000000..30d100b64
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_colorselector.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Color Selection dialog window.
+-->
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<style TYPE="text/css">
+			#ColorTable		{ cursor: pointer ; cursor: hand ; }
+			#hicolor		{ height: 74px ; width: 74px ; border-width: 1px ; border-style: solid ; }
+			#hicolortext	{ width: 75px ; text-align: right ; margin-bottom: 7px ; }
+			#selhicolor		{ height: 20px ; width: 74px ; border-width: 1px ; border-style: solid ; }
+			#selcolor		{ width: 75px ; height: 20px ; margin-top: 0px ; margin-bottom: 7px ; }
+			#btnClear		{ width: 75px ; height: 22px ; margin-bottom: 6px ; }
+			.ColorCell		{ height: 15px ; width: 15px ; }
+		</style>
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var oEditor = window.parent.InnerDialogLoaded() ;
+
+function OnLoad()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	CreateColorTable() ;
+
+	window.parent.SetOkButton( true ) ;
+	window.parent.SetAutoSize( true ) ;
+}
+
+function CreateColorTable()
+{
+	// Get the target table.
+	var oTable = document.getElementById('ColorTable') ;
+
+	// Create the base colors array.
+	var aColors = ['00','33','66','99','cc','ff'] ;
+
+	// This function combines two ranges of three values from the color array into a row.
+	function AppendColorRow( rangeA, rangeB )
+	{
+		for ( var i = rangeA ; i < rangeA + 3 ; i++ )
+		{
+			var oRow = oTable.insertRow(-1) ;
+
+			for ( var j = rangeB ; j < rangeB + 3 ; j++ )
+			{
+				for ( var n = 0 ; n < 6 ; n++ )
+				{
+					AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ;
+				}
+			}
+		}
+	}
+
+	// This function create a single color cell in the color table.
+	function AppendColorCell( targetRow, color )
+	{
+		var oCell = targetRow.insertCell(-1) ;
+		oCell.className = 'ColorCell' ;
+		oCell.bgColor = color ;
+
+		oCell.onmouseover = function()
+		{
+			document.getElementById('hicolor').style.backgroundColor = this.bgColor ;
+			document.getElementById('hicolortext').innerHTML = this.bgColor ;
+		}
+
+		oCell.onclick = function()
+		{
+			document.getElementById('selhicolor').style.backgroundColor = this.bgColor ;
+			document.getElementById('selcolor').value = this.bgColor ;
+		}
+	}
+
+	AppendColorRow( 0, 0 ) ;
+	AppendColorRow( 3, 0 ) ;
+	AppendColorRow( 0, 3 ) ;
+	AppendColorRow( 3, 3 ) ;
+
+	// Create the last row.
+	var oRow = oTable.insertRow(-1) ;
+
+	// Create the gray scale colors cells.
+	for ( var n = 0 ; n < 6 ; n++ )
+	{
+		AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ;
+	}
+
+	// Fill the row with black cells.
+	for ( var i = 0 ; i < 12 ; i++ )
+	{
+		AppendColorCell( oRow, '#000000' ) ;
+	}
+}
+
+function Clear()
+{
+	document.getElementById('selhicolor').style.backgroundColor = '' ;
+	document.getElementById('selcolor').value = '' ;
+}
+
+function ClearActual()
+{
+	document.getElementById('hicolor').style.backgroundColor = '' ;
+	document.getElementById('hicolortext').innerHTML = '&nbsp;' ;
+}
+
+function UpdateColor()
+{
+	try		  { document.getElementById('selhicolor').style.backgroundColor = document.getElementById('selcolor').value ; }
+	catch (e) { Clear() ; }
+}
+
+function Ok()
+{
+	if ( typeof(window.parent.Args().CustomValue) == 'function' )
+		window.parent.Args().CustomValue( document.getElementById('selcolor').value ) ;
+
+	return true ;
+}
+		</script>
+	</head>
+	<body onload="OnLoad()" scroll="no" style="OVERFLOW: hidden">
+		<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+			<tr>
+				<td align="center" valign="middle">
+					<table border="0" cellspacing="5" cellpadding="0" width="100%">
+						<tr>
+							<td valign="top" align="center" nowrap width="100%">
+								<table id="ColorTable" border="0" cellspacing="0" cellpadding="0" width="270" onmouseout="ClearActual();">
+								</table>
+							</td>
+							<td valign="top" align="left" nowrap>
+								<span fckLang="DlgColorHighlight">Highlight</span>
+								<div id="hicolor"></div>
+								<div id="hicolortext">&nbsp;</div>
+								<span fckLang="DlgColorSelected">Selected</span>
+								<div id="selhicolor"></div>
+								<input id="selcolor" type="text" maxlength="20" onchange="UpdateColor();">
+								<br>
+								<input id="btnClear" type="button" fckLang="DlgColorBtnClear" value="Clear" onclick="Clear();" />
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_div.html b/modules/editor/skins/fckeditor/editor/dialog/fck_div.html
new file mode 100644
index 000000000..a583c8c9b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_div.html
@@ -0,0 +1,364 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Form dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var FCK = oEditor.FCK ;
+var FCKLang = oEditor.FCKLang ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
+var FCKStyles = oEditor.FCKStyles ;
+var FCKElementPath = oEditor.FCKElementPath ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRangeIterator = oEditor.FCKDomRangeIterator ;
+var FCKListsLib = oEditor.FCKListsLib ;
+var AlwaysCreate = dialog.Args().CustomValue ;
+
+String.prototype.IEquals = function()
+{
+	var thisUpper = this.toUpperCase() ;
+
+	var aArgs = arguments ;
+
+	// The arguments could also be a single array.
+	if ( aArgs.length == 1 && aArgs[0].pop )
+		aArgs = aArgs[0] ;
+
+	for ( var i = 0 ; i < aArgs.length ; i++ )
+	{
+		if ( thisUpper == aArgs[i].toUpperCase() )
+			return true ;
+	}
+	return false ;
+}
+
+var CurrentContainers = [] ;
+if ( !AlwaysCreate )
+{
+	dialog.Selection.EnsureSelection() ;
+	CurrentContainers = FCKDomTools.GetSelectedDivContainers() ;
+}
+
+// Add some tabs
+dialog.AddTab( 'General', FCKLang.DlgDivGeneralTab );
+dialog.AddTab( 'Advanced', FCKLang.DlgDivAdvancedTab ) ;
+
+function AddStyleOption( styleName )
+{
+	var el = GetE( 'selStyle' ) ;
+	var opt = document.createElement( 'option' ) ;
+	opt.text = opt.value = styleName ;
+
+	if ( FCKBrowserInfo.IsIE )
+		el.add( opt ) ;
+	else
+		el.add( opt, null ) ;
+}
+
+function OnDialogTabChange( tabCode )
+{
+	ShowE( 'divGeneral', tabCode == 'General' ) ;
+	ShowE( 'divAdvanced', tabCode == 'Advanced' ) ;
+	dialog.SetAutoSize( true ) ;
+}
+
+function GetNearestAncestorDirection( node )
+{
+	var dir = 'ltr' ;	// HTML default.
+	while ( ( node = node.parentNode ) )
+	{
+		if ( node.dir )
+			dir = node.dir ;
+	}
+	return dir ;
+}
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+
+	// Popuplate the style menu
+	var styles = FCKStyles.GetStyles() ;
+	var selectableStyles = {} ;
+	for ( var i in styles )
+	{
+		if ( ! /^_FCK_/.test( i ) && styles[i].Element == 'div' )
+			selectableStyles[i] = styles[i] ;
+	}
+	if ( CurrentContainers.length <= 1 )
+	{
+		var target = CurrentContainers[0] ;
+		var match = null ;
+		for ( var i in selectableStyles )
+		{
+			if ( target && styles[i].CheckElementRemovable( target, true ) )
+				match = i ;
+		}
+		if ( !match )
+			AddStyleOption( "" ) ;
+		for ( var i in selectableStyles )
+			AddStyleOption( i ) ;
+		if ( match )
+			GetE( 'selStyle' ).value = match ;
+
+		// Set the value for other inputs
+		if ( target )
+		{
+			GetE( 'txtClass' ).value = target.className ;
+			GetE( 'txtId' ).value = target.id ;
+			GetE( 'txtLang' ).value = target.lang ;
+			GetE( 'txtInlineStyle').value = target.style.cssText ;
+			GetE( 'txtTitle' ).value = target.title ;
+			GetE( 'selLangDir').value = target.dir || GetNearestAncestorDirection( target ) ;
+		}
+	}
+	else
+	{
+		GetE( 'txtId' ).disabled = true ;
+		AddStyleOption( "" ) ;
+		for ( var i in selectableStyles )
+			AddStyleOption( i ) ;
+	}
+}
+
+function CreateDiv()
+{
+	var newBlocks = [] ;
+	var range = new FCKDomRange( FCK.EditorWindow ) ;
+	range.MoveToSelection() ;
+
+	var bookmark = range.CreateBookmark() ;
+
+	// Kludge for #1592: if the bookmark nodes are in the beginning of
+	// $tagName, then move them to the nearest block element in the
+	// $tagName.
+	if ( FCKBrowserInfo.IsIE )
+	{
+		var bStart	= range.GetBookmarkNode( bookmark, true ) ;
+		var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
+
+		var cursor ;
+
+		if ( bStart
+				&& bStart.parentNode.nodeName.IEquals( 'div' )
+				&& !bStart.previousSibling )
+		{
+			cursor = bStart ;
+			while ( ( cursor = cursor.nextSibling ) )
+			{
+				if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+					FCKDomTools.MoveNode( bStart, cursor, true ) ;
+			}
+		}
+
+		if ( bEnd
+				&& bEnd.parentNode.nodeName.IEquals( 'div' )
+				&& !bEnd.previousSibling )
+		{
+			cursor = bEnd ;
+			while ( ( cursor = cursor.nextSibling ) )
+			{
+				if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
+				{
+					if ( cursor.firstChild == bStart )
+						FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
+					else
+						FCKDomTools.MoveNode( bEnd, cursor, true ) ;
+				}
+			}
+		}
+	}
+
+	var iterator = new FCKDomRangeIterator( range ) ;
+	var block ;
+
+	iterator.EnforceRealBlocks = true ;
+	var paragraphs = [] ;
+	var groups = [] ;
+	var lastBlockLimit = null ;
+	while ( ( block = iterator.GetNextParagraph() ) )
+	{
+		var elementPath = new FCKElementPath( block ) ;
+		if ( elementPath.BlockLimit != lastBlockLimit )
+		{
+			groups.push( [] ) ;
+			lastBlockLimit = elementPath.BlockLimit ;
+		}
+		groups[groups.length - 1].push( block ) ;
+	}
+
+	for ( var i = 0 ; i < groups.length ; i++ )
+	{
+		var divNode = FCK.EditorDocument.createElement( 'div' ) ;
+		groups[i][0].parentNode.insertBefore( divNode, groups[i][0] ) ;
+		for ( var j = 0 ; j < groups[i].length ; j++ )
+			FCKDomTools.MoveNode( groups[i][j], divNode ) ;
+		newBlocks.push( divNode ) ;
+	}
+
+	range.MoveToBookmark( bookmark ) ;
+	range.Select() ;
+
+	FCK.Focus() ;
+	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+
+	return newBlocks ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	if ( CurrentContainers.length < 1 )
+		CurrentContainers = CreateDiv();
+
+	var setValue = function( attrName, inputName )
+	{
+		var val = GetE( inputName ).value ;
+		for ( var i = 0 ; i < CurrentContainers.length ; i++ )
+		{
+			if ( val == '' )
+				CurrentContainers[i].removeAttribute( attrName ) ;
+			else
+				CurrentContainers[i].setAttribute( attrName, val ) ;
+		}
+	}
+
+	// Apply modifications to the DIV container according to dialog inputs.
+	if ( CurrentContainers.length == 1 )
+	{
+		setValue( 'class', 'txtClass' ) ;
+		setValue( 'id', 'txtId' ) ;
+	}
+	setValue( 'lang', 'txtLang' ) ;
+	if ( FCKBrowserInfo.IsIE )
+	{
+		for ( var i = 0 ; i < CurrentContainers.length ; i++ )
+			CurrentContainers[i].style.cssText = GetE( 'txtInlineStyle' ).value ;
+	}
+	else
+		setValue( 'style', 'txtInlineStyle' ) ;
+	setValue( 'title', 'txtTitle' ) ;
+	for ( var i = 0 ; i < CurrentContainers.length ; i++ )
+	{
+		var dir = GetE( 'selLangDir' ).value ;
+		var styleName = GetE( 'selStyle' ).value ;
+		if ( GetNearestAncestorDirection( CurrentContainers[i] ) != dir )
+			CurrentContainers[i].dir = dir ;
+		else
+			CurrentContainers[i].removeAttribute( 'dir' ) ;
+
+		if ( styleName )
+			FCKStyles.GetStyle( styleName ).ApplyToObject( CurrentContainers[i] ) ;
+	}
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<div id="divGeneral">
+		<table cellspacing="0" cellpadding="0" width="100%" border="0">
+			<colgroup span="2">
+				<col width="49%" />
+				<col width="2%" />
+				<col width="49%" />
+			</colgroup>
+			<tr>
+				<td>
+					<span fcklang="DlgDivStyle">Style</span><br />
+					<select id="selStyle" style="width: 100%;">
+					</select>
+				</td>
+				<td>&nbsp;</td>
+				<td>
+					<span fcklang="DlgGenClass">Stylesheet Classes</span><br />
+					<input id="txtClass" style="width: 100%" type="text" />
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div id="divAdvanced" style="display: none">
+		<table cellspacing="0" cellpadding="0" width="100%" border="0">
+			<colgroup span="2">
+				<col width="49%" />
+				<col width="2%" />
+				<col width="49%" />
+			</colgroup>
+			<tr>
+				<td>
+					<span fcklang="DlgGenId">Id</span><br />
+					<input style="width: 100%" type="text" id="txtId" />
+				</td>
+				<td>&nbsp;</td>
+				<td>
+					<span fcklang="DlgGenLangCode">Language Code</span><br />
+					<input style="width: 100%" type="text" id="txtLang" />
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3">&nbsp;</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+					<span fcklang="DlgDivInlineStyle">Inline Style</span><br />
+					<input style="width: 100%" type="text" id="txtInlineStyle" />
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3">&nbsp;</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+					<span fcklang="DlgGenTitle">Advisory Title</span><br />
+					<input style="width: 100%" type="text" id="txtTitle" />
+				</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td>
+					<span fcklang="DlgGenLangDir">Language Direction</span><br />
+					<select id="selLangDir">
+						<option fcklang="DlgGenLangDirLtr" value="ltr">Left to Right (LTR)
+						<option fcklang="DlgGenLangDirRtl" value="rtl">Right to Left (RTL)
+					</select>
+				</td>
+			</tr>
+		</table>
+	</div>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_docprops.html b/modules/editor/skins/fckeditor/editor/dialog/fck_docprops.html
new file mode 100644
index 000000000..d943dd9ad
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_docprops.html
@@ -0,0 +1,600 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Link dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var oEditor		= window.parent.InnerDialogLoaded() ;
+var FCK			= oEditor.FCK ;
+var FCKLang		= oEditor.FCKLang ;
+var FCKConfig	= oEditor.FCKConfig ;
+
+//#### Dialog Tabs
+
+// Set the dialog tabs.
+window.parent.AddTab( 'General'		, FCKLang.DlgDocGeneralTab ) ;
+window.parent.AddTab( 'Background'	, FCKLang.DlgDocBackTab ) ;
+window.parent.AddTab( 'Colors'		, FCKLang.DlgDocColorsTab ) ;
+window.parent.AddTab( 'Meta'		, FCKLang.DlgDocMetaTab ) ;
+
+// Function called when a dialog tag is selected.
+function OnDialogTabChange( tabCode )
+{
+	ShowE( 'divGeneral'		, ( tabCode == 'General' ) ) ;
+	ShowE( 'divBackground'	, ( tabCode == 'Background' ) ) ;
+	ShowE( 'divColors'		, ( tabCode == 'Colors' ) ) ;
+	ShowE( 'divMeta'		, ( tabCode == 'Meta' ) ) ;
+
+	ShowE( 'ePreview'		, ( tabCode == 'Background' || tabCode == 'Colors' ) ) ;
+}
+
+//#### Get Base elements from the document: BEGIN
+
+// The HTML element of the document.
+var oHTML = FCK.EditorDocument.getElementsByTagName('html')[0] ;
+
+// The HEAD element of the document.
+var oHead = oHTML.getElementsByTagName('head')[0] ;
+
+var oBody = FCK.EditorDocument.body ;
+
+// This object contains all META tags defined in the document.
+var oMetaTags = new Object() ;
+
+// Get all META tags defined in the document.
+AppendMetaCollection( oMetaTags, oHead.getElementsByTagName('meta') ) ;
+AppendMetaCollection( oMetaTags, oHead.getElementsByTagName('fck:meta') ) ;
+
+function AppendMetaCollection( targetObject, metaCollection )
+{
+	// Loop throw all METAs and put it in the HashTable.
+	for ( var i = 0 ; i < metaCollection.length ; i++ )
+	{
+		// Try to get the "name" attribute.
+		var sName = GetAttribute( metaCollection[i], 'name', GetAttribute( metaCollection[i], '___fcktoreplace:name', '' ) ) ;
+
+		// If no "name", try with the "http-equiv" attribute.
+		if ( sName.length == 0 )
+		{
+			if ( oEditor.FCKBrowserInfo.IsIE )
+			{
+				// Get the http-equiv value from the outerHTML.
+				var oHttpEquivMatch = metaCollection[i].outerHTML.match( oEditor.FCKRegexLib.MetaHttpEquiv ) ;
+				if ( oHttpEquivMatch )
+					sName = oHttpEquivMatch[1] ;
+			}
+			else
+				sName = GetAttribute( metaCollection[i], 'http-equiv', '' ) ;
+		}
+
+		if ( sName.length > 0 )
+			targetObject[ sName.toLowerCase() ] = metaCollection[i] ;
+	}
+}
+
+//#### END
+
+// Set a META tag in the document.
+function SetMetadata( name, content, isHttp )
+{
+	if ( content.length == 0 )
+	{
+		RemoveMetadata( name ) ;
+		return ;
+	}
+
+	var oMeta = oMetaTags[ name.toLowerCase() ] ;
+
+	if ( !oMeta )
+	{
+		oMeta = oHead.appendChild( FCK.EditorDocument.createElement('META') ) ;
+
+		if ( isHttp )
+			SetAttribute( oMeta, 'http-equiv', name ) ;
+		else
+		{
+			// On IE, it is not possible to set the "name" attribute of the META tag.
+			// So a temporary attribute is used and it is replaced when getting the
+			// editor's HTML/XHTML value. This is sad, I know :(
+			if ( oEditor.FCKBrowserInfo.IsIE )
+				SetAttribute( oMeta, '___fcktoreplace:name', name ) ;
+			else
+				SetAttribute( oMeta, 'name', name ) ;
+		}
+
+		oMetaTags[ name.toLowerCase() ] = oMeta ;
+	}
+
+	SetAttribute( oMeta, 'content', content ) ;
+//	oMeta.content = content ;
+}
+
+function RemoveMetadata( name )
+{
+	var oMeta = oMetaTags[ name.toLowerCase() ] ;
+
+	if ( oMeta && oMeta != null )
+	{
+		oMeta.parentNode.removeChild( oMeta ) ;
+		oMetaTags[ name.toLowerCase() ] = null ;
+	}
+}
+
+function GetMetadata( name )
+{
+	var oMeta = oMetaTags[ name.toLowerCase() ] ;
+
+	if ( oMeta && oMeta != null )
+		return oMeta.getAttribute( 'content', 2 ) ;
+	else
+		return '' ;
+}
+
+window.onload = function ()
+{
+	// Show/Hide the "Browse Server" button.
+	GetE('tdBrowse').style.display = oEditor.FCKConfig.ImageBrowser ? "" : "none";
+
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage( document ) ;
+
+	FillFields() ;
+
+	UpdatePreview() ;
+
+	// Show the "Ok" button.
+	window.parent.SetOkButton( true ) ;
+
+	window.parent.SetAutoSize( true ) ;
+}
+
+function FillFields()
+{
+	// ### General Info
+	GetE('txtPageTitle').value = FCK.EditorDocument.title ;
+
+	GetE('selDirection').value	= GetAttribute( oHTML, 'dir', '' ) ;
+	GetE('txtLang').value		= GetAttribute( oHTML, 'xml:lang', GetAttribute( oHTML, 'lang', '' ) ) ;	// "xml:lang" takes precedence to "lang".
+
+	// Character Set Encoding.
+//	if ( oEditor.FCKBrowserInfo.IsIE )
+//		var sCharSet = FCK.EditorDocument.charset ;
+//	else
+		var sCharSet = GetMetadata( 'Content-Type' ) ;
+
+	if ( sCharSet != null && sCharSet.length > 0 )
+	{
+//		if ( !oEditor.FCKBrowserInfo.IsIE )
+			sCharSet = sCharSet.match( /[^=]*$/ ) ;
+
+		GetE('selCharSet').value = sCharSet ;
+
+		if ( GetE('selCharSet').selectedIndex == -1 )
+		{
+			GetE('selCharSet').value = '...' ;
+			GetE('txtCustomCharSet').value = sCharSet ;
+
+			CheckOther( GetE('selCharSet'), 'txtCustomCharSet' ) ;
+		}
+	}
+
+	// Document Type.
+	if ( FCK.DocTypeDeclaration && FCK.DocTypeDeclaration.length > 0 )
+	{
+		GetE('selDocType').value = FCK.DocTypeDeclaration ;
+
+		if ( GetE('selDocType').selectedIndex == -1 )
+		{
+			GetE('selDocType').value = '...' ;
+			GetE('txtDocType').value = FCK.DocTypeDeclaration ;
+
+			CheckOther( GetE('selDocType'), 'txtDocType' ) ;
+		}
+	}
+
+	// Document Type.
+	GetE('chkIncXHTMLDecl').checked = ( FCK.XmlDeclaration && FCK.XmlDeclaration.length > 0 ) ;
+
+	// ### Background
+	GetE('txtBackColor').value = GetAttribute( oBody, 'bgColor'		, '' ) ;
+	GetE('txtBackImage').value = GetAttribute( oBody, 'background'	, '' ) ;
+	GetE('chkBackNoScroll').checked = ( GetAttribute( oBody, 'bgProperties', '' ).toLowerCase() == 'fixed' ) ;
+
+	// ### Colors
+	GetE('txtColorText').value		= GetAttribute( oBody, 'text'	, '' ) ;
+	GetE('txtColorLink').value		= GetAttribute( oBody, 'link'	, '' ) ;
+	GetE('txtColorVisited').value	= GetAttribute( oBody, 'vLink'	, '' ) ;
+	GetE('txtColorActive').value	= GetAttribute( oBody, 'aLink'	, '' ) ;
+
+	// ### Margins
+	GetE('txtMarginTop').value		= GetAttribute( oBody, 'topMargin'		, '' ) ;
+	GetE('txtMarginLeft').value		= GetAttribute( oBody, 'leftMargin'		, '' ) ;
+	GetE('txtMarginRight').value	= GetAttribute( oBody, 'rightMargin'	, '' ) ;
+	GetE('txtMarginBottom').value	= GetAttribute( oBody, 'bottomMargin'	, '' ) ;
+
+	// ### Meta Data
+	GetE('txtMetaKeywords').value		= GetMetadata( 'keywords' ) ;
+	GetE('txtMetaDescription').value	= GetMetadata( 'description' ) ;
+	GetE('txtMetaAuthor').value			= GetMetadata( 'author' ) ;
+	GetE('txtMetaCopyright').value		= GetMetadata( 'copyright' ) ;
+}
+
+// Called when the "Ok" button is clicked.
+function Ok()
+{
+	// ### General Info
+	FCK.EditorDocument.title = GetE('txtPageTitle').value ;
+
+	var oHTML = FCK.EditorDocument.getElementsByTagName('html')[0] ;
+
+	SetAttribute( oHTML, 'dir'		, GetE('selDirection').value ) ;
+	SetAttribute( oHTML, 'lang'		, GetE('txtLang').value ) ;
+	SetAttribute( oHTML, 'xml:lang'	, GetE('txtLang').value ) ;
+
+	// Character Set Enconding.
+	var sCharSet = GetE('selCharSet').value ;
+	if ( sCharSet == '...' )
+		sCharSet = GetE('txtCustomCharSet').value ;
+
+	if ( sCharSet.length > 0 )
+			sCharSet = 'text/html; charset=' + sCharSet ;
+
+//	if ( oEditor.FCKBrowserInfo.IsIE )
+//		FCK.EditorDocument.charset = sCharSet ;
+//	else
+		SetMetadata( 'Content-Type', sCharSet, true ) ;
+
+	// Document Type
+	var sDocType = GetE('selDocType').value ;
+	if ( sDocType == '...' )
+		sDocType = GetE('txtDocType').value ;
+
+	FCK.DocTypeDeclaration = sDocType ;
+
+	// XHTML Declarations.
+	if ( GetE('chkIncXHTMLDecl').checked )
+	{
+		if ( sCharSet.length == 0 )
+			sCharSet = 'utf-8' ;
+
+		FCK.XmlDeclaration = '<' + '?xml version="1.0" encoding="' + sCharSet + '"?>' ;
+
+		SetAttribute( oHTML, 'xmlns', 'http://www.w3.org/1999/xhtml' ) ;
+	}
+	else
+	{
+		FCK.XmlDeclaration = null ;
+		oHTML.removeAttribute( 'xmlns', 0 ) ;
+	}
+
+	// ### Background
+	SetAttribute( oBody, 'bgcolor'		, GetE('txtBackColor').value ) ;
+	SetAttribute( oBody, 'background'	, GetE('txtBackImage').value ) ;
+	SetAttribute( oBody, 'bgproperties'	, GetE('chkBackNoScroll').checked ? 'fixed' : '' ) ;
+
+	// ### Colors
+	SetAttribute( oBody, 'text'	, GetE('txtColorText').value ) ;
+	SetAttribute( oBody, 'link'	, GetE('txtColorLink').value ) ;
+	SetAttribute( oBody, 'vlink', GetE('txtColorVisited').value ) ;
+	SetAttribute( oBody, 'alink', GetE('txtColorActive').value ) ;
+
+	// ### Margins
+	SetAttribute( oBody, 'topmargin'	, GetE('txtMarginTop').value ) ;
+	SetAttribute( oBody, 'leftmargin'	, GetE('txtMarginLeft').value ) ;
+	SetAttribute( oBody, 'rightmargin'	, GetE('txtMarginRight').value ) ;
+	SetAttribute( oBody, 'bottommargin'	, GetE('txtMarginBottom').value ) ;
+
+	// ### Meta data
+	SetMetadata( 'keywords'		, GetE('txtMetaKeywords').value ) ;
+	SetMetadata( 'description'	, GetE('txtMetaDescription').value ) ;
+	SetMetadata( 'author'		, GetE('txtMetaAuthor').value ) ;
+	SetMetadata( 'copyright'	, GetE('txtMetaCopyright').value ) ;
+
+	return true ;
+}
+
+var bPreviewIsLoaded = false ;
+var oPreviewWindow ;
+var oPreviewBody ;
+
+// Called by the Preview page when loaded.
+function OnPreviewLoad( previewWindow, previewBody )
+{
+	oPreviewWindow	= previewWindow ;
+	oPreviewBody	= previewBody ;
+
+	bPreviewIsLoaded = true ;
+	UpdatePreview() ;
+}
+
+function UpdatePreview()
+{
+	if ( !bPreviewIsLoaded )
+		return ;
+
+	// ### Background
+	SetAttribute( oPreviewBody, 'bgcolor'		, GetE('txtBackColor').value ) ;
+	SetAttribute( oPreviewBody, 'background'	, GetE('txtBackImage').value ) ;
+	SetAttribute( oPreviewBody, 'bgproperties'	, GetE('chkBackNoScroll').checked ? 'fixed' : '' ) ;
+
+	// ### Colors
+	SetAttribute( oPreviewBody, 'text', GetE('txtColorText').value ) ;
+
+	oPreviewWindow.SetLinkColor( GetE('txtColorLink').value ) ;
+	oPreviewWindow.SetVisitedColor( GetE('txtColorVisited').value ) ;
+	oPreviewWindow.SetActiveColor( GetE('txtColorActive').value ) ;
+}
+
+function CheckOther( combo, txtField )
+{
+	var bNotOther = ( combo.value != '...' ) ;
+
+	GetE(txtField).style.backgroundColor = ( bNotOther ? '#cccccc' : '' ) ;
+	GetE(txtField).disabled = bNotOther ;
+}
+
+function SetColor( inputId, color )
+{
+	GetE( inputId ).value = color + '' ;
+	UpdatePreview() ;
+}
+
+function SelectBackColor( color )		{ SetColor('txtBackColor', color ) ; }
+function SelectColorText( color )		{ SetColor('txtColorText', color ) ; }
+function SelectColorLink( color )		{ SetColor('txtColorLink', color ) ; }
+function SelectColorVisited( color )	{ SetColor('txtColorVisited', color ) ; }
+function SelectColorActive( color )		{ SetColor('txtColorActive', color ) ; }
+
+function SelectColor( wich )
+{
+	switch ( wich )
+	{
+		case 'Back'			: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectBackColor, window ) ; return ;
+		case 'ColorText'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorText, window ) ; return ;
+		case 'ColorLink'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorLink, window ) ; return ;
+		case 'ColorVisited'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorVisited, window ) ; return ;
+		case 'ColorActive'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorActive, window ) ; return ;
+	}
+}
+
+function BrowseServerBack()
+{
+	OpenFileBrowser( FCKConfig.ImageBrowserURL, FCKConfig.ImageBrowserWindowWidth, FCKConfig.ImageBrowserWindowHeight ) ;
+}
+
+function SetUrl( url )
+{
+	GetE('txtBackImage').value = url ;
+	UpdatePreview() ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 100%">
+		<tr>
+			<td valign="top" style="height: 100%">
+				<div id="divGeneral">
+					<span fcklang="DlgDocPageTitle">Page Title</span><br />
+					<input id="txtPageTitle" style="width: 100%" type="text" />
+					<br />
+					<table cellspacing="0" cellpadding="0" border="0">
+						<tr>
+							<td>
+								<span fcklang="DlgDocLangDir">Language Direction</span><br />
+								<select id="selDirection">
+									<option value="" selected="selected"></option>
+									<option value="ltr" fcklang="DlgDocLangDirLTR">Left to Right (LTR)</option>
+									<option value="rtl" fcklang="DlgDocLangDirRTL">Right to Left (RTL)</option>
+								</select>
+							</td>
+							<td>
+								&nbsp;&nbsp;&nbsp;</td>
+							<td>
+								<span fcklang="DlgDocLangCode">Language Code</span><br />
+								<input id="txtLang" type="text" />
+							</td>
+						</tr>
+					</table>
+					<br />
+					<table cellspacing="0" cellpadding="0" width="100%" border="0">
+						<tr>
+							<td style="white-space: nowrap">
+								<span fcklang="DlgDocCharSet">Character Set Encoding</span><br />
+								<select id="selCharSet" onchange="CheckOther( this, 'txtCustomCharSet' );">
+									<option value="" selected="selected"></option>
+									<option value="us-ascii">ASCII</option>
+									<option fcklang="DlgDocCharSetCE" value="iso-8859-2">Central European</option>
+									<option fcklang="DlgDocCharSetCT" value="big5">Chinese Traditional (Big5)</option>
+									<option fcklang="DlgDocCharSetCR" value="iso-8859-5">Cyrillic</option>
+									<option fcklang="DlgDocCharSetGR" value="iso-8859-7">Greek</option>
+									<option fcklang="DlgDocCharSetJP" value="iso-2022-jp">Japanese</option>
+									<option fcklang="DlgDocCharSetKR" value="iso-2022-kr">Korean</option>
+									<option fcklang="DlgDocCharSetTR" value="iso-8859-9">Turkish</option>
+									<option fcklang="DlgDocCharSetUN" value="utf-8">Unicode (UTF-8)</option>
+									<option fcklang="DlgDocCharSetWE" value="iso-8859-1">Western European</option>
+									<option fcklang="DlgOpOther" value="...">&lt;Other&gt;</option>
+								</select>
+							</td>
+							<td>
+								&nbsp;&nbsp;&nbsp;</td>
+							<td width="100%">
+								<span fcklang="DlgDocCharSetOther">Other Character Set Encoding</span><br />
+								<input id="txtCustomCharSet" style="width: 100%; background-color: #cccccc" disabled="disabled"
+									type="text" />
+							</td>
+						</tr>
+						<tr>
+							<td colspan="3">
+								&nbsp;</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap">
+								<span fcklang="DlgDocDocType">Document Type Heading</span><br />
+								<select id="selDocType" name="selDocType" onchange="CheckOther( this, 'txtDocType' );">
+									<option value="" selected="selected"></option>
+									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'>HTML
+										4.01 Transitional</option>
+									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'>
+										HTML 4.01 Strict</option>
+									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'>
+										HTML 4.01 Frameset</option>
+									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'>
+										XHTML 1.0 Transitional</option>
+									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'>
+										XHTML 1.0 Strict</option>
+									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'>
+										XHTML 1.0 Frameset</option>
+									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'>
+										XHTML 1.1</option>
+									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'>HTML 3.2</option>
+									<option value='<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">'>HTML 2.0</option>
+									<option value="..." fcklang="DlgOpOther">&lt;Other&gt;</option>
+								</select>
+							</td>
+							<td>
+							</td>
+							<td width="100%">
+								<span fcklang="DlgDocDocTypeOther">Other Document Type Heading</span><br />
+								<input id="txtDocType" style="width: 100%; background-color: #cccccc" disabled="disabled"
+									type="text" />
+							</td>
+						</tr>
+					</table>
+					<br />
+					<input id="chkIncXHTMLDecl" type="checkbox" />
+					<label for="chkIncXHTMLDecl" fcklang="DlgDocIncXHTML">
+						Include XHTML Declarations</label>
+				</div>
+				<div id="divBackground" style="display: none">
+					<span fcklang="DlgDocBgColor">Background Color</span><br />
+					<input id="txtBackColor" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" />&nbsp;<input
+						id="btnSelBackColor" onclick="SelectColor( 'Back' )" type="button" value="Select..."
+						fcklang="DlgCellBtnSelect" /><br />
+					<br />
+					<span fcklang="DlgDocBgImage">Background Image URL</span><br />
+					<table cellspacing="0" cellpadding="0" width="100%" border="0">
+						<tr>
+							<td width="100%">
+								<input id="txtBackImage" style="width: 100%" type="text" onchange="UpdatePreview();"
+									onkeyup="UpdatePreview();" /></td>
+							<td id="tdBrowse" nowrap="nowrap">
+								&nbsp;<input id="btnBrowse" onclick="BrowseServerBack();" type="button" fcklang="DlgBtnBrowseServer"
+									value="Browse Server" /></td>
+						</tr>
+					</table>
+					<input id="chkBackNoScroll" type="checkbox" onclick="UpdatePreview();" />
+					<label for="chkBackNoScroll" fcklang="DlgDocBgNoScroll">
+						Nonscrolling Background</label>
+				</div>
+				<div id="divColors" style="display: none">
+					<table cellspacing="0" cellpadding="0" width="100%" border="0">
+						<tr>
+							<td>
+								<span fcklang="DlgDocCText">Text</span><br />
+								<input id="txtColorText" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
+									onclick="SelectColor( 'ColorText' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
+								<br />
+								<span fcklang="DlgDocCLink">Link</span><br />
+								<input id="txtColorLink" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
+									onclick="SelectColor( 'ColorLink' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
+								<br />
+								<span fcklang="DlgDocCVisited">Visited Link</span><br />
+								<input id="txtColorVisited" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
+									onclick="SelectColor( 'ColorVisited' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
+								<br />
+								<span fcklang="DlgDocCActive">Active Link</span><br />
+								<input id="txtColorActive" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
+									onclick="SelectColor( 'ColorActive' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
+							</td>
+							<td valign="middle" align="center">
+								<table cellspacing="2" cellpadding="0" border="0">
+									<tr>
+										<td>
+											<span fcklang="DlgDocMargins">Page Margins</span></td>
+									</tr>
+									<tr>
+										<td style="border: #000000 1px solid; padding: 5px">
+											<table cellpadding="0" cellspacing="0" border="0" dir="ltr">
+												<tr>
+													<td align="center" colspan="3">
+														<span fcklang="DlgDocMaTop">Top</span><br />
+														<input id="txtMarginTop" type="text" size="3" />
+													</td>
+												</tr>
+												<tr>
+													<td align="left">
+														<span fcklang="DlgDocMaLeft">Left</span><br />
+														<input id="txtMarginLeft" type="text" size="3" />
+													</td>
+													<td>
+														&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+													<td align="right">
+														<span fcklang="DlgDocMaRight">Right</span><br />
+														<input id="txtMarginRight" type="text" size="3" />
+													</td>
+												</tr>
+												<tr>
+													<td align="center" colspan="3">
+														<span fcklang="DlgDocMaBottom">Bottom</span><br />
+														<input id="txtMarginBottom" type="text" size="3" />
+													</td>
+												</tr>
+											</table>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</div>
+				<div id="divMeta" style="display: none">
+					<span fcklang="DlgDocMeIndex">Document Indexing Keywords (comma separated)</span><br />
+					<textarea id="txtMetaKeywords" style="width: 100%" rows="2" cols="20"></textarea>
+					<br />
+					<span fcklang="DlgDocMeDescr">Document Description</span><br />
+					<textarea id="txtMetaDescription" style="width: 100%" rows="4" cols="20"></textarea>
+					<br />
+					<span fcklang="DlgDocMeAuthor">Author</span><br />
+					<input id="txtMetaAuthor" style="width: 100%" type="text" /><br />
+					<br />
+					<span fcklang="DlgDocMeCopy">Copyright</span><br />
+					<input id="txtMetaCopyright" type="text" style="width: 100%" />
+				</div>
+			</td>
+		</tr>
+		<tr id="ePreview" style="display: none">
+			<td>
+				<span fcklang="DlgDocPreview">Preview</span><br />
+				<iframe id="frmPreview" src="fck_docprops/fck_document_preview.html" width="100%"
+					height="100"></iframe>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html b/modules/editor/skins/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
new file mode 100644
index 000000000..0ac5acc1e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
@@ -0,0 +1,113 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Preview shown in the "Document Properties" dialog window.
+-->
+<html>
+	<head>
+		<title>Document Properties - Preview</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="robots" content="noindex, nofollow">
+		<script language="javascript">
+
+var eBase = parent.FCK.EditorDocument.getElementsByTagName( 'BASE' ) ;
+if ( eBase.length > 0 && eBase[0].href.length > 0 )
+{
+	document.write( '<base href="' + eBase[0].href + '">' ) ;
+}
+
+window.onload = function()
+{
+	if ( typeof( parent.OnPreviewLoad ) == 'function' )
+		parent.OnPreviewLoad( window, document.body ) ;
+}
+
+function SetBaseHRef( baseHref )
+{
+	var eBase = document.createElement( 'BASE' ) ;
+	eBase.href = baseHref ;
+
+	var eHead = document.getElementsByTagName( 'HEAD' )[0] ;
+	eHead.appendChild( eBase ) ;
+}
+
+function SetLinkColor( color )
+{
+	if ( color && color.length > 0 )
+		document.getElementById('eLink').style.color = color ;
+	else
+		document.getElementById('eLink').style.color = window.document.linkColor ;
+}
+
+function SetVisitedColor( color )
+{
+	if ( color && color.length > 0 )
+		document.getElementById('eVisited').style.color = color ;
+	else
+		document.getElementById('eVisited').style.color = window.document.vlinkColor ;
+}
+
+function SetActiveColor( color )
+{
+	if ( color && color.length > 0 )
+		document.getElementById('eActive').style.color = color ;
+	else
+		document.getElementById('eActive').style.color = window.document.alinkColor ;
+}
+		</script>
+	</head>
+	<body>
+		<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0">
+			<tr>
+				<td align="center" valign="middle">
+					Normal Text
+				</td>
+				<td id="eLink" align="center" valign="middle">
+					<u>Link Text</u>
+				</td>
+			</tr>
+			<tr>
+				<td id="eVisited" valign="middle" align="center">
+					<u>Visited Link</u>
+				</td>
+				<td id="eActive" valign="middle" align="center">
+					<u>Active Link</u>
+				</td>
+			</tr>
+		</table>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+		<br>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_flash.html b/modules/editor/skins/fckeditor/editor/dialog/fck_flash.html
new file mode 100644
index 000000000..1569175a6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_flash.html
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Flash Properties dialog window.
+-->
+<html>
+	<head>
+		<title>Flash Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
+
+		</script>
+	</head>
+	<body scroll="no" style="OVERFLOW: hidden">
+		<div id="divInfo">
+			<table cellSpacing="1" cellPadding="1" width="100%" border="0">
+				<tr>
+					<td>
+						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
+							<tr>
+								<td width="100%"><span fckLang="DlgImgURL">URL</span>
+								</td>
+								<td id="tdBrowse" style="DISPLAY: none" noWrap rowSpan="2">&nbsp; <input id="btnBrowse" onclick="BrowseServer();" type="button" value="Browse Server" fckLang="DlgBtnBrowseServer">
+								</td>
+							</tr>
+							<tr>
+								<td vAlign="top"><input id="txtUrl" onblur="UpdatePreview();" style="WIDTH: 100%" type="text">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<TR>
+					<TD>
+						<table cellSpacing="0" cellPadding="0" border="0">
+							<TR>
+								<TD nowrap>
+									<span fckLang="DlgImgWidth">Width</span><br>
+									<input id="txtWidth" onkeypress="return IsDigit(event);" type="text" size="3">
+								</TD>
+								<TD>&nbsp;</TD>
+								<TD>
+									<span fckLang="DlgImgHeight">Height</span><br>
+									<input id="txtHeight" onkeypress="return IsDigit(event);" type="text" size="3">
+								</TD>
+							</TR>
+						</table>
+					</TD>
+				</TR>
+				<tr>
+					<td vAlign="top">
+						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
+							<tr>
+								<td valign="top" width="100%">
+									<table cellSpacing="0" cellPadding="0" width="100%">
+										<tr>
+											<td><span fckLang="DlgImgPreview">Preview</span></td>
+										</tr>
+										<tr>
+											<td id="ePreviewCell" valign="top" class="FlashPreviewArea"><iframe src="fck_flash/fck_flash_preview.html" frameborder="0" marginheight="0" marginwidth="0"></iframe></td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div id="divUpload" style="DISPLAY: none">
+			<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data" action="" onsubmit="return CheckUpload();">
+				<span fckLang="DlgLnkUpload">Upload</span><br />
+				<input id="txtUploadFile" style="WIDTH: 100%" type="file" size="40" name="NewFile" /><br />
+				<br />
+				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
+				<script type="text/javascript">
+					document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
+				</script>
+			</form>
+		</div>
+		<div id="divAdvanced" style="DISPLAY: none">
+			<TABLE cellSpacing="0" cellPadding="0" border="0">
+				<TR>
+					<TD nowrap>
+						<span fckLang="DlgFlashScale">Scale</span><BR>
+						<select id="cmbScale">
+							<option value="" selected></option>
+							<option value="showall" fckLang="DlgFlashScaleAll">Show all</option>
+							<option value="noborder" fckLang="DlgFlashScaleNoBorder">No Border</option>
+							<option value="exactfit" fckLang="DlgFlashScaleFit">Exact Fit</option>
+						</select></TD>
+					<TD>&nbsp;&nbsp;&nbsp; &nbsp;
+					</TD>
+					<td valign="bottom">
+						<table>
+							<tr>
+								<td><input id="chkAutoPlay" type="checkbox" checked></td>
+								<td><label for="chkAutoPlay" nowrap fckLang="DlgFlashChkPlay">Auto Play</label>&nbsp;&nbsp;</td>
+								<td><input id="chkLoop" type="checkbox" checked></td>
+								<td><label for="chkLoop" nowrap fckLang="DlgFlashChkLoop">Loop</label>&nbsp;&nbsp;</td>
+								<td><input id="chkMenu" type="checkbox" checked></td>
+								<td><label for="chkMenu" nowrap fckLang="DlgFlashChkMenu">Enable Flash Menu</label></td>
+							</tr>
+						</table>
+					</td>
+				</TR>
+			</TABLE>
+			<br>
+			&nbsp;
+			<table cellSpacing="0" cellPadding="0" width="100%" align="center" border="0">
+				<tr>
+					<td vAlign="top" width="50%"><span fckLang="DlgGenId">Id</span><br>
+						<input id="txtAttId" style="WIDTH: 100%" type="text">
+					</td>
+					<td>&nbsp;&nbsp;</td>
+					<td vAlign="top" nowrap><span fckLang="DlgGenClass">Stylesheet Classes</span><br>
+						<input id="txtAttClasses" style="WIDTH: 100%" type="text">
+					</td>
+					<td>&nbsp;&nbsp;</td>
+					<td vAlign="top" nowrap width="50%">&nbsp;<span fckLang="DlgGenTitle">Advisory Title</span><br>
+						<input id="txtAttTitle" style="WIDTH: 100%" type="text">
+					</td>
+				</tr>
+			</table>
+			<span fckLang="DlgGenStyle">Style</span><br>
+			<input id="txtAttStyle" style="WIDTH: 100%" type="text">
+		</div>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash.js b/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash.js
new file mode 100644
index 000000000..993ba8c3a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash.js
@@ -0,0 +1,300 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Flash dialog window (see fck_flash.html).
+ */
+
+var dialog		= window.parent ;
+var oEditor		= dialog.InnerDialogLoaded() ;
+var FCK			= oEditor.FCK ;
+var FCKLang		= oEditor.FCKLang ;
+var FCKConfig	= oEditor.FCKConfig ;
+var FCKTools	= oEditor.FCKTools ;
+
+//#### Dialog Tabs
+
+// Set the dialog tabs.
+dialog.AddTab( 'Info', oEditor.FCKLang.DlgInfoTab ) ;
+
+if ( FCKConfig.FlashUpload )
+	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
+
+if ( !FCKConfig.FlashDlgHideAdvanced )
+	dialog.AddTab( 'Advanced', oEditor.FCKLang.DlgAdvancedTag ) ;
+
+// Function called when a dialog tag is selected.
+function OnDialogTabChange( tabCode )
+{
+	ShowE('divInfo'		, ( tabCode == 'Info' ) ) ;
+	ShowE('divUpload'	, ( tabCode == 'Upload' ) ) ;
+	ShowE('divAdvanced'	, ( tabCode == 'Advanced' ) ) ;
+}
+
+// Get the selected flash embed (if available).
+var oFakeImage = dialog.Selection.GetSelectedElement() ;
+var oEmbed ;
+
+if ( oFakeImage )
+{
+	if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckflash') )
+		oEmbed = FCK.GetRealElement( oFakeImage ) ;
+	else
+		oFakeImage = null ;
+}
+
+window.onload = function()
+{
+	// Translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	// Load the selected element information (if any).
+	LoadSelection() ;
+
+	// Show/Hide the "Browse Server" button.
+	GetE('tdBrowse').style.display = FCKConfig.FlashBrowser	? '' : 'none' ;
+
+	// Set the actual uploader URL.
+	if ( FCKConfig.FlashUpload )
+		GetE('frmUpload').action = FCKConfig.FlashUploadURL ;
+
+	dialog.SetAutoSize( true ) ;
+
+	// Activate the "OK" button.
+	dialog.SetOkButton( true ) ;
+
+	SelectField( 'txtUrl' ) ;
+}
+
+function LoadSelection()
+{
+	if ( ! oEmbed ) return ;
+
+	GetE('txtUrl').value    = GetAttribute( oEmbed, 'src', '' ) ;
+	GetE('txtWidth').value  = GetAttribute( oEmbed, 'width', '' ) ;
+	GetE('txtHeight').value = GetAttribute( oEmbed, 'height', '' ) ;
+
+	// Get Advances Attributes
+	GetE('txtAttId').value		= oEmbed.id ;
+	GetE('chkAutoPlay').checked	= GetAttribute( oEmbed, 'play', 'true' ) == 'true' ;
+	GetE('chkLoop').checked		= GetAttribute( oEmbed, 'loop', 'true' ) == 'true' ;
+	GetE('chkMenu').checked		= GetAttribute( oEmbed, 'menu', 'true' ) == 'true' ;
+	GetE('cmbScale').value		= GetAttribute( oEmbed, 'scale', '' ).toLowerCase() ;
+
+	GetE('txtAttTitle').value		= oEmbed.title ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+	{
+		GetE('txtAttClasses').value = oEmbed.getAttribute('className') || '' ;
+		GetE('txtAttStyle').value = oEmbed.style.cssText ;
+	}
+	else
+	{
+		GetE('txtAttClasses').value = oEmbed.getAttribute('class',2) || '' ;
+		GetE('txtAttStyle').value = oEmbed.getAttribute('style',2) || '' ;
+	}
+
+	UpdatePreview() ;
+}
+
+//#### The OK button was hit.
+function Ok()
+{
+	if ( GetE('txtUrl').value.length == 0 )
+	{
+		dialog.SetSelectedTab( 'Info' ) ;
+		GetE('txtUrl').focus() ;
+
+		alert( oEditor.FCKLang.DlgAlertUrl ) ;
+
+		return false ;
+	}
+
+	oEditor.FCKUndo.SaveUndoStep() ;
+	if ( !oEmbed )
+	{
+		oEmbed		= FCK.EditorDocument.createElement( 'EMBED' ) ;
+		oFakeImage  = null ;
+	}
+	UpdateEmbed( oEmbed ) ;
+
+	if ( !oFakeImage )
+	{
+		oFakeImage	= oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Flash', oEmbed ) ;
+		oFakeImage.setAttribute( '_fckflash', 'true', 0 ) ;
+		oFakeImage	= FCK.InsertElement( oFakeImage ) ;
+	}
+
+	oEditor.FCKEmbedAndObjectProcessor.RefreshView( oFakeImage, oEmbed ) ;
+
+	return true ;
+}
+
+function UpdateEmbed( e )
+{
+	SetAttribute( e, 'type'			, 'application/x-shockwave-flash' ) ;
+	SetAttribute( e, 'pluginspage'	, 'http://www.macromedia.com/go/getflashplayer' ) ;
+
+	SetAttribute( e, 'src', GetE('txtUrl').value ) ;
+	SetAttribute( e, "width" , GetE('txtWidth').value ) ;
+	SetAttribute( e, "height", GetE('txtHeight').value ) ;
+
+	// Advances Attributes
+
+	SetAttribute( e, 'id'	, GetE('txtAttId').value ) ;
+	SetAttribute( e, 'scale', GetE('cmbScale').value ) ;
+
+	SetAttribute( e, 'play', GetE('chkAutoPlay').checked ? 'true' : 'false' ) ;
+	SetAttribute( e, 'loop', GetE('chkLoop').checked ? 'true' : 'false' ) ;
+	SetAttribute( e, 'menu', GetE('chkMenu').checked ? 'true' : 'false' ) ;
+
+	SetAttribute( e, 'title'	, GetE('txtAttTitle').value ) ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+	{
+		SetAttribute( e, 'className', GetE('txtAttClasses').value ) ;
+		e.style.cssText = GetE('txtAttStyle').value ;
+	}
+	else
+	{
+		SetAttribute( e, 'class', GetE('txtAttClasses').value ) ;
+		SetAttribute( e, 'style', GetE('txtAttStyle').value ) ;
+	}
+}
+
+var ePreview ;
+
+function SetPreviewElement( previewEl )
+{
+	ePreview = previewEl ;
+
+	if ( GetE('txtUrl').value.length > 0 )
+		UpdatePreview() ;
+}
+
+function UpdatePreview()
+{
+	if ( !ePreview )
+		return ;
+
+	while ( ePreview.firstChild )
+		ePreview.removeChild( ePreview.firstChild ) ;
+
+	if ( GetE('txtUrl').value.length == 0 )
+		ePreview.innerHTML = '&nbsp;' ;
+	else
+	{
+		var oDoc	= ePreview.ownerDocument || ePreview.document ;
+		var e		= oDoc.createElement( 'EMBED' ) ;
+
+		SetAttribute( e, 'src', GetE('txtUrl').value ) ;
+		SetAttribute( e, 'type', 'application/x-shockwave-flash' ) ;
+		SetAttribute( e, 'width', '100%' ) ;
+		SetAttribute( e, 'height', '100%' ) ;
+
+		ePreview.appendChild( e ) ;
+	}
+}
+
+// <embed id="ePreview" src="fck_flash/claims.swf" width="100%" height="100%" style="visibility:hidden" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+
+function BrowseServer()
+{
+	OpenFileBrowser( FCKConfig.FlashBrowserURL, FCKConfig.FlashBrowserWindowWidth, FCKConfig.FlashBrowserWindowHeight ) ;
+}
+
+function SetUrl( url, width, height )
+{
+	GetE('txtUrl').value = url ;
+
+	if ( width )
+		GetE('txtWidth').value = width ;
+
+	if ( height )
+		GetE('txtHeight').value = height ;
+
+	UpdatePreview() ;
+
+	dialog.SetSelectedTab( 'Info' ) ;
+}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
+{
+	// Remove animation
+	window.parent.Throbber.Hide() ;
+	GetE( 'divUpload' ).style.display  = '' ;
+
+	switch ( errorNumber )
+	{
+		case 0 :	// No errors
+			alert( 'Your file has been successfully uploaded' ) ;
+			break ;
+		case 1 :	// Custom error
+			alert( customMsg ) ;
+			return ;
+		case 101 :	// Custom warning
+			alert( customMsg ) ;
+			break ;
+		case 201 :
+			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
+			break ;
+		case 202 :
+			alert( 'Invalid file type' ) ;
+			return ;
+		case 203 :
+			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
+			return ;
+		case 500 :
+			alert( 'The connector is disabled' ) ;
+			break ;
+		default :
+			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
+			return ;
+	}
+
+	SetUrl( fileUrl ) ;
+	GetE('frmUpload').reset() ;
+}
+
+var oUploadAllowedExtRegex	= new RegExp( FCKConfig.FlashUploadAllowedExtensions, 'i' ) ;
+var oUploadDeniedExtRegex	= new RegExp( FCKConfig.FlashUploadDeniedExtensions, 'i' ) ;
+
+function CheckUpload()
+{
+	var sFile = GetE('txtUploadFile').value ;
+
+	if ( sFile.length == 0 )
+	{
+		alert( 'Please select a file to upload' ) ;
+		return false ;
+	}
+
+	if ( ( FCKConfig.FlashUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
+		( FCKConfig.FlashUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
+	{
+		OnUploadCompleted( 202 ) ;
+		return false ;
+	}
+
+	// Show animation
+	window.parent.Throbber.Show( 100 ) ;
+	GetE( 'divUpload' ).style.display  = 'none' ;
+
+	return true ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html b/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
new file mode 100644
index 000000000..4817c1d1f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Preview page for the Flash dialog window.
+-->
+<html>
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="robots" content="noindex, nofollow">
+		<script src="../common/fck_dialog_common.js" type="text/javascript"></script>
+		<script language="javascript">
+
+var FCKTools	= window.parent.FCKTools ;
+var FCKConfig	= window.parent.FCKConfig ;
+
+// Sets the Skin CSS
+document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
+document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ;
+
+if ( window.parent.FCKConfig.BaseHref.length > 0 )
+	document.write( '<base href="' + window.parent.FCKConfig.BaseHref + '">' ) ;
+
+window.onload = function()
+{
+	window.parent.SetPreviewElement( document.body ) ;
+}
+
+		</script>
+	</head>
+	<body style="COLOR: #000000; BACKGROUND-COLOR: #ffffff"></body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_form.html b/modules/editor/skins/fckeditor/editor/dialog/fck_form.html
new file mode 100644
index 000000000..71edf4944
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_form.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Form dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( 'FORM' ) ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl )
+	{
+		GetE('txtName').value	= oActiveEl.name ;
+		GetE('txtAction').value	= oActiveEl.getAttribute( 'action', 2 ) ;
+		GetE('txtMethod').value	= oActiveEl.method ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	if ( !oActiveEl )
+	{
+		oActiveEl = oEditor.FCK.InsertElement( 'form' ) ;
+
+		if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+			oEditor.FCKTools.AppendBogusBr( oActiveEl ) ;
+	}
+
+	oActiveEl.name = GetE('txtName').value ;
+	SetAttribute( oActiveEl, 'action', GetE('txtAction').value ) ;
+	oActiveEl.method = GetE('txtMethod').value ;
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table width="100%" style="height: 100%">
+		<tr>
+			<td align="center">
+				<table cellspacing="0" cellpadding="0" width="80%" border="0">
+					<tr>
+						<td>
+							<span fcklang="DlgFormName">Name</span><br />
+							<input style="width: 100%" type="text" id="txtName" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgFormAction">Action</span><br />
+							<input style="width: 100%" type="text" id="txtAction" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgFormMethod">Method</span><br />
+							<select id="txtMethod">
+								<option value="get" selected="selected">GET</option>
+								<option value="post">POST</option>
+							</select>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_hiddenfield.html b/modules/editor/skins/fckeditor/editor/dialog/fck_hiddenfield.html
new file mode 100644
index 000000000..3ee162f65
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_hiddenfield.html
@@ -0,0 +1,115 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Hidden Field dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Hidden Field Properties</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+var FCK = oEditor.FCK ;
+
+// Gets the document DOM
+var oDOM = FCK.EditorDocument ;
+
+// Get the selected flash embed (if available).
+var oFakeImage = dialog.Selection.GetSelectedElement() ;
+var oActiveEl ;
+
+if ( oFakeImage )
+{
+	if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckinputhidden') )
+		oActiveEl = FCK.GetRealElement( oFakeImage ) ;
+	else
+		oFakeImage = null ;
+}
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl )
+	{
+		GetE('txtName').value		= oActiveEl.name ;
+		GetE('txtValue').value		= oActiveEl.value ;
+	}
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'hidden' } ) ;
+
+	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
+
+	if ( !oFakeImage )
+	{
+		oFakeImage	= oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
+		oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
+
+		oActiveEl.parentNode.insertBefore( oFakeImage, oActiveEl ) ;
+		oActiveEl.parentNode.removeChild( oActiveEl ) ;
+	}
+	else
+		oEditor.FCKUndo.SaveUndoStep() ;
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden" scroll="no">
+	<table height="100%" width="100%">
+		<tr>
+			<td align="center">
+				<table border="0" class="inhoud" cellpadding="0" cellspacing="0" width="80%">
+					<tr>
+						<td>
+							<span fcklang="DlgHiddenName">Name</span><br />
+							<input type="text" size="20" id="txtName" style="width: 100%" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgHiddenValue">Value</span><br />
+							<input type="text" size="30" id="txtValue" style="width: 100%" />
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_image.html b/modules/editor/skins/fckeditor/editor/dialog/fck_image.html
new file mode 100644
index 000000000..5ce5ecb61
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_image.html
@@ -0,0 +1,258 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Image Properties dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Image Properties</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script src="fck_image/fck_image.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
+
+		</script>
+</head>
+<body scroll="no" style="overflow: hidden">
+	<div id="divInfo">
+		<table cellspacing="1" cellpadding="1" border="0" width="100%" height="100%">
+			<tr>
+				<td>
+					<table cellspacing="0" cellpadding="0" width="100%" border="0">
+						<tr>
+							<td width="100%">
+								<span fcklang="DlgImgURL">URL</span>
+							</td>
+							<td id="tdBrowse" style="display: none" nowrap="nowrap" rowspan="2">
+								&nbsp;
+								<input id="btnBrowse" onclick="BrowseServer();" type="button" value="Browse Server"
+									fcklang="DlgBtnBrowseServer" />
+							</td>
+						</tr>
+						<tr>
+							<td valign="top">
+								<input id="txtUrl" style="width: 100%" type="text" onblur="UpdatePreview();" />
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<span fcklang="DlgImgAlt">Short Description</span><br />
+					<input id="txtAlt" style="width: 100%" type="text" /><br />
+				</td>
+			</tr>
+			<tr height="100%">
+				<td valign="top">
+					<table cellspacing="0" cellpadding="0" width="100%" border="0" height="100%">
+						<tr>
+							<td valign="top">
+								<br />
+								<table cellspacing="0" cellpadding="0" border="0">
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgWidth">Width</span>&nbsp;</td>
+										<td>
+											<input type="text" size="3" id="txtWidth" onkeyup="OnSizeChanged('Width',this.value);" /></td>
+										<td rowspan="2">
+											<div id="btnLockSizes" class="BtnLocked" onmouseover="this.className = (bLockRatio ? 'BtnLocked' : 'BtnUnlocked' ) + ' BtnOver';"
+												onmouseout="this.className = (bLockRatio ? 'BtnLocked' : 'BtnUnlocked' );" title="Lock Sizes"
+												onclick="SwitchLock(this);">
+											</div>
+										</td>
+										<td rowspan="2">
+											<div id="btnResetSize" class="BtnReset" onmouseover="this.className='BtnReset BtnOver';"
+												onmouseout="this.className='BtnReset';" title="Reset Size" onclick="ResetSizes();">
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgHeight">Height</span>&nbsp;</td>
+										<td>
+											<input type="text" size="3" id="txtHeight" onkeyup="OnSizeChanged('Height',this.value);" /></td>
+									</tr>
+								</table>
+								<br />
+								<table cellspacing="0" cellpadding="0" border="0">
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgBorder">Border</span>&nbsp;</td>
+										<td>
+											<input type="text" size="2" value="" id="txtBorder" onkeyup="UpdatePreview();" /></td>
+									</tr>
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgHSpace">HSpace</span>&nbsp;</td>
+										<td>
+											<input type="text" size="2" id="txtHSpace" onkeyup="UpdatePreview();" /></td>
+									</tr>
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgVSpace">VSpace</span>&nbsp;</td>
+										<td>
+											<input type="text" size="2" id="txtVSpace" onkeyup="UpdatePreview();" /></td>
+									</tr>
+									<tr>
+										<td nowrap="nowrap">
+											<span fcklang="DlgImgAlign">Align</span>&nbsp;</td>
+										<td>
+											<select id="cmbAlign" onchange="UpdatePreview();">
+												<option value="" selected="selected"></option>
+												<option fcklang="DlgImgAlignLeft" value="left">Left</option>
+												<option fcklang="DlgImgAlignAbsBottom" value="absBottom">Abs Bottom</option>
+												<option fcklang="DlgImgAlignAbsMiddle" value="absMiddle">Abs Middle</option>
+												<option fcklang="DlgImgAlignBaseline" value="baseline">Baseline</option>
+												<option fcklang="DlgImgAlignBottom" value="bottom">Bottom</option>
+												<option fcklang="DlgImgAlignMiddle" value="middle">Middle</option>
+												<option fcklang="DlgImgAlignRight" value="right">Right</option>
+												<option fcklang="DlgImgAlignTextTop" value="textTop">Text Top</option>
+												<option fcklang="DlgImgAlignTop" value="top">Top</option>
+											</select>
+										</td>
+									</tr>
+								</table>
+							</td>
+							<td>
+								&nbsp;&nbsp;&nbsp;</td>
+							<td width="100%" valign="top">
+								<table cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed">
+									<tr>
+										<td>
+											<span fcklang="DlgImgPreview">Preview</span></td>
+									</tr>
+									<tr>
+										<td valign="top">
+											<iframe class="ImagePreviewArea" src="fck_image/fck_image_preview.html" frameborder="0"
+												marginheight="0" marginwidth="0"></iframe>
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div id="divUpload" style="display: none">
+		<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data"
+			action="" onsubmit="return CheckUpload();">
+			<span fcklang="DlgLnkUpload">Upload</span><br />
+			<input id="txtUploadFile" style="width: 100%" type="file" size="40" name="NewFile" /><br />
+			<br />
+			<input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
+			<script type="text/javascript">
+				document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
+			</script>
+		</form>
+	</div>
+	<div id="divLink" style="display: none">
+		<table cellspacing="1" cellpadding="1" border="0" width="100%">
+			<tr>
+				<td>
+					<div>
+						<span fcklang="DlgLnkURL">URL</span><br />
+						<input id="txtLnkUrl" style="width: 100%" type="text" onblur="UpdatePreview();" />
+					</div>
+					<div id="divLnkBrowseServer" align="right">
+						<input type="button" value="Browse Server" fcklang="DlgBtnBrowseServer" onclick="LnkBrowseServer();" />
+					</div>
+					<div>
+						<span fcklang="DlgLnkTarget">Target</span><br />
+						<select id="cmbLnkTarget">
+							<option value="" fcklang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
+							<option value="_blank" fcklang="DlgLnkTargetBlank">New Window (_blank)</option>
+							<option value="_top" fcklang="DlgLnkTargetTop">Topmost Window (_top)</option>
+							<option value="_self" fcklang="DlgLnkTargetSelf">Same Window (_self)</option>
+							<option value="_parent" fcklang="DlgLnkTargetParent">Parent Window (_parent)</option>
+						</select>
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div id="divAdvanced" style="display: none">
+		<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+			<tr>
+				<td valign="top" width="50%">
+					<span fcklang="DlgGenId">Id</span><br />
+					<input id="txtAttId" style="width: 100%" type="text" />
+				</td>
+				<td width="1">
+					&nbsp;&nbsp;</td>
+				<td valign="top">
+					<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+						<tr>
+							<td width="60%">
+								<span fcklang="DlgGenLangDir">Language Direction</span><br />
+								<select id="cmbAttLangDir" style="width: 100%">
+									<option value="" fcklang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
+									<option value="ltr" fcklang="DlgGenLangDirLtr">Left to Right (LTR)</option>
+									<option value="rtl" fcklang="DlgGenLangDirRtl">Right to Left (RTL)</option>
+								</select>
+							</td>
+							<td width="1%">
+								&nbsp;&nbsp;</td>
+							<td nowrap="nowrap">
+								<span fcklang="DlgGenLangCode">Language Code</span><br />
+								<input id="txtAttLangCode" style="width: 100%" type="text" />&nbsp;
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+					&nbsp;</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+					<span fcklang="DlgGenLongDescr">Long Description URL</span><br />
+					<input id="txtLongDesc" style="width: 100%" type="text" />
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+					&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign="top">
+					<span fcklang="DlgGenClass">Stylesheet Classes</span><br />
+					<input id="txtAttClasses" style="width: 100%" type="text" />
+				</td>
+				<td>
+				</td>
+				<td valign="top">
+					&nbsp;<span fcklang="DlgGenTitle">Advisory Title</span><br />
+					<input id="txtAttTitle" style="width: 100%" type="text" />
+				</td>
+			</tr>
+		</table>
+		<span fcklang="DlgGenStyle">Style</span><br />
+		<input id="txtAttStyle" style="width: 100%" type="text" />
+	</div>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image.js b/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image.js
new file mode 100644
index 000000000..7498e07d3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image.js
@@ -0,0 +1,512 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Image dialog window (see fck_image.html).
+ */
+
+var dialog		= window.parent ;
+var oEditor		= dialog.InnerDialogLoaded() ;
+var FCK			= oEditor.FCK ;
+var FCKLang		= oEditor.FCKLang ;
+var FCKConfig	= oEditor.FCKConfig ;
+var FCKDebug	= oEditor.FCKDebug ;
+var FCKTools	= oEditor.FCKTools ;
+
+var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
+
+//#### Dialog Tabs
+
+// Set the dialog tabs.
+dialog.AddTab( 'Info', FCKLang.DlgImgInfoTab ) ;
+
+if ( !bImageButton && !FCKConfig.ImageDlgHideLink )
+	dialog.AddTab( 'Link', FCKLang.DlgImgLinkTab ) ;
+
+if ( FCKConfig.ImageUpload )
+	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
+
+if ( !FCKConfig.ImageDlgHideAdvanced )
+	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
+
+// Function called when a dialog tag is selected.
+function OnDialogTabChange( tabCode )
+{
+	ShowE('divInfo'		, ( tabCode == 'Info' ) ) ;
+	ShowE('divLink'		, ( tabCode == 'Link' ) ) ;
+	ShowE('divUpload'	, ( tabCode == 'Upload' ) ) ;
+	ShowE('divAdvanced'	, ( tabCode == 'Advanced' ) ) ;
+}
+
+// Get the selected image (if available).
+var oImage = dialog.Selection.GetSelectedElement() ;
+
+if ( oImage && oImage.tagName != 'IMG' && !( oImage.tagName == 'INPUT' && oImage.type == 'image' ) )
+	oImage = null ;
+
+// Get the active link.
+var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
+
+var oImageOriginal ;
+
+function UpdateOriginal( resetSize )
+{
+	if ( !eImgPreview )
+		return ;
+
+	if ( GetE('txtUrl').value.length == 0 )
+	{
+		oImageOriginal = null ;
+		return ;
+	}
+
+	oImageOriginal = document.createElement( 'IMG' ) ;	// new Image() ;
+
+	if ( resetSize )
+	{
+		oImageOriginal.onload = function()
+		{
+			this.onload = null ;
+			ResetSizes() ;
+		}
+	}
+
+	oImageOriginal.src = eImgPreview.src ;
+}
+
+var bPreviewInitialized ;
+
+window.onload = function()
+{
+	// Translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	GetE('btnLockSizes').title = FCKLang.DlgImgLockRatio ;
+	GetE('btnResetSize').title = FCKLang.DlgBtnResetSize ;
+
+	// Load the selected element information (if any).
+	LoadSelection() ;
+
+	// Show/Hide the "Browse Server" button.
+	GetE('tdBrowse').style.display				= FCKConfig.ImageBrowser	? '' : 'none' ;
+	GetE('divLnkBrowseServer').style.display	= FCKConfig.LinkBrowser		? '' : 'none' ;
+
+	UpdateOriginal() ;
+
+	// Set the actual uploader URL.
+	if ( FCKConfig.ImageUpload )
+		GetE('frmUpload').action = FCKConfig.ImageUploadURL ;
+
+	dialog.SetAutoSize( true ) ;
+
+	// Activate the "OK" button.
+	dialog.SetOkButton( true ) ;
+
+	SelectField( 'txtUrl' ) ;
+}
+
+function LoadSelection()
+{
+	if ( ! oImage ) return ;
+
+	var sUrl = oImage.getAttribute( '_fcksavedurl' ) ;
+	if ( sUrl == null )
+		sUrl = GetAttribute( oImage, 'src', '' ) ;
+
+	GetE('txtUrl').value    = sUrl ;
+	GetE('txtAlt').value    = GetAttribute( oImage, 'alt', '' ) ;
+	GetE('txtVSpace').value	= GetAttribute( oImage, 'vspace', '' ) ;
+	GetE('txtHSpace').value	= GetAttribute( oImage, 'hspace', '' ) ;
+	GetE('txtBorder').value	= GetAttribute( oImage, 'border', '' ) ;
+	GetE('cmbAlign').value	= GetAttribute( oImage, 'align', '' ) ;
+
+	var iWidth, iHeight ;
+
+	var regexSize = /^\s*(\d+)px\s*$/i ;
+
+	if ( oImage.style.width )
+	{
+		var aMatchW  = oImage.style.width.match( regexSize ) ;
+		if ( aMatchW )
+		{
+			iWidth = aMatchW[1] ;
+			oImage.style.width = '' ;
+			SetAttribute( oImage, 'width' , iWidth ) ;
+		}
+	}
+
+	if ( oImage.style.height )
+	{
+		var aMatchH  = oImage.style.height.match( regexSize ) ;
+		if ( aMatchH )
+		{
+			iHeight = aMatchH[1] ;
+			oImage.style.height = '' ;
+			SetAttribute( oImage, 'height', iHeight ) ;
+		}
+	}
+
+	GetE('txtWidth').value	= iWidth ? iWidth : GetAttribute( oImage, "width", '' ) ;
+	GetE('txtHeight').value	= iHeight ? iHeight : GetAttribute( oImage, "height", '' ) ;
+
+	// Get Advances Attributes
+	GetE('txtAttId').value			= oImage.id ;
+	GetE('cmbAttLangDir').value		= oImage.dir ;
+	GetE('txtAttLangCode').value	= oImage.lang ;
+	GetE('txtAttTitle').value		= oImage.title ;
+	GetE('txtLongDesc').value		= oImage.longDesc ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+	{
+		GetE('txtAttClasses').value = oImage.className || '' ;
+		GetE('txtAttStyle').value = oImage.style.cssText ;
+	}
+	else
+	{
+		GetE('txtAttClasses').value = oImage.getAttribute('class',2) || '' ;
+		GetE('txtAttStyle').value = oImage.getAttribute('style',2) ;
+	}
+
+	if ( oLink )
+	{
+		var sLinkUrl = oLink.getAttribute( '_fcksavedurl' ) ;
+		if ( sLinkUrl == null )
+			sLinkUrl = oLink.getAttribute('href',2) ;
+
+		GetE('txtLnkUrl').value		= sLinkUrl ;
+		GetE('cmbLnkTarget').value	= oLink.target ;
+	}
+
+	UpdatePreview() ;
+}
+
+//#### The OK button was hit.
+function Ok()
+{
+	if ( GetE('txtUrl').value.length == 0 )
+	{
+		dialog.SetSelectedTab( 'Info' ) ;
+		GetE('txtUrl').focus() ;
+
+		alert( FCKLang.DlgImgAlertUrl ) ;
+
+		return false ;
+	}
+
+	var bHasImage = ( oImage != null ) ;
+
+	if ( bHasImage && bImageButton && oImage.tagName == 'IMG' )
+	{
+		if ( confirm( 'Do you want to transform the selected image on a image button?' ) )
+			oImage = null ;
+	}
+	else if ( bHasImage && !bImageButton && oImage.tagName == 'INPUT' )
+	{
+		if ( confirm( 'Do you want to transform the selected image button on a simple image?' ) )
+			oImage = null ;
+	}
+
+	oEditor.FCKUndo.SaveUndoStep() ;
+	if ( !bHasImage )
+	{
+		if ( bImageButton )
+		{
+			oImage = FCK.EditorDocument.createElement( 'input' ) ;
+			oImage.type = 'image' ;
+			oImage = FCK.InsertElement( oImage ) ;
+		}
+		else
+			oImage = FCK.InsertElement( 'img' ) ;
+	}
+
+	UpdateImage( oImage ) ;
+
+	var sLnkUrl = GetE('txtLnkUrl').value.Trim() ;
+
+	if ( sLnkUrl.length == 0 )
+	{
+		if ( oLink )
+			FCK.ExecuteNamedCommand( 'Unlink' ) ;
+	}
+	else
+	{
+		if ( oLink )	// Modifying an existent link.
+			oLink.href = sLnkUrl ;
+		else			// Creating a new link.
+		{
+			if ( !bHasImage )
+				oEditor.FCKSelection.SelectNode( oImage ) ;
+
+			oLink = oEditor.FCK.CreateLink( sLnkUrl )[0] ;
+
+			if ( !bHasImage )
+			{
+				oEditor.FCKSelection.SelectNode( oLink ) ;
+				oEditor.FCKSelection.Collapse( false ) ;
+			}
+		}
+
+		SetAttribute( oLink, '_fcksavedurl', sLnkUrl ) ;
+		SetAttribute( oLink, 'target', GetE('cmbLnkTarget').value ) ;
+	}
+
+	return true ;
+}
+
+function UpdateImage( e, skipId )
+{
+	e.src = GetE('txtUrl').value ;
+	SetAttribute( e, "_fcksavedurl", GetE('txtUrl').value ) ;
+	SetAttribute( e, "alt"   , GetE('txtAlt').value ) ;
+	SetAttribute( e, "width" , GetE('txtWidth').value ) ;
+	SetAttribute( e, "height", GetE('txtHeight').value ) ;
+	SetAttribute( e, "vspace", GetE('txtVSpace').value ) ;
+	SetAttribute( e, "hspace", GetE('txtHSpace').value ) ;
+	SetAttribute( e, "border", GetE('txtBorder').value ) ;
+	SetAttribute( e, "align" , GetE('cmbAlign').value ) ;
+
+	// Advances Attributes
+
+	if ( ! skipId )
+		SetAttribute( e, 'id', GetE('txtAttId').value ) ;
+
+	SetAttribute( e, 'dir'		, GetE('cmbAttLangDir').value ) ;
+	SetAttribute( e, 'lang'		, GetE('txtAttLangCode').value ) ;
+	SetAttribute( e, 'title'	, GetE('txtAttTitle').value ) ;
+	SetAttribute( e, 'longDesc'	, GetE('txtLongDesc').value ) ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+	{
+		e.className = GetE('txtAttClasses').value ;
+		e.style.cssText = GetE('txtAttStyle').value ;
+	}
+	else
+	{
+		SetAttribute( e, 'class'	, GetE('txtAttClasses').value ) ;
+		SetAttribute( e, 'style', GetE('txtAttStyle').value ) ;
+	}
+}
+
+var eImgPreview ;
+var eImgPreviewLink ;
+
+function SetPreviewElements( imageElement, linkElement )
+{
+	eImgPreview = imageElement ;
+	eImgPreviewLink = linkElement ;
+
+	UpdatePreview() ;
+	UpdateOriginal() ;
+
+	bPreviewInitialized = true ;
+}
+
+function UpdatePreview()
+{
+	if ( !eImgPreview || !eImgPreviewLink )
+		return ;
+
+	if ( GetE('txtUrl').value.length == 0 )
+		eImgPreviewLink.style.display = 'none' ;
+	else
+	{
+		UpdateImage( eImgPreview, true ) ;
+
+		if ( GetE('txtLnkUrl').value.Trim().length > 0 )
+			eImgPreviewLink.href = 'javascript:void(null);' ;
+		else
+			SetAttribute( eImgPreviewLink, 'href', '' ) ;
+
+		eImgPreviewLink.style.display = '' ;
+	}
+}
+
+var bLockRatio = true ;
+
+function SwitchLock( lockButton )
+{
+	bLockRatio = !bLockRatio ;
+	lockButton.className = bLockRatio ? 'BtnLocked' : 'BtnUnlocked' ;
+	lockButton.title = bLockRatio ? 'Lock sizes' : 'Unlock sizes' ;
+
+	if ( bLockRatio )
+	{
+		if ( GetE('txtWidth').value.length > 0 )
+			OnSizeChanged( 'Width', GetE('txtWidth').value ) ;
+		else
+			OnSizeChanged( 'Height', GetE('txtHeight').value ) ;
+	}
+}
+
+// Fired when the width or height input texts change
+function OnSizeChanged( dimension, value )
+{
+	// Verifies if the aspect ration has to be maintained
+	if ( oImageOriginal && bLockRatio )
+	{
+		var e = dimension == 'Width' ? GetE('txtHeight') : GetE('txtWidth') ;
+
+		if ( value.length == 0 || isNaN( value ) )
+		{
+			e.value = '' ;
+			return ;
+		}
+
+		if ( dimension == 'Width' )
+			value = value == 0 ? 0 : Math.round( oImageOriginal.height * ( value  / oImageOriginal.width ) ) ;
+		else
+			value = value == 0 ? 0 : Math.round( oImageOriginal.width  * ( value / oImageOriginal.height ) ) ;
+
+		if ( !isNaN( value ) )
+			e.value = value ;
+	}
+
+	UpdatePreview() ;
+}
+
+// Fired when the Reset Size button is clicked
+function ResetSizes()
+{
+	if ( ! oImageOriginal ) return ;
+	if ( oEditor.FCKBrowserInfo.IsGecko && !oImageOriginal.complete )
+	{
+		setTimeout( ResetSizes, 50 ) ;
+		return ;
+	}
+
+	GetE('txtWidth').value  = oImageOriginal.width ;
+	GetE('txtHeight').value = oImageOriginal.height ;
+
+	UpdatePreview() ;
+}
+
+function BrowseServer()
+{
+	OpenServerBrowser(
+		'Image',
+		FCKConfig.ImageBrowserURL,
+		FCKConfig.ImageBrowserWindowWidth,
+		FCKConfig.ImageBrowserWindowHeight ) ;
+}
+
+function LnkBrowseServer()
+{
+	OpenServerBrowser(
+		'Link',
+		FCKConfig.LinkBrowserURL,
+		FCKConfig.LinkBrowserWindowWidth,
+		FCKConfig.LinkBrowserWindowHeight ) ;
+}
+
+function OpenServerBrowser( type, url, width, height )
+{
+	sActualBrowser = type ;
+	OpenFileBrowser( url, width, height ) ;
+}
+
+var sActualBrowser ;
+
+function SetUrl( url, width, height, alt )
+{
+	if ( sActualBrowser == 'Link' )
+	{
+		GetE('txtLnkUrl').value = url ;
+		UpdatePreview() ;
+	}
+	else
+	{
+		GetE('txtUrl').value = url ;
+		GetE('txtWidth').value = width ? width : '' ;
+		GetE('txtHeight').value = height ? height : '' ;
+
+		if ( alt )
+			GetE('txtAlt').value = alt;
+
+		UpdatePreview() ;
+		UpdateOriginal( true ) ;
+	}
+
+	dialog.SetSelectedTab( 'Info' ) ;
+}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
+{
+	// Remove animation
+	window.parent.Throbber.Hide() ;
+	GetE( 'divUpload' ).style.display  = '' ;
+
+	switch ( errorNumber )
+	{
+		case 0 :	// No errors
+			alert( 'Your file has been successfully uploaded' ) ;
+			break ;
+		case 1 :	// Custom error
+			alert( customMsg ) ;
+			return ;
+		case 101 :	// Custom warning
+			alert( customMsg ) ;
+			break ;
+		case 201 :
+			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
+			break ;
+		case 202 :
+			alert( 'Invalid file type' ) ;
+			return ;
+		case 203 :
+			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
+			return ;
+		case 500 :
+			alert( 'The connector is disabled' ) ;
+			break ;
+		default :
+			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
+			return ;
+	}
+
+	sActualBrowser = '' ;
+	SetUrl( fileUrl ) ;
+	GetE('frmUpload').reset() ;
+}
+
+var oUploadAllowedExtRegex	= new RegExp( FCKConfig.ImageUploadAllowedExtensions, 'i' ) ;
+var oUploadDeniedExtRegex	= new RegExp( FCKConfig.ImageUploadDeniedExtensions, 'i' ) ;
+
+function CheckUpload()
+{
+	var sFile = GetE('txtUploadFile').value ;
+
+	if ( sFile.length == 0 )
+	{
+		alert( 'Please select a file to upload' ) ;
+		return false ;
+	}
+
+	if ( ( FCKConfig.ImageUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
+		( FCKConfig.ImageUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
+	{
+		OnUploadCompleted( 202 ) ;
+		return false ;
+	}
+
+	// Show animation
+	window.parent.Throbber.Show( 100 ) ;
+	GetE( 'divUpload' ).style.display  = 'none' ;
+
+	return true ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image_preview.html b/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image_preview.html
new file mode 100644
index 000000000..81f44e8d0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_image/fck_image_preview.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Preview page for the Image dialog window.
+ *
+ * Curiosity: http://en.wikipedia.org/wiki/Lorem_ipsum
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="../common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var FCKTools	= window.parent.FCKTools ;
+var FCKConfig	= window.parent.FCKConfig ;
+
+// Set the preview CSS
+document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) ) ;
+document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaStyles ) ) ;
+
+if ( window.parent.FCKConfig.BaseHref.length > 0 )
+	document.write( '<base href="' + window.parent.FCKConfig.BaseHref + '">' ) ;
+
+window.onload = function()
+{
+	window.parent.SetPreviewElements(
+		document.getElementById( 'imgPreview' ),
+		document.getElementById( 'lnkPreview' ) ) ;
+}
+
+	</script>
+</head>
+<body>
+	<div>
+		<a id="lnkPreview" onclick="return false;" style="cursor: default">
+			<img id="imgPreview" onload="window.parent.UpdateOriginal();"
+				style="display: none" alt="" /></a>Lorem ipsum dolor sit amet, consectetuer adipiscing
+		elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus
+		a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis,
+		nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed
+		velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper
+		nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices
+		a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus
+		faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget
+		tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit,
+		tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis
+		id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus,
+		eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur
+		ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.
+	</div>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_link.html b/modules/editor/skins/fckeditor/editor/dialog/fck_link.html
new file mode 100644
index 000000000..6d69e6e2c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_link.html
@@ -0,0 +1,295 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Link dialog window.
+-->
+<html>
+	<head>
+		<title>Link Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script src="fck_link/fck_link.js" type="text/javascript"></script>
+	</head>
+	<body scroll="no" style="OVERFLOW: hidden">
+		<div id="divInfo" style="DISPLAY: none">
+			<span fckLang="DlgLnkType">Link Type</span><br />
+			<select id="cmbLinkType" onchange="SetLinkType(this.value);">
+				<option value="url" fckLang="DlgLnkTypeURL" selected="selected">URL</option>
+				<option value="anchor" fckLang="DlgLnkTypeAnchor">Anchor in this page</option>
+				<option value="email" fckLang="DlgLnkTypeEMail">E-Mail</option>
+			</select>
+			<br />
+			<br />
+			<div id="divLinkTypeUrl">
+				<table cellspacing="0" cellpadding="0" width="100%" border="0" dir="ltr">
+					<tr>
+						<td nowrap="nowrap">
+							<span fckLang="DlgLnkProto">Protocol</span><br />
+							<select id="cmbLinkProtocol">
+								<option value="http://" selected="selected">http://</option>
+								<option value="https://">https://</option>
+								<option value="ftp://">ftp://</option>
+								<option value="news://">news://</option>
+								<option value="" fckLang="DlgLnkProtoOther">&lt;other&gt;</option>
+							</select>
+						</td>
+						<td nowrap="nowrap">&nbsp;</td>
+						<td nowrap="nowrap" width="100%">
+							<span fckLang="DlgLnkURL">URL</span><br />
+							<input id="txtUrl" style="WIDTH: 100%" type="text" onkeyup="OnUrlChange();" onchange="OnUrlChange();" />
+						</td>
+					</tr>
+				</table>
+				<br />
+				<div id="divBrowseServer">
+				<input type="button" value="Browse Server" fckLang="DlgBtnBrowseServer" onclick="BrowseServer();" />
+				</div>
+			</div>
+			<div id="divLinkTypeAnchor" style="DISPLAY: none" align="center">
+				<div id="divSelAnchor" style="DISPLAY: none">
+					<table cellspacing="0" cellpadding="0" border="0" width="70%">
+						<tr>
+							<td colspan="3">
+								<span fckLang="DlgLnkAnchorSel">Select an Anchor</span>
+							</td>
+						</tr>
+						<tr>
+							<td width="50%">
+								<span fckLang="DlgLnkAnchorByName">By Anchor Name</span><br />
+								<select id="cmbAnchorName" onchange="GetE('cmbAnchorId').value='';" style="WIDTH: 100%">
+									<option value="" selected="selected"></option>
+								</select>
+							</td>
+							<td>&nbsp;&nbsp;&nbsp;</td>
+							<td width="50%">
+								<span fckLang="DlgLnkAnchorById">By Element Id</span><br />
+								<select id="cmbAnchorId" onchange="GetE('cmbAnchorName').value='';" style="WIDTH: 100%">
+									<option value="" selected="selected"></option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</div>
+				<div id="divNoAnchor" style="DISPLAY: none">
+					<span fckLang="DlgLnkNoAnchors">&lt;No anchors available in the document&gt;</span>
+				</div>
+			</div>
+			<div id="divLinkTypeEMail" style="DISPLAY: none">
+				<span fckLang="DlgLnkEMail">E-Mail Address</span><br />
+				<input id="txtEMailAddress" style="WIDTH: 100%" type="text" /><br />
+				<span fckLang="DlgLnkEMailSubject">Message Subject</span><br />
+				<input id="txtEMailSubject" style="WIDTH: 100%" type="text" /><br />
+				<span fckLang="DlgLnkEMailBody">Message Body</span><br />
+				<textarea id="txtEMailBody" style="WIDTH: 100%" rows="3" cols="20"></textarea>
+			</div>
+		</div>
+		<div id="divUpload" style="DISPLAY: none">
+			<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data" action="" onsubmit="return CheckUpload();">
+				<span fckLang="DlgLnkUpload">Upload</span><br />
+				<input id="txtUploadFile" style="WIDTH: 100%" type="file" size="40" name="NewFile" /><br />
+				<br />
+				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
+				<script type="text/javascript">
+					document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
+				</script>
+			</form>
+		</div>
+		<div id="divTarget" style="DISPLAY: none">
+			<table cellspacing="0" cellpadding="0" width="100%" border="0">
+				<tr>
+					<td nowrap="nowrap">
+						<span fckLang="DlgLnkTarget">Target</span><br />
+						<select id="cmbTarget" onchange="SetTarget(this.value);">
+							<option value="" fckLang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
+							<option value="frame" fckLang="DlgLnkTargetFrame">&lt;frame&gt;</option>
+							<option value="popup" fckLang="DlgLnkTargetPopup">&lt;popup window&gt;</option>
+							<option value="_blank" fckLang="DlgLnkTargetBlank">New Window (_blank)</option>
+							<option value="_top" fckLang="DlgLnkTargetTop">Topmost Window (_top)</option>
+							<option value="_self" fckLang="DlgLnkTargetSelf">Same Window (_self)</option>
+							<option value="_parent" fckLang="DlgLnkTargetParent">Parent Window (_parent)</option>
+						</select>
+					</td>
+					<td>&nbsp;</td>
+					<td id="tdTargetFrame" nowrap="nowrap" width="100%">
+						<span fckLang="DlgLnkTargetFrameName">Target Frame Name</span><br />
+						<input id="txtTargetFrame" style="WIDTH: 100%" type="text" onkeyup="OnTargetNameChange();"
+							onchange="OnTargetNameChange();" />
+					</td>
+					<td id="tdPopupName" style="DISPLAY: none" nowrap="nowrap" width="100%">
+						<span fckLang="DlgLnkPopWinName">Popup Window Name</span><br />
+						<input id="txtPopupName" style="WIDTH: 100%" type="text" />
+					</td>
+				</tr>
+			</table>
+			<br />
+			<table id="tablePopupFeatures" style="DISPLAY: none" cellspacing="0" cellpadding="0" align="center"
+				border="0">
+				<tr>
+					<td>
+						<span fckLang="DlgLnkPopWinFeat">Popup Window Features</span><br />
+						<table cellspacing="0" cellpadding="0" border="0">
+							<tr>
+								<td valign="top" nowrap="nowrap" width="50%">
+									<input id="chkPopupResizable" name="chkFeature" value="resizable" type="checkbox" /><label for="chkPopupResizable" fckLang="DlgLnkPopResize">Resizable</label><br />
+									<input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location
+										Bar</label><br />
+									<input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu
+										Bar</label><br />
+									<input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll
+										Bars</label>
+								</td>
+								<td></td>
+								<td valign="top" nowrap="nowrap" width="50%">
+									<input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status
+										Bar</label><br />
+									<input id="chkPopupToolbar" name="chkFeature" value="toolbar" type="checkbox" /><label for="chkPopupToolbar" fckLang="DlgLnkPopToolbar">Toolbar</label><br />
+									<input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full
+										Screen (IE)</label><br />
+									<input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent
+										(Netscape)</label>
+								</td>
+							</tr>
+							<tr>
+								<td valign="top" nowrap="nowrap" width="50%">&nbsp;</td>
+								<td></td>
+								<td valign="top" nowrap="nowrap" width="50%"></td>
+							</tr>
+							<tr>
+								<td valign="top">
+									<table cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td nowrap="nowrap"><span fckLang="DlgLnkPopWidth">Width</span></td>
+											<td>&nbsp;<input id="txtPopupWidth" type="text" maxlength="4" size="4" /></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span fckLang="DlgLnkPopHeight">Height</span></td>
+											<td>&nbsp;<input id="txtPopupHeight" type="text" maxlength="4" size="4" /></td>
+										</tr>
+									</table>
+								</td>
+								<td>&nbsp;&nbsp;</td>
+								<td valign="top">
+									<table cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td nowrap="nowrap"><span fckLang="DlgLnkPopLeft">Left Position</span></td>
+											<td>&nbsp;<input id="txtPopupLeft" type="text" maxlength="4" size="4" /></td>
+										</tr>
+										<tr>
+											<td nowrap="nowrap"><span fckLang="DlgLnkPopTop">Top Position</span></td>
+											<td>&nbsp;<input id="txtPopupTop" type="text" maxlength="4" size="4" /></td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div id="divAttribs" style="DISPLAY: none">
+			<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+				<tr>
+					<td valign="top" width="50%">
+						<span fckLang="DlgGenId">Id</span><br />
+						<input id="txtAttId" style="WIDTH: 100%" type="text" />
+					</td>
+					<td width="1"></td>
+					<td valign="top">
+						<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+							<tr>
+								<td width="60%">
+									<span fckLang="DlgGenLangDir">Language Direction</span><br />
+									<select id="cmbAttLangDir" style="WIDTH: 100%">
+										<option value="" fckLang="DlgGenNotSet" selected>&lt;not set&gt;</option>
+										<option value="ltr" fckLang="DlgGenLangDirLtr">Left to Right (LTR)</option>
+										<option value="rtl" fckLang="DlgGenLangDirRtl">Right to Left (RTL)</option>
+									</select>
+								</td>
+								<td width="1%">&nbsp;&nbsp;&nbsp;</td>
+								<td nowrap="nowrap"><span fckLang="DlgGenAccessKey">Access Key</span><br />
+									<input id="txtAttAccessKey" style="WIDTH: 100%" type="text" maxlength="1" size="1" />
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td valign="top" width="50%">
+						<span fckLang="DlgGenName">Name</span><br />
+						<input id="txtAttName" style="WIDTH: 100%" type="text" />
+					</td>
+					<td width="1"></td>
+					<td valign="top">
+						<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+							<tr>
+								<td width="60%">
+									<span fckLang="DlgGenLangCode">Language Code</span><br />
+									<input id="txtAttLangCode" style="WIDTH: 100%" type="text" />
+								</td>
+								<td width="1%">&nbsp;&nbsp;&nbsp;</td>
+								<td nowrap="nowrap">
+									<span fckLang="DlgGenTabIndex">Tab Index</span><br />
+									<input id="txtAttTabIndex" style="WIDTH: 100%" type="text" maxlength="5" size="5" />
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td valign="top" width="50%">&nbsp;</td>
+					<td width="1"></td>
+					<td valign="top"></td>
+				</tr>
+				<tr>
+					<td valign="top" width="50%">
+						<span fckLang="DlgGenTitle">Advisory Title</span><br />
+						<input id="txtAttTitle" style="WIDTH: 100%" type="text" />
+					</td>
+					<td width="1">&nbsp;&nbsp;&nbsp;</td>
+					<td valign="top">
+						<span fckLang="DlgGenContType">Advisory Content Type</span><br />
+						<input id="txtAttContentType" style="WIDTH: 100%" type="text" />
+					</td>
+				</tr>
+				<tr>
+					<td valign="top">
+						<span fckLang="DlgGenClass">Stylesheet Classes</span><br />
+						<input id="txtAttClasses" style="WIDTH: 100%" type="text" />
+					</td>
+					<td></td>
+					<td valign="top">
+						<span fckLang="DlgGenLinkCharset">Linked Resource Charset</span><br />
+						<input id="txtAttCharSet" style="WIDTH: 100%" type="text" />
+					</td>
+				</tr>
+			</table>
+			<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
+				<tr>
+					<td>
+						<span fckLang="DlgGenStyle">Style</span><br />
+						<input id="txtAttStyle" style="WIDTH: 100%" type="text" />
+					</td>
+				</tr>
+			</table>
+		</div>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_link/fck_link.js b/modules/editor/skins/fckeditor/editor/dialog/fck_link/fck_link.js
new file mode 100644
index 000000000..817b3e1f4
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_link/fck_link.js
@@ -0,0 +1,893 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Link dialog window (see fck_link.html).
+ */
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+var FCK			= oEditor.FCK ;
+var FCKLang		= oEditor.FCKLang ;
+var FCKConfig	= oEditor.FCKConfig ;
+var FCKRegexLib	= oEditor.FCKRegexLib ;
+var FCKTools	= oEditor.FCKTools ;
+
+//#### Dialog Tabs
+
+// Set the dialog tabs.
+dialog.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
+
+if ( !FCKConfig.LinkDlgHideTarget )
+	dialog.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
+
+if ( FCKConfig.LinkUpload )
+	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
+
+if ( !FCKConfig.LinkDlgHideAdvanced )
+	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
+
+// Function called when a dialog tag is selected.
+function OnDialogTabChange( tabCode )
+{
+	ShowE('divInfo'		, ( tabCode == 'Info' ) ) ;
+	ShowE('divTarget'	, ( tabCode == 'Target' ) ) ;
+	ShowE('divUpload'	, ( tabCode == 'Upload' ) ) ;
+	ShowE('divAttribs'	, ( tabCode == 'Advanced' ) ) ;
+
+	dialog.SetAutoSize( true ) ;
+}
+
+//#### Regular Expressions library.
+var oRegex = new Object() ;
+
+oRegex.UriProtocol = /^(((http|https|ftp|news):\/\/)|mailto:)/gi ;
+
+oRegex.UrlOnChangeProtocol = /^(http|https|ftp|news):\/\/(?=.)/gi ;
+
+oRegex.UrlOnChangeTestOther = /^((javascript:)|[#\/\.])/gi ;
+
+oRegex.ReserveTarget = /^_(blank|self|top|parent)$/i ;
+
+oRegex.PopupUri = /^javascript:void\(\s*window.open\(\s*'([^']+)'\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*\)\s*$/ ;
+
+// Accessible popups
+oRegex.OnClickPopup = /^\s*on[cC]lick="\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*"$/ ;
+
+oRegex.PopupFeatures = /(?:^|,)([^=]+)=(\d+|yes|no)/gi ;
+
+//#### Parser Functions
+
+var oParser = new Object() ;
+
+// This method simply returns the two inputs in numerical order. You can even
+// provide strings, as the method would parseInt() the values.
+oParser.SortNumerical = function(a, b)
+{
+	return parseInt( a, 10 ) - parseInt( b, 10 ) ;
+}
+
+oParser.ParseEMailParams = function(sParams)
+{
+	// Initialize the oEMailParams object.
+	var oEMailParams = new Object() ;
+	oEMailParams.Subject = '' ;
+	oEMailParams.Body = '' ;
+
+	var aMatch = sParams.match( /(^|^\?|&)subject=([^&]+)/i ) ;
+	if ( aMatch ) oEMailParams.Subject = decodeURIComponent( aMatch[2] ) ;
+
+	aMatch = sParams.match( /(^|^\?|&)body=([^&]+)/i ) ;
+	if ( aMatch ) oEMailParams.Body = decodeURIComponent( aMatch[2] ) ;
+
+	return oEMailParams ;
+}
+
+// This method returns either an object containing the email info, or FALSE
+// if the parameter is not an email link.
+oParser.ParseEMailUri = function( sUrl )
+{
+	// Initializes the EMailInfo object.
+	var oEMailInfo = new Object() ;
+	oEMailInfo.Address = '' ;
+	oEMailInfo.Subject = '' ;
+	oEMailInfo.Body = '' ;
+
+	var aLinkInfo = sUrl.match( /^(\w+):(.*)$/ ) ;
+	if ( aLinkInfo && aLinkInfo[1] == 'mailto' )
+	{
+		// This seems to be an unprotected email link.
+		var aParts = aLinkInfo[2].match( /^([^\?]+)\??(.+)?/ ) ;
+		if ( aParts )
+		{
+			// Set the e-mail address.
+			oEMailInfo.Address = aParts[1] ;
+
+			// Look for the optional e-mail parameters.
+			if ( aParts[2] )
+			{
+				var oEMailParams = oParser.ParseEMailParams( aParts[2] ) ;
+				oEMailInfo.Subject = oEMailParams.Subject ;
+				oEMailInfo.Body = oEMailParams.Body ;
+			}
+		}
+		return oEMailInfo ;
+	}
+	else if ( aLinkInfo && aLinkInfo[1] == 'javascript' )
+	{
+		// This may be a protected email.
+
+		// Try to match the url against the EMailProtectionFunction.
+		var func = FCKConfig.EMailProtectionFunction ;
+		if ( func != null )
+		{
+			try
+			{
+				// Escape special chars.
+				func = func.replace( /([\/^$*+.?()\[\]])/g, '\\$1' ) ;
+
+				// Define the possible keys.
+				var keys = new Array('NAME', 'DOMAIN', 'SUBJECT', 'BODY') ;
+
+				// Get the order of the keys (hold them in the array <pos>) and
+				// the function replaced by regular expression patterns.
+				var sFunc = func ;
+				var pos = new Array() ;
+				for ( var i = 0 ; i < keys.length ; i ++ )
+				{
+					var rexp = new RegExp( keys[i] ) ;
+					var p = func.search( rexp ) ;
+					if ( p >= 0 )
+					{
+						sFunc = sFunc.replace( rexp, '\'([^\']*)\'' ) ;
+						pos[pos.length] = p + ':' + keys[i] ;
+					}
+				}
+
+				// Sort the available keys.
+				pos.sort( oParser.SortNumerical ) ;
+
+				// Replace the excaped single quotes in the url, such they do
+				// not affect the regexp afterwards.
+				aLinkInfo[2] = aLinkInfo[2].replace( /\\'/g, '###SINGLE_QUOTE###' ) ;
+
+				// Create the regexp and execute it.
+				var rFunc = new RegExp( '^' + sFunc + '$' ) ;
+				var aMatch = rFunc.exec( aLinkInfo[2] ) ;
+				if ( aMatch )
+				{
+					var aInfo = new Array();
+					for ( var i = 1 ; i < aMatch.length ; i ++ )
+					{
+						var k = pos[i-1].match(/^\d+:(.+)$/) ;
+						aInfo[k[1]] = aMatch[i].replace(/###SINGLE_QUOTE###/g, '\'') ;
+					}
+
+					// Fill the EMailInfo object that will be returned
+					oEMailInfo.Address = aInfo['NAME'] + '@' + aInfo['DOMAIN'] ;
+					oEMailInfo.Subject = decodeURIComponent( aInfo['SUBJECT'] ) ;
+					oEMailInfo.Body = decodeURIComponent( aInfo['BODY'] ) ;
+
+					return oEMailInfo ;
+				}
+			}
+			catch (e)
+			{
+			}
+		}
+
+		// Try to match the email against the encode protection.
+		var aMatch = aLinkInfo[2].match( /^location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'$/ ) ;
+		if ( aMatch )
+		{
+			// The link is encoded
+			oEMailInfo.Address = eval( aMatch[1] ) ;
+			if ( aMatch[2] )
+			{
+				var oEMailParams = oParser.ParseEMailParams( aMatch[2] ) ;
+				oEMailInfo.Subject = oEMailParams.Subject ;
+				oEMailInfo.Body = oEMailParams.Body ;
+			}
+			return oEMailInfo ;
+		}
+	}
+	return false;
+}
+
+oParser.CreateEMailUri = function( address, subject, body )
+{
+	// Switch for the EMailProtection setting.
+	switch ( FCKConfig.EMailProtection )
+	{
+		case 'function' :
+			var func = FCKConfig.EMailProtectionFunction ;
+			if ( func == null )
+			{
+				if ( FCKConfig.Debug )
+				{
+					alert('EMailProtection alert!\nNo function defined. Please set "FCKConfig.EMailProtectionFunction"') ;
+				}
+				return '';
+			}
+
+			// Split the email address into name and domain parts.
+			var aAddressParts = address.split( '@', 2 ) ;
+			if ( aAddressParts[1] == undefined )
+			{
+				aAddressParts[1] = '' ;
+			}
+
+			// Replace the keys by their values (embedded in single quotes).
+			func = func.replace(/NAME/g, "'" + aAddressParts[0].replace(/'/g, '\\\'') + "'") ;
+			func = func.replace(/DOMAIN/g, "'" + aAddressParts[1].replace(/'/g, '\\\'') + "'") ;
+			func = func.replace(/SUBJECT/g, "'" + encodeURIComponent( subject ).replace(/'/g, '\\\'') + "'") ;
+			func = func.replace(/BODY/g, "'" + encodeURIComponent( body ).replace(/'/g, '\\\'') + "'") ;
+
+			return 'javascript:' + func ;
+
+		case 'encode' :
+			var aParams = [] ;
+			var aAddressCode = [] ;
+
+			if ( subject.length > 0 )
+				aParams.push( 'subject='+ encodeURIComponent( subject ) ) ;
+			if ( body.length > 0 )
+				aParams.push( 'body=' + encodeURIComponent( body ) ) ;
+			for ( var i = 0 ; i < address.length ; i++ )
+				aAddressCode.push( address.charCodeAt( i ) ) ;
+
+			return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ;
+	}
+
+	// EMailProtection 'none'
+
+	var sBaseUri = 'mailto:' + address ;
+
+	var sParams = '' ;
+
+	if ( subject.length > 0 )
+		sParams = '?subject=' + encodeURIComponent( subject ) ;
+
+	if ( body.length > 0 )
+	{
+		sParams += ( sParams.length == 0 ? '?' : '&' ) ;
+		sParams += 'body=' + encodeURIComponent( body ) ;
+	}
+
+	return sBaseUri + sParams ;
+}
+
+//#### Initialization Code
+
+// oLink: The actual selected link in the editor.
+var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
+if ( oLink )
+	FCK.Selection.SelectNode( oLink ) ;
+
+window.onload = function()
+{
+	// Translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	// Fill the Anchor Names and Ids combos.
+	LoadAnchorNamesAndIds() ;
+
+	// Load the selected link information (if any).
+	LoadSelection() ;
+
+	// Update the dialog box.
+	SetLinkType( GetE('cmbLinkType').value ) ;
+
+	// Show/Hide the "Browse Server" button.
+	GetE('divBrowseServer').style.display = FCKConfig.LinkBrowser ? '' : 'none' ;
+
+	// Show the initial dialog content.
+	GetE('divInfo').style.display = '' ;
+
+	// Set the actual uploader URL.
+	if ( FCKConfig.LinkUpload )
+		GetE('frmUpload').action = FCKConfig.LinkUploadURL ;
+
+	// Set the default target (from configuration).
+	SetDefaultTarget() ;
+
+	// Activate the "OK" button.
+	dialog.SetOkButton( true ) ;
+
+	// Select the first field.
+	switch( GetE('cmbLinkType').value )
+	{
+		case 'url' :
+			SelectField( 'txtUrl' ) ;
+			break ;
+		case 'email' :
+			SelectField( 'txtEMailAddress' ) ;
+			break ;
+		case 'anchor' :
+			if ( GetE('divSelAnchor').style.display != 'none' )
+				SelectField( 'cmbAnchorName' ) ;
+			else
+				SelectField( 'cmbLinkType' ) ;
+	}
+}
+
+var bHasAnchors ;
+
+function LoadAnchorNamesAndIds()
+{
+	// Since version 2.0, the anchors are replaced in the DOM by IMGs so the user see the icon
+	// to edit them. So, we must look for that images now.
+	var aAnchors = new Array() ;
+	var i ;
+	var oImages = oEditor.FCK.EditorDocument.getElementsByTagName( 'IMG' ) ;
+	for( i = 0 ; i < oImages.length ; i++ )
+	{
+		if ( oImages[i].getAttribute('_fckanchor') )
+			aAnchors[ aAnchors.length ] = oEditor.FCK.GetRealElement( oImages[i] ) ;
+	}
+
+	// Add also real anchors
+	var oLinks = oEditor.FCK.EditorDocument.getElementsByTagName( 'A' ) ;
+	for( i = 0 ; i < oLinks.length ; i++ )
+	{
+		if ( oLinks[i].name && ( oLinks[i].name.length > 0 ) )
+			aAnchors[ aAnchors.length ] = oLinks[i] ;
+	}
+
+	var aIds = FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
+
+	bHasAnchors = ( aAnchors.length > 0 || aIds.length > 0 ) ;
+
+	for ( i = 0 ; i < aAnchors.length ; i++ )
+	{
+		var sName = aAnchors[i].name ;
+		if ( sName && sName.length > 0 )
+			FCKTools.AddSelectOption( GetE('cmbAnchorName'), sName, sName ) ;
+	}
+
+	for ( i = 0 ; i < aIds.length ; i++ )
+	{
+		FCKTools.AddSelectOption( GetE('cmbAnchorId'), aIds[i], aIds[i] ) ;
+	}
+
+	ShowE( 'divSelAnchor'	, bHasAnchors ) ;
+	ShowE( 'divNoAnchor'	, !bHasAnchors ) ;
+}
+
+function LoadSelection()
+{
+	if ( !oLink ) return ;
+
+	var sType = 'url' ;
+
+	// Get the actual Link href.
+	var sHRef = oLink.getAttribute( '_fcksavedurl' ) ;
+	if ( sHRef == null )
+		sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
+
+	// Look for a popup javascript link.
+	var oPopupMatch = oRegex.PopupUri.exec( sHRef ) ;
+	if( oPopupMatch )
+	{
+		GetE('cmbTarget').value = 'popup' ;
+		sHRef = oPopupMatch[1] ;
+		FillPopupFields( oPopupMatch[2], oPopupMatch[3] ) ;
+		SetTarget( 'popup' ) ;
+	}
+
+	// Accessible popups, the popup data is in the onclick attribute
+	if ( !oPopupMatch )
+	{
+		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+		if ( onclick )
+		{
+			// Decode the protected string
+			onclick = decodeURIComponent( onclick ) ;
+
+			oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
+			if( oPopupMatch )
+			{
+				GetE( 'cmbTarget' ).value = 'popup' ;
+				FillPopupFields( oPopupMatch[1], oPopupMatch[2] ) ;
+				SetTarget( 'popup' ) ;
+			}
+		}
+	}
+
+	// Search for the protocol.
+	var sProtocol = oRegex.UriProtocol.exec( sHRef ) ;
+
+	// Search for a protected email link.
+	var oEMailInfo = oParser.ParseEMailUri( sHRef );
+
+	if ( oEMailInfo )
+	{
+		sType = 'email' ;
+
+		GetE('txtEMailAddress').value = oEMailInfo.Address ;
+		GetE('txtEMailSubject').value = oEMailInfo.Subject ;
+		GetE('txtEMailBody').value    = oEMailInfo.Body ;
+	}
+	else if ( sProtocol )
+	{
+		sProtocol = sProtocol[0].toLowerCase() ;
+		GetE('cmbLinkProtocol').value = sProtocol ;
+
+		// Remove the protocol and get the remaining URL.
+		var sUrl = sHRef.replace( oRegex.UriProtocol, '' ) ;
+		sType = 'url' ;
+		GetE('txtUrl').value = sUrl ;
+	}
+	else if ( sHRef.substr(0,1) == '#' && sHRef.length > 1 )	// It is an anchor link.
+	{
+		sType = 'anchor' ;
+		GetE('cmbAnchorName').value = GetE('cmbAnchorId').value = sHRef.substr(1) ;
+	}
+	else					// It is another type of link.
+	{
+		sType = 'url' ;
+
+		GetE('cmbLinkProtocol').value = '' ;
+		GetE('txtUrl').value = sHRef ;
+	}
+
+	if ( !oPopupMatch )
+	{
+		// Get the target.
+		var sTarget = oLink.target ;
+
+		if ( sTarget && sTarget.length > 0 )
+		{
+			if ( oRegex.ReserveTarget.test( sTarget ) )
+			{
+				sTarget = sTarget.toLowerCase() ;
+				GetE('cmbTarget').value = sTarget ;
+			}
+			else
+				GetE('cmbTarget').value = 'frame' ;
+			GetE('txtTargetFrame').value = sTarget ;
+		}
+	}
+
+	// Get Advances Attributes
+	GetE('txtAttId').value			= oLink.id ;
+	GetE('txtAttName').value		= oLink.name ;
+	GetE('cmbAttLangDir').value		= oLink.dir ;
+	GetE('txtAttLangCode').value	= oLink.lang ;
+	GetE('txtAttAccessKey').value	= oLink.accessKey ;
+	GetE('txtAttTabIndex').value	= oLink.tabIndex <= 0 ? '' : oLink.tabIndex ;
+	GetE('txtAttTitle').value		= oLink.title ;
+	GetE('txtAttContentType').value	= oLink.type ;
+	GetE('txtAttCharSet').value		= oLink.charset ;
+
+	var sClass ;
+	if ( oEditor.FCKBrowserInfo.IsIE )
+	{
+		sClass	= oLink.getAttribute('className',2) || '' ;
+		// Clean up temporary classes for internal use:
+		sClass = sClass.replace( FCKRegexLib.FCK_Class, '' ) ;
+
+		GetE('txtAttStyle').value	= oLink.style.cssText ;
+	}
+	else
+	{
+		sClass	= oLink.getAttribute('class',2) || '' ;
+		GetE('txtAttStyle').value	= oLink.getAttribute('style',2) || '' ;
+	}
+	GetE('txtAttClasses').value	= sClass ;
+
+	// Update the Link type combo.
+	GetE('cmbLinkType').value = sType ;
+}
+
+//#### Link type selection.
+function SetLinkType( linkType )
+{
+	ShowE('divLinkTypeUrl'		, (linkType == 'url') ) ;
+	ShowE('divLinkTypeAnchor'	, (linkType == 'anchor') ) ;
+	ShowE('divLinkTypeEMail'	, (linkType == 'email') ) ;
+
+	if ( !FCKConfig.LinkDlgHideTarget )
+		dialog.SetTabVisibility( 'Target'	, (linkType == 'url') ) ;
+
+	if ( FCKConfig.LinkUpload )
+		dialog.SetTabVisibility( 'Upload'	, (linkType == 'url') ) ;
+
+	if ( !FCKConfig.LinkDlgHideAdvanced )
+		dialog.SetTabVisibility( 'Advanced'	, (linkType != 'anchor' || bHasAnchors) ) ;
+
+	if ( linkType == 'email' )
+		dialog.SetAutoSize( true ) ;
+}
+
+//#### Target type selection.
+function SetTarget( targetType )
+{
+	GetE('tdTargetFrame').style.display	= ( targetType == 'popup' ? 'none' : '' ) ;
+	GetE('tdPopupName').style.display	=
+	GetE('tablePopupFeatures').style.display = ( targetType == 'popup' ? '' : 'none' ) ;
+
+	switch ( targetType )
+	{
+		case "_blank" :
+		case "_self" :
+		case "_parent" :
+		case "_top" :
+			GetE('txtTargetFrame').value = targetType ;
+			break ;
+		case "" :
+			GetE('txtTargetFrame').value = '' ;
+			break ;
+	}
+
+	if ( targetType == 'popup' )
+		dialog.SetAutoSize( true ) ;
+}
+
+//#### Called while the user types the URL.
+function OnUrlChange()
+{
+	var sUrl = GetE('txtUrl').value ;
+	var sProtocol = oRegex.UrlOnChangeProtocol.exec( sUrl ) ;
+
+	if ( sProtocol )
+	{
+		sUrl = sUrl.substr( sProtocol[0].length ) ;
+		GetE('txtUrl').value = sUrl ;
+		GetE('cmbLinkProtocol').value = sProtocol[0].toLowerCase() ;
+	}
+	else if ( oRegex.UrlOnChangeTestOther.test( sUrl ) )
+	{
+		GetE('cmbLinkProtocol').value = '' ;
+	}
+}
+
+//#### Called while the user types the target name.
+function OnTargetNameChange()
+{
+	var sFrame = GetE('txtTargetFrame').value ;
+
+	if ( sFrame.length == 0 )
+		GetE('cmbTarget').value = '' ;
+	else if ( oRegex.ReserveTarget.test( sFrame ) )
+		GetE('cmbTarget').value = sFrame.toLowerCase() ;
+	else
+		GetE('cmbTarget').value = 'frame' ;
+}
+
+// Accessible popups
+function BuildOnClickPopup()
+{
+	var sWindowName = "'" + GetE('txtPopupName').value.replace(/\W/gi, "") + "'" ;
+
+	var sFeatures = '' ;
+	var aChkFeatures = document.getElementsByName( 'chkFeature' ) ;
+	for ( var i = 0 ; i < aChkFeatures.length ; i++ )
+	{
+		if ( i > 0 ) sFeatures += ',' ;
+		sFeatures += aChkFeatures[i].value + '=' + ( aChkFeatures[i].checked ? 'yes' : 'no' ) ;
+	}
+
+	if ( GetE('txtPopupWidth').value.length > 0 )	sFeatures += ',width=' + GetE('txtPopupWidth').value ;
+	if ( GetE('txtPopupHeight').value.length > 0 )	sFeatures += ',height=' + GetE('txtPopupHeight').value ;
+	if ( GetE('txtPopupLeft').value.length > 0 )	sFeatures += ',left=' + GetE('txtPopupLeft').value ;
+	if ( GetE('txtPopupTop').value.length > 0 )		sFeatures += ',top=' + GetE('txtPopupTop').value ;
+
+	if ( sFeatures != '' )
+		sFeatures = sFeatures + ",status" ;
+
+	return ( "window.open(this.href," + sWindowName + ",'" + sFeatures + "'); return false" ) ;
+}
+
+//#### Fills all Popup related fields.
+function FillPopupFields( windowName, features )
+{
+	if ( windowName )
+		GetE('txtPopupName').value = windowName ;
+
+	var oFeatures = new Object() ;
+	var oFeaturesMatch ;
+	while( ( oFeaturesMatch = oRegex.PopupFeatures.exec( features ) ) != null )
+	{
+		var sValue = oFeaturesMatch[2] ;
+		if ( sValue == ( 'yes' || '1' ) )
+			oFeatures[ oFeaturesMatch[1] ] = true ;
+		else if ( ! isNaN( sValue ) && sValue != 0 )
+			oFeatures[ oFeaturesMatch[1] ] = sValue ;
+	}
+
+	// Update all features check boxes.
+	var aChkFeatures = document.getElementsByName('chkFeature') ;
+	for ( var i = 0 ; i < aChkFeatures.length ; i++ )
+	{
+		if ( oFeatures[ aChkFeatures[i].value ] )
+			aChkFeatures[i].checked = true ;
+	}
+
+	// Update position and size text boxes.
+	if ( oFeatures['width'] )	GetE('txtPopupWidth').value		= oFeatures['width'] ;
+	if ( oFeatures['height'] )	GetE('txtPopupHeight').value	= oFeatures['height'] ;
+	if ( oFeatures['left'] )	GetE('txtPopupLeft').value		= oFeatures['left'] ;
+	if ( oFeatures['top'] )		GetE('txtPopupTop').value		= oFeatures['top'] ;
+}
+
+//#### The OK button was hit.
+function Ok()
+{
+	var sUri, sInnerHtml ;
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	switch ( GetE('cmbLinkType').value )
+	{
+		case 'url' :
+			sUri = GetE('txtUrl').value ;
+
+			if ( sUri.length == 0 )
+			{
+				alert( FCKLang.DlnLnkMsgNoUrl ) ;
+				return false ;
+			}
+
+			sUri = GetE('cmbLinkProtocol').value + sUri ;
+
+			break ;
+
+		case 'email' :
+			sUri = GetE('txtEMailAddress').value ;
+
+			if ( sUri.length == 0 )
+			{
+				alert( FCKLang.DlnLnkMsgNoEMail ) ;
+				return false ;
+			}
+
+			sUri = oParser.CreateEMailUri(
+				sUri,
+				GetE('txtEMailSubject').value,
+				GetE('txtEMailBody').value ) ;
+			break ;
+
+		case 'anchor' :
+			var sAnchor = GetE('cmbAnchorName').value ;
+			if ( sAnchor.length == 0 ) sAnchor = GetE('cmbAnchorId').value ;
+
+			if ( sAnchor.length == 0 )
+			{
+				alert( FCKLang.DlnLnkMsgNoAnchor ) ;
+				return false ;
+			}
+
+			sUri = '#' + sAnchor ;
+			break ;
+	}
+
+	// If no link is selected, create a new one (it may result in more than one link creation - #220).
+	var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri, true ) ;
+
+	// If no selection, no links are created, so use the uri as the link text (by dom, 2006-05-26)
+	var aHasSelection = ( aLinks.length > 0 ) ;
+	if ( !aHasSelection )
+	{
+		sInnerHtml = sUri;
+
+		// Built a better text for empty links.
+		switch ( GetE('cmbLinkType').value )
+		{
+			// anchor: use old behavior --> return true
+			case 'anchor':
+				sInnerHtml = sInnerHtml.replace( /^#/, '' ) ;
+				break ;
+
+			// url: try to get path
+			case 'url':
+				var oLinkPathRegEx = new RegExp("//?([^?\"']+)([?].*)?$") ;
+				var asLinkPath = oLinkPathRegEx.exec( sUri ) ;
+				if (asLinkPath != null)
+					sInnerHtml = asLinkPath[1];  // use matched path
+				break ;
+
+			// mailto: try to get email address
+			case 'email':
+				sInnerHtml = GetE('txtEMailAddress').value ;
+				break ;
+		}
+
+		// Create a new (empty) anchor.
+		aLinks = [ oEditor.FCK.InsertElement( 'a' ) ] ;
+	}
+
+	for ( var i = 0 ; i < aLinks.length ; i++ )
+	{
+		oLink = aLinks[i] ;
+
+		if ( aHasSelection )
+			sInnerHtml = oLink.innerHTML ;		// Save the innerHTML (IE changes it if it is like an URL).
+
+		oLink.href = sUri ;
+		SetAttribute( oLink, '_fcksavedurl', sUri ) ;
+
+		var onclick;
+		// Accessible popups
+		if( GetE('cmbTarget').value == 'popup' )
+		{
+			onclick = BuildOnClickPopup() ;
+			// Encode the attribute
+			onclick = encodeURIComponent( " onclick=\"" + onclick + "\"" )  ;
+			SetAttribute( oLink, 'onclick_fckprotectedatt', onclick ) ;
+		}
+		else
+		{
+			// Check if the previous onclick was for a popup:
+			// In that case remove the onclick handler.
+			onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+			if ( onclick )
+			{
+				// Decode the protected string
+				onclick = decodeURIComponent( onclick ) ;
+
+				if( oRegex.OnClickPopup.test( onclick ) )
+					SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
+			}
+		}
+
+		oLink.innerHTML = sInnerHtml ;		// Set (or restore) the innerHTML
+
+		// Target
+		if( GetE('cmbTarget').value != 'popup' )
+			SetAttribute( oLink, 'target', GetE('txtTargetFrame').value ) ;
+		else
+			SetAttribute( oLink, 'target', null ) ;
+
+		// Let's set the "id" only for the first link to avoid duplication.
+		if ( i == 0 )
+			SetAttribute( oLink, 'id', GetE('txtAttId').value ) ;
+
+		// Advances Attributes
+		SetAttribute( oLink, 'name'		, GetE('txtAttName').value ) ;
+		SetAttribute( oLink, 'dir'		, GetE('cmbAttLangDir').value ) ;
+		SetAttribute( oLink, 'lang'		, GetE('txtAttLangCode').value ) ;
+		SetAttribute( oLink, 'accesskey', GetE('txtAttAccessKey').value ) ;
+		SetAttribute( oLink, 'tabindex'	, ( GetE('txtAttTabIndex').value > 0 ? GetE('txtAttTabIndex').value : null ) ) ;
+		SetAttribute( oLink, 'title'	, GetE('txtAttTitle').value ) ;
+		SetAttribute( oLink, 'type'		, GetE('txtAttContentType').value ) ;
+		SetAttribute( oLink, 'charset'	, GetE('txtAttCharSet').value ) ;
+
+		if ( oEditor.FCKBrowserInfo.IsIE )
+		{
+			var sClass = GetE('txtAttClasses').value ;
+			// If it's also an anchor add an internal class
+			if ( GetE('txtAttName').value.length != 0 )
+				sClass += ' FCK__AnchorC' ;
+			SetAttribute( oLink, 'className', sClass ) ;
+
+			oLink.style.cssText = GetE('txtAttStyle').value ;
+		}
+		else
+		{
+			SetAttribute( oLink, 'class', GetE('txtAttClasses').value ) ;
+			SetAttribute( oLink, 'style', GetE('txtAttStyle').value ) ;
+		}
+	}
+
+	// Select the (first) link.
+	oEditor.FCKSelection.SelectNode( aLinks[0] );
+
+	return true ;
+}
+
+function BrowseServer()
+{
+	OpenFileBrowser( FCKConfig.LinkBrowserURL, FCKConfig.LinkBrowserWindowWidth, FCKConfig.LinkBrowserWindowHeight ) ;
+}
+
+function SetUrl( url )
+{
+	GetE('txtUrl').value = url ;
+	OnUrlChange() ;
+	dialog.SetSelectedTab( 'Info' ) ;
+}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
+{
+	// Remove animation
+	window.parent.Throbber.Hide() ;
+	GetE( 'divUpload' ).style.display  = '' ;
+
+	switch ( errorNumber )
+	{
+		case 0 :	// No errors
+			alert( 'Your file has been successfully uploaded' ) ;
+			break ;
+		case 1 :	// Custom error
+			alert( customMsg ) ;
+			return ;
+		case 101 :	// Custom warning
+			alert( customMsg ) ;
+			break ;
+		case 201 :
+			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
+			break ;
+		case 202 :
+			alert( 'Invalid file type' ) ;
+			return ;
+		case 203 :
+			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
+			return ;
+		case 500 :
+			alert( 'The connector is disabled' ) ;
+			break ;
+		default :
+			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
+			return ;
+	}
+
+	SetUrl( fileUrl ) ;
+	GetE('frmUpload').reset() ;
+}
+
+var oUploadAllowedExtRegex	= new RegExp( FCKConfig.LinkUploadAllowedExtensions, 'i' ) ;
+var oUploadDeniedExtRegex	= new RegExp( FCKConfig.LinkUploadDeniedExtensions, 'i' ) ;
+
+function CheckUpload()
+{
+	var sFile = GetE('txtUploadFile').value ;
+
+	if ( sFile.length == 0 )
+	{
+		alert( 'Please select a file to upload' ) ;
+		return false ;
+	}
+
+	if ( ( FCKConfig.LinkUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
+		( FCKConfig.LinkUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
+	{
+		OnUploadCompleted( 202 ) ;
+		return false ;
+	}
+
+	// Show animation
+	window.parent.Throbber.Show( 100 ) ;
+	GetE( 'divUpload' ).style.display  = 'none' ;
+
+	return true ;
+}
+
+function SetDefaultTarget()
+{
+	var target = FCKConfig.DefaultLinkTarget || '' ;
+
+	if ( oLink || target.length == 0 )
+		return ;
+
+	switch ( target )
+	{
+		case '_blank' :
+		case '_self' :
+		case '_parent' :
+		case '_top' :
+			GetE('cmbTarget').value = target ;
+			break ;
+		default :
+			GetE('cmbTarget').value = 'frame' ;
+			break ;
+	}
+
+	GetE('txtTargetFrame').value = target ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_listprop.html b/modules/editor/skins/fckeditor/editor/dialog/fck_listprop.html
new file mode 100644
index 000000000..ef30a94b3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_listprop.html
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Bulleted List dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
+
+var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( sListType ) ;
+var oActiveSel ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( sListType == 'UL' )
+		oActiveSel = GetE('selBulleted') ;
+	else
+	{
+		if ( oActiveEl )
+		{
+			oActiveSel = GetE('selNumbered') ;
+			GetE('eStart').style.display = '' ;
+			GetE('txtStartPosition').value	= GetAttribute( oActiveEl, 'start' ) ;
+		}
+	}
+
+	oActiveSel.style.display = '' ;
+
+	if ( oActiveEl )
+	{
+		if ( oActiveEl.getAttribute('type') )
+			oActiveSel.value = oActiveEl.getAttribute('type') ;
+	}
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+
+	SelectField( sListType == 'OL' ? 'txtStartPosition' : 'selBulleted' ) ;
+}
+
+function Ok()
+{
+	if ( oActiveEl ){
+		SetAttribute( oActiveEl, 'type'	, oActiveSel.value ) ;
+		if(oActiveEl.tagName == 'OL')
+			SetAttribute( oActiveEl, 'start', GetE('txtStartPosition').value ) ;
+	}
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table width="100%" style="height: 100%">
+		<tr>
+			<td style="text-align:center">
+				<table cellspacing="0" cellpadding="0" border="0" style="margin-left: auto; margin-right: auto;">
+					<tr>
+						<td id="eStart" style="display: none; padding-right: 5px; padding-left: 5px">
+							<span fcklang="DlgLstStart">Start</span><br />
+							<input type="text" id="txtStartPosition" size="5" />
+						</td>
+						<td style="padding-right: 5px; padding-left: 5px">
+							<span fcklang="DlgLstType">List Type</span><br />
+							<select id="selBulleted" style="display: none">
+								<option value="" selected="selected"></option>
+								<option value="circle" fcklang="DlgLstTypeCircle">Circle</option>
+								<option value="disc" fcklang="DlgLstTypeDisc">Disc</option>
+								<option value="square" fcklang="DlgLstTypeSquare">Square</option>
+							</select>
+							<select id="selNumbered" style="display: none">
+								<option value="" selected="selected"></option>
+								<option value="1" fcklang="DlgLstTypeNumbers">Numbers (1, 2, 3)</option>
+								<option value="a" fcklang="DlgLstTypeLCase">Lowercase Letters (a, b, c)</option>
+								<option value="A" fcklang="DlgLstTypeUCase">Uppercase Letters (A, B, C)</option>
+								<option value="i" fcklang="DlgLstTypeSRoman">Small Roman Numerals (i, ii, iii)</option>
+								<option value="I" fcklang="DlgLstTypeLRoman">Large Roman Numerals (I, II, III)</option>
+							</select>
+							&nbsp;
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_paste.html b/modules/editor/skins/fckeditor/editor/dialog/fck_paste.html
new file mode 100644
index 000000000..40cc6f56c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_paste.html
@@ -0,0 +1,346 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This dialog is shown when, for some reason (usually security settings),
+ * the user is not able to paste data from the clipboard to the editor using
+ * the toolbar buttons or the context menu.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var FCK = oEditor.FCK;
+var FCKTools	= oEditor.FCKTools ;
+var FCKConfig	= oEditor.FCKConfig ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
+
+window.onload = function ()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	var sPastingType = dialog.Args().CustomValue ;
+
+	if ( sPastingType == 'Word' || sPastingType == 'Security' )
+	{
+		if ( sPastingType == 'Security' )
+			document.getElementById( 'xSecurityMsg' ).style.display = '' ;
+
+		// For document.domain compatibility (#123) we must do all the magic in
+		// the URL for IE.
+		var sFrameUrl = !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE ?
+			'javascript:void(0)' :
+			'javascript:void( (function(){' +
+				'document.open() ;' +
+				'document.domain=\'' + document.domain + '\' ;' +
+				'document.write(\'<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>\') ;' +
+				'document.close() ;' +
+				'document.body.contentEditable = true ;' +
+				'window.focus() ;' +
+				'})() )' ;
+
+		var eFrameSpace = document.getElementById( 'xFrameSpace' ) ;
+		eFrameSpace.innerHTML = '<iframe id="frmData" src="' + sFrameUrl + '" ' +
+					'height="98%" width="99%" frameborder="0" style="border: #000000 1px; background-color: #ffffff"><\/iframe>' ;
+
+		var oFrame = eFrameSpace.firstChild ;
+
+		if ( !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
+		{
+			// Avoid errors if the pasted content has any script that fails: #389
+			var oDoc = oFrame.contentWindow.document ;
+			oDoc.open() ;
+			oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
+			oDoc.close() ;
+
+			if ( FCKBrowserInfo.IsIE )
+				oDoc.body.contentEditable = true ;
+			else
+				oDoc.designMode = 'on' ;
+
+			oFrame.contentWindow.focus();
+		}
+	}
+	else
+	{
+		document.getElementById('txtData').style.display = '' ;
+	}
+
+	if ( sPastingType != 'Word' )
+		document.getElementById('oWordCommands').style.display = 'none' ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+}
+
+function Ok()
+{
+	// Before doing anything, save undo snapshot.
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	var sHtml ;
+
+	var sPastingType = dialog.Args().CustomValue ;
+
+	if ( sPastingType == 'Word' || sPastingType == 'Security' )
+	{
+		var oFrame = document.getElementById('frmData') ;
+		var oBody ;
+
+		if ( oFrame.contentDocument )
+			oBody = oFrame.contentDocument.body ;
+		else
+			oBody = oFrame.contentWindow.document.body ;
+
+		if ( sPastingType == 'Word' )
+		{
+			// If a plugin creates a FCK.CustomCleanWord function it will be called instead of the default one
+			if ( typeof( FCK.CustomCleanWord ) == 'function' )
+				sHtml = FCK.CustomCleanWord( oBody, document.getElementById('chkRemoveFont').checked, document.getElementById('chkRemoveStyles').checked ) ;
+			else
+				sHtml = CleanWord( oBody, document.getElementById('chkRemoveFont').checked, document.getElementById('chkRemoveStyles').checked ) ;
+		}
+		else
+			sHtml = oBody.innerHTML ;
+
+		// Fix relative anchor URLs (IE automatically adds the current page URL).
+		var re = new RegExp( window.location + "#", "g" ) ;
+		sHtml = sHtml.replace( re, '#') ;
+	}
+	else
+	{
+		sHtml = oEditor.FCKTools.HTMLEncode( document.getElementById('txtData').value )  ;
+		sHtml = FCKTools.ProcessLineBreaks( oEditor, FCKConfig, sHtml ) ;
+
+		// FCK.InsertHtml() does not work for us, since document fragments cannot contain node fragments. :(
+		// Use the marker method instead. It's primitive, but it works.
+		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+		var oDoc = oEditor.FCK.EditorDocument ;
+		dialog.Selection.EnsureSelection() ;
+		range.MoveToSelection() ;
+		range.DeleteContents() ;
+		var marker = [] ;
+		for ( var i = 0 ; i < 5 ; i++ )
+			marker.push( parseInt(Math.random() * 100000, 10 ) ) ;
+		marker = marker.join( "" ) ;
+		range.InsertNode ( oDoc.createTextNode( marker ) ) ;
+		var bookmark = range.CreateBookmark() ;
+
+		// Now we've got a marker indicating the paste position in the editor document.
+		// Find its position in the HTML code.
+		var htmlString = oDoc.body.innerHTML ;
+		var index = htmlString.indexOf( marker ) ;
+
+		// Split it the HTML code up, add the code we generated, and put them back together.
+		var htmlList = [] ;
+		htmlList.push( htmlString.substr( 0, index ) ) ;
+		htmlList.push( sHtml ) ;
+		htmlList.push( htmlString.substr( index + marker.length ) ) ;
+		htmlString = htmlList.join( "" ) ;
+
+		if ( oEditor.FCKBrowserInfo.IsIE )
+			oEditor.FCK.SetInnerHtml( htmlString ) ;
+		else
+			oDoc.body.innerHTML = htmlString ;
+
+		range.MoveToBookmark( bookmark ) ;
+		range.Collapse( false ) ;
+		range.Select() ;
+		range.Release() ;
+		return true ;
+	}
+
+	oEditor.FCK.InsertHtml( sHtml ) ;
+
+	return true ;
+}
+
+// This function will be called from the PasteFromWord dialog (fck_paste.html)
+// Input: oNode a DOM node that contains the raw paste from the clipboard
+// bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog
+// Output: the cleaned string
+function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
+{
+	var html = oNode.innerHTML ;
+
+	html = html.replace(/<o:p>\s*<\/o:p>/g, '') ;
+	html = html.replace(/<o:p>[\s\S]*?<\/o:p>/g, '&nbsp;') ;
+
+	// Remove mso-xxx styles.
+	html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;
+
+	// Remove margin styles.
+	html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ;
+	html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ;
+
+	html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ;
+	html = html.replace( /\s*TEXT-INDENT: 0cm\s*"/gi, "\"" ) ;
+
+	html = html.replace( /\s*TEXT-ALIGN: [^\s;]+;?"/gi, "\"" ) ;
+
+	html = html.replace( /\s*PAGE-BREAK-BEFORE: [^\s;]+;?"/gi, "\"" ) ;
+
+	html = html.replace( /\s*FONT-VARIANT: [^\s;]+;?"/gi, "\"" ) ;
+
+	html = html.replace( /\s*tab-stops:[^;"]*;?/gi, '' ) ;
+	html = html.replace( /\s*tab-stops:[^"]*/gi, '' ) ;
+
+	// Remove FONT face attributes.
+	if ( bIgnoreFont )
+	{
+		html = html.replace( /\s*face="[^"]*"/gi, '' ) ;
+		html = html.replace( /\s*face=[^ >]*/gi, '' ) ;
+
+		html = html.replace( /\s*FONT-FAMILY:[^;"]*;?/gi, '' ) ;
+	}
+
+	// Remove Class attributes
+	html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ;
+
+	// Remove styles.
+	if ( bRemoveStyles )
+		html = html.replace( /<(\w[^>]*) style="([^\"]*)"([^>]*)/gi, "<$1$3" ) ;
+
+	// Remove style, meta and link tags
+	html = html.replace( /<STYLE[^>]*>[\s\S]*?<\/STYLE[^>]*>/gi, '' ) ;
+	html = html.replace( /<(?:META|LINK)[^>]*>\s*/gi, '' ) ;
+
+	// Remove empty styles.
+	html =  html.replace( /\s*style="\s*"/gi, '' ) ;
+
+	html = html.replace( /<SPAN\s*[^>]*>\s*&nbsp;\s*<\/SPAN>/gi, '&nbsp;' ) ;
+
+	html = html.replace( /<SPAN\s*[^>]*><\/SPAN>/gi, '' ) ;
+
+	// Remove Lang attributes
+	html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ;
+
+	html = html.replace( /<SPAN\s*>([\s\S]*?)<\/SPAN>/gi, '$1' ) ;
+
+	html = html.replace( /<FONT\s*>([\s\S]*?)<\/FONT>/gi, '$1' ) ;
+
+	// Remove XML elements and declarations
+	html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ;
+
+	// Remove w: tags with contents.
+	html = html.replace( /<w:[^>]*>[\s\S]*?<\/w:[^>]*>/gi, '' ) ;
+
+	// Remove Tags with XML namespace declarations: <o:p><\/o:p>
+	html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
+
+	// Remove comments [SF BUG-1481861].
+	html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
+
+	html = html.replace( /<(U|I|STRIKE)>&nbsp;<\/\1>/g, '&nbsp;' ) ;
+
+	html = html.replace( /<H\d>\s*<\/H\d>/gi, '' ) ;
+
+	// Remove "display:none" tags.
+	html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none[\s\S]*?<\/\1>/ig, '' ) ;
+
+	// Remove language tags
+	html = html.replace( /<(\w[^>]*) language=([^ |>]*)([^>]*)/gi, "<$1$3") ;
+
+	// Remove onmouseover and onmouseout events (from MS Word comments effect)
+	html = html.replace( /<(\w[^>]*) onmouseover="([^\"]*)"([^>]*)/gi, "<$1$3") ;
+	html = html.replace( /<(\w[^>]*) onmouseout="([^\"]*)"([^>]*)/gi, "<$1$3") ;
+
+	if ( FCKConfig.CleanWordKeepsStructure )
+	{
+		// The original <Hn> tag send from Word is something like this: <Hn style="margin-top:0px;margin-bottom:0px">
+		html = html.replace( /<H(\d)([^>]*)>/gi, '<h$1>' ) ;
+
+		// Word likes to insert extra <font> tags, when using MSIE. (Wierd).
+		html = html.replace( /<(H\d)><FONT[^>]*>([\s\S]*?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' );
+		html = html.replace( /<(H\d)><EM>([\s\S]*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' );
+	}
+	else
+	{
+		html = html.replace( /<H1([^>]*)>/gi, '<div$1><b><font size="6">' ) ;
+		html = html.replace( /<H2([^>]*)>/gi, '<div$1><b><font size="5">' ) ;
+		html = html.replace( /<H3([^>]*)>/gi, '<div$1><b><font size="4">' ) ;
+		html = html.replace( /<H4([^>]*)>/gi, '<div$1><b><font size="3">' ) ;
+		html = html.replace( /<H5([^>]*)>/gi, '<div$1><b><font size="2">' ) ;
+		html = html.replace( /<H6([^>]*)>/gi, '<div$1><b><font size="1">' ) ;
+
+		html = html.replace( /<\/H\d>/gi, '<\/font><\/b><\/div>' ) ;
+
+		// Transform <P> to <DIV>
+		var re = new RegExp( '(<P)([^>]*>[\\s\\S]*?)(<\/P>)', 'gi' ) ;	// Different because of a IE 5.0 error
+		html = html.replace( re, '<div$2<\/div>' ) ;
+
+		// Remove empty tags (three times, just to be sure).
+		// This also removes any empty anchor
+		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
+		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
+		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
+	}
+
+	return html ;
+}
+
+	</script>
+
+</head>
+<body style="overflow: hidden">
+	<table cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 98%">
+		<tr>
+			<td>
+				<div id="xSecurityMsg" style="display: none">
+					<span fcklang="DlgPasteSec">Because of your browser security settings,
+						the editor is not able to access your clipboard data directly. You are required
+						to paste it again in this window.</span><br />
+					&nbsp;
+				</div>
+				<div>
+					<span fcklang="DlgPasteMsg2">Please paste inside the following box using the keyboard
+						(<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.</span><br />
+					&nbsp;
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td id="xFrameSpace" valign="top" height="100%" style="border: #000000 1px solid">
+				<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
+					width: 99%; height: 98%"></textarea>
+			</td>
+		</tr>
+		<tr id="oWordCommands">
+			<td>
+
+					<input id="chkRemoveFont" type="checkbox" checked="checked" />
+					<label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
+						Ignore Font Face definitions</label>
+					<br />
+					<input id="chkRemoveStyles" type="checkbox" />
+					<label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
+						Remove Styles definitions</label>
+
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_radiobutton.html b/modules/editor/skins/fckeditor/editor/dialog/fck_radiobutton.html
new file mode 100644
index 000000000..eb9aa5d10
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_radiobutton.html
@@ -0,0 +1,104 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Radio Button dialog window.
+-->
+<html>
+	<head>
+		<title>Radio Button Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl && oActiveEl.tagName.toUpperCase() == 'INPUT' && oActiveEl.type == 'radio' )
+	{
+		GetE('txtName').value		= oActiveEl.name ;
+		GetE('txtValue').value		= oEditor.FCKBrowserInfo.IsIE ? oActiveEl.value : GetAttribute( oActiveEl, 'value' ) ;
+		GetE('txtSelected').checked	= oActiveEl.checked ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'radio' } ) ;
+
+	if ( oEditor.FCKBrowserInfo.IsIE )
+		oActiveEl.value = GetE('txtValue').value ;
+	else
+		SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
+
+	var bIsChecked = GetE('txtSelected').checked ;
+	SetAttribute( oActiveEl, 'checked', bIsChecked ? 'checked' : null ) ;	// For Firefox
+	oActiveEl.checked = bIsChecked ;
+
+	return true ;
+}
+
+		</script>
+	</head>
+	<body style="OVERFLOW: hidden" scroll="no">
+		<table height="100%" width="100%">
+			<tr>
+				<td align="center">
+					<table border="0" cellpadding="0" cellspacing="0" width="80%">
+						<tr>
+							<td>
+								<span fckLang="DlgCheckboxName">Name</span><br>
+								<input type="text" size="20" id="txtName" style="WIDTH: 100%">
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<span fckLang="DlgCheckboxValue">Value</span><br>
+								<input type="text" size="20" id="txtValue" style="WIDTH: 100%">
+							</td>
+						</tr>
+						<tr>
+							<td><input type="checkbox" id="txtSelected"><label for="txtSelected" fckLang="DlgCheckboxSelected">Checked</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_replace.html b/modules/editor/skins/fckeditor/editor/dialog/fck_replace.html
new file mode 100644
index 000000000..f334d7f06
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_replace.html
@@ -0,0 +1,648 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * "Find" and "Replace" dialog box window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var dialogArguments = dialog.Args() ;
+
+var FCKLang = oEditor.FCKLang ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKListsLib = oEditor.FCKListsLib ;
+var FCKTools = oEditor.FCKTools ;
+var EditorDocument = oEditor.FCK.EditorDocument ;
+var HighlightStyle = oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' )  ;
+
+dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
+dialog.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
+var idMap = {} ;
+
+function OnDialogTabChange( tabCode )
+{
+	ShowE( 'divFind', ( tabCode == 'Find' ) ) ;
+	ShowE( 'divReplace', ( tabCode == 'Replace' ) ) ;
+	idMap['FindText'] = 'txtFind' + tabCode ;
+	idMap['CheckCase'] = 'chkCase' + tabCode ;
+	idMap['CheckWord'] = 'chkWord' + tabCode ;
+
+	if ( tabCode == 'Replace' )
+		dialog.SetAutoSize( true ) ;
+}
+
+GetNextNonEmptyTextNode = function( node, stopNode )
+{
+	while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 )
+		1 ;
+	return node ;
+}
+
+CharacterCursor = function( arg )
+{
+	if ( arg.nodeType && arg.nodeType == 9 )
+	{
+		this._textNode = GetNextNonEmptyTextNode( arg.body, arg.documentElement ) ;
+		this._offset = 0 ;
+		this._doc = arg ;
+	}
+	else
+	{
+		this._textNode = arguments[0] ;
+		this._offset = arguments[1] ;
+		this._doc = FCKTools.GetElementDocument( arguments[0] ) ;
+	}
+}
+CharacterCursor.prototype =
+{
+	GetCharacter : function()
+	{
+		return ( this._textNode && this._textNode.nodeValue.charAt( this._offset ) ) || null ;
+	},
+
+	// Non-normalized.
+	GetTextNode : function()
+	{
+		return this._textNode ;
+	},
+
+	// Non-normalized.
+	GetIndex : function()
+	{
+		return this._offset ;
+	},
+
+	// Return value means whehther we've crossed a line break or a paragraph boundary.
+	MoveNext : function()
+	{
+		if ( this._offset < this._textNode.length - 1 )
+		{
+			this._offset++ ;
+			return false ;
+		}
+
+		var crossed = false ;
+		var curNode = this._textNode ;
+		while ( ( curNode = FCKDomTools.GetNextSourceNode( curNode ) )
+				&& curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) )
+		{
+			var tag = curNode.nodeName.toLowerCase() ;
+			if ( FCKListsLib.BlockElements[tag] || tag == 'br' )
+				crossed = true ;
+		}
+
+		this._textNode = curNode ;
+		this._offset = 0 ;
+		return crossed ;
+	},
+
+	// Return value means whehther we've crossed a line break or a paragraph boundary.
+	MoveBack : function()
+	{
+		if ( this._offset > 0 && this._textNode.length > 0 )
+		{
+			this._offset = Math.min( this._offset - 1, this._textNode.length - 1 ) ;
+			return false ;
+		}
+
+		var crossed = false ;
+		var curNode = this._textNode ;
+		while ( ( curNode = FCKDomTools.GetPreviousSourceNode( curNode ) )
+				&& curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) )
+		{
+			var tag = curNode.nodeName.toLowerCase() ;
+			if ( FCKListsLib.BlockElements[tag] || tag == 'br' )
+				crossed = true ;
+		}
+
+		this._textNode = curNode ;
+		this._offset = curNode.length - 1 ;
+		return crossed ;
+	},
+
+	Clone : function()
+	{
+		return new CharacterCursor( this._textNode, this._offset ) ;
+	}
+} ;
+
+CharacterRange = function( initCursor, maxLength )
+{
+	this._cursors = initCursor.push ? initCursor : [initCursor] ;
+	this._maxLength = maxLength ;
+	this._highlightRange = null ;
+}
+CharacterRange.prototype =
+{
+	ToDomRange : function()
+	{
+		var firstCursor = this._cursors[0] ;
+		var lastCursor = this._cursors[ this._cursors.length - 1 ] ;
+		var domRange = new FCKDomRange( FCKTools.GetElementWindow( firstCursor.GetTextNode() ) ) ;
+		var w3cRange = domRange._Range = domRange.CreateRange() ;
+		w3cRange.setStart( firstCursor.GetTextNode(), firstCursor.GetIndex() ) ;
+		w3cRange.setEnd( lastCursor.GetTextNode(), lastCursor.GetIndex() + 1 ) ;
+		domRange._UpdateElementInfo() ;
+		return domRange ;
+	},
+
+	Highlight : function()
+	{
+		if ( this._cursors.length < 1 )
+			return ;
+
+		var domRange = this.ToDomRange() ;
+		HighlightStyle.ApplyToRange( domRange, false, true ) ;
+		this._highlightRange = domRange ;
+
+		var charRange = CharacterRange.CreateFromDomRange( domRange ) ;
+		var focusNode = domRange.StartNode ;
+		if ( focusNode.nodeType != 1 )
+			focusNode = focusNode.parentNode ;
+		FCKDomTools.ScrollIntoView( focusNode, false ) ;
+		this._cursors = charRange._cursors ;
+	},
+
+	RemoveHighlight : function()
+	{
+		if ( this._highlightRange )
+		{
+			HighlightStyle.RemoveFromRange( this._highlightRange, false, true ) ;
+			var charRange = CharacterRange.CreateFromDomRange( this._highlightRange ) ;
+			this._cursors = charRange._cursors ;
+			this._highlightRange = null ;
+		}
+	},
+
+	GetHighlightDomRange : function()
+	{
+		return this._highlightRange;
+	},
+
+	MoveNext : function()
+	{
+		var next = this._cursors[ this._cursors.length - 1 ].Clone() ;
+		var retval = next.MoveNext() ;
+		if ( retval )
+			this._cursors = [] ;
+		this._cursors.push( next ) ;
+		if ( this._cursors.length > this._maxLength )
+			this._cursors.shift() ;
+		return retval ;
+	},
+
+	MoveBack : function()
+	{
+		var prev = this._cursors[0].Clone() ;
+		var retval = prev.MoveBack() ;
+		if ( retval )
+			this._cursors = [] ;
+		this._cursors.unshift( prev ) ;
+		if ( this._cursors.length > this._maxLength )
+			this._cursors.pop() ;
+		return retval ;
+	},
+
+	GetEndCharacter : function()
+	{
+		if ( this._cursors.length < 1 )
+			return null ;
+		var retval = this._cursors[ this._cursors.length - 1 ].GetCharacter() ;
+		return retval ;
+	},
+
+	GetNextRange : function( len )
+	{
+		if ( this._cursors.length == 0 )
+			return null ;
+		var cur = this._cursors[ this._cursors.length - 1 ].Clone() ;
+		cur.MoveNext() ;
+		return new CharacterRange( cur, len ) ;
+	},
+
+	GetCursors : function()
+	{
+		return this._cursors ;
+	}
+} ;
+
+CharacterRange.CreateFromDomRange = function( domRange )
+{
+	var w3cRange = domRange._Range ;
+	var startContainer = w3cRange.startContainer ;
+	var endContainer = w3cRange.endContainer ;
+	var startTextNode, startIndex, endTextNode, endIndex ;
+
+	if ( startContainer.nodeType == 3 )
+	{
+		startTextNode = startContainer ;
+		startIndex = w3cRange.startOffset ;
+	}
+	else if ( domRange.StartNode.nodeType == 3 )
+	{
+		startTextNode = domRange.StartNode ;
+		startIndex = 0 ;
+	}
+	else
+	{
+		startTextNode = GetNextNonEmptyTextNode( domRange.StartNode, domRange.StartNode.parentNode ) ;
+		if ( !startTextNode )
+			return null ;
+		startIndex = 0 ;
+	}
+
+	if ( endContainer.nodeType == 3 && w3cRange.endOffset > 0 )
+	{
+		endTextNode = endContainer ;
+		endIndex = w3cRange.endOffset - 1 ;
+	}
+	else
+	{
+		endTextNode = domRange.EndNode ;
+		while ( endTextNode.nodeType != 3 )
+			endTextNode = endTextNode.lastChild ;
+		endIndex = endTextNode.length - 1 ;
+	}
+
+	var cursors = [] ;
+	var current = new CharacterCursor( startTextNode, startIndex ) ;
+	cursors.push( current ) ;
+	if ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) && !domRange.CheckIsEmpty() )
+	{
+		do
+		{
+			current = current.Clone() ;
+			current.MoveNext() ;
+			cursors.push( current ) ;
+		}
+		while ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) ) ;
+	}
+
+	return new CharacterRange( cursors, cursors.length ) ;
+}
+
+// Knuth-Morris-Pratt Algorithm for stream input
+KMP_NOMATCH = 0 ;
+KMP_ADVANCED = 1 ;
+KMP_MATCHED = 2 ;
+KmpMatch = function( pattern, ignoreCase )
+{
+	var overlap = [ -1 ] ;
+	for ( var i = 0 ; i < pattern.length ; i++ )
+	{
+		overlap.push( overlap[i] + 1 ) ;
+		while ( overlap[ i + 1 ] > 0 && pattern.charAt( i ) != pattern.charAt( overlap[ i + 1 ] - 1 ) )
+			overlap[ i + 1 ] = overlap[ overlap[ i + 1 ] - 1 ] + 1 ;
+	}
+	this._Overlap = overlap ;
+	this._State = 0 ;
+	this._IgnoreCase = ( ignoreCase === true ) ;
+	if ( ignoreCase )
+		this.Pattern = pattern.toLowerCase();
+	else
+		this.Pattern = pattern ;
+}
+KmpMatch.prototype = {
+	FeedCharacter : function( c )
+	{
+		if ( this._IgnoreCase )
+			c = c.toLowerCase();
+
+		while ( true )
+		{
+			if ( c == this.Pattern.charAt( this._State ) )
+			{
+				this._State++ ;
+				if ( this._State == this.Pattern.length )
+				{
+					// found a match, start over, don't care about partial matches involving the current match
+					this._State = 0;
+					return KMP_MATCHED;
+				}
+				return KMP_ADVANCED ;
+			}
+			else if ( this._State == 0 )
+				return KMP_NOMATCH;
+			else
+				this._State = this._Overlap[ this._State ];
+		}
+
+		return null ;
+	},
+
+	Reset : function()
+	{
+		this._State = 0 ;
+	}
+};
+
+// Place a range at the start of document.
+function OnLoad()
+{
+	// First of all, translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage( document ) ;
+
+	// Show the appropriate tab at startup.
+	if ( dialogArguments.CustomValue == 'Find' )
+	{
+		dialog.SetSelectedTab( 'Find' ) ;
+		dialog.SetAutoSize( true ) ;
+	}
+	else
+		dialog.SetSelectedTab( 'Replace' ) ;
+
+	SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
+}
+
+function btnStat()
+{
+	GetE('btnReplace').disabled =
+		GetE('btnReplaceAll').disabled =
+			GetE('btnFind').disabled =
+				( GetE(idMap["FindText"]).value.length == 0 ) ;
+}
+
+function btnStatDelayed()
+{
+	setTimeout( btnStat, 1 ) ;
+}
+
+function GetSearchString()
+{
+	return GetE(idMap['FindText']).value ;
+}
+
+function GetReplaceString()
+{
+	return GetE("txtReplace").value ;
+}
+
+function GetCheckCase()
+{
+	return !! ( GetE(idMap['CheckCase']).checked ) ;
+}
+
+function GetMatchWord()
+{
+	return !! ( GetE(idMap['CheckWord']).checked ) ;
+}
+
+/* Is this character a unicode whitespace or a punctuation mark?
+ * References:
+ * http://unicode.org/Public/UNIDATA/PropList.txt (whitespaces)
+ * http://php.chinaunix.net/manual/tw/ref.regex.php (punctuation marks)
+ */
+function CheckIsWordSeparator( c )
+{
+	var code = c.charCodeAt( 0 );
+	if ( code >= 9 && code <= 0xd )
+		return true;
+	if ( code >= 0x2000 && code <= 0x200a )
+		return true;
+	switch ( code )
+	{
+		case 0x20:
+		case 0x85:
+		case 0xa0:
+		case 0x1680:
+		case 0x180e:
+		case 0x2028:
+		case 0x2029:
+		case 0x202f:
+		case 0x205f:
+		case 0x3000:
+			return true;
+		default:
+	}
+	return /[.,"'?!;:]/.test( c ) ;
+}
+
+FindRange = null ;
+function _Find()
+{
+	var searchString = GetSearchString() ;
+	if ( !FindRange )
+		FindRange = new CharacterRange( new CharacterCursor( EditorDocument ), searchString.length ) ;
+	else
+	{
+		FindRange.RemoveHighlight() ;
+		FindRange = FindRange.GetNextRange( searchString.length ) ;
+	}
+	var matcher = new KmpMatch( searchString, ! GetCheckCase() ) ;
+	var matchState = KMP_NOMATCH ;
+	var character = '%' ;
+
+	while ( character != null )
+	{
+		while ( ( character = FindRange.GetEndCharacter() ) )
+		{
+			matchState = matcher.FeedCharacter( character ) ;
+			if ( matchState == KMP_MATCHED )
+				break ;
+			if ( FindRange.MoveNext() )
+				matcher.Reset() ;
+		}
+
+		if ( matchState == KMP_MATCHED )
+		{
+			if ( GetMatchWord() )
+			{
+				var cursors = FindRange.GetCursors() ;
+				var head = cursors[ cursors.length - 1 ].Clone() ;
+				var tail = cursors[0].Clone() ;
+				if ( !head.MoveNext() && !CheckIsWordSeparator( head.GetCharacter() ) )
+					continue ;
+				if ( !tail.MoveBack() && !CheckIsWordSeparator( tail.GetCharacter() ) )
+					continue ;
+			}
+
+			FindRange.Highlight() ;
+			return true ;
+		}
+	}
+
+	FindRange = null ;
+	return false ;
+}
+
+function Find()
+{
+	if ( ! _Find() )
+		alert( FCKLang.DlgFindNotFoundMsg ) ;
+}
+
+function Replace()
+{
+	var saveUndoStep = function( selectRange )
+	{
+		var ieRange ;
+		if ( oEditor.FCKBrowserInfo.IsIE )
+			ieRange = document.selection.createRange() ;
+
+		selectRange.Select() ;
+		oEditor.FCKUndo.SaveUndoStep() ;
+		var cloneRange = selectRange.Clone() ;
+		cloneRange.Collapse( false ) ;
+		cloneRange.Select() ;
+
+		if ( ieRange )
+			setTimeout( function(){ ieRange.select() ; }, 1 ) ;
+	}
+
+	if ( FindRange && FindRange.GetHighlightDomRange() )
+	{
+		var range = FindRange.GetHighlightDomRange() ;
+		var bookmark = range.CreateBookmark() ;
+		FindRange.RemoveHighlight() ;
+		range.MoveToBookmark( bookmark ) ;
+
+		saveUndoStep( range ) ;
+		range.DeleteContents() ;
+		range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ;
+		range._UpdateElementInfo() ;
+
+		FindRange = CharacterRange.CreateFromDomRange( range ) ;
+	}
+	else
+	{
+		if ( ! _Find() )
+		{
+			FindRange && FindRange.RemoveHighlight() ;
+			alert( FCKLang.DlgFindNotFoundMsg ) ;
+		}
+	}
+}
+
+function ReplaceAll()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+	var replaceCount = 0 ;
+
+	while ( _Find() )
+	{
+		var range = FindRange.GetHighlightDomRange() ;
+		var bookmark = range.CreateBookmark() ;
+		FindRange.RemoveHighlight() ;
+		range.MoveToBookmark( bookmark) ;
+
+		range.DeleteContents() ;
+		range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ;
+		range._UpdateElementInfo() ;
+
+		FindRange = CharacterRange.CreateFromDomRange( range ) ;
+		replaceCount++ ;
+	}
+	if ( replaceCount == 0 )
+	{
+		FindRange && FindRange.RemoveHighlight() ;
+		alert( FCKLang.DlgFindNotFoundMsg ) ;
+	}
+	dialog.Cancel() ;
+}
+
+window.onunload = function()
+{
+	if ( FindRange )
+	{
+		FindRange.RemoveHighlight() ;
+		FindRange.ToDomRange().Select() ;
+	}
+}
+	</script>
+</head>
+<body onload="OnLoad()" style="overflow: hidden">
+	<div id="divFind" style="display: none">
+		<table cellspacing="3" cellpadding="2" width="100%" border="0">
+			<tr>
+				<td nowrap="nowrap">
+					<label for="txtFindFind" fcklang="DlgReplaceFindLbl">
+						Find what:</label>
+				</td>
+				<td width="100%">
+					<input id="txtFindFind" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
+						type="text" />
+				</td>
+				<td>
+					<input id="btnFind" style="width: 80px" disabled="disabled" onclick="Find();"
+						type="button" value="Find" fcklang="DlgFindFindBtn" />
+				</td>
+			</tr>
+			<tr>
+				<td valign="bottom" colspan="3">
+					&nbsp;<input id="chkCaseFind" tabindex="3" type="checkbox" /><label for="chkCaseFind" fcklang="DlgReplaceCaseChk">Match
+						case</label>
+					<br />
+					&nbsp;<input id="chkWordFind" tabindex="4" type="checkbox" /><label for="chkWordFind" fcklang="DlgReplaceWordChk">Match
+						whole word</label>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div id="divReplace" style="display:none">
+		<table cellspacing="3" cellpadding="2" width="100%" border="0">
+			<tr>
+				<td nowrap="nowrap">
+					<label for="txtFindReplace" fcklang="DlgReplaceFindLbl">
+						Find what:</label>
+				</td>
+				<td width="100%">
+					<input id="txtFindReplace" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
+						type="text" />
+				</td>
+				<td>
+					<input id="btnReplace" style="width: 80px" disabled="disabled" onclick="Replace();"
+						type="button" value="Replace" fcklang="DlgReplaceReplaceBtn" />
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" nowrap="nowrap">
+					<label for="txtReplace" fcklang="DlgReplaceReplaceLbl">
+						Replace with:</label>
+				</td>
+				<td valign="top">
+					<input id="txtReplace" style="width: 100%" tabindex="2" type="text" />
+				</td>
+				<td>
+					<input id="btnReplaceAll" style="width: 80px" disabled="disabled" onclick="ReplaceAll()" type="button"
+						value="Replace All" fcklang="DlgReplaceReplAllBtn" />
+				</td>
+			</tr>
+			<tr>
+				<td valign="bottom" colspan="3">
+					&nbsp;<input id="chkCaseReplace" tabindex="3" type="checkbox" /><label for="chkCaseReplace" fcklang="DlgReplaceCaseChk">Match
+						case</label>
+					<br />
+					&nbsp;<input id="chkWordReplace" tabindex="4" type="checkbox" /><label for="chkWordReplace" fcklang="DlgReplaceWordChk">Match
+						whole word</label>
+				</td>
+			</tr>
+		</table>
+	</div>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_select.html b/modules/editor/skins/fckeditor/editor/dialog/fck_select.html
new file mode 100644
index 000000000..a1735a127
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_select.html
@@ -0,0 +1,180 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Select dialog window.
+-->
+<html>
+	<head>
+		<title>Select Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript" src="fck_select/fck_select.js"></script>
+		<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+var oListText ;
+var oListValue ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	oListText	= document.getElementById( 'cmbText' ) ;
+	oListValue	= document.getElementById( 'cmbValue' ) ;
+
+	// Fix the lists widths. (Bug #970)
+	oListText.style.width = oListText.offsetWidth ;
+	oListValue.style.width = oListValue.offsetWidth ;
+
+	if ( oActiveEl && oActiveEl.tagName == 'SELECT' )
+	{
+		GetE('txtName').value		= oActiveEl.name ;
+		GetE('txtSelValue').value	= oActiveEl.value ;
+		GetE('txtLines').value		= GetAttribute( oActiveEl, 'size' ) ;
+		GetE('chkMultiple').checked	= oActiveEl.multiple ;
+
+		// Load the actual options
+		for ( var i = 0 ; i < oActiveEl.options.length ; i++ )
+		{
+			var sText	= HTMLDecode( oActiveEl.options[i].innerHTML ) ;
+			var sValue	= oActiveEl.options[i].value ;
+
+			AddComboOption( oListText, sText, sText ) ;
+			AddComboOption( oListValue, sValue, sValue ) ;
+		}
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	var sSize = GetE('txtLines').value ;
+	if ( sSize == null || isNaN( sSize ) || sSize <= 1 )
+		sSize = '' ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'SELECT', {name: GetE('txtName').value} ) ;
+
+	SetAttribute( oActiveEl, 'size'	, sSize ) ;
+	oActiveEl.multiple = ( sSize.length > 0 && GetE('chkMultiple').checked ) ;
+
+	// Remove all options.
+	while ( oActiveEl.options.length > 0 )
+		oActiveEl.remove(0) ;
+
+	// Add all available options.
+	for ( var i = 0 ; i < oListText.options.length ; i++ )
+	{
+		var sText	= oListText.options[i].value ;
+		var sValue	= oListValue.options[i].value ;
+		if ( sValue.length == 0 ) sValue = sText ;
+
+		var oOption = AddComboOption( oActiveEl, sText, sValue, oDOM ) ;
+
+		if ( sValue == GetE('txtSelValue').value )
+		{
+			SetAttribute( oOption, 'selected', 'selected' ) ;
+			oOption.selected = true ;
+		}
+	}
+
+	return true ;
+}
+
+		</script>
+	</head>
+	<body style="overflow: hidden">
+		<table width="100%" height="100%">
+			<tr>
+				<td>
+					<table width="100%">
+						<tr>
+							<td nowrap><span fckLang="DlgSelectName">Name</span>&nbsp;</td>
+							<td width="100%" colSpan="2"><input id="txtName" style="WIDTH: 100%" type="text"></td>
+						</tr>
+						<tr>
+							<td nowrap><span fckLang="DlgSelectValue">Value</span>&nbsp;</td>
+							<td width="100%" colSpan="2"><input id="txtSelValue" style="WIDTH: 100%; BACKGROUND-COLOR: buttonface" type="text" readonly></td>
+						</tr>
+						<tr>
+							<td nowrap><span fckLang="DlgSelectSize">Size</span>&nbsp;</td>
+							<td nowrap><input id="txtLines" type="text" size="2" value="">&nbsp;<span fckLang="DlgSelectLines">lines</span></td>
+							<td nowrap align="right"><input id="chkMultiple" name="chkMultiple" type="checkbox"><label for="chkMultiple" fckLang="DlgSelectChkMulti">Allow
+									multiple selections</label></td>
+						</tr>
+					</table>
+					<br>
+					<hr style="POSITION: absolute">
+					<span style="LEFT: 10px; POSITION: relative; TOP: -7px" class="BackColor">&nbsp;<span fckLang="DlgSelectOpAvail">Available
+							Options</span>&nbsp;</span>
+					<table width="100%">
+						<tr>
+							<td width="50%"><span fckLang="DlgSelectOpText">Text</span><br>
+								<input id="txtText" style="WIDTH: 100%" type="text" name="txtText">
+							</td>
+							<td width="50%"><span fckLang="DlgSelectOpValue">Value</span><br>
+								<input id="txtValue" style="WIDTH: 100%" type="text" name="txtValue">
+							</td>
+							<td vAlign="bottom"><input onclick="Add();" type="button" fckLang="DlgSelectBtnAdd" value="Add"></td>
+							<td vAlign="bottom"><input onclick="Modify();" type="button" fckLang="DlgSelectBtnModify" value="Modify"></td>
+						</tr>
+						<tr>
+							<td rowSpan="2"><select id="cmbText" style="WIDTH: 100%" onchange="GetE('cmbValue').selectedIndex = this.selectedIndex;Select(this);"
+									size="5" name="cmbText"></select>
+							</td>
+							<td rowSpan="2"><select id="cmbValue" style="WIDTH: 100%" onchange="GetE('cmbText').selectedIndex = this.selectedIndex;Select(this);"
+									size="5" name="cmbValue"></select>
+							</td>
+							<td vAlign="top" colSpan="2">
+							</td>
+						</tr>
+						<tr>
+							<td vAlign="bottom" colSpan="2"><input style="WIDTH: 100%" onclick="Move(-1);" type="button" fckLang="DlgSelectBtnUp" value="Up">
+								<br>
+								<input style="WIDTH: 100%" onclick="Move(1);" type="button" fckLang="DlgSelectBtnDown"
+									value="Down">
+							</td>
+						</tr>
+						<TR>
+							<TD vAlign="bottom" colSpan="4"><INPUT onclick="SetSelectedValue();" type="button" fckLang="DlgSelectBtnSetValue" value="Set as selected value">&nbsp;&nbsp;
+								<input onclick="Delete();" type="button" fckLang="DlgSelectBtnDelete" value="Delete"></TD>
+						</TR>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_select/fck_select.js b/modules/editor/skins/fckeditor/editor/dialog/fck_select/fck_select.js
new file mode 100644
index 000000000..167e24d60
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_select/fck_select.js
@@ -0,0 +1,194 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts for the fck_select.html page.
+ */
+
+function Select( combo )
+{
+	var iIndex = combo.selectedIndex ;
+
+	oListText.selectedIndex		= iIndex ;
+	oListValue.selectedIndex	= iIndex ;
+
+	var oTxtText	= document.getElementById( "txtText" ) ;
+	var oTxtValue	= document.getElementById( "txtValue" ) ;
+
+	oTxtText.value	= oListText.value ;
+	oTxtValue.value	= oListValue.value ;
+}
+
+function Add()
+{
+	var oTxtText	= document.getElementById( "txtText" ) ;
+	var oTxtValue	= document.getElementById( "txtValue" ) ;
+
+	AddComboOption( oListText, oTxtText.value, oTxtText.value ) ;
+	AddComboOption( oListValue, oTxtValue.value, oTxtValue.value ) ;
+
+	oListText.selectedIndex = oListText.options.length - 1 ;
+	oListValue.selectedIndex = oListValue.options.length - 1 ;
+
+	oTxtText.value	= '' ;
+	oTxtValue.value	= '' ;
+
+	oTxtText.focus() ;
+}
+
+function Modify()
+{
+	var iIndex = oListText.selectedIndex ;
+
+	if ( iIndex < 0 ) return ;
+
+	var oTxtText	= document.getElementById( "txtText" ) ;
+	var oTxtValue	= document.getElementById( "txtValue" ) ;
+
+	oListText.options[ iIndex ].innerHTML	= HTMLEncode( oTxtText.value ) ;
+	oListText.options[ iIndex ].value		= oTxtText.value ;
+
+	oListValue.options[ iIndex ].innerHTML	= HTMLEncode( oTxtValue.value ) ;
+	oListValue.options[ iIndex ].value		= oTxtValue.value ;
+
+	oTxtText.value	= '' ;
+	oTxtValue.value	= '' ;
+
+	oTxtText.focus() ;
+}
+
+function Move( steps )
+{
+	ChangeOptionPosition( oListText, steps ) ;
+	ChangeOptionPosition( oListValue, steps ) ;
+}
+
+function Delete()
+{
+	RemoveSelectedOptions( oListText ) ;
+	RemoveSelectedOptions( oListValue ) ;
+}
+
+function SetSelectedValue()
+{
+	var iIndex = oListValue.selectedIndex ;
+	if ( iIndex < 0 ) return ;
+
+	var oTxtValue = document.getElementById( "txtSelValue" ) ;
+
+	oTxtValue.value = oListValue.options[ iIndex ].value ;
+}
+
+// Moves the selected option by a number of steps (also negative)
+function ChangeOptionPosition( combo, steps )
+{
+	var iActualIndex = combo.selectedIndex ;
+
+	if ( iActualIndex < 0 )
+		return ;
+
+	var iFinalIndex = iActualIndex + steps ;
+
+	if ( iFinalIndex < 0 )
+		iFinalIndex = 0 ;
+
+	if ( iFinalIndex > ( combo.options.length - 1 ) )
+		iFinalIndex = combo.options.length - 1 ;
+
+	if ( iActualIndex == iFinalIndex )
+		return ;
+
+	var oOption = combo.options[ iActualIndex ] ;
+	var sText	= HTMLDecode( oOption.innerHTML ) ;
+	var sValue	= oOption.value ;
+
+	combo.remove( iActualIndex ) ;
+
+	oOption = AddComboOption( combo, sText, sValue, null, iFinalIndex ) ;
+
+	oOption.selected = true ;
+}
+
+// Remove all selected options from a SELECT object
+function RemoveSelectedOptions(combo)
+{
+	// Save the selected index
+	var iSelectedIndex = combo.selectedIndex ;
+
+	var oOptions = combo.options ;
+
+	// Remove all selected options
+	for ( var i = oOptions.length - 1 ; i >= 0 ; i-- )
+	{
+		if (oOptions[i].selected) combo.remove(i) ;
+	}
+
+	// Reset the selection based on the original selected index
+	if ( combo.options.length > 0 )
+	{
+		if ( iSelectedIndex >= combo.options.length ) iSelectedIndex = combo.options.length - 1 ;
+		combo.selectedIndex = iSelectedIndex ;
+	}
+}
+
+// Add a new option to a SELECT object (combo or list)
+function AddComboOption( combo, optionText, optionValue, documentObject, index )
+{
+	var oOption ;
+
+	if ( documentObject )
+		oOption = documentObject.createElement("OPTION") ;
+	else
+		oOption = document.createElement("OPTION") ;
+
+	if ( index != null )
+		combo.options.add( oOption, index ) ;
+	else
+		combo.options.add( oOption ) ;
+
+	oOption.innerHTML = optionText.length > 0 ? HTMLEncode( optionText ) : '&nbsp;' ;
+	oOption.value     = optionValue ;
+
+	return oOption ;
+}
+
+function HTMLEncode( text )
+{
+	if ( !text )
+		return '' ;
+
+	text = text.replace( /&/g, '&amp;' ) ;
+	text = text.replace( /</g, '&lt;' ) ;
+	text = text.replace( />/g, '&gt;' ) ;
+
+	return text ;
+}
+
+
+function HTMLDecode( text )
+{
+	if ( !text )
+		return '' ;
+
+	text = text.replace( /&gt;/g, '>' ) ;
+	text = text.replace( /&lt;/g, '<' ) ;
+	text = text.replace( /&amp;/g, '&' ) ;
+
+	return text ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_smiley.html b/modules/editor/skins/fckeditor/editor/dialog/fck_smiley.html
new file mode 100644
index 000000000..0d6f63fd8
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_smiley.html
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Smileys (emoticons) dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<style type="text/css">
+		.Hand
+		{
+			cursor: pointer;
+			cursor: hand;
+		}
+	</style>
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+window.onload = function ()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	dialog.SetAutoSize( true ) ;
+}
+
+function InsertSmiley( url )
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	var oImg = oEditor.FCK.InsertElement( 'img' ) ;
+	oImg.src = url ;
+	oImg.setAttribute( '_fcksavedurl', url ) ;
+
+	// For long smileys list, it seams that IE continues loading the images in
+	// the background when you quickly select one image. so, let's clear
+	// everything before closing.
+	document.body.innerHTML = '' ;
+
+	dialog.Cancel() ;
+}
+
+function over(td)
+{
+	td.className = 'LightBackground Hand' ;
+}
+
+function out(td)
+{
+	td.className = 'DarkBackground Hand' ;
+}
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table cellpadding="2" cellspacing="2" align="center" border="0" width="100%" height="100%">
+		<script type="text/javascript">
+
+var FCKConfig = oEditor.FCKConfig ;
+
+var sBasePath	= FCKConfig.SmileyPath ;
+var aImages		= FCKConfig.SmileyImages ;
+var iCols		= FCKConfig.SmileyColumns ;
+var iColWidth	= parseInt( 100 / iCols, 10 ) ;
+
+var i = 0 ;
+while (i < aImages.length)
+{
+	document.write( '<tr>' ) ;
+	for(var j = 0 ; j < iCols ; j++)
+	{
+		if (aImages[i])
+		{
+			var sUrl = sBasePath + aImages[i] ;
+			document.write( '<td width="' + iColWidth + '%" align="center" class="DarkBackground Hand" onclick="InsertSmiley(\'' + sUrl.replace(/'/g, "\\'" ) + '\')" onmouseover="over(this)" onmouseout="out(this)">' ) ;
+			document.write( '<img src="' + sUrl + '" border="0" />' ) ;
+		}
+		else
+			document.write( '<td width="' + iColWidth + '%" class="DarkBackground">&nbsp;' ) ;
+		document.write( '<\/td>' ) ;
+		i++ ;
+	}
+	document.write('<\/tr>') ;
+}
+
+		</script>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_source.html b/modules/editor/skins/fckeditor/editor/dialog/fck_source.html
new file mode 100644
index 000000000..d66c28118
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_source.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Source editor dialog window.
+-->
+<html>
+	<head>
+		<title>Source</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="robots" content="noindex, nofollow">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script language="javascript">
+
+var oEditor		= window.parent.InnerDialogLoaded() ;
+var FCK			= oEditor.FCK ;
+var FCKConfig	= oEditor.FCKConfig ;
+var FCKTools	= oEditor.FCKTools ;
+
+document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
+
+window.onload = function()
+{
+	// EnableXHTML and EnableSourceXHTML has been deprecated
+//	document.getElementById('txtSource').value = ( FCKConfig.EnableXHTML && FCKConfig.EnableSourceXHTML ? FCK.GetXHTML( FCKConfig.FormatSource ) : FCK.GetHTML( FCKConfig.FormatSource ) ) ;
+	document.getElementById('txtSource').value = FCK.GetXHTML( FCKConfig.FormatSource ) ;
+
+	// Activate the "OK" button.
+	window.parent.SetOkButton( true ) ;
+}
+
+//#### The OK button was hit.
+function Ok()
+{
+	if ( oEditor.FCKBrowserInfo.IsIE )
+		oEditor.FCKUndo.SaveUndoStep() ;
+
+	FCK.SetData( document.getElementById('txtSource').value, false ) ;
+
+	return true ;
+}
+		</script>
+	</head>
+	<body scroll="no" style="OVERFLOW: hidden">
+		<table width="100%" height="100%">
+			<tr>
+				<td height="100%"><textarea id="txtSource" dir="ltr" style="PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-SIZE: 14px; PADDING-BOTTOM: 5px; WIDTH: 100%; PADDING-TOP: 5px; FONT-FAMILY: Monospace; HEIGHT: 100%">Loading. Please wait...</textarea></td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_specialchar.html b/modules/editor/skins/fckeditor/editor/dialog/fck_specialchar.html
new file mode 100644
index 000000000..d7fda32de
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_specialchar.html
@@ -0,0 +1,121 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Special Chars Selector dialog window.
+-->
+<html>
+	<head>
+		<meta name="robots" content="noindex, nofollow">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<style type="text/css">
+				.Hand
+				{
+					cursor: pointer ;
+					cursor: hand ;
+				}
+				.Sample { font-size: 24px; }
+		</style>
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var oEditor = window.parent.InnerDialogLoaded() ;
+
+var oSample ;
+
+function insertChar(charValue)
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+	oEditor.FCK.InsertHtml( charValue || "" ) ;
+	window.parent.Cancel() ;
+}
+
+function over(td)
+{
+	if ( ! oSample )
+		return ;
+	oSample.innerHTML = td.innerHTML ;
+	td.className = 'LightBackground SpecialCharsOver Hand' ;
+}
+
+function out(td)
+{
+	if ( ! oSample )
+		return ;
+	oSample.innerHTML = "&nbsp;" ;
+	td.className = 'DarkBackground SpecialCharsOut Hand' ;
+}
+
+function setDefaults()
+{
+	// Gets the sample placeholder.
+	oSample = document.getElementById("SampleTD") ;
+
+	// First of all, translates the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	window.parent.SetAutoSize( true ) ;
+}
+
+		</script>
+	</head>
+	<body onload="setDefaults()" style="overflow: hidden">
+		<table cellpadding="0" cellspacing="0" width="100%" height="100%">
+			<tr>
+				<td width="100%">
+					<table cellpadding="1" cellspacing="1" align="center" border="0" width="100%" height="100%">
+						<script type="text/javascript">
+var aChars = ["!","&quot;","#","$","%","&amp;","\\'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","&lt;","=","&gt;","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","&euro;","&lsquo;","&rsquo;","&rsquo;","&ldquo;","&rdquo;","&ndash;","&mdash;","&iexcl;","&cent;","&pound;","&curren;","&yen;","&brvbar;","&sect;","&uml;","&copy;","&ordf;","&laquo;","&not;","&reg;","&macr;","&deg;","&plusmn;","&sup2;","&sup3;","&acute;","&micro;","&para;","&middot;","&cedil;","&sup1;","&ordm;","&raquo;","&frac14;","&frac12;","&frac34;","&iquest;","&Agrave;","&Aacute;","&Acirc;","&Atilde;","&Auml;","&Aring;","&AElig;","&Ccedil;","&Egrave;","&Eacute;","&Ecirc;","&Euml;","&Igrave;","&Iacute;","&Icirc;","&Iuml;","&ETH;","&Ntilde;","&Ograve;","&Oacute;","&Ocirc;","&Otilde;","&Ouml;","&times;","&Oslash;","&Ugrave;","&Uacute;","&Ucirc;","&Uuml;","&Yacute;","&THORN;","&szlig;","&agrave;","&aacute;","&acirc;","&atilde;","&auml;","&aring;","&aelig;","&ccedil;","&egrave;","&eacute;","&ecirc;","&euml;","&igrave;","&iacute;","&icirc;","&iuml;","&eth;","&ntilde;","&ograve;","&oacute;","&ocirc;","&otilde;","&ouml;","&divide;","&oslash;","&ugrave;","&uacute;","&ucirc;","&uuml;","&uuml;","&yacute;","&thorn;","&yuml;","&OElig;","&oelig;","&#372;","&#374","&#373","&#375;","&sbquo;","&#8219;","&bdquo;","&hellip;","&trade;","&#9658;","&bull;","&rarr;","&rArr;","&hArr;","&diams;","&asymp;"] ;
+
+var cols = 20 ;
+
+var i = 0 ;
+while (i < aChars.length)
+{
+	document.write("<TR>") ;
+	for(var j = 0 ; j < cols ; j++)
+	{
+		if (aChars[i])
+		{
+			document.write('<TD width="1%" class="DarkBackground SpecialCharsOut Hand" align="center" onclick="insertChar(\'' + aChars[i].replace(/&/g, "&amp;") + '\')" onmouseover="over(this)" onmouseout="out(this)">') ;
+			document.write(aChars[i]) ;
+		}
+		else
+			document.write("<TD class='DarkBackground SpecialCharsOut'>&nbsp;") ;
+		document.write("<\/TD>") ;
+		i++ ;
+	}
+	document.write("<\/TR>") ;
+}
+						</script>
+					</table>
+				</td>
+				<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+				<td valign="top">
+					<table width="40" cellpadding="0" cellspacing="0" border="0">
+						<tr>
+							<td id="SampleTD" width="40" height="40" align="center" class="DarkBackground SpecialCharsOut Sample">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages.html b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages.html
new file mode 100644
index 000000000..87cf2c47e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Spell Check dialog window.
+-->
+<html>
+	<head>
+		<title>Spell Check</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script src="fck_spellerpages/spellerpages/spellChecker.js"></script>
+		<script type="text/javascript">
+
+var oEditor = window.parent.InnerDialogLoaded() ;
+var FCKLang = oEditor.FCKLang ;
+
+window.onload = function()
+{
+	document.getElementById('txtHtml').value = oEditor.FCK.EditorDocument.body.innerHTML ;
+
+	var oSpeller = new spellChecker( document.getElementById('txtHtml') ) ;
+	oSpeller.spellCheckScript = oEditor.FCKConfig.SpellerPagesServerScript || 'server-scripts/spellchecker.php' ;
+	oSpeller.OnFinished = oSpeller_OnFinished ;
+	oSpeller.openChecker() ;
+}
+
+function OnSpellerControlsLoad( controlsWindow )
+{
+	// Translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage( controlsWindow.document ) ;
+}
+
+function oSpeller_OnFinished( numberOCorrections )
+{
+	if ( numberOCorrections > 0 )
+	{
+		oEditor.FCKUndo.SaveUndoStep() ;
+		oEditor.FCK.EditorDocument.body.innerHTML = document.getElementById('txtHtml').value ;
+		if ( oEditor.FCKBrowserInfo.IsIE )
+			oEditor.FCKSelection.Collapse( true ) ;
+	}
+	window.parent.Cancel() ;
+}
+
+		</script>
+	</head>
+	<body style="OVERFLOW: hidden" scroll="no" style="padding:0px;">
+		<input type="hidden" id="txtHtml" value="">
+		<iframe id="frmSpell" src="javascript:void(0)" name="spellchecker" width="100%" height="100%" frameborder="0"></iframe>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
new file mode 100644
index 000000000..80af84995
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
@@ -0,0 +1,87 @@
+////////////////////////////////////////////////////
+// controlWindow object
+////////////////////////////////////////////////////
+function controlWindow( controlForm ) {
+	// private properties
+	this._form = controlForm;
+
+	// public properties
+	this.windowType = "controlWindow";
+//	this.noSuggestionSelection = "- No suggestions -";	// by FredCK
+	this.noSuggestionSelection = FCKLang.DlgSpellNoSuggestions ;
+	// set up the properties for elements of the given control form
+	this.suggestionList  = this._form.sugg;
+	this.evaluatedText   = this._form.misword;
+	this.replacementText = this._form.txtsugg;
+	this.undoButton      = this._form.btnUndo;
+
+	// public methods
+	this.addSuggestion = addSuggestion;
+	this.clearSuggestions = clearSuggestions;
+	this.selectDefaultSuggestion = selectDefaultSuggestion;
+	this.resetForm = resetForm;
+	this.setSuggestedText = setSuggestedText;
+	this.enableUndo = enableUndo;
+	this.disableUndo = disableUndo;
+}
+
+function resetForm() {
+	if( this._form ) {
+		this._form.reset();
+	}
+}
+
+function setSuggestedText() {
+	var slct = this.suggestionList;
+	var txt = this.replacementText;
+	var str = "";
+	if( (slct.options[0].text) && slct.options[0].text != this.noSuggestionSelection ) {
+		str = slct.options[slct.selectedIndex].text;
+	}
+	txt.value = str;
+}
+
+function selectDefaultSuggestion() {
+	var slct = this.suggestionList;
+	var txt = this.replacementText;
+	if( slct.options.length == 0 ) {
+		this.addSuggestion( this.noSuggestionSelection );
+	} else {
+		slct.options[0].selected = true;
+	}
+	this.setSuggestedText();
+}
+
+function addSuggestion( sugg_text ) {
+	var slct = this.suggestionList;
+	if( sugg_text ) {
+		var i = slct.options.length;
+		var newOption = new Option( sugg_text, 'sugg_text'+i );
+		slct.options[i] = newOption;
+	 }
+}
+
+function clearSuggestions() {
+	var slct = this.suggestionList;
+	for( var j = slct.length - 1; j > -1; j-- ) {
+		if( slct.options[j] ) {
+			slct.options[j] = null;
+		}
+	}
+}
+
+function enableUndo() {
+	if( this.undoButton ) {
+		if( this.undoButton.disabled == true ) {
+			this.undoButton.disabled = false;
+		}
+	}
+}
+
+function disableUndo() {
+	if( this.undoButton ) {
+		if( this.undoButton.disabled == false ) {
+			this.undoButton.disabled = true;
+		}
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
new file mode 100644
index 000000000..d91bcce2d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
@@ -0,0 +1,153 @@
+<html>
+	<head>
+		<link rel="stylesheet" type="text/css" href="spellerStyle.css" />
+		<script type="text/javascript" src="controlWindow.js"></script>
+		<script type="text/javascript">
+var spellerObject;
+var controlWindowObj;
+
+if( parent.opener ) {
+	spellerObject = parent.opener.speller;
+}
+
+function ignore_word() {
+	if( spellerObject ) {
+		spellerObject.ignoreWord();
+	}
+}
+
+function ignore_all() {
+	if( spellerObject ) {
+		spellerObject.ignoreAll();
+	}
+}
+
+function replace_word() {
+	if( spellerObject ) {
+		spellerObject.replaceWord();
+	}
+}
+
+function replace_all() {
+	if( spellerObject ) {
+		spellerObject.replaceAll();
+	}
+}
+
+function end_spell() {
+	if( spellerObject ) {
+		spellerObject.terminateSpell();
+	}
+}
+
+function undo() {
+	if( spellerObject ) {
+		spellerObject.undo();
+	}
+}
+
+function suggText() {
+	if( controlWindowObj ) {
+		controlWindowObj.setSuggestedText();
+	}
+}
+
+var FCKLang = window.parent.parent.FCKLang ;	// by FredCK
+
+function init_spell() {
+	// By FredCK (fckLang attributes have been added to the HTML source of this page)
+	window.parent.parent.OnSpellerControlsLoad( this ) ;
+
+	var controlForm = document.spellcheck;
+
+	// create a new controlWindow object
+ 	controlWindowObj = new controlWindow( controlForm );
+
+	// call the init_spell() function in the parent frameset
+	if( parent.frames.length ) {
+		parent.init_spell( controlWindowObj );
+	} else {
+		alert( 'This page was loaded outside of a frameset. It might not display properly' );
+	}
+}
+
+</script>
+	</head>
+	<body class="controlWindowBody" onLoad="init_spell();" style="OVERFLOW: hidden" scroll="no">	<!-- by FredCK -->
+		<form name="spellcheck">
+			<table border="0" cellpadding="0" cellspacing="0" border="0" align="center">
+				<tr>
+					<td colspan="3" class="normalLabel"><span fckLang="DlgSpellNotInDic">Not in dictionary:</span></td>
+				</tr>
+				<tr>
+					<td colspan="3"><input class="readonlyInput" type="text" name="misword" readonly /></td>
+				</tr>
+				<tr>
+					<td colspan="3" height="5"></td>
+				</tr>
+				<tr>
+					<td class="normalLabel"><span fckLang="DlgSpellChangeTo">Change to:</span></td>
+				</tr>
+				<tr valign="top">
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" border="0">
+							<tr>
+								<td class="normalLabel">
+									<input class="textDefault" type="text" name="txtsugg" />
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<select class="suggSlct" name="sugg" size="7" onChange="suggText();" onDblClick="replace_word();">
+										<option></option>
+									</select>
+								</td>
+							</tr>
+						</table>
+					</td>
+					<td>&nbsp;&nbsp;</td>
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" border="0">
+							<tr>
+								<td>
+									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnIgnore" value="Ignore" onClick="ignore_word();">
+								</td>
+								<td>&nbsp;&nbsp;</td>
+								<td>
+									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnIgnoreAll" value="Ignore All" onClick="ignore_all();">
+								</td>
+							</tr>
+							<tr>
+								<td colspan="3" height="5"></td>
+							</tr>
+							<tr>
+								<td>
+									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnReplace" value="Replace" onClick="replace_word();">
+								</td>
+								<td>&nbsp;&nbsp;</td>
+								<td>
+									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnReplaceAll" value="Replace All" onClick="replace_all();">
+								</td>
+							</tr>
+							<tr>
+								<td colspan="3" height="5"></td>
+							</tr>
+							<tr>
+								<td>
+									<input class="buttonDefault" type="button" name="btnUndo" fckLang="DlgSpellBtnUndo" value="Undo" onClick="undo();"
+										disabled>
+								</td>
+								<td>&nbsp;&nbsp;</td>
+								<td>
+									<!-- by FredCK
+									<input class="buttonDefault" type="button" value="Close" onClick="end_spell();">
+									-->
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</form>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
new file mode 100644
index 000000000..27e368e8b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
@@ -0,0 +1,148 @@
+<cfsetting enablecfoutputonly="true">
+<!---
+This code uses a CF User Defined Function and should work in CF version 5.0
+and up without alteration.
+
+Also if you are hosting your site at an ISP, you will have to check with them
+to see if the use of <CFEXECUTE> is allowed. In most cases ISP will not allow
+the use of that tag for security reasons. Clients would be able to access each
+others files in certain cases.
+--->
+
+<!--- The following variables values must reflect your installation. --->
+<cfset aspell_dir	  = "C:\Program Files\Aspell\bin">
+<cfset lang         = "en_US">
+<cfset aspell_opts  = "-a --lang=#lang# --encoding=utf-8 -H --rem-sgml-check=alt">
+<cfset tempfile_in  = GetTempFile(GetTempDirectory(), "spell_")>
+<cfset tempfile_out = GetTempFile(GetTempDirectory(), "spell_")>
+<cfset spellercss   = "../spellerStyle.css">
+<cfset word_win_src = "../wordWindow.js">
+
+<cfset form.checktext = form["textinputs[]"]>
+
+<!--- make no difference between URL and FORM scopes --->
+<cfparam name="url.checktext"  default="">
+<cfparam name="form.checktext" default="#url.checktext#">
+
+<!--- Takes care of those pesky smart quotes from MS apps, replaces them with regular quotes --->
+<cfset submitted_text = ReplaceList(form.checktext,"%u201C,%u201D","%22,%22")>
+
+<!--- submitted_text now is ready for processing --->
+
+<!--- use carat on each line to escape possible aspell commands --->
+<cfset text = "">
+<cfset CRLF = Chr(13) & Chr(10)>
+
+<cfloop list="#submitted_text#" index="field" delimiters=",">
+	<cfset text = text & "%"  & CRLF
+                      & "^A" & CRLF
+                      & "!"  & CRLF>
+	<!--- Strip all tags for the text. (by FredCK - #339 / #681) --->
+	<cfset field = REReplace(URLDecode(field), "<[^>]+>", " ", "all")>
+	<cfloop list="#field#" index="line" delimiters="#CRLF#">
+		<cfset text = ListAppend(text, "^" & Trim(JSStringFormat(line)), CRLF)>
+	</cfloop>
+</cfloop>
+
+<!--- create temp file from the submitted text, this will be passed to aspell to be check for misspelled words --->
+<cffile action="write" file="#tempfile_in#" output="#text#" charset="utf-8">
+
+<!--- execute aspell in an UTF-8 console and redirect output to a file. UTF-8 encoding is lost if done differently --->
+<cfexecute name="cmd.exe" arguments='/c type "#tempfile_in#" | "#aspell_dir#\aspell.exe" #aspell_opts# > "#tempfile_out#"' timeout="100"/>
+
+<!--- read output file for further processing --->
+<cffile action="read" file="#tempfile_out#" variable="food" charset="utf-8">
+
+<!--- remove temp files --->
+<cffile action="delete" file="#tempfile_in#">
+<cffile action="delete" file="#tempfile_out#">
+
+<cfset texts = StructNew()>
+<cfset texts.textinputs = "">
+<cfset texts.words      = "">
+<cfset texts.abort      = "">
+
+<!--- Generate Text Inputs --->
+<cfset i = 0>
+<cfloop list="#submitted_text#" index="textinput">
+  <cfset texts.textinputs = ListAppend(texts.textinputs, 'textinputs[#i#] = decodeURIComponent("#textinput#");', CRLF)>
+  <cfset i = i + 1>
+</cfloop>
+
+<!--- Generate Words Lists --->
+<cfset word_cnt  = 0>
+<cfset input_cnt = -1>
+<cfloop list="#food#" index="aspell_line" delimiters="#CRLF#">
+    <cfset leftChar = Left(aspell_line, 1)>
+	<cfif leftChar eq "*">
+			<cfset input_cnt   = input_cnt + 1>
+			<cfset word_cnt    = 0>
+			<cfset texts.words = ListAppend(texts.words, "words[#input_cnt#] = [];", CRLF)>
+			<cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#] = [];", CRLF)>
+    <cfelse>
+        <cfif leftChar eq "&" or leftChar eq "##">
+			<!--- word that misspelled --->
+			<cfset bad_word    = Trim(ListGetAt(aspell_line, 2, " "))>
+			<cfset bad_word    = Replace(bad_word, "'", "\'", "ALL")>
+			<!--- sugestions --->
+			<cfset sug_list    = Trim(ListRest(aspell_line, ":"))>
+			<cfset sug_list    = ListQualify(Replace(sug_list, "'", "\'", "ALL"), "'")>
+			<!--- javascript --->
+			<cfset texts.words = ListAppend(texts.words, "words[#input_cnt#][#word_cnt#] = '#bad_word#';", CRLF)>
+			<cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#][#word_cnt#] = [#sug_list#];", CRLF)>
+			<cfset word_cnt    = word_cnt + 1>
+		</cfif>
+     </cfif>
+</cfloop>
+
+<cfif texts.words eq "">
+  <cfset texts.abort = "alert('Spell check complete.\n\nNo misspellings found.'); top.window.close();">
+</cfif>
+
+<cfcontent type="text/html; charset=utf-8">
+
+<cfoutput><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="#spellercss#" />
+<script language="javascript" src="#word_win_src#"></script>
+<script language="javascript">
+var suggs      = new Array();
+var words      = new Array();
+var textinputs = new Array();
+var error;
+
+#texts.textinputs##CRLF#
+#texts.words#
+#texts.abort#
+
+var wordWindowObj = new wordWindow();
+wordWindowObj.originalSpellings = words;
+wordWindowObj.suggestions = suggs;
+wordWindowObj.textInputs = textinputs;
+
+function init_spell() {
+	// check if any error occured during server-side processing
+	if( error ) {
+		alert( error );
+	} else {
+		// call the init_spell() function in the parent frameset
+		if (parent.frames.length) {
+			parent.init_spell( wordWindowObj );
+		} else {
+			alert('This page was loaded outside of a frameset. It might not display properly');
+		}
+	}
+}
+</script>
+
+</head>
+<body onLoad="init_spell();">
+
+<script type="text/javascript">
+wordWindowObj.writeBody();
+</script>
+
+</body>
+</html></cfoutput>
+<cfsetting enablecfoutputonly="false">
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
new file mode 100644
index 000000000..9c747c916
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
@@ -0,0 +1,199 @@
+<?php
+header('Content-type: text/html; charset=utf-8');
+
+// The following variables values must reflect your installation needs.
+
+$aspell_prog	= '"C:\Program Files\Aspell\bin\aspell.exe"';	// by FredCK (for Windows)
+//$aspell_prog	= 'aspell';										// by FredCK (for Linux)
+
+$lang			= 'en_US';
+$aspell_opts	= "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		// by FredCK
+
+$tempfiledir	= "./";
+
+$spellercss		= '../spellerStyle.css';						// by FredCK
+$word_win_src	= '../wordWindow.js';							// by FredCK
+
+$textinputs		= $_POST['textinputs']; # array
+$input_separator = "A";
+
+# set the JavaScript variable to the submitted text.
+# textinputs is an array, each element corresponding to the (url-encoded)
+# value of the text control submitted for spell-checking
+function print_textinputs_var() {
+	global $textinputs;
+	foreach( $textinputs as $key=>$val ) {
+		# $val = str_replace( "'", "%27", $val );
+		echo "textinputs[$key] = decodeURIComponent(\"" . $val . "\");\n";
+	}
+}
+
+# make declarations for the text input index
+function print_textindex_decl( $text_input_idx ) {
+	echo "words[$text_input_idx] = [];\n";
+	echo "suggs[$text_input_idx] = [];\n";
+}
+
+# set an element of the JavaScript 'words' array to a misspelled word
+function print_words_elem( $word, $index, $text_input_idx ) {
+	echo "words[$text_input_idx][$index] = '" . escape_quote( $word ) . "';\n";
+}
+
+
+# set an element of the JavaScript 'suggs' array to a list of suggestions
+function print_suggs_elem( $suggs, $index, $text_input_idx ) {
+	echo "suggs[$text_input_idx][$index] = [";
+	foreach( $suggs as $key=>$val ) {
+		if( $val ) {
+			echo "'" . escape_quote( $val ) . "'";
+			if ( $key+1 < count( $suggs )) {
+				echo ", ";
+			}
+		}
+	}
+	echo "];\n";
+}
+
+# escape single quote
+function escape_quote( $str ) {
+	return preg_replace ( "/'/", "\\'", $str );
+}
+
+
+# handle a server-side error.
+function error_handler( $err ) {
+	echo "error = '" . preg_replace( "/['\\\\]/", "\\\\$0", $err ) . "';\n";
+}
+
+## get the list of misspelled words. Put the results in the javascript words array
+## for each misspelled word, get suggestions and put in the javascript suggs array
+function print_checker_results() {
+
+	global $aspell_prog;
+	global $aspell_opts;
+	global $tempfiledir;
+	global $textinputs;
+	global $input_separator;
+	$aspell_err = "";
+	# create temp file
+	$tempfile = tempnam( $tempfiledir, 'aspell_data_' );
+
+	# open temp file, add the submitted text.
+	if( $fh = fopen( $tempfile, 'w' )) {
+		for( $i = 0; $i < count( $textinputs ); $i++ ) {
+			$text = urldecode( $textinputs[$i] );
+
+			// Strip all tags for the text. (by FredCK - #339 / #681)
+			$text = preg_replace( "/<[^>]+>/", " ", $text ) ;
+
+			$lines = explode( "\n", $text );
+			fwrite ( $fh, "%\n" ); # exit terse mode
+			fwrite ( $fh, "^$input_separator\n" );
+			fwrite ( $fh, "!\n" ); # enter terse mode
+			foreach( $lines as $key=>$value ) {
+				# use carat on each line to escape possible aspell commands
+				fwrite( $fh, "^$value\n" );
+			}
+		}
+		fclose( $fh );
+
+		# exec aspell command - redirect STDERR to STDOUT
+		$cmd = "$aspell_prog $aspell_opts < $tempfile 2>&1";
+		if( $aspellret = shell_exec( $cmd )) {
+			$linesout = explode( "\n", $aspellret );
+			$index = 0;
+			$text_input_index = -1;
+			# parse each line of aspell return
+			foreach( $linesout as $key=>$val ) {
+				$chardesc = substr( $val, 0, 1 );
+				# if '&', then not in dictionary but has suggestions
+				# if '#', then not in dictionary and no suggestions
+				# if '*', then it is a delimiter between text inputs
+				# if '@' then version info
+				if( $chardesc == '&' || $chardesc == '#' ) {
+					$line = explode( " ", $val, 5 );
+					print_words_elem( $line[1], $index, $text_input_index );
+					if( isset( $line[4] )) {
+						$suggs = explode( ", ", $line[4] );
+					} else {
+						$suggs = array();
+					}
+					print_suggs_elem( $suggs, $index, $text_input_index );
+					$index++;
+				} elseif( $chardesc == '*' ) {
+					$text_input_index++;
+					print_textindex_decl( $text_input_index );
+					$index = 0;
+				} elseif( $chardesc != '@' && $chardesc != "" ) {
+					# assume this is error output
+					$aspell_err .= $val;
+				}
+			}
+			if( $aspell_err ) {
+				$aspell_err = "Error executing `$cmd`\\n$aspell_err";
+				error_handler( $aspell_err );
+			}
+		} else {
+			error_handler( "System error: Aspell program execution failed (`$cmd`)" );
+		}
+	} else {
+		error_handler( "System error: Could not open file '$tempfile' for writing" );
+	}
+
+	# close temp file, delete file
+	unlink( $tempfile );
+}
+
+
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="<?php echo $spellercss ?>" />
+<script language="javascript" src="<?php echo $word_win_src ?>"></script>
+<script language="javascript">
+var suggs = new Array();
+var words = new Array();
+var textinputs = new Array();
+var error;
+<?php
+
+print_textinputs_var();
+
+print_checker_results();
+
+?>
+
+var wordWindowObj = new wordWindow();
+wordWindowObj.originalSpellings = words;
+wordWindowObj.suggestions = suggs;
+wordWindowObj.textInputs = textinputs;
+
+function init_spell() {
+	// check if any error occured during server-side processing
+	if( error ) {
+		alert( error );
+	} else {
+		// call the init_spell() function in the parent frameset
+		if (parent.frames.length) {
+			parent.init_spell( wordWindowObj );
+		} else {
+			alert('This page was loaded outside of a frameset. It might not display properly');
+		}
+	}
+}
+
+
+
+</script>
+
+</head>
+<!-- <body onLoad="init_spell();">		by FredCK -->
+<body onLoad="init_spell();" bgcolor="#ffffff">
+
+<script type="text/javascript">
+wordWindowObj.writeBody();
+</script>
+
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
new file mode 100644
index 000000000..fae010d9b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
@@ -0,0 +1,181 @@
+#!/usr/bin/perl
+
+use CGI qw/ :standard /;
+use File::Temp qw/ tempfile tempdir /;
+
+# my $spellercss = '/speller/spellerStyle.css';					# by FredCK
+my $spellercss = '../spellerStyle.css';							# by FredCK
+# my $wordWindowSrc = '/speller/wordWindow.js';					# by FredCK
+my $wordWindowSrc = '../wordWindow.js';							# by FredCK
+my @textinputs = param( 'textinputs[]' ); # array
+# my $aspell_cmd = 'aspell';									# by FredCK (for Linux)
+my $aspell_cmd = '"C:\Program Files\Aspell\bin\aspell.exe"';	# by FredCK (for Windows)
+my $lang = 'en_US';
+# my $aspell_opts = "-a --lang=$lang --encoding=utf-8";			# by FredCK
+my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		# by FredCK
+my $input_separator = "A";
+
+# set the 'wordtext' JavaScript variable to the submitted text.
+sub printTextVar {
+	for( my $i = 0; $i <= $#textinputs; $i++ ) {
+	        print "textinputs[$i] = decodeURIComponent('" . escapeQuote( $textinputs[$i] ) . "')\n";
+	}
+}
+
+sub printTextIdxDecl {
+	my $idx = shift;
+	print "words[$idx] = [];\n";
+	print "suggs[$idx] = [];\n";
+}
+
+sub printWordsElem {
+	my( $textIdx, $wordIdx, $word ) = @_;
+	print "words[$textIdx][$wordIdx] = '" . escapeQuote( $word ) . "';\n";
+}
+
+sub printSuggsElem {
+	my( $textIdx, $wordIdx, @suggs ) = @_;
+	print "suggs[$textIdx][$wordIdx] = [";
+	for my $i ( 0..$#suggs ) {
+		print "'" . escapeQuote( $suggs[$i] ) . "'";
+		if( $i < $#suggs ) {
+			print ", ";
+		}
+	}
+	print "];\n";
+}
+
+sub printCheckerResults {
+	my $textInputIdx = -1;
+	my $wordIdx = 0;
+	my $unhandledText;
+	# create temp file
+	my $dir = tempdir( CLEANUP => 1 );
+	my( $fh, $tmpfilename ) = tempfile( DIR => $dir );
+
+	# temp file was created properly?
+
+	# open temp file, add the submitted text.
+	for( my $i = 0; $i <= $#textinputs; $i++ ) {
+		$text = url_decode( $textinputs[$i] );
+		# Strip all tags for the text. (by FredCK - #339 / #681)
+		$text =~ s/<[^>]+>/ /g;
+		@lines = split( /\n/, $text );
+		print $fh "\%\n"; # exit terse mode
+		print $fh "^$input_separator\n";
+		print $fh "!\n";  # enter terse mode
+		for my $line ( @lines ) {
+			# use carat on each line to escape possible aspell commands
+			print $fh "^$line\n";
+		}
+
+	}
+	# exec aspell command
+	my $cmd = "$aspell_cmd $aspell_opts < $tmpfilename 2>&1";
+	open ASPELL, "$cmd |" or handleError( "Could not execute `$cmd`\\n$!" ) and return;
+	# parse each line of aspell return
+	for my $ret ( <ASPELL> ) {
+		chomp( $ret );
+		# if '&', then not in dictionary but has suggestions
+		# if '#', then not in dictionary and no suggestions
+		# if '*', then it is a delimiter between text inputs
+		if( $ret =~ /^\*/ ) {
+			$textInputIdx++;
+			printTextIdxDecl( $textInputIdx );
+			$wordIdx = 0;
+
+		} elsif( $ret =~ /^(&|#)/ ) {
+			my @tokens = split( " ", $ret, 5 );
+			printWordsElem( $textInputIdx, $wordIdx, $tokens[1] );
+			my @suggs = ();
+			if( $tokens[4] ) {
+				@suggs = split( ", ", $tokens[4] );
+			}
+			printSuggsElem( $textInputIdx, $wordIdx, @suggs );
+			$wordIdx++;
+		} else {
+			$unhandledText .= $ret;
+		}
+	}
+	close ASPELL or handleError( "Error executing `$cmd`\\n$unhandledText" ) and return;
+}
+
+sub escapeQuote {
+	my $str = shift;
+	$str =~ s/'/\\'/g;
+	return $str;
+}
+
+sub handleError {
+	my $err = shift;
+	print "error = '" . escapeQuote( $err ) . "';\n";
+}
+
+sub url_decode {
+	local $_ = @_ ? shift : $_;
+	defined or return;
+	# change + signs to spaces
+	tr/+/ /;
+	# change hex escapes to the proper characters
+	s/%([a-fA-F0-9]{2})/pack "H2", $1/eg;
+	return $_;
+}
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Display HTML
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+print <<EOF;
+Content-type: text/html; charset=utf-8
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="$spellercss"/>
+<script src="$wordWindowSrc"></script>
+<script type="text/javascript">
+var suggs = new Array();
+var words = new Array();
+var textinputs = new Array();
+var error;
+EOF
+
+printTextVar();
+
+printCheckerResults();
+
+print <<EOF;
+var wordWindowObj = new wordWindow();
+wordWindowObj.originalSpellings = words;
+wordWindowObj.suggestions = suggs;
+wordWindowObj.textInputs = textinputs;
+
+
+function init_spell() {
+	// check if any error occured during server-side processing
+	if( error ) {
+		alert( error );
+	} else {
+		// call the init_spell() function in the parent frameset
+		if (parent.frames.length) {
+			parent.init_spell( wordWindowObj );
+		} else {
+			error = "This page was loaded outside of a frameset. ";
+			error += "It might not display properly";
+			alert( error );
+		}
+	}
+}
+
+</script>
+
+</head>
+<body onLoad="init_spell();">
+
+<script type="text/javascript">
+wordWindowObj.writeBody();
+</script>
+
+</body>
+</html>
+EOF
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
new file mode 100644
index 000000000..c85be9ab6
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
@@ -0,0 +1,461 @@
+////////////////////////////////////////////////////
+// spellChecker.js
+//
+// spellChecker object
+//
+// This file is sourced on web pages that have a textarea object to evaluate
+// for spelling. It includes the implementation for the spellCheckObject.
+//
+////////////////////////////////////////////////////
+
+
+// constructor
+function spellChecker( textObject ) {
+
+	// public properties - configurable
+//	this.popUpUrl = '/speller/spellchecker.html';							// by FredCK
+	this.popUpUrl = 'fck_spellerpages/spellerpages/spellchecker.html';		// by FredCK
+	this.popUpName = 'spellchecker';
+//	this.popUpProps = "menu=no,width=440,height=350,top=70,left=120,resizable=yes,status=yes";	// by FredCK
+	this.popUpProps = null ;																	// by FredCK
+//	this.spellCheckScript = '/speller/server-scripts/spellchecker.php';		// by FredCK
+	//this.spellCheckScript = '/cgi-bin/spellchecker.pl';
+
+	// values used to keep track of what happened to a word
+	this.replWordFlag = "R";	// single replace
+	this.ignrWordFlag = "I";	// single ignore
+	this.replAllFlag = "RA";	// replace all occurances
+	this.ignrAllFlag = "IA";	// ignore all occurances
+	this.fromReplAll = "~RA";	// an occurance of a "replace all" word
+	this.fromIgnrAll = "~IA";	// an occurance of a "ignore all" word
+	// properties set at run time
+	this.wordFlags = new Array();
+	this.currentTextIndex = 0;
+	this.currentWordIndex = 0;
+	this.spellCheckerWin = null;
+	this.controlWin = null;
+	this.wordWin = null;
+	this.textArea = textObject;	// deprecated
+	this.textInputs = arguments;
+
+	// private methods
+	this._spellcheck = _spellcheck;
+	this._getSuggestions = _getSuggestions;
+	this._setAsIgnored = _setAsIgnored;
+	this._getTotalReplaced = _getTotalReplaced;
+	this._setWordText = _setWordText;
+	this._getFormInputs = _getFormInputs;
+
+	// public methods
+	this.openChecker = openChecker;
+	this.startCheck = startCheck;
+	this.checkTextBoxes = checkTextBoxes;
+	this.checkTextAreas = checkTextAreas;
+	this.spellCheckAll = spellCheckAll;
+	this.ignoreWord = ignoreWord;
+	this.ignoreAll = ignoreAll;
+	this.replaceWord = replaceWord;
+	this.replaceAll = replaceAll;
+	this.terminateSpell = terminateSpell;
+	this.undo = undo;
+
+	// set the current window's "speller" property to the instance of this class.
+	// this object can now be referenced by child windows/frames.
+	window.speller = this;
+}
+
+// call this method to check all text boxes (and only text boxes) in the HTML document
+function checkTextBoxes() {
+	this.textInputs = this._getFormInputs( "^text$" );
+	this.openChecker();
+}
+
+// call this method to check all textareas (and only textareas ) in the HTML document
+function checkTextAreas() {
+	this.textInputs = this._getFormInputs( "^textarea$" );
+	this.openChecker();
+}
+
+// call this method to check all text boxes and textareas in the HTML document
+function spellCheckAll() {
+	this.textInputs = this._getFormInputs( "^text(area)?$" );
+	this.openChecker();
+}
+
+// call this method to check text boxe(s) and/or textarea(s) that were passed in to the
+// object's constructor or to the textInputs property
+function openChecker() {
+	this.spellCheckerWin = window.open( this.popUpUrl, this.popUpName, this.popUpProps );
+	if( !this.spellCheckerWin.opener ) {
+		this.spellCheckerWin.opener = window;
+	}
+}
+
+function startCheck( wordWindowObj, controlWindowObj ) {
+
+	// set properties from args
+	this.wordWin = wordWindowObj;
+	this.controlWin = controlWindowObj;
+
+	// reset properties
+	this.wordWin.resetForm();
+	this.controlWin.resetForm();
+	this.currentTextIndex = 0;
+	this.currentWordIndex = 0;
+	// initialize the flags to an array - one element for each text input
+	this.wordFlags = new Array( this.wordWin.textInputs.length );
+	// each element will be an array that keeps track of each word in the text
+	for( var i=0; i<this.wordFlags.length; i++ ) {
+		this.wordFlags[i] = [];
+	}
+
+	// start
+	this._spellcheck();
+
+	return true;
+}
+
+function ignoreWord() {
+	var wi = this.currentWordIndex;
+	var ti = this.currentTextIndex;
+	if( !this.wordWin ) {
+		alert( 'Error: Word frame not available.' );
+		return false;
+	}
+	if( !this.wordWin.getTextVal( ti, wi )) {
+		alert( 'Error: "Not in dictionary" text is missing.' );
+		return false;
+	}
+	// set as ignored
+	if( this._setAsIgnored( ti, wi, this.ignrWordFlag )) {
+		this.currentWordIndex++;
+		this._spellcheck();
+	}
+	return true;
+}
+
+function ignoreAll() {
+	var wi = this.currentWordIndex;
+	var ti = this.currentTextIndex;
+	if( !this.wordWin ) {
+		alert( 'Error: Word frame not available.' );
+		return false;
+	}
+	// get the word that is currently being evaluated.
+	var s_word_to_repl = this.wordWin.getTextVal( ti, wi );
+	if( !s_word_to_repl ) {
+		alert( 'Error: "Not in dictionary" text is missing' );
+		return false;
+	}
+
+	// set this word as an "ignore all" word.
+	this._setAsIgnored( ti, wi, this.ignrAllFlag );
+
+	// loop through all the words after this word
+	for( var i = ti; i < this.wordWin.textInputs.length; i++ ) {
+		for( var j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+			if(( i == ti && j > wi ) || i > ti ) {
+				// future word: set as "from ignore all" if
+				// 1) do not already have a flag and
+				// 2) have the same value as current word
+				if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl )
+				&& ( !this.wordFlags[i][j] )) {
+					this._setAsIgnored( i, j, this.fromIgnrAll );
+				}
+			}
+		}
+	}
+
+	// finally, move on
+	this.currentWordIndex++;
+	this._spellcheck();
+	return true;
+}
+
+function replaceWord() {
+	var wi = this.currentWordIndex;
+	var ti = this.currentTextIndex;
+	if( !this.wordWin ) {
+		alert( 'Error: Word frame not available.' );
+		return false;
+	}
+	if( !this.wordWin.getTextVal( ti, wi )) {
+		alert( 'Error: "Not in dictionary" text is missing' );
+		return false;
+	}
+	if( !this.controlWin.replacementText ) {
+		return false ;
+	}
+	var txt = this.controlWin.replacementText;
+	if( txt.value ) {
+		var newspell = new String( txt.value );
+		if( this._setWordText( ti, wi, newspell, this.replWordFlag )) {
+			this.currentWordIndex++;
+			this._spellcheck();
+		}
+	}
+	return true;
+}
+
+function replaceAll() {
+	var ti = this.currentTextIndex;
+	var wi = this.currentWordIndex;
+	if( !this.wordWin ) {
+		alert( 'Error: Word frame not available.' );
+		return false;
+	}
+	var s_word_to_repl = this.wordWin.getTextVal( ti, wi );
+	if( !s_word_to_repl ) {
+		alert( 'Error: "Not in dictionary" text is missing' );
+		return false;
+	}
+	var txt = this.controlWin.replacementText;
+	if( !txt.value ) return false;
+	var newspell = new String( txt.value );
+
+	// set this word as a "replace all" word.
+	this._setWordText( ti, wi, newspell, this.replAllFlag );
+
+	// loop through all the words after this word
+	for( var i = ti; i < this.wordWin.textInputs.length; i++ ) {
+		for( var j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+			if(( i == ti && j > wi ) || i > ti ) {
+				// future word: set word text to s_word_to_repl if
+				// 1) do not already have a flag and
+				// 2) have the same value as s_word_to_repl
+				if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl )
+				&& ( !this.wordFlags[i][j] )) {
+					this._setWordText( i, j, newspell, this.fromReplAll );
+				}
+			}
+		}
+	}
+
+	// finally, move on
+	this.currentWordIndex++;
+	this._spellcheck();
+	return true;
+}
+
+function terminateSpell() {
+	// called when we have reached the end of the spell checking.
+	var msg = "";		// by FredCK
+	var numrepl = this._getTotalReplaced();
+	if( numrepl == 0 ) {
+		// see if there were no misspellings to begin with
+		if( !this.wordWin ) {
+			msg = "";
+		} else {
+			if( this.wordWin.totalMisspellings() ) {
+//				msg += "No words changed.";			// by FredCK
+				msg += FCKLang.DlgSpellNoChanges ;	// by FredCK
+			} else {
+//				msg += "No misspellings found.";	// by FredCK
+				msg += FCKLang.DlgSpellNoMispell ;	// by FredCK
+			}
+		}
+	} else if( numrepl == 1 ) {
+//		msg += "One word changed.";			// by FredCK
+		msg += FCKLang.DlgSpellOneChange ;	// by FredCK
+	} else {
+//		msg += numrepl + " words changed.";	// by FredCK
+		msg += FCKLang.DlgSpellManyChanges.replace( /%1/g, numrepl ) ;
+	}
+	if( msg ) {
+//		msg += "\n";	// by FredCK
+		alert( msg );
+	}
+
+	if( numrepl > 0 ) {
+		// update the text field(s) on the opener window
+		for( var i = 0; i < this.textInputs.length; i++ ) {
+			// this.textArea.value = this.wordWin.text;
+			if( this.wordWin ) {
+				if( this.wordWin.textInputs[i] ) {
+					this.textInputs[i].value = this.wordWin.textInputs[i];
+				}
+			}
+		}
+	}
+
+	// return back to the calling window
+//	this.spellCheckerWin.close();					// by FredCK
+	if ( typeof( this.OnFinished ) == 'function' )	// by FredCK
+		this.OnFinished(numrepl) ;					// by FredCK
+
+	return true;
+}
+
+function undo() {
+	// skip if this is the first word!
+	var ti = this.currentTextIndex;
+	var wi = this.currentWordIndex;
+
+	if( this.wordWin.totalPreviousWords( ti, wi ) > 0 ) {
+		this.wordWin.removeFocus( ti, wi );
+
+		// go back to the last word index that was acted upon
+		do {
+			// if the current word index is zero then reset the seed
+			if( this.currentWordIndex == 0 && this.currentTextIndex > 0 ) {
+				this.currentTextIndex--;
+				this.currentWordIndex = this.wordWin.totalWords( this.currentTextIndex )-1;
+				if( this.currentWordIndex < 0 ) this.currentWordIndex = 0;
+			} else {
+				if( this.currentWordIndex > 0 ) {
+					this.currentWordIndex--;
+				}
+			}
+		} while (
+			this.wordWin.totalWords( this.currentTextIndex ) == 0
+			|| this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromIgnrAll
+			|| this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromReplAll
+		);
+
+		var text_idx = this.currentTextIndex;
+		var idx = this.currentWordIndex;
+		var preReplSpell = this.wordWin.originalSpellings[text_idx][idx];
+
+		// if we got back to the first word then set the Undo button back to disabled
+		if( this.wordWin.totalPreviousWords( text_idx, idx ) == 0 ) {
+			this.controlWin.disableUndo();
+		}
+
+		var i, j, origSpell ;
+		// examine what happened to this current word.
+		switch( this.wordFlags[text_idx][idx] ) {
+			// replace all: go through this and all the future occurances of the word
+			// and revert them all to the original spelling and clear their flags
+			case this.replAllFlag :
+				for( i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
+					for( j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+						if(( i == text_idx && j >= idx ) || i > text_idx ) {
+							origSpell = this.wordWin.originalSpellings[i][j];
+							if( origSpell == preReplSpell ) {
+								this._setWordText ( i, j, origSpell, undefined );
+							}
+						}
+					}
+				}
+				break;
+
+			// ignore all: go through all the future occurances of the word
+			// and clear their flags
+			case this.ignrAllFlag :
+				for( i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
+					for( j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+						if(( i == text_idx && j >= idx ) || i > text_idx ) {
+							origSpell = this.wordWin.originalSpellings[i][j];
+							if( origSpell == preReplSpell ) {
+								this.wordFlags[i][j] = undefined;
+							}
+						}
+					}
+				}
+				break;
+
+			// replace: revert the word to its original spelling
+			case this.replWordFlag :
+				this._setWordText ( text_idx, idx, preReplSpell, undefined );
+				break;
+		}
+
+		// For all four cases, clear the wordFlag of this word. re-start the process
+		this.wordFlags[text_idx][idx] = undefined;
+		this._spellcheck();
+	}
+}
+
+function _spellcheck() {
+	var ww = this.wordWin;
+
+	// check if this is the last word in the current text element
+	if( this.currentWordIndex == ww.totalWords( this.currentTextIndex) ) {
+		this.currentTextIndex++;
+		this.currentWordIndex = 0;
+		// keep going if we're not yet past the last text element
+		if( this.currentTextIndex < this.wordWin.textInputs.length ) {
+			this._spellcheck();
+			return;
+		} else {
+			this.terminateSpell();
+			return;
+		}
+	}
+
+	// if this is after the first one make sure the Undo button is enabled
+	if( this.currentWordIndex > 0 ) {
+		this.controlWin.enableUndo();
+	}
+
+	// skip the current word if it has already been worked on
+	if( this.wordFlags[this.currentTextIndex][this.currentWordIndex] ) {
+		// increment the global current word index and move on.
+		this.currentWordIndex++;
+		this._spellcheck();
+	} else {
+		var evalText = ww.getTextVal( this.currentTextIndex, this.currentWordIndex );
+		if( evalText ) {
+			this.controlWin.evaluatedText.value = evalText;
+			ww.setFocus( this.currentTextIndex, this.currentWordIndex );
+			this._getSuggestions( this.currentTextIndex, this.currentWordIndex );
+		}
+	}
+}
+
+function _getSuggestions( text_num, word_num ) {
+	this.controlWin.clearSuggestions();
+	// add suggestion in list for each suggested word.
+	// get the array of suggested words out of the
+	// three-dimensional array containing all suggestions.
+	var a_suggests = this.wordWin.suggestions[text_num][word_num];
+	if( a_suggests ) {
+		// got an array of suggestions.
+		for( var ii = 0; ii < a_suggests.length; ii++ ) {
+			this.controlWin.addSuggestion( a_suggests[ii] );
+		}
+	}
+	this.controlWin.selectDefaultSuggestion();
+}
+
+function _setAsIgnored( text_num, word_num, flag ) {
+	// set the UI
+	this.wordWin.removeFocus( text_num, word_num );
+	// do the bookkeeping
+	this.wordFlags[text_num][word_num] = flag;
+	return true;
+}
+
+function _getTotalReplaced() {
+	var i_replaced = 0;
+	for( var i = 0; i < this.wordFlags.length; i++ ) {
+		for( var j = 0; j < this.wordFlags[i].length; j++ ) {
+			if(( this.wordFlags[i][j] == this.replWordFlag )
+			|| ( this.wordFlags[i][j] == this.replAllFlag )
+			|| ( this.wordFlags[i][j] == this.fromReplAll )) {
+				i_replaced++;
+			}
+		}
+	}
+	return i_replaced;
+}
+
+function _setWordText( text_num, word_num, newText, flag ) {
+	// set the UI and form inputs
+	this.wordWin.setText( text_num, word_num, newText );
+	// keep track of what happened to this word:
+	this.wordFlags[text_num][word_num] = flag;
+	return true;
+}
+
+function _getFormInputs( inputPattern ) {
+	var inputs = new Array();
+	for( var i = 0; i < document.forms.length; i++ ) {
+		for( var j = 0; j < document.forms[i].elements.length; j++ ) {
+			if( document.forms[i].elements[j].type.match( inputPattern )) {
+				inputs[inputs.length] = document.forms[i].elements[j];
+			}
+		}
+	}
+	return inputs;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
new file mode 100644
index 000000000..cbcd7db79
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
@@ -0,0 +1,71 @@
+
+<script>
+
+var wordWindow = null;
+var controlWindow = null;
+
+function init_spell( spellerWindow ) {
+
+	if( spellerWindow ) {
+		if( spellerWindow.windowType == "wordWindow" ) {
+			wordWindow = spellerWindow;
+		} else if ( spellerWindow.windowType == "controlWindow" ) {
+			controlWindow = spellerWindow;
+		}
+	}
+
+	if( controlWindow && wordWindow ) {
+		// populate the speller object and start it off!
+		var speller = opener.speller;
+		wordWindow.speller = speller;
+		speller.startCheck( wordWindow, controlWindow );
+	}
+}
+
+// encodeForPost
+function encodeForPost( str ) {
+	var s = new String( str );
+	s = encodeURIComponent( s );
+	// additionally encode single quotes to evade any PHP
+	// magic_quotes_gpc setting (it inserts escape characters and
+	// therefore skews the btye positions of misspelled words)
+	return s.replace( /\'/g, '%27' );
+}
+
+// post the text area data to the script that populates the speller
+function postWords() {
+	var bodyDoc = window.frames[0].document;
+	bodyDoc.open();
+	bodyDoc.write('<html>');
+	bodyDoc.write('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+	bodyDoc.write('<link rel="stylesheet" type="text/css" href="spellerStyle.css"/>');
+	if (opener) {
+		var speller = opener.speller;
+		bodyDoc.write('<body class="normalText" onLoad="document.forms[0].submit();">');
+		bodyDoc.write('<p>' + window.parent.FCKLang.DlgSpellProgress + '<\/p>');		// by FredCK
+		bodyDoc.write('<form action="'+speller.spellCheckScript+'" method="post">');
+		for( var i = 0; i < speller.textInputs.length; i++ ) {
+			bodyDoc.write('<input type="hidden" name="textinputs[]" value="'+encodeForPost(speller.textInputs[i].value)+'">');
+		}
+		bodyDoc.write('<\/form>');
+		bodyDoc.write('<\/body>');
+	} else {
+		bodyDoc.write('<body class="normalText">');
+		bodyDoc.write('<p><b>This page cannot be displayed<\/b><\/p><p>The window was not opened from another window.<\/p>');
+		bodyDoc.write('<\/body>');
+	}
+	bodyDoc.write('<\/html>');
+	bodyDoc.close();
+}
+</script>
+
+<html>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<head>
+<title>Speller Pages</title>
+</head>
+<frameset rows="*,201" onLoad="postWords();">
+<frame src="blank.html">
+<frame src="controls.html">
+</frameset>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
new file mode 100644
index 000000000..9928086e1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
@@ -0,0 +1,49 @@
+.blend {
+	font-family: courier new;
+	font-size: 10pt;
+	border: 0;
+	margin-bottom:-1;
+}
+.normalLabel {
+	font-size:8pt;
+}
+.normalText {
+	font-family:arial, helvetica, sans-serif;
+	font-size:10pt;
+	color:000000;
+	background-color:FFFFFF;
+}
+.plainText {
+	font-family: courier new, courier, monospace;
+	font-size: 10pt;
+	color:000000;
+	background-color:FFFFFF;
+}
+.controlWindowBody {
+	font-family:arial, helvetica, sans-serif;
+	font-size:8pt;
+	padding: 7px ;		/* by FredCK */
+	margin: 0px ;		/* by FredCK */
+	/* color:000000;				by FredCK */
+	/* background-color:DADADA;		by FredCK */
+}
+.readonlyInput {
+	background-color:DADADA;
+	color:000000;
+	font-size:8pt;
+	width:392px;
+}
+.textDefault {
+	font-size:8pt;
+	width: 200px;
+}
+.buttonDefault {
+	width:90px;
+	height:22px;
+	font-size:8pt;
+}
+.suggSlct {
+	width:200px;
+	margin-top:2;
+	font-size:8pt;
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
new file mode 100644
index 000000000..7990296a2
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
@@ -0,0 +1,272 @@
+////////////////////////////////////////////////////
+// wordWindow object
+////////////////////////////////////////////////////
+function wordWindow() {
+	// private properties
+	this._forms = [];
+
+	// private methods
+	this._getWordObject = _getWordObject;
+	//this._getSpellerObject = _getSpellerObject;
+	this._wordInputStr = _wordInputStr;
+	this._adjustIndexes = _adjustIndexes;
+	this._isWordChar = _isWordChar;
+	this._lastPos = _lastPos;
+
+	// public properties
+	this.wordChar = /[a-zA-Z]/;
+	this.windowType = "wordWindow";
+	this.originalSpellings = new Array();
+	this.suggestions = new Array();
+	this.checkWordBgColor = "pink";
+	this.normWordBgColor = "white";
+	this.text = "";
+	this.textInputs = new Array();
+	this.indexes = new Array();
+	//this.speller = this._getSpellerObject();
+
+	// public methods
+	this.resetForm = resetForm;
+	this.totalMisspellings = totalMisspellings;
+	this.totalWords = totalWords;
+	this.totalPreviousWords = totalPreviousWords;
+	//this.getTextObjectArray = getTextObjectArray;
+	this.getTextVal = getTextVal;
+	this.setFocus = setFocus;
+	this.removeFocus = removeFocus;
+	this.setText = setText;
+	//this.getTotalWords = getTotalWords;
+	this.writeBody = writeBody;
+	this.printForHtml = printForHtml;
+}
+
+function resetForm() {
+	if( this._forms ) {
+		for( var i = 0; i < this._forms.length; i++ ) {
+			this._forms[i].reset();
+		}
+	}
+	return true;
+}
+
+function totalMisspellings() {
+	var total_words = 0;
+	for( var i = 0; i < this.textInputs.length; i++ ) {
+		total_words += this.totalWords( i );
+	}
+	return total_words;
+}
+
+function totalWords( textIndex ) {
+	return this.originalSpellings[textIndex].length;
+}
+
+function totalPreviousWords( textIndex, wordIndex ) {
+	var total_words = 0;
+	for( var i = 0; i <= textIndex; i++ ) {
+		for( var j = 0; j < this.totalWords( i ); j++ ) {
+			if( i == textIndex && j == wordIndex ) {
+				break;
+			} else {
+				total_words++;
+			}
+		}
+	}
+	return total_words;
+}
+
+//function getTextObjectArray() {
+//	return this._form.elements;
+//}
+
+function getTextVal( textIndex, wordIndex ) {
+	var word = this._getWordObject( textIndex, wordIndex );
+	if( word ) {
+		return word.value;
+	}
+}
+
+function setFocus( textIndex, wordIndex ) {
+	var word = this._getWordObject( textIndex, wordIndex );
+	if( word ) {
+		if( word.type == "text" ) {
+			word.focus();
+			word.style.backgroundColor = this.checkWordBgColor;
+		}
+	}
+}
+
+function removeFocus( textIndex, wordIndex ) {
+	var word = this._getWordObject( textIndex, wordIndex );
+	if( word ) {
+		if( word.type == "text" ) {
+			word.blur();
+			word.style.backgroundColor = this.normWordBgColor;
+		}
+	}
+}
+
+function setText( textIndex, wordIndex, newText ) {
+	var word = this._getWordObject( textIndex, wordIndex );
+	var beginStr;
+	var endStr;
+	if( word ) {
+		var pos = this.indexes[textIndex][wordIndex];
+		var oldText = word.value;
+		// update the text given the index of the string
+		beginStr = this.textInputs[textIndex].substring( 0, pos );
+		endStr = this.textInputs[textIndex].substring(
+			pos + oldText.length,
+			this.textInputs[textIndex].length
+		);
+		this.textInputs[textIndex] = beginStr + newText + endStr;
+
+		// adjust the indexes on the stack given the differences in
+		// length between the new word and old word.
+		var lengthDiff = newText.length - oldText.length;
+		this._adjustIndexes( textIndex, wordIndex, lengthDiff );
+
+		word.size = newText.length;
+		word.value = newText;
+		this.removeFocus( textIndex, wordIndex );
+	}
+}
+
+
+function writeBody() {
+	var d = window.document;
+	var is_html = false;
+
+	d.open();
+
+	// iterate through each text input.
+	for( var txtid = 0; txtid < this.textInputs.length; txtid++ ) {
+		var end_idx = 0;
+		var begin_idx = 0;
+		d.writeln( '<form name="textInput'+txtid+'">' );
+		var wordtxt = this.textInputs[txtid];
+		this.indexes[txtid] = [];
+
+		if( wordtxt ) {
+			var orig = this.originalSpellings[txtid];
+			if( !orig ) break;
+
+			//!!! plain text, or HTML mode?
+			d.writeln( '<div class="plainText">' );
+			// iterate through each occurrence of a misspelled word.
+			for( var i = 0; i < orig.length; i++ ) {
+				// find the position of the current misspelled word,
+				// starting at the last misspelled word.
+				// and keep looking if it's a substring of another word
+				do {
+					begin_idx = wordtxt.indexOf( orig[i], end_idx );
+					end_idx = begin_idx + orig[i].length;
+					// word not found? messed up!
+					if( begin_idx == -1 ) break;
+					// look at the characters immediately before and after
+					// the word. If they are word characters we'll keep looking.
+					var before_char = wordtxt.charAt( begin_idx - 1 );
+					var after_char = wordtxt.charAt( end_idx );
+				} while (
+					this._isWordChar( before_char )
+					|| this._isWordChar( after_char )
+				);
+
+				// keep track of its position in the original text.
+				this.indexes[txtid][i] = begin_idx;
+
+				// write out the characters before the current misspelled word
+				for( var j = this._lastPos( txtid, i ); j < begin_idx; j++ ) {
+					// !!! html mode? make it html compatible
+					d.write( this.printForHtml( wordtxt.charAt( j )));
+				}
+
+				// write out the misspelled word.
+				d.write( this._wordInputStr( orig[i] ));
+
+				// if it's the last word, write out the rest of the text
+				if( i == orig.length-1 ){
+					d.write( printForHtml( wordtxt.substr( end_idx )));
+				}
+			}
+
+			d.writeln( '</div>' );
+
+		}
+		d.writeln( '</form>' );
+	}
+	//for ( var j = 0; j < d.forms.length; j++ ) {
+	//	alert( d.forms[j].name );
+	//	for( var k = 0; k < d.forms[j].elements.length; k++ ) {
+	//		alert( d.forms[j].elements[k].name + ": " + d.forms[j].elements[k].value );
+	//	}
+	//}
+
+	// set the _forms property
+	this._forms = d.forms;
+	d.close();
+}
+
+// return the character index in the full text after the last word we evaluated
+function _lastPos( txtid, idx ) {
+	if( idx > 0 )
+		return this.indexes[txtid][idx-1] + this.originalSpellings[txtid][idx-1].length;
+	else
+		return 0;
+}
+
+function printForHtml( n ) {
+	return n ;		// by FredCK
+/*
+	var htmlstr = n;
+	if( htmlstr.length == 1 ) {
+		// do simple case statement if it's just one character
+		switch ( n ) {
+			case "\n":
+				htmlstr = '<br/>';
+				break;
+			case "<":
+				htmlstr = '&lt;';
+				break;
+			case ">":
+				htmlstr = '&gt;';
+				break;
+		}
+		return htmlstr;
+	} else {
+		htmlstr = htmlstr.replace( /</g, '&lt' );
+		htmlstr = htmlstr.replace( />/g, '&gt' );
+		htmlstr = htmlstr.replace( /\n/g, '<br/>' );
+		return htmlstr;
+	}
+*/
+}
+
+function _isWordChar( letter ) {
+	if( letter.search( this.wordChar ) == -1 ) {
+		return false;
+	} else {
+		return true;
+	}
+}
+
+function _getWordObject( textIndex, wordIndex ) {
+	if( this._forms[textIndex] ) {
+		if( this._forms[textIndex].elements[wordIndex] ) {
+			return this._forms[textIndex].elements[wordIndex];
+		}
+	}
+	return null;
+}
+
+function _wordInputStr( word ) {
+	var str = '<input readonly ';
+	str += 'class="blend" type="text" value="' + word + '" size="' + word.length + '">';
+	return str;
+}
+
+function _adjustIndexes( textIndex, wordIndex, lengthDiff ) {
+	for( var i = wordIndex + 1; i < this.originalSpellings[textIndex].length; i++ ) {
+		this.indexes[textIndex][i] = this.indexes[textIndex][i] + lengthDiff;
+	}
+}
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_table.html b/modules/editor/skins/fckeditor/editor/dialog/fck_table.html
new file mode 100644
index 000000000..e3792d746
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_table.html
@@ -0,0 +1,298 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Table dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Table Properties</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var dialogArguments = dialog.Args() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+// Gets the table if there is one selected.
+var table ;
+var e = dialog.Selection.GetSelectedElement() ;
+
+if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
+	e = oEditor.FCKSelection.MoveToAncestorNode( 'TABLE' ) ;
+
+if ( e && e.tagName == "TABLE" )
+	table = e ;
+
+// Fired when the window loading process is finished. It sets the fields with the
+// actual values if a table is selected in the editor.
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if (table)
+	{
+		document.getElementById('txtRows').value    = table.rows.length ;
+		document.getElementById('txtColumns').value = table.rows[0].cells.length ;
+
+		// Gets the value from the Width or the Style attribute
+		var iWidth  = (table.style.width  ? table.style.width  : table.width ) ;
+		var iHeight = (table.style.height ? table.style.height : table.height ) ;
+
+		if (iWidth.indexOf('%') >= 0)			// Percentual = %
+		{
+			iWidth = parseInt( iWidth.substr(0,iWidth.length - 1), 10 ) ;
+			document.getElementById('selWidthType').value = "percent" ;
+		}
+		else if (iWidth.indexOf('px') >= 0)		// Style Pixel = px
+		{																										  //
+			iWidth = iWidth.substr(0,iWidth.length - 2);
+			document.getElementById('selWidthType').value = "pixels" ;
+		}
+
+		if (iHeight && iHeight.indexOf('px') >= 0)		// Style Pixel = px
+			iHeight = iHeight.substr(0,iHeight.length - 2);
+
+		document.getElementById('txtWidth').value		= iWidth || '' ;
+		document.getElementById('txtHeight').value		= iHeight || '' ;
+		document.getElementById('txtBorder').value		= GetAttribute( table, 'border', '' ) ;
+		document.getElementById('selAlignment').value	= GetAttribute( table, 'align', '' ) ;
+		document.getElementById('txtCellPadding').value	= GetAttribute( table, 'cellPadding', '' ) ;
+		document.getElementById('txtCellSpacing').value	= GetAttribute( table, 'cellSpacing', '' ) ;
+		document.getElementById('txtSummary').value     = GetAttribute( table, 'summary', '' ) ;
+//		document.getElementById('cmbFontStyle').value	= table.className ;
+
+		var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;
+		if ( eCaption ) document.getElementById('txtCaption').value = eCaption.innerHTML ;
+
+		document.getElementById('txtRows').disabled    = true ;
+		document.getElementById('txtColumns').disabled = true ;
+		SelectField( 'txtWidth' ) ;
+	}
+	else
+		SelectField( 'txtRows' ) ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+}
+
+// Fired when the user press the OK button
+function Ok()
+{
+	var bExists = ( table != null ) ;
+
+	if ( ! bExists )
+		table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;
+
+	// Removes the Width and Height styles
+	if ( bExists && table.style.width )		table.style.width = null ; //.removeAttribute("width") ;
+	if ( bExists && table.style.height )	table.style.height = null ; //.removeAttribute("height") ;
+
+	var sWidth = GetE('txtWidth').value ;
+	if ( sWidth.length > 0 && GetE('selWidthType').value == 'percent' )
+		sWidth += '%' ;
+
+	SetAttribute( table, 'width'		, sWidth ) ;
+	SetAttribute( table, 'height'		, GetE('txtHeight').value ) ;
+	SetAttribute( table, 'border'		, GetE('txtBorder').value ) ;
+	SetAttribute( table, 'align'		, GetE('selAlignment').value ) ;
+	SetAttribute( table, 'cellPadding'	, GetE('txtCellPadding').value ) ;
+	SetAttribute( table, 'cellSpacing'	, GetE('txtCellSpacing').value ) ;
+	SetAttribute( table, 'summary'		, GetE('txtSummary').value ) ;
+
+	var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;
+
+	if ( document.getElementById('txtCaption').value != '')
+	{
+		if ( !eCaption )
+		{
+			eCaption = oEditor.FCK.EditorDocument.createElement( 'CAPTION' ) ;
+			table.insertBefore( eCaption, table.firstChild ) ;
+		}
+
+		eCaption.innerHTML = document.getElementById('txtCaption').value ;
+	}
+	else if ( bExists && eCaption )
+	{
+		// TODO: It causes an IE internal error if using removeChild or
+		// table.deleteCaption() (see #505).
+		if ( oEditor.FCKBrowserInfo.IsIE )
+			eCaption.innerHTML = '' ;
+		else
+			eCaption.parentNode.removeChild( eCaption ) ;
+	}
+
+	if (! bExists)
+	{
+		var iRows = document.getElementById('txtRows').value ;
+		var iCols = document.getElementById('txtColumns').value ;
+
+		for ( var r = 0 ; r < iRows ; r++ )
+		{
+			var oRow = table.insertRow(-1) ;
+			for ( var c = 0 ; c < iCols ; c++ )
+			{
+				var oCell = oRow.insertCell(-1) ;
+				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+					oEditor.FCKTools.AppendBogusBr( oCell ) ;
+			}
+		}
+
+		oEditor.FCKUndo.SaveUndoStep() ;
+
+		oEditor.FCK.InsertElement( table ) ;
+	}
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table id="otable" cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 100%">
+		<tr>
+			<td>
+				<table cellspacing="1" cellpadding="1" width="100%" border="0">
+					<tr>
+						<td valign="top">
+							<table cellspacing="0" cellpadding="0" border="0">
+								<tr>
+									<td>
+										<span fcklang="DlgTableRows">Rows</span>:</td>
+									<td>
+										&nbsp;<input id="txtRows" type="text" maxlength="3" size="2" value="3" name="txtRows"
+											onkeypress="return IsDigit(event);" /></td>
+								</tr>
+								<tr>
+									<td>
+										<span fcklang="DlgTableColumns">Columns</span>:</td>
+									<td>
+										&nbsp;<input id="txtColumns" type="text" maxlength="2" size="2" value="2" name="txtColumns"
+											onkeypress="return IsDigit(event);" /></td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td>
+										<span fcklang="DlgTableBorder">Border size</span>:</td>
+									<td>
+										&nbsp;<input id="txtBorder" type="text" maxlength="2" size="2" value="1" name="txtBorder"
+											onkeypress="return IsDigit(event);" /></td>
+								</tr>
+								<tr>
+									<td>
+										<span fcklang="DlgTableAlign">Alignment</span>:</td>
+									<td>
+										&nbsp;<select id="selAlignment" name="selAlignment">
+											<option fcklang="DlgTableAlignNotSet" value="" selected="selected">&lt;Not set&gt;</option>
+											<option fcklang="DlgTableAlignLeft" value="left">Left</option>
+											<option fcklang="DlgTableAlignCenter" value="center">Center</option>
+											<option fcklang="DlgTableAlignRight" value="right">Right</option>
+										</select></td>
+								</tr>
+							</table>
+						</td>
+						<td>
+							&nbsp;&nbsp;&nbsp;</td>
+						<td align="right" valign="top">
+							<table cellspacing="0" cellpadding="0" border="0">
+								<tr>
+									<td>
+										<span fcklang="DlgTableWidth">Width</span>:</td>
+									<td>
+										&nbsp;<input id="txtWidth" type="text" maxlength="4" size="3" value="200" name="txtWidth"
+											onkeypress="return IsDigit(event);" /></td>
+									<td>
+										&nbsp;<select id="selWidthType" name="selWidthType">
+											<option fcklang="DlgTableWidthPx" value="pixels" selected="selected">pixels</option>
+											<option fcklang="DlgTableWidthPc" value="percent">percent</option>
+										</select></td>
+								</tr>
+								<tr>
+									<td>
+										<span fcklang="DlgTableHeight">Height</span>:</td>
+									<td>
+										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" /></td>
+									<td>
+										&nbsp;<span fcklang="DlgTableWidthPx">pixels</span></td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgTableCellSpace">Cell spacing</span>:</td>
+									<td>
+										&nbsp;<input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1" name="txtCellSpacing"
+											onkeypress="return IsDigit(event);" /></td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgTableCellPad">Cell padding</span>:</td>
+									<td>
+										&nbsp;<input id="txtCellPadding" type="text" maxlength="2" size="2" value="1" name="txtCellPadding"
+											onkeypress="return IsDigit(event);" /></td>
+									<td>
+										&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table cellspacing="0" cellpadding="0" width="100%" border="0">
+					<tr>
+						<td nowrap="nowrap">
+							<span fcklang="DlgTableCaption">Caption</span>:&nbsp;</td>
+						<td>
+							&nbsp;</td>
+						<td width="100%" nowrap="nowrap">
+							<input id="txtCaption" type="text" style="width: 100%" /></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap">
+							<span fcklang="DlgTableSummary">Summary</span>:&nbsp;</td>
+						<td>
+							&nbsp;</td>
+						<td width="100%" nowrap="nowrap">
+							<input id="txtSummary" type="text" style="width: 100%" /></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_tablecell.html b/modules/editor/skins/fckeditor/editor/dialog/fck_tablecell.html
new file mode 100644
index 000000000..3d7429627
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_tablecell.html
@@ -0,0 +1,257 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Cell properties dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Table Cell Properties</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+// Array of selected Cells
+var aCells = oEditor.FCKTableHandler.GetSelectedCells() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage( document ) ;
+
+	SetStartupValue() ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtWidth' ) ;
+}
+
+function SetStartupValue()
+{
+	if ( aCells.length > 0 )
+	{
+		var oCell = aCells[0] ;
+		var iWidth = GetAttribute( oCell, 'width' ) ;
+
+		if ( iWidth.indexOf && iWidth.indexOf( '%' ) >= 0 )
+		{
+			iWidth = iWidth.substr( 0, iWidth.length - 1 ) ;
+			GetE('selWidthType').value = 'percent' ;
+		}
+
+		if ( oCell.attributes['noWrap'] != null && oCell.attributes['noWrap'].specified )
+			GetE('selWordWrap').value = !oCell.noWrap ;
+
+		GetE('txtWidth').value			= iWidth ;
+		GetE('txtHeight').value			= GetAttribute( oCell, 'height' ) ;
+		GetE('selHAlign').value			= GetAttribute( oCell, 'align' ) ;
+		GetE('selVAlign').value			= GetAttribute( oCell, 'vAlign' ) ;
+		GetE('txtRowSpan').value		= GetAttribute( oCell, 'rowSpan' ) ;
+		GetE('txtCollSpan').value		= GetAttribute( oCell, 'colSpan' ) ;
+		GetE('txtBackColor').value		= GetAttribute( oCell, 'bgColor' ) ;
+		GetE('txtBorderColor').value	= GetAttribute( oCell, 'borderColor' ) ;
+//		GetE('cmbFontStyle').value		= oCell.className ;
+	}
+}
+
+// Fired when the user press the OK button
+function Ok()
+{
+	for( i = 0 ; i < aCells.length ; i++ )
+	{
+		if ( GetE('txtWidth').value.length > 0 )
+			aCells[i].width	= GetE('txtWidth').value + ( GetE('selWidthType').value == 'percent' ? '%' : '') ;
+		else
+			aCells[i].removeAttribute( 'width', 0 ) ;
+
+		if ( GetE('selWordWrap').value == 'false' )
+			SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;
+		else
+			aCells[i].removeAttribute( 'noWrap' ) ;
+
+		SetAttribute( aCells[i], 'height'		, GetE('txtHeight').value ) ;
+		SetAttribute( aCells[i], 'align'		, GetE('selHAlign').value ) ;
+		SetAttribute( aCells[i], 'vAlign'		, GetE('selVAlign').value ) ;
+		SetAttribute( aCells[i], 'rowSpan'		, GetE('txtRowSpan').value ) ;
+		SetAttribute( aCells[i], 'colSpan'		, GetE('txtCollSpan').value ) ;
+		SetAttribute( aCells[i], 'bgColor'		, GetE('txtBackColor').value ) ;
+		SetAttribute( aCells[i], 'borderColor'	, GetE('txtBorderColor').value ) ;
+//		SetAttribute( aCells[i], 'className'	, GetE('cmbFontStyle').value ) ;
+	}
+
+	return true ;
+}
+
+function SelectBackColor( color )
+{
+	if ( color && color.length > 0 )
+		GetE('txtBackColor').value = color ;
+}
+
+function SelectBorderColor( color )
+{
+	if ( color && color.length > 0 )
+		GetE('txtBorderColor').value = color ;
+}
+
+function SelectColor( wich )
+{
+	oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
+}
+
+	</script>
+</head>
+<body scroll="no" style="overflow: hidden">
+	<table cellspacing="0" cellpadding="0" width="100%" border="0" height="100%">
+		<tr>
+			<td>
+				<table cellspacing="1" cellpadding="1" width="100%" border="0">
+					<tr>
+						<td>
+							<table cellspacing="0" cellpadding="0" border="0">
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellWidth">Width</span>:</td>
+									<td>
+										&nbsp;<input onkeypress="return IsDigit(event);" id="txtWidth" type="text" maxlength="4"
+											size="3" name="txtWidth" />&nbsp;<select id="selWidthType" name="selWidthType">
+												<option fcklang="DlgCellWidthPx" value="pixels" selected="selected">pixels</option>
+												<option fcklang="DlgCellWidthPc" value="percent">percent</option>
+											</select></td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellHeight">Height</span>:</td>
+									<td>
+										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" />&nbsp;<span
+											fcklang="DlgCellWidthPx">pixels</span></td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellWordWrap">Word Wrap</span>:</td>
+									<td>
+										&nbsp;<select id="selWordWrap" name="selAlignment">
+											<option fcklang="DlgCellWordWrapYes" value="true" selected="selected">Yes</option>
+											<option fcklang="DlgCellWordWrapNo" value="false">No</option>
+										</select></td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellHorAlign">Horizontal Alignment</span>:</td>
+									<td>
+										&nbsp;<select id="selHAlign" name="selAlignment">
+											<option fcklang="DlgCellHorAlignNotSet" value="" selected>&lt;Not set&gt;</option>
+											<option fcklang="DlgCellHorAlignLeft" value="left">Left</option>
+											<option fcklang="DlgCellHorAlignCenter" value="center">Center</option>
+											<option fcklang="DlgCellHorAlignRight" value="right">Right</option>
+										</select></td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellVerAlign">Vertical Alignment</span>:</td>
+									<td>
+										&nbsp;<select id="selVAlign" name="selAlignment">
+											<option fcklang="DlgCellVerAlignNotSet" value="" selected>&lt;Not set&gt;</option>
+											<option fcklang="DlgCellVerAlignTop" value="top">Top</option>
+											<option fcklang="DlgCellVerAlignMiddle" value="middle">Middle</option>
+											<option fcklang="DlgCellVerAlignBottom" value="bottom">Bottom</option>
+											<option fcklang="DlgCellVerAlignBaseline" value="baseline">Baseline</option>
+										</select></td>
+								</tr>
+							</table>
+						</td>
+						<td>
+							&nbsp;&nbsp;&nbsp;</td>
+						<td align="right">
+							<table cellspacing="0" cellpadding="0" border="0">
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellRowSpan">Rows Span</span>:</td>
+									<td>
+										&nbsp;
+										<input onkeypress="return IsDigit(event);" id="txtRowSpan" type="text" maxlength="3" size="2"
+											name="txtRows"></td>
+									<td>
+									</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellCollSpan">Columns Span</span>:</td>
+									<td>
+										&nbsp;
+										<input onkeypress="return IsDigit(event);" id="txtCollSpan" type="text" maxlength="2"
+											size="2" name="txtColumns"></td>
+									<td>
+									</td>
+								</tr>
+								<tr>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+									<td>
+										&nbsp;</td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellBackColor">Background Color</span>:</td>
+									<td>
+										&nbsp;<input id="txtBackColor" type="text" size="8" name="txtCellSpacing"></td>
+									<td>
+										&nbsp;
+										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Back' )"></td>
+								</tr>
+								<tr>
+									<td nowrap="nowrap">
+										<span fcklang="DlgCellBorderColor">Border Color</span>:</td>
+									<td>
+										&nbsp;<input id="txtBorderColor" type="text" size="8" name="txtCellPadding" /></td>
+									<td>
+										&nbsp;
+										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Border' )" /></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_template.html b/modules/editor/skins/fckeditor/editor/dialog/fck_template.html
new file mode 100644
index 000000000..4f3629ba0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_template.html
@@ -0,0 +1,242 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Template selection dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<style type="text/css">
+			.TplList
+			{
+				border: #dcdcdc 2px solid;
+				background-color: #ffffff;
+				overflow: auto;
+				width: 90%;
+			}
+
+			.TplItem
+			{
+				margin: 5px;
+				padding: 7px;
+				border: #eeeeee 1px solid;
+			}
+
+			.TplItem TABLE
+			{
+				display: inline;
+			}
+
+			.TplTitle
+			{
+				font-weight: bold;
+			}
+		</style>
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var oEditor		= window.parent.InnerDialogLoaded() ;
+var FCK			= oEditor.FCK ;
+var FCKLang		= oEditor.FCKLang ;
+var FCKConfig	= oEditor.FCKConfig ;
+
+window.onload = function()
+{
+	// Set the right box height (browser dependent).
+	GetE('eList').style.height = document.all ? '100%' : '295px' ;
+
+	// Translate the dialog box texts.
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	GetE('xChkReplaceAll').checked = ( FCKConfig.TemplateReplaceAll !== false ) ;
+
+	if ( FCKConfig.TemplateReplaceCheckbox !== false )
+		GetE('xReplaceBlock').style.display = '' ;
+
+	window.parent.SetAutoSize( true ) ;
+
+	LoadTemplatesXml() ;
+}
+
+function LoadTemplatesXml()
+{
+	var oTemplate ;
+
+	if ( !FCK._Templates )
+	{
+		GetE('eLoading').style.display = '' ;
+
+		// Create the Templates array.
+		FCK._Templates = new Array() ;
+
+		// Load the XML file.
+		var oXml = new oEditor.FCKXml() ;
+		oXml.LoadUrl( FCKConfig.TemplatesXmlPath ) ;
+
+		// Get the Images Base Path.
+		var oAtt = oXml.SelectSingleNode( 'Templates/@imagesBasePath' ) ;
+		var sImagesBasePath = oAtt ? oAtt.value : '' ;
+
+		// Get the "Template" nodes defined in the XML file.
+		var aTplNodes = oXml.SelectNodes( 'Templates/Template' ) ;
+
+		for ( var i = 0 ; i < aTplNodes.length ; i++ )
+		{
+			var oNode = aTplNodes[i] ;
+
+			oTemplate = new Object() ;
+
+			var oPart ;
+
+			// Get the Template Title.
+			if ( (oPart = oNode.attributes.getNamedItem('title')) )
+				oTemplate.Title = oPart.value ;
+			else
+				oTemplate.Title = 'Template ' + ( i + 1 ) ;
+
+			// Get the Template Description.
+			if ( (oPart = oXml.SelectSingleNode( 'Description', oNode )) )
+				oTemplate.Description = oPart.text ? oPart.text : oPart.textContent ;
+
+			// Get the Template Image.
+			if ( (oPart = oNode.attributes.getNamedItem('image')) )
+				oTemplate.Image = sImagesBasePath + oPart.value ;
+
+			// Get the Template HTML.
+			if ( (oPart = oXml.SelectSingleNode( 'Html', oNode )) )
+				oTemplate.Html = oPart.text ? oPart.text : oPart.textContent ;
+			else
+			{
+				alert( 'No HTML defined for template index ' + i + '. Please review the "' + FCKConfig.TemplatesXmlPath + '" file.' ) ;
+				continue ;
+			}
+
+			FCK._Templates[ FCK._Templates.length ] = oTemplate ;
+		}
+
+		GetE('eLoading').style.display = 'none' ;
+	}
+
+	if ( FCK._Templates.length == 0 )
+		GetE('eEmpty').style.display = '' ;
+	else
+	{
+		for ( var j = 0 ; j < FCK._Templates.length ; j++ )
+		{
+			oTemplate = FCK._Templates[j] ;
+
+			var oItemDiv = GetE('eList').appendChild( document.createElement( 'DIV' ) ) ;
+			oItemDiv.TplIndex = j ;
+			oItemDiv.className = 'TplItem' ;
+
+			// Build the inner HTML of our new item DIV.
+			var sInner = '<table><tr>' ;
+
+			if ( oTemplate.Image )
+				sInner += '<td valign="top"><img src="' + oTemplate.Image + '"><\/td>' ;
+
+			sInner += '<td valign="top"><div class="TplTitle">' + oTemplate.Title + '<\/div>' ;
+
+			if ( oTemplate.Description )
+				sInner += '<div>' + oTemplate.Description + '<\/div>' ;
+
+			sInner += '<\/td><\/tr><\/table>' ;
+
+			oItemDiv.innerHTML = sInner ;
+
+			oItemDiv.onmouseover = ItemDiv_OnMouseOver ;
+			oItemDiv.onmouseout = ItemDiv_OnMouseOut ;
+			oItemDiv.onclick = ItemDiv_OnClick ;
+		}
+	}
+}
+
+function ItemDiv_OnMouseOver()
+{
+	this.className += ' PopupSelectionBox' ;
+}
+
+function ItemDiv_OnMouseOut()
+{
+	this.className = this.className.replace( /\s*PopupSelectionBox\s*/, '' ) ;
+}
+
+function ItemDiv_OnClick()
+{
+	SelectTemplate( this.TplIndex ) ;
+}
+
+function SelectTemplate( index )
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	if ( GetE('xChkReplaceAll').checked )
+		FCK.SetData( FCK._Templates[index].Html ) ;
+	else
+		FCK.InsertHtml( FCK._Templates[index].Html ) ;
+
+	window.parent.Cancel( true ) ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table width="100%" style="height: 100%">
+		<tr>
+			<td align="center">
+				<span fcklang="DlgTemplatesSelMsg">Please select the template to open in the editor<br />
+					(the actual contents will be lost):</span>
+			</td>
+		</tr>
+		<tr>
+			<td height="100%" align="center">
+				<div id="eList" align="left" class="TplList">
+					<div id="eLoading" align="center" style="display: none">
+						<br />
+						<span fcklang="DlgTemplatesLoading">Loading templates list. Please wait...</span>
+					</div>
+					<div id="eEmpty" align="center" style="display: none">
+						<br />
+						<span fcklang="DlgTemplatesNoTpl">(No templates defined)</span>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr id="xReplaceBlock" style="display: none">
+			<td>
+				<table cellpadding="0" cellspacing="0">
+					<tr>
+						<td>
+							<input id="xChkReplaceAll" type="checkbox" /></td>
+						<td>
+							&nbsp;</td>
+						<td>
+							<label for="xChkReplaceAll" fcklang="DlgTemplatesReplace">
+								Replace actual contents</label></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template1.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template1.gif
new file mode 100644
index 000000000..efdabbebd
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template1.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template2.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template2.gif
new file mode 100644
index 000000000..d1cebb3ae
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template2.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template3.gif b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template3.gif
new file mode 100644
index 000000000..db41cb4fb
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/dialog/fck_template/images/template3.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_textarea.html b/modules/editor/skins/fckeditor/editor/dialog/fck_textarea.html
new file mode 100644
index 000000000..3a1c56dcd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_textarea.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Text Area dialog window.
+-->
+<html>
+	<head>
+		<title>Text Area Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+		<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl && oActiveEl.tagName == 'TEXTAREA' )
+	{
+		GetE('txtName').value		= oActiveEl.name ;
+		GetE('txtCols').value		= GetAttribute( oActiveEl, 'cols' ) ;
+		GetE('txtRows').value		= GetAttribute( oActiveEl, 'rows' ) ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'TEXTAREA', {name: GetE('txtName').value} ) ;
+
+	SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
+	SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;
+
+	return true ;
+}
+
+		</script>
+	</head>
+	<body style="overflow: hidden">
+		<table height="100%" width="100%">
+			<tr>
+				<td align="center">
+					<table border="0" cellpadding="0" cellspacing="0" width="80%">
+						<tr>
+							<td>
+								<span fckLang="DlgTextareaName">Name</span><br>
+								<input type="text" id="txtName" style="WIDTH: 100%">
+								<span fckLang="DlgTextareaCols">Collumns</span><br>
+								<input id="txtCols" type="text" size="5">
+								<br>
+								<span fckLang="DlgTextareaRows">Rows</span><br>
+								<input id="txtRows" type="text" size="5">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dialog/fck_textfield.html b/modules/editor/skins/fckeditor/editor/dialog/fck_textfield.html
new file mode 100644
index 000000000..cf3ce03d3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dialog/fck_textfield.html
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Text field dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta content="noindex, nofollow" name="robots" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
+	<script type="text/javascript">
+
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
+// Gets the document DOM
+var oDOM = oEditor.FCK.EditorDocument ;
+
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
+
+window.onload = function()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && ( oActiveEl.type == 'text' || oActiveEl.type == 'password' ) )
+	{
+		GetE('txtName').value	= oActiveEl.name ;
+		GetE('txtValue').value	= oActiveEl.value ;
+		GetE('txtSize').value	= GetAttribute( oActiveEl, 'size' ) ;
+		GetE('txtMax').value	= GetAttribute( oActiveEl, 'maxLength' ) ;
+		GetE('txtType').value	= oActiveEl.type ;
+	}
+	else
+		oActiveEl = null ;
+
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
+}
+
+function Ok()
+{
+	if ( isNaN( GetE('txtMax').value ) || GetE('txtMax').value < 0 )
+	{
+		alert( "Maximum characters must be a positive number." ) ;
+		GetE('txtMax').focus() ;
+		return false ;
+	}
+	else if( isNaN( GetE('txtSize').value ) || GetE('txtSize').value < 0 )
+	{
+		alert( "Width must be a positive number." ) ;
+		GetE('txtSize').focus() ;
+		return false ;
+	}
+
+	oEditor.FCKUndo.SaveUndoStep() ;
+
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
+
+	SetAttribute( oActiveEl, 'value'	, GetE('txtValue').value ) ;
+	SetAttribute( oActiveEl, 'size'		, GetE('txtSize').value ) ;
+	SetAttribute( oActiveEl, 'maxlength', GetE('txtMax').value ) ;
+
+	return true ;
+}
+
+	</script>
+</head>
+<body style="overflow: hidden">
+	<table width="100%" style="height: 100%">
+		<tr>
+			<td align="center">
+				<table cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td>
+							<span fcklang="DlgTextName">Name</span><br />
+							<input id="txtName" type="text" size="20" />
+						</td>
+						<td>
+						</td>
+						<td>
+							<span fcklang="DlgTextValue">Value</span><br />
+							<input id="txtValue" type="text" size="25" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgTextCharWidth">Character Width</span><br />
+							<input id="txtSize" type="text" size="5" />
+						</td>
+						<td>
+						</td>
+						<td>
+							<span fcklang="DlgTextMaxChars">Maximum Characters</span><br />
+							<input id="txtMax" type="text" size="5" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<span fcklang="DlgTextType">Type</span><br />
+							<select id="txtType">
+								<option value="text" selected="selected" fcklang="DlgTextTypeText">Text</option>
+								<option value="password" fcklang="DlgTextTypePass">Password</option>
+							</select>
+						</td>
+						<td>
+							&nbsp;</td>
+						<td>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dtd/fck_dtd_test.html b/modules/editor/skins/fckeditor/editor/dtd/fck_dtd_test.html
new file mode 100644
index 000000000..c149d15c1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dtd/fck_dtd_test.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>DTD Test Page</title>
+	<script type="text/javascript">
+
+	// Define an object for this test page, so the assignment to FCK.DTD works
+	var FCK = {} ;
+	</script>
+	<script type="text/javascript" src="../_source/internals/fcktools.js"></script>
+	<script type="text/javascript" src="fck_xhtml10transitional.js"></script>
+</head>
+<body>
+	<h1>
+		DTD Contents
+	</h1>
+	<table border="1">
+		<script type="text/javascript">
+
+for ( var p in FCK.DTD )
+{
+	document.write( '<tr><td><b>' + p + '</b></td><td>' ) ;
+
+	var isFirst = true ;
+
+	for ( var c in FCK.DTD[p] )
+	{
+		if ( !isFirst )
+			document.write( ', ' ) ;
+		isFirst = false ;
+
+		document.write( c ) ;
+	}
+
+
+	document.write( '</td></tr>' ) ;
+}
+		</script>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10strict.js b/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10strict.js
new file mode 100644
index 000000000..0849b528a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10strict.js
@@ -0,0 +1,116 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Contains the DTD mapping for XHTML 1.0 Strict.
+ * This file was automatically generated from the file: xhtml10-strict.dtd
+ */
+FCK.DTD = (function()
+{
+    var X = FCKTools.Merge ;
+
+    var H,I,J,K,C,L,M,A,B,D,E,G,N,F ;
+    A = {ins:1, del:1, script:1} ;
+    B = {hr:1, ul:1, div:1, blockquote:1, noscript:1, table:1, address:1, pre:1, p:1, h5:1, dl:1, h4:1, ol:1, h6:1, h1:1, h3:1, h2:1} ;
+    C = X({fieldset:1}, B) ;
+    D = X({sub:1, bdo:1, 'var':1, sup:1, br:1, kbd:1, map:1, samp:1, b:1, acronym:1, '#':1, abbr:1, code:1, i:1, cite:1, tt:1, strong:1, q:1, em:1, big:1, small:1, span:1, dfn:1}, A) ;
+    E = X({img:1, object:1}, D) ;
+    F = {input:1, button:1, textarea:1, select:1, label:1} ;
+    G = X({a:1}, F) ;
+    H = {img:1, noscript:1, br:1, kbd:1, button:1, h5:1, h4:1, samp:1, h6:1, ol:1, h1:1, h3:1, h2:1, form:1, select:1, '#':1, ins:1, abbr:1, label:1, code:1, table:1, script:1, cite:1, input:1, strong:1, textarea:1, big:1, small:1, span:1, hr:1, sub:1, bdo:1, 'var':1, div:1, object:1, sup:1, map:1, dl:1, del:1, fieldset:1, ul:1, b:1, acronym:1, a:1, blockquote:1, i:1, address:1, tt:1, q:1, pre:1, p:1, em:1, dfn:1} ;
+
+    I = X({form:1, fieldset:1}, B, E, G) ;
+    J = {tr:1} ;
+    K = {'#':1} ;
+    L = X(E, G) ;
+    M = {li:1} ;
+    N = X({form:1}, A, C) ;
+
+    return {
+        col: {},
+        tr: {td:1, th:1},
+        img: {},
+        colgroup: {col:1},
+        noscript: N,
+        td: I,
+        br: {},
+        th: I,
+        kbd: L,
+        button: X(B, E),
+        h5: L,
+        h4: L,
+        samp: L,
+        h6: L,
+        ol: M,
+        h1: L,
+        h3: L,
+        option: K,
+        h2: L,
+        form: X(A, C),
+        select: {optgroup:1, option:1},
+        ins: I,
+        abbr: L,
+        label: L,
+        code: L,
+        table: {thead:1, col:1, tbody:1, tr:1, colgroup:1, caption:1, tfoot:1},
+        script: K,
+        tfoot: J,
+        cite: L,
+        li: I,
+        input: {},
+        strong: L,
+        textarea: K,
+        big: L,
+        small: L,
+        span: L,
+        dt: L,
+        hr: {},
+        sub: L,
+        optgroup: {option:1},
+        bdo: L,
+        param: {},
+        'var': L,
+        div: I,
+        object: X({param:1}, H),
+        sup: L,
+        dd: I,
+        area: {},
+        map: X({form:1, area:1}, A, C),
+        dl: {dt:1, dd:1},
+        del: I,
+        fieldset: X({legend:1}, H),
+        thead: J,
+        ul: M,
+        acronym: L,
+        b: L,
+        a: X({img:1, object:1}, D, F),
+        blockquote: N,
+        caption: L,
+        i: L,
+        tbody: J,
+        address: L,
+        tt: L,
+        legend: L,
+        q: L,
+        pre: X({a:1}, D, F),
+        p: L,
+        em: L,
+        dfn: L
+    } ;
+})() ;
diff --git a/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10transitional.js b/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10transitional.js
new file mode 100644
index 000000000..5857ea9ff
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/dtd/fck_xhtml10transitional.js
@@ -0,0 +1,140 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Contains the DTD mapping for XHTML 1.0 Transitional.
+ * This file was automatically generated from the file: xhtml10-transitional.dtd
+ */
+FCK.DTD = (function()
+{
+    var X = FCKTools.Merge ;
+
+    var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I ;
+    A = {isindex:1, fieldset:1} ;
+    B = {input:1, button:1, select:1, textarea:1, label:1} ;
+    C = X({a:1}, B) ;
+    D = X({iframe:1}, C) ;
+    E = {hr:1, ul:1, menu:1, div:1, blockquote:1, noscript:1, table:1, center:1, address:1, dir:1, pre:1, h5:1, dl:1, h4:1, noframes:1, h6:1, ol:1, h1:1, h3:1, h2:1} ;
+    F = {ins:1, del:1, script:1} ;
+    G = X({b:1, acronym:1, bdo:1, 'var':1, '#':1, abbr:1, code:1, br:1, i:1, cite:1, kbd:1, u:1, strike:1, s:1, tt:1, strong:1, q:1, samp:1, em:1, dfn:1, span:1}, F) ;
+    H = X({sub:1, img:1, object:1, sup:1, basefont:1, map:1, applet:1, font:1, big:1, small:1}, G) ;
+    I = X({p:1}, H) ;
+    J = X({iframe:1}, H, B) ;
+    K = {img:1, noscript:1, br:1, kbd:1, center:1, button:1, basefont:1, h5:1, h4:1, samp:1, h6:1, ol:1, h1:1, h3:1, h2:1, form:1, font:1, '#':1, select:1, menu:1, ins:1, abbr:1, label:1, code:1, table:1, script:1, cite:1, input:1, iframe:1, strong:1, textarea:1, noframes:1, big:1, small:1, span:1, hr:1, sub:1, bdo:1, 'var':1, div:1, object:1, sup:1, strike:1, dir:1, map:1, dl:1, applet:1, del:1, isindex:1, fieldset:1, ul:1, b:1, acronym:1, a:1, blockquote:1, i:1, u:1, s:1, tt:1, address:1, q:1, pre:1, p:1, em:1, dfn:1} ;
+
+    L = X({a:1}, J) ;
+    M = {tr:1} ;
+    N = {'#':1} ;
+    O = X({param:1}, K) ;
+    P = X({form:1}, A, D, E, I) ;
+    Q = {li:1} ;
+
+    return {
+        col: {},
+        tr: {td:1, th:1},
+        img: {},
+        colgroup: {col:1},
+        noscript: P,
+        td: P,
+        br: {},
+        th: P,
+        center: P,
+        kbd: L,
+        button: X(I, E),
+        basefont: {},
+        h5: L,
+        h4: L,
+        samp: L,
+        h6: L,
+        ol: Q,
+        h1: L,
+        h3: L,
+        option: N,
+        h2: L,
+        form: X(A, D, E, I),
+        select: {optgroup:1, option:1},
+        font: J,		// Changed from L to J (see (1))
+        ins: P,
+        menu: Q,
+        abbr: L,
+        label: L,
+        table: {thead:1, col:1, tbody:1, tr:1, colgroup:1, caption:1, tfoot:1},
+        code: L,
+        script: N,
+        tfoot: M,
+        cite: L,
+        li: P,
+        input: {},
+        iframe: P,
+        strong: J,		// Changed from L to J (see (1))
+        textarea: N,
+        noframes: P,
+        big: J,			// Changed from L to J (see (1))
+        small: J,		// Changed from L to J (see (1))
+        span: J,		// Changed from L to J (see (1))
+        hr: {},
+        dt: L,
+        sub: J,			// Changed from L to J (see (1))
+        optgroup: {option:1},
+        param: {},
+        bdo: L,
+        'var': J,		// Changed from L to J (see (1))
+        div: P,
+        object: O,
+        sup: J,			// Changed from L to J (see (1))
+        dd: P,
+        strike: J,		// Changed from L to J (see (1))
+        area: {},
+        dir: Q,
+        map: X({area:1, form:1, p:1}, A, F, E),
+        applet: O,
+        dl: {dt:1, dd:1},
+        del: P,
+        isindex: {},
+        fieldset: X({legend:1}, K),
+        thead: M,
+        ul: Q,
+        acronym: L,
+        b: J,			// Changed from L to J (see (1))
+        a: J,
+        blockquote: P,
+        caption: L,
+        i: J,			// Changed from L to J (see (1))
+        u: J,			// Changed from L to J (see (1))
+        tbody: M,
+        s: L,
+        address: X(D, I),
+        tt: J,			// Changed from L to J (see (1))
+        legend: L,
+        q: L,
+        pre: X(G, C),
+        p: L,
+        em: J,			// Changed from L to J (see (1))
+        dfn: L
+    } ;
+})() ;
+
+/*
+	Notes:
+	(1) According to the DTD, many elements, like <b> accept <a> elements
+	    inside of them. But, to produce better output results, we have manually
+	    changed the map to avoid breaking the links on pieces, having
+	    "<b>this is a </b><a><b>link</b> test</a>", instead of
+	    "<b>this is a <a>link</a></b><a> test</a>".
+*/
diff --git a/modules/editor/skins/fckeditor/editor/fckdialog.html b/modules/editor/skins/fckeditor/editor/fckdialog.html
new file mode 100644
index 000000000..4bbc36985
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/fckdialog.html
@@ -0,0 +1,812 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This page is used by all dialog box as the container.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta name="robots" content="noindex, nofollow" />
+		<script type="text/javascript">
+// <![CDATA[
+
+// Domain relaxation logic.
+(function()
+{
+	var d = document.domain ;
+
+	while ( true )
+	{
+		// Test if we can access a parent property.
+		try
+		{
+			var parentDomain = ( Args().TopWindow || E ).document.domain ;
+
+			if ( document.domain != parentDomain )
+				document.domain = parentDomain ;
+
+			break ;
+		}
+		catch( e ) {}
+
+		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+
+		if ( d.length == 0 )
+			break ;		// It was not able to detect the domain.
+
+		document.domain = d ;
+	}
+})() ;
+
+var E = frameElement._DialogArguments.Editor ;
+
+// It seems referencing to frameElement._DialogArguments directly would lead to memory leaks in IE.
+// So let's use functions to access its members instead.
+function Args()
+{
+	return frameElement._DialogArguments ;
+}
+
+function ParentDialog( dialog )
+{
+	return dialog ? dialog._ParentDialog : frameElement._ParentDialog ;
+}
+
+var FCK				= E.FCK ;
+var FCKTools		= E.FCKTools ;
+var FCKDomTools		= E.FCKDomTools ;
+var FCKDialog		= E.FCKDialog ;
+var FCKBrowserInfo	= E.FCKBrowserInfo ;
+var FCKConfig		= E.FCKConfig ;
+
+// Steal the focus so that the caret would no longer stay in the editor iframe.
+window.focus() ;
+
+// Sets the Skin CSS
+document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
+
+// Sets the language direction.
+var langDir = document.documentElement.dir = E.FCKLang.Dir ;
+
+// For IE6-, the fck_dialog_ie6.js is loaded, used to fix limitations in the browser.
+if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+	document.write( '<' + 'script type="text/javascript" src="' + FCKConfig.SkinPath + 'fck_dialog_ie6.js"><' + '\/script>' ) ;
+
+FCKTools.RegisterDollarFunction( window ) ;
+
+// Resize related functions.
+var Sizer = function()
+{
+	var bAutoSize = false ;
+
+	var retval = {
+		// Sets whether the dialog should auto-resize according to its content's height.
+		SetAutoSize : function( autoSize )
+		{
+			bAutoSize = autoSize ;
+			this.RefreshSize() ;
+		},
+
+		// Fit the dialog container's layout to the inner iframe's external size.
+		RefreshContainerSize : function()
+		{
+			var frmMain = $( 'frmMain' ) ;
+
+			if ( frmMain )
+			{
+				// Get the container size.
+				var height = $( 'contents' ).offsetHeight ;
+
+				// Subtract the size of other elements.
+				height -= $( 'TitleArea' ).offsetHeight ;
+				height -= $( 'TabsRow' ).offsetHeight ;
+				height -= $( 'PopupButtons' ).offsetHeight ;
+
+				frmMain.style.height = Math.max( height, 0 ) + 'px' ;
+			}
+		},
+
+		// Resize and re-layout the dialog.
+		// Triggers the onresize event for the layout logic.
+		ResizeDialog : function( width, height )
+		{
+			FCKDomTools.SetElementStyles( window.frameElement,
+					{
+						'width' : width + 'px',
+						'height' : height + 'px'
+					} ) ;
+
+			// If the skin have defined a function for resize fixes, call it now.
+			if ( typeof window.DoResizeFixes == 'function' )
+				window.DoResizeFixes() ;
+		},
+
+		// if bAutoSize is true, automatically fit the dialog size and layout to
+		// accomodate the inner iframe's internal height.
+		// if bAutoSize is false, then only the layout logic for the dialog decorations
+		// is run to accomodate the inner iframe's external height.
+		RefreshSize : function()
+		{
+			if ( bAutoSize )
+			{
+				var frmMain		= $( 'frmMain' ) ;
+				var innerDoc	= frmMain.contentWindow.document ;
+				var isStrict	= FCKTools.IsStrictMode( innerDoc ) ;
+
+				// Get the size of the frame contents.
+				var innerWidth	= isStrict ? innerDoc.documentElement.scrollWidth : innerDoc.body.scrollWidth ;
+				var innerHeight	= isStrict ? innerDoc.documentElement.scrollHeight : innerDoc.body.scrollHeight ;
+
+				// Get the current frame size.
+				var frameSize = FCKTools.GetViewPaneSize( frmMain.contentWindow ) ;
+
+				var deltaWidth	= innerWidth - frameSize.Width ;
+				var deltaHeight	= innerHeight - frameSize.Height ;
+
+				// If the contents fits the current size.
+				if ( deltaWidth <= 0 && deltaHeight <= 0 )
+					return ;
+
+				var dialogWidth		= frameElement.offsetWidth + Math.max( deltaWidth, 0 ) ;
+				var dialogHeight	= frameElement.offsetHeight + Math.max( deltaHeight, 0 ) ;
+
+				this.ResizeDialog( dialogWidth, dialogHeight ) ;
+			}
+			this.RefreshContainerSize() ;
+		}
+	}
+
+	/**
+	 * Safari seems to have a bug with the time when RefreshSize() is executed - it
+	 * thinks frmMain's innerHeight is 0 if we query the value too soon after the
+	 * page is loaded in some circumstances. (#1316)
+	 * TODO : Maybe this is not needed anymore after #35.
+	 */
+	if ( FCKBrowserInfo.IsSafari )
+	{
+		var originalRefreshSize = retval.RefreshSize ;
+
+		retval.RefreshSize = function()
+		{
+			FCKTools.SetTimeout( originalRefreshSize, 1, retval ) ;
+		}
+	}
+
+	/**
+	 * IE6 has a similar bug where it sometimes thinks $('contents') has an
+	 * offsetHeight of 0 (#2114).
+	 */
+	if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+	{
+		var originalRefreshContainerSize = retval.RefreshContainerSize ;
+		retval.RefreshContainerSize = function()
+		{
+			FCKTools.SetTimeout( originalRefreshContainerSize, 1, retval ) ;
+		}
+	}
+
+	window.onresize = function()
+	{
+		retval.RefreshContainerSize() ;
+	}
+
+	window.SetAutoSize = FCKTools.Bind( retval, retval.SetAutoSize ) ;
+
+	return retval ;
+}() ;
+
+// Manages the throbber image that appears if the inner part of dialog is taking too long to load.
+var Throbber = function()
+{
+	var timer ;
+
+	var updateThrobber = function()
+	{
+		var throbberParent = $( 'throbberBlock' ) ;
+		var throbberBlocks = throbberParent.childNodes ;
+		var lastClass = throbberParent.lastChild.className ;
+
+		// From the last to the second one, copy the class from the previous one.
+		for ( var i = throbberBlocks.length - 1 ; i > 0 ; i-- )
+			throbberBlocks[i].className = throbberBlocks[i-1].className ;
+
+		// For the first one, copy the last class (rotation).
+		throbberBlocks[0].className = lastClass ;
+	}
+
+	return {
+		Show : function( waitMilliseconds )
+		{
+			// Auto-setup the Show function to be called again after the
+			// requested amount of time.
+			if ( waitMilliseconds && waitMilliseconds > 0 )
+			{
+				timer = FCKTools.SetTimeout( this.Show, waitMilliseconds, this, null, window ) ;
+				return ;
+			}
+
+			var throbberParent = $( 'throbberBlock' ) ;
+
+			if (throbberParent.childNodes.length == 0)
+			{
+				// Create the throbber blocks.
+				var classIds = [ 1,2,3,4,5,4,3,2 ] ;
+				while ( classIds.length > 0 )
+					throbberParent.appendChild( document.createElement( 'div' ) ).className = ' throbber_' + classIds.shift() ;
+			}
+
+			// Center the throbber.
+			var frm = $( 'contents' ) ;
+			var frmCoords = FCKTools.GetDocumentPosition( window, frm ) ;
+			var x = frmCoords.x + ( frm.offsetWidth - throbberParent.offsetWidth ) / 2 ;
+			var y = frmCoords.y + ( frm.offsetHeight - throbberParent.offsetHeight ) / 2 ;
+			throbberParent.style.left = parseInt( x, 10 ) + 'px' ;
+			throbberParent.style.top = parseInt( y, 10 ) + 'px' ;
+
+			// Show it.
+			throbberParent.style.visibility = ''  ;
+
+			// Hide tabs and buttons:
+			$( 'Tabs' ).style.visibility = 'hidden' ;
+			$( 'PopupButtons' ).style.visibility = 'hidden' ;
+
+			// Setup the animation interval.
+			timer = setInterval( updateThrobber, 100 ) ;
+		},
+
+		Hide : function()
+		{
+			if ( timer )
+			{
+				clearInterval( timer ) ;
+				timer = null ;
+			}
+
+			$( 'throbberBlock' ).style.visibility = 'hidden' ;
+
+			// Show tabs and buttons:
+			$( 'Tabs' ).style.visibility = '' ;
+			$( 'PopupButtons' ).style.visibility = '' ;
+		}
+	} ;
+}() ;
+
+// Drag and drop handlers.
+var DragAndDrop = function()
+{
+	var registeredWindows = [] ;
+	var lastCoords ;
+	var currentPos ;
+
+	var cleanUpHandlers = function()
+	{
+		for ( var i = 0 ; i < registeredWindows.length ; i++ )
+		{
+			FCKTools.RemoveEventListener( registeredWindows[i].document, 'mousemove', dragMouseMoveHandler ) ;
+			FCKTools.RemoveEventListener( registeredWindows[i].document, 'mouseup', dragMouseUpHandler ) ;
+		}
+	}
+
+	var dragMouseMoveHandler = function( evt )
+	{
+		if ( !lastCoords )
+			return ;
+
+		if ( !evt )
+			evt = FCKTools.GetElementDocument( this ).parentWindow.event ;
+
+		// Updated the last coordinates.
+		var currentCoords =
+		{
+			x : evt.screenX,
+			y : evt.screenY
+		} ;
+
+		currentPos =
+		{
+			x : currentPos.x + ( currentCoords.x - lastCoords.x ),
+			y : currentPos.y + ( currentCoords.y - lastCoords.y )
+		} ;
+
+		lastCoords = currentCoords ;
+
+		frameElement.style.left	= currentPos.x + 'px' ;
+		frameElement.style.top	= currentPos.y + 'px' ;
+
+		if ( evt.preventDefault )
+			evt.preventDefault() ;
+		else
+			evt.returnValue = false ;
+	}
+
+	var dragMouseUpHandler = function( evt )
+	{
+		if ( !lastCoords )
+			return ;
+		if ( !evt )
+			evt = FCKTools.GetElementDocument( this ).parentWindow.event ;
+		cleanUpHandlers() ;
+		lastCoords = null ;
+	}
+
+	return {
+
+		MouseDownHandler : function( evt )
+		{
+			var view = null ;
+			if ( !evt )
+			{
+				view = FCKTools.GetElementDocument( this ).parentWindow ;
+				evt = view.event ;
+			}
+			else
+				view = evt.view ;
+
+			var target = evt.srcElement || evt.target ;
+			if ( target.id == 'closeButton' || target.className == 'PopupTab' || target.className == 'PopupTabSelected' )
+				return ;
+
+			lastCoords =
+			{
+				x : evt.screenX,
+				y : evt.screenY
+			} ;
+
+			// Save the current IFRAME position.
+			currentPos =
+			{
+				x : parseInt( FCKDomTools.GetCurrentElementStyle( frameElement, 'left' ), 10 ),
+				y : parseInt( FCKDomTools.GetCurrentElementStyle( frameElement, 'top' ), 10 )
+			} ;
+
+			for ( var i = 0 ; i < registeredWindows.length ; i++ )
+			{
+				FCKTools.AddEventListener( registeredWindows[i].document, 'mousemove', dragMouseMoveHandler ) ;
+				FCKTools.AddEventListener( registeredWindows[i].document, 'mouseup', dragMouseUpHandler ) ;
+			}
+
+			if ( evt.preventDefault )
+				evt.preventDefault() ;
+			else
+				evt.returnValue = false ;
+		},
+
+		RegisterHandlers : function( w )
+		{
+			registeredWindows.push( w ) ;
+		}
+	}
+}() ;
+
+// Selection related functions.
+//(Became simple shortcuts after the fix for #1990)
+var Selection =
+{
+	/**
+	 * Ensures that the editing area contains an active selection. This is a
+	 * requirement for IE, as it looses the selection when the focus moves to other
+	 * frames.
+	 */
+	EnsureSelection : function()
+	{
+		FCK.Selection.Restore() ;
+	},
+
+	/**
+	 * Get the FCKSelection object for the editor instance.
+	 */
+	GetSelection : function()
+	{
+		return FCK.Selection ;
+	},
+
+	/**
+	 * Get the selected element in the editing area (for object selections).
+	 */
+	GetSelectedElement : function()
+	{
+		return FCK.Selection.GetSelectedElement() ;
+	}
+}
+
+// Tab related functions.
+var Tabs = function()
+{
+	// Only element ids should be stored here instead of element references since setSelectedTab and TabDiv_OnClick
+	// would build circular references with the element references inside and cause memory leaks in IE6.
+	var oTabs = new Object() ;
+
+	var setSelectedTab = function( tabCode )
+	{
+		for ( var sCode in oTabs )
+		{
+			if ( sCode == tabCode )
+				$( oTabs[sCode] ).className = 'PopupTabSelected' ;
+			else
+				$( oTabs[sCode] ).className = 'PopupTab' ;
+		}
+
+		if ( typeof( window.frames["frmMain"].OnDialogTabChange ) == 'function' )
+			window.frames["frmMain"].OnDialogTabChange( tabCode ) ;
+	}
+
+	function TabDiv_OnClick()
+	{
+		setSelectedTab( this.TabCode ) ;
+	}
+
+	window.AddTab = function( tabCode, tabText, startHidden )
+	{
+		if ( typeof( oTabs[ tabCode ] ) != 'undefined' )
+			return ;
+
+		var eTabsRow = $( 'Tabs' ) ;
+
+		var oCell = eTabsRow.insertCell(  eTabsRow.cells.length - 1 ) ;
+		oCell.noWrap = true ;
+
+		var oDiv = document.createElement( 'DIV' ) ;
+		oDiv.className = 'PopupTab' ;
+		oDiv.innerHTML = tabText ;
+		oDiv.TabCode = tabCode ;
+		oDiv.onclick = TabDiv_OnClick ;
+		oDiv.id = Math.random() ;
+
+		if ( startHidden )
+			oDiv.style.display = 'none' ;
+
+		eTabsRow = $( 'TabsRow' ) ;
+
+		oCell.appendChild( oDiv ) ;
+
+		if ( eTabsRow.style.display == 'none' )
+		{
+			var eTitleArea = $( 'TitleArea' ) ;
+			eTitleArea.className = 'PopupTitle' ;
+
+			oDiv.className = 'PopupTabSelected' ;
+			eTabsRow.style.display = '' ;
+
+			if ( window.onresize )
+				window.onresize() ;
+		}
+
+		oTabs[ tabCode ] = oDiv.id ;
+
+		FCKTools.DisableSelection( oDiv ) ;
+	} ;
+
+	window.SetSelectedTab = setSelectedTab ;
+
+	window.SetTabVisibility = function( tabCode, isVisible )
+	{
+		var oTab = $( oTabs[ tabCode ] ) ;
+		oTab.style.display = isVisible ? '' : 'none' ;
+
+		if ( ! isVisible && oTab.className == 'PopupTabSelected' )
+		{
+			for ( var sCode in oTabs )
+			{
+				if ( $( oTabs[sCode] ).style.display != 'none' )
+				{
+					setSelectedTab( sCode ) ;
+					break ;
+				}
+			}
+		}
+	} ;
+}() ;
+
+// readystatechange handler for registering drag and drop handlers in cover
+// iframes, defined out here to avoid memory leak.
+// Do NOT put this function as a private function as it will induce memory leak
+// in IE and it's not detectable with Drip or sIEve and undetectable leaks are
+// really nasty (sigh).
+var onReadyRegister = function()
+{
+	if ( this.readyState != 'complete' )
+		return ;
+	DragAndDrop.RegisterHandlers( this.contentWindow ) ;
+} ;
+
+// The business logic of the dialog, dealing with operational things like
+// dialog open/dialog close/enable/disable/etc.
+(function()
+{
+	var setOnKeyDown = function( targetDocument )
+	{
+		targetDocument.onkeydown = function ( e )
+		{
+			e = e || event || this.parentWindow.event ;
+			switch ( e.keyCode )
+			{
+				case 13 :		// ENTER
+					var oTarget = e.srcElement || e.target ;
+					if ( oTarget.tagName == 'TEXTAREA' )
+						return true ;
+					Ok() ;
+					return false ;
+
+				case 27 :		// ESC
+					Cancel() ;
+					return false ;
+			}
+			return true ;
+		}
+	} ;
+
+	var contextMenuBlocker = function( e )
+	{
+		var sTagName = e.target.tagName ;
+		if ( ! ( ( sTagName == "INPUT" && e.target.type == "text" ) || sTagName == "TEXTAREA" ) )
+			e.preventDefault() ;
+	} ;
+
+	var disableContextMenu = function( targetDocument )
+	{
+		if ( FCKBrowserInfo.IsIE )
+			return ;
+
+		targetDocument.addEventListener( 'contextmenu', contextMenuBlocker, true ) ;
+	} ;
+
+	// Program entry point.
+	window.Init = function()
+	{
+		// Start the throbber timer.
+		Throbber.Show( 1000 ) ;
+
+		Sizer.RefreshContainerSize() ;
+		LoadInnerDialog() ;
+
+		FCKTools.DisableSelection( document.body ) ;
+
+		// Make the title area draggable.
+		var titleElement = $( 'header' ) ;
+		titleElement.onmousedown = DragAndDrop.MouseDownHandler ;
+
+		// Connect mousemove and mouseup events from dialog frame and outer window to dialog dragging logic.
+		DragAndDrop.RegisterHandlers( window ) ;
+		DragAndDrop.RegisterHandlers( Args().TopWindow ) ;
+
+		// Disable the previous dialog if it exists.
+		if ( ParentDialog() )
+		{
+			ParentDialog().contentWindow.SetEnabled( false ) ;
+			if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+			{
+				var currentParent = ParentDialog() ;
+				while ( currentParent )
+				{
+					var blockerFrame = currentParent.contentWindow.$( 'blocker' ) ;
+					if ( blockerFrame.readyState == 'complete' )
+						DragAndDrop.RegisterHandlers( blockerFrame.contentWindow ) ;
+					else
+						blockerFrame.onreadystatechange = onReadyRegister ;
+					currentParent = ParentDialog( currentParent ) ;
+				}
+			}
+			else
+			{
+				var currentParent = ParentDialog() ;
+				while ( currentParent )
+				{
+					DragAndDrop.RegisterHandlers( currentParent.contentWindow ) ;
+					currentParent = ParentDialog( currentParent ) ;
+				}
+			}
+		}
+
+		// If this is the only dialog on screen, enable the background cover.
+		if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+		{
+			var blockerFrame = FCKDialog.GetCover().firstChild ;
+			if ( blockerFrame.readyState == 'complete' )
+				DragAndDrop.RegisterHandlers( blockerFrame.contentWindow ) ;
+			else
+				blockerFrame.onreadystatechange = onReadyRegister;
+		}
+
+		// Add Enter/Esc hotkeys and disable context menu for the dialog.
+		setOnKeyDown( document ) ;
+		disableContextMenu( document ) ;
+	} ;
+
+	window.LoadInnerDialog = function()
+	{
+		if ( window.onresize )
+			window.onresize() ;
+
+		// First of all, translate the dialog box contents.
+		E.FCKLanguageManager.TranslatePage( document ) ;
+
+		// Create the IFRAME that holds the dialog contents.
+		$( 'innerContents' ).innerHTML = '<iframe id="frmMain" src="' + Args().Page + '" name="frmMain" frameborder="0" width="100%" height="100%" scrolling="auto" style="visibility: hidden;" allowtransparency="true"><\/iframe>' ;
+	} ;
+
+	window.InnerDialogLoaded = function()
+	{
+		// If the dialog has been closed before the iframe is loaded, do nothing.
+		if ( !frameElement.parentNode )
+			return null ;
+
+		Throbber.Hide() ;
+
+		var frmMain = $('frmMain') ;
+		var innerWindow = frmMain.contentWindow ;
+		var innerDoc = innerWindow.document ;
+
+		// Show the loaded iframe.
+		frmMain.style.visibility = '' ;
+
+		// Set the language direction.
+		innerDoc.documentElement.dir = langDir ;
+
+		// Sets the Skin CSS.
+		innerDoc.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
+
+		setOnKeyDown( innerDoc ) ;
+		disableContextMenu( innerDoc ) ;
+
+		Sizer.RefreshContainerSize();
+
+		DragAndDrop.RegisterHandlers( innerWindow ) ;
+
+		innerWindow.focus() ;
+
+		return E ;
+	} ;
+
+	window.SetOkButton = function( showIt )
+	{
+		$('btnOk').style.visibility = ( showIt ? '' : 'hidden' ) ;
+	} ;
+
+	window.Ok = function()
+	{
+		Selection.EnsureSelection() ;
+
+		var frmMain = window.frames["frmMain"] ;
+
+		if ( frmMain.Ok && frmMain.Ok() )
+			CloseDialog() ;
+		else
+			frmMain.focus() ;
+	} ;
+
+	window.Cancel = function( dontFireChange )
+	{
+		Selection.EnsureSelection() ;
+		return CloseDialog( dontFireChange ) ;
+	} ;
+
+	window.CloseDialog = function( dontFireChange )
+	{
+		Throbber.Hide() ;
+
+		// Points the src to a non-existent location to avoid loading errors later, in case the dialog
+		// haven't been completed loaded at this point.
+		if ( $( 'frmMain' ) )
+			$( 'frmMain' ).src = FCKTools.GetVoidUrl() ;
+
+		if ( !dontFireChange && !FCK.EditMode )
+		{
+			// All dialog windows, by default, will fire the "OnSelectionChange"
+			// event, no matter the Ok or Cancel button has been pressed.
+			// It seems that OnSelectionChange may enter on a concurrency state
+			// on some situations (#1965), so we should put the event firing in
+			// the execution queue instead of executing it immediately.
+			setTimeout( function()
+				{
+					FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+				}, 0 ) ;
+		}
+
+		FCKDialog.OnDialogClose( window ) ;
+	} ;
+
+	window.SetEnabled = function( isEnabled )
+	{
+		var cover = $( 'cover' ) ;
+		cover.style.display = isEnabled ? 'none' : '' ;
+
+		if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+		{
+			if ( !isEnabled )
+			{
+				// Inser the blocker IFRAME before the cover.
+				var blocker = document.createElement( 'iframe' ) ;
+				blocker.src = FCKTools.GetVoidUrl() ;
+				blocker.hideFocus = true ;
+				blocker.frameBorder = 0 ;
+				blocker.id = blocker.className = 'blocker' ;
+				cover.appendChild( blocker ) ;
+			}
+			else
+			{
+				var blocker = $( 'blocker' ) ;
+				if ( blocker && blocker.parentNode )
+					blocker.parentNode.removeChild( blocker ) ;
+			}
+		}
+	} ;
+})() ;
+// ]]>
+		</script>
+	</head>
+	<body onload="Init();" class="PopupBody">
+		<div class="contents" id="contents">
+			<div id="header">
+				<div id="TitleArea" class="PopupTitle PopupTitleBorder">
+					<script type="text/javascript">
+// <![CDATA[
+document.write( Args().Title ) ;
+// ]]>
+					</script>
+					<div id="closeButton" onclick="Cancel();"></div>
+				</div>
+				<div id="TabsRow" class="PopupTabArea" style="display: none">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+						<tr id="Tabs">
+							<td class="PopupTabEmptyArea">&nbsp;</td>
+							<td class="PopupTabEmptyArea" width="100%">&nbsp;</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div id="innerContents"></div>
+			<div id="PopupButtons" class="PopupButtons">
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td width="100%">&nbsp;</td>
+						<td nowrap="nowrap">
+							<input id="btnOk" style="visibility: hidden;" type="button" value="Ok" class="Button" onclick="Ok();" fckLang="DlgBtnOK" />
+							&nbsp;
+							<input id="btnCancel" type="button" value="Cancel" class="Button" onclick="Cancel();" fckLang="DlgBtnCancel" />
+						</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+		<div class="tl"></div>
+		<div class="tc"></div>
+		<div class="tr"></div>
+		<div class="ml"></div>
+		<div class="mr"></div>
+		<div class="bl"></div>
+		<div class="bc"></div>
+		<div class="br"></div>
+		<div class="cover" id="cover" style="display:none"></div>
+		<div id="throbberBlock" style="position: absolute; visibility: hidden"></div>
+		<script type="text/javascript">
+// <![CDATA[
+			// Set the class name for language direction.
+			document.body.className += ' ' + langDir ;
+
+			var cover = $( 'cover' ) ;
+			cover.style.backgroundColor = FCKConfig.BackgroundBlockerColor ;
+			FCKDomTools.SetOpacity( cover, FCKConfig.BackgroundBlockerOpacity ) ;
+// ]]>
+		</script>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/fckeditor.html b/modules/editor/skins/fckeditor/editor/fckeditor.html
new file mode 100644
index 000000000..aba4c483b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/fckeditor.html
@@ -0,0 +1,317 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Main page that holds the editor.
+-->
+<html>
+<head>
+	<title>FCKeditor</title>
+	<meta name="robots" content="noindex, nofollow">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta http-equiv="Cache-Control" content="public">
+	<script type="text/javascript">
+
+// #1645: Alert the user if opening FCKeditor in FF3 from local filesystem
+// without security.fileuri.strict_origin_policy disabled.
+if ( document.location.protocol == 'file:' )
+{
+	try
+	{
+		window.parent.document.domain ;
+	}
+	catch ( e )
+	{
+		window.addEventListener( 'load', function()
+			{
+				document.body.innerHTML = '\
+					<div style="border: 1px red solid; font-family: arial; font-size: 12px; color: red; padding:10px;">\
+						<p>\
+							<b>Your browser security settings don\'t allow FCKeditor to be opened from\
+							the local filesystem.<\/b>\
+						<\/p>\
+						<p>\
+							Please open the <b>about:config<\/b> page and disable the\
+							&quot;security.fileuri.strict_origin_policy&quot; option; then load this page again.\
+						<\/p>\
+						<p>\
+							Check our <a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/FAQ#ff3perms">FAQ<\/a>\
+							for more information.\
+						<\/p>\
+					<\/div>' ;
+			}, false ) ;
+	}
+}
+
+// Save a reference to the default domain.
+var FCK_ORIGINAL_DOMAIN ;
+
+// Automatically detect the correct document.domain (#123).
+(function()
+{
+	var d = FCK_ORIGINAL_DOMAIN = document.domain ;
+
+	while ( true )
+	{
+		// Test if we can access a parent property.
+		try
+		{
+			var test = window.parent.document.domain ;
+			break ;
+		}
+		catch( e ) {}
+
+		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+
+		if ( d.length == 0 )
+			break ;		// It was not able to detect the domain.
+
+		try
+		{
+			document.domain = d ;
+		}
+		catch (e)
+		{
+			break ;
+		}
+	}
+})() ;
+
+// Save a reference to the detected runtime domain.
+var FCK_RUNTIME_DOMAIN = document.domain ;
+
+var FCK_IS_CUSTOM_DOMAIN = ( FCK_ORIGINAL_DOMAIN != FCK_RUNTIME_DOMAIN ) ;
+
+// Instead of loading scripts and CSSs using inline tags, all scripts are
+// loaded by code. In this way we can guarantee the correct processing order,
+// otherwise external scripts and inline scripts could be executed in an
+// unwanted order (IE).
+
+function LoadScript( url )
+{
+	document.write( '<scr' + 'ipt type="text/javascript" src="' + url + '"><\/scr' + 'ipt>' ) ;
+}
+
+// Main editor scripts.
+var sSuffix = ( /*@cc_on!@*/false ) ? 'ie' : 'gecko' ;
+
+LoadScript( 'js/fckeditorcode_' + sSuffix + '.js' ) ;
+
+// Base configuration file.
+LoadScript( '../fckconfig.js' ) ;
+
+	</script>
+	<script type="text/javascript">
+
+// Adobe AIR compatibility file.
+if ( FCKBrowserInfo.IsAIR )
+	LoadScript( 'js/fckadobeair.js' ) ;
+
+if ( FCKBrowserInfo.IsIE )
+{
+	// Remove IE mouse flickering.
+	try
+	{
+		document.execCommand( 'BackgroundImageCache', false, true ) ;
+	}
+	catch (e)
+	{
+		// We have been reported about loading problems caused by the above
+		// line. For safety, let's just ignore errors.
+	}
+
+	// Create the default cleanup object used by the editor.
+	FCK.IECleanup = new FCKIECleanup( window ) ;
+	FCK.IECleanup.AddItem( FCKTempBin, FCKTempBin.Reset ) ;
+	FCK.IECleanup.AddItem( FCK, FCK_Cleanup ) ;
+}
+
+// The first function to be called on selection change must the the styles
+// change checker, because the result of its processing may be used by another
+// functions listening to the same event.
+FCK.Events.AttachEvent( 'OnSelectionChange', function() { FCKStyles.CheckSelectionChanges() ; } ) ;
+
+// The config hidden field is processed immediately, because
+// CustomConfigurationsPath may be set in the page.
+FCKConfig.ProcessHiddenField() ;
+
+// Load the custom configurations file (if defined).
+if ( FCKConfig.CustomConfigurationsPath.length > 0 )
+	LoadScript( FCKConfig.CustomConfigurationsPath ) ;
+
+	</script>
+	<script type="text/javascript">
+
+// Load configurations defined at page level.
+FCKConfig_LoadPageConfig() ;
+
+FCKConfig_PreProcess() ;
+
+// Load the full debug script.
+if ( FCKConfig.Debug )
+	LoadScript( '_source/internals/fckdebug.js' ) ;
+
+	</script>
+	<script type="text/javascript">
+
+// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
+var FCK_InternalCSS			= FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
+var FCK_ShowTableBordersCSS	= FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
+
+// Popup the debug window if debug mode is set to true. It guarantees that the
+// first debug message will not be lost.
+if ( FCKConfig.Debug )
+	FCKDebug._GetWindow() ;
+
+// Load the active skin CSS.
+document.write( FCKTools.GetStyleHtml( FCKConfig.SkinEditorCSS ) ) ;
+
+// Load the language file.
+FCKLanguageManager.Initialize() ;
+LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;
+
+	</script>
+	<script type="text/javascript">
+
+// Initialize the editing area context menu.
+FCK_ContextMenu_Init() ;
+
+FCKPlugins.Load() ;
+
+	</script>
+	<script type="text/javascript">
+
+// Set the editor interface direction.
+window.document.dir = FCKLang.Dir ;
+
+	</script>
+	<script type="text/javascript">
+
+window.onload = function()
+{
+	InitializeAPI() ;
+
+	if ( FCKBrowserInfo.IsIE )
+		FCK_PreloadImages() ;
+	else
+		LoadToolbarSetup() ;
+}
+
+function LoadToolbarSetup()
+{
+	FCKeditorAPI._FunctionQueue.Add( LoadToolbar ) ;
+}
+
+function LoadToolbar()
+{
+	var oToolbarSet = FCK.ToolbarSet = FCKToolbarSet_Create() ;
+
+	if ( oToolbarSet.IsLoaded )
+		StartEditor() ;
+	else
+	{
+		oToolbarSet.OnLoad = StartEditor ;
+		oToolbarSet.Load( FCKURLParams['Toolbar'] || 'Default' ) ;
+	}
+}
+
+function StartEditor()
+{
+	// Remove the onload listener.
+	FCK.ToolbarSet.OnLoad = null ;
+
+	FCKeditorAPI._FunctionQueue.Remove( LoadToolbar ) ;
+
+	FCK.Events.AttachEvent( 'OnStatusChange', WaitForActive ) ;
+
+	// Start the editor.
+	FCK.StartEditor() ;
+}
+
+function WaitForActive( editorInstance, newStatus )
+{
+	if ( newStatus == FCK_STATUS_ACTIVE )
+	{
+		if ( FCKBrowserInfo.IsGecko )
+			FCKTools.RunFunction( window.onresize ) ;
+
+		if ( !FCKConfig.PreventSubmitHandler )
+			_AttachFormSubmitToAPI() ;
+
+		FCK.SetStatus( FCK_STATUS_COMPLETE ) ;
+
+		// Call the special "FCKeditor_OnComplete" function that should be present in
+		// the HTML page where the editor is located.
+		if ( typeof( window.parent.FCKeditor_OnComplete ) == 'function' )
+			window.parent.FCKeditor_OnComplete( FCK ) ;
+	}
+}
+
+// Gecko browsers doesn't calculate well the IFRAME size so we must
+// recalculate it every time the window size changes.
+if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
+{
+	window.onresize = function( e )
+	{
+		// Running in Chrome makes the window receive the event including subframes.
+		// we care only about this window. Ticket #1642.
+		// #2002: The originalTarget from the event can be the current document, the window, or the editing area.
+		if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
+			return ;
+
+		var oCell = document.getElementById( 'xEditingArea' ) ;
+
+		var eInnerElement = oCell.firstChild ;
+		if ( eInnerElement )
+		{
+			eInnerElement.style.height = '0px' ;
+			eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ;
+		}
+	}
+}
+
+	</script>
+</head>
+<body>
+	<table width="100%" cellpadding="0" cellspacing="0" style="height: 100%; table-layout: fixed">
+		<tr id="xToolbarRow" style="display: none">
+			<td id="xToolbarSpace" style="overflow: hidden">
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr id="xCollapsed" style="display: none">
+						<td id="xExpandHandle" class="TB_Expand" colspan="3">
+							<img class="TB_ExpandImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
+					</tr>
+					<tr id="xExpanded" style="display: none">
+						<td id="xTBLeftBorder" class="TB_SideBorder" style="width: 1px; display: none;"></td>
+						<td id="xCollapseHandle" style="display: none" class="TB_Collapse" valign="bottom">
+							<img class="TB_CollapseImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
+						<td id="xToolbar" class="TB_ToolbarSet"></td>
+						<td class="TB_SideBorder" style="width: 1px"></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td id="xEditingArea" valign="top" style="height: 100%"></td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/images/anchor.gif b/modules/editor/skins/fckeditor/editor/images/anchor.gif
new file mode 100644
index 000000000..5aa797b22
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/anchor.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/arrow_ltr.gif b/modules/editor/skins/fckeditor/editor/images/arrow_ltr.gif
new file mode 100644
index 000000000..9c59bfe0b
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/arrow_ltr.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/arrow_rtl.gif b/modules/editor/skins/fckeditor/editor/images/arrow_rtl.gif
new file mode 100644
index 000000000..22e864984
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/arrow_rtl.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/angel_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/angel_smile.gif
new file mode 100644
index 000000000..a95e05371
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/angel_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/angry_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/angry_smile.gif
new file mode 100644
index 000000000..c667c5d6a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/angry_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/broken_heart.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/broken_heart.gif
new file mode 100644
index 000000000..938cce190
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/broken_heart.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/cake.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/cake.gif
new file mode 100644
index 000000000..f6489d7d5
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/cake.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/confused_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/confused_smile.gif
new file mode 100644
index 000000000..aeb05393d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/confused_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/cry_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/cry_smile.gif
new file mode 100644
index 000000000..0758f429e
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/cry_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/devil_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/devil_smile.gif
new file mode 100644
index 000000000..15518d7f0
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/devil_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/embaressed_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/embaressed_smile.gif
new file mode 100644
index 000000000..c43194617
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/embaressed_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/envelope.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/envelope.gif
new file mode 100644
index 000000000..66d365614
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/envelope.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/heart.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/heart.gif
new file mode 100644
index 000000000..305714f88
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/heart.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/kiss.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/kiss.gif
new file mode 100644
index 000000000..f840ea602
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/kiss.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/lightbulb.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/lightbulb.gif
new file mode 100644
index 000000000..863be6e51
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/lightbulb.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/omg_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/omg_smile.gif
new file mode 100644
index 000000000..aabc7fd17
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/omg_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/regular_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/regular_smile.gif
new file mode 100644
index 000000000..33f297e81
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/regular_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/sad_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/sad_smile.gif
new file mode 100644
index 000000000..dfb78efea
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/sad_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/shades_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/shades_smile.gif
new file mode 100644
index 000000000..157df770a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/shades_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/teeth_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/teeth_smile.gif
new file mode 100644
index 000000000..26b5a555f
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/teeth_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_down.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_down.gif
new file mode 100644
index 000000000..f53ee7249
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_down.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_up.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_up.gif
new file mode 100644
index 000000000..7e8c74627
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/thumbs_up.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/tounge_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/tounge_smile.gif
new file mode 100644
index 000000000..b87ec4465
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/tounge_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
new file mode 100644
index 000000000..c0741223d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/smiley/msn/wink_smile.gif b/modules/editor/skins/fckeditor/editor/images/smiley/msn/wink_smile.gif
new file mode 100644
index 000000000..eefe61dfa
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/smiley/msn/wink_smile.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/images/spacer.gif b/modules/editor/skins/fckeditor/editor/images/spacer.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/images/spacer.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/js/fckadobeair.js b/modules/editor/skins/fckeditor/editor/js/fckadobeair.js
new file mode 100644
index 000000000..811bd00eb
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/js/fckadobeair.js
@@ -0,0 +1,176 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Compatibility code for Adobe AIR.
+ */
+
+if ( FCKBrowserInfo.IsAIR )
+{
+	var FCKAdobeAIR = (function()
+	{
+		/*
+		 * ### Private functions.
+		 */
+
+		var getDocumentHead = function( doc )
+		{
+			var head ;
+			var heads = doc.getElementsByTagName( 'head' ) ;
+
+			if( heads && heads[0] )
+				head = heads[0] ;
+			else
+			{
+				head = doc.createElement( 'head' ) ;
+				doc.documentElement.insertBefore( head, doc.documentElement.firstChild ) ;
+			}
+
+			return head ;
+		} ;
+
+		/*
+		 * ### Public interface.
+		 */
+		return {
+			FCKeditorAPI_Evaluate : function( parentWindow, script )
+			{
+				// TODO : This one doesn't work always. The parent window will
+				// point to an anonymous function in this window. If this
+				// window is destroyied the parent window will be pointing to
+				// an invalid reference.
+
+				// Evaluate the script in this window.
+				eval( script ) ;
+
+				// Point the FCKeditorAPI property of the parent window to the
+				// local reference.
+				parentWindow.FCKeditorAPI = window.FCKeditorAPI ;
+			},
+
+			EditingArea_Start : function( doc, html )
+			{
+				// Get the HTML for the <head>.
+				var headInnerHtml = html.match( /<head>([\s\S]*)<\/head>/i )[1] ;
+
+				if ( headInnerHtml && headInnerHtml.length > 0 )
+				{
+					// Inject the <head> HTML inside a <div>.
+					// Do that before getDocumentHead because WebKit moves
+					// <link css> elements to the <head> at this point.
+					var div = doc.createElement( 'div' ) ;
+					div.innerHTML = headInnerHtml ;
+
+					// Move the <div> nodes to <head>.
+					FCKDomTools.MoveChildren( div, getDocumentHead( doc ) ) ;
+				}
+
+				doc.body.innerHTML = html.match( /<body>([\s\S]*)<\/body>/i )[1] ;
+
+				//prevent clicking on hyperlinks and navigating away
+				doc.addEventListener('click', function( ev )
+					{
+						ev.preventDefault() ;
+						ev.stopPropagation() ;
+					}, true ) ;
+			},
+
+			Panel_Contructor : function( doc, baseLocation )
+			{
+				var head = getDocumentHead( doc ) ;
+
+				// Set the <base> href.
+				head.appendChild( doc.createElement('base') ).href = baseLocation ;
+
+				doc.body.style.margin	= '0px' ;
+				doc.body.style.padding	= '0px' ;
+			},
+
+			ToolbarSet_GetOutElement : function( win, outMatch )
+			{
+				var toolbarTarget = win.parent ;
+
+				var targetWindowParts = outMatch[1].split( '.' ) ;
+				while ( targetWindowParts.length > 0 )
+				{
+					var part = targetWindowParts.shift() ;
+					if ( part.length > 0 )
+						toolbarTarget = toolbarTarget[ part ] ;
+				}
+
+				toolbarTarget = toolbarTarget.document.getElementById( outMatch[2] ) ;
+			},
+
+			ToolbarSet_InitOutFrame : function( doc )
+			{
+				var head = getDocumentHead( doc ) ;
+
+				head.appendChild( doc.createElement('base') ).href = window.document.location ;
+
+				var targetWindow = doc.defaultView;
+
+				targetWindow.adjust = function()
+				{
+					targetWindow.frameElement.height = doc.body.scrollHeight;
+				} ;
+
+				targetWindow.onresize = targetWindow.adjust ;
+				targetWindow.setTimeout( targetWindow.adjust, 0 ) ;
+
+				doc.body.style.overflow = 'hidden';
+				doc.body.innerHTML = document.getElementById( 'xToolbarSpace' ).innerHTML ;
+			}
+		} ;
+	})();
+
+	/*
+	 * ### Overrides
+	 */
+	( function()
+	{
+		// Save references for override reuse.
+		var _Original_FCKPanel_Window_OnFocus	= FCKPanel_Window_OnFocus ;
+		var _Original_FCKPanel_Window_OnBlur	= FCKPanel_Window_OnBlur ;
+		var _Original_FCK_StartEditor			= FCK.StartEditor ;
+
+		FCKPanel_Window_OnFocus = function( e, panel )
+		{
+			// Call the original implementation.
+			_Original_FCKPanel_Window_OnFocus.call( this, e, panel ) ;
+
+			if ( panel._focusTimer )
+				clearTimeout( panel._focusTimer ) ;
+		}
+
+		FCKPanel_Window_OnBlur = function( e, panel )
+		{
+			// Delay the execution of the original function.
+			panel._focusTimer = FCKTools.SetTimeout( _Original_FCKPanel_Window_OnBlur, 100, this, [ e, panel ] ) ;
+		}
+
+		FCK.StartEditor = function()
+		{
+			// Force pointing to the CSS files instead of using the inline CSS cached styles.
+			window.FCK_InternalCSS			= FCKConfig.BasePath + 'css/fck_internal.css' ;
+			window.FCK_ShowTableBordersCSS	= FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;
+
+			_Original_FCK_StartEditor.apply( this, arguments ) ;
+		}
+	})();
+}
diff --git a/modules/editor/skins/fckeditor/editor/js/fckeditorcode_gecko.js b/modules/editor/skins/fckeditor/editor/js/fckeditorcode_gecko.js
new file mode 100644
index 000000000..c692165a7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/js/fckeditorcode_gecko.js
@@ -0,0 +1,108 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This file has been compressed for better performance. The original source
+ * can be found at "editor/_source".
+ */
+
+var FCK_STATUS_NOTLOADED=window.parent.FCK_STATUS_NOTLOADED=0;var FCK_STATUS_ACTIVE=window.parent.FCK_STATUS_ACTIVE=1;var FCK_STATUS_COMPLETE=window.parent.FCK_STATUS_COMPLETE=2;var FCK_TRISTATE_OFF=window.parent.FCK_TRISTATE_OFF=0;var FCK_TRISTATE_ON=window.parent.FCK_TRISTATE_ON=1;var FCK_TRISTATE_DISABLED=window.parent.FCK_TRISTATE_DISABLED=-1;var FCK_UNKNOWN=window.parent.FCK_UNKNOWN=-9;var FCK_TOOLBARITEM_ONLYICON=window.parent.FCK_TOOLBARITEM_ONLYICON=0;var FCK_TOOLBARITEM_ONLYTEXT=window.parent.FCK_TOOLBARITEM_ONLYTEXT=1;var FCK_TOOLBARITEM_ICONTEXT=window.parent.FCK_TOOLBARITEM_ICONTEXT=2;var FCK_EDITMODE_WYSIWYG=window.parent.FCK_EDITMODE_WYSIWYG=0;var FCK_EDITMODE_SOURCE=window.parent.FCK_EDITMODE_SOURCE=1;var FCK_IMAGES_PATH='images/';var FCK_SPACER_PATH='images/spacer.gif';var CTRL=1000;var SHIFT=2000;var ALT=4000;var FCK_STYLE_BLOCK=0;var FCK_STYLE_INLINE=1;var FCK_STYLE_OBJECT=2;
+String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.AddItem=function(A){var i=this.length;this[i]=A;return i;};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
+var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:/*@cc_on!@*/false,IsIE7:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=7),IsIE6:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=6),IsSafari:s.Contains(' applewebkit/'),IsOpera:!!window.opera,IsAIR:s.Contains(' adobeair/'),IsMac:s.Contains('macintosh')};(function(A){A.IsGecko=(navigator.product=='Gecko')&&!A.IsSafari&&!A.IsOpera;A.IsGeckoLike=(A.IsGecko||A.IsSafari||A.IsOpera);if (A.IsGecko){var B=s.match(/rv:(\d+\.\d+)/);var C=B&&parseFloat(B[1]);if (C){A.IsGecko10=(C<1.8);A.IsGecko19=(C>1.8);}}})(FCKBrowserInfo);
+var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
+var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else{if (C.IndexOf(B)==-1) C.push(B);}};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++){try{C=(D[i](this.Owner,B)&&C);}catch(e){if (e.number!=-2146823277) throw e;}}};return C;};
+var FCKDataProcessor=function(){};FCKDataProcessor.prototype={ConvertToHtml:function(A){if (FCKConfig.FullPage){FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (!FCKRegexLib.HasBodyTag.test(A)) A='<body>'+A+'</body>';if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';if (!FCKRegexLib.HeadOpener.test(A)) A=A.replace(FCKRegexLib.HtmlOpener,'$&<head><title></title></head>');return A;}else{var B=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&FCKConfig.DocType.length>0&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) B+=' style="overflow-y: scroll"';B+='><head><title></title></head><body'+FCKConfig.GetBodyAttributes()+'>'+A+'</body></html>';return B;}},ConvertToDataFormat:function(A,B,C,D){var E=FCKXHtml.GetXHTML(A,!B,D);if (C&&FCKRegexLib.EmptyOutParagraph.test(E)) return '';return E;},FixHtml:function(A){return A;}};
+var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
+FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){if (window.onresize) window.onresize();FCKFocusManager.AddWindow(this.EditorWindow);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this._ExecDrop=function(evt){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){if (evt.dataTransfer){var A=evt.dataTransfer.getData('Text');A=FCKTools.HTMLEncode(A);A=FCKTools.ProcessLineBreaks(window,FCKConfig,A);FCK.InsertHtml(A);}else if (FCKConfig.ShowDropDialog) FCK.PasteAsPlainText();evt.preventDefault();evt.stopPropagation();}};this._ExecCheckCaret=function(evt){if (FCK.EditMode!=0) return;if (evt.type=='keypress'){var B=evt.keyCode;if (B<33||B>40) return;};var C=function(H){if (H.nodeType!=1) return false;var D=H.tagName.toLowerCase();return (FCKListsLib.BlockElements[D]||FCKListsLib.EmptyElements[D]);};var E=function(){var F=FCKSelection.GetSelection();var G=F.getRangeAt(0);if (!G||!G.collapsed) return;var H=G.endContainer;if (H.nodeType!=3) return;if (H.nodeValue.length!=G.endOffset) return;var I=H.parentNode.tagName.toLowerCase();if (!(I=='a'||(!FCKBrowserInfo.IsOpera&&String(H.parentNode.contentEditable)=='false')||(!(FCKListsLib.BlockElements[I]||FCKListsLib.NonEmptyBlockElements[I])&&B==35))) return;var J=FCKTools.GetNextTextNode(H,H.parentNode,C);if (J) return;G=FCK.EditorDocument.createRange();J=FCKTools.GetNextTextNode(H,H.parentNode.parentNode,C);if (J){if (FCKBrowserInfo.IsOpera&&B==37) return;G.setStart(J,0);G.setEnd(J,0);}else{while (H.parentNode&&H.parentNode!=FCK.EditorDocument.body&&H.parentNode!=FCK.EditorDocument.documentElement&&H==H.parentNode.lastChild&&(!FCKListsLib.BlockElements[H.parentNode.tagName.toLowerCase()]&&!FCKListsLib.NonEmptyBlockElements[H.parentNode.tagName.toLowerCase()])) H=H.parentNode;if (FCKListsLib.BlockElements[I]||FCKListsLib.EmptyElements[I]||H==FCK.EditorDocument.body){G.setStart(H,H.childNodes.length);G.setEnd(H,H.childNodes.length);}else{var K=H.nextSibling;while (K){if (K.nodeType!=1){K=K.nextSibling;continue;};var L=K.tagName.toLowerCase();if (FCKListsLib.BlockElements[L]||FCKListsLib.EmptyElements[L]||FCKListsLib.NonEmptyBlockElements[L]) break;K=K.nextSibling;};var M=FCK.EditorDocument.createTextNode('');if (K) H.parentNode.insertBefore(M,K);else H.parentNode.appendChild(M);G.setStart(M,0);G.setEnd(M,0);}};F.removeAllRanges();F.addRange(G);FCK.Events.FireEvent("OnSelectionChange");};setTimeout(E,1);};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);this.EditorDocument.addEventListener('keydown',this._KeyDownListener,false);if (FCKBrowserInfo.IsGecko){this.EditorWindow.addEventListener('dragdrop',this._ExecDrop,true);}else if (FCKBrowserInfo.IsSafari){var N=function(evt){ if (!FCK.MouseDownFlag) evt.returnValue=false;};this.EditorDocument.addEventListener('dragenter',N,true);this.EditorDocument.addEventListener('dragover',N,true);this.EditorDocument.addEventListener('drop',this._ExecDrop,true);this.EditorDocument.addEventListener('mousedown',function(ev){var O=ev.srcElement;if (O.nodeName.IEquals('IMG','HR','INPUT','TEXTAREA','SELECT')){FCKSelection.SelectNode(O);}},true);this.EditorDocument.addEventListener('mouseup',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);this.EditorDocument.addEventListener('click',function(ev){if (ev.srcElement.nodeName.IEquals('INPUT','TEXTAREA','SELECT')) ev.preventDefault()},true);};if (FCKBrowserInfo.IsGecko||FCKBrowserInfo.IsOpera){this.EditorDocument.addEventListener('keypress',this._ExecCheckCaret,false);this.EditorDocument.addEventListener('click',this._ExecCheckCaret,false);};FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?0:-1;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try{if (FCKBrowserInfo.IsSafari) throw '';if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security');};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK._ExecPaste=function(){FCKUndo.SaveUndoStep();if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};return true;};FCK.InsertHtml=function(A){var B=FCK.EditorDocument,range;A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGecko){A=A.replace(/&nbsp;$/,'$&<span _fcktemp="1"/>');var C=new FCKDocumentFragment(this.EditorDocument);C.AppendHtml(A);var D=C.RootNode.lastChild;range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();range.DeleteContents();range.InsertNode(C.RootNode);range.MoveToPosition(D,4);}else B.execCommand('inserthtml',false,A);this.Focus();if (!range){range=new FCKDomRange(this.EditorWindow);range.MoveToSelection();};var E=range.CreateBookmark();FCKDocumentProcessor.Process(B);try{range.MoveToBookmark(E);range.Select();}catch (e) {};this.Events.FireEvent("OnSelectionChange");};FCK.PasteAsPlainText=function(){FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText']);};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A,B){var C=[];if (FCKSelection.GetSelection().isCollapsed) return C;FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){var D='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',D,false,!!B);var E=this.EditorDocument.evaluate("//a[@href='"+D+"']",this.EditorDocument.body,null,XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,null);for (var i=0;i<E.snapshotLength;i++){var F=E.snapshotItem(i);F.href=A;C.push(F);}};return C;};FCK._FillEmptyBlock=function(A){if (!A||A.nodeType!=1) return;var B=A.tagName.toLowerCase();if (B!='p'&&B!='div') return;if (A.firstChild) return;FCKTools.AppendBogusBr(A);};FCK._ExecCheckEmptyBlock=function(){FCK._FillEmptyBlock(FCK.EditorDocument.body.firstChild);var A=FCKSelection.GetSelection();if (!A||A.rangeCount<1) return;var B=A.getRangeAt(0);FCK._FillEmptyBlock(B.startContainer);};
+var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
+var FCKDebug={Output:function(){},OutputObject:function(){}};
+var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B=A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attributes[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.SetEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B];},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNodes.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfig.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
+var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/css"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCKTools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode(A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.document.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools.RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
+FCKTools.CancelEvent=function(e){if (e) e.preventDefault();};FCKTools.DisableSelection=function(A){if (FCKBrowserInfo.IsGecko) A.style.MozUserSelect='none';else if (FCKBrowserInfo.IsSafari) A.style.KhtmlUserSelect='none';else A.style.userSelect='none';};FCKTools._AppendStyleSheet=function(A,B){var e=A.createElement('LINK');e.rel='stylesheet';e.type='text/css';e.href=B;A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var e=A.createElement("STYLE");e.appendChild(A.createTextNode(B));A.getElementsByTagName("HEAD")[0].appendChild(e);return e;};FCKTools.ClearElementAttributes=function(A){for (var i=0;i<A.attributes.length;i++){A.removeAttribute(A.attributes[i].name,0);}};FCKTools.GetAllChildrenIds=function(A){var B=[];var C=function(parent){for (var i=0;i<parent.childNodes.length;i++){var D=parent.childNodes[i].id;if (D&&D.length>0) B[B.length]=D;C(parent.childNodes[i]);}};C(A);return B;};FCKTools.RemoveOuterTags=function(e){var A=e.ownerDocument.createDocumentFragment();for (var i=0;i<e.childNodes.length;i++) A.appendChild(e.childNodes[i].cloneNode(true));e.parentNode.replaceChild(A,e);};FCKTools.CreateXmlObject=function(A){switch (A){case 'XmlHttp':return new XMLHttpRequest();case 'DOMDocument':var B=(new DOMParser()).parseFromString('<tmp></tmp>','text/xml');FCKDomTools.RemoveNode(B.firstChild);return B;};return null;};FCKTools.GetScrollPosition=function(A){return { X:A.pageXOffset,Y:A.pageYOffset };};FCKTools.AddEventListener=function(A,B,C){A.addEventListener(B,C,false);};FCKTools.RemoveEventListener=function(A,B,C){A.removeEventListener(B,C,false);};FCKTools.AddEventListenerEx=function(A,B,C,D){A.addEventListener(B,function(e){C.apply(A,[e].concat(D||[]));},false);};FCKTools.GetViewPaneSize=function(A){return { Width:A.innerWidth,Height:A.innerHeight };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.className;A.className='';};var D=A.getAttribute('style');if (D&&D.length>0){C.Inline=D;A.setAttribute('style','',0);};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';if (B.Inline) A.setAttribute('style',B.Inline,0);else A.removeAttribute('style',0);FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=function(id){return A.document.getElementById(id);};};FCKTools.AppendElement=function(A,B){return A.appendChild(A.ownerDocument.createElement(B));};FCKTools.GetElementPosition=function(A,B){var c={ X:0,Y:0 };var C=B||window;var D=FCKTools.GetElementWindow(A);var E=null;while (A){var F=D.getComputedStyle(A,'').position;if (F&&F!='static'&&A.style.zIndex!=FCKConfig.FloatingPanelsZIndex) break;c.X+=A.offsetLeft-A.scrollLeft;c.Y+=A.offsetTop-A.scrollTop;if (!FCKBrowserInfo.IsOpera){var G=E;while (G&&G!=A){c.X-=G.scrollLeft;c.Y-=G.scrollTop;G=G.parentNode;}};E=A;if (A.offsetParent) A=A.offsetParent;else{if (D!=C){A=D.frameElement;E=null;if (A) D=FCKTools.GetElementWindow(A);}else{c.X+=A.scrollLeft;c.Y+=A.scrollTop;break;}}};return c;};
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.3",VersionBuild : "19836",Instances : new Object(),GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
+var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBody:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
+var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
+var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
+var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','⁄':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','←':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','⇐':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','∏':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','∝':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','‍':'zwj','‎':'lrm','‏':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','”':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','Á':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','Í':'Iacute','Î':'Icirc','Ï':'Iuml','Ð':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','Ý':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','Ν':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','ρ':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={};A=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
+var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+FCKXHtml.SpecialBlocks.AddItem(A);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
+FCKXHtml._GetMainXmlString=function(){return (new XMLSerializer()).serializeToString(this.MainNode);};FCKXHtml._AppendAttributes=function(A,B,C){var D=B.attributes;for (var n=0;n<D.length;n++){var E=D[n];if (E.specified){var F=E.nodeName.toLowerCase();var G;if (F.StartsWith('_fck')) continue;else if (F.indexOf('_moz')==0) continue;else if (F=='class'){G=E.nodeValue.replace(FCKRegexLib.FCK_Class,'');if (G.length==0) continue;}else if (E.nodeValue===true) G=F;else G=B.getAttribute(F,2);this._AppendAttribute(C,F,G);}}};if (FCKBrowserInfo.IsOpera){FCKXHtml.TagProcessors['head']=function(A,B){FCKXHtml.XML._HeadElement=A;A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['meta']=function(A,B,C){if (B.parentNode.nodeName.toLowerCase()!='head'){var D=FCKXHtml.XML._HeadElement;if (D&&C!=D){delete B._fckxhtmljob;FCKXHtml._AppendNode(D,B);return null;}};return A;}};if (FCKBrowserInfo.IsGecko){FCKXHtml.TagProcessors['link']=function(A,B){if (B.href.substr(0,9).toLowerCase()=='chrome://') return false;return A;}};
+var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+FCKCodeFormatter.ProtectedData.AddItem(C)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
+var FCKUndo={};FCKUndo.SavedData=[];FCKUndo.CurrentIndex=-1;FCKUndo.TypesCount=0;FCKUndo.Changed=false;FCKUndo.MaxTypes=25;FCKUndo.Typing=false;FCKUndo.SaveLocked=false;FCKUndo._GetBookmark=function(){FCKSelection.Restore();var A=new FCKDomRange(FCK.EditorWindow);try{A.MoveToSelection();}catch (e){return null;};if (FCKBrowserInfo.IsIE){var B=A.CreateBookmark();var C=FCK.EditorDocument.body.innerHTML;A.MoveToBookmark(B);return [B,C];};return A.CreateBookmark2();};FCKUndo._SelectBookmark=function(A){if (!A) return;var B=new FCKDomRange(FCK.EditorWindow);if (A instanceof Object){if (FCKBrowserInfo.IsIE) B.MoveToBookmark(A[0]);else B.MoveToBookmark2(A);try{B.Select();}catch (e){B.MoveToPosition(FCK.EditorDocument.body,4);B.Select();}}};FCKUndo._CompareCursors=function(A,B){for (var i=0;i<Math.min(A.length,B.length);i++){if (A[i]<B[i]) return-1;else if (A[i]>B[i]) return 1;};if (A.length<B.length) return-1;else if (A.length>B.length) return 1;return 0;};FCKUndo._CheckIsBookmarksEqual=function(A,B){if (!(A&&B)) return false;if (FCKBrowserInfo.IsIE){var C=A[1].search(A[0].StartId);var D=B[1].search(B[0].StartId);var E=A[1].search(A[0].EndId);var F=B[1].search(B[0].EndId);return C==D&&E==F;}else{return this._CompareCursors(A.Start,B.Start)==0&&this._CompareCursors(A.End,B.End)==0;}};FCKUndo.SaveUndoStep=function(){if (FCK.EditMode!=0||this.SaveLocked) return;if (this.SavedData.length) this.Changed=true;var A=FCK.EditorDocument.body.innerHTML;var B=this._GetBookmark();this.SavedData=this.SavedData.slice(0,this.CurrentIndex+1);if (this.CurrentIndex>0&&A==this.SavedData[this.CurrentIndex][0]&&this._CheckIsBookmarksEqual(B,this.SavedData[this.CurrentIndex][1])) return;else if (this.CurrentIndex==0&&this.SavedData.length&&A==this.SavedData[0][0]){this.SavedData[0][1]=B;return;};if (this.CurrentIndex+1>=FCKConfig.MaxUndoLevels) this.SavedData.shift();else this.CurrentIndex++;this.SavedData[this.CurrentIndex]=[A,B];FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.CheckUndoState=function(){return (this.Changed||this.CurrentIndex>0);};FCKUndo.CheckRedoState=function(){return (this.CurrentIndex<(this.SavedData.length-1));};FCKUndo.Undo=function(){if (this.CheckUndoState()){if (this.CurrentIndex==(this.SavedData.length-1)){this.SaveUndoStep();};this._ApplyUndoLevel(--this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo.Redo=function(){if (this.CheckRedoState()){this._ApplyUndoLevel(++this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo._ApplyUndoLevel=function(A){var B=this.SavedData[A];if (!B) return;if (FCKBrowserInfo.IsIE){if (B[1]&&B[1][1]) FCK.SetInnerHtml(B[1][1]);else FCK.SetInnerHtml(B[0]);}else FCK.EditorDocument.body.innerHTML=B[0];this._SelectBookmark(B[1]);this.TypesCount=0;this.Changed=false;this.Typing=false;};
+var FCKEditingArea=function(A){this.TargetElement=A;this.Mode=0;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKEditingArea_Cleanup);};FCKEditingArea.prototype.Start=function(A,B){var C=this.TargetElement;var D=FCKTools.GetElementDocument(C);while(C.firstChild) C.removeChild(C.firstChild);if (this.Mode==0){if (FCK_IS_CUSTOM_DOMAIN) A='<script>document.domain="'+FCK_RUNTIME_DOMAIN+'";</script>'+A;if (FCKBrowserInfo.IsIE) A=A.replace(/(<base[^>]*?)\s*\/?>(?!\s*<\/base>)/gi,'$1></base>');else if (!B){var E=A.match(FCKRegexLib.BeforeBody);var F=A.match(FCKRegexLib.AfterBody);if (E&&F){var G=A.substr(E[1].length,A.length-E[1].length-F[1].length);A=E[1]+'&nbsp;'+F[1];if (FCKBrowserInfo.IsGecko&&(G.length==0||FCKRegexLib.EmptyParagraph.test(G))) G='<br type="_moz">';this._BodyHTML=G;}else this._BodyHTML=A;};var H=this.IFrame=D.createElement('iframe');var I='<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>';H.frameBorder=0;H.style.width=H.style.height='100%';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A.replace(/<head>/i,'<head>'+I);H.src='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.parent._FCKHtmlToLoad );document.close() ;window.parent._FCKHtmlToLoad = null ;})() )';}else if (!FCKBrowserInfo.IsGecko){H.src='javascript:void(0)';};C.appendChild(H);this.Window=H.contentWindow;if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){var J=this.Window.document;J.open();J.write(A.replace(/<head>/i,'<head>'+I));J.close();};if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.EditingArea_Start(J,A);if (FCKBrowserInfo.IsGecko10&&!B){this.Start(A,true);return;};if (H.readyState&&H.readyState!='completed'){var K=this;setTimeout(function(){try{K.Window.document.documentElement.doScroll("left");}catch(e){setTimeout(arguments.callee,0);return;};K.Window._FCKEditingArea=K;FCKEditingArea_CompleteStart.call(K.Window);},0);}else{this.Window._FCKEditingArea=this;if (FCKBrowserInfo.IsGecko10) this.Window.setTimeout(FCKEditingArea_CompleteStart,500);else FCKEditingArea_CompleteStart.call(this.Window);}}else{var L=this.Textarea=D.createElement('textarea');L.className='SourceField';L.dir='ltr';FCKDomTools.SetElementStyles(L,{width:'100%',height:'100%',border:'none',resize:'none',outline:'none'});C.appendChild(L);L.value=A;FCKTools.RunFunction(this.OnLoad);}};function FCKEditingArea_CompleteStart(){if (!this.document.body){this.setTimeout(FCKEditingArea_CompleteStart,50);return;};var A=this._FCKEditingArea;A.Document=A.Window.document;A.MakeEditable();FCKTools.RunFunction(A.OnLoad);};FCKEditingArea.prototype.MakeEditable=function(){var A=this.Document;if (FCKBrowserInfo.IsIE){A.body.disabled=true;A.body.contentEditable=true;A.body.removeAttribute("disabled");}else{try{A.body.spellcheck=(this.FFSpellChecker!==false);if (this._BodyHTML){A.body.innerHTML=this._BodyHTML;A.body.offsetLeft;this._BodyHTML=null;};A.designMode='on';A.execCommand('enableObjectResizing',false,!FCKConfig.DisableObjectResizing);A.execCommand('enableInlineTableEditing',false,!FCKConfig.DisableFFTableHandles);}catch (e){FCKTools.AddEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);}}};function FCKEditingArea_Document_AttributeNodeModified(A){var B=A.currentTarget.contentWindow._FCKEditingArea;if (B._timer) window.clearTimeout(B._timer);B._timer=FCKTools.SetTimeout(FCKEditingArea_MakeEditableByMutation,1000,B);};function FCKEditingArea_MakeEditableByMutation(){delete this._timer;FCKTools.RemoveEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);this.MakeEditable();};FCKEditingArea.prototype.Focus=function(){try{if (this.Mode==0){if (FCKBrowserInfo.IsIE) this._FocusIE();else this.Window.focus();}else{var A=FCKTools.GetElementDocument(this.Textarea);if ((!A.hasFocus||A.hasFocus())&&A.activeElement==this.Textarea) return;this.Textarea.focus();}}catch(e) {}};FCKEditingArea.prototype._FocusIE=function(){this.Document.body.setActive();this.Window.focus();var A=this.Document.selection.createRange();var B=A.parentElement();var C=B.nodeName.toLowerCase();if (B.childNodes.length>0||!(FCKListsLib.BlockElements[C]||FCKListsLib.NonEmptyBlockElements[C])){return;};A=new FCKDomRange(this.Window);A.MoveToElementEditStart(B);A.Select();};function FCKEditingArea_Cleanup(){if (this.Document) this.Document.body.innerHTML="";this.TargetElement=null;this.IFrame=null;this.Document=null;this.Textarea=null;if (this.Window){this.Window._FCKEditingArea=null;this.Window=null;}};
+var FCKKeystrokeHandler=function(A){this.Keystrokes={};this.CancelCtrlDefaults=(A!==false);};FCKKeystrokeHandler.prototype.AttachToElement=function(A){FCKTools.AddEventListenerEx(A,'keydown',_FCKKeystrokeHandler_OnKeyDown,this);if (FCKBrowserInfo.IsGecko10||FCKBrowserInfo.IsOpera||(FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac)) FCKTools.AddEventListenerEx(A,'keypress',_FCKKeystrokeHandler_OnKeyPress,this);};FCKKeystrokeHandler.prototype.SetKeystrokes=function(){for (var i=0;i<arguments.length;i++){var A=arguments[i];if (!A) continue;if (typeof(A[0])=='object') this.SetKeystrokes.apply(this,A);else{if (A.length==1) delete this.Keystrokes[A[0]];else this.Keystrokes[A[0]]=A[1]===true?true:A;}}};function _FCKKeystrokeHandler_OnKeyDown(A,B){var C=A.keyCode||A.which;var D=0;if (A.ctrlKey||A.metaKey) D+=CTRL;if (A.shiftKey) D+=SHIFT;if (A.altKey) D+=ALT;var E=C+D;var F=B._CancelIt=false;var G=B.Keystrokes[E];if (G){if (G===true||!(B.OnKeystroke&&B.OnKeystroke.apply(B,G))) return true;F=true;};if (F||(B.CancelCtrlDefaults&&D==CTRL&&(C<33||C>40))){B._CancelIt=true;if (A.preventDefault) return A.preventDefault();A.returnValue=false;A.cancelBubble=true;return false;};return true;};function _FCKKeystrokeHandler_OnKeyPress(A,B){if (B._CancelIt){if (A.preventDefault) return A.preventDefault();return false;};return true;};
+FCK.DTD=(function(){var X=FCKTools.Merge;var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I;A={isindex:1,fieldset:1};B={input:1,button:1,select:1,textarea:1,label:1};C=X({a:1},B);D=X({iframe:1},C);E={hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1};F={ins:1,del:1,script:1};G=X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1},F);H=X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G);I=X({p:1},H);J=X({iframe:1},H,B);K={img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1};L=X({a:1},J);M={tr:1};N={'#':1};O=X({param:1},K);P=X({form:1},A,D,E,I);Q={li:1};return {col:{},tr:{td:1,th:1},img:{},colgroup:{col:1},noscript:P,td:P,br:{},th:P,center:P,kbd:L,button:X(I,E),basefont:{},h5:L,h4:L,samp:L,h6:L,ol:Q,h1:L,h3:L,option:N,h2:L,form:X(A,D,E,I),select:{optgroup:1,option:1},font:J,ins:P,menu:Q,abbr:L,label:L,table:{thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1},code:L,script:N,tfoot:M,cite:L,li:P,input:{},iframe:P,strong:J,textarea:N,noframes:P,big:J,small:J,span:J,hr:{},dt:L,sub:J,optgroup:{option:1},param:{},bdo:L,'var':J,div:P,object:O,sup:J,dd:P,strike:J,area:{},dir:Q,map:X({area:1,form:1,p:1},A,F,E),applet:O,dl:{dt:1,dd:1},del:P,isindex:{},fieldset:X({legend:1},K),thead:M,ul:Q,acronym:L,b:J,a:J,blockquote:P,caption:L,i:J,u:J,tbody:M,s:L,address:X(D,I),tt:J,legend:L,q:L,pre:X(G,C),p:L,em:J,dfn:L};})();
+var FCKStyle=function(A){this.Element=(A.Element||'span').toLowerCase();this._StyleDesc=A;};FCKStyle.prototype={GetType:function(){var A=this.GetType_$;if (A!=undefined) return A;var B=this.Element;if (B=='#'||FCKListsLib.StyleBlockElements[B]) A=0;else if (FCKListsLib.StyleObjectElements[B]) A=2;else A=1;return (this.GetType_$=A);},ApplyToSelection:function(A){var B=new FCKDomRange(A);B.MoveToSelection();this.ApplyToRange(B,true);},ApplyToRange:function(A,B,C){switch (this.GetType()){case 0:this.ApplyToRange=this._ApplyBlockStyle;break;case 1:this.ApplyToRange=this._ApplyInlineStyle;break;default:return;};this.ApplyToRange(A,B,C);},ApplyToObject:function(A){if (!A) return;this.BuildElement(null,A);},RemoveFromSelection:function(A){var B=new FCKDomRange(A);B.MoveToSelection();this.RemoveFromRange(B,true);},RemoveFromRange:function(A,B,C){var D;var E=this._GetAttribsForComparison();var F=this._GetOverridesForComparison();if (A.CheckIsCollapsed()){var D=A.CreateBookmark(true);var H=A.GetBookmarkNode(D,true);var I=new FCKElementPath(H.parentNode);var J=[];var K=!FCKDomTools.GetNextSibling(H);var L=K||!FCKDomTools.GetPreviousSibling(H);var M;var N=-1;for (var i=0;i<I.Elements.length;i++){var O=I.Elements[i];if (this.CheckElementRemovable(O)){if (L&&!FCKDomTools.CheckIsEmptyElement(O,function(el){return (el!=H);})){M=O;N=J.length-1;}else{var P=O.nodeName.toLowerCase();if (P==this.Element){for (var Q in E){if (FCKDomTools.HasAttribute(O,Q)){switch (Q){case 'style':this._RemoveStylesFromElement(O);break;case 'class':if (FCKDomTools.GetAttributeValue(O,Q)!=this.GetFinalAttributeValue(Q)) continue;default:FCKDomTools.RemoveAttribute(O,Q);}}}};this._RemoveOverrides(O,F[P]);if (this.GetType()==1) this._RemoveNoAttribElement(O);}}else if (L) J.push(O);L=L&&((K&&!FCKDomTools.GetNextSibling(O))||(!K&&!FCKDomTools.GetPreviousSibling(O)));if (M&&(!L||(i==I.Elements.length-1))){var R=FCKDomTools.RemoveNode(H);for (var j=0;j<=N;j++){var S=FCKDomTools.CloneElement(J[j]);S.appendChild(R);R=S;};if (K) FCKDomTools.InsertAfterNode(M,R);else M.parentNode.insertBefore(R,M);L=false;M=null;}};if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);return;};A.Expand('inline_elements');D=A.CreateBookmark(true);var T=A.GetBookmarkNode(D,true);var U=A.GetBookmarkNode(D,false);A.Release(true);var I=new FCKElementPath(T);var X=I.Elements;var O;for (var i=1;i<X.length;i++){O=X[i];if (O==I.Block||O==I.BlockLimit) break;if (this.CheckElementRemovable(O)) FCKDomTools.BreakParent(T,O,A);};I=new FCKElementPath(U);X=I.Elements;for (var i=1;i<X.length;i++){O=X[i];if (O==I.Block||O==I.BlockLimit) break;b=O.nodeName.toLowerCase();if (this.CheckElementRemovable(O)) FCKDomTools.BreakParent(U,O,A);};var Z=FCKDomTools.GetNextSourceNode(T,true);while (Z){var a=FCKDomTools.GetNextSourceNode(Z);if (Z.nodeType==1){var b=Z.nodeName.toLowerCase();var c=(b==this.Element);if (c){for (var Q in E){if (FCKDomTools.HasAttribute(Z,Q)){switch (Q){case 'style':this._RemoveStylesFromElement(Z);break;case 'class':if (FCKDomTools.GetAttributeValue(Z,Q)!=this.GetFinalAttributeValue(Q)) continue;default:FCKDomTools.RemoveAttribute(Z,Q);}}}}else c=!!F[b];if (c){this._RemoveOverrides(Z,F[b]);this._RemoveNoAttribElement(Z);}};if (a==U) break;Z=a;};this._FixBookmarkStart(T);if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);},CheckElementRemovable:function(A,B){if (!A) return false;var C=A.nodeName.toLowerCase();if (C==this.Element){if (!B&&!FCKDomTools.HasAttributes(A)) return true;var D=this._GetAttribsForComparison();var E=(D._length==0);for (var F in D){if (F=='_length') continue;if (this._CompareAttributeValues(F,FCKDomTools.GetAttributeValue(A,F),(this.GetFinalAttributeValue(F)||''))){E=true;if (!B) break;}else{E=false;if (B) return false;}};if (E) return true;};var G=this._GetOverridesForComparison()[C];if (G){if (!(D=G.Attributes)) return true;for (var i=0;i<D.length;i++){var H=D[i][0];if (FCKDomTools.HasAttribute(A,H)){var I=D[i][1];if (I==null||(typeof I=='string'&&FCKDomTools.GetAttributeValue(A,H)==I)||I.test(FCKDomTools.GetAttributeValue(A,H))) return true;}}};return false;},CheckActive:function(A){switch (this.GetType()){case 0:return this.CheckElementRemovable(A.Block||A.BlockLimit,true);case 1:var B=A.Elements;for (var i=0;i<B.length;i++){var C=B[i];if (C==A.Block||C==A.BlockLimit) continue;if (this.CheckElementRemovable(C,true)) return true;}};return false;},RemoveFromElement:function(A){var B=this._GetAttribsForComparison();var C=this._GetOverridesForComparison();var D=A.getElementsByTagName(this.Element);for (var i=D.length-1;i>=0;i--){var E=D[i];for (var F in B){if (FCKDomTools.HasAttribute(E,F)){switch (F){case 'style':this._RemoveStylesFromElement(E);break;case 'class':if (FCKDomTools.GetAttributeValue(E,F)!=this.GetFinalAttributeValue(F)) continue;default:FCKDomTools.RemoveAttribute(E,F);}}};this._RemoveOverrides(E,C[this.Element]);this._RemoveNoAttribElement(E);};for (var G in C){if (G!=this.Element){D=A.getElementsByTagName(G);for (var i=D.length-1;i>=0;i--){var E=D[i];this._RemoveOverrides(E,C[G]);this._RemoveNoAttribElement(E);}}}},_RemoveStylesFromElement:function(A){var B=A.style.cssText;var C=this.GetFinalStyleValue();if (B.length>0&&C.length==0) return;C='(^|;)\\s*('+C.replace(/\s*([^ ]+):.*?(;|$)/g,'$1|').replace(/\|$/,'')+'):[^;]+';var D=new RegExp(C,'gi');B=B.replace(D,'').Trim();if (B.length==0||B==';') FCKDomTools.RemoveAttribute(A,'style');else A.style.cssText=B.replace(D,'');},_RemoveOverrides:function(A,B){var C=B&&B.Attributes;if (C){for (var i=0;i<C.length;i++){var D=C[i][0];if (FCKDomTools.HasAttribute(A,D)){var E=C[i][1];if (E==null||(E.test&&E.test(FCKDomTools.GetAttributeValue(A,D)))||(typeof E=='string'&&FCKDomTools.GetAttributeValue(A,D)==E)) FCKDomTools.RemoveAttribute(A,D);}}}},_RemoveNoAttribElement:function(A){if (!FCKDomTools.HasAttributes(A)){var B=A.firstChild;var C=A.lastChild;FCKDomTools.RemoveNode(A,true);this._MergeSiblings(B);if (B!=C) this._MergeSiblings(C);}},BuildElement:function(A,B){var C=B||A.createElement(this.Element);var D=this._StyleDesc.Attributes;var E;if (D){for (var F in D){E=this.GetFinalAttributeValue(F);if (F.toLowerCase()=='class') C.className=E;else C.setAttribute(F,E);}};if (this._GetStyleText().length>0) C.style.cssText=this.GetFinalStyleValue();return C;},_CompareAttributeValues:function(A,B,C){if (A=='style'&&B&&C){B=B.replace(/;$/,'').toLowerCase();C=C.replace(/;$/,'').toLowerCase();};return (B==C||((B===null||B==='')&&(C===null||C==='')))},GetFinalAttributeValue:function(A){var B=this._StyleDesc.Attributes;var B=B?B[A]:null;if (!B&&A=='style') return this.GetFinalStyleValue();if (B&&this._Variables) B=B.Replace(FCKRegexLib.StyleVariableAttName,this._GetVariableReplace,this);return B;},GetFinalStyleValue:function(){var A=this._GetStyleText();if (A.length>0&&this._Variables){A=A.Replace(FCKRegexLib.StyleVariableAttName,this._GetVariableReplace,this);A=FCKTools.NormalizeCssText(A);};return A;},_GetVariableReplace:function(){return this._Variables[arguments[2]]||arguments[0];},SetVariable:function(A,B){var C=this._Variables;if (!C) C=this._Variables={};this._Variables[A]=B;},_FromPre:function(A,B,C){var D=B.innerHTML;D=D.replace(/(\r\n|\r)/g,'\n');D=D.replace(/^[ \t]*\n/,'');D=D.replace(/\n$/,'');D=D.replace(/^[ \t]+|[ \t]+$/g,function(match,offset,s){if (match.length==1) return '&nbsp;';else if (offset==0) return new Array(match.length).join('&nbsp;')+' ';else return ' '+new Array(match.length).join('&nbsp;');});var E=new FCKHtmlIterator(D);var F=[];E.Each(function(isTag,value){if (!isTag){value=value.replace(/\n/g,'<br>');value=value.replace(/[ \t]{2,}/g,function (match){return new Array(match.length).join('&nbsp;')+' ';});};F.push(value);});C.innerHTML=F.join('');return C;},_ToPre:function(A,B,C){var D=B.innerHTML.Trim();D=D.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'<br />');var E=new FCKHtmlIterator(D);var F=[];E.Each(function(isTag,value){if (!isTag) value=value.replace(/([ \t\n\r]+|&nbsp;)/g,' ');else if (isTag&&value=='<br />') value='\n';F.push(value);});if (FCKBrowserInfo.IsIE){var G=A.createElement('div');G.appendChild(C);C.outerHTML='<pre>\n'+F.join('')+'</pre>';C=G.removeChild(G.firstChild);}else C.innerHTML=F.join('');return C;},_CheckAndMergePre:function(A,B){if (A!=FCKDomTools.GetPreviousSourceElement(B,true)) return;var C=A.innerHTML.replace(/\n$/,'')+'\n\n'+B.innerHTML.replace(/^\n/,'');if (FCKBrowserInfo.IsIE) B.outerHTML='<pre>'+C+'</pre>';else B.innerHTML=C;FCKDomTools.RemoveNode(A);},_CheckAndSplitPre:function(A){var B;var C=A.firstChild;C=C&&C.nextSibling;while (C){var D=C.nextSibling;if (D&&D.nextSibling&&C.nodeName.IEquals('br')&&D.nodeName.IEquals('br')){FCKDomTools.RemoveNode(C);C=D.nextSibling;FCKDomTools.RemoveNode(D);B=FCKDomTools.InsertAfterNode(B||A,FCKDomTools.CloneElement(A));continue;};if (B){C=C.previousSibling;FCKDomTools.MoveNode(C.nextSibling,B);};C=C.nextSibling;}},_ApplyBlockStyle:function(A,B,C){var D;if (B) D=A.CreateBookmark();var E=new FCKDomRangeIterator(A);E.EnforceRealBlocks=true;var F;var G=A.Window.document;var H;while((F=E.GetNextParagraph())){var I=this.BuildElement(G);var J=I.nodeName.IEquals('pre');var K=F.nodeName.IEquals('pre');var L=J&&!K;var M=!J&&K;if (L) I=this._ToPre(G,F,I);else if (M) I=this._FromPre(G,F,I);else FCKDomTools.MoveChildren(F,I);F.parentNode.insertBefore(I,F);FCKDomTools.RemoveNode(F);if (J){if (H) this._CheckAndMergePre(H,I);H=I;}else if (M) this._CheckAndSplitPre(I);};if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);},_ApplyInlineStyle:function(A,B,C){var D=A.Window.document;if (A.CheckIsCollapsed()){var E=this.BuildElement(D);A.InsertNode(E);A.MoveToPosition(E,2);A.Select();return;};var F=this.Element;var G=FCK.DTD[F]||FCK.DTD.span;var H=this._GetAttribsForComparison();var I;A.Expand('inline_elements');var J=A.CreateBookmark(true);var K=A.GetBookmarkNode(J,true);var L=A.GetBookmarkNode(J,false);A.Release(true);var M=FCKDomTools.GetNextSourceNode(K,true);while (M){var N=false;var O=M.nodeType;var P=O==1?M.nodeName.toLowerCase():null;if (!P||G[P]){if ((FCK.DTD[M.parentNode.nodeName.toLowerCase()]||FCK.DTD.span)[F]||!FCK.DTD[F]){if (!A.CheckHasRange()) A.SetStart(M,3);if (O!=1||M.childNodes.length==0){var Q=M;var R=Q.parentNode;while (Q==R.lastChild&&G[R.nodeName.toLowerCase()]){Q=R;};A.SetEnd(Q,4);if (Q==Q.parentNode.lastChild&&!G[Q.parentNode.nodeName.toLowerCase()]) N=true;}else{A.SetEnd(M,3);}}else N=true;}else N=true;M=FCKDomTools.GetNextSourceNode(M);if (M==L){M=null;N=true;};if (N&&A.CheckHasRange()&&!A.CheckIsCollapsed()){I=this.BuildElement(D);A.ExtractContents().AppendTo(I);if (I.innerHTML.RTrim().length>0){A.InsertNode(I);this.RemoveFromElement(I);this._MergeSiblings(I,this._GetAttribsForComparison());if (!FCKBrowserInfo.IsIE) I.normalize();};A.Release(true);}};this._FixBookmarkStart(K);if (B) A.SelectBookmark(J);if (C) A.MoveToBookmark(J);},_FixBookmarkStart:function(A){var B;while ((B=A.nextSibling)){if (B.nodeType==1&&FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){if (!B.firstChild) FCKDomTools.RemoveNode(B);else FCKDomTools.MoveNode(A,B,true);continue;};if (B.nodeType==3&&B.length==0){FCKDomTools.RemoveNode(B);continue;};break;}},_MergeSiblings:function(A,B){if (!A||A.nodeType!=1||!FCKListsLib.InlineNonEmptyElements[A.nodeName.toLowerCase()]) return;this._MergeNextSibling(A,B);this._MergePreviousSibling(A,B);},_MergeNextSibling:function(A,B){var C=A.nextSibling;var D=(C&&C.nodeType==1&&C.getAttribute('_fck_bookmark'));if (D) C=C.nextSibling;if (C&&C.nodeType==1&&C.nodeName==A.nodeName){if (!B) B=this._CreateElementAttribsForComparison(A);if (this._CheckAttributesMatch(C,B)){var E=A.lastChild;if (D) FCKDomTools.MoveNode(A.nextSibling,A);FCKDomTools.MoveChildren(C,A);FCKDomTools.RemoveNode(C);if (E) this._MergeNextSibling(E);}}},_MergePreviousSibling:function(A,B){var C=A.previousSibling;var D=(C&&C.nodeType==1&&C.getAttribute('_fck_bookmark'));if (D) C=C.previousSibling;if (C&&C.nodeType==1&&C.nodeName==A.nodeName){if (!B) B=this._CreateElementAttribsForComparison(A);if (this._CheckAttributesMatch(C,B)){var E=A.firstChild;if (D) FCKDomTools.MoveNode(A.previousSibling,A,true);FCKDomTools.MoveChildren(C,A,true);FCKDomTools.RemoveNode(C);if (E) this._MergePreviousSibling(E);}}},_GetStyleText:function(){var A=this._StyleDesc.Styles;var B=(this._StyleDesc.Attributes?this._StyleDesc.Attributes['style']||'':'');if (B.length>0) B+=';';for (var C in A) B+=C+':'+A[C]+';';if (B.length>0&&!(/#\(/.test(B))){B=FCKTools.NormalizeCssText(B);};return (this._GetStyleText=function() { return B;})();},_GetAttribsForComparison:function(){var A=this._GetAttribsForComparison_$;if (A) return A;A={};var B=this._StyleDesc.Attributes;if (B){for (var C in B){A[C.toLowerCase()]=B[C].toLowerCase();}};if (this._GetStyleText().length>0){A['style']=this._GetStyleText().toLowerCase();};FCKTools.AppendLengthProperty(A,'_length');return (this._GetAttribsForComparison_$=A);},_GetOverridesForComparison:function(){var A=this._GetOverridesForComparison_$;if (A) return A;A={};var B=this._StyleDesc.Overrides;if (B){if (!FCKTools.IsArray(B)) B=[B];for (var i=0;i<B.length;i++){var C=B[i];var D;var E;var F;if (typeof C=='string') D=C.toLowerCase();else{D=C.Element?C.Element.toLowerCase():this.Element;F=C.Attributes;};E=A[D]||(A[D]={});if (F){var G=(E.Attributes=E.Attributes||[]);for (var H in F){G.push([H.toLowerCase(),F[H]]);}}}};return (this._GetOverridesForComparison_$=A);},_CreateElementAttribsForComparison:function(A){var B={};var C=0;for (var i=0;i<A.attributes.length;i++){var D=A.attributes[i];if (D.specified){B[D.nodeName.toLowerCase()]=FCKDomTools.GetAttributeValue(A,D).toLowerCase();C++;}};B._length=C;return B;},_CheckAttributesMatch:function(A,B){var C=A.attributes;var D=0;for (var i=0;i<C.length;i++){var E=C[i];if (E.specified){var F=E.nodeName.toLowerCase();var G=B[F];if (!G) break;if (G!=FCKDomTools.GetAttributeValue(A,E).toLowerCase()) break;D++;}};return (D==B._length);}};
+var FCKStyles=FCK.Styles={_Callbacks:{},_ObjectStyles:{},ApplyStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){if (A.GetType()==2) A.ApplyToObject(FCKSelection.GetSelectedElement());else A.ApplyToSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},RemoveStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){A.RemoveFromSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},AttachStyleStateChange:function(A,B,C){var D=this._Callbacks[A];if (!D) D=this._Callbacks[A]=[];D.push([B,C]);},CheckSelectionChanges:function(){var A=FCKSelection.GetBoundaryParentElement(true);if (!A) return;var B=new FCKElementPath(A);var C=this.GetStyles();for (var D in C){var E=this._Callbacks[D];if (E){var F=C[D];var G=F.CheckActive(B);if (G!=(F._LastState||null)){F._LastState=G;for (var i=0;i<E.length;i++){var H=E[i][0];var I=E[i][1];H.call(I||window,D,G);}}}}},CheckStyleInSelection:function(A){return false;},_GetRemoveFormatTagsRegex:function (){var A=new RegExp('^(?:'+FCKConfig.RemoveFormatTags.replace(/,/g,'|')+')$','i');return (this._GetRemoveFormatTagsRegex=function(){return A;})&&A;},RemoveAll:function(){var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();if (A.CheckIsCollapsed()) return;A.Expand('inline_elements');var B=A.CreateBookmark(true);var C=A.GetBookmarkNode(B,true);var D=A.GetBookmarkNode(B,false);A.Release(true);var E=this._GetRemoveFormatTagsRegex();var F=new FCKElementPath(C);var G=F.Elements;var H;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;if (E.test(H.nodeName)) FCKDomTools.BreakParent(C,H,A);};F=new FCKElementPath(D);G=F.Elements;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;elementName=H.nodeName.toLowerCase();if (E.test(H.nodeName)) FCKDomTools.BreakParent(D,H,A);};var I=FCKDomTools.GetNextSourceNode(C,true,1);while (I){if (I==D) break;var J=FCKDomTools.GetNextSourceNode(I,false,1);if (E.test(I.nodeName)) FCKDomTools.RemoveNode(I,true);else FCKDomTools.RemoveAttributes(I,FCKConfig.RemoveAttributesArray);I=J;};A.SelectBookmark(B);FCK.Events.FireEvent('OnSelectionChange');},GetStyle:function(A){return this.GetStyles()[A];},GetStyles:function(){var A=this._GetStyles;if (!A){A=this._GetStyles=FCKTools.Merge(this._LoadStylesCore(),this._LoadStylesCustom(),this._LoadStylesXml());};return A;},CheckHasObjectStyle:function(A){return!!this._ObjectStyles[A];},_LoadStylesCore:function(){var A={};var B=FCKConfig.CoreStyles;for (var C in B){var D=A['_FCK_'+C]=new FCKStyle(B[C]);D.IsCore=true;};return A;},_LoadStylesCustom:function(){var A={};var B=FCKConfig.CustomStyles;if (B){for (var C in B){var D=A[C]=new FCKStyle(B[C]);D.Name=C;}};return A;},_LoadStylesXml:function(){var A={};var B=FCKConfig.StylesXmlPath;if (!B||B.length==0) return A;var C=new FCKXml();C.LoadUrl(B);var D=FCKXml.TransformToObject(C.SelectSingleNode('Styles'));var E=D.$Style;if (!E) return A;for (var i=0;i<E.length;i++){var F=E[i];var G=(F.element||'').toLowerCase();if (G.length==0) throw('The element name is required. Error loading "'+B+'"');var H={Element:G,Attributes:{},Styles:{},Overrides:[]};var I=F.$Attribute||[];for (var j=0;j<I.length;j++){H.Attributes[I[j].name]=I[j].value;};var J=F.$Style||[];for (j=0;j<J.length;j++){H.Styles[J[j].name]=J[j].value;};var K=F.$Override;if (K){for (j=0;j<K.length;j++){var L=K[j];var M={Element:L.element};var N=L.$Attribute;if (N){M.Attributes={};for (var k=0;k<N.length;k++){var O=N[k].value||null;if (O){var P=O&&FCKRegexLib.RegExp.exec(O);if (P) O=new RegExp(P[1],P[2]||'');};M.Attributes[N[k].name]=O;}};H.Overrides.push(M);}};var Q=new FCKStyle(H);Q.Name=F.name||G;if (Q.GetType()==2) this._ObjectStyles[G]=true;A[Q.Name]=Q;};return A;}};
+var FCKListHandler={OutdentListItem:function(A){var B=A.parentNode;if (B.tagName.toUpperCase().Equals('UL','OL')){var C=FCKTools.GetElementDocument(A);var D=new FCKDocumentFragment(C);var E=D.RootNode;var F=false;var G=FCKDomTools.GetFirstChild(A,['UL','OL']);if (G){F=true;var H;while ((H=G.firstChild)) E.appendChild(G.removeChild(H));FCKDomTools.RemoveNode(G);};var I;var J=false;while ((I=A.nextSibling)){if (!F&&I.nodeType==1&&I.nodeName.toUpperCase()=='LI') J=F=true;E.appendChild(I.parentNode.removeChild(I));if (!J&&I.nodeType==1&&I.nodeName.toUpperCase().Equals('UL','OL')) FCKDomTools.RemoveNode(I,true);};var K=B.parentNode.tagName.toUpperCase();var L=(K=='LI');if (L||K.Equals('UL','OL')){if (F){var G=B.cloneNode(false);D.AppendTo(G);A.appendChild(G);}else if (L) D.InsertAfterNode(B.parentNode);else D.InsertAfterNode(B);if (L) FCKDomTools.InsertAfterNode(B.parentNode,B.removeChild(A));else FCKDomTools.InsertAfterNode(B,B.removeChild(A));}else{if (F){var N=B.cloneNode(false);D.AppendTo(N);FCKDomTools.InsertAfterNode(B,N);};var O=C.createElement(FCKConfig.EnterMode=='p'?'p':'div');FCKDomTools.MoveChildren(B.removeChild(A),O);FCKDomTools.InsertAfterNode(B,O);if (FCKConfig.EnterMode=='br'){if (FCKBrowserInfo.IsGecko) O.parentNode.insertBefore(FCKTools.CreateBogusBR(C),O);else FCKDomTools.InsertAfterNode(O,FCKTools.CreateBogusBR(C));FCKDomTools.RemoveNode(O,true);}};if (this.CheckEmptyList(B)) FCKDomTools.RemoveNode(B,true);}},CheckEmptyList:function(A){return (FCKDomTools.GetFirstChild(A,'LI')==null);},CheckListHasContents:function(A){var B=A.firstChild;while (B){switch (B.nodeType){case 1:if (!B.nodeName.IEquals('UL','LI')) return true;break;case 3:if (B.nodeValue.Trim().length>0) return true;};B=B.nextSibling;};return false;}};
+var FCKElementPath=function(A){var B=null;var C=null;var D=[];var e=A;while (e){if (e.nodeType==1){if (!this.LastElement) this.LastElement=e;var E=e.nodeName.toLowerCase();if (FCKBrowserInfo.IsIE&&e.scopeName!='HTML') E=e.scopeName.toLowerCase()+':'+E;if (!C){if (!B&&FCKListsLib.PathBlockElements[E]!=null) B=e;if (FCKListsLib.PathBlockLimitElements[E]!=null){if (!B&&E=='div'&&!FCKElementPath._CheckHasBlock(e)) B=e;else C=e;}};D.push(e);if (E=='body') break;};e=e.parentNode;};this.Block=B;this.BlockLimit=C;this.Elements=D;};FCKElementPath._CheckHasBlock=function(A){var B=A.childNodes;for (var i=0,count=B.length;i<count;i++){var C=B[i];if (C.nodeType==1&&FCKListsLib.BlockElements[C.nodeName.toLowerCase()]) return true;};return false;};
+var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
+FCKDomRange.prototype.MoveToSelection=function(){this.Release(true);var A=this.Window.getSelection();if (A&&A.rangeCount>0){this._Range=FCKW3CRange.CreateFromRange(this.Window.document,A.getRangeAt(0));this._UpdateElementInfo();}else if (this.Window.document) this.MoveToElementStart(this.Window.document.body);};FCKDomRange.prototype.Select=function(){var A=this._Range;if (A){var B=A.startContainer;if (A.collapsed&&B.nodeType==1&&B.childNodes.length==0) B.appendChild(A._Document.createTextNode(''));var C=this.Window.document.createRange();C.setStart(B,A.startOffset);try{C.setEnd(A.endContainer,A.endOffset);}catch (e){if (e.toString().Contains('NS_ERROR_ILLEGAL_VALUE')){A.collapse(true);C.setEnd(A.endContainer,A.endOffset);}else throw(e);};var D=this.Window.getSelection();D.removeAllRanges();D.addRange(C);}};FCKDomRange.prototype.SelectBookmark=function(A){var B=this.Window.document.createRange();var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);B.setStart(C.parentNode,FCKDomTools.GetIndexOf(C));FCKDomTools.RemoveNode(C);if (D){B.setEnd(D.parentNode,FCKDomTools.GetIndexOf(D));FCKDomTools.RemoveNode(D);};var E=this.Window.getSelection();E.removeAllRanges();E.addRange(B);};
+var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I);};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
+var FCKDocumentFragment=function(A,B){this.RootNode=B||A.createDocumentFragment();};FCKDocumentFragment.prototype={AppendTo:function(A){A.appendChild(this.RootNode);},AppendHtml:function(A){var B=this.RootNode.ownerDocument.createElement('div');B.innerHTML=A;FCKDomTools.MoveChildren(B,this.RootNode);},InsertAfterNode:function(A){FCKDomTools.InsertAfterNode(A,this.RootNode);}};
+var FCKW3CRange=function(A){this._Document=A;this.startContainer=null;this.startOffset=null;this.endContainer=null;this.endOffset=null;this.collapsed=true;};FCKW3CRange.CreateRange=function(A){return new FCKW3CRange(A);};FCKW3CRange.CreateFromRange=function(A,B){var C=FCKW3CRange.CreateRange(A);C.setStart(B.startContainer,B.startOffset);C.setEnd(B.endContainer,B.endOffset);return C;};FCKW3CRange.prototype={_UpdateCollapsed:function(){this.collapsed=(this.startContainer==this.endContainer&&this.startOffset==this.endOffset);},setStart:function(A,B){this.startContainer=A;this.startOffset=B;if (!this.endContainer){this.endContainer=A;this.endOffset=B;};this._UpdateCollapsed();},setEnd:function(A,B){this.endContainer=A;this.endOffset=B;if (!this.startContainer){this.startContainer=A;this.startOffset=B;};this._UpdateCollapsed();},setStartAfter:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setStartBefore:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A));},setEndAfter:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setEndBefore:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A));},collapse:function(A){if (A){this.endContainer=this.startContainer;this.endOffset=this.startOffset;}else{this.startContainer=this.endContainer;this.startOffset=this.endOffset;};this.collapsed=true;},selectNodeContents:function(A){this.setStart(A,0);this.setEnd(A,A.nodeType==3?A.data.length:A.childNodes.length);},insertNode:function(A){var B=this.startContainer;var C=this.startOffset;if (B.nodeType==3){B.splitText(C);if (B==this.endContainer) this.setEnd(B.nextSibling,this.endOffset-this.startOffset);FCKDomTools.InsertAfterNode(B,A);return;}else{B.insertBefore(A,B.childNodes[C]||null);if (B==this.endContainer){this.endOffset++;this.collapsed=false;}}},deleteContents:function(){if (this.collapsed) return;this._ExecContentsAction(0);},extractContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(1,A);return A;},cloneContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(2,A);return A;},_ExecContentsAction:function(A,B){var C=this.startContainer;var D=this.endContainer;var E=this.startOffset;var F=this.endOffset;var G=false;var H=false;if (D.nodeType==3) D=D.splitText(F);else{if (D.childNodes.length>0){if (F>D.childNodes.length-1){D=FCKDomTools.InsertAfterNode(D.lastChild,this._Document.createTextNode(''));H=true;}else D=D.childNodes[F];}};if (C.nodeType==3){C.splitText(E);if (C==D) D=C.nextSibling;}else{if (E==0){C=C.insertBefore(this._Document.createTextNode(''),C.firstChild);G=true;}else if (E>C.childNodes.length-1){C=C.appendChild(this._Document.createTextNode(''));G=true;}else C=C.childNodes[E].previousSibling;};var I=FCKDomTools.GetParents(C);var J=FCKDomTools.GetParents(D);var i,topStart,topEnd;for (i=0;i<I.length;i++){topStart=I[i];topEnd=J[i];if (topStart!=topEnd) break;};var K,levelStartNode,levelClone,currentNode,currentSibling;if (B) K=B.RootNode;for (var j=i;j<I.length;j++){levelStartNode=I[j];if (K&&levelStartNode!=C) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==C));currentNode=levelStartNode.nextSibling;while(currentNode){if (currentNode==J[j]||currentNode==D) break;currentSibling=currentNode.nextSibling;if (A==2) K.appendChild(currentNode.cloneNode(true));else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.appendChild(currentNode);};currentNode=currentSibling;};if (K) K=levelClone;};if (B) K=B.RootNode;for (var k=i;k<J.length;k++){levelStartNode=J[k];if (A>0&&levelStartNode!=D) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==D));if (!I[k]||levelStartNode.parentNode!=I[k].parentNode){currentNode=levelStartNode.previousSibling;while(currentNode){if (currentNode==I[k]||currentNode==C) break;currentSibling=currentNode.previousSibling;if (A==2) K.insertBefore(currentNode.cloneNode(true),K.firstChild);else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.insertBefore(currentNode,K.firstChild);};currentNode=currentSibling;}};if (K) K=levelClone;};if (A==2){var L=this.startContainer;if (L.nodeType==3){L.data+=L.nextSibling.data;L.parentNode.removeChild(L.nextSibling);};var M=this.endContainer;if (M.nodeType==3&&M.nextSibling){M.data+=M.nextSibling.data;M.parentNode.removeChild(M.nextSibling);}}else{if (topStart&&topEnd&&(C.parentNode!=topStart.parentNode||D.parentNode!=topEnd.parentNode)){var N=FCKDomTools.GetIndexOf(topEnd);if (G&&topEnd.parentNode==C.parentNode) N--;this.setStart(topEnd.parentNode,N);};this.collapse(true);};if(G) C.parentNode.removeChild(C);if(H&&D.parentNode) D.parentNode.removeChild(D);},cloneRange:function(){return FCKW3CRange.CreateFromRange(this._Document,this);}};
+var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike) FCKDomTools.ScrollIntoView(F||I,false);C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
+var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.AddItem(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
+var FCKSelection=FCK.Selection={GetParentBlock:function(){var A=this.GetParentElement();while (A){if (FCKListsLib.BlockBoundaries[A.nodeName.toLowerCase()]) break;A=A.parentNode;};return A;},ApplyStyle:function(A){FCKStyles.ApplyStyle(new FCKStyle(A));}};
+FCKSelection.GetType=function(){var A='Text';var B;try { B=this.GetSelection();} catch (e) {};if (B&&B.rangeCount==1){var C=B.getRangeAt(0);if (C.startContainer==C.endContainer&&(C.endOffset-C.startOffset)==1&&C.startContainer.nodeType==1&&FCKListsLib.StyleObjectElements[C.startContainer.childNodes[C.startOffset].nodeName.toLowerCase()]){A='Control';}};return A;};FCKSelection.GetSelectedElement=function(){var A=!!FCK.EditorWindow&&this.GetSelection();if (!A||A.rangeCount<1) return null;var B=A.getRangeAt(0);if (B.startContainer!=B.endContainer||B.startContainer.nodeType!=1||B.startOffset!=B.endOffset-1) return null;var C=B.startContainer.childNodes[B.startOffset];if (C.nodeType!=1) return null;return C;};FCKSelection.GetParentElement=function(){if (this.GetType()=='Control') return FCKSelection.GetSelectedElement().parentNode;else{var A=this.GetSelection();if (A){if (A.anchorNode&&A.anchorNode==A.focusNode){var B=A.getRangeAt(0);if (B.collapsed||B.startContainer.nodeType==3) return A.anchorNode.parentNode;else return A.anchorNode;};var C=new FCKElementPath(A.anchorNode);var D=new FCKElementPath(A.focusNode);var E=null;var F=null;if (C.Elements.length>D.Elements.length){E=C.Elements;F=D.Elements;}else{E=D.Elements;F=C.Elements;};var G=E.length-F.length;for(var i=0;i<F.length;i++){if (E[G+i]==F[i]) return F[i];};return null;}};return null;};FCKSelection.GetBoundaryParentElement=function(A){if (!FCK.EditorWindow) return null;if (this.GetType()=='Control') return FCKSelection.GetSelectedElement().parentNode;else{var B=this.GetSelection();if (B&&B.rangeCount>0){var C=B.getRangeAt(A?0:(B.rangeCount-1));var D=A?C.startContainer:C.endContainer;return (D.nodeType==1?D:D.parentNode);}};return null;};FCKSelection.SelectNode=function(A){var B=FCK.EditorDocument.createRange();B.selectNode(A);var C=this.GetSelection();C.removeAllRanges();C.addRange(B);};FCKSelection.Collapse=function(A){var B=this.GetSelection();if (A==null||A===true) B.collapseToStart();else B.collapseToEnd();};FCKSelection.HasAncestorNode=function(A){var B=this.GetSelectedElement();if (!B&&FCK.EditorWindow){try		{ B=this.GetSelection().getRangeAt(0).startContainer;}catch(e){}}while (B){if (B.nodeType==1&&B.nodeName.IEquals(A)) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B;var C=this.GetSelectedElement();if (!C) C=this.GetSelection().getRangeAt(0).startContainer;while (C){if (C.nodeName.IEquals(A)) return C;C=C.parentNode;};return null;};FCKSelection.Delete=function(){var A=this.GetSelection();for (var i=0;i<A.rangeCount;i++){A.getRangeAt(i).deleteContents();};return A;};FCKSelection.GetSelection=function(){return FCK.EditorWindow.getSelection();};FCKSelection.Save=function(){};FCKSelection.Restore=function(){};FCKSelection.Release=function(){};
+var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=FCKTools.GetElementAscensor(B[i],'TR');C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];if (A) F.insertBefore(B,G);else if (G.nextSibling) F.insertBefore(B,G.nextSibling);else F.appendChild(B);}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(FCKTools.GetElementAscensor(A,'TR'));return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){if (FCKBrowserInfo.IsIE) A[i].removeAttribute(B);else delete A[i][B];}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0].parentNode.parentNode);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCKTools.GetElementDocument(B).createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCKTools.GetElementDocument(D).createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCKTools.GetElementDocument(B).createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCKTools.GetElementDocument(B).createElement('td'));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=FCKTableHandler._GetCellIndexSpan(C,B.parentNode.rowIndex,B);var E=B.rowSpan;var F=B.parentNode.rowIndex;if (isNaN(E)) E=1;if (E>1){B.rowSpan=Math.ceil(E/2);var G=F+Math.ceil(E/2);var H=null;for (var i=D+1;i<C[G].length;i++){if (C[G][i].parentNode.rowIndex==G){H=C[G][i];break;}};var I=FCK.EditorDocument.createElement('td');I.rowSpan=Math.floor(E/2);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);B.parentNode.parentNode.rows[G].insertBefore(I,H);}else{var G=F+1;var K=FCK.EditorDocument.createElement('tr');var L=B.parentNode.parentNode;if (L.rows.length>G) L.insertBefore(K,L.rows[G]);else L.appendChild(K);for (var i=0;i<C[F].length;){var M=C[F][i].colSpan;if (isNaN(M)||M<1) M=1;if (i==D){i+=M;continue;};var N=C[F][i].rowSpan;if (isNaN(N)) N=1;C[F][i].rowSpan=N+1;i+=M;};var I=FCK.EditorDocument.createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);K.appendChild(I);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._GetColumnCells=function(A,B){var C=[];for (var r=0;r<A.length;r++){var D=A[r][B];if (D&&(C.length==0||C[C.length-1]!=D)) C[C.length]=D;};return C;};FCKTableHandler._CreateTableMap=function(A){var B=A.rows;var r=-1;var C=[];for (var i=0;i<B.length;i++){r++;if (!C[r]) C[r]=[];var c=-1;for (var j=0;j<B[i].cells.length;j++){var D=B[i].cells[j];c++;while (C[r][c]) c++;var E=isNaN(D.colSpan)?1:D.colSpan;var F=isNaN(D.rowSpan)?1:D.rowSpan;for (var G=0;G<F;G++){if (!C[r+G]) C[r+G]=[];for (var H=0;H<E;H++){C[r+G][c+H]=B[i].cells[j];}};c+=E-1;}};return C;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";while (B.rows.length>0){var D=B.rows[0];D.parentNode.removeChild(D);};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (E.parentNode) E.parentNode.removeChild(E);E.colSpan=E[C]=1;}};var F=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (!E) continue;if (j>F) F=j;if (E._colScanned===true) continue;if (A[i][j-1]==E) E.colSpan++;if (A[i][j+1]!=E) E._colScanned=true;}};for (var i=0;i<=F;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var E=A[j][i];if (!E||E._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==E) E[C]++;if (!A[j+1]||A[j+1][i]!=E) E._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (FCKBrowserInfo.IsIE){E.removeAttribute('_colScanned');E.removeAttribute('_rowScanned');}else{delete E._colScanned;delete E._rowScanned;}}};for (var i=0;i<A.length;i++){var J=FCKTools.GetElementDocument(B).createElement('tr');for (var j=0;j<A[i].length;){var E=A[i][j];if (A[i-1]&&A[i-1][j]==E){j+=E.colSpan;continue;};J.appendChild(E);if (C!='rowSpan'){E.rowSpan=E[C];E.removeAttribute(C);};j+=E.colSpan;if (E.colSpan==1) E.removeAttribute('colspan');if (E.rowSpan==1) E.removeAttribute('rowspan');};B.appendChild(J);}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
+FCKTableHandler.GetSelectedCells=function(){var A=[];var B=FCKSelection.GetSelection();if (B.rangeCount==1&&B.anchorNode.nodeType==3){var C=FCKTools.GetElementAscensor(B.anchorNode,'TD,TH');if (C) A[0]=C;return A;};for (var i=0;i<B.rangeCount;i++){var D=B.getRangeAt(i);var E;if (D.startContainer.tagName.Equals('TD','TH')) E=D.startContainer;else E=D.startContainer.childNodes[D.startOffset];if (E.tagName.Equals('TD','TH')) A[A.length]=E;};return A;};
+var FCKXml=function(){this.Error=false;};FCKXml.GetAttribute=function(A,B,C){var D=A.attributes.getNamedItem(B);return D?D.value:C;};FCKXml.TransformToObject=function(A){if (!A) return null;var B={};var C=A.attributes;for (var i=0;i<C.length;i++){var D=C[i];B[D.name]=D.value;};var E=A.childNodes;for (i=0;i<E.length;i++){var F=E[i];if (F.nodeType==1){var G='$'+F.nodeName;var H=B[G];if (!H) H=B[G]=[];H.push(this.TransformToObject(F));}};return B;};
+FCKXml.prototype={LoadUrl:function(A){this.Error=false;var B;var C=FCKTools.CreateXmlObject('XmlHttp');C.open('GET',A,false);C.send(null);if (C.status==200||C.status==304||(C.status==0&&C.readyState==4)){B=C.responseXML;if (!B) B=(new DOMParser()).parseFromString(C.responseText,'text/xml');}else B=null;if (B){try{var D=B.firstChild;}catch (e){B=(new DOMParser()).parseFromString(C.responseText,'text/xml');}};if (!B||!B.firstChild){this.Error=true;if (window.confirm('Error loading "'+A+'" (HTTP Status: '+C.status+').\r\nDo you want to see the server response dump?')) alert(C.responseText);};this.DOMDocument=B;},SelectNodes:function(A,B){if (this.Error) return [];var C=[];var D=this.DOMDocument.evaluate(A,B?B:this.DOMDocument,this.DOMDocument.createNSResolver(this.DOMDocument.documentElement),XPathResult.ORDERED_NODE_ITERATOR_TYPE,null);if (D){var E=D.iterateNext();while(E){C[C.length]=E;E=D.iterateNext();}};return C;},SelectSingleNode:function(A,B){if (this.Error) return null;var C=this.DOMDocument.evaluate(A,B?B:this.DOMDocument,this.DOMDocument.createNSResolver(this.DOMDocument.documentElement),9,null);if (C&&C.singleNodeValue) return C.singleNodeValue;else return null;}};
+var FCKNamedCommand=function(A){this.Name=A;};FCKNamedCommand.prototype.Execute=function(){FCK.ExecuteNamedCommand(this.Name);};FCKNamedCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState(this.Name);};
+var FCKStyleCommand=function(){};FCKStyleCommand.prototype={Name:'Style',Execute:function(A,B){FCKUndo.SaveUndoStep();if (B.Selected) FCK.Styles.RemoveStyle(B.Style);else FCK.Styles.ApplyStyle(B.Style);FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorDocument) return -1;if (FCKSelection.GetType()=='Control'){var A=FCKSelection.GetSelectedElement();if (!A||!FCKStyles.CheckHasObjectStyle(A.nodeName.toLowerCase())) return -1;};return 0;}};
+var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
+var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
+var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=(FCKConfig.SpellChecker=='SpellerPages');};FCKSpellCheckCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
+var FCKTextColorCommand=function(A){this.Name=A=='ForeColor'?'TextColor':'BGColor';this.Type=A;var B;if (FCKBrowserInfo.IsIE) B=window;else if (FCK.ToolbarSet._IFrame) B=FCKTools.GetElementWindow(FCK.ToolbarSet._IFrame);else B=window.parent;this._Panel=new FCKPanel(B);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._Panel.MainNode.className='FCK_Panel';this._CreatePanelBody(this._Panel.Document,this._Panel.MainNode);FCK.ToolbarSet.ToolbarItems.GetItem(this.Name).RegisterPanel(this._Panel);FCKTools.DisableSelection(this._Panel.Document.body);};FCKTextColorCommand.prototype.Execute=function(A,B,C){this._Panel.Show(A,B,C);};FCKTextColorCommand.prototype.SetColor=function(A){FCKUndo.SaveUndoStep();var B=FCKStyles.GetStyle('_FCK_'+(this.Type=='ForeColor'?'Color':'BackColor'));if (!A||A.length==0) FCK.Styles.RemoveStyle(B);else{B.SetVariable('Color',A);FCKStyles.ApplyStyle(B);};FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');};FCKTextColorCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};function FCKTextColorCommand_OnMouseOver(){this.className='ColorSelected';};function FCKTextColorCommand_OnMouseOut(){this.className='ColorDeselected';};function FCKTextColorCommand_OnClick(A,B,C){this.className='ColorDeselected';B.SetColor(C);B._Panel.Hide();};function FCKTextColorCommand_AutoOnClick(A,B){this.className='ColorDeselected';B.SetColor('');B._Panel.Hide();};function FCKTextColorCommand_MoreOnClick(A,B){this.className='ColorDeselected';B._Panel.Hide();FCKDialog.OpenDialog('FCKDialog_Color',FCKLang.DlgColorTitle,'dialog/fck_colorselector.html',410,320,FCKTools.Bind(B,B.SetColor));};FCKTextColorCommand.prototype._CreatePanelBody=function(A,B){function CreateSelectionDiv(){var C=A.createElement("DIV");C.className='ColorDeselected';FCKTools.AddEventListenerEx(C,'mouseover',FCKTextColorCommand_OnMouseOver);FCKTools.AddEventListenerEx(C,'mouseout',FCKTextColorCommand_OnMouseOut);return C;};var D=B.appendChild(A.createElement("TABLE"));D.className='ForceBaseFont';D.style.tableLayout='fixed';D.cellPadding=0;D.cellSpacing=0;D.border=0;D.width=150;var E=D.insertRow(-1).insertCell(-1);E.colSpan=8;var C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table cellspacing="0" cellpadding="0" width="100%" border="0">\n			<tr>\n				<td><div class="ColorBoxBorder"><div class="ColorBox" style="background-color: #000000"></div></div></td>\n				<td nowrap width="100%" align="center">'+FCKLang.ColorAutomatic+'</td>\n			</tr>\n		</table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_AutoOnClick,this);if (!FCKBrowserInfo.IsIE) C.style.width='96%';var G=FCKConfig.FontColors.toString().split(',');var H=0;while (H<G.length){var I=D.insertRow(-1);for (var i=0;i<8;i++,H++){if (H<G.length){var J=G[H].split('/');var K='#'+J[0];var L=J[1]||K;};C=I.insertCell(-1).appendChild(CreateSelectionDiv());C.innerHTML='<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: '+K+'"></div></div>';if (H>=G.length) C.style.visibility='hidden';else FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_OnClick,[this,L]);}};if (FCKConfig.EnableMoreFontColors){E=D.insertRow(-1).insertCell(-1);E.colSpan=8;C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">'+FCKLang.ColorMoreColors+'</td></tr></table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_MoreOnClick,this);};if (!FCKBrowserInfo.IsIE) C.style.width='96%';};
+var FCKPastePlainTextCommand=function(){this.Name='PasteText';};FCKPastePlainTextCommand.prototype.Execute=function(){FCK.PasteAsPlainText();};FCKPastePlainTextCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');};
+var FCKPasteWordCommand=function(){this.Name='PasteWord';};FCKPasteWordCommand.prototype.Execute=function(){FCK.PasteFromWord();};FCKPasteWordCommand.prototype.GetState=function(){if (FCK.EditMode!=0||FCKConfig.ForcePasteAsPlainText) return -1;else return FCK.GetNamedCommandState('Paste');};
+var FCKTableCommand=function(A){this.Name=A;};FCKTableCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (!FCKBrowserInfo.IsGecko){switch (this.Name){case 'TableMergeRight':return FCKTableHandler.MergeRight();case 'TableMergeDown':return FCKTableHandler.MergeDown();}};switch (this.Name){case 'TableInsertRowAfter':return FCKTableHandler.InsertRow(false);case 'TableInsertRowBefore':return FCKTableHandler.InsertRow(true);case 'TableDeleteRows':return FCKTableHandler.DeleteRows();case 'TableInsertColumnAfter':return FCKTableHandler.InsertColumn(false);case 'TableInsertColumnBefore':return FCKTableHandler.InsertColumn(true);case 'TableDeleteColumns':return FCKTableHandler.DeleteColumns();case 'TableInsertCellAfter':return FCKTableHandler.InsertCell(null,false);case 'TableInsertCellBefore':return FCKTableHandler.InsertCell(null,true);case 'TableDeleteCells':return FCKTableHandler.DeleteCells();case 'TableMergeCells':return FCKTableHandler.MergeCells();case 'TableHorizontalSplitCell':return FCKTableHandler.HorizontalSplitCell();case 'TableVerticalSplitCell':return FCKTableHandler.VerticalSplitCell();case 'TableDelete':return FCKTableHandler.DeleteTable();default:return alert(FCKLang.UnknownCommand.replace(/%1/g,this.Name));}};FCKTableCommand.prototype.GetState=function(){if (FCK.EditorDocument!=null&&FCKSelection.HasAncestorNode('TABLE')){switch (this.Name){case 'TableHorizontalSplitCell':case 'TableVerticalSplitCell':if (FCKTableHandler.GetSelectedCells().length==1) return 0;else return -1;case 'TableMergeCells':if (FCKTableHandler.CheckIsSelectionRectangular()&&FCKTableHandler.GetSelectedCells().length>1) return 0;else return -1;case 'TableMergeRight':return FCKTableHandler.GetMergeRightTarget()?0:-1;case 'TableMergeDown':return FCKTableHandler.GetMergeDownTarget()?0:-1;default:return 0;}}else return -1;};
+var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();var I=FCKTools.GetScrollPosition(FCK.EditorWindow);if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();H.Select();FCK.EditorWindow.scrollTo(I.X,I.Y);};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
+var FCKListCommand=function(A,B){this.Name=A;this.TagName=B;};FCKListCommand.prototype={GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=FCKSelection.GetBoundaryParentElement(true);var B=A;while (B){if (B.nodeName.IEquals(['ul','ol'])) break;B=B.parentNode;};if (B&&B.nodeName.IEquals(this.TagName)) return 1;else return 0;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCK.EditorDocument;var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=this.GetState();if (C==0){FCKDomTools.TrimNode(A.body);if (!A.body.firstChild){var D=A.createElement('p');A.body.appendChild(D);B.MoveToNodeContents(D);}};var E=B.CreateBookmark();var F=[];var G={};var H=new FCKDomRangeIterator(B);var I;H.ForceBrBreak=(C==0);var J=true;var K=null;while (J){while ((I=H.GetNextParagraph())){var L=new FCKElementPath(I);var M=null;var N=false;var O=L.BlockLimit;for (var i=L.Elements.length-1;i>=0;i--){var P=L.Elements[i];if (P.nodeName.IEquals(['ol','ul'])){if (O._FCK_ListGroupObject) O._FCK_ListGroupObject=null;var Q=P._FCK_ListGroupObject;if (Q) Q.contents.push(I);else{Q={ 'root':P,'contents':[I] };F.push(Q);FCKDomTools.SetElementMarker(G,P,'_FCK_ListGroupObject',Q);};N=true;break;}};if (N) continue;var R=O;if (R._FCK_ListGroupObject) R._FCK_ListGroupObject.contents.push(I);else{var Q={ 'root':R,'contents':[I] };FCKDomTools.SetElementMarker(G,R,'_FCK_ListGroupObject',Q);F.push(Q);}};if (FCKBrowserInfo.IsIE) J=false;else{if (K==null){K=[];var T=FCKSelection.GetSelection();if (T&&F.length==0) K.push(T.getRangeAt(0));for (var i=1;T&&i<T.rangeCount;i++) K.push(T.getRangeAt(i));};if (K.length<1) J=false;else{var U=FCKW3CRange.CreateFromRange(A,K.shift());B._Range=U;B._UpdateElementInfo();if (B.StartNode.nodeName.IEquals('td')) B.SetStart(B.StartNode,1);if (B.EndNode.nodeName.IEquals('td')) B.SetEnd(B.EndNode,2);H=new FCKDomRangeIterator(B);H.ForceBrBreak=(C==0);}}};var W=[];while (F.length>0){var Q=F.shift();if (C==0){if (Q.root.nodeName.IEquals(['ul','ol'])) this._ChangeListType(Q,G,W);else this._CreateList(Q,W);}else if (C==1&&Q.root.nodeName.IEquals(['ul','ol'])) this._RemoveList(Q,G);};for (var i=0;i<W.length;i++){var M=W[i];var Z=false;var a=M;while (!Z){a=a.nextSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.firstChild) M.appendChild(a.removeChild(a.firstChild));};Z=false;a=M;while (!Z){a=a.previousSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.lastChild) M.insertBefore(a.removeChild(a.lastChild),M.firstChild);}};FCKDomTools.ClearAllMarkers(G);B.MoveToBookmark(E);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},_ChangeListType:function(A,B,C){var D=FCKDomTools.ListToArray(A.root,B);var E=[];for (var i=0;i<A.contents.length;i++){var F=A.contents[i];F=FCKTools.GetElementAscensor(F,'li');if (!F||F._FCK_ListItem_Processed) continue;E.push(F);FCKDomTools.SetElementMarker(B,F,'_FCK_ListItem_Processed',true);};var G=FCKTools.GetElementDocument(A.root).createElement(this.TagName);for (var i=0;i<E.length;i++){var H=E[i]._FCK_ListArray_Index;D[H].parent=G;};var I=FCKDomTools.ArrayToList(D,B);for (var i=0;i<I.listNode.childNodes.length;i++){if (I.listNode.childNodes[i].nodeName.IEquals(this.TagName)) C.push(I.listNode.childNodes[i]);};A.root.parentNode.replaceChild(I.listNode,A.root);},_CreateList:function(A,B){var C=A.contents;var D=FCKTools.GetElementDocument(A.root);var E=[];if (C.length==1&&C[0]==A.root){var F=D.createElement('div');while (C[0].firstChild) F.appendChild(C[0].removeChild(C[0].firstChild));C[0].appendChild(F);C[0]=F;};var G=A.contents[0].parentNode;for (var i=0;i<C.length;i++) G=FCKDomTools.GetCommonParents(G,C[i].parentNode).pop();for (var i=0;i<C.length;i++){var H=C[i];while (H.parentNode){if (H.parentNode==G){E.push(H);break;};H=H.parentNode;}};if (E.length<1) return;var I=E[E.length-1].nextSibling;var J=D.createElement(this.TagName);B.push(J);while (E.length){var K=E.shift();var L=D.createDocumentFragment();while (K.firstChild) L.appendChild(K.removeChild(K.firstChild));K.parentNode.removeChild(K);var M=D.createElement('li');M.appendChild(L);J.appendChild(M);};G.insertBefore(J,I);},_RemoveList:function(A,B){var C=FCKDomTools.ListToArray(A.root,B);var D=[];for (var i=0;i<A.contents.length;i++){var E=A.contents[i];E=FCKTools.GetElementAscensor(E,'li');if (!E||E._FCK_ListItem_Processed) continue;D.push(E);FCKDomTools.SetElementMarker(B,E,'_FCK_ListItem_Processed',true);};var F=null;for (var i=0;i<D.length;i++){var G=D[i]._FCK_ListArray_Index;C[G].indent=-1;F=G;};for (var i=F+1;i<C.length;i++){if (C[i].indent>C[i-1].indent+1){var H=C[i-1].indent+1-C[i].indent;var I=C[i].indent;while (C[i]&&C[i].indent>=I){C[i].indent+=H;i++;};i--;}};var J=FCKDomTools.ArrayToList(C,B);if (A.root.nextSibling==null||A.root.nextSibling.nodeName.IEquals('br')){if (J.listNode.lastChild.nodeName.IEquals('br')) J.listNode.removeChild(J.listNode.lastChild);};A.root.parentNode.replaceChild(J.listNode,A.root);}};
+var FCKJustifyCommand=function(A){this.AlignValue=A;var B=FCKConfig.ContentLangDirection.toLowerCase();this.IsDefaultAlign=(A=='left'&&B=='ltr')||(A=='right'&&B=='rtl');var C=this._CssClassName=(function(){var D=FCKConfig.JustifyClasses;if (D){switch (A){case 'left':return D[0]||null;case 'center':return D[1]||null;case 'right':return D[2]||null;case 'justify':return D[3]||null;}};return null;})();if (C&&C.length>0) this._CssClassRegex=new RegExp('(?:^|\\s+)'+C+'(?=$|\\s)');};FCKJustifyCommand._GetClassNameRegex=function(){var A=FCKJustifyCommand._ClassRegex;if (A!=undefined) return A;var B=[];var C=FCKConfig.JustifyClasses;if (C){for (var i=0;i<4;i++){var D=C[i];if (D&&D.length>0) B.push(D);}};if (B.length>0) A=new RegExp('(?:^|\\s+)(?:'+B.join('|')+')(?=$|\\s)');else A=null;return FCKJustifyCommand._ClassRegex=A;};FCKJustifyCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=this.GetState();if (B==-1) return;var C=A.CreateBookmark();var D=this._CssClassName;var E=new FCKDomRangeIterator(A);var F;while ((F=E.GetNextParagraph())){F.removeAttribute('align');if (D){var G=F.className.replace(FCKJustifyCommand._GetClassNameRegex(),'');if (B==0){if (G.length>0) G+=' ';F.className=G+D;}else if (G.length==0) FCKDomTools.RemoveAttribute(F,'class');}else{var H=F.style;if (B==0) H.textAlign=this.AlignValue;else{H.textAlign='';if (H.cssText.length==0) F.removeAttribute('style');}}};A.MoveToBookmark(C);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;var C;if (FCKBrowserInfo.IsIE) C=B.currentStyle.textAlign;else C=FCK.EditorWindow.getComputedStyle(B,'').getPropertyValue('text-align');C=C.replace(/(-moz-|-webkit-|start|auto)/i,'');if ((!C&&this.IsDefaultAlign)||C==this.AlignValue) return 1;return 0;}};
+var FCKIndentCommand=function(A,B){this.Name=A;this.Offset=B;this.IndentCSSProperty=FCKConfig.ContentLangDirection.IEquals('ltr')?'marginLeft':'marginRight';};FCKIndentCommand._InitIndentModeParameters=function(){if (FCKConfig.IndentClasses&&FCKConfig.IndentClasses.length>0){this._UseIndentClasses=true;this._IndentClassMap={};for (var i=0;i<FCKConfig.IndentClasses.length;i++) this._IndentClassMap[FCKConfig.IndentClasses[i]]=i+1;this._ClassNameRegex=new RegExp('(?:^|\\s+)('+FCKConfig.IndentClasses.join('|')+')(?=$|\\s)');}else this._UseIndentClasses=false;};FCKIndentCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=A.CreateBookmark();var C=FCKDomTools.GetCommonParentNode(A.StartNode||A.StartContainer,A.EndNode||A.EndContainer,['ul','ol']);if (C) this._IndentList(A,C);else this._IndentBlock(A);A.MoveToBookmark(B);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;if (FCKIndentCommand._UseIndentClasses==undefined) FCKIndentCommand._InitIndentModeParameters();var A=FCKSelection.GetBoundaryParentElement(true);var B=FCKSelection.GetBoundaryParentElement(false);var C=FCKDomTools.GetCommonParentNode(A,B,['ul','ol']);if (C){if (this.Name.IEquals('outdent')) return 0;var D=FCKTools.GetElementAscensor(A,'li');if (!D||!D.previousSibling) return -1;return 0;};if (!FCKIndentCommand._UseIndentClasses&&this.Name.IEquals('indent')) return 0;var E=new FCKElementPath(A);var F=E.Block||E.BlockLimit;if (!F) return -1;if (FCKIndentCommand._UseIndentClasses){var G=F.className.match(FCKIndentCommand._ClassNameRegex);var H=0;if (G!=null){G=G[1];H=FCKIndentCommand._IndentClassMap[G];};if ((this.Name=='outdent'&&H==0)||(this.Name=='indent'&&H==FCKConfig.IndentClasses.length)) return -1;return 0;}else{var I=parseInt(F.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;if (I<=0) return -1;return 0;}},_IndentBlock:function(A){var B=new FCKDomRangeIterator(A);B.EnforceRealBlocks=true;A.Expand('block_contents');var C=FCKDomTools.GetCommonParents(A.StartContainer,A.EndContainer);var D=C[C.length-1];var E;while ((E=B.GetNextParagraph())){if (!(E==D||E.parentNode==D)) continue;if (FCKIndentCommand._UseIndentClasses){var F=E.className.match(FCKIndentCommand._ClassNameRegex);var G=0;if (F!=null){F=F[1];G=FCKIndentCommand._IndentClassMap[F];};if (this.Name.IEquals('outdent')) G--;else if (this.Name.IEquals('indent')) G++;G=Math.min(G,FCKConfig.IndentClasses.length);G=Math.max(G,0);var H=E.className.replace(FCKIndentCommand._ClassNameRegex,'');if (G<1) E.className=H;else E.className=(H.length>0?H+' ':'')+FCKConfig.IndentClasses[G-1];}else{var I=parseInt(E.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;I+=this.Offset;I=Math.max(I,0);I=Math.ceil(I/this.Offset)*this.Offset;E.style[this.IndentCSSProperty]=I?I+FCKConfig.IndentUnit:'';if (E.getAttribute('style')=='') E.removeAttribute('style');}}},_IndentList:function(A,B){var C=A.StartContainer;var D=A.EndContainer;while (C&&C.parentNode!=B) C=C.parentNode;while (D&&D.parentNode!=B) D=D.parentNode;if (!C||!D) return;var E=C;var F=[];var G=false;while (G==false){if (E==D) G=true;F.push(E);E=E.nextSibling;};if (F.length<1) return;var H=FCKDomTools.GetParents(B);for (var i=0;i<H.length;i++){if (H[i].nodeName.IEquals(['ul','ol'])){B=H[i];break;}};var I=this.Name.IEquals('indent')?1:-1;var J=F[0];var K=F[F.length-1];var L={};var M=FCKDomTools.ListToArray(B,L);var N=M[K._FCK_ListArray_Index].indent;for (var i=J._FCK_ListArray_Index;i<=K._FCK_ListArray_Index;i++) M[i].indent+=I;for (var i=K._FCK_ListArray_Index+1;i<M.length&&M[i].indent>N;i++) M[i].indent+=I;var O=FCKDomTools.ArrayToList(M);if (O) B.parentNode.replaceChild(O.listNode,B);FCKDomTools.ClearAllMarkers(L);}};
+var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){G.EnforceRealBlocks=true;var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();};var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];while ((H=G.GetNextParagraph())){var P=null;var Q=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){P=H.parentNode;Q=H;break;};H=H.parentNode;};if (P&&Q) O.push(Q);};var R=[];while (O.length>0){var S=O.shift();var N=S.parentNode;if (S==S.parentNode.firstChild){N.parentNode.insertBefore(N.removeChild(S),N);if (!N.firstChild) N.parentNode.removeChild(N);}else if (S==S.parentNode.lastChild){N.parentNode.insertBefore(N.removeChild(S),N.nextSibling);if (!N.firstChild) N.parentNode.removeChild(N);}else FCKDomTools.BreakParent(S,S.parentNode,B);R.push(S);};if (FCKConfig.EnterMode.IEquals('br')){while (R.length){var S=R.shift();var W=true;if (S.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(S).createDocumentFragment();var Y=W&&S.previousSibling&&!FCKListsLib.BlockBoundaries[S.previousSibling.nodeName.toLowerCase()];if (W&&Y) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));var Z=S.nextSibling&&!FCKListsLib.BlockBoundaries[S.nextSibling.nodeName.toLowerCase()];while (S.firstChild) M.appendChild(S.removeChild(S.firstChild));if (Z) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));S.parentNode.replaceChild(M,S);W=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
+var FCKCoreStyleCommand=function(A){this.Name='CoreStyle';this.StyleName='_FCK_'+A;this.IsActive=false;FCKStyles.AttachStyleStateChange(this.StyleName,this._OnStyleStateChange,this);};FCKCoreStyleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();if (this.IsActive) FCKStyles.RemoveStyle(this.StyleName);else FCKStyles.ApplyStyle(this.StyleName);FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0) return -1;return this.IsActive?1:0;},_OnStyleStateChange:function(A,B){this.IsActive=B;}};
+var FCKRemoveFormatCommand=function(){this.Name='RemoveFormat';};FCKRemoveFormatCommand.prototype={Execute:function(){FCKStyles.RemoveAll();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){return FCK.EditorWindow?0:-1;}};
+var FCKCommands=FCK.Commands={};FCKCommands.LoadedCommands={};FCKCommands.RegisterCommand=function(A,B){this.LoadedCommands[A]=B;};FCKCommands.GetCommand=function(A){var B=FCKCommands.LoadedCommands[A];if (B) return B;switch (A){case 'Bold':case 'Italic':case 'Underline':case 'StrikeThrough':case 'Subscript':case 'Superscript':B=new FCKCoreStyleCommand(A);break;case 'RemoveFormat':B=new FCKRemoveFormatCommand();break;case 'DocProps':B=new FCKDialogCommand('DocProps',FCKLang.DocProps,'dialog/fck_docprops.html',400,380,FCKCommands.GetFullPageState);break;case 'Templates':B=new FCKDialogCommand('Templates',FCKLang.DlgTemplatesTitle,'dialog/fck_template.html',380,450);break;case 'Link':B=new FCKDialogCommand('Link',FCKLang.DlgLnkWindowTitle,'dialog/fck_link.html',400,300);break;case 'Unlink':B=new FCKUnlinkCommand();break;case 'VisitLink':B=new FCKVisitLinkCommand();break;case 'Anchor':B=new FCKDialogCommand('Anchor',FCKLang.DlgAnchorTitle,'dialog/fck_anchor.html',370,160);break;case 'AnchorDelete':B=new FCKAnchorDeleteCommand();break;case 'BulletedList':B=new FCKDialogCommand('BulletedList',FCKLang.BulletedListProp,'dialog/fck_listprop.html?UL',370,160);break;case 'NumberedList':B=new FCKDialogCommand('NumberedList',FCKLang.NumberedListProp,'dialog/fck_listprop.html?OL',370,160);break;case 'About':B=new FCKDialogCommand('About',FCKLang.About,'dialog/fck_about.html',420,330,function(){ return 0;});break;case 'Find':B=new FCKDialogCommand('Find',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Find');break;case 'Replace':B=new FCKDialogCommand('Replace',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Replace');break;case 'Image':B=new FCKDialogCommand('Image',FCKLang.DlgImgTitle,'dialog/fck_image.html',450,390);break;case 'Flash':B=new FCKDialogCommand('Flash',FCKLang.DlgFlashTitle,'dialog/fck_flash.html',450,390);break;case 'SpecialChar':B=new FCKDialogCommand('SpecialChar',FCKLang.DlgSpecialCharTitle,'dialog/fck_specialchar.html',400,290);break;case 'Smiley':B=new FCKDialogCommand('Smiley',FCKLang.DlgSmileyTitle,'dialog/fck_smiley.html',FCKConfig.SmileyWindowWidth,FCKConfig.SmileyWindowHeight);break;case 'Table':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html',480,250);break;case 'TableProp':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html?Parent',480,250);break;case 'TableCellProp':B=new FCKDialogCommand('TableCell',FCKLang.DlgCellTitle,'dialog/fck_tablecell.html',550,240);break;case 'Style':B=new FCKStyleCommand();break;case 'FontName':B=new FCKFontNameCommand();break;case 'FontSize':B=new FCKFontSizeCommand();break;case 'FontFormat':B=new FCKFormatBlockCommand();break;case 'Source':B=new FCKSourceCommand();break;case 'Preview':B=new FCKPreviewCommand();break;case 'Save':B=new FCKSaveCommand();break;case 'NewPage':B=new FCKNewPageCommand();break;case 'PageBreak':B=new FCKPageBreakCommand();break;case 'Rule':B=new FCKRuleCommand();break;case 'Nbsp':B=new FCKNbsp();break;case 'TextColor':B=new FCKTextColorCommand('ForeColor');break;case 'BGColor':B=new FCKTextColorCommand('BackColor');break;case 'Paste':B=new FCKPasteCommand();break;case 'PasteText':B=new FCKPastePlainTextCommand();break;case 'PasteWord':B=new FCKPasteWordCommand();break;case 'JustifyLeft':B=new FCKJustifyCommand('left');break;case 'JustifyCenter':B=new FCKJustifyCommand('center');break;case 'JustifyRight':B=new FCKJustifyCommand('right');break;case 'JustifyFull':B=new FCKJustifyCommand('justify');break;case 'Indent':B=new FCKIndentCommand('indent',FCKConfig.IndentLength);break;case 'Outdent':B=new FCKIndentCommand('outdent',FCKConfig.IndentLength*-1);break;case 'Blockquote':B=new FCKBlockQuoteCommand();break;case 'CreateDiv':B=new FCKDialogCommand('CreateDiv',FCKLang.CreateDiv,'dialog/fck_div.html',380,210,null,null,true);break;case 'EditDiv':B=new FCKDialogCommand('EditDiv',FCKLang.EditDiv,'dialog/fck_div.html',380,210,null,null,false);break;case 'DeleteDiv':B=new FCKDeleteDivCommand();break;case 'TableInsertRowAfter':B=new FCKTableCommand('TableInsertRowAfter');break;case 'TableInsertRowBefore':B=new FCKTableCommand('TableInsertRowBefore');break;case 'TableDeleteRows':B=new FCKTableCommand('TableDeleteRows');break;case 'TableInsertColumnAfter':B=new FCKTableCommand('TableInsertColumnAfter');break;case 'TableInsertColumnBefore':B=new FCKTableCommand('TableInsertColumnBefore');break;case 'TableDeleteColumns':B=new FCKTableCommand('TableDeleteColumns');break;case 'TableInsertCellAfter':B=new FCKTableCommand('TableInsertCellAfter');break;case 'TableInsertCellBefore':B=new FCKTableCommand('TableInsertCellBefore');break;case 'TableDeleteCells':B=new FCKTableCommand('TableDeleteCells');break;case 'TableMergeCells':B=new FCKTableCommand('TableMergeCells');break;case 'TableMergeRight':B=new FCKTableCommand('TableMergeRight');break;case 'TableMergeDown':B=new FCKTableCommand('TableMergeDown');break;case 'TableHorizontalSplitCell':B=new FCKTableCommand('TableHorizontalSplitCell');break;case 'TableVerticalSplitCell':B=new FCKTableCommand('TableVerticalSplitCell');break;case 'TableDelete':B=new FCKTableCommand('TableDelete');break;case 'Form':B=new FCKDialogCommand('Form',FCKLang.Form,'dialog/fck_form.html',380,210);break;case 'Checkbox':B=new FCKDialogCommand('Checkbox',FCKLang.Checkbox,'dialog/fck_checkbox.html',380,200);break;case 'Radio':B=new FCKDialogCommand('Radio',FCKLang.RadioButton,'dialog/fck_radiobutton.html',380,200);break;case 'TextField':B=new FCKDialogCommand('TextField',FCKLang.TextField,'dialog/fck_textfield.html',380,210);break;case 'Textarea':B=new FCKDialogCommand('Textarea',FCKLang.Textarea,'dialog/fck_textarea.html',380,210);break;case 'HiddenField':B=new FCKDialogCommand('HiddenField',FCKLang.HiddenField,'dialog/fck_hiddenfield.html',380,190);break;case 'Button':B=new FCKDialogCommand('Button',FCKLang.Button,'dialog/fck_button.html',380,210);break;case 'Select':B=new FCKDialogCommand('Select',FCKLang.SelectionField,'dialog/fck_select.html',400,340);break;case 'ImageButton':B=new FCKDialogCommand('ImageButton',FCKLang.ImageButton,'dialog/fck_image.html?ImageButton',450,390);break;case 'SpellCheck':B=new FCKSpellCheckCommand();break;case 'FitWindow':B=new FCKFitWindow();break;case 'Undo':B=new FCKUndoCommand();break;case 'Redo':B=new FCKRedoCommand();break;case 'Copy':B=new FCKCutCopyCommand(false);break;case 'Cut':B=new FCKCutCopyCommand(true);break;case 'SelectAll':B=new FCKSelectAllCommand();break;case 'InsertOrderedList':B=new FCKListCommand('insertorderedlist','ol');break;case 'InsertUnorderedList':B=new FCKListCommand('insertunorderedlist','ul');break;case 'ShowBlocks':B=new FCKShowBlockCommand('ShowBlocks',FCKConfig.StartupShowBlocks?1:0);break;case 'Undefined':B=new FCKUndefinedCommand();break;default:if (FCKRegexLib.NamedCommands.test(A)) B=new FCKNamedCommand(A);else{alert(FCKLang.UnknownCommand.replace(/%1/g,A));return null;}};FCKCommands.LoadedCommands[A]=B;return B;};FCKCommands.GetFullPageState=function(){return FCKConfig.FullPage?0:-1;};FCKCommands.GetBooleanState=function(A){return A?-1:0;};
+var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;};
+var FCKIcon=function(A){var B=A?typeof(A):'undefined';switch (B){case 'number':this.Path=FCKConfig.SkinPath+'fck_strip.gif';this.Size=16;this.Position=A;break;case 'undefined':this.Path=FCK_SPACER_PATH;break;case 'string':this.Path=A;break;default:this.Path=A[0];this.Size=A[1];this.Position=A[2];}};FCKIcon.prototype.CreateIconElement=function(A){var B,eIconImage;if (this.Position){var C='-'+((this.Position-1)*this.Size)+'px';if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path;eIconImage.style.top=C;}else{B=A.createElement('IMG');B.src=FCK_SPACER_PATH;B.style.backgroundPosition='0px '+C;B.style.backgroundImage='url("'+this.Path+'")';}}else{if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path?this.Path:FCK_SPACER_PATH;}else{B=A.createElement('IMG');B.src=this.Path?this.Path:FCK_SPACER_PATH;}};B.className='TB_Button_Image';return B;};
+var FCKToolbarButtonUI=function(A,B,C,D,E,F){this.Name=A;this.Label=B||A;this.Tooltip=C||this.Label;this.Style=E||0;this.State=F||0;this.Icon=new FCKIcon(D);if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarButtonUI_Cleanup);};FCKToolbarButtonUI.prototype._CreatePaddingElement=function(A){var B=A.createElement('IMG');B.className='TB_Button_Padding';B.src=FCK_SPACER_PATH;return B;};FCKToolbarButtonUI.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this.MainElement=B.createElement('DIV');C.title=this.Tooltip;if (FCKBrowserInfo.IsGecko) C.onmousedown=FCKTools.CancelEvent;FCKTools.AddEventListenerEx(C,'mouseover',FCKToolbarButtonUI_OnMouseOver,this);FCKTools.AddEventListenerEx(C,'mouseout',FCKToolbarButtonUI_OnMouseOut,this);FCKTools.AddEventListenerEx(C,'click',FCKToolbarButtonUI_OnClick,this);this.ChangeState(this.State,true);if (this.Style==0&&!this.ShowArrow){C.appendChild(this.Icon.CreateIconElement(B));}else{var D=C.appendChild(B.createElement('TABLE'));D.cellPadding=0;D.cellSpacing=0;var E=D.insertRow(-1);var F=E.insertCell(-1);if (this.Style==0||this.Style==2) F.appendChild(this.Icon.CreateIconElement(B));else F.appendChild(this._CreatePaddingElement(B));if (this.Style==1||this.Style==2){F=E.insertCell(-1);F.className='TB_Button_Text';F.noWrap=true;F.appendChild(B.createTextNode(this.Label));};if (this.ShowArrow){if (this.Style!=0){E.insertCell(-1).appendChild(this._CreatePaddingElement(B));};F=E.insertCell(-1);var G=F.appendChild(B.createElement('IMG'));G.src=FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif';G.width=5;G.height=3;};F=E.insertCell(-1);F.appendChild(this._CreatePaddingElement(B));};A.appendChild(C);};FCKToolbarButtonUI.prototype.ChangeState=function(A,B){if (!B&&this.State==A) return;var e=this.MainElement;if (!e) return;switch (parseInt(A,10)){case 0:e.className='TB_Button_Off';break;case 1:e.className='TB_Button_On';break;case -1:e.className='TB_Button_Disabled';break;};this.State=A;};function FCKToolbarButtonUI_OnMouseOver(A,B){if (B.State==0) this.className='TB_Button_Off_Over';else if (B.State==1) this.className='TB_Button_On_Over';};function FCKToolbarButtonUI_OnMouseOut(A,B){if (B.State==0) this.className='TB_Button_Off';else if (B.State==1) this.className='TB_Button_On';};function FCKToolbarButtonUI_OnClick(A,B){if (B.OnClick&&B.State!=-1) B.OnClick(B);};function FCKToolbarButtonUI_Cleanup(){this.MainElement=null;};
+var FCKToolbarButton=function(A,B,C,D,E,F,G){this.CommandName=A;this.Label=B;this.Tooltip=C;this.Style=D;this.SourceView=E?true:false;this.ContextSensitive=F?true:false;if (G==null) this.IconPath=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(G)=='number') this.IconPath=[FCKConfig.SkinPath+'fck_strip.gif',16,G];else this.IconPath=G;};FCKToolbarButton.prototype.Create=function(A){this._UIButton=new FCKToolbarButtonUI(this.CommandName,this.Label,this.Tooltip,this.IconPath,this.Style);this._UIButton.OnClick=this.Click;this._UIButton._ToolbarButton=this;this._UIButton.Create(A);};FCKToolbarButton.prototype.RefreshState=function(){var A=this._UIButton;if (!A) return;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B==A.State) return;A.ChangeState(B);};FCKToolbarButton.prototype.Click=function(){var A=this._ToolbarButton||this;FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(A.CommandName).Execute();};FCKToolbarButton.prototype.Enable=function(){this.RefreshState();};FCKToolbarButton.prototype.Disable=function(){this._UIButton.ChangeState(-1);};
+var FCKSpecialCombo=function(A,B,C,D,E){this.FieldWidth=B||100;this.PanelWidth=C||150;this.PanelMaxHeight=D||150;this.Label='&nbsp;';this.Caption=A;this.Tooltip=A;this.Style=2;this.Enabled=true;this.Items={};this._Panel=new FCKPanel(E||window);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._PanelBox=this._Panel.MainNode.appendChild(this._Panel.Document.createElement('DIV'));this._PanelBox.className='SC_Panel';this._PanelBox.style.width=this.PanelWidth+'px';this._PanelBox.innerHTML='<table cellpadding="0" cellspacing="0" width="100%" style="TABLE-LAYOUT: fixed"><tr><td nowrap></td></tr></table>';this._ItemsHolderEl=this._PanelBox.getElementsByTagName('TD')[0];if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKSpecialCombo_Cleanup);};function FCKSpecialCombo_ItemOnMouseOver(){this.className+=' SC_ItemOver';};function FCKSpecialCombo_ItemOnMouseOut(){this.className=this.originalClass;};function FCKSpecialCombo_ItemOnClick(A,B,C){this.className=this.originalClass;B._Panel.Hide();B.SetLabel(this.FCKItemLabel);if (typeof(B.OnSelect)=='function') B.OnSelect(C,this);};FCKSpecialCombo.prototype.ClearItems=function (){if (this.Items) this.Items={};var A=this._ItemsHolderEl;while (A.firstChild) A.removeChild(A.firstChild);};FCKSpecialCombo.prototype.AddItem=function(A,B,C,D){var E=this._ItemsHolderEl.appendChild(this._Panel.Document.createElement('DIV'));E.className=E.originalClass='SC_Item';E.innerHTML=B;E.FCKItemLabel=C||A;E.Selected=false;if (FCKBrowserInfo.IsIE) E.style.width='100%';if (D) E.style.backgroundColor=D;FCKTools.AddEventListenerEx(E,'mouseover',FCKSpecialCombo_ItemOnMouseOver);FCKTools.AddEventListenerEx(E,'mouseout',FCKSpecialCombo_ItemOnMouseOut);FCKTools.AddEventListenerEx(E,'click',FCKSpecialCombo_ItemOnClick,[this,A]);this.Items[A.toString().toLowerCase()]=E;return E;};FCKSpecialCombo.prototype.SelectItem=function(A){if (typeof A=='string') A=this.Items[A.toString().toLowerCase()];if (A){A.className=A.originalClass='SC_ItemSelected';A.Selected=true;}};FCKSpecialCombo.prototype.SelectItemByLabel=function(A,B){for (var C in this.Items){var D=this.Items[C];if (D.FCKItemLabel==A){D.className=D.originalClass='SC_ItemSelected';D.Selected=true;if (B) this.SetLabel(A);}}};FCKSpecialCombo.prototype.DeselectAll=function(A){for (var i in this.Items){if (!this.Items[i]) continue;this.Items[i].className=this.Items[i].originalClass='SC_Item';this.Items[i].Selected=false;};if (A) this.SetLabel('');};FCKSpecialCombo.prototype.SetLabelById=function(A){A=A?A.toString().toLowerCase():'';var B=this.Items[A];this.SetLabel(B?B.FCKItemLabel:'');};FCKSpecialCombo.prototype.SetLabel=function(A){A=(!A||A.length==0)?'&nbsp;':A;if (A==this.Label) return;this.Label=A;var B=this._LabelEl;if (B){B.innerHTML=A;FCKTools.DisableSelection(B);}};FCKSpecialCombo.prototype.SetEnabled=function(A){this.Enabled=A;if (this._OuterTable) this._OuterTable.className=A?'':'SC_FieldDisabled';};FCKSpecialCombo.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this._OuterTable=A.appendChild(B.createElement('TABLE'));C.cellPadding=0;C.cellSpacing=0;C.insertRow(-1);var D;var E;switch (this.Style){case 0:D='TB_ButtonType_Icon';E=false;break;case 1:D='TB_ButtonType_Text';E=false;break;case 2:E=true;break;};if (this.Caption&&this.Caption.length>0&&E){var F=C.rows[0].insertCell(-1);F.innerHTML=this.Caption;F.className='SC_FieldCaption';};var G=FCKTools.AppendElement(C.rows[0].insertCell(-1),'div');if (E){G.className='SC_Field';G.style.width=this.FieldWidth+'px';G.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" style="TABLE-LAYOUT: fixed;"><tbody><tr><td class="SC_FieldLabel"><label>&nbsp;</label></td><td class="SC_FieldButton">&nbsp;</td></tr></tbody></table>';this._LabelEl=G.getElementsByTagName('label')[0];this._LabelEl.innerHTML=this.Label;}else{G.className='TB_Button_Off';G.innerHTML='<table title="'+this.Tooltip+'" class="'+D+'" cellspacing="0" cellpadding="0" border="0"><tr><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td><td class="TB_Text">'+this.Caption+'</td><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td><td class="TB_ButtonArrow"><img src="'+FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif" width="5" height="3"></td><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td></tr></table>';};FCKTools.AddEventListenerEx(G,'mouseover',FCKSpecialCombo_OnMouseOver,this);FCKTools.AddEventListenerEx(G,'mouseout',FCKSpecialCombo_OnMouseOut,this);FCKTools.AddEventListenerEx(G,'click',FCKSpecialCombo_OnClick,this);FCKTools.DisableSelection(this._Panel.Document.body);};function FCKSpecialCombo_Cleanup(){this._LabelEl=null;this._OuterTable=null;this._ItemsHolderEl=null;this._PanelBox=null;if (this.Items){for (var A in this.Items) this.Items[A]=null;}};function FCKSpecialCombo_OnMouseOver(A,B){if (B.Enabled){switch (B.Style){case 0:this.className='TB_Button_On_Over';break;case 1:this.className='TB_Button_On_Over';break;case 2:this.className='SC_Field SC_FieldOver';break;}}};function FCKSpecialCombo_OnMouseOut(A,B){switch (B.Style){case 0:this.className='TB_Button_Off';break;case 1:this.className='TB_Button_Off';break;case 2:this.className='SC_Field';break;}};function FCKSpecialCombo_OnClick(e,A){if (A.Enabled){var B=A._Panel;var C=A._PanelBox;var D=A._ItemsHolderEl;var E=A.PanelMaxHeight;if (A.OnBeforeClick) A.OnBeforeClick(A);if (FCKBrowserInfo.IsIE) B.Preload(0,this.offsetHeight,this);if (D.offsetHeight>E) C.style.height=E+'px';else C.style.height='';B.Show(0,this.offsetHeight,this);}};
+var FCKToolbarSpecialCombo=function(){this.SourceView=false;this.ContextSensitive=true;this.FieldWidth=null;this.PanelWidth=null;this.PanelMaxHeight=null;};FCKToolbarSpecialCombo.prototype.DefaultLabel='';function FCKToolbarSpecialCombo_OnSelect(A,B){FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).Execute(A,B);};FCKToolbarSpecialCombo.prototype.Create=function(A){this._Combo=new FCKSpecialCombo(this.GetLabel(),this.FieldWidth,this.PanelWidth,this.PanelMaxHeight,FCKBrowserInfo.IsIE?window:FCKTools.GetElementWindow(A).parent);this._Combo.Tooltip=this.Tooltip;this._Combo.Style=this.Style;this.CreateItems(this._Combo);this._Combo.Create(A);this._Combo.CommandName=this.CommandName;this._Combo.OnSelect=FCKToolbarSpecialCombo_OnSelect;};function FCKToolbarSpecialCombo_RefreshActiveItems(A,B){A.DeselectAll();A.SelectItem(B);A.SetLabelById(B);};FCKToolbarSpecialCombo.prototype.RefreshState=function(){var A;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B!=-1){A=1;if (this.RefreshActiveItems) this.RefreshActiveItems(this._Combo,B);else{if (this._LastValue!==B){this._LastValue=B;if (!B||B.length==0){this._Combo.DeselectAll();this._Combo.SetLabel(this.DefaultLabel);}else FCKToolbarSpecialCombo_RefreshActiveItems(this._Combo,B);}}}else A=-1;if (A==this.State) return;if (A==-1){this._Combo.DeselectAll();this._Combo.SetLabel('');};this.State=A;this._Combo.SetEnabled(A!=-1);};FCKToolbarSpecialCombo.prototype.Enable=function(){this.RefreshState();};FCKToolbarSpecialCombo.prototype.Disable=function(){this.State=-1;this._Combo.DeselectAll();this._Combo.SetLabel('');this._Combo.SetEnabled(false);};
+var FCKToolbarStyleCombo=function(A,B){if (A===false) return;this.CommandName='Style';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultStyleLabel||'';};FCKToolbarStyleCombo.prototype=new FCKToolbarSpecialCombo;FCKToolbarStyleCombo.prototype.GetLabel=function(){return FCKLang.Style;};FCKToolbarStyleCombo.prototype.GetStyles=function(){var A={};var B=FCK.ToolbarSet.CurrentInstance.Styles.GetStyles();for (var C in B){var D=B[C];if (!D.IsCore) A[C]=D;};return A;};FCKToolbarStyleCombo.prototype.CreateItems=function(A){var B=A._Panel.Document;FCKTools.AppendStyleSheet(B,FCKConfig.ToolbarComboPreviewCSS);FCKTools.AppendStyleString(B,FCKConfig.EditorAreaStyles);B.body.className+=' ForceBaseFont';FCKConfig.ApplyBodyAttributes(B.body);var C=this.GetStyles();for (var D in C){var E=C[D];var F=E.GetType()==2?D:FCKToolbarStyleCombo_BuildPreview(E,E.Label||D);var G=A.AddItem(D,F);G.Style=E;};A.OnBeforeClick=this.StyleCombo_OnBeforeClick;};FCKToolbarStyleCombo.prototype.RefreshActiveItems=function(A){var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Elements;for (var e=0;e<D.length;e++){for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D[e],true)){A.SetLabel(F.Label||F.Name);return;}}}};A.SetLabel(this.DefaultLabel);};FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B;var C;var D;var E=FCK.ToolbarSet.CurrentInstance.Selection;if (E.GetType()=='Control'){B=E.GetSelectedElement();D=B.nodeName.toLowerCase();}else{B=E.GetBoundaryParentElement(true);C=new FCKElementPath(B);};for (var i in A.Items){var F=A.Items[i];var G=F.Style;if ((D&&G.Element==D)||(!D&&G.GetType()!=2)){F.style.display='';if ((C&&G.CheckActive(C))||(!C&&G.CheckElementRemovable(B,true))) A.SelectItem(G.Name);}else F.style.display='none';}};function FCKToolbarStyleCombo_BuildPreview(A,B){var C=A.GetType();var D=[];if (C==0) D.push('<div class="BaseFont">');var E=A.Element;if (E=='bdo') E='span';D=['<',E];var F=A._StyleDesc.Attributes;if (F){for (var G in F){D.push(' ',G,'="',A.GetFinalAttributeValue(G),'"');}};if (A._GetStyleText().length>0) D.push(' style="',A.GetFinalStyleValue(),'"');D.push('>',B,'</',E,'>');if (C==0) D.push('</div>');return D.join('');};
+var FCKToolbarFontFormatCombo=function(A,B){if (A===false) return;this.CommandName='FontFormat';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.NormalLabel='Normal';this.PanelWidth=190;this.DefaultLabel=FCKConfig.DefaultFontFormatLabel||'';};FCKToolbarFontFormatCombo.prototype=new FCKToolbarStyleCombo(false);FCKToolbarFontFormatCombo.prototype.GetLabel=function(){return FCKLang.FontFormat;};FCKToolbarFontFormatCombo.prototype.GetStyles=function(){var A={};var B=FCKLang['FontFormats'].split(';');var C={p:B[0],pre:B[1],address:B[2],h1:B[3],h2:B[4],h3:B[5],h4:B[6],h5:B[7],h6:B[8],div:B[9]||(B[0]+' (DIV)')};var D=FCKConfig.FontFormats.split(';');for (var i=0;i<D.length;i++){var E=D[i];var F=FCKStyles.GetStyle('_FCK_'+E);if (F){F.Label=C[E];A['_FCK_'+E]=F;}else alert("The FCKConfig.CoreStyles['"+E+"'] setting was not found. Please check the fckconfig.js file");};return A;};FCKToolbarFontFormatCombo.prototype.RefreshActiveItems=function(A){var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Block;if (D){for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D)){A.SetLabel(F.Label);return;}}}};A.SetLabel(this.DefaultLabel);};FCKToolbarFontFormatCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Block;for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D)){A.SelectItem(E);return;}}}};
+var FCKToolbarFontsCombo=function(A,B){this.CommandName='FontName';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultFontLabel||'';};FCKToolbarFontsCombo.prototype=new FCKToolbarFontFormatCombo(false);FCKToolbarFontsCombo.prototype.GetLabel=function(){return FCKLang.Font;};FCKToolbarFontsCombo.prototype.GetStyles=function(){var A=FCKStyles.GetStyle('_FCK_FontFace');if (!A){alert("The FCKConfig.CoreStyles['Size'] setting was not found. Please check the fckconfig.js file");return {};};var B={};var C=FCKConfig.FontNames.split(';');for (var i=0;i<C.length;i++){var D=C[i].split('/');var E=D[0];var F=D[1]||E;var G=FCKTools.CloneObject(A);G.SetVariable('Font',E);G.Label=F;B[F]=G;};return B;};FCKToolbarFontsCombo.prototype.RefreshActiveItems=FCKToolbarStyleCombo.prototype.RefreshActiveItems;FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B=FCKSelection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);for (var i in A.Items){var D=A.Items[i];var E=D.Style;if (E.CheckActive(C)){A.SelectItem(D);return;}}}};
+var FCKToolbarFontSizeCombo=function(A,B){this.CommandName='FontSize';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultFontSizeLabel||'';this.FieldWidth=70;};FCKToolbarFontSizeCombo.prototype=new FCKToolbarFontFormatCombo(false);FCKToolbarFontSizeCombo.prototype.GetLabel=function(){return FCKLang.FontSize;};FCKToolbarFontSizeCombo.prototype.GetStyles=function(){var A=FCKStyles.GetStyle('_FCK_Size');if (!A){alert("The FCKConfig.CoreStyles['FontFace'] setting was not found. Please check the fckconfig.js file");return {};};var B={};var C=FCKConfig.FontSizes.split(';');for (var i=0;i<C.length;i++){var D=C[i].split('/');var E=D[0];var F=D[1]||E;var G=FCKTools.CloneObject(A);G.SetVariable('Size',E);G.Label=F;B[F]=G;};return B;};FCKToolbarFontSizeCombo.prototype.RefreshActiveItems=FCKToolbarStyleCombo.prototype.RefreshActiveItems;FCKToolbarFontSizeCombo.prototype.StyleCombo_OnBeforeClick=FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick;
+var FCKToolbarPanelButton=function(A,B,C,D,E){this.CommandName=A;var F;if (E==null) F=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(E)=='number') F=[FCKConfig.SkinPath+'fck_strip.gif',16,E];var G=this._UIButton=new FCKToolbarButtonUI(A,B,C,F,D);G._FCKToolbarPanelButton=this;G.ShowArrow=true;G.OnClick=FCKToolbarPanelButton_OnButtonClick;};FCKToolbarPanelButton.prototype.TypeName='FCKToolbarPanelButton';FCKToolbarPanelButton.prototype.Create=function(A){A.className+='Menu';this._UIButton.Create(A);var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName)._Panel;this.RegisterPanel(B);};FCKToolbarPanelButton.prototype.RegisterPanel=function(A){if (A._FCKToolbarPanelButton) return;A._FCKToolbarPanelButton=this;var B=A.Document.body.appendChild(A.Document.createElement('div'));B.style.position='absolute';B.style.top='0px';var C=A._FCKToolbarPanelButtonLineDiv=B.appendChild(A.Document.createElement('IMG'));C.className='TB_ConnectionLine';C.style.position='absolute';C.src=FCK_SPACER_PATH;A.OnHide=FCKToolbarPanelButton_OnPanelHide;};function FCKToolbarPanelButton_OnButtonClick(A){var B=this._FCKToolbarPanelButton;var e=B._UIButton.MainElement;B._UIButton.ChangeState(1);var C=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(B.CommandName);var D=C._Panel;D._FCKToolbarPanelButtonLineDiv.style.width=(e.offsetWidth-2)+'px';C.Execute(0,e.offsetHeight-1,e);};function FCKToolbarPanelButton_OnPanelHide(){var A=this._FCKToolbarPanelButton;A._UIButton.ChangeState(0);};FCKToolbarPanelButton.prototype.RefreshState=FCKToolbarButton.prototype.RefreshState;FCKToolbarPanelButton.prototype.Enable=FCKToolbarButton.prototype.Enable;FCKToolbarPanelButton.prototype.Disable=FCKToolbarButton.prototype.Disable;
+var FCKToolbarItems={};FCKToolbarItems.LoadedItems={};FCKToolbarItems.RegisterItem=function(A,B){this.LoadedItems[A]=B;};FCKToolbarItems.GetItem=function(A){var B=FCKToolbarItems.LoadedItems[A];if (B) return B;switch (A){case 'Source':B=new FCKToolbarButton('Source',FCKLang.Source,null,2,true,true,1);break;case 'DocProps':B=new FCKToolbarButton('DocProps',FCKLang.DocProps,null,null,null,null,2);break;case 'Save':B=new FCKToolbarButton('Save',FCKLang.Save,null,null,true,null,3);break;case 'NewPage':B=new FCKToolbarButton('NewPage',FCKLang.NewPage,null,null,true,null,4);break;case 'Preview':B=new FCKToolbarButton('Preview',FCKLang.Preview,null,null,true,null,5);break;case 'Templates':B=new FCKToolbarButton('Templates',FCKLang.Templates,null,null,null,null,6);break;case 'About':B=new FCKToolbarButton('About',FCKLang.About,null,null,true,null,47);break;case 'Cut':B=new FCKToolbarButton('Cut',FCKLang.Cut,null,null,false,true,7);break;case 'Copy':B=new FCKToolbarButton('Copy',FCKLang.Copy,null,null,false,true,8);break;case 'Paste':B=new FCKToolbarButton('Paste',FCKLang.Paste,null,null,false,true,9);break;case 'PasteText':B=new FCKToolbarButton('PasteText',FCKLang.PasteText,null,null,false,true,10);break;case 'PasteWord':B=new FCKToolbarButton('PasteWord',FCKLang.PasteWord,null,null,false,true,11);break;case 'Print':B=new FCKToolbarButton('Print',FCKLang.Print,null,null,false,true,12);break;case 'SpellCheck':B=new FCKToolbarButton('SpellCheck',FCKLang.SpellCheck,null,null,null,null,13);break;case 'Undo':B=new FCKToolbarButton('Undo',FCKLang.Undo,null,null,false,true,14);break;case 'Redo':B=new FCKToolbarButton('Redo',FCKLang.Redo,null,null,false,true,15);break;case 'SelectAll':B=new FCKToolbarButton('SelectAll',FCKLang.SelectAll,null,null,true,null,18);break;case 'RemoveFormat':B=new FCKToolbarButton('RemoveFormat',FCKLang.RemoveFormat,null,null,false,true,19);break;case 'FitWindow':B=new FCKToolbarButton('FitWindow',FCKLang.FitWindow,null,null,true,true,66);break;case 'Bold':B=new FCKToolbarButton('Bold',FCKLang.Bold,null,null,false,true,20);break;case 'Italic':B=new FCKToolbarButton('Italic',FCKLang.Italic,null,null,false,true,21);break;case 'Underline':B=new FCKToolbarButton('Underline',FCKLang.Underline,null,null,false,true,22);break;case 'StrikeThrough':B=new FCKToolbarButton('StrikeThrough',FCKLang.StrikeThrough,null,null,false,true,23);break;case 'Subscript':B=new FCKToolbarButton('Subscript',FCKLang.Subscript,null,null,false,true,24);break;case 'Superscript':B=new FCKToolbarButton('Superscript',FCKLang.Superscript,null,null,false,true,25);break;case 'OrderedList':B=new FCKToolbarButton('InsertOrderedList',FCKLang.NumberedListLbl,FCKLang.NumberedList,null,false,true,26);break;case 'UnorderedList':B=new FCKToolbarButton('InsertUnorderedList',FCKLang.BulletedListLbl,FCKLang.BulletedList,null,false,true,27);break;case 'Outdent':B=new FCKToolbarButton('Outdent',FCKLang.DecreaseIndent,null,null,false,true,28);break;case 'Indent':B=new FCKToolbarButton('Indent',FCKLang.IncreaseIndent,null,null,false,true,29);break;case 'Blockquote':B=new FCKToolbarButton('Blockquote',FCKLang.Blockquote,null,null,false,true,73);break;case 'CreateDiv':B=new FCKToolbarButton('CreateDiv',FCKLang.CreateDiv,null,null,false,true,74);break;case 'Link':B=new FCKToolbarButton('Link',FCKLang.InsertLinkLbl,FCKLang.InsertLink,null,false,true,34);break;case 'Unlink':B=new FCKToolbarButton('Unlink',FCKLang.RemoveLink,null,null,false,true,35);break;case 'Anchor':B=new FCKToolbarButton('Anchor',FCKLang.Anchor,null,null,null,null,36);break;case 'Image':B=new FCKToolbarButton('Image',FCKLang.InsertImageLbl,FCKLang.InsertImage,null,false,true,37);break;case 'Flash':B=new FCKToolbarButton('Flash',FCKLang.InsertFlashLbl,FCKLang.InsertFlash,null,false,true,38);break;case 'Table':B=new FCKToolbarButton('Table',FCKLang.InsertTableLbl,FCKLang.InsertTable,null,false,true,39);break;case 'SpecialChar':B=new FCKToolbarButton('SpecialChar',FCKLang.InsertSpecialCharLbl,FCKLang.InsertSpecialChar,null,false,true,42);break;case 'Smiley':B=new FCKToolbarButton('Smiley',FCKLang.InsertSmileyLbl,FCKLang.InsertSmiley,null,false,true,41);break;case 'PageBreak':B=new FCKToolbarButton('PageBreak',FCKLang.PageBreakLbl,FCKLang.PageBreak,null,false,true,43);break;case 'Rule':B=new FCKToolbarButton('Rule',FCKLang.InsertLineLbl,FCKLang.InsertLine,null,false,true,40);break;case 'JustifyLeft':B=new FCKToolbarButton('JustifyLeft',FCKLang.LeftJustify,null,null,false,true,30);break;case 'JustifyCenter':B=new FCKToolbarButton('JustifyCenter',FCKLang.CenterJustify,null,null,false,true,31);break;case 'JustifyRight':B=new FCKToolbarButton('JustifyRight',FCKLang.RightJustify,null,null,false,true,32);break;case 'JustifyFull':B=new FCKToolbarButton('JustifyFull',FCKLang.BlockJustify,null,null,false,true,33);break;case 'Style':B=new FCKToolbarStyleCombo();break;case 'FontName':B=new FCKToolbarFontsCombo();break;case 'FontSize':B=new FCKToolbarFontSizeCombo();break;case 'FontFormat':B=new FCKToolbarFontFormatCombo();break;case 'TextColor':B=new FCKToolbarPanelButton('TextColor',FCKLang.TextColor,null,null,45);break;case 'BGColor':B=new FCKToolbarPanelButton('BGColor',FCKLang.BGColor,null,null,46);break;case 'Find':B=new FCKToolbarButton('Find',FCKLang.Find,null,null,null,null,16);break;case 'Replace':B=new FCKToolbarButton('Replace',FCKLang.Replace,null,null,null,null,17);break;case 'Form':B=new FCKToolbarButton('Form',FCKLang.Form,null,null,null,null,48);break;case 'Checkbox':B=new FCKToolbarButton('Checkbox',FCKLang.Checkbox,null,null,null,null,49);break;case 'Radio':B=new FCKToolbarButton('Radio',FCKLang.RadioButton,null,null,null,null,50);break;case 'TextField':B=new FCKToolbarButton('TextField',FCKLang.TextField,null,null,null,null,51);break;case 'Textarea':B=new FCKToolbarButton('Textarea',FCKLang.Textarea,null,null,null,null,52);break;case 'HiddenField':B=new FCKToolbarButton('HiddenField',FCKLang.HiddenField,null,null,null,null,56);break;case 'Button':B=new FCKToolbarButton('Button',FCKLang.Button,null,null,null,null,54);break;case 'Select':B=new FCKToolbarButton('Select',FCKLang.SelectionField,null,null,null,null,53);break;case 'ImageButton':B=new FCKToolbarButton('ImageButton',FCKLang.ImageButton,null,null,null,null,55);break;case 'ShowBlocks':B=new FCKToolbarButton('ShowBlocks',FCKLang.ShowBlocks,null,null,null,true,72);break;default:alert(FCKLang.UnknownToolbarItem.replace(/%1/g,A));return null;};FCKToolbarItems.LoadedItems[A]=B;return B;};
+var FCKToolbar=function(){this.Items=[];};FCKToolbar.prototype.AddItem=function(A){return this.Items[this.Items.length]=A;};FCKToolbar.prototype.AddButton=function(A,B,C,D,E,F){if (typeof(D)=='number') D=[this.DefaultIconsStrip,this.DefaultIconSize,D];var G=new FCKToolbarButtonUI(A,B,C,D,E,F);G._FCKToolbar=this;G.OnClick=FCKToolbar_OnItemClick;return this.AddItem(G);};function FCKToolbar_OnItemClick(A){var B=A._FCKToolbar;if (B.OnItemClick) B.OnItemClick(B,A);};FCKToolbar.prototype.AddSeparator=function(){this.AddItem(new FCKToolbarSeparator());};FCKToolbar.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var e=B.createElement('table');e.className='TB_Toolbar';e.style.styleFloat=e.style.cssFloat=(FCKLang.Dir=='ltr'?'left':'right');e.dir=FCKLang.Dir;e.cellPadding=0;e.cellSpacing=0;var C=e.insertRow(-1);var D;if (!this.HideStart){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_Start';};for (var i=0;i<this.Items.length;i++){this.Items[i].Create(C.insertCell(-1));};if (!this.HideEnd){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_End';};A.appendChild(e);};var FCKToolbarSeparator=function(){};FCKToolbarSeparator.prototype.Create=function(A){FCKTools.AppendElement(A,'div').className='TB_Separator';};
+var FCKToolbarBreak=function(){};FCKToolbarBreak.prototype.Create=function(A){var B=A.ownerDocument.createElement('div');B.style.clear=B.style.cssFloat=FCKLang.Dir=='rtl'?'right':'left';A.appendChild(B);};
+function FCKToolbarSet_Create(A){var B;var C=A||FCKConfig.ToolbarLocation;switch (C){case 'In':document.getElementById('xToolbarRow').style.display='';B=new FCKToolbarSet(document);break;case 'None':B=new FCKToolbarSet(document);break;default:FCK.Events.AttachEvent('OnBlur',FCK_OnBlur);FCK.Events.AttachEvent('OnFocus',FCK_OnFocus);var D;var E=C.match(/^Out:(.+)\((\w+)\)$/);if (E){if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_GetOutElement(window,E);else D=eval('parent.'+E[1]).document.getElementById(E[2]);}else{E=C.match(/^Out:(\w+)$/);if (E) D=parent.document.getElementById(E[1]);};if (!D){alert('Invalid value for "ToolbarLocation"');return arguments.callee('In');};B=D.__FCKToolbarSet;if (B) break;var F=FCKTools.GetElementDocument(D).createElement('iframe');F.src='javascript:void(0)';F.frameBorder=0;F.width='100%';F.height='10';D.appendChild(F);F.unselectable='on';var G=F.contentWindow.document;var H='';if (FCKBrowserInfo.IsSafari) H='<base href="'+window.document.location+'">';G.open();G.write('<html><head>'+H+'<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = window.onload = function(){var timer = null;var lastHeight = -1;var lastChange = 0;var poller = function(){var currentHeight = document.body.scrollHeight || 0;var currentTime = (new Date()).getTime();if (currentHeight != lastHeight){lastChange = currentTime;adjust();lastHeight = document.body.scrollHeight;}if (lastChange < currentTime - 1000) clearInterval(timer);};timer = setInterval(poller, 100);}</script></head><body style="overflow: hidden">'+document.getElementById('xToolbarSpace').innerHTML+'</body></html>');G.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_InitOutFrame(G);FCKTools.AddEventListener(G,'contextmenu',FCKTools.CancelEvent);FCKTools.AppendStyleSheet(G,FCKConfig.SkinEditorCSS);B=D.__FCKToolbarSet=new FCKToolbarSet(G);B._IFrame=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(D,FCKToolbarSet_Target_Cleanup);};B.CurrentInstance=FCK;if (!B.ToolbarItems) B.ToolbarItems=FCKToolbarItems;FCK.AttachToOnSelectionChange(B.RefreshItemsState);return B;};function FCK_OnBlur(A){var B=A.ToolbarSet;if (B.CurrentInstance==A) B.Disable();};function FCK_OnFocus(A){var B=A.ToolbarSet;var C=A||FCK;B.CurrentInstance.FocusManager.RemoveWindow(B._IFrame.contentWindow);B.CurrentInstance=C;C.FocusManager.AddWindow(B._IFrame.contentWindow,true);B.Enable();};function FCKToolbarSet_Cleanup(){this._TargetElement=null;this._IFrame=null;};function FCKToolbarSet_Target_Cleanup(){this.__FCKToolbarSet=null;};var FCKToolbarSet=function(A){this._Document=A;this._TargetElement=A.getElementById('xToolbar');var B=A.getElementById('xExpandHandle');var C=A.getElementById('xCollapseHandle');B.title=FCKLang.ToolbarExpand;FCKTools.AddEventListener(B,'click',FCKToolbarSet_Expand_OnClick);C.title=FCKLang.ToolbarCollapse;FCKTools.AddEventListener(C,'click',FCKToolbarSet_Collapse_OnClick);if (!FCKConfig.ToolbarCanCollapse||FCKConfig.ToolbarStartExpanded) this.Expand();else this.Collapse();C.style.display=FCKConfig.ToolbarCanCollapse?'':'none';if (FCKConfig.ToolbarCanCollapse) C.style.display='';else A.getElementById('xTBLeftBorder').style.display='';this.Toolbars=[];this.IsLoaded=false;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarSet_Cleanup);};function FCKToolbarSet_Expand_OnClick(){FCK.ToolbarSet.Expand();};function FCKToolbarSet_Collapse_OnClick(){FCK.ToolbarSet.Collapse();};FCKToolbarSet.prototype.Expand=function(){this._ChangeVisibility(false);};FCKToolbarSet.prototype.Collapse=function(){this._ChangeVisibility(true);};FCKToolbarSet.prototype._ChangeVisibility=function(A){this._Document.getElementById('xCollapsed').style.display=A?'':'none';this._Document.getElementById('xExpanded').style.display=A?'none':'';if (FCKBrowserInfo.IsGecko){FCKTools.RunFunction(window.onresize);}};FCKToolbarSet.prototype.Load=function(A){this.Name=A;this.Items=[];this.ItemsWysiwygOnly=[];this.ItemsContextSensitive=[];this._TargetElement.innerHTML='';var B=FCKConfig.ToolbarSets[A];if (!B){alert(FCKLang.UnknownToolbarSet.replace(/%1/g,A));return;};this.Toolbars=[];for (var x=0;x<B.length;x++){var C=B[x];if (!C) continue;var D;if (typeof(C)=='string'){if (C=='/') D=new FCKToolbarBreak();}else{D=new FCKToolbar();for (var j=0;j<C.length;j++){var E=C[j];if (E=='-') D.AddSeparator();else{var F=FCKToolbarItems.GetItem(E);if (F){D.AddItem(F);this.Items.push(F);if (!F.SourceView) this.ItemsWysiwygOnly.push(F);if (F.ContextSensitive) this.ItemsContextSensitive.push(F);}}}};D.Create(this._TargetElement);this.Toolbars[this.Toolbars.length]=D;};FCKTools.DisableSelection(this._Document.getElementById('xCollapseHandle').parentNode);if (FCK.Status!=2) FCK.Events.AttachEvent('OnStatusChange',this.RefreshModeState);else this.RefreshModeState();this.IsLoaded=true;this.IsEnabled=true;FCKTools.RunFunction(this.OnLoad);};FCKToolbarSet.prototype.Enable=function(){if (this.IsEnabled) return;this.IsEnabled=true;var A=this.Items;for (var i=0;i<A.length;i++) A[i].RefreshState();};FCKToolbarSet.prototype.Disable=function(){if (!this.IsEnabled) return;this.IsEnabled=false;var A=this.Items;for (var i=0;i<A.length;i++) A[i].Disable();};FCKToolbarSet.prototype.RefreshModeState=function(A){if (FCK.Status!=2) return;var B=A?A.ToolbarSet:this;var C=B.ItemsWysiwygOnly;if (FCK.EditMode==0){for (var i=0;i<C.length;i++) C[i].Enable();B.RefreshItemsState(A);}else{B.RefreshItemsState(A);for (var j=0;j<C.length;j++) C[j].Disable();}};FCKToolbarSet.prototype.RefreshItemsState=function(A){var B=(A?A.ToolbarSet:this).ItemsContextSensitive;for (var i=0;i<B.length;i++) B[i].RefreshState();};
+var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save();var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
+var FCKMenuItem=function(A,B,C,D,E,F){this.Name=B;this.Label=C||B;this.IsDisabled=E;this.Icon=new FCKIcon(D);this.SubMenu=new FCKMenuBlockPanel();this.SubMenu.Parent=A;this.SubMenu.OnClick=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnClick,this);this.CustomData=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuItem_Cleanup);};FCKMenuItem.prototype.AddItem=function(A,B,C,D,E){this.HasSubMenu=true;return this.SubMenu.AddItem(A,B,C,D,E);};FCKMenuItem.prototype.AddSeparator=function(){this.SubMenu.AddSeparator();};FCKMenuItem.prototype.Create=function(A){var B=this.HasSubMenu;var C=FCKTools.GetElementDocument(A);var r=this.MainElement=A.insertRow(-1);r.className=this.IsDisabled?'MN_Item_Disabled':'MN_Item';if (!this.IsDisabled){FCKTools.AddEventListenerEx(r,'mouseover',FCKMenuItem_OnMouseOver,[this]);FCKTools.AddEventListenerEx(r,'click',FCKMenuItem_OnClick,[this]);if (!B) FCKTools.AddEventListenerEx(r,'mouseout',FCKMenuItem_OnMouseOut,[this]);};var D=r.insertCell(-1);D.className='MN_Icon';D.appendChild(this.Icon.CreateIconElement(C));D=r.insertCell(-1);D.className='MN_Label';D.noWrap=true;D.appendChild(C.createTextNode(this.Label));D=r.insertCell(-1);if (B){D.className='MN_Arrow';var E=D.appendChild(C.createElement('IMG'));E.src=FCK_IMAGES_PATH+'arrow_'+FCKLang.Dir+'.gif';E.width=4;E.height=7;this.SubMenu.Create();this.SubMenu.Panel.OnHide=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnHide,this);}};FCKMenuItem.prototype.Activate=function(){this.MainElement.className='MN_Item_Over';if (this.HasSubMenu){this.SubMenu.Show(this.MainElement.offsetWidth+2,-2,this.MainElement);};FCKTools.RunFunction(this.OnActivate,this);};FCKMenuItem.prototype.Deactivate=function(){this.MainElement.className='MN_Item';if (this.HasSubMenu) this.SubMenu.Hide();};function FCKMenuItem_SubMenu_OnClick(A,B){FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuItem_SubMenu_OnHide(A){A.Deactivate();};function FCKMenuItem_OnClick(A,B){if (B.HasSubMenu) B.Activate();else{B.Deactivate();FCKTools.RunFunction(B.OnClick,B,[B]);}};function FCKMenuItem_OnMouseOver(A,B){B.Activate();};function FCKMenuItem_OnMouseOut(A,B){B.Deactivate();};function FCKMenuItem_Cleanup(){this.MainElement=null;};
+var FCKMenuBlock=function(){this._Items=[];};FCKMenuBlock.prototype.Count=function(){return this._Items.length;};FCKMenuBlock.prototype.AddItem=function(A,B,C,D,E){var F=new FCKMenuItem(this,A,B,C,D,E);F.OnClick=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnClick,this);F.OnActivate=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnActivate,this);this._Items.push(F);return F;};FCKMenuBlock.prototype.AddSeparator=function(){this._Items.push(new FCKMenuSeparator());};FCKMenuBlock.prototype.RemoveAllItems=function(){this._Items=[];var A=this._ItemsTable;if (A){while (A.rows.length>0) A.deleteRow(0);}};FCKMenuBlock.prototype.Create=function(A){if (!this._ItemsTable){if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuBlock_Cleanup);this._Window=FCKTools.GetElementWindow(A);var B=FCKTools.GetElementDocument(A);var C=A.appendChild(B.createElement('table'));C.cellPadding=0;C.cellSpacing=0;FCKTools.DisableSelection(C);var D=C.insertRow(-1).insertCell(-1);D.className='MN_Menu';var E=this._ItemsTable=D.appendChild(B.createElement('table'));E.cellPadding=0;E.cellSpacing=0;};for (var i=0;i<this._Items.length;i++) this._Items[i].Create(this._ItemsTable);};function FCKMenuBlock_Item_OnClick(A,B){if (B.Hide) B.Hide();FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuBlock_Item_OnActivate(A){var B=A._ActiveItem;if (B&&B!=this){if (!FCKBrowserInfo.IsIE&&B.HasSubMenu&&!this.HasSubMenu){A._Window.focus();A.Panel.HasFocus=true;};B.Deactivate();};A._ActiveItem=this;};function FCKMenuBlock_Cleanup(){this._Window=null;this._ItemsTable=null;};var FCKMenuSeparator=function(){};FCKMenuSeparator.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var r=A.insertRow(-1);var C=r.insertCell(-1);C.className='MN_Separator MN_Icon';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';};
+var FCKMenuBlockPanel=function(){FCKMenuBlock.call(this);};FCKMenuBlockPanel.prototype=new FCKMenuBlock();FCKMenuBlockPanel.prototype.Create=function(){var A=this.Panel=(this.Parent&&this.Parent.Panel?this.Parent.Panel.CreateChildPanel():new FCKPanel());A.AppendStyleSheet(FCKConfig.SkinEditorCSS);FCKMenuBlock.prototype.Create.call(this,A.MainNode);};FCKMenuBlockPanel.prototype.Show=function(x,y,A){if (!this.Panel.CheckIsOpened()) this.Panel.Show(x,y,A);};FCKMenuBlockPanel.prototype.Hide=function(){if (this.Panel.CheckIsOpened()) this.Panel.Hide();};
+var FCKContextMenu=function(A,B){this.CtrlDisable=false;var C=this._Panel=new FCKPanel(A);C.AppendStyleSheet(FCKConfig.SkinEditorCSS);C.IsContextMenu=true;if (FCKBrowserInfo.IsGecko) C.Document.addEventListener('draggesture',function(e) {e.preventDefault();return false;},true);var D=this._MenuBlock=new FCKMenuBlock();D.Panel=C;D.OnClick=FCKTools.CreateEventListener(FCKContextMenu_MenuBlock_OnClick,this);this._Redraw=true;};FCKContextMenu.prototype.SetMouseClickWindow=function(A){if (!FCKBrowserInfo.IsIE){this._Document=A.document;if (FCKBrowserInfo.IsOpera&&!('oncontextmenu' in document.createElement('foo'))){this._Document.addEventListener('mousedown',FCKContextMenu_Document_OnMouseDown,false);this._Document.addEventListener('mouseup',FCKContextMenu_Document_OnMouseUp,false);};this._Document.addEventListener('contextmenu',FCKContextMenu_Document_OnContextMenu,false);}};FCKContextMenu.prototype.AddItem=function(A,B,C,D,E){var F=this._MenuBlock.AddItem(A,B,C,D,E);this._Redraw=true;return F;};FCKContextMenu.prototype.AddSeparator=function(){this._MenuBlock.AddSeparator();this._Redraw=true;};FCKContextMenu.prototype.RemoveAllItems=function(){this._MenuBlock.RemoveAllItems();this._Redraw=true;};FCKContextMenu.prototype.AttachToElement=function(A){if (FCKBrowserInfo.IsIE) FCKTools.AddEventListenerEx(A,'contextmenu',FCKContextMenu_AttachedElement_OnContextMenu,this);else A._FCKContextMenu=this;};function FCKContextMenu_Document_OnContextMenu(e){if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;FCKTools.CancelEvent(e);FCKContextMenu_AttachedElement_OnContextMenu(e,A._FCKContextMenu,A);return false;};A=A.parentNode;};return true;};var FCKContextMenu_OverrideButton;function FCKContextMenu_Document_OnMouseDown(e){if(!e||e.button!=2) return false;if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;var B=FCKContextMenu_OverrideButton;if(!B){var C=FCKTools.GetElementDocument(e.target);B=FCKContextMenu_OverrideButton=C.createElement('input');B.type='button';var D=C.createElement('p');C.body.appendChild(D);D.appendChild(B);};B.style.cssText='position:absolute;top:'+(e.clientY-2)+'px;left:'+(e.clientX-2)+'px;width:5px;height:5px;opacity:0.01';};A=A.parentNode;};return false;};function FCKContextMenu_Document_OnMouseUp(e){if (FCKConfig.BrowserContextMenu) return true;var A=FCKContextMenu_OverrideButton;if (A){var B=A.parentNode;B.parentNode.removeChild(B);FCKContextMenu_OverrideButton=undefined;if(e&&e.button==2){FCKContextMenu_Document_OnContextMenu(e);return false;}};return true;};function FCKContextMenu_AttachedElement_OnContextMenu(A,B,C){if ((B.CtrlDisable&&(A.ctrlKey||A.metaKey))||FCKConfig.BrowserContextMenu) return true;var D=C||this;if (B.OnBeforeOpen) B.OnBeforeOpen.call(B,D);if (B._MenuBlock.Count()==0) return false;if (B._Redraw){B._MenuBlock.Create(B._Panel.MainNode);B._Redraw=false;};FCKTools.DisableSelection(B._Panel.Document.body);var x=0;var y=0;if (FCKBrowserInfo.IsIE){x=A.screenX;y=A.screenY;}else if (FCKBrowserInfo.IsSafari){x=A.clientX;y=A.clientY;}else{x=A.pageX;y=A.pageY;};B._Panel.Show(x,y,A.currentTarget||null);return false;};function FCKContextMenu_MenuBlock_OnClick(A,B){B._Panel.Hide();FCKTools.RunFunction(B.OnItemClick,B,A);};
+FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
+var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};
+var FCKPlugin=function(A,B,C){this.Name=A;this.BasePath=C?C:FCKConfig.PluginsPath;this.Path=this.BasePath+A+'/';if (!B||B.length==0) this.AvailableLangs=[];else this.AvailableLangs=B.split(',');};FCKPlugin.prototype.Load=function(){if (this.AvailableLangs.length>0){var A;if (this.AvailableLangs.IndexOf(FCKLanguageManager.ActiveLanguage.Code)>=0) A=FCKLanguageManager.ActiveLanguage.Code;else A=this.AvailableLangs[0];LoadScript(this.Path+'lang/'+A+'.js');};LoadScript(this.Path+'fckplugin.js');};
+var FCKPlugins=FCK.Plugins={};FCKPlugins.ItemsCount=0;FCKPlugins.Items={};FCKPlugins.Load=function(){var A=FCKPlugins.Items;for (var i=0;i<FCKConfig.Plugins.Items.length;i++){var B=FCKConfig.Plugins.Items[i];var C=A[B[0]]=new FCKPlugin(B[0],B[1],B[2]);FCKPlugins.ItemsCount++;};for (var s in A) A[s].Load();FCKPlugins.Load=null;};
diff --git a/modules/editor/skins/fckeditor/editor/js/fckeditorcode_ie.js b/modules/editor/skins/fckeditor/editor/js/fckeditorcode_ie.js
new file mode 100644
index 000000000..d66ca5573
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/js/fckeditorcode_ie.js
@@ -0,0 +1,109 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This file has been compressed for better performance. The original source
+ * can be found at "editor/_source".
+ */
+
+var FCK_STATUS_NOTLOADED=window.parent.FCK_STATUS_NOTLOADED=0;var FCK_STATUS_ACTIVE=window.parent.FCK_STATUS_ACTIVE=1;var FCK_STATUS_COMPLETE=window.parent.FCK_STATUS_COMPLETE=2;var FCK_TRISTATE_OFF=window.parent.FCK_TRISTATE_OFF=0;var FCK_TRISTATE_ON=window.parent.FCK_TRISTATE_ON=1;var FCK_TRISTATE_DISABLED=window.parent.FCK_TRISTATE_DISABLED=-1;var FCK_UNKNOWN=window.parent.FCK_UNKNOWN=-9;var FCK_TOOLBARITEM_ONLYICON=window.parent.FCK_TOOLBARITEM_ONLYICON=0;var FCK_TOOLBARITEM_ONLYTEXT=window.parent.FCK_TOOLBARITEM_ONLYTEXT=1;var FCK_TOOLBARITEM_ICONTEXT=window.parent.FCK_TOOLBARITEM_ICONTEXT=2;var FCK_EDITMODE_WYSIWYG=window.parent.FCK_EDITMODE_WYSIWYG=0;var FCK_EDITMODE_SOURCE=window.parent.FCK_EDITMODE_SOURCE=1;var FCK_IMAGES_PATH='images/';var FCK_SPACER_PATH='images/spacer.gif';var CTRL=1000;var SHIFT=2000;var ALT=4000;var FCK_STYLE_BLOCK=0;var FCK_STYLE_INLINE=1;var FCK_STYLE_OBJECT=2;
+String.prototype.Contains=function(A){return (this.indexOf(A)>-1);};String.prototype.Equals=function(){var A=arguments;if (A.length==1&&A[0].pop) A=A[0];for (var i=0;i<A.length;i++){if (this==A[i]) return true;};return false;};String.prototype.IEquals=function(){var A=this.toUpperCase();var B=arguments;if (B.length==1&&B[0].pop) B=B[0];for (var i=0;i<B.length;i++){if (A==B[i].toUpperCase()) return true;};return false;};String.prototype.ReplaceAll=function(A,B){var C=this;for (var i=0;i<A.length;i++){C=C.replace(A[i],B[i]);};return C;};String.prototype.StartsWith=function(A){return (this.substr(0,A.length)==A);};String.prototype.EndsWith=function(A,B){var C=this.length;var D=A.length;if (D>C) return false;if (B){var E=new RegExp(A+'$','i');return E.test(this);}else return (D==0||this.substr(C-D,D)==A);};String.prototype.Remove=function(A,B){var s='';if (A>0) s=this.substring(0,A);if (A+B<this.length) s+=this.substring(A+B,this.length);return s;};String.prototype.Trim=function(){return this.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g,'');};String.prototype.LTrim=function(){return this.replace(/^[ \t\n\r]*/g,'');};String.prototype.RTrim=function(){return this.replace(/[ \t\n\r]*$/g,'');};String.prototype.ReplaceNewLineChars=function(A){return this.replace(/\n/g,A);};String.prototype.Replace=function(A,B,C){if (typeof B=='function'){return this.replace(A,function(){return B.apply(C||this,arguments);});}else return this.replace(A,B);};Array.prototype.AddItem=function(A){var i=this.length;this[i]=A;return i;};Array.prototype.IndexOf=function(A){for (var i=0;i<this.length;i++){if (this[i]==A) return i;};return-1;};
+var	FCKIECleanup=function(A){if (A._FCKCleanupObj) this.Items=A._FCKCleanupObj.Items;else{this.Items=[];A._FCKCleanupObj=this;FCKTools.AddEventListenerEx(A,'unload',FCKIECleanup_Cleanup);}};FCKIECleanup.prototype.AddItem=function(A,B){this.Items.push([A,B]);};function FCKIECleanup_Cleanup(){if (!this._FCKCleanupObj||(FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag)) return;var A=this._FCKCleanupObj.Items;while (A.length>0){var B=A.pop();if (B) B[1].call(B[0]);};this._FCKCleanupObj=null;if (CollectGarbage) CollectGarbage();};
+var s=navigator.userAgent.toLowerCase();var FCKBrowserInfo={IsIE:/*@cc_on!@*/false,IsIE7:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=7),IsIE6:/*@cc_on!@*/false&&(parseInt(s.match(/msie (\d+)/)[1],10)>=6),IsSafari:s.Contains(' applewebkit/'),IsOpera:!!window.opera,IsAIR:s.Contains(' adobeair/'),IsMac:s.Contains('macintosh')};(function(A){A.IsGecko=(navigator.product=='Gecko')&&!A.IsSafari&&!A.IsOpera;A.IsGeckoLike=(A.IsGecko||A.IsSafari||A.IsOpera);if (A.IsGecko){var B=s.match(/rv:(\d+\.\d+)/);var C=B&&parseFloat(B[1]);if (C){A.IsGecko10=(C<1.8);A.IsGecko19=(C>1.8);}}})(FCKBrowserInfo);
+var FCKURLParams={};(function(){var A=document.location.search.substr(1).split('&');for (var i=0;i<A.length;i++){var B=A[i].split('=');var C=decodeURIComponent(B[0]);var D=decodeURIComponent(B[1]);FCKURLParams[C]=D;}})();
+var FCKEvents=function(A){this.Owner=A;this._RegisteredEvents={};};FCKEvents.prototype.AttachEvent=function(A,B){var C;if (!(C=this._RegisteredEvents[A])) this._RegisteredEvents[A]=[B];else{if (C.IndexOf(B)==-1) C.push(B);}};FCKEvents.prototype.FireEvent=function(A,B){var C=true;var D=this._RegisteredEvents[A];if (D){for (var i=0;i<D.length;i++){try{C=(D[i](this.Owner,B)&&C);}catch(e){if (e.number!=-2146823277) throw e;}}};return C;};
+var FCKDataProcessor=function(){};FCKDataProcessor.prototype={ConvertToHtml:function(A){if (FCKConfig.FullPage){FCK.DocTypeDeclaration=A.match(FCKRegexLib.DocTypeTag);if (!FCKRegexLib.HasBodyTag.test(A)) A='<body>'+A+'</body>';if (!FCKRegexLib.HtmlOpener.test(A)) A='<html dir="'+FCKConfig.ContentLangDirection+'">'+A+'</html>';if (!FCKRegexLib.HeadOpener.test(A)) A=A.replace(FCKRegexLib.HtmlOpener,'$&<head><title></title></head>');return A;}else{var B=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"';if (FCKBrowserInfo.IsIE&&FCKConfig.DocType.length>0&&!FCKRegexLib.Html4DocType.test(FCKConfig.DocType)) B+=' style="overflow-y: scroll"';B+='><head><title></title></head><body'+FCKConfig.GetBodyAttributes()+'>'+A+'</body></html>';return B;}},ConvertToDataFormat:function(A,B,C,D){var E=FCKXHtml.GetXHTML(A,!B,D);if (C&&FCKRegexLib.EmptyOutParagraph.test(E)) return '';return E;},FixHtml:function(A){return A;}};
+var FCK={Name:FCKURLParams['InstanceName'],Status:0,EditMode:0,Toolbar:null,HasFocus:false,DataProcessor:new FCKDataProcessor(),GetInstanceObject:(function(){var w=window;return function(name){return w[name];}})(),AttachToOnSelectionChange:function(A){this.Events.AttachEvent('OnSelectionChange',A);},GetLinkedFieldValue:function(){return this.LinkedField.value;},GetParentForm:function(){return this.LinkedField.form;},StartupValue:'',IsDirty:function(){if (this.EditMode==1) return (this.StartupValue!=this.EditingArea.Textarea.value);else{if (!this.EditorDocument) return false;return (this.StartupValue!=this.EditorDocument.body.innerHTML);}},ResetIsDirty:function(){if (this.EditMode==1) this.StartupValue=this.EditingArea.Textarea.value;else if (this.EditorDocument.body) this.StartupValue=this.EditorDocument.body.innerHTML;},StartEditor:function(){this.TempBaseTag=FCKConfig.BaseHref.length>0?'<base href="'+FCKConfig.BaseHref+'" _fcktemp="true"></base>':'';var A=FCK.KeystrokeHandler=new FCKKeystrokeHandler();A.OnKeystroke=_FCK_KeystrokeHandler_OnKeystroke;A.SetKeystrokes(FCKConfig.Keystrokes);if (FCKBrowserInfo.IsIE7){if ((CTRL+86) in A.Keystrokes) A.SetKeystrokes([CTRL+86,true]);if ((SHIFT+45) in A.Keystrokes) A.SetKeystrokes([SHIFT+45,true]);};A.SetKeystrokes([CTRL+8,true]);this.EditingArea=new FCKEditingArea(document.getElementById('xEditingArea'));this.EditingArea.FFSpellChecker=FCKConfig.FirefoxSpellChecker;this.SetData(this.GetLinkedFieldValue(),true);FCKTools.AddEventListener(document,"keydown",this._TabKeyHandler);this.AttachToOnSelectionChange(_FCK_PaddingNodeListener);if (FCKBrowserInfo.IsGecko) this.AttachToOnSelectionChange(this._ExecCheckEmptyBlock);},Focus:function(){FCK.EditingArea.Focus();},SetStatus:function(A){this.Status=A;if (A==1){FCKFocusManager.AddWindow(window,true);if (FCKBrowserInfo.IsIE) FCKFocusManager.AddWindow(window.frameElement,true);if (FCKConfig.StartupFocus) FCK.Focus();};this.Events.FireEvent('OnStatusChange',A);},FixBody:function(){var A=FCKConfig.EnterMode;if (A!='p'&&A!='div') return;var B=this.EditorDocument;if (!B) return;var C=B.body;if (!C) return;FCKDomTools.TrimNode(C);var D=C.firstChild;var E;while (D){var F=false;switch (D.nodeType){case 1:var G=D.nodeName.toLowerCase();if (!FCKListsLib.BlockElements[G]&&G!='li'&&!D.getAttribute('_fckfakelement')&&D.getAttribute('_moz_dirty')==null) F=true;break;case 3:if (E||D.nodeValue.Trim().length>0) F=true;break;case 8:if (E) F=true;break;};if (F){var H=D.parentNode;if (!E) E=H.insertBefore(B.createElement(A),D);E.appendChild(H.removeChild(D));D=E.nextSibling;}else{if (E){FCKDomTools.TrimNode(E);E=null;};D=D.nextSibling;}};if (E) FCKDomTools.TrimNode(E);},GetData:function(A){if (FCK.EditMode==1) return FCK.EditingArea.Textarea.value;this.FixBody();var B=FCK.EditorDocument;if (!B) return null;var C=FCKConfig.FullPage;var D=FCK.DataProcessor.ConvertToDataFormat(C?B.documentElement:B.body,!C,FCKConfig.IgnoreEmptyParagraphValue,A);D=FCK.ProtectEventsRestore(D);if (FCKBrowserInfo.IsIE) D=D.replace(FCKRegexLib.ToReplace,'$1');if (C){if (FCK.DocTypeDeclaration&&FCK.DocTypeDeclaration.length>0) D=FCK.DocTypeDeclaration+'\n'+D;if (FCK.XmlDeclaration&&FCK.XmlDeclaration.length>0) D=FCK.XmlDeclaration+'\n'+D;};return FCKConfig.ProtectedSource.Revert(D);},UpdateLinkedField:function(){var A=FCK.GetXHTML(FCKConfig.FormatOutput);if (FCKConfig.HtmlEncodeOutput) A=FCKTools.HTMLEncode(A);FCK.LinkedField.value=A;FCK.Events.FireEvent('OnAfterLinkedFieldUpdate');},RegisteredDoubleClickHandlers:{},OnDoubleClick:function(A){var B=FCK.RegisteredDoubleClickHandlers[A.tagName.toUpperCase()];if (B){for (var i=0;i<B.length;i++) B[i](A);};B=FCK.RegisteredDoubleClickHandlers['*'];if (B){for (var i=0;i<B.length;i++) B[i](A);}},RegisterDoubleClickHandler:function(A,B){var C=B||'*';C=C.toUpperCase();var D;if (!(D=FCK.RegisteredDoubleClickHandlers[C])) FCK.RegisteredDoubleClickHandlers[C]=[A];else{if (D.IndexOf(A)==-1) D.push(A);}},OnAfterSetHTML:function(){FCKDocumentProcessor.Process(FCK.EditorDocument);FCKUndo.SaveUndoStep();FCK.Events.FireEvent('OnSelectionChange');FCK.Events.FireEvent('OnAfterSetHTML');},ProtectUrls:function(A){A=A.replace(FCKRegexLib.ProtectUrlsA,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsImg,'$& _fcksavedurl=$1');A=A.replace(FCKRegexLib.ProtectUrlsArea,'$& _fcksavedurl=$1');return A;},ProtectEvents:function(A){return A.replace(FCKRegexLib.TagsWithEvent,_FCK_ProtectEvents_ReplaceTags);},ProtectEventsRestore:function(A){return A.replace(FCKRegexLib.ProtectedEvents,_FCK_ProtectEvents_RestoreEvents);},ProtectTags:function(A){var B=FCKConfig.ProtectedTags;if (FCKBrowserInfo.IsIE) B+=B.length>0?'|ABBR|XML|EMBED|OBJECT':'ABBR|XML|EMBED|OBJECT';var C;if (B.length>0){C=new RegExp('<('+B+')(?!\w|:)','gi');A=A.replace(C,'<FCK:$1');C=new RegExp('<\/('+B+')>','gi');A=A.replace(C,'<\/FCK:$1>');};B='META';if (FCKBrowserInfo.IsIE) B+='|HR';C=new RegExp('<(('+B+')(?=\\s|>|/)[\\s\\S]*?)/?>','gi');A=A.replace(C,'<FCK:$1 />');return A;},SetData:function(A,B){this.EditingArea.Mode=FCK.EditMode;if (FCKBrowserInfo.IsIE&&FCK.EditorDocument){FCK.EditorDocument.detachEvent("onselectionchange",Doc_OnSelectionChange);};FCKTempBin.Reset();if (FCK.EditMode==0){this._ForceResetIsDirty=(B===true);A=FCKConfig.ProtectedSource.Protect(A);A=FCK.DataProcessor.ConvertToHtml(A);A=A.replace(FCKRegexLib.InvalidSelfCloseTags,'$1></$2>');A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);if (FCK.TempBaseTag.length>0&&!FCKRegexLib.HasBaseTag.test(A)) A=A.replace(FCKRegexLib.HeadOpener,'$&'+FCK.TempBaseTag);var C='';if (!FCKConfig.FullPage) C+=_FCK_GetEditorAreaStyleTags();if (FCKBrowserInfo.IsIE) C+=FCK._GetBehaviorsStyle();else if (FCKConfig.ShowBorders) C+=FCKTools.GetStyleHtml(FCK_ShowTableBordersCSS,true);C+=FCKTools.GetStyleHtml(FCK_InternalCSS,true);A=A.replace(FCKRegexLib.HeadCloser,C+'$&');this.EditingArea.OnLoad=_FCK_EditingArea_OnLoad;this.EditingArea.Start(A);}else{FCK.EditorWindow=null;FCK.EditorDocument=null;FCKDomTools.PaddingNode=null;this.EditingArea.OnLoad=null;this.EditingArea.Start(A);this.EditingArea.Textarea._FCKShowContextMenu=true;FCK.EnterKeyHandler=null;if (B) this.ResetIsDirty();FCK.KeystrokeHandler.AttachToElement(this.EditingArea.Textarea);this.EditingArea.Textarea.focus();FCK.Events.FireEvent('OnAfterSetHTML');};if (FCKBrowserInfo.IsGecko) window.onresize();},RedirectNamedCommands:{},ExecuteNamedCommand:function(A,B,C,D){if (!D) FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};if (!D) FCKUndo.SaveUndoStep();},GetNamedCommandState:function(A){try{if (FCKBrowserInfo.IsSafari&&FCK.EditorWindow&&A.IEquals('Paste')) return 0;if (!FCK.EditorDocument.queryCommandEnabled(A)) return -1;else{return FCK.EditorDocument.queryCommandState(A)?1:0;}}catch (e){return 0;}},GetNamedCommandValue:function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==-1) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';},Paste:function(A){if (FCK.Status!=2||!FCK.Events.FireEvent('OnPaste')) return false;return A||FCK._ExecPaste();},PasteFromWord:function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');},Preview:function(){var A;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) A=FCK.TempBaseTag+FCK.GetXHTML();else A=FCK.GetXHTML();}else{A=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'"><head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+_FCK_GetEditorAreaStyleTags()+'</head><body'+FCKConfig.GetBodyAttributes()+'>'+FCK.GetXHTML()+'</body></html>';};var B=FCKConfig.ScreenWidth*0.8;var C=FCKConfig.ScreenHeight*0.7;var D=(FCKConfig.ScreenWidth-B)/2;var E='';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A;E='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.opener._FCKHtmlToLoad );document.close() ;window.opener._FCKHtmlToLoad = null ;})() )';};var F=window.open(E,null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+B+',height='+C+',left='+D);if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){F.document.write(A);F.document.close();}},SwitchEditMode:function(A){var B=(FCK.EditMode==0);var C=FCK.IsDirty();var D;if (B){FCKCommands.GetCommand('ShowBlocks').SaveState();if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();D=FCK.GetXHTML(FCKConfig.FormatSource);if (FCKBrowserInfo.IsIE) FCKTempBin.ToHtml();if (D==null) return false;}else D=this.EditingArea.Textarea.value;FCK.EditMode=B?1:0;FCK.SetData(D,!C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);return true;},InsertElement:function(A){if (typeof A=='string') A=this.EditorDocument.createElement(A);var B=A.nodeName.toLowerCase();FCKSelection.Restore();var C=new FCKDomRange(this.EditorWindow);C.MoveToSelection();C.DeleteContents();if (FCKListsLib.BlockElements[B]!=null){if (C.StartBlock){if (C.CheckStartOfBlock()) C.MoveToPosition(C.StartBlock,3);else if (C.CheckEndOfBlock()) C.MoveToPosition(C.StartBlock,4);else C.SplitBlock();};C.InsertNode(A);var D=FCKDomTools.GetNextSourceElement(A,false,null,['hr','br','param','img','area','input'],true);if (!D&&FCKConfig.EnterMode!='br'){D=this.EditorDocument.body.appendChild(this.EditorDocument.createElement(FCKConfig.EnterMode));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);};if (FCKListsLib.EmptyElements[B]==null) C.MoveToElementEditStart(A);else if (D) C.MoveToElementEditStart(D);else C.MoveToPosition(A,4);if (FCKBrowserInfo.IsGeckoLike){if (D) FCKDomTools.ScrollIntoView(D,false);FCKDomTools.ScrollIntoView(A,false);}}else{C.InsertNode(A);C.SetStart(A,4);C.SetEnd(A,4);};C.Select();C.Release();this.Focus();return A;},_InsertBlockElement:function(A){},_IsFunctionKey:function(A){if (A>=16&&A<=20) return true;if (A==27||(A>=33&&A<=40)) return true;if (A==45) return true;return false;},_KeyDownListener:function(A){if (!A) A=FCK.EditorWindow.event;if (FCK.EditorWindow){if (!FCK._IsFunctionKey(A.keyCode)&&!(A.ctrlKey||A.metaKey)&&!(A.keyCode==46)) FCK._KeyDownUndo();};return true;},_KeyDownUndo:function(){if (!FCKUndo.Typing){FCKUndo.SaveUndoStep();FCKUndo.Typing=true;FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.TypesCount++;FCKUndo.Changed=1;if (FCKUndo.TypesCount>FCKUndo.MaxTypes){FCKUndo.TypesCount=0;FCKUndo.SaveUndoStep();}},_TabKeyHandler:function(A){if (!A) A=window.event;var B=A.keyCode;if (B==9&&FCK.EditMode!=0){if (FCKBrowserInfo.IsIE){var C=document.selection.createRange();if (C.parentElement()!=FCK.EditingArea.Textarea) return true;C.text='\t';C.select();}else{var a=[];var D=FCK.EditingArea.Textarea;var E=D.selectionStart;var F=D.selectionEnd;a.push(D.value.substr(0,E));a.push('\t');a.push(D.value.substr(F));D.value=a.join('');D.setSelectionRange(E+1,E+1);};if (A.preventDefault) return A.preventDefault();return A.returnValue=false;};return true;}};FCK.Events=new FCKEvents(FCK);FCK.GetHTML=FCK.GetXHTML=FCK.GetData;FCK.SetHTML=FCK.SetData;FCK.InsertElementAndGetIt=FCK.CreateElement=FCK.InsertElement;function _FCK_ProtectEvents_ReplaceTags(A){return A.replace(FCKRegexLib.EventAttributes,_FCK_ProtectEvents_ReplaceEvents);};function _FCK_ProtectEvents_ReplaceEvents(A,B){return ' '+B+'_fckprotectedatt="'+encodeURIComponent(A)+'"';};function _FCK_ProtectEvents_RestoreEvents(A,B){return decodeURIComponent(B);};function _FCK_MouseEventsListener(A){if (!A) A=window.event;if (A.type=='mousedown') FCK.MouseDownFlag=true;else if (A.type=='mouseup') FCK.MouseDownFlag=false;else if (A.type=='mousemove') FCK.Events.FireEvent('OnMouseMove',A);};function _FCK_PaddingNodeListener(){if (FCKConfig.EnterMode.IEquals('br')) return;FCKDomTools.EnforcePaddingNode(FCK.EditorDocument,FCKConfig.EnterMode);if (!FCKBrowserInfo.IsIE&&FCKDomTools.PaddingNode){var A=FCKSelection.GetSelection();if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.collapsed&&B.startContainer==FCK.EditorDocument.body&&B.startOffset==0){B.selectNodeContents(FCKDomTools.PaddingNode);B.collapse(true);A.removeAllRanges();A.addRange(B);}}}else if (FCKDomTools.PaddingNode){var C=FCKSelection.GetParentElement();var D=FCKDomTools.PaddingNode;if (C&&C.nodeName.IEquals('body')){if (FCK.EditorDocument.body.childNodes.length==1&&FCK.EditorDocument.body.firstChild==D){if (FCKSelection._GetSelectionDocument(FCK.EditorDocument.selection)!=FCK.EditorDocument) return;var B=FCK.EditorDocument.body.createTextRange();var F=false;if (!D.childNodes.firstChild){D.appendChild(FCKTools.GetElementDocument(D).createTextNode('\ufeff'));F=true;};B.moveToElementText(D);B.select();if (F) B.pasteHTML('');}}}};function _FCK_EditingArea_OnLoad(){FCK.EditorWindow=FCK.EditingArea.Window;FCK.EditorDocument=FCK.EditingArea.Document;if (FCKBrowserInfo.IsIE) FCKTempBin.ToElements();FCK.InitializeBehaviors();FCK.MouseDownFlag=false;FCKTools.AddEventListener(FCK.EditorDocument,'mousemove',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',_FCK_MouseEventsListener);FCKTools.AddEventListener(FCK.EditorDocument,'mouseup',_FCK_MouseEventsListener);if (FCKBrowserInfo.IsSafari){var A=function(evt){if (!(evt.ctrlKey||evt.metaKey)) return;if (FCK.EditMode!=0) return;switch (evt.keyCode){case 89:FCKUndo.Redo();break;case 90:FCKUndo.Undo();break;}};FCKTools.AddEventListener(FCK.EditorDocument,'keyup',A);};FCK.EnterKeyHandler=new FCKEnterKey(FCK.EditorWindow,FCKConfig.EnterMode,FCKConfig.ShiftEnterMode,FCKConfig.TabSpaces);FCK.KeystrokeHandler.AttachToElement(FCK.EditorDocument);if (FCK._ForceResetIsDirty) FCK.ResetIsDirty();if (FCKBrowserInfo.IsIE&&FCK.HasFocus) FCK.EditorDocument.body.setActive();FCK.OnAfterSetHTML();FCKCommands.GetCommand('ShowBlocks').RestoreState();if (FCK.Status!=0) return;FCK.SetStatus(1);};function _FCK_GetEditorAreaStyleTags(){return FCKTools.GetStyleHtml(FCKConfig.EditorAreaCSS)+FCKTools.GetStyleHtml(FCKConfig.EditorAreaStyles);};function _FCK_KeystrokeHandler_OnKeystroke(A,B){if (FCK.Status!=2) return false;if (FCK.EditMode==0){switch (B){case 'Paste':return!FCK.Paste();case 'Cut':FCKUndo.SaveUndoStep();return false;}}else{if (B.Equals('Paste','Undo','Redo','SelectAll','Cut')) return false;};var C=FCK.Commands.GetCommand(B);if (C.GetState()==-1) return false;return (C.Execute.apply(C,FCKTools.ArgumentsToArray(arguments,2))!==false);};(function(){var A=window.parent.document;var B=A.getElementById(FCK.Name);var i=0;while (B||i==0){if (B&&B.tagName.toLowerCase().Equals('input','textarea')){FCK.LinkedField=B;break;};B=A.getElementsByName(FCK.Name)[i++];}})();var FCKTempBin={Elements:[],AddElement:function(A){var B=this.Elements.length;this.Elements[B]=A;return B;},RemoveElement:function(A){var e=this.Elements[A];this.Elements[A]=null;return e;},Reset:function(){var i=0;while (i<this.Elements.length) this.Elements[i++]=null;this.Elements.length=0;},ToHtml:function(){for (var i=0;i<this.Elements.length;i++){this.Elements[i]='<div>&nbsp;'+this.Elements[i].outerHTML+'</div>';this.Elements[i].isHtml=true;}},ToElements:function(){var A=FCK.EditorDocument.createElement('div');for (var i=0;i<this.Elements.length;i++){if (this.Elements[i].isHtml){A.innerHTML=this.Elements[i];this.Elements[i]=A.firstChild.removeChild(A.firstChild.lastChild);}}}};var FCKFocusManager=FCK.FocusManager={IsLocked:false,AddWindow:function(A,B){var C;if (FCKBrowserInfo.IsIE) C=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else if (FCKBrowserInfo.IsSafari) C=A;else C=A.document;FCKTools.AddEventListener(C,'blur',FCKFocusManager_Win_OnBlur);FCKTools.AddEventListener(C,'focus',B?FCKFocusManager_Win_OnFocus_Area:FCKFocusManager_Win_OnFocus);},RemoveWindow:function(A){if (FCKBrowserInfo.IsIE) oTarget=A.nodeType==1?A:A.frameElement?A.frameElement:A.document;else oTarget=A.document;FCKTools.RemoveEventListener(oTarget,'blur',FCKFocusManager_Win_OnBlur);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus_Area);FCKTools.RemoveEventListener(oTarget,'focus',FCKFocusManager_Win_OnFocus);},Lock:function(){this.IsLocked=true;},Unlock:function(){if (this._HasPendingBlur) FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);this.IsLocked=false;},_ResetTimer:function(){this._HasPendingBlur=false;if (this._Timer){window.clearTimeout(this._Timer);delete this._Timer;}}};function FCKFocusManager_Win_OnBlur(){if (typeof(FCK)!='undefined'&&FCK.HasFocus){FCKFocusManager._ResetTimer();FCKFocusManager._Timer=window.setTimeout(FCKFocusManager_FireOnBlur,100);}};function FCKFocusManager_FireOnBlur(){if (FCKFocusManager.IsLocked) FCKFocusManager._HasPendingBlur=true;else{FCK.HasFocus=false;FCK.Events.FireEvent("OnBlur");}};function FCKFocusManager_Win_OnFocus_Area(){if (FCKFocusManager._IsFocusing) return;FCKFocusManager._IsFocusing=true;FCK.Focus();FCKFocusManager_Win_OnFocus();FCKTools.RunFunction(function(){delete FCKFocusManager._IsFocusing;});};function FCKFocusManager_Win_OnFocus(){FCKFocusManager._ResetTimer();if (!FCK.HasFocus&&!FCKFocusManager.IsLocked){FCK.HasFocus=true;FCK.Events.FireEvent("OnFocus");}};(function(){var A=window.frameElement;var B=A.width;var C=A.height;if (/^\d+$/.test(B)) B+='px';if (/^\d+$/.test(C)) C+='px';var D=A.style;D.border=D.padding=D.margin=0;D.backgroundColor='transparent';D.backgroundImage='none';D.width=B;D.height=C;})();
+FCK.Description="FCKeditor for Internet Explorer 5.5+";FCK._GetBehaviorsStyle=function(){if (!FCK._BehaviorsStyle){var A=FCKConfig.BasePath;var B='';var C;C='<style type="text/css" _fcktemp="true">';if (FCKConfig.ShowBorders) B='url('+A+'css/behaviors/showtableborders.htc)';C+='INPUT,TEXTAREA,SELECT,.FCK__Anchor,.FCK__PageBreak,.FCK__InputHidden';if (FCKConfig.DisableObjectResizing){C+=',IMG';B+=' url('+A+'css/behaviors/disablehandles.htc)';};C+=' { behavior: url('+A+'css/behaviors/disablehandles.htc) ; }';if (B.length>0) C+='TABLE { behavior: '+B+' ; }';C+='</style>';FCK._BehaviorsStyle=C;};return FCK._BehaviorsStyle;};function Doc_OnMouseUp(){if (FCK.EditorWindow.event.srcElement.tagName=='HTML'){FCK.Focus();FCK.EditorWindow.event.cancelBubble=true;FCK.EditorWindow.event.returnValue=false;}};function Doc_OnPaste(){var A=FCK.EditorDocument.body;A.detachEvent('onpaste',Doc_OnPaste);var B=FCK.Paste(!FCKConfig.ForcePasteAsPlainText&&!FCKConfig.AutoDetectPasteFromWord);A.attachEvent('onpaste',Doc_OnPaste);return B;};function Doc_OnDblClick(){FCK.OnDoubleClick(FCK.EditorWindow.event.srcElement);FCK.EditorWindow.event.cancelBubble=true;};function Doc_OnSelectionChange(){if (!FCK.IsSelectionChangeLocked&&FCK.EditorDocument) FCK.Events.FireEvent("OnSelectionChange");};function Doc_OnDrop(){if (FCK.MouseDownFlag){FCK.MouseDownFlag=false;return;};if (FCKConfig.ForcePasteAsPlainText){var A=FCK.EditorWindow.event;if (FCK._CheckIsPastingEnabled()||FCKConfig.ShowDropDialog) FCK.PasteAsPlainText(A.dataTransfer.getData('Text'));A.returnValue=false;A.cancelBubble=true;}};FCK.InitializeBehaviors=function(A){this.EditorDocument.attachEvent('onmouseup',Doc_OnMouseUp);this.EditorDocument.body.attachEvent('onpaste',Doc_OnPaste);this.EditorDocument.body.attachEvent('ondrop',Doc_OnDrop);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument.body);this.EditorDocument.attachEvent("onkeydown",FCK._KeyDownListener);this.EditorDocument.attachEvent("ondblclick",Doc_OnDblClick);this.EditorDocument.attachEvent("onbeforedeactivate",function(){ FCKSelection.Save(true);});this.EditorDocument.attachEvent("onselectionchange",Doc_OnSelectionChange);FCKTools.AddEventListener(FCK.EditorDocument,'mousedown',Doc_OnMouseDown);};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectEvents(A);A=FCK.ProtectUrls(A);A=FCK.ProtectTags(A);FCKSelection.Restore();FCK.EditorWindow.focus();FCKUndo.SaveUndoStep();var B=FCKSelection.GetSelection();if (B.type.toLowerCase()=='control') B.clear();A='<span id="__fakeFCKRemove__" style="display:none;">fakeFCKRemove</span>'+A;B.createRange().pasteHTML(A);FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode(true);FCKDocumentProcessor.Process(FCK.EditorDocument);this.Events.FireEvent("OnSelectionChange");};FCK.SetInnerHtml=function(A){var B=FCK.EditorDocument;B.body.innerHTML='<div id="__fakeFCKRemove__">&nbsp;</div>'+A;B.getElementById('__fakeFCKRemove__').removeNode(true);};function FCK_PreloadImages(){var A=new FCKImagePreloader();A.AddImages(FCKConfig.PreloadImages);A.AddImages(FCKConfig.SkinPath+'fck_strip.gif');A.OnComplete=LoadToolbarSetup;A.Start();};function Document_OnContextMenu(){return (event.srcElement._FCKShowContextMenu==true);};document.oncontextmenu=Document_OnContextMenu;function FCK_Cleanup(){this.LinkedField=null;this.EditorWindow=null;this.EditorDocument=null;};FCK._ExecPaste=function(){if (FCK._PasteIsRunning) return true;if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;};var A=FCK._CheckIsPastingEnabled(true);if (A===false) FCKTools.RunFunction(FCKDialog.OpenDialog,FCKDialog,['FCKDialog_Paste',FCKLang.Paste,'dialog/fck_paste.html',400,330,'Security']);else{if (FCKConfig.AutoDetectPasteFromWord&&A.length>0){var B=/<\w[^>]*(( class="?MsoNormal"?)|(="mso-))/gi;if (B.test(A)){if (confirm(FCKLang.PasteWordConfirm)){FCK.PasteFromWord();return false;}}};FCK._PasteIsRunning=true;FCK.ExecuteNamedCommand('Paste');delete FCK._PasteIsRunning;};return false;};FCK.PasteAsPlainText=function(A){if (!FCK._CheckIsPastingEnabled()){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');return;};var B=null;if (!A) B=clipboardData.getData("Text");else B=A;if (B&&B.length>0){B=FCKTools.HTMLEncode(B);B=FCKTools.ProcessLineBreaks(window,FCKConfig,B);var C=B.search('</p>');var D=B.search('<p>');if ((C!=-1&&D!=-1&&C<D)||(C!=-1&&D==-1)){var E=B.substr(0,C);B=B.substr(C+4);this.InsertHtml(E);};FCKUndo.SaveLocked=true;this.InsertHtml(B);FCKUndo.SaveLocked=false;}};FCK._CheckIsPastingEnabled=function(A){FCK._PasteIsEnabled=false;document.body.attachEvent('onpaste',FCK_CheckPasting_Listener);var B=FCK.GetClipboardHTML();document.body.detachEvent('onpaste',FCK_CheckPasting_Listener);if (FCK._PasteIsEnabled){if (!A) B=true;}else B=false;delete FCK._PasteIsEnabled;return B;};function FCK_CheckPasting_Listener(){FCK._PasteIsEnabled=true;};FCK.GetClipboardHTML=function(){var A=document.getElementById('___FCKHiddenDiv');if (!A){A=document.createElement('DIV');A.id='___FCKHiddenDiv';var B=A.style;B.position='absolute';B.visibility=B.overflow='hidden';B.width=B.height=1;document.body.appendChild(A);};A.innerHTML='';var C=document.body.createTextRange();C.moveToElementText(A);C.execCommand('Paste');var D=A.innerHTML;A.innerHTML='';return D;};FCK.CreateLink=function(A,B){var C=[];FCK.ExecuteNamedCommand('Unlink',null,false,!!B);if (A.length>0){if (FCKSelection.GetType()=='Control'){var D=this.EditorDocument.createElement('A');D.href=A;var E=FCKSelection.GetSelectedElement();E.parentNode.insertBefore(D,E);E.parentNode.removeChild(E);D.appendChild(E);return [D];};var F='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',F,false,!!B);var G=this.EditorDocument.links;for (i=0;i<G.length;i++){var D=G[i];if (D.getAttribute('href',2)==F){var I=D.innerHTML;D.href=A;D.innerHTML=I;var J=D.lastChild;if (J&&J.nodeName=='BR'){FCKDomTools.InsertAfterNode(D,D.removeChild(J));};C.push(D);}}};return C;};function _FCK_RemoveDisabledAtt(){this.removeAttribute('disabled');};function Doc_OnMouseDown(A){var e=A.srcElement;if (e.nodeName.IEquals('input')&&e.type.IEquals(['radio','checkbox'])&&!e.disabled){e.disabled=true;FCKTools.SetTimeout(_FCK_RemoveDisabledAtt,1,e);}};
+var FCKConfig=FCK.Config={};if (document.location.protocol=='file:'){FCKConfig.BasePath=decodeURIComponent(document.location.pathname.substr(1));FCKConfig.BasePath=FCKConfig.BasePath.replace(/\\/gi,'/');var sFullProtocol=document.location.href.match(/^(file\:\/{2,3})/)[1];if (FCKBrowserInfo.IsOpera) sFullProtocol+='localhost/';FCKConfig.BasePath=sFullProtocol+FCKConfig.BasePath.substring(0,FCKConfig.BasePath.lastIndexOf('/')+1);}else FCKConfig.BasePath=document.location.protocol+'//'+document.location.host+document.location.pathname.substring(0,document.location.pathname.lastIndexOf('/')+1);FCKConfig.FullBasePath=FCKConfig.BasePath;FCKConfig.EditorPath=FCKConfig.BasePath.replace(/editor\/$/,'');try{FCKConfig.ScreenWidth=screen.width;FCKConfig.ScreenHeight=screen.height;}catch (e){FCKConfig.ScreenWidth=800;FCKConfig.ScreenHeight=600;};FCKConfig.ProcessHiddenField=function(){this.PageConfig={};var A=window.parent.document.getElementById(FCK.Name+'___Config');if (!A) return;var B=A.value.split('&');for (var i=0;i<B.length;i++){if (B[i].length==0) continue;var C=B[i].split('=');var D=decodeURIComponent(C[0]);var E=decodeURIComponent(C[1]);if (D=='CustomConfigurationsPath') FCKConfig[D]=E;else if (E.toLowerCase()=="true") this.PageConfig[D]=true;else if (E.toLowerCase()=="false") this.PageConfig[D]=false;else if (E.length>0&&!isNaN(E)) this.PageConfig[D]=parseInt(E,10);else this.PageConfig[D]=E;}};function FCKConfig_LoadPageConfig(){var A=FCKConfig.PageConfig;for (var B in A) FCKConfig[B]=A[B];};function FCKConfig_PreProcess(){var A=FCKConfig;if (A.AllowQueryStringDebug){try{if ((/fckdebug=true/i).test(window.top.location.search)) A.Debug=true;}catch (e) {  }};if (!A.PluginsPath.EndsWith('/')) A.PluginsPath+='/';var B=A.ToolbarComboPreviewCSS;if (!B||B.length==0) A.ToolbarComboPreviewCSS=A.EditorAreaCSS;A.RemoveAttributesArray=(A.RemoveAttributes||'').split(',');if (!FCKConfig.SkinEditorCSS||FCKConfig.SkinEditorCSS.length==0) FCKConfig.SkinEditorCSS=FCKConfig.SkinPath+'fck_editor.css';if (!FCKConfig.SkinDialogCSS||FCKConfig.SkinDialogCSS.length==0) FCKConfig.SkinDialogCSS=FCKConfig.SkinPath+'fck_dialog.css';};FCKConfig.ToolbarSets={};FCKConfig.Plugins={};FCKConfig.Plugins.Items=[];FCKConfig.Plugins.Add=function(A,B,C){FCKConfig.Plugins.Items.AddItem([A,B,C]);};FCKConfig.ProtectedSource={};FCKConfig.ProtectedSource._CodeTag=(new Date()).valueOf();FCKConfig.ProtectedSource.RegexEntries=[/<!--[\s\S]*?-->/g,/<script[\s\S]*?<\/script>/gi,/<noscript[\s\S]*?<\/noscript>/gi];FCKConfig.ProtectedSource.Add=function(A){this.RegexEntries.AddItem(A);};FCKConfig.ProtectedSource.Protect=function(A){var B=this._CodeTag;function _Replace(protectedSource){var C=FCKTempBin.AddElement(protectedSource);return '<!--{'+B+C+'}-->';};for (var i=0;i<this.RegexEntries.length;i++){A=A.replace(this.RegexEntries[i],_Replace);};return A;};FCKConfig.ProtectedSource.Revert=function(A,B){function _Replace(m,opener,index){var C=B?FCKTempBin.RemoveElement(index):FCKTempBin.Elements[index];return FCKConfig.ProtectedSource.Revert(C,B);};var D=new RegExp("(<|&lt;)!--\\{"+this._CodeTag+"(\\d+)\\}--(>|&gt;)","g");return A.replace(D,_Replace);};FCKConfig.GetBodyAttributes=function(){var A='';if (this.BodyId&&this.BodyId.length>0) A+=' id="'+this.BodyId+'"';if (this.BodyClass&&this.BodyClass.length>0) A+=' class="'+this.BodyClass+'"';return A;};FCKConfig.ApplyBodyAttributes=function(A){if (this.BodyId&&this.BodyId.length>0) A.id=FCKConfig.BodyId;if (this.BodyClass&&this.BodyClass.length>0) A.className+=' '+FCKConfig.BodyClass;};
+var FCKDebug={Output:function(){},OutputObject:function(){}};
+var FCKDomTools={MoveChildren:function(A,B,C){if (A==B) return;var D;if (C){while ((D=A.lastChild)) B.insertBefore(A.removeChild(D),B.firstChild);}else{while ((D=A.firstChild)) B.appendChild(A.removeChild(D));}},MoveNode:function(A,B,C){if (C) B.insertBefore(FCKDomTools.RemoveNode(A),B.firstChild);else B.appendChild(FCKDomTools.RemoveNode(A));},TrimNode:function(A){this.LTrimNode(A);this.RTrimNode(A);},LTrimNode:function(A){var B;while ((B=A.firstChild)){if (B.nodeType==3){var C=B.nodeValue.LTrim();var D=B.nodeValue.length;if (C.length==0){A.removeChild(B);continue;}else if (C.length<D){B.splitText(D-C.length);A.removeChild(A.firstChild);}};break;}},RTrimNode:function(A){var B;while ((B=A.lastChild)){if (B.nodeType==3){var C=B.nodeValue.RTrim();var D=B.nodeValue.length;if (C.length==0){B.parentNode.removeChild(B);continue;}else if (C.length<D){B.splitText(C.length);A.lastChild.parentNode.removeChild(A.lastChild);}};break;};if (!FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsOpera){B=A.lastChild;if (B&&B.nodeType==1&&B.nodeName.toLowerCase()=='br'){B.parentNode.removeChild(B);}}},RemoveNode:function(A,B){if (B){var C;while ((C=A.firstChild)) A.parentNode.insertBefore(A.removeChild(C),A);};return A.parentNode.removeChild(A);},GetFirstChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.firstChild;while(C){if (C.nodeType==1&&C.tagName.Equals.apply(C.tagName,B)) return C;C=C.nextSibling;};return null;},GetLastChild:function(A,B){if (typeof (B)=='string') B=[B];var C=A.lastChild;while(C){if (C.nodeType==1&&(!B||C.tagName.Equals(B))) return C;C=C.previousSibling;};return null;},GetPreviousSourceElement:function(A,B,C,D){if (!A) return null;if (C&&A.nodeType==1&&A.nodeName.IEquals(C)) return null;if (A.previousSibling) A=A.previousSibling;else return this.GetPreviousSourceElement(A.parentNode,B,C,D);while (A){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (!D||!A.nodeName.IEquals(D)) return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;if (A.lastChild) A=A.lastChild;else return this.GetPreviousSourceElement(A,B,C,D);};return null;},GetNextSourceElement:function(A,B,C,D,E){while((A=this.GetNextSourceNode(A,E))){if (A.nodeType==1){if (C&&A.nodeName.IEquals(C)) break;if (D&&A.nodeName.IEquals(D)) return this.GetNextSourceElement(A,B,C,D);return A;}else if (B&&A.nodeType==3&&A.nodeValue.RTrim().length>0) break;};return null;},GetNextSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.firstChild) E=A.firstChild;else{if (D&&A==D) return null;E=A.nextSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetNextSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetNextSourceNode(E,false,C,D);return E;},GetPreviousSourceNode:function(A,B,C,D){if (!A) return null;var E;if (!B&&A.lastChild) E=A.lastChild;else{if (D&&A==D) return null;E=A.previousSibling;if (!E&&(!D||D!=A.parentNode)) return this.GetPreviousSourceNode(A.parentNode,true,C,D);};if (C&&E&&E.nodeType!=C) return this.GetPreviousSourceNode(E,false,C,D);return E;},InsertAfterNode:function(A,B){return A.parentNode.insertBefore(B,A.nextSibling);},GetParents:function(A){var B=[];while (A){B.unshift(A);A=A.parentNode;};return B;},GetCommonParents:function(A,B){var C=this.GetParents(A);var D=this.GetParents(B);var E=[];for (var i=0;i<C.length;i++){if (C[i]==D[i]) E.push(C[i]);};return E;},GetCommonParentNode:function(A,B,C){var D={};if (!C.pop) C=[C];while (C.length>0) D[C.pop().toLowerCase()]=1;var E=this.GetCommonParents(A,B);var F=null;while ((F=E.pop())){if (D[F.nodeName.toLowerCase()]) return F;};return null;},GetIndexOf:function(A){var B=A.parentNode?A.parentNode.firstChild:null;var C=-1;while (B){C++;if (B==A) return C;B=B.nextSibling;};return-1;},PaddingNode:null,EnforcePaddingNode:function(A,B){try{if (!A||!A.body) return;}catch (e){return;};this.CheckAndRemovePaddingNode(A,B,true);try{if (A.body.lastChild&&(A.body.lastChild.nodeType!=1||A.body.lastChild.tagName.toLowerCase()==B.toLowerCase())) return;}catch (e){return;};var C=A.createElement(B);if (FCKBrowserInfo.IsGecko&&FCKListsLib.NonEmptyBlockElements[B]) FCKTools.AppendBogusBr(C);this.PaddingNode=C;if (A.body.childNodes.length==1&&A.body.firstChild.nodeType==1&&A.body.firstChild.tagName.toLowerCase()=='br'&&(A.body.firstChild.getAttribute('_moz_dirty')!=null||A.body.firstChild.getAttribute('type')=='_moz')) A.body.replaceChild(C,A.body.firstChild);else A.body.appendChild(C);},CheckAndRemovePaddingNode:function(A,B,C){var D=this.PaddingNode;if (!D) return;try{if (D.parentNode!=A.body||D.tagName.toLowerCase()!=B||(D.childNodes.length>1)||(D.firstChild&&D.firstChild.nodeValue!='\xa0'&&String(D.firstChild.tagName).toLowerCase()!='br')){this.PaddingNode=null;return;}}catch (e){this.PaddingNode=null;return;};if (!C){if (D.parentNode.childNodes.length>1) D.parentNode.removeChild(D);this.PaddingNode=null;}},HasAttribute:function(A,B){if (A.hasAttribute) return A.hasAttribute(B);else{var C=A.attributes[B];return (C!=undefined&&C.specified);}},HasAttributes:function(A){var B=A.attributes;for (var i=0;i<B.length;i++){if (FCKBrowserInfo.IsIE&&B[i].nodeName=='class'){if (A.className.length>0) return true;}else if (B[i].specified) return true;};return false;},RemoveAttribute:function(A,B){if (FCKBrowserInfo.IsIE&&B.toLowerCase()=='class') B='className';return A.removeAttribute(B,0);},RemoveAttributes:function (A,B){for (var i=0;i<B.length;i++) this.RemoveAttribute(A,B[i]);},GetAttributeValue:function(A,B){var C=B;if (typeof B=='string') B=A.attributes[B];else C=B.nodeName;if (B&&B.specified){if (C=='style') return A.style.cssText;else if (C=='class'||C.indexOf('on')==0) return B.nodeValue;else{return A.getAttribute(C,2);}};return null;},Contains:function(A,B){if (A.contains&&B.nodeType==1) return A.contains(B);while ((B=B.parentNode)){if (B==A) return true;};return false;},BreakParent:function(A,B,C){var D=C||new FCKDomRange(FCKTools.GetElementWindow(A));D.SetStart(A,4);D.SetEnd(B,4);var E=D.ExtractContents();D.InsertNode(A.parentNode.removeChild(A));E.InsertAfterNode(A);D.Release(!!C);},GetNodeAddress:function(A,B){var C=[];while (A&&A!=FCKTools.GetElementDocument(A).documentElement){var D=A.parentNode;var E=-1;for(var i=0;i<D.childNodes.length;i++){var F=D.childNodes[i];if (B===true&&F.nodeType==3&&F.previousSibling&&F.previousSibling.nodeType==3) continue;E++;if (D.childNodes[i]==A) break;};C.unshift(E);A=A.parentNode;};return C;},GetNodeFromAddress:function(A,B,C){var D=A.documentElement;for (var i=0;i<B.length;i++){var E=B[i];if (!C){D=D.childNodes[E];continue;};var F=-1;for (var j=0;j<D.childNodes.length;j++){var G=D.childNodes[j];if (C===true&&G.nodeType==3&&G.previousSibling&&G.previousSibling.nodeType==3) continue;F++;if (F==E){D=G;break;}}};return D;},CloneElement:function(A){A=A.cloneNode(false);A.removeAttribute('id',false);return A;},ClearElementJSProperty:function(A,B){if (FCKBrowserInfo.IsIE) A.removeAttribute(B);else delete A[B];},SetElementMarker:function (A,B,C,D){var E=String(parseInt(Math.random()*0xffffffff,10));B._FCKMarkerId=E;B[C]=D;if (!A[E]) A[E]={ 'element':B,'markers':{} };A[E]['markers'][C]=D;},ClearElementMarkers:function(A,B,C){var D=B._FCKMarkerId;if (!D) return;this.ClearElementJSProperty(B,'_FCKMarkerId');for (var j in A[D]['markers']) this.ClearElementJSProperty(B,j);if (C) delete A[D];},ClearAllMarkers:function(A){for (var i in A) this.ClearElementMarkers(A,A[i]['element'],true);},ListToArray:function(A,B,C,D,E){if (!A.nodeName.IEquals(['ul','ol'])) return [];if (!D) D=0;if (!C) C=[];for (var i=0;i<A.childNodes.length;i++){var F=A.childNodes[i];if (!F.nodeName.IEquals('li')) continue;var G={ 'parent':A,'indent':D,'contents':[] };if (!E){G.grandparent=A.parentNode;if (G.grandparent&&G.grandparent.nodeName.IEquals('li')) G.grandparent=G.grandparent.parentNode;}else G.grandparent=E;if (B) this.SetElementMarker(B,F,'_FCK_ListArray_Index',C.length);C.push(G);for (var j=0;j<F.childNodes.length;j++){var H=F.childNodes[j];if (H.nodeName.IEquals(['ul','ol'])) this.ListToArray(H,B,C,D+1,G.grandparent);else G.contents.push(H);}};return C;},ArrayToList:function(A,B,C){if (C==undefined) C=0;if (!A||A.length<C+1) return null;var D=FCKTools.GetElementDocument(A[C].parent);var E=D.createDocumentFragment();var F=null;var G=C;var H=Math.max(A[C].indent,0);var I=null;while (true){var J=A[G];if (J.indent==H){if (!F||A[G].parent.nodeName!=F.nodeName){F=A[G].parent.cloneNode(false);E.appendChild(F);};I=D.createElement('li');F.appendChild(I);for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));G++;}else if (J.indent==Math.max(H,0)+1){var K=this.ArrayToList(A,null,G);I.appendChild(K.listNode);G=K.nextIndex;}else if (J.indent==-1&&C==0&&J.grandparent){var I;if (J.grandparent.nodeName.IEquals(['ul','ol'])) I=D.createElement('li');else{if (FCKConfig.EnterMode.IEquals(['div','p'])&&!J.grandparent.nodeName.IEquals('td')) I=D.createElement(FCKConfig.EnterMode);else I=D.createDocumentFragment();};for (var i=0;i<J.contents.length;i++) I.appendChild(J.contents[i].cloneNode(true));if (I.nodeType==11){if (I.lastChild&&I.lastChild.getAttribute&&I.lastChild.getAttribute('type')=='_moz') I.removeChild(I.lastChild);I.appendChild(D.createElement('br'));};if (I.nodeName.IEquals(FCKConfig.EnterMode)&&I.firstChild){this.TrimNode(I);if (FCKListsLib.BlockBoundaries[I.firstChild.nodeName.toLowerCase()]){var M=D.createDocumentFragment();while (I.firstChild) M.appendChild(I.removeChild(I.firstChild));I=M;}};if (FCKBrowserInfo.IsGeckoLike&&I.nodeName.IEquals(['div','p'])) FCKTools.AppendBogusBr(I);E.appendChild(I);F=null;G++;}else return null;if (A.length<=G||Math.max(A[G].indent,0)<H){break;}};if (B){var N=E.firstChild;while (N){if (N.nodeType==1) this.ClearElementMarkers(B,N);N=this.GetNextSourceNode(N);}};return { 'listNode':E,'nextIndex':G };},GetNextSibling:function(A,B){A=A.nextSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.nextSibling;return A;},GetPreviousSibling:function(A,B){A=A.previousSibling;while (A&&!B&&A.nodeType!=1&&(A.nodeType!=3||A.nodeValue.length==0)) A=A.previousSibling;return A;},CheckIsEmptyElement:function(A,B){var C=A.firstChild;var D;while (C){if (C.nodeType==1){if (D||!FCKListsLib.InlineNonEmptyElements[C.nodeName.toLowerCase()]) return false;if (!B||B(C)===true) D=C;}else if (C.nodeType==3&&C.nodeValue.length>0) return false;C=C.nextSibling;};return D?this.CheckIsEmptyElement(D,B):true;},SetElementStyles:function(A,B){var C=A.style;for (var D in B) C[D]=B[D];},SetOpacity:function(A,B){if (FCKBrowserInfo.IsIE){B=Math.round(B*100);A.style.filter=(B>100?'':'progid:DXImageTransform.Microsoft.Alpha(opacity='+B+')');}else A.style.opacity=B;},GetCurrentElementStyle:function(A,B){if (FCKBrowserInfo.IsIE) return A.currentStyle[B];else return A.ownerDocument.defaultView.getComputedStyle(A,'').getPropertyValue(B);},GetPositionedAncestor:function(A){var B=A;while (B!=FCKTools.GetElementDocument(B).documentElement){if (this.GetCurrentElementStyle(B,'position')!='static') return B;if (B==FCKTools.GetElementDocument(B).documentElement&&currentWindow!=w) B=currentWindow.frameElement;else B=B.parentNode;};return null;},ScrollIntoView:function(A,B){var C=FCKTools.GetElementWindow(A);var D=FCKTools.GetViewPaneSize(C).Height;var E=D*-1;if (B===false){E+=A.offsetHeight||0;E+=parseInt(this.GetCurrentElementStyle(A,'marginBottom')||0,10)||0;};var F=FCKTools.GetDocumentPosition(C,A);E+=F.y;var G=FCKTools.GetScrollPosition(C).Y;if (E>0&&(E>G||E<G-D)) C.scrollTo(0,E);},CheckIsEditable:function(A){var B=A.nodeName.toLowerCase();var C=FCK.DTD[B]||FCK.DTD.span;return (C['#']&&!FCKListsLib.NonEditableElements[B]);},GetSelectedDivContainers:function(){var A=[];var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.GetTouchedStartNode();var D=B.GetTouchedEndNode();var E=C;if (C==D){while (D.nodeType==1&&D.lastChild) D=D.lastChild;D=FCKDomTools.GetNextSourceNode(D);}while (E&&E!=D){if (E.nodeType!=3||!/^[ \t\n]*$/.test(E.nodeValue)){var F=new FCKElementPath(E);var G=F.BlockLimit;if (G&&G.nodeName.IEquals('div')&&A.IndexOf(G)==-1) A.push(G);};E=FCKDomTools.GetNextSourceNode(E);};return A;}};
+var FCKTools={};FCKTools.CreateBogusBR=function(A){var B=A.createElement('br');B.setAttribute('type','_moz');return B;};FCKTools.FixCssUrls=function(A,B){if (!A||A.length==0) return B;return B.replace(/url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g,function(match,opener,path,closer){if (/^\/|^\w?:/.test(path)) return match;else return 'url('+opener+A+path+closer+')';});};FCKTools._GetUrlFixedCss=function(A,B){var C=A.match(/^([^|]+)\|([\s\S]*)/);if (C) return FCKTools.FixCssUrls(C[1],C[2]);else return A;};FCKTools.AppendStyleSheet=function(A,B){if (!B) return [];if (typeof(B)=='string'){if (/[\\\/\.][^{}]*$/.test(B)){return this.AppendStyleSheet(A,B.split(','));}else return [this.AppendStyleString(A,FCKTools._GetUrlFixedCss(B))];}else{var C=[];for (var i=0;i<B.length;i++) C.push(this._AppendStyleSheet(A,B[i]));return C;}};FCKTools.GetStyleHtml=(function(){var A=function(styleDef,markTemp){if (styleDef.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<style type="text/css"'+B+'>'+styleDef+'</style>';};var C=function(cssFileUrl,markTemp){if (cssFileUrl.length==0) return '';var B=markTemp?' _fcktemp="true"':'';return '<link href="'+cssFileUrl+'" type="text/css" rel="stylesheet" '+B+'/>';};return function(cssFileOrArrayOrDef,markTemp){if (!cssFileOrArrayOrDef) return '';if (typeof(cssFileOrArrayOrDef)=='string'){if (/[\\\/\.][^{}]*$/.test(cssFileOrArrayOrDef)){return this.GetStyleHtml(cssFileOrArrayOrDef.split(','),markTemp);}else return A(this._GetUrlFixedCss(cssFileOrArrayOrDef),markTemp);}else{var E='';for (var i=0;i<cssFileOrArrayOrDef.length;i++) E+=C(cssFileOrArrayOrDef[i],markTemp);return E;}}})();FCKTools.GetElementDocument=function (A){return A.ownerDocument||A.document;};FCKTools.GetElementWindow=function(A){return this.GetDocumentWindow(this.GetElementDocument(A));};FCKTools.GetDocumentWindow=function(A){if (FCKBrowserInfo.IsSafari&&!A.parentWindow) this.FixDocumentParentWindow(window.top);return A.parentWindow||A.defaultView;};FCKTools.FixDocumentParentWindow=function(A){if (A.document) A.document.parentWindow=A;for (var i=0;i<A.frames.length;i++) FCKTools.FixDocumentParentWindow(A.frames[i]);};FCKTools.HTMLEncode=function(A){if (!A) return '';A=A.replace(/&/g,'&amp;');A=A.replace(/</g,'&lt;');A=A.replace(/>/g,'&gt;');return A;};FCKTools.HTMLDecode=function(A){if (!A) return '';A=A.replace(/&gt;/g,'>');A=A.replace(/&lt;/g,'<');A=A.replace(/&amp;/g,'&');return A;};FCKTools._ProcessLineBreaksForPMode=function(A,B,C,D,E){var F=0;var G="<p>";var H="</p>";var I="<br />";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='p'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};var n=B.charAt(i+1);if (n=='\r'){i++;n=B.charAt(i+1);};if (n=='\n'){i++;if (F) E.push(H);E.push(G);F=1;}else E.push(I);}};FCKTools._ProcessLineBreaksForDivMode=function(A,B,C,D,E){var F=0;var G="<div>";var H="</div>";if (C){G="<li>";H="</li>";F=1;}while (D&&D!=A.FCK.EditorDocument.body){if (D.tagName.toLowerCase()=='div'){F=1;break;};D=D.parentNode;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F){if (E[E.length-1]==G){E.push("&nbsp;");};E.push(H);};E.push(G);F=1;};if (F) E.push(H);};FCKTools._ProcessLineBreaksForBrMode=function(A,B,C,D,E){var F=0;var G="<br />";var H="";if (C){G="<li>";H="</li>";F=1;};for (var i=0;i<B.length;i++){var c=B.charAt(i);if (c=='\r') continue;if (c!='\n'){E.push(c);continue;};if (F&&H.length) E.push (H);E.push(G);F=1;}};FCKTools.ProcessLineBreaks=function(A,B,C){var D=B.EnterMode.toLowerCase();var E=[];var F=0;var G=new A.FCKDomRange(A.FCK.EditorWindow);G.MoveToSelection();var H=G._Range.startContainer;while (H&&H.nodeType!=1) H=H.parentNode;if (H&&H.tagName.toLowerCase()=='li') F=1;if (D=='p') this._ProcessLineBreaksForPMode(A,C,F,H,E);else if (D=='div') this._ProcessLineBreaksForDivMode(A,C,F,H,E);else if (D=='br') this._ProcessLineBreaksForBrMode(A,C,F,H,E);return E.join("");};FCKTools.AddSelectOption=function(A,B,C){var D=FCKTools.GetElementDocument(A).createElement("OPTION");D.text=B;D.value=C;A.options.add(D);return D;};FCKTools.RunFunction=function(A,B,C,D){if (A) this.SetTimeout(A,0,B,C,D);};FCKTools.SetTimeout=function(A,B,C,D,E){return (E||window).setTimeout(function(){if (D) A.apply(C,[].concat(D));else A.apply(C);},B);};FCKTools.SetInterval=function(A,B,C,D,E){return (E||window).setInterval(function(){A.apply(C,D||[]);},B);};FCKTools.ConvertStyleSizeToHtml=function(A){return A.EndsWith('%')?A:parseInt(A,10);};FCKTools.ConvertHtmlSizeToStyle=function(A){return A.EndsWith('%')?A:(A+'px');};FCKTools.GetElementAscensor=function(A,B){var e=A;var C=","+B.toUpperCase()+",";while (e){if (C.indexOf(","+e.nodeName.toUpperCase()+",")!=-1) return e;e=e.parentNode;};return null;};FCKTools.CreateEventListener=function(A,B){var f=function(){var C=[];for (var i=0;i<arguments.length;i++) C.push(arguments[i]);A.apply(this,C.concat(B));};return f;};FCKTools.IsStrictMode=function(A){return ('CSS1Compat'==(A.compatMode||(FCKBrowserInfo.IsSafari?'CSS1Compat':null)));};FCKTools.ArgumentsToArray=function(A,B,C){B=B||0;C=C||A.length;var D=[];for (var i=B;i<B+C&&i<A.length;i++) D.push(A[i]);return D;};FCKTools.CloneObject=function(A){var B=function() {};B.prototype=A;return new B;};FCKTools.AppendBogusBr=function(A){if (!A) return;var B=this.GetLastItem(A.getElementsByTagName('br'));if (!B||(B.getAttribute('type',2)!='_moz'&&B.getAttribute('_moz_dirty')==null)){var C=this.GetElementDocument(A);if (FCKBrowserInfo.IsOpera) A.appendChild(C.createTextNode(''));else A.appendChild(this.CreateBogusBR(C));}};FCKTools.GetLastItem=function(A){if (A.length>0) return A[A.length-1];return null;};FCKTools.GetDocumentPosition=function(w,A){var x=0;var y=0;var B=A;var C=null;var D=FCKTools.GetElementWindow(B);while (B&&!(D==w&&(B==w.document.body||B==w.document.documentElement))){x+=B.offsetLeft-B.scrollLeft;y+=B.offsetTop-B.scrollTop;if (!FCKBrowserInfo.IsOpera){var E=C;while (E&&E!=B){x-=E.scrollLeft;y-=E.scrollTop;E=E.parentNode;}};C=B;if (B.offsetParent) B=B.offsetParent;else{if (D!=w){B=D.frameElement;C=null;if (B) D=B.contentWindow.parent;}else B=null;}};if (FCKDomTools.GetCurrentElementStyle(w.document.body,'position')!='static'||(FCKBrowserInfo.IsIE&&FCKDomTools.GetPositionedAncestor(A)==null)){x+=w.document.body.offsetLeft;y+=w.document.body.offsetTop;};return { "x":x,"y":y };};FCKTools.GetWindowPosition=function(w,A){var B=this.GetDocumentPosition(w,A);var C=FCKTools.GetScrollPosition(w);B.x-=C.X;B.y-=C.Y;return B;};FCKTools.ProtectFormStyles=function(A){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return [];var B=[];var C=['style','className'];for (var i=0;i<C.length;i++){var D=C[i];if (A.elements.namedItem(D)){var E=A.elements.namedItem(D);B.push([E,E.nextSibling]);A.removeChild(E);}};return B;};FCKTools.RestoreFormStyles=function(A,B){if (!A||A.nodeType!=1||A.tagName.toLowerCase()!='form') return;if (B.length>0){for (var i=B.length-1;i>=0;i--){var C=B[i][0];var D=B[i][1];if (D) A.insertBefore(C,D);else A.appendChild(C);}}};FCKTools.GetNextNode=function(A,B){if (A.firstChild) return A.firstChild;else if (A.nextSibling) return A.nextSibling;else{var C=A.parentNode;while (C){if (C==B) return null;if (C.nextSibling) return C.nextSibling;else C=C.parentNode;}};return null;};FCKTools.GetNextTextNode=function(A,B,C){node=this.GetNextNode(A,B);if (C&&node&&C(node)) return null;while (node&&node.nodeType!=3){node=this.GetNextNode(node,B);if (C&&node&&C(node)) return null;};return node;};FCKTools.Merge=function(){var A=arguments;var o=A[0];for (var i=1;i<A.length;i++){var B=A[i];for (var p in B) o[p]=B[p];};return o;};FCKTools.IsArray=function(A){return (A instanceof Array);};FCKTools.AppendLengthProperty=function(A,B){var C=0;for (var n in A) C++;return A[B||'length']=C;};FCKTools.NormalizeCssText=function(A){var B=document.createElement('span');B.style.cssText=A;return B.style.cssText;};FCKTools.Bind=function(A,B){return function(){ return B.apply(A,arguments);};};FCKTools.GetVoidUrl=function(){if (FCK_IS_CUSTOM_DOMAIN) return "javascript: void( function(){document.open();document.write('<html><head><title></title></head><body></body></html>');document.domain = '"+FCK_RUNTIME_DOMAIN+"';document.close();}() ) ;";if (FCKBrowserInfo.IsIE){if (FCKBrowserInfo.IsIE7||!FCKBrowserInfo.IsIE6) return "";else return "javascript: '';";};return "javascript: void(0);";};FCKTools.ResetStyles=function(A){A.style.cssText='margin:0;padding:0;border:0;background-color:transparent;background-image:none;';};
+FCKTools.CancelEvent=function(e){return false;};FCKTools._AppendStyleSheet=function(A,B){return A.createStyleSheet(B).owningElement;};FCKTools.AppendStyleString=function(A,B){if (!B) return null;var s=A.createStyleSheet("");s.cssText=B;return s;};FCKTools.ClearElementAttributes=function(A){A.clearAttributes();};FCKTools.GetAllChildrenIds=function(A){var B=[];for (var i=0;i<A.all.length;i++){var C=A.all[i].id;if (C&&C.length>0) B[B.length]=C;};return B;};FCKTools.RemoveOuterTags=function(e){e.insertAdjacentHTML('beforeBegin',e.innerHTML);e.parentNode.removeChild(e);};FCKTools.CreateXmlObject=function(A){var B;switch (A){case 'XmlHttp':if (document.location.protocol!='file:') try { return new XMLHttpRequest();} catch (e) {};B=['MSXML2.XmlHttp','Microsoft.XmlHttp'];break;case 'DOMDocument':B=['MSXML2.DOMDocument','Microsoft.XmlDom'];break;};for (var i=0;i<2;i++){try { return new ActiveXObject(B[i]);}catch (e){}};if (FCKLang.NoActiveX){alert(FCKLang.NoActiveX);FCKLang.NoActiveX=null;};return null;};FCKTools.DisableSelection=function(A){A.unselectable='on';var e,i=0;while ((e=A.all[i++])){switch (e.tagName){case 'IFRAME':case 'TEXTAREA':case 'INPUT':case 'SELECT':break;default:e.unselectable='on';}}};FCKTools.GetScrollPosition=function(A){var B=A.document;var C={ X:B.documentElement.scrollLeft,Y:B.documentElement.scrollTop };if (C.X>0||C.Y>0) return C;return { X:B.body.scrollLeft,Y:B.body.scrollTop };};FCKTools.AddEventListener=function(A,B,C){A.attachEvent('on'+B,C);};FCKTools.RemoveEventListener=function(A,B,C){A.detachEvent('on'+B,C);};FCKTools.AddEventListenerEx=function(A,B,C,D){var o={};o.Source=A;o.Params=D||[];o.Listener=function(ev){return C.apply(o.Source,[ev].concat(o.Params));};if (FCK.IECleanup) FCK.IECleanup.AddItem(null,function() { o.Source=null;o.Params=null;});A.attachEvent('on'+B,o.Listener);A=null;D=null;};FCKTools.GetViewPaneSize=function(A){var B;var C=A.document.documentElement;if (C&&C.clientWidth) B=C;else B=A.document.body;if (B) return { Width:B.clientWidth,Height:B.clientHeight };else return { Width:0,Height:0 };};FCKTools.SaveStyles=function(A){var B=FCKTools.ProtectFormStyles(A);var C={};if (A.className.length>0){C.Class=A.className;A.className='';};var D=A.style.cssText;if (D.length>0){C.Inline=D;A.style.cssText='';};FCKTools.RestoreFormStyles(A,B);return C;};FCKTools.RestoreStyles=function(A,B){var C=FCKTools.ProtectFormStyles(A);A.className=B.Class||'';A.style.cssText=B.Inline||'';FCKTools.RestoreFormStyles(A,C);};FCKTools.RegisterDollarFunction=function(A){A.$=A.document.getElementById;};FCKTools.AppendElement=function(A,B){return A.appendChild(this.GetElementDocument(A).createElement(B));};FCKTools.ToLowerCase=function(A){return A.toLowerCase();};
+var FCKeditorAPI;function InitializeAPI(){var A=window.parent;if (!(FCKeditorAPI=A.FCKeditorAPI)){var B='window.FCKeditorAPI = {Version : "2.6.3",VersionBuild : "19836",Instances : new Object(),GetInstance : function( name ){return this.Instances[ name ];},_FormSubmit : function(){for ( var name in FCKeditorAPI.Instances ){var oEditor = FCKeditorAPI.Instances[ name ] ;if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )oEditor.UpdateLinkedField() ;}this._FCKOriginalSubmit() ;},_FunctionQueue	: {Functions : new Array(),IsRunning : false,Add : function( f ){this.Functions.push( f );if ( !this.IsRunning )this.StartNext();},StartNext : function(){var aQueue = this.Functions ;if ( aQueue.length > 0 ){this.IsRunning = true;aQueue[0].call();}else this.IsRunning = false;},Remove : function( f ){var aQueue = this.Functions;var i = 0, fFunc;while( (fFunc = aQueue[ i ]) ){if ( fFunc == f )aQueue.splice( i,1 );i++ ;}this.StartNext();}}}';if (A.execScript) A.execScript(B,'JavaScript');else{if (FCKBrowserInfo.IsGecko10){eval.call(A,B);}else if(FCKBrowserInfo.IsAIR){FCKAdobeAIR.FCKeditorAPI_Evaluate(A,B);}else if (FCKBrowserInfo.IsSafari){var C=A.document;var D=C.createElement('script');D.appendChild(C.createTextNode(B));C.documentElement.appendChild(D);}else A.eval(B);};FCKeditorAPI=A.FCKeditorAPI;FCKeditorAPI.__Instances=FCKeditorAPI.Instances;};FCKeditorAPI.Instances[FCK.Name]=FCK;};function _AttachFormSubmitToAPI(){var A=FCK.GetParentForm();if (A){FCKTools.AddEventListener(A,'submit',FCK.UpdateLinkedField);if (!A._FCKOriginalSubmit&&(typeof(A.submit)=='function'||(!A.submit.tagName&&!A.submit.length))){A._FCKOriginalSubmit=A.submit;A.submit=FCKeditorAPI._FormSubmit;}}};function FCKeditorAPI_Cleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat&&!window.FCKUnloadFlag) return;delete FCKeditorAPI.Instances[FCK.Name];};function FCKeditorAPI_ConfirmCleanup(){if (window.FCKConfig&&FCKConfig.MsWebBrowserControlCompat) window.FCKUnloadFlag=true;};FCKTools.AddEventListener(window,'unload',FCKeditorAPI_Cleanup);FCKTools.AddEventListener(window,'beforeunload',FCKeditorAPI_ConfirmCleanup);
+var FCKImagePreloader=function(){this._Images=[];};FCKImagePreloader.prototype={AddImages:function(A){if (typeof(A)=='string') A=A.split(';');this._Images=this._Images.concat(A);},Start:function(){var A=this._Images;this._PreloadCount=A.length;for (var i=0;i<A.length;i++){var B=document.createElement('img');FCKTools.AddEventListenerEx(B,'load',_FCKImagePreloader_OnImage,this);FCKTools.AddEventListenerEx(B,'error',_FCKImagePreloader_OnImage,this);B.src=A[i];_FCKImagePreloader_ImageCache.push(B);}}};var _FCKImagePreloader_ImageCache=[];function _FCKImagePreloader_OnImage(A,B){if ((--B._PreloadCount)==0&&B.OnComplete) B.OnComplete();};
+var FCKRegexLib={AposEntity:/&apos;/gi,ObjectElements:/^(?:IMG|TABLE|TR|TD|TH|INPUT|SELECT|TEXTAREA|HR|OBJECT|A|UL|OL|LI)$/i,NamedCommands:/^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i,BeforeBody:/(^[\s\S]*\<body[^\>]*\>)/i,AfterBody:/(\<\/body\>[\s\S]*$)/i,ToReplace:/___fcktoreplace:([\w]+)/ig,MetaHttpEquiv:/http-equiv\s*=\s*["']?([^"' ]+)/i,HasBaseTag:/<base /i,HasBodyTag:/<body[\s|>]/i,HtmlOpener:/<html\s?[^>]*>/i,HeadOpener:/<head\s?[^>]*>/i,HeadCloser:/<\/head\s*>/i,FCK_Class:/\s*FCK__[^ ]*(?=\s+|$)/,ElementName:/(^[a-z_:][\w.\-:]*\w$)|(^[a-z_]$)/,ForceSimpleAmpersand:/___FCKAmp___/g,SpaceNoClose:/\/>/g,EmptyParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/,EmptyOutParagraph:/^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/,TagBody:/></,GeckoEntitiesMarker:/#\?-\:/g,ProtectUrlsImg:/<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsA:/<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,ProtectUrlsArea:/<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi,Html4DocType:/HTML 4\.0 Transitional/i,DocTypeTag:/<!DOCTYPE[^>]*>/i,HtmlDocType:/DTD HTML/,TagsWithEvent:/<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g,EventAttributes:/\s(on\w+)[\s\r\n]*=[\s\r\n]*?('|")([\s\S]*?)\2/g,ProtectedEvents:/\s\w+_fckprotectedatt="([^"]+)"/g,StyleProperties:/\S+\s*:/g,InvalidSelfCloseTags:/(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0-9:]+)[^>]*)\/>/gi,StyleVariableAttName:/#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,RegExp:/^\/(.*)\/([gim]*)$/,HtmlTag:/<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/};
+var FCKListsLib={BlockElements:{ address:1,blockquote:1,center:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,marquee:1,noscript:1,ol:1,p:1,pre:1,script:1,table:1,ul:1 },NonEmptyBlockElements:{ p:1,div:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,address:1,pre:1,ol:1,ul:1,li:1,td:1,th:1 },InlineChildReqElements:{ abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },InlineNonEmptyElements:{ a:1,abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 },EmptyElements:{ base:1,col:1,meta:1,link:1,hr:1,br:1,param:1,img:1,area:1,input:1 },PathBlockElements:{ address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,de:1 },PathBlockLimitElements:{ body:1,div:1,td:1,th:1,caption:1,form:1 },StyleBlockElements:{ address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1 },StyleObjectElements:{ img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },NonEditableElements:{ button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },BlockBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },ListBoundaries:{ p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }};
+var FCKLanguageManager=FCK.Language={AvailableLanguages:{af:'Afrikaans',ar:'Arabic',bg:'Bulgarian',bn:'Bengali/Bangla',bs:'Bosnian',ca:'Catalan',cs:'Czech',da:'Danish',de:'German',el:'Greek',en:'English','en-au':'English (Australia)','en-ca':'English (Canadian)','en-uk':'English (United Kingdom)',eo:'Esperanto',es:'Spanish',et:'Estonian',eu:'Basque',fa:'Persian',fi:'Finnish',fo:'Faroese',fr:'French','fr-ca':'French (Canada)',gl:'Galician',gu:'Gujarati',he:'Hebrew',hi:'Hindi',hr:'Croatian',hu:'Hungarian',it:'Italian',ja:'Japanese',km:'Khmer',ko:'Korean',lt:'Lithuanian',lv:'Latvian',mn:'Mongolian',ms:'Malay',nb:'Norwegian Bokmal',nl:'Dutch',no:'Norwegian',pl:'Polish',pt:'Portuguese (Portugal)','pt-br':'Portuguese (Brazil)',ro:'Romanian',ru:'Russian',sk:'Slovak',sl:'Slovenian',sr:'Serbian (Cyrillic)','sr-latn':'Serbian (Latin)',sv:'Swedish',th:'Thai',tr:'Turkish',uk:'Ukrainian',vi:'Vietnamese',zh:'Chinese Traditional','zh-cn':'Chinese Simplified'},GetActiveLanguage:function(){if (FCKConfig.AutoDetectLanguage){var A;if (navigator.userLanguage) A=navigator.userLanguage.toLowerCase();else if (navigator.language) A=navigator.language.toLowerCase();else{return FCKConfig.DefaultLanguage;};if (A.length>=5){A=A.substr(0,5);if (this.AvailableLanguages[A]) return A;};if (A.length>=2){A=A.substr(0,2);if (this.AvailableLanguages[A]) return A;}};return this.DefaultLanguage;},TranslateElements:function(A,B,C,D){var e=A.getElementsByTagName(B);var E,s;for (var i=0;i<e.length;i++){if ((E=e[i].getAttribute('fckLang'))){if ((s=FCKLang[E])){if (D) s=FCKTools.HTMLEncode(s);e[i][C]=s;}}}},TranslatePage:function(A){this.TranslateElements(A,'INPUT','value');this.TranslateElements(A,'SPAN','innerHTML');this.TranslateElements(A,'LABEL','innerHTML');this.TranslateElements(A,'OPTION','innerHTML',true);this.TranslateElements(A,'LEGEND','innerHTML');},Initialize:function(){if (this.AvailableLanguages[FCKConfig.DefaultLanguage]) this.DefaultLanguage=FCKConfig.DefaultLanguage;else this.DefaultLanguage='en';this.ActiveLanguage={};this.ActiveLanguage.Code=this.GetActiveLanguage();this.ActiveLanguage.Name=this.AvailableLanguages[this.ActiveLanguage.Code];}};
+var FCKXHtmlEntities={};FCKXHtmlEntities.Initialize=function(){if (FCKXHtmlEntities.Entities) return;var A='';var B,e;if (FCKConfig.ProcessHTMLEntities){FCKXHtmlEntities.Entities={' ':'nbsp','¡':'iexcl','¢':'cent','£':'pound','¤':'curren','¥':'yen','¦':'brvbar','§':'sect','¨':'uml','©':'copy','ª':'ordf','«':'laquo','¬':'not','­':'shy','®':'reg','¯':'macr','°':'deg','±':'plusmn','²':'sup2','³':'sup3','´':'acute','µ':'micro','¶':'para','·':'middot','¸':'cedil','¹':'sup1','º':'ordm','»':'raquo','¼':'frac14','½':'frac12','¾':'frac34','¿':'iquest','×':'times','÷':'divide','ƒ':'fnof','•':'bull','…':'hellip','′':'prime','″':'Prime','‾':'oline','⁄':'frasl','℘':'weierp','ℑ':'image','ℜ':'real','™':'trade','ℵ':'alefsym','←':'larr','↑':'uarr','→':'rarr','↓':'darr','↔':'harr','↵':'crarr','⇐':'lArr','⇑':'uArr','⇒':'rArr','⇓':'dArr','⇔':'hArr','∀':'forall','∂':'part','∃':'exist','∅':'empty','∇':'nabla','∈':'isin','∉':'notin','∋':'ni','∏':'prod','∑':'sum','−':'minus','∗':'lowast','√':'radic','∝':'prop','∞':'infin','∠':'ang','∧':'and','∨':'or','∩':'cap','∪':'cup','∫':'int','∴':'there4','∼':'sim','≅':'cong','≈':'asymp','≠':'ne','≡':'equiv','≤':'le','≥':'ge','⊂':'sub','⊃':'sup','⊄':'nsub','⊆':'sube','⊇':'supe','⊕':'oplus','⊗':'otimes','⊥':'perp','⋅':'sdot','\u2308':'lceil','\u2309':'rceil','\u230a':'lfloor','\u230b':'rfloor','\u2329':'lang','\u232a':'rang','◊':'loz','♠':'spades','♣':'clubs','♥':'hearts','♦':'diams','"':'quot','ˆ':'circ','˜':'tilde',' ':'ensp',' ':'emsp',' ':'thinsp','‌':'zwnj','‍':'zwj','‎':'lrm','‏':'rlm','–':'ndash','—':'mdash','‘':'lsquo','’':'rsquo','‚':'sbquo','“':'ldquo','”':'rdquo','„':'bdquo','†':'dagger','‡':'Dagger','‰':'permil','‹':'lsaquo','›':'rsaquo','€':'euro'};for (e in FCKXHtmlEntities.Entities) A+=e;if (FCKConfig.IncludeLatinEntities){B={'À':'Agrave','Á':'Aacute','Â':'Acirc','Ã':'Atilde','Ä':'Auml','Å':'Aring','Æ':'AElig','Ç':'Ccedil','È':'Egrave','É':'Eacute','Ê':'Ecirc','Ë':'Euml','Ì':'Igrave','Í':'Iacute','Î':'Icirc','Ï':'Iuml','Ð':'ETH','Ñ':'Ntilde','Ò':'Ograve','Ó':'Oacute','Ô':'Ocirc','Õ':'Otilde','Ö':'Ouml','Ø':'Oslash','Ù':'Ugrave','Ú':'Uacute','Û':'Ucirc','Ü':'Uuml','Ý':'Yacute','Þ':'THORN','ß':'szlig','à':'agrave','á':'aacute','â':'acirc','ã':'atilde','ä':'auml','å':'aring','æ':'aelig','ç':'ccedil','è':'egrave','é':'eacute','ê':'ecirc','ë':'euml','ì':'igrave','í':'iacute','î':'icirc','ï':'iuml','ð':'eth','ñ':'ntilde','ò':'ograve','ó':'oacute','ô':'ocirc','õ':'otilde','ö':'ouml','ø':'oslash','ù':'ugrave','ú':'uacute','û':'ucirc','ü':'uuml','ý':'yacute','þ':'thorn','ÿ':'yuml','Œ':'OElig','œ':'oelig','Š':'Scaron','š':'scaron','Ÿ':'Yuml'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;};if (FCKConfig.IncludeGreekEntities){B={'Α':'Alpha','Β':'Beta','Γ':'Gamma','Δ':'Delta','Ε':'Epsilon','Ζ':'Zeta','Η':'Eta','Θ':'Theta','Ι':'Iota','Κ':'Kappa','Λ':'Lambda','Μ':'Mu','Ν':'Nu','Ξ':'Xi','Ο':'Omicron','Π':'Pi','Ρ':'Rho','Σ':'Sigma','Τ':'Tau','Υ':'Upsilon','Φ':'Phi','Χ':'Chi','Ψ':'Psi','Ω':'Omega','α':'alpha','β':'beta','γ':'gamma','δ':'delta','ε':'epsilon','ζ':'zeta','η':'eta','θ':'theta','ι':'iota','κ':'kappa','λ':'lambda','μ':'mu','ν':'nu','ξ':'xi','ο':'omicron','π':'pi','ρ':'rho','ς':'sigmaf','σ':'sigma','τ':'tau','υ':'upsilon','φ':'phi','χ':'chi','ψ':'psi','ω':'omega','\u03d1':'thetasym','\u03d2':'upsih','\u03d6':'piv'};for (e in B){FCKXHtmlEntities.Entities[e]=B[e];A+=e;};B=null;}}else{FCKXHtmlEntities.Entities={};A=' ';};var C='['+A+']';if (FCKConfig.ProcessNumericEntities) C='[^ -~]|'+C;var D=FCKConfig.AdditionalNumericEntities;if (D&&D.length>0) C+='|'+FCKConfig.AdditionalNumericEntities;FCKXHtmlEntities.EntitiesRegex=new RegExp(C,'g');};
+var FCKXHtml={};FCKXHtml.CurrentJobNum=0;FCKXHtml.GetXHTML=function(A,B,C){FCKDomTools.CheckAndRemovePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);FCKXHtmlEntities.Initialize();this._NbspEntity=(FCKConfig.ProcessHTMLEntities?'nbsp':'#160');var D=FCK.IsDirty();FCKXHtml.SpecialBlocks=[];this.XML=FCKTools.CreateXmlObject('DOMDocument');this.MainNode=this.XML.appendChild(this.XML.createElement('xhtml'));FCKXHtml.CurrentJobNum++;if (B) this._AppendNode(this.MainNode,A);else this._AppendChildNodes(this.MainNode,A,false);var E=this._GetMainXmlString();this.XML=null;if (FCKBrowserInfo.IsSafari) E=E.replace(/^<xhtml.*?>/,'<xhtml>');E=E.substr(7,E.length-15).Trim();if (FCKConfig.DocType.length>0&&FCKRegexLib.HtmlDocType.test(FCKConfig.DocType)) E=E.replace(FCKRegexLib.SpaceNoClose,'>');else E=E.replace(FCKRegexLib.SpaceNoClose,' />');if (FCKConfig.ForceSimpleAmpersand) E=E.replace(FCKRegexLib.ForceSimpleAmpersand,'&');if (C) E=FCKCodeFormatter.Format(E);for (var i=0;i<FCKXHtml.SpecialBlocks.length;i++){var F=new RegExp('___FCKsi___'+i);E=E.replace(F,FCKXHtml.SpecialBlocks[i]);};E=E.replace(FCKRegexLib.GeckoEntitiesMarker,'&');if (!D) FCK.ResetIsDirty();FCKDomTools.EnforcePaddingNode(FCKTools.GetElementDocument(A),FCKConfig.EnterMode);return E;};FCKXHtml._AppendAttribute=function(A,B,C){try{if (C==undefined||C==null) C='';else if (C.replace){if (FCKConfig.ForceSimpleAmpersand) C=C.replace(/&/g,'___FCKAmp___');C=C.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity);};var D=this.XML.createAttribute(B);D.value=C;A.attributes.setNamedItem(D);}catch (e){}};FCKXHtml._AppendChildNodes=function(A,B,C){var D=B.firstChild;while (D){this._AppendNode(A,D);D=D.nextSibling;};if (C&&B.tagName&&B.tagName.toLowerCase()!='pre'){FCKDomTools.TrimNode(A);if (FCKConfig.FillEmptyBlocks){var E=A.lastChild;if (E&&E.nodeType==1&&E.nodeName=='br') this._AppendEntity(A,this._NbspEntity);}};if (A.childNodes.length==0){if (C&&FCKConfig.FillEmptyBlocks){this._AppendEntity(A,this._NbspEntity);return A;};var F=A.nodeName;if (FCKListsLib.InlineChildReqElements[F]) return null;if (!FCKListsLib.EmptyElements[F]) A.appendChild(this.XML.createTextNode(''));};return A;};FCKXHtml._AppendNode=function(A,B){if (!B) return false;switch (B.nodeType){case 1:if (FCKBrowserInfo.IsGecko&&B.tagName.toLowerCase()=='br'&&B.parentNode.tagName.toLowerCase()=='pre'){var C='\r';if (B==B.parentNode.firstChild) C+='\r';return FCKXHtml._AppendNode(A,this.XML.createTextNode(C));};if (B.getAttribute('_fckfakelement')) return FCKXHtml._AppendNode(A,FCK.GetRealElement(B));if (FCKBrowserInfo.IsGecko&&(B.hasAttribute('_moz_editor_bogus_node')||B.getAttribute('type')=='_moz')){if (B.nextSibling) return false;else{B.removeAttribute('_moz_editor_bogus_node');B.removeAttribute('type');}};if (B.getAttribute('_fcktemp')) return false;var D=B.tagName.toLowerCase();if (FCKBrowserInfo.IsIE){if (B.scopeName&&B.scopeName!='HTML'&&B.scopeName!='FCK') D=B.scopeName.toLowerCase()+':'+D;}else{if (D.StartsWith('fck:')) D=D.Remove(0,4);};if (!FCKRegexLib.ElementName.test(D)) return false;if (B._fckxhtmljob&&B._fckxhtmljob==FCKXHtml.CurrentJobNum) return false;var E=this.XML.createElement(D);FCKXHtml._AppendAttributes(A,B,E,D);B._fckxhtmljob=FCKXHtml.CurrentJobNum;var F=FCKXHtml.TagProcessors[D];if (F) E=F(E,B,A);else E=this._AppendChildNodes(E,B,Boolean(FCKListsLib.NonEmptyBlockElements[D]));if (!E) return false;A.appendChild(E);break;case 3:if (B.parentNode&&B.parentNode.nodeName.IEquals('pre')) return this._AppendTextNode(A,B.nodeValue);return this._AppendTextNode(A,B.nodeValue.ReplaceNewLineChars(' '));case 8:if (FCKBrowserInfo.IsIE&&!B.innerHTML) break;try { A.appendChild(this.XML.createComment(B.nodeValue));}catch (e) {};break;default:A.appendChild(this.XML.createComment("Element not supported - Type: "+B.nodeType+" Name: "+B.nodeName));break;};return true;};FCKXHtml._AppendSpecialItem=function(A){return '___FCKsi___'+FCKXHtml.SpecialBlocks.AddItem(A);};FCKXHtml._AppendEntity=function(A,B){A.appendChild(this.XML.createTextNode('#?-:'+B+';'));};FCKXHtml._AppendTextNode=function(A,B){var C=B.length>0;if (C) A.appendChild(this.XML.createTextNode(B.replace(FCKXHtmlEntities.EntitiesRegex,FCKXHtml_GetEntity)));return C;};function FCKXHtml_GetEntity(A){var B=FCKXHtmlEntities.Entities[A]||('#'+A.charCodeAt(0));return '#?-:'+B+';';};FCKXHtml.TagProcessors={a:function(A,B){if (B.innerHTML.Trim().length==0&&!B.name) return false;var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);};A=FCKXHtml._AppendChildNodes(A,B,false);return A;},area:function(A,B){var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'href',C);if (FCKBrowserInfo.IsIE){if (!A.attributes.getNamedItem('coords')){var D=B.getAttribute('coords',2);if (D&&D!='0,0,0') FCKXHtml._AppendAttribute(A,'coords',D);};if (!A.attributes.getNamedItem('shape')){var E=B.getAttribute('shape',2);if (E&&E.length>0) FCKXHtml._AppendAttribute(A,'shape',E.toLowerCase());}};return A;},body:function(A,B){A=FCKXHtml._AppendChildNodes(A,B,false);A.removeAttribute('spellcheck');return A;},iframe:function(A,B){var C=B.innerHTML;if (FCKBrowserInfo.IsGecko) C=FCKTools.HTMLDecode(C);C=C.replace(/\s_fcksavedurl="[^"]*"/g,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},img:function(A,B){if (!A.attributes.getNamedItem('alt')) FCKXHtml._AppendAttribute(A,'alt','');var C=B.getAttribute('_fcksavedurl');if (C!=null) FCKXHtml._AppendAttribute(A,'src',C);if (B.style.width) A.removeAttribute('width');if (B.style.height) A.removeAttribute('height');return A;},li:function(A,B,C){if (C.nodeName.IEquals(['ul','ol'])) return FCKXHtml._AppendChildNodes(A,B,true);var D=FCKXHtml.XML.createElement('ul');B._fckxhtmljob=null;do{FCKXHtml._AppendNode(D,B);do{B=FCKDomTools.GetNextSibling(B);} while (B&&B.nodeType==3&&B.nodeValue.Trim().length==0)}	while (B&&B.nodeName.toLowerCase()=='li') return D;},ol:function(A,B,C){if (B.innerHTML.Trim().length==0) return false;var D=C.lastChild;if (D&&D.nodeType==3) D=D.previousSibling;if (D&&D.nodeName.toUpperCase()=='LI'){B._fckxhtmljob=null;FCKXHtml._AppendNode(D,B);return false;};A=FCKXHtml._AppendChildNodes(A,B);return A;},pre:function (A,B){var C=B.firstChild;if (C&&C.nodeType==3) A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem('\r\n')));FCKXHtml._AppendChildNodes(A,B,true);return A;},script:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/javascript');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(B.text)));return A;},span:function(A,B){if (B.innerHTML.length==0) return false;A=FCKXHtml._AppendChildNodes(A,B,false);return A;},style:function(A,B){if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text/css');var C=B.innerHTML;if (FCKBrowserInfo.IsIE) C=C.replace(/^(\r\n|\n|\r)/,'');A.appendChild(FCKXHtml.XML.createTextNode(FCKXHtml._AppendSpecialItem(C)));return A;},title:function(A,B){A.appendChild(FCKXHtml.XML.createTextNode(FCK.EditorDocument.title));return A;}};FCKXHtml.TagProcessors.ul=FCKXHtml.TagProcessors.ol;
+FCKXHtml._GetMainXmlString=function(){return this.MainNode.xml;};FCKXHtml._AppendAttributes=function(A,B,C,D){var E=B.attributes,bHasStyle;for (var n=0;n<E.length;n++){var F=E[n];if (F.specified){var G=F.nodeName.toLowerCase();var H;if (G.StartsWith('_fck')) continue;else if (G=='style'){bHasStyle=true;continue;}else if (G=='class'){H=F.nodeValue.replace(FCKRegexLib.FCK_Class,'');if (H.length==0) continue;}else if (G.indexOf('on')==0) H=F.nodeValue;else if (D=='body'&&G=='contenteditable') continue;else if (F.nodeValue===true) H=G;else{try{H=B.getAttribute(G,2);}catch (e) {}};this._AppendAttribute(C,G,H||F.nodeValue);}};if (bHasStyle||B.style.cssText.length>0){var I=FCKTools.ProtectFormStyles(B);var J=B.style.cssText.replace(FCKRegexLib.StyleProperties,FCKTools.ToLowerCase);FCKTools.RestoreFormStyles(B,I);this._AppendAttribute(C,'style',J);}};FCKXHtml.TagProcessors['div']=function(A,B){if (B.align.length>0) FCKXHtml._AppendAttribute(A,'align',B.align);A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['font']=function(A,B){if (A.attributes.length==0) A=FCKXHtml.XML.createDocumentFragment();A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['form']=function(A,B){if (B.acceptCharset&&B.acceptCharset.length>0&&B.acceptCharset!='UNKNOWN') FCKXHtml._AppendAttribute(A,'accept-charset',B.acceptCharset);var C=B.attributes['name'];if (C&&C.value.length>0) FCKXHtml._AppendAttribute(A,'name',C.value);A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['input']=function(A,B){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);if (B.value&&!A.attributes.getNamedItem('value')) FCKXHtml._AppendAttribute(A,'value',B.value);if (!A.attributes.getNamedItem('type')) FCKXHtml._AppendAttribute(A,'type','text');return A;};FCKXHtml.TagProcessors['label']=function(A,B){if (B.htmlFor.length>0) FCKXHtml._AppendAttribute(A,'for',B.htmlFor);A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['map']=function(A,B){if (!A.attributes.getNamedItem('name')){var C=B.name;if (C) FCKXHtml._AppendAttribute(A,'name',C);};A=FCKXHtml._AppendChildNodes(A,B,true);return A;};FCKXHtml.TagProcessors['meta']=function(A,B){var C=A.attributes.getNamedItem('http-equiv');if (C==null||C.value.length==0){var D=B.outerHTML.match(FCKRegexLib.MetaHttpEquiv);if (D){D=D[1];FCKXHtml._AppendAttribute(A,'http-equiv',D);}};return A;};FCKXHtml.TagProcessors['option']=function(A,B){if (B.selected&&!A.attributes.getNamedItem('selected')) FCKXHtml._AppendAttribute(A,'selected','selected');A=FCKXHtml._AppendChildNodes(A,B);return A;};FCKXHtml.TagProcessors['textarea']=FCKXHtml.TagProcessors['select']=function(A,B){if (B.name) FCKXHtml._AppendAttribute(A,'name',B.name);A=FCKXHtml._AppendChildNodes(A,B);return A;};
+var FCKCodeFormatter={};FCKCodeFormatter.Init=function(){var A=this.Regex={};A.BlocksOpener=/\<(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.BlocksCloser=/\<\/(P|DIV|H1|H2|H3|H4|H5|H6|ADDRESS|PRE|OL|UL|LI|TITLE|META|LINK|BASE|SCRIPT|LINK|TD|TH|AREA|OPTION)[^\>]*\>/gi;A.NewLineTags=/\<(BR|HR)[^\>]*\>/gi;A.MainTags=/\<\/?(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR)[^\>]*\>/gi;A.LineSplitter=/\s*\n+\s*/g;A.IncreaseIndent=/^\<(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \/\>]/i;A.DecreaseIndent=/^\<\/(HTML|HEAD|BODY|FORM|TABLE|TBODY|THEAD|TR|UL|OL)[ \>]/i;A.FormatIndentatorRemove=new RegExp('^'+FCKConfig.FormatIndentator);A.ProtectedTags=/(<PRE[^>]*>)([\s\S]*?)(<\/PRE>)/gi;};FCKCodeFormatter._ProtectData=function(A,B,C,D){return B+'___FCKpd___'+FCKCodeFormatter.ProtectedData.AddItem(C)+D;};FCKCodeFormatter.Format=function(A){if (!this.Regex) this.Init();FCKCodeFormatter.ProtectedData=[];var B=A.replace(this.Regex.ProtectedTags,FCKCodeFormatter._ProtectData);B=B.replace(this.Regex.BlocksOpener,'\n$&');B=B.replace(this.Regex.BlocksCloser,'$&\n');B=B.replace(this.Regex.NewLineTags,'$&\n');B=B.replace(this.Regex.MainTags,'\n$&\n');var C='';var D=B.split(this.Regex.LineSplitter);B='';for (var i=0;i<D.length;i++){var E=D[i];if (E.length==0) continue;if (this.Regex.DecreaseIndent.test(E)) C=C.replace(this.Regex.FormatIndentatorRemove,'');B+=C+E+'\n';if (this.Regex.IncreaseIndent.test(E)) C+=FCKConfig.FormatIndentator;};for (var j=0;j<FCKCodeFormatter.ProtectedData.length;j++){var F=new RegExp('___FCKpd___'+j);B=B.replace(F,FCKCodeFormatter.ProtectedData[j].replace(/\$/g,'$$$$'));};return B.Trim();};
+var FCKUndo={};FCKUndo.SavedData=[];FCKUndo.CurrentIndex=-1;FCKUndo.TypesCount=0;FCKUndo.Changed=false;FCKUndo.MaxTypes=25;FCKUndo.Typing=false;FCKUndo.SaveLocked=false;FCKUndo._GetBookmark=function(){FCKSelection.Restore();var A=new FCKDomRange(FCK.EditorWindow);try{A.MoveToSelection();}catch (e){return null;};if (FCKBrowserInfo.IsIE){var B=A.CreateBookmark();var C=FCK.EditorDocument.body.innerHTML;A.MoveToBookmark(B);return [B,C];};return A.CreateBookmark2();};FCKUndo._SelectBookmark=function(A){if (!A) return;var B=new FCKDomRange(FCK.EditorWindow);if (A instanceof Object){if (FCKBrowserInfo.IsIE) B.MoveToBookmark(A[0]);else B.MoveToBookmark2(A);try{B.Select();}catch (e){B.MoveToPosition(FCK.EditorDocument.body,4);B.Select();}}};FCKUndo._CompareCursors=function(A,B){for (var i=0;i<Math.min(A.length,B.length);i++){if (A[i]<B[i]) return-1;else if (A[i]>B[i]) return 1;};if (A.length<B.length) return-1;else if (A.length>B.length) return 1;return 0;};FCKUndo._CheckIsBookmarksEqual=function(A,B){if (!(A&&B)) return false;if (FCKBrowserInfo.IsIE){var C=A[1].search(A[0].StartId);var D=B[1].search(B[0].StartId);var E=A[1].search(A[0].EndId);var F=B[1].search(B[0].EndId);return C==D&&E==F;}else{return this._CompareCursors(A.Start,B.Start)==0&&this._CompareCursors(A.End,B.End)==0;}};FCKUndo.SaveUndoStep=function(){if (FCK.EditMode!=0||this.SaveLocked) return;if (this.SavedData.length) this.Changed=true;var A=FCK.EditorDocument.body.innerHTML;var B=this._GetBookmark();this.SavedData=this.SavedData.slice(0,this.CurrentIndex+1);if (this.CurrentIndex>0&&A==this.SavedData[this.CurrentIndex][0]&&this._CheckIsBookmarksEqual(B,this.SavedData[this.CurrentIndex][1])) return;else if (this.CurrentIndex==0&&this.SavedData.length&&A==this.SavedData[0][0]){this.SavedData[0][1]=B;return;};if (this.CurrentIndex+1>=FCKConfig.MaxUndoLevels) this.SavedData.shift();else this.CurrentIndex++;this.SavedData[this.CurrentIndex]=[A,B];FCK.Events.FireEvent("OnSelectionChange");};FCKUndo.CheckUndoState=function(){return (this.Changed||this.CurrentIndex>0);};FCKUndo.CheckRedoState=function(){return (this.CurrentIndex<(this.SavedData.length-1));};FCKUndo.Undo=function(){if (this.CheckUndoState()){if (this.CurrentIndex==(this.SavedData.length-1)){this.SaveUndoStep();};this._ApplyUndoLevel(--this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo.Redo=function(){if (this.CheckRedoState()){this._ApplyUndoLevel(++this.CurrentIndex);FCK.Events.FireEvent("OnSelectionChange");}};FCKUndo._ApplyUndoLevel=function(A){var B=this.SavedData[A];if (!B) return;if (FCKBrowserInfo.IsIE){if (B[1]&&B[1][1]) FCK.SetInnerHtml(B[1][1]);else FCK.SetInnerHtml(B[0]);}else FCK.EditorDocument.body.innerHTML=B[0];this._SelectBookmark(B[1]);this.TypesCount=0;this.Changed=false;this.Typing=false;};
+var FCKEditingArea=function(A){this.TargetElement=A;this.Mode=0;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKEditingArea_Cleanup);};FCKEditingArea.prototype.Start=function(A,B){var C=this.TargetElement;var D=FCKTools.GetElementDocument(C);while(C.firstChild) C.removeChild(C.firstChild);if (this.Mode==0){if (FCK_IS_CUSTOM_DOMAIN) A='<script>document.domain="'+FCK_RUNTIME_DOMAIN+'";</script>'+A;if (FCKBrowserInfo.IsIE) A=A.replace(/(<base[^>]*?)\s*\/?>(?!\s*<\/base>)/gi,'$1></base>');else if (!B){var E=A.match(FCKRegexLib.BeforeBody);var F=A.match(FCKRegexLib.AfterBody);if (E&&F){var G=A.substr(E[1].length,A.length-E[1].length-F[1].length);A=E[1]+'&nbsp;'+F[1];if (FCKBrowserInfo.IsGecko&&(G.length==0||FCKRegexLib.EmptyParagraph.test(G))) G='<br type="_moz">';this._BodyHTML=G;}else this._BodyHTML=A;};var H=this.IFrame=D.createElement('iframe');var I='<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>';H.frameBorder=0;H.style.width=H.style.height='100%';if (FCK_IS_CUSTOM_DOMAIN&&FCKBrowserInfo.IsIE){window._FCKHtmlToLoad=A.replace(/<head>/i,'<head>'+I);H.src='javascript:void( (function(){document.open() ;document.domain="'+document.domain+'" ;document.write( window.parent._FCKHtmlToLoad );document.close() ;window.parent._FCKHtmlToLoad = null ;})() )';}else if (!FCKBrowserInfo.IsGecko){H.src='javascript:void(0)';};C.appendChild(H);this.Window=H.contentWindow;if (!FCK_IS_CUSTOM_DOMAIN||!FCKBrowserInfo.IsIE){var J=this.Window.document;J.open();J.write(A.replace(/<head>/i,'<head>'+I));J.close();};if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.EditingArea_Start(J,A);if (FCKBrowserInfo.IsGecko10&&!B){this.Start(A,true);return;};if (H.readyState&&H.readyState!='completed'){var K=this;setTimeout(function(){try{K.Window.document.documentElement.doScroll("left");}catch(e){setTimeout(arguments.callee,0);return;};K.Window._FCKEditingArea=K;FCKEditingArea_CompleteStart.call(K.Window);},0);}else{this.Window._FCKEditingArea=this;if (FCKBrowserInfo.IsGecko10) this.Window.setTimeout(FCKEditingArea_CompleteStart,500);else FCKEditingArea_CompleteStart.call(this.Window);}}else{var L=this.Textarea=D.createElement('textarea');L.className='SourceField';L.dir='ltr';FCKDomTools.SetElementStyles(L,{width:'100%',height:'100%',border:'none',resize:'none',outline:'none'});C.appendChild(L);L.value=A;FCKTools.RunFunction(this.OnLoad);}};function FCKEditingArea_CompleteStart(){if (!this.document.body){this.setTimeout(FCKEditingArea_CompleteStart,50);return;};var A=this._FCKEditingArea;A.Document=A.Window.document;A.MakeEditable();FCKTools.RunFunction(A.OnLoad);};FCKEditingArea.prototype.MakeEditable=function(){var A=this.Document;if (FCKBrowserInfo.IsIE){A.body.disabled=true;A.body.contentEditable=true;A.body.removeAttribute("disabled");}else{try{A.body.spellcheck=(this.FFSpellChecker!==false);if (this._BodyHTML){A.body.innerHTML=this._BodyHTML;A.body.offsetLeft;this._BodyHTML=null;};A.designMode='on';A.execCommand('enableObjectResizing',false,!FCKConfig.DisableObjectResizing);A.execCommand('enableInlineTableEditing',false,!FCKConfig.DisableFFTableHandles);}catch (e){FCKTools.AddEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);}}};function FCKEditingArea_Document_AttributeNodeModified(A){var B=A.currentTarget.contentWindow._FCKEditingArea;if (B._timer) window.clearTimeout(B._timer);B._timer=FCKTools.SetTimeout(FCKEditingArea_MakeEditableByMutation,1000,B);};function FCKEditingArea_MakeEditableByMutation(){delete this._timer;FCKTools.RemoveEventListener(this.Window.frameElement,'DOMAttrModified',FCKEditingArea_Document_AttributeNodeModified);this.MakeEditable();};FCKEditingArea.prototype.Focus=function(){try{if (this.Mode==0){if (FCKBrowserInfo.IsIE) this._FocusIE();else this.Window.focus();}else{var A=FCKTools.GetElementDocument(this.Textarea);if ((!A.hasFocus||A.hasFocus())&&A.activeElement==this.Textarea) return;this.Textarea.focus();}}catch(e) {}};FCKEditingArea.prototype._FocusIE=function(){this.Document.body.setActive();this.Window.focus();var A=this.Document.selection.createRange();var B=A.parentElement();var C=B.nodeName.toLowerCase();if (B.childNodes.length>0||!(FCKListsLib.BlockElements[C]||FCKListsLib.NonEmptyBlockElements[C])){return;};A=new FCKDomRange(this.Window);A.MoveToElementEditStart(B);A.Select();};function FCKEditingArea_Cleanup(){if (this.Document) this.Document.body.innerHTML="";this.TargetElement=null;this.IFrame=null;this.Document=null;this.Textarea=null;if (this.Window){this.Window._FCKEditingArea=null;this.Window=null;}};
+var FCKKeystrokeHandler=function(A){this.Keystrokes={};this.CancelCtrlDefaults=(A!==false);};FCKKeystrokeHandler.prototype.AttachToElement=function(A){FCKTools.AddEventListenerEx(A,'keydown',_FCKKeystrokeHandler_OnKeyDown,this);if (FCKBrowserInfo.IsGecko10||FCKBrowserInfo.IsOpera||(FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac)) FCKTools.AddEventListenerEx(A,'keypress',_FCKKeystrokeHandler_OnKeyPress,this);};FCKKeystrokeHandler.prototype.SetKeystrokes=function(){for (var i=0;i<arguments.length;i++){var A=arguments[i];if (!A) continue;if (typeof(A[0])=='object') this.SetKeystrokes.apply(this,A);else{if (A.length==1) delete this.Keystrokes[A[0]];else this.Keystrokes[A[0]]=A[1]===true?true:A;}}};function _FCKKeystrokeHandler_OnKeyDown(A,B){var C=A.keyCode||A.which;var D=0;if (A.ctrlKey||A.metaKey) D+=CTRL;if (A.shiftKey) D+=SHIFT;if (A.altKey) D+=ALT;var E=C+D;var F=B._CancelIt=false;var G=B.Keystrokes[E];if (G){if (G===true||!(B.OnKeystroke&&B.OnKeystroke.apply(B,G))) return true;F=true;};if (F||(B.CancelCtrlDefaults&&D==CTRL&&(C<33||C>40))){B._CancelIt=true;if (A.preventDefault) return A.preventDefault();A.returnValue=false;A.cancelBubble=true;return false;};return true;};function _FCKKeystrokeHandler_OnKeyPress(A,B){if (B._CancelIt){if (A.preventDefault) return A.preventDefault();return false;};return true;};
+FCK.DTD=(function(){var X=FCKTools.Merge;var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I;A={isindex:1,fieldset:1};B={input:1,button:1,select:1,textarea:1,label:1};C=X({a:1},B);D=X({iframe:1},C);E={hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1};F={ins:1,del:1,script:1};G=X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1},F);H=X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G);I=X({p:1},H);J=X({iframe:1},H,B);K={img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1};L=X({a:1},J);M={tr:1};N={'#':1};O=X({param:1},K);P=X({form:1},A,D,E,I);Q={li:1};return {col:{},tr:{td:1,th:1},img:{},colgroup:{col:1},noscript:P,td:P,br:{},th:P,center:P,kbd:L,button:X(I,E),basefont:{},h5:L,h4:L,samp:L,h6:L,ol:Q,h1:L,h3:L,option:N,h2:L,form:X(A,D,E,I),select:{optgroup:1,option:1},font:J,ins:P,menu:Q,abbr:L,label:L,table:{thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1},code:L,script:N,tfoot:M,cite:L,li:P,input:{},iframe:P,strong:J,textarea:N,noframes:P,big:J,small:J,span:J,hr:{},dt:L,sub:J,optgroup:{option:1},param:{},bdo:L,'var':J,div:P,object:O,sup:J,dd:P,strike:J,area:{},dir:Q,map:X({area:1,form:1,p:1},A,F,E),applet:O,dl:{dt:1,dd:1},del:P,isindex:{},fieldset:X({legend:1},K),thead:M,ul:Q,acronym:L,b:J,a:J,blockquote:P,caption:L,i:J,u:J,tbody:M,s:L,address:X(D,I),tt:J,legend:L,q:L,pre:X(G,C),p:L,em:J,dfn:L};})();
+var FCKStyle=function(A){this.Element=(A.Element||'span').toLowerCase();this._StyleDesc=A;};FCKStyle.prototype={GetType:function(){var A=this.GetType_$;if (A!=undefined) return A;var B=this.Element;if (B=='#'||FCKListsLib.StyleBlockElements[B]) A=0;else if (FCKListsLib.StyleObjectElements[B]) A=2;else A=1;return (this.GetType_$=A);},ApplyToSelection:function(A){var B=new FCKDomRange(A);B.MoveToSelection();this.ApplyToRange(B,true);},ApplyToRange:function(A,B,C){switch (this.GetType()){case 0:this.ApplyToRange=this._ApplyBlockStyle;break;case 1:this.ApplyToRange=this._ApplyInlineStyle;break;default:return;};this.ApplyToRange(A,B,C);},ApplyToObject:function(A){if (!A) return;this.BuildElement(null,A);},RemoveFromSelection:function(A){var B=new FCKDomRange(A);B.MoveToSelection();this.RemoveFromRange(B,true);},RemoveFromRange:function(A,B,C){var D;var E=this._GetAttribsForComparison();var F=this._GetOverridesForComparison();if (A.CheckIsCollapsed()){var D=A.CreateBookmark(true);var H=A.GetBookmarkNode(D,true);var I=new FCKElementPath(H.parentNode);var J=[];var K=!FCKDomTools.GetNextSibling(H);var L=K||!FCKDomTools.GetPreviousSibling(H);var M;var N=-1;for (var i=0;i<I.Elements.length;i++){var O=I.Elements[i];if (this.CheckElementRemovable(O)){if (L&&!FCKDomTools.CheckIsEmptyElement(O,function(el){return (el!=H);})){M=O;N=J.length-1;}else{var P=O.nodeName.toLowerCase();if (P==this.Element){for (var Q in E){if (FCKDomTools.HasAttribute(O,Q)){switch (Q){case 'style':this._RemoveStylesFromElement(O);break;case 'class':if (FCKDomTools.GetAttributeValue(O,Q)!=this.GetFinalAttributeValue(Q)) continue;default:FCKDomTools.RemoveAttribute(O,Q);}}}};this._RemoveOverrides(O,F[P]);if (this.GetType()==1) this._RemoveNoAttribElement(O);}}else if (L) J.push(O);L=L&&((K&&!FCKDomTools.GetNextSibling(O))||(!K&&!FCKDomTools.GetPreviousSibling(O)));if (M&&(!L||(i==I.Elements.length-1))){var R=FCKDomTools.RemoveNode(H);for (var j=0;j<=N;j++){var S=FCKDomTools.CloneElement(J[j]);S.appendChild(R);R=S;};if (K) FCKDomTools.InsertAfterNode(M,R);else M.parentNode.insertBefore(R,M);L=false;M=null;}};if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);return;};A.Expand('inline_elements');D=A.CreateBookmark(true);var T=A.GetBookmarkNode(D,true);var U=A.GetBookmarkNode(D,false);A.Release(true);var I=new FCKElementPath(T);var X=I.Elements;var O;for (var i=1;i<X.length;i++){O=X[i];if (O==I.Block||O==I.BlockLimit) break;if (this.CheckElementRemovable(O)) FCKDomTools.BreakParent(T,O,A);};I=new FCKElementPath(U);X=I.Elements;for (var i=1;i<X.length;i++){O=X[i];if (O==I.Block||O==I.BlockLimit) break;b=O.nodeName.toLowerCase();if (this.CheckElementRemovable(O)) FCKDomTools.BreakParent(U,O,A);};var Z=FCKDomTools.GetNextSourceNode(T,true);while (Z){var a=FCKDomTools.GetNextSourceNode(Z);if (Z.nodeType==1){var b=Z.nodeName.toLowerCase();var c=(b==this.Element);if (c){for (var Q in E){if (FCKDomTools.HasAttribute(Z,Q)){switch (Q){case 'style':this._RemoveStylesFromElement(Z);break;case 'class':if (FCKDomTools.GetAttributeValue(Z,Q)!=this.GetFinalAttributeValue(Q)) continue;default:FCKDomTools.RemoveAttribute(Z,Q);}}}}else c=!!F[b];if (c){this._RemoveOverrides(Z,F[b]);this._RemoveNoAttribElement(Z);}};if (a==U) break;Z=a;};this._FixBookmarkStart(T);if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);},CheckElementRemovable:function(A,B){if (!A) return false;var C=A.nodeName.toLowerCase();if (C==this.Element){if (!B&&!FCKDomTools.HasAttributes(A)) return true;var D=this._GetAttribsForComparison();var E=(D._length==0);for (var F in D){if (F=='_length') continue;if (this._CompareAttributeValues(F,FCKDomTools.GetAttributeValue(A,F),(this.GetFinalAttributeValue(F)||''))){E=true;if (!B) break;}else{E=false;if (B) return false;}};if (E) return true;};var G=this._GetOverridesForComparison()[C];if (G){if (!(D=G.Attributes)) return true;for (var i=0;i<D.length;i++){var H=D[i][0];if (FCKDomTools.HasAttribute(A,H)){var I=D[i][1];if (I==null||(typeof I=='string'&&FCKDomTools.GetAttributeValue(A,H)==I)||I.test(FCKDomTools.GetAttributeValue(A,H))) return true;}}};return false;},CheckActive:function(A){switch (this.GetType()){case 0:return this.CheckElementRemovable(A.Block||A.BlockLimit,true);case 1:var B=A.Elements;for (var i=0;i<B.length;i++){var C=B[i];if (C==A.Block||C==A.BlockLimit) continue;if (this.CheckElementRemovable(C,true)) return true;}};return false;},RemoveFromElement:function(A){var B=this._GetAttribsForComparison();var C=this._GetOverridesForComparison();var D=A.getElementsByTagName(this.Element);for (var i=D.length-1;i>=0;i--){var E=D[i];for (var F in B){if (FCKDomTools.HasAttribute(E,F)){switch (F){case 'style':this._RemoveStylesFromElement(E);break;case 'class':if (FCKDomTools.GetAttributeValue(E,F)!=this.GetFinalAttributeValue(F)) continue;default:FCKDomTools.RemoveAttribute(E,F);}}};this._RemoveOverrides(E,C[this.Element]);this._RemoveNoAttribElement(E);};for (var G in C){if (G!=this.Element){D=A.getElementsByTagName(G);for (var i=D.length-1;i>=0;i--){var E=D[i];this._RemoveOverrides(E,C[G]);this._RemoveNoAttribElement(E);}}}},_RemoveStylesFromElement:function(A){var B=A.style.cssText;var C=this.GetFinalStyleValue();if (B.length>0&&C.length==0) return;C='(^|;)\\s*('+C.replace(/\s*([^ ]+):.*?(;|$)/g,'$1|').replace(/\|$/,'')+'):[^;]+';var D=new RegExp(C,'gi');B=B.replace(D,'').Trim();if (B.length==0||B==';') FCKDomTools.RemoveAttribute(A,'style');else A.style.cssText=B.replace(D,'');},_RemoveOverrides:function(A,B){var C=B&&B.Attributes;if (C){for (var i=0;i<C.length;i++){var D=C[i][0];if (FCKDomTools.HasAttribute(A,D)){var E=C[i][1];if (E==null||(E.test&&E.test(FCKDomTools.GetAttributeValue(A,D)))||(typeof E=='string'&&FCKDomTools.GetAttributeValue(A,D)==E)) FCKDomTools.RemoveAttribute(A,D);}}}},_RemoveNoAttribElement:function(A){if (!FCKDomTools.HasAttributes(A)){var B=A.firstChild;var C=A.lastChild;FCKDomTools.RemoveNode(A,true);this._MergeSiblings(B);if (B!=C) this._MergeSiblings(C);}},BuildElement:function(A,B){var C=B||A.createElement(this.Element);var D=this._StyleDesc.Attributes;var E;if (D){for (var F in D){E=this.GetFinalAttributeValue(F);if (F.toLowerCase()=='class') C.className=E;else C.setAttribute(F,E);}};if (this._GetStyleText().length>0) C.style.cssText=this.GetFinalStyleValue();return C;},_CompareAttributeValues:function(A,B,C){if (A=='style'&&B&&C){B=B.replace(/;$/,'').toLowerCase();C=C.replace(/;$/,'').toLowerCase();};return (B==C||((B===null||B==='')&&(C===null||C==='')))},GetFinalAttributeValue:function(A){var B=this._StyleDesc.Attributes;var B=B?B[A]:null;if (!B&&A=='style') return this.GetFinalStyleValue();if (B&&this._Variables) B=B.Replace(FCKRegexLib.StyleVariableAttName,this._GetVariableReplace,this);return B;},GetFinalStyleValue:function(){var A=this._GetStyleText();if (A.length>0&&this._Variables){A=A.Replace(FCKRegexLib.StyleVariableAttName,this._GetVariableReplace,this);A=FCKTools.NormalizeCssText(A);};return A;},_GetVariableReplace:function(){return this._Variables[arguments[2]]||arguments[0];},SetVariable:function(A,B){var C=this._Variables;if (!C) C=this._Variables={};this._Variables[A]=B;},_FromPre:function(A,B,C){var D=B.innerHTML;D=D.replace(/(\r\n|\r)/g,'\n');D=D.replace(/^[ \t]*\n/,'');D=D.replace(/\n$/,'');D=D.replace(/^[ \t]+|[ \t]+$/g,function(match,offset,s){if (match.length==1) return '&nbsp;';else if (offset==0) return new Array(match.length).join('&nbsp;')+' ';else return ' '+new Array(match.length).join('&nbsp;');});var E=new FCKHtmlIterator(D);var F=[];E.Each(function(isTag,value){if (!isTag){value=value.replace(/\n/g,'<br>');value=value.replace(/[ \t]{2,}/g,function (match){return new Array(match.length).join('&nbsp;')+' ';});};F.push(value);});C.innerHTML=F.join('');return C;},_ToPre:function(A,B,C){var D=B.innerHTML.Trim();D=D.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,'<br />');var E=new FCKHtmlIterator(D);var F=[];E.Each(function(isTag,value){if (!isTag) value=value.replace(/([ \t\n\r]+|&nbsp;)/g,' ');else if (isTag&&value=='<br />') value='\n';F.push(value);});if (FCKBrowserInfo.IsIE){var G=A.createElement('div');G.appendChild(C);C.outerHTML='<pre>\n'+F.join('')+'</pre>';C=G.removeChild(G.firstChild);}else C.innerHTML=F.join('');return C;},_CheckAndMergePre:function(A,B){if (A!=FCKDomTools.GetPreviousSourceElement(B,true)) return;var C=A.innerHTML.replace(/\n$/,'')+'\n\n'+B.innerHTML.replace(/^\n/,'');if (FCKBrowserInfo.IsIE) B.outerHTML='<pre>'+C+'</pre>';else B.innerHTML=C;FCKDomTools.RemoveNode(A);},_CheckAndSplitPre:function(A){var B;var C=A.firstChild;C=C&&C.nextSibling;while (C){var D=C.nextSibling;if (D&&D.nextSibling&&C.nodeName.IEquals('br')&&D.nodeName.IEquals('br')){FCKDomTools.RemoveNode(C);C=D.nextSibling;FCKDomTools.RemoveNode(D);B=FCKDomTools.InsertAfterNode(B||A,FCKDomTools.CloneElement(A));continue;};if (B){C=C.previousSibling;FCKDomTools.MoveNode(C.nextSibling,B);};C=C.nextSibling;}},_ApplyBlockStyle:function(A,B,C){var D;if (B) D=A.CreateBookmark();var E=new FCKDomRangeIterator(A);E.EnforceRealBlocks=true;var F;var G=A.Window.document;var H;while((F=E.GetNextParagraph())){var I=this.BuildElement(G);var J=I.nodeName.IEquals('pre');var K=F.nodeName.IEquals('pre');var L=J&&!K;var M=!J&&K;if (L) I=this._ToPre(G,F,I);else if (M) I=this._FromPre(G,F,I);else FCKDomTools.MoveChildren(F,I);F.parentNode.insertBefore(I,F);FCKDomTools.RemoveNode(F);if (J){if (H) this._CheckAndMergePre(H,I);H=I;}else if (M) this._CheckAndSplitPre(I);};if (B) A.SelectBookmark(D);if (C) A.MoveToBookmark(D);},_ApplyInlineStyle:function(A,B,C){var D=A.Window.document;if (A.CheckIsCollapsed()){var E=this.BuildElement(D);A.InsertNode(E);A.MoveToPosition(E,2);A.Select();return;};var F=this.Element;var G=FCK.DTD[F]||FCK.DTD.span;var H=this._GetAttribsForComparison();var I;A.Expand('inline_elements');var J=A.CreateBookmark(true);var K=A.GetBookmarkNode(J,true);var L=A.GetBookmarkNode(J,false);A.Release(true);var M=FCKDomTools.GetNextSourceNode(K,true);while (M){var N=false;var O=M.nodeType;var P=O==1?M.nodeName.toLowerCase():null;if (!P||G[P]){if ((FCK.DTD[M.parentNode.nodeName.toLowerCase()]||FCK.DTD.span)[F]||!FCK.DTD[F]){if (!A.CheckHasRange()) A.SetStart(M,3);if (O!=1||M.childNodes.length==0){var Q=M;var R=Q.parentNode;while (Q==R.lastChild&&G[R.nodeName.toLowerCase()]){Q=R;};A.SetEnd(Q,4);if (Q==Q.parentNode.lastChild&&!G[Q.parentNode.nodeName.toLowerCase()]) N=true;}else{A.SetEnd(M,3);}}else N=true;}else N=true;M=FCKDomTools.GetNextSourceNode(M);if (M==L){M=null;N=true;};if (N&&A.CheckHasRange()&&!A.CheckIsCollapsed()){I=this.BuildElement(D);A.ExtractContents().AppendTo(I);if (I.innerHTML.RTrim().length>0){A.InsertNode(I);this.RemoveFromElement(I);this._MergeSiblings(I,this._GetAttribsForComparison());if (!FCKBrowserInfo.IsIE) I.normalize();};A.Release(true);}};this._FixBookmarkStart(K);if (B) A.SelectBookmark(J);if (C) A.MoveToBookmark(J);},_FixBookmarkStart:function(A){var B;while ((B=A.nextSibling)){if (B.nodeType==1&&FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){if (!B.firstChild) FCKDomTools.RemoveNode(B);else FCKDomTools.MoveNode(A,B,true);continue;};if (B.nodeType==3&&B.length==0){FCKDomTools.RemoveNode(B);continue;};break;}},_MergeSiblings:function(A,B){if (!A||A.nodeType!=1||!FCKListsLib.InlineNonEmptyElements[A.nodeName.toLowerCase()]) return;this._MergeNextSibling(A,B);this._MergePreviousSibling(A,B);},_MergeNextSibling:function(A,B){var C=A.nextSibling;var D=(C&&C.nodeType==1&&C.getAttribute('_fck_bookmark'));if (D) C=C.nextSibling;if (C&&C.nodeType==1&&C.nodeName==A.nodeName){if (!B) B=this._CreateElementAttribsForComparison(A);if (this._CheckAttributesMatch(C,B)){var E=A.lastChild;if (D) FCKDomTools.MoveNode(A.nextSibling,A);FCKDomTools.MoveChildren(C,A);FCKDomTools.RemoveNode(C);if (E) this._MergeNextSibling(E);}}},_MergePreviousSibling:function(A,B){var C=A.previousSibling;var D=(C&&C.nodeType==1&&C.getAttribute('_fck_bookmark'));if (D) C=C.previousSibling;if (C&&C.nodeType==1&&C.nodeName==A.nodeName){if (!B) B=this._CreateElementAttribsForComparison(A);if (this._CheckAttributesMatch(C,B)){var E=A.firstChild;if (D) FCKDomTools.MoveNode(A.previousSibling,A,true);FCKDomTools.MoveChildren(C,A,true);FCKDomTools.RemoveNode(C);if (E) this._MergePreviousSibling(E);}}},_GetStyleText:function(){var A=this._StyleDesc.Styles;var B=(this._StyleDesc.Attributes?this._StyleDesc.Attributes['style']||'':'');if (B.length>0) B+=';';for (var C in A) B+=C+':'+A[C]+';';if (B.length>0&&!(/#\(/.test(B))){B=FCKTools.NormalizeCssText(B);};return (this._GetStyleText=function() { return B;})();},_GetAttribsForComparison:function(){var A=this._GetAttribsForComparison_$;if (A) return A;A={};var B=this._StyleDesc.Attributes;if (B){for (var C in B){A[C.toLowerCase()]=B[C].toLowerCase();}};if (this._GetStyleText().length>0){A['style']=this._GetStyleText().toLowerCase();};FCKTools.AppendLengthProperty(A,'_length');return (this._GetAttribsForComparison_$=A);},_GetOverridesForComparison:function(){var A=this._GetOverridesForComparison_$;if (A) return A;A={};var B=this._StyleDesc.Overrides;if (B){if (!FCKTools.IsArray(B)) B=[B];for (var i=0;i<B.length;i++){var C=B[i];var D;var E;var F;if (typeof C=='string') D=C.toLowerCase();else{D=C.Element?C.Element.toLowerCase():this.Element;F=C.Attributes;};E=A[D]||(A[D]={});if (F){var G=(E.Attributes=E.Attributes||[]);for (var H in F){G.push([H.toLowerCase(),F[H]]);}}}};return (this._GetOverridesForComparison_$=A);},_CreateElementAttribsForComparison:function(A){var B={};var C=0;for (var i=0;i<A.attributes.length;i++){var D=A.attributes[i];if (D.specified){B[D.nodeName.toLowerCase()]=FCKDomTools.GetAttributeValue(A,D).toLowerCase();C++;}};B._length=C;return B;},_CheckAttributesMatch:function(A,B){var C=A.attributes;var D=0;for (var i=0;i<C.length;i++){var E=C[i];if (E.specified){var F=E.nodeName.toLowerCase();var G=B[F];if (!G) break;if (G!=FCKDomTools.GetAttributeValue(A,E).toLowerCase()) break;D++;}};return (D==B._length);}};
+var FCKStyles=FCK.Styles={_Callbacks:{},_ObjectStyles:{},ApplyStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){if (A.GetType()==2) A.ApplyToObject(FCKSelection.GetSelectedElement());else A.ApplyToSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},RemoveStyle:function(A){if (typeof A=='string') A=this.GetStyles()[A];if (A){A.RemoveFromSelection(FCK.EditorWindow);FCK.Events.FireEvent('OnSelectionChange');}},AttachStyleStateChange:function(A,B,C){var D=this._Callbacks[A];if (!D) D=this._Callbacks[A]=[];D.push([B,C]);},CheckSelectionChanges:function(){var A=FCKSelection.GetBoundaryParentElement(true);if (!A) return;var B=new FCKElementPath(A);var C=this.GetStyles();for (var D in C){var E=this._Callbacks[D];if (E){var F=C[D];var G=F.CheckActive(B);if (G!=(F._LastState||null)){F._LastState=G;for (var i=0;i<E.length;i++){var H=E[i][0];var I=E[i][1];H.call(I||window,D,G);}}}}},CheckStyleInSelection:function(A){return false;},_GetRemoveFormatTagsRegex:function (){var A=new RegExp('^(?:'+FCKConfig.RemoveFormatTags.replace(/,/g,'|')+')$','i');return (this._GetRemoveFormatTagsRegex=function(){return A;})&&A;},RemoveAll:function(){var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();if (A.CheckIsCollapsed()) return;A.Expand('inline_elements');var B=A.CreateBookmark(true);var C=A.GetBookmarkNode(B,true);var D=A.GetBookmarkNode(B,false);A.Release(true);var E=this._GetRemoveFormatTagsRegex();var F=new FCKElementPath(C);var G=F.Elements;var H;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;if (E.test(H.nodeName)) FCKDomTools.BreakParent(C,H,A);};F=new FCKElementPath(D);G=F.Elements;for (var i=1;i<G.length;i++){H=G[i];if (H==F.Block||H==F.BlockLimit) break;elementName=H.nodeName.toLowerCase();if (E.test(H.nodeName)) FCKDomTools.BreakParent(D,H,A);};var I=FCKDomTools.GetNextSourceNode(C,true,1);while (I){if (I==D) break;var J=FCKDomTools.GetNextSourceNode(I,false,1);if (E.test(I.nodeName)) FCKDomTools.RemoveNode(I,true);else FCKDomTools.RemoveAttributes(I,FCKConfig.RemoveAttributesArray);I=J;};A.SelectBookmark(B);FCK.Events.FireEvent('OnSelectionChange');},GetStyle:function(A){return this.GetStyles()[A];},GetStyles:function(){var A=this._GetStyles;if (!A){A=this._GetStyles=FCKTools.Merge(this._LoadStylesCore(),this._LoadStylesCustom(),this._LoadStylesXml());};return A;},CheckHasObjectStyle:function(A){return!!this._ObjectStyles[A];},_LoadStylesCore:function(){var A={};var B=FCKConfig.CoreStyles;for (var C in B){var D=A['_FCK_'+C]=new FCKStyle(B[C]);D.IsCore=true;};return A;},_LoadStylesCustom:function(){var A={};var B=FCKConfig.CustomStyles;if (B){for (var C in B){var D=A[C]=new FCKStyle(B[C]);D.Name=C;}};return A;},_LoadStylesXml:function(){var A={};var B=FCKConfig.StylesXmlPath;if (!B||B.length==0) return A;var C=new FCKXml();C.LoadUrl(B);var D=FCKXml.TransformToObject(C.SelectSingleNode('Styles'));var E=D.$Style;if (!E) return A;for (var i=0;i<E.length;i++){var F=E[i];var G=(F.element||'').toLowerCase();if (G.length==0) throw('The element name is required. Error loading "'+B+'"');var H={Element:G,Attributes:{},Styles:{},Overrides:[]};var I=F.$Attribute||[];for (var j=0;j<I.length;j++){H.Attributes[I[j].name]=I[j].value;};var J=F.$Style||[];for (j=0;j<J.length;j++){H.Styles[J[j].name]=J[j].value;};var K=F.$Override;if (K){for (j=0;j<K.length;j++){var L=K[j];var M={Element:L.element};var N=L.$Attribute;if (N){M.Attributes={};for (var k=0;k<N.length;k++){var O=N[k].value||null;if (O){var P=O&&FCKRegexLib.RegExp.exec(O);if (P) O=new RegExp(P[1],P[2]||'');};M.Attributes[N[k].name]=O;}};H.Overrides.push(M);}};var Q=new FCKStyle(H);Q.Name=F.name||G;if (Q.GetType()==2) this._ObjectStyles[G]=true;A[Q.Name]=Q;};return A;}};
+var FCKListHandler={OutdentListItem:function(A){var B=A.parentNode;if (B.tagName.toUpperCase().Equals('UL','OL')){var C=FCKTools.GetElementDocument(A);var D=new FCKDocumentFragment(C);var E=D.RootNode;var F=false;var G=FCKDomTools.GetFirstChild(A,['UL','OL']);if (G){F=true;var H;while ((H=G.firstChild)) E.appendChild(G.removeChild(H));FCKDomTools.RemoveNode(G);};var I;var J=false;while ((I=A.nextSibling)){if (!F&&I.nodeType==1&&I.nodeName.toUpperCase()=='LI') J=F=true;E.appendChild(I.parentNode.removeChild(I));if (!J&&I.nodeType==1&&I.nodeName.toUpperCase().Equals('UL','OL')) FCKDomTools.RemoveNode(I,true);};var K=B.parentNode.tagName.toUpperCase();var L=(K=='LI');if (L||K.Equals('UL','OL')){if (F){var G=B.cloneNode(false);D.AppendTo(G);A.appendChild(G);}else if (L) D.InsertAfterNode(B.parentNode);else D.InsertAfterNode(B);if (L) FCKDomTools.InsertAfterNode(B.parentNode,B.removeChild(A));else FCKDomTools.InsertAfterNode(B,B.removeChild(A));}else{if (F){var N=B.cloneNode(false);D.AppendTo(N);FCKDomTools.InsertAfterNode(B,N);};var O=C.createElement(FCKConfig.EnterMode=='p'?'p':'div');FCKDomTools.MoveChildren(B.removeChild(A),O);FCKDomTools.InsertAfterNode(B,O);if (FCKConfig.EnterMode=='br'){if (FCKBrowserInfo.IsGecko) O.parentNode.insertBefore(FCKTools.CreateBogusBR(C),O);else FCKDomTools.InsertAfterNode(O,FCKTools.CreateBogusBR(C));FCKDomTools.RemoveNode(O,true);}};if (this.CheckEmptyList(B)) FCKDomTools.RemoveNode(B,true);}},CheckEmptyList:function(A){return (FCKDomTools.GetFirstChild(A,'LI')==null);},CheckListHasContents:function(A){var B=A.firstChild;while (B){switch (B.nodeType){case 1:if (!B.nodeName.IEquals('UL','LI')) return true;break;case 3:if (B.nodeValue.Trim().length>0) return true;};B=B.nextSibling;};return false;}};
+var FCKElementPath=function(A){var B=null;var C=null;var D=[];var e=A;while (e){if (e.nodeType==1){if (!this.LastElement) this.LastElement=e;var E=e.nodeName.toLowerCase();if (FCKBrowserInfo.IsIE&&e.scopeName!='HTML') E=e.scopeName.toLowerCase()+':'+E;if (!C){if (!B&&FCKListsLib.PathBlockElements[E]!=null) B=e;if (FCKListsLib.PathBlockLimitElements[E]!=null){if (!B&&E=='div'&&!FCKElementPath._CheckHasBlock(e)) B=e;else C=e;}};D.push(e);if (E=='body') break;};e=e.parentNode;};this.Block=B;this.BlockLimit=C;this.Elements=D;};FCKElementPath._CheckHasBlock=function(A){var B=A.childNodes;for (var i=0,count=B.length;i<count;i++){var C=B[i];if (C.nodeType==1&&FCKListsLib.BlockElements[C.nodeName.toLowerCase()]) return true;};return false;};
+var FCKDomRange=function(A){this.Window=A;this._Cache={};};FCKDomRange.prototype={_UpdateElementInfo:function(){var A=this._Range;if (!A) this.Release(true);else{var B=A.startContainer;var C=new FCKElementPath(B);this.StartNode=B.nodeType==3?B:B.childNodes[A.startOffset];this.StartContainer=B;this.StartBlock=C.Block;this.StartBlockLimit=C.BlockLimit;if (A.collapsed){this.EndNode=this.StartNode;this.EndContainer=this.StartContainer;this.EndBlock=this.StartBlock;this.EndBlockLimit=this.StartBlockLimit;}else{var D=A.endContainer;if (B!=D) C=new FCKElementPath(D);var E=D;if (A.endOffset==0){while (E&&!E.previousSibling) E=E.parentNode;if (E) E=E.previousSibling;}else if (E.nodeType==1) E=E.childNodes[A.endOffset-1];this.EndNode=E;this.EndContainer=D;this.EndBlock=C.Block;this.EndBlockLimit=C.BlockLimit;}};this._Cache={};},CreateRange:function(){return new FCKW3CRange(this.Window.document);},DeleteContents:function(){if (this._Range){this._Range.deleteContents();this._UpdateElementInfo();}},ExtractContents:function(){if (this._Range){var A=this._Range.extractContents();this._UpdateElementInfo();return A;};return null;},CheckIsCollapsed:function(){if (this._Range) return this._Range.collapsed;return false;},Collapse:function(A){if (this._Range) this._Range.collapse(A);this._UpdateElementInfo();},Clone:function(){var A=FCKTools.CloneObject(this);if (this._Range) A._Range=this._Range.cloneRange();return A;},MoveToNodeContents:function(A){if (!this._Range) this._Range=this.CreateRange();this._Range.selectNodeContents(A);this._UpdateElementInfo();},MoveToElementStart:function(A){this.SetStart(A,1);this.SetEnd(A,1);},MoveToElementEditStart:function(A){var B;while (A&&A.nodeType==1){if (FCKDomTools.CheckIsEditable(A)) B=A;else if (B) break;A=A.firstChild;};if (B) this.MoveToElementStart(B);},InsertNode:function(A){if (this._Range) this._Range.insertNode(A);},CheckIsEmpty:function(){if (this.CheckIsCollapsed()) return true;var A=this.Window.document.createElement('div');this._Range.cloneContents().AppendTo(A);FCKDomTools.TrimNode(A);return (A.innerHTML.length==0);},CheckStartOfBlock:function(){var A=this._Cache;var B=A.IsStartOfBlock;if (B!=undefined) return B;var C=this.StartBlock||this.StartBlockLimit;var D=this._Range.startContainer;var E=this._Range.startOffset;var F;if (E>0){if (D.nodeType==3){var G=D.nodeValue.substr(0,E).Trim();if (G.length!=0) return A.IsStartOfBlock=false;}else F=D.childNodes[E-1];};if (!F) F=FCKDomTools.GetPreviousSourceNode(D,true,null,C);while (F){switch (F.nodeType){case 1:if (!FCKListsLib.InlineChildReqElements[F.nodeName.toLowerCase()]) return A.IsStartOfBlock=false;break;case 3:if (F.nodeValue.Trim().length>0) return A.IsStartOfBlock=false;};F=FCKDomTools.GetPreviousSourceNode(F,false,null,C);};return A.IsStartOfBlock=true;},CheckEndOfBlock:function(A){var B=this._Cache.IsEndOfBlock;if (B!=undefined) return B;var C=this.EndBlock||this.EndBlockLimit;var D=this._Range.endContainer;var E=this._Range.endOffset;var F;if (D.nodeType==3){var G=D.nodeValue;if (E<G.length){G=G.substr(E);if (G.Trim().length!=0) return this._Cache.IsEndOfBlock=false;}}else F=D.childNodes[E];if (!F) F=FCKDomTools.GetNextSourceNode(D,true,null,C);var H=false;while (F){switch (F.nodeType){case 1:var I=F.nodeName.toLowerCase();if (FCKListsLib.InlineChildReqElements[I]) break;if (I=='br'&&!H){H=true;break;};return this._Cache.IsEndOfBlock=false;case 3:if (F.nodeValue.Trim().length>0) return this._Cache.IsEndOfBlock=false;};F=FCKDomTools.GetNextSourceNode(F,false,null,C);};if (A) this.Select();return this._Cache.IsEndOfBlock=true;},CreateBookmark:function(A){var B={StartId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'S',EndId:(new Date()).valueOf()+Math.floor(Math.random()*1000)+'E'};var C=this.Window.document;var D;var E;var F;if (!this.CheckIsCollapsed()){E=C.createElement('span');E.style.display='none';E.id=B.EndId;E.setAttribute('_fck_bookmark',true);E.innerHTML='&nbsp;';F=this.Clone();F.Collapse(false);F.InsertNode(E);};D=C.createElement('span');D.style.display='none';D.id=B.StartId;D.setAttribute('_fck_bookmark',true);D.innerHTML='&nbsp;';F=this.Clone();F.Collapse(true);F.InsertNode(D);if (A){B.StartNode=D;B.EndNode=E;};if (E){this.SetStart(D,4);this.SetEnd(E,3);}else this.MoveToPosition(D,4);return B;},GetBookmarkNode:function(A,B){var C=this.Window.document;if (B) return A.StartNode||C.getElementById(A.StartId);else return A.EndNode||C.getElementById(A.EndId);},MoveToBookmark:function(A,B){var C=this.GetBookmarkNode(A,true);var D=this.GetBookmarkNode(A,false);this.SetStart(C,3);if (!B) FCKDomTools.RemoveNode(C);if (D){this.SetEnd(D,3);if (!B) FCKDomTools.RemoveNode(D);}else this.Collapse(true);this._UpdateElementInfo();},CreateBookmark2:function(){if (!this._Range) return { "Start":0,"End":0 };var A={"Start":[this._Range.startOffset],"End":[this._Range.endOffset]};var B=this._Range.startContainer.previousSibling;var C=this._Range.endContainer.previousSibling;var D=this._Range.startContainer;var E=this._Range.endContainer;while (B&&D.nodeType==3){A.Start[0]+=B.length;D=B;B=B.previousSibling;}while (C&&E.nodeType==3){A.End[0]+=C.length;E=C;C=C.previousSibling;};if (D.nodeType==1&&D.childNodes[A.Start[0]]&&D.childNodes[A.Start[0]].nodeType==3){var F=D.childNodes[A.Start[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};D=F;A.Start[0]=G;};if (E.nodeType==1&&E.childNodes[A.End[0]]&&E.childNodes[A.End[0]].nodeType==3){var F=E.childNodes[A.End[0]];var G=0;while (F.previousSibling&&F.previousSibling.nodeType==3){F=F.previousSibling;G+=F.length;};E=F;A.End[0]=G;};A.Start=FCKDomTools.GetNodeAddress(D,true).concat(A.Start);A.End=FCKDomTools.GetNodeAddress(E,true).concat(A.End);return A;},MoveToBookmark2:function(A){var B=FCKDomTools.GetNodeFromAddress(this.Window.document,A.Start.slice(0,-1),true);var C=FCKDomTools.GetNodeFromAddress(this.Window.document,A.End.slice(0,-1),true);this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var D=A.Start[A.Start.length-1];var E=A.End[A.End.length-1];while (B.nodeType==3&&D>B.length){if (!B.nextSibling||B.nextSibling.nodeType!=3) break;D-=B.length;B=B.nextSibling;}while (C.nodeType==3&&E>C.length){if (!C.nextSibling||C.nextSibling.nodeType!=3) break;E-=C.length;C=C.nextSibling;};this._Range.setStart(B,D);this._Range.setEnd(C,E);this._UpdateElementInfo();},MoveToPosition:function(A,B){this.SetStart(A,B);this.Collapse(true);},SetStart:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setStart(A,0);break;case 2:D.setStart(A,A.childNodes.length);break;case 3:D.setStartBefore(A);break;case 4:D.setStartAfter(A);};if (!C) this._UpdateElementInfo();},SetEnd:function(A,B,C){var D=this._Range;if (!D) D=this._Range=this.CreateRange();switch(B){case 1:D.setEnd(A,0);break;case 2:D.setEnd(A,A.childNodes.length);break;case 3:D.setEndBefore(A);break;case 4:D.setEndAfter(A);};if (!C) this._UpdateElementInfo();},Expand:function(A){var B,oSibling;switch (A){case 'inline_elements':if (this._Range.startOffset==0){B=this._Range.startContainer;if (B.nodeType!=1) B=B.previousSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setStartBefore(B);if (B!=B.parentNode.firstChild) break;B=B.parentNode;}}};B=this._Range.endContainer;var C=this._Range.endOffset;if ((B.nodeType==3&&C>=B.nodeValue.length)||(B.nodeType==1&&C>=B.childNodes.length)||(B.nodeType!=1&&B.nodeType!=3)){if (B.nodeType!=1) B=B.nextSibling?null:B.parentNode;if (B){while (FCKListsLib.InlineNonEmptyElements[B.nodeName.toLowerCase()]){this._Range.setEndAfter(B);if (B!=B.parentNode.lastChild) break;B=B.parentNode;}}};break;case 'block_contents':case 'list_contents':var D=FCKListsLib.BlockBoundaries;if (A=='list_contents'||FCKConfig.EnterMode=='br') D=FCKListsLib.ListBoundaries;if (this.StartBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents') this.SetStart(this.StartBlock,1);else{B=this._Range.startContainer;if (B.nodeType==1){var E=B.childNodes[this._Range.startOffset];if (E) B=FCKDomTools.GetPreviousSourceNode(E,true);else B=B.lastChild||B;}while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setStartBefore(B);B=B.previousSibling||B.parentNode;}};if (this.EndBlock&&FCKConfig.EnterMode!='br'&&A=='block_contents'&&this.EndBlock.nodeName.toLowerCase()!='li') this.SetEnd(this.EndBlock,2);else{B=this._Range.endContainer;if (B.nodeType==1) B=B.childNodes[this._Range.endOffset]||B.lastChild;while (B&&(B.nodeType!=1||(B!=this.StartBlockLimit&&!D[B.nodeName.toLowerCase()]))){this._Range.setEndAfter(B);B=B.nextSibling||B.parentNode;};if (B&&B.nodeName.toLowerCase()=='br') this._Range.setEndAfter(B);};this._UpdateElementInfo();}},SplitBlock:function(A){var B=A||FCKConfig.EnterMode;if (!this._Range) this.MoveToSelection();if (this.StartBlockLimit==this.EndBlockLimit){var C=this.StartBlock;var D=this.EndBlock;var E=null;if (B!='br'){if (!C){C=this.FixBlock(true,B);D=this.EndBlock;};if (!D) D=this.FixBlock(false,B);};var F=(C!=null&&this.CheckStartOfBlock());var G=(D!=null&&this.CheckEndOfBlock());if (!this.CheckIsEmpty()) this.DeleteContents();if (C&&D&&C==D){if (G){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(D,4);D=null;}else if (F){E=new FCKElementPath(this.StartContainer);this.MoveToPosition(C,3);C=null;}else{this.SetEnd(C,2);var H=this.ExtractContents();D=C.cloneNode(false);D.removeAttribute('id',false);H.AppendTo(D);FCKDomTools.InsertAfterNode(C,D);this.MoveToPosition(C,4);if (FCKBrowserInfo.IsGecko&&!C.nodeName.IEquals(['ul','ol'])) FCKTools.AppendBogusBr(C);}};return {PreviousBlock:C,NextBlock:D,WasStartOfBlock:F,WasEndOfBlock:G,ElementPath:E};};return null;},FixBlock:function(A,B){var C=this.CreateBookmark();this.Collapse(A);this.Expand('block_contents');var D=this.Window.document.createElement(B);this.ExtractContents().AppendTo(D);FCKDomTools.TrimNode(D);if (FCKDomTools.CheckIsEmptyElement(D,function(element) { return element.getAttribute('_fck_bookmark')!='true';})&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(D);this.InsertNode(D);this.MoveToBookmark(C);return D;},Release:function(A){if (!A) this.Window=null;this.StartNode=null;this.StartContainer=null;this.StartBlock=null;this.StartBlockLimit=null;this.EndNode=null;this.EndContainer=null;this.EndBlock=null;this.EndBlockLimit=null;this._Range=null;this._Cache=null;},CheckHasRange:function(){return!!this._Range;},GetTouchedStartNode:function(){var A=this._Range;var B=A.startContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.startOffset]||B;},GetTouchedEndNode:function(){var A=this._Range;var B=A.endContainer;if (A.collapsed||B.nodeType!=1) return B;return B.childNodes[A.endOffset-1]||B;}};
+FCKDomRange.prototype.MoveToSelection=function(){this.Release(true);this._Range=new FCKW3CRange(this.Window.document);var A=this.Window.document.selection;if (A.type!='Control'){var B=this._GetSelectionMarkerTag(true);var C=this._GetSelectionMarkerTag(false);if (!B&&!C){this._Range.setStart(this.Window.document.body,0);this._UpdateElementInfo();return;};this._Range.setStart(B.parentNode,FCKDomTools.GetIndexOf(B));B.parentNode.removeChild(B);this._Range.setEnd(C.parentNode,FCKDomTools.GetIndexOf(C));C.parentNode.removeChild(C);this._UpdateElementInfo();}else{var D=A.createRange().item(0);if (D){this._Range.setStartBefore(D);this._Range.setEndAfter(D);this._UpdateElementInfo();}}};FCKDomRange.prototype.Select=function(A){if (this._Range) this.SelectBookmark(this.CreateBookmark(true),A);};FCKDomRange.prototype.SelectBookmark=function(A,B){var C=this.CheckIsCollapsed();var D;var E;var F=this.GetBookmarkNode(A,true);if (!F) return;var G;if (!C) G=this.GetBookmarkNode(A,false);var H=this.Window.document.body.createTextRange();H.moveToElementText(F);H.moveStart('character',1);if (G){var I=this.Window.document.body.createTextRange();I.moveToElementText(G);H.setEndPoint('EndToEnd',I);H.moveEnd('character',-1);}else{D=(B||!F.previousSibling||F.previousSibling.nodeName.toLowerCase()=='br')&&!F.nextSibing;E=this.Window.document.createElement('span');E.innerHTML='&#65279;';F.parentNode.insertBefore(E,F);if (D){F.parentNode.insertBefore(this.Window.document.createTextNode('\ufeff'),F);}};if (!this._Range) this._Range=this.CreateRange();this._Range.setStartBefore(F);F.parentNode.removeChild(F);if (C){if (D){H.moveStart('character',-1);H.select();this.Window.document.selection.clear();}else H.select();FCKDomTools.RemoveNode(E);}else{this._Range.setEndBefore(G);G.parentNode.removeChild(G);H.select();}};FCKDomRange.prototype._GetSelectionMarkerTag=function(A){var B=this.Window.document;var C=B.selection;var D;try{D=C.createRange();}catch (e){return null;};if (D.parentElement().document!=B) return null;D.collapse(A===true);var E='fck_dom_range_temp_'+(new Date()).valueOf()+'_'+Math.floor(Math.random()*1000);D.pasteHTML('<span id="'+E+'"></span>');return B.getElementById(E);};
+var FCKDomRangeIterator=function(A){this.Range=A;this.ForceBrBreak=false;this.EnforceRealBlocks=false;};FCKDomRangeIterator.CreateFromSelection=function(A){var B=new FCKDomRange(A);B.MoveToSelection();return new FCKDomRangeIterator(B);};FCKDomRangeIterator.prototype={GetNextParagraph:function(){var A;var B;var C;var D;var E;var F=this.ForceBrBreak?FCKListsLib.ListBoundaries:FCKListsLib.BlockBoundaries;if (!this._LastNode){var B=this.Range.Clone();B.Expand(this.ForceBrBreak?'list_contents':'block_contents');this._NextNode=B.GetTouchedStartNode();this._LastNode=B.GetTouchedEndNode();B=null;};var H=this._NextNode;var I=this._LastNode;this._NextNode=null;while (H){var J=false;var K=(H.nodeType!=1);var L=false;if (!K){var M=H.nodeName.toLowerCase();if (F[M]&&(!FCKBrowserInfo.IsIE||H.scopeName=='HTML')){if (M=='br') K=true;else if (!B&&H.childNodes.length==0&&M!='hr'){A=H;C=H==I;break;};if (B){B.SetEnd(H,3,true);if (M!='br') this._NextNode=FCKDomTools.GetNextSourceNode(H,true,null,I);};J=true;}else{if (H.firstChild){if (!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};H=H.firstChild;continue;};K=true;}}else if (H.nodeType==3){if (/^[\r\n\t ]+$/.test(H.nodeValue)) K=false;};if (K&&!B){B=new FCKDomRange(this.Range.Window);B.SetStart(H,3,true);};C=((!J||K)&&H==I);if (B&&!J){while (!H.nextSibling&&!C){var N=H.parentNode;if (F[N.nodeName.toLowerCase()]){J=true;C=C||(N==I);break;};H=N;K=true;C=(H==I);L=true;}};if (K) B.SetEnd(H,4,true);if ((J||C)&&B){B._UpdateElementInfo();if (B.StartNode==B.EndNode&&B.StartNode.parentNode==B.StartBlockLimit&&B.StartNode.getAttribute&&B.StartNode.getAttribute('_fck_bookmark')) B=null;else break;};if (C) break;H=FCKDomTools.GetNextSourceNode(H,L,null,I);};if (!A){if (!B){this._NextNode=null;return null;};A=B.StartBlock;if (!A&&!this.EnforceRealBlocks&&B.StartBlockLimit.nodeName.IEquals('DIV','TH','TD')&&B.CheckStartOfBlock()&&B.CheckEndOfBlock()){A=B.StartBlockLimit;}else if (!A||(this.EnforceRealBlocks&&A.nodeName.toLowerCase()=='li')){A=this.Range.Window.document.createElement(FCKConfig.EnterMode=='p'?'p':'div');B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);B.InsertNode(A);D=true;E=true;}else if (A.nodeName.toLowerCase()!='li'){if (!B.CheckStartOfBlock()||!B.CheckEndOfBlock()){A=A.cloneNode(false);B.ExtractContents().AppendTo(A);FCKDomTools.TrimNode(A);var O=B.SplitBlock();D=!O.WasStartOfBlock;E=!O.WasEndOfBlock;B.InsertNode(A);}}else if (!C){this._NextNode=A==I?null:FCKDomTools.GetNextSourceNode(B.EndNode,true,null,I);return A;}};if (D){var P=A.previousSibling;if (P&&P.nodeType==1){if (P.nodeName.toLowerCase()=='br') P.parentNode.removeChild(P);else if (P.lastChild&&P.lastChild.nodeName.IEquals('br')) P.removeChild(P.lastChild);}};if (E){var Q=A.lastChild;if (Q&&Q.nodeType==1&&Q.nodeName.toLowerCase()=='br') A.removeChild(Q);};if (!this._NextNode) this._NextNode=(C||A==I)?null:FCKDomTools.GetNextSourceNode(A,true,null,I);return A;}};
+var FCKDocumentFragment=function(A){this._Document=A;this.RootNode=A.createElement('div');};FCKDocumentFragment.prototype={AppendTo:function(A){FCKDomTools.MoveChildren(this.RootNode,A);},AppendHtml:function(A){var B=this._Document.createElement('div');B.innerHTML=A;FCKDomTools.MoveChildren(B,this.RootNode);},InsertAfterNode:function(A){var B=this.RootNode;var C;while((C=B.lastChild)) FCKDomTools.InsertAfterNode(A,B.removeChild(C));}};
+var FCKW3CRange=function(A){this._Document=A;this.startContainer=null;this.startOffset=null;this.endContainer=null;this.endOffset=null;this.collapsed=true;};FCKW3CRange.CreateRange=function(A){return new FCKW3CRange(A);};FCKW3CRange.CreateFromRange=function(A,B){var C=FCKW3CRange.CreateRange(A);C.setStart(B.startContainer,B.startOffset);C.setEnd(B.endContainer,B.endOffset);return C;};FCKW3CRange.prototype={_UpdateCollapsed:function(){this.collapsed=(this.startContainer==this.endContainer&&this.startOffset==this.endOffset);},setStart:function(A,B){this.startContainer=A;this.startOffset=B;if (!this.endContainer){this.endContainer=A;this.endOffset=B;};this._UpdateCollapsed();},setEnd:function(A,B){this.endContainer=A;this.endOffset=B;if (!this.startContainer){this.startContainer=A;this.startOffset=B;};this._UpdateCollapsed();},setStartAfter:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setStartBefore:function(A){this.setStart(A.parentNode,FCKDomTools.GetIndexOf(A));},setEndAfter:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A)+1);},setEndBefore:function(A){this.setEnd(A.parentNode,FCKDomTools.GetIndexOf(A));},collapse:function(A){if (A){this.endContainer=this.startContainer;this.endOffset=this.startOffset;}else{this.startContainer=this.endContainer;this.startOffset=this.endOffset;};this.collapsed=true;},selectNodeContents:function(A){this.setStart(A,0);this.setEnd(A,A.nodeType==3?A.data.length:A.childNodes.length);},insertNode:function(A){var B=this.startContainer;var C=this.startOffset;if (B.nodeType==3){B.splitText(C);if (B==this.endContainer) this.setEnd(B.nextSibling,this.endOffset-this.startOffset);FCKDomTools.InsertAfterNode(B,A);return;}else{B.insertBefore(A,B.childNodes[C]||null);if (B==this.endContainer){this.endOffset++;this.collapsed=false;}}},deleteContents:function(){if (this.collapsed) return;this._ExecContentsAction(0);},extractContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(1,A);return A;},cloneContents:function(){var A=new FCKDocumentFragment(this._Document);if (!this.collapsed) this._ExecContentsAction(2,A);return A;},_ExecContentsAction:function(A,B){var C=this.startContainer;var D=this.endContainer;var E=this.startOffset;var F=this.endOffset;var G=false;var H=false;if (D.nodeType==3) D=D.splitText(F);else{if (D.childNodes.length>0){if (F>D.childNodes.length-1){D=FCKDomTools.InsertAfterNode(D.lastChild,this._Document.createTextNode(''));H=true;}else D=D.childNodes[F];}};if (C.nodeType==3){C.splitText(E);if (C==D) D=C.nextSibling;}else{if (E==0){C=C.insertBefore(this._Document.createTextNode(''),C.firstChild);G=true;}else if (E>C.childNodes.length-1){C=C.appendChild(this._Document.createTextNode(''));G=true;}else C=C.childNodes[E].previousSibling;};var I=FCKDomTools.GetParents(C);var J=FCKDomTools.GetParents(D);var i,topStart,topEnd;for (i=0;i<I.length;i++){topStart=I[i];topEnd=J[i];if (topStart!=topEnd) break;};var K,levelStartNode,levelClone,currentNode,currentSibling;if (B) K=B.RootNode;for (var j=i;j<I.length;j++){levelStartNode=I[j];if (K&&levelStartNode!=C) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==C));currentNode=levelStartNode.nextSibling;while(currentNode){if (currentNode==J[j]||currentNode==D) break;currentSibling=currentNode.nextSibling;if (A==2) K.appendChild(currentNode.cloneNode(true));else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.appendChild(currentNode);};currentNode=currentSibling;};if (K) K=levelClone;};if (B) K=B.RootNode;for (var k=i;k<J.length;k++){levelStartNode=J[k];if (A>0&&levelStartNode!=D) levelClone=K.appendChild(levelStartNode.cloneNode(levelStartNode==D));if (!I[k]||levelStartNode.parentNode!=I[k].parentNode){currentNode=levelStartNode.previousSibling;while(currentNode){if (currentNode==I[k]||currentNode==C) break;currentSibling=currentNode.previousSibling;if (A==2) K.insertBefore(currentNode.cloneNode(true),K.firstChild);else{currentNode.parentNode.removeChild(currentNode);if (A==1) K.insertBefore(currentNode,K.firstChild);};currentNode=currentSibling;}};if (K) K=levelClone;};if (A==2){var L=this.startContainer;if (L.nodeType==3){L.data+=L.nextSibling.data;L.parentNode.removeChild(L.nextSibling);};var M=this.endContainer;if (M.nodeType==3&&M.nextSibling){M.data+=M.nextSibling.data;M.parentNode.removeChild(M.nextSibling);}}else{if (topStart&&topEnd&&(C.parentNode!=topStart.parentNode||D.parentNode!=topEnd.parentNode)){var N=FCKDomTools.GetIndexOf(topEnd);if (G&&topEnd.parentNode==C.parentNode) N--;this.setStart(topEnd.parentNode,N);};this.collapse(true);};if(G) C.parentNode.removeChild(C);if(H&&D.parentNode) D.parentNode.removeChild(D);},cloneRange:function(){return FCKW3CRange.CreateFromRange(this._Document,this);}};
+var FCKEnterKey=function(A,B,C,D){this.Window=A;this.EnterMode=B||'p';this.ShiftEnterMode=C||'br';var E=new FCKKeystrokeHandler(false);E._EnterKey=this;E.OnKeystroke=FCKEnterKey_OnKeystroke;E.SetKeystrokes([[13,'Enter'],[SHIFT+13,'ShiftEnter'],[8,'Backspace'],[CTRL+8,'CtrlBackspace'],[46,'Delete']]);this.TabText='';if (D>0||FCKBrowserInfo.IsSafari){while (D--) this.TabText+='\xa0';E.SetKeystrokes([9,'Tab']);};E.AttachToElement(A.document);};function FCKEnterKey_OnKeystroke(A,B){var C=this._EnterKey;try{switch (B){case 'Enter':return C.DoEnter();break;case 'ShiftEnter':return C.DoShiftEnter();break;case 'Backspace':return C.DoBackspace();break;case 'Delete':return C.DoDelete();break;case 'Tab':return C.DoTab();break;case 'CtrlBackspace':return C.DoCtrlBackspace();break;}}catch (e){};return false;};FCKEnterKey.prototype.DoEnter=function(A,B){FCKUndo.SaveUndoStep();this._HasShift=(B===true);var C=FCKSelection.GetParentElement();var D=new FCKElementPath(C);var E=A||this.EnterMode;if (E=='br'||D.Block&&D.Block.tagName.toLowerCase()=='pre') return this._ExecuteEnterBr();else return this._ExecuteEnterBlock(E);};FCKEnterKey.prototype.DoShiftEnter=function(){return this.DoEnter(this.ShiftEnterMode,true);};FCKEnterKey.prototype.DoBackspace=function(){var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};var C=B.CheckIsCollapsed();if (!C){if (FCKBrowserInfo.IsIE&&this.Window.document.selection.type.toLowerCase()=="control"){var D=this.Window.document.selection.createRange();for (var i=D.length-1;i>=0;i--){var E=D.item(i);E.parentNode.removeChild(E);};return true;};return false;};if (FCKBrowserInfo.IsIE){var F=FCKDomTools.GetPreviousSourceElement(B.StartNode,true);if (F&&F.nodeName.toLowerCase()=='br'){var G=B.Clone();G.SetStart(F,4);if (G.CheckIsEmpty()){F.parentNode.removeChild(F);return true;}}};var H=B.StartBlock;var I=B.EndBlock;if (B.StartBlockLimit==B.EndBlockLimit&&H&&I){if (!C){var J=B.CheckEndOfBlock();B.DeleteContents();if (H!=I){B.SetStart(I,1);B.SetEnd(I,1);};B.Select();A=(H==I);};if (B.CheckStartOfBlock()){var K=B.StartBlock;var L=FCKDomTools.GetPreviousSourceElement(K,true,['BODY',B.StartBlockLimit.nodeName],['UL','OL']);A=this._ExecuteBackspace(B,L,K);}else if (FCKBrowserInfo.IsGeckoLike){B.Select();}};B.Release();return A;};FCKEnterKey.prototype.DoCtrlBackspace=function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(this.Window);A.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(A,this.Window.document.body)){this._FixIESelectAllBug(A);return true;};return false;};FCKEnterKey.prototype._ExecuteBackspace=function(A,B,C){var D=false;if (!B&&C&&C.nodeName.IEquals('LI')&&C.parentNode.parentNode.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};if (B&&B.nodeName.IEquals('LI')){var E=FCKDomTools.GetLastChild(B,['UL','OL']);while (E){B=FCKDomTools.GetLastChild(E,'LI');E=FCKDomTools.GetLastChild(B,['UL','OL']);}};if (B&&C){if (C.nodeName.IEquals('LI')&&!B.nodeName.IEquals('LI')){this._OutdentWithSelection(C,A);return true;};var F=C.parentNode;var G=B.nodeName.toLowerCase();if (FCKListsLib.EmptyElements[G]!=null||G=='table'){FCKDomTools.RemoveNode(B);D=true;}else{FCKDomTools.RemoveNode(C);while (F.innerHTML.Trim().length==0){var H=F.parentNode;H.removeChild(F);F=H;};FCKDomTools.LTrimNode(C);FCKDomTools.RTrimNode(B);A.SetStart(B,2,true);A.Collapse(true);var I=A.CreateBookmark(true);if (!C.tagName.IEquals(['TABLE'])) FCKDomTools.MoveChildren(C,B);A.SelectBookmark(I);D=true;}};return D;};FCKEnterKey.prototype.DoDelete=function(){FCKUndo.SaveUndoStep();var A=false;var B=new FCKDomRange(this.Window);B.MoveToSelection();if (FCKBrowserInfo.IsIE&&this._CheckIsAllContentsIncluded(B,this.Window.document.body)){this._FixIESelectAllBug(B);return true;};if (B.CheckIsCollapsed()&&B.CheckEndOfBlock(FCKBrowserInfo.IsGeckoLike)){var C=B.StartBlock;var D=FCKTools.GetElementAscensor(C,'td');var E=FCKDomTools.GetNextSourceElement(C,true,[B.StartBlockLimit.nodeName],['UL','OL','TR'],true);if (D){var F=FCKTools.GetElementAscensor(E,'td');if (F!=D) return true;};A=this._ExecuteBackspace(B,C,E);};B.Release();return A;};FCKEnterKey.prototype.DoTab=function(){var A=new FCKDomRange(this.Window);A.MoveToSelection();var B=A._Range.startContainer;while (B){if (B.nodeType==1){var C=B.tagName.toLowerCase();if (C=="tr"||C=="td"||C=="th"||C=="tbody"||C=="table") return false;else break;};B=B.parentNode;};if (this.TabText){A.DeleteContents();A.InsertNode(this.Window.document.createTextNode(this.TabText));A.Collapse(false);A.Select();};return true;};FCKEnterKey.prototype._ExecuteEnterBlock=function(A,B){var C=B||new FCKDomRange(this.Window);var D=C.SplitBlock(A);if (D){var E=D.PreviousBlock;var F=D.NextBlock;var G=D.WasStartOfBlock;var H=D.WasEndOfBlock;if (F){if (F.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(F,F.parentNode);FCKDomTools.MoveNode(F,F.nextSibling,true);}}else if (E&&E.parentNode.nodeName.IEquals('li')){FCKDomTools.BreakParent(E,E.parentNode);C.MoveToElementEditStart(E.nextSibling);FCKDomTools.MoveNode(E,E.previousSibling);};if (!G&&!H){if (F.nodeName.IEquals('li')&&F.firstChild&&F.firstChild.nodeName.IEquals(['ul','ol'])) F.insertBefore(FCKTools.GetElementDocument(F).createTextNode('\xa0'),F.firstChild);if (F) C.MoveToElementEditStart(F);}else{if (G&&H&&E.tagName.toUpperCase()=='LI'){C.MoveToElementStart(E);this._OutdentWithSelection(E,C);C.Release();return true;};var I;if (E){var J=E.tagName.toUpperCase();if (!this._HasShift&&!(/^H[1-6]$/).test(J)){I=FCKDomTools.CloneElement(E);}}else if (F) I=FCKDomTools.CloneElement(F);if (!I) I=this.Window.document.createElement(A);var K=D.ElementPath;if (K){for (var i=0,len=K.Elements.length;i<len;i++){var L=K.Elements[i];if (L==K.Block||L==K.BlockLimit) break;if (FCKListsLib.InlineChildReqElements[L.nodeName.toLowerCase()]){L=FCKDomTools.CloneElement(L);FCKDomTools.MoveChildren(I,L);I.appendChild(L);}}};if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);C.InsertNode(I);if (FCKBrowserInfo.IsIE){C.MoveToElementEditStart(I);C.Select();};C.MoveToElementEditStart(G&&!H?F:I);};if (FCKBrowserInfo.IsGeckoLike) FCKDomTools.ScrollIntoView(F||I,false);C.Select();};C.Release();return true;};FCKEnterKey.prototype._ExecuteEnterBr=function(A){var B=new FCKDomRange(this.Window);B.MoveToSelection();if (B.StartBlockLimit==B.EndBlockLimit){B.DeleteContents();B.MoveToSelection();var C=B.CheckStartOfBlock();var D=B.CheckEndOfBlock();var E=B.StartBlock?B.StartBlock.tagName.toUpperCase():'';var F=this._HasShift;var G=false;if (!F&&E=='LI') return this._ExecuteEnterBlock(null,B);if (!F&&D&&(/^H[1-6]$/).test(E)){FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createElement('br'));if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(B.StartBlock,this.Window.document.createTextNode(''));B.SetStart(B.StartBlock.nextSibling,FCKBrowserInfo.IsIE?3:1);}else{var H;G=E.IEquals('pre');if (G) H=this.Window.document.createTextNode(FCKBrowserInfo.IsIE?'\r':'\n');else H=this.Window.document.createElement('br');B.InsertNode(H);if (FCKBrowserInfo.IsGecko) FCKDomTools.InsertAfterNode(H,this.Window.document.createTextNode(''));if (D&&FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H.parentNode);if (FCKBrowserInfo.IsIE) B.SetStart(H,4);else B.SetStart(H.nextSibling,1);if (!FCKBrowserInfo.IsIE){var I=null;if (FCKBrowserInfo.IsOpera) I=this.Window.document.createElement('span');else I=this.Window.document.createElement('br');H.parentNode.insertBefore(I,H.nextSibling);FCKDomTools.ScrollIntoView(I,false);I.parentNode.removeChild(I);}};B.Collapse(true);B.Select(G);};B.Release();return true;};FCKEnterKey.prototype._OutdentWithSelection=function(A,B){var C=B.CreateBookmark();FCKListHandler.OutdentListItem(A);B.MoveToBookmark(C);B.Select();};FCKEnterKey.prototype._CheckIsAllContentsIncluded=function(A,B){var C=false;var D=false;if (A.StartContainer==B||A.StartContainer==B.firstChild) C=(A._Range.startOffset==0);if (A.EndContainer==B||A.EndContainer==B.lastChild){var E=A.EndContainer.nodeType==3?A.EndContainer.length:A.EndContainer.childNodes.length;D=(A._Range.endOffset==E);};return C&&D;};FCKEnterKey.prototype._FixIESelectAllBug=function(A){var B=this.Window.document;B.body.innerHTML='';var C;if (FCKConfig.EnterMode.IEquals(['div','p'])){C=B.createElement(FCKConfig.EnterMode);B.body.appendChild(C);}else C=B.body;A.MoveToNodeContents(C);A.Collapse(true);A.Select();A.Release();};
+var FCKDocumentProcessor={};FCKDocumentProcessor._Items=[];FCKDocumentProcessor.AppendNew=function(){var A={};this._Items.AddItem(A);return A;};FCKDocumentProcessor.Process=function(A){var B=FCK.IsDirty();var C,i=0;while((C=this._Items[i++])) C.ProcessDocument(A);if (!B) FCK.ResetIsDirty();};var FCKDocumentProcessor_CreateFakeImage=function(A,B){var C=FCKTools.GetElementDocument(B).createElement('IMG');C.className=A;C.src=FCKConfig.BasePath+'images/spacer.gif';C.setAttribute('_fckfakelement','true',0);C.setAttribute('_fckrealelement',FCKTempBin.AddElement(B),0);return C;};if (FCKBrowserInfo.IsIE||FCKBrowserInfo.IsOpera){var FCKAnchorsProcessor=FCKDocumentProcessor.AppendNew();FCKAnchorsProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('A');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.name.length>0){if (C.innerHTML!==''){if (FCKBrowserInfo.IsIE) C.className+=' FCK__AnchorC';}else{var D=FCKDocumentProcessor_CreateFakeImage('FCK__Anchor',C.cloneNode(true));D.setAttribute('_fckanchor','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}}}};var FCKPageBreaksProcessor=FCKDocumentProcessor.AppendNew();FCKPageBreaksProcessor.ProcessDocument=function(A){var B=A.getElementsByTagName('DIV');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.style.pageBreakAfter=='always'&&C.childNodes.length==1&&C.childNodes[0].style&&C.childNodes[0].style.display=='none'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',C.cloneNode(true));C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor=(function(){var A=[];var B=function(el){var C=el.cloneNode(true);var D;var E=D=FCKDocumentProcessor_CreateFakeImage('FCK__UnknownObject',C);FCKEmbedAndObjectProcessor.RefreshView(E,el);for (var i=0;i<A.length;i++) D=A[i](el,D)||D;if (D!=E) FCKTempBin.RemoveElement(E.getAttribute('_fckrealelement'));el.parentNode.replaceChild(D,el);};var F=function(elementName,doc){var G=doc.getElementsByTagName(elementName);for (var i=G.length-1;i>=0;i--) B(G[i]);};var H=function(doc){F('object',doc);F('embed',doc);};return FCKTools.Merge(FCKDocumentProcessor.AppendNew(),{ProcessDocument:function(doc){if (FCKBrowserInfo.IsGecko) FCKTools.RunFunction(H,this,[doc]);else H(doc);},RefreshView:function(placeHolder,original){if (original.getAttribute('width')>0) placeHolder.style.width=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('width'));if (original.getAttribute('height')>0) placeHolder.style.height=FCKTools.ConvertHtmlSizeToStyle(original.getAttribute('height'));},AddCustomHandler:function(func){A.push(func);}});})();FCK.GetRealElement=function(A){var e=FCKTempBin.Elements[A.getAttribute('_fckrealelement')];if (A.getAttribute('_fckflash')){if (A.style.width.length>0) e.width=FCKTools.ConvertStyleSizeToHtml(A.style.width);if (A.style.height.length>0) e.height=FCKTools.ConvertStyleSizeToHtml(A.style.height);};return e;};if (FCKBrowserInfo.IsIE){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('HR');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){var D=A.createElement('hr');D.mergeAttributes(C,true);FCKDomTools.InsertAfterNode(C,D);C.parentNode.removeChild(C);}}};FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByTagName('INPUT');var C;var i=B.length-1;while (i>=0&&(C=B[i--])){if (C.type=='hidden'){var D=FCKDocumentProcessor_CreateFakeImage('FCK__InputHidden',C.cloneNode(true));D.setAttribute('_fckinputhidden','true',0);C.parentNode.insertBefore(D,C);C.parentNode.removeChild(C);}}};FCKEmbedAndObjectProcessor.AddCustomHandler(function(A,B){if (!(A.nodeName.IEquals('embed')&&(A.type=='application/x-shockwave-flash'||/\.swf($|#|\?)/i.test(A.src)))) return;B.className='FCK__Flash';B.setAttribute('_fckflash','true',0);});if (FCKBrowserInfo.IsSafari){FCKDocumentProcessor.AppendNew().ProcessDocument=function(A){var B=A.getElementsByClassName?A.getElementsByClassName('Apple-style-span'):Array.prototype.filter.call(A.getElementsByTagName('span'),function(item){ return item.className=='Apple-style-span';});for (var i=B.length-1;i>=0;i--) FCKDomTools.RemoveNode(B[i],true);}};
+var FCKSelection=FCK.Selection={GetParentBlock:function(){var A=this.GetParentElement();while (A){if (FCKListsLib.BlockBoundaries[A.nodeName.toLowerCase()]) break;A=A.parentNode;};return A;},ApplyStyle:function(A){FCKStyles.ApplyStyle(new FCKStyle(A));}};
+FCKSelection.GetType=function(){try{var A=FCKSelection.GetSelection().type;if (A=='Control'||A=='Text') return A;if (this.GetSelection().createRange().parentElement) return 'Text';}catch(e){};return 'None';};FCKSelection.GetSelectedElement=function(){if (this.GetType()=='Control'){var A=this.GetSelection().createRange();if (A&&A.item) return this.GetSelection().createRange().item(0);};return null;};FCKSelection.GetParentElement=function(){switch (this.GetType()){case 'Control':var A=FCKSelection.GetSelectedElement();return A?A.parentElement:null;case 'None':return null;default:return this.GetSelection().createRange().parentElement();}};FCKSelection.GetBoundaryParentElement=function(A){switch (this.GetType()){case 'Control':var B=FCKSelection.GetSelectedElement();return B?B.parentElement:null;case 'None':return null;default:var C=FCK.EditorDocument;var D=C.selection.createRange();D.collapse(A!==false);var B=D.parentElement();return FCKTools.GetElementDocument(B)==C?B:null;}};FCKSelection.SelectNode=function(A){FCK.Focus();this.GetSelection().empty();var B;try{B=FCK.EditorDocument.body.createControlRange();B.addElement(A);}catch(e){B=FCK.EditorDocument.body.createTextRange();B.moveToElementText(A);};B.select();};FCKSelection.Collapse=function(A){FCK.Focus();if (this.GetType()=='Text'){var B=this.GetSelection().createRange();B.collapse(A==null||A===true);B.select();}};FCKSelection.HasAncestorNode=function(A){var B;if (this.GetSelection().type=="Control"){B=this.GetSelectedElement();}else{var C=this.GetSelection().createRange();B=C.parentElement();}while (B){if (B.nodeName.IEquals(A)) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B,oRange;if (!FCK.EditorDocument) return null;if (this.GetSelection().type=="Control"){oRange=this.GetSelection().createRange();for (i=0;i<oRange.length;i++){if (oRange(i).parentNode){B=oRange(i).parentNode;break;}}}else{oRange=this.GetSelection().createRange();B=oRange.parentElement();}while (B&&B.nodeName!=A) B=B.parentNode;return B;};FCKSelection.Delete=function(){var A=this.GetSelection();if (A.type.toLowerCase()!="none"){A.clear();};return A;};FCKSelection.GetSelection=function(){this.Restore();return FCK.EditorDocument.selection;};FCKSelection.Save=function(A){if (!A) FCK.Focus();var B=FCK.EditorDocument;if (!B) return;var C=B.selection;var D;if (C){D=C.createRange();if (D){if (D.parentElement&&FCKTools.GetElementDocument(D.parentElement())!=B) D=null;else if (D.item&&FCKTools.GetElementDocument(D.item(0))!=B) D=null;}};this.SelectionData=D;};FCKSelection._GetSelectionDocument=function(A){var B=A.createRange();if (!B) return null;else if (B.item) return FCKTools.GetElementDocument(B.item(0));else return FCKTools.GetElementDocument(B.parentElement());};FCKSelection.Restore=function(){if (this.SelectionData){FCK.IsSelectionChangeLocked=true;try{if (String(this._GetSelectionDocument(FCK.EditorDocument.selection).body.contentEditable)=='true'){FCK.IsSelectionChangeLocked=false;return;};this.SelectionData.select();}catch (e) {};FCK.IsSelectionChangeLocked=false;}};FCKSelection.Release=function(){delete this.SelectionData;};
+var FCKTableHandler={};FCKTableHandler.InsertRow=function(A){var B=FCKSelection.MoveToAncestorNode('TR');if (!B) return;var C=B.cloneNode(true);B.parentNode.insertBefore(C,B);FCKTableHandler.ClearRow(A?C:B);};FCKTableHandler.DeleteRows=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();var C=[];for (var i=0;i<B.length;i++){var D=FCKTools.GetElementAscensor(B[i],'TR');C[D.rowIndex]=D;};for (var i=C.length;i>=0;i--){if (C[i]) FCKTableHandler.DeleteRows(C[i]);};return;};var E=FCKTools.GetElementAscensor(A,'TABLE');if (E.rows.length==1){FCKTableHandler.DeleteTable(E);return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteTable=function(A){if (!A){A=FCKSelection.GetSelectedElement();if (!A||A.tagName!='TABLE') A=FCKSelection.MoveToAncestorNode('TABLE');};if (!A) return;FCKSelection.SelectNode(A);FCKSelection.Collapse();if (A.parentNode.childNodes.length==1) A.parentNode.parentNode.removeChild(A.parentNode);else A.parentNode.removeChild(A);};FCKTableHandler.InsertColumn=function(A){var B=null;var C=this.GetSelectedCells();if (C&&C.length) B=C[A?0:(C.length-1)];if (!B) return;var D=FCKTools.GetElementAscensor(B,'TABLE');var E=B.cellIndex;for (var i=0;i<D.rows.length;i++){var F=D.rows[i];if (F.cells.length<(E+1)) continue;B=F.cells[E].cloneNode(false);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B);var G=F.cells[E];if (A) F.insertBefore(B,G);else if (G.nextSibling) F.insertBefore(B,G.nextSibling);else F.appendChild(B);}};FCKTableHandler.DeleteColumns=function(A){if (!A){var B=FCKTableHandler.GetSelectedCells();for (var i=B.length;i>=0;i--){if (B[i]) FCKTableHandler.DeleteColumns(B[i]);};return;};if (!A) return;var C=FCKTools.GetElementAscensor(A,'TABLE');var D=A.cellIndex;for (var i=C.rows.length-1;i>=0;i--){var E=C.rows[i];if (D==0&&E.cells.length==1){FCKTableHandler.DeleteRows(E);continue;};if (E.cells[D]) E.removeChild(E.cells[D]);}};FCKTableHandler.InsertCell=function(A,B){var C=null;var D=this.GetSelectedCells();if (D&&D.length) C=D[B?0:(D.length-1)];if (!C) return null;var E=FCK.EditorDocument.createElement('TD');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(E);if (!B&&C.cellIndex==C.parentNode.cells.length-1) C.parentNode.appendChild(E);else C.parentNode.insertBefore(E,B?C:C.nextSibling);return E;};FCKTableHandler.DeleteCell=function(A){if (A.parentNode.cells.length==1){FCKTableHandler.DeleteRows(FCKTools.GetElementAscensor(A,'TR'));return;};A.parentNode.removeChild(A);};FCKTableHandler.DeleteCells=function(){var A=FCKTableHandler.GetSelectedCells();for (var i=A.length-1;i>=0;i--){FCKTableHandler.DeleteCell(A[i]);}};FCKTableHandler._MarkCells=function(A,B){for (var i=0;i<A.length;i++) A[i][B]=true;};FCKTableHandler._UnmarkCells=function(A,B){for (var i=0;i<A.length;i++){if (FCKBrowserInfo.IsIE) A[i].removeAttribute(B);else delete A[i][B];}};FCKTableHandler._ReplaceCellsByMarker=function(A,B,C){for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){if (A[i][j][B]) A[i][j]=C;}}};FCKTableHandler._GetMarkerGeometry=function(A,B,C,D){var E=0;var F=0;var G=0;var H=0;for (var i=C;A[B][i]&&A[B][i][D];i++) E++;for (var i=C-1;A[B][i]&&A[B][i][D];i--){E++;G++;};for (var i=B;A[i]&&A[i][C]&&A[i][C][D];i++) F++;for (var i=B-1;A[i]&&A[i][C]&&A[i][C][D];i--){F++;H++;};return { 'width':E,'height':F,'x':G,'y':H };};FCKTableHandler.CheckIsSelectionRectangular=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length<1) return false;this._MarkCells(A,'_CellSelected');var B=this._CreateTableMap(A[0].parentNode.parentNode);var C=A[0].parentNode.rowIndex;var D=this._GetCellIndexSpan(B,C,A[0]);var E=this._GetMarkerGeometry(B,C,D,'_CellSelected');var F=D-E.x;var G=C-E.y;if (E.width>=E.height){for (D=F;D<F+E.width;D++){C=G+(D-F) % E.height;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}}else{for (C=G;C<G+E.height;C++){D=F+(C-G) % E.width;if (!B[C]||!B[C][D]){this._UnmarkCells(A,'_CellSelected');return false;};var g=this._GetMarkerGeometry(B,C,D,'_CellSelected');if (g.width!=E.width||g.height!=E.height){this._UnmarkCells(A,'_CellSelected');return false;}}};this._UnmarkCells(A,'_CellSelected');return true;};FCKTableHandler.MergeCells=function(){var A=this.GetSelectedCells();if (A.length<2) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);this._MarkCells(A,'_SelectedCells');var F=this._GetMarkerGeometry(C,D,E,'_SelectedCells');var G=E-F.x;var H=D-F.y;var I=FCKTools.GetElementDocument(B).createDocumentFragment();for (var i=0;i<F.height;i++){var J=0;for (var j=0;j<F.width;j++){var K=C[H+i][G+j];while (K.childNodes.length>0){var L=K.removeChild(K.firstChild);if (L.nodeType!=1||(L.getAttribute('type',2)!='_moz'&&L.getAttribute('_moz_dirty')!=null)){I.appendChild(L);J++;}}};if (J>0) I.appendChild(FCKTools.GetElementDocument(B).createElement('br'));};this._ReplaceCellsByMarker(C,'_SelectedCells',B);this._UnmarkCells(A,'_SelectedCells');this._InstallTableMap(C,B.parentNode.parentNode);B.appendChild(I);if (FCKBrowserInfo.IsGeckoLike&&(!B.firstChild)) FCKTools.AppendBogusBr(B);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeRight=function(){var A=this.GetMergeRightTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCK.EditorDocument.createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));D.parentNode.removeChild(D);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.MergeDown=function(){var A=this.GetMergeDownTarget();if (A==null) return;var B=A.refCell;var C=A.tableMap;var D=A.nextCell;var E=FCKTools.GetElementDocument(B).createDocumentFragment();while (D&&D.childNodes&&D.childNodes.length>0) E.appendChild(D.removeChild(D.firstChild));if (E.firstChild) E.insertBefore(FCKTools.GetElementDocument(D).createElement('br'),E.firstChild);B.appendChild(E);this._MarkCells([D],'_Replace');this._ReplaceCellsByMarker(C,'_Replace',B);this._InstallTableMap(C,B.parentNode.parentNode);this._MoveCaretToCell(B,false);};FCKTableHandler.HorizontalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=FCKTableHandler._GetCellIndexSpan(C,D,B);var F=isNaN(B.colSpan)?1:B.colSpan;if (F>1){var G=Math.ceil(F/2);var H=FCKTools.GetElementDocument(B).createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(H);var I=E+G;var J=E+F;var K=isNaN(B.rowSpan)?1:B.rowSpan;for (var r=D;r<D+K;r++){for (var i=I;i<J;i++) C[r][i]=H;}}else{var L=[];for (var i=0;i<C.length;i++){var M=C[i].slice(0,E);if (C[i].length<=E){L.push(M);continue;};if (C[i][E]==B){M.push(B);M.push(FCKTools.GetElementDocument(B).createElement('td'));if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(M[M.length-1]);}else{M.push(C[i][E]);M.push(C[i][E]);};for (var j=E+1;j<C[i].length;j++) M.push(C[i][j]);L.push(M);};C=L;};this._InstallTableMap(C,B.parentNode.parentNode);};FCKTableHandler.VerticalSplitCell=function(){var A=FCKTableHandler.GetSelectedCells();if (A.length!=1) return;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=FCKTableHandler._GetCellIndexSpan(C,B.parentNode.rowIndex,B);var E=B.rowSpan;var F=B.parentNode.rowIndex;if (isNaN(E)) E=1;if (E>1){B.rowSpan=Math.ceil(E/2);var G=F+Math.ceil(E/2);var H=null;for (var i=D+1;i<C[G].length;i++){if (C[G][i].parentNode.rowIndex==G){H=C[G][i];break;}};var I=FCK.EditorDocument.createElement('td');I.rowSpan=Math.floor(E/2);if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);B.parentNode.parentNode.rows[G].insertBefore(I,H);}else{var G=F+1;var K=FCK.EditorDocument.createElement('tr');var L=B.parentNode.parentNode;if (L.rows.length>G) L.insertBefore(K,L.rows[G]);else L.appendChild(K);for (var i=0;i<C[F].length;){var M=C[F][i].colSpan;if (isNaN(M)||M<1) M=1;if (i==D){i+=M;continue;};var N=C[F][i].rowSpan;if (isNaN(N)) N=1;C[F][i].rowSpan=N+1;i+=M;};var I=FCK.EditorDocument.createElement('td');if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(I);K.appendChild(I);}};FCKTableHandler._GetCellIndexSpan=function(A,B,C){if (A.length<B+1) return null;var D=A[B];for (var c=0;c<D.length;c++){if (D[c]==C) return c;};return null;};FCKTableHandler._GetCellLocation=function(A,B){for (var i=0;i<A.length;i++){for (var c=0;c<A[i].length;c++){if (A[i][c]==B) return [i,c];}};return null;};FCKTableHandler._GetColumnCells=function(A,B){var C=[];for (var r=0;r<A.length;r++){var D=A[r][B];if (D&&(C.length==0||C[C.length-1]!=D)) C[C.length]=D;};return C;};FCKTableHandler._CreateTableMap=function(A){var B=A.rows;var r=-1;var C=[];for (var i=0;i<B.length;i++){r++;if (!C[r]) C[r]=[];var c=-1;for (var j=0;j<B[i].cells.length;j++){var D=B[i].cells[j];c++;while (C[r][c]) c++;var E=isNaN(D.colSpan)?1:D.colSpan;var F=isNaN(D.rowSpan)?1:D.rowSpan;for (var G=0;G<F;G++){if (!C[r+G]) C[r+G]=[];for (var H=0;H<E;H++){C[r+G][c+H]=B[i].cells[j];}};c+=E-1;}};return C;};FCKTableHandler._InstallTableMap=function(A,B){var C=FCKBrowserInfo.IsIE?"_fckrowspan":"rowSpan";while (B.rows.length>0){var D=B.rows[0];D.parentNode.removeChild(D);};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (E.parentNode) E.parentNode.removeChild(E);E.colSpan=E[C]=1;}};var F=0;for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (!E) continue;if (j>F) F=j;if (E._colScanned===true) continue;if (A[i][j-1]==E) E.colSpan++;if (A[i][j+1]!=E) E._colScanned=true;}};for (var i=0;i<=F;i++){for (var j=0;j<A.length;j++){if (!A[j]) continue;var E=A[j][i];if (!E||E._rowScanned===true) continue;if (A[j-1]&&A[j-1][i]==E) E[C]++;if (!A[j+1]||A[j+1][i]!=E) E._rowScanned=true;}};for (var i=0;i<A.length;i++){for (var j=0;j<A[i].length;j++){var E=A[i][j];if (FCKBrowserInfo.IsIE){E.removeAttribute('_colScanned');E.removeAttribute('_rowScanned');}else{delete E._colScanned;delete E._rowScanned;}}};for (var i=0;i<A.length;i++){var J=FCKTools.GetElementDocument(B).createElement('tr');for (var j=0;j<A[i].length;){var E=A[i][j];if (A[i-1]&&A[i-1][j]==E){j+=E.colSpan;continue;};J.appendChild(E);if (C!='rowSpan'){E.rowSpan=E[C];E.removeAttribute(C);};j+=E.colSpan;if (E.colSpan==1) E.removeAttribute('colspan');if (E.rowSpan==1) E.removeAttribute('rowspan');};B.appendChild(J);}};FCKTableHandler._MoveCaretToCell=function (A,B){var C=new FCKDomRange(FCK.EditorWindow);C.MoveToNodeContents(A);C.Collapse(B);C.Select();};FCKTableHandler.ClearRow=function(A){var B=A.cells;for (var i=0;i<B.length;i++){B[i].innerHTML='';if (FCKBrowserInfo.IsGeckoLike) FCKTools.AppendBogusBr(B[i]);}};FCKTableHandler.GetMergeRightTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=E+(isNaN(B.colSpan)?1:B.colSpan);var G=C[D][F];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,D,F,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.height!=I.height||H.y!=I.y) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};FCKTableHandler.GetMergeDownTarget=function(){var A=this.GetSelectedCells();if (A.length!=1) return null;var B=A[0];var C=this._CreateTableMap(B.parentNode.parentNode);var D=B.parentNode.rowIndex;var E=this._GetCellIndexSpan(C,D,B);var F=D+(isNaN(B.rowSpan)?1:B.rowSpan);if (!C[F]) return null;var G=C[F][E];if (!G) return null;this._MarkCells([B,G],'_SizeTest');var H=this._GetMarkerGeometry(C,D,E,'_SizeTest');var I=this._GetMarkerGeometry(C,F,E,'_SizeTest');this._UnmarkCells([B,G],'_SizeTest');if (H.width!=I.width||H.x!=I.x) return null;return { 'refCell':B,'nextCell':G,'tableMap':C };};
+FCKTableHandler.GetSelectedCells=function(){if (FCKSelection.GetType()=='Control'){var A=FCKSelection.MoveToAncestorNode('TD');return A?[A]:[];};var B=[];var C=FCKSelection.GetSelection().createRange();var D=FCKSelection.GetParentElement();if (D&&D.tagName.Equals('TD','TH')) B[0]=D;else{D=FCKSelection.MoveToAncestorNode('TABLE');if (D){for (var i=0;i<D.cells.length;i++){var E=FCK.EditorDocument.body.createTextRange();E.moveToElementText(D.cells[i]);if (C.inRange(E)||(C.compareEndPoints('StartToStart',E)>=0&&C.compareEndPoints('StartToEnd',E)<=0)||(C.compareEndPoints('EndToStart',E)>=0&&C.compareEndPoints('EndToEnd',E)<=0)){B[B.length]=D.cells[i];}}}};return B;};
+var FCKXml=function(){this.Error=false;};FCKXml.GetAttribute=function(A,B,C){var D=A.attributes.getNamedItem(B);return D?D.value:C;};FCKXml.TransformToObject=function(A){if (!A) return null;var B={};var C=A.attributes;for (var i=0;i<C.length;i++){var D=C[i];B[D.name]=D.value;};var E=A.childNodes;for (i=0;i<E.length;i++){var F=E[i];if (F.nodeType==1){var G='$'+F.nodeName;var H=B[G];if (!H) H=B[G]=[];H.push(this.TransformToObject(F));}};return B;};
+FCKXml.prototype={LoadUrl:function(A){this.Error=false;var B=FCKTools.CreateXmlObject('XmlHttp');if (!B){this.Error=true;return;};B.open("GET",A,false);B.send(null);if (B.status==200||B.status==304||(B.status==0&&B.readyState==4)){this.DOMDocument=B.responseXML;if (!this.DOMDocument||this.DOMDocument.firstChild==null){this.DOMDocument=FCKTools.CreateXmlObject('DOMDocument');this.DOMDocument.async=false;this.DOMDocument.resolveExternals=false;this.DOMDocument.loadXML(B.responseText);}}else{this.DOMDocument=null;};if (this.DOMDocument==null||this.DOMDocument.firstChild==null){this.Error=true;if (window.confirm('Error loading "'+A+'"\r\nDo you want to see more info?')) alert('URL requested: "'+A+'"\r\nServer response:\r\nStatus: '+B.status+'\r\nResponse text:\r\n'+B.responseText);}},SelectNodes:function(A,B){if (this.Error) return [];if (B) return B.selectNodes(A);else return this.DOMDocument.selectNodes(A);},SelectSingleNode:function(A,B){if (this.Error) return null;if (B) return B.selectSingleNode(A);else return this.DOMDocument.selectSingleNode(A);}};
+var FCKNamedCommand=function(A){this.Name=A;};FCKNamedCommand.prototype.Execute=function(){FCK.ExecuteNamedCommand(this.Name);};FCKNamedCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState(this.Name);};
+var FCKStyleCommand=function(){};FCKStyleCommand.prototype={Name:'Style',Execute:function(A,B){FCKUndo.SaveUndoStep();if (B.Selected) FCK.Styles.RemoveStyle(B.Style);else FCK.Styles.ApplyStyle(B.Style);FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorDocument) return -1;if (FCKSelection.GetType()=='Control'){var A=FCKSelection.GetSelectedElement();if (!A||!FCKStyles.CheckHasObjectStyle(A.nodeName.toLowerCase())) return -1;};return 0;}};
+var FCKDialogCommand=function(A,B,C,D,E,F,G,H){this.Name=A;this.Title=B;this.Url=C;this.Width=D;this.Height=E;this.CustomValue=H;this.GetStateFunction=F;this.GetStateParam=G;this.Resizable=false;};FCKDialogCommand.prototype.Execute=function(){FCKDialog.OpenDialog('FCKDialog_'+this.Name,this.Title,this.Url,this.Width,this.Height,this.CustomValue,null,this.Resizable);};FCKDialogCommand.prototype.GetState=function(){if (this.GetStateFunction) return this.GetStateFunction(this.GetStateParam);else return FCK.EditMode==0?0:-1;};var FCKUndefinedCommand=function(){this.Name='Undefined';};FCKUndefinedCommand.prototype.Execute=function(){alert(FCKLang.NotImplemented);};FCKUndefinedCommand.prototype.GetState=function(){return 0;};var FCKFormatBlockCommand=function(){};FCKFormatBlockCommand.prototype={Name:'FormatBlock',Execute:FCKStyleCommand.prototype.Execute,GetState:function(){return FCK.EditorDocument?0:-1;}};var FCKFontNameCommand=function(){};FCKFontNameCommand.prototype={Name:'FontName',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKFontSizeCommand=function(){};FCKFontSizeCommand.prototype={Name:'FontSize',Execute:FCKStyleCommand.prototype.Execute,GetState:FCKFormatBlockCommand.prototype.GetState};var FCKPreviewCommand=function(){this.Name='Preview';};FCKPreviewCommand.prototype.Execute=function(){FCK.Preview();};FCKPreviewCommand.prototype.GetState=function(){return 0;};var FCKSaveCommand=function(){this.Name='Save';};FCKSaveCommand.prototype.Execute=function(){var A=FCK.GetParentForm();if (typeof(A.onsubmit)=='function'){var B=A.onsubmit();if (B!=null&&B===false) return;};if (typeof(A.submit)=='function') A.submit();else A.submit.click();};FCKSaveCommand.prototype.GetState=function(){return 0;};var FCKNewPageCommand=function(){this.Name='NewPage';};FCKNewPageCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();FCK.SetData('');FCKUndo.Typing=true;FCK.Focus();};FCKNewPageCommand.prototype.GetState=function(){return 0;};var FCKSourceCommand=function(){this.Name='Source';};FCKSourceCommand.prototype.Execute=function(){if (FCKConfig.SourcePopup){var A=FCKConfig.ScreenWidth*0.65;var B=FCKConfig.ScreenHeight*0.65;FCKDialog.OpenDialog('FCKDialog_Source',FCKLang.Source,'dialog/fck_source.html',A,B,null,null,true);}else FCK.SwitchEditMode();};FCKSourceCommand.prototype.GetState=function(){return (FCK.EditMode==0?0:1);};var FCKUndoCommand=function(){this.Name='Undo';};FCKUndoCommand.prototype.Execute=function(){FCKUndo.Undo();};FCKUndoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckUndoState()?0:-1);};var FCKRedoCommand=function(){this.Name='Redo';};FCKRedoCommand.prototype.Execute=function(){FCKUndo.Redo();};FCKRedoCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return (FCKUndo.CheckRedoState()?0:-1);};var FCKPageBreakCommand=function(){this.Name='PageBreak';};FCKPageBreakCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();var e=FCK.EditorDocument.createElement('DIV');e.style.pageBreakAfter='always';e.innerHTML='<span style="DISPLAY:none">&nbsp;</span>';var A=FCKDocumentProcessor_CreateFakeImage('FCK__PageBreak',e);var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.SplitBlock();B.InsertNode(A);FCK.Events.FireEvent('OnSelectionChange');};FCKPageBreakCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKUnlinkCommand=function(){this.Name='Unlink';};FCKUnlinkCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (FCKBrowserInfo.IsGeckoLike){var A=FCK.Selection.MoveToAncestorNode('A');if (A) FCKTools.RemoveOuterTags(A);return;};FCK.ExecuteNamedCommand(this.Name);};FCKUnlinkCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState(this.Name);if (A==0&&FCK.EditMode==0){var B=FCKSelection.MoveToAncestorNode('A');var C=(B&&B.name.length>0&&B.href.length==0);if (C) A=-1;};return A;};FCKVisitLinkCommand=function(){this.Name='VisitLink';};FCKVisitLinkCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCK.GetNamedCommandState('Unlink');if (A==0){var B=FCKSelection.MoveToAncestorNode('A');if (!B.href) A=-1;};return A;},Execute:function(){var A=FCKSelection.MoveToAncestorNode('A');var B=A.getAttribute('_fcksavedurl')||A.getAttribute('href',2);if (!/:\/\//.test(B)){var C=FCKConfig.BaseHref;var D=FCK.GetInstanceObject('parent');if (!C){C=D.document.location.href;C=C.substring(0,C.lastIndexOf('/')+1);};if (/^\//.test(B)){try{C=C.match(/^.*:\/\/+[^\/]+/)[0];}catch (e){C=D.document.location.protocol+'://'+D.parent.document.location.host;}};B=C+B;};if (!window.open(B,'_blank')) alert(FCKLang.VisitLinkBlocked);}};var FCKSelectAllCommand=function(){this.Name='SelectAll';};FCKSelectAllCommand.prototype.Execute=function(){if (FCK.EditMode==0){FCK.ExecuteNamedCommand('SelectAll');}else{var A=FCK.EditingArea.Textarea;if (FCKBrowserInfo.IsIE){A.createTextRange().execCommand('SelectAll');}else{A.selectionStart=0;A.selectionEnd=A.value.length;};A.focus();}};FCKSelectAllCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};var FCKPasteCommand=function(){this.Name='Paste';};FCKPasteCommand.prototype={Execute:function(){if (FCKBrowserInfo.IsIE) FCK.Paste();else FCK.ExecuteNamedCommand('Paste');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');}};var FCKRuleCommand=function(){this.Name='Rule';};FCKRuleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();FCK.InsertElement('hr');},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('InsertHorizontalRule');}};var FCKCutCopyCommand=function(A){this.Name=A?'Cut':'Copy';};FCKCutCopyCommand.prototype={Execute:function(){var A=false;if (FCKBrowserInfo.IsIE){var B=function(){A=true;};var C='on'+this.Name.toLowerCase();FCK.EditorDocument.body.attachEvent(C,B);FCK.ExecuteNamedCommand(this.Name);FCK.EditorDocument.body.detachEvent(C,B);}else{try{FCK.ExecuteNamedCommand(this.Name);A=true;}catch(e){}};if (!A) alert(FCKLang['PasteError'+this.Name]);},GetState:function(){return FCK.EditMode!=0?-1:FCK.GetNamedCommandState('Cut');}};var FCKAnchorDeleteCommand=function(){this.Name='AnchorDelete';};FCKAnchorDeleteCommand.prototype={Execute:function(){if (FCK.Selection.GetType()=='Control'){FCK.Selection.Delete();}else{var A=FCK.Selection.GetSelectedElement();if (A){if (A.tagName=='IMG'&&A.getAttribute('_fckanchor')) oAnchor=FCK.GetRealElement(A);else A=null;};if (!A){oAnchor=FCK.Selection.MoveToAncestorNode('A');if (oAnchor) FCK.Selection.SelectNode(oAnchor);};if (oAnchor.href.length!=0){oAnchor.removeAttribute('name');if (FCKBrowserInfo.IsIE) oAnchor.className=oAnchor.className.replace(FCKRegexLib.FCK_Class,'');return;};if (A){A.parentNode.removeChild(A);return;};if (oAnchor.innerHTML.length==0){oAnchor.parentNode.removeChild(oAnchor);return;};FCKTools.RemoveOuterTags(oAnchor);};if (FCKBrowserInfo.IsGecko) FCK.Selection.Collapse(true);},GetState:function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Unlink');}};var FCKDeleteDivCommand=function(){};FCKDeleteDivCommand.prototype={GetState:function(){if (FCK.EditMode!=0) return -1;var A=FCKSelection.GetParentElement();var B=new FCKElementPath(A);return B.BlockLimit&&B.BlockLimit.nodeName.IEquals('div')?0:-1;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCKDomTools.GetSelectedDivContainers();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();for (var i=0;i<A.length;i++) FCKDomTools.RemoveNode(A[i],true);B.MoveToBookmark(C);B.Select();}};var FCKNbsp=function(){this.Name='Non Breaking Space';};FCKNbsp.prototype={Execute:function(){FCK.InsertHtml('&nbsp;');},GetState:function(){return (FCK.EditMode!=0?-1:0);}};
+var FCKShowBlockCommand=function(A,B){this.Name=A;if (B!=undefined) this._SavedState=B;else this._SavedState=null;};FCKShowBlockCommand.prototype.Execute=function(){var A=this.GetState();if (A==-1) return;var B=FCK.EditorDocument.body;if (A==1) B.className=B.className.replace(/(^| )FCK__ShowBlocks/g,'');else B.className+=' FCK__ShowBlocks';if (FCKBrowserInfo.IsIE){try{FCK.EditorDocument.selection.createRange().select();}catch (e){}}else{var C=FCK.EditorWindow.getSelection().focusNode;if (C.nodeType!=1) C=C.parentNode;FCKDomTools.ScrollIntoView(C,false);};FCK.Events.FireEvent('OnSelectionChange');};FCKShowBlockCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;if (!FCK.EditorDocument) return 0;if (/FCK__ShowBlocks(?:\s|$)/.test(FCK.EditorDocument.body.className)) return 1;return 0;};FCKShowBlockCommand.prototype.SaveState=function(){this._SavedState=this.GetState();};FCKShowBlockCommand.prototype.RestoreState=function(){if (this._SavedState!=null&&this.GetState()!=this._SavedState) this.Execute();};
+var FCKSpellCheckCommand=function(){this.Name='SpellCheck';this.IsEnabled=(FCKConfig.SpellChecker=='ieSpell'||FCKConfig.SpellChecker=='SpellerPages');};FCKSpellCheckCommand.prototype.Execute=function(){switch (FCKConfig.SpellChecker){case 'ieSpell':this._RunIeSpell();break;case 'SpellerPages':FCKDialog.OpenDialog('FCKDialog_SpellCheck','Spell Check','dialog/fck_spellerpages.html',440,480);break;}};FCKSpellCheckCommand.prototype._RunIeSpell=function(){try{var A=new ActiveXObject("ieSpell.ieSpellExtension");A.CheckAllLinkedDocuments(FCK.EditorDocument);}catch(e){if(e.number==-2146827859){if (confirm(FCKLang.IeSpellDownload)) window.open(FCKConfig.IeSpellDownloadUrl,'IeSpellDownload');}else alert('Error Loading ieSpell: '+e.message+' ('+e.number+')');}};FCKSpellCheckCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return this.IsEnabled?0:-1;};
+var FCKTextColorCommand=function(A){this.Name=A=='ForeColor'?'TextColor':'BGColor';this.Type=A;var B;if (FCKBrowserInfo.IsIE) B=window;else if (FCK.ToolbarSet._IFrame) B=FCKTools.GetElementWindow(FCK.ToolbarSet._IFrame);else B=window.parent;this._Panel=new FCKPanel(B);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._Panel.MainNode.className='FCK_Panel';this._CreatePanelBody(this._Panel.Document,this._Panel.MainNode);FCK.ToolbarSet.ToolbarItems.GetItem(this.Name).RegisterPanel(this._Panel);FCKTools.DisableSelection(this._Panel.Document.body);};FCKTextColorCommand.prototype.Execute=function(A,B,C){this._Panel.Show(A,B,C);};FCKTextColorCommand.prototype.SetColor=function(A){FCKUndo.SaveUndoStep();var B=FCKStyles.GetStyle('_FCK_'+(this.Type=='ForeColor'?'Color':'BackColor'));if (!A||A.length==0) FCK.Styles.RemoveStyle(B);else{B.SetVariable('Color',A);FCKStyles.ApplyStyle(B);};FCKUndo.SaveUndoStep();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');};FCKTextColorCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return 0;};function FCKTextColorCommand_OnMouseOver(){this.className='ColorSelected';};function FCKTextColorCommand_OnMouseOut(){this.className='ColorDeselected';};function FCKTextColorCommand_OnClick(A,B,C){this.className='ColorDeselected';B.SetColor(C);B._Panel.Hide();};function FCKTextColorCommand_AutoOnClick(A,B){this.className='ColorDeselected';B.SetColor('');B._Panel.Hide();};function FCKTextColorCommand_MoreOnClick(A,B){this.className='ColorDeselected';B._Panel.Hide();FCKDialog.OpenDialog('FCKDialog_Color',FCKLang.DlgColorTitle,'dialog/fck_colorselector.html',410,320,FCKTools.Bind(B,B.SetColor));};FCKTextColorCommand.prototype._CreatePanelBody=function(A,B){function CreateSelectionDiv(){var C=A.createElement("DIV");C.className='ColorDeselected';FCKTools.AddEventListenerEx(C,'mouseover',FCKTextColorCommand_OnMouseOver);FCKTools.AddEventListenerEx(C,'mouseout',FCKTextColorCommand_OnMouseOut);return C;};var D=B.appendChild(A.createElement("TABLE"));D.className='ForceBaseFont';D.style.tableLayout='fixed';D.cellPadding=0;D.cellSpacing=0;D.border=0;D.width=150;var E=D.insertRow(-1).insertCell(-1);E.colSpan=8;var C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table cellspacing="0" cellpadding="0" width="100%" border="0">\n			<tr>\n				<td><div class="ColorBoxBorder"><div class="ColorBox" style="background-color: #000000"></div></div></td>\n				<td nowrap width="100%" align="center">'+FCKLang.ColorAutomatic+'</td>\n			</tr>\n		</table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_AutoOnClick,this);if (!FCKBrowserInfo.IsIE) C.style.width='96%';var G=FCKConfig.FontColors.toString().split(',');var H=0;while (H<G.length){var I=D.insertRow(-1);for (var i=0;i<8;i++,H++){if (H<G.length){var J=G[H].split('/');var K='#'+J[0];var L=J[1]||K;};C=I.insertCell(-1).appendChild(CreateSelectionDiv());C.innerHTML='<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: '+K+'"></div></div>';if (H>=G.length) C.style.visibility='hidden';else FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_OnClick,[this,L]);}};if (FCKConfig.EnableMoreFontColors){E=D.insertRow(-1).insertCell(-1);E.colSpan=8;C=E.appendChild(CreateSelectionDiv());C.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td nowrap align="center">'+FCKLang.ColorMoreColors+'</td></tr></table>';FCKTools.AddEventListenerEx(C,'click',FCKTextColorCommand_MoreOnClick,this);};if (!FCKBrowserInfo.IsIE) C.style.width='96%';};
+var FCKPastePlainTextCommand=function(){this.Name='PasteText';};FCKPastePlainTextCommand.prototype.Execute=function(){FCK.PasteAsPlainText();};FCKPastePlainTextCommand.prototype.GetState=function(){if (FCK.EditMode!=0) return -1;return FCK.GetNamedCommandState('Paste');};
+var FCKPasteWordCommand=function(){this.Name='PasteWord';};FCKPasteWordCommand.prototype.Execute=function(){FCK.PasteFromWord();};FCKPasteWordCommand.prototype.GetState=function(){if (FCK.EditMode!=0||FCKConfig.ForcePasteAsPlainText) return -1;else return FCK.GetNamedCommandState('Paste');};
+var FCKTableCommand=function(A){this.Name=A;};FCKTableCommand.prototype.Execute=function(){FCKUndo.SaveUndoStep();if (!FCKBrowserInfo.IsGecko){switch (this.Name){case 'TableMergeRight':return FCKTableHandler.MergeRight();case 'TableMergeDown':return FCKTableHandler.MergeDown();}};switch (this.Name){case 'TableInsertRowAfter':return FCKTableHandler.InsertRow(false);case 'TableInsertRowBefore':return FCKTableHandler.InsertRow(true);case 'TableDeleteRows':return FCKTableHandler.DeleteRows();case 'TableInsertColumnAfter':return FCKTableHandler.InsertColumn(false);case 'TableInsertColumnBefore':return FCKTableHandler.InsertColumn(true);case 'TableDeleteColumns':return FCKTableHandler.DeleteColumns();case 'TableInsertCellAfter':return FCKTableHandler.InsertCell(null,false);case 'TableInsertCellBefore':return FCKTableHandler.InsertCell(null,true);case 'TableDeleteCells':return FCKTableHandler.DeleteCells();case 'TableMergeCells':return FCKTableHandler.MergeCells();case 'TableHorizontalSplitCell':return FCKTableHandler.HorizontalSplitCell();case 'TableVerticalSplitCell':return FCKTableHandler.VerticalSplitCell();case 'TableDelete':return FCKTableHandler.DeleteTable();default:return alert(FCKLang.UnknownCommand.replace(/%1/g,this.Name));}};FCKTableCommand.prototype.GetState=function(){if (FCK.EditorDocument!=null&&FCKSelection.HasAncestorNode('TABLE')){switch (this.Name){case 'TableHorizontalSplitCell':case 'TableVerticalSplitCell':if (FCKTableHandler.GetSelectedCells().length==1) return 0;else return -1;case 'TableMergeCells':if (FCKTableHandler.CheckIsSelectionRectangular()&&FCKTableHandler.GetSelectedCells().length>1) return 0;else return -1;case 'TableMergeRight':return FCKTableHandler.GetMergeRightTarget()?0:-1;case 'TableMergeDown':return FCKTableHandler.GetMergeDownTarget()?0:-1;default:return 0;}}else return -1;};
+var FCKFitWindow=function(){this.Name='FitWindow';};FCKFitWindow.prototype.Execute=function(){var A=window.frameElement;var B=A.style;var C=parent;var D=C.document.documentElement;var E=C.document.body;var F=E.style;var G;var H=new FCKDomRange(FCK.EditorWindow);H.MoveToSelection();var I=FCKTools.GetScrollPosition(FCK.EditorWindow);if (!this.IsMaximized){if(FCKBrowserInfo.IsIE) C.attachEvent('onresize',FCKFitWindow_Resize);else C.addEventListener('resize',FCKFitWindow_Resize,true);this._ScrollPos=FCKTools.GetScrollPosition(C);G=A;while((G=G.parentNode)){if (G.nodeType==1){G._fckSavedStyles=FCKTools.SaveStyles(G);G.style.zIndex=FCKConfig.FloatingPanelsZIndex-1;}};if (FCKBrowserInfo.IsIE){this.documentElementOverflow=D.style.overflow;D.style.overflow='hidden';F.overflow='hidden';}else{F.overflow='hidden';F.width='0px';F.height='0px';};this._EditorFrameStyles=FCKTools.SaveStyles(A);var J=FCKTools.GetViewPaneSize(C);B.position="absolute";A.offsetLeft;B.zIndex=FCKConfig.FloatingPanelsZIndex-1;B.left="0px";B.top="0px";B.width=J.Width+"px";B.height=J.Height+"px";if (!FCKBrowserInfo.IsIE){B.borderRight=B.borderBottom="9999px solid white";B.backgroundColor="white";};C.scrollTo(0,0);var K=FCKTools.GetWindowPosition(C,A);if (K.x!=0) B.left=(-1*K.x)+"px";if (K.y!=0) B.top=(-1*K.y)+"px";this.IsMaximized=true;}else{if(FCKBrowserInfo.IsIE) C.detachEvent("onresize",FCKFitWindow_Resize);else C.removeEventListener("resize",FCKFitWindow_Resize,true);G=A;while((G=G.parentNode)){if (G._fckSavedStyles){FCKTools.RestoreStyles(G,G._fckSavedStyles);G._fckSavedStyles=null;}};if (FCKBrowserInfo.IsIE) D.style.overflow=this.documentElementOverflow;FCKTools.RestoreStyles(A,this._EditorFrameStyles);C.scrollTo(this._ScrollPos.X,this._ScrollPos.Y);this.IsMaximized=false;};FCKToolbarItems.GetItem('FitWindow').RefreshState();if (FCK.EditMode==0) FCK.EditingArea.MakeEditable();FCK.Focus();H.Select();FCK.EditorWindow.scrollTo(I.X,I.Y);};FCKFitWindow.prototype.GetState=function(){if (FCKConfig.ToolbarLocation!='In') return -1;else return (this.IsMaximized?1:0);};function FCKFitWindow_Resize(){var A=FCKTools.GetViewPaneSize(parent);var B=window.frameElement.style;B.width=A.Width+'px';B.height=A.Height+'px';};
+var FCKListCommand=function(A,B){this.Name=A;this.TagName=B;};FCKListCommand.prototype={GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=FCKSelection.GetBoundaryParentElement(true);var B=A;while (B){if (B.nodeName.IEquals(['ul','ol'])) break;B=B.parentNode;};if (B&&B.nodeName.IEquals(this.TagName)) return 1;else return 0;},Execute:function(){FCKUndo.SaveUndoStep();var A=FCK.EditorDocument;var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=this.GetState();if (C==0){FCKDomTools.TrimNode(A.body);if (!A.body.firstChild){var D=A.createElement('p');A.body.appendChild(D);B.MoveToNodeContents(D);}};var E=B.CreateBookmark();var F=[];var G={};var H=new FCKDomRangeIterator(B);var I;H.ForceBrBreak=(C==0);var J=true;var K=null;while (J){while ((I=H.GetNextParagraph())){var L=new FCKElementPath(I);var M=null;var N=false;var O=L.BlockLimit;for (var i=L.Elements.length-1;i>=0;i--){var P=L.Elements[i];if (P.nodeName.IEquals(['ol','ul'])){if (O._FCK_ListGroupObject) O._FCK_ListGroupObject=null;var Q=P._FCK_ListGroupObject;if (Q) Q.contents.push(I);else{Q={ 'root':P,'contents':[I] };F.push(Q);FCKDomTools.SetElementMarker(G,P,'_FCK_ListGroupObject',Q);};N=true;break;}};if (N) continue;var R=O;if (R._FCK_ListGroupObject) R._FCK_ListGroupObject.contents.push(I);else{var Q={ 'root':R,'contents':[I] };FCKDomTools.SetElementMarker(G,R,'_FCK_ListGroupObject',Q);F.push(Q);}};if (FCKBrowserInfo.IsIE) J=false;else{if (K==null){K=[];var T=FCKSelection.GetSelection();if (T&&F.length==0) K.push(T.getRangeAt(0));for (var i=1;T&&i<T.rangeCount;i++) K.push(T.getRangeAt(i));};if (K.length<1) J=false;else{var U=FCKW3CRange.CreateFromRange(A,K.shift());B._Range=U;B._UpdateElementInfo();if (B.StartNode.nodeName.IEquals('td')) B.SetStart(B.StartNode,1);if (B.EndNode.nodeName.IEquals('td')) B.SetEnd(B.EndNode,2);H=new FCKDomRangeIterator(B);H.ForceBrBreak=(C==0);}}};var W=[];while (F.length>0){var Q=F.shift();if (C==0){if (Q.root.nodeName.IEquals(['ul','ol'])) this._ChangeListType(Q,G,W);else this._CreateList(Q,W);}else if (C==1&&Q.root.nodeName.IEquals(['ul','ol'])) this._RemoveList(Q,G);};for (var i=0;i<W.length;i++){var M=W[i];var Z=false;var a=M;while (!Z){a=a.nextSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.firstChild) M.appendChild(a.removeChild(a.firstChild));};Z=false;a=M;while (!Z){a=a.previousSibling;if (a&&a.nodeType==3&&a.nodeValue.search(/^[\n\r\t ]*$/)==0) continue;Z=true;};if (a&&a.nodeName.IEquals(this.TagName)){a.parentNode.removeChild(a);while (a.lastChild) M.insertBefore(a.removeChild(a.lastChild),M.firstChild);}};FCKDomTools.ClearAllMarkers(G);B.MoveToBookmark(E);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},_ChangeListType:function(A,B,C){var D=FCKDomTools.ListToArray(A.root,B);var E=[];for (var i=0;i<A.contents.length;i++){var F=A.contents[i];F=FCKTools.GetElementAscensor(F,'li');if (!F||F._FCK_ListItem_Processed) continue;E.push(F);FCKDomTools.SetElementMarker(B,F,'_FCK_ListItem_Processed',true);};var G=FCKTools.GetElementDocument(A.root).createElement(this.TagName);for (var i=0;i<E.length;i++){var H=E[i]._FCK_ListArray_Index;D[H].parent=G;};var I=FCKDomTools.ArrayToList(D,B);for (var i=0;i<I.listNode.childNodes.length;i++){if (I.listNode.childNodes[i].nodeName.IEquals(this.TagName)) C.push(I.listNode.childNodes[i]);};A.root.parentNode.replaceChild(I.listNode,A.root);},_CreateList:function(A,B){var C=A.contents;var D=FCKTools.GetElementDocument(A.root);var E=[];if (C.length==1&&C[0]==A.root){var F=D.createElement('div');while (C[0].firstChild) F.appendChild(C[0].removeChild(C[0].firstChild));C[0].appendChild(F);C[0]=F;};var G=A.contents[0].parentNode;for (var i=0;i<C.length;i++) G=FCKDomTools.GetCommonParents(G,C[i].parentNode).pop();for (var i=0;i<C.length;i++){var H=C[i];while (H.parentNode){if (H.parentNode==G){E.push(H);break;};H=H.parentNode;}};if (E.length<1) return;var I=E[E.length-1].nextSibling;var J=D.createElement(this.TagName);B.push(J);while (E.length){var K=E.shift();var L=D.createDocumentFragment();while (K.firstChild) L.appendChild(K.removeChild(K.firstChild));K.parentNode.removeChild(K);var M=D.createElement('li');M.appendChild(L);J.appendChild(M);};G.insertBefore(J,I);},_RemoveList:function(A,B){var C=FCKDomTools.ListToArray(A.root,B);var D=[];for (var i=0;i<A.contents.length;i++){var E=A.contents[i];E=FCKTools.GetElementAscensor(E,'li');if (!E||E._FCK_ListItem_Processed) continue;D.push(E);FCKDomTools.SetElementMarker(B,E,'_FCK_ListItem_Processed',true);};var F=null;for (var i=0;i<D.length;i++){var G=D[i]._FCK_ListArray_Index;C[G].indent=-1;F=G;};for (var i=F+1;i<C.length;i++){if (C[i].indent>C[i-1].indent+1){var H=C[i-1].indent+1-C[i].indent;var I=C[i].indent;while (C[i]&&C[i].indent>=I){C[i].indent+=H;i++;};i--;}};var J=FCKDomTools.ArrayToList(C,B);if (A.root.nextSibling==null||A.root.nextSibling.nodeName.IEquals('br')){if (J.listNode.lastChild.nodeName.IEquals('br')) J.listNode.removeChild(J.listNode.lastChild);};A.root.parentNode.replaceChild(J.listNode,A.root);}};
+var FCKJustifyCommand=function(A){this.AlignValue=A;var B=FCKConfig.ContentLangDirection.toLowerCase();this.IsDefaultAlign=(A=='left'&&B=='ltr')||(A=='right'&&B=='rtl');var C=this._CssClassName=(function(){var D=FCKConfig.JustifyClasses;if (D){switch (A){case 'left':return D[0]||null;case 'center':return D[1]||null;case 'right':return D[2]||null;case 'justify':return D[3]||null;}};return null;})();if (C&&C.length>0) this._CssClassRegex=new RegExp('(?:^|\\s+)'+C+'(?=$|\\s)');};FCKJustifyCommand._GetClassNameRegex=function(){var A=FCKJustifyCommand._ClassRegex;if (A!=undefined) return A;var B=[];var C=FCKConfig.JustifyClasses;if (C){for (var i=0;i<4;i++){var D=C[i];if (D&&D.length>0) B.push(D);}};if (B.length>0) A=new RegExp('(?:^|\\s+)(?:'+B.join('|')+')(?=$|\\s)');else A=null;return FCKJustifyCommand._ClassRegex=A;};FCKJustifyCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=this.GetState();if (B==-1) return;var C=A.CreateBookmark();var D=this._CssClassName;var E=new FCKDomRangeIterator(A);var F;while ((F=E.GetNextParagraph())){F.removeAttribute('align');if (D){var G=F.className.replace(FCKJustifyCommand._GetClassNameRegex(),'');if (B==0){if (G.length>0) G+=' ';F.className=G+D;}else if (G.length==0) FCKDomTools.RemoveAttribute(F,'class');}else{var H=F.style;if (B==0) H.textAlign=this.AlignValue;else{H.textAlign='';if (H.cssText.length==0) F.removeAttribute('style');}}};A.MoveToBookmark(C);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;var C;if (FCKBrowserInfo.IsIE) C=B.currentStyle.textAlign;else C=FCK.EditorWindow.getComputedStyle(B,'').getPropertyValue('text-align');C=C.replace(/(-moz-|-webkit-|start|auto)/i,'');if ((!C&&this.IsDefaultAlign)||C==this.AlignValue) return 1;return 0;}};
+var FCKIndentCommand=function(A,B){this.Name=A;this.Offset=B;this.IndentCSSProperty=FCKConfig.ContentLangDirection.IEquals('ltr')?'marginLeft':'marginRight';};FCKIndentCommand._InitIndentModeParameters=function(){if (FCKConfig.IndentClasses&&FCKConfig.IndentClasses.length>0){this._UseIndentClasses=true;this._IndentClassMap={};for (var i=0;i<FCKConfig.IndentClasses.length;i++) this._IndentClassMap[FCKConfig.IndentClasses[i]]=i+1;this._ClassNameRegex=new RegExp('(?:^|\\s+)('+FCKConfig.IndentClasses.join('|')+')(?=$|\\s)');}else this._UseIndentClasses=false;};FCKIndentCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=new FCKDomRange(FCK.EditorWindow);A.MoveToSelection();var B=A.CreateBookmark();var C=FCKDomTools.GetCommonParentNode(A.StartNode||A.StartContainer,A.EndNode||A.EndContainer,['ul','ol']);if (C) this._IndentList(A,C);else this._IndentBlock(A);A.MoveToBookmark(B);A.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;if (FCKIndentCommand._UseIndentClasses==undefined) FCKIndentCommand._InitIndentModeParameters();var A=FCKSelection.GetBoundaryParentElement(true);var B=FCKSelection.GetBoundaryParentElement(false);var C=FCKDomTools.GetCommonParentNode(A,B,['ul','ol']);if (C){if (this.Name.IEquals('outdent')) return 0;var D=FCKTools.GetElementAscensor(A,'li');if (!D||!D.previousSibling) return -1;return 0;};if (!FCKIndentCommand._UseIndentClasses&&this.Name.IEquals('indent')) return 0;var E=new FCKElementPath(A);var F=E.Block||E.BlockLimit;if (!F) return -1;if (FCKIndentCommand._UseIndentClasses){var G=F.className.match(FCKIndentCommand._ClassNameRegex);var H=0;if (G!=null){G=G[1];H=FCKIndentCommand._IndentClassMap[G];};if ((this.Name=='outdent'&&H==0)||(this.Name=='indent'&&H==FCKConfig.IndentClasses.length)) return -1;return 0;}else{var I=parseInt(F.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;if (I<=0) return -1;return 0;}},_IndentBlock:function(A){var B=new FCKDomRangeIterator(A);B.EnforceRealBlocks=true;A.Expand('block_contents');var C=FCKDomTools.GetCommonParents(A.StartContainer,A.EndContainer);var D=C[C.length-1];var E;while ((E=B.GetNextParagraph())){if (!(E==D||E.parentNode==D)) continue;if (FCKIndentCommand._UseIndentClasses){var F=E.className.match(FCKIndentCommand._ClassNameRegex);var G=0;if (F!=null){F=F[1];G=FCKIndentCommand._IndentClassMap[F];};if (this.Name.IEquals('outdent')) G--;else if (this.Name.IEquals('indent')) G++;G=Math.min(G,FCKConfig.IndentClasses.length);G=Math.max(G,0);var H=E.className.replace(FCKIndentCommand._ClassNameRegex,'');if (G<1) E.className=H;else E.className=(H.length>0?H+' ':'')+FCKConfig.IndentClasses[G-1];}else{var I=parseInt(E.style[this.IndentCSSProperty],10);if (isNaN(I)) I=0;I+=this.Offset;I=Math.max(I,0);I=Math.ceil(I/this.Offset)*this.Offset;E.style[this.IndentCSSProperty]=I?I+FCKConfig.IndentUnit:'';if (E.getAttribute('style')=='') E.removeAttribute('style');}}},_IndentList:function(A,B){var C=A.StartContainer;var D=A.EndContainer;while (C&&C.parentNode!=B) C=C.parentNode;while (D&&D.parentNode!=B) D=D.parentNode;if (!C||!D) return;var E=C;var F=[];var G=false;while (G==false){if (E==D) G=true;F.push(E);E=E.nextSibling;};if (F.length<1) return;var H=FCKDomTools.GetParents(B);for (var i=0;i<H.length;i++){if (H[i].nodeName.IEquals(['ul','ol'])){B=H[i];break;}};var I=this.Name.IEquals('indent')?1:-1;var J=F[0];var K=F[F.length-1];var L={};var M=FCKDomTools.ListToArray(B,L);var N=M[K._FCK_ListArray_Index].indent;for (var i=J._FCK_ListArray_Index;i<=K._FCK_ListArray_Index;i++) M[i].indent+=I;for (var i=K._FCK_ListArray_Index+1;i<M.length&&M[i].indent>N;i++) M[i].indent+=I;var O=FCKDomTools.ArrayToList(M);if (O) B.parentNode.replaceChild(O.listNode,B);FCKDomTools.ClearAllMarkers(L);}};
+var FCKBlockQuoteCommand=function(){};FCKBlockQuoteCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();var A=this.GetState();var B=new FCKDomRange(FCK.EditorWindow);B.MoveToSelection();var C=B.CreateBookmark();if (FCKBrowserInfo.IsIE){var D=B.GetBookmarkNode(C,true);var E=B.GetBookmarkNode(C,false);var F;if (D&&D.parentNode.nodeName.IEquals('blockquote')&&!D.previousSibling){F=D;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]) FCKDomTools.MoveNode(D,F,true);}};if (E&&E.parentNode.nodeName.IEquals('blockquote')&&!E.previousSibling){F=E;while ((F=F.nextSibling)){if (FCKListsLib.BlockElements[F.nodeName.toLowerCase()]){if (F.firstChild==D) FCKDomTools.InsertAfterNode(D,E);else FCKDomTools.MoveNode(E,F,true);}}}};var G=new FCKDomRangeIterator(B);var H;if (A==0){G.EnforceRealBlocks=true;var I=[];while ((H=G.GetNextParagraph())) I.push(H);if (I.length<1){para=B.Window.document.createElement(FCKConfig.EnterMode.IEquals('p')?'p':'div');B.InsertNode(para);para.appendChild(B.Window.document.createTextNode('\ufeff'));B.MoveToBookmark(C);B.MoveToNodeContents(para);B.Collapse(true);C=B.CreateBookmark();I.push(para);};var J=I[0].parentNode;var K=[];for (var i=0;i<I.length;i++){H=I[i];J=FCKDomTools.GetCommonParents(H.parentNode,J).pop();};var L=null;while (I.length>0){H=I.shift();while (H.parentNode!=J) H=H.parentNode;if (H!=L) K.push(H);L=H;}while (K.length>0){H=K.shift();if (H.nodeName.IEquals('blockquote')){var M=FCKTools.GetElementDocument(H).createDocumentFragment();while (H.firstChild){M.appendChild(H.removeChild(H.firstChild));I.push(M.lastChild);};H.parentNode.replaceChild(M,H);}else I.push(H);};var N=B.Window.document.createElement('blockquote');J.insertBefore(N,I[0]);while (I.length>0){H=I.shift();N.appendChild(H);}}else if (A==1){var O=[];while ((H=G.GetNextParagraph())){var P=null;var Q=null;while (H.parentNode){if (H.parentNode.nodeName.IEquals('blockquote')){P=H.parentNode;Q=H;break;};H=H.parentNode;};if (P&&Q) O.push(Q);};var R=[];while (O.length>0){var S=O.shift();var N=S.parentNode;if (S==S.parentNode.firstChild){N.parentNode.insertBefore(N.removeChild(S),N);if (!N.firstChild) N.parentNode.removeChild(N);}else if (S==S.parentNode.lastChild){N.parentNode.insertBefore(N.removeChild(S),N.nextSibling);if (!N.firstChild) N.parentNode.removeChild(N);}else FCKDomTools.BreakParent(S,S.parentNode,B);R.push(S);};if (FCKConfig.EnterMode.IEquals('br')){while (R.length){var S=R.shift();var W=true;if (S.nodeName.IEquals('div')){var M=FCKTools.GetElementDocument(S).createDocumentFragment();var Y=W&&S.previousSibling&&!FCKListsLib.BlockBoundaries[S.previousSibling.nodeName.toLowerCase()];if (W&&Y) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));var Z=S.nextSibling&&!FCKListsLib.BlockBoundaries[S.nextSibling.nodeName.toLowerCase()];while (S.firstChild) M.appendChild(S.removeChild(S.firstChild));if (Z) M.appendChild(FCKTools.GetElementDocument(S).createElement('br'));S.parentNode.replaceChild(M,S);W=false;}}}};B.MoveToBookmark(C);B.Select();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0||!FCK.EditorWindow) return -1;var A=new FCKElementPath(FCKSelection.GetBoundaryParentElement(true));var B=A.Block||A.BlockLimit;if (!B||B.nodeName.toLowerCase()=='body') return 0;for (var i=0;i<A.Elements.length;i++){if (A.Elements[i].nodeName.IEquals('blockquote')) return 1;};return 0;}};
+var FCKCoreStyleCommand=function(A){this.Name='CoreStyle';this.StyleName='_FCK_'+A;this.IsActive=false;FCKStyles.AttachStyleStateChange(this.StyleName,this._OnStyleStateChange,this);};FCKCoreStyleCommand.prototype={Execute:function(){FCKUndo.SaveUndoStep();if (this.IsActive) FCKStyles.RemoveStyle(this.StyleName);else FCKStyles.ApplyStyle(this.StyleName);FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){if (FCK.EditMode!=0) return -1;return this.IsActive?1:0;},_OnStyleStateChange:function(A,B){this.IsActive=B;}};
+var FCKRemoveFormatCommand=function(){this.Name='RemoveFormat';};FCKRemoveFormatCommand.prototype={Execute:function(){FCKStyles.RemoveAll();FCK.Focus();FCK.Events.FireEvent('OnSelectionChange');},GetState:function(){return FCK.EditorWindow?0:-1;}};
+var FCKCommands=FCK.Commands={};FCKCommands.LoadedCommands={};FCKCommands.RegisterCommand=function(A,B){this.LoadedCommands[A]=B;};FCKCommands.GetCommand=function(A){var B=FCKCommands.LoadedCommands[A];if (B) return B;switch (A){case 'Bold':case 'Italic':case 'Underline':case 'StrikeThrough':case 'Subscript':case 'Superscript':B=new FCKCoreStyleCommand(A);break;case 'RemoveFormat':B=new FCKRemoveFormatCommand();break;case 'DocProps':B=new FCKDialogCommand('DocProps',FCKLang.DocProps,'dialog/fck_docprops.html',400,380,FCKCommands.GetFullPageState);break;case 'Templates':B=new FCKDialogCommand('Templates',FCKLang.DlgTemplatesTitle,'dialog/fck_template.html',380,450);break;case 'Link':B=new FCKDialogCommand('Link',FCKLang.DlgLnkWindowTitle,'dialog/fck_link.html',400,300);break;case 'Unlink':B=new FCKUnlinkCommand();break;case 'VisitLink':B=new FCKVisitLinkCommand();break;case 'Anchor':B=new FCKDialogCommand('Anchor',FCKLang.DlgAnchorTitle,'dialog/fck_anchor.html',370,160);break;case 'AnchorDelete':B=new FCKAnchorDeleteCommand();break;case 'BulletedList':B=new FCKDialogCommand('BulletedList',FCKLang.BulletedListProp,'dialog/fck_listprop.html?UL',370,160);break;case 'NumberedList':B=new FCKDialogCommand('NumberedList',FCKLang.NumberedListProp,'dialog/fck_listprop.html?OL',370,160);break;case 'About':B=new FCKDialogCommand('About',FCKLang.About,'dialog/fck_about.html',420,330,function(){ return 0;});break;case 'Find':B=new FCKDialogCommand('Find',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Find');break;case 'Replace':B=new FCKDialogCommand('Replace',FCKLang.DlgFindAndReplaceTitle,'dialog/fck_replace.html',340,230,null,null,'Replace');break;case 'Image':B=new FCKDialogCommand('Image',FCKLang.DlgImgTitle,'dialog/fck_image.html',450,390);break;case 'Flash':B=new FCKDialogCommand('Flash',FCKLang.DlgFlashTitle,'dialog/fck_flash.html',450,390);break;case 'SpecialChar':B=new FCKDialogCommand('SpecialChar',FCKLang.DlgSpecialCharTitle,'dialog/fck_specialchar.html',400,290);break;case 'Smiley':B=new FCKDialogCommand('Smiley',FCKLang.DlgSmileyTitle,'dialog/fck_smiley.html',FCKConfig.SmileyWindowWidth,FCKConfig.SmileyWindowHeight);break;case 'Table':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html',480,250);break;case 'TableProp':B=new FCKDialogCommand('Table',FCKLang.DlgTableTitle,'dialog/fck_table.html?Parent',480,250);break;case 'TableCellProp':B=new FCKDialogCommand('TableCell',FCKLang.DlgCellTitle,'dialog/fck_tablecell.html',550,240);break;case 'Style':B=new FCKStyleCommand();break;case 'FontName':B=new FCKFontNameCommand();break;case 'FontSize':B=new FCKFontSizeCommand();break;case 'FontFormat':B=new FCKFormatBlockCommand();break;case 'Source':B=new FCKSourceCommand();break;case 'Preview':B=new FCKPreviewCommand();break;case 'Save':B=new FCKSaveCommand();break;case 'NewPage':B=new FCKNewPageCommand();break;case 'PageBreak':B=new FCKPageBreakCommand();break;case 'Rule':B=new FCKRuleCommand();break;case 'Nbsp':B=new FCKNbsp();break;case 'TextColor':B=new FCKTextColorCommand('ForeColor');break;case 'BGColor':B=new FCKTextColorCommand('BackColor');break;case 'Paste':B=new FCKPasteCommand();break;case 'PasteText':B=new FCKPastePlainTextCommand();break;case 'PasteWord':B=new FCKPasteWordCommand();break;case 'JustifyLeft':B=new FCKJustifyCommand('left');break;case 'JustifyCenter':B=new FCKJustifyCommand('center');break;case 'JustifyRight':B=new FCKJustifyCommand('right');break;case 'JustifyFull':B=new FCKJustifyCommand('justify');break;case 'Indent':B=new FCKIndentCommand('indent',FCKConfig.IndentLength);break;case 'Outdent':B=new FCKIndentCommand('outdent',FCKConfig.IndentLength*-1);break;case 'Blockquote':B=new FCKBlockQuoteCommand();break;case 'CreateDiv':B=new FCKDialogCommand('CreateDiv',FCKLang.CreateDiv,'dialog/fck_div.html',380,210,null,null,true);break;case 'EditDiv':B=new FCKDialogCommand('EditDiv',FCKLang.EditDiv,'dialog/fck_div.html',380,210,null,null,false);break;case 'DeleteDiv':B=new FCKDeleteDivCommand();break;case 'TableInsertRowAfter':B=new FCKTableCommand('TableInsertRowAfter');break;case 'TableInsertRowBefore':B=new FCKTableCommand('TableInsertRowBefore');break;case 'TableDeleteRows':B=new FCKTableCommand('TableDeleteRows');break;case 'TableInsertColumnAfter':B=new FCKTableCommand('TableInsertColumnAfter');break;case 'TableInsertColumnBefore':B=new FCKTableCommand('TableInsertColumnBefore');break;case 'TableDeleteColumns':B=new FCKTableCommand('TableDeleteColumns');break;case 'TableInsertCellAfter':B=new FCKTableCommand('TableInsertCellAfter');break;case 'TableInsertCellBefore':B=new FCKTableCommand('TableInsertCellBefore');break;case 'TableDeleteCells':B=new FCKTableCommand('TableDeleteCells');break;case 'TableMergeCells':B=new FCKTableCommand('TableMergeCells');break;case 'TableMergeRight':B=new FCKTableCommand('TableMergeRight');break;case 'TableMergeDown':B=new FCKTableCommand('TableMergeDown');break;case 'TableHorizontalSplitCell':B=new FCKTableCommand('TableHorizontalSplitCell');break;case 'TableVerticalSplitCell':B=new FCKTableCommand('TableVerticalSplitCell');break;case 'TableDelete':B=new FCKTableCommand('TableDelete');break;case 'Form':B=new FCKDialogCommand('Form',FCKLang.Form,'dialog/fck_form.html',380,210);break;case 'Checkbox':B=new FCKDialogCommand('Checkbox',FCKLang.Checkbox,'dialog/fck_checkbox.html',380,200);break;case 'Radio':B=new FCKDialogCommand('Radio',FCKLang.RadioButton,'dialog/fck_radiobutton.html',380,200);break;case 'TextField':B=new FCKDialogCommand('TextField',FCKLang.TextField,'dialog/fck_textfield.html',380,210);break;case 'Textarea':B=new FCKDialogCommand('Textarea',FCKLang.Textarea,'dialog/fck_textarea.html',380,210);break;case 'HiddenField':B=new FCKDialogCommand('HiddenField',FCKLang.HiddenField,'dialog/fck_hiddenfield.html',380,190);break;case 'Button':B=new FCKDialogCommand('Button',FCKLang.Button,'dialog/fck_button.html',380,210);break;case 'Select':B=new FCKDialogCommand('Select',FCKLang.SelectionField,'dialog/fck_select.html',400,340);break;case 'ImageButton':B=new FCKDialogCommand('ImageButton',FCKLang.ImageButton,'dialog/fck_image.html?ImageButton',450,390);break;case 'SpellCheck':B=new FCKSpellCheckCommand();break;case 'FitWindow':B=new FCKFitWindow();break;case 'Undo':B=new FCKUndoCommand();break;case 'Redo':B=new FCKRedoCommand();break;case 'Copy':B=new FCKCutCopyCommand(false);break;case 'Cut':B=new FCKCutCopyCommand(true);break;case 'SelectAll':B=new FCKSelectAllCommand();break;case 'InsertOrderedList':B=new FCKListCommand('insertorderedlist','ol');break;case 'InsertUnorderedList':B=new FCKListCommand('insertunorderedlist','ul');break;case 'ShowBlocks':B=new FCKShowBlockCommand('ShowBlocks',FCKConfig.StartupShowBlocks?1:0);break;case 'Undefined':B=new FCKUndefinedCommand();break;default:if (FCKRegexLib.NamedCommands.test(A)) B=new FCKNamedCommand(A);else{alert(FCKLang.UnknownCommand.replace(/%1/g,A));return null;}};FCKCommands.LoadedCommands[A]=B;return B;};FCKCommands.GetFullPageState=function(){return FCKConfig.FullPage?0:-1;};FCKCommands.GetBooleanState=function(A){return A?-1:0;};
+var FCKPanel=function(A){this.IsRTL=(FCKLang.Dir=='rtl');this.IsContextMenu=false;this._LockCounter=0;this._Window=A||window;var B;if (FCKBrowserInfo.IsIE){this._Popup=this._Window.createPopup();var C=this._Window.document;if (FCK_IS_CUSTOM_DOMAIN&&!FCKBrowserInfo.IsIE7){C.domain=FCK_ORIGINAL_DOMAIN;document.domain=FCK_ORIGINAL_DOMAIN;};B=this.Document=this._Popup.document;if (FCK_IS_CUSTOM_DOMAIN){B.domain=FCK_RUNTIME_DOMAIN;C.domain=FCK_RUNTIME_DOMAIN;document.domain=FCK_RUNTIME_DOMAIN;};FCK.IECleanup.AddItem(this,FCKPanel_Cleanup);}else{var D=this._IFrame=this._Window.document.createElement('iframe');FCKTools.ResetStyles(D);D.src='javascript:void(0)';D.allowTransparency=true;D.frameBorder='0';D.scrolling='no';D.style.width=D.style.height='0px';FCKDomTools.SetElementStyles(D,{position:'absolute',zIndex:FCKConfig.FloatingPanelsZIndex});this._Window.document.body.appendChild(D);var E=D.contentWindow;B=this.Document=E.document;var F='';if (FCKBrowserInfo.IsSafari) F='<base href="'+window.document.location+'">';B.open();B.write('<html><head>'+F+'<\/head><body style="margin:0px;padding:0px;"><\/body><\/html>');B.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.Panel_Contructor(B,window.document.location);FCKTools.AddEventListenerEx(E,'focus',FCKPanel_Window_OnFocus,this);FCKTools.AddEventListenerEx(E,'blur',FCKPanel_Window_OnBlur,this);};B.dir=FCKLang.Dir;FCKTools.AddEventListener(B,'contextmenu',FCKTools.CancelEvent);this.MainNode=B.body.appendChild(B.createElement('DIV'));this.MainNode.style.cssFloat=this.IsRTL?'right':'left';};FCKPanel.prototype.AppendStyleSheet=function(A){FCKTools.AppendStyleSheet(this.Document,A);};FCKPanel.prototype.Preload=function(x,y,A){if (this._Popup) this._Popup.show(x,y,0,0,A);};FCKPanel.prototype.Show=function(x,y,A,B,C){var D;var E=this.MainNode;if (this._Popup){this._Popup.show(x,y,0,0,A);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=(x*-1)+A.offsetWidth-D;};this._Popup.show(x,y,D,E.offsetHeight,A);if (this.OnHide){if (this._Timer) CheckPopupOnHide.call(this,true);this._Timer=FCKTools.SetInterval(CheckPopupOnHide,100,this);}}else{if (typeof(FCK.ToolbarSet.CurrentInstance.FocusManager)!='undefined') FCK.ToolbarSet.CurrentInstance.FocusManager.Lock();if (this.ParentPanel){this.ParentPanel.Lock();FCKPanel_Window_OnBlur(null,this.ParentPanel);};if (FCKBrowserInfo.IsGecko&&FCKBrowserInfo.IsMac){this._IFrame.scrolling='';FCKTools.RunFunction(function(){ this._IFrame.scrolling='no';},this);};if (FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel&&FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel!=this) FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel.Hide(false,true);FCKDomTools.SetElementStyles(E,{B:B?B+'px':'',C:C?C+'px':''});D=E.offsetWidth;if (!B)	this._IFrame.width=1;if (!C)	this._IFrame.height=1;D=E.offsetWidth||E.firstChild.offsetWidth;var F=FCKTools.GetDocumentPosition(this._Window,A.nodeType==9?(FCKTools.IsStrictMode(A)?A.documentElement:A.body):A);var G=FCKDomTools.GetPositionedAncestor(this._IFrame.parentNode);if (G){var H=FCKTools.GetDocumentPosition(FCKTools.GetElementWindow(G),G);F.x-=H.x;F.y-=H.y;};if (this.IsRTL&&!this.IsContextMenu) x=(x*-1);x+=F.x;y+=F.y;if (this.IsRTL){if (this.IsContextMenu) x=x-D+1;else if (A) x=x+A.offsetWidth-D;}else{var I=FCKTools.GetViewPaneSize(this._Window);var J=FCKTools.GetScrollPosition(this._Window);var K=I.Height+J.Y;var L=I.Width+J.X;if ((x+D)>L) x-=x+D-L;if ((y+E.offsetHeight)>K) y-=y+E.offsetHeight-K;};FCKDomTools.SetElementStyles(this._IFrame,{left:x+'px',top:y+'px'});this._IFrame.contentWindow.focus();this._IsOpened=true;var M=this;this._resizeTimer=setTimeout(function(){var N=E.offsetWidth||E.firstChild.offsetWidth;var O=E.offsetHeight;M._IFrame.style.width=N+'px';M._IFrame.style.height=O+'px';},0);FCK.ToolbarSet.CurrentInstance.GetInstanceObject('FCKPanel')._OpenedPanel=this;};FCKTools.RunFunction(this.OnShow,this);};FCKPanel.prototype.Hide=function(A,B){if (this._Popup) this._Popup.hide();else{if (!this._IsOpened||this._LockCounter>0) return;if (typeof(FCKFocusManager)!='undefined'&&!B) FCKFocusManager.Unlock();this._IFrame.style.width=this._IFrame.style.height='0px';this._IsOpened=false;if (this._resizeTimer){clearTimeout(this._resizeTimer);this._resizeTimer=null;};if (this.ParentPanel) this.ParentPanel.Unlock();if (!A) FCKTools.RunFunction(this.OnHide,this);}};FCKPanel.prototype.CheckIsOpened=function(){if (this._Popup) return this._Popup.isOpen;else return this._IsOpened;};FCKPanel.prototype.CreateChildPanel=function(){var A=this._Popup?FCKTools.GetDocumentWindow(this.Document):this._Window;var B=new FCKPanel(A);B.ParentPanel=this;return B;};FCKPanel.prototype.Lock=function(){this._LockCounter++;};FCKPanel.prototype.Unlock=function(){if (--this._LockCounter==0&&!this.HasFocus) this.Hide();};function FCKPanel_Window_OnFocus(e,A){A.HasFocus=true;};function FCKPanel_Window_OnBlur(e,A){A.HasFocus=false;if (A._LockCounter==0) FCKTools.RunFunction(A.Hide,A);};function CheckPopupOnHide(A){if (A||!this._Popup.isOpen){window.clearInterval(this._Timer);this._Timer=null;FCKTools.RunFunction(this.OnHide,this);}};function FCKPanel_Cleanup(){this._Popup=null;this._Window=null;this.Document=null;this.MainNode=null;};
+var FCKIcon=function(A){var B=A?typeof(A):'undefined';switch (B){case 'number':this.Path=FCKConfig.SkinPath+'fck_strip.gif';this.Size=16;this.Position=A;break;case 'undefined':this.Path=FCK_SPACER_PATH;break;case 'string':this.Path=A;break;default:this.Path=A[0];this.Size=A[1];this.Position=A[2];}};FCKIcon.prototype.CreateIconElement=function(A){var B,eIconImage;if (this.Position){var C='-'+((this.Position-1)*this.Size)+'px';if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path;eIconImage.style.top=C;}else{B=A.createElement('IMG');B.src=FCK_SPACER_PATH;B.style.backgroundPosition='0px '+C;B.style.backgroundImage='url("'+this.Path+'")';}}else{if (FCKBrowserInfo.IsIE){B=A.createElement('DIV');eIconImage=B.appendChild(A.createElement('IMG'));eIconImage.src=this.Path?this.Path:FCK_SPACER_PATH;}else{B=A.createElement('IMG');B.src=this.Path?this.Path:FCK_SPACER_PATH;}};B.className='TB_Button_Image';return B;};
+var FCKToolbarButtonUI=function(A,B,C,D,E,F){this.Name=A;this.Label=B||A;this.Tooltip=C||this.Label;this.Style=E||0;this.State=F||0;this.Icon=new FCKIcon(D);if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarButtonUI_Cleanup);};FCKToolbarButtonUI.prototype._CreatePaddingElement=function(A){var B=A.createElement('IMG');B.className='TB_Button_Padding';B.src=FCK_SPACER_PATH;return B;};FCKToolbarButtonUI.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this.MainElement=B.createElement('DIV');C.title=this.Tooltip;if (FCKBrowserInfo.IsGecko) C.onmousedown=FCKTools.CancelEvent;FCKTools.AddEventListenerEx(C,'mouseover',FCKToolbarButtonUI_OnMouseOver,this);FCKTools.AddEventListenerEx(C,'mouseout',FCKToolbarButtonUI_OnMouseOut,this);FCKTools.AddEventListenerEx(C,'click',FCKToolbarButtonUI_OnClick,this);this.ChangeState(this.State,true);if (this.Style==0&&!this.ShowArrow){C.appendChild(this.Icon.CreateIconElement(B));}else{var D=C.appendChild(B.createElement('TABLE'));D.cellPadding=0;D.cellSpacing=0;var E=D.insertRow(-1);var F=E.insertCell(-1);if (this.Style==0||this.Style==2) F.appendChild(this.Icon.CreateIconElement(B));else F.appendChild(this._CreatePaddingElement(B));if (this.Style==1||this.Style==2){F=E.insertCell(-1);F.className='TB_Button_Text';F.noWrap=true;F.appendChild(B.createTextNode(this.Label));};if (this.ShowArrow){if (this.Style!=0){E.insertCell(-1).appendChild(this._CreatePaddingElement(B));};F=E.insertCell(-1);var G=F.appendChild(B.createElement('IMG'));G.src=FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif';G.width=5;G.height=3;};F=E.insertCell(-1);F.appendChild(this._CreatePaddingElement(B));};A.appendChild(C);};FCKToolbarButtonUI.prototype.ChangeState=function(A,B){if (!B&&this.State==A) return;var e=this.MainElement;if (!e) return;switch (parseInt(A,10)){case 0:e.className='TB_Button_Off';break;case 1:e.className='TB_Button_On';break;case -1:e.className='TB_Button_Disabled';break;};this.State=A;};function FCKToolbarButtonUI_OnMouseOver(A,B){if (B.State==0) this.className='TB_Button_Off_Over';else if (B.State==1) this.className='TB_Button_On_Over';};function FCKToolbarButtonUI_OnMouseOut(A,B){if (B.State==0) this.className='TB_Button_Off';else if (B.State==1) this.className='TB_Button_On';};function FCKToolbarButtonUI_OnClick(A,B){if (B.OnClick&&B.State!=-1) B.OnClick(B);};function FCKToolbarButtonUI_Cleanup(){this.MainElement=null;};
+var FCKToolbarButton=function(A,B,C,D,E,F,G){this.CommandName=A;this.Label=B;this.Tooltip=C;this.Style=D;this.SourceView=E?true:false;this.ContextSensitive=F?true:false;if (G==null) this.IconPath=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(G)=='number') this.IconPath=[FCKConfig.SkinPath+'fck_strip.gif',16,G];else this.IconPath=G;};FCKToolbarButton.prototype.Create=function(A){this._UIButton=new FCKToolbarButtonUI(this.CommandName,this.Label,this.Tooltip,this.IconPath,this.Style);this._UIButton.OnClick=this.Click;this._UIButton._ToolbarButton=this;this._UIButton.Create(A);};FCKToolbarButton.prototype.RefreshState=function(){var A=this._UIButton;if (!A) return;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B==A.State) return;A.ChangeState(B);};FCKToolbarButton.prototype.Click=function(){var A=this._ToolbarButton||this;FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(A.CommandName).Execute();};FCKToolbarButton.prototype.Enable=function(){this.RefreshState();};FCKToolbarButton.prototype.Disable=function(){this._UIButton.ChangeState(-1);};
+var FCKSpecialCombo=function(A,B,C,D,E){this.FieldWidth=B||100;this.PanelWidth=C||150;this.PanelMaxHeight=D||150;this.Label='&nbsp;';this.Caption=A;this.Tooltip=A;this.Style=2;this.Enabled=true;this.Items={};this._Panel=new FCKPanel(E||window);this._Panel.AppendStyleSheet(FCKConfig.SkinEditorCSS);this._PanelBox=this._Panel.MainNode.appendChild(this._Panel.Document.createElement('DIV'));this._PanelBox.className='SC_Panel';this._PanelBox.style.width=this.PanelWidth+'px';this._PanelBox.innerHTML='<table cellpadding="0" cellspacing="0" width="100%" style="TABLE-LAYOUT: fixed"><tr><td nowrap></td></tr></table>';this._ItemsHolderEl=this._PanelBox.getElementsByTagName('TD')[0];if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKSpecialCombo_Cleanup);};function FCKSpecialCombo_ItemOnMouseOver(){this.className+=' SC_ItemOver';};function FCKSpecialCombo_ItemOnMouseOut(){this.className=this.originalClass;};function FCKSpecialCombo_ItemOnClick(A,B,C){this.className=this.originalClass;B._Panel.Hide();B.SetLabel(this.FCKItemLabel);if (typeof(B.OnSelect)=='function') B.OnSelect(C,this);};FCKSpecialCombo.prototype.ClearItems=function (){if (this.Items) this.Items={};var A=this._ItemsHolderEl;while (A.firstChild) A.removeChild(A.firstChild);};FCKSpecialCombo.prototype.AddItem=function(A,B,C,D){var E=this._ItemsHolderEl.appendChild(this._Panel.Document.createElement('DIV'));E.className=E.originalClass='SC_Item';E.innerHTML=B;E.FCKItemLabel=C||A;E.Selected=false;if (FCKBrowserInfo.IsIE) E.style.width='100%';if (D) E.style.backgroundColor=D;FCKTools.AddEventListenerEx(E,'mouseover',FCKSpecialCombo_ItemOnMouseOver);FCKTools.AddEventListenerEx(E,'mouseout',FCKSpecialCombo_ItemOnMouseOut);FCKTools.AddEventListenerEx(E,'click',FCKSpecialCombo_ItemOnClick,[this,A]);this.Items[A.toString().toLowerCase()]=E;return E;};FCKSpecialCombo.prototype.SelectItem=function(A){if (typeof A=='string') A=this.Items[A.toString().toLowerCase()];if (A){A.className=A.originalClass='SC_ItemSelected';A.Selected=true;}};FCKSpecialCombo.prototype.SelectItemByLabel=function(A,B){for (var C in this.Items){var D=this.Items[C];if (D.FCKItemLabel==A){D.className=D.originalClass='SC_ItemSelected';D.Selected=true;if (B) this.SetLabel(A);}}};FCKSpecialCombo.prototype.DeselectAll=function(A){for (var i in this.Items){if (!this.Items[i]) continue;this.Items[i].className=this.Items[i].originalClass='SC_Item';this.Items[i].Selected=false;};if (A) this.SetLabel('');};FCKSpecialCombo.prototype.SetLabelById=function(A){A=A?A.toString().toLowerCase():'';var B=this.Items[A];this.SetLabel(B?B.FCKItemLabel:'');};FCKSpecialCombo.prototype.SetLabel=function(A){A=(!A||A.length==0)?'&nbsp;':A;if (A==this.Label) return;this.Label=A;var B=this._LabelEl;if (B){B.innerHTML=A;FCKTools.DisableSelection(B);}};FCKSpecialCombo.prototype.SetEnabled=function(A){this.Enabled=A;if (this._OuterTable) this._OuterTable.className=A?'':'SC_FieldDisabled';};FCKSpecialCombo.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var C=this._OuterTable=A.appendChild(B.createElement('TABLE'));C.cellPadding=0;C.cellSpacing=0;C.insertRow(-1);var D;var E;switch (this.Style){case 0:D='TB_ButtonType_Icon';E=false;break;case 1:D='TB_ButtonType_Text';E=false;break;case 2:E=true;break;};if (this.Caption&&this.Caption.length>0&&E){var F=C.rows[0].insertCell(-1);F.innerHTML=this.Caption;F.className='SC_FieldCaption';};var G=FCKTools.AppendElement(C.rows[0].insertCell(-1),'div');if (E){G.className='SC_Field';G.style.width=this.FieldWidth+'px';G.innerHTML='<table width="100%" cellpadding="0" cellspacing="0" style="TABLE-LAYOUT: fixed;"><tbody><tr><td class="SC_FieldLabel"><label>&nbsp;</label></td><td class="SC_FieldButton">&nbsp;</td></tr></tbody></table>';this._LabelEl=G.getElementsByTagName('label')[0];this._LabelEl.innerHTML=this.Label;}else{G.className='TB_Button_Off';G.innerHTML='<table title="'+this.Tooltip+'" class="'+D+'" cellspacing="0" cellpadding="0" border="0"><tr><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td><td class="TB_Text">'+this.Caption+'</td><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td><td class="TB_ButtonArrow"><img src="'+FCKConfig.SkinPath+'images/toolbar.buttonarrow.gif" width="5" height="3"></td><td><img class="TB_Button_Padding" src="'+FCK_SPACER_PATH+'" /></td></tr></table>';};FCKTools.AddEventListenerEx(G,'mouseover',FCKSpecialCombo_OnMouseOver,this);FCKTools.AddEventListenerEx(G,'mouseout',FCKSpecialCombo_OnMouseOut,this);FCKTools.AddEventListenerEx(G,'click',FCKSpecialCombo_OnClick,this);FCKTools.DisableSelection(this._Panel.Document.body);};function FCKSpecialCombo_Cleanup(){this._LabelEl=null;this._OuterTable=null;this._ItemsHolderEl=null;this._PanelBox=null;if (this.Items){for (var A in this.Items) this.Items[A]=null;}};function FCKSpecialCombo_OnMouseOver(A,B){if (B.Enabled){switch (B.Style){case 0:this.className='TB_Button_On_Over';break;case 1:this.className='TB_Button_On_Over';break;case 2:this.className='SC_Field SC_FieldOver';break;}}};function FCKSpecialCombo_OnMouseOut(A,B){switch (B.Style){case 0:this.className='TB_Button_Off';break;case 1:this.className='TB_Button_Off';break;case 2:this.className='SC_Field';break;}};function FCKSpecialCombo_OnClick(e,A){if (A.Enabled){var B=A._Panel;var C=A._PanelBox;var D=A._ItemsHolderEl;var E=A.PanelMaxHeight;if (A.OnBeforeClick) A.OnBeforeClick(A);if (FCKBrowserInfo.IsIE) B.Preload(0,this.offsetHeight,this);if (D.offsetHeight>E) C.style.height=E+'px';else C.style.height='';B.Show(0,this.offsetHeight,this);}};
+var FCKToolbarSpecialCombo=function(){this.SourceView=false;this.ContextSensitive=true;this.FieldWidth=null;this.PanelWidth=null;this.PanelMaxHeight=null;};FCKToolbarSpecialCombo.prototype.DefaultLabel='';function FCKToolbarSpecialCombo_OnSelect(A,B){FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).Execute(A,B);};FCKToolbarSpecialCombo.prototype.Create=function(A){this._Combo=new FCKSpecialCombo(this.GetLabel(),this.FieldWidth,this.PanelWidth,this.PanelMaxHeight,FCKBrowserInfo.IsIE?window:FCKTools.GetElementWindow(A).parent);this._Combo.Tooltip=this.Tooltip;this._Combo.Style=this.Style;this.CreateItems(this._Combo);this._Combo.Create(A);this._Combo.CommandName=this.CommandName;this._Combo.OnSelect=FCKToolbarSpecialCombo_OnSelect;};function FCKToolbarSpecialCombo_RefreshActiveItems(A,B){A.DeselectAll();A.SelectItem(B);A.SetLabelById(B);};FCKToolbarSpecialCombo.prototype.RefreshState=function(){var A;var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName).GetState();if (B!=-1){A=1;if (this.RefreshActiveItems) this.RefreshActiveItems(this._Combo,B);else{if (this._LastValue!==B){this._LastValue=B;if (!B||B.length==0){this._Combo.DeselectAll();this._Combo.SetLabel(this.DefaultLabel);}else FCKToolbarSpecialCombo_RefreshActiveItems(this._Combo,B);}}}else A=-1;if (A==this.State) return;if (A==-1){this._Combo.DeselectAll();this._Combo.SetLabel('');};this.State=A;this._Combo.SetEnabled(A!=-1);};FCKToolbarSpecialCombo.prototype.Enable=function(){this.RefreshState();};FCKToolbarSpecialCombo.prototype.Disable=function(){this.State=-1;this._Combo.DeselectAll();this._Combo.SetLabel('');this._Combo.SetEnabled(false);};
+var FCKToolbarStyleCombo=function(A,B){if (A===false) return;this.CommandName='Style';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultStyleLabel||'';};FCKToolbarStyleCombo.prototype=new FCKToolbarSpecialCombo;FCKToolbarStyleCombo.prototype.GetLabel=function(){return FCKLang.Style;};FCKToolbarStyleCombo.prototype.GetStyles=function(){var A={};var B=FCK.ToolbarSet.CurrentInstance.Styles.GetStyles();for (var C in B){var D=B[C];if (!D.IsCore) A[C]=D;};return A;};FCKToolbarStyleCombo.prototype.CreateItems=function(A){var B=A._Panel.Document;FCKTools.AppendStyleSheet(B,FCKConfig.ToolbarComboPreviewCSS);FCKTools.AppendStyleString(B,FCKConfig.EditorAreaStyles);B.body.className+=' ForceBaseFont';FCKConfig.ApplyBodyAttributes(B.body);var C=this.GetStyles();for (var D in C){var E=C[D];var F=E.GetType()==2?D:FCKToolbarStyleCombo_BuildPreview(E,E.Label||D);var G=A.AddItem(D,F);G.Style=E;};A.OnBeforeClick=this.StyleCombo_OnBeforeClick;};FCKToolbarStyleCombo.prototype.RefreshActiveItems=function(A){var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Elements;for (var e=0;e<D.length;e++){for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D[e],true)){A.SetLabel(F.Label||F.Name);return;}}}};A.SetLabel(this.DefaultLabel);};FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B;var C;var D;var E=FCK.ToolbarSet.CurrentInstance.Selection;if (E.GetType()=='Control'){B=E.GetSelectedElement();D=B.nodeName.toLowerCase();}else{B=E.GetBoundaryParentElement(true);C=new FCKElementPath(B);};for (var i in A.Items){var F=A.Items[i];var G=F.Style;if ((D&&G.Element==D)||(!D&&G.GetType()!=2)){F.style.display='';if ((C&&G.CheckActive(C))||(!C&&G.CheckElementRemovable(B,true))) A.SelectItem(G.Name);}else F.style.display='none';}};function FCKToolbarStyleCombo_BuildPreview(A,B){var C=A.GetType();var D=[];if (C==0) D.push('<div class="BaseFont">');var E=A.Element;if (E=='bdo') E='span';D=['<',E];var F=A._StyleDesc.Attributes;if (F){for (var G in F){D.push(' ',G,'="',A.GetFinalAttributeValue(G),'"');}};if (A._GetStyleText().length>0) D.push(' style="',A.GetFinalStyleValue(),'"');D.push('>',B,'</',E,'>');if (C==0) D.push('</div>');return D.join('');};
+var FCKToolbarFontFormatCombo=function(A,B){if (A===false) return;this.CommandName='FontFormat';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.NormalLabel='Normal';this.PanelWidth=190;this.DefaultLabel=FCKConfig.DefaultFontFormatLabel||'';};FCKToolbarFontFormatCombo.prototype=new FCKToolbarStyleCombo(false);FCKToolbarFontFormatCombo.prototype.GetLabel=function(){return FCKLang.FontFormat;};FCKToolbarFontFormatCombo.prototype.GetStyles=function(){var A={};var B=FCKLang['FontFormats'].split(';');var C={p:B[0],pre:B[1],address:B[2],h1:B[3],h2:B[4],h3:B[5],h4:B[6],h5:B[7],h6:B[8],div:B[9]||(B[0]+' (DIV)')};var D=FCKConfig.FontFormats.split(';');for (var i=0;i<D.length;i++){var E=D[i];var F=FCKStyles.GetStyle('_FCK_'+E);if (F){F.Label=C[E];A['_FCK_'+E]=F;}else alert("The FCKConfig.CoreStyles['"+E+"'] setting was not found. Please check the fckconfig.js file");};return A;};FCKToolbarFontFormatCombo.prototype.RefreshActiveItems=function(A){var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Block;if (D){for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D)){A.SetLabel(F.Label);return;}}}};A.SetLabel(this.DefaultLabel);};FCKToolbarFontFormatCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B=FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);var D=C.Block;for (var i in A.Items){var E=A.Items[i];var F=E.Style;if (F.CheckElementRemovable(D)){A.SelectItem(E);return;}}}};
+var FCKToolbarFontsCombo=function(A,B){this.CommandName='FontName';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultFontLabel||'';};FCKToolbarFontsCombo.prototype=new FCKToolbarFontFormatCombo(false);FCKToolbarFontsCombo.prototype.GetLabel=function(){return FCKLang.Font;};FCKToolbarFontsCombo.prototype.GetStyles=function(){var A=FCKStyles.GetStyle('_FCK_FontFace');if (!A){alert("The FCKConfig.CoreStyles['Size'] setting was not found. Please check the fckconfig.js file");return {};};var B={};var C=FCKConfig.FontNames.split(';');for (var i=0;i<C.length;i++){var D=C[i].split('/');var E=D[0];var F=D[1]||E;var G=FCKTools.CloneObject(A);G.SetVariable('Font',E);G.Label=F;B[F]=G;};return B;};FCKToolbarFontsCombo.prototype.RefreshActiveItems=FCKToolbarStyleCombo.prototype.RefreshActiveItems;FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick=function(A){A.DeselectAll();var B=FCKSelection.GetBoundaryParentElement(true);if (B){var C=new FCKElementPath(B);for (var i in A.Items){var D=A.Items[i];var E=D.Style;if (E.CheckActive(C)){A.SelectItem(D);return;}}}};
+var FCKToolbarFontSizeCombo=function(A,B){this.CommandName='FontSize';this.Label=this.GetLabel();this.Tooltip=A?A:this.Label;this.Style=B?B:2;this.DefaultLabel=FCKConfig.DefaultFontSizeLabel||'';this.FieldWidth=70;};FCKToolbarFontSizeCombo.prototype=new FCKToolbarFontFormatCombo(false);FCKToolbarFontSizeCombo.prototype.GetLabel=function(){return FCKLang.FontSize;};FCKToolbarFontSizeCombo.prototype.GetStyles=function(){var A=FCKStyles.GetStyle('_FCK_Size');if (!A){alert("The FCKConfig.CoreStyles['FontFace'] setting was not found. Please check the fckconfig.js file");return {};};var B={};var C=FCKConfig.FontSizes.split(';');for (var i=0;i<C.length;i++){var D=C[i].split('/');var E=D[0];var F=D[1]||E;var G=FCKTools.CloneObject(A);G.SetVariable('Size',E);G.Label=F;B[F]=G;};return B;};FCKToolbarFontSizeCombo.prototype.RefreshActiveItems=FCKToolbarStyleCombo.prototype.RefreshActiveItems;FCKToolbarFontSizeCombo.prototype.StyleCombo_OnBeforeClick=FCKToolbarFontsCombo.prototype.StyleCombo_OnBeforeClick;
+var FCKToolbarPanelButton=function(A,B,C,D,E){this.CommandName=A;var F;if (E==null) F=FCKConfig.SkinPath+'toolbar/'+A.toLowerCase()+'.gif';else if (typeof(E)=='number') F=[FCKConfig.SkinPath+'fck_strip.gif',16,E];var G=this._UIButton=new FCKToolbarButtonUI(A,B,C,F,D);G._FCKToolbarPanelButton=this;G.ShowArrow=true;G.OnClick=FCKToolbarPanelButton_OnButtonClick;};FCKToolbarPanelButton.prototype.TypeName='FCKToolbarPanelButton';FCKToolbarPanelButton.prototype.Create=function(A){A.className+='Menu';this._UIButton.Create(A);var B=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(this.CommandName)._Panel;this.RegisterPanel(B);};FCKToolbarPanelButton.prototype.RegisterPanel=function(A){if (A._FCKToolbarPanelButton) return;A._FCKToolbarPanelButton=this;var B=A.Document.body.appendChild(A.Document.createElement('div'));B.style.position='absolute';B.style.top='0px';var C=A._FCKToolbarPanelButtonLineDiv=B.appendChild(A.Document.createElement('IMG'));C.className='TB_ConnectionLine';C.style.position='absolute';C.src=FCK_SPACER_PATH;A.OnHide=FCKToolbarPanelButton_OnPanelHide;};function FCKToolbarPanelButton_OnButtonClick(A){var B=this._FCKToolbarPanelButton;var e=B._UIButton.MainElement;B._UIButton.ChangeState(1);var C=FCK.ToolbarSet.CurrentInstance.Commands.GetCommand(B.CommandName);var D=C._Panel;D._FCKToolbarPanelButtonLineDiv.style.width=(e.offsetWidth-2)+'px';C.Execute(0,e.offsetHeight-1,e);};function FCKToolbarPanelButton_OnPanelHide(){var A=this._FCKToolbarPanelButton;A._UIButton.ChangeState(0);};FCKToolbarPanelButton.prototype.RefreshState=FCKToolbarButton.prototype.RefreshState;FCKToolbarPanelButton.prototype.Enable=FCKToolbarButton.prototype.Enable;FCKToolbarPanelButton.prototype.Disable=FCKToolbarButton.prototype.Disable;
+var FCKToolbarItems={};FCKToolbarItems.LoadedItems={};FCKToolbarItems.RegisterItem=function(A,B){this.LoadedItems[A]=B;};FCKToolbarItems.GetItem=function(A){var B=FCKToolbarItems.LoadedItems[A];if (B) return B;switch (A){case 'Source':B=new FCKToolbarButton('Source',FCKLang.Source,null,2,true,true,1);break;case 'DocProps':B=new FCKToolbarButton('DocProps',FCKLang.DocProps,null,null,null,null,2);break;case 'Save':B=new FCKToolbarButton('Save',FCKLang.Save,null,null,true,null,3);break;case 'NewPage':B=new FCKToolbarButton('NewPage',FCKLang.NewPage,null,null,true,null,4);break;case 'Preview':B=new FCKToolbarButton('Preview',FCKLang.Preview,null,null,true,null,5);break;case 'Templates':B=new FCKToolbarButton('Templates',FCKLang.Templates,null,null,null,null,6);break;case 'About':B=new FCKToolbarButton('About',FCKLang.About,null,null,true,null,47);break;case 'Cut':B=new FCKToolbarButton('Cut',FCKLang.Cut,null,null,false,true,7);break;case 'Copy':B=new FCKToolbarButton('Copy',FCKLang.Copy,null,null,false,true,8);break;case 'Paste':B=new FCKToolbarButton('Paste',FCKLang.Paste,null,null,false,true,9);break;case 'PasteText':B=new FCKToolbarButton('PasteText',FCKLang.PasteText,null,null,false,true,10);break;case 'PasteWord':B=new FCKToolbarButton('PasteWord',FCKLang.PasteWord,null,null,false,true,11);break;case 'Print':B=new FCKToolbarButton('Print',FCKLang.Print,null,null,false,true,12);break;case 'SpellCheck':B=new FCKToolbarButton('SpellCheck',FCKLang.SpellCheck,null,null,null,null,13);break;case 'Undo':B=new FCKToolbarButton('Undo',FCKLang.Undo,null,null,false,true,14);break;case 'Redo':B=new FCKToolbarButton('Redo',FCKLang.Redo,null,null,false,true,15);break;case 'SelectAll':B=new FCKToolbarButton('SelectAll',FCKLang.SelectAll,null,null,true,null,18);break;case 'RemoveFormat':B=new FCKToolbarButton('RemoveFormat',FCKLang.RemoveFormat,null,null,false,true,19);break;case 'FitWindow':B=new FCKToolbarButton('FitWindow',FCKLang.FitWindow,null,null,true,true,66);break;case 'Bold':B=new FCKToolbarButton('Bold',FCKLang.Bold,null,null,false,true,20);break;case 'Italic':B=new FCKToolbarButton('Italic',FCKLang.Italic,null,null,false,true,21);break;case 'Underline':B=new FCKToolbarButton('Underline',FCKLang.Underline,null,null,false,true,22);break;case 'StrikeThrough':B=new FCKToolbarButton('StrikeThrough',FCKLang.StrikeThrough,null,null,false,true,23);break;case 'Subscript':B=new FCKToolbarButton('Subscript',FCKLang.Subscript,null,null,false,true,24);break;case 'Superscript':B=new FCKToolbarButton('Superscript',FCKLang.Superscript,null,null,false,true,25);break;case 'OrderedList':B=new FCKToolbarButton('InsertOrderedList',FCKLang.NumberedListLbl,FCKLang.NumberedList,null,false,true,26);break;case 'UnorderedList':B=new FCKToolbarButton('InsertUnorderedList',FCKLang.BulletedListLbl,FCKLang.BulletedList,null,false,true,27);break;case 'Outdent':B=new FCKToolbarButton('Outdent',FCKLang.DecreaseIndent,null,null,false,true,28);break;case 'Indent':B=new FCKToolbarButton('Indent',FCKLang.IncreaseIndent,null,null,false,true,29);break;case 'Blockquote':B=new FCKToolbarButton('Blockquote',FCKLang.Blockquote,null,null,false,true,73);break;case 'CreateDiv':B=new FCKToolbarButton('CreateDiv',FCKLang.CreateDiv,null,null,false,true,74);break;case 'Link':B=new FCKToolbarButton('Link',FCKLang.InsertLinkLbl,FCKLang.InsertLink,null,false,true,34);break;case 'Unlink':B=new FCKToolbarButton('Unlink',FCKLang.RemoveLink,null,null,false,true,35);break;case 'Anchor':B=new FCKToolbarButton('Anchor',FCKLang.Anchor,null,null,null,null,36);break;case 'Image':B=new FCKToolbarButton('Image',FCKLang.InsertImageLbl,FCKLang.InsertImage,null,false,true,37);break;case 'Flash':B=new FCKToolbarButton('Flash',FCKLang.InsertFlashLbl,FCKLang.InsertFlash,null,false,true,38);break;case 'Table':B=new FCKToolbarButton('Table',FCKLang.InsertTableLbl,FCKLang.InsertTable,null,false,true,39);break;case 'SpecialChar':B=new FCKToolbarButton('SpecialChar',FCKLang.InsertSpecialCharLbl,FCKLang.InsertSpecialChar,null,false,true,42);break;case 'Smiley':B=new FCKToolbarButton('Smiley',FCKLang.InsertSmileyLbl,FCKLang.InsertSmiley,null,false,true,41);break;case 'PageBreak':B=new FCKToolbarButton('PageBreak',FCKLang.PageBreakLbl,FCKLang.PageBreak,null,false,true,43);break;case 'Rule':B=new FCKToolbarButton('Rule',FCKLang.InsertLineLbl,FCKLang.InsertLine,null,false,true,40);break;case 'JustifyLeft':B=new FCKToolbarButton('JustifyLeft',FCKLang.LeftJustify,null,null,false,true,30);break;case 'JustifyCenter':B=new FCKToolbarButton('JustifyCenter',FCKLang.CenterJustify,null,null,false,true,31);break;case 'JustifyRight':B=new FCKToolbarButton('JustifyRight',FCKLang.RightJustify,null,null,false,true,32);break;case 'JustifyFull':B=new FCKToolbarButton('JustifyFull',FCKLang.BlockJustify,null,null,false,true,33);break;case 'Style':B=new FCKToolbarStyleCombo();break;case 'FontName':B=new FCKToolbarFontsCombo();break;case 'FontSize':B=new FCKToolbarFontSizeCombo();break;case 'FontFormat':B=new FCKToolbarFontFormatCombo();break;case 'TextColor':B=new FCKToolbarPanelButton('TextColor',FCKLang.TextColor,null,null,45);break;case 'BGColor':B=new FCKToolbarPanelButton('BGColor',FCKLang.BGColor,null,null,46);break;case 'Find':B=new FCKToolbarButton('Find',FCKLang.Find,null,null,null,null,16);break;case 'Replace':B=new FCKToolbarButton('Replace',FCKLang.Replace,null,null,null,null,17);break;case 'Form':B=new FCKToolbarButton('Form',FCKLang.Form,null,null,null,null,48);break;case 'Checkbox':B=new FCKToolbarButton('Checkbox',FCKLang.Checkbox,null,null,null,null,49);break;case 'Radio':B=new FCKToolbarButton('Radio',FCKLang.RadioButton,null,null,null,null,50);break;case 'TextField':B=new FCKToolbarButton('TextField',FCKLang.TextField,null,null,null,null,51);break;case 'Textarea':B=new FCKToolbarButton('Textarea',FCKLang.Textarea,null,null,null,null,52);break;case 'HiddenField':B=new FCKToolbarButton('HiddenField',FCKLang.HiddenField,null,null,null,null,56);break;case 'Button':B=new FCKToolbarButton('Button',FCKLang.Button,null,null,null,null,54);break;case 'Select':B=new FCKToolbarButton('Select',FCKLang.SelectionField,null,null,null,null,53);break;case 'ImageButton':B=new FCKToolbarButton('ImageButton',FCKLang.ImageButton,null,null,null,null,55);break;case 'ShowBlocks':B=new FCKToolbarButton('ShowBlocks',FCKLang.ShowBlocks,null,null,null,true,72);break;default:alert(FCKLang.UnknownToolbarItem.replace(/%1/g,A));return null;};FCKToolbarItems.LoadedItems[A]=B;return B;};
+var FCKToolbar=function(){this.Items=[];};FCKToolbar.prototype.AddItem=function(A){return this.Items[this.Items.length]=A;};FCKToolbar.prototype.AddButton=function(A,B,C,D,E,F){if (typeof(D)=='number') D=[this.DefaultIconsStrip,this.DefaultIconSize,D];var G=new FCKToolbarButtonUI(A,B,C,D,E,F);G._FCKToolbar=this;G.OnClick=FCKToolbar_OnItemClick;return this.AddItem(G);};function FCKToolbar_OnItemClick(A){var B=A._FCKToolbar;if (B.OnItemClick) B.OnItemClick(B,A);};FCKToolbar.prototype.AddSeparator=function(){this.AddItem(new FCKToolbarSeparator());};FCKToolbar.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var e=B.createElement('table');e.className='TB_Toolbar';e.style.styleFloat=e.style.cssFloat=(FCKLang.Dir=='ltr'?'left':'right');e.dir=FCKLang.Dir;e.cellPadding=0;e.cellSpacing=0;var C=e.insertRow(-1);var D;if (!this.HideStart){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_Start';};for (var i=0;i<this.Items.length;i++){this.Items[i].Create(C.insertCell(-1));};if (!this.HideEnd){D=C.insertCell(-1);D.appendChild(B.createElement('div')).className='TB_End';};A.appendChild(e);};var FCKToolbarSeparator=function(){};FCKToolbarSeparator.prototype.Create=function(A){FCKTools.AppendElement(A,'div').className='TB_Separator';};
+var FCKToolbarBreak=function(){};FCKToolbarBreak.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A).createElement('div');B.className='TB_Break';B.style.clear=FCKLang.Dir=='rtl'?'left':'right';A.appendChild(B);};
+function FCKToolbarSet_Create(A){var B;var C=A||FCKConfig.ToolbarLocation;switch (C){case 'In':document.getElementById('xToolbarRow').style.display='';B=new FCKToolbarSet(document);break;case 'None':B=new FCKToolbarSet(document);break;default:FCK.Events.AttachEvent('OnBlur',FCK_OnBlur);FCK.Events.AttachEvent('OnFocus',FCK_OnFocus);var D;var E=C.match(/^Out:(.+)\((\w+)\)$/);if (E){if (FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_GetOutElement(window,E);else D=eval('parent.'+E[1]).document.getElementById(E[2]);}else{E=C.match(/^Out:(\w+)$/);if (E) D=parent.document.getElementById(E[1]);};if (!D){alert('Invalid value for "ToolbarLocation"');return arguments.callee('In');};B=D.__FCKToolbarSet;if (B) break;var F=FCKTools.GetElementDocument(D).createElement('iframe');F.src='javascript:void(0)';F.frameBorder=0;F.width='100%';F.height='10';D.appendChild(F);F.unselectable='on';var G=F.contentWindow.document;var H='';if (FCKBrowserInfo.IsSafari) H='<base href="'+window.document.location+'">';G.open();G.write('<html><head>'+H+'<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = window.onload = function(){var timer = null;var lastHeight = -1;var lastChange = 0;var poller = function(){var currentHeight = document.body.scrollHeight || 0;var currentTime = (new Date()).getTime();if (currentHeight != lastHeight){lastChange = currentTime;adjust();lastHeight = document.body.scrollHeight;}if (lastChange < currentTime - 1000) clearInterval(timer);};timer = setInterval(poller, 100);}</script></head><body style="overflow: hidden">'+document.getElementById('xToolbarSpace').innerHTML+'</body></html>');G.close();if(FCKBrowserInfo.IsAIR) FCKAdobeAIR.ToolbarSet_InitOutFrame(G);FCKTools.AddEventListener(G,'contextmenu',FCKTools.CancelEvent);FCKTools.AppendStyleSheet(G,FCKConfig.SkinEditorCSS);B=D.__FCKToolbarSet=new FCKToolbarSet(G);B._IFrame=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(D,FCKToolbarSet_Target_Cleanup);};B.CurrentInstance=FCK;if (!B.ToolbarItems) B.ToolbarItems=FCKToolbarItems;FCK.AttachToOnSelectionChange(B.RefreshItemsState);return B;};function FCK_OnBlur(A){var B=A.ToolbarSet;if (B.CurrentInstance==A) B.Disable();};function FCK_OnFocus(A){var B=A.ToolbarSet;var C=A||FCK;B.CurrentInstance.FocusManager.RemoveWindow(B._IFrame.contentWindow);B.CurrentInstance=C;C.FocusManager.AddWindow(B._IFrame.contentWindow,true);B.Enable();};function FCKToolbarSet_Cleanup(){this._TargetElement=null;this._IFrame=null;};function FCKToolbarSet_Target_Cleanup(){this.__FCKToolbarSet=null;};var FCKToolbarSet=function(A){this._Document=A;this._TargetElement=A.getElementById('xToolbar');var B=A.getElementById('xExpandHandle');var C=A.getElementById('xCollapseHandle');B.title=FCKLang.ToolbarExpand;FCKTools.AddEventListener(B,'click',FCKToolbarSet_Expand_OnClick);C.title=FCKLang.ToolbarCollapse;FCKTools.AddEventListener(C,'click',FCKToolbarSet_Collapse_OnClick);if (!FCKConfig.ToolbarCanCollapse||FCKConfig.ToolbarStartExpanded) this.Expand();else this.Collapse();C.style.display=FCKConfig.ToolbarCanCollapse?'':'none';if (FCKConfig.ToolbarCanCollapse) C.style.display='';else A.getElementById('xTBLeftBorder').style.display='';this.Toolbars=[];this.IsLoaded=false;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKToolbarSet_Cleanup);};function FCKToolbarSet_Expand_OnClick(){FCK.ToolbarSet.Expand();};function FCKToolbarSet_Collapse_OnClick(){FCK.ToolbarSet.Collapse();};FCKToolbarSet.prototype.Expand=function(){this._ChangeVisibility(false);};FCKToolbarSet.prototype.Collapse=function(){this._ChangeVisibility(true);};FCKToolbarSet.prototype._ChangeVisibility=function(A){this._Document.getElementById('xCollapsed').style.display=A?'':'none';this._Document.getElementById('xExpanded').style.display=A?'none':'';if (FCKBrowserInfo.IsGecko){FCKTools.RunFunction(window.onresize);}};FCKToolbarSet.prototype.Load=function(A){this.Name=A;this.Items=[];this.ItemsWysiwygOnly=[];this.ItemsContextSensitive=[];this._TargetElement.innerHTML='';var B=FCKConfig.ToolbarSets[A];if (!B){alert(FCKLang.UnknownToolbarSet.replace(/%1/g,A));return;};this.Toolbars=[];for (var x=0;x<B.length;x++){var C=B[x];if (!C) continue;var D;if (typeof(C)=='string'){if (C=='/') D=new FCKToolbarBreak();}else{D=new FCKToolbar();for (var j=0;j<C.length;j++){var E=C[j];if (E=='-') D.AddSeparator();else{var F=FCKToolbarItems.GetItem(E);if (F){D.AddItem(F);this.Items.push(F);if (!F.SourceView) this.ItemsWysiwygOnly.push(F);if (F.ContextSensitive) this.ItemsContextSensitive.push(F);}}}};D.Create(this._TargetElement);this.Toolbars[this.Toolbars.length]=D;};FCKTools.DisableSelection(this._Document.getElementById('xCollapseHandle').parentNode);if (FCK.Status!=2) FCK.Events.AttachEvent('OnStatusChange',this.RefreshModeState);else this.RefreshModeState();this.IsLoaded=true;this.IsEnabled=true;FCKTools.RunFunction(this.OnLoad);};FCKToolbarSet.prototype.Enable=function(){if (this.IsEnabled) return;this.IsEnabled=true;var A=this.Items;for (var i=0;i<A.length;i++) A[i].RefreshState();};FCKToolbarSet.prototype.Disable=function(){if (!this.IsEnabled) return;this.IsEnabled=false;var A=this.Items;for (var i=0;i<A.length;i++) A[i].Disable();};FCKToolbarSet.prototype.RefreshModeState=function(A){if (FCK.Status!=2) return;var B=A?A.ToolbarSet:this;var C=B.ItemsWysiwygOnly;if (FCK.EditMode==0){for (var i=0;i<C.length;i++) C[i].Enable();B.RefreshItemsState(A);}else{B.RefreshItemsState(A);for (var j=0;j<C.length;j++) C[j].Disable();}};FCKToolbarSet.prototype.RefreshItemsState=function(A){var B=(A?A.ToolbarSet:this).ItemsContextSensitive;for (var i=0;i<B.length;i++) B[i].RefreshState();};
+var FCKDialog=(function(){var A;var B;var C;var D=window.parent;while (D.parent&&D.parent!=D){try{if (D.parent.document.domain!=document.domain) break;if (D.parent.document.getElementsByTagName('frameset').length>0) break;}catch (e){break;};D=D.parent;};var E=D.document;var F=function(){if (!B) B=FCKConfig.FloatingPanelsZIndex+999;return++B;};var G=function(){if (!C) return;var H=FCKTools.IsStrictMode(E)?E.documentElement:E.body;FCKDomTools.SetElementStyles(C,{'width':Math.max(H.scrollWidth,H.clientWidth,E.scrollWidth||0)-1+'px','height':Math.max(H.scrollHeight,H.clientHeight,E.scrollHeight||0)-1+'px'});};return {OpenDialog:function(dialogName,dialogTitle,dialogPage,width,height,customValue,parentWindow,resizable){if (!A) this.DisplayMainCover();var I={Title:dialogTitle,Page:dialogPage,Editor:window,CustomValue:customValue,TopWindow:D};FCK.ToolbarSet.CurrentInstance.Selection.Save();var J=FCKTools.GetViewPaneSize(D);var K={ 'X':0,'Y':0 };var L=FCKBrowserInfo.IsIE&&(!FCKBrowserInfo.IsIE7||!FCKTools.IsStrictMode(D.document));if (L) K=FCKTools.GetScrollPosition(D);var M=Math.max(K.Y+(J.Height-height-20)/2,0);var N=Math.max(K.X+(J.Width-width-20)/2,0);var O=E.createElement('iframe');FCKTools.ResetStyles(O);O.src=FCKConfig.BasePath+'fckdialog.html';O.frameBorder=0;O.allowTransparency=true;FCKDomTools.SetElementStyles(O,{'position':(L)?'absolute':'fixed','top':M+'px','left':N+'px','width':width+'px','height':height+'px','zIndex':F()});O._DialogArguments=I;E.body.appendChild(O);O._ParentDialog=A;A=O;},OnDialogClose:function(dialogWindow){var O=dialogWindow.frameElement;FCKDomTools.RemoveNode(O);if (O._ParentDialog){A=O._ParentDialog;O._ParentDialog.contentWindow.SetEnabled(true);}else{if (!FCKBrowserInfo.IsIE) FCK.Focus();this.HideMainCover();setTimeout(function(){ A=null;},0);FCK.ToolbarSet.CurrentInstance.Selection.Release();}},DisplayMainCover:function(){C=E.createElement('div');FCKTools.ResetStyles(C);FCKDomTools.SetElementStyles(C,{'position':'absolute','zIndex':F(),'top':'0px','left':'0px','backgroundColor':FCKConfig.BackgroundBlockerColor});FCKDomTools.SetOpacity(C,FCKConfig.BackgroundBlockerOpacity);if (FCKBrowserInfo.IsIE&&!FCKBrowserInfo.IsIE7){var Q=E.createElement('iframe');FCKTools.ResetStyles(Q);Q.hideFocus=true;Q.frameBorder=0;Q.src=FCKTools.GetVoidUrl();FCKDomTools.SetElementStyles(Q,{'width':'100%','height':'100%','position':'absolute','left':'0px','top':'0px','filter':'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'});C.appendChild(Q);};FCKTools.AddEventListener(D,'resize',G);G();E.body.appendChild(C);FCKFocusManager.Lock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R._fck_originalTabIndex=R.tabIndex;R.tabIndex=-1;},HideMainCover:function(){FCKDomTools.RemoveNode(C);FCKFocusManager.Unlock();var R=FCK.ToolbarSet.CurrentInstance.GetInstanceObject('frameElement');R.tabIndex=R._fck_originalTabIndex;FCKDomTools.ClearElementJSProperty(R,'_fck_originalTabIndex');},GetCover:function(){return C;}};})();
+var FCKMenuItem=function(A,B,C,D,E,F){this.Name=B;this.Label=C||B;this.IsDisabled=E;this.Icon=new FCKIcon(D);this.SubMenu=new FCKMenuBlockPanel();this.SubMenu.Parent=A;this.SubMenu.OnClick=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnClick,this);this.CustomData=F;if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuItem_Cleanup);};FCKMenuItem.prototype.AddItem=function(A,B,C,D,E){this.HasSubMenu=true;return this.SubMenu.AddItem(A,B,C,D,E);};FCKMenuItem.prototype.AddSeparator=function(){this.SubMenu.AddSeparator();};FCKMenuItem.prototype.Create=function(A){var B=this.HasSubMenu;var C=FCKTools.GetElementDocument(A);var r=this.MainElement=A.insertRow(-1);r.className=this.IsDisabled?'MN_Item_Disabled':'MN_Item';if (!this.IsDisabled){FCKTools.AddEventListenerEx(r,'mouseover',FCKMenuItem_OnMouseOver,[this]);FCKTools.AddEventListenerEx(r,'click',FCKMenuItem_OnClick,[this]);if (!B) FCKTools.AddEventListenerEx(r,'mouseout',FCKMenuItem_OnMouseOut,[this]);};var D=r.insertCell(-1);D.className='MN_Icon';D.appendChild(this.Icon.CreateIconElement(C));D=r.insertCell(-1);D.className='MN_Label';D.noWrap=true;D.appendChild(C.createTextNode(this.Label));D=r.insertCell(-1);if (B){D.className='MN_Arrow';var E=D.appendChild(C.createElement('IMG'));E.src=FCK_IMAGES_PATH+'arrow_'+FCKLang.Dir+'.gif';E.width=4;E.height=7;this.SubMenu.Create();this.SubMenu.Panel.OnHide=FCKTools.CreateEventListener(FCKMenuItem_SubMenu_OnHide,this);}};FCKMenuItem.prototype.Activate=function(){this.MainElement.className='MN_Item_Over';if (this.HasSubMenu){this.SubMenu.Show(this.MainElement.offsetWidth+2,-2,this.MainElement);};FCKTools.RunFunction(this.OnActivate,this);};FCKMenuItem.prototype.Deactivate=function(){this.MainElement.className='MN_Item';if (this.HasSubMenu) this.SubMenu.Hide();};function FCKMenuItem_SubMenu_OnClick(A,B){FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuItem_SubMenu_OnHide(A){A.Deactivate();};function FCKMenuItem_OnClick(A,B){if (B.HasSubMenu) B.Activate();else{B.Deactivate();FCKTools.RunFunction(B.OnClick,B,[B]);}};function FCKMenuItem_OnMouseOver(A,B){B.Activate();};function FCKMenuItem_OnMouseOut(A,B){B.Deactivate();};function FCKMenuItem_Cleanup(){this.MainElement=null;};
+var FCKMenuBlock=function(){this._Items=[];};FCKMenuBlock.prototype.Count=function(){return this._Items.length;};FCKMenuBlock.prototype.AddItem=function(A,B,C,D,E){var F=new FCKMenuItem(this,A,B,C,D,E);F.OnClick=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnClick,this);F.OnActivate=FCKTools.CreateEventListener(FCKMenuBlock_Item_OnActivate,this);this._Items.push(F);return F;};FCKMenuBlock.prototype.AddSeparator=function(){this._Items.push(new FCKMenuSeparator());};FCKMenuBlock.prototype.RemoveAllItems=function(){this._Items=[];var A=this._ItemsTable;if (A){while (A.rows.length>0) A.deleteRow(0);}};FCKMenuBlock.prototype.Create=function(A){if (!this._ItemsTable){if (FCK.IECleanup) FCK.IECleanup.AddItem(this,FCKMenuBlock_Cleanup);this._Window=FCKTools.GetElementWindow(A);var B=FCKTools.GetElementDocument(A);var C=A.appendChild(B.createElement('table'));C.cellPadding=0;C.cellSpacing=0;FCKTools.DisableSelection(C);var D=C.insertRow(-1).insertCell(-1);D.className='MN_Menu';var E=this._ItemsTable=D.appendChild(B.createElement('table'));E.cellPadding=0;E.cellSpacing=0;};for (var i=0;i<this._Items.length;i++) this._Items[i].Create(this._ItemsTable);};function FCKMenuBlock_Item_OnClick(A,B){if (B.Hide) B.Hide();FCKTools.RunFunction(B.OnClick,B,[A]);};function FCKMenuBlock_Item_OnActivate(A){var B=A._ActiveItem;if (B&&B!=this){if (!FCKBrowserInfo.IsIE&&B.HasSubMenu&&!this.HasSubMenu){A._Window.focus();A.Panel.HasFocus=true;};B.Deactivate();};A._ActiveItem=this;};function FCKMenuBlock_Cleanup(){this._Window=null;this._ItemsTable=null;};var FCKMenuSeparator=function(){};FCKMenuSeparator.prototype.Create=function(A){var B=FCKTools.GetElementDocument(A);var r=A.insertRow(-1);var C=r.insertCell(-1);C.className='MN_Separator MN_Icon';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';C=r.insertCell(-1);C.className='MN_Separator';C.appendChild(B.createElement('DIV')).className='MN_Separator_Line';};
+var FCKMenuBlockPanel=function(){FCKMenuBlock.call(this);};FCKMenuBlockPanel.prototype=new FCKMenuBlock();FCKMenuBlockPanel.prototype.Create=function(){var A=this.Panel=(this.Parent&&this.Parent.Panel?this.Parent.Panel.CreateChildPanel():new FCKPanel());A.AppendStyleSheet(FCKConfig.SkinEditorCSS);FCKMenuBlock.prototype.Create.call(this,A.MainNode);};FCKMenuBlockPanel.prototype.Show=function(x,y,A){if (!this.Panel.CheckIsOpened()) this.Panel.Show(x,y,A);};FCKMenuBlockPanel.prototype.Hide=function(){if (this.Panel.CheckIsOpened()) this.Panel.Hide();};
+var FCKContextMenu=function(A,B){this.CtrlDisable=false;var C=this._Panel=new FCKPanel(A);C.AppendStyleSheet(FCKConfig.SkinEditorCSS);C.IsContextMenu=true;if (FCKBrowserInfo.IsGecko) C.Document.addEventListener('draggesture',function(e) {e.preventDefault();return false;},true);var D=this._MenuBlock=new FCKMenuBlock();D.Panel=C;D.OnClick=FCKTools.CreateEventListener(FCKContextMenu_MenuBlock_OnClick,this);this._Redraw=true;};FCKContextMenu.prototype.SetMouseClickWindow=function(A){if (!FCKBrowserInfo.IsIE){this._Document=A.document;if (FCKBrowserInfo.IsOpera&&!('oncontextmenu' in document.createElement('foo'))){this._Document.addEventListener('mousedown',FCKContextMenu_Document_OnMouseDown,false);this._Document.addEventListener('mouseup',FCKContextMenu_Document_OnMouseUp,false);};this._Document.addEventListener('contextmenu',FCKContextMenu_Document_OnContextMenu,false);}};FCKContextMenu.prototype.AddItem=function(A,B,C,D,E){var F=this._MenuBlock.AddItem(A,B,C,D,E);this._Redraw=true;return F;};FCKContextMenu.prototype.AddSeparator=function(){this._MenuBlock.AddSeparator();this._Redraw=true;};FCKContextMenu.prototype.RemoveAllItems=function(){this._MenuBlock.RemoveAllItems();this._Redraw=true;};FCKContextMenu.prototype.AttachToElement=function(A){if (FCKBrowserInfo.IsIE) FCKTools.AddEventListenerEx(A,'contextmenu',FCKContextMenu_AttachedElement_OnContextMenu,this);else A._FCKContextMenu=this;};function FCKContextMenu_Document_OnContextMenu(e){if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;FCKTools.CancelEvent(e);FCKContextMenu_AttachedElement_OnContextMenu(e,A._FCKContextMenu,A);return false;};A=A.parentNode;};return true;};var FCKContextMenu_OverrideButton;function FCKContextMenu_Document_OnMouseDown(e){if(!e||e.button!=2) return false;if (FCKConfig.BrowserContextMenu) return true;var A=e.target;while (A){if (A._FCKContextMenu){if (A._FCKContextMenu.CtrlDisable&&(e.ctrlKey||e.metaKey)) return true;var B=FCKContextMenu_OverrideButton;if(!B){var C=FCKTools.GetElementDocument(e.target);B=FCKContextMenu_OverrideButton=C.createElement('input');B.type='button';var D=C.createElement('p');C.body.appendChild(D);D.appendChild(B);};B.style.cssText='position:absolute;top:'+(e.clientY-2)+'px;left:'+(e.clientX-2)+'px;width:5px;height:5px;opacity:0.01';};A=A.parentNode;};return false;};function FCKContextMenu_Document_OnMouseUp(e){if (FCKConfig.BrowserContextMenu) return true;var A=FCKContextMenu_OverrideButton;if (A){var B=A.parentNode;B.parentNode.removeChild(B);FCKContextMenu_OverrideButton=undefined;if(e&&e.button==2){FCKContextMenu_Document_OnContextMenu(e);return false;}};return true;};function FCKContextMenu_AttachedElement_OnContextMenu(A,B,C){if ((B.CtrlDisable&&(A.ctrlKey||A.metaKey))||FCKConfig.BrowserContextMenu) return true;var D=C||this;if (B.OnBeforeOpen) B.OnBeforeOpen.call(B,D);if (B._MenuBlock.Count()==0) return false;if (B._Redraw){B._MenuBlock.Create(B._Panel.MainNode);B._Redraw=false;};FCKTools.DisableSelection(B._Panel.Document.body);var x=0;var y=0;if (FCKBrowserInfo.IsIE){x=A.screenX;y=A.screenY;}else if (FCKBrowserInfo.IsSafari){x=A.clientX;y=A.clientY;}else{x=A.pageX;y=A.pageY;};B._Panel.Show(x,y,A.currentTarget||null);return false;};function FCKContextMenu_MenuBlock_OnClick(A,B){B._Panel.Hide();FCKTools.RunFunction(B.OnItemClick,B,A);};
+FCK.ContextMenu={};FCK.ContextMenu.Listeners=[];FCK.ContextMenu.RegisterListener=function(A){if (A) this.Listeners.push(A);};function FCK_ContextMenu_Init(){var A=FCK.ContextMenu._InnerContextMenu=new FCKContextMenu(FCKBrowserInfo.IsIE?window:window.parent,FCKLang.Dir);A.CtrlDisable=FCKConfig.BrowserContextMenuOnCtrl;A.OnBeforeOpen=FCK_ContextMenu_OnBeforeOpen;A.OnItemClick=FCK_ContextMenu_OnItemClick;var B=FCK.ContextMenu;for (var i=0;i<FCKConfig.ContextMenu.length;i++) B.RegisterListener(FCK_ContextMenu_GetListener(FCKConfig.ContextMenu[i]));};function FCK_ContextMenu_GetListener(A){switch (A){case 'Generic':return {AddItems:function(menu,tag,tagName){menu.AddItem('Cut',FCKLang.Cut,7,FCKCommands.GetCommand('Cut').GetState()==-1);menu.AddItem('Copy',FCKLang.Copy,8,FCKCommands.GetCommand('Copy').GetState()==-1);menu.AddItem('Paste',FCKLang.Paste,9,FCKCommands.GetCommand('Paste').GetState()==-1);}};case 'Table':return {AddItems:function(menu,tag,tagName){var B=(tagName=='TABLE');var C=(!B&&FCKSelection.HasAncestorNode('TABLE'));if (C){menu.AddSeparator();var D=menu.AddItem('Cell',FCKLang.CellCM);D.AddItem('TableInsertCellBefore',FCKLang.InsertCellBefore,69);D.AddItem('TableInsertCellAfter',FCKLang.InsertCellAfter,58);D.AddItem('TableDeleteCells',FCKLang.DeleteCells,59);if (FCKBrowserInfo.IsGecko) D.AddItem('TableMergeCells',FCKLang.MergeCells,60,FCKCommands.GetCommand('TableMergeCells').GetState()==-1);else{D.AddItem('TableMergeRight',FCKLang.MergeRight,60,FCKCommands.GetCommand('TableMergeRight').GetState()==-1);D.AddItem('TableMergeDown',FCKLang.MergeDown,60,FCKCommands.GetCommand('TableMergeDown').GetState()==-1);};D.AddItem('TableHorizontalSplitCell',FCKLang.HorizontalSplitCell,61,FCKCommands.GetCommand('TableHorizontalSplitCell').GetState()==-1);D.AddItem('TableVerticalSplitCell',FCKLang.VerticalSplitCell,61,FCKCommands.GetCommand('TableVerticalSplitCell').GetState()==-1);D.AddSeparator();D.AddItem('TableCellProp',FCKLang.CellProperties,57,FCKCommands.GetCommand('TableCellProp').GetState()==-1);menu.AddSeparator();D=menu.AddItem('Row',FCKLang.RowCM);D.AddItem('TableInsertRowBefore',FCKLang.InsertRowBefore,70);D.AddItem('TableInsertRowAfter',FCKLang.InsertRowAfter,62);D.AddItem('TableDeleteRows',FCKLang.DeleteRows,63);menu.AddSeparator();D=menu.AddItem('Column',FCKLang.ColumnCM);D.AddItem('TableInsertColumnBefore',FCKLang.InsertColumnBefore,71);D.AddItem('TableInsertColumnAfter',FCKLang.InsertColumnAfter,64);D.AddItem('TableDeleteColumns',FCKLang.DeleteColumns,65);};if (B||C){menu.AddSeparator();menu.AddItem('TableDelete',FCKLang.TableDelete);menu.AddItem('TableProp',FCKLang.TableProperties,39);}}};case 'Link':return {AddItems:function(menu,tag,tagName){var E=(tagName=='A'||FCKSelection.HasAncestorNode('A'));if (E||FCK.GetNamedCommandState('Unlink')!=-1){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0&&F.href.length==0);if (G) return;menu.AddSeparator();menu.AddItem('VisitLink',FCKLang.VisitLink);menu.AddSeparator();if (E) menu.AddItem('Link',FCKLang.EditLink,34);menu.AddItem('Unlink',FCKLang.RemoveLink,35);}}};case 'Image':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&!tag.getAttribute('_fckfakelement')){menu.AddSeparator();menu.AddItem('Image',FCKLang.ImageProperties,37);}}};case 'Anchor':return {AddItems:function(menu,tag,tagName){var F=FCKSelection.MoveToAncestorNode('A');var G=(F&&F.name.length>0);if (G||(tagName=='IMG'&&tag.getAttribute('_fckanchor'))){menu.AddSeparator();menu.AddItem('Anchor',FCKLang.AnchorProp,36);menu.AddItem('AnchorDelete',FCKLang.AnchorDelete);}}};case 'Flash':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckflash')){menu.AddSeparator();menu.AddItem('Flash',FCKLang.FlashProperties,38);}}};case 'Form':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('FORM')){menu.AddSeparator();menu.AddItem('Form',FCKLang.FormProp,48);}}};case 'Checkbox':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='checkbox'){menu.AddSeparator();menu.AddItem('Checkbox',FCKLang.CheckboxProp,49);}}};case 'Radio':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='radio'){menu.AddSeparator();menu.AddItem('Radio',FCKLang.RadioButtonProp,50);}}};case 'TextField':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='text'||tag.type=='password')){menu.AddSeparator();menu.AddItem('TextField',FCKLang.TextFieldProp,51);}}};case 'HiddenField':return {AddItems:function(menu,tag,tagName){if (tagName=='IMG'&&tag.getAttribute('_fckinputhidden')){menu.AddSeparator();menu.AddItem('HiddenField',FCKLang.HiddenFieldProp,56);}}};case 'ImageButton':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&tag.type=='image'){menu.AddSeparator();menu.AddItem('ImageButton',FCKLang.ImageButtonProp,55);}}};case 'Button':return {AddItems:function(menu,tag,tagName){if (tagName=='INPUT'&&(tag.type=='button'||tag.type=='submit'||tag.type=='reset')){menu.AddSeparator();menu.AddItem('Button',FCKLang.ButtonProp,54);}}};case 'Select':return {AddItems:function(menu,tag,tagName){if (tagName=='SELECT'){menu.AddSeparator();menu.AddItem('Select',FCKLang.SelectionFieldProp,53);}}};case 'Textarea':return {AddItems:function(menu,tag,tagName){if (tagName=='TEXTAREA'){menu.AddSeparator();menu.AddItem('Textarea',FCKLang.TextareaProp,52);}}};case 'BulletedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('UL')){menu.AddSeparator();menu.AddItem('BulletedList',FCKLang.BulletedListProp,27);}}};case 'NumberedList':return {AddItems:function(menu,tag,tagName){if (FCKSelection.HasAncestorNode('OL')){menu.AddSeparator();menu.AddItem('NumberedList',FCKLang.NumberedListProp,26);}}};case 'DivContainer':return {AddItems:function(menu,tag,tagName){var J=FCKDomTools.GetSelectedDivContainers();if (J.length>0){menu.AddSeparator();menu.AddItem('EditDiv',FCKLang.EditDiv,75);menu.AddItem('DeleteDiv',FCKLang.DeleteDiv,76);}}};};return null;};function FCK_ContextMenu_OnBeforeOpen(){FCK.Events.FireEvent('OnSelectionChange');var A,sTagName;if ((A=FCKSelection.GetSelectedElement())) sTagName=A.tagName;var B=FCK.ContextMenu._InnerContextMenu;B.RemoveAllItems();var C=FCK.ContextMenu.Listeners;for (var i=0;i<C.length;i++) C[i].AddItems(B,A,sTagName);};function FCK_ContextMenu_OnItemClick(A){FCK.Focus();FCKCommands.GetCommand(A.Name).Execute(A.CustomData);};
+var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};var FCKHtmlIterator=function(A){this._sourceHtml=A;};FCKHtmlIterator.prototype={Next:function(){var A=this._sourceHtml;if (A==null) return null;var B=FCKRegexLib.HtmlTag.exec(A);var C=false;var D="";if (B){if (B.index>0){D=A.substr(0,B.index);this._sourceHtml=A.substr(B.index);}else{C=true;D=B[0];this._sourceHtml=A.substr(B[0].length);}}else{D=A;this._sourceHtml=null;};return { 'isTag':C,'value':D };},Each:function(A){var B;while ((B=this.Next())) A(B.isTag,B.value);}};
+var FCKPlugin=function(A,B,C){this.Name=A;this.BasePath=C?C:FCKConfig.PluginsPath;this.Path=this.BasePath+A+'/';if (!B||B.length==0) this.AvailableLangs=[];else this.AvailableLangs=B.split(',');};FCKPlugin.prototype.Load=function(){if (this.AvailableLangs.length>0){var A;if (this.AvailableLangs.IndexOf(FCKLanguageManager.ActiveLanguage.Code)>=0) A=FCKLanguageManager.ActiveLanguage.Code;else A=this.AvailableLangs[0];LoadScript(this.Path+'lang/'+A+'.js');};LoadScript(this.Path+'fckplugin.js');};
+var FCKPlugins=FCK.Plugins={};FCKPlugins.ItemsCount=0;FCKPlugins.Items={};FCKPlugins.Load=function(){var A=FCKPlugins.Items;for (var i=0;i<FCKConfig.Plugins.Items.length;i++){var B=FCKConfig.Plugins.Items[i];var C=A[B[0]]=new FCKPlugin(B[0],B[1],B[2]);FCKPlugins.ItemsCount++;};for (var s in A) A[s].Load();FCKPlugins.Load=null;};
diff --git a/modules/editor/skins/fckeditor/editor/lang/_translationstatus.txt b/modules/editor/skins/fckeditor/editor/lang/_translationstatus.txt
new file mode 100644
index 000000000..667826e59
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/_translationstatus.txt
@@ -0,0 +1,78 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Translations Status.
+ */
+
+af.js      Found: 396   Missing: 24
+ar.js      Found: 411   Missing: 9
+bg.js      Found: 373   Missing: 47
+bn.js      Found: 380   Missing: 40
+bs.js      Found: 226   Missing: 194
+ca.js      Found: 420   Missing: 0
+cs.js      Found: 420   Missing: 0
+da.js      Found: 381   Missing: 39
+de.js      Found: 419   Missing: 1
+el.js      Found: 396   Missing: 24
+en-au.js   Found: 420   Missing: 0
+en-ca.js   Found: 420   Missing: 0
+en-uk.js   Found: 420   Missing: 0
+eo.js      Found: 346   Missing: 74
+es.js      Found: 420   Missing: 0
+et.js      Found: 411   Missing: 9
+eu.js      Found: 411   Missing: 9
+fa.js      Found: 413   Missing: 7
+fi.js      Found: 411   Missing: 9
+fo.js      Found: 420   Missing: 0
+fr-ca.js   Found: 419   Missing: 1
+fr.js      Found: 420   Missing: 0
+gl.js      Found: 381   Missing: 39
+gu.js      Found: 411   Missing: 9
+he.js      Found: 420   Missing: 0
+hi.js      Found: 420   Missing: 0
+hr.js      Found: 420   Missing: 0
+hu.js      Found: 411   Missing: 9
+it.js      Found: 410   Missing: 10
+ja.js      Found: 420   Missing: 0
+km.js      Found: 370   Missing: 50
+ko.js      Found: 390   Missing: 30
+lt.js      Found: 376   Missing: 44
+lv.js      Found: 381   Missing: 39
+mn.js      Found: 411   Missing: 9
+ms.js      Found: 352   Missing: 68
+nb.js      Found: 414   Missing: 6
+nl.js      Found: 420   Missing: 0
+no.js      Found: 414   Missing: 6
+pl.js      Found: 411   Missing: 9
+pt-br.js   Found: 411   Missing: 9
+pt.js      Found: 381   Missing: 39
+ro.js      Found: 410   Missing: 10
+ru.js      Found: 411   Missing: 9
+sk.js      Found: 396   Missing: 24
+sl.js      Found: 411   Missing: 9
+sr-latn.js Found: 368   Missing: 52
+sr.js      Found: 368   Missing: 52
+sv.js      Found: 409   Missing: 11
+th.js      Found: 393   Missing: 27
+tr.js      Found: 396   Missing: 24
+uk.js      Found: 397   Missing: 23
+vi.js      Found: 419   Missing: 1
+zh-cn.js   Found: 420   Missing: 0
+zh.js      Found: 420   Missing: 0
diff --git a/modules/editor/skins/fckeditor/editor/lang/af.js b/modules/editor/skins/fckeditor/editor/lang/af.js
new file mode 100644
index 000000000..5aa191447
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/af.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Afrikaans language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Vou Gereedskaps balk toe",
+ToolbarExpand		: "Vou Gereedskaps balk oop",
+
+// Toolbar Items and Context Menu
+Save				: "Bewaar",
+NewPage				: "Nuwe Bladsy",
+Preview				: "Voorskou",
+Cut					: "Uitsny ",
+Copy				: "Kopieer",
+Paste				: "Byvoeg",
+PasteText			: "Slegs inhoud byvoeg",
+PasteWord			: "Van Word af byvoeg",
+Print				: "Druk",
+SelectAll			: "Selekteer alles",
+RemoveFormat		: "Formaat verweider",
+InsertLinkLbl		: "Skakel",
+InsertLink			: "Skakel byvoeg/verander",
+RemoveLink			: "Skakel verweider",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Plekhouer byvoeg/verander",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Beeld",
+InsertImage			: "Beeld byvoeg/verander",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash byvoeg/verander",
+InsertTableLbl		: "Tabel",
+InsertTable			: "Tabel byvoeg/verander",
+InsertLineLbl		: "Lyn",
+InsertLine			: "Horisontale lyn byvoeg",
+InsertSpecialCharLbl: "Spesiaale karakter",
+InsertSpecialChar	: "Spesiaale Karakter byvoeg",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Smiley byvoeg",
+About				: "Meer oor FCKeditor",
+Bold				: "Vet",
+Italic				: "Skuins",
+Underline			: "Onderstreep",
+StrikeThrough		: "Gestreik",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Links rig",
+CenterJustify		: "Rig Middel",
+RightJustify		: "Regs rig",
+BlockJustify		: "Blok paradeer",
+DecreaseIndent		: "Paradeering verkort",
+IncreaseIndent		: "Paradeering verleng",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Ont-skep",
+Redo				: "Her-skep",
+NumberedListLbl		: "Genommerde lys",
+NumberedList		: "Genommerde lys byvoeg/verweider",
+BulletedListLbl		: "Gepunkte lys",
+BulletedList		: "Gepunkte lys byvoeg/verweider",
+ShowTableBorders	: "Wys tabel kante",
+ShowDetails			: "Wys informasie",
+Style				: "Styl",
+FontFormat			: "Karakter formaat",
+Font				: "Karakters",
+FontSize			: "Karakter grote",
+TextColor			: "Karakter kleur",
+BGColor				: "Agtergrond kleur",
+Source				: "Source",
+Find				: "Vind",
+Replace				: "Vervang",
+SpellCheck			: "Spelling nagaan",
+UniversalKeyboard	: "Universeele Sleutelbord",
+PageBreakLbl		: "Bladsy breek",
+PageBreak			: "Bladsy breek byvoeg",
+
+Form			: "Form",
+Checkbox		: "HakBox",
+RadioButton		: "PuntBox",
+TextField		: "Byvoegbare karakter strook",
+Textarea		: "Byvoegbare karakter area",
+HiddenField		: "Blinde strook",
+Button			: "Knop",
+SelectionField	: "Opklapbare keuse strook",
+ImageButton		: "Beeld knop",
+
+FitWindow		: "Maksimaliseer venster grote",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Verander skakel",
+CellCM				: "Cell",
+RowCM				: "Ry",
+ColumnCM			: "Kolom",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Ry verweider",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Kolom verweider",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Cell verweider",
+MergeCells			: "Cell verenig",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Tabel verweider",
+CellProperties		: "Cell eienskappe",
+TableProperties		: "Tabel eienskappe",
+ImageProperties		: "Beeld eienskappe",
+FlashProperties		: "Flash eienskappe",
+
+AnchorProp			: "Plekhouer eienskappe",
+ButtonProp			: "Knop eienskappe",
+CheckboxProp		: "HakBox eienskappe",
+HiddenFieldProp		: "Blinde strook eienskappe",
+RadioButtonProp		: "PuntBox eienskappe",
+ImageButtonProp		: "Beeld knop eienskappe",
+TextFieldProp		: "Karakter strook eienskappe",
+SelectionFieldProp	: "Opklapbare keuse strook eienskappe",
+TextareaProp		: "Karakter area eienskappe",
+FormProp			: "Form eienskappe",
+
+FontFormats			: "Normaal;Geformateerd;Adres;Opskrif 1;Opskrif 2;Opskrif 3;Opskrif 4;Opskrif 5;Opskrif 6;Normaal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML word verarbeit. U geduld asseblief...",
+Done				: "Kompleet",
+PasteWordConfirm	: "Die informasie wat U probeer byvoeg is warskynlik van Word. Wil U dit reinig voor die byvoeging?",
+NotCompatiblePaste	: "Die instruksie is beskikbaar vir Internet Explorer weergawe 5.5 of hor. Wil U dir byvoeg sonder reiniging?",
+UnknownToolbarItem	: "Unbekende gereedskaps balk item \"%1\"",
+UnknownCommand		: "Unbekende instruksie naam \"%1\"",
+NotImplemented		: "Instruksie is nie geimplementeer nie.",
+UnknownToolbarSet	: "Gereedskaps balk \"%1\" bestaan nie",
+NoActiveX			: "U browser sekuriteit instellings kan die funksies van die editor behinder. U moet die opsie \"Run ActiveX controls and plug-ins\" aktiveer. U ondervinding mag problematies geskiet of sekere funksionaliteit mag verhinder word.",
+BrowseServerBlocked : "Die vorraad venster word geblok! Verseker asseblief dat U die \"popup blocker\" instelling verander.",
+DialogBlocked		: "Die dialoog venster vir verdere informasie word geblok. De-aktiveer asseblief die \"popup blocker\" instellings wat dit behinder.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Kanseleer",
+DlgBtnClose			: "Sluit",
+DlgBtnBrowseServer	: "Server deurblaai",
+DlgAdvancedTag		: "Ingewikkeld",
+DlgOpOther			: "<Ander>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Voeg asseblief die URL in",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<geen instelling>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Taal rigting",
+DlgGenLangDirLtr	: "Links na regs (LTR)",
+DlgGenLangDirRtl	: "Regs na links (RTL)",
+DlgGenLangCode		: "Taal kode",
+DlgGenAccessKey		: "Toegang sleutel",
+DlgGenName			: "Naam",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Lang beskreiwing URL",
+DlgGenClass			: "Skakel Tiepe",
+DlgGenTitle			: "Voorbeveelings Titel",
+DlgGenContType		: "Voorbeveelings inhoud soort",
+DlgGenLinkCharset	: "Geskakelde voorbeeld karakterstel",
+DlgGenStyle			: "Styl",
+
+// Image Dialog
+DlgImgTitle			: "Beeld eienskappe",
+DlgImgInfoTab		: "Beeld informasie",
+DlgImgBtnUpload		: "Stuur dit na die Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Uplaai",
+DlgImgAlt			: "Alternatiewe beskrywing",
+DlgImgWidth			: "Weidte",
+DlgImgHeight		: "Hoogde",
+DlgImgLockRatio		: "Behou preporsie",
+DlgBtnResetSize		: "Herstel groote",
+DlgImgBorder		: "Kant",
+DlgImgHSpace		: "HSpasie",
+DlgImgVSpace		: "VSpasie",
+DlgImgAlign			: "Paradeer",
+DlgImgAlignLeft		: "Links",
+DlgImgAlignAbsBottom: "Abs Onder",
+DlgImgAlignAbsMiddle: "Abs Middel",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Onder",
+DlgImgAlignMiddle	: "Middel",
+DlgImgAlignRight	: "Regs",
+DlgImgAlignTextTop	: "Text Bo",
+DlgImgAlignTop		: "Bo",
+DlgImgPreview		: "Voorskou",
+DlgImgAlertUrl		: "Voeg asseblief Beeld URL in.",
+DlgImgLinkTab		: "Skakel",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash eienskappe",
+DlgFlashChkPlay		: "Automaties Speel",
+DlgFlashChkLoop		: "Herhaling",
+DlgFlashChkMenu		: "Laat Flash Menu toe",
+DlgFlashScale		: "Scale",
+DlgFlashScaleAll	: "Wys alles",
+DlgFlashScaleNoBorder	: "Geen kante",
+DlgFlashScaleFit	: "Presiese pas",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Skakel",
+DlgLnkInfoTab		: "Skakel informasie",
+DlgLnkTargetTab		: "Mikpunt",
+
+DlgLnkType			: "Skakel soort",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Skakel na plekhouers in text",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<ander>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Kies 'n plekhouer",
+DlgLnkAnchorByName	: "Volgens plekhouer naam",
+DlgLnkAnchorById	: "Volgens element Id",
+DlgLnkNoAnchors		: "(Geen plekhouers beskikbaar in dokument}",
+DlgLnkEMail			: "E-Mail Adres",
+DlgLnkEMailSubject	: "Boodskap Opskrif",
+DlgLnkEMailBody		: "Boodskap Inhoud",
+DlgLnkUpload		: "Oplaai",
+DlgLnkBtnUpload		: "Stuur na Server",
+
+DlgLnkTarget		: "Mikpunt",
+DlgLnkTargetFrame	: "<raam>",
+DlgLnkTargetPopup	: "<popup venster>",
+DlgLnkTargetBlank	: "Nuwe Venster (_blank)",
+DlgLnkTargetParent	: "Vorige Venster (_parent)",
+DlgLnkTargetSelf	: "Selfde Venster (_self)",
+DlgLnkTargetTop		: "Boonste Venster (_top)",
+DlgLnkTargetFrameName	: "Mikpunt Venster Naam",
+DlgLnkPopWinName	: "Popup Venster Naam",
+DlgLnkPopWinFeat	: "Popup Venster Geaartheid",
+DlgLnkPopResize		: "Verstelbare Groote",
+DlgLnkPopLocation	: "Adres Balk",
+DlgLnkPopMenu		: "Menu Balk",
+DlgLnkPopScroll		: "Gleibalkstuk",
+DlgLnkPopStatus		: "Status Balk",
+DlgLnkPopToolbar	: "Gereedskap Balk",
+DlgLnkPopFullScrn	: "Voll Skerm (IE)",
+DlgLnkPopDependent	: "Afhanklik (Netscape)",
+DlgLnkPopWidth		: "Weite",
+DlgLnkPopHeight		: "Hoogde",
+DlgLnkPopLeft		: "Links Posisie",
+DlgLnkPopTop		: "Bo Posisie",
+
+DlnLnkMsgNoUrl		: "Voeg asseblief die URL in",
+DlnLnkMsgNoEMail	: "Voeg asseblief die e-mail adres in",
+DlnLnkMsgNoAnchor	: "Kies asseblief 'n plekhouer",
+DlnLnkMsgInvPopName	: "Die popup naam moet begin met alphabetiese karakters sonder spasies.",
+
+// Color Dialog
+DlgColorTitle		: "Kies Kleur",
+DlgColorBtnClear	: "Maak skoon",
+DlgColorHighlight	: "Highlight",
+DlgColorSelected	: "Geselekteer",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Voeg Smiley by",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Kies spesiale karakter",
+
+// Table Dialog
+DlgTableTitle		: "Tabel eienskappe",
+DlgTableRows		: "Reie",
+DlgTableColumns		: "Kolome",
+DlgTableBorder		: "Kant groote",
+DlgTableAlign		: "Parideering",
+DlgTableAlignNotSet	: "<geen instelling>",
+DlgTableAlignLeft	: "Links",
+DlgTableAlignCenter	: "Middel",
+DlgTableAlignRight	: "Regs",
+DlgTableWidth		: "Weite",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Hoogde",
+DlgTableCellSpace	: "Cell spasieering",
+DlgTableCellPad		: "Cell buffer",
+DlgTableCaption		: "Beskreiwing",
+DlgTableSummary		: "Opsomming",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cell eienskappe",
+DlgCellWidth		: "Weite",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Hoogde",
+DlgCellWordWrap		: "Woord Wrap",
+DlgCellWordWrapNotSet	: "<geen instelling>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nee",
+DlgCellHorAlign		: "Horisontale rigting",
+DlgCellHorAlignNotSet	: "<geen instelling>",
+DlgCellHorAlignLeft	: "Links",
+DlgCellHorAlignCenter	: "Middel",
+DlgCellHorAlignRight: "Regs",
+DlgCellVerAlign		: "Vertikale rigting",
+DlgCellVerAlignNotSet	: "<geen instelling>",
+DlgCellVerAlignTop	: "Bo",
+DlgCellVerAlignMiddle	: "Middel",
+DlgCellVerAlignBottom	: "Onder",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rei strekking",
+DlgCellCollSpan		: "Kolom strekking",
+DlgCellBackColor	: "Agtergrond Kleur",
+DlgCellBorderColor	: "Kant Kleur",
+DlgCellBtnSelect	: "Keuse...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Vind",
+DlgFindFindBtn		: "Vind",
+DlgFindNotFoundMsg	: "Die gespesifiseerde karakters word nie gevind nie.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Vervang",
+DlgReplaceFindLbl		: "Soek wat:",
+DlgReplaceReplaceLbl	: "Vervang met:",
+DlgReplaceCaseChk		: "Vergelyk karakter skryfweise",
+DlgReplaceReplaceBtn	: "Vervang",
+DlgReplaceReplAllBtn	: "Vervang alles",
+DlgReplaceWordChk		: "Vergelyk komplete woord",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "U browser se sekuriteit instelling behinder die uitsny aksie. Gebruik asseblief die sleutel kombenasie(Ctrl+X).",
+PasteErrorCopy	: "U browser se sekuriteit instelling behinder die kopieerings aksie. Gebruik asseblief die sleutel kombenasie(Ctrl+C).",
+
+PasteAsText		: "Voeg slegs karakters by",
+PasteFromWord	: "Byvoeging uit Word",
+
+DlgPasteMsg2	: "Voeg asseblief die inhoud in die gegewe box by met sleutel kombenasie(<STRONG>Ctrl+V</STRONG>) en druk <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignoreer karakter soort defenisies",
+DlgPasteRemoveStyles	: "Verweider Styl defenisies",
+
+// Color Picker
+ColorAutomatic	: "Automaties",
+ColorMoreColors	: "Meer Kleure...",
+
+// Document Properties
+DocProps		: "Dokument Eienskappe",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Plekhouer Eienskappe",
+DlgAnchorName		: "Plekhouer Naam",
+DlgAnchorErrorName	: "Voltooi die plekhouer naam asseblief",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nie in woordeboek nie",
+DlgSpellChangeTo		: "Verander na",
+DlgSpellBtnIgnore		: "Ignoreer",
+DlgSpellBtnIgnoreAll	: "Ignoreer na-volgende",
+DlgSpellBtnReplace		: "Vervang",
+DlgSpellBtnReplaceAll	: "vervang na-volgende",
+DlgSpellBtnUndo			: "Ont-skep",
+DlgSpellNoSuggestions	: "- Geen voorstel -",
+DlgSpellProgress		: "Spelling word beproef...",
+DlgSpellNoMispell		: "Spellproef kompleet: Geen foute",
+DlgSpellNoChanges		: "Spellproef kompleet: Geen woord veranderings",
+DlgSpellOneChange		: "Spellproef kompleet: Een woord verander",
+DlgSpellManyChanges		: "Spellproef kompleet: %1 woorde verander",
+
+IeSpellDownload			: "Geen Spellproefer geinstaleer nie. Wil U dit aflaai?",
+
+// Button Dialog
+DlgButtonText		: "Karakters (Waarde)",
+DlgButtonType		: "Soort",
+DlgButtonTypeBtn	: "Knop",
+DlgButtonTypeSbm	: "Indien",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Naam",
+DlgCheckboxValue	: "Waarde",
+DlgCheckboxSelected	: "Uitgekies",
+
+// Form Dialog
+DlgFormName		: "Naam",
+DlgFormAction	: "Aksie",
+DlgFormMethod	: "Metode",
+
+// Select Field Dialog
+DlgSelectName		: "Naam",
+DlgSelectValue		: "Waarde",
+DlgSelectSize		: "Grote",
+DlgSelectLines		: "lyne",
+DlgSelectChkMulti	: "Laat meerere keuses toe",
+DlgSelectOpAvail	: "Beskikbare Opsies",
+DlgSelectOpText		: "Karakters",
+DlgSelectOpValue	: "Waarde",
+DlgSelectBtnAdd		: "Byvoeg",
+DlgSelectBtnModify	: "Verander",
+DlgSelectBtnUp		: "Op",
+DlgSelectBtnDown	: "Af",
+DlgSelectBtnSetValue : "Stel as uitgekiesde waarde",
+DlgSelectBtnDelete	: "Verweider",
+
+// Textarea Dialog
+DlgTextareaName	: "Naam",
+DlgTextareaCols	: "Kolom",
+DlgTextareaRows	: "Reie",
+
+// Text Field Dialog
+DlgTextName			: "Naam",
+DlgTextValue		: "Waarde",
+DlgTextCharWidth	: "Karakter weite",
+DlgTextMaxChars		: "Maximale karakters",
+DlgTextType			: "Soort",
+DlgTextTypeText		: "Karakters",
+DlgTextTypePass		: "Wagwoord",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Naam",
+DlgHiddenValue	: "Waarde",
+
+// Bulleted List Dialog
+BulletedListProp	: "Gepunkte lys eienskappe",
+NumberedListProp	: "Genommerde lys eienskappe",
+DlgLstStart			: "Begin",
+DlgLstType			: "Soort",
+DlgLstTypeCircle	: "Sirkel",
+DlgLstTypeDisc		: "Skyf",
+DlgLstTypeSquare	: "Vierkant",
+DlgLstTypeNumbers	: "Nommer (1, 2, 3)",
+DlgLstTypeLCase		: "Klein Letters (a, b, c)",
+DlgLstTypeUCase		: "Hoof Letters (A, B, C)",
+DlgLstTypeSRoman	: "Klein Romeinse nommers (i, ii, iii)",
+DlgLstTypeLRoman	: "Groot Romeinse nommers (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Algemeen",
+DlgDocBackTab		: "Agtergrond",
+DlgDocColorsTab		: "Kleure en Rante",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Bladsy Opskrif",
+DlgDocLangDir		: "Taal rigting",
+DlgDocLangDirLTR	: "Link na Regs (LTR)",
+DlgDocLangDirRTL	: "Regs na Links (RTL)",
+DlgDocLangCode		: "Taal Kode",
+DlgDocCharSet		: "Karakterstel Kodeering",
+DlgDocCharSetCE		: "Sentraal Europa",
+DlgDocCharSetCT		: "Chinees Traditioneel (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Grieks",
+DlgDocCharSetJP		: "Japanees",
+DlgDocCharSetKR		: "Koreans",
+DlgDocCharSetTR		: "Turks",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "Ander Karakterstel Kodeering",
+
+DlgDocDocType		: "Dokument Opskrif Soort",
+DlgDocDocTypeOther	: "Ander Dokument Opskrif Soort",
+DlgDocIncXHTML		: "Voeg XHTML verklaring by",
+DlgDocBgColor		: "Agtergrond kleur",
+DlgDocBgImage		: "Agtergrond Beeld URL",
+DlgDocBgNoScroll	: "Vasgeklemde Agtergrond",
+DlgDocCText			: "Karakters",
+DlgDocCLink			: "Skakel",
+DlgDocCVisited		: "Besoekte Skakel",
+DlgDocCActive		: "Aktiewe Skakel",
+DlgDocMargins		: "Bladsy Rante",
+DlgDocMaTop			: "Bo",
+DlgDocMaLeft		: "Links",
+DlgDocMaRight		: "Regs",
+DlgDocMaBottom		: "Onder",
+DlgDocMeIndex		: "Dokument Index Sleutelwoorde(comma verdeelt)",
+DlgDocMeDescr		: "Dokument Beskrywing",
+DlgDocMeAuthor		: "Skrywer",
+DlgDocMeCopy		: "Kopiereg",
+DlgDocPreview		: "Voorskou",
+
+// Templates Dialog
+Templates			: "Templates",
+DlgTemplatesTitle	: "Inhoud Templates",
+DlgTemplatesSelMsg	: "Kies die template om te gebruik in die editor<br>(Inhoud word vervang!):",
+DlgTemplatesLoading	: "Templates word gelaai. U geduld asseblief...",
+DlgTemplatesNoTpl	: "(Geen templates gedefinieerd)",
+DlgTemplatesReplace	: "Vervang bestaande inhoud",
+
+// About Dialog
+DlgAboutAboutTab	: "Meer oor",
+DlgAboutBrowserInfoTab	: "Blaai Informasie deur",
+DlgAboutLicenseTab	: "Lesensie",
+DlgAboutVersion		: "weergawe",
+DlgAboutInfo		: "Vir meer informasie gaan na ",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ar.js b/modules/editor/skins/fckeditor/editor/lang/ar.js
new file mode 100644
index 000000000..f417bfd67
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ar.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Arabic language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "rtl",
+
+ToolbarCollapse		: "ضم شريط الأدوات",
+ToolbarExpand		: "تمدد شريط الأدوات",
+
+// Toolbar Items and Context Menu
+Save				: "حفظ",
+NewPage				: "صفحة جديدة",
+Preview				: "معاينة الصفحة",
+Cut					: "قص",
+Copy				: "نسخ",
+Paste				: "لصق",
+PasteText			: "لصق كنص بسيط",
+PasteWord			: "لصق من وورد",
+Print				: "طباعة",
+SelectAll			: "تحديد الكل",
+RemoveFormat		: "إزالة التنسيقات",
+InsertLinkLbl		: "رابط",
+InsertLink			: "إدراج/تحرير رابط",
+RemoveLink			: "إزالة رابط",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "إدراج/تحرير إشارة مرجعية",
+AnchorDelete		: "إزالة إشارة مرجعية",
+InsertImageLbl		: "صورة",
+InsertImage			: "إدراج/تحرير صورة",
+InsertFlashLbl		: "فلاش",
+InsertFlash			: "إدراج/تحرير فيلم فلاش",
+InsertTableLbl		: "جدول",
+InsertTable			: "إدراج/تحرير جدول",
+InsertLineLbl		: "خط فاصل",
+InsertLine			: "إدراج خط فاصل",
+InsertSpecialCharLbl: "رموز",
+InsertSpecialChar	: "إدراج  رموز..ِ",
+InsertSmileyLbl		: "ابتسامات",
+InsertSmiley		: "إدراج ابتسامات",
+About				: "حول FCKeditor",
+Bold				: "غامق",
+Italic				: "مائل",
+Underline			: "تسطير",
+StrikeThrough		: "يتوسطه خط",
+Subscript			: "منخفض",
+Superscript			: "مرتفع",
+LeftJustify			: "محاذاة إلى اليسار",
+CenterJustify		: "توسيط",
+RightJustify		: "محاذاة إلى اليمين",
+BlockJustify		: "ضبط",
+DecreaseIndent		: "إنقاص المسافة البادئة",
+IncreaseIndent		: "زيادة المسافة البادئة",
+Blockquote			: "اقتباس",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "تراجع",
+Redo				: "إعادة",
+NumberedListLbl		: "تعداد رقمي",
+NumberedList		: "إدراج/إلغاء تعداد رقمي",
+BulletedListLbl		: "تعداد نقطي",
+BulletedList		: "إدراج/إلغاء تعداد نقطي",
+ShowTableBorders	: "معاينة حدود الجداول",
+ShowDetails			: "معاينة التفاصيل",
+Style				: "نمط",
+FontFormat			: "تنسيق",
+Font				: "خط",
+FontSize			: "حجم الخط",
+TextColor			: "لون النص",
+BGColor				: "لون الخلفية",
+Source				: "شفرة المصدر",
+Find				: "بحث",
+Replace				: "إستبدال",
+SpellCheck			: "تدقيق إملائي",
+UniversalKeyboard	: "لوحة المفاتيح العالمية",
+PageBreakLbl		: "فصل الصفحة",
+PageBreak			: "إدخال صفحة جديدة",
+
+Form			: "نموذج",
+Checkbox		: "خانة إختيار",
+RadioButton		: "زر خيار",
+TextField		: "مربع نص",
+Textarea		: "ناحية نص",
+HiddenField		: "إدراج حقل خفي",
+Button			: "زر ضغط",
+SelectionField	: "قائمة منسدلة",
+ImageButton		: "زر صورة",
+
+FitWindow		: "تكبير حجم المحرر",
+ShowBlocks		: "مخطط تفصيلي",
+
+// Context Menu
+EditLink			: "تحرير رابط",
+CellCM				: "خلية",
+RowCM				: "صف",
+ColumnCM			: "عمود",
+InsertRowAfter		: "إدراج صف بعد",
+InsertRowBefore		: "إدراج صف قبل",
+DeleteRows			: "حذف صفوف",
+InsertColumnAfter	: "إدراج عمود بعد",
+InsertColumnBefore	: "إدراج عمود قبل",
+DeleteColumns		: "حذف أعمدة",
+InsertCellAfter		: "إدراج خلية بعد",
+InsertCellBefore	: "إدراج خلية قبل",
+DeleteCells			: "حذف خلايا",
+MergeCells			: "دمج خلايا",
+MergeRight			: "دمج لليمين",
+MergeDown			: "دمج للأسفل",
+HorizontalSplitCell	: "تقسيم الخلية أفقياً",
+VerticalSplitCell	: "تقسيم الخلية عمودياً",
+TableDelete			: "حذف الجدول",
+CellProperties		: "خصائص الخلية",
+TableProperties		: "خصائص الجدول",
+ImageProperties		: "خصائص الصورة",
+FlashProperties		: "خصائص فيلم الفلاش",
+
+AnchorProp			: "خصائص الإشارة المرجعية",
+ButtonProp			: "خصائص زر الضغط",
+CheckboxProp		: "خصائص خانة الإختيار",
+HiddenFieldProp		: "خصائص الحقل الخفي",
+RadioButtonProp		: "خصائص زر الخيار",
+ImageButtonProp		: "خصائص زر الصورة",
+TextFieldProp		: "خصائص مربع النص",
+SelectionFieldProp	: "خصائص القائمة المنسدلة",
+TextareaProp		: "خصائص ناحية النص",
+FormProp			: "خصائص النموذج",
+
+FontFormats			: "عادي;منسّق;دوس;العنوان 1;العنوان  2;العنوان  3;العنوان  4;العنوان  5;العنوان  6",
+
+// Alerts and Messages
+ProcessingXHTML		: "إنتظر قليلاً ريثما تتم   معالَجة‏ XHTML. لن يستغرق طويلاً...",
+Done				: "تم",
+PasteWordConfirm	: "يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟",
+NotCompatiblePaste	: "هذه الميزة تحتاج لمتصفح من النوعInternet Explorer إصدار 5.5 فما فوق. هل تود اللصق دون تنظيف الكود؟",
+UnknownToolbarItem	: "عنصر شريط أدوات غير معروف \"%1\"",
+UnknownCommand		: "أمر غير معروف \"%1\"",
+NotImplemented		: "لم يتم دعم هذا الأمر",
+UnknownToolbarSet	: "لم أتمكن من العثور على طقم الأدوات \"%1\" ",
+NoActiveX			: "لتأمين متصفحك يجب أن تحدد بعض مميزات المحرر. يتوجب عليك تمكين الخيار \"Run ActiveX controls and plug-ins\". قد تواجة أخطاء وتلاحظ مميزات مفقودة",
+BrowseServerBlocked : "لايمكن فتح مصدر المتصفح. فضلا يجب التأكد بأن جميع موانع النوافذ المنبثقة معطلة",
+DialogBlocked		: "لايمكن فتح نافذة الحوار . فضلا تأكد من أن  مانع النوافذ المنبثة معطل .",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "موافق",
+DlgBtnCancel		: "إلغاء الأمر",
+DlgBtnClose			: "إغلاق",
+DlgBtnBrowseServer	: "تصفح الخادم",
+DlgAdvancedTag		: "متقدم",
+DlgOpOther			: "<أخرى>",
+DlgInfoTab			: "معلومات",
+DlgAlertUrl			: "الرجاء كتابة عنوان الإنترنت",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<بدون تحديد>",
+DlgGenId			: "الرقم",
+DlgGenLangDir		: "إتجاه النص",
+DlgGenLangDirLtr	: "اليسار لليمين (LTR)",
+DlgGenLangDirRtl	: "اليمين لليسار (RTL)",
+DlgGenLangCode		: "رمز اللغة",
+DlgGenAccessKey		: "مفاتيح الإختصار",
+DlgGenName			: "الاسم",
+DlgGenTabIndex		: "الترتيب",
+DlgGenLongDescr		: "عنوان الوصف المفصّل",
+DlgGenClass			: "فئات التنسيق",
+DlgGenTitle			: "تلميح الشاشة",
+DlgGenContType		: "نوع التلميح",
+DlgGenLinkCharset	: "ترميز المادة المطلوبة",
+DlgGenStyle			: "نمط",
+
+// Image Dialog
+DlgImgTitle			: "خصائص الصورة",
+DlgImgInfoTab		: "معلومات الصورة",
+DlgImgBtnUpload		: "أرسلها للخادم",
+DlgImgURL			: "موقع الصورة",
+DlgImgUpload		: "رفع",
+DlgImgAlt			: "الوصف",
+DlgImgWidth			: "العرض",
+DlgImgHeight		: "الإرتفاع",
+DlgImgLockRatio		: "تناسق الحجم",
+DlgBtnResetSize		: "إستعادة الحجم الأصلي",
+DlgImgBorder		: "سمك الحدود",
+DlgImgHSpace		: "تباعد أفقي",
+DlgImgVSpace		: "تباعد عمودي",
+DlgImgAlign			: "محاذاة",
+DlgImgAlignLeft		: "يسار",
+DlgImgAlignAbsBottom: "أسفل النص",
+DlgImgAlignAbsMiddle: "وسط السطر",
+DlgImgAlignBaseline	: "على السطر",
+DlgImgAlignBottom	: "أسفل",
+DlgImgAlignMiddle	: "وسط",
+DlgImgAlignRight	: "يمين",
+DlgImgAlignTextTop	: "أعلى النص",
+DlgImgAlignTop		: "أعلى",
+DlgImgPreview		: "معاينة",
+DlgImgAlertUrl		: "فضلاً أكتب الموقع الذي توجد عليه هذه الصورة.",
+DlgImgLinkTab		: "الرابط",
+
+// Flash Dialog
+DlgFlashTitle		: "خصائص فيلم الفلاش",
+DlgFlashChkPlay		: "تشغيل تلقائي",
+DlgFlashChkLoop		: "تكرار",
+DlgFlashChkMenu		: "تمكين قائمة فيلم الفلاش",
+DlgFlashScale		: "الحجم",
+DlgFlashScaleAll	: "إظهار الكل",
+DlgFlashScaleNoBorder	: "بلا حدود",
+DlgFlashScaleFit	: "ضبط تام",
+
+// Link Dialog
+DlgLnkWindowTitle	: "إرتباط تشعبي",
+DlgLnkInfoTab		: "معلومات الرابط",
+DlgLnkTargetTab		: "الهدف",
+
+DlgLnkType			: "نوع الربط",
+DlgLnkTypeURL		: "العنوان",
+DlgLnkTypeAnchor	: "مكان في هذا المستند",
+DlgLnkTypeEMail		: "بريد إلكتروني",
+DlgLnkProto			: "البروتوكول",
+DlgLnkProtoOther	: "<أخرى>",
+DlgLnkURL			: "الموقع",
+DlgLnkAnchorSel		: "اختر علامة مرجعية",
+DlgLnkAnchorByName	: "حسب اسم العلامة",
+DlgLnkAnchorById	: "حسب تعريف العنصر",
+DlgLnkNoAnchors		: "(لا يوجد علامات مرجعية في هذا المستند)",
+DlgLnkEMail			: "عنوان بريد إلكتروني",
+DlgLnkEMailSubject	: "موضوع الرسالة",
+DlgLnkEMailBody		: "محتوى الرسالة",
+DlgLnkUpload		: "رفع",
+DlgLnkBtnUpload		: "أرسلها للخادم",
+
+DlgLnkTarget		: "الهدف",
+DlgLnkTargetFrame	: "<إطار>",
+DlgLnkTargetPopup	: "<نافذة منبثقة>",
+DlgLnkTargetBlank	: "إطار جديد (_blank)",
+DlgLnkTargetParent	: "الإطار الأصل (_parent)",
+DlgLnkTargetSelf	: "نفس الإطار (_self)",
+DlgLnkTargetTop		: "صفحة كاملة (_top)",
+DlgLnkTargetFrameName	: "اسم الإطار الهدف",
+DlgLnkPopWinName	: "تسمية النافذة المنبثقة",
+DlgLnkPopWinFeat	: "خصائص النافذة المنبثقة",
+DlgLnkPopResize		: "قابلة للتحجيم",
+DlgLnkPopLocation	: "شريط العنوان",
+DlgLnkPopMenu		: "القوائم الرئيسية",
+DlgLnkPopScroll		: "أشرطة التمرير",
+DlgLnkPopStatus		: "شريط الحالة السفلي",
+DlgLnkPopToolbar	: "شريط الأدوات",
+DlgLnkPopFullScrn	: "ملئ الشاشة (IE)",
+DlgLnkPopDependent	: "تابع (Netscape)",
+DlgLnkPopWidth		: "العرض",
+DlgLnkPopHeight		: "الإرتفاع",
+DlgLnkPopLeft		: "التمركز لليسار",
+DlgLnkPopTop		: "التمركز للأعلى",
+
+DlnLnkMsgNoUrl		: "فضلاً أدخل عنوان الموقع الذي يشير إليه الرابط",
+DlnLnkMsgNoEMail	: "فضلاً أدخل عنوان البريد الإلكتروني",
+DlnLnkMsgNoAnchor	: "فضلاً حدد العلامة المرجعية المرغوبة",
+DlnLnkMsgInvPopName	: "اسم النافذة المنبثقة يجب أن يبدأ بحرف أبجدي دون مسافات",
+
+// Color Dialog
+DlgColorTitle		: "اختر لوناً",
+DlgColorBtnClear	: "مسح",
+DlgColorHighlight	: "تحديد",
+DlgColorSelected	: "إختيار",
+
+// Smiley Dialog
+DlgSmileyTitle		: "إدراج إبتسامات ",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "إدراج رمز",
+
+// Table Dialog
+DlgTableTitle		: "إدراج جدول",
+DlgTableRows		: "صفوف",
+DlgTableColumns		: "أعمدة",
+DlgTableBorder		: "سمك الحدود",
+DlgTableAlign		: "المحاذاة",
+DlgTableAlignNotSet	: "<بدون تحديد>",
+DlgTableAlignLeft	: "يسار",
+DlgTableAlignCenter	: "وسط",
+DlgTableAlignRight	: "يمين",
+DlgTableWidth		: "العرض",
+DlgTableWidthPx		: "بكسل",
+DlgTableWidthPc		: "بالمئة",
+DlgTableHeight		: "الإرتفاع",
+DlgTableCellSpace	: "تباعد الخلايا",
+DlgTableCellPad		: "المسافة البادئة",
+DlgTableCaption		: "الوصف",
+DlgTableSummary		: "الخلاصة",
+
+// Table Cell Dialog
+DlgCellTitle		: "خصائص الخلية",
+DlgCellWidth		: "العرض",
+DlgCellWidthPx		: "بكسل",
+DlgCellWidthPc		: "بالمئة",
+DlgCellHeight		: "الإرتفاع",
+DlgCellWordWrap		: "التفاف النص",
+DlgCellWordWrapNotSet	: "<بدون تحديد>",
+DlgCellWordWrapYes	: "نعم",
+DlgCellWordWrapNo	: "لا",
+DlgCellHorAlign		: "المحاذاة الأفقية",
+DlgCellHorAlignNotSet	: "<بدون تحديد>",
+DlgCellHorAlignLeft	: "يسار",
+DlgCellHorAlignCenter	: "وسط",
+DlgCellHorAlignRight: "يمين",
+DlgCellVerAlign		: "المحاذاة العمودية",
+DlgCellVerAlignNotSet	: "<بدون تحديد>",
+DlgCellVerAlignTop	: "أعلى",
+DlgCellVerAlignMiddle	: "وسط",
+DlgCellVerAlignBottom	: "أسفل",
+DlgCellVerAlignBaseline	: "على السطر",
+DlgCellRowSpan		: "إمتداد الصفوف",
+DlgCellCollSpan		: "إمتداد الأعمدة",
+DlgCellBackColor	: "لون الخلفية",
+DlgCellBorderColor	: "لون الحدود",
+DlgCellBtnSelect	: "حدّد...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "بحث واستبدال",
+
+// Find Dialog
+DlgFindTitle		: "بحث",
+DlgFindFindBtn		: "ابحث",
+DlgFindNotFoundMsg	: "لم يتم العثور على النص المحدد.",
+
+// Replace Dialog
+DlgReplaceTitle			: "إستبدال",
+DlgReplaceFindLbl		: "البحث عن:",
+DlgReplaceReplaceLbl	: "إستبدال بـ:",
+DlgReplaceCaseChk		: "مطابقة حالة الأحرف",
+DlgReplaceReplaceBtn	: "إستبدال",
+DlgReplaceReplAllBtn	: "إستبدال الكل",
+DlgReplaceWordChk		: "الكلمة بالكامل فقط",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl+X).",
+PasteErrorCopy	: "الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl+C).",
+
+PasteAsText		: "لصق كنص بسيط",
+PasteFromWord	: "لصق من وورد",
+
+DlgPasteMsg2	: "الصق داخل الصندوق بإستخدام زرّي (<STRONG>Ctrl+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.",
+DlgPasteSec		: "نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذا وجب عليك لصق المحتوى مرة أخرى في هذه النافذة.",
+DlgPasteIgnoreFont		: "تجاهل تعريفات أسماء الخطوط",
+DlgPasteRemoveStyles	: "إزالة تعريفات الأنماط",
+
+// Color Picker
+ColorAutomatic	: "تلقائي",
+ColorMoreColors	: "ألوان إضافية...",
+
+// Document Properties
+DocProps		: "خصائص الصفحة",
+
+// Anchor Dialog
+DlgAnchorTitle		: "خصائص إشارة مرجعية",
+DlgAnchorName		: "اسم الإشارة المرجعية",
+DlgAnchorErrorName	: "الرجاء كتابة اسم الإشارة المرجعية",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "ليست في القاموس",
+DlgSpellChangeTo		: "التغيير إلى",
+DlgSpellBtnIgnore		: "تجاهل",
+DlgSpellBtnIgnoreAll	: "تجاهل الكل",
+DlgSpellBtnReplace		: "تغيير",
+DlgSpellBtnReplaceAll	: "تغيير الكل",
+DlgSpellBtnUndo			: "تراجع",
+DlgSpellNoSuggestions	: "- لا توجد إقتراحات -",
+DlgSpellProgress		: "جاري التدقيق إملائياً",
+DlgSpellNoMispell		: "تم إكمال التدقيق الإملائي: لم يتم العثور على أي أخطاء إملائية",
+DlgSpellNoChanges		: "تم إكمال التدقيق الإملائي: لم يتم تغيير أي كلمة",
+DlgSpellOneChange		: "تم إكمال التدقيق الإملائي: تم تغيير كلمة واحدة فقط",
+DlgSpellManyChanges		: "تم إكمال التدقيق الإملائي: تم تغيير %1 كلمات\كلمة",
+
+IeSpellDownload			: "المدقق الإملائي (الإنجليزي) غير مثبّت. هل تود تحميله الآن؟",
+
+// Button Dialog
+DlgButtonText		: "القيمة/التسمية",
+DlgButtonType		: "نوع الزر",
+DlgButtonTypeBtn	: "زر",
+DlgButtonTypeSbm	: "إرسال",
+DlgButtonTypeRst	: "إعادة تعيين",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "الاسم",
+DlgCheckboxValue	: "القيمة",
+DlgCheckboxSelected	: "محدد",
+
+// Form Dialog
+DlgFormName		: "الاسم",
+DlgFormAction	: "اسم الملف",
+DlgFormMethod	: "الأسلوب",
+
+// Select Field Dialog
+DlgSelectName		: "الاسم",
+DlgSelectValue		: "القيمة",
+DlgSelectSize		: "الحجم",
+DlgSelectLines		: "الأسطر",
+DlgSelectChkMulti	: "السماح بتحديدات متعددة",
+DlgSelectOpAvail	: "الخيارات المتاحة",
+DlgSelectOpText		: "النص",
+DlgSelectOpValue	: "القيمة",
+DlgSelectBtnAdd		: "إضافة",
+DlgSelectBtnModify	: "تعديل",
+DlgSelectBtnUp		: "تحريك لأعلى",
+DlgSelectBtnDown	: "تحريك لأسفل",
+DlgSelectBtnSetValue : "إجعلها محددة",
+DlgSelectBtnDelete	: "إزالة",
+
+// Textarea Dialog
+DlgTextareaName	: "الاسم",
+DlgTextareaCols	: "الأعمدة",
+DlgTextareaRows	: "الصفوف",
+
+// Text Field Dialog
+DlgTextName			: "الاسم",
+DlgTextValue		: "القيمة",
+DlgTextCharWidth	: "العرض بالأحرف",
+DlgTextMaxChars		: "عدد الحروف الأقصى",
+DlgTextType			: "نوع المحتوى",
+DlgTextTypeText		: "نص",
+DlgTextTypePass		: "كلمة مرور",
+
+// Hidden Field Dialog
+DlgHiddenName	: "الاسم",
+DlgHiddenValue	: "القيمة",
+
+// Bulleted List Dialog
+BulletedListProp	: "خصائص التعداد النقطي",
+NumberedListProp	: "خصائص التعداد الرقمي",
+DlgLstStart			: "البدء عند",
+DlgLstType			: "النوع",
+DlgLstTypeCircle	: "دائرة",
+DlgLstTypeDisc		: "قرص",
+DlgLstTypeSquare	: "مربع",
+DlgLstTypeNumbers	: "أرقام (1، 2، 3)َ",
+DlgLstTypeLCase		: "حروف صغيرة (a, b, c)َ",
+DlgLstTypeUCase		: "حروف كبيرة (A, B, C)َ",
+DlgLstTypeSRoman	: "ترقيم روماني صغير (i, ii, iii)َ",
+DlgLstTypeLRoman	: "ترقيم روماني كبير (I, II, III)َ",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "عام",
+DlgDocBackTab		: "الخلفية",
+DlgDocColorsTab		: "الألوان والهوامش",
+DlgDocMetaTab		: "المعرّفات الرأسية",
+
+DlgDocPageTitle		: "عنوان الصفحة",
+DlgDocLangDir		: "إتجاه اللغة",
+DlgDocLangDirLTR	: "اليسار لليمين (LTR)",
+DlgDocLangDirRTL	: "اليمين لليسار (RTL)",
+DlgDocLangCode		: "رمز اللغة",
+DlgDocCharSet		: "ترميز الحروف",
+DlgDocCharSetCE		: "أوروبا الوسطى",
+DlgDocCharSetCT		: "الصينية التقليدية (Big5)",
+DlgDocCharSetCR		: "السيريلية",
+DlgDocCharSetGR		: "اليونانية",
+DlgDocCharSetJP		: "اليابانية",
+DlgDocCharSetKR		: "الكورية",
+DlgDocCharSetTR		: "التركية",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "أوروبا الغربية",
+DlgDocCharSetOther	: "ترميز آخر",
+
+DlgDocDocType		: "ترويسة نوع  الصفحة",
+DlgDocDocTypeOther	: "ترويسة نوع  صفحة أخرى",
+DlgDocIncXHTML		: "تضمين   إعلانات‏ لغة XHTMLَ",
+DlgDocBgColor		: "لون الخلفية",
+DlgDocBgImage		: "رابط الصورة الخلفية",
+DlgDocBgNoScroll	: "جعلها علامة مائية",
+DlgDocCText			: "النص",
+DlgDocCLink			: "الروابط",
+DlgDocCVisited		: "المزارة",
+DlgDocCActive		: "النشطة",
+DlgDocMargins		: "هوامش الصفحة",
+DlgDocMaTop			: "علوي",
+DlgDocMaLeft		: "أيسر",
+DlgDocMaRight		: "أيمن",
+DlgDocMaBottom		: "سفلي",
+DlgDocMeIndex		: "الكلمات الأساسية (مفصولة بفواصل)َ",
+DlgDocMeDescr		: "وصف الصفحة",
+DlgDocMeAuthor		: "الكاتب",
+DlgDocMeCopy		: "المالك",
+DlgDocPreview		: "معاينة",
+
+// Templates Dialog
+Templates			: "القوالب",
+DlgTemplatesTitle	: "قوالب المحتوى",
+DlgTemplatesSelMsg	: "اختر القالب الذي تود وضعه في المحرر <br>(سيتم فقدان المحتوى الحالي):",
+DlgTemplatesLoading	: "جاري تحميل قائمة القوالب، الرجاء الإنتظار...",
+DlgTemplatesNoTpl	: "(لم يتم تعريف أي قالب)",
+DlgTemplatesReplace	: "استبدال المحتوى",
+
+// About Dialog
+DlgAboutAboutTab	: "نبذة",
+DlgAboutBrowserInfoTab	: "معلومات متصفحك",
+DlgAboutLicenseTab	: "الترخيص",
+DlgAboutVersion		: "الإصدار",
+DlgAboutInfo		: "لمزيد من المعلومات تفضل بزيارة",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/bg.js b/modules/editor/skins/fckeditor/editor/lang/bg.js
new file mode 100644
index 000000000..6c6f8b1ea
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/bg.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Bulgarian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Скрий панела с инструментите",
+ToolbarExpand		: "Покажи панела с инструментите",
+
+// Toolbar Items and Context Menu
+Save				: "Запази",
+NewPage				: "Нова страница",
+Preview				: "Предварителен изглед",
+Cut					: "Изрежи",
+Copy				: "Запамети",
+Paste				: "Вмъкни",
+PasteText			: "Вмъкни само текст",
+PasteWord			: "Вмъкни от MS Word",
+Print				: "Печат",
+SelectAll			: "Селектирай всичко",
+RemoveFormat		: "Изтрий форматирането",
+InsertLinkLbl		: "Връзка",
+InsertLink			: "Добави/Редактирай връзка",
+RemoveLink			: "Изтрий връзка",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Добави/Редактирай котва",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Изображение",
+InsertImage			: "Добави/Редактирай изображение",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Добави/Редактиай Flash обект",
+InsertTableLbl		: "Таблица",
+InsertTable			: "Добави/Редактирай таблица",
+InsertLineLbl		: "Линия",
+InsertLine			: "Вмъкни хоризонтална линия",
+InsertSpecialCharLbl: "Специален символ",
+InsertSpecialChar	: "Вмъкни специален символ",
+InsertSmileyLbl		: "Усмивка",
+InsertSmiley		: "Добави усмивка",
+About				: "За FCKeditor",
+Bold				: "Удебелен",
+Italic				: "Курсив",
+Underline			: "Подчертан",
+StrikeThrough		: "Зачертан",
+Subscript			: "Индекс за база",
+Superscript			: "Индекс за степен",
+LeftJustify			: "Подравняване в ляво",
+CenterJustify		: "Подравнявне в средата",
+RightJustify		: "Подравняване в дясно",
+BlockJustify		: "Двустранно подравняване",
+DecreaseIndent		: "Намали отстъпа",
+IncreaseIndent		: "Увеличи отстъпа",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Отмени",
+Redo				: "Повтори",
+NumberedListLbl		: "Нумериран списък",
+NumberedList		: "Добави/Изтрий нумериран списък",
+BulletedListLbl		: "Ненумериран списък",
+BulletedList		: "Добави/Изтрий ненумериран списък",
+ShowTableBorders	: "Покажи рамките на таблицата",
+ShowDetails			: "Покажи подробности",
+Style				: "Стил",
+FontFormat			: "Формат",
+Font				: "Шрифт",
+FontSize			: "Размер",
+TextColor			: "Цвят на текста",
+BGColor				: "Цвят на фона",
+Source				: "Код",
+Find				: "Търси",
+Replace				: "Замести",
+SpellCheck			: "Провери правописа",
+UniversalKeyboard	: "Универсална клавиатура",
+PageBreakLbl		: "Нов ред",
+PageBreak			: "Вмъкни нов ред",
+
+Form			: "Формуляр",
+Checkbox		: "Поле за отметка",
+RadioButton		: "Поле за опция",
+TextField		: "Текстово поле",
+Textarea		: "Текстова област",
+HiddenField		: "Скрито поле",
+Button			: "Бутон",
+SelectionField	: "Падащо меню с опции",
+ImageButton		: "Бутон-изображение",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Редактирай връзка",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Изтрий редовете",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Изтрий колоните",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Изтрий клетките",
+MergeCells			: "Обедини клетките",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Изтрий таблицата",
+CellProperties		: "Параметри на клетката",
+TableProperties		: "Параметри на таблицата",
+ImageProperties		: "Параметри на изображението",
+FlashProperties		: "Параметри на Flash обекта",
+
+AnchorProp			: "Параметри на котвата",
+ButtonProp			: "Параметри на бутона",
+CheckboxProp		: "Параметри на полето за отметка",
+HiddenFieldProp		: "Параметри на скритото поле",
+RadioButtonProp		: "Параметри на полето за опция",
+ImageButtonProp		: "Параметри на бутона-изображение",
+TextFieldProp		: "Параметри на текстовото-поле",
+SelectionFieldProp	: "Параметри на падащото меню с опции",
+TextareaProp		: "Параметри на текстовата област",
+FormProp			: "Параметри на формуляра",
+
+FontFormats			: "Нормален;Форматиран;Адрес;Заглавие 1;Заглавие 2;Заглавие 3;Заглавие 4;Заглавие 5;Заглавие 6;Параграф (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Обработка на XHTML. Моля изчакайте...",
+Done				: "Готово",
+PasteWordConfirm	: "Текстът, който искате да вмъкнете е копиран от MS Word. Желаете ли да бъде изчистен преди вмъкването?",
+NotCompatiblePaste	: "Тази операция изисква MS Internet Explorer версия 5.5 или по-висока. Желаете ли да вмъкнете запаметеното без изчистване?",
+UnknownToolbarItem	: "Непознат инструмент \"%1\"",
+UnknownCommand		: "Непозната команда \"%1\"",
+NotImplemented		: "Командата не е имплементирана",
+UnknownToolbarSet	: "Панелът \"%1\" не съществува",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ОК",
+DlgBtnCancel		: "Отказ",
+DlgBtnClose			: "Затвори",
+DlgBtnBrowseServer	: "Разгледай сървъра",
+DlgAdvancedTag		: "Подробности...",
+DlgOpOther			: "<Друго>",
+DlgInfoTab			: "Информация",
+DlgAlertUrl			: "Моля, въведете пълния път (URL)",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<не е настроен>",
+DlgGenId			: "Идентификатор",
+DlgGenLangDir		: "посока на речта",
+DlgGenLangDirLtr	: "От ляво на дясно",
+DlgGenLangDirRtl	: "От дясно на ляво",
+DlgGenLangCode		: "Код на езика",
+DlgGenAccessKey		: "Бърз клавиш",
+DlgGenName			: "Име",
+DlgGenTabIndex		: "Ред на достъп",
+DlgGenLongDescr		: "Описание на връзката",
+DlgGenClass			: "Клас от стиловите таблици",
+DlgGenTitle			: "Препоръчително заглавие",
+DlgGenContType		: "Препоръчителен тип на съдържанието",
+DlgGenLinkCharset	: "Тип на свързания ресурс",
+DlgGenStyle			: "Стил",
+
+// Image Dialog
+DlgImgTitle			: "Параметри на изображението",
+DlgImgInfoTab		: "Информация за изображението",
+DlgImgBtnUpload		: "Прати към сървъра",
+DlgImgURL			: "Пълен път (URL)",
+DlgImgUpload		: "Качи",
+DlgImgAlt			: "Алтернативен текст",
+DlgImgWidth			: "Ширина",
+DlgImgHeight		: "Височина",
+DlgImgLockRatio		: "Запази пропорцията",
+DlgBtnResetSize		: "Възстанови размера",
+DlgImgBorder		: "Рамка",
+DlgImgHSpace		: "Хоризонтален отстъп",
+DlgImgVSpace		: "Вертикален отстъп",
+DlgImgAlign			: "Подравняване",
+DlgImgAlignLeft		: "Ляво",
+DlgImgAlignAbsBottom: "Най-долу",
+DlgImgAlignAbsMiddle: "Точно по средата",
+DlgImgAlignBaseline	: "По базовата линия",
+DlgImgAlignBottom	: "Долу",
+DlgImgAlignMiddle	: "По средата",
+DlgImgAlignRight	: "Дясно",
+DlgImgAlignTextTop	: "Върху текста",
+DlgImgAlignTop		: "Отгоре",
+DlgImgPreview		: "Изглед",
+DlgImgAlertUrl		: "Моля, въведете пълния път до изображението",
+DlgImgLinkTab		: "Връзка",
+
+// Flash Dialog
+DlgFlashTitle		: "Параметри на Flash обекта",
+DlgFlashChkPlay		: "Автоматично стартиране",
+DlgFlashChkLoop		: "Ново стартиране след завършването",
+DlgFlashChkMenu		: "Разрешено Flash меню",
+DlgFlashScale		: "Оразмеряване",
+DlgFlashScaleAll	: "Покажи целия обект",
+DlgFlashScaleNoBorder	: "Без рамка",
+DlgFlashScaleFit	: "Според мястото",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Връзка",
+DlgLnkInfoTab		: "Информация за връзката",
+DlgLnkTargetTab		: "Цел",
+
+DlgLnkType			: "Вид на връзката",
+DlgLnkTypeURL		: "Пълен път (URL)",
+DlgLnkTypeAnchor	: "Котва в текущата страница",
+DlgLnkTypeEMail		: "Е-поща",
+DlgLnkProto			: "Протокол",
+DlgLnkProtoOther	: "<друго>",
+DlgLnkURL			: "Пълен път (URL)",
+DlgLnkAnchorSel		: "Изберете котва",
+DlgLnkAnchorByName	: "По име на котвата",
+DlgLnkAnchorById	: "По идентификатор на елемент",
+DlgLnkNoAnchors		: "(Няма котви в текущия документ)",
+DlgLnkEMail			: "Адрес за е-поща",
+DlgLnkEMailSubject	: "Тема на писмото",
+DlgLnkEMailBody		: "Текст на писмото",
+DlgLnkUpload		: "Качи",
+DlgLnkBtnUpload		: "Прати на сървъра",
+
+DlgLnkTarget		: "Цел",
+DlgLnkTargetFrame	: "<рамка>",
+DlgLnkTargetPopup	: "<дъщерен прозорец>",
+DlgLnkTargetBlank	: "Нов прозорец (_blank)",
+DlgLnkTargetParent	: "Родителски прозорец (_parent)",
+DlgLnkTargetSelf	: "Активния прозорец (_self)",
+DlgLnkTargetTop		: "Целия прозорец (_top)",
+DlgLnkTargetFrameName	: "Име на целевия прозорец",
+DlgLnkPopWinName	: "Име на дъщерния прозорец",
+DlgLnkPopWinFeat	: "Параметри на дъщерния прозорец",
+DlgLnkPopResize		: "С променливи размери",
+DlgLnkPopLocation	: "Поле за адрес",
+DlgLnkPopMenu		: "Меню",
+DlgLnkPopScroll		: "Плъзгач",
+DlgLnkPopStatus		: "Поле за статус",
+DlgLnkPopToolbar	: "Панел с бутони",
+DlgLnkPopFullScrn	: "Голям екран (MS IE)",
+DlgLnkPopDependent	: "Зависим (Netscape)",
+DlgLnkPopWidth		: "Ширина",
+DlgLnkPopHeight		: "Височина",
+DlgLnkPopLeft		: "Координати - X",
+DlgLnkPopTop		: "Координати - Y",
+
+DlnLnkMsgNoUrl		: "Моля, напишете пълния път (URL)",
+DlnLnkMsgNoEMail	: "Моля, напишете адреса за е-поща",
+DlnLnkMsgNoAnchor	: "Моля, изберете котва",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Изберете цвят",
+DlgColorBtnClear	: "Изчисти",
+DlgColorHighlight	: "Текущ",
+DlgColorSelected	: "Избран",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Добави усмивка",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Изберете специален символ",
+
+// Table Dialog
+DlgTableTitle		: "Параметри на таблицата",
+DlgTableRows		: "Редове",
+DlgTableColumns		: "Колони",
+DlgTableBorder		: "Размер на рамката",
+DlgTableAlign		: "Подравняване",
+DlgTableAlignNotSet	: "<Не е избрано>",
+DlgTableAlignLeft	: "Ляво",
+DlgTableAlignCenter	: "Център",
+DlgTableAlignRight	: "Дясно",
+DlgTableWidth		: "Ширина",
+DlgTableWidthPx		: "пиксели",
+DlgTableWidthPc		: "проценти",
+DlgTableHeight		: "Височина",
+DlgTableCellSpace	: "Разстояние между клетките",
+DlgTableCellPad		: "Отстъп на съдържанието в клетките",
+DlgTableCaption		: "Заглавие",
+DlgTableSummary		: "Резюме",
+
+// Table Cell Dialog
+DlgCellTitle		: "Параметри на клетката",
+DlgCellWidth		: "Ширина",
+DlgCellWidthPx		: "пиксели",
+DlgCellWidthPc		: "проценти",
+DlgCellHeight		: "Височина",
+DlgCellWordWrap		: "пренасяне на нов ред",
+DlgCellWordWrapNotSet	: "<Не е настроено>",
+DlgCellWordWrapYes	: "Да",
+DlgCellWordWrapNo	: "не",
+DlgCellHorAlign		: "Хоризонтално подравняване",
+DlgCellHorAlignNotSet	: "<Не е настроено>",
+DlgCellHorAlignLeft	: "Ляво",
+DlgCellHorAlignCenter	: "Център",
+DlgCellHorAlignRight: "Дясно",
+DlgCellVerAlign		: "Вертикално подравняване",
+DlgCellVerAlignNotSet	: "<Не е настроено>",
+DlgCellVerAlignTop	: "Горе",
+DlgCellVerAlignMiddle	: "По средата",
+DlgCellVerAlignBottom	: "Долу",
+DlgCellVerAlignBaseline	: "По базовата линия",
+DlgCellRowSpan		: "повече от един ред",
+DlgCellCollSpan		: "повече от една колона",
+DlgCellBackColor	: "фонов цвят",
+DlgCellBorderColor	: "цвят на рамката",
+DlgCellBtnSelect	: "Изберете...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Търси",
+DlgFindFindBtn		: "Търси",
+DlgFindNotFoundMsg	: "Указания текст не беше намерен.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Замести",
+DlgReplaceFindLbl		: "Търси:",
+DlgReplaceReplaceLbl	: "Замести с:",
+DlgReplaceCaseChk		: "Със същия регистър",
+DlgReplaceReplaceBtn	: "Замести",
+DlgReplaceReplAllBtn	: "Замести всички",
+DlgReplaceWordChk		: "Търси същата дума",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни изрязването. За целта използвайте клавиатурата (Ctrl+X).",
+PasteErrorCopy	: "Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl+C).",
+
+PasteAsText		: "Вмъкни като чист текст",
+PasteFromWord	: "Вмъкни от MS Word",
+
+DlgPasteMsg2	: "Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl+V</STRONG>) и натиснете <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Игнорирай шрифтовите дефиниции",
+DlgPasteRemoveStyles	: "Изтрий стиловите дефиниции",
+
+// Color Picker
+ColorAutomatic	: "По подразбиране",
+ColorMoreColors	: "Други цветове...",
+
+// Document Properties
+DocProps		: "Параметри на документа",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Параметри на котвата",
+DlgAnchorName		: "Име на котвата",
+DlgAnchorErrorName	: "Моля, въведете име на котвата",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Липсва в речника",
+DlgSpellChangeTo		: "Промени на",
+DlgSpellBtnIgnore		: "Игнорирай",
+DlgSpellBtnIgnoreAll	: "Игнорирай всички",
+DlgSpellBtnReplace		: "Замести",
+DlgSpellBtnReplaceAll	: "Замести всички",
+DlgSpellBtnUndo			: "Отмени",
+DlgSpellNoSuggestions	: "- Няма предложения -",
+DlgSpellProgress		: "Извършване на проверката за правопис...",
+DlgSpellNoMispell		: "Проверката за правопис завършена: не са открити правописни грешки",
+DlgSpellNoChanges		: "Проверката за правопис завършена: няма променени думи",
+DlgSpellOneChange		: "Проверката за правопис завършена: една дума е променена",
+DlgSpellManyChanges		: "Проверката за правопис завършена: %1 думи са променени",
+
+IeSpellDownload			: "Инструментът за проверка на правопис не е инсталиран. Желаете ли да го инсталирате ?",
+
+// Button Dialog
+DlgButtonText		: "Текст (Стойност)",
+DlgButtonType		: "Тип",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Име",
+DlgCheckboxValue	: "Стойност",
+DlgCheckboxSelected	: "Отметнато",
+
+// Form Dialog
+DlgFormName		: "Име",
+DlgFormAction	: "Действие",
+DlgFormMethod	: "Метод",
+
+// Select Field Dialog
+DlgSelectName		: "Име",
+DlgSelectValue		: "Стойност",
+DlgSelectSize		: "Размер",
+DlgSelectLines		: "линии",
+DlgSelectChkMulti	: "Разрешено множествено селектиране",
+DlgSelectOpAvail	: "Възможни опции",
+DlgSelectOpText		: "Текст",
+DlgSelectOpValue	: "Стойност",
+DlgSelectBtnAdd		: "Добави",
+DlgSelectBtnModify	: "Промени",
+DlgSelectBtnUp		: "Нагоре",
+DlgSelectBtnDown	: "Надолу",
+DlgSelectBtnSetValue : "Настрой като избрана стойност",
+DlgSelectBtnDelete	: "Изтрий",
+
+// Textarea Dialog
+DlgTextareaName	: "Име",
+DlgTextareaCols	: "Колони",
+DlgTextareaRows	: "Редове",
+
+// Text Field Dialog
+DlgTextName			: "Име",
+DlgTextValue		: "Стойност",
+DlgTextCharWidth	: "Ширина на символите",
+DlgTextMaxChars		: "Максимум символи",
+DlgTextType			: "Тип",
+DlgTextTypeText		: "Текст",
+DlgTextTypePass		: "Парола",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Име",
+DlgHiddenValue	: "Стойност",
+
+// Bulleted List Dialog
+BulletedListProp	: "Параметри на ненумерирания списък",
+NumberedListProp	: "Параметри на нумерирания списък",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Тип",
+DlgLstTypeCircle	: "Окръжност",
+DlgLstTypeDisc		: "Кръг",
+DlgLstTypeSquare	: "Квадрат",
+DlgLstTypeNumbers	: "Числа (1, 2, 3)",
+DlgLstTypeLCase		: "Малки букви (a, b, c)",
+DlgLstTypeUCase		: "Големи букви (A, B, C)",
+DlgLstTypeSRoman	: "Малки римски числа (i, ii, iii)",
+DlgLstTypeLRoman	: "Големи римски числа (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Общи",
+DlgDocBackTab		: "Фон",
+DlgDocColorsTab		: "Цветове и отстъпи",
+DlgDocMetaTab		: "Мета данни",
+
+DlgDocPageTitle		: "Заглавие на страницата",
+DlgDocLangDir		: "Посока на речта",
+DlgDocLangDirLTR	: "От ляво на дясно",
+DlgDocLangDirRTL	: "От дясно на ляво",
+DlgDocLangCode		: "Код на езика",
+DlgDocCharSet		: "Кодиране на символите",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Друго кодиране на символите",
+
+DlgDocDocType		: "Тип на документа",
+DlgDocDocTypeOther	: "Друг тип на документа",
+DlgDocIncXHTML		: "Включи XHTML декларация",
+DlgDocBgColor		: "Цвят на фона",
+DlgDocBgImage		: "Пълен път до фоновото изображение",
+DlgDocBgNoScroll	: "Не-повтарящо се фоново изображение",
+DlgDocCText			: "Текст",
+DlgDocCLink			: "Връзка",
+DlgDocCVisited		: "Посетена връзка",
+DlgDocCActive		: "Активна връзка",
+DlgDocMargins		: "Отстъпи на страницата",
+DlgDocMaTop			: "Горе",
+DlgDocMaLeft		: "Ляво",
+DlgDocMaRight		: "Дясно",
+DlgDocMaBottom		: "Долу",
+DlgDocMeIndex		: "Ключови думи за документа (разделени със запетаи)",
+DlgDocMeDescr		: "Описание на документа",
+DlgDocMeAuthor		: "Автор",
+DlgDocMeCopy		: "Авторски права",
+DlgDocPreview		: "Изглед",
+
+// Templates Dialog
+Templates			: "Шаблони",
+DlgTemplatesTitle	: "Шаблони",
+DlgTemplatesSelMsg	: "Изберете шаблон <br>(текущото съдържание на редактора ще бъде загубено):",
+DlgTemplatesLoading	: "Зареждане на списъка с шаблоните. Моля изчакайте...",
+DlgTemplatesNoTpl	: "(Няма дефинирани шаблони)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "За",
+DlgAboutBrowserInfoTab	: "Информация за браузъра",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "версия",
+DlgAboutInfo		: "За повече информация посетете",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/bn.js b/modules/editor/skins/fckeditor/editor/lang/bn.js
new file mode 100644
index 000000000..173182e25
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/bn.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Bengali/Bangla language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "টূলবার গুটিয়ে দাও",
+ToolbarExpand		: "টূলবার ছড়িয়ে দাও",
+
+// Toolbar Items and Context Menu
+Save				: "সংরক্ষন কর",
+NewPage				: "নতুন পেজ",
+Preview				: "প্রিভিউ",
+Cut					: "কাট",
+Copy				: "কপি",
+Paste				: "পেস্ট",
+PasteText			: "পেস্ট (সাদা টেক্সট)",
+PasteWord			: "পেস্ট (শব্দ)",
+Print				: "প্রিন্ট",
+SelectAll			: "সব সিলেক্ট কর",
+RemoveFormat		: "ফরমেট সরাও",
+InsertLinkLbl		: "লিংকের যুক্ত করার লেবেল",
+InsertLink			: "লিংক যুক্ত কর",
+RemoveLink			: "লিংক সরাও",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "নোঙ্গর",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "ছবির লেবেল যুক্ত কর",
+InsertImage			: "ছবি যুক্ত কর",
+InsertFlashLbl		: "ফ্লাশ লেবেল যুক্ত কর",
+InsertFlash			: "ফ্লাশ যুক্ত কর",
+InsertTableLbl		: "টেবিলের লেবেল যুক্ত কর",
+InsertTable			: "টেবিল যুক্ত কর",
+InsertLineLbl		: "রেখা যুক্ত কর",
+InsertLine			: "রেখা যুক্ত কর",
+InsertSpecialCharLbl: "বিশেষ অক্ষরের লেবেল যুক্ত কর",
+InsertSpecialChar	: "বিশেষ অক্ষর যুক্ত কর",
+InsertSmileyLbl		: "স্মাইলী",
+InsertSmiley		: "স্মাইলী যুক্ত কর",
+About				: "FCKeditor কে বানিয়েছে",
+Bold				: "বোল্ড",
+Italic				: "ইটালিক",
+Underline			: "আন্ডারলাইন",
+StrikeThrough		: "স্ট্রাইক থ্রু",
+Subscript			: "অধোলেখ",
+Superscript			: "অভিলেখ",
+LeftJustify			: "বা দিকে ঘেঁষা",
+CenterJustify		: "মাঝ বরাবর ঘেষা",
+RightJustify		: "ডান দিকে ঘেঁষা",
+BlockJustify		: "ব্লক জাস্টিফাই",
+DecreaseIndent		: "ইনডেন্ট কমাও",
+IncreaseIndent		: "ইনডেন্ট বাড়াও",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "আনডু",
+Redo				: "রি-ডু",
+NumberedListLbl		: "সাংখ্যিক লিস্টের লেবেল",
+NumberedList		: "সাংখ্যিক লিস্ট",
+BulletedListLbl		: "বুলেট লিস্ট লেবেল",
+BulletedList		: "বুলেটেড লিস্ট",
+ShowTableBorders	: "টেবিল বর্ডার",
+ShowDetails			: "সবটুকু দেখাও",
+Style				: "স্টাইল",
+FontFormat			: "ফন্ট ফরমেট",
+Font				: "ফন্ট",
+FontSize			: "সাইজ",
+TextColor			: "টেক্স্ট রং",
+BGColor				: "বেকগ্রাউন্ড রং",
+Source				: "সোর্স",
+Find				: "খোজো",
+Replace				: "রিপ্লেস",
+SpellCheck			: "বানান চেক",
+UniversalKeyboard	: "সার্বজনীন কিবোর্ড",
+PageBreakLbl		: "পেজ ব্রেক লেবেল",
+PageBreak			: "পেজ ব্রেক",
+
+Form			: "ফর্ম",
+Checkbox		: "চেক বাক্স",
+RadioButton		: "রেডিও বাটন",
+TextField		: "টেক্সট ফীল্ড",
+Textarea		: "টেক্সট এরিয়া",
+HiddenField		: "গুপ্ত ফীল্ড",
+Button			: "বাটন",
+SelectionField	: "বাছাই ফীল্ড",
+ImageButton		: "ছবির বাটন",
+
+FitWindow		: "উইন্ডো ফিট কর",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "লিংক সম্পাদন",
+CellCM				: "সেল",
+RowCM				: "রো",
+ColumnCM			: "কলাম",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "রো মুছে দাও",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "কলাম মুছে দাও",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "সেল মুছে দাও",
+MergeCells			: "সেল জোড়া দাও",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "টেবিল ডিলীট কর",
+CellProperties		: "সেলের প্রোপার্টিজ",
+TableProperties		: "টেবিল প্রোপার্টি",
+ImageProperties		: "ছবি প্রোপার্টি",
+FlashProperties		: "ফ্লাশ প্রোপার্টি",
+
+AnchorProp			: "নোঙর প্রোপার্টি",
+ButtonProp			: "বাটন প্রোপার্টি",
+CheckboxProp		: "চেক বক্স প্রোপার্টি",
+HiddenFieldProp		: "গুপ্ত ফীল্ড প্রোপার্টি",
+RadioButtonProp		: "রেডিও বাটন প্রোপার্টি",
+ImageButtonProp		: "ছবি বাটন প্রোপার্টি",
+TextFieldProp		: "টেক্সট ফীল্ড প্রোপার্টি",
+SelectionFieldProp	: "বাছাই ফীল্ড প্রোপার্টি",
+TextareaProp		: "টেক্সট এরিয়া প্রোপার্টি",
+FormProp			: "ফর্ম প্রোপার্টি",
+
+FontFormats			: "সাধারণ;ফর্মেটেড;ঠিকানা;শীর্ষক ১;শীর্ষক ২;শীর্ষক ৩;শীর্ষক ৪;শীর্ষক ৫;শীর্ষক ৬;শীর্ষক (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML প্রসেস করা হচ্ছে",
+Done				: "শেষ হয়েছে",
+PasteWordConfirm	: "যে টেকস্টটি আপনি পেস্ট করতে চাচ্ছেন মনে হচ্ছে সেটি ওয়ার্ড থেকে কপি করা। আপনি কি পেস্ট করার আগে একে পরিষ্কার করতে চান?",
+NotCompatiblePaste	: "এই কমান্ডটি শুধুমাত্র ইন্টারনেট এক্সপ্লোরার ৫.০ বা তার পরের ভার্সনে পাওয়া সম্ভব। আপনি কি পরিষ্কার না করেই পেস্ট করতে চান?",
+UnknownToolbarItem	: "অজানা টুলবার আইটেম \"%1\"",
+UnknownCommand		: "অজানা কমান্ড \"%1\"",
+NotImplemented		: "কমান্ড ইমপ্লিমেন্ট করা হয়নি",
+UnknownToolbarSet	: "টুলবার সেট \"%1\" এর অস্তিত্ব নেই",
+NoActiveX			: "আপনার ব্রাউজারের সুরক্ষা সেটিংস কারনে এডিটরের কিছু ফিচার পাওয়া নাও যেতে পারে। আপনাকে অবশ্যই \"Run ActiveX controls and plug-ins\" এনাবেল করে নিতে হবে। আপনি ভুলভ্রান্তি কিছু কিছু ফিচারের অনুপস্থিতি উপলব্ধি করতে পারেন।",
+BrowseServerBlocked : "রিসোর্স ব্রাউজার খোলা গেল না। নিশ্চিত করুন যে সব পপআপ ব্লকার বন্ধ করা আছে।",
+DialogBlocked		: "ডায়ালগ ইউন্ডো খোলা গেল না। নিশ্চিত করুন যে সব পপআপ ব্লকার বন্ধ করা আছে।",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ওকে",
+DlgBtnCancel		: "বাতিল",
+DlgBtnClose			: "বন্ধ কর",
+DlgBtnBrowseServer	: "ব্রাউজ সার্ভার",
+DlgAdvancedTag		: "এডভান্সড",
+DlgOpOther			: "<অন্য>",
+DlgInfoTab			: "তথ্য",
+DlgAlertUrl			: "দয়া করে URL যুক্ত করুন",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<সেট নেই>",
+DlgGenId			: "আইডি",
+DlgGenLangDir		: "ভাষা লেখার দিক",
+DlgGenLangDirLtr	: "বাম থেকে ডান (LTR)",
+DlgGenLangDirRtl	: "ডান থেকে বাম (RTL)",
+DlgGenLangCode		: "ভাষা কোড",
+DlgGenAccessKey		: "এক্সেস কী",
+DlgGenName			: "নাম",
+DlgGenTabIndex		: "ট্যাব ইন্ডেক্স",
+DlgGenLongDescr		: "URL এর লম্বা বর্ণনা",
+DlgGenClass			: "স্টাইল-শীট ক্লাস",
+DlgGenTitle			: "পরামর্শ শীর্ষক",
+DlgGenContType		: "পরামর্শ কন্টেন্টের প্রকার",
+DlgGenLinkCharset	: "লিংক রিসোর্স ক্যারেক্টর সেট",
+DlgGenStyle			: "স্টাইল",
+
+// Image Dialog
+DlgImgTitle			: "ছবির প্রোপার্টি",
+DlgImgInfoTab		: "ছবির তথ্য",
+DlgImgBtnUpload		: "ইহাকে সার্ভারে প্রেরন কর",
+DlgImgURL			: "URL",
+DlgImgUpload		: "আপলোড",
+DlgImgAlt			: "বিকল্প টেক্সট",
+DlgImgWidth			: "প্রস্থ",
+DlgImgHeight		: "দৈর্ঘ্য",
+DlgImgLockRatio		: "অনুপাত লক কর",
+DlgBtnResetSize		: "সাইজ পূর্বাবস্থায় ফিরিয়ে দাও",
+DlgImgBorder		: "বর্ডার",
+DlgImgHSpace		: "হরাইজন্টাল স্পেস",
+DlgImgVSpace		: "ভার্টিকেল স্পেস",
+DlgImgAlign			: "এলাইন",
+DlgImgAlignLeft		: "বামে",
+DlgImgAlignAbsBottom: "Abs নীচে",
+DlgImgAlignAbsMiddle: "Abs উপর",
+DlgImgAlignBaseline	: "মূল রেখা",
+DlgImgAlignBottom	: "নীচে",
+DlgImgAlignMiddle	: "মধ্য",
+DlgImgAlignRight	: "ডানে",
+DlgImgAlignTextTop	: "টেক্সট উপর",
+DlgImgAlignTop		: "উপর",
+DlgImgPreview		: "প্রীভিউ",
+DlgImgAlertUrl		: "অনুগ্রহক করে ছবির URL টাইপ করুন",
+DlgImgLinkTab		: "লিংক",
+
+// Flash Dialog
+DlgFlashTitle		: "ফ্ল্যাশ প্রোপার্টি",
+DlgFlashChkPlay		: "অটো প্লে",
+DlgFlashChkLoop		: "লূপ",
+DlgFlashChkMenu		: "ফ্ল্যাশ মেনু এনাবল কর",
+DlgFlashScale		: "স্কেল",
+DlgFlashScaleAll	: "সব দেখাও",
+DlgFlashScaleNoBorder	: "কোনো বর্ডার নেই",
+DlgFlashScaleFit	: "নিখুঁত ফিট",
+
+// Link Dialog
+DlgLnkWindowTitle	: "লিংক",
+DlgLnkInfoTab		: "লিংক তথ্য",
+DlgLnkTargetTab		: "টার্গেট",
+
+DlgLnkType			: "লিংক প্রকার",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "এই পেজে নোঙর কর",
+DlgLnkTypeEMail		: "ইমেইল",
+DlgLnkProto			: "প্রোটোকল",
+DlgLnkProtoOther	: "<অন্য>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "নোঙর বাছাই",
+DlgLnkAnchorByName	: "নোঙরের নাম দিয়ে",
+DlgLnkAnchorById	: "নোঙরের আইডি দিয়ে",
+DlgLnkNoAnchors		: "(No anchors available in the document)",	//MISSING
+DlgLnkEMail			: "ইমেইল ঠিকানা",
+DlgLnkEMailSubject	: "মেসেজের বিষয়",
+DlgLnkEMailBody		: "মেসেজের দেহ",
+DlgLnkUpload		: "আপলোড",
+DlgLnkBtnUpload		: "একে সার্ভারে পাঠাও",
+
+DlgLnkTarget		: "টার্গেট",
+DlgLnkTargetFrame	: "<ফ্রেম>",
+DlgLnkTargetPopup	: "<পপআপ উইন্ডো>",
+DlgLnkTargetBlank	: "নতুন উইন্ডো (_blank)",
+DlgLnkTargetParent	: "মূল উইন্ডো (_parent)",
+DlgLnkTargetSelf	: "এই উইন্ডো (_self)",
+DlgLnkTargetTop		: "শীর্ষ উইন্ডো (_top)",
+DlgLnkTargetFrameName	: "টার্গেট ফ্রেমের নাম",
+DlgLnkPopWinName	: "পপআপ উইন্ডোর নাম",
+DlgLnkPopWinFeat	: "পপআপ উইন্ডো ফীচার সমূহ",
+DlgLnkPopResize		: "রিসাইজ করা সম্ভব",
+DlgLnkPopLocation	: "লোকেশন বার",
+DlgLnkPopMenu		: "মেন্যু বার",
+DlgLnkPopScroll		: "স্ক্রল বার",
+DlgLnkPopStatus		: "স্ট্যাটাস বার",
+DlgLnkPopToolbar	: "টুল বার",
+DlgLnkPopFullScrn	: "পূর্ণ পর্দা জুড়ে (IE)",
+DlgLnkPopDependent	: "ডিপেন্ডেন্ট (Netscape)",
+DlgLnkPopWidth		: "প্রস্থ",
+DlgLnkPopHeight		: "দৈর্ঘ্য",
+DlgLnkPopLeft		: "বামের পজিশন",
+DlgLnkPopTop		: "ডানের পজিশন",
+
+DlnLnkMsgNoUrl		: "অনুগ্রহ করে URL লিংক টাইপ করুন",
+DlnLnkMsgNoEMail	: "অনুগ্রহ করে ইমেইল এড্রেস টাইপ করুন",
+DlnLnkMsgNoAnchor	: "অনুগ্রহ করে নোঙর বাছাই করুন",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "রং বাছাই কর",
+DlgColorBtnClear	: "পরিষ্কার কর",
+DlgColorHighlight	: "হাইলাইট",
+DlgColorSelected	: "সিলেক্টেড",
+
+// Smiley Dialog
+DlgSmileyTitle		: "স্মাইলী যুক্ত কর",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "বিশেষ ক্যারেক্টার বাছাই কর",
+
+// Table Dialog
+DlgTableTitle		: "টেবিল প্রোপার্টি",
+DlgTableRows		: "রো",
+DlgTableColumns		: "কলাম",
+DlgTableBorder		: "বর্ডার সাইজ",
+DlgTableAlign		: "এলাইনমেন্ট",
+DlgTableAlignNotSet	: "<সেট নেই>",
+DlgTableAlignLeft	: "বামে",
+DlgTableAlignCenter	: "মাঝখানে",
+DlgTableAlignRight	: "ডানে",
+DlgTableWidth		: "প্রস্থ",
+DlgTableWidthPx		: "পিক্সেল",
+DlgTableWidthPc		: "শতকরা",
+DlgTableHeight		: "দৈর্ঘ্য",
+DlgTableCellSpace	: "সেল স্পেস",
+DlgTableCellPad		: "সেল প্যাডিং",
+DlgTableCaption		: "শীর্ষক",
+DlgTableSummary		: "সারাংশ",
+
+// Table Cell Dialog
+DlgCellTitle		: "সেল প্রোপার্টি",
+DlgCellWidth		: "প্রস্থ",
+DlgCellWidthPx		: "পিক্সেল",
+DlgCellWidthPc		: "শতকরা",
+DlgCellHeight		: "দৈর্ঘ্য",
+DlgCellWordWrap		: "ওয়ার্ড রেপ",
+DlgCellWordWrapNotSet	: "<সেট নেই>",
+DlgCellWordWrapYes	: "হাঁ",
+DlgCellWordWrapNo	: "না",
+DlgCellHorAlign		: "হরাইজন্টাল এলাইনমেন্ট",
+DlgCellHorAlignNotSet	: "<সেট নেই>",
+DlgCellHorAlignLeft	: "বামে",
+DlgCellHorAlignCenter	: "মাঝখানে",
+DlgCellHorAlignRight: "ডানে",
+DlgCellVerAlign		: "ভার্টিক্যাল এলাইনমেন্ট",
+DlgCellVerAlignNotSet	: "<সেট নেই>",
+DlgCellVerAlignTop	: "উপর",
+DlgCellVerAlignMiddle	: "মধ্য",
+DlgCellVerAlignBottom	: "নীচে",
+DlgCellVerAlignBaseline	: "মূলরেখা",
+DlgCellRowSpan		: "রো স্প্যান",
+DlgCellCollSpan		: "কলাম স্প্যান",
+DlgCellBackColor	: "ব্যাকগ্রাউন্ড রং",
+DlgCellBorderColor	: "বর্ডারের রং",
+DlgCellBtnSelect	: "বাছাই কর",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "খোঁজো",
+DlgFindFindBtn		: "খোঁজো",
+DlgFindNotFoundMsg	: "আপনার উল্লেখিত টেকস্ট পাওয়া যায়নি",
+
+// Replace Dialog
+DlgReplaceTitle			: "বদলে দাও",
+DlgReplaceFindLbl		: "যা খুঁজতে হবে:",
+DlgReplaceReplaceLbl	: "যার সাথে বদলাতে হবে:",
+DlgReplaceCaseChk		: "কেস মিলাও",
+DlgReplaceReplaceBtn	: "বদলে দাও",
+DlgReplaceReplAllBtn	: "সব বদলে দাও",
+DlgReplaceWordChk		: "পুরা শব্দ মেলাও",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl+X)।",
+PasteErrorCopy	: "আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কপি করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl+C)।",
+
+PasteAsText		: "সাদা টেক্সট হিসেবে পেস্ট কর",
+PasteFromWord	: "ওয়ার্ড থেকে পেস্ট কর",
+
+DlgPasteMsg2	: "অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "ফন্ট ফেস ডেফিনেশন ইগনোর করুন",
+DlgPasteRemoveStyles	: "স্টাইল ডেফিনেশন সরিয়ে দিন",
+
+// Color Picker
+ColorAutomatic	: "অটোমেটিক",
+ColorMoreColors	: "আরও রং...",
+
+// Document Properties
+DocProps		: "ডক্যুমেন্ট প্রোপার্টি",
+
+// Anchor Dialog
+DlgAnchorTitle		: "নোঙরের প্রোপার্টি",
+DlgAnchorName		: "নোঙরের নাম",
+DlgAnchorErrorName	: "নোঙরের নাম টাইপ করুন",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "শব্দকোষে নেই",
+DlgSpellChangeTo		: "এতে বদলাও",
+DlgSpellBtnIgnore		: "ইগনোর কর",
+DlgSpellBtnIgnoreAll	: "সব ইগনোর কর",
+DlgSpellBtnReplace		: "বদলে দাও",
+DlgSpellBtnReplaceAll	: "সব বদলে দাও",
+DlgSpellBtnUndo			: "আন্ডু",
+DlgSpellNoSuggestions	: "- কোন সাজেশন নেই -",
+DlgSpellProgress		: "বানান পরীক্ষা চলছে...",
+DlgSpellNoMispell		: "বানান পরীক্ষা শেষ: কোন ভুল বানান পাওয়া যায়নি",
+DlgSpellNoChanges		: "বানান পরীক্ষা শেষ: কোন শব্দ পরিবর্তন করা হয়নি",
+DlgSpellOneChange		: "বানান পরীক্ষা শেষ: একটি মাত্র শব্দ পরিবর্তন করা হয়েছে",
+DlgSpellManyChanges		: "বানান পরীক্ষা শেষ: %1 গুলো শব্দ বদলে গ্যাছে",
+
+IeSpellDownload			: "বানান পরীক্ষক ইনস্টল করা নেই। আপনি কি এখনই এটা ডাউনলোড করতে চান?",
+
+// Button Dialog
+DlgButtonText		: "টেক্সট (ভ্যালু)",
+DlgButtonType		: "প্রকার",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "নাম",
+DlgCheckboxValue	: "ভ্যালু",
+DlgCheckboxSelected	: "সিলেক্টেড",
+
+// Form Dialog
+DlgFormName		: "নাম",
+DlgFormAction	: "একশ্যন",
+DlgFormMethod	: "পদ্ধতি",
+
+// Select Field Dialog
+DlgSelectName		: "নাম",
+DlgSelectValue		: "ভ্যালু",
+DlgSelectSize		: "সাইজ",
+DlgSelectLines		: "লাইন সমূহ",
+DlgSelectChkMulti	: "একাধিক সিলেকশন এলাউ কর",
+DlgSelectOpAvail	: "অন্যান্য বিকল্প",
+DlgSelectOpText		: "টেক্সট",
+DlgSelectOpValue	: "ভ্যালু",
+DlgSelectBtnAdd		: "যুক্ত",
+DlgSelectBtnModify	: "বদলে দাও",
+DlgSelectBtnUp		: "উপর",
+DlgSelectBtnDown	: "নীচে",
+DlgSelectBtnSetValue : "বাছাই করা ভ্যালু হিসেবে সেট কর",
+DlgSelectBtnDelete	: "ডিলীট",
+
+// Textarea Dialog
+DlgTextareaName	: "নাম",
+DlgTextareaCols	: "কলাম",
+DlgTextareaRows	: "রো",
+
+// Text Field Dialog
+DlgTextName			: "নাম",
+DlgTextValue		: "ভ্যালু",
+DlgTextCharWidth	: "ক্যারেক্টার প্রশস্ততা",
+DlgTextMaxChars		: "সর্বাধিক ক্যারেক্টার",
+DlgTextType			: "টাইপ",
+DlgTextTypeText		: "টেক্সট",
+DlgTextTypePass		: "পাসওয়ার্ড",
+
+// Hidden Field Dialog
+DlgHiddenName	: "নাম",
+DlgHiddenValue	: "ভ্যালু",
+
+// Bulleted List Dialog
+BulletedListProp	: "বুলেটেড সূচী প্রোপার্টি",
+NumberedListProp	: "সাংখ্যিক সূচী প্রোপার্টি",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "প্রকার",
+DlgLstTypeCircle	: "গোল",
+DlgLstTypeDisc		: "ডিস্ক",
+DlgLstTypeSquare	: "চৌকোণা",
+DlgLstTypeNumbers	: "সংখ্যা (1, 2, 3)",
+DlgLstTypeLCase		: "ছোট অক্ষর (a, b, c)",
+DlgLstTypeUCase		: "বড় অক্ষর (A, B, C)",
+DlgLstTypeSRoman	: "ছোট রোমান সংখ্যা (i, ii, iii)",
+DlgLstTypeLRoman	: "বড় রোমান সংখ্যা (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "সাধারন",
+DlgDocBackTab		: "ব্যাকগ্রাউন্ড",
+DlgDocColorsTab		: "রং এবং মার্জিন",
+DlgDocMetaTab		: "মেটাডেটা",
+
+DlgDocPageTitle		: "পেজ শীর্ষক",
+DlgDocLangDir		: "ভাষা লিখার দিক",
+DlgDocLangDirLTR	: "বাম থেকে ডানে (LTR)",
+DlgDocLangDirRTL	: "ডান থেকে বামে (RTL)",
+DlgDocLangCode		: "ভাষা কোড",
+DlgDocCharSet		: "ক্যারেক্টার সেট এনকোডিং",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "অন্য ক্যারেক্টার সেট এনকোডিং",
+
+DlgDocDocType		: "ডক্যুমেন্ট টাইপ হেডিং",
+DlgDocDocTypeOther	: "অন্য ডক্যুমেন্ট টাইপ হেডিং",
+DlgDocIncXHTML		: "XHTML ডেক্লারেশন যুক্ত কর",
+DlgDocBgColor		: "ব্যাকগ্রাউন্ড রং",
+DlgDocBgImage		: "ব্যাকগ্রাউন্ড ছবির URL",
+DlgDocBgNoScroll	: "স্ক্রলহীন ব্যাকগ্রাউন্ড",
+DlgDocCText			: "টেক্সট",
+DlgDocCLink			: "লিংক",
+DlgDocCVisited		: "ভিজিট করা লিংক",
+DlgDocCActive		: "সক্রিয় লিংক",
+DlgDocMargins		: "পেজ মার্জিন",
+DlgDocMaTop			: "উপর",
+DlgDocMaLeft		: "বামে",
+DlgDocMaRight		: "ডানে",
+DlgDocMaBottom		: "নীচে",
+DlgDocMeIndex		: "ডক্যুমেন্ট ইন্ডেক্স কিওয়ার্ড (কমা দ্বারা বিচ্ছিন্ন)",
+DlgDocMeDescr		: "ডক্যূমেন্ট বর্ণনা",
+DlgDocMeAuthor		: "লেখক",
+DlgDocMeCopy		: "কপীরাইট",
+DlgDocPreview		: "প্রীভিউ",
+
+// Templates Dialog
+Templates			: "টেমপ্লেট",
+DlgTemplatesTitle	: "কনটেন্ট টেমপ্লেট",
+DlgTemplatesSelMsg	: "অনুগ্রহ করে এডিটরে ওপেন করার জন্য টেমপ্লেট বাছাই করুন<br>(আসল কনটেন্ট হারিয়ে যাবে):",
+DlgTemplatesLoading	: "টেমপ্লেট লিস্ট হারিয়ে যাবে। অনুগ্রহ করে অপেক্ষা করুন...",
+DlgTemplatesNoTpl	: "(কোন টেমপ্লেট ডিফাইন করা নেই)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "কে বানিয়েছে",
+DlgAboutBrowserInfoTab	: "ব্রাউজারের ব্যাপারে তথ্য",
+DlgAboutLicenseTab	: "লাইসেন্স",
+DlgAboutVersion		: "ভার্সন",
+DlgAboutInfo		: "আরও তথ্যের জন্য যান",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/bs.js b/modules/editor/skins/fckeditor/editor/lang/bs.js
new file mode 100644
index 000000000..662b4b8f1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/bs.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Bosnian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skupi trake sa alatima",
+ToolbarExpand		: "Otvori trake sa alatima",
+
+// Toolbar Items and Context Menu
+Save				: "Snimi",
+NewPage				: "Novi dokument",
+Preview				: "Prikaži",
+Cut					: "Izreži",
+Copy				: "Kopiraj",
+Paste				: "Zalijepi",
+PasteText			: "Zalijepi kao obièan tekst",
+PasteWord			: "Zalijepi iz Word-a",
+Print				: "Štampaj",
+SelectAll			: "Selektuj sve",
+RemoveFormat		: "Poništi format",
+InsertLinkLbl		: "Link",
+InsertLink			: "Ubaci/Izmjeni link",
+RemoveLink			: "Izbriši link",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Insert/Edit Anchor",	//MISSING
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Slika",
+InsertImage			: "Ubaci/Izmjeni sliku",
+InsertFlashLbl		: "Flash",	//MISSING
+InsertFlash			: "Insert/Edit Flash",	//MISSING
+InsertTableLbl		: "Tabela",
+InsertTable			: "Ubaci/Izmjeni tabelu",
+InsertLineLbl		: "Linija",
+InsertLine			: "Ubaci horizontalnu liniju",
+InsertSpecialCharLbl: "Specijalni karakter",
+InsertSpecialChar	: "Ubaci specijalni karater",
+InsertSmileyLbl		: "Smješko",
+InsertSmiley		: "Ubaci smješka",
+About				: "O FCKeditor-u",
+Bold				: "Boldiraj",
+Italic				: "Ukosi",
+Underline			: "Podvuci",
+StrikeThrough		: "Precrtaj",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Lijevo poravnanje",
+CenterJustify		: "Centralno poravnanje",
+RightJustify		: "Desno poravnanje",
+BlockJustify		: "Puno poravnanje",
+DecreaseIndent		: "Smanji uvod",
+IncreaseIndent		: "Poveæaj uvod",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Vrati",
+Redo				: "Ponovi",
+NumberedListLbl		: "Numerisana lista",
+NumberedList		: "Ubaci/Izmjeni numerisanu listu",
+BulletedListLbl		: "Lista",
+BulletedList		: "Ubaci/Izmjeni listu",
+ShowTableBorders	: "Pokaži okvire tabela",
+ShowDetails			: "Pokaži detalje",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Velièina",
+TextColor			: "Boja teksta",
+BGColor				: "Boja pozadine",
+Source				: "HTML kôd",
+Find				: "Naði",
+Replace				: "Zamjeni",
+SpellCheck			: "Check Spelling",	//MISSING
+UniversalKeyboard	: "Universal Keyboard",	//MISSING
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "Form",	//MISSING
+Checkbox		: "Checkbox",	//MISSING
+RadioButton		: "Radio Button",	//MISSING
+TextField		: "Text Field",	//MISSING
+Textarea		: "Textarea",	//MISSING
+HiddenField		: "Hidden Field",	//MISSING
+Button			: "Button",	//MISSING
+SelectionField	: "Selection Field",	//MISSING
+ImageButton		: "Image Button",	//MISSING
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Izmjeni link",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Briši redove",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Briši kolone",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Briši æelije",
+MergeCells			: "Spoji æelije",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Delete Table",	//MISSING
+CellProperties		: "Svojstva æelije",
+TableProperties		: "Svojstva tabele",
+ImageProperties		: "Svojstva slike",
+FlashProperties		: "Flash Properties",	//MISSING
+
+AnchorProp			: "Anchor Properties",	//MISSING
+ButtonProp			: "Button Properties",	//MISSING
+CheckboxProp		: "Checkbox Properties",	//MISSING
+HiddenFieldProp		: "Hidden Field Properties",	//MISSING
+RadioButtonProp		: "Radio Button Properties",	//MISSING
+ImageButtonProp		: "Image Button Properties",	//MISSING
+TextFieldProp		: "Text Field Properties",	//MISSING
+SelectionFieldProp	: "Selection Field Properties",	//MISSING
+TextareaProp		: "Textarea Properties",	//MISSING
+FormProp			: "Form Properties",	//MISSING
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Procesiram XHTML. Molim saèekajte...",
+Done				: "Gotovo",
+PasteWordConfirm	: "Tekst koji želite zalijepiti èini se da je kopiran iz Worda. Da li želite da se prvo oèisti?",
+NotCompatiblePaste	: "Ova komanda je podržana u Internet Explorer-u verzijama 5.5 ili novijim. Da li želite da izvršite lijepljenje teksta bez èišæenja?",
+UnknownToolbarItem	: "Nepoznata stavka sa trake sa alatima \"%1\"",
+UnknownCommand		: "Nepoznata komanda \"%1\"",
+NotImplemented		: "Komanda nije implementirana",
+UnknownToolbarSet	: "Traka sa alatima \"%1\" ne postoji",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Odustani",
+DlgBtnClose			: "Zatvori",
+DlgBtnBrowseServer	: "Browse Server",	//MISSING
+DlgAdvancedTag		: "Naprednije",
+DlgOpOther			: "<Other>",	//MISSING
+DlgInfoTab			: "Info",	//MISSING
+DlgAlertUrl			: "Please insert the URL",	//MISSING
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nije podešeno>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Smjer pisanja",
+DlgGenLangDirLtr	: "S lijeva na desno (LTR)",
+DlgGenLangDirRtl	: "S desna na lijevo (RTL)",
+DlgGenLangCode		: "Jezièni kôd",
+DlgGenAccessKey		: "Pristupna tipka",
+DlgGenName			: "Naziv",
+DlgGenTabIndex		: "Tab indeks",
+DlgGenLongDescr		: "Dugaèki opis URL-a",
+DlgGenClass			: "Klase CSS stilova",
+DlgGenTitle			: "Advisory title",
+DlgGenContType		: "Advisory vrsta sadržaja",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Svojstva slike",
+DlgImgInfoTab		: "Info slike",
+DlgImgBtnUpload		: "Šalji na server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Šalji",
+DlgImgAlt			: "Tekst na slici",
+DlgImgWidth			: "Širina",
+DlgImgHeight		: "Visina",
+DlgImgLockRatio		: "Zakljuèaj odnos",
+DlgBtnResetSize		: "Resetuj dimenzije",
+DlgImgBorder		: "Okvir",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Poravnanje",
+DlgImgAlignLeft		: "Lijevo",
+DlgImgAlignAbsBottom: "Abs dole",
+DlgImgAlignAbsMiddle: "Abs sredina",
+DlgImgAlignBaseline	: "Bazno",
+DlgImgAlignBottom	: "Dno",
+DlgImgAlignMiddle	: "Sredina",
+DlgImgAlignRight	: "Desno",
+DlgImgAlignTextTop	: "Vrh teksta",
+DlgImgAlignTop		: "Vrh",
+DlgImgPreview		: "Prikaz",
+DlgImgAlertUrl		: "Molimo ukucajte URL od slike.",
+DlgImgLinkTab		: "Link",	//MISSING
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",	//MISSING
+DlgFlashChkPlay		: "Auto Play",	//MISSING
+DlgFlashChkLoop		: "Loop",	//MISSING
+DlgFlashChkMenu		: "Enable Flash Menu",	//MISSING
+DlgFlashScale		: "Scale",	//MISSING
+DlgFlashScaleAll	: "Show all",	//MISSING
+DlgFlashScaleNoBorder	: "No Border",	//MISSING
+DlgFlashScaleFit	: "Exact Fit",	//MISSING
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link info",
+DlgLnkTargetTab		: "Prozor",
+
+DlgLnkType			: "Tip linka",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Sidro na ovoj stranici",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<drugi>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Izaberi sidro",
+DlgLnkAnchorByName	: "Po nazivu sidra",
+DlgLnkAnchorById	: "Po Id-u elementa",
+DlgLnkNoAnchors		: "(Nema dostupnih sidra na stranici)",
+DlgLnkEMail			: "E-Mail Adresa",
+DlgLnkEMailSubject	: "Subjekt poruke",
+DlgLnkEMailBody		: "Poruka",
+DlgLnkUpload		: "Šalji",
+DlgLnkBtnUpload		: "Šalji na server",
+
+DlgLnkTarget		: "Prozor",
+DlgLnkTargetFrame	: "<frejm>",
+DlgLnkTargetPopup	: "<popup prozor>",
+DlgLnkTargetBlank	: "Novi prozor (_blank)",
+DlgLnkTargetParent	: "Glavni prozor (_parent)",
+DlgLnkTargetSelf	: "Isti prozor (_self)",
+DlgLnkTargetTop		: "Najgornji prozor (_top)",
+DlgLnkTargetFrameName	: "Target Frame Name",	//MISSING
+DlgLnkPopWinName	: "Naziv popup prozora",
+DlgLnkPopWinFeat	: "Moguænosti popup prozora",
+DlgLnkPopResize		: "Promjenljive velièine",
+DlgLnkPopLocation	: "Traka za lokaciju",
+DlgLnkPopMenu		: "Izborna traka",
+DlgLnkPopScroll		: "Scroll traka",
+DlgLnkPopStatus		: "Statusna traka",
+DlgLnkPopToolbar	: "Traka sa alatima",
+DlgLnkPopFullScrn	: "Cijeli ekran (IE)",
+DlgLnkPopDependent	: "Ovisno (Netscape)",
+DlgLnkPopWidth		: "Širina",
+DlgLnkPopHeight		: "Visina",
+DlgLnkPopLeft		: "Lijeva pozicija",
+DlgLnkPopTop		: "Gornja pozicija",
+
+DlnLnkMsgNoUrl		: "Molimo ukucajte URL link",
+DlnLnkMsgNoEMail	: "Molimo ukucajte e-mail adresu",
+DlnLnkMsgNoAnchor	: "Molimo izaberite sidro",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Izaberi boju",
+DlgColorBtnClear	: "Oèisti",
+DlgColorHighlight	: "Igled",
+DlgColorSelected	: "Selektovana",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Ubaci smješka",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Izaberi specijalni karakter",
+
+// Table Dialog
+DlgTableTitle		: "Svojstva tabele",
+DlgTableRows		: "Redova",
+DlgTableColumns		: "Kolona",
+DlgTableBorder		: "Okvir",
+DlgTableAlign		: "Poravnanje",
+DlgTableAlignNotSet	: "<Nije podešeno>",
+DlgTableAlignLeft	: "Lijevo",
+DlgTableAlignCenter	: "Centar",
+DlgTableAlignRight	: "Desno",
+DlgTableWidth		: "Širina",
+DlgTableWidthPx		: "piksela",
+DlgTableWidthPc		: "posto",
+DlgTableHeight		: "Visina",
+DlgTableCellSpace	: "Razmak æelija",
+DlgTableCellPad		: "Uvod æelija",
+DlgTableCaption		: "Naslov",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "Svojstva æelije",
+DlgCellWidth		: "Širina",
+DlgCellWidthPx		: "piksela",
+DlgCellWidthPc		: "posto",
+DlgCellHeight		: "Visina",
+DlgCellWordWrap		: "Vrapuj tekst",
+DlgCellWordWrapNotSet	: "<Nije podešeno>",
+DlgCellWordWrapYes	: "Da",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Horizontalno poravnanje",
+DlgCellHorAlignNotSet	: "<Nije podešeno>",
+DlgCellHorAlignLeft	: "Lijevo",
+DlgCellHorAlignCenter	: "Centar",
+DlgCellHorAlignRight: "Desno",
+DlgCellVerAlign		: "Vertikalno poravnanje",
+DlgCellVerAlignNotSet	: "<Nije podešeno>",
+DlgCellVerAlignTop	: "Gore",
+DlgCellVerAlignMiddle	: "Sredina",
+DlgCellVerAlignBottom	: "Dno",
+DlgCellVerAlignBaseline	: "Bazno",
+DlgCellRowSpan		: "Spajanje æelija",
+DlgCellCollSpan		: "Spajanje kolona",
+DlgCellBackColor	: "Boja pozadine",
+DlgCellBorderColor	: "Boja okvira",
+DlgCellBtnSelect	: "Selektuj...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Naði",
+DlgFindFindBtn		: "Naði",
+DlgFindNotFoundMsg	: "Traženi tekst nije pronaðen.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Zamjeni",
+DlgReplaceFindLbl		: "Naði šta:",
+DlgReplaceReplaceLbl	: "Zamjeni sa:",
+DlgReplaceCaseChk		: "Uporeðuj velika/mala slova",
+DlgReplaceReplaceBtn	: "Zamjeni",
+DlgReplaceReplAllBtn	: "Zamjeni sve",
+DlgReplaceWordChk		: "Uporeðuj samo cijelu rijeè",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl+X).",
+PasteErrorCopy	: "Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl+C).",
+
+PasteAsText		: "Zalijepi kao obièan tekst",
+PasteFromWord	: "Zalijepi iz Word-a",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",	//MISSING
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",	//MISSING
+DlgPasteRemoveStyles	: "Remove Styles definitions",	//MISSING
+
+// Color Picker
+ColorAutomatic	: "Automatska",
+ColorMoreColors	: "Više boja...",
+
+// Document Properties
+DocProps		: "Document Properties",	//MISSING
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anchor Properties",	//MISSING
+DlgAnchorName		: "Anchor Name",	//MISSING
+DlgAnchorErrorName	: "Please type the anchor name",	//MISSING
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Not in dictionary",	//MISSING
+DlgSpellChangeTo		: "Change to",	//MISSING
+DlgSpellBtnIgnore		: "Ignore",	//MISSING
+DlgSpellBtnIgnoreAll	: "Ignore All",	//MISSING
+DlgSpellBtnReplace		: "Replace",	//MISSING
+DlgSpellBtnReplaceAll	: "Replace All",	//MISSING
+DlgSpellBtnUndo			: "Undo",	//MISSING
+DlgSpellNoSuggestions	: "- No suggestions -",	//MISSING
+DlgSpellProgress		: "Spell check in progress...",	//MISSING
+DlgSpellNoMispell		: "Spell check complete: No misspellings found",	//MISSING
+DlgSpellNoChanges		: "Spell check complete: No words changed",	//MISSING
+DlgSpellOneChange		: "Spell check complete: One word changed",	//MISSING
+DlgSpellManyChanges		: "Spell check complete: %1 words changed",	//MISSING
+
+IeSpellDownload			: "Spell checker not installed. Do you want to download it now?",	//MISSING
+
+// Button Dialog
+DlgButtonText		: "Text (Value)",	//MISSING
+DlgButtonType		: "Type",	//MISSING
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",	//MISSING
+DlgCheckboxValue	: "Value",	//MISSING
+DlgCheckboxSelected	: "Selected",	//MISSING
+
+// Form Dialog
+DlgFormName		: "Name",	//MISSING
+DlgFormAction	: "Action",	//MISSING
+DlgFormMethod	: "Method",	//MISSING
+
+// Select Field Dialog
+DlgSelectName		: "Name",	//MISSING
+DlgSelectValue		: "Value",	//MISSING
+DlgSelectSize		: "Size",	//MISSING
+DlgSelectLines		: "lines",	//MISSING
+DlgSelectChkMulti	: "Allow multiple selections",	//MISSING
+DlgSelectOpAvail	: "Available Options",	//MISSING
+DlgSelectOpText		: "Text",	//MISSING
+DlgSelectOpValue	: "Value",	//MISSING
+DlgSelectBtnAdd		: "Add",	//MISSING
+DlgSelectBtnModify	: "Modify",	//MISSING
+DlgSelectBtnUp		: "Up",	//MISSING
+DlgSelectBtnDown	: "Down",	//MISSING
+DlgSelectBtnSetValue : "Set as selected value",	//MISSING
+DlgSelectBtnDelete	: "Delete",	//MISSING
+
+// Textarea Dialog
+DlgTextareaName	: "Name",	//MISSING
+DlgTextareaCols	: "Columns",	//MISSING
+DlgTextareaRows	: "Rows",	//MISSING
+
+// Text Field Dialog
+DlgTextName			: "Name",	//MISSING
+DlgTextValue		: "Value",	//MISSING
+DlgTextCharWidth	: "Character Width",	//MISSING
+DlgTextMaxChars		: "Maximum Characters",	//MISSING
+DlgTextType			: "Type",	//MISSING
+DlgTextTypeText		: "Text",	//MISSING
+DlgTextTypePass		: "Password",	//MISSING
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",	//MISSING
+DlgHiddenValue	: "Value",	//MISSING
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted List Properties",	//MISSING
+NumberedListProp	: "Numbered List Properties",	//MISSING
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Type",	//MISSING
+DlgLstTypeCircle	: "Circle",	//MISSING
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "Square",	//MISSING
+DlgLstTypeNumbers	: "Numbers (1, 2, 3)",	//MISSING
+DlgLstTypeLCase		: "Lowercase Letters (a, b, c)",	//MISSING
+DlgLstTypeUCase		: "Uppercase Letters (A, B, C)",	//MISSING
+DlgLstTypeSRoman	: "Small Roman Numerals (i, ii, iii)",	//MISSING
+DlgLstTypeLRoman	: "Large Roman Numerals (I, II, III)",	//MISSING
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",	//MISSING
+DlgDocBackTab		: "Background",	//MISSING
+DlgDocColorsTab		: "Colors and Margins",	//MISSING
+DlgDocMetaTab		: "Meta Data",	//MISSING
+
+DlgDocPageTitle		: "Page Title",	//MISSING
+DlgDocLangDir		: "Language Direction",	//MISSING
+DlgDocLangDirLTR	: "Left to Right (LTR)",	//MISSING
+DlgDocLangDirRTL	: "Right to Left (RTL)",	//MISSING
+DlgDocLangCode		: "Language Code",	//MISSING
+DlgDocCharSet		: "Character Set Encoding",	//MISSING
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Other Character Set Encoding",	//MISSING
+
+DlgDocDocType		: "Document Type Heading",	//MISSING
+DlgDocDocTypeOther	: "Other Document Type Heading",	//MISSING
+DlgDocIncXHTML		: "Include XHTML Declarations",	//MISSING
+DlgDocBgColor		: "Background Color",	//MISSING
+DlgDocBgImage		: "Background Image URL",	//MISSING
+DlgDocBgNoScroll	: "Nonscrolling Background",	//MISSING
+DlgDocCText			: "Text",	//MISSING
+DlgDocCLink			: "Link",	//MISSING
+DlgDocCVisited		: "Visited Link",	//MISSING
+DlgDocCActive		: "Active Link",	//MISSING
+DlgDocMargins		: "Page Margins",	//MISSING
+DlgDocMaTop			: "Top",	//MISSING
+DlgDocMaLeft		: "Left",	//MISSING
+DlgDocMaRight		: "Right",	//MISSING
+DlgDocMaBottom		: "Bottom",	//MISSING
+DlgDocMeIndex		: "Document Indexing Keywords (comma separated)",	//MISSING
+DlgDocMeDescr		: "Document Description",	//MISSING
+DlgDocMeAuthor		: "Author",	//MISSING
+DlgDocMeCopy		: "Copyright",	//MISSING
+DlgDocPreview		: "Preview",	//MISSING
+
+// Templates Dialog
+Templates			: "Templates",	//MISSING
+DlgTemplatesTitle	: "Content Templates",	//MISSING
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",	//MISSING
+DlgTemplatesLoading	: "Loading templates list. Please wait...",	//MISSING
+DlgTemplatesNoTpl	: "(No templates defined)",	//MISSING
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "About",	//MISSING
+DlgAboutBrowserInfoTab	: "Browser Info",	//MISSING
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "verzija",
+DlgAboutInfo		: "Za više informacija posjetite",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ca.js b/modules/editor/skins/fckeditor/editor/lang/ca.js
new file mode 100644
index 000000000..bb877853d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ca.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Catalan language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Redueix la barra d'eines",
+ToolbarExpand		: "Amplia la barra d'eines",
+
+// Toolbar Items and Context Menu
+Save				: "Desa",
+NewPage				: "Nova Pàgina",
+Preview				: "Visualització prèvia",
+Cut					: "Retalla",
+Copy				: "Copia",
+Paste				: "Enganxa",
+PasteText			: "Enganxa com a text no formatat",
+PasteWord			: "Enganxa des del Word",
+Print				: "Imprimeix",
+SelectAll			: "Selecciona-ho tot",
+RemoveFormat		: "Elimina Format",
+InsertLinkLbl		: "Enllaç",
+InsertLink			: "Insereix/Edita enllaç",
+RemoveLink			: "Elimina l'enllaç",
+VisitLink			: "Obre l'enllaç",
+Anchor				: "Insereix/Edita àncora",
+AnchorDelete		: "Elimina àncora",
+InsertImageLbl		: "Imatge",
+InsertImage			: "Insereix/Edita imatge",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insereix/Edita Flash",
+InsertTableLbl		: "Taula",
+InsertTable			: "Insereix/Edita taula",
+InsertLineLbl		: "Línia",
+InsertLine			: "Insereix línia horitzontal",
+InsertSpecialCharLbl: "Caràcter Especial",
+InsertSpecialChar	: "Insereix caràcter especial",
+InsertSmileyLbl		: "Icona",
+InsertSmiley		: "Insereix icona",
+About				: "Quant a l'FCKeditor",
+Bold				: "Negreta",
+Italic				: "Cursiva",
+Underline			: "Subratllat",
+StrikeThrough		: "Barrat",
+Subscript			: "Subíndex",
+Superscript			: "Superíndex",
+LeftJustify			: "Alinia a l'esquerra",
+CenterJustify		: "Centrat",
+RightJustify		: "Alinia a la dreta",
+BlockJustify		: "Justificat",
+DecreaseIndent		: "Redueix el sagnat",
+IncreaseIndent		: "Augmenta el sagnat",
+Blockquote			: "Bloc de cita",
+CreateDiv			: "Crea un contenidor Div",
+EditDiv				: "Edita el contenidor Div",
+DeleteDiv			: "Elimina el contenidor Div",
+Undo				: "Desfés",
+Redo				: "Refés",
+NumberedListLbl		: "Llista numerada",
+NumberedList		: "Numeració activada/desactivada",
+BulletedListLbl		: "Llista de pics",
+BulletedList		: "Pics activats/descativats",
+ShowTableBorders	: "Mostra les vores de les taules",
+ShowDetails			: "Mostra detalls",
+Style				: "Estil",
+FontFormat			: "Format",
+Font				: "Tipus de lletra",
+FontSize			: "Mida",
+TextColor			: "Color de Text",
+BGColor				: "Color de Fons",
+Source				: "Codi font",
+Find				: "Cerca",
+Replace				: "Reemplaça",
+SpellCheck			: "Revisa l'ortografia",
+UniversalKeyboard	: "Teclat universal",
+PageBreakLbl		: "Salt de pàgina",
+PageBreak			: "Insereix salt de pàgina",
+
+Form			: "Formulari",
+Checkbox		: "Casella de verificació",
+RadioButton		: "Botó d'opció",
+TextField		: "Camp de text",
+Textarea		: "Àrea de text",
+HiddenField		: "Camp ocult",
+Button			: "Botó",
+SelectionField	: "Camp de selecció",
+ImageButton		: "Botó d'imatge",
+
+FitWindow		: "Maximiza la mida de l'editor",
+ShowBlocks		: "Mostra els blocs",
+
+// Context Menu
+EditLink			: "Edita l'enllaç",
+CellCM				: "Cel·la",
+RowCM				: "Fila",
+ColumnCM			: "Columna",
+InsertRowAfter		: "Insereix fila darrera",
+InsertRowBefore		: "Insereix fila abans de",
+DeleteRows			: "Suprimeix una fila",
+InsertColumnAfter	: "Insereix columna darrera",
+InsertColumnBefore	: "Insereix columna abans de",
+DeleteColumns		: "Suprimeix una columna",
+InsertCellAfter		: "Insereix cel·la darrera",
+InsertCellBefore	: "Insereix cel·la abans de",
+DeleteCells			: "Suprimeix les cel·les",
+MergeCells			: "Fusiona les cel·les",
+MergeRight			: "Fusiona cap a la dreta",
+MergeDown			: "Fusiona cap avall",
+HorizontalSplitCell	: "Divideix la cel·la horitzontalment",
+VerticalSplitCell	: "Divideix la cel·la verticalment",
+TableDelete			: "Suprimeix la taula",
+CellProperties		: "Propietats de la cel·la",
+TableProperties		: "Propietats de la taula",
+ImageProperties		: "Propietats de la imatge",
+FlashProperties		: "Propietats del Flash",
+
+AnchorProp			: "Propietats de l'àncora",
+ButtonProp			: "Propietats del botó",
+CheckboxProp		: "Propietats de la casella de verificació",
+HiddenFieldProp		: "Propietats del camp ocult",
+RadioButtonProp		: "Propietats del botó d'opció",
+ImageButtonProp		: "Propietats del botó d'imatge",
+TextFieldProp		: "Propietats del camp de text",
+SelectionFieldProp	: "Propietats del camp de selecció",
+TextareaProp		: "Propietats de l'àrea de text",
+FormProp			: "Propietats del formulari",
+
+FontFormats			: "Normal;Formatejat;Adreça;Encapçalament 1;Encapçalament 2;Encapçalament 3;Encapçalament 4;Encapçalament 5;Encapçalament 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processant XHTML. Si us plau esperi...",
+Done				: "Fet",
+PasteWordConfirm	: "El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?",
+NotCompatiblePaste	: "Aquesta funció és disponible per a Internet Explorer versió 5.5 o superior. Voleu enganxar sense netejar?",
+UnknownToolbarItem	: "Element de la barra d'eines desconegut \"%1\"",
+UnknownCommand		: "Nom de comanda desconegut \"%1\"",
+NotImplemented		: "Mètode no implementat",
+UnknownToolbarSet	: "Conjunt de barra d'eines \"%1\" inexistent",
+NoActiveX			: "Les preferències del navegador poden limitar algunes funcions d'aquest editor. Cal habilitar l'opció \"Executa controls ActiveX i plug-ins\". Poden sorgir errors i poden faltar algunes funcions.",
+BrowseServerBlocked : "El visualitzador de recursos no s'ha pogut obrir. Assegura't de que els bloquejos de finestres emergents estan desactivats.",
+DialogBlocked		: "No ha estat possible obrir una finestra de diàleg. Assegureu-vos que els bloquejos de finestres emergents estan desactivats.",
+VisitLinkBlocked	: "No ha estat possible obrir una nova finestra. Assegureu-vos que els bloquejos de finestres emergents estan desactivats.",
+
+// Dialogs
+DlgBtnOK			: "D'acord",
+DlgBtnCancel		: "Cancel·la",
+DlgBtnClose			: "Tanca",
+DlgBtnBrowseServer	: "Veure servidor",
+DlgAdvancedTag		: "Avançat",
+DlgOpOther			: "Altres",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Si us plau, afegiu la URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<no definit>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Direcció de l'idioma",
+DlgGenLangDirLtr	: "D'esquerra a dreta (LTR)",
+DlgGenLangDirRtl	: "De dreta a esquerra (RTL)",
+DlgGenLangCode		: "Codi d'idioma",
+DlgGenAccessKey		: "Clau d'accés",
+DlgGenName			: "Nom",
+DlgGenTabIndex		: "Index de Tab",
+DlgGenLongDescr		: "Descripció llarga de la URL",
+DlgGenClass			: "Classes del full d'estil",
+DlgGenTitle			: "Títol consultiu",
+DlgGenContType		: "Tipus de contingut consultiu",
+DlgGenLinkCharset	: "Conjunt de caràcters font enllaçat",
+DlgGenStyle			: "Estil",
+
+// Image Dialog
+DlgImgTitle			: "Propietats de la imatge",
+DlgImgInfoTab		: "Informació de la imatge",
+DlgImgBtnUpload		: "Envia-la al servidor",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Puja",
+DlgImgAlt			: "Text alternatiu",
+DlgImgWidth			: "Amplada",
+DlgImgHeight		: "Alçada",
+DlgImgLockRatio		: "Bloqueja les proporcions",
+DlgBtnResetSize		: "Restaura la mida",
+DlgImgBorder		: "Vora",
+DlgImgHSpace		: "Espaiat horit.",
+DlgImgVSpace		: "Espaiat vert.",
+DlgImgAlign			: "Alineació",
+DlgImgAlignLeft		: "Ajusta a l'esquerra",
+DlgImgAlignAbsBottom: "Abs Bottom",
+DlgImgAlignAbsMiddle: "Abs Middle",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Bottom",
+DlgImgAlignMiddle	: "Middle",
+DlgImgAlignRight	: "Ajusta a la dreta",
+DlgImgAlignTextTop	: "Text Top",
+DlgImgAlignTop		: "Top",
+DlgImgPreview		: "Vista prèvia",
+DlgImgAlertUrl		: "Si us plau, escriviu la URL de la imatge",
+DlgImgLinkTab		: "Enllaç",
+
+// Flash Dialog
+DlgFlashTitle		: "Propietats del Flash",
+DlgFlashChkPlay		: "Reprodució automàtica",
+DlgFlashChkLoop		: "Bucle",
+DlgFlashChkMenu		: "Habilita menú Flash",
+DlgFlashScale		: "Escala",
+DlgFlashScaleAll	: "Mostra-ho tot",
+DlgFlashScaleNoBorder	: "Sense vores",
+DlgFlashScaleFit	: "Mida exacta",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Enllaç",
+DlgLnkInfoTab		: "Informació de l'enllaç",
+DlgLnkTargetTab		: "Destí",
+
+DlgLnkType			: "Tipus d'enllaç",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Àncora en aquesta pàgina",
+DlgLnkTypeEMail		: "Correu electrònic",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<altra>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Selecciona una àncora",
+DlgLnkAnchorByName	: "Per nom d'àncora",
+DlgLnkAnchorById	: "Per Id d'element",
+DlgLnkNoAnchors		: "(No hi ha àncores disponibles en aquest document)",
+DlgLnkEMail			: "Adreça de correu electrònic",
+DlgLnkEMailSubject	: "Assumpte del missatge",
+DlgLnkEMailBody		: "Cos del missatge",
+DlgLnkUpload		: "Puja",
+DlgLnkBtnUpload		: "Envia al servidor",
+
+DlgLnkTarget		: "Destí",
+DlgLnkTargetFrame	: "<marc>",
+DlgLnkTargetPopup	: "<finestra emergent>",
+DlgLnkTargetBlank	: "Nova finestra (_blank)",
+DlgLnkTargetParent	: "Finestra pare (_parent)",
+DlgLnkTargetSelf	: "Mateixa finestra (_self)",
+DlgLnkTargetTop		: "Finestra Major (_top)",
+DlgLnkTargetFrameName	: "Nom del marc de destí",
+DlgLnkPopWinName	: "Nom finestra popup",
+DlgLnkPopWinFeat	: "Característiques finestra popup",
+DlgLnkPopResize		: "Redimensionable",
+DlgLnkPopLocation	: "Barra d'adreça",
+DlgLnkPopMenu		: "Barra de menú",
+DlgLnkPopScroll		: "Barres d'scroll",
+DlgLnkPopStatus		: "Barra d'estat",
+DlgLnkPopToolbar	: "Barra d'eines",
+DlgLnkPopFullScrn	: "Pantalla completa (IE)",
+DlgLnkPopDependent	: "Depenent (Netscape)",
+DlgLnkPopWidth		: "Amplada",
+DlgLnkPopHeight		: "Alçada",
+DlgLnkPopLeft		: "Posició esquerra",
+DlgLnkPopTop		: "Posició dalt",
+
+DlnLnkMsgNoUrl		: "Si us plau, escrigui l'enllaç URL",
+DlnLnkMsgNoEMail	: "Si us plau, escrigui l'adreça correu electrònic",
+DlnLnkMsgNoAnchor	: "Si us plau, escrigui l'àncora",
+DlnLnkMsgInvPopName	: "El nom de la finestra emergent ha de començar amb una lletra i no pot tenir espais",
+
+// Color Dialog
+DlgColorTitle		: "Selecciona el color",
+DlgColorBtnClear	: "Neteja",
+DlgColorHighlight	: "Realça",
+DlgColorSelected	: "Selecciona",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insereix una icona",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Selecciona el caràcter especial",
+
+// Table Dialog
+DlgTableTitle		: "Propietats de la taula",
+DlgTableRows		: "Files",
+DlgTableColumns		: "Columnes",
+DlgTableBorder		: "Mida vora",
+DlgTableAlign		: "Alineació",
+DlgTableAlignNotSet	: "<No Definit>",
+DlgTableAlignLeft	: "Esquerra",
+DlgTableAlignCenter	: "Centre",
+DlgTableAlignRight	: "Dreta",
+DlgTableWidth		: "Amplada",
+DlgTableWidthPx		: "píxels",
+DlgTableWidthPc		: "percentatge",
+DlgTableHeight		: "Alçada",
+DlgTableCellSpace	: "Espaiat de cel·les",
+DlgTableCellPad		: "Encoixinament de cel·les",
+DlgTableCaption		: "Títol",
+DlgTableSummary		: "Resum",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propietats de la cel·la",
+DlgCellWidth		: "Amplada",
+DlgCellWidthPx		: "píxels",
+DlgCellWidthPc		: "percentatge",
+DlgCellHeight		: "Alçada",
+DlgCellWordWrap		: "Ajust de paraula",
+DlgCellWordWrapNotSet	: "<No Definit>",
+DlgCellWordWrapYes	: "Si",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Alineació horitzontal",
+DlgCellHorAlignNotSet	: "<No Definit>",
+DlgCellHorAlignLeft	: "Esquerra",
+DlgCellHorAlignCenter	: "Centre",
+DlgCellHorAlignRight: "Dreta",
+DlgCellVerAlign		: "Alineació vertical",
+DlgCellVerAlignNotSet	: "<No definit>",
+DlgCellVerAlignTop	: "Top",
+DlgCellVerAlignMiddle	: "Middle",
+DlgCellVerAlignBottom	: "Bottom",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rows Span",
+DlgCellCollSpan		: "Columns Span",
+DlgCellBackColor	: "Color de fons",
+DlgCellBorderColor	: "Color de la vora",
+DlgCellBtnSelect	: "Seleccioneu...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Cerca i reemplaça",
+
+// Find Dialog
+DlgFindTitle		: "Cerca",
+DlgFindFindBtn		: "Cerca",
+DlgFindNotFoundMsg	: "El text especificat no s'ha trobat.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Reemplaça",
+DlgReplaceFindLbl		: "Cerca:",
+DlgReplaceReplaceLbl	: "Remplaça amb:",
+DlgReplaceCaseChk		: "Distingeix majúscules/minúscules",
+DlgReplaceReplaceBtn	: "Reemplaça",
+DlgReplaceReplAllBtn	: "Reemplaça-ho tot",
+DlgReplaceWordChk		: "Només paraules completes",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "La seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl+X).",
+PasteErrorCopy	: "La seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl+C).",
+
+PasteAsText		: "Enganxa com a text no formatat",
+PasteFromWord	: "Enganxa com a Word",
+
+DlgPasteMsg2	: "Si us plau, enganxeu dins del següent camp utilitzant el teclat (<STRONG>Ctrl+V</STRONG>) i premeu <STRONG>OK</STRONG>.",
+DlgPasteSec		: "A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir al porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.",
+DlgPasteIgnoreFont		: "Ignora definicions de font",
+DlgPasteRemoveStyles	: "Elimina definicions d'estil",
+
+// Color Picker
+ColorAutomatic	: "Automàtic",
+ColorMoreColors	: "Més colors...",
+
+// Document Properties
+DocProps		: "Propietats del document",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propietats de l'àncora",
+DlgAnchorName		: "Nom de l'àncora",
+DlgAnchorErrorName	: "Si us plau, escriviu el nom de l'ancora",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "No és al diccionari",
+DlgSpellChangeTo		: "Reemplaça amb",
+DlgSpellBtnIgnore		: "Ignora",
+DlgSpellBtnIgnoreAll	: "Ignora-les totes",
+DlgSpellBtnReplace		: "Canvia",
+DlgSpellBtnReplaceAll	: "Canvia-les totes",
+DlgSpellBtnUndo			: "Desfés",
+DlgSpellNoSuggestions	: "Cap suggeriment",
+DlgSpellProgress		: "Verificació ortogràfica en curs...",
+DlgSpellNoMispell		: "Verificació ortogràfica acabada: no hi ha cap paraula mal escrita",
+DlgSpellNoChanges		: "Verificació ortogràfica: no s'ha canviat cap paraula",
+DlgSpellOneChange		: "Verificació ortogràfica: s'ha canviat una paraula",
+DlgSpellManyChanges		: "Verificació ortogràfica: s'han canviat %1 paraules",
+
+IeSpellDownload			: "Verificació ortogràfica no instal·lada. Voleu descarregar-ho ara?",
+
+// Button Dialog
+DlgButtonText		: "Text (Valor)",
+DlgButtonType		: "Tipus",
+DlgButtonTypeBtn	: "Botó",
+DlgButtonTypeSbm	: "Transmet formulari",
+DlgButtonTypeRst	: "Reinicia formulari",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nom",
+DlgCheckboxValue	: "Valor",
+DlgCheckboxSelected	: "Seleccionat",
+
+// Form Dialog
+DlgFormName		: "Nom",
+DlgFormAction	: "Acció",
+DlgFormMethod	: "Mètode",
+
+// Select Field Dialog
+DlgSelectName		: "Nom",
+DlgSelectValue		: "Valor",
+DlgSelectSize		: "Mida",
+DlgSelectLines		: "Línies",
+DlgSelectChkMulti	: "Permet múltiples seleccions",
+DlgSelectOpAvail	: "Opcions disponibles",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Valor",
+DlgSelectBtnAdd		: "Afegeix",
+DlgSelectBtnModify	: "Modifica",
+DlgSelectBtnUp		: "Amunt",
+DlgSelectBtnDown	: "Avall",
+DlgSelectBtnSetValue : "Selecciona per defecte",
+DlgSelectBtnDelete	: "Elimina",
+
+// Textarea Dialog
+DlgTextareaName	: "Nom",
+DlgTextareaCols	: "Columnes",
+DlgTextareaRows	: "Files",
+
+// Text Field Dialog
+DlgTextName			: "Nom",
+DlgTextValue		: "Valor",
+DlgTextCharWidth	: "Amplada",
+DlgTextMaxChars		: "Nombre màxim de caràcters",
+DlgTextType			: "Tipus",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Contrasenya",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nom",
+DlgHiddenValue	: "Valor",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propietats de la llista de pics",
+NumberedListProp	: "Propietats de llista numerada",
+DlgLstStart			: "Inici",
+DlgLstType			: "Tipus",
+DlgLstTypeCircle	: "Cercle",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Quadrat",
+DlgLstTypeNumbers	: "Números (1, 2, 3)",
+DlgLstTypeLCase		: "Lletres minúscules (a, b, c)",
+DlgLstTypeUCase		: "Lletres majúscules (A, B, C)",
+DlgLstTypeSRoman	: "Números romans en minúscules (i, ii, iii)",
+DlgLstTypeLRoman	: "Números romans en majúscules (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Fons",
+DlgDocColorsTab		: "Colors i marges",
+DlgDocMetaTab		: "Metadades",
+
+DlgDocPageTitle		: "Títol de la pàgina",
+DlgDocLangDir		: "Direcció idioma",
+DlgDocLangDirLTR	: "Esquerra a dreta (LTR)",
+DlgDocLangDirRTL	: "Dreta a esquerra (RTL)",
+DlgDocLangCode		: "Codi d'idioma",
+DlgDocCharSet		: "Codificació de conjunt de caràcters",
+DlgDocCharSetCE		: "Centreeuropeu",
+DlgDocCharSetCT		: "Xinès tradicional (Big5)",
+DlgDocCharSetCR		: "Ciríl·lic",
+DlgDocCharSetGR		: "Grec",
+DlgDocCharSetJP		: "Japonès",
+DlgDocCharSetKR		: "Coreà",
+DlgDocCharSetTR		: "Turc",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Europeu occidental",
+DlgDocCharSetOther	: "Una altra codificació de caràcters",
+
+DlgDocDocType		: "Capçalera de tipus de document",
+DlgDocDocTypeOther	: "Un altra capçalera de tipus de document",
+DlgDocIncXHTML		: "Incloure declaracions XHTML",
+DlgDocBgColor		: "Color de fons",
+DlgDocBgImage		: "URL de la imatge de fons",
+DlgDocBgNoScroll	: "Fons fixe",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Enllaç",
+DlgDocCVisited		: "Enllaç visitat",
+DlgDocCActive		: "Enllaç actiu",
+DlgDocMargins		: "Marges de pàgina",
+DlgDocMaTop			: "Cap",
+DlgDocMaLeft		: "Esquerra",
+DlgDocMaRight		: "Dreta",
+DlgDocMaBottom		: "Peu",
+DlgDocMeIndex		: "Mots clau per a indexació (separats per coma)",
+DlgDocMeDescr		: "Descripció del document",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Vista prèvia",
+
+// Templates Dialog
+Templates			: "Plantilles",
+DlgTemplatesTitle	: "Contingut plantilles",
+DlgTemplatesSelMsg	: "Si us plau, seleccioneu la plantilla per obrir a l'editor<br>(el contingut actual no serà enregistrat):",
+DlgTemplatesLoading	: "Carregant la llista de plantilles. Si us plau, espereu...",
+DlgTemplatesNoTpl	: "(No hi ha plantilles definides)",
+DlgTemplatesReplace	: "Reemplaça el contingut actual",
+
+// About Dialog
+DlgAboutAboutTab	: "Quant a",
+DlgAboutBrowserInfoTab	: "Informació del navegador",
+DlgAboutLicenseTab	: "Llicència",
+DlgAboutVersion		: "versió",
+DlgAboutInfo		: "Per a més informació aneu a",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Avançat",
+DlgDivStyle		: "Estil",
+DlgDivInlineStyle	: "Estil en línia"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/cs.js b/modules/editor/skins/fckeditor/editor/lang/cs.js
new file mode 100644
index 000000000..20bed1440
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/cs.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Czech language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skrýt panel nástrojů",
+ToolbarExpand		: "Zobrazit panel nástrojů",
+
+// Toolbar Items and Context Menu
+Save				: "Uložit",
+NewPage				: "Nová stránka",
+Preview				: "Náhled",
+Cut					: "Vyjmout",
+Copy				: "Kopírovat",
+Paste				: "Vložit",
+PasteText			: "Vložit jako čistý text",
+PasteWord			: "Vložit z Wordu",
+Print				: "Tisk",
+SelectAll			: "Vybrat vše",
+RemoveFormat		: "Odstranit formátování",
+InsertLinkLbl		: "Odkaz",
+InsertLink			: "Vložit/změnit odkaz",
+RemoveLink			: "Odstranit odkaz",
+VisitLink			: "Otevřít odkaz",
+Anchor				: "Vložít/změnit záložku",
+AnchorDelete		: "Odstranit kotvu",
+InsertImageLbl		: "Obrázek",
+InsertImage			: "Vložit/změnit obrázek",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Vložit/Upravit Flash",
+InsertTableLbl		: "Tabulka",
+InsertTable			: "Vložit/změnit tabulku",
+InsertLineLbl		: "Linka",
+InsertLine			: "Vložit vodorovnou linku",
+InsertSpecialCharLbl: "Speciální znaky",
+InsertSpecialChar	: "Vložit speciální znaky",
+InsertSmileyLbl		: "Smajlíky",
+InsertSmiley		: "Vložit smajlík",
+About				: "O aplikaci FCKeditor",
+Bold				: "Tučné",
+Italic				: "Kurzíva",
+Underline			: "Podtržené",
+StrikeThrough		: "Přeškrtnuté",
+Subscript			: "Dolní index",
+Superscript			: "Horní index",
+LeftJustify			: "Zarovnat vlevo",
+CenterJustify		: "Zarovnat na střed",
+RightJustify		: "Zarovnat vpravo",
+BlockJustify		: "Zarovnat do bloku",
+DecreaseIndent		: "Zmenšit odsazení",
+IncreaseIndent		: "Zvětšit odsazení",
+Blockquote			: "Citace",
+CreateDiv			: "Vytvořit Div kontejner",
+EditDiv				: "Upravit Div kontejner",
+DeleteDiv			: "Odstranit Div kontejner",
+Undo				: "Zpět",
+Redo				: "Znovu",
+NumberedListLbl		: "Číslování",
+NumberedList		: "Vložit/odstranit číslovaný seznam",
+BulletedListLbl		: "Odrážky",
+BulletedList		: "Vložit/odstranit odrážky",
+ShowTableBorders	: "Zobrazit okraje tabulek",
+ShowDetails			: "Zobrazit podrobnosti",
+Style				: "Styl",
+FontFormat			: "Formát",
+Font				: "Písmo",
+FontSize			: "Velikost",
+TextColor			: "Barva textu",
+BGColor				: "Barva pozadí",
+Source				: "Zdroj",
+Find				: "Hledat",
+Replace				: "Nahradit",
+SpellCheck			: "Zkontrolovat pravopis",
+UniversalKeyboard	: "Univerzální klávesnice",
+PageBreakLbl		: "Konec stránky",
+PageBreak			: "Vložit konec stránky",
+
+Form			: "Formulář",
+Checkbox		: "Zaškrtávací políčko",
+RadioButton		: "Přepínač",
+TextField		: "Textové pole",
+Textarea		: "Textová oblast",
+HiddenField		: "Skryté pole",
+Button			: "Tlačítko",
+SelectionField	: "Seznam",
+ImageButton		: "Obrázkové tlačítko",
+
+FitWindow		: "Maximalizovat velikost editoru",
+ShowBlocks		: "Ukázat bloky",
+
+// Context Menu
+EditLink			: "Změnit odkaz",
+CellCM				: "Buňka",
+RowCM				: "Řádek",
+ColumnCM			: "Sloupec",
+InsertRowAfter		: "Vložit řádek za",
+InsertRowBefore		: "Vložit řádek před",
+DeleteRows			: "Smazat řádky",
+InsertColumnAfter	: "Vložit sloupec za",
+InsertColumnBefore	: "Vložit sloupec před",
+DeleteColumns		: "Smazat sloupec",
+InsertCellAfter		: "Vložit buňku za",
+InsertCellBefore	: "Vložit buňku před",
+DeleteCells			: "Smazat buňky",
+MergeCells			: "Sloučit buňky",
+MergeRight			: "Sloučit doprava",
+MergeDown			: "Sloučit dolů",
+HorizontalSplitCell	: "Rozdělit buňky vodorovně",
+VerticalSplitCell	: "Rozdělit buňky svisle",
+TableDelete			: "Smazat tabulku",
+CellProperties		: "Vlastnosti buňky",
+TableProperties		: "Vlastnosti tabulky",
+ImageProperties		: "Vlastnosti obrázku",
+FlashProperties		: "Vlastnosti Flashe",
+
+AnchorProp			: "Vlastnosti záložky",
+ButtonProp			: "Vlastnosti tlačítka",
+CheckboxProp		: "Vlastnosti zaškrtávacího políčka",
+HiddenFieldProp		: "Vlastnosti skrytého pole",
+RadioButtonProp		: "Vlastnosti přepínače",
+ImageButtonProp		: "Vlastností obrázkového tlačítka",
+TextFieldProp		: "Vlastnosti textového pole",
+SelectionFieldProp	: "Vlastnosti seznamu",
+TextareaProp		: "Vlastnosti textové oblasti",
+FormProp			: "Vlastnosti formuláře",
+
+FontFormats			: "Normální;Naformátováno;Adresa;Nadpis 1;Nadpis 2;Nadpis 3;Nadpis 4;Nadpis 5;Nadpis 6;Normální (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Probíhá zpracování XHTML. Prosím čekejte...",
+Done				: "Hotovo",
+PasteWordConfirm	: "Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?",
+NotCompatiblePaste	: "Tento příkaz je dostupný pouze v Internet Exploreru verze 5.5 nebo vyšší. Chcete vložit text bez vyčištění?",
+UnknownToolbarItem	: "Neznámá položka panelu nástrojů \"%1\"",
+UnknownCommand		: "Neznámý příkaz \"%1\"",
+NotImplemented		: "Příkaz není implementován",
+UnknownToolbarSet	: "Panel nástrojů \"%1\" neexistuje",
+NoActiveX			: "Nastavení bezpečnosti Vašeho prohlížeče omezuje funkčnost některých jeho možností. Je třeba zapnout volbu \"Spouštět ovládáací prvky ActiveX a moduly plug-in\", jinak nebude možné využívat všechny dosputné schopnosti editoru.",
+BrowseServerBlocked : "Průzkumník zdrojů nelze otevřít. Prověřte, zda nemáte aktivováno blokování popup oken.",
+DialogBlocked		: "Nelze otevřít dialogové okno. Prověřte, zda nemáte aktivováno blokování popup oken.",
+VisitLinkBlocked	: "Není možné otevřít nové okno. Prověřte, zda všechny nástroje pro blokování vyskakovacích oken jsou vypnuty.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Storno",
+DlgBtnClose			: "Zavřít",
+DlgBtnBrowseServer	: "Vybrat na serveru",
+DlgAdvancedTag		: "Rozšířené",
+DlgOpOther			: "<Ostatní>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Prosím vložte URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nenastaveno>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Orientace jazyka",
+DlgGenLangDirLtr	: "Zleva do prava (LTR)",
+DlgGenLangDirRtl	: "Zprava do leva (RTL)",
+DlgGenLangCode		: "Kód jazyka",
+DlgGenAccessKey		: "Přístupový klíč",
+DlgGenName			: "Jméno",
+DlgGenTabIndex		: "Pořadí prvku",
+DlgGenLongDescr		: "Dlouhý popis URL",
+DlgGenClass			: "Třída stylu",
+DlgGenTitle			: "Pomocný titulek",
+DlgGenContType		: "Pomocný typ obsahu",
+DlgGenLinkCharset	: "Přiřazená znaková sada",
+DlgGenStyle			: "Styl",
+
+// Image Dialog
+DlgImgTitle			: "Vlastnosti obrázku",
+DlgImgInfoTab		: "Informace o obrázku",
+DlgImgBtnUpload		: "Odeslat na server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Odeslat",
+DlgImgAlt			: "Alternativní text",
+DlgImgWidth			: "Šířka",
+DlgImgHeight		: "Výška",
+DlgImgLockRatio		: "Zámek",
+DlgBtnResetSize		: "Původní velikost",
+DlgImgBorder		: "Okraje",
+DlgImgHSpace		: "H-mezera",
+DlgImgVSpace		: "V-mezera",
+DlgImgAlign			: "Zarovnání",
+DlgImgAlignLeft		: "Vlevo",
+DlgImgAlignAbsBottom: "Zcela dolů",
+DlgImgAlignAbsMiddle: "Doprostřed",
+DlgImgAlignBaseline	: "Na účaří",
+DlgImgAlignBottom	: "Dolů",
+DlgImgAlignMiddle	: "Na střed",
+DlgImgAlignRight	: "Vpravo",
+DlgImgAlignTextTop	: "Na horní okraj textu",
+DlgImgAlignTop		: "Nahoru",
+DlgImgPreview		: "Náhled",
+DlgImgAlertUrl		: "Zadejte prosím URL obrázku",
+DlgImgLinkTab		: "Odkaz",
+
+// Flash Dialog
+DlgFlashTitle		: "Vlastnosti Flashe",
+DlgFlashChkPlay		: "Automatické spuštění",
+DlgFlashChkLoop		: "Opakování",
+DlgFlashChkMenu		: "Nabídka Flash",
+DlgFlashScale		: "Zobrazit",
+DlgFlashScaleAll	: "Zobrazit vše",
+DlgFlashScaleNoBorder	: "Bez okraje",
+DlgFlashScaleFit	: "Přizpůsobit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Odkaz",
+DlgLnkInfoTab		: "Informace o odkazu",
+DlgLnkTargetTab		: "Cíl",
+
+DlgLnkType			: "Typ odkazu",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Kotva v této stránce",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<jiný>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Vybrat kotvu",
+DlgLnkAnchorByName	: "Podle jména kotvy",
+DlgLnkAnchorById	: "Podle Id objektu",
+DlgLnkNoAnchors		: "(Ve stránce není definována žádná kotva!)",
+DlgLnkEMail			: "E-Mailová adresa",
+DlgLnkEMailSubject	: "Předmět zprávy",
+DlgLnkEMailBody		: "Tělo zprávy",
+DlgLnkUpload		: "Odeslat",
+DlgLnkBtnUpload		: "Odeslat na Server",
+
+DlgLnkTarget		: "Cíl",
+DlgLnkTargetFrame	: "<rámec>",
+DlgLnkTargetPopup	: "<vyskakovací okno>",
+DlgLnkTargetBlank	: "Nové okno (_blank)",
+DlgLnkTargetParent	: "Rodičovské okno (_parent)",
+DlgLnkTargetSelf	: "Stejné okno (_self)",
+DlgLnkTargetTop		: "Hlavní okno (_top)",
+DlgLnkTargetFrameName	: "Název cílového rámu",
+DlgLnkPopWinName	: "Název vyskakovacího okna",
+DlgLnkPopWinFeat	: "Vlastnosti vyskakovacího okna",
+DlgLnkPopResize		: "Měnitelná velikost",
+DlgLnkPopLocation	: "Panel umístění",
+DlgLnkPopMenu		: "Panel nabídky",
+DlgLnkPopScroll		: "Posuvníky",
+DlgLnkPopStatus		: "Stavový řádek",
+DlgLnkPopToolbar	: "Panel nástrojů",
+DlgLnkPopFullScrn	: "Celá obrazovka (IE)",
+DlgLnkPopDependent	: "Závislost (Netscape)",
+DlgLnkPopWidth		: "Šířka",
+DlgLnkPopHeight		: "Výška",
+DlgLnkPopLeft		: "Levý okraj",
+DlgLnkPopTop		: "Horní okraj",
+
+DlnLnkMsgNoUrl		: "Zadejte prosím URL odkazu",
+DlnLnkMsgNoEMail	: "Zadejte prosím e-mailovou adresu",
+DlnLnkMsgNoAnchor	: "Vyberte prosím kotvu",
+DlnLnkMsgInvPopName	: "Název vyskakovacího okna musí začínat písmenem a nesmí obsahovat mezery",
+
+// Color Dialog
+DlgColorTitle		: "Výběr barvy",
+DlgColorBtnClear	: "Vymazat",
+DlgColorHighlight	: "Zvýrazněná",
+DlgColorSelected	: "Vybraná",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Vkládání smajlíků",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Výběr speciálního znaku",
+
+// Table Dialog
+DlgTableTitle		: "Vlastnosti tabulky",
+DlgTableRows		: "Řádky",
+DlgTableColumns		: "Sloupce",
+DlgTableBorder		: "Ohraničení",
+DlgTableAlign		: "Zarovnání",
+DlgTableAlignNotSet	: "<nenastaveno>",
+DlgTableAlignLeft	: "Vlevo",
+DlgTableAlignCenter	: "Na střed",
+DlgTableAlignRight	: "Vpravo",
+DlgTableWidth		: "Šířka",
+DlgTableWidthPx		: "bodů",
+DlgTableWidthPc		: "procent",
+DlgTableHeight		: "Výška",
+DlgTableCellSpace	: "Vzdálenost buněk",
+DlgTableCellPad		: "Odsazení obsahu",
+DlgTableCaption		: "Popis",
+DlgTableSummary		: "Souhrn",
+
+// Table Cell Dialog
+DlgCellTitle		: "Vlastnosti buňky",
+DlgCellWidth		: "Šířka",
+DlgCellWidthPx		: "bodů",
+DlgCellWidthPc		: "procent",
+DlgCellHeight		: "Výška",
+DlgCellWordWrap		: "Zalamování",
+DlgCellWordWrapNotSet	: "<nenanstaveno>",
+DlgCellWordWrapYes	: "Ano",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Vodorovné zarovnání",
+DlgCellHorAlignNotSet	: "<nenastaveno>",
+DlgCellHorAlignLeft	: "Vlevo",
+DlgCellHorAlignCenter	: "Na střed",
+DlgCellHorAlignRight: "Vpravo",
+DlgCellVerAlign		: "Svislé zarovnání",
+DlgCellVerAlignNotSet	: "<nenastaveno>",
+DlgCellVerAlignTop	: "Nahoru",
+DlgCellVerAlignMiddle	: "Doprostřed",
+DlgCellVerAlignBottom	: "Dolů",
+DlgCellVerAlignBaseline	: "Na účaří",
+DlgCellRowSpan		: "Sloučené řádky",
+DlgCellCollSpan		: "Sloučené sloupce",
+DlgCellBackColor	: "Barva pozadí",
+DlgCellBorderColor	: "Barva ohraničení",
+DlgCellBtnSelect	: "Výběr...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Najít a nahradit",
+
+// Find Dialog
+DlgFindTitle		: "Hledat",
+DlgFindFindBtn		: "Hledat",
+DlgFindNotFoundMsg	: "Hledaný text nebyl nalezen.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Nahradit",
+DlgReplaceFindLbl		: "Co hledat:",
+DlgReplaceReplaceLbl	: "Čím nahradit:",
+DlgReplaceCaseChk		: "Rozlišovat velikost písma",
+DlgReplaceReplaceBtn	: "Nahradit",
+DlgReplaceReplAllBtn	: "Nahradit vše",
+DlgReplaceWordChk		: "Pouze celá slova",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Bezpečnostní nastavení Vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl+X).",
+PasteErrorCopy	: "Bezpečnostní nastavení Vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl+C).",
+
+PasteAsText		: "Vložit jako čistý text",
+PasteFromWord	: "Vložit text z Wordu",
+
+DlgPasteMsg2	: "Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Z důvodů nastavení bezpečnosti Vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.",
+DlgPasteIgnoreFont		: "Ignorovat písmo",
+DlgPasteRemoveStyles	: "Odstranit styly",
+
+// Color Picker
+ColorAutomatic	: "Automaticky",
+ColorMoreColors	: "Více barev...",
+
+// Document Properties
+DocProps		: "Vlastnosti dokumentu",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Vlastnosti záložky",
+DlgAnchorName		: "Název záložky",
+DlgAnchorErrorName	: "Zadejte prosím název záložky",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Není ve slovníku",
+DlgSpellChangeTo		: "Změnit na",
+DlgSpellBtnIgnore		: "Přeskočit",
+DlgSpellBtnIgnoreAll	: "Přeskakovat vše",
+DlgSpellBtnReplace		: "Zaměnit",
+DlgSpellBtnReplaceAll	: "Zaměňovat vše",
+DlgSpellBtnUndo			: "Zpět",
+DlgSpellNoSuggestions	: "- žádné návrhy -",
+DlgSpellProgress		: "Probíhá kontrola pravopisu...",
+DlgSpellNoMispell		: "Kontrola pravopisu dokončena: Žádné pravopisné chyby nenalezeny",
+DlgSpellNoChanges		: "Kontrola pravopisu dokončena: Beze změn",
+DlgSpellOneChange		: "Kontrola pravopisu dokončena: Jedno slovo změněno",
+DlgSpellManyChanges		: "Kontrola pravopisu dokončena: %1 slov změněno",
+
+IeSpellDownload			: "Kontrola pravopisu není nainstalována. Chcete ji nyní stáhnout?",
+
+// Button Dialog
+DlgButtonText		: "Popisek",
+DlgButtonType		: "Typ",
+DlgButtonTypeBtn	: "Tlačítko",
+DlgButtonTypeSbm	: "Odeslat",
+DlgButtonTypeRst	: "Obnovit",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Název",
+DlgCheckboxValue	: "Hodnota",
+DlgCheckboxSelected	: "Zaškrtnuto",
+
+// Form Dialog
+DlgFormName		: "Název",
+DlgFormAction	: "Akce",
+DlgFormMethod	: "Metoda",
+
+// Select Field Dialog
+DlgSelectName		: "Název",
+DlgSelectValue		: "Hodnota",
+DlgSelectSize		: "Velikost",
+DlgSelectLines		: "Řádků",
+DlgSelectChkMulti	: "Povolit mnohonásobné výběry",
+DlgSelectOpAvail	: "Dostupná nastavení",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Hodnota",
+DlgSelectBtnAdd		: "Přidat",
+DlgSelectBtnModify	: "Změnit",
+DlgSelectBtnUp		: "Nahoru",
+DlgSelectBtnDown	: "Dolů",
+DlgSelectBtnSetValue : "Nastavit jako vybranou hodnotu",
+DlgSelectBtnDelete	: "Smazat",
+
+// Textarea Dialog
+DlgTextareaName	: "Název",
+DlgTextareaCols	: "Sloupců",
+DlgTextareaRows	: "Řádků",
+
+// Text Field Dialog
+DlgTextName			: "Název",
+DlgTextValue		: "Hodnota",
+DlgTextCharWidth	: "Šířka ve znacích",
+DlgTextMaxChars		: "Maximální počet znaků",
+DlgTextType			: "Typ",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Heslo",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Název",
+DlgHiddenValue	: "Hodnota",
+
+// Bulleted List Dialog
+BulletedListProp	: "Vlastnosti odrážek",
+NumberedListProp	: "Vlastnosti číslovaného seznamu",
+DlgLstStart			: "Začátek",
+DlgLstType			: "Typ",
+DlgLstTypeCircle	: "Kružnice",
+DlgLstTypeDisc		: "Kruh",
+DlgLstTypeSquare	: "Čtverec",
+DlgLstTypeNumbers	: "Čísla (1, 2, 3)",
+DlgLstTypeLCase		: "Malá písmena (a, b, c)",
+DlgLstTypeUCase		: "Velká písmena (A, B, C)",
+DlgLstTypeSRoman	: "Malé římská číslice (i, ii, iii)",
+DlgLstTypeLRoman	: "Velké římské číslice (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Obecné",
+DlgDocBackTab		: "Pozadí",
+DlgDocColorsTab		: "Barvy a okraje",
+DlgDocMetaTab		: "Metadata",
+
+DlgDocPageTitle		: "Titulek stránky",
+DlgDocLangDir		: "Směr jazyku",
+DlgDocLangDirLTR	: "Zleva do prava ",
+DlgDocLangDirRTL	: "Zprava doleva",
+DlgDocLangCode		: "Kód jazyku",
+DlgDocCharSet		: "Znaková sada",
+DlgDocCharSetCE		: "Středoevropské jazyky",
+DlgDocCharSetCT		: "Tradiční čínština (Big5)",
+DlgDocCharSetCR		: "Cyrilice",
+DlgDocCharSetGR		: "Řečtina",
+DlgDocCharSetJP		: "Japonština",
+DlgDocCharSetKR		: "Korejština",
+DlgDocCharSetTR		: "Turečtina",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Západoevropské jazyky",
+DlgDocCharSetOther	: "Další znaková sada",
+
+DlgDocDocType		: "Typ dokumentu",
+DlgDocDocTypeOther	: "Jiný typ dokumetu",
+DlgDocIncXHTML		: "Zahrnou deklarace XHTML",
+DlgDocBgColor		: "Barva pozadí",
+DlgDocBgImage		: "URL obrázku na pozadí",
+DlgDocBgNoScroll	: "Nerolovatelné pozadí",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Odkaz",
+DlgDocCVisited		: "Navštívený odkaz",
+DlgDocCActive		: "Vybraný odkaz",
+DlgDocMargins		: "Okraje stránky",
+DlgDocMaTop			: "Horní",
+DlgDocMaLeft		: "Levý",
+DlgDocMaRight		: "Pravý",
+DlgDocMaBottom		: "Dolní",
+DlgDocMeIndex		: "Klíčová slova (oddělená čárkou)",
+DlgDocMeDescr		: "Popis dokumentu",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Autorská práva",
+DlgDocPreview		: "Náhled",
+
+// Templates Dialog
+Templates			: "Šablony",
+DlgTemplatesTitle	: "Šablony obsahu",
+DlgTemplatesSelMsg	: "Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):",
+DlgTemplatesLoading	: "Nahrávám přeheld šablon. Prosím čekejte...",
+DlgTemplatesNoTpl	: "(Není definována žádná šablona)",
+DlgTemplatesReplace	: "Nahradit aktuální obsah",
+
+// About Dialog
+DlgAboutAboutTab	: "O aplikaci",
+DlgAboutBrowserInfoTab	: "Informace o prohlížeči",
+DlgAboutLicenseTab	: "Licence",
+DlgAboutVersion		: "verze",
+DlgAboutInfo		: "Více informací získáte na",
+
+// Div Dialog
+DlgDivGeneralTab	: "Obecné",
+DlgDivAdvancedTab	: "Rozšířené",
+DlgDivStyle		: "Styl",
+DlgDivInlineStyle	: "Vložený styl"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/da.js b/modules/editor/skins/fckeditor/editor/lang/da.js
new file mode 100644
index 000000000..c0273f59c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/da.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Danish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skjul værktøjslinier",
+ToolbarExpand		: "Vis værktøjslinier",
+
+// Toolbar Items and Context Menu
+Save				: "Gem",
+NewPage				: "Ny side",
+Preview				: "Vis eksempel",
+Cut					: "Klip",
+Copy				: "Kopier",
+Paste				: "Indsæt",
+PasteText			: "Indsæt som ikke-formateret tekst",
+PasteWord			: "Indsæt fra Word",
+Print				: "Udskriv",
+SelectAll			: "Vælg alt",
+RemoveFormat		: "Fjern formatering",
+InsertLinkLbl		: "Hyperlink",
+InsertLink			: "Indsæt/rediger hyperlink",
+RemoveLink			: "Fjern hyperlink",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Indsæt/rediger bogmærke",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Indsæt billede",
+InsertImage			: "Indsæt/rediger billede",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Indsæt/rediger Flash",
+InsertTableLbl		: "Table",
+InsertTable			: "Indsæt/rediger tabel",
+InsertLineLbl		: "Linie",
+InsertLine			: "Indsæt vandret linie",
+InsertSpecialCharLbl: "Symbol",
+InsertSpecialChar	: "Indsæt symbol",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Indsæt smiley",
+About				: "Om FCKeditor",
+Bold				: "Fed",
+Italic				: "Kursiv",
+Underline			: "Understreget",
+StrikeThrough		: "Overstreget",
+Subscript			: "Sænket skrift",
+Superscript			: "Hævet skrift",
+LeftJustify			: "Venstrestillet",
+CenterJustify		: "Centreret",
+RightJustify		: "Højrestillet",
+BlockJustify		: "Lige margener",
+DecreaseIndent		: "Formindsk indrykning",
+IncreaseIndent		: "Forøg indrykning",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Fortryd",
+Redo				: "Annuller fortryd",
+NumberedListLbl		: "Talopstilling",
+NumberedList		: "Indsæt/fjern talopstilling",
+BulletedListLbl		: "Punktopstilling",
+BulletedList		: "Indsæt/fjern punktopstilling",
+ShowTableBorders	: "Vis tabelkanter",
+ShowDetails			: "Vis detaljer",
+Style				: "Typografi",
+FontFormat			: "Formatering",
+Font				: "Skrifttype",
+FontSize			: "Skriftstørrelse",
+TextColor			: "Tekstfarve",
+BGColor				: "Baggrundsfarve",
+Source				: "Kilde",
+Find				: "Søg",
+Replace				: "Erstat",
+SpellCheck			: "Stavekontrol",
+UniversalKeyboard	: "Universaltastatur",
+PageBreakLbl		: "Sidskift",
+PageBreak			: "Indsæt sideskift",
+
+Form			: "Indsæt formular",
+Checkbox		: "Indsæt afkrydsningsfelt",
+RadioButton		: "Indsæt alternativknap",
+TextField		: "Indsæt tekstfelt",
+Textarea		: "Indsæt tekstboks",
+HiddenField		: "Indsæt skjult felt",
+Button			: "Indsæt knap",
+SelectionField	: "Indsæt liste",
+ImageButton		: "Indsæt billedknap",
+
+FitWindow		: "Maksimer editor vinduet",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Rediger hyperlink",
+CellCM				: "Celle",
+RowCM				: "Række",
+ColumnCM			: "Kolonne",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Slet række",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Slet kolonne",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Slet celle",
+MergeCells			: "Flet celler",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Slet tabel",
+CellProperties		: "Egenskaber for celle",
+TableProperties		: "Egenskaber for tabel",
+ImageProperties		: "Egenskaber for billede",
+FlashProperties		: "Egenskaber for Flash",
+
+AnchorProp			: "Egenskaber for bogmærke",
+ButtonProp			: "Egenskaber for knap",
+CheckboxProp		: "Egenskaber for afkrydsningsfelt",
+HiddenFieldProp		: "Egenskaber for skjult felt",
+RadioButtonProp		: "Egenskaber for alternativknap",
+ImageButtonProp		: "Egenskaber for billedknap",
+TextFieldProp		: "Egenskaber for tekstfelt",
+SelectionFieldProp	: "Egenskaber for liste",
+TextareaProp		: "Egenskaber for tekstboks",
+FormProp			: "Egenskaber for formular",
+
+FontFormats			: "Normal;Formateret;Adresse;Overskrift 1;Overskrift 2;Overskrift 3;Overskrift 4;Overskrift 5;Overskrift 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Behandler XHTML...",
+Done				: "Færdig",
+PasteWordConfirm	: "Den tekst du forsøger at indsætte ser ud til at komme fra Word.<br>Vil du rense teksten før den indsættes?",
+NotCompatiblePaste	: "Denne kommando er tilgændelig i Internet Explorer 5.5 eller senere.<br>Vil du indsætte teksten uden at rense den ?",
+UnknownToolbarItem	: "Ukendt værktøjslinjeobjekt \"%1\"!",
+UnknownCommand		: "Ukendt kommandonavn \"%1\"!",
+NotImplemented		: "Kommandoen er ikke implementeret!",
+UnknownToolbarSet	: "Værktøjslinjen \"%1\" eksisterer ikke!",
+NoActiveX			: "Din browsers sikkerhedsindstillinger begrænser nogle af editorens muligheder.<br>Slå \"Kør ActiveX-objekter og plug-ins\" til, ellers vil du opleve fejl og manglende muligheder.",
+BrowseServerBlocked : "Browseren kunne ikke åbne de nødvendige ressourcer!<br>Slå pop-up blokering fra.",
+DialogBlocked		: "Dialogvinduet kunne ikke åbnes!<br>Slå pop-up blokering fra.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Annuller",
+DlgBtnClose			: "Luk",
+DlgBtnBrowseServer	: "Gennemse...",
+DlgAdvancedTag		: "Avanceret",
+DlgOpOther			: "<Andet>",
+DlgInfoTab			: "Generelt",
+DlgAlertUrl			: "Indtast URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<intet valgt>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Tekstretning",
+DlgGenLangDirLtr	: "Fra venstre mod højre (LTR)",
+DlgGenLangDirRtl	: "Fra højre mod venstre (RTL)",
+DlgGenLangCode		: "Sprogkode",
+DlgGenAccessKey		: "Genvejstast",
+DlgGenName			: "Navn",
+DlgGenTabIndex		: "Tabulator indeks",
+DlgGenLongDescr		: "Udvidet beskrivelse",
+DlgGenClass			: "Typografiark",
+DlgGenTitle			: "Titel",
+DlgGenContType		: "Indholdstype",
+DlgGenLinkCharset	: "Tegnsæt",
+DlgGenStyle			: "Typografi",
+
+// Image Dialog
+DlgImgTitle			: "Egenskaber for billede",
+DlgImgInfoTab		: "Generelt",
+DlgImgBtnUpload		: "Upload",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternativ tekst",
+DlgImgWidth			: "Bredde",
+DlgImgHeight		: "Højde",
+DlgImgLockRatio		: "Lås størrelsesforhold",
+DlgBtnResetSize		: "Nulstil størrelse",
+DlgImgBorder		: "Ramme",
+DlgImgHSpace		: "HMargen",
+DlgImgVSpace		: "VMargen",
+DlgImgAlign			: "Justering",
+DlgImgAlignLeft		: "Venstre",
+DlgImgAlignAbsBottom: "Absolut nederst",
+DlgImgAlignAbsMiddle: "Absolut centreret",
+DlgImgAlignBaseline	: "Grundlinje",
+DlgImgAlignBottom	: "Nederst",
+DlgImgAlignMiddle	: "Centreret",
+DlgImgAlignRight	: "Højre",
+DlgImgAlignTextTop	: "Toppen af teksten",
+DlgImgAlignTop		: "Øverst",
+DlgImgPreview		: "Vis eksempel",
+DlgImgAlertUrl		: "Indtast stien til billedet",
+DlgImgLinkTab		: "Hyperlink",
+
+// Flash Dialog
+DlgFlashTitle		: "Egenskaber for Flash",
+DlgFlashChkPlay		: "Automatisk afspilning",
+DlgFlashChkLoop		: "Gentagelse",
+DlgFlashChkMenu		: "Vis Flash menu",
+DlgFlashScale		: "Skalér",
+DlgFlashScaleAll	: "Vis alt",
+DlgFlashScaleNoBorder	: "Ingen ramme",
+DlgFlashScaleFit	: "Tilpas størrelse",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Egenskaber for hyperlink",
+DlgLnkInfoTab		: "Generelt",
+DlgLnkTargetTab		: "Mål",
+
+DlgLnkType			: "Hyperlink type",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Bogmærke på denne side",
+DlgLnkTypeEMail		: "E-mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<anden>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Vælg et anker",
+DlgLnkAnchorByName	: "Efter anker navn",
+DlgLnkAnchorById	: "Efter element Id",
+DlgLnkNoAnchors		: "(Ingen bogmærker dokumentet)",
+DlgLnkEMail			: "E-mailadresse",
+DlgLnkEMailSubject	: "Emne",
+DlgLnkEMailBody		: "Brødtekst",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Upload",
+
+DlgLnkTarget		: "Mål",
+DlgLnkTargetFrame	: "<ramme>",
+DlgLnkTargetPopup	: "<popup vindue>",
+DlgLnkTargetBlank	: "Nyt vindue (_blank)",
+DlgLnkTargetParent	: "Overordnet ramme (_parent)",
+DlgLnkTargetSelf	: "Samme vindue (_self)",
+DlgLnkTargetTop		: "Hele vinduet (_top)",
+DlgLnkTargetFrameName	: "Destinationsvinduets navn",
+DlgLnkPopWinName	: "Pop-up vinduets navn",
+DlgLnkPopWinFeat	: "Egenskaber for pop-up",
+DlgLnkPopResize		: "Skalering",
+DlgLnkPopLocation	: "Adresselinje",
+DlgLnkPopMenu		: "Menulinje",
+DlgLnkPopScroll		: "Scrollbars",
+DlgLnkPopStatus		: "Statuslinje",
+DlgLnkPopToolbar	: "Værktøjslinje",
+DlgLnkPopFullScrn	: "Fuld skærm (IE)",
+DlgLnkPopDependent	: "Koblet/dependent (Netscape)",
+DlgLnkPopWidth		: "Bredde",
+DlgLnkPopHeight		: "Højde",
+DlgLnkPopLeft		: "Position fra venstre",
+DlgLnkPopTop		: "Position fra toppen",
+
+DlnLnkMsgNoUrl		: "Indtast hyperlink URL!",
+DlnLnkMsgNoEMail	: "Indtast e-mailaddresse!",
+DlnLnkMsgNoAnchor	: "Vælg bogmærke!",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Vælg farve",
+DlgColorBtnClear	: "Nulstil",
+DlgColorHighlight	: "Markeret",
+DlgColorSelected	: "Valgt",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Vælg smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Vælg symbol",
+
+// Table Dialog
+DlgTableTitle		: "Egenskaber for tabel",
+DlgTableRows		: "Rækker",
+DlgTableColumns		: "Kolonner",
+DlgTableBorder		: "Rammebredde",
+DlgTableAlign		: "Justering",
+DlgTableAlignNotSet	: "<intet valgt>",
+DlgTableAlignLeft	: "Venstrestillet",
+DlgTableAlignCenter	: "Centreret",
+DlgTableAlignRight	: "Højrestillet",
+DlgTableWidth		: "Bredde",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "procent",
+DlgTableHeight		: "Højde",
+DlgTableCellSpace	: "Celleafstand",
+DlgTableCellPad		: "Cellemargen",
+DlgTableCaption		: "Titel",
+DlgTableSummary		: "Resume",
+
+// Table Cell Dialog
+DlgCellTitle		: "Egenskaber for celle",
+DlgCellWidth		: "Bredde",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "procent",
+DlgCellHeight		: "Højde",
+DlgCellWordWrap		: "Orddeling",
+DlgCellWordWrapNotSet	: "<intet valgt>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nej",
+DlgCellHorAlign		: "Vandret justering",
+DlgCellHorAlignNotSet	: "<intet valgt>",
+DlgCellHorAlignLeft	: "Venstrestillet",
+DlgCellHorAlignCenter	: "Centreret",
+DlgCellHorAlignRight: "Højrestillet",
+DlgCellVerAlign		: "Lodret justering",
+DlgCellVerAlignNotSet	: "<intet valgt>",
+DlgCellVerAlignTop	: "Øverst",
+DlgCellVerAlignMiddle	: "Centreret",
+DlgCellVerAlignBottom	: "Nederst",
+DlgCellVerAlignBaseline	: "Grundlinje",
+DlgCellRowSpan		: "Højde i antal rækker",
+DlgCellCollSpan		: "Bredde i antal kolonner",
+DlgCellBackColor	: "Baggrundsfarve",
+DlgCellBorderColor	: "Rammefarve",
+DlgCellBtnSelect	: "Vælg...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Find",
+DlgFindFindBtn		: "Find",
+DlgFindNotFoundMsg	: "Søgeteksten blev ikke fundet!",
+
+// Replace Dialog
+DlgReplaceTitle			: "Erstat",
+DlgReplaceFindLbl		: "Søg efter:",
+DlgReplaceReplaceLbl	: "Erstat med:",
+DlgReplaceCaseChk		: "Forskel på store og små bogstaver",
+DlgReplaceReplaceBtn	: "Erstat",
+DlgReplaceReplAllBtn	: "Erstat alle",
+DlgReplaceWordChk		: "Kun hele ord",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Din browsers sikkerhedsindstillinger tillader ikke editoren at klippe tekst automatisk!<br>Brug i stedet tastaturet til at klippe teksten (Ctrl+X).",
+PasteErrorCopy	: "Din browsers sikkerhedsindstillinger tillader ikke editoren at kopiere tekst automatisk!<br>Brug i stedet tastaturet til at kopiere teksten (Ctrl+C).",
+
+PasteAsText		: "Indsæt som ikke-formateret tekst",
+PasteFromWord	: "Indsæt fra Word",
+
+DlgPasteMsg2	: "Indsæt i feltet herunder (<STRONG>Ctrl+V</STRONG>) og klik <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignorer font definitioner",
+DlgPasteRemoveStyles	: "Ignorer typografi",
+
+// Color Picker
+ColorAutomatic	: "Automatisk",
+ColorMoreColors	: "Flere farver...",
+
+// Document Properties
+DocProps		: "Egenskaber for dokument",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Egenskaber for bogmærke",
+DlgAnchorName		: "Bogmærke navn",
+DlgAnchorErrorName	: "Indtast bogmærke navn!",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ikke i ordbogen",
+DlgSpellChangeTo		: "Forslag",
+DlgSpellBtnIgnore		: "Ignorer",
+DlgSpellBtnIgnoreAll	: "Ignorer alle",
+DlgSpellBtnReplace		: "Erstat",
+DlgSpellBtnReplaceAll	: "Erstat alle",
+DlgSpellBtnUndo			: "Tilbage",
+DlgSpellNoSuggestions	: "- ingen forslag -",
+DlgSpellProgress		: "Stavekontrolen arbejder...",
+DlgSpellNoMispell		: "Stavekontrol færdig: Ingen fejl fundet",
+DlgSpellNoChanges		: "Stavekontrol færdig: Ingen ord ændret",
+DlgSpellOneChange		: "Stavekontrol færdig: Et ord ændret",
+DlgSpellManyChanges		: "Stavekontrol færdig: %1 ord ændret",
+
+IeSpellDownload			: "Stavekontrol ikke installeret.<br>Vil du hente den nu?",
+
+// Button Dialog
+DlgButtonText		: "Tekst",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Navn",
+DlgCheckboxValue	: "Værdi",
+DlgCheckboxSelected	: "Valgt",
+
+// Form Dialog
+DlgFormName		: "Navn",
+DlgFormAction	: "Handling",
+DlgFormMethod	: "Metod",
+
+// Select Field Dialog
+DlgSelectName		: "Navn",
+DlgSelectValue		: "Værdi",
+DlgSelectSize		: "Størrelse",
+DlgSelectLines		: "linier",
+DlgSelectChkMulti	: "Tillad flere valg",
+DlgSelectOpAvail	: "Valgmuligheder",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Værdi",
+DlgSelectBtnAdd		: "Tilføj",
+DlgSelectBtnModify	: "Rediger",
+DlgSelectBtnUp		: "Op",
+DlgSelectBtnDown	: "Ned",
+DlgSelectBtnSetValue : "Sæt som valgt",
+DlgSelectBtnDelete	: "Slet",
+
+// Textarea Dialog
+DlgTextareaName	: "Navn",
+DlgTextareaCols	: "Kolonner",
+DlgTextareaRows	: "Rækker",
+
+// Text Field Dialog
+DlgTextName			: "Navn",
+DlgTextValue		: "Værdi",
+DlgTextCharWidth	: "Bredde (tegn)",
+DlgTextMaxChars		: "Max antal tegn",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Adgangskode",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Navn",
+DlgHiddenValue	: "Værdi",
+
+// Bulleted List Dialog
+BulletedListProp	: "Egenskaber for punktopstilling",
+NumberedListProp	: "Egenskaber for talopstilling",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Cirkel",
+DlgLstTypeDisc		: "Udfyldt cirkel",
+DlgLstTypeSquare	: "Firkant",
+DlgLstTypeNumbers	: "Nummereret (1, 2, 3)",
+DlgLstTypeLCase		: "Små bogstaver (a, b, c)",
+DlgLstTypeUCase		: "Store bogstaver (A, B, C)",
+DlgLstTypeSRoman	: "Små romertal (i, ii, iii)",
+DlgLstTypeLRoman	: "Store romertal (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Generelt",
+DlgDocBackTab		: "Baggrund",
+DlgDocColorsTab		: "Farver og margen",
+DlgDocMetaTab		: "Metadata",
+
+DlgDocPageTitle		: "Sidetitel",
+DlgDocLangDir		: "Sprog",
+DlgDocLangDirLTR	: "Fra venstre mod højre (LTR)",
+DlgDocLangDirRTL	: "Fra højre mod venstre (RTL)",
+DlgDocLangCode		: "Landekode",
+DlgDocCharSet		: "Tegnsæt kode",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Anden tegnsæt kode",
+
+DlgDocDocType		: "Dokumenttype kategori",
+DlgDocDocTypeOther	: "Anden dokumenttype kategori",
+DlgDocIncXHTML		: "Inkludere XHTML deklartion",
+DlgDocBgColor		: "Baggrundsfarve",
+DlgDocBgImage		: "Baggrundsbillede URL",
+DlgDocBgNoScroll	: "Fastlåst baggrund",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Hyperlink",
+DlgDocCVisited		: "Besøgt hyperlink",
+DlgDocCActive		: "Aktivt hyperlink",
+DlgDocMargins		: "Sidemargen",
+DlgDocMaTop			: "Øverst",
+DlgDocMaLeft		: "Venstre",
+DlgDocMaRight		: "Højre",
+DlgDocMaBottom		: "Nederst",
+DlgDocMeIndex		: "Dokument index nøgleord (kommasepareret)",
+DlgDocMeDescr		: "Dokument beskrivelse",
+DlgDocMeAuthor		: "Forfatter",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Vis",
+
+// Templates Dialog
+Templates			: "Skabeloner",
+DlgTemplatesTitle	: "Indholdsskabeloner",
+DlgTemplatesSelMsg	: "Vælg den skabelon, som skal åbnes i editoren.<br>(Nuværende indhold vil blive overskrevet!):",
+DlgTemplatesLoading	: "Henter liste over skabeloner...",
+DlgTemplatesNoTpl	: "(Der er ikke defineret nogen skabelon!)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Om",
+DlgAboutBrowserInfoTab	: "Generelt",
+DlgAboutLicenseTab	: "Licens",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "For yderlig information gå til",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/de.js b/modules/editor/skins/fckeditor/editor/lang/de.js
new file mode 100644
index 000000000..7edd90f96
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/de.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * German language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Symbolleiste einklappen",
+ToolbarExpand		: "Symbolleiste ausklappen",
+
+// Toolbar Items and Context Menu
+Save				: "Speichern",
+NewPage				: "Neue Seite",
+Preview				: "Vorschau",
+Cut					: "Ausschneiden",
+Copy				: "Kopieren",
+Paste				: "Einfügen",
+PasteText			: "aus Textdatei einfügen",
+PasteWord			: "aus MS-Word einfügen",
+Print				: "Drucken",
+SelectAll			: "Alles auswählen",
+RemoveFormat		: "Formatierungen entfernen",
+InsertLinkLbl		: "Link",
+InsertLink			: "Link einfügen/editieren",
+RemoveLink			: "Link entfernen",
+VisitLink			: "Link aufrufen",
+Anchor				: "Anker einfügen/editieren",
+AnchorDelete		: "Anker entfernen",
+InsertImageLbl		: "Bild",
+InsertImage			: "Bild einfügen/editieren",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash einfügen/editieren",
+InsertTableLbl		: "Tabelle",
+InsertTable			: "Tabelle einfügen/editieren",
+InsertLineLbl		: "Linie",
+InsertLine			: "Horizontale Linie einfügen",
+InsertSpecialCharLbl: "Sonderzeichen",
+InsertSpecialChar	: "Sonderzeichen einfügen/editieren",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Smiley einfügen",
+About				: "Über FCKeditor",
+Bold				: "Fett",
+Italic				: "Kursiv",
+Underline			: "Unterstrichen",
+StrikeThrough		: "Durchgestrichen",
+Subscript			: "Tiefgestellt",
+Superscript			: "Hochgestellt",
+LeftJustify			: "Linksbündig",
+CenterJustify		: "Zentriert",
+RightJustify		: "Rechtsbündig",
+BlockJustify		: "Blocksatz",
+DecreaseIndent		: "Einzug verringern",
+IncreaseIndent		: "Einzug erhöhen",
+Blockquote			: "Zitatblock",
+CreateDiv			: "Erzeuge Div Block",
+EditDiv				: "Bearbeite Div Block",
+DeleteDiv			: "Entferne Div Block",
+Undo				: "Rückgängig",
+Redo				: "Wiederherstellen",
+NumberedListLbl		: "Nummerierte Liste",
+NumberedList		: "Nummerierte Liste einfügen/entfernen",
+BulletedListLbl		: "Liste",
+BulletedList		: "Liste einfügen/entfernen",
+ShowTableBorders	: "Zeige Tabellenrahmen",
+ShowDetails			: "Zeige Details",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Schriftart",
+FontSize			: "Größe",
+TextColor			: "Textfarbe",
+BGColor				: "Hintergrundfarbe",
+Source				: "Quellcode",
+Find				: "Suchen",
+Replace				: "Ersetzen",
+SpellCheck			: "Rechtschreibprüfung",
+UniversalKeyboard	: "Universal-Tastatur",
+PageBreakLbl		: "Seitenumbruch",
+PageBreak			: "Seitenumbruch einfügen",
+
+Form			: "Formular",
+Checkbox		: "Checkbox",
+RadioButton		: "Radiobutton",
+TextField		: "Textfeld einzeilig",
+Textarea		: "Textfeld mehrzeilig",
+HiddenField		: "verstecktes Feld",
+Button			: "Klickbutton",
+SelectionField	: "Auswahlfeld",
+ImageButton		: "Bildbutton",
+
+FitWindow		: "Editor maximieren",
+ShowBlocks		: "Blöcke anzeigen",
+
+// Context Menu
+EditLink			: "Link editieren",
+CellCM				: "Zelle",
+RowCM				: "Zeile",
+ColumnCM			: "Spalte",
+InsertRowAfter		: "Zeile unterhalb einfügen",
+InsertRowBefore		: "Zeile oberhalb einfügen",
+DeleteRows			: "Zeile entfernen",
+InsertColumnAfter	: "Spalte rechts danach einfügen",
+InsertColumnBefore	: "Spalte links davor einfügen",
+DeleteColumns		: "Spalte löschen",
+InsertCellAfter		: "Zelle danach einfügen",
+InsertCellBefore	: "Zelle davor einfügen",
+DeleteCells			: "Zelle löschen",
+MergeCells			: "Zellen verbinden",
+MergeRight			: "nach rechts verbinden",
+MergeDown			: "nach unten verbinden",
+HorizontalSplitCell	: "Zelle horizontal teilen",
+VerticalSplitCell	: "Zelle vertikal teilen",
+TableDelete			: "Tabelle löschen",
+CellProperties		: "Zellen-Eigenschaften",
+TableProperties		: "Tabellen-Eigenschaften",
+ImageProperties		: "Bild-Eigenschaften",
+FlashProperties		: "Flash-Eigenschaften",
+
+AnchorProp			: "Anker-Eigenschaften",
+ButtonProp			: "Button-Eigenschaften",
+CheckboxProp		: "Checkbox-Eigenschaften",
+HiddenFieldProp		: "Verstecktes Feld-Eigenschaften",
+RadioButtonProp		: "Optionsfeld-Eigenschaften",
+ImageButtonProp		: "Bildbutton-Eigenschaften",
+TextFieldProp		: "Textfeld (einzeilig) Eigenschaften",
+SelectionFieldProp	: "Auswahlfeld-Eigenschaften",
+TextareaProp		: "Textfeld (mehrzeilig) Eigenschaften",
+FormProp			: "Formular-Eigenschaften",
+
+FontFormats			: "Normal;Formatiert;Addresse;Überschrift 1;Überschrift 2;Überschrift 3;Überschrift 4;Überschrift 5;Überschrift 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Bearbeite XHTML. Bitte warten...",
+Done				: "Fertig",
+PasteWordConfirm	: "Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?",
+NotCompatiblePaste	: "Diese Funktion steht nur im Internet Explorer ab Version 5.5 zur Verfügung. Möchten Sie den Text unbereinigt einfügen?",
+UnknownToolbarItem	: "Unbekanntes Menüleisten-Objekt \"%1\"",
+UnknownCommand		: "Unbekannter Befehl \"%1\"",
+NotImplemented		: "Befehl nicht implementiert",
+UnknownToolbarSet	: "Menüleiste \"%1\" existiert nicht",
+NoActiveX			: "Die Sicherheitseinstellungen Ihres Browsers beschränken evtl. einige Funktionen des Editors. Aktivieren Sie die Option \"ActiveX-Steuerelemente und Plugins ausführen\" in den Sicherheitseinstellungen, um diese Funktionen nutzen zu können",
+BrowseServerBlocked : "Ein Auswahlfenster konnte nicht geöffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.",
+DialogBlocked		: "Das Dialog-Fenster konnte nicht geöffnet werden. Stellen Sie sicher, das alle Popup-Blocker ausgeschaltet sind.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Abbrechen",
+DlgBtnClose			: "Schließen",
+DlgBtnBrowseServer	: "Server durchsuchen",
+DlgAdvancedTag		: "Erweitert",
+DlgOpOther			: "<andere>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Bitte tragen Sie die URL ein",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nichts>",
+DlgGenId			: "ID",
+DlgGenLangDir		: "Schreibrichtung",
+DlgGenLangDirLtr	: "Links nach Rechts (LTR)",
+DlgGenLangDirRtl	: "Rechts nach Links (RTL)",
+DlgGenLangCode		: "Sprachenkürzel",
+DlgGenAccessKey		: "Zugriffstaste",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "Tab-Index",
+DlgGenLongDescr		: "Langform URL",
+DlgGenClass			: "Stylesheet Klasse",
+DlgGenTitle			: "Titel Beschreibung",
+DlgGenContType		: "Inhaltstyp",
+DlgGenLinkCharset	: "Ziel-Zeichensatz",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Bild-Eigenschaften",
+DlgImgInfoTab		: "Bild-Info",
+DlgImgBtnUpload		: "Zum Server senden",
+DlgImgURL			: "Bildauswahl",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternativer Text",
+DlgImgWidth			: "Breite",
+DlgImgHeight		: "Höhe",
+DlgImgLockRatio		: "Größenverhältniss beibehalten",
+DlgBtnResetSize		: "Größe zurücksetzen",
+DlgImgBorder		: "Rahmen",
+DlgImgHSpace		: "H-Abstand",
+DlgImgVSpace		: "V-Abstand",
+DlgImgAlign			: "Ausrichtung",
+DlgImgAlignLeft		: "Links",
+DlgImgAlignAbsBottom: "Abs Unten",
+DlgImgAlignAbsMiddle: "Abs Mitte",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Unten",
+DlgImgAlignMiddle	: "Mitte",
+DlgImgAlignRight	: "Rechts",
+DlgImgAlignTextTop	: "Text Oben",
+DlgImgAlignTop		: "Oben",
+DlgImgPreview		: "Vorschau",
+DlgImgAlertUrl		: "Bitte geben Sie die Bild-URL an",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash-Eigenschaften",
+DlgFlashChkPlay		: "autom. Abspielen",
+DlgFlashChkLoop		: "Endlosschleife",
+DlgFlashChkMenu		: "Flash-Menü aktivieren",
+DlgFlashScale		: "Skalierung",
+DlgFlashScaleAll	: "Alles anzeigen",
+DlgFlashScaleNoBorder	: "ohne Rand",
+DlgFlashScaleFit	: "Passgenau",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link-Info",
+DlgLnkTargetTab		: "Zielseite",
+
+DlgLnkType			: "Link-Typ",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Anker in dieser Seite",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<anderes>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Anker auswählen",
+DlgLnkAnchorByName	: "nach Anker Name",
+DlgLnkAnchorById	: "nach Element Id",
+DlgLnkNoAnchors		: "(keine Anker im Dokument vorhanden)",
+DlgLnkEMail			: "E-Mail Addresse",
+DlgLnkEMailSubject	: "Betreffzeile",
+DlgLnkEMailBody		: "Nachrichtentext",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Zum Server senden",
+
+DlgLnkTarget		: "Zielseite",
+DlgLnkTargetFrame	: "<Frame>",
+DlgLnkTargetPopup	: "<Pop-up Fenster>",
+DlgLnkTargetBlank	: "Neues Fenster (_blank)",
+DlgLnkTargetParent	: "Oberes Fenster (_parent)",
+DlgLnkTargetSelf	: "Gleiches Fenster (_self)",
+DlgLnkTargetTop		: "Oberstes Fenster (_top)",
+DlgLnkTargetFrameName	: "Ziel-Fenster-Name",
+DlgLnkPopWinName	: "Pop-up Fenster-Name",
+DlgLnkPopWinFeat	: "Pop-up Fenster-Eigenschaften",
+DlgLnkPopResize		: "Vergrößerbar",
+DlgLnkPopLocation	: "Adress-Leiste",
+DlgLnkPopMenu		: "Menü-Leiste",
+DlgLnkPopScroll		: "Rollbalken",
+DlgLnkPopStatus		: "Statusleiste",
+DlgLnkPopToolbar	: "Werkzeugleiste",
+DlgLnkPopFullScrn	: "Vollbild (IE)",
+DlgLnkPopDependent	: "Abhängig (Netscape)",
+DlgLnkPopWidth		: "Breite",
+DlgLnkPopHeight		: "Höhe",
+DlgLnkPopLeft		: "Linke Position",
+DlgLnkPopTop		: "Obere Position",
+
+DlnLnkMsgNoUrl		: "Bitte geben Sie die Link-URL an",
+DlnLnkMsgNoEMail	: "Bitte geben Sie e-Mail Adresse an",
+DlnLnkMsgNoAnchor	: "Bitte wählen Sie einen Anker aus",
+DlnLnkMsgInvPopName	: "Der Name des Popups muss mit einem Buchstaben beginnen und darf keine Leerzeichen enthalten",
+
+// Color Dialog
+DlgColorTitle		: "Farbauswahl",
+DlgColorBtnClear	: "Keine Farbe",
+DlgColorHighlight	: "Vorschau",
+DlgColorSelected	: "Ausgewählt",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Smiley auswählen",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Sonderzeichen auswählen",
+
+// Table Dialog
+DlgTableTitle		: "Tabellen-Eigenschaften",
+DlgTableRows		: "Zeile",
+DlgTableColumns		: "Spalte",
+DlgTableBorder		: "Rahmen",
+DlgTableAlign		: "Ausrichtung",
+DlgTableAlignNotSet	: "<keine>",
+DlgTableAlignLeft	: "Links",
+DlgTableAlignCenter	: "Zentriert",
+DlgTableAlignRight	: "Rechts",
+DlgTableWidth		: "Breite",
+DlgTableWidthPx		: "Pixel",
+DlgTableWidthPc		: "%",
+DlgTableHeight		: "Höhe",
+DlgTableCellSpace	: "Zellenabstand außen",
+DlgTableCellPad		: "Zellenabstand innen",
+DlgTableCaption		: "Überschrift",
+DlgTableSummary		: "Inhaltsübersicht",
+
+// Table Cell Dialog
+DlgCellTitle		: "Zellen-Eigenschaften",
+DlgCellWidth		: "Breite",
+DlgCellWidthPx		: "Pixel",
+DlgCellWidthPc		: "%",
+DlgCellHeight		: "Höhe",
+DlgCellWordWrap		: "Umbruch",
+DlgCellWordWrapNotSet	: "<keiner>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nein",
+DlgCellHorAlign		: "Horizontale Ausrichtung",
+DlgCellHorAlignNotSet	: "<keine>",
+DlgCellHorAlignLeft	: "Links",
+DlgCellHorAlignCenter	: "Zentriert",
+DlgCellHorAlignRight: "Rechts",
+DlgCellVerAlign		: "Vertikale Ausrichtung",
+DlgCellVerAlignNotSet	: "<keine>",
+DlgCellVerAlignTop	: "Oben",
+DlgCellVerAlignMiddle	: "Mitte",
+DlgCellVerAlignBottom	: "Unten",
+DlgCellVerAlignBaseline	: "Grundlinie",
+DlgCellRowSpan		: "Zeilen zusammenfassen",
+DlgCellCollSpan		: "Spalten zusammenfassen",
+DlgCellBackColor	: "Hintergrundfarbe",
+DlgCellBorderColor	: "Rahmenfarbe",
+DlgCellBtnSelect	: "Auswahl...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Suchen und Ersetzen",
+
+// Find Dialog
+DlgFindTitle		: "Finden",
+DlgFindFindBtn		: "Finden",
+DlgFindNotFoundMsg	: "Der gesuchte Text wurde nicht gefunden.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Ersetzen",
+DlgReplaceFindLbl		: "Suche nach:",
+DlgReplaceReplaceLbl	: "Ersetze mit:",
+DlgReplaceCaseChk		: "Groß-Kleinschreibung beachten",
+DlgReplaceReplaceBtn	: "Ersetzen",
+DlgReplaceReplAllBtn	: "Alle Ersetzen",
+DlgReplaceWordChk		: "Nur ganze Worte suchen",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).",
+PasteErrorCopy	: "Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).",
+
+PasteAsText		: "Als Text einfügen",
+PasteFromWord	: "Aus Word einfügen",
+
+DlgPasteMsg2	: "Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.",
+DlgPasteIgnoreFont		: "Ignoriere Schriftart-Definitionen",
+DlgPasteRemoveStyles	: "Entferne Style-Definitionen",
+
+// Color Picker
+ColorAutomatic	: "Automatisch",
+ColorMoreColors	: "Weitere Farben...",
+
+// Document Properties
+DocProps		: "Dokument-Eigenschaften",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anker-Eigenschaften",
+DlgAnchorName		: "Anker Name",
+DlgAnchorErrorName	: "Bitte geben Sie den Namen des Ankers ein",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nicht im Wörterbuch",
+DlgSpellChangeTo		: "Ändern in",
+DlgSpellBtnIgnore		: "Ignorieren",
+DlgSpellBtnIgnoreAll	: "Alle Ignorieren",
+DlgSpellBtnReplace		: "Ersetzen",
+DlgSpellBtnReplaceAll	: "Alle Ersetzen",
+DlgSpellBtnUndo			: "Rückgängig",
+DlgSpellNoSuggestions	: " - keine Vorschläge - ",
+DlgSpellProgress		: "Rechtschreibprüfung läuft...",
+DlgSpellNoMispell		: "Rechtschreibprüfung abgeschlossen - keine Fehler gefunden",
+DlgSpellNoChanges		: "Rechtschreibprüfung abgeschlossen - keine Worte geändert",
+DlgSpellOneChange		: "Rechtschreibprüfung abgeschlossen - ein Wort geändert",
+DlgSpellManyChanges		: "Rechtschreibprüfung abgeschlossen - %1 Wörter geändert",
+
+IeSpellDownload			: "Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?",
+
+// Button Dialog
+DlgButtonText		: "Text (Wert)",
+DlgButtonType		: "Typ",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Absenden",
+DlgButtonTypeRst	: "Zurücksetzen",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",
+DlgCheckboxValue	: "Wert",
+DlgCheckboxSelected	: "ausgewählt",
+
+// Form Dialog
+DlgFormName		: "Name",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Name",
+DlgSelectValue		: "Wert",
+DlgSelectSize		: "Größe",
+DlgSelectLines		: "Linien",
+DlgSelectChkMulti	: "Erlaube Mehrfachauswahl",
+DlgSelectOpAvail	: "Mögliche Optionen",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Wert",
+DlgSelectBtnAdd		: "Hinzufügen",
+DlgSelectBtnModify	: "Ändern",
+DlgSelectBtnUp		: "Hoch",
+DlgSelectBtnDown	: "Runter",
+DlgSelectBtnSetValue : "Setze als Standardwert",
+DlgSelectBtnDelete	: "Entfernen",
+
+// Textarea Dialog
+DlgTextareaName	: "Name",
+DlgTextareaCols	: "Spalten",
+DlgTextareaRows	: "Reihen",
+
+// Text Field Dialog
+DlgTextName			: "Name",
+DlgTextValue		: "Wert",
+DlgTextCharWidth	: "Zeichenbreite",
+DlgTextMaxChars		: "Max. Zeichen",
+DlgTextType			: "Typ",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Passwort",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",
+DlgHiddenValue	: "Wert",
+
+// Bulleted List Dialog
+BulletedListProp	: "Listen-Eigenschaften",
+NumberedListProp	: "Nummerierte Listen-Eigenschaften",
+DlgLstStart			: "Start",
+DlgLstType			: "Typ",
+DlgLstTypeCircle	: "Ring",
+DlgLstTypeDisc		: "Kreis",
+DlgLstTypeSquare	: "Quadrat",
+DlgLstTypeNumbers	: "Nummern (1, 2, 3)",
+DlgLstTypeLCase		: "Kleinbuchstaben (a, b, c)",
+DlgLstTypeUCase		: "Großbuchstaben (A, B, C)",
+DlgLstTypeSRoman	: "Kleine römische Zahlen (i, ii, iii)",
+DlgLstTypeLRoman	: "Große römische Zahlen (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Allgemein",
+DlgDocBackTab		: "Hintergrund",
+DlgDocColorsTab		: "Farben und Abstände",
+DlgDocMetaTab		: "Metadaten",
+
+DlgDocPageTitle		: "Seitentitel",
+DlgDocLangDir		: "Schriftrichtung",
+DlgDocLangDirLTR	: "Links nach Rechts",
+DlgDocLangDirRTL	: "Rechts nach Links",
+DlgDocLangCode		: "Sprachkürzel",
+DlgDocCharSet		: "Zeichenkodierung",
+DlgDocCharSetCE		: "Zentraleuropäisch",
+DlgDocCharSetCT		: "traditionell Chinesisch (Big5)",
+DlgDocCharSetCR		: "Kyrillisch",
+DlgDocCharSetGR		: "Griechisch",
+DlgDocCharSetJP		: "Japanisch",
+DlgDocCharSetKR		: "Koreanisch",
+DlgDocCharSetTR		: "Türkisch",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Westeuropäisch",
+DlgDocCharSetOther	: "Andere Zeichenkodierung",
+
+DlgDocDocType		: "Dokumententyp",
+DlgDocDocTypeOther	: "Anderer Dokumententyp",
+DlgDocIncXHTML		: "Beziehe XHTML Deklarationen ein",
+DlgDocBgColor		: "Hintergrundfarbe",
+DlgDocBgImage		: "Hintergrundbild URL",
+DlgDocBgNoScroll	: "feststehender Hintergrund",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Besuchter Link",
+DlgDocCActive		: "Aktiver Link",
+DlgDocMargins		: "Seitenränder",
+DlgDocMaTop			: "Oben",
+DlgDocMaLeft		: "Links",
+DlgDocMaRight		: "Rechts",
+DlgDocMaBottom		: "Unten",
+DlgDocMeIndex		: "Schlüsselwörter (durch Komma getrennt)",
+DlgDocMeDescr		: "Dokument-Beschreibung",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Vorschau",
+
+// Templates Dialog
+Templates			: "Vorlagen",
+DlgTemplatesTitle	: "Vorlagen",
+DlgTemplatesSelMsg	: "Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen (der aktuelle Inhalt wird dabei gelöscht!):",
+DlgTemplatesLoading	: "Liste der Vorlagen wird geladen. Bitte warten...",
+DlgTemplatesNoTpl	: "(keine Vorlagen definiert)",
+DlgTemplatesReplace	: "Aktuellen Inhalt ersetzen",
+
+// About Dialog
+DlgAboutAboutTab	: "Über",
+DlgAboutBrowserInfoTab	: "Browser-Info",
+DlgAboutLicenseTab	: "Lizenz",
+DlgAboutVersion		: "Version",
+DlgAboutInfo		: "Für weitere Informationen siehe",
+
+// Div Dialog
+DlgDivGeneralTab	: "Allgemein",
+DlgDivAdvancedTab	: "Erweitert",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/el.js b/modules/editor/skins/fckeditor/editor/lang/el.js
new file mode 100644
index 000000000..e62ded66b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/el.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Greek language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Απόκρυψη Μπάρας Εργαλείων",
+ToolbarExpand		: "Εμφάνιση Μπάρας Εργαλείων",
+
+// Toolbar Items and Context Menu
+Save				: "Αποθήκευση",
+NewPage				: "Νέα Σελίδα",
+Preview				: "Προεπισκόπιση",
+Cut					: "Αποκοπή",
+Copy				: "Αντιγραφή",
+Paste				: "Επικόλληση",
+PasteText			: "Επικόλληση (απλό κείμενο)",
+PasteWord			: "Επικόλληση από το Word",
+Print				: "Εκτύπωση",
+SelectAll			: "Επιλογή όλων",
+RemoveFormat		: "Αφαίρεση Μορφοποίησης",
+InsertLinkLbl		: "Σύνδεσμος (Link)",
+InsertLink			: "Εισαγωγή/Μεταβολή Συνδέσμου (Link)",
+RemoveLink			: "Αφαίρεση Συνδέσμου (Link)",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Εισαγωγή/επεξεργασία Anchor",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Εικόνα",
+InsertImage			: "Εισαγωγή/Μεταβολή Εικόνας",
+InsertFlashLbl		: "Εισαγωγή Flash",
+InsertFlash			: "Εισαγωγή/επεξεργασία Flash",
+InsertTableLbl		: "Πίνακας",
+InsertTable			: "Εισαγωγή/Μεταβολή Πίνακα",
+InsertLineLbl		: "Γραμμή",
+InsertLine			: "Εισαγωγή Οριζόντιας Γραμμής",
+InsertSpecialCharLbl: "Ειδικό Σύμβολο",
+InsertSpecialChar	: "Εισαγωγή Ειδικού Συμβόλου",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Εισαγωγή Smiley",
+About				: "Περί του FCKeditor",
+Bold				: "Έντονα",
+Italic				: "Πλάγια",
+Underline			: "Υπογράμμιση",
+StrikeThrough		: "Διαγράμμιση",
+Subscript			: "Δείκτης",
+Superscript			: "Εκθέτης",
+LeftJustify			: "Στοίχιση Αριστερά",
+CenterJustify		: "Στοίχιση στο Κέντρο",
+RightJustify		: "Στοίχιση Δεξιά",
+BlockJustify		: "Πλήρης Στοίχιση (Block)",
+DecreaseIndent		: "Μείωση Εσοχής",
+IncreaseIndent		: "Αύξηση Εσοχής",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Αναίρεση",
+Redo				: "Επαναφορά",
+NumberedListLbl		: "Λίστα με Αριθμούς",
+NumberedList		: "Εισαγωγή/Διαγραφή Λίστας με Αριθμούς",
+BulletedListLbl		: "Λίστα με Bullets",
+BulletedList		: "Εισαγωγή/Διαγραφή Λίστας με Bullets",
+ShowTableBorders	: "Προβολή Ορίων Πίνακα",
+ShowDetails			: "Προβολή Λεπτομερειών",
+Style				: "Στυλ",
+FontFormat			: "Μορφή Γραμματοσειράς",
+Font				: "Γραμματοσειρά",
+FontSize			: "Μέγεθος",
+TextColor			: "Χρώμα Γραμμάτων",
+BGColor				: "Χρώμα Υποβάθρου",
+Source				: "HTML κώδικας",
+Find				: "Αναζήτηση",
+Replace				: "Αντικατάσταση",
+SpellCheck			: "Ορθογραφικός έλεγχος",
+UniversalKeyboard	: "Διεθνής πληκτρολόγιο",
+PageBreakLbl		: "Τέλος σελίδας",
+PageBreak			: "Εισαγωγή τέλους σελίδας",
+
+Form			: "Φόρμα",
+Checkbox		: "Κουτί επιλογής",
+RadioButton		: "Κουμπί Radio",
+TextField		: "Πεδίο κειμένου",
+Textarea		: "Περιοχή κειμένου",
+HiddenField		: "Κρυφό πεδίο",
+Button			: "Κουμπί",
+SelectionField	: "Πεδίο επιλογής",
+ImageButton		: "Κουμπί εικόνας",
+
+FitWindow		: "Μεγιστοποίηση προγράμματος",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Μεταβολή Συνδέσμου (Link)",
+CellCM				: "Κελί",
+RowCM				: "Σειρά",
+ColumnCM			: "Στήλη",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Διαγραφή Γραμμών",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Διαγραφή Κολωνών",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Διαγραφή Κελιών",
+MergeCells			: "Ενοποίηση Κελιών",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Διαγραφή πίνακα",
+CellProperties		: "Ιδιότητες Κελιού",
+TableProperties		: "Ιδιότητες Πίνακα",
+ImageProperties		: "Ιδιότητες Εικόνας",
+FlashProperties		: "Ιδιότητες Flash",
+
+AnchorProp			: "Ιδιότητες άγκυρας",
+ButtonProp			: "Ιδιότητες κουμπιού",
+CheckboxProp		: "Ιδιότητες κουμπιού επιλογής",
+HiddenFieldProp		: "Ιδιότητες κρυφού πεδίου",
+RadioButtonProp		: "Ιδιότητες κουμπιού radio",
+ImageButtonProp		: "Ιδιότητες κουμπιού εικόνας",
+TextFieldProp		: "Ιδιότητες πεδίου κειμένου",
+SelectionFieldProp	: "Ιδιότητες πεδίου επιλογής",
+TextareaProp		: "Ιδιότητες περιοχής κειμένου",
+FormProp			: "Ιδιότητες φόρμας",
+
+FontFormats			: "Κανονικό;Μορφοποιημένο;Διεύθυνση;Επικεφαλίδα 1;Επικεφαλίδα 2;Επικεφαλίδα 3;Επικεφαλίδα 4;Επικεφαλίδα 5;Επικεφαλίδα 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Επεξεργασία XHTML. Παρακαλώ περιμένετε...",
+Done				: "Έτοιμο",
+PasteWordConfirm	: "Το κείμενο που θέλετε να επικολήσετε, φαίνεται πως προέρχεται από το Word. Θέλετε να καθαριστεί πριν επικοληθεί;",
+NotCompatiblePaste	: "Αυτή η επιλογή είναι διαθέσιμη στον Internet Explorer έκδοση 5.5+. Θέλετε να γίνει η επικόλληση χωρίς καθαρισμό;",
+UnknownToolbarItem	: "Άγνωστο αντικείμενο της μπάρας εργαλείων \"%1\"",
+UnknownCommand		: "Άγνωστή εντολή \"%1\"",
+NotImplemented		: "Η εντολή δεν έχει ενεργοποιηθεί",
+UnknownToolbarSet	: "Η μπάρα εργαλείων \"%1\" δεν υπάρχει",
+NoActiveX			: "Οι ρυθμίσεις ασφαλείας του browser σας μπορεί να περιορίσουν κάποιες ρυθμίσεις του προγράμματος. Χρειάζεται να ενεργοποιήσετε την επιλογή \"Run ActiveX controls and plug-ins\". Ίσως παρουσιαστούν λάθη και παρατηρήσετε ελειπείς λειτουργίες.",
+BrowseServerBlocked : "Οι πόροι του browser σας δεν είναι προσπελάσιμοι. Σιγουρευτείτε ότι δεν υπάρχουν ενεργοί popup blockers.",
+DialogBlocked		: "Δεν ήταν δυνατό να ανοίξει το παράθυρο διαλόγου. Σιγουρευτείτε ότι δεν υπάρχουν ενεργοί popup blockers.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Ακύρωση",
+DlgBtnClose			: "Κλείσιμο",
+DlgBtnBrowseServer	: "Εξερεύνηση διακομιστή",
+DlgAdvancedTag		: "Για προχωρημένους",
+DlgOpOther			: "<Άλλα>",
+DlgInfoTab			: "Πληροφορίες",
+DlgAlertUrl			: "Παρακαλώ εισάγετε URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<χωρίς>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Κατεύθυνση κειμένου",
+DlgGenLangDirLtr	: "Αριστερά προς Δεξιά (LTR)",
+DlgGenLangDirRtl	: "Δεξιά προς Αριστερά (RTL)",
+DlgGenLangCode		: "Κωδικός Γλώσσας",
+DlgGenAccessKey		: "Συντόμευση (Access Key)",
+DlgGenName			: "Όνομα",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Αναλυτική περιγραφή URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Συμβουλευτικός τίτλος",
+DlgGenContType		: "Συμβουλευτικός τίτλος περιεχομένου",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Στύλ",
+
+// Image Dialog
+DlgImgTitle			: "Ιδιότητες Εικόνας",
+DlgImgInfoTab		: "Πληροφορίες Εικόνας",
+DlgImgBtnUpload		: "Αποστολή στον Διακομιστή",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Αποστολή",
+DlgImgAlt			: "Εναλλακτικό Κείμενο (ALT)",
+DlgImgWidth			: "Πλάτος",
+DlgImgHeight		: "Ύψος",
+DlgImgLockRatio		: "Κλείδωμα Αναλογίας",
+DlgBtnResetSize		: "Επαναφορά Αρχικού Μεγέθους",
+DlgImgBorder		: "Περιθώριο",
+DlgImgHSpace		: "Οριζόντιος Χώρος (HSpace)",
+DlgImgVSpace		: "Κάθετος Χώρος (VSpace)",
+DlgImgAlign			: "Ευθυγράμμιση (Align)",
+DlgImgAlignLeft		: "Αριστερά",
+DlgImgAlignAbsBottom: "Απόλυτα Κάτω (Abs Bottom)",
+DlgImgAlignAbsMiddle: "Απόλυτα στη Μέση (Abs Middle)",
+DlgImgAlignBaseline	: "Γραμμή Βάσης (Baseline)",
+DlgImgAlignBottom	: "Κάτω (Bottom)",
+DlgImgAlignMiddle	: "Μέση (Middle)",
+DlgImgAlignRight	: "Δεξιά (Right)",
+DlgImgAlignTextTop	: "Κορυφή Κειμένου (Text Top)",
+DlgImgAlignTop		: "Πάνω (Top)",
+DlgImgPreview		: "Προεπισκόπιση",
+DlgImgAlertUrl		: "Εισάγετε την τοποθεσία (URL) της εικόνας",
+DlgImgLinkTab		: "Σύνδεσμος",
+
+// Flash Dialog
+DlgFlashTitle		: "Ιδιότητες flash",
+DlgFlashChkPlay		: "Αυτόματη έναρξη",
+DlgFlashChkLoop		: "Επανάληψη",
+DlgFlashChkMenu		: "Ενεργοποίηση Flash Menu",
+DlgFlashScale		: "Κλίμακα",
+DlgFlashScaleAll	: "Εμφάνιση όλων",
+DlgFlashScaleNoBorder	: "Χωρίς όρια",
+DlgFlashScaleFit	: "Ακριβής εφαρμογή",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Σύνδεσμος (Link)",
+DlgLnkInfoTab		: "Link",
+DlgLnkTargetTab		: "Παράθυρο Στόχος (Target)",
+
+DlgLnkType			: "Τύπος συνδέσμου (Link)",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Άγκυρα σε αυτή τη σελίδα",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Προτόκολο",
+DlgLnkProtoOther	: "<άλλο>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Επιλέξτε μια άγκυρα",
+DlgLnkAnchorByName	: "Βάσει του Ονόματος (Name) της άγκυρας",
+DlgLnkAnchorById	: "Βάσει του Element Id",
+DlgLnkNoAnchors		: "(Δεν υπάρχουν άγκυρες στο κείμενο)",
+DlgLnkEMail			: "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου",
+DlgLnkEMailSubject	: "Θέμα Μηνύματος",
+DlgLnkEMailBody		: "Κείμενο Μηνύματος",
+DlgLnkUpload		: "Αποστολή",
+DlgLnkBtnUpload		: "Αποστολή στον Διακομιστή",
+
+DlgLnkTarget		: "Παράθυρο Στόχος (Target)",
+DlgLnkTargetFrame	: "<πλαίσιο>",
+DlgLnkTargetPopup	: "<παράθυρο popup>",
+DlgLnkTargetBlank	: "Νέο Παράθυρο (_blank)",
+DlgLnkTargetParent	: "Γονικό Παράθυρο (_parent)",
+DlgLnkTargetSelf	: "Ίδιο Παράθυρο (_self)",
+DlgLnkTargetTop		: "Ανώτατο Παράθυρο (_top)",
+DlgLnkTargetFrameName	: "Όνομα πλαισίου στόχου",
+DlgLnkPopWinName	: "Όνομα Popup Window",
+DlgLnkPopWinFeat	: "Επιλογές Popup Window",
+DlgLnkPopResize		: "Με αλλαγή Μεγέθους",
+DlgLnkPopLocation	: "Μπάρα Τοποθεσίας",
+DlgLnkPopMenu		: "Μπάρα Menu",
+DlgLnkPopScroll		: "Μπάρες Κύλισης",
+DlgLnkPopStatus		: "Μπάρα Status",
+DlgLnkPopToolbar	: "Μπάρα Εργαλείων",
+DlgLnkPopFullScrn	: "Ολόκληρη η Οθόνη (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Πλάτος",
+DlgLnkPopHeight		: "Ύψος",
+DlgLnkPopLeft		: "Τοποθεσία Αριστερής Άκρης",
+DlgLnkPopTop		: "Τοποθεσία Πάνω Άκρης",
+
+DlnLnkMsgNoUrl		: "Εισάγετε την τοποθεσία (URL) του υπερσυνδέσμου (Link)",
+DlnLnkMsgNoEMail	: "Εισάγετε την διεύθυνση ηλεκτρονικού ταχυδρομείου",
+DlnLnkMsgNoAnchor	: "Επιλέξτε ένα Anchor",
+DlnLnkMsgInvPopName	: "Το όνομα του popup πρέπει να αρχίζει με χαρακτήρα της αλφαβήτου και να μην περιέχει κενά",
+
+// Color Dialog
+DlgColorTitle		: "Επιλογή χρώματος",
+DlgColorBtnClear	: "Καθαρισμός",
+DlgColorHighlight	: "Προεπισκόπιση",
+DlgColorSelected	: "Επιλεγμένο",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Επιλέξτε ένα Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Επιλέξτε ένα Ειδικό Σύμβολο",
+
+// Table Dialog
+DlgTableTitle		: "Ιδιότητες Πίνακα",
+DlgTableRows		: "Γραμμές",
+DlgTableColumns		: "Κολώνες",
+DlgTableBorder		: "Μέγεθος Περιθωρίου",
+DlgTableAlign		: "Στοίχιση",
+DlgTableAlignNotSet	: "<χωρίς>",
+DlgTableAlignLeft	: "Αριστερά",
+DlgTableAlignCenter	: "Κέντρο",
+DlgTableAlignRight	: "Δεξιά",
+DlgTableWidth		: "Πλάτος",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "\%",
+DlgTableHeight		: "Ύψος",
+DlgTableCellSpace	: "Απόσταση κελιών",
+DlgTableCellPad		: "Γέμισμα κελιών",
+DlgTableCaption		: "Υπέρτιτλος",
+DlgTableSummary		: "Περίληψη",
+
+// Table Cell Dialog
+DlgCellTitle		: "Ιδιότητες Κελιού",
+DlgCellWidth		: "Πλάτος",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "\%",
+DlgCellHeight		: "Ύψος",
+DlgCellWordWrap		: "Με αλλαγή γραμμής",
+DlgCellWordWrapNotSet	: "<χωρίς>",
+DlgCellWordWrapYes	: "Ναι",
+DlgCellWordWrapNo	: "Όχι",
+DlgCellHorAlign		: "Οριζόντια Στοίχιση",
+DlgCellHorAlignNotSet	: "<χωρίς>",
+DlgCellHorAlignLeft	: "Αριστερά",
+DlgCellHorAlignCenter	: "Κέντρο",
+DlgCellHorAlignRight: "Δεξιά",
+DlgCellVerAlign		: "Κάθετη Στοίχιση",
+DlgCellVerAlignNotSet	: "<χωρίς>",
+DlgCellVerAlignTop	: "Πάνω (Top)",
+DlgCellVerAlignMiddle	: "Μέση (Middle)",
+DlgCellVerAlignBottom	: "Κάτω (Bottom)",
+DlgCellVerAlignBaseline	: "Γραμμή Βάσης (Baseline)",
+DlgCellRowSpan		: "Αριθμός Γραμμών (Rows Span)",
+DlgCellCollSpan		: "Αριθμός Κολωνών (Columns Span)",
+DlgCellBackColor	: "Χρώμα Υποβάθρου",
+DlgCellBorderColor	: "Χρώμα Περιθωρίου",
+DlgCellBtnSelect	: "Επιλογή...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Αναζήτηση",
+DlgFindFindBtn		: "Αναζήτηση",
+DlgFindNotFoundMsg	: "Το κείμενο δεν βρέθηκε.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Αντικατάσταση",
+DlgReplaceFindLbl		: "Αναζήτηση:",
+DlgReplaceReplaceLbl	: "Αντικατάσταση με:",
+DlgReplaceCaseChk		: "Έλεγχος πεζών/κεφαλαίων",
+DlgReplaceReplaceBtn	: "Αντικατάσταση",
+DlgReplaceReplAllBtn	: "Αντικατάσταση Όλων",
+DlgReplaceWordChk		: "Εύρεση πλήρους λέξης",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Οι ρυθμίσεις ασφαλείας του φυλλομετρητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Χρησιμοποιείστε το πληκτρολόγιο (Ctrl+X).",
+PasteErrorCopy	: "Οι ρυθμίσεις ασφαλείας του φυλλομετρητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Χρησιμοποιείστε το πληκτρολόγιο (Ctrl+C).",
+
+PasteAsText		: "Επικόλληση ως Απλό Κείμενο",
+PasteFromWord	: "Επικόλληση από το Word",
+
+DlgPasteMsg2	: "Παρακαλώ επικολήστε στο ακόλουθο κουτί χρησιμοποιόντας το πληκτρολόγιο (<STRONG>Ctrl+V</STRONG>) και πατήστε <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Αγνόηση προδιαγραφών γραμματοσειράς",
+DlgPasteRemoveStyles	: "Αφαίρεση προδιαγραφών στύλ",
+
+// Color Picker
+ColorAutomatic	: "Αυτόματο",
+ColorMoreColors	: "Περισσότερα χρώματα...",
+
+// Document Properties
+DocProps		: "Ιδιότητες εγγράφου",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ιδιότητες άγκυρας",
+DlgAnchorName		: "Όνομα άγκυρας",
+DlgAnchorErrorName	: "Παρακαλούμε εισάγετε όνομα άγκυρας",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Δεν υπάρχει στο λεξικό",
+DlgSpellChangeTo		: "Αλλαγή σε",
+DlgSpellBtnIgnore		: "Αγνόηση",
+DlgSpellBtnIgnoreAll	: "Αγνόηση όλων",
+DlgSpellBtnReplace		: "Αντικατάσταση",
+DlgSpellBtnReplaceAll	: "Αντικατάσταση όλων",
+DlgSpellBtnUndo			: "Αναίρεση",
+DlgSpellNoSuggestions	: "- Δεν υπάρχουν προτάσεις -",
+DlgSpellProgress		: "Ορθογραφικός έλεγχος σε εξέλιξη...",
+DlgSpellNoMispell		: "Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν βρέθηκαν λάθη",
+DlgSpellNoChanges		: "Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Δεν άλλαξαν λέξεις",
+DlgSpellOneChange		: "Ο ορθογραφικός έλεγχος ολοκληρώθηκε: Μια λέξη άλλαξε",
+DlgSpellManyChanges		: "Ο ορθογραφικός έλεγχος ολοκληρώθηκε: %1 λέξεις άλλαξαν",
+
+IeSpellDownload			: "Δεν υπάρχει εγκατεστημένος ορθογράφος. Θέλετε να τον κατεβάσετε τώρα;",
+
+// Button Dialog
+DlgButtonText		: "Κείμενο (Τιμή)",
+DlgButtonType		: "Τύπος",
+DlgButtonTypeBtn	: "Κουμπί",
+DlgButtonTypeSbm	: "Καταχώρηση",
+DlgButtonTypeRst	: "Επαναφορά",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Όνομα",
+DlgCheckboxValue	: "Τιμή",
+DlgCheckboxSelected	: "Επιλεγμένο",
+
+// Form Dialog
+DlgFormName		: "Όνομα",
+DlgFormAction	: "Δράση",
+DlgFormMethod	: "Μάθοδος",
+
+// Select Field Dialog
+DlgSelectName		: "Όνομα",
+DlgSelectValue		: "Τιμή",
+DlgSelectSize		: "Μέγεθος",
+DlgSelectLines		: "γραμμές",
+DlgSelectChkMulti	: "Πολλαπλές επιλογές",
+DlgSelectOpAvail	: "Διαθέσιμες επιλογές",
+DlgSelectOpText		: "Κείμενο",
+DlgSelectOpValue	: "Τιμή",
+DlgSelectBtnAdd		: "Προσθήκη",
+DlgSelectBtnModify	: "Αλλαγή",
+DlgSelectBtnUp		: "Πάνω",
+DlgSelectBtnDown	: "Κάτω",
+DlgSelectBtnSetValue : "Προεπιλεγμένη επιλογή",
+DlgSelectBtnDelete	: "Διαγραφή",
+
+// Textarea Dialog
+DlgTextareaName	: "Όνομα",
+DlgTextareaCols	: "Στήλες",
+DlgTextareaRows	: "Σειρές",
+
+// Text Field Dialog
+DlgTextName			: "Όνομα",
+DlgTextValue		: "Τιμή",
+DlgTextCharWidth	: "Μήκος χαρακτήρων",
+DlgTextMaxChars		: "Μέγιστοι χαρακτήρες",
+DlgTextType			: "Τύπος",
+DlgTextTypeText		: "Κείμενο",
+DlgTextTypePass		: "Κωδικός",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Όνομα",
+DlgHiddenValue	: "Τιμή",
+
+// Bulleted List Dialog
+BulletedListProp	: "Ιδιότητες λίστας Bulleted",
+NumberedListProp	: "Ιδιότητες αριθμημένης λίστας ",
+DlgLstStart			: "Αρχή",
+DlgLstType			: "Τύπος",
+DlgLstTypeCircle	: "Κύκλος",
+DlgLstTypeDisc		: "Δίσκος",
+DlgLstTypeSquare	: "Τετράγωνο",
+DlgLstTypeNumbers	: "Αριθμοί (1, 2, 3)",
+DlgLstTypeLCase		: "Πεζά γράμματα (a, b, c)",
+DlgLstTypeUCase		: "Κεφαλαία γράμματα (A, B, C)",
+DlgLstTypeSRoman	: "Μικρά λατινικά αριθμητικά (i, ii, iii)",
+DlgLstTypeLRoman	: "Μεγάλα λατινικά αριθμητικά (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Γενικά",
+DlgDocBackTab		: "Φόντο",
+DlgDocColorsTab		: "Χρώματα και περιθώρια",
+DlgDocMetaTab		: "Δεδομένα Meta",
+
+DlgDocPageTitle		: "Τίτλος σελίδας",
+DlgDocLangDir		: "Κατεύθυνση γραφής",
+DlgDocLangDirLTR	: "αριστερά προς δεξιά (LTR)",
+DlgDocLangDirRTL	: "δεξιά προς αριστερά (RTL)",
+DlgDocLangCode		: "Κωδικός γλώσσας",
+DlgDocCharSet		: "Κωδικοποίηση χαρακτήρων",
+DlgDocCharSetCE		: "Κεντρικής Ευρώπης",
+DlgDocCharSetCT		: "Παραδοσιακά κινέζικα (Big5)",
+DlgDocCharSetCR		: "Κυριλλική",
+DlgDocCharSetGR		: "Ελληνική",
+DlgDocCharSetJP		: "Ιαπωνική",
+DlgDocCharSetKR		: "Κορεάτικη",
+DlgDocCharSetTR		: "Τουρκική",
+DlgDocCharSetUN		: "Διεθνής (UTF-8)",
+DlgDocCharSetWE		: "Δυτικής Ευρώπης",
+DlgDocCharSetOther	: "Άλλη κωδικοποίηση χαρακτήρων",
+
+DlgDocDocType		: "Επικεφαλίδα τύπου εγγράφου",
+DlgDocDocTypeOther	: "Άλλη επικεφαλίδα τύπου εγγράφου",
+DlgDocIncXHTML		: "Να συμπεριληφθούν οι δηλώσεις XHTML",
+DlgDocBgColor		: "Χρώμα φόντου",
+DlgDocBgImage		: "Διεύθυνση εικόνας φόντου",
+DlgDocBgNoScroll	: "Φόντο χωρίς κύλιση",
+DlgDocCText			: "Κείμενο",
+DlgDocCLink			: "Σύνδεσμος",
+DlgDocCVisited		: "Σύνδεσμος που έχει επισκευθεί",
+DlgDocCActive		: "Ενεργός σύνδεσμος",
+DlgDocMargins		: "Περιθώρια σελίδας",
+DlgDocMaTop			: "Κορυφή",
+DlgDocMaLeft		: "Αριστερά",
+DlgDocMaRight		: "Δεξιά",
+DlgDocMaBottom		: "Κάτω",
+DlgDocMeIndex		: "Λέξεις κλειδιά δείκτες εγγράφου (διαχωρισμός με κόμμα)",
+DlgDocMeDescr		: "Περιγραφή εγγράφου",
+DlgDocMeAuthor		: "Συγγραφέας",
+DlgDocMeCopy		: "Πνευματικά δικαιώματα",
+DlgDocPreview		: "Προεπισκόπηση",
+
+// Templates Dialog
+Templates			: "Πρότυπα",
+DlgTemplatesTitle	: "Πρότυπα περιεχομένου",
+DlgTemplatesSelMsg	: "Παρακαλώ επιλέξτε πρότυπο για εισαγωγή στο πρόγραμμα<br>(τα υπάρχοντα περιεχόμενα θα χαθούν):",
+DlgTemplatesLoading	: "Φόρτωση καταλόγου προτύπων. Παρακαλώ περιμένετε...",
+DlgTemplatesNoTpl	: "(Δεν έχουν καθοριστεί πρότυπα)",
+DlgTemplatesReplace	: "Αντικατάσταση υπάρχοντων περιεχομένων",
+
+// About Dialog
+DlgAboutAboutTab	: "Σχετικά",
+DlgAboutBrowserInfoTab	: "Πληροφορίες Browser",
+DlgAboutLicenseTab	: "Άδεια",
+DlgAboutVersion		: "έκδοση",
+DlgAboutInfo		: "Για περισσότερες πληροφορίες",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/en-au.js b/modules/editor/skins/fckeditor/editor/lang/en-au.js
new file mode 100644
index 000000000..5ea421ef1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/en-au.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * English (Australia) language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Collapse Toolbar",
+ToolbarExpand		: "Expand Toolbar",
+
+// Toolbar Items and Context Menu
+Save				: "Save",
+NewPage				: "New Page",
+Preview				: "Preview",
+Cut					: "Cut",
+Copy				: "Copy",
+Paste				: "Paste",
+PasteText			: "Paste as plain text",
+PasteWord			: "Paste from Word",
+Print				: "Print",
+SelectAll			: "Select All",
+RemoveFormat		: "Remove Format",
+InsertLinkLbl		: "Link",
+InsertLink			: "Insert/Edit Link",
+RemoveLink			: "Remove Link",
+VisitLink			: "Open Link",
+Anchor				: "Insert/Edit Anchor",
+AnchorDelete		: "Remove Anchor",
+InsertImageLbl		: "Image",
+InsertImage			: "Insert/Edit Image",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insert/Edit Flash",
+InsertTableLbl		: "Table",
+InsertTable			: "Insert/Edit Table",
+InsertLineLbl		: "Line",
+InsertLine			: "Insert Horizontal Line",
+InsertSpecialCharLbl: "Special Character",
+InsertSpecialChar	: "Insert Special Character",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Insert Smiley",
+About				: "About FCKeditor",
+Bold				: "Bold",
+Italic				: "Italic",
+Underline			: "Underline",
+StrikeThrough		: "Strike Through",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Left Justify",
+CenterJustify		: "Centre Justify",
+RightJustify		: "Right Justify",
+BlockJustify		: "Block Justify",
+DecreaseIndent		: "Decrease Indent",
+IncreaseIndent		: "Increase Indent",
+Blockquote			: "Blockquote",
+CreateDiv			: "Create Div Container",
+EditDiv				: "Edit Div Container",
+DeleteDiv			: "Remove Div Container",
+Undo				: "Undo",
+Redo				: "Redo",
+NumberedListLbl		: "Numbered List",
+NumberedList		: "Insert/Remove Numbered List",
+BulletedListLbl		: "Bulleted List",
+BulletedList		: "Insert/Remove Bulleted List",
+ShowTableBorders	: "Show Table Borders",
+ShowDetails			: "Show Details",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Size",
+TextColor			: "Text Colour",
+BGColor				: "Background Colour",
+Source				: "Source",
+Find				: "Find",
+Replace				: "Replace",
+SpellCheck			: "Check Spelling",
+UniversalKeyboard	: "Universal Keyboard",
+PageBreakLbl		: "Page Break",
+PageBreak			: "Insert Page Break",
+
+Form			: "Form",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Hidden Field",
+Button			: "Button",
+SelectionField	: "Selection Field",
+ImageButton		: "Image Button",
+
+FitWindow		: "Maximize the editor size",
+ShowBlocks		: "Show Blocks",
+
+// Context Menu
+EditLink			: "Edit Link",
+CellCM				: "Cell",
+RowCM				: "Row",
+ColumnCM			: "Column",
+InsertRowAfter		: "Insert Row After",
+InsertRowBefore		: "Insert Row Before",
+DeleteRows			: "Delete Rows",
+InsertColumnAfter	: "Insert Column After",
+InsertColumnBefore	: "Insert Column Before",
+DeleteColumns		: "Delete Columns",
+InsertCellAfter		: "Insert Cell After",
+InsertCellBefore	: "Insert Cell Before",
+DeleteCells			: "Delete Cells",
+MergeCells			: "Merge Cells",
+MergeRight			: "Merge Right",
+MergeDown			: "Merge Down",
+HorizontalSplitCell	: "Split Cell Horizontally",
+VerticalSplitCell	: "Split Cell Vertically",
+TableDelete			: "Delete Table",
+CellProperties		: "Cell Properties",
+TableProperties		: "Table Properties",
+ImageProperties		: "Image Properties",
+FlashProperties		: "Flash Properties",
+
+AnchorProp			: "Anchor Properties",
+ButtonProp			: "Button Properties",
+CheckboxProp		: "Checkbox Properties",
+HiddenFieldProp		: "Hidden Field Properties",
+RadioButtonProp		: "Radio Button Properties",
+ImageButtonProp		: "Image Button Properties",
+TextFieldProp		: "Text Field Properties",
+SelectionFieldProp	: "Selection Field Properties",
+TextareaProp		: "Textarea Properties",
+FormProp			: "Form Properties",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processing XHTML. Please wait...",
+Done				: "Done",
+PasteWordConfirm	: "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?",
+NotCompatiblePaste	: "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?",
+UnknownToolbarItem	: "Unknown toolbar item \"%1\"",
+UnknownCommand		: "Unknown command name \"%1\"",
+NotImplemented		: "Command not implemented",
+UnknownToolbarSet	: "Toolbar set \"%1\" doesn't exist",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancel",
+DlgBtnClose			: "Close",
+DlgBtnBrowseServer	: "Browse Server",
+DlgAdvancedTag		: "Advanced",
+DlgOpOther			: "<Other>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Please insert the URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<not set>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Language Direction",
+DlgGenLangDirLtr	: "Left to Right (LTR)",
+DlgGenLangDirRtl	: "Right to Left (RTL)",
+DlgGenLangCode		: "Language Code",
+DlgGenAccessKey		: "Access Key",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Long Description URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Image Properties",
+DlgImgInfoTab		: "Image Info",
+DlgImgBtnUpload		: "Send it to the Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternative Text",
+DlgImgWidth			: "Width",
+DlgImgHeight		: "Height",
+DlgImgLockRatio		: "Lock Ratio",
+DlgBtnResetSize		: "Reset Size",
+DlgImgBorder		: "Border",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Align",
+DlgImgAlignLeft		: "Left",
+DlgImgAlignAbsBottom: "Abs Bottom",
+DlgImgAlignAbsMiddle: "Abs Middle",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Bottom",
+DlgImgAlignMiddle	: "Middle",
+DlgImgAlignRight	: "Right",
+DlgImgAlignTextTop	: "Text Top",
+DlgImgAlignTop		: "Top",
+DlgImgPreview		: "Preview",
+DlgImgAlertUrl		: "Please type the image URL",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",
+DlgFlashChkPlay		: "Auto Play",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Enable Flash Menu",
+DlgFlashScale		: "Scale",
+DlgFlashScaleAll	: "Show all",
+DlgFlashScaleNoBorder	: "No Border",
+DlgFlashScaleFit	: "Exact Fit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Target",
+
+DlgLnkType			: "Link Type",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Link to anchor in the text",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<other>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Select an Anchor",
+DlgLnkAnchorByName	: "By Anchor Name",
+DlgLnkAnchorById	: "By Element Id",
+DlgLnkNoAnchors		: "(No anchors available in the document)",
+DlgLnkEMail			: "E-Mail Address",
+DlgLnkEMailSubject	: "Message Subject",
+DlgLnkEMailBody		: "Message Body",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Send it to the Server",
+
+DlgLnkTarget		: "Target",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<popup window>",
+DlgLnkTargetBlank	: "New Window (_blank)",
+DlgLnkTargetParent	: "Parent Window (_parent)",
+DlgLnkTargetSelf	: "Same Window (_self)",
+DlgLnkTargetTop		: "Topmost Window (_top)",
+DlgLnkTargetFrameName	: "Target Frame Name",
+DlgLnkPopWinName	: "Popup Window Name",
+DlgLnkPopWinFeat	: "Popup Window Features",
+DlgLnkPopResize		: "Resizable",
+DlgLnkPopLocation	: "Location Bar",
+DlgLnkPopMenu		: "Menu Bar",
+DlgLnkPopScroll		: "Scroll Bars",
+DlgLnkPopStatus		: "Status Bar",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Full Screen (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Width",
+DlgLnkPopHeight		: "Height",
+DlgLnkPopLeft		: "Left Position",
+DlgLnkPopTop		: "Top Position",
+
+DlnLnkMsgNoUrl		: "Please type the link URL",
+DlnLnkMsgNoEMail	: "Please type the e-mail address",
+DlnLnkMsgNoAnchor	: "Please select an anchor",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",
+
+// Color Dialog
+DlgColorTitle		: "Select Colour",
+DlgColorBtnClear	: "Clear",
+DlgColorHighlight	: "Highlight",
+DlgColorSelected	: "Selected",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insert a Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Select Special Character",
+
+// Table Dialog
+DlgTableTitle		: "Table Properties",
+DlgTableRows		: "Rows",
+DlgTableColumns		: "Columns",
+DlgTableBorder		: "Border size",
+DlgTableAlign		: "Alignment",
+DlgTableAlignNotSet	: "<Not set>",
+DlgTableAlignLeft	: "Left",
+DlgTableAlignCenter	: "Centre",
+DlgTableAlignRight	: "Right",
+DlgTableWidth		: "Width",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Height",
+DlgTableCellSpace	: "Cell spacing",
+DlgTableCellPad		: "Cell padding",
+DlgTableCaption		: "Caption",
+DlgTableSummary		: "Summary",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cell Properties",
+DlgCellWidth		: "Width",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Height",
+DlgCellWordWrap		: "Word Wrap",
+DlgCellWordWrapNotSet	: "<Not set>",
+DlgCellWordWrapYes	: "Yes",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlignNotSet	: "<Not set>",
+DlgCellHorAlignLeft	: "Left",
+DlgCellHorAlignCenter	: "Centre",
+DlgCellHorAlignRight: "Right",
+DlgCellVerAlign		: "Vertical Alignment",
+DlgCellVerAlignNotSet	: "<Not set>",
+DlgCellVerAlignTop	: "Top",
+DlgCellVerAlignMiddle	: "Middle",
+DlgCellVerAlignBottom	: "Bottom",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rows Span",
+DlgCellCollSpan		: "Columns Span",
+DlgCellBackColor	: "Background Colour",
+DlgCellBorderColor	: "Border Colour",
+DlgCellBtnSelect	: "Select...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",
+
+// Find Dialog
+DlgFindTitle		: "Find",
+DlgFindFindBtn		: "Find",
+DlgFindNotFoundMsg	: "The specified text was not found.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Replace",
+DlgReplaceFindLbl		: "Find what:",
+DlgReplaceReplaceLbl	: "Replace with:",
+DlgReplaceCaseChk		: "Match case",
+DlgReplaceReplaceBtn	: "Replace",
+DlgReplaceReplAllBtn	: "Replace All",
+DlgReplaceWordChk		: "Match whole word",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).",
+PasteErrorCopy	: "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).",
+
+PasteAsText		: "Paste as Plain Text",
+PasteFromWord	: "Paste from Word",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",
+DlgPasteRemoveStyles	: "Remove Styles definitions",
+
+// Color Picker
+ColorAutomatic	: "Automatic",
+ColorMoreColors	: "More Colours...",
+
+// Document Properties
+DocProps		: "Document Properties",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anchor Properties",
+DlgAnchorName		: "Anchor Name",
+DlgAnchorErrorName	: "Please type the anchor name",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Not in dictionary",
+DlgSpellChangeTo		: "Change to",
+DlgSpellBtnIgnore		: "Ignore",
+DlgSpellBtnIgnoreAll	: "Ignore All",
+DlgSpellBtnReplace		: "Replace",
+DlgSpellBtnReplaceAll	: "Replace All",
+DlgSpellBtnUndo			: "Undo",
+DlgSpellNoSuggestions	: "- No suggestions -",
+DlgSpellProgress		: "Spell check in progress...",
+DlgSpellNoMispell		: "Spell check complete: No misspellings found",
+DlgSpellNoChanges		: "Spell check complete: No words changed",
+DlgSpellOneChange		: "Spell check complete: One word changed",
+DlgSpellManyChanges		: "Spell check complete: %1 words changed",
+
+IeSpellDownload			: "Spell checker not installed. Do you want to download it now?",
+
+// Button Dialog
+DlgButtonText		: "Text (Value)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",
+DlgCheckboxValue	: "Value",
+DlgCheckboxSelected	: "Selected",
+
+// Form Dialog
+DlgFormName		: "Name",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Name",
+DlgSelectValue		: "Value",
+DlgSelectSize		: "Size",
+DlgSelectLines		: "lines",
+DlgSelectChkMulti	: "Allow multiple selections",
+DlgSelectOpAvail	: "Available Options",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Value",
+DlgSelectBtnAdd		: "Add",
+DlgSelectBtnModify	: "Modify",
+DlgSelectBtnUp		: "Up",
+DlgSelectBtnDown	: "Down",
+DlgSelectBtnSetValue : "Set as selected value",
+DlgSelectBtnDelete	: "Delete",
+
+// Textarea Dialog
+DlgTextareaName	: "Name",
+DlgTextareaCols	: "Columns",
+DlgTextareaRows	: "Rows",
+
+// Text Field Dialog
+DlgTextName			: "Name",
+DlgTextValue		: "Value",
+DlgTextCharWidth	: "Character Width",
+DlgTextMaxChars		: "Maximum Characters",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Password",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",
+DlgHiddenValue	: "Value",
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted List Properties",
+NumberedListProp	: "Numbered List Properties",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Circle",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Numbers (1, 2, 3)",
+DlgLstTypeLCase		: "Lowercase Letters (a, b, c)",
+DlgLstTypeUCase		: "Uppercase Letters (A, B, C)",
+DlgLstTypeSRoman	: "Small Roman Numerals (i, ii, iii)",
+DlgLstTypeLRoman	: "Large Roman Numerals (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Background",
+DlgDocColorsTab		: "Colours and Margins",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Page Title",
+DlgDocLangDir		: "Language Direction",
+DlgDocLangDirLTR	: "Left to Right (LTR)",
+DlgDocLangDirRTL	: "Right to Left (RTL)",
+DlgDocLangCode		: "Language Code",
+DlgDocCharSet		: "Character Set Encoding",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "Other Character Set Encoding",
+
+DlgDocDocType		: "Document Type Heading",
+DlgDocDocTypeOther	: "Other Document Type Heading",
+DlgDocIncXHTML		: "Include XHTML Declarations",
+DlgDocBgColor		: "Background Colour",
+DlgDocBgImage		: "Background Image URL",
+DlgDocBgNoScroll	: "Nonscrolling Background",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Visited Link",
+DlgDocCActive		: "Active Link",
+DlgDocMargins		: "Page Margins",
+DlgDocMaTop			: "Top",
+DlgDocMaLeft		: "Left",
+DlgDocMaRight		: "Right",
+DlgDocMaBottom		: "Bottom",
+DlgDocMeIndex		: "Document Indexing Keywords (comma separated)",
+DlgDocMeDescr		: "Document Description",
+DlgDocMeAuthor		: "Author",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Preview",
+
+// Templates Dialog
+Templates			: "Templates",
+DlgTemplatesTitle	: "Content Templates",
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",
+DlgTemplatesLoading	: "Loading templates list. Please wait...",
+DlgTemplatesNoTpl	: "(No templates defined)",
+DlgTemplatesReplace	: "Replace actual contents",
+
+// About Dialog
+DlgAboutAboutTab	: "About",
+DlgAboutBrowserInfoTab	: "Browser Info",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "For further information go to",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Advanced",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/en-ca.js b/modules/editor/skins/fckeditor/editor/lang/en-ca.js
new file mode 100644
index 000000000..b192385e3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/en-ca.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * English (Canadian) language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Collapse Toolbar",
+ToolbarExpand		: "Expand Toolbar",
+
+// Toolbar Items and Context Menu
+Save				: "Save",
+NewPage				: "New Page",
+Preview				: "Preview",
+Cut					: "Cut",
+Copy				: "Copy",
+Paste				: "Paste",
+PasteText			: "Paste as plain text",
+PasteWord			: "Paste from Word",
+Print				: "Print",
+SelectAll			: "Select All",
+RemoveFormat		: "Remove Format",
+InsertLinkLbl		: "Link",
+InsertLink			: "Insert/Edit Link",
+RemoveLink			: "Remove Link",
+VisitLink			: "Open Link",
+Anchor				: "Insert/Edit Anchor",
+AnchorDelete		: "Remove Anchor",
+InsertImageLbl		: "Image",
+InsertImage			: "Insert/Edit Image",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insert/Edit Flash",
+InsertTableLbl		: "Table",
+InsertTable			: "Insert/Edit Table",
+InsertLineLbl		: "Line",
+InsertLine			: "Insert Horizontal Line",
+InsertSpecialCharLbl: "Special Character",
+InsertSpecialChar	: "Insert Special Character",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Insert Smiley",
+About				: "About FCKeditor",
+Bold				: "Bold",
+Italic				: "Italic",
+Underline			: "Underline",
+StrikeThrough		: "Strike Through",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Left Justify",
+CenterJustify		: "Centre Justify",
+RightJustify		: "Right Justify",
+BlockJustify		: "Block Justify",
+DecreaseIndent		: "Decrease Indent",
+IncreaseIndent		: "Increase Indent",
+Blockquote			: "Blockquote",
+CreateDiv			: "Create Div Container",
+EditDiv				: "Edit Div Container",
+DeleteDiv			: "Remove Div Container",
+Undo				: "Undo",
+Redo				: "Redo",
+NumberedListLbl		: "Numbered List",
+NumberedList		: "Insert/Remove Numbered List",
+BulletedListLbl		: "Bulleted List",
+BulletedList		: "Insert/Remove Bulleted List",
+ShowTableBorders	: "Show Table Borders",
+ShowDetails			: "Show Details",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Size",
+TextColor			: "Text Colour",
+BGColor				: "Background Colour",
+Source				: "Source",
+Find				: "Find",
+Replace				: "Replace",
+SpellCheck			: "Check Spelling",
+UniversalKeyboard	: "Universal Keyboard",
+PageBreakLbl		: "Page Break",
+PageBreak			: "Insert Page Break",
+
+Form			: "Form",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Hidden Field",
+Button			: "Button",
+SelectionField	: "Selection Field",
+ImageButton		: "Image Button",
+
+FitWindow		: "Maximize the editor size",
+ShowBlocks		: "Show Blocks",
+
+// Context Menu
+EditLink			: "Edit Link",
+CellCM				: "Cell",
+RowCM				: "Row",
+ColumnCM			: "Column",
+InsertRowAfter		: "Insert Row After",
+InsertRowBefore		: "Insert Row Before",
+DeleteRows			: "Delete Rows",
+InsertColumnAfter	: "Insert Column After",
+InsertColumnBefore	: "Insert Column Before",
+DeleteColumns		: "Delete Columns",
+InsertCellAfter		: "Insert Cell After",
+InsertCellBefore	: "Insert Cell Before",
+DeleteCells			: "Delete Cells",
+MergeCells			: "Merge Cells",
+MergeRight			: "Merge Right",
+MergeDown			: "Merge Down",
+HorizontalSplitCell	: "Split Cell Horizontally",
+VerticalSplitCell	: "Split Cell Vertically",
+TableDelete			: "Delete Table",
+CellProperties		: "Cell Properties",
+TableProperties		: "Table Properties",
+ImageProperties		: "Image Properties",
+FlashProperties		: "Flash Properties",
+
+AnchorProp			: "Anchor Properties",
+ButtonProp			: "Button Properties",
+CheckboxProp		: "Checkbox Properties",
+HiddenFieldProp		: "Hidden Field Properties",
+RadioButtonProp		: "Radio Button Properties",
+ImageButtonProp		: "Image Button Properties",
+TextFieldProp		: "Text Field Properties",
+SelectionFieldProp	: "Selection Field Properties",
+TextareaProp		: "Textarea Properties",
+FormProp			: "Form Properties",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processing XHTML. Please wait...",
+Done				: "Done",
+PasteWordConfirm	: "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?",
+NotCompatiblePaste	: "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?",
+UnknownToolbarItem	: "Unknown toolbar item \"%1\"",
+UnknownCommand		: "Unknown command name \"%1\"",
+NotImplemented		: "Command not implemented",
+UnknownToolbarSet	: "Toolbar set \"%1\" doesn't exist",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancel",
+DlgBtnClose			: "Close",
+DlgBtnBrowseServer	: "Browse Server",
+DlgAdvancedTag		: "Advanced",
+DlgOpOther			: "<Other>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Please insert the URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<not set>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Language Direction",
+DlgGenLangDirLtr	: "Left to Right (LTR)",
+DlgGenLangDirRtl	: "Right to Left (RTL)",
+DlgGenLangCode		: "Language Code",
+DlgGenAccessKey		: "Access Key",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Long Description URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Image Properties",
+DlgImgInfoTab		: "Image Info",
+DlgImgBtnUpload		: "Send it to the Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternative Text",
+DlgImgWidth			: "Width",
+DlgImgHeight		: "Height",
+DlgImgLockRatio		: "Lock Ratio",
+DlgBtnResetSize		: "Reset Size",
+DlgImgBorder		: "Border",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Align",
+DlgImgAlignLeft		: "Left",
+DlgImgAlignAbsBottom: "Abs Bottom",
+DlgImgAlignAbsMiddle: "Abs Middle",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Bottom",
+DlgImgAlignMiddle	: "Middle",
+DlgImgAlignRight	: "Right",
+DlgImgAlignTextTop	: "Text Top",
+DlgImgAlignTop		: "Top",
+DlgImgPreview		: "Preview",
+DlgImgAlertUrl		: "Please type the image URL",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",
+DlgFlashChkPlay		: "Auto Play",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Enable Flash Menu",
+DlgFlashScale		: "Scale",
+DlgFlashScaleAll	: "Show all",
+DlgFlashScaleNoBorder	: "No Border",
+DlgFlashScaleFit	: "Exact Fit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Target",
+
+DlgLnkType			: "Link Type",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Link to anchor in the text",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<other>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Select an Anchor",
+DlgLnkAnchorByName	: "By Anchor Name",
+DlgLnkAnchorById	: "By Element Id",
+DlgLnkNoAnchors		: "(No anchors available in the document)",
+DlgLnkEMail			: "E-Mail Address",
+DlgLnkEMailSubject	: "Message Subject",
+DlgLnkEMailBody		: "Message Body",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Send it to the Server",
+
+DlgLnkTarget		: "Target",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<popup window>",
+DlgLnkTargetBlank	: "New Window (_blank)",
+DlgLnkTargetParent	: "Parent Window (_parent)",
+DlgLnkTargetSelf	: "Same Window (_self)",
+DlgLnkTargetTop		: "Topmost Window (_top)",
+DlgLnkTargetFrameName	: "Target Frame Name",
+DlgLnkPopWinName	: "Popup Window Name",
+DlgLnkPopWinFeat	: "Popup Window Features",
+DlgLnkPopResize		: "Resizable",
+DlgLnkPopLocation	: "Location Bar",
+DlgLnkPopMenu		: "Menu Bar",
+DlgLnkPopScroll		: "Scroll Bars",
+DlgLnkPopStatus		: "Status Bar",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Full Screen (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Width",
+DlgLnkPopHeight		: "Height",
+DlgLnkPopLeft		: "Left Position",
+DlgLnkPopTop		: "Top Position",
+
+DlnLnkMsgNoUrl		: "Please type the link URL",
+DlnLnkMsgNoEMail	: "Please type the e-mail address",
+DlnLnkMsgNoAnchor	: "Please select an anchor",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",
+
+// Color Dialog
+DlgColorTitle		: "Select Colour",
+DlgColorBtnClear	: "Clear",
+DlgColorHighlight	: "Highlight",
+DlgColorSelected	: "Selected",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insert a Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Select Special Character",
+
+// Table Dialog
+DlgTableTitle		: "Table Properties",
+DlgTableRows		: "Rows",
+DlgTableColumns		: "Columns",
+DlgTableBorder		: "Border size",
+DlgTableAlign		: "Alignment",
+DlgTableAlignNotSet	: "<Not set>",
+DlgTableAlignLeft	: "Left",
+DlgTableAlignCenter	: "Centre",
+DlgTableAlignRight	: "Right",
+DlgTableWidth		: "Width",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Height",
+DlgTableCellSpace	: "Cell spacing",
+DlgTableCellPad		: "Cell padding",
+DlgTableCaption		: "Caption",
+DlgTableSummary		: "Summary",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cell Properties",
+DlgCellWidth		: "Width",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Height",
+DlgCellWordWrap		: "Word Wrap",
+DlgCellWordWrapNotSet	: "<Not set>",
+DlgCellWordWrapYes	: "Yes",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlignNotSet	: "<Not set>",
+DlgCellHorAlignLeft	: "Left",
+DlgCellHorAlignCenter	: "Centre",
+DlgCellHorAlignRight: "Right",
+DlgCellVerAlign		: "Vertical Alignment",
+DlgCellVerAlignNotSet	: "<Not set>",
+DlgCellVerAlignTop	: "Top",
+DlgCellVerAlignMiddle	: "Middle",
+DlgCellVerAlignBottom	: "Bottom",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rows Span",
+DlgCellCollSpan		: "Columns Span",
+DlgCellBackColor	: "Background Colour",
+DlgCellBorderColor	: "Border Colour",
+DlgCellBtnSelect	: "Select...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",
+
+// Find Dialog
+DlgFindTitle		: "Find",
+DlgFindFindBtn		: "Find",
+DlgFindNotFoundMsg	: "The specified text was not found.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Replace",
+DlgReplaceFindLbl		: "Find what:",
+DlgReplaceReplaceLbl	: "Replace with:",
+DlgReplaceCaseChk		: "Match case",
+DlgReplaceReplaceBtn	: "Replace",
+DlgReplaceReplAllBtn	: "Replace All",
+DlgReplaceWordChk		: "Match whole word",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).",
+PasteErrorCopy	: "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).",
+
+PasteAsText		: "Paste as Plain Text",
+PasteFromWord	: "Paste from Word",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",
+DlgPasteRemoveStyles	: "Remove Styles definitions",
+
+// Color Picker
+ColorAutomatic	: "Automatic",
+ColorMoreColors	: "More Colours...",
+
+// Document Properties
+DocProps		: "Document Properties",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anchor Properties",
+DlgAnchorName		: "Anchor Name",
+DlgAnchorErrorName	: "Please type the anchor name",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Not in dictionary",
+DlgSpellChangeTo		: "Change to",
+DlgSpellBtnIgnore		: "Ignore",
+DlgSpellBtnIgnoreAll	: "Ignore All",
+DlgSpellBtnReplace		: "Replace",
+DlgSpellBtnReplaceAll	: "Replace All",
+DlgSpellBtnUndo			: "Undo",
+DlgSpellNoSuggestions	: "- No suggestions -",
+DlgSpellProgress		: "Spell check in progress...",
+DlgSpellNoMispell		: "Spell check complete: No misspellings found",
+DlgSpellNoChanges		: "Spell check complete: No words changed",
+DlgSpellOneChange		: "Spell check complete: One word changed",
+DlgSpellManyChanges		: "Spell check complete: %1 words changed",
+
+IeSpellDownload			: "Spell checker not installed. Do you want to download it now?",
+
+// Button Dialog
+DlgButtonText		: "Text (Value)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",
+DlgCheckboxValue	: "Value",
+DlgCheckboxSelected	: "Selected",
+
+// Form Dialog
+DlgFormName		: "Name",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Name",
+DlgSelectValue		: "Value",
+DlgSelectSize		: "Size",
+DlgSelectLines		: "lines",
+DlgSelectChkMulti	: "Allow multiple selections",
+DlgSelectOpAvail	: "Available Options",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Value",
+DlgSelectBtnAdd		: "Add",
+DlgSelectBtnModify	: "Modify",
+DlgSelectBtnUp		: "Up",
+DlgSelectBtnDown	: "Down",
+DlgSelectBtnSetValue : "Set as selected value",
+DlgSelectBtnDelete	: "Delete",
+
+// Textarea Dialog
+DlgTextareaName	: "Name",
+DlgTextareaCols	: "Columns",
+DlgTextareaRows	: "Rows",
+
+// Text Field Dialog
+DlgTextName			: "Name",
+DlgTextValue		: "Value",
+DlgTextCharWidth	: "Character Width",
+DlgTextMaxChars		: "Maximum Characters",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Password",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",
+DlgHiddenValue	: "Value",
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted List Properties",
+NumberedListProp	: "Numbered List Properties",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Circle",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Numbers (1, 2, 3)",
+DlgLstTypeLCase		: "Lowercase Letters (a, b, c)",
+DlgLstTypeUCase		: "Uppercase Letters (A, B, C)",
+DlgLstTypeSRoman	: "Small Roman Numerals (i, ii, iii)",
+DlgLstTypeLRoman	: "Large Roman Numerals (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Background",
+DlgDocColorsTab		: "Colours and Margins",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Page Title",
+DlgDocLangDir		: "Language Direction",
+DlgDocLangDirLTR	: "Left to Right (LTR)",
+DlgDocLangDirRTL	: "Right to Left (RTL)",
+DlgDocLangCode		: "Language Code",
+DlgDocCharSet		: "Character Set Encoding",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "Other Character Set Encoding",
+
+DlgDocDocType		: "Document Type Heading",
+DlgDocDocTypeOther	: "Other Document Type Heading",
+DlgDocIncXHTML		: "Include XHTML Declarations",
+DlgDocBgColor		: "Background Colour",
+DlgDocBgImage		: "Background Image URL",
+DlgDocBgNoScroll	: "Nonscrolling Background",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Visited Link",
+DlgDocCActive		: "Active Link",
+DlgDocMargins		: "Page Margins",
+DlgDocMaTop			: "Top",
+DlgDocMaLeft		: "Left",
+DlgDocMaRight		: "Right",
+DlgDocMaBottom		: "Bottom",
+DlgDocMeIndex		: "Document Indexing Keywords (comma separated)",
+DlgDocMeDescr		: "Document Description",
+DlgDocMeAuthor		: "Author",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Preview",
+
+// Templates Dialog
+Templates			: "Templates",
+DlgTemplatesTitle	: "Content Templates",
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",
+DlgTemplatesLoading	: "Loading templates list. Please wait...",
+DlgTemplatesNoTpl	: "(No templates defined)",
+DlgTemplatesReplace	: "Replace actual contents",
+
+// About Dialog
+DlgAboutAboutTab	: "About",
+DlgAboutBrowserInfoTab	: "Browser Info",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "For further information go to",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Advanced",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/en-uk.js b/modules/editor/skins/fckeditor/editor/lang/en-uk.js
new file mode 100644
index 000000000..901c8857f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/en-uk.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * English (United Kingdom) language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Collapse Toolbar",
+ToolbarExpand		: "Expand Toolbar",
+
+// Toolbar Items and Context Menu
+Save				: "Save",
+NewPage				: "New Page",
+Preview				: "Preview",
+Cut					: "Cut",
+Copy				: "Copy",
+Paste				: "Paste",
+PasteText			: "Paste as plain text",
+PasteWord			: "Paste from Word",
+Print				: "Print",
+SelectAll			: "Select All",
+RemoveFormat		: "Remove Format",
+InsertLinkLbl		: "Link",
+InsertLink			: "Insert/Edit Link",
+RemoveLink			: "Remove Link",
+VisitLink			: "Open Link",
+Anchor				: "Insert/Edit Anchor",
+AnchorDelete		: "Remove Anchor",
+InsertImageLbl		: "Image",
+InsertImage			: "Insert/Edit Image",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insert/Edit Flash",
+InsertTableLbl		: "Table",
+InsertTable			: "Insert/Edit Table",
+InsertLineLbl		: "Line",
+InsertLine			: "Insert Horizontal Line",
+InsertSpecialCharLbl: "Special Character",
+InsertSpecialChar	: "Insert Special Character",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Insert Smiley",
+About				: "About FCKeditor",
+Bold				: "Bold",
+Italic				: "Italic",
+Underline			: "Underline",
+StrikeThrough		: "Strike Through",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Left Justify",
+CenterJustify		: "Centre Justify",
+RightJustify		: "Right Justify",
+BlockJustify		: "Block Justify",
+DecreaseIndent		: "Decrease Indent",
+IncreaseIndent		: "Increase Indent",
+Blockquote			: "Blockquote",
+CreateDiv			: "Create Div Container",
+EditDiv				: "Edit Div Container",
+DeleteDiv			: "Remove Div Container",
+Undo				: "Undo",
+Redo				: "Redo",
+NumberedListLbl		: "Numbered List",
+NumberedList		: "Insert/Remove Numbered List",
+BulletedListLbl		: "Bulleted List",
+BulletedList		: "Insert/Remove Bulleted List",
+ShowTableBorders	: "Show Table Borders",
+ShowDetails			: "Show Details",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Size",
+TextColor			: "Text Colour",
+BGColor				: "Background Colour",
+Source				: "Source",
+Find				: "Find",
+Replace				: "Replace",
+SpellCheck			: "Check Spelling",
+UniversalKeyboard	: "Universal Keyboard",
+PageBreakLbl		: "Page Break",
+PageBreak			: "Insert Page Break",
+
+Form			: "Form",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Hidden Field",
+Button			: "Button",
+SelectionField	: "Selection Field",
+ImageButton		: "Image Button",
+
+FitWindow		: "Maximize the editor size",
+ShowBlocks		: "Show Blocks",
+
+// Context Menu
+EditLink			: "Edit Link",
+CellCM				: "Cell",
+RowCM				: "Row",
+ColumnCM			: "Column",
+InsertRowAfter		: "Insert Row After",
+InsertRowBefore		: "Insert Row Before",
+DeleteRows			: "Delete Rows",
+InsertColumnAfter	: "Insert Column After",
+InsertColumnBefore	: "Insert Column Before",
+DeleteColumns		: "Delete Columns",
+InsertCellAfter		: "Insert Cell After",
+InsertCellBefore	: "Insert Cell Before",
+DeleteCells			: "Delete Cells",
+MergeCells			: "Merge Cells",
+MergeRight			: "Merge Right",
+MergeDown			: "Merge Down",
+HorizontalSplitCell	: "Split Cell Horizontally",
+VerticalSplitCell	: "Split Cell Vertically",
+TableDelete			: "Delete Table",
+CellProperties		: "Cell Properties",
+TableProperties		: "Table Properties",
+ImageProperties		: "Image Properties",
+FlashProperties		: "Flash Properties",
+
+AnchorProp			: "Anchor Properties",
+ButtonProp			: "Button Properties",
+CheckboxProp		: "Checkbox Properties",
+HiddenFieldProp		: "Hidden Field Properties",
+RadioButtonProp		: "Radio Button Properties",
+ImageButtonProp		: "Image Button Properties",
+TextFieldProp		: "Text Field Properties",
+SelectionFieldProp	: "Selection Field Properties",
+TextareaProp		: "Textarea Properties",
+FormProp			: "Form Properties",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processing XHTML. Please wait...",
+Done				: "Done",
+PasteWordConfirm	: "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?",
+NotCompatiblePaste	: "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?",
+UnknownToolbarItem	: "Unknown toolbar item \"%1\"",
+UnknownCommand		: "Unknown command name \"%1\"",
+NotImplemented		: "Command not implemented",
+UnknownToolbarSet	: "Toolbar set \"%1\" doesn't exist",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancel",
+DlgBtnClose			: "Close",
+DlgBtnBrowseServer	: "Browse Server",
+DlgAdvancedTag		: "Advanced",
+DlgOpOther			: "<Other>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Please insert the URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<not set>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Language Direction",
+DlgGenLangDirLtr	: "Left to Right (LTR)",
+DlgGenLangDirRtl	: "Right to Left (RTL)",
+DlgGenLangCode		: "Language Code",
+DlgGenAccessKey		: "Access Key",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Long Description URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Image Properties",
+DlgImgInfoTab		: "Image Info",
+DlgImgBtnUpload		: "Send it to the Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternative Text",
+DlgImgWidth			: "Width",
+DlgImgHeight		: "Height",
+DlgImgLockRatio		: "Lock Ratio",
+DlgBtnResetSize		: "Reset Size",
+DlgImgBorder		: "Border",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Align",
+DlgImgAlignLeft		: "Left",
+DlgImgAlignAbsBottom: "Abs Bottom",
+DlgImgAlignAbsMiddle: "Abs Middle",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Bottom",
+DlgImgAlignMiddle	: "Middle",
+DlgImgAlignRight	: "Right",
+DlgImgAlignTextTop	: "Text Top",
+DlgImgAlignTop		: "Top",
+DlgImgPreview		: "Preview",
+DlgImgAlertUrl		: "Please type the image URL",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",
+DlgFlashChkPlay		: "Auto Play",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Enable Flash Menu",
+DlgFlashScale		: "Scale",
+DlgFlashScaleAll	: "Show all",
+DlgFlashScaleNoBorder	: "No Border",
+DlgFlashScaleFit	: "Exact Fit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Target",
+
+DlgLnkType			: "Link Type",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Link to anchor in the text",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<other>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Select an Anchor",
+DlgLnkAnchorByName	: "By Anchor Name",
+DlgLnkAnchorById	: "By Element Id",
+DlgLnkNoAnchors		: "(No anchors available in the document)",
+DlgLnkEMail			: "E-Mail Address",
+DlgLnkEMailSubject	: "Message Subject",
+DlgLnkEMailBody		: "Message Body",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Send it to the Server",
+
+DlgLnkTarget		: "Target",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<popup window>",
+DlgLnkTargetBlank	: "New Window (_blank)",
+DlgLnkTargetParent	: "Parent Window (_parent)",
+DlgLnkTargetSelf	: "Same Window (_self)",
+DlgLnkTargetTop		: "Topmost Window (_top)",
+DlgLnkTargetFrameName	: "Target Frame Name",
+DlgLnkPopWinName	: "Popup Window Name",
+DlgLnkPopWinFeat	: "Popup Window Features",
+DlgLnkPopResize		: "Resizable",
+DlgLnkPopLocation	: "Location Bar",
+DlgLnkPopMenu		: "Menu Bar",
+DlgLnkPopScroll		: "Scroll Bars",
+DlgLnkPopStatus		: "Status Bar",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Full Screen (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Width",
+DlgLnkPopHeight		: "Height",
+DlgLnkPopLeft		: "Left Position",
+DlgLnkPopTop		: "Top Position",
+
+DlnLnkMsgNoUrl		: "Please type the link URL",
+DlnLnkMsgNoEMail	: "Please type the e-mail address",
+DlnLnkMsgNoAnchor	: "Please select an anchor",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",
+
+// Color Dialog
+DlgColorTitle		: "Select Colour",
+DlgColorBtnClear	: "Clear",
+DlgColorHighlight	: "Highlight",
+DlgColorSelected	: "Selected",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insert a Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Select Special Character",
+
+// Table Dialog
+DlgTableTitle		: "Table Properties",
+DlgTableRows		: "Rows",
+DlgTableColumns		: "Columns",
+DlgTableBorder		: "Border size",
+DlgTableAlign		: "Alignment",
+DlgTableAlignNotSet	: "<Not set>",
+DlgTableAlignLeft	: "Left",
+DlgTableAlignCenter	: "Centre",
+DlgTableAlignRight	: "Right",
+DlgTableWidth		: "Width",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Height",
+DlgTableCellSpace	: "Cell spacing",
+DlgTableCellPad		: "Cell padding",
+DlgTableCaption		: "Caption",
+DlgTableSummary		: "Summary",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cell Properties",
+DlgCellWidth		: "Width",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Height",
+DlgCellWordWrap		: "Word Wrap",
+DlgCellWordWrapNotSet	: "<Not set>",
+DlgCellWordWrapYes	: "Yes",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlignNotSet	: "<Not set>",
+DlgCellHorAlignLeft	: "Left",
+DlgCellHorAlignCenter	: "Centre",
+DlgCellHorAlignRight: "Right",
+DlgCellVerAlign		: "Vertical Alignment",
+DlgCellVerAlignNotSet	: "<Not set>",
+DlgCellVerAlignTop	: "Top",
+DlgCellVerAlignMiddle	: "Middle",
+DlgCellVerAlignBottom	: "Bottom",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rows Span",
+DlgCellCollSpan		: "Columns Span",
+DlgCellBackColor	: "Background Colour",
+DlgCellBorderColor	: "Border Colour",
+DlgCellBtnSelect	: "Select...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",
+
+// Find Dialog
+DlgFindTitle		: "Find",
+DlgFindFindBtn		: "Find",
+DlgFindNotFoundMsg	: "The specified text was not found.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Replace",
+DlgReplaceFindLbl		: "Find what:",
+DlgReplaceReplaceLbl	: "Replace with:",
+DlgReplaceCaseChk		: "Match case",
+DlgReplaceReplaceBtn	: "Replace",
+DlgReplaceReplAllBtn	: "Replace All",
+DlgReplaceWordChk		: "Match whole word",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).",
+PasteErrorCopy	: "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).",
+
+PasteAsText		: "Paste as Plain Text",
+PasteFromWord	: "Paste from Word",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",
+DlgPasteRemoveStyles	: "Remove Styles definitions",
+
+// Color Picker
+ColorAutomatic	: "Automatic",
+ColorMoreColors	: "More Colours...",
+
+// Document Properties
+DocProps		: "Document Properties",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anchor Properties",
+DlgAnchorName		: "Anchor Name",
+DlgAnchorErrorName	: "Please type the anchor name",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Not in dictionary",
+DlgSpellChangeTo		: "Change to",
+DlgSpellBtnIgnore		: "Ignore",
+DlgSpellBtnIgnoreAll	: "Ignore All",
+DlgSpellBtnReplace		: "Replace",
+DlgSpellBtnReplaceAll	: "Replace All",
+DlgSpellBtnUndo			: "Undo",
+DlgSpellNoSuggestions	: "- No suggestions -",
+DlgSpellProgress		: "Spell check in progress...",
+DlgSpellNoMispell		: "Spell check complete: No misspellings found",
+DlgSpellNoChanges		: "Spell check complete: No words changed",
+DlgSpellOneChange		: "Spell check complete: One word changed",
+DlgSpellManyChanges		: "Spell check complete: %1 words changed",
+
+IeSpellDownload			: "Spell checker not installed. Do you want to download it now?",
+
+// Button Dialog
+DlgButtonText		: "Text (Value)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",
+DlgCheckboxValue	: "Value",
+DlgCheckboxSelected	: "Selected",
+
+// Form Dialog
+DlgFormName		: "Name",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Name",
+DlgSelectValue		: "Value",
+DlgSelectSize		: "Size",
+DlgSelectLines		: "lines",
+DlgSelectChkMulti	: "Allow multiple selections",
+DlgSelectOpAvail	: "Available Options",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Value",
+DlgSelectBtnAdd		: "Add",
+DlgSelectBtnModify	: "Modify",
+DlgSelectBtnUp		: "Up",
+DlgSelectBtnDown	: "Down",
+DlgSelectBtnSetValue : "Set as selected value",
+DlgSelectBtnDelete	: "Delete",
+
+// Textarea Dialog
+DlgTextareaName	: "Name",
+DlgTextareaCols	: "Columns",
+DlgTextareaRows	: "Rows",
+
+// Text Field Dialog
+DlgTextName			: "Name",
+DlgTextValue		: "Value",
+DlgTextCharWidth	: "Character Width",
+DlgTextMaxChars		: "Maximum Characters",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Password",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",
+DlgHiddenValue	: "Value",
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted List Properties",
+NumberedListProp	: "Numbered List Properties",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Circle",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Numbers (1, 2, 3)",
+DlgLstTypeLCase		: "Lowercase Letters (a, b, c)",
+DlgLstTypeUCase		: "Uppercase Letters (A, B, C)",
+DlgLstTypeSRoman	: "Small Roman Numerals (i, ii, iii)",
+DlgLstTypeLRoman	: "Large Roman Numerals (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Background",
+DlgDocColorsTab		: "Colours and Margins",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Page Title",
+DlgDocLangDir		: "Language Direction",
+DlgDocLangDirLTR	: "Left to Right (LTR)",
+DlgDocLangDirRTL	: "Right to Left (RTL)",
+DlgDocLangCode		: "Language Code",
+DlgDocCharSet		: "Character Set Encoding",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "Other Character Set Encoding",
+
+DlgDocDocType		: "Document Type Heading",
+DlgDocDocTypeOther	: "Other Document Type Heading",
+DlgDocIncXHTML		: "Include XHTML Declarations",
+DlgDocBgColor		: "Background Colour",
+DlgDocBgImage		: "Background Image URL",
+DlgDocBgNoScroll	: "Nonscrolling Background",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Visited Link",
+DlgDocCActive		: "Active Link",
+DlgDocMargins		: "Page Margins",
+DlgDocMaTop			: "Top",
+DlgDocMaLeft		: "Left",
+DlgDocMaRight		: "Right",
+DlgDocMaBottom		: "Bottom",
+DlgDocMeIndex		: "Document Indexing Keywords (comma separated)",
+DlgDocMeDescr		: "Document Description",
+DlgDocMeAuthor		: "Author",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Preview",
+
+// Templates Dialog
+Templates			: "Templates",
+DlgTemplatesTitle	: "Content Templates",
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",
+DlgTemplatesLoading	: "Loading templates list. Please wait...",
+DlgTemplatesNoTpl	: "(No templates defined)",
+DlgTemplatesReplace	: "Replace actual contents",
+
+// About Dialog
+DlgAboutAboutTab	: "About",
+DlgAboutBrowserInfoTab	: "Browser Info",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "For further information go to",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Advanced",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/en.js b/modules/editor/skins/fckeditor/editor/lang/en.js
new file mode 100644
index 000000000..59395887b
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/en.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * English language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Collapse Toolbar",
+ToolbarExpand		: "Expand Toolbar",
+
+// Toolbar Items and Context Menu
+Save				: "Save",
+NewPage				: "New Page",
+Preview				: "Preview",
+Cut					: "Cut",
+Copy				: "Copy",
+Paste				: "Paste",
+PasteText			: "Paste as plain text",
+PasteWord			: "Paste from Word",
+Print				: "Print",
+SelectAll			: "Select All",
+RemoveFormat		: "Remove Format",
+InsertLinkLbl		: "Link",
+InsertLink			: "Insert/Edit Link",
+RemoveLink			: "Remove Link",
+VisitLink			: "Open Link",
+Anchor				: "Insert/Edit Anchor",
+AnchorDelete		: "Remove Anchor",
+InsertImageLbl		: "Image",
+InsertImage			: "Insert/Edit Image",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insert/Edit Flash",
+InsertTableLbl		: "Table",
+InsertTable			: "Insert/Edit Table",
+InsertLineLbl		: "Line",
+InsertLine			: "Insert Horizontal Line",
+InsertSpecialCharLbl: "Special Character",
+InsertSpecialChar	: "Insert Special Character",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Insert Smiley",
+About				: "About FCKeditor",
+Bold				: "Bold",
+Italic				: "Italic",
+Underline			: "Underline",
+StrikeThrough		: "Strike Through",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Left Justify",
+CenterJustify		: "Center Justify",
+RightJustify		: "Right Justify",
+BlockJustify		: "Block Justify",
+DecreaseIndent		: "Decrease Indent",
+IncreaseIndent		: "Increase Indent",
+Blockquote			: "Blockquote",
+CreateDiv			: "Create Div Container",
+EditDiv				: "Edit Div Container",
+DeleteDiv			: "Remove Div Container",
+Undo				: "Undo",
+Redo				: "Redo",
+NumberedListLbl		: "Numbered List",
+NumberedList		: "Insert/Remove Numbered List",
+BulletedListLbl		: "Bulleted List",
+BulletedList		: "Insert/Remove Bulleted List",
+ShowTableBorders	: "Show Table Borders",
+ShowDetails			: "Show Details",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Size",
+TextColor			: "Text Color",
+BGColor				: "Background Color",
+Source				: "Source",
+Find				: "Find",
+Replace				: "Replace",
+SpellCheck			: "Check Spelling",
+UniversalKeyboard	: "Universal Keyboard",
+PageBreakLbl		: "Page Break",
+PageBreak			: "Insert Page Break",
+
+Form			: "Form",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Hidden Field",
+Button			: "Button",
+SelectionField	: "Selection Field",
+ImageButton		: "Image Button",
+
+FitWindow		: "Maximize the editor size",
+ShowBlocks		: "Show Blocks",
+
+// Context Menu
+EditLink			: "Edit Link",
+CellCM				: "Cell",
+RowCM				: "Row",
+ColumnCM			: "Column",
+InsertRowAfter		: "Insert Row After",
+InsertRowBefore		: "Insert Row Before",
+DeleteRows			: "Delete Rows",
+InsertColumnAfter	: "Insert Column After",
+InsertColumnBefore	: "Insert Column Before",
+DeleteColumns		: "Delete Columns",
+InsertCellAfter		: "Insert Cell After",
+InsertCellBefore	: "Insert Cell Before",
+DeleteCells			: "Delete Cells",
+MergeCells			: "Merge Cells",
+MergeRight			: "Merge Right",
+MergeDown			: "Merge Down",
+HorizontalSplitCell	: "Split Cell Horizontally",
+VerticalSplitCell	: "Split Cell Vertically",
+TableDelete			: "Delete Table",
+CellProperties		: "Cell Properties",
+TableProperties		: "Table Properties",
+ImageProperties		: "Image Properties",
+FlashProperties		: "Flash Properties",
+
+AnchorProp			: "Anchor Properties",
+ButtonProp			: "Button Properties",
+CheckboxProp		: "Checkbox Properties",
+HiddenFieldProp		: "Hidden Field Properties",
+RadioButtonProp		: "Radio Button Properties",
+ImageButtonProp		: "Image Button Properties",
+TextFieldProp		: "Text Field Properties",
+SelectionFieldProp	: "Selection Field Properties",
+TextareaProp		: "Textarea Properties",
+FormProp			: "Form Properties",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processing XHTML. Please wait...",
+Done				: "Done",
+PasteWordConfirm	: "The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?",
+NotCompatiblePaste	: "This command is available for Internet Explorer version 5.5 or more. Do you want to paste without cleaning?",
+UnknownToolbarItem	: "Unknown toolbar item \"%1\"",
+UnknownCommand		: "Unknown command name \"%1\"",
+NotImplemented		: "Command not implemented",
+UnknownToolbarSet	: "Toolbar set \"%1\" doesn't exist",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancel",
+DlgBtnClose			: "Close",
+DlgBtnBrowseServer	: "Browse Server",
+DlgAdvancedTag		: "Advanced",
+DlgOpOther			: "<Other>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Please insert the URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<not set>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Language Direction",
+DlgGenLangDirLtr	: "Left to Right (LTR)",
+DlgGenLangDirRtl	: "Right to Left (RTL)",
+DlgGenLangCode		: "Language Code",
+DlgGenAccessKey		: "Access Key",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "Tab Index",
+DlgGenLongDescr		: "Long Description URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Image Properties",
+DlgImgInfoTab		: "Image Info",
+DlgImgBtnUpload		: "Send it to the Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternative Text",
+DlgImgWidth			: "Width",
+DlgImgHeight		: "Height",
+DlgImgLockRatio		: "Lock Ratio",
+DlgBtnResetSize		: "Reset Size",
+DlgImgBorder		: "Border",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Align",
+DlgImgAlignLeft		: "Left",
+DlgImgAlignAbsBottom: "Abs Bottom",
+DlgImgAlignAbsMiddle: "Abs Middle",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Bottom",
+DlgImgAlignMiddle	: "Middle",
+DlgImgAlignRight	: "Right",
+DlgImgAlignTextTop	: "Text Top",
+DlgImgAlignTop		: "Top",
+DlgImgPreview		: "Preview",
+DlgImgAlertUrl		: "Please type the image URL",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",
+DlgFlashChkPlay		: "Auto Play",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Enable Flash Menu",
+DlgFlashScale		: "Scale",
+DlgFlashScaleAll	: "Show all",
+DlgFlashScaleNoBorder	: "No Border",
+DlgFlashScaleFit	: "Exact Fit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Target",
+
+DlgLnkType			: "Link Type",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Link to anchor in the text",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<other>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Select an Anchor",
+DlgLnkAnchorByName	: "By Anchor Name",
+DlgLnkAnchorById	: "By Element Id",
+DlgLnkNoAnchors		: "(No anchors available in the document)",
+DlgLnkEMail			: "E-Mail Address",
+DlgLnkEMailSubject	: "Message Subject",
+DlgLnkEMailBody		: "Message Body",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Send it to the Server",
+
+DlgLnkTarget		: "Target",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<popup window>",
+DlgLnkTargetBlank	: "New Window (_blank)",
+DlgLnkTargetParent	: "Parent Window (_parent)",
+DlgLnkTargetSelf	: "Same Window (_self)",
+DlgLnkTargetTop		: "Topmost Window (_top)",
+DlgLnkTargetFrameName	: "Target Frame Name",
+DlgLnkPopWinName	: "Popup Window Name",
+DlgLnkPopWinFeat	: "Popup Window Features",
+DlgLnkPopResize		: "Resizable",
+DlgLnkPopLocation	: "Location Bar",
+DlgLnkPopMenu		: "Menu Bar",
+DlgLnkPopScroll		: "Scroll Bars",
+DlgLnkPopStatus		: "Status Bar",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Full Screen (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Width",
+DlgLnkPopHeight		: "Height",
+DlgLnkPopLeft		: "Left Position",
+DlgLnkPopTop		: "Top Position",
+
+DlnLnkMsgNoUrl		: "Please type the link URL",
+DlnLnkMsgNoEMail	: "Please type the e-mail address",
+DlnLnkMsgNoAnchor	: "Please select an anchor",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",
+
+// Color Dialog
+DlgColorTitle		: "Select Color",
+DlgColorBtnClear	: "Clear",
+DlgColorHighlight	: "Highlight",
+DlgColorSelected	: "Selected",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insert a Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Select Special Character",
+
+// Table Dialog
+DlgTableTitle		: "Table Properties",
+DlgTableRows		: "Rows",
+DlgTableColumns		: "Columns",
+DlgTableBorder		: "Border size",
+DlgTableAlign		: "Alignment",
+DlgTableAlignNotSet	: "<Not set>",
+DlgTableAlignLeft	: "Left",
+DlgTableAlignCenter	: "Center",
+DlgTableAlignRight	: "Right",
+DlgTableWidth		: "Width",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Height",
+DlgTableCellSpace	: "Cell spacing",
+DlgTableCellPad		: "Cell padding",
+DlgTableCaption		: "Caption",
+DlgTableSummary		: "Summary",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cell Properties",
+DlgCellWidth		: "Width",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Height",
+DlgCellWordWrap		: "Word Wrap",
+DlgCellWordWrapNotSet	: "<Not set>",
+DlgCellWordWrapYes	: "Yes",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlignNotSet	: "<Not set>",
+DlgCellHorAlignLeft	: "Left",
+DlgCellHorAlignCenter	: "Center",
+DlgCellHorAlignRight: "Right",
+DlgCellVerAlign		: "Vertical Alignment",
+DlgCellVerAlignNotSet	: "<Not set>",
+DlgCellVerAlignTop	: "Top",
+DlgCellVerAlignMiddle	: "Middle",
+DlgCellVerAlignBottom	: "Bottom",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Rows Span",
+DlgCellCollSpan		: "Columns Span",
+DlgCellBackColor	: "Background Color",
+DlgCellBorderColor	: "Border Color",
+DlgCellBtnSelect	: "Select...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",
+
+// Find Dialog
+DlgFindTitle		: "Find",
+DlgFindFindBtn		: "Find",
+DlgFindNotFoundMsg	: "The specified text was not found.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Replace",
+DlgReplaceFindLbl		: "Find what:",
+DlgReplaceReplaceLbl	: "Replace with:",
+DlgReplaceCaseChk		: "Match case",
+DlgReplaceReplaceBtn	: "Replace",
+DlgReplaceReplAllBtn	: "Replace All",
+DlgReplaceWordChk		: "Match whole word",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl+X).",
+PasteErrorCopy	: "Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl+C).",
+
+PasteAsText		: "Paste as Plain Text",
+PasteFromWord	: "Paste from Word",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",
+DlgPasteRemoveStyles	: "Remove Styles definitions",
+
+// Color Picker
+ColorAutomatic	: "Automatic",
+ColorMoreColors	: "More Colors...",
+
+// Document Properties
+DocProps		: "Document Properties",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Anchor Properties",
+DlgAnchorName		: "Anchor Name",
+DlgAnchorErrorName	: "Please type the anchor name",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Not in dictionary",
+DlgSpellChangeTo		: "Change to",
+DlgSpellBtnIgnore		: "Ignore",
+DlgSpellBtnIgnoreAll	: "Ignore All",
+DlgSpellBtnReplace		: "Replace",
+DlgSpellBtnReplaceAll	: "Replace All",
+DlgSpellBtnUndo			: "Undo",
+DlgSpellNoSuggestions	: "- No suggestions -",
+DlgSpellProgress		: "Spell check in progress...",
+DlgSpellNoMispell		: "Spell check complete: No misspellings found",
+DlgSpellNoChanges		: "Spell check complete: No words changed",
+DlgSpellOneChange		: "Spell check complete: One word changed",
+DlgSpellManyChanges		: "Spell check complete: %1 words changed",
+
+IeSpellDownload			: "Spell checker not installed. Do you want to download it now?",
+
+// Button Dialog
+DlgButtonText		: "Text (Value)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Name",
+DlgCheckboxValue	: "Value",
+DlgCheckboxSelected	: "Selected",
+
+// Form Dialog
+DlgFormName		: "Name",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Name",
+DlgSelectValue		: "Value",
+DlgSelectSize		: "Size",
+DlgSelectLines		: "lines",
+DlgSelectChkMulti	: "Allow multiple selections",
+DlgSelectOpAvail	: "Available Options",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Value",
+DlgSelectBtnAdd		: "Add",
+DlgSelectBtnModify	: "Modify",
+DlgSelectBtnUp		: "Up",
+DlgSelectBtnDown	: "Down",
+DlgSelectBtnSetValue : "Set as selected value",
+DlgSelectBtnDelete	: "Delete",
+
+// Textarea Dialog
+DlgTextareaName	: "Name",
+DlgTextareaCols	: "Columns",
+DlgTextareaRows	: "Rows",
+
+// Text Field Dialog
+DlgTextName			: "Name",
+DlgTextValue		: "Value",
+DlgTextCharWidth	: "Character Width",
+DlgTextMaxChars		: "Maximum Characters",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Password",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Name",
+DlgHiddenValue	: "Value",
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted List Properties",
+NumberedListProp	: "Numbered List Properties",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Circle",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Numbers (1, 2, 3)",
+DlgLstTypeLCase		: "Lowercase Letters (a, b, c)",
+DlgLstTypeUCase		: "Uppercase Letters (A, B, C)",
+DlgLstTypeSRoman	: "Small Roman Numerals (i, ii, iii)",
+DlgLstTypeLRoman	: "Large Roman Numerals (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Background",
+DlgDocColorsTab		: "Colors and Margins",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Page Title",
+DlgDocLangDir		: "Language Direction",
+DlgDocLangDirLTR	: "Left to Right (LTR)",
+DlgDocLangDirRTL	: "Right to Left (RTL)",
+DlgDocLangCode		: "Language Code",
+DlgDocCharSet		: "Character Set Encoding",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "Other Character Set Encoding",
+
+DlgDocDocType		: "Document Type Heading",
+DlgDocDocTypeOther	: "Other Document Type Heading",
+DlgDocIncXHTML		: "Include XHTML Declarations",
+DlgDocBgColor		: "Background Color",
+DlgDocBgImage		: "Background Image URL",
+DlgDocBgNoScroll	: "Nonscrolling Background",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Visited Link",
+DlgDocCActive		: "Active Link",
+DlgDocMargins		: "Page Margins",
+DlgDocMaTop			: "Top",
+DlgDocMaLeft		: "Left",
+DlgDocMaRight		: "Right",
+DlgDocMaBottom		: "Bottom",
+DlgDocMeIndex		: "Document Indexing Keywords (comma separated)",
+DlgDocMeDescr		: "Document Description",
+DlgDocMeAuthor		: "Author",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Preview",
+
+// Templates Dialog
+Templates			: "Templates",
+DlgTemplatesTitle	: "Content Templates",
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",
+DlgTemplatesLoading	: "Loading templates list. Please wait...",
+DlgTemplatesNoTpl	: "(No templates defined)",
+DlgTemplatesReplace	: "Replace actual contents",
+
+// About Dialog
+DlgAboutAboutTab	: "About",
+DlgAboutBrowserInfoTab	: "Browser Info",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "For further information go to",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Advanced",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/eo.js b/modules/editor/skins/fckeditor/editor/lang/eo.js
new file mode 100644
index 000000000..dc032efe7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/eo.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Esperanto language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Kaŝi Ilobreton",
+ToolbarExpand		: "Vidigi Ilojn",
+
+// Toolbar Items and Context Menu
+Save				: "Sekurigi",
+NewPage				: "Nova Paĝo",
+Preview				: "Vidigi Aspekton",
+Cut					: "Eltondi",
+Copy				: "Kopii",
+Paste				: "Interglui",
+PasteText			: "Interglui kiel Tekston",
+PasteWord			: "Interglui el Word",
+Print				: "Presi",
+SelectAll			: "Elekti ĉion",
+RemoveFormat		: "Forigi Formaton",
+InsertLinkLbl		: "Ligilo",
+InsertLink			: "Enmeti/Ŝanĝi Ligilon",
+RemoveLink			: "Forigi Ligilon",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Enmeti/Ŝanĝi Ankron",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Bildo",
+InsertImage			: "Enmeti/Ŝanĝi Bildon",
+InsertFlashLbl		: "Flash",	//MISSING
+InsertFlash			: "Insert/Edit Flash",	//MISSING
+InsertTableLbl		: "Tabelo",
+InsertTable			: "Enmeti/Ŝanĝi Tabelon",
+InsertLineLbl		: "Horizonta Linio",
+InsertLine			: "Enmeti Horizonta Linio",
+InsertSpecialCharLbl: "Speciala Signo",
+InsertSpecialChar	: "Enmeti Specialan Signon",
+InsertSmileyLbl		: "Mienvinjeto",
+InsertSmiley		: "Enmeti Mienvinjeton",
+About				: "Pri FCKeditor",
+Bold				: "Grasa",
+Italic				: "Kursiva",
+Underline			: "Substreko",
+StrikeThrough		: "Trastreko",
+Subscript			: "Subskribo",
+Superscript			: "Superskribo",
+LeftJustify			: "Maldekstrigi",
+CenterJustify		: "Centrigi",
+RightJustify		: "Dekstrigi",
+BlockJustify		: "Ĝisrandigi Ambaŭflanke",
+DecreaseIndent		: "Malpligrandigi Krommarĝenon",
+IncreaseIndent		: "Pligrandigi Krommarĝenon",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Malfari",
+Redo				: "Refari",
+NumberedListLbl		: "Numera Listo",
+NumberedList		: "Enmeti/Forigi Numeran Liston",
+BulletedListLbl		: "Bula Listo",
+BulletedList		: "Enmeti/Forigi Bulan Liston",
+ShowTableBorders	: "Vidigi Borderojn de Tabelo",
+ShowDetails			: "Vidigi Detalojn",
+Style				: "Stilo",
+FontFormat			: "Formato",
+Font				: "Tiparo",
+FontSize			: "Grando",
+TextColor			: "Teksta Koloro",
+BGColor				: "Fona Koloro",
+Source				: "Fonto",
+Find				: "Serĉi",
+Replace				: "Anstataŭigi",
+SpellCheck			: "Literumada Kontrolilo",
+UniversalKeyboard	: "Universala Klavaro",
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "Formularo",
+Checkbox		: "Markobutono",
+RadioButton		: "Radiobutono",
+TextField		: "Teksta kampo",
+Textarea		: "Teksta Areo",
+HiddenField		: "Kaŝita Kampo",
+Button			: "Butono",
+SelectionField	: "Elekta Kampo",
+ImageButton		: "Bildbutono",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Modifier Ligilon",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Forigi Liniojn",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Forigi Kolumnojn",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Forigi Ĉelojn",
+MergeCells			: "Kunfandi Ĉelojn",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Delete Table",	//MISSING
+CellProperties		: "Atributoj de Ĉelo",
+TableProperties		: "Atributoj de Tabelo",
+ImageProperties		: "Atributoj de Bildo",
+FlashProperties		: "Flash Properties",	//MISSING
+
+AnchorProp			: "Ankraj Atributoj",
+ButtonProp			: "Butonaj Atributoj",
+CheckboxProp		: "Markobutonaj Atributoj",
+HiddenFieldProp		: "Atributoj de Kaŝita Kampo",
+RadioButtonProp		: "Radiobutonaj Atributoj",
+ImageButtonProp		: "Bildbutonaj Atributoj",
+TextFieldProp		: "Atributoj de Teksta Kampo",
+SelectionFieldProp	: "Atributoj de Elekta Kampo",
+TextareaProp		: "Atributoj de Teksta Areo",
+FormProp			: "Formularaj Atributoj",
+
+FontFormats			: "Normala;Formatita;Adreso;Titolo 1;Titolo 2;Titolo 3;Titolo 4;Titolo 5;Titolo 6;Paragrafo (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Traktado de XHTML. Bonvolu pacienci...",
+Done				: "Finita",
+PasteWordConfirm	: "La algluota teksto ŝajnas esti Word-devena. Ĉu vi volas purigi ĝin antaŭ ol interglui?",
+NotCompatiblePaste	: "Tiu ĉi komando bezonas almenaŭ Internet Explorer 5.5. Ĉu vi volas daŭrigi sen purigado?",
+UnknownToolbarItem	: "Ilobretero nekonata \"%1\"",
+UnknownCommand		: "Komandonomo nekonata \"%1\"",
+NotImplemented		: "Komando ne ankoraŭ realigita",
+UnknownToolbarSet	: "La ilobreto \"%1\" ne ekzistas",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Akcepti",
+DlgBtnCancel		: "Rezigni",
+DlgBtnClose			: "Fermi",
+DlgBtnBrowseServer	: "Foliumi en la Servilo",
+DlgAdvancedTag		: "Speciala",
+DlgOpOther			: "<Alia>",
+DlgInfoTab			: "Info",	//MISSING
+DlgAlertUrl			: "Please insert the URL",	//MISSING
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Defaŭlta>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Skribdirekto",
+DlgGenLangDirLtr	: "De maldekstro dekstren (LTR)",
+DlgGenLangDirRtl	: "De dekstro maldekstren (RTL)",
+DlgGenLangCode		: "Lingva Kodo",
+DlgGenAccessKey		: "Fulmoklavo",
+DlgGenName			: "Nomo",
+DlgGenTabIndex		: "Taba Ordo",
+DlgGenLongDescr		: "URL de Longa Priskribo",
+DlgGenClass			: "Klasoj de Stilfolioj",
+DlgGenTitle			: "Indika Titolo",
+DlgGenContType		: "Indika Enhavotipo",
+DlgGenLinkCharset	: "Signaro de la Ligita Rimedo",
+DlgGenStyle			: "Stilo",
+
+// Image Dialog
+DlgImgTitle			: "Atributoj de Bildo",
+DlgImgInfoTab		: "Informoj pri Bildo",
+DlgImgBtnUpload		: "Sendu al Servilo",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Alŝuti",
+DlgImgAlt			: "Anstataŭiga Teksto",
+DlgImgWidth			: "Larĝo",
+DlgImgHeight		: "Alto",
+DlgImgLockRatio		: "Konservi Proporcion",
+DlgBtnResetSize		: "Origina Grando",
+DlgImgBorder		: "Bordero",
+DlgImgHSpace		: "HSpaco",
+DlgImgVSpace		: "VSpaco",
+DlgImgAlign			: "Ĝisrandigo",
+DlgImgAlignLeft		: "Maldekstre",
+DlgImgAlignAbsBottom: "Abs Malsupre",
+DlgImgAlignAbsMiddle: "Abs Centre",
+DlgImgAlignBaseline	: "Je Malsupro de Teksto",
+DlgImgAlignBottom	: "Malsupre",
+DlgImgAlignMiddle	: "Centre",
+DlgImgAlignRight	: "Dekstre",
+DlgImgAlignTextTop	: "Je Supro de Teksto",
+DlgImgAlignTop		: "Supre",
+DlgImgPreview		: "Vidigi Aspekton",
+DlgImgAlertUrl		: "Bonvolu tajpi la URL de la bildo",
+DlgImgLinkTab		: "Link",	//MISSING
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",	//MISSING
+DlgFlashChkPlay		: "Auto Play",	//MISSING
+DlgFlashChkLoop		: "Loop",	//MISSING
+DlgFlashChkMenu		: "Enable Flash Menu",	//MISSING
+DlgFlashScale		: "Scale",	//MISSING
+DlgFlashScaleAll	: "Show all",	//MISSING
+DlgFlashScaleNoBorder	: "No Border",	//MISSING
+DlgFlashScaleFit	: "Exact Fit",	//MISSING
+
+// Link Dialog
+DlgLnkWindowTitle	: "Ligilo",
+DlgLnkInfoTab		: "Informoj pri la Ligilo",
+DlgLnkTargetTab		: "Celo",
+
+DlgLnkType			: "Tipo de Ligilo",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ankri en tiu ĉi paĝo",
+DlgLnkTypeEMail		: "Retpoŝto",
+DlgLnkProto			: "Protokolo",
+DlgLnkProtoOther	: "<alia>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Elekti Ankron",
+DlgLnkAnchorByName	: "Per Ankronomo",
+DlgLnkAnchorById	: "Per Elementidentigilo",
+DlgLnkNoAnchors		: "<Ne disponeblas ankroj en la dokumento>",
+DlgLnkEMail			: "Retadreso",
+DlgLnkEMailSubject	: "Temlinio",
+DlgLnkEMailBody		: "Mesaĝa korpo",
+DlgLnkUpload		: "Alŝuti",
+DlgLnkBtnUpload		: "Sendi al Servilo",
+
+DlgLnkTarget		: "Celo",
+DlgLnkTargetFrame	: "<kadro>",
+DlgLnkTargetPopup	: "<ŝprucfenestro>",
+DlgLnkTargetBlank	: "Nova Fenestro (_blank)",
+DlgLnkTargetParent	: "Gepatra Fenestro (_parent)",
+DlgLnkTargetSelf	: "Sama Fenestro (_self)",
+DlgLnkTargetTop		: "Plej Supra Fenestro (_top)",
+DlgLnkTargetFrameName	: "Nomo de Kadro",
+DlgLnkPopWinName	: "Nomo de Ŝprucfenestro",
+DlgLnkPopWinFeat	: "Atributoj de la Ŝprucfenestro",
+DlgLnkPopResize		: "Grando Ŝanĝebla",
+DlgLnkPopLocation	: "Adresobreto",
+DlgLnkPopMenu		: "Menubreto",
+DlgLnkPopScroll		: "Rulumlisteloj",
+DlgLnkPopStatus		: "Statobreto",
+DlgLnkPopToolbar	: "Ilobreto",
+DlgLnkPopFullScrn	: "Tutekrane (IE)",
+DlgLnkPopDependent	: "Dependa (Netscape)",
+DlgLnkPopWidth		: "Larĝo",
+DlgLnkPopHeight		: "Alto",
+DlgLnkPopLeft		: "Pozicio de Maldekstro",
+DlgLnkPopTop		: "Pozicio de Supro",
+
+DlnLnkMsgNoUrl		: "Bonvolu entajpi la URL-on",
+DlnLnkMsgNoEMail	: "Bonvolu entajpi la retadreson",
+DlnLnkMsgNoAnchor	: "Bonvolu elekti ankron",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Elekti",
+DlgColorBtnClear	: "Forigi",
+DlgColorHighlight	: "Emfazi",
+DlgColorSelected	: "Elektita",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Enmeti Mienvinjeton",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Enmeti Specialan Signon",
+
+// Table Dialog
+DlgTableTitle		: "Atributoj de Tabelo",
+DlgTableRows		: "Linioj",
+DlgTableColumns		: "Kolumnoj",
+DlgTableBorder		: "Bordero",
+DlgTableAlign		: "Ĝisrandigo",
+DlgTableAlignNotSet	: "<Defaŭlte>",
+DlgTableAlignLeft	: "Maldekstre",
+DlgTableAlignCenter	: "Centre",
+DlgTableAlignRight	: "Dekstre",
+DlgTableWidth		: "Larĝo",
+DlgTableWidthPx		: "Bitbilderoj",
+DlgTableWidthPc		: "elcentoj",
+DlgTableHeight		: "Alto",
+DlgTableCellSpace	: "Interspacigo de Ĉeloj",
+DlgTableCellPad		: "Ĉirkaŭenhava Plenigado",
+DlgTableCaption		: "Titolo",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "Atributoj de Celo",
+DlgCellWidth		: "Larĝo",
+DlgCellWidthPx		: "bitbilderoj",
+DlgCellWidthPc		: "elcentoj",
+DlgCellHeight		: "Alto",
+DlgCellWordWrap		: "Linifaldo",
+DlgCellWordWrapNotSet	: "<Defaŭlte>",
+DlgCellWordWrapYes	: "Jes",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Horizonta Ĝisrandigo",
+DlgCellHorAlignNotSet	: "<Defaŭlte>",
+DlgCellHorAlignLeft	: "Maldekstre",
+DlgCellHorAlignCenter	: "Centre",
+DlgCellHorAlignRight: "Dekstre",
+DlgCellVerAlign		: "Vertikala Ĝisrandigo",
+DlgCellVerAlignNotSet	: "<Defaŭlte>",
+DlgCellVerAlignTop	: "Supre",
+DlgCellVerAlignMiddle	: "Centre",
+DlgCellVerAlignBottom	: "Malsupre",
+DlgCellVerAlignBaseline	: "Je Malsupro de Teksto",
+DlgCellRowSpan		: "Linioj Kunfanditaj",
+DlgCellCollSpan		: "Kolumnoj Kunfanditaj",
+DlgCellBackColor	: "Fono",
+DlgCellBorderColor	: "Bordero",
+DlgCellBtnSelect	: "Elekti...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Serĉi",
+DlgFindFindBtn		: "Serĉi",
+DlgFindNotFoundMsg	: "La celteksto ne estas trovita.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Anstataŭigi",
+DlgReplaceFindLbl		: "Serĉi:",
+DlgReplaceReplaceLbl	: "Anstataŭigi per:",
+DlgReplaceCaseChk		: "Kongruigi Usklecon",
+DlgReplaceReplaceBtn	: "Anstataŭigi",
+DlgReplaceReplAllBtn	: "Anstataŭigi Ĉiun",
+DlgReplaceWordChk		: "Tuta Vorto",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (ctrl-X).",
+PasteErrorCopy	: "La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (ctrl-C).",
+
+PasteAsText		: "Interglui kiel Tekston",
+PasteFromWord	: "Interglui el Word",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",	//MISSING
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",	//MISSING
+DlgPasteRemoveStyles	: "Remove Styles definitions",	//MISSING
+
+// Color Picker
+ColorAutomatic	: "Aŭtomata",
+ColorMoreColors	: "Pli da Koloroj...",
+
+// Document Properties
+DocProps		: "Dokumentaj Atributoj",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankraj Atributoj",
+DlgAnchorName		: "Ankra Nomo",
+DlgAnchorErrorName	: "Bv tajpi la ankran nomon",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ne trovita en la vortaro",
+DlgSpellChangeTo		: "Ŝanĝi al",
+DlgSpellBtnIgnore		: "Malatenti",
+DlgSpellBtnIgnoreAll	: "Malatenti Ĉiun",
+DlgSpellBtnReplace		: "Anstataŭigi",
+DlgSpellBtnReplaceAll	: "Anstataŭigi Ĉiun",
+DlgSpellBtnUndo			: "Malfari",
+DlgSpellNoSuggestions	: "- Neniu propono -",
+DlgSpellProgress		: "Literumkontrolado daŭras...",
+DlgSpellNoMispell		: "Literumkontrolado finita: neniu fuŝo trovita",
+DlgSpellNoChanges		: "Literumkontrolado finita: neniu vorto ŝanĝita",
+DlgSpellOneChange		: "Literumkontrolado finita: unu vorto ŝanĝita",
+DlgSpellManyChanges		: "Literumkontrolado finita: %1 vortoj ŝanĝitaj",
+
+IeSpellDownload			: "Literumada Kontrolilo ne instalita. Ĉu vi volas elŝuti ĝin nun?",
+
+// Button Dialog
+DlgButtonText		: "Teksto (Valoro)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nomo",
+DlgCheckboxValue	: "Valoro",
+DlgCheckboxSelected	: "Elektita",
+
+// Form Dialog
+DlgFormName		: "Nomo",
+DlgFormAction	: "Ago",
+DlgFormMethod	: "Metodo",
+
+// Select Field Dialog
+DlgSelectName		: "Nomo",
+DlgSelectValue		: "Valoro",
+DlgSelectSize		: "Grando",
+DlgSelectLines		: "Linioj",
+DlgSelectChkMulti	: "Permesi Plurajn Elektojn",
+DlgSelectOpAvail	: "Elektoj Disponeblaj",
+DlgSelectOpText		: "Teksto",
+DlgSelectOpValue	: "Valoro",
+DlgSelectBtnAdd		: "Aldoni",
+DlgSelectBtnModify	: "Modifi",
+DlgSelectBtnUp		: "Supren",
+DlgSelectBtnDown	: "Malsupren",
+DlgSelectBtnSetValue : "Agordi kiel Elektitan Valoron",
+DlgSelectBtnDelete	: "Forigi",
+
+// Textarea Dialog
+DlgTextareaName	: "Nomo",
+DlgTextareaCols	: "Kolumnoj",
+DlgTextareaRows	: "Vicoj",
+
+// Text Field Dialog
+DlgTextName			: "Nomo",
+DlgTextValue		: "Valoro",
+DlgTextCharWidth	: "Signolarĝo",
+DlgTextMaxChars		: "Maksimuma Nombro da Signoj",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Teksto",
+DlgTextTypePass		: "Pasvorto",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nomo",
+DlgHiddenValue	: "Valoro",
+
+// Bulleted List Dialog
+BulletedListProp	: "Atributoj de Bula Listo",
+NumberedListProp	: "Atributoj de Numera Listo",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Cirklo",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "Kvadrato",
+DlgLstTypeNumbers	: "Ciferoj (1, 2, 3)",
+DlgLstTypeLCase		: "Minusklaj Literoj (a, b, c)",
+DlgLstTypeUCase		: "Majusklaj Literoj (A, B, C)",
+DlgLstTypeSRoman	: "Malgrandaj Romanaj Ciferoj (i, ii, iii)",
+DlgLstTypeLRoman	: "Grandaj Romanaj Ciferoj (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Ĝeneralaĵoj",
+DlgDocBackTab		: "Fono",
+DlgDocColorsTab		: "Koloroj kaj Marĝenoj",
+DlgDocMetaTab		: "Metadatumoj",
+
+DlgDocPageTitle		: "Paĝotitolo",
+DlgDocLangDir		: "Skribdirekto de la Lingvo",
+DlgDocLangDirLTR	: "De maldekstro dekstren (LTR)",
+DlgDocLangDirRTL	: "De dekstro maldekstren (LTR)",
+DlgDocLangCode		: "Lingvokodo",
+DlgDocCharSet		: "Signara Kodo",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Alia Signara Kodo",
+
+DlgDocDocType		: "Dokumenta Tipo",
+DlgDocDocTypeOther	: "Alia Dokumenta Tipo",
+DlgDocIncXHTML		: "Inkluzivi XHTML Deklaroj",
+DlgDocBgColor		: "Fona Koloro",
+DlgDocBgImage		: "URL de Fona Bildo",
+DlgDocBgNoScroll	: "Neruluma Fono",
+DlgDocCText			: "Teksto",
+DlgDocCLink			: "Ligilo",
+DlgDocCVisited		: "Vizitita Ligilo",
+DlgDocCActive		: "Aktiva Ligilo",
+DlgDocMargins		: "Paĝaj Marĝenoj",
+DlgDocMaTop			: "Supra",
+DlgDocMaLeft		: "Maldekstra",
+DlgDocMaRight		: "Dekstra",
+DlgDocMaBottom		: "Malsupra",
+DlgDocMeIndex		: "Ŝlosilvortoj de la Dokumento (apartigita de komoj)",
+DlgDocMeDescr		: "Dokumenta Priskribo",
+DlgDocMeAuthor		: "Verkinto",
+DlgDocMeCopy		: "Kopirajto",
+DlgDocPreview		: "Aspekto",
+
+// Templates Dialog
+Templates			: "Templates",	//MISSING
+DlgTemplatesTitle	: "Content Templates",	//MISSING
+DlgTemplatesSelMsg	: "Please select the template to open in the editor<br />(the actual contents will be lost):",	//MISSING
+DlgTemplatesLoading	: "Loading templates list. Please wait...",	//MISSING
+DlgTemplatesNoTpl	: "(No templates defined)",	//MISSING
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Pri",
+DlgAboutBrowserInfoTab	: "Informoj pri TTT-legilo",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "versio",
+DlgAboutInfo		: "Por pli da informoj, vizitu",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/es.js b/modules/editor/skins/fckeditor/editor/lang/es.js
new file mode 100644
index 000000000..c6f655a23
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/es.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Spanish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Contraer Barra",
+ToolbarExpand		: "Expandir Barra",
+
+// Toolbar Items and Context Menu
+Save				: "Guardar",
+NewPage				: "Nueva Página",
+Preview				: "Vista Previa",
+Cut					: "Cortar",
+Copy				: "Copiar",
+Paste				: "Pegar",
+PasteText			: "Pegar como texto plano",
+PasteWord			: "Pegar desde Word",
+Print				: "Imprimir",
+SelectAll			: "Seleccionar Todo",
+RemoveFormat		: "Eliminar Formato",
+InsertLinkLbl		: "Vínculo",
+InsertLink			: "Insertar/Editar Vínculo",
+RemoveLink			: "Eliminar Vínculo",
+VisitLink			: "Abrir enlace",
+Anchor				: "Referencia",
+AnchorDelete		: "Eliminar Referencia",
+InsertImageLbl		: "Imagen",
+InsertImage			: "Insertar/Editar Imagen",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insertar/Editar Flash",
+InsertTableLbl		: "Tabla",
+InsertTable			: "Insertar/Editar Tabla",
+InsertLineLbl		: "Línea",
+InsertLine			: "Insertar Línea Horizontal",
+InsertSpecialCharLbl: "Caracter Especial",
+InsertSpecialChar	: "Insertar Caracter Especial",
+InsertSmileyLbl		: "Emoticons",
+InsertSmiley		: "Insertar Emoticons",
+About				: "Acerca de FCKeditor",
+Bold				: "Negrita",
+Italic				: "Cursiva",
+Underline			: "Subrayado",
+StrikeThrough		: "Tachado",
+Subscript			: "Subíndice",
+Superscript			: "Superíndice",
+LeftJustify			: "Alinear a Izquierda",
+CenterJustify		: "Centrar",
+RightJustify		: "Alinear a Derecha",
+BlockJustify		: "Justificado",
+DecreaseIndent		: "Disminuir Sangría",
+IncreaseIndent		: "Aumentar Sangría",
+Blockquote			: "Cita",
+CreateDiv			: "Crear contenedor (div)",
+EditDiv				: "Editar contenedor (div)",
+DeleteDiv			: "Eliminar contenedor (div)",
+Undo				: "Deshacer",
+Redo				: "Rehacer",
+NumberedListLbl		: "Numeración",
+NumberedList		: "Insertar/Eliminar Numeración",
+BulletedListLbl		: "Viñetas",
+BulletedList		: "Insertar/Eliminar Viñetas",
+ShowTableBorders	: "Mostrar Bordes de Tablas",
+ShowDetails			: "Mostrar saltos de Párrafo",
+Style				: "Estilo",
+FontFormat			: "Formato",
+Font				: "Fuente",
+FontSize			: "Tamaño",
+TextColor			: "Color de Texto",
+BGColor				: "Color de Fondo",
+Source				: "Fuente HTML",
+Find				: "Buscar",
+Replace				: "Reemplazar",
+SpellCheck			: "Ortografía",
+UniversalKeyboard	: "Teclado Universal",
+PageBreakLbl		: "Salto de Página",
+PageBreak			: "Insertar Salto de Página",
+
+Form			: "Formulario",
+Checkbox		: "Casilla de Verificación",
+RadioButton		: "Botones de Radio",
+TextField		: "Campo de Texto",
+Textarea		: "Area de Texto",
+HiddenField		: "Campo Oculto",
+Button			: "Botón",
+SelectionField	: "Campo de Selección",
+ImageButton		: "Botón Imagen",
+
+FitWindow		: "Maximizar el tamaño del editor",
+ShowBlocks		: "Mostrar bloques",
+
+// Context Menu
+EditLink			: "Editar Vínculo",
+CellCM				: "Celda",
+RowCM				: "Fila",
+ColumnCM			: "Columna",
+InsertRowAfter		: "Insertar fila en la parte inferior",
+InsertRowBefore		: "Insertar fila en la parte superior",
+DeleteRows			: "Eliminar Filas",
+InsertColumnAfter	: "Insertar columna a la derecha",
+InsertColumnBefore	: "Insertar columna a la izquierda",
+DeleteColumns		: "Eliminar Columnas",
+InsertCellAfter		: "Insertar celda a la derecha",
+InsertCellBefore	: "Insertar celda a la izquierda",
+DeleteCells			: "Eliminar Celdas",
+MergeCells			: "Combinar Celdas",
+MergeRight			: "Combinar a la derecha",
+MergeDown			: "Combinar hacia abajo",
+HorizontalSplitCell	: "Dividir la celda horizontalmente",
+VerticalSplitCell	: "Dividir la celda verticalmente",
+TableDelete			: "Eliminar Tabla",
+CellProperties		: "Propiedades de Celda",
+TableProperties		: "Propiedades de Tabla",
+ImageProperties		: "Propiedades de Imagen",
+FlashProperties		: "Propiedades de Flash",
+
+AnchorProp			: "Propiedades de Referencia",
+ButtonProp			: "Propiedades de Botón",
+CheckboxProp		: "Propiedades de Casilla",
+HiddenFieldProp		: "Propiedades de Campo Oculto",
+RadioButtonProp		: "Propiedades de Botón de Radio",
+ImageButtonProp		: "Propiedades de Botón de Imagen",
+TextFieldProp		: "Propiedades de Campo de Texto",
+SelectionFieldProp	: "Propiedades de Campo de Selección",
+TextareaProp		: "Propiedades de Area de Texto",
+FormProp			: "Propiedades de Formulario",
+
+FontFormats			: "Normal;Con formato;Dirección;Encabezado 1;Encabezado 2;Encabezado 3;Encabezado 4;Encabezado 5;Encabezado 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Procesando XHTML. Por favor, espere...",
+Done				: "Hecho",
+PasteWordConfirm	: "El texto que desea parece provenir de Word. Desea depurarlo antes de pegarlo?",
+NotCompatiblePaste	: "Este comando está disponible sólo para Internet Explorer version 5.5 or superior. Desea pegar sin depurar?",
+UnknownToolbarItem	: "Item de barra desconocido \"%1\"",
+UnknownCommand		: "Nombre de comando desconocido \"%1\"",
+NotImplemented		: "Comando no implementado",
+UnknownToolbarSet	: "Nombre de barra \"%1\" no definido",
+NoActiveX			: "La configuración de las opciones de seguridad de su navegador puede estar limitando algunas características del editor. Por favor active la opción \"Ejecutar controles y complementos de ActiveX \", de lo contrario puede experimentar errores o ausencia de funcionalidades.",
+BrowseServerBlocked : "La ventana de visualización del servidor no pudo ser abierta. Verifique que su navegador no esté bloqueando las ventanas emergentes (pop up).",
+DialogBlocked		: "No se ha podido abrir la ventana de diálogo. Verifique que su navegador no esté bloqueando las ventanas emergentes (pop up).",
+VisitLinkBlocked	: "Nose ha podido abrir la ventana. Asegurese de que todos los bloqueadores de popups están deshabilitados.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancelar",
+DlgBtnClose			: "Cerrar",
+DlgBtnBrowseServer	: "Ver Servidor",
+DlgAdvancedTag		: "Avanzado",
+DlgOpOther			: "<Otro>",
+DlgInfoTab			: "Información",
+DlgAlertUrl			: "Inserte el URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<No definido>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Orientación",
+DlgGenLangDirLtr	: "Izquierda a Derecha (LTR)",
+DlgGenLangDirRtl	: "Derecha a Izquierda (RTL)",
+DlgGenLangCode		: "Cód. de idioma",
+DlgGenAccessKey		: "Clave de Acceso",
+DlgGenName			: "Nombre",
+DlgGenTabIndex		: "Indice de tabulación",
+DlgGenLongDescr		: "Descripción larga URL",
+DlgGenClass			: "Clases de hojas de estilo",
+DlgGenTitle			: "Título",
+DlgGenContType		: "Tipo de Contenido",
+DlgGenLinkCharset	: "Fuente de caracteres vinculado",
+DlgGenStyle			: "Estilo",
+
+// Image Dialog
+DlgImgTitle			: "Propiedades de Imagen",
+DlgImgInfoTab		: "Información de Imagen",
+DlgImgBtnUpload		: "Enviar al Servidor",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Cargar",
+DlgImgAlt			: "Texto Alternativo",
+DlgImgWidth			: "Anchura",
+DlgImgHeight		: "Altura",
+DlgImgLockRatio		: "Proporcional",
+DlgBtnResetSize		: "Tamaño Original",
+DlgImgBorder		: "Borde",
+DlgImgHSpace		: "Esp.Horiz",
+DlgImgVSpace		: "Esp.Vert",
+DlgImgAlign			: "Alineación",
+DlgImgAlignLeft		: "Izquierda",
+DlgImgAlignAbsBottom: "Abs inferior",
+DlgImgAlignAbsMiddle: "Abs centro",
+DlgImgAlignBaseline	: "Línea de base",
+DlgImgAlignBottom	: "Pie",
+DlgImgAlignMiddle	: "Centro",
+DlgImgAlignRight	: "Derecha",
+DlgImgAlignTextTop	: "Tope del texto",
+DlgImgAlignTop		: "Tope",
+DlgImgPreview		: "Vista Previa",
+DlgImgAlertUrl		: "Por favor escriba la URL de la imagen",
+DlgImgLinkTab		: "Vínculo",
+
+// Flash Dialog
+DlgFlashTitle		: "Propiedades de Flash",
+DlgFlashChkPlay		: "Autoejecución",
+DlgFlashChkLoop		: "Repetir",
+DlgFlashChkMenu		: "Activar Menú Flash",
+DlgFlashScale		: "Escala",
+DlgFlashScaleAll	: "Mostrar todo",
+DlgFlashScaleNoBorder	: "Sin Borde",
+DlgFlashScaleFit	: "Ajustado",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Vínculo",
+DlgLnkInfoTab		: "Información de Vínculo",
+DlgLnkTargetTab		: "Destino",
+
+DlgLnkType			: "Tipo de vínculo",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Referencia en esta página",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocolo",
+DlgLnkProtoOther	: "<otro>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Seleccionar una referencia",
+DlgLnkAnchorByName	: "Por Nombre de Referencia",
+DlgLnkAnchorById	: "Por ID de elemento",
+DlgLnkNoAnchors		: "(No hay referencias disponibles en el documento)",
+DlgLnkEMail			: "Dirección de E-Mail",
+DlgLnkEMailSubject	: "Título del Mensaje",
+DlgLnkEMailBody		: "Cuerpo del Mensaje",
+DlgLnkUpload		: "Cargar",
+DlgLnkBtnUpload		: "Enviar al Servidor",
+
+DlgLnkTarget		: "Destino",
+DlgLnkTargetFrame	: "<marco>",
+DlgLnkTargetPopup	: "<ventana emergente>",
+DlgLnkTargetBlank	: "Nueva Ventana(_blank)",
+DlgLnkTargetParent	: "Ventana Padre (_parent)",
+DlgLnkTargetSelf	: "Misma Ventana (_self)",
+DlgLnkTargetTop		: "Ventana primaria (_top)",
+DlgLnkTargetFrameName	: "Nombre del Marco Destino",
+DlgLnkPopWinName	: "Nombre de Ventana Emergente",
+DlgLnkPopWinFeat	: "Características de Ventana Emergente",
+DlgLnkPopResize		: "Ajustable",
+DlgLnkPopLocation	: "Barra de ubicación",
+DlgLnkPopMenu		: "Barra de Menú",
+DlgLnkPopScroll		: "Barras de desplazamiento",
+DlgLnkPopStatus		: "Barra de Estado",
+DlgLnkPopToolbar	: "Barra de Herramientas",
+DlgLnkPopFullScrn	: "Pantalla Completa (IE)",
+DlgLnkPopDependent	: "Dependiente (Netscape)",
+DlgLnkPopWidth		: "Anchura",
+DlgLnkPopHeight		: "Altura",
+DlgLnkPopLeft		: "Posición Izquierda",
+DlgLnkPopTop		: "Posición Derecha",
+
+DlnLnkMsgNoUrl		: "Por favor tipee el vínculo URL",
+DlnLnkMsgNoEMail	: "Por favor tipee la dirección de e-mail",
+DlnLnkMsgNoAnchor	: "Por favor seleccione una referencia",
+DlnLnkMsgInvPopName	: "El nombre debe empezar con un caracter alfanumérico y no debe contener espacios",
+
+// Color Dialog
+DlgColorTitle		: "Seleccionar Color",
+DlgColorBtnClear	: "Ninguno",
+DlgColorHighlight	: "Resaltado",
+DlgColorSelected	: "Seleccionado",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insertar un Emoticon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Seleccione un caracter especial",
+
+// Table Dialog
+DlgTableTitle		: "Propiedades de Tabla",
+DlgTableRows		: "Filas",
+DlgTableColumns		: "Columnas",
+DlgTableBorder		: "Tamaño de Borde",
+DlgTableAlign		: "Alineación",
+DlgTableAlignNotSet	: "<No establecido>",
+DlgTableAlignLeft	: "Izquierda",
+DlgTableAlignCenter	: "Centrado",
+DlgTableAlignRight	: "Derecha",
+DlgTableWidth		: "Anchura",
+DlgTableWidthPx		: "pixeles",
+DlgTableWidthPc		: "porcentaje",
+DlgTableHeight		: "Altura",
+DlgTableCellSpace	: "Esp. e/celdas",
+DlgTableCellPad		: "Esp. interior",
+DlgTableCaption		: "Título",
+DlgTableSummary		: "Síntesis",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propiedades de Celda",
+DlgCellWidth		: "Anchura",
+DlgCellWidthPx		: "pixeles",
+DlgCellWidthPc		: "porcentaje",
+DlgCellHeight		: "Altura",
+DlgCellWordWrap		: "Cortar Línea",
+DlgCellWordWrapNotSet	: "<No establecido>",
+DlgCellWordWrapYes	: "Si",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Alineación Horizontal",
+DlgCellHorAlignNotSet	: "<No establecido>",
+DlgCellHorAlignLeft	: "Izquierda",
+DlgCellHorAlignCenter	: "Centrado",
+DlgCellHorAlignRight: "Derecha",
+DlgCellVerAlign		: "Alineación Vertical",
+DlgCellVerAlignNotSet	: "<Not establecido>",
+DlgCellVerAlignTop	: "Tope",
+DlgCellVerAlignMiddle	: "Medio",
+DlgCellVerAlignBottom	: "ie",
+DlgCellVerAlignBaseline	: "Línea de Base",
+DlgCellRowSpan		: "Abarcar Filas",
+DlgCellCollSpan		: "Abarcar Columnas",
+DlgCellBackColor	: "Color de Fondo",
+DlgCellBorderColor	: "Color de Borde",
+DlgCellBtnSelect	: "Seleccione...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Buscar y Reemplazar",
+
+// Find Dialog
+DlgFindTitle		: "Buscar",
+DlgFindFindBtn		: "Buscar",
+DlgFindNotFoundMsg	: "El texto especificado no ha sido encontrado.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Reemplazar",
+DlgReplaceFindLbl		: "Texto a buscar:",
+DlgReplaceReplaceLbl	: "Reemplazar con:",
+DlgReplaceCaseChk		: "Coincidir may/min",
+DlgReplaceReplaceBtn	: "Reemplazar",
+DlgReplaceReplAllBtn	: "Reemplazar Todo",
+DlgReplaceWordChk		: "Coincidir toda la palabra",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado. Por favor use el teclado (Ctrl+X).",
+PasteErrorCopy	: "La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado. Por favor use el teclado (Ctrl+C).",
+
+PasteAsText		: "Pegar como Texto Plano",
+PasteFromWord	: "Pegar desde Word",
+
+DlgPasteMsg2	: "Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl+V</STRONG>); luego presione <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles. Es necesario que lo pegue de nuevo en esta ventana.",
+DlgPasteIgnoreFont		: "Ignorar definiciones de fuentes",
+DlgPasteRemoveStyles	: "Remover definiciones de estilo",
+
+// Color Picker
+ColorAutomatic	: "Automático",
+ColorMoreColors	: "Más Colores...",
+
+// Document Properties
+DocProps		: "Propiedades del Documento",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propiedades de la Referencia",
+DlgAnchorName		: "Nombre de la Referencia",
+DlgAnchorErrorName	: "Por favor, complete el nombre de la Referencia",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "No se encuentra en el Diccionario",
+DlgSpellChangeTo		: "Cambiar a",
+DlgSpellBtnIgnore		: "Ignorar",
+DlgSpellBtnIgnoreAll	: "Ignorar Todo",
+DlgSpellBtnReplace		: "Reemplazar",
+DlgSpellBtnReplaceAll	: "Reemplazar Todo",
+DlgSpellBtnUndo			: "Deshacer",
+DlgSpellNoSuggestions	: "- No hay sugerencias -",
+DlgSpellProgress		: "Control de Ortografía en progreso...",
+DlgSpellNoMispell		: "Control finalizado: no se encontraron errores",
+DlgSpellNoChanges		: "Control finalizado: no se ha cambiado ninguna palabra",
+DlgSpellOneChange		: "Control finalizado: se ha cambiado una palabra",
+DlgSpellManyChanges		: "Control finalizado: se ha cambiado %1 palabras",
+
+IeSpellDownload			: "Módulo de Control de Ortografía no instalado. ¿Desea descargarlo ahora?",
+
+// Button Dialog
+DlgButtonText		: "Texto (Valor)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Boton",
+DlgButtonTypeSbm	: "Enviar",
+DlgButtonTypeRst	: "Reestablecer",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nombre",
+DlgCheckboxValue	: "Valor",
+DlgCheckboxSelected	: "Seleccionado",
+
+// Form Dialog
+DlgFormName		: "Nombre",
+DlgFormAction	: "Acción",
+DlgFormMethod	: "Método",
+
+// Select Field Dialog
+DlgSelectName		: "Nombre",
+DlgSelectValue		: "Valor",
+DlgSelectSize		: "Tamaño",
+DlgSelectLines		: "Lineas",
+DlgSelectChkMulti	: "Permitir múltiple selección",
+DlgSelectOpAvail	: "Opciones disponibles",
+DlgSelectOpText		: "Texto",
+DlgSelectOpValue	: "Valor",
+DlgSelectBtnAdd		: "Agregar",
+DlgSelectBtnModify	: "Modificar",
+DlgSelectBtnUp		: "Subir",
+DlgSelectBtnDown	: "Bajar",
+DlgSelectBtnSetValue : "Establecer como predeterminado",
+DlgSelectBtnDelete	: "Eliminar",
+
+// Textarea Dialog
+DlgTextareaName	: "Nombre",
+DlgTextareaCols	: "Columnas",
+DlgTextareaRows	: "Filas",
+
+// Text Field Dialog
+DlgTextName			: "Nombre",
+DlgTextValue		: "Valor",
+DlgTextCharWidth	: "Caracteres de ancho",
+DlgTextMaxChars		: "Máximo caracteres",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Texto",
+DlgTextTypePass		: "Contraseña",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nombre",
+DlgHiddenValue	: "Valor",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propiedades de Viñetas",
+NumberedListProp	: "Propiedades de Numeraciones",
+DlgLstStart			: "Inicio",
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Círculo",
+DlgLstTypeDisc		: "Disco",
+DlgLstTypeSquare	: "Cuadrado",
+DlgLstTypeNumbers	: "Números (1, 2, 3)",
+DlgLstTypeLCase		: "letras en minúsculas (a, b, c)",
+DlgLstTypeUCase		: "letras en mayúsculas (A, B, C)",
+DlgLstTypeSRoman	: "Números Romanos (i, ii, iii)",
+DlgLstTypeLRoman	: "Números Romanos (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Fondo",
+DlgDocColorsTab		: "Colores y Márgenes",
+DlgDocMetaTab		: "Meta Información",
+
+DlgDocPageTitle		: "Título de Página",
+DlgDocLangDir		: "Orientación de idioma",
+DlgDocLangDirLTR	: "Izq. a Derecha (LTR)",
+DlgDocLangDirRTL	: "Der. a Izquierda (RTL)",
+DlgDocLangCode		: "Código de Idioma",
+DlgDocCharSet		: "Codif. de Conjunto de Caracteres",
+DlgDocCharSetCE		: "Centro Europeo",
+DlgDocCharSetCT		: "Chino Tradicional (Big5)",
+DlgDocCharSetCR		: "Cirílico",
+DlgDocCharSetGR		: "Griego",
+DlgDocCharSetJP		: "Japonés",
+DlgDocCharSetKR		: "Coreano",
+DlgDocCharSetTR		: "Turco",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Europeo occidental",
+DlgDocCharSetOther	: "Otra Codificación",
+
+DlgDocDocType		: "Encabezado de Tipo de Documento",
+DlgDocDocTypeOther	: "Otro Encabezado",
+DlgDocIncXHTML		: "Incluir Declaraciones XHTML",
+DlgDocBgColor		: "Color de Fondo",
+DlgDocBgImage		: "URL de Imagen de Fondo",
+DlgDocBgNoScroll	: "Fondo sin rolido",
+DlgDocCText			: "Texto",
+DlgDocCLink			: "Vínculo",
+DlgDocCVisited		: "Vínculo Visitado",
+DlgDocCActive		: "Vínculo Activo",
+DlgDocMargins		: "Márgenes de Página",
+DlgDocMaTop			: "Tope",
+DlgDocMaLeft		: "Izquierda",
+DlgDocMaRight		: "Derecha",
+DlgDocMaBottom		: "Pie",
+DlgDocMeIndex		: "Claves de indexación del Documento (separados por comas)",
+DlgDocMeDescr		: "Descripción del Documento",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Vista Previa",
+
+// Templates Dialog
+Templates			: "Plantillas",
+DlgTemplatesTitle	: "Contenido de Plantillas",
+DlgTemplatesSelMsg	: "Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):",
+DlgTemplatesLoading	: "Cargando lista de Plantillas. Por favor, aguarde...",
+DlgTemplatesNoTpl	: "(No hay plantillas definidas)",
+DlgTemplatesReplace	: "Reemplazar el contenido actual",
+
+// About Dialog
+DlgAboutAboutTab	: "Acerca de",
+DlgAboutBrowserInfoTab	: "Información de Navegador",
+DlgAboutLicenseTab	: "Licencia",
+DlgAboutVersion		: "versión",
+DlgAboutInfo		: "Para mayor información por favor dirigirse a",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",
+DlgDivAdvancedTab	: "Avanzado",
+DlgDivStyle		: "Estilo",
+DlgDivInlineStyle	: "Estilos CSS"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/et.js b/modules/editor/skins/fckeditor/editor/lang/et.js
new file mode 100644
index 000000000..8c9d5ff44
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/et.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Estonian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Voldi tööriistariba",
+ToolbarExpand		: "Laienda tööriistariba",
+
+// Toolbar Items and Context Menu
+Save				: "Salvesta",
+NewPage				: "Uus leht",
+Preview				: "Eelvaade",
+Cut					: "Lõika",
+Copy				: "Kopeeri",
+Paste				: "Kleebi",
+PasteText			: "Kleebi tavalise tekstina",
+PasteWord			: "Kleebi Wordist",
+Print				: "Prindi",
+SelectAll			: "Vali kõik",
+RemoveFormat		: "Eemalda vorming",
+InsertLinkLbl		: "Link",
+InsertLink			: "Sisesta link / Muuda linki",
+RemoveLink			: "Eemalda link",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Sisesta ankur / Muuda ankrut",
+AnchorDelete		: "Eemalda ankur",
+InsertImageLbl		: "Pilt",
+InsertImage			: "Sisesta pilt / Muuda pilti",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Sisesta flash / Muuda flashi",
+InsertTableLbl		: "Tabel",
+InsertTable			: "Sisesta tabel / Muuda tabelit",
+InsertLineLbl		: "Joon",
+InsertLine			: "Sisesta horisontaaljoon",
+InsertSpecialCharLbl: "Erimärgid",
+InsertSpecialChar	: "Sisesta erimärk",
+InsertSmileyLbl		: "Emotikon",
+InsertSmiley		: "Sisesta emotikon",
+About				: "FCKeditor teave",
+Bold				: "Paks",
+Italic				: "Kursiiv",
+Underline			: "Allajoonitud",
+StrikeThrough		: "Läbijoonitud",
+Subscript			: "Allindeks",
+Superscript			: "Ülaindeks",
+LeftJustify			: "Vasakjoondus",
+CenterJustify		: "Keskjoondus",
+RightJustify		: "Paremjoondus",
+BlockJustify		: "Rööpjoondus",
+DecreaseIndent		: "Vähenda taanet",
+IncreaseIndent		: "Suurenda taanet",
+Blockquote			: "Blokktsitaat",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Võta tagasi",
+Redo				: "Korda toimingut",
+NumberedListLbl		: "Nummerdatud loetelu",
+NumberedList		: "Sisesta/Eemalda nummerdatud loetelu",
+BulletedListLbl		: "Punktiseeritud loetelu",
+BulletedList		: "Sisesta/Eemalda punktiseeritud loetelu",
+ShowTableBorders	: "Näita tabeli jooni",
+ShowDetails			: "Näita üksikasju",
+Style				: "Laad",
+FontFormat			: "Vorming",
+Font				: "Kiri",
+FontSize			: "Suurus",
+TextColor			: "Teksti värv",
+BGColor				: "Tausta värv",
+Source				: "Lähtekood",
+Find				: "Otsi",
+Replace				: "Asenda",
+SpellCheck			: "Kontrolli õigekirja",
+UniversalKeyboard	: "Universaalne klaviatuur",
+PageBreakLbl		: "Lehepiir",
+PageBreak			: "Sisesta lehevahetuskoht",
+
+Form			: "Vorm",
+Checkbox		: "Märkeruut",
+RadioButton		: "Raadionupp",
+TextField		: "Tekstilahter",
+Textarea		: "Tekstiala",
+HiddenField		: "Varjatud lahter",
+Button			: "Nupp",
+SelectionField	: "Valiklahter",
+ImageButton		: "Piltnupp",
+
+FitWindow		: "Maksimeeri redaktori mõõtmed",
+ShowBlocks		: "Näita blokke",
+
+// Context Menu
+EditLink			: "Muuda linki",
+CellCM				: "Lahter",
+RowCM				: "Rida",
+ColumnCM			: "Veerg",
+InsertRowAfter		: "Sisesta rida peale",
+InsertRowBefore		: "Sisesta rida enne",
+DeleteRows			: "Eemalda read",
+InsertColumnAfter	: "Sisesta veerg peale",
+InsertColumnBefore	: "Sisesta veerg enne",
+DeleteColumns		: "Eemalda veerud",
+InsertCellAfter		: "Sisesta lahter peale",
+InsertCellBefore	: "Sisesta lahter enne",
+DeleteCells			: "Eemalda lahtrid",
+MergeCells			: "Ühenda lahtrid",
+MergeRight			: "Ühenda paremale",
+MergeDown			: "Ühenda alla",
+HorizontalSplitCell	: "Poolita lahter horisontaalselt",
+VerticalSplitCell	: "Poolita lahter vertikaalselt",
+TableDelete			: "Kustuta tabel",
+CellProperties		: "Lahtri atribuudid",
+TableProperties		: "Tabeli atribuudid",
+ImageProperties		: "Pildi atribuudid",
+FlashProperties		: "Flash omadused",
+
+AnchorProp			: "Ankru omadused",
+ButtonProp			: "Nupu omadused",
+CheckboxProp		: "Märkeruudu omadused",
+HiddenFieldProp		: "Varjatud lahtri omadused",
+RadioButtonProp		: "Raadionupu omadused",
+ImageButtonProp		: "Piltnupu omadused",
+TextFieldProp		: "Tekstilahtri omadused",
+SelectionFieldProp	: "Valiklahtri omadused",
+TextareaProp		: "Tekstiala omadused",
+FormProp			: "Vormi omadused",
+
+FontFormats			: "Tavaline;Vormindatud;Aadress;Pealkiri 1;Pealkiri 2;Pealkiri 3;Pealkiri 4;Pealkiri 5;Pealkiri 6;Tavaline (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Töötlen XHTML'i. Palun oota...",
+Done				: "Tehtud",
+PasteWordConfirm	: "Tekst, mida soovid lisada paistab pärinevat Word'ist. Kas soovid seda enne kleepimist puhastada?",
+NotCompatiblePaste	: "See käsk on saadaval ainult Internet Explorer versioon 5.5 või uuema puhul. Kas soovid kleepida ilma puhastamata?",
+UnknownToolbarItem	: "Tundmatu tööriistarea üksus \"%1\"",
+UnknownCommand		: "Tundmatu käsunimi \"%1\"",
+NotImplemented		: "Käsku ei täidetud",
+UnknownToolbarSet	: "Tööriistariba \"%1\" ei eksisteeri",
+NoActiveX			: "Sinu veebisirvija turvalisuse seaded võivad limiteerida mõningaid tekstirdaktori kasutusvõimalusi. Sa peaksid võimaldama valiku \"Run ActiveX controls and plug-ins\" oma veebisirvija seadetes. Muidu võid sa täheldada vigu tekstiredaktori töös ja märgata puuduvaid funktsioone.",
+BrowseServerBlocked : "Ressursside sirvija avamine ebaõnnestus. Võimalda pop-up akende avanemine.",
+DialogBlocked		: "Ei olenud võimalik avada dialoogi akent. Võimalda pop-up akende avanemine.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Loobu",
+DlgBtnClose			: "Sulge",
+DlgBtnBrowseServer	: "Sirvi serverit",
+DlgAdvancedTag		: "Täpsemalt",
+DlgOpOther			: "<Teine>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Palun sisesta URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<määramata>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Keele suund",
+DlgGenLangDirLtr	: "Vasakult paremale (LTR)",
+DlgGenLangDirRtl	: "Paremalt vasakule (RTL)",
+DlgGenLangCode		: "Keele kood",
+DlgGenAccessKey		: "Juurdepääsu võti",
+DlgGenName			: "Nimi",
+DlgGenTabIndex		: "Tab indeks",
+DlgGenLongDescr		: "Pikk kirjeldus URL",
+DlgGenClass			: "Stiilistiku klassid",
+DlgGenTitle			: "Juhendav tiitel",
+DlgGenContType		: "Juhendava sisu tüüp",
+DlgGenLinkCharset	: "Lingitud ressurssi märgistik",
+DlgGenStyle			: "Laad",
+
+// Image Dialog
+DlgImgTitle			: "Pildi atribuudid",
+DlgImgInfoTab		: "Pildi info",
+DlgImgBtnUpload		: "Saada serverissee",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Lae üles",
+DlgImgAlt			: "Alternatiivne tekst",
+DlgImgWidth			: "Laius",
+DlgImgHeight		: "Kõrgus",
+DlgImgLockRatio		: "Lukusta kuvasuhe",
+DlgBtnResetSize		: "Lähtesta suurus",
+DlgImgBorder		: "Joon",
+DlgImgHSpace		: "H. vaheruum",
+DlgImgVSpace		: "V. vaheruum",
+DlgImgAlign			: "Joondus",
+DlgImgAlignLeft		: "Vasak",
+DlgImgAlignAbsBottom: "Abs alla",
+DlgImgAlignAbsMiddle: "Abs keskele",
+DlgImgAlignBaseline	: "Baasjoonele",
+DlgImgAlignBottom	: "Alla",
+DlgImgAlignMiddle	: "Keskele",
+DlgImgAlignRight	: "Paremale",
+DlgImgAlignTextTop	: "Tekstit üles",
+DlgImgAlignTop		: "Üles",
+DlgImgPreview		: "Eelvaade",
+DlgImgAlertUrl		: "Palun kirjuta pildi URL",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash omadused",
+DlgFlashChkPlay		: "Automaatne start ",
+DlgFlashChkLoop		: "Korduv",
+DlgFlashChkMenu		: "Võimalda flash menüü",
+DlgFlashScale		: "Mastaap",
+DlgFlashScaleAll	: "Näita kõike",
+DlgFlashScaleNoBorder	: "Äärist ei ole",
+DlgFlashScaleFit	: "Täpne sobivus",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Lingi info",
+DlgLnkTargetTab		: "Sihtkoht",
+
+DlgLnkType			: "Lingi tüüp",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ankur sellel lehel",
+DlgLnkTypeEMail		: "E-post",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<muu>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Vali ankur",
+DlgLnkAnchorByName	: "Ankru nime järgi",
+DlgLnkAnchorById	: "Elemendi id järgi",
+DlgLnkNoAnchors		: "(Selles dokumendis ei ole ankruid)",
+DlgLnkEMail			: "E-posti aadress",
+DlgLnkEMailSubject	: "Sõnumi teema",
+DlgLnkEMailBody		: "Sõnumi tekst",
+DlgLnkUpload		: "Lae üles",
+DlgLnkBtnUpload		: "Saada serverisse",
+
+DlgLnkTarget		: "Sihtkoht",
+DlgLnkTargetFrame	: "<raam>",
+DlgLnkTargetPopup	: "<hüpikaken>",
+DlgLnkTargetBlank	: "Uus aken (_blank)",
+DlgLnkTargetParent	: "Esivanem aken (_parent)",
+DlgLnkTargetSelf	: "Sama aken (_self)",
+DlgLnkTargetTop		: "Pealmine aken (_top)",
+DlgLnkTargetFrameName	: "Sihtmärk raami nimi",
+DlgLnkPopWinName	: "Hüpikakna nimi",
+DlgLnkPopWinFeat	: "Hüpikakna omadused",
+DlgLnkPopResize		: "Suurendatav",
+DlgLnkPopLocation	: "Aadressiriba",
+DlgLnkPopMenu		: "Menüüriba",
+DlgLnkPopScroll		: "Kerimisribad",
+DlgLnkPopStatus		: "Olekuriba",
+DlgLnkPopToolbar	: "Tööriistariba",
+DlgLnkPopFullScrn	: "Täisekraan (IE)",
+DlgLnkPopDependent	: "Sõltuv (Netscape)",
+DlgLnkPopWidth		: "Laius",
+DlgLnkPopHeight		: "Kõrgus",
+DlgLnkPopLeft		: "Vasak asukoht",
+DlgLnkPopTop		: "Ülemine asukoht",
+
+DlnLnkMsgNoUrl		: "Palun kirjuta lingi URL",
+DlnLnkMsgNoEMail	: "Palun kirjuta E-Posti aadress",
+DlnLnkMsgNoAnchor	: "Palun vali ankur",
+DlnLnkMsgInvPopName	: "Hüpikakna nimi peab algama alfabeetilise tähega ja ei tohi sisaldada tühikuid",
+
+// Color Dialog
+DlgColorTitle		: "Vali värv",
+DlgColorBtnClear	: "Tühjenda",
+DlgColorHighlight	: "Märgi",
+DlgColorSelected	: "Valitud",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Sisesta emotikon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Vali erimärk",
+
+// Table Dialog
+DlgTableTitle		: "Tabeli atribuudid",
+DlgTableRows		: "Read",
+DlgTableColumns		: "Veerud",
+DlgTableBorder		: "Joone suurus",
+DlgTableAlign		: "Joondus",
+DlgTableAlignNotSet	: "<Määramata>",
+DlgTableAlignLeft	: "Vasak",
+DlgTableAlignCenter	: "Kesk",
+DlgTableAlignRight	: "Parem",
+DlgTableWidth		: "Laius",
+DlgTableWidthPx		: "pikslit",
+DlgTableWidthPc		: "protsenti",
+DlgTableHeight		: "Kõrgus",
+DlgTableCellSpace	: "Lahtri vahe",
+DlgTableCellPad		: "Lahtri täidis",
+DlgTableCaption		: "Tabeli tiitel",
+DlgTableSummary		: "Kokkuvõte",
+
+// Table Cell Dialog
+DlgCellTitle		: "Lahtri atribuudid",
+DlgCellWidth		: "Laius",
+DlgCellWidthPx		: "pikslit",
+DlgCellWidthPc		: "protsenti",
+DlgCellHeight		: "Kõrgus",
+DlgCellWordWrap		: "Sõna ülekanne",
+DlgCellWordWrapNotSet	: "<Määramata>",
+DlgCellWordWrapYes	: "Jah",
+DlgCellWordWrapNo	: "Ei",
+DlgCellHorAlign		: "Horisontaaljoondus",
+DlgCellHorAlignNotSet	: "<Määramata>",
+DlgCellHorAlignLeft	: "Vasak",
+DlgCellHorAlignCenter	: "Kesk",
+DlgCellHorAlignRight: "Parem",
+DlgCellVerAlign		: "Vertikaaljoondus",
+DlgCellVerAlignNotSet	: "<Määramata>",
+DlgCellVerAlignTop	: "Üles",
+DlgCellVerAlignMiddle	: "Keskele",
+DlgCellVerAlignBottom	: "Alla",
+DlgCellVerAlignBaseline	: "Baasjoonele",
+DlgCellRowSpan		: "Reaulatus",
+DlgCellCollSpan		: "Veeruulatus",
+DlgCellBackColor	: "Tausta värv",
+DlgCellBorderColor	: "Joone värv",
+DlgCellBtnSelect	: "Vali...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Otsi ja asenda",
+
+// Find Dialog
+DlgFindTitle		: "Otsi",
+DlgFindFindBtn		: "Otsi",
+DlgFindNotFoundMsg	: "Valitud teksti ei leitud.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Asenda",
+DlgReplaceFindLbl		: "Leia mida:",
+DlgReplaceReplaceLbl	: "Asenda millega:",
+DlgReplaceCaseChk		: "Erista suur- ja väiketähti",
+DlgReplaceReplaceBtn	: "Asenda",
+DlgReplaceReplAllBtn	: "Asenda kõik",
+DlgReplaceWordChk		: "Otsi terviklike sõnu",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+X).",
+PasteErrorCopy	: "Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl+C).",
+
+PasteAsText		: "Kleebi tavalise tekstina",
+PasteFromWord	: "Kleebi Wordist",
+
+DlgPasteMsg2	: "Palun kleebi järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Sinu veebisirvija turvaseadete tõttu, ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead kleepima need uuesti siia aknasse.",
+DlgPasteIgnoreFont		: "Ignoreeri kirja definitsioone",
+DlgPasteRemoveStyles	: "Eemalda stiilide definitsioonid",
+
+// Color Picker
+ColorAutomatic	: "Automaatne",
+ColorMoreColors	: "Rohkem värve...",
+
+// Document Properties
+DocProps		: "Dokumendi omadused",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankru omadused",
+DlgAnchorName		: "Ankru nimi",
+DlgAnchorErrorName	: "Palun sisest ankru nimi",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Puudub sõnastikust",
+DlgSpellChangeTo		: "Muuda",
+DlgSpellBtnIgnore		: "Ignoreeri",
+DlgSpellBtnIgnoreAll	: "Ignoreeri kõiki",
+DlgSpellBtnReplace		: "Asenda",
+DlgSpellBtnReplaceAll	: "Asenda kõik",
+DlgSpellBtnUndo			: "Võta tagasi",
+DlgSpellNoSuggestions	: "- Soovitused puuduvad -",
+DlgSpellProgress		: "Toimub õigekirja kontroll...",
+DlgSpellNoMispell		: "Õigekirja kontroll sooritatud: õigekirjuvigu ei leitud",
+DlgSpellNoChanges		: "Õigekirja kontroll sooritatud: ühtegi sõna ei muudetud",
+DlgSpellOneChange		: "Õigekirja kontroll sooritatud: üks sõna muudeti",
+DlgSpellManyChanges		: "Õigekirja kontroll sooritatud: %1 sõna muudetud",
+
+IeSpellDownload			: "Õigekirja kontrollija ei ole installeeritud. Soovid sa selle alla laadida?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (väärtus)",
+DlgButtonType		: "Tüüp",
+DlgButtonTypeBtn	: "Nupp",
+DlgButtonTypeSbm	: "Saada",
+DlgButtonTypeRst	: "Lähtesta",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nimi",
+DlgCheckboxValue	: "Väärtus",
+DlgCheckboxSelected	: "Valitud",
+
+// Form Dialog
+DlgFormName		: "Nimi",
+DlgFormAction	: "Toiming",
+DlgFormMethod	: "Meetod",
+
+// Select Field Dialog
+DlgSelectName		: "Nimi",
+DlgSelectValue		: "Väärtus",
+DlgSelectSize		: "Suurus",
+DlgSelectLines		: "ridu",
+DlgSelectChkMulti	: "Võimalda mitu valikut",
+DlgSelectOpAvail	: "Võimalikud valikud",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Väärtus",
+DlgSelectBtnAdd		: "Lisa",
+DlgSelectBtnModify	: "Muuda",
+DlgSelectBtnUp		: "Üles",
+DlgSelectBtnDown	: "Alla",
+DlgSelectBtnSetValue : "Sea valitud olekuna",
+DlgSelectBtnDelete	: "Kustuta",
+
+// Textarea Dialog
+DlgTextareaName	: "Nimi",
+DlgTextareaCols	: "Veerge",
+DlgTextareaRows	: "Ridu",
+
+// Text Field Dialog
+DlgTextName			: "Nimi",
+DlgTextValue		: "Väärtus",
+DlgTextCharWidth	: "Laius (tähemärkides)",
+DlgTextMaxChars		: "Maksimaalselt tähemärke",
+DlgTextType			: "Tüüp",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Parool",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nimi",
+DlgHiddenValue	: "Väärtus",
+
+// Bulleted List Dialog
+BulletedListProp	: "Täpitud loetelu omadused",
+NumberedListProp	: "Nummerdatud loetelu omadused",
+DlgLstStart			: "Alusta",
+DlgLstType			: "Tüüp",
+DlgLstTypeCircle	: "Ring",
+DlgLstTypeDisc		: "Ketas",
+DlgLstTypeSquare	: "Ruut",
+DlgLstTypeNumbers	: "Numbrid (1, 2, 3)",
+DlgLstTypeLCase		: "Väiketähed (a, b, c)",
+DlgLstTypeUCase		: "Suurtähed (A, B, C)",
+DlgLstTypeSRoman	: "Väiksed Rooma numbrid (i, ii, iii)",
+DlgLstTypeLRoman	: "Suured Rooma numbrid (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Üldine",
+DlgDocBackTab		: "Taust",
+DlgDocColorsTab		: "Värvid ja veerised",
+DlgDocMetaTab		: "Meta andmed",
+
+DlgDocPageTitle		: "Lehekülje tiitel",
+DlgDocLangDir		: "Kirja suund",
+DlgDocLangDirLTR	: "Vasakult paremale (LTR)",
+DlgDocLangDirRTL	: "Paremalt vasakule (RTL)",
+DlgDocLangCode		: "Keele kood",
+DlgDocCharSet		: "Märgistiku kodeering",
+DlgDocCharSetCE		: "Kesk-Euroopa",
+DlgDocCharSetCT		: "Hiina traditsiooniline (Big5)",
+DlgDocCharSetCR		: "Kirillisa",
+DlgDocCharSetGR		: "Kreeka",
+DlgDocCharSetJP		: "Jaapani",
+DlgDocCharSetKR		: "Korea",
+DlgDocCharSetTR		: "Türgi",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Lääne-Euroopa",
+DlgDocCharSetOther	: "Ülejäänud märgistike kodeeringud",
+
+DlgDocDocType		: "Dokumendi tüüppäis",
+DlgDocDocTypeOther	: "Teised dokumendi tüüppäised",
+DlgDocIncXHTML		: "Arva kaasa XHTML deklaratsioonid",
+DlgDocBgColor		: "Taustavärv",
+DlgDocBgImage		: "Taustapildi URL",
+DlgDocBgNoScroll	: "Mittekeritav tagataust",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Külastatud link",
+DlgDocCActive		: "Aktiivne link",
+DlgDocMargins		: "Lehekülje äärised",
+DlgDocMaTop			: "Ülaserv",
+DlgDocMaLeft		: "Vasakserv",
+DlgDocMaRight		: "Paremserv",
+DlgDocMaBottom		: "Alaserv",
+DlgDocMeIndex		: "Dokumendi võtmesõnad (eraldatud komadega)",
+DlgDocMeDescr		: "Dokumendi kirjeldus",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Autoriõigus",
+DlgDocPreview		: "Eelvaade",
+
+// Templates Dialog
+Templates			: "Šabloon",
+DlgTemplatesTitle	: "Sisu šabloonid",
+DlgTemplatesSelMsg	: "Palun vali šabloon, et avada see redaktoris<br />(praegune sisu läheb kaotsi):",
+DlgTemplatesLoading	: "Laen šabloonide nimekirja. Palun oota...",
+DlgTemplatesNoTpl	: "(Ühtegi šablooni ei ole defineeritud)",
+DlgTemplatesReplace	: "Asenda tegelik sisu",
+
+// About Dialog
+DlgAboutAboutTab	: "Teave",
+DlgAboutBrowserInfoTab	: "Veebisirvija info",
+DlgAboutLicenseTab	: "Litsents",
+DlgAboutVersion		: "versioon",
+DlgAboutInfo		: "Täpsema info saamiseks mine",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/eu.js b/modules/editor/skins/fckeditor/editor/lang/eu.js
new file mode 100644
index 000000000..2ad6f2666
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/eu.js
@@ -0,0 +1,527 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Basque language file.
+ * Euskara hizkuntza fitxategia.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Estutu Tresna Barra",
+ToolbarExpand		: "Hedatu Tresna Barra",
+
+// Toolbar Items and Context Menu
+Save				: "Gorde",
+NewPage				: "Orrialde Berria",
+Preview				: "Aurrebista",
+Cut					: "Ebaki",
+Copy				: "Kopiatu",
+Paste				: "Itsatsi",
+PasteText			: "Itsatsi testu bezala",
+PasteWord			: "Itsatsi Word-etik",
+Print				: "Inprimatu",
+SelectAll			: "Hautatu dena",
+RemoveFormat		: "Kendu Formatoa",
+InsertLinkLbl		: "Esteka",
+InsertLink			: "Txertatu/Editatu Esteka",
+RemoveLink			: "Kendu Esteka",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Aingura",
+AnchorDelete		: "Ezabatu Aingura",
+InsertImageLbl		: "Irudia",
+InsertImage			: "Txertatu/Editatu Irudia",
+InsertFlashLbl		: "Flasha",
+InsertFlash			: "Txertatu/Editatu Flasha",
+InsertTableLbl		: "Taula",
+InsertTable			: "Txertatu/Editatu Taula",
+InsertLineLbl		: "Lerroa",
+InsertLine			: "Txertatu Marra Horizontala",
+InsertSpecialCharLbl: "Karaktere Berezia",
+InsertSpecialChar	: "Txertatu Karaktere Berezia",
+InsertSmileyLbl		: "Aurpegierak",
+InsertSmiley		: "Txertatu Aurpegierak",
+About				: "FCKeditor-ri buruz",
+Bold				: "Lodia",
+Italic				: "Etzana",
+Underline			: "Azpimarratu",
+StrikeThrough		: "Marratua",
+Subscript			: "Azpi-indize",
+Superscript			: "Goi-indize",
+LeftJustify			: "Lerrokatu Ezkerrean",
+CenterJustify		: "Lerrokatu Erdian",
+RightJustify		: "Lerrokatu Eskuman",
+BlockJustify		: "Justifikatu",
+DecreaseIndent		: "Txikitu Koska",
+IncreaseIndent		: "Handitu Koska",
+Blockquote			: "Aipamen blokea",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Desegin",
+Redo				: "Berregin",
+NumberedListLbl		: "Zenbakidun Zerrenda",
+NumberedList		: "Txertatu/Kendu Zenbakidun zerrenda",
+BulletedListLbl		: "Buletdun Zerrenda",
+BulletedList		: "Txertatu/Kendu Buletdun zerrenda",
+ShowTableBorders	: "Erakutsi Taularen Ertzak",
+ShowDetails			: "Erakutsi Xehetasunak",
+Style				: "Estiloa",
+FontFormat			: "Formatoa",
+Font				: "Letra-tipoa",
+FontSize			: "Tamaina",
+TextColor			: "Testu Kolorea",
+BGColor				: "Atzeko kolorea",
+Source				: "HTML Iturburua",
+Find				: "Bilatu",
+Replace				: "Ordezkatu",
+SpellCheck			: "Ortografia",
+UniversalKeyboard	: "Teklatu Unibertsala",
+PageBreakLbl		: "Orrialde-jauzia",
+PageBreak			: "Txertatu Orrialde-jauzia",
+
+Form			: "Formularioa",
+Checkbox		: "Kontrol-laukia",
+RadioButton		: "Aukera-botoia",
+TextField		: "Testu Eremua",
+Textarea		: "Testu-area",
+HiddenField		: "Ezkutuko Eremua",
+Button			: "Botoia",
+SelectionField	: "Hautespen Eremua",
+ImageButton		: "Irudi Botoia",
+
+FitWindow		: "Maximizatu editorearen tamaina",
+ShowBlocks		: "Blokeak erakutsi",
+
+// Context Menu
+EditLink			: "Aldatu Esteka",
+CellCM				: "Gelaxka",
+RowCM				: "Errenkada",
+ColumnCM			: "Zutabea",
+InsertRowAfter		: "Txertatu Lerroa Ostean",
+InsertRowBefore		: "Txertatu Lerroa Aurretik",
+DeleteRows			: "Ezabatu Errenkadak",
+InsertColumnAfter	: "Txertatu Zutabea Ostean",
+InsertColumnBefore	: "Txertatu Zutabea Aurretik",
+DeleteColumns		: "Ezabatu Zutabeak",
+InsertCellAfter		: "Txertatu Gelaxka Ostean",
+InsertCellBefore	: "Txertatu Gelaxka Aurretik",
+DeleteCells			: "Kendu Gelaxkak",
+MergeCells			: "Batu Gelaxkak",
+MergeRight			: "Elkartu Eskumara",
+MergeDown			: "Elkartu Behera",
+HorizontalSplitCell	: "Banatu Gelaxkak Horizontalki",
+VerticalSplitCell	: "Banatu Gelaxkak Bertikalki",
+TableDelete			: "Ezabatu Taula",
+CellProperties		: "Gelaxkaren Ezaugarriak",
+TableProperties		: "Taularen Ezaugarriak",
+ImageProperties		: "Irudiaren Ezaugarriak",
+FlashProperties		: "Flasharen Ezaugarriak",
+
+AnchorProp			: "Ainguraren Ezaugarriak",
+ButtonProp			: "Botoiaren Ezaugarriak",
+CheckboxProp		: "Kontrol-laukiko Ezaugarriak",
+HiddenFieldProp		: "Ezkutuko Eremuaren Ezaugarriak",
+RadioButtonProp		: "Aukera-botoiaren Ezaugarriak",
+ImageButtonProp		: "Irudi Botoiaren Ezaugarriak",
+TextFieldProp		: "Testu Eremuaren Ezaugarriak",
+SelectionFieldProp	: "Hautespen Eremuaren Ezaugarriak",
+TextareaProp		: "Testu-arearen Ezaugarriak",
+FormProp			: "Formularioaren Ezaugarriak",
+
+FontFormats			: "Arrunta;Formateatua;Helbidea;Izenburua 1;Izenburua 2;Izenburua 3;Izenburua 4;Izenburua 5;Izenburua 6;Paragrafoa (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML Prozesatzen. Itxaron mesedez...",
+Done				: "Eginda",
+PasteWordConfirm	: "Itsatsi nahi duzun textua Wordetik hartua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?",
+NotCompatiblePaste	: "Komando hau Internet Explorer 5.5 bertsiorako edo ondorengoentzako erabilgarria dago. Garbitu gabe itsatsi nahi duzu?",
+UnknownToolbarItem	: "Ataza barrako elementu ezezaguna \"%1\"",
+UnknownCommand		: "Komando izen ezezaguna \"%1\"",
+NotImplemented		: "Komando ez inplementatua",
+UnknownToolbarSet	: "Ataza barra \"%1\" taldea ez da existitzen",
+NoActiveX			: "Zure nabigatzailearen segustasun hobespenak editore honen zenbait ezaugarri mugatu ditzake. \"ActiveX kontrolak eta plug-inak\" aktibatu beharko zenituzke, bestela erroreak eta ezaugarrietan mugak egon daitezke.",
+BrowseServerBlocked : "Baliabideen arakatzailea ezin da ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.",
+DialogBlocked		: "Ezin da elkarrizketa-leihoa ireki. Ziurtatu popup blokeatzaileak desgaituta dituzula.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Ados",
+DlgBtnCancel		: "Utzi",
+DlgBtnClose			: "Itxi",
+DlgBtnBrowseServer	: "Zerbitzaria arakatu",
+DlgAdvancedTag		: "Aurreratua",
+DlgOpOther			: "<Bestelakoak>",
+DlgInfoTab			: "Informazioa",
+DlgAlertUrl			: "Mesedez URLa idatzi ezazu",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Ezarri gabe>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Hizkuntzaren Norabidea",
+DlgGenLangDirLtr	: "Ezkerretik Eskumara(LTR)",
+DlgGenLangDirRtl	: "Eskumatik Ezkerrera (RTL)",
+DlgGenLangCode		: "Hizkuntza Kodea",
+DlgGenAccessKey		: "Sarbide-gakoa",
+DlgGenName			: "Izena",
+DlgGenTabIndex		: "Tabulazio Indizea",
+DlgGenLongDescr		: "URL Deskribapen Luzea",
+DlgGenClass			: "Estilo-orriko Klaseak",
+DlgGenTitle			: "Izenburua",
+DlgGenContType		: "Eduki Mota (Content Type)",
+DlgGenLinkCharset	: "Estekatutako Karaktere Multzoa",
+DlgGenStyle			: "Estiloa",
+
+// Image Dialog
+DlgImgTitle			: "Irudi Ezaugarriak",
+DlgImgInfoTab		: "Irudi informazioa",
+DlgImgBtnUpload		: "Zerbitzarira bidalia",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Gora Kargatu",
+DlgImgAlt			: "Textu Alternatiboa",
+DlgImgWidth			: "Zabalera",
+DlgImgHeight		: "Altuera",
+DlgImgLockRatio		: "Erlazioa Blokeatu",
+DlgBtnResetSize		: "Tamaina Berrezarri",
+DlgImgBorder		: "Ertza",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Lerrokatu",
+DlgImgAlignLeft		: "Ezkerrera",
+DlgImgAlignAbsBottom: "Abs Behean",
+DlgImgAlignAbsMiddle: "Abs Erdian",
+DlgImgAlignBaseline	: "Oinan",
+DlgImgAlignBottom	: "Behean",
+DlgImgAlignMiddle	: "Erdian",
+DlgImgAlignRight	: "Eskuman",
+DlgImgAlignTextTop	: "Testua Goian",
+DlgImgAlignTop		: "Goian",
+DlgImgPreview		: "Aurrebista",
+DlgImgAlertUrl		: "Mesedez Irudiaren URLa idatzi",
+DlgImgLinkTab		: "Esteka",
+
+// Flash Dialog
+DlgFlashTitle		: "Flasharen Ezaugarriak",
+DlgFlashChkPlay		: "Automatikoki Erreproduzitu",
+DlgFlashChkLoop		: "Begizta",
+DlgFlashChkMenu		: "Flasharen Menua Gaitu",
+DlgFlashScale		: "Eskalatu",
+DlgFlashScaleAll	: "Dena erakutsi",
+DlgFlashScaleNoBorder	: "Ertzarik gabe",
+DlgFlashScaleFit	: "Doitu",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Esteka",
+DlgLnkInfoTab		: "Estekaren Informazioa",
+DlgLnkTargetTab		: "Helburua",
+
+DlgLnkType			: "Esteka Mota",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Aingura horrialde honentan",
+DlgLnkTypeEMail		: "ePosta",
+DlgLnkProto			: "Protokoloa",
+DlgLnkProtoOther	: "<Beste batzuk>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Aingura bat hautatu",
+DlgLnkAnchorByName	: "Aingura izenagatik",
+DlgLnkAnchorById	: "Elementuaren ID-gatik",
+DlgLnkNoAnchors		: "(Ez daude aingurak eskuragarri dokumentuan)",
+DlgLnkEMail			: "ePosta Helbidea",
+DlgLnkEMailSubject	: "Mezuaren Gaia",
+DlgLnkEMailBody		: "Mezuaren Gorputza",
+DlgLnkUpload		: "Gora kargatu",
+DlgLnkBtnUpload		: "Zerbitzarira bidali",
+
+DlgLnkTarget		: "Target (Helburua)",
+DlgLnkTargetFrame	: "<marko>",
+DlgLnkTargetPopup	: "<popup lehioa>",
+DlgLnkTargetBlank	: "Lehio Berria (_blank)",
+DlgLnkTargetParent	: "Lehio Gurasoa (_parent)",
+DlgLnkTargetSelf	: "Lehio Berdina (_self)",
+DlgLnkTargetTop		: "Goiko Lehioa (_top)",
+DlgLnkTargetFrameName	: "Marko Helburuaren Izena",
+DlgLnkPopWinName	: "Popup Lehioaren Izena",
+DlgLnkPopWinFeat	: "Popup Lehioaren Ezaugarriak",
+DlgLnkPopResize		: "Tamaina Aldakorra",
+DlgLnkPopLocation	: "Kokaleku Barra",
+DlgLnkPopMenu		: "Menu Barra",
+DlgLnkPopScroll		: "Korritze Barrak",
+DlgLnkPopStatus		: "Egoera Barra",
+DlgLnkPopToolbar	: "Tresna Barra",
+DlgLnkPopFullScrn	: "Pantaila Osoa (IE)",
+DlgLnkPopDependent	: "Menpekoa (Netscape)",
+DlgLnkPopWidth		: "Zabalera",
+DlgLnkPopHeight		: "Altuera",
+DlgLnkPopLeft		: "Ezkerreko  Posizioa",
+DlgLnkPopTop		: "Goiko Posizioa",
+
+DlnLnkMsgNoUrl		: "Mesedez URL esteka idatzi",
+DlnLnkMsgNoEMail	: "Mesedez ePosta helbidea idatzi",
+DlnLnkMsgNoAnchor	: "Mesedez aingura bat aukeratu",
+DlnLnkMsgInvPopName	: "Popup lehioaren izenak karaktere alfabetiko batekin hasi behar du eta eta ezin du zuriunerik izan",
+
+// Color Dialog
+DlgColorTitle		: "Kolore Aukeraketa",
+DlgColorBtnClear	: "Garbitu",
+DlgColorHighlight	: "Nabarmendu",
+DlgColorSelected	: "Aukeratuta",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Aurpegiera Sartu",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Karaktere Berezia Aukeratu",
+
+// Table Dialog
+DlgTableTitle		: "Taularen Ezaugarriak",
+DlgTableRows		: "Lerroak",
+DlgTableColumns		: "Zutabeak",
+DlgTableBorder		: "Ertzaren Zabalera",
+DlgTableAlign		: "Lerrokatu",
+DlgTableAlignNotSet	: "<Ezarri gabe>",
+DlgTableAlignLeft	: "Ezkerrean",
+DlgTableAlignCenter	: "Erdian",
+DlgTableAlignRight	: "Eskuman",
+DlgTableWidth		: "Zabalera",
+DlgTableWidthPx		: "pixel",
+DlgTableWidthPc		: "ehuneko",
+DlgTableHeight		: "Altuera",
+DlgTableCellSpace	: "Gelaxka arteko tartea",
+DlgTableCellPad		: "Gelaxken betegarria",
+DlgTableCaption		: "Epigrafea",
+DlgTableSummary		: "Laburpena",
+
+// Table Cell Dialog
+DlgCellTitle		: "Gelaxken Ezaugarriak",
+DlgCellWidth		: "Zabalera",
+DlgCellWidthPx		: "pixel",
+DlgCellWidthPc		: "ehuneko",
+DlgCellHeight		: "Altuera",
+DlgCellWordWrap		: "Itzulbira",
+DlgCellWordWrapNotSet	: "<Ezarri gabe>",
+DlgCellWordWrapYes	: "Bai",
+DlgCellWordWrapNo	: "Ez",
+DlgCellHorAlign		: "Horizontal Alignment",
+DlgCellHorAlignNotSet	: "<Ezarri gabe>",
+DlgCellHorAlignLeft	: "Ezkerrean",
+DlgCellHorAlignCenter	: "Erdian",
+DlgCellHorAlignRight: "Eskuman",
+DlgCellVerAlign		: "Lerrokatu Bertikalki",
+DlgCellVerAlignNotSet	: "<Ezarri gabe>",
+DlgCellVerAlignTop	: "Goian",
+DlgCellVerAlignMiddle	: "Erdian",
+DlgCellVerAlignBottom	: "Behean",
+DlgCellVerAlignBaseline	: "Oinan",
+DlgCellRowSpan		: "Lerroak Hedatu",
+DlgCellCollSpan		: "Zutabeak Hedatu",
+DlgCellBackColor	: "Atzeko Kolorea",
+DlgCellBorderColor	: "Ertzako Kolorea",
+DlgCellBtnSelect	: "Aukertau...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Bilatu eta Ordeztu",
+
+// Find Dialog
+DlgFindTitle		: "Bilaketa",
+DlgFindFindBtn		: "Bilatu",
+DlgFindNotFoundMsg	: "Idatzitako testua ez da topatu.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Ordeztu",
+DlgReplaceFindLbl		: "Zer bilatu:",
+DlgReplaceReplaceLbl	: "Zerekin ordeztu:",
+DlgReplaceCaseChk		: "Maiuskula/minuskula",
+DlgReplaceReplaceBtn	: "Ordeztu",
+DlgReplaceReplAllBtn	: "Ordeztu Guztiak",
+DlgReplaceWordChk		: "Esaldi osoa bilatu",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki moztea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+X).",
+PasteErrorCopy	: "Zure web nabigatzailearen segurtasun ezarpenak testuak automatikoki kopiatzea ez dute baimentzen. Mesedez teklatua erabili ezazu (Ctrl+C).",
+
+PasteAsText		: "Testu Arrunta bezala Itsatsi",
+PasteFromWord	: "Word-etik itsatsi",
+
+DlgPasteMsg2	: "Mesedez teklatua erabilita (<STRONG>Ctrl+V</STRONG>) ondorego eremuan testua itsatsi eta <STRONG>OK</STRONG> sakatu.",
+DlgPasteSec		: "Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.",
+DlgPasteIgnoreFont		: "Letra Motaren definizioa ezikusi",
+DlgPasteRemoveStyles	: "Estilo definizioak kendu",
+
+// Color Picker
+ColorAutomatic	: "Automatikoa",
+ColorMoreColors	: "Kolore gehiago...",
+
+// Document Properties
+DocProps		: "Dokumentuaren Ezarpenak",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ainguraren Ezaugarriak",
+DlgAnchorName		: "Ainguraren Izena",
+DlgAnchorErrorName	: "Idatzi ainguraren izena",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ez dago hiztegian",
+DlgSpellChangeTo		: "Honekin ordezkatu",
+DlgSpellBtnIgnore		: "Ezikusi",
+DlgSpellBtnIgnoreAll	: "Denak Ezikusi",
+DlgSpellBtnReplace		: "Ordezkatu",
+DlgSpellBtnReplaceAll	: "Denak Ordezkatu",
+DlgSpellBtnUndo			: "Desegin",
+DlgSpellNoSuggestions	: "- Iradokizunik ez -",
+DlgSpellProgress		: "Zuzenketa ortografikoa martxan...",
+DlgSpellNoMispell		: "Zuzenketa ortografikoa bukatuta: Akatsik ez",
+DlgSpellNoChanges		: "Zuzenketa ortografikoa bukatuta: Ez da ezer aldatu",
+DlgSpellOneChange		: "Zuzenketa ortografikoa bukatuta: Hitz bat aldatu da",
+DlgSpellManyChanges		: "Zuzenketa ortografikoa bukatuta: %1 hitz aldatu dira",
+
+IeSpellDownload			: "Zuzentzaile ortografikoa ez dago instalatuta. Deskargatu nahi duzu?",
+
+// Button Dialog
+DlgButtonText		: "Testua (Balorea)",
+DlgButtonType		: "Mota",
+DlgButtonTypeBtn	: "Botoia",
+DlgButtonTypeSbm	: "Bidali",
+DlgButtonTypeRst	: "Garbitu",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Izena",
+DlgCheckboxValue	: "Balorea",
+DlgCheckboxSelected	: "Hautatuta",
+
+// Form Dialog
+DlgFormName		: "Izena",
+DlgFormAction	: "Ekintza",
+DlgFormMethod	: "Method",
+
+// Select Field Dialog
+DlgSelectName		: "Izena",
+DlgSelectValue		: "Balorea",
+DlgSelectSize		: "Tamaina",
+DlgSelectLines		: "lerro kopurura",
+DlgSelectChkMulti	: "Hautaketa anitzak baimendu",
+DlgSelectOpAvail	: "Aukera Eskuragarriak",
+DlgSelectOpText		: "Testua",
+DlgSelectOpValue	: "Balorea",
+DlgSelectBtnAdd		: "Gehitu",
+DlgSelectBtnModify	: "Aldatu",
+DlgSelectBtnUp		: "Gora",
+DlgSelectBtnDown	: "Behera",
+DlgSelectBtnSetValue : "Aukeratutako balorea ezarri",
+DlgSelectBtnDelete	: "Ezabatu",
+
+// Textarea Dialog
+DlgTextareaName	: "Izena",
+DlgTextareaCols	: "Zutabeak",
+DlgTextareaRows	: "Lerroak",
+
+// Text Field Dialog
+DlgTextName			: "Izena",
+DlgTextValue		: "Balorea",
+DlgTextCharWidth	: "Zabalera",
+DlgTextMaxChars		: "Zenbat karaktere gehienez",
+DlgTextType			: "Mota",
+DlgTextTypeText		: "Testua",
+DlgTextTypePass		: "Pasahitza",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Izena",
+DlgHiddenValue	: "Balorea",
+
+// Bulleted List Dialog
+BulletedListProp	: "Buletdun Zerrendaren Ezarpenak",
+NumberedListProp	: "Zenbakidun Zerrendaren Ezarpenak",
+DlgLstStart			: "Hasiera",
+DlgLstType			: "Mota",
+DlgLstTypeCircle	: "Zirkulua",
+DlgLstTypeDisc		: "Diskoa",
+DlgLstTypeSquare	: "Karratua",
+DlgLstTypeNumbers	: "Zenbakiak (1, 2, 3)",
+DlgLstTypeLCase		: "Letra xeheak (a, b, c)",
+DlgLstTypeUCase		: "Letra larriak (A, B, C)",
+DlgLstTypeSRoman	: "Erromatar zenbaki zeheak (i, ii, iii)",
+DlgLstTypeLRoman	: "Erromatar zenbaki larriak (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Orokorra",
+DlgDocBackTab		: "Atzekaldea",
+DlgDocColorsTab		: "Koloreak eta Marjinak",
+DlgDocMetaTab		: "Meta Informazioa",
+
+DlgDocPageTitle		: "Orriaren Izenburua",
+DlgDocLangDir		: "Hizkuntzaren Norabidea",
+DlgDocLangDirLTR	: "Ezkerretik eskumara (LTR)",
+DlgDocLangDirRTL	: "Eskumatik ezkerrera (RTL)",
+DlgDocLangCode		: "Hizkuntzaren Kodea",
+DlgDocCharSet		: "Karaktere Multzoaren Kodeketa",
+DlgDocCharSetCE		: "Erdialdeko Europakoa",
+DlgDocCharSetCT		: "Txinatar Tradizionala (Big5)",
+DlgDocCharSetCR		: "Zirilikoa",
+DlgDocCharSetGR		: "Grekoa",
+DlgDocCharSetJP		: "Japoniarra",
+DlgDocCharSetKR		: "Korearra",
+DlgDocCharSetTR		: "Turkiarra",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Mendebaldeko Europakoa",
+DlgDocCharSetOther	: "Beste Karaktere Multzoko Kodeketa",
+
+DlgDocDocType		: "Document Type Goiburua",
+DlgDocDocTypeOther	: "Beste Document Type Goiburua",
+DlgDocIncXHTML		: "XHTML Ezarpenak",
+DlgDocBgColor		: "Atzeko Kolorea",
+DlgDocBgImage		: "Atzeko Irudiaren URL-a",
+DlgDocBgNoScroll	: "Korritze gabeko Atzekaldea",
+DlgDocCText			: "Testua",
+DlgDocCLink			: "Estekak",
+DlgDocCVisited		: "Bisitatutako Estekak",
+DlgDocCActive		: "Esteka Aktiboa",
+DlgDocMargins		: "Orrialdearen marjinak",
+DlgDocMaTop			: "Goian",
+DlgDocMaLeft		: "Ezkerrean",
+DlgDocMaRight		: "Eskuman",
+DlgDocMaBottom		: "Behean",
+DlgDocMeIndex		: "Dokumentuaren Gako-hitzak (komarekin bananduta)",
+DlgDocMeDescr		: "Dokumentuaren Deskribapena",
+DlgDocMeAuthor		: "Egilea",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Aurrebista",
+
+// Templates Dialog
+Templates			: "Txantiloiak",
+DlgTemplatesTitle	: "Eduki Txantiloiak",
+DlgTemplatesSelMsg	: "Mesedez txantiloia aukeratu editorean kargatzeko<br>(orain dauden edukiak galduko dira):",
+DlgTemplatesLoading	: "Txantiloiak kargatzen. Itxaron mesedez...",
+DlgTemplatesNoTpl	: "(Ez dago definitutako txantiloirik)",
+DlgTemplatesReplace	: "Ordeztu oraingo edukiak",
+
+// About Dialog
+DlgAboutAboutTab	: "Honi buruz",
+DlgAboutBrowserInfoTab	: "Nabigatzailearen Informazioa",
+DlgAboutLicenseTab	: "Lizentzia",
+DlgAboutVersion		: "bertsioa",
+DlgAboutInfo		: "Informazio gehiago eskuratzeko hona joan",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/fa.js b/modules/editor/skins/fckeditor/editor/lang/fa.js
new file mode 100644
index 000000000..a63852670
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/fa.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Persian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "rtl",
+
+ToolbarCollapse		: "برچیدن نوارابزار",
+ToolbarExpand		: "گستردن نوارابزار",
+
+// Toolbar Items and Context Menu
+Save				: "ذخیره",
+NewPage				: "برگهٴ تازه",
+Preview				: "پیش‌نمایش",
+Cut					: "برش",
+Copy				: "کپی",
+Paste				: "چسباندن",
+PasteText			: "چسباندن به عنوان متن ِساده",
+PasteWord			: "چسباندن از Word",
+Print				: "چاپ",
+SelectAll			: "گزینش همه",
+RemoveFormat		: "برداشتن فرمت",
+InsertLinkLbl		: "پیوند",
+InsertLink			: "گنجاندن/ویرایش ِپیوند",
+RemoveLink			: "برداشتن پیوند",
+VisitLink			: "باز کردن پیوند",
+Anchor				: "گنجاندن/ویرایش ِلنگر",
+AnchorDelete		: "برداشتن لنگر",
+InsertImageLbl		: "تصویر",
+InsertImage			: "گنجاندن/ویرایش ِتصویر",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "گنجاندن/ویرایش ِFlash",
+InsertTableLbl		: "جدول",
+InsertTable			: "گنجاندن/ویرایش ِجدول",
+InsertLineLbl		: "خط",
+InsertLine			: "گنجاندن خط ِافقی",
+InsertSpecialCharLbl: "نویسهٴ ویژه",
+InsertSpecialChar	: "گنجاندن نویسهٴ ویژه",
+InsertSmileyLbl		: "خندانک",
+InsertSmiley		: "گنجاندن خندانک",
+About				: "دربارهٴ FCKeditor",
+Bold				: "درشت",
+Italic				: "خمیده",
+Underline			: "خط‌زیردار",
+StrikeThrough		: "میان‌خط",
+Subscript			: "زیرنویس",
+Superscript			: "بالانویس",
+LeftJustify			: "چپ‌چین",
+CenterJustify		: "میان‌چین",
+RightJustify		: "راست‌چین",
+BlockJustify		: "بلوک‌چین",
+DecreaseIndent		: "کاهش تورفتگی",
+IncreaseIndent		: "افزایش تورفتگی",
+Blockquote			: "بلوک نقل قول",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "واچیدن",
+Redo				: "بازچیدن",
+NumberedListLbl		: "فهرست شماره‌دار",
+NumberedList		: "گنجاندن/برداشتن فهرست شماره‌دار",
+BulletedListLbl		: "فهرست نقطه‌ای",
+BulletedList		: "گنجاندن/برداشتن فهرست نقطه‌ای",
+ShowTableBorders	: "نمایش لبهٴ جدول",
+ShowDetails			: "نمایش جزئیات",
+Style				: "سبک",
+FontFormat			: "فرمت",
+Font				: "قلم",
+FontSize			: "اندازه",
+TextColor			: "رنگ متن",
+BGColor				: "رنگ پس‌زمینه",
+Source				: "منبع",
+Find				: "جستجو",
+Replace				: "جایگزینی",
+SpellCheck			: "بررسی املا",
+UniversalKeyboard	: "صفحه‌کلید جهانی",
+PageBreakLbl		: "شکستگی ِپایان ِبرگه",
+PageBreak			: "گنجاندن شکستگی ِپایان ِبرگه",
+
+Form			: "فرم",
+Checkbox		: "خانهٴ گزینه‌ای",
+RadioButton		: "دکمهٴ رادیویی",
+TextField		: "فیلد متنی",
+Textarea		: "ناحیهٴ متنی",
+HiddenField		: "فیلد پنهان",
+Button			: "دکمه",
+SelectionField	: "فیلد چندگزینه‌ای",
+ImageButton		: "دکمهٴ تصویری",
+
+FitWindow		: "بیشینه‌سازی ِاندازهٴ ویرایشگر",
+ShowBlocks		: "نمایش بلوک‌ها",
+
+// Context Menu
+EditLink			: "ویرایش پیوند",
+CellCM				: "سلول",
+RowCM				: "سطر",
+ColumnCM			: "ستون",
+InsertRowAfter		: "افزودن سطر بعد از",
+InsertRowBefore		: "افزودن سطر قبل از",
+DeleteRows			: "حذف سطرها",
+InsertColumnAfter	: "افزودن ستون بعد از",
+InsertColumnBefore	: "افزودن ستون قبل از",
+DeleteColumns		: "حذف ستونها",
+InsertCellAfter		: "افزودن سلول بعد از",
+InsertCellBefore	: "افزودن سلول قبل از",
+DeleteCells			: "حذف سلولها",
+MergeCells			: "ادغام سلولها",
+MergeRight			: "ادغام به راست",
+MergeDown			: "ادغام به پایین",
+HorizontalSplitCell	: "جدا کردن افقی سلول",
+VerticalSplitCell	: "جدا کردن عمودی سلول",
+TableDelete			: "پاک‌کردن جدول",
+CellProperties		: "ویژگیهای سلول",
+TableProperties		: "ویژگیهای جدول",
+ImageProperties		: "ویژگیهای تصویر",
+FlashProperties		: "ویژگیهای Flash",
+
+AnchorProp			: "ویژگیهای لنگر",
+ButtonProp			: "ویژگیهای دکمه",
+CheckboxProp		: "ویژگیهای خانهٴ گزینه‌ای",
+HiddenFieldProp		: "ویژگیهای فیلد پنهان",
+RadioButtonProp		: "ویژگیهای دکمهٴ رادیویی",
+ImageButtonProp		: "ویژگیهای دکمهٴ تصویری",
+TextFieldProp		: "ویژگیهای فیلد متنی",
+SelectionFieldProp	: "ویژگیهای فیلد چندگزینه‌ای",
+TextareaProp		: "ویژگیهای ناحیهٴ متنی",
+FormProp			: "ویژگیهای فرم",
+
+FontFormats			: "نرمال;فرمت‌شده;آدرس;سرنویس 1;سرنویس 2;سرنویس 3;سرنویس 4;سرنویس 5;سرنویس 6;بند;(DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "پردازش XHTML. لطفا صبر کنید...",
+Done				: "انجام شد",
+PasteWordConfirm	: "متنی که می‌خواهید بچسبانید به نظر می‌رسد از Word کپی شده است. آیا می‌خواهید قبل از چسباندن آن را پاک‌سازی کنید؟",
+NotCompatiblePaste	: "این فرمان برای مرورگر Internet Explorer از نگارش 5.5 یا بالاتر در دسترس است. آیا می‌خواهید بدون پاک‌سازی، متن را بچسبانید؟",
+UnknownToolbarItem	: "فقرهٴ نوارابزار ناشناخته \"%1\"",
+UnknownCommand		: "نام دستور ناشناخته \"%1\"",
+NotImplemented		: "دستور پیاده‌سازی‌نشده",
+UnknownToolbarSet	: "مجموعهٴ نوارابزار \"%1\" وجود ندارد",
+NoActiveX			: "تنظیمات امنیتی مرورگر شما ممکن است در بعضی از ویژگیهای مرورگر محدودیت ایجاد کند. شما باید گزینهٴ \"Run ActiveX controls and plug-ins\" را فعال کنید. ممکن است شما با خطاهایی روبرو باشید و متوجه کمبود ویژگیهایی شوید.",
+BrowseServerBlocked : "توانایی بازگشایی مرورگر منابع فراهم نیست. اطمینان حاصل کنید که تمامی برنامه‌های پیشگیری از نمایش popup را از کار بازداشته‌اید.",
+DialogBlocked		: "توانایی بازگشایی پنجرهٴ کوچک ِگفتگو فراهم نیست. اطمینان حاصل کنید که تمامی برنامه‌های پیشگیری از نمایش popup را از کار بازداشته‌اید.",
+VisitLinkBlocked	: "امکان بازکردن یک پنجره جدید نیست. اطمینان حاصل کنید که تمامی برنامه‌های پیشگیری از نمایش popup را از کار بازداشته‌اید.",
+
+// Dialogs
+DlgBtnOK			: "پذیرش",
+DlgBtnCancel		: "انصراف",
+DlgBtnClose			: "بستن",
+DlgBtnBrowseServer	: "فهرست‌نمایی سرور",
+DlgAdvancedTag		: "پیشرفته",
+DlgOpOther			: "<غیره>",
+DlgInfoTab			: "اطلاعات",
+DlgAlertUrl			: "لطفاً URL را بنویسید",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<تعین‌نشده>",
+DlgGenId			: "شناسه",
+DlgGenLangDir		: "جهت‌نمای زبان",
+DlgGenLangDirLtr	: "چپ به راست (LTR)",
+DlgGenLangDirRtl	: "راست به چپ (RTL)",
+DlgGenLangCode		: "کد زبان",
+DlgGenAccessKey		: "کلید دستیابی",
+DlgGenName			: "نام",
+DlgGenTabIndex		: "نمایهٴ دسترسی با Tab",
+DlgGenLongDescr		: "URL توصیف طولانی",
+DlgGenClass			: "کلاسهای شیوه‌نامه(Stylesheet)",
+DlgGenTitle			: "عنوان کمکی",
+DlgGenContType		: "نوع محتوای کمکی",
+DlgGenLinkCharset	: "نویسه‌گان منبع ِپیوندشده",
+DlgGenStyle			: "شیوه(style)",
+
+// Image Dialog
+DlgImgTitle			: "ویژگیهای تصویر",
+DlgImgInfoTab		: "اطلاعات تصویر",
+DlgImgBtnUpload		: "به سرور بفرست",
+DlgImgURL			: "URL",
+DlgImgUpload		: "انتقال به سرور",
+DlgImgAlt			: "متن جایگزین",
+DlgImgWidth			: "پهنا",
+DlgImgHeight		: "درازا",
+DlgImgLockRatio		: "قفل‌کردن ِنسبت",
+DlgBtnResetSize		: "بازنشانی اندازه",
+DlgImgBorder		: "لبه",
+DlgImgHSpace		: "فاصلهٴ افقی",
+DlgImgVSpace		: "فاصلهٴ عمودی",
+DlgImgAlign			: "چینش",
+DlgImgAlignLeft		: "چپ",
+DlgImgAlignAbsBottom: "پائین مطلق",
+DlgImgAlignAbsMiddle: "وسط مطلق",
+DlgImgAlignBaseline	: "خط‌پایه",
+DlgImgAlignBottom	: "پائین",
+DlgImgAlignMiddle	: "وسط",
+DlgImgAlignRight	: "راست",
+DlgImgAlignTextTop	: "متن بالا",
+DlgImgAlignTop		: "بالا",
+DlgImgPreview		: "پیش‌نمایش",
+DlgImgAlertUrl		: "لطفا URL تصویر را بنویسید",
+DlgImgLinkTab		: "پیوند",
+
+// Flash Dialog
+DlgFlashTitle		: "ویژگیهای Flash",
+DlgFlashChkPlay		: "آغاز ِخودکار",
+DlgFlashChkLoop		: "اجرای پیاپی",
+DlgFlashChkMenu		: "دردسترس‌بودن منوی Flash",
+DlgFlashScale		: "مقیاس",
+DlgFlashScaleAll	: "نمایش همه",
+DlgFlashScaleNoBorder	: "بدون کران",
+DlgFlashScaleFit	: "جایگیری کامل",
+
+// Link Dialog
+DlgLnkWindowTitle	: "پیوند",
+DlgLnkInfoTab		: "اطلاعات پیوند",
+DlgLnkTargetTab		: "مقصد",
+
+DlgLnkType			: "نوع پیوند",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "لنگر در همین صفحه",
+DlgLnkTypeEMail		: "پست الکترونیکی",
+DlgLnkProto			: "پروتکل",
+DlgLnkProtoOther	: "<دیگر>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "یک لنگر برگزینید",
+DlgLnkAnchorByName	: "با نام لنگر",
+DlgLnkAnchorById	: "با شناسهٴ المان",
+DlgLnkNoAnchors		: "(در این سند لنگری دردسترس نیست)",
+DlgLnkEMail			: "نشانی پست الکترونیکی",
+DlgLnkEMailSubject	: "موضوع پیام",
+DlgLnkEMailBody		: "متن پیام",
+DlgLnkUpload		: "انتقال به سرور",
+DlgLnkBtnUpload		: "به سرور بفرست",
+
+DlgLnkTarget		: "مقصد",
+DlgLnkTargetFrame	: "<فریم>",
+DlgLnkTargetPopup	: "<پنجرهٴ پاپاپ>",
+DlgLnkTargetBlank	: "پنجرهٴ دیگر (_blank)",
+DlgLnkTargetParent	: "پنجرهٴ والد (_parent)",
+DlgLnkTargetSelf	: "همان پنجره (_self)",
+DlgLnkTargetTop		: "بالاترین پنجره (_top)",
+DlgLnkTargetFrameName	: "نام فریم مقصد",
+DlgLnkPopWinName	: "نام پنجرهٴ پاپاپ",
+DlgLnkPopWinFeat	: "ویژگیهای پنجرهٴ پاپاپ",
+DlgLnkPopResize		: "قابل تغییر اندازه",
+DlgLnkPopLocation	: "نوار موقعیت",
+DlgLnkPopMenu		: "نوار منو",
+DlgLnkPopScroll		: "میله‌های پیمایش",
+DlgLnkPopStatus		: "نوار وضعیت",
+DlgLnkPopToolbar	: "نوارابزار",
+DlgLnkPopFullScrn	: "تمام‌صفحه (IE)",
+DlgLnkPopDependent	: "وابسته (Netscape)",
+DlgLnkPopWidth		: "پهنا",
+DlgLnkPopHeight		: "درازا",
+DlgLnkPopLeft		: "موقعیت ِچپ",
+DlgLnkPopTop		: "موقعیت ِبالا",
+
+DlnLnkMsgNoUrl		: "لطفا URL پیوند را بنویسید",
+DlnLnkMsgNoEMail	: "لطفا نشانی پست الکترونیکی را بنویسید",
+DlnLnkMsgNoAnchor	: "لطفا لنگری را برگزینید",
+DlnLnkMsgInvPopName	: "نام پنجرهٴ پاپاپ باید با یک نویسهٴ الفبایی آغاز گردد و نباید فاصله‌های خالی در آن باشند",
+
+// Color Dialog
+DlgColorTitle		: "گزینش رنگ",
+DlgColorBtnClear	: "پاک‌کردن",
+DlgColorHighlight	: "نمونه",
+DlgColorSelected	: "برگزیده",
+
+// Smiley Dialog
+DlgSmileyTitle		: "گنجاندن خندانک",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "گزینش نویسهٴ‌ویژه",
+
+// Table Dialog
+DlgTableTitle		: "ویژگیهای جدول",
+DlgTableRows		: "سطرها",
+DlgTableColumns		: "ستونها",
+DlgTableBorder		: "اندازهٴ لبه",
+DlgTableAlign		: "چینش",
+DlgTableAlignNotSet	: "<تعین‌نشده>",
+DlgTableAlignLeft	: "چپ",
+DlgTableAlignCenter	: "وسط",
+DlgTableAlignRight	: "راست",
+DlgTableWidth		: "پهنا",
+DlgTableWidthPx		: "پیکسل",
+DlgTableWidthPc		: "درصد",
+DlgTableHeight		: "درازا",
+DlgTableCellSpace	: "فاصلهٴ میان سلولها",
+DlgTableCellPad		: "فاصلهٴ پرشده در سلول",
+DlgTableCaption		: "عنوان",
+DlgTableSummary		: "خلاصه",
+
+// Table Cell Dialog
+DlgCellTitle		: "ویژگیهای سلول",
+DlgCellWidth		: "پهنا",
+DlgCellWidthPx		: "پیکسل",
+DlgCellWidthPc		: "درصد",
+DlgCellHeight		: "درازا",
+DlgCellWordWrap		: "شکستن واژه‌ها",
+DlgCellWordWrapNotSet	: "<تعین‌نشده>",
+DlgCellWordWrapYes	: "بله",
+DlgCellWordWrapNo	: "خیر",
+DlgCellHorAlign		: "چینش ِافقی",
+DlgCellHorAlignNotSet	: "<تعین‌نشده>",
+DlgCellHorAlignLeft	: "چپ",
+DlgCellHorAlignCenter	: "وسط",
+DlgCellHorAlignRight: "راست",
+DlgCellVerAlign		: "چینش ِعمودی",
+DlgCellVerAlignNotSet	: "<تعین‌نشده>",
+DlgCellVerAlignTop	: "بالا",
+DlgCellVerAlignMiddle	: "میان",
+DlgCellVerAlignBottom	: "پائین",
+DlgCellVerAlignBaseline	: "خط‌پایه",
+DlgCellRowSpan		: "گستردگی سطرها",
+DlgCellCollSpan		: "گستردگی ستونها",
+DlgCellBackColor	: "رنگ پس‌زمینه",
+DlgCellBorderColor	: "رنگ لبه",
+DlgCellBtnSelect	: "برگزینید...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "جستجو و جایگزینی",
+
+// Find Dialog
+DlgFindTitle		: "یافتن",
+DlgFindFindBtn		: "یافتن",
+DlgFindNotFoundMsg	: "متن موردنظر یافت نشد.",
+
+// Replace Dialog
+DlgReplaceTitle			: "جایگزینی",
+DlgReplaceFindLbl		: "چه‌چیز را می‌یابید:",
+DlgReplaceReplaceLbl	: "جایگزینی با:",
+DlgReplaceCaseChk		: "همسانی در بزرگی و کوچکی نویسه‌ها",
+DlgReplaceReplaceBtn	: "جایگزینی",
+DlgReplaceReplAllBtn	: "جایگزینی همهٴ یافته‌ها",
+DlgReplaceWordChk		: "همسانی با واژهٴ کامل",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "تنظیمات امنیتی مرورگر شما اجازه نمی‌دهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمه‌های صفحه‌کلید این کار را انجام دهید (Ctrl+X).",
+PasteErrorCopy	: "تنظیمات امنیتی مرورگر شما اجازه نمی‌دهد که ویرایشگر به طور خودکار عملکردهای کپی‌کردن را انجام دهد. لطفا با دکمه‌های صفحه‌کلید این کار را انجام دهید (Ctrl+C).",
+
+PasteAsText		: "چسباندن به عنوان متن ِساده",
+PasteFromWord	: "چسباندن از Word",
+
+DlgPasteMsg2	: "لطفا متن را با کلیدهای (<STRONG>Ctrl+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.",
+DlgPasteSec		: "به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمی‌تواند دسترسی مستقیم به داده‌های clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.",
+DlgPasteIgnoreFont		: "چشم‌پوشی از تعاریف نوع قلم",
+DlgPasteRemoveStyles	: "چشم‌پوشی از تعاریف سبک (style)",
+
+// Color Picker
+ColorAutomatic	: "خودکار",
+ColorMoreColors	: "رنگهای بیشتر...",
+
+// Document Properties
+DocProps		: "ویژگیهای سند",
+
+// Anchor Dialog
+DlgAnchorTitle		: "ویژگیهای لنگر",
+DlgAnchorName		: "نام لنگر",
+DlgAnchorErrorName	: "لطفا نام لنگر را بنویسید",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "در واژه‌نامه یافت نشد",
+DlgSpellChangeTo		: "تغییر به",
+DlgSpellBtnIgnore		: "چشم‌پوشی",
+DlgSpellBtnIgnoreAll	: "چشم‌پوشی همه",
+DlgSpellBtnReplace		: "جایگزینی",
+DlgSpellBtnReplaceAll	: "جایگزینی همه",
+DlgSpellBtnUndo			: "واچینش",
+DlgSpellNoSuggestions	: "- پیشنهادی نیست -",
+DlgSpellProgress		: "بررسی املا در حال انجام...",
+DlgSpellNoMispell		: "بررسی املا انجام شد. هیچ غلط‌املائی یافت نشد",
+DlgSpellNoChanges		: "بررسی املا انجام شد. هیچ واژه‌ای تغییر نیافت",
+DlgSpellOneChange		: "بررسی املا انجام شد. یک واژه تغییر یافت",
+DlgSpellManyChanges		: "بررسی املا انجام شد. %1 واژه تغییر یافت",
+
+IeSpellDownload			: "بررسی‌کنندهٴ املا نصب نشده است. آیا می‌خواهید آن را هم‌اکنون دریافت کنید؟",
+
+// Button Dialog
+DlgButtonText		: "متن (مقدار)",
+DlgButtonType		: "نوع",
+DlgButtonTypeBtn	: "دکمه",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "بازنشانی (Reset)",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "نام",
+DlgCheckboxValue	: "مقدار",
+DlgCheckboxSelected	: "برگزیده",
+
+// Form Dialog
+DlgFormName		: "نام",
+DlgFormAction	: "رویداد",
+DlgFormMethod	: "متد",
+
+// Select Field Dialog
+DlgSelectName		: "نام",
+DlgSelectValue		: "مقدار",
+DlgSelectSize		: "اندازه",
+DlgSelectLines		: "خطوط",
+DlgSelectChkMulti	: "گزینش چندگانه فراهم باشد",
+DlgSelectOpAvail	: "گزینه‌های دردسترس",
+DlgSelectOpText		: "متن",
+DlgSelectOpValue	: "مقدار",
+DlgSelectBtnAdd		: "افزودن",
+DlgSelectBtnModify	: "ویرایش",
+DlgSelectBtnUp		: "بالا",
+DlgSelectBtnDown	: "پائین",
+DlgSelectBtnSetValue : "تنظیم به عنوان مقدار ِبرگزیده",
+DlgSelectBtnDelete	: "پاک‌کردن",
+
+// Textarea Dialog
+DlgTextareaName	: "نام",
+DlgTextareaCols	: "ستونها",
+DlgTextareaRows	: "سطرها",
+
+// Text Field Dialog
+DlgTextName			: "نام",
+DlgTextValue		: "مقدار",
+DlgTextCharWidth	: "پهنای نویسه",
+DlgTextMaxChars		: "بیشینهٴ نویسه‌ها",
+DlgTextType			: "نوع",
+DlgTextTypeText		: "متن",
+DlgTextTypePass		: "گذرواژه",
+
+// Hidden Field Dialog
+DlgHiddenName	: "نام",
+DlgHiddenValue	: "مقدار",
+
+// Bulleted List Dialog
+BulletedListProp	: "ویژگیهای فهرست نقطه‌ای",
+NumberedListProp	: "ویژگیهای فهرست شماره‌دار",
+DlgLstStart			: "آغاز",
+DlgLstType			: "نوع",
+DlgLstTypeCircle	: "دایره",
+DlgLstTypeDisc		: "قرص",
+DlgLstTypeSquare	: "چهارگوش",
+DlgLstTypeNumbers	: "شماره‌ها (1، 2، 3)",
+DlgLstTypeLCase		: "نویسه‌های کوچک (a، b، c)",
+DlgLstTypeUCase		: "نویسه‌های بزرگ (A، B، C)",
+DlgLstTypeSRoman	: "شمارگان رومی کوچک (i، ii، iii)",
+DlgLstTypeLRoman	: "شمارگان رومی بزرگ (I، II، III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "عمومی",
+DlgDocBackTab		: "پس‌زمینه",
+DlgDocColorsTab		: "رنگها و حاشیه‌ها",
+DlgDocMetaTab		: "فراداده",
+
+DlgDocPageTitle		: "عنوان صفحه",
+DlgDocLangDir		: "جهت زبان",
+DlgDocLangDirLTR	: "چپ به راست (LTR(",
+DlgDocLangDirRTL	: "راست به چپ (RTL(",
+DlgDocLangCode		: "کد زبان",
+DlgDocCharSet		: "رمزگذاری نویسه‌گان",
+DlgDocCharSetCE		: "اروپای مرکزی",
+DlgDocCharSetCT		: "چینی رسمی (Big5)",
+DlgDocCharSetCR		: "سیریلیک",
+DlgDocCharSetGR		: "یونانی",
+DlgDocCharSetJP		: "ژاپنی",
+DlgDocCharSetKR		: "کره‌ای",
+DlgDocCharSetTR		: "ترکی",
+DlgDocCharSetUN		: "یونیکُد (UTF-8)",
+DlgDocCharSetWE		: "اروپای غربی",
+DlgDocCharSetOther	: "رمزگذاری نویسه‌گان دیگر",
+
+DlgDocDocType		: "عنوان نوع سند",
+DlgDocDocTypeOther	: "عنوان نوع سند دیگر",
+DlgDocIncXHTML		: "شامل تعاریف XHTML",
+DlgDocBgColor		: "رنگ پس‌زمینه",
+DlgDocBgImage		: "URL تصویر پس‌زمینه",
+DlgDocBgNoScroll	: "پس‌زمینهٴ پیمایش‌ناپذیر",
+DlgDocCText			: "متن",
+DlgDocCLink			: "پیوند",
+DlgDocCVisited		: "پیوند مشاهده‌شده",
+DlgDocCActive		: "پیوند فعال",
+DlgDocMargins		: "حاشیه‌های صفحه",
+DlgDocMaTop			: "بالا",
+DlgDocMaLeft		: "چپ",
+DlgDocMaRight		: "راست",
+DlgDocMaBottom		: "پایین",
+DlgDocMeIndex		: "کلیدواژگان نمایه‌گذاری سند (با کاما جدا شوند)",
+DlgDocMeDescr		: "توصیف سند",
+DlgDocMeAuthor		: "نویسنده",
+DlgDocMeCopy		: "کپی‌رایت",
+DlgDocPreview		: "پیش‌نمایش",
+
+// Templates Dialog
+Templates			: "الگوها",
+DlgTemplatesTitle	: "الگوهای محتویات",
+DlgTemplatesSelMsg	: "لطفا الگوی موردنظر را برای بازکردن در ویرایشگر برگزینید<br>(محتویات کنونی از دست خواهند رفت):",
+DlgTemplatesLoading	: "بارگذاری فهرست الگوها. لطفا صبر کنید...",
+DlgTemplatesNoTpl	: "(الگوئی تعریف نشده است)",
+DlgTemplatesReplace	: "محتویات کنونی جایگزین شوند",
+
+// About Dialog
+DlgAboutAboutTab	: "درباره",
+DlgAboutBrowserInfoTab	: "اطلاعات مرورگر",
+DlgAboutLicenseTab	: "گواهینامه",
+DlgAboutVersion		: "نگارش",
+DlgAboutInfo		: "برای آگاهی بیشتر به این نشانی بروید",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/fi.js b/modules/editor/skins/fckeditor/editor/lang/fi.js
new file mode 100644
index 000000000..1bd09eab9
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/fi.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Finnish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Piilota työkalurivi",
+ToolbarExpand		: "Näytä työkalurivi",
+
+// Toolbar Items and Context Menu
+Save				: "Tallenna",
+NewPage				: "Tyhjennä",
+Preview				: "Esikatsele",
+Cut					: "Leikkaa",
+Copy				: "Kopioi",
+Paste				: "Liitä",
+PasteText			: "Liitä tekstinä",
+PasteWord			: "Liitä Wordista",
+Print				: "Tulosta",
+SelectAll			: "Valitse kaikki",
+RemoveFormat		: "Poista muotoilu",
+InsertLinkLbl		: "Linkki",
+InsertLink			: "Lisää linkki/muokkaa linkkiä",
+RemoveLink			: "Poista linkki",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Lisää ankkuri/muokkaa ankkuria",
+AnchorDelete		: "Poista ankkuri",
+InsertImageLbl		: "Kuva",
+InsertImage			: "Lisää kuva/muokkaa kuvaa",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Lisää/muokkaa Flashia",
+InsertTableLbl		: "Taulu",
+InsertTable			: "Lisää taulu/muokkaa taulua",
+InsertLineLbl		: "Murtoviiva",
+InsertLine			: "Lisää murtoviiva",
+InsertSpecialCharLbl: "Erikoismerkki",
+InsertSpecialChar	: "Lisää erikoismerkki",
+InsertSmileyLbl		: "Hymiö",
+InsertSmiley		: "Lisää hymiö",
+About				: "FCKeditorista",
+Bold				: "Lihavoitu",
+Italic				: "Kursivoitu",
+Underline			: "Alleviivattu",
+StrikeThrough		: "Yliviivattu",
+Subscript			: "Alaindeksi",
+Superscript			: "Yläindeksi",
+LeftJustify			: "Tasaa vasemmat reunat",
+CenterJustify		: "Keskitä",
+RightJustify		: "Tasaa oikeat reunat",
+BlockJustify		: "Tasaa molemmat reunat",
+DecreaseIndent		: "Pienennä sisennystä",
+IncreaseIndent		: "Suurenna sisennystä",
+Blockquote			: "Lainaus",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Kumoa",
+Redo				: "Toista",
+NumberedListLbl		: "Numerointi",
+NumberedList		: "Lisää/poista numerointi",
+BulletedListLbl		: "Luottelomerkit",
+BulletedList		: "Lisää/poista luottelomerkit",
+ShowTableBorders	: "Näytä taulun rajat",
+ShowDetails			: "Näytä muotoilu",
+Style				: "Tyyli",
+FontFormat			: "Muotoilu",
+Font				: "Fontti",
+FontSize			: "Koko",
+TextColor			: "Tekstiväri",
+BGColor				: "Taustaväri",
+Source				: "Koodi",
+Find				: "Etsi",
+Replace				: "Korvaa",
+SpellCheck			: "Tarkista oikeinkirjoitus",
+UniversalKeyboard	: "Universaali näppäimistö",
+PageBreakLbl		: "Sivun vaihto",
+PageBreak			: "Lisää sivun vaihto",
+
+Form			: "Lomake",
+Checkbox		: "Valintaruutu",
+RadioButton		: "Radiopainike",
+TextField		: "Tekstikenttä",
+Textarea		: "Tekstilaatikko",
+HiddenField		: "Piilokenttä",
+Button			: "Painike",
+SelectionField	: "Valintakenttä",
+ImageButton		: "Kuvapainike",
+
+FitWindow		: "Suurenna editori koko ikkunaan",
+ShowBlocks		: "Näytä elementit",
+
+// Context Menu
+EditLink			: "Muokkaa linkkiä",
+CellCM				: "Solu",
+RowCM				: "Rivi",
+ColumnCM			: "Sarake",
+InsertRowAfter		: "Lisää rivi alapuolelle",
+InsertRowBefore		: "Lisää rivi yläpuolelle",
+DeleteRows			: "Poista rivit",
+InsertColumnAfter	: "Lisää sarake oikealle",
+InsertColumnBefore	: "Lisää sarake vasemmalle",
+DeleteColumns		: "Poista sarakkeet",
+InsertCellAfter		: "Lisää solu perään",
+InsertCellBefore	: "Lisää solu eteen",
+DeleteCells			: "Poista solut",
+MergeCells			: "Yhdistä solut",
+MergeRight			: "Yhdistä oikealla olevan kanssa",
+MergeDown			: "Yhdistä alla olevan kanssa",
+HorizontalSplitCell	: "Jaa solu vaakasuunnassa",
+VerticalSplitCell	: "Jaa solu pystysuunnassa",
+TableDelete			: "Poista taulu",
+CellProperties		: "Solun ominaisuudet",
+TableProperties		: "Taulun ominaisuudet",
+ImageProperties		: "Kuvan ominaisuudet",
+FlashProperties		: "Flash ominaisuudet",
+
+AnchorProp			: "Ankkurin ominaisuudet",
+ButtonProp			: "Painikkeen ominaisuudet",
+CheckboxProp		: "Valintaruudun ominaisuudet",
+HiddenFieldProp		: "Piilokentän ominaisuudet",
+RadioButtonProp		: "Radiopainikkeen ominaisuudet",
+ImageButtonProp		: "Kuvapainikkeen ominaisuudet",
+TextFieldProp		: "Tekstikentän ominaisuudet",
+SelectionFieldProp	: "Valintakentän ominaisuudet",
+TextareaProp		: "Tekstilaatikon ominaisuudet",
+FormProp			: "Lomakkeen ominaisuudet",
+
+FontFormats			: "Normaali;Muotoiltu;Osoite;Otsikko 1;Otsikko 2;Otsikko 3;Otsikko 4;Otsikko 5;Otsikko 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Prosessoidaan XHTML:ää. Odota hetki...",
+Done				: "Valmis",
+PasteWordConfirm	: "Teksti, jonka haluat liittää, näyttää olevan kopioitu Wordista. Haluatko puhdistaa sen ennen liittämistä?",
+NotCompatiblePaste	: "Tämä komento toimii vain Internet Explorer 5.5:ssa tai uudemmassa. Haluatko liittää ilman puhdistusta?",
+UnknownToolbarItem	: "Tuntemanton työkalu \"%1\"",
+UnknownCommand		: "Tuntematon komento \"%1\"",
+NotImplemented		: "Komentoa ei ole liitetty sovellukseen",
+UnknownToolbarSet	: "Työkalukokonaisuus \"%1\" ei ole olemassa",
+NoActiveX			: "Selaimesi turvallisuusasetukset voivat rajoittaa joitain editorin ominaisuuksia. Sinun pitää ottaa käyttöön asetuksista \"Suorita ActiveX komponentit ja -plugin-laajennukset\". Saatat kohdata virheitä ja huomata puuttuvia ominaisuuksia.",
+BrowseServerBlocked : "Resurssiselainta ei voitu avata. Varmista, että ponnahdusikkunoiden estäjät eivät ole päällä.",
+DialogBlocked		: "Apuikkunaa ei voitu avaata. Varmista, että ponnahdusikkunoiden estäjät eivät ole päällä.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Peruuta",
+DlgBtnClose			: "Sulje",
+DlgBtnBrowseServer	: "Selaa palvelinta",
+DlgAdvancedTag		: "Lisäominaisuudet",
+DlgOpOther			: "Muut",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Lisää URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ei asetettu>",
+DlgGenId			: "Tunniste",
+DlgGenLangDir		: "Kielen suunta",
+DlgGenLangDirLtr	: "Vasemmalta oikealle (LTR)",
+DlgGenLangDirRtl	: "Oikealta vasemmalle (RTL)",
+DlgGenLangCode		: "Kielikoodi",
+DlgGenAccessKey		: "Pikanäppäin",
+DlgGenName			: "Nimi",
+DlgGenTabIndex		: "Tabulaattori indeksi",
+DlgGenLongDescr		: "Pitkän kuvauksen URL",
+DlgGenClass			: "Tyyliluokat",
+DlgGenTitle			: "Avustava otsikko",
+DlgGenContType		: "Avustava sisällön tyyppi",
+DlgGenLinkCharset	: "Linkitetty kirjaimisto",
+DlgGenStyle			: "Tyyli",
+
+// Image Dialog
+DlgImgTitle			: "Kuvan ominaisuudet",
+DlgImgInfoTab		: "Kuvan tiedot",
+DlgImgBtnUpload		: "Lähetä palvelimelle",
+DlgImgURL			: "Osoite",
+DlgImgUpload		: "Lisää kuva",
+DlgImgAlt			: "Vaihtoehtoinen teksti",
+DlgImgWidth			: "Leveys",
+DlgImgHeight		: "Korkeus",
+DlgImgLockRatio		: "Lukitse suhteet",
+DlgBtnResetSize		: "Alkuperäinen koko",
+DlgImgBorder		: "Raja",
+DlgImgHSpace		: "Vaakatila",
+DlgImgVSpace		: "Pystytila",
+DlgImgAlign			: "Kohdistus",
+DlgImgAlignLeft		: "Vasemmalle",
+DlgImgAlignAbsBottom: "Aivan alas",
+DlgImgAlignAbsMiddle: "Aivan keskelle",
+DlgImgAlignBaseline	: "Alas (teksti)",
+DlgImgAlignBottom	: "Alas",
+DlgImgAlignMiddle	: "Keskelle",
+DlgImgAlignRight	: "Oikealle",
+DlgImgAlignTextTop	: "Ylös (teksti)",
+DlgImgAlignTop		: "Ylös",
+DlgImgPreview		: "Esikatselu",
+DlgImgAlertUrl		: "Kirjoita kuvan osoite (URL)",
+DlgImgLinkTab		: "Linkki",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash ominaisuudet",
+DlgFlashChkPlay		: "Automaattinen käynnistys",
+DlgFlashChkLoop		: "Toisto",
+DlgFlashChkMenu		: "Näytä Flash-valikko",
+DlgFlashScale		: "Levitä",
+DlgFlashScaleAll	: "Näytä kaikki",
+DlgFlashScaleNoBorder	: "Ei rajaa",
+DlgFlashScaleFit	: "Tarkka koko",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Linkki",
+DlgLnkInfoTab		: "Linkin tiedot",
+DlgLnkTargetTab		: "Kohde",
+
+DlgLnkType			: "Linkkityyppi",
+DlgLnkTypeURL		: "Osoite",
+DlgLnkTypeAnchor	: "Ankkuri tässä sivussa",
+DlgLnkTypeEMail		: "Sähköposti",
+DlgLnkProto			: "Protokolla",
+DlgLnkProtoOther	: "<muu>",
+DlgLnkURL			: "Osoite",
+DlgLnkAnchorSel		: "Valitse ankkuri",
+DlgLnkAnchorByName	: "Ankkurin nimen mukaan",
+DlgLnkAnchorById	: "Ankkurin ID:n mukaan",
+DlgLnkNoAnchors		: "(Ei ankkureita tässä dokumentissa)",
+DlgLnkEMail			: "Sähköpostiosoite",
+DlgLnkEMailSubject	: "Aihe",
+DlgLnkEMailBody		: "Viesti",
+DlgLnkUpload		: "Lisää tiedosto",
+DlgLnkBtnUpload		: "Lähetä palvelimelle",
+
+DlgLnkTarget		: "Kohde",
+DlgLnkTargetFrame	: "<kehys>",
+DlgLnkTargetPopup	: "<popup ikkuna>",
+DlgLnkTargetBlank	: "Uusi ikkuna (_blank)",
+DlgLnkTargetParent	: "Emoikkuna (_parent)",
+DlgLnkTargetSelf	: "Sama ikkuna (_self)",
+DlgLnkTargetTop		: "Päällimmäisin ikkuna (_top)",
+DlgLnkTargetFrameName	: "Kohdekehyksen nimi",
+DlgLnkPopWinName	: "Popup ikkunan nimi",
+DlgLnkPopWinFeat	: "Popup ikkunan ominaisuudet",
+DlgLnkPopResize		: "Venytettävä",
+DlgLnkPopLocation	: "Osoiterivi",
+DlgLnkPopMenu		: "Valikkorivi",
+DlgLnkPopScroll		: "Vierityspalkit",
+DlgLnkPopStatus		: "Tilarivi",
+DlgLnkPopToolbar	: "Vakiopainikkeet",
+DlgLnkPopFullScrn	: "Täysi ikkuna (IE)",
+DlgLnkPopDependent	: "Riippuva (Netscape)",
+DlgLnkPopWidth		: "Leveys",
+DlgLnkPopHeight		: "Korkeus",
+DlgLnkPopLeft		: "Vasemmalta (px)",
+DlgLnkPopTop		: "Ylhäältä (px)",
+
+DlnLnkMsgNoUrl		: "Linkille on kirjoitettava URL",
+DlnLnkMsgNoEMail	: "Kirjoita sähköpostiosoite",
+DlnLnkMsgNoAnchor	: "Valitse ankkuri",
+DlnLnkMsgInvPopName	: "Popup-ikkunan nimi pitää alkaa aakkosella ja ei saa sisältää välejä",
+
+// Color Dialog
+DlgColorTitle		: "Valitse väri",
+DlgColorBtnClear	: "Tyhjennä",
+DlgColorHighlight	: "Kohdalla",
+DlgColorSelected	: "Valittu",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Lisää hymiö",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Valitse erikoismerkki",
+
+// Table Dialog
+DlgTableTitle		: "Taulun ominaisuudet",
+DlgTableRows		: "Rivit",
+DlgTableColumns		: "Sarakkeet",
+DlgTableBorder		: "Rajan paksuus",
+DlgTableAlign		: "Kohdistus",
+DlgTableAlignNotSet	: "<ei asetettu>",
+DlgTableAlignLeft	: "Vasemmalle",
+DlgTableAlignCenter	: "Keskelle",
+DlgTableAlignRight	: "Oikealle",
+DlgTableWidth		: "Leveys",
+DlgTableWidthPx		: "pikseliä",
+DlgTableWidthPc		: "prosenttia",
+DlgTableHeight		: "Korkeus",
+DlgTableCellSpace	: "Solujen väli",
+DlgTableCellPad		: "Solujen sisennys",
+DlgTableCaption		: "Otsikko",
+DlgTableSummary		: "Yhteenveto",
+
+// Table Cell Dialog
+DlgCellTitle		: "Solun ominaisuudet",
+DlgCellWidth		: "Leveys",
+DlgCellWidthPx		: "pikseliä",
+DlgCellWidthPc		: "prosenttia",
+DlgCellHeight		: "Korkeus",
+DlgCellWordWrap		: "Tekstikierrätys",
+DlgCellWordWrapNotSet	: "<Ei asetettu>",
+DlgCellWordWrapYes	: "Kyllä",
+DlgCellWordWrapNo	: "Ei",
+DlgCellHorAlign		: "Vaakakohdistus",
+DlgCellHorAlignNotSet	: "<Ei asetettu>",
+DlgCellHorAlignLeft	: "Vasemmalle",
+DlgCellHorAlignCenter	: "Keskelle",
+DlgCellHorAlignRight: "Oikealle",
+DlgCellVerAlign		: "Pystykohdistus",
+DlgCellVerAlignNotSet	: "<Ei asetettu>",
+DlgCellVerAlignTop	: "Ylös",
+DlgCellVerAlignMiddle	: "Keskelle",
+DlgCellVerAlignBottom	: "Alas",
+DlgCellVerAlignBaseline	: "Tekstin alas",
+DlgCellRowSpan		: "Rivin jatkuvuus",
+DlgCellCollSpan		: "Sarakkeen jatkuvuus",
+DlgCellBackColor	: "Taustaväri",
+DlgCellBorderColor	: "Rajan väri",
+DlgCellBtnSelect	: "Valitse...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Etsi ja korvaa",
+
+// Find Dialog
+DlgFindTitle		: "Etsi",
+DlgFindFindBtn		: "Etsi",
+DlgFindNotFoundMsg	: "Etsittyä tekstiä ei löytynyt.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Korvaa",
+DlgReplaceFindLbl		: "Etsi mitä:",
+DlgReplaceReplaceLbl	: "Korvaa tällä:",
+DlgReplaceCaseChk		: "Sama kirjainkoko",
+DlgReplaceReplaceBtn	: "Korvaa",
+DlgReplaceReplAllBtn	: "Korvaa kaikki",
+DlgReplaceWordChk		: "Koko sana",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).",
+PasteErrorCopy	: "Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).",
+
+PasteAsText		: "Liitä tekstinä",
+PasteFromWord	: "Liitä Wordista",
+
+DlgPasteMsg2	: "Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.",
+DlgPasteIgnoreFont		: "Jätä huomioimatta fonttimääritykset",
+DlgPasteRemoveStyles	: "Poista tyylimääritykset",
+
+// Color Picker
+ColorAutomatic	: "Automaattinen",
+ColorMoreColors	: "Lisää värejä...",
+
+// Document Properties
+DocProps		: "Dokumentin ominaisuudet",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankkurin ominaisuudet",
+DlgAnchorName		: "Nimi",
+DlgAnchorErrorName	: "Ankkurille on kirjoitettava nimi",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ei sanakirjassa",
+DlgSpellChangeTo		: "Vaihda",
+DlgSpellBtnIgnore		: "Jätä huomioimatta",
+DlgSpellBtnIgnoreAll	: "Jätä kaikki huomioimatta",
+DlgSpellBtnReplace		: "Korvaa",
+DlgSpellBtnReplaceAll	: "Korvaa kaikki",
+DlgSpellBtnUndo			: "Kumoa",
+DlgSpellNoSuggestions	: "Ei ehdotuksia",
+DlgSpellProgress		: "Tarkistus käynnissä...",
+DlgSpellNoMispell		: "Tarkistus valmis: Ei virheitä",
+DlgSpellNoChanges		: "Tarkistus valmis: Yhtään sanaa ei muutettu",
+DlgSpellOneChange		: "Tarkistus valmis: Yksi sana muutettiin",
+DlgSpellManyChanges		: "Tarkistus valmis: %1 sanaa muutettiin",
+
+IeSpellDownload			: "Oikeinkirjoituksen tarkistusta ei ole asennettu. Haluatko ladata sen nyt?",
+
+// Button Dialog
+DlgButtonText		: "Teksti (arvo)",
+DlgButtonType		: "Tyyppi",
+DlgButtonTypeBtn	: "Painike",
+DlgButtonTypeSbm	: "Lähetä",
+DlgButtonTypeRst	: "Tyhjennä",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nimi",
+DlgCheckboxValue	: "Arvo",
+DlgCheckboxSelected	: "Valittu",
+
+// Form Dialog
+DlgFormName		: "Nimi",
+DlgFormAction	: "Toiminto",
+DlgFormMethod	: "Tapa",
+
+// Select Field Dialog
+DlgSelectName		: "Nimi",
+DlgSelectValue		: "Arvo",
+DlgSelectSize		: "Koko",
+DlgSelectLines		: "Rivit",
+DlgSelectChkMulti	: "Salli usea valinta",
+DlgSelectOpAvail	: "Ominaisuudet",
+DlgSelectOpText		: "Teksti",
+DlgSelectOpValue	: "Arvo",
+DlgSelectBtnAdd		: "Lisää",
+DlgSelectBtnModify	: "Muuta",
+DlgSelectBtnUp		: "Ylös",
+DlgSelectBtnDown	: "Alas",
+DlgSelectBtnSetValue : "Aseta valituksi",
+DlgSelectBtnDelete	: "Poista",
+
+// Textarea Dialog
+DlgTextareaName	: "Nimi",
+DlgTextareaCols	: "Sarakkeita",
+DlgTextareaRows	: "Rivejä",
+
+// Text Field Dialog
+DlgTextName			: "Nimi",
+DlgTextValue		: "Arvo",
+DlgTextCharWidth	: "Leveys",
+DlgTextMaxChars		: "Maksimi merkkimäärä",
+DlgTextType			: "Tyyppi",
+DlgTextTypeText		: "Teksti",
+DlgTextTypePass		: "Salasana",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nimi",
+DlgHiddenValue	: "Arvo",
+
+// Bulleted List Dialog
+BulletedListProp	: "Luettelon ominaisuudet",
+NumberedListProp	: "Numeroinnin ominaisuudet",
+DlgLstStart			: "Alku",
+DlgLstType			: "Tyyppi",
+DlgLstTypeCircle	: "Kehä",
+DlgLstTypeDisc		: "Ympyrä",
+DlgLstTypeSquare	: "Neliö",
+DlgLstTypeNumbers	: "Numerot (1, 2, 3)",
+DlgLstTypeLCase		: "Pienet kirjaimet (a, b, c)",
+DlgLstTypeUCase		: "Isot kirjaimet (A, B, C)",
+DlgLstTypeSRoman	: "Pienet roomalaiset numerot (i, ii, iii)",
+DlgLstTypeLRoman	: "Isot roomalaiset numerot (Ii, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Yleiset",
+DlgDocBackTab		: "Tausta",
+DlgDocColorsTab		: "Värit ja marginaalit",
+DlgDocMetaTab		: "Meta-tieto",
+
+DlgDocPageTitle		: "Sivun nimi",
+DlgDocLangDir		: "Kielen suunta",
+DlgDocLangDirLTR	: "Vasemmalta oikealle (LTR)",
+DlgDocLangDirRTL	: "Oikealta vasemmalle (RTL)",
+DlgDocLangCode		: "Kielikoodi",
+DlgDocCharSet		: "Merkistökoodaus",
+DlgDocCharSetCE		: "Keskieurooppalainen",
+DlgDocCharSetCT		: "Kiina, perinteinen (Big5)",
+DlgDocCharSetCR		: "Kyrillinen",
+DlgDocCharSetGR		: "Kreikka",
+DlgDocCharSetJP		: "Japani",
+DlgDocCharSetKR		: "Korealainen",
+DlgDocCharSetTR		: "Turkkilainen",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Länsieurooppalainen",
+DlgDocCharSetOther	: "Muu merkistökoodaus",
+
+DlgDocDocType		: "Dokumentin tyyppi",
+DlgDocDocTypeOther	: "Muu dokumentin tyyppi",
+DlgDocIncXHTML		: "Lisää XHTML julistukset",
+DlgDocBgColor		: "Taustaväri",
+DlgDocBgImage		: "Taustakuva",
+DlgDocBgNoScroll	: "Paikallaanpysyvä tausta",
+DlgDocCText			: "Teksti",
+DlgDocCLink			: "Linkki",
+DlgDocCVisited		: "Vierailtu linkki",
+DlgDocCActive		: "Aktiivinen linkki",
+DlgDocMargins		: "Sivun marginaalit",
+DlgDocMaTop			: "Ylä",
+DlgDocMaLeft		: "Vasen",
+DlgDocMaRight		: "Oikea",
+DlgDocMaBottom		: "Ala",
+DlgDocMeIndex		: "Hakusanat (pilkulla erotettuna)",
+DlgDocMeDescr		: "Kuvaus",
+DlgDocMeAuthor		: "Tekijä",
+DlgDocMeCopy		: "Tekijänoikeudet",
+DlgDocPreview		: "Esikatselu",
+
+// Templates Dialog
+Templates			: "Pohjat",
+DlgTemplatesTitle	: "Sisältöpohjat",
+DlgTemplatesSelMsg	: "Valitse pohja editoriin<br>(aiempi sisältö menetetään):",
+DlgTemplatesLoading	: "Ladataan listaa pohjista. Hetkinen...",
+DlgTemplatesNoTpl	: "(Ei määriteltyjä pohjia)",
+DlgTemplatesReplace	: "Korvaa editorin koko sisältö",
+
+// About Dialog
+DlgAboutAboutTab	: "Editorista",
+DlgAboutBrowserInfoTab	: "Selaimen tiedot",
+DlgAboutLicenseTab	: "Lisenssi",
+DlgAboutVersion		: "versio",
+DlgAboutInfo		: "Lisää tietoa osoitteesta",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/fo.js b/modules/editor/skins/fckeditor/editor/lang/fo.js
new file mode 100644
index 000000000..fa0d8c959
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/fo.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Faroese language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Fjal amboðsbjálkan",
+ToolbarExpand		: "Vís amboðsbjálkan",
+
+// Toolbar Items and Context Menu
+Save				: "Goym",
+NewPage				: "Nýggj síða",
+Preview				: "Frumsýning",
+Cut					: "Kvett",
+Copy				: "Avrita",
+Paste				: "Innrita",
+PasteText			: "Innrita reinan tekst",
+PasteWord			: "Innrita frá Word",
+Print				: "Prenta",
+SelectAll			: "Markera alt",
+RemoveFormat		: "Strika sniðgeving",
+InsertLinkLbl		: "Tilknýti",
+InsertLink			: "Ger/broyt tilknýti",
+RemoveLink			: "Strika tilknýti",
+VisitLink			: "Opna tilknýti",
+Anchor				: "Ger/broyt marknastein",
+AnchorDelete		: "Strika marknastein",
+InsertImageLbl		: "Myndir",
+InsertImage			: "Set inn/broyt mynd",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Set inn/broyt Flash",
+InsertTableLbl		: "Tabell",
+InsertTable			: "Set inn/broyt tabell",
+InsertLineLbl		: "Linja",
+InsertLine			: "Ger vatnrætta linju",
+InsertSpecialCharLbl: "Sertekn",
+InsertSpecialChar	: "Set inn sertekn",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Set inn Smiley",
+About				: "Um FCKeditor",
+Bold				: "Feit skrift",
+Italic				: "Skráskrift",
+Underline			: "Undirstrikað",
+StrikeThrough		: "Yvirstrikað",
+Subscript			: "Lækkað skrift",
+Superscript			: "Hækkað skrift",
+LeftJustify			: "Vinstrasett",
+CenterJustify		: "Miðsett",
+RightJustify		: "Høgrasett",
+BlockJustify		: "Javnir tekstkantar",
+DecreaseIndent		: "Minka reglubrotarinntriv",
+IncreaseIndent		: "Økja reglubrotarinntriv",
+Blockquote			: "Blockquote",
+CreateDiv			: "Ger DIV øki",
+EditDiv				: "Broyt DIV øki",
+DeleteDiv			: "Strika DIV øki",
+Undo				: "Angra",
+Redo				: "Vend aftur",
+NumberedListLbl		: "Talmerktur listi",
+NumberedList		: "Ger/strika talmerktan lista",
+BulletedListLbl		: "Punktmerktur listi",
+BulletedList		: "Ger/strika punktmerktan lista",
+ShowTableBorders	: "Vís tabellbordar",
+ShowDetails			: "Vís í smálutum",
+Style				: "Typografi",
+FontFormat			: "Skriftsnið",
+Font				: "Skrift",
+FontSize			: "Skriftstødd",
+TextColor			: "Tekstlitur",
+BGColor				: "Bakgrundslitur",
+Source				: "Kelda",
+Find				: "Leita",
+Replace				: "Yvirskriva",
+SpellCheck			: "Kanna stavseting",
+UniversalKeyboard	: "Knappaborð",
+PageBreakLbl		: "Síðuskift",
+PageBreak			: "Ger síðuskift",
+
+Form			: "Formur",
+Checkbox		: "Flugubein",
+RadioButton		: "Radioknøttur",
+TextField		: "Tekstteigur",
+Textarea		: "Tekstumráði",
+HiddenField		: "Fjaldur teigur",
+Button			: "Knøttur",
+SelectionField	: "Valskrá",
+ImageButton		: "Myndaknøttur",
+
+FitWindow		: "Set tekstviðgera til fulla stødd",
+ShowBlocks		: "Vís blokkar",
+
+// Context Menu
+EditLink			: "Broyt tilknýti",
+CellCM				: "Meski",
+RowCM				: "Rað",
+ColumnCM			: "Kolonna",
+InsertRowAfter		: "Set rað inn aftaná",
+InsertRowBefore		: "Set rað inn áðrenn",
+DeleteRows			: "Strika røðir",
+InsertColumnAfter	: "Set kolonnu inn aftaná",
+InsertColumnBefore	: "Set kolonnu inn áðrenn",
+DeleteColumns		: "Strika kolonnur",
+InsertCellAfter		: "Set meska inn aftaná",
+InsertCellBefore	: "Set meska inn áðrenn",
+DeleteCells			: "Strika meskar",
+MergeCells			: "Flætta meskar",
+MergeRight			: "Flætta meskar til høgru",
+MergeDown			: "Flætta saman",
+HorizontalSplitCell	: "Kloyv meska vatnrætt",
+VerticalSplitCell	: "Kloyv meska loddrætt",
+TableDelete			: "Strika tabell",
+CellProperties		: "Meskueginleikar",
+TableProperties		: "Tabelleginleikar",
+ImageProperties		: "Myndaeginleikar",
+FlashProperties		: "Flash eginleikar",
+
+AnchorProp			: "Eginleikar fyri marknastein",
+ButtonProp			: "Eginleikar fyri knøtt",
+CheckboxProp		: "Eginleikar fyri flugubein",
+HiddenFieldProp		: "Eginleikar fyri fjaldan teig",
+RadioButtonProp		: "Eginleikar fyri radioknøtt",
+ImageButtonProp		: "Eginleikar fyri myndaknøtt",
+TextFieldProp		: "Eginleikar fyri tekstteig",
+SelectionFieldProp	: "Eginleikar fyri valskrá",
+TextareaProp		: "Eginleikar fyri tekstumráði",
+FormProp			: "Eginleikar fyri Form",
+
+FontFormats			: "Vanligt;Sniðgivið;Adressa;Yvirskrift 1;Yvirskrift 2;Yvirskrift 3;Yvirskrift 4;Yvirskrift 5;Yvirskrift 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML verður viðgjørt. Bíða við...",
+Done				: "Liðugt",
+PasteWordConfirm	: "Teksturin, royndur verður at seta inn, tykist at stava frá Word. Vilt tú reinsa tekstin, áðrenn hann verður settur inn?",
+NotCompatiblePaste	: "Hetta er bert tøkt í Internet Explorer 5.5 og nýggjari. Vilt tú seta tekstin inn kortini - óreinsaðan?",
+UnknownToolbarItem	: "Ókendur lutur í amboðsbjálkanum \"%1\"",
+UnknownCommand		: "Ókend kommando \"%1\"",
+NotImplemented		: "Hetta er ikki tøkt í hesi útgávuni",
+UnknownToolbarSet	: "Amboðsbjálkin \"%1\" finst ikki",
+NoActiveX			: "Trygdaruppsetingin í alnótskaganum kann sum er avmarka onkrar hentleikar í tekstviðgeranum. Tú mást loyva møguleikanum \"Run/Kør ActiveX controls and plug-ins\". Tú kanst uppliva feilir og ávaringar um tvørrandi hentleikar.",
+BrowseServerBlocked : "Ambætarakagin kundi ikki opnast. Tryggja tær, at allar pop-up forðingar eru óvirknar.",
+DialogBlocked		: "Tað eyðnaðist ikki at opna samskiftisrútin. Tryggja tær, at allar pop-up forðingar eru óvirknar.",
+VisitLinkBlocked	: "Tað eyðnaðist ikki at opna nýggjan rút. Tryggja tær, at allar pop-up forðingar eru óvirknar.",
+
+// Dialogs
+DlgBtnOK			: "Góðkent",
+DlgBtnCancel		: "Avlýst",
+DlgBtnClose			: "Lat aftur",
+DlgBtnBrowseServer	: "Ambætarakagi",
+DlgAdvancedTag		: "Fjølbroytt",
+DlgOpOther			: "<Annað>",
+DlgInfoTab			: "Upplýsingar",
+DlgAlertUrl			: "Vinarliga veit ein URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ikki sett>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Tekstkós",
+DlgGenLangDirLtr	: "Frá vinstru til høgru (LTR)",
+DlgGenLangDirRtl	: "Frá høgru til vinstru (RTL)",
+DlgGenLangCode		: "Málkoda",
+DlgGenAccessKey		: "Snarvegisknappur",
+DlgGenName			: "Navn",
+DlgGenTabIndex		: "Inntriv indeks",
+DlgGenLongDescr		: "Víðkað URL frágreiðing",
+DlgGenClass			: "Typografi klassar",
+DlgGenTitle			: "Vegleiðandi heiti",
+DlgGenContType		: "Vegleiðandi innihaldsslag",
+DlgGenLinkCharset	: "Atknýtt teknsett",
+DlgGenStyle			: "Typografi",
+
+// Image Dialog
+DlgImgTitle			: "Myndaeginleikar",
+DlgImgInfoTab		: "Myndaupplýsingar",
+DlgImgBtnUpload		: "Send til ambætaran",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Send",
+DlgImgAlt			: "Alternativur tekstur",
+DlgImgWidth			: "Breidd",
+DlgImgHeight		: "Hædd",
+DlgImgLockRatio		: "Læs lutfallið",
+DlgBtnResetSize		: "Upprunastødd",
+DlgImgBorder		: "Bordi",
+DlgImgHSpace		: "Høgri breddi",
+DlgImgVSpace		: "Vinstri breddi",
+DlgImgAlign			: "Justering",
+DlgImgAlignLeft		: "Vinstra",
+DlgImgAlignAbsBottom: "Abs botnur",
+DlgImgAlignAbsMiddle: "Abs miðja",
+DlgImgAlignBaseline	: "Basislinja",
+DlgImgAlignBottom	: "Botnur",
+DlgImgAlignMiddle	: "Miðja",
+DlgImgAlignRight	: "Høgra",
+DlgImgAlignTextTop	: "Tekst toppur",
+DlgImgAlignTop		: "Ovast",
+DlgImgPreview		: "Frumsýning",
+DlgImgAlertUrl		: "Rita slóðina til myndina",
+DlgImgLinkTab		: "Tilknýti",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash eginleikar",
+DlgFlashChkPlay		: "Avspælingin byrjar sjálv",
+DlgFlashChkLoop		: "Endurspæl",
+DlgFlashChkMenu		: "Ger Flash skrá virkna",
+DlgFlashScale		: "Skalering",
+DlgFlashScaleAll	: "Vís alt",
+DlgFlashScaleNoBorder	: "Eingin bordi",
+DlgFlashScaleFit	: "Neyv skalering",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Tilknýti",
+DlgLnkInfoTab		: "Tilknýtis upplýsingar",
+DlgLnkTargetTab		: "Mál",
+
+DlgLnkType			: "Tilknýtisslag",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Tilknýti til marknastein í tekstinum",
+DlgLnkTypeEMail		: "Teldupostur",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<Annað>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Vel ein marknastein",
+DlgLnkAnchorByName	: "Eftir navni á marknasteini",
+DlgLnkAnchorById	: "Eftir element Id",
+DlgLnkNoAnchors		: "(Eingir marknasteinar eru í hesum dokumentið)",
+DlgLnkEMail			: "Teldupost-adressa",
+DlgLnkEMailSubject	: "Evni",
+DlgLnkEMailBody		: "Breyðtekstur",
+DlgLnkUpload		: "Send til ambætaran",
+DlgLnkBtnUpload		: "Send til ambætaran",
+
+DlgLnkTarget		: "Mál",
+DlgLnkTargetFrame	: "<ramma>",
+DlgLnkTargetPopup	: "<popup vindeyga>",
+DlgLnkTargetBlank	: "Nýtt vindeyga (_blank)",
+DlgLnkTargetParent	: "Upphavliga vindeygað (_parent)",
+DlgLnkTargetSelf	: "Sama vindeygað (_self)",
+DlgLnkTargetTop		: "Alt vindeygað (_top)",
+DlgLnkTargetFrameName	: "Vís navn vindeygans",
+DlgLnkPopWinName	: "Popup vindeygans navn",
+DlgLnkPopWinFeat	: "Popup vindeygans víðkaðu eginleikar",
+DlgLnkPopResize		: "Kann broyta stødd",
+DlgLnkPopLocation	: "Adressulinja",
+DlgLnkPopMenu		: "Skrábjálki",
+DlgLnkPopScroll		: "Rullibjálki",
+DlgLnkPopStatus		: "Støðufrágreiðingarbjálki",
+DlgLnkPopToolbar	: "Amboðsbjálki",
+DlgLnkPopFullScrn	: "Fullur skermur (IE)",
+DlgLnkPopDependent	: "Bundið (Netscape)",
+DlgLnkPopWidth		: "Breidd",
+DlgLnkPopHeight		: "Hædd",
+DlgLnkPopLeft		: "Frástøða frá vinstru",
+DlgLnkPopTop		: "Frástøða frá íerva",
+
+DlnLnkMsgNoUrl		: "Vinarliga skriva tilknýti (URL)",
+DlnLnkMsgNoEMail	: "Vinarliga skriva teldupost-adressu",
+DlnLnkMsgNoAnchor	: "Vinarliga vel marknastein",
+DlnLnkMsgInvPopName	: "Popup navnið má byrja við bókstavi og má ikki hava millumrúm",
+
+// Color Dialog
+DlgColorTitle		: "Vel lit",
+DlgColorBtnClear	: "Strika alt",
+DlgColorHighlight	: "Framhevja",
+DlgColorSelected	: "Valt",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Vel Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Vel sertekn",
+
+// Table Dialog
+DlgTableTitle		: "Eginleikar fyri tabell",
+DlgTableRows		: "Røðir",
+DlgTableColumns		: "Kolonnur",
+DlgTableBorder		: "Bordabreidd",
+DlgTableAlign		: "Justering",
+DlgTableAlignNotSet	: "<Einki valt>",
+DlgTableAlignLeft	: "Vinstrasett",
+DlgTableAlignCenter	: "Miðsett",
+DlgTableAlignRight	: "Høgrasett",
+DlgTableWidth		: "Breidd",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "prosent",
+DlgTableHeight		: "Hædd",
+DlgTableCellSpace	: "Fjarstøða millum meskar",
+DlgTableCellPad		: "Meskubreddi",
+DlgTableCaption		: "Tabellfrágreiðing",
+DlgTableSummary		: "Samandráttur",
+
+// Table Cell Dialog
+DlgCellTitle		: "Mesku eginleikar",
+DlgCellWidth		: "Breidd",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "prosent",
+DlgCellHeight		: "Hædd",
+DlgCellWordWrap		: "Orðkloyving",
+DlgCellWordWrapNotSet	: "<Einki valt>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nei",
+DlgCellHorAlign		: "Vatnrøtt justering",
+DlgCellHorAlignNotSet	: "<Einki valt>",
+DlgCellHorAlignLeft	: "Vinstrasett",
+DlgCellHorAlignCenter	: "Miðsett",
+DlgCellHorAlignRight: "Høgrasett",
+DlgCellVerAlign		: "Lodrøtt justering",
+DlgCellVerAlignNotSet	: "<Ikki sett>",
+DlgCellVerAlignTop	: "Ovast",
+DlgCellVerAlignMiddle	: "Miðjan",
+DlgCellVerAlignBottom	: "Niðast",
+DlgCellVerAlignBaseline	: "Basislinja",
+DlgCellRowSpan		: "Røðir, meskin fevnir um",
+DlgCellCollSpan		: "Kolonnur, meskin fevnir um",
+DlgCellBackColor	: "Bakgrundslitur",
+DlgCellBorderColor	: "Litur á borda",
+DlgCellBtnSelect	: "Vel...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Finn og broyt",
+
+// Find Dialog
+DlgFindTitle		: "Finn",
+DlgFindFindBtn		: "Finn",
+DlgFindNotFoundMsg	: "Leititeksturin varð ikki funnin",
+
+// Replace Dialog
+DlgReplaceTitle			: "Yvirskriva",
+DlgReplaceFindLbl		: "Finn:",
+DlgReplaceReplaceLbl	: "Yvirskriva við:",
+DlgReplaceCaseChk		: "Munur á stórum og smáðum bókstavum",
+DlgReplaceReplaceBtn	: "Yvirskriva",
+DlgReplaceReplAllBtn	: "Yvirskriva alt",
+DlgReplaceWordChk		: "Bert heil orð",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (CTRL+X).",
+PasteErrorCopy	: "Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (CTRL+C).",
+
+PasteAsText		: "Innrita som reinan tekst",
+PasteFromWord	: "Innrita fra Word",
+
+DlgPasteMsg2	: "Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>CTRL+V</strong>) og klikk á <strong>Góðtak</strong>.",
+DlgPasteSec		: "Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.",
+DlgPasteIgnoreFont		: "Forfjóna Font definitiónirnar",
+DlgPasteRemoveStyles	: "Strika typografi definitiónir",
+
+// Color Picker
+ColorAutomatic	: "Automatiskt",
+ColorMoreColors	: "Fleiri litir...",
+
+// Document Properties
+DocProps		: "Eginleikar fyri dokument",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Eginleikar fyri marknastein",
+DlgAnchorName		: "Heiti marknasteinsins",
+DlgAnchorErrorName	: "Vinarliga rita marknasteinsins heiti",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Finst ikki í orðabókini",
+DlgSpellChangeTo		: "Broyt til",
+DlgSpellBtnIgnore		: "Forfjóna",
+DlgSpellBtnIgnoreAll	: "Forfjóna alt",
+DlgSpellBtnReplace		: "Yvirskriva",
+DlgSpellBtnReplaceAll	: "Yvirskriva alt",
+DlgSpellBtnUndo			: "Angra",
+DlgSpellNoSuggestions	: "- Einki uppskot -",
+DlgSpellProgress		: "Rættstavarin arbeiðir...",
+DlgSpellNoMispell		: "Rættstavarain liðugur: Eingin feilur funnin",
+DlgSpellNoChanges		: "Rættstavarain liðugur: Einki orð varð broytt",
+DlgSpellOneChange		: "Rættstavarain liðugur: Eitt orð er broytt",
+DlgSpellManyChanges		: "Rættstavarain liðugur: %1 orð broytt",
+
+IeSpellDownload			: "Rættstavarin er ikki tøkur í tekstviðgeranum. Vilt tú heinta hann nú?",
+
+// Button Dialog
+DlgButtonText		: "Tekstur",
+DlgButtonType		: "Slag",
+DlgButtonTypeBtn	: "Knøttur",
+DlgButtonTypeSbm	: "Send",
+DlgButtonTypeRst	: "Nullstilla",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Navn",
+DlgCheckboxValue	: "Virði",
+DlgCheckboxSelected	: "Valt",
+
+// Form Dialog
+DlgFormName		: "Navn",
+DlgFormAction	: "Hending",
+DlgFormMethod	: "Háttur",
+
+// Select Field Dialog
+DlgSelectName		: "Navn",
+DlgSelectValue		: "Virði",
+DlgSelectSize		: "Stødd",
+DlgSelectLines		: "Linjur",
+DlgSelectChkMulti	: "Loyv fleiri valmøguleikum samstundis",
+DlgSelectOpAvail	: "Tøkir møguleikar",
+DlgSelectOpText		: "Tekstur",
+DlgSelectOpValue	: "Virði",
+DlgSelectBtnAdd		: "Legg afturat",
+DlgSelectBtnModify	: "Broyt",
+DlgSelectBtnUp		: "Upp",
+DlgSelectBtnDown	: "Niður",
+DlgSelectBtnSetValue : "Set sum valt virði",
+DlgSelectBtnDelete	: "Strika",
+
+// Textarea Dialog
+DlgTextareaName	: "Navn",
+DlgTextareaCols	: "kolonnur",
+DlgTextareaRows	: "røðir",
+
+// Text Field Dialog
+DlgTextName			: "Navn",
+DlgTextValue		: "Virði",
+DlgTextCharWidth	: "Breidd (sjónlig tekn)",
+DlgTextMaxChars		: "Mest loyvdu tekn",
+DlgTextType			: "Slag",
+DlgTextTypeText		: "Tekstur",
+DlgTextTypePass		: "Loyniorð",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Navn",
+DlgHiddenValue	: "Virði",
+
+// Bulleted List Dialog
+BulletedListProp	: "Eginleikar fyri punktmerktan lista",
+NumberedListProp	: "Eginleikar fyri talmerktan lista",
+DlgLstStart			: "Byrjan",
+DlgLstType			: "Slag",
+DlgLstTypeCircle	: "Sirkul",
+DlgLstTypeDisc		: "Fyltur sirkul",
+DlgLstTypeSquare	: "Fjórhyrningur",
+DlgLstTypeNumbers	: "Talmerkt (1, 2, 3)",
+DlgLstTypeLCase		: "Smáir bókstavir (a, b, c)",
+DlgLstTypeUCase		: "Stórir bókstavir (A, B, C)",
+DlgLstTypeSRoman	: "Smá rómaratøl (i, ii, iii)",
+DlgLstTypeLRoman	: "Stór rómaratøl (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Generelt",
+DlgDocBackTab		: "Bakgrund",
+DlgDocColorsTab		: "Litir og breddar",
+DlgDocMetaTab		: "META-upplýsingar",
+
+DlgDocPageTitle		: "Síðuheiti",
+DlgDocLangDir		: "Tekstkós",
+DlgDocLangDirLTR	: "Frá vinstru móti høgru (LTR)",
+DlgDocLangDirRTL	: "Frá høgru móti vinstru (RTL)",
+DlgDocLangCode		: "Málkoda",
+DlgDocCharSet		: "Teknsett koda",
+DlgDocCharSetCE		: "Miðeuropa",
+DlgDocCharSetCT		: "Kinesiskt traditionelt (Big5)",
+DlgDocCharSetCR		: "Cyrilliskt",
+DlgDocCharSetGR		: "Grikst",
+DlgDocCharSetJP		: "Japanskt",
+DlgDocCharSetKR		: "Koreanskt",
+DlgDocCharSetTR		: "Turkiskt",
+DlgDocCharSetUN		: "UNICODE (UTF-8)",
+DlgDocCharSetWE		: "Vestureuropa",
+DlgDocCharSetOther	: "Onnur teknsett koda",
+
+DlgDocDocType		: "Dokumentslag yvirskrift",
+DlgDocDocTypeOther	: "Annað dokumentslag yvirskrift",
+DlgDocIncXHTML		: "Viðfest XHTML deklaratiónir",
+DlgDocBgColor		: "Bakgrundslitur",
+DlgDocBgImage		: "Leið til bakgrundsmynd (URL)",
+DlgDocBgNoScroll	: "Læst bakgrund (rullar ikki)",
+DlgDocCText			: "Tekstur",
+DlgDocCLink			: "Tilknýti",
+DlgDocCVisited		: "Vitjaði tilknýti",
+DlgDocCActive		: "Virkin tilknýti",
+DlgDocMargins		: "Síðubreddar",
+DlgDocMaTop			: "Ovast",
+DlgDocMaLeft		: "Vinstra",
+DlgDocMaRight		: "Høgra",
+DlgDocMaBottom		: "Niðast",
+DlgDocMeIndex		: "Dokument index lyklaorð (sundurbýtt við komma)",
+DlgDocMeDescr		: "Dokumentlýsing",
+DlgDocMeAuthor		: "Høvundur",
+DlgDocMeCopy		: "Upphavsrættindi",
+DlgDocPreview		: "Frumsýning",
+
+// Templates Dialog
+Templates			: "Skabelónir",
+DlgTemplatesTitle	: "Innihaldsskabelónir",
+DlgTemplatesSelMsg	: "Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):",
+DlgTemplatesLoading	: "Heinti yvirlit yvir skabelónir. Vinarliga bíða við...",
+DlgTemplatesNoTpl	: "(Ongar skabelónir tøkar)",
+DlgTemplatesReplace	: "Yvirskriva núverandi innihald",
+
+// About Dialog
+DlgAboutAboutTab	: "Um",
+DlgAboutBrowserInfoTab	: "Upplýsingar um alnótskagan",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "Fyri fleiri upplýsingar, far til",
+
+// Div Dialog
+DlgDivGeneralTab	: "Generelt",
+DlgDivAdvancedTab	: "Fjølbroytt",
+DlgDivStyle		: "Typografi",
+DlgDivInlineStyle	: "Inline typografi"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/fr-ca.js b/modules/editor/skins/fckeditor/editor/lang/fr-ca.js
new file mode 100644
index 000000000..eb40f8b0d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/fr-ca.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Canadian French language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Masquer Outils",
+ToolbarExpand		: "Afficher Outils",
+
+// Toolbar Items and Context Menu
+Save				: "Sauvegarder",
+NewPage				: "Nouvelle page",
+Preview				: "Previsualiser",
+Cut					: "Couper",
+Copy				: "Copier",
+Paste				: "Coller",
+PasteText			: "Coller en tant que texte",
+PasteWord			: "Coller en tant que Word (formaté)",
+Print				: "Imprimer",
+SelectAll			: "Tout sélectionner",
+RemoveFormat		: "Supprimer le formatage",
+InsertLinkLbl		: "Lien",
+InsertLink			: "Insérer/modifier le lien",
+RemoveLink			: "Supprimer le lien",
+VisitLink			: "Suivre le lien",
+Anchor				: "Insérer/modifier l'ancre",
+AnchorDelete		: "Supprimer l'ancre",
+InsertImageLbl		: "Image",
+InsertImage			: "Insérer/modifier l'image",
+InsertFlashLbl		: "Animation Flash",
+InsertFlash			: "Insérer/modifier l'animation Flash",
+InsertTableLbl		: "Tableau",
+InsertTable			: "Insérer/modifier le tableau",
+InsertLineLbl		: "Séparateur",
+InsertLine			: "Insérer un séparateur",
+InsertSpecialCharLbl: "Caractères spéciaux",
+InsertSpecialChar	: "Insérer un caractère spécial",
+InsertSmileyLbl		: "Emoticon",
+InsertSmiley		: "Insérer un Emoticon",
+About				: "A propos de FCKeditor",
+Bold				: "Gras",
+Italic				: "Italique",
+Underline			: "Souligné",
+StrikeThrough		: "Barrer",
+Subscript			: "Indice",
+Superscript			: "Exposant",
+LeftJustify			: "Aligner à gauche",
+CenterJustify		: "Centrer",
+RightJustify		: "Aligner à Droite",
+BlockJustify		: "Texte justifié",
+DecreaseIndent		: "Diminuer le retrait",
+IncreaseIndent		: "Augmenter le retrait",
+Blockquote			: "Citation",
+CreateDiv			: "Créer Balise Div",
+EditDiv				: "Modifier Balise Div",
+DeleteDiv			: "Supprimer Balise Div",
+Undo				: "Annuler",
+Redo				: "Refaire",
+NumberedListLbl		: "Liste numérotée",
+NumberedList		: "Insérer/supprimer la liste numérotée",
+BulletedListLbl		: "Liste à puces",
+BulletedList		: "Insérer/supprimer la liste à puces",
+ShowTableBorders	: "Afficher les bordures du tableau",
+ShowDetails			: "Afficher les caractères invisibles",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Police",
+FontSize			: "Taille",
+TextColor			: "Couleur de caractère",
+BGColor				: "Couleur de fond",
+Source				: "Source",
+Find				: "Chercher",
+Replace				: "Remplacer",
+SpellCheck			: "Orthographe",
+UniversalKeyboard	: "Clavier universel",
+PageBreakLbl		: "Saut de page",
+PageBreak			: "Insérer un saut de page",
+
+Form			: "Formulaire",
+Checkbox		: "Case à cocher",
+RadioButton		: "Bouton radio",
+TextField		: "Champ texte",
+Textarea		: "Zone de texte",
+HiddenField		: "Champ caché",
+Button			: "Bouton",
+SelectionField	: "Champ de sélection",
+ImageButton		: "Bouton image",
+
+FitWindow		: "Edition pleine page",
+ShowBlocks		: "Afficher les blocs",
+
+// Context Menu
+EditLink			: "Modifier le lien",
+CellCM				: "Cellule",
+RowCM				: "Ligne",
+ColumnCM			: "Colonne",
+InsertRowAfter		: "Insérer une ligne après",
+InsertRowBefore		: "Insérer une ligne avant",
+DeleteRows			: "Supprimer des lignes",
+InsertColumnAfter	: "Insérer une colonne après",
+InsertColumnBefore	: "Insérer une colonne avant",
+DeleteColumns		: "Supprimer des colonnes",
+InsertCellAfter		: "Insérer une cellule après",
+InsertCellBefore	: "Insérer une cellule avant",
+DeleteCells			: "Supprimer des cellules",
+MergeCells			: "Fusionner les cellules",
+MergeRight			: "Fusionner à droite",
+MergeDown			: "Fusionner en bas",
+HorizontalSplitCell	: "Scinder la cellule horizontalement",
+VerticalSplitCell	: "Scinder la cellule verticalement",
+TableDelete			: "Supprimer le tableau",
+CellProperties		: "Propriétés de cellule",
+TableProperties		: "Propriétés du tableau",
+ImageProperties		: "Propriétés de l'image",
+FlashProperties		: "Propriétés de l'animation Flash",
+
+AnchorProp			: "Propriétés de l'ancre",
+ButtonProp			: "Propriétés du bouton",
+CheckboxProp		: "Propriétés de la case à cocher",
+HiddenFieldProp		: "Propriétés du champ caché",
+RadioButtonProp		: "Propriétés du bouton radio",
+ImageButtonProp		: "Propriétés du bouton image",
+TextFieldProp		: "Propriétés du champ texte",
+SelectionFieldProp	: "Propriétés de la liste/du menu",
+TextareaProp		: "Propriétés de la zone de texte",
+FormProp			: "Propriétés du formulaire",
+
+FontFormats			: "Normal;Formaté;Adresse;En-tête 1;En-tête 2;En-tête 3;En-tête 4;En-tête 5;En-tête 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Calcul XHTML. Veuillez patienter...",
+Done				: "Terminé",
+PasteWordConfirm	: "Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?",
+NotCompatiblePaste	: "Cette commande nécessite Internet Explorer version 5.5 et plus. Souhaitez-vous coller sans nettoyage?",
+UnknownToolbarItem	: "Élément de barre d'outil inconnu \"%1\"",
+UnknownCommand		: "Nom de commande inconnu \"%1\"",
+NotImplemented		: "Commande indisponible",
+UnknownToolbarSet	: "La barre d'outils \"%1\" n'existe pas",
+NoActiveX			: "Les paramètres de sécurité de votre navigateur peuvent limiter quelques fonctionnalités de l'éditeur. Veuillez activer l'option \"Exécuter les contrôles ActiveX et les plug-ins\". Il se peut que vous rencontriez des erreurs et remarquiez quelques limitations.",
+BrowseServerBlocked : "Le navigateur n'a pas pu être ouvert. Assurez-vous que les bloqueurs de popups soient désactivés.",
+DialogBlocked		: "La fenêtre de dialogue n'a pas pu s'ouvrir. Assurez-vous que les bloqueurs de popups soient désactivés.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Annuler",
+DlgBtnClose			: "Fermer",
+DlgBtnBrowseServer	: "Parcourir le serveur",
+DlgAdvancedTag		: "Avancée",
+DlgOpOther			: "<autre>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Veuillez saisir l'URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Par défaut>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Sens d'écriture",
+DlgGenLangDirLtr	: "De gauche à droite (LTR)",
+DlgGenLangDirRtl	: "De droite à gauche (RTL)",
+DlgGenLangCode		: "Code langue",
+DlgGenAccessKey		: "Équivalent clavier",
+DlgGenName			: "Nom",
+DlgGenTabIndex		: "Ordre de tabulation",
+DlgGenLongDescr		: "URL de description longue",
+DlgGenClass			: "Classes de feuilles de style",
+DlgGenTitle			: "Titre",
+DlgGenContType		: "Type de contenu",
+DlgGenLinkCharset	: "Encodage de caractère",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Propriétés de l'image",
+DlgImgInfoTab		: "Informations sur l'image",
+DlgImgBtnUpload		: "Envoyer sur le serveur",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Télécharger",
+DlgImgAlt			: "Texte de remplacement",
+DlgImgWidth			: "Largeur",
+DlgImgHeight		: "Hauteur",
+DlgImgLockRatio		: "Garder les proportions",
+DlgBtnResetSize		: "Taille originale",
+DlgImgBorder		: "Bordure",
+DlgImgHSpace		: "Espacement horizontal",
+DlgImgVSpace		: "Espacement vertical",
+DlgImgAlign			: "Alignement",
+DlgImgAlignLeft		: "Gauche",
+DlgImgAlignAbsBottom: "Abs Bas",
+DlgImgAlignAbsMiddle: "Abs Milieu",
+DlgImgAlignBaseline	: "Bas du texte",
+DlgImgAlignBottom	: "Bas",
+DlgImgAlignMiddle	: "Milieu",
+DlgImgAlignRight	: "Droite",
+DlgImgAlignTextTop	: "Haut du texte",
+DlgImgAlignTop		: "Haut",
+DlgImgPreview		: "Prévisualisation",
+DlgImgAlertUrl		: "Veuillez saisir l'URL de l'image",
+DlgImgLinkTab		: "Lien",
+
+// Flash Dialog
+DlgFlashTitle		: "Propriétés de l'animation Flash",
+DlgFlashChkPlay		: "Lecture automatique",
+DlgFlashChkLoop		: "Boucle",
+DlgFlashChkMenu		: "Activer le menu Flash",
+DlgFlashScale		: "Affichage",
+DlgFlashScaleAll	: "Par défaut (tout montrer)",
+DlgFlashScaleNoBorder	: "Sans bordure",
+DlgFlashScaleFit	: "Ajuster aux dimensions",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Propriétés du lien",
+DlgLnkInfoTab		: "Informations sur le lien",
+DlgLnkTargetTab		: "Destination",
+
+DlgLnkType			: "Type de lien",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ancre dans cette page",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocole",
+DlgLnkProtoOther	: "<autre>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Sélectionner une ancre",
+DlgLnkAnchorByName	: "Par nom",
+DlgLnkAnchorById	: "Par id",
+DlgLnkNoAnchors		: "(Pas d'ancre disponible dans le document)",
+DlgLnkEMail			: "Adresse E-Mail",
+DlgLnkEMailSubject	: "Sujet du message",
+DlgLnkEMailBody		: "Corps du message",
+DlgLnkUpload		: "Télécharger",
+DlgLnkBtnUpload		: "Envoyer sur le serveur",
+
+DlgLnkTarget		: "Destination",
+DlgLnkTargetFrame	: "<Cadre>",
+DlgLnkTargetPopup	: "<fenêtre popup>",
+DlgLnkTargetBlank	: "Nouvelle fenêtre (_blank)",
+DlgLnkTargetParent	: "Fenêtre mère (_parent)",
+DlgLnkTargetSelf	: "Même fenêtre (_self)",
+DlgLnkTargetTop		: "Fenêtre supérieure (_top)",
+DlgLnkTargetFrameName	: "Nom du cadre de destination",
+DlgLnkPopWinName	: "Nom de la fenêtre popup",
+DlgLnkPopWinFeat	: "Caractéristiques de la fenêtre popup",
+DlgLnkPopResize		: "Taille modifiable",
+DlgLnkPopLocation	: "Barre d'adresses",
+DlgLnkPopMenu		: "Barre de menu",
+DlgLnkPopScroll		: "Barres de défilement",
+DlgLnkPopStatus		: "Barre d'état",
+DlgLnkPopToolbar	: "Barre d'outils",
+DlgLnkPopFullScrn	: "Plein écran (IE)",
+DlgLnkPopDependent	: "Dépendante (Netscape)",
+DlgLnkPopWidth		: "Largeur",
+DlgLnkPopHeight		: "Hauteur",
+DlgLnkPopLeft		: "Position à partir de la gauche",
+DlgLnkPopTop		: "Position à partir du haut",
+
+DlnLnkMsgNoUrl		: "Veuillez saisir l'URL",
+DlnLnkMsgNoEMail	: "Veuillez saisir l'adresse e-mail",
+DlnLnkMsgNoAnchor	: "Veuillez sélectionner une ancre",
+DlnLnkMsgInvPopName	: "Le nom de la fenêtre popup doit commencer par une lettre et ne doit pas contenir d'espace",
+
+// Color Dialog
+DlgColorTitle		: "Sélectionner",
+DlgColorBtnClear	: "Effacer",
+DlgColorHighlight	: "Prévisualisation",
+DlgColorSelected	: "Sélectionné",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insérer un Emoticon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Insérer un caractère spécial",
+
+// Table Dialog
+DlgTableTitle		: "Propriétés du tableau",
+DlgTableRows		: "Lignes",
+DlgTableColumns		: "Colonnes",
+DlgTableBorder		: "Taille de la bordure",
+DlgTableAlign		: "Alignement",
+DlgTableAlignNotSet	: "<Par défaut>",
+DlgTableAlignLeft	: "Gauche",
+DlgTableAlignCenter	: "Centré",
+DlgTableAlignRight	: "Droite",
+DlgTableWidth		: "Largeur",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "pourcentage",
+DlgTableHeight		: "Hauteur",
+DlgTableCellSpace	: "Espacement",
+DlgTableCellPad		: "Contour",
+DlgTableCaption		: "Titre",
+DlgTableSummary		: "Résumé",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propriétés de la cellule",
+DlgCellWidth		: "Largeur",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "pourcentage",
+DlgCellHeight		: "Hauteur",
+DlgCellWordWrap		: "Retour à la ligne",
+DlgCellWordWrapNotSet	: "<Par défaut>",
+DlgCellWordWrapYes	: "Oui",
+DlgCellWordWrapNo	: "Non",
+DlgCellHorAlign		: "Alignement horizontal",
+DlgCellHorAlignNotSet	: "<Par défaut>",
+DlgCellHorAlignLeft	: "Gauche",
+DlgCellHorAlignCenter	: "Centré",
+DlgCellHorAlignRight: "Droite",
+DlgCellVerAlign		: "Alignement vertical",
+DlgCellVerAlignNotSet	: "<Par défaut>",
+DlgCellVerAlignTop	: "Haut",
+DlgCellVerAlignMiddle	: "Milieu",
+DlgCellVerAlignBottom	: "Bas",
+DlgCellVerAlignBaseline	: "Bas du texte",
+DlgCellRowSpan		: "Lignes fusionnées",
+DlgCellCollSpan		: "Colonnes fusionnées",
+DlgCellBackColor	: "Couleur de fond",
+DlgCellBorderColor	: "Couleur de bordure",
+DlgCellBtnSelect	: "Sélectionner...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Chercher et Remplacer",
+
+// Find Dialog
+DlgFindTitle		: "Chercher",
+DlgFindFindBtn		: "Chercher",
+DlgFindNotFoundMsg	: "Le texte indiqué est introuvable.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Remplacer",
+DlgReplaceFindLbl		: "Rechercher:",
+DlgReplaceReplaceLbl	: "Remplacer par:",
+DlgReplaceCaseChk		: "Respecter la casse",
+DlgReplaceReplaceBtn	: "Remplacer",
+DlgReplaceReplAllBtn	: "Tout remplacer",
+DlgReplaceWordChk		: "Mot entier",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl+X).",
+PasteErrorCopy	: "Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl+C).",
+
+PasteAsText		: "Coller comme texte",
+PasteFromWord	: "Coller à partir de Word",
+
+DlgPasteMsg2	: "Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.",
+DlgPasteSec		: "A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.",
+DlgPasteIgnoreFont		: "Ignorer les polices de caractères",
+DlgPasteRemoveStyles	: "Supprimer les styles",
+
+// Color Picker
+ColorAutomatic	: "Automatique",
+ColorMoreColors	: "Plus de couleurs...",
+
+// Document Properties
+DocProps		: "Propriétés du document",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propriétés de l'ancre",
+DlgAnchorName		: "Nom de l'ancre",
+DlgAnchorErrorName	: "Veuillez saisir le nom de l'ancre",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Pas dans le dictionnaire",
+DlgSpellChangeTo		: "Changer en",
+DlgSpellBtnIgnore		: "Ignorer",
+DlgSpellBtnIgnoreAll	: "Ignorer tout",
+DlgSpellBtnReplace		: "Remplacer",
+DlgSpellBtnReplaceAll	: "Remplacer tout",
+DlgSpellBtnUndo			: "Annuler",
+DlgSpellNoSuggestions	: "- Pas de suggestion -",
+DlgSpellProgress		: "Vérification d'orthographe en cours...",
+DlgSpellNoMispell		: "Vérification d'orthographe terminée: pas d'erreur trouvée",
+DlgSpellNoChanges		: "Vérification d'orthographe terminée: Pas de modifications",
+DlgSpellOneChange		: "Vérification d'orthographe terminée: Un mot modifié",
+DlgSpellManyChanges		: "Vérification d'orthographe terminée: %1 mots modifiés",
+
+IeSpellDownload			: "Le Correcteur d'orthographe n'est pas installé. Souhaitez-vous le télécharger maintenant?",
+
+// Button Dialog
+DlgButtonText		: "Texte (Valeur)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Bouton",
+DlgButtonTypeSbm	: "Soumettre",
+DlgButtonTypeRst	: "Réinitialiser",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nom",
+DlgCheckboxValue	: "Valeur",
+DlgCheckboxSelected	: "Sélectionné",
+
+// Form Dialog
+DlgFormName		: "Nom",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Méthode",
+
+// Select Field Dialog
+DlgSelectName		: "Nom",
+DlgSelectValue		: "Valeur",
+DlgSelectSize		: "Taille",
+DlgSelectLines		: "lignes",
+DlgSelectChkMulti	: "Sélection multiple",
+DlgSelectOpAvail	: "Options disponibles",
+DlgSelectOpText		: "Texte",
+DlgSelectOpValue	: "Valeur",
+DlgSelectBtnAdd		: "Ajouter",
+DlgSelectBtnModify	: "Modifier",
+DlgSelectBtnUp		: "Monter",
+DlgSelectBtnDown	: "Descendre",
+DlgSelectBtnSetValue : "Valeur sélectionnée",
+DlgSelectBtnDelete	: "Supprimer",
+
+// Textarea Dialog
+DlgTextareaName	: "Nom",
+DlgTextareaCols	: "Colonnes",
+DlgTextareaRows	: "Lignes",
+
+// Text Field Dialog
+DlgTextName			: "Nom",
+DlgTextValue		: "Valeur",
+DlgTextCharWidth	: "Largeur en caractères",
+DlgTextMaxChars		: "Nombre maximum de caractères",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Texte",
+DlgTextTypePass		: "Mot de passe",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nom",
+DlgHiddenValue	: "Valeur",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propriétés de liste à puces",
+NumberedListProp	: "Propriétés de liste numérotée",
+DlgLstStart			: "Début",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Cercle",
+DlgLstTypeDisc		: "Disque",
+DlgLstTypeSquare	: "Carré",
+DlgLstTypeNumbers	: "Nombres (1, 2, 3)",
+DlgLstTypeLCase		: "Lettres minuscules (a, b, c)",
+DlgLstTypeUCase		: "Lettres majuscules (A, B, C)",
+DlgLstTypeSRoman	: "Chiffres romains minuscules (i, ii, iii)",
+DlgLstTypeLRoman	: "Chiffres romains majuscules (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Général",
+DlgDocBackTab		: "Fond",
+DlgDocColorsTab		: "Couleurs et Marges",
+DlgDocMetaTab		: "Méta-Données",
+
+DlgDocPageTitle		: "Titre de la page",
+DlgDocLangDir		: "Sens d'écriture",
+DlgDocLangDirLTR	: "De la gauche vers la droite (LTR)",
+DlgDocLangDirRTL	: "De la droite vers la gauche (RTL)",
+DlgDocLangCode		: "Code langue",
+DlgDocCharSet		: "Encodage de caractère",
+DlgDocCharSetCE		: "Europe Centrale",
+DlgDocCharSetCT		: "Chinois Traditionnel (Big5)",
+DlgDocCharSetCR		: "Cyrillique",
+DlgDocCharSetGR		: "Grecque",
+DlgDocCharSetJP		: "Japonais",
+DlgDocCharSetKR		: "Coréen",
+DlgDocCharSetTR		: "Turcque",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Occidental",
+DlgDocCharSetOther	: "Autre encodage de caractère",
+
+DlgDocDocType		: "Type de document",
+DlgDocDocTypeOther	: "Autre type de document",
+DlgDocIncXHTML		: "Inclure les déclarations XHTML",
+DlgDocBgColor		: "Couleur de fond",
+DlgDocBgImage		: "Image de fond",
+DlgDocBgNoScroll	: "Image fixe sans défilement",
+DlgDocCText			: "Texte",
+DlgDocCLink			: "Lien",
+DlgDocCVisited		: "Lien visité",
+DlgDocCActive		: "Lien activé",
+DlgDocMargins		: "Marges",
+DlgDocMaTop			: "Haut",
+DlgDocMaLeft		: "Gauche",
+DlgDocMaRight		: "Droite",
+DlgDocMaBottom		: "Bas",
+DlgDocMeIndex		: "Mots-clés (séparés par des virgules)",
+DlgDocMeDescr		: "Description",
+DlgDocMeAuthor		: "Auteur",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Prévisualisation",
+
+// Templates Dialog
+Templates			: "Modèles",
+DlgTemplatesTitle	: "Modèles de contenu",
+DlgTemplatesSelMsg	: "Sélectionner le modèle à ouvrir dans l'éditeur<br>(le contenu actuel sera remplacé):",
+DlgTemplatesLoading	: "Chargement de la liste des modèles. Veuillez patienter...",
+DlgTemplatesNoTpl	: "(Aucun modèle disponible)",
+DlgTemplatesReplace	: "Remplacer tout le contenu actuel",
+
+// About Dialog
+DlgAboutAboutTab	: "Á propos de",
+DlgAboutBrowserInfoTab	: "Navigateur",
+DlgAboutLicenseTab	: "License",
+DlgAboutVersion		: "Version",
+DlgAboutInfo		: "Pour plus d'informations, visiter",
+
+// Div Dialog
+DlgDivGeneralTab	: "Général",
+DlgDivAdvancedTab	: "Avancé",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Attribut Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/fr.js b/modules/editor/skins/fckeditor/editor/lang/fr.js
new file mode 100644
index 000000000..7b744ad0f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/fr.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * French language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Masquer Outils",
+ToolbarExpand		: "Afficher Outils",
+
+// Toolbar Items and Context Menu
+Save				: "Enregistrer",
+NewPage				: "Nouvelle page",
+Preview				: "Prévisualisation",
+Cut					: "Couper",
+Copy				: "Copier",
+Paste				: "Coller",
+PasteText			: "Coller comme texte",
+PasteWord			: "Coller de Word",
+Print				: "Imprimer",
+SelectAll			: "Tout sélectionner",
+RemoveFormat		: "Supprimer le format",
+InsertLinkLbl		: "Lien",
+InsertLink			: "Insérer/modifier le lien",
+RemoveLink			: "Supprimer le lien",
+VisitLink			: "Suivre le lien",
+Anchor				: "Insérer/modifier l'ancre",
+AnchorDelete		: "Supprimer l'ancre",
+InsertImageLbl		: "Image",
+InsertImage			: "Insérer/modifier l'image",
+InsertFlashLbl		: "Animation Flash",
+InsertFlash			: "Insérer/modifier l'animation Flash",
+InsertTableLbl		: "Tableau",
+InsertTable			: "Insérer/modifier le tableau",
+InsertLineLbl		: "Séparateur",
+InsertLine			: "Insérer un séparateur",
+InsertSpecialCharLbl: "Caractères spéciaux",
+InsertSpecialChar	: "Insérer un caractère spécial",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Insérer un Smiley",
+About				: "A propos de FCKeditor",
+Bold				: "Gras",
+Italic				: "Italique",
+Underline			: "Souligné",
+StrikeThrough		: "Barré",
+Subscript			: "Indice",
+Superscript			: "Exposant",
+LeftJustify			: "Aligné à gauche",
+CenterJustify		: "Centré",
+RightJustify		: "Aligné à Droite",
+BlockJustify		: "Texte justifié",
+DecreaseIndent		: "Diminuer le retrait",
+IncreaseIndent		: "Augmenter le retrait",
+Blockquote			: "Citation",
+CreateDiv			: "Créer Balise Div",
+EditDiv				: "Modifier Balise Div",
+DeleteDiv			: "Supprimer Balise Div",
+Undo				: "Annuler",
+Redo				: "Refaire",
+NumberedListLbl		: "Liste numérotée",
+NumberedList		: "Insérer/supprimer la liste numérotée",
+BulletedListLbl		: "Liste à puces",
+BulletedList		: "Insérer/supprimer la liste à puces",
+ShowTableBorders	: "Afficher les bordures du tableau",
+ShowDetails			: "Afficher les caractères invisibles",
+Style				: "Style",
+FontFormat			: "Format",
+Font				: "Police",
+FontSize			: "Taille",
+TextColor			: "Couleur de caractère",
+BGColor				: "Couleur de fond",
+Source				: "Source",
+Find				: "Chercher",
+Replace				: "Remplacer",
+SpellCheck			: "Orthographe",
+UniversalKeyboard	: "Clavier universel",
+PageBreakLbl		: "Saut de page",
+PageBreak			: "Insérer un saut de page",
+
+Form			: "Formulaire",
+Checkbox		: "Case à cocher",
+RadioButton		: "Bouton radio",
+TextField		: "Champ texte",
+Textarea		: "Zone de texte",
+HiddenField		: "Champ caché",
+Button			: "Bouton",
+SelectionField	: "Liste/menu",
+ImageButton		: "Bouton image",
+
+FitWindow		: "Edition pleine page",
+ShowBlocks		: "Afficher les blocs",
+
+// Context Menu
+EditLink			: "Modifier le lien",
+CellCM				: "Cellule",
+RowCM				: "Ligne",
+ColumnCM			: "Colonne",
+InsertRowAfter		: "Insérer une ligne après",
+InsertRowBefore		: "Insérer une ligne avant",
+DeleteRows			: "Supprimer des lignes",
+InsertColumnAfter	: "Insérer une colonne après",
+InsertColumnBefore	: "Insérer une colonne avant",
+DeleteColumns		: "Supprimer des colonnes",
+InsertCellAfter		: "Insérer une cellule après",
+InsertCellBefore	: "Insérer une cellule avant",
+DeleteCells			: "Supprimer des cellules",
+MergeCells			: "Fusionner les cellules",
+MergeRight			: "Fusionner à droite",
+MergeDown			: "Fusionner en bas",
+HorizontalSplitCell	: "Scinder la cellule horizontalement",
+VerticalSplitCell	: "Scinder la cellule verticalement",
+TableDelete			: "Supprimer le tableau",
+CellProperties		: "Propriétés de cellule",
+TableProperties		: "Propriétés du tableau",
+ImageProperties		: "Propriétés de l'image",
+FlashProperties		: "Propriétés de l'animation Flash",
+
+AnchorProp			: "Propriétés de l'ancre",
+ButtonProp			: "Propriétés du bouton",
+CheckboxProp		: "Propriétés de la case à cocher",
+HiddenFieldProp		: "Propriétés du champ caché",
+RadioButtonProp		: "Propriétés du bouton radio",
+ImageButtonProp		: "Propriétés du bouton image",
+TextFieldProp		: "Propriétés du champ texte",
+SelectionFieldProp	: "Propriétés de la liste/du menu",
+TextareaProp		: "Propriétés de la zone de texte",
+FormProp			: "Propriétés du formulaire",
+
+FontFormats			: "Normal;Formaté;Adresse;En-tête 1;En-tête 2;En-tête 3;En-tête 4;En-tête 5;En-tête 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Calcul XHTML. Veuillez patienter...",
+Done				: "Terminé",
+PasteWordConfirm	: "Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?",
+NotCompatiblePaste	: "Cette commande nécessite Internet Explorer version 5.5 minimum. Souhaitez-vous coller sans nettoyage?",
+UnknownToolbarItem	: "Elément de barre d'outil inconnu \"%1\"",
+UnknownCommand		: "Nom de commande inconnu \"%1\"",
+NotImplemented		: "Commande non encore écrite",
+UnknownToolbarSet	: "La barre d'outils \"%1\" n'existe pas",
+NoActiveX			: "Les paramètres de sécurité de votre navigateur peuvent limiter quelques fonctionnalités de l'éditeur. Veuillez activer l'option \"Exécuter les contrôles ActiveX et les plug-ins\". Il se peut que vous rencontriez des erreurs et remarquiez quelques limitations.",
+BrowseServerBlocked : "Le navigateur n'a pas pu être ouvert. Assurez-vous que les bloqueurs de popups soient désactivés.",
+DialogBlocked		: "La fenêtre de dialogue n'a pas pu s'ouvrir. Assurez-vous que les bloqueurs de popups soient désactivés.",
+VisitLinkBlocked	: "Impossible d'ouvrir une nouvelle fenêtre. Assurez-vous que les bloqueurs de popups soient désactivés.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Annuler",
+DlgBtnClose			: "Fermer",
+DlgBtnBrowseServer	: "Parcourir le serveur",
+DlgAdvancedTag		: "Avancé",
+DlgOpOther			: "<Autre>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Veuillez saisir l'URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Par défaut>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Sens d'écriture",
+DlgGenLangDirLtr	: "De gauche à droite (LTR)",
+DlgGenLangDirRtl	: "De droite à gauche (RTL)",
+DlgGenLangCode		: "Code langue",
+DlgGenAccessKey		: "Equivalent clavier",
+DlgGenName			: "Nom",
+DlgGenTabIndex		: "Ordre de tabulation",
+DlgGenLongDescr		: "URL de description longue",
+DlgGenClass			: "Classes de feuilles de style",
+DlgGenTitle			: "Titre",
+DlgGenContType		: "Type de contenu",
+DlgGenLinkCharset	: "Encodage de caractère",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Propriétés de l'image",
+DlgImgInfoTab		: "Informations sur l'image",
+DlgImgBtnUpload		: "Envoyer sur le serveur",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Télécharger",
+DlgImgAlt			: "Texte de remplacement",
+DlgImgWidth			: "Largeur",
+DlgImgHeight		: "Hauteur",
+DlgImgLockRatio		: "Garder les proportions",
+DlgBtnResetSize		: "Taille originale",
+DlgImgBorder		: "Bordure",
+DlgImgHSpace		: "Espacement horizontal",
+DlgImgVSpace		: "Espacement vertical",
+DlgImgAlign			: "Alignement",
+DlgImgAlignLeft		: "Gauche",
+DlgImgAlignAbsBottom: "Abs Bas",
+DlgImgAlignAbsMiddle: "Abs Milieu",
+DlgImgAlignBaseline	: "Bas du texte",
+DlgImgAlignBottom	: "Bas",
+DlgImgAlignMiddle	: "Milieu",
+DlgImgAlignRight	: "Droite",
+DlgImgAlignTextTop	: "Haut du texte",
+DlgImgAlignTop		: "Haut",
+DlgImgPreview		: "Prévisualisation",
+DlgImgAlertUrl		: "Veuillez saisir l'URL de l'image",
+DlgImgLinkTab		: "Lien",
+
+// Flash Dialog
+DlgFlashTitle		: "Propriétés de l'animation Flash",
+DlgFlashChkPlay		: "Lecture automatique",
+DlgFlashChkLoop		: "Boucle",
+DlgFlashChkMenu		: "Activer le menu Flash",
+DlgFlashScale		: "Affichage",
+DlgFlashScaleAll	: "Par défaut (tout montrer)",
+DlgFlashScaleNoBorder	: "Sans bordure",
+DlgFlashScaleFit	: "Ajuster aux dimensions",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Propriétés du lien",
+DlgLnkInfoTab		: "Informations sur le lien",
+DlgLnkTargetTab		: "Destination",
+
+DlgLnkType			: "Type de lien",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ancre dans cette page",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocole",
+DlgLnkProtoOther	: "<autre>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Sélectionner une ancre",
+DlgLnkAnchorByName	: "Par nom",
+DlgLnkAnchorById	: "Par id",
+DlgLnkNoAnchors		: "(Pas d'ancre disponible dans le document)",
+DlgLnkEMail			: "Adresse E-Mail",
+DlgLnkEMailSubject	: "Sujet du message",
+DlgLnkEMailBody		: "Corps du message",
+DlgLnkUpload		: "Télécharger",
+DlgLnkBtnUpload		: "Envoyer sur le serveur",
+
+DlgLnkTarget		: "Destination",
+DlgLnkTargetFrame	: "<Cadre>",
+DlgLnkTargetPopup	: "<fenêtre popup>",
+DlgLnkTargetBlank	: "Nouvelle fenêtre (_blank)",
+DlgLnkTargetParent	: "Fenêtre mère (_parent)",
+DlgLnkTargetSelf	: "Même fenêtre (_self)",
+DlgLnkTargetTop		: "Fenêtre supérieure (_top)",
+DlgLnkTargetFrameName	: "Nom du cadre de destination",
+DlgLnkPopWinName	: "Nom de la fenêtre popup",
+DlgLnkPopWinFeat	: "Caractéristiques de la fenêtre popup",
+DlgLnkPopResize		: "Taille modifiable",
+DlgLnkPopLocation	: "Barre d'adresses",
+DlgLnkPopMenu		: "Barre de menu",
+DlgLnkPopScroll		: "Barres de défilement",
+DlgLnkPopStatus		: "Barre d'état",
+DlgLnkPopToolbar	: "Barre d'outils",
+DlgLnkPopFullScrn	: "Plein écran (IE)",
+DlgLnkPopDependent	: "Dépendante (Netscape)",
+DlgLnkPopWidth		: "Largeur",
+DlgLnkPopHeight		: "Hauteur",
+DlgLnkPopLeft		: "Position à partir de la gauche",
+DlgLnkPopTop		: "Position à partir du haut",
+
+DlnLnkMsgNoUrl		: "Veuillez saisir l'URL",
+DlnLnkMsgNoEMail	: "Veuillez saisir l'adresse e-mail",
+DlnLnkMsgNoAnchor	: "Veuillez sélectionner une ancre",
+DlnLnkMsgInvPopName	: "Le nom de la fenêtre popup doit commencer par une lettre et ne doit pas contenir d'espace",
+
+// Color Dialog
+DlgColorTitle		: "Sélectionner",
+DlgColorBtnClear	: "Effacer",
+DlgColorHighlight	: "Prévisualisation",
+DlgColorSelected	: "Sélectionné",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Insérer un Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Insérer un caractère spécial",
+
+// Table Dialog
+DlgTableTitle		: "Propriétés du tableau",
+DlgTableRows		: "Lignes",
+DlgTableColumns		: "Colonnes",
+DlgTableBorder		: "Bordure",
+DlgTableAlign		: "Alignement",
+DlgTableAlignNotSet	: "<Par défaut>",
+DlgTableAlignLeft	: "Gauche",
+DlgTableAlignCenter	: "Centré",
+DlgTableAlignRight	: "Droite",
+DlgTableWidth		: "Largeur",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "pourcentage",
+DlgTableHeight		: "Hauteur",
+DlgTableCellSpace	: "Espacement",
+DlgTableCellPad		: "Contour",
+DlgTableCaption		: "Titre",
+DlgTableSummary		: "Résumé",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propriétés de la cellule",
+DlgCellWidth		: "Largeur",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "pourcentage",
+DlgCellHeight		: "Hauteur",
+DlgCellWordWrap		: "Retour à la ligne",
+DlgCellWordWrapNotSet	: "<Par défaut>",
+DlgCellWordWrapYes	: "Oui",
+DlgCellWordWrapNo	: "Non",
+DlgCellHorAlign		: "Alignement horizontal",
+DlgCellHorAlignNotSet	: "<Par défaut>",
+DlgCellHorAlignLeft	: "Gauche",
+DlgCellHorAlignCenter	: "Centré",
+DlgCellHorAlignRight: "Droite",
+DlgCellVerAlign		: "Alignement vertical",
+DlgCellVerAlignNotSet	: "<Par défaut>",
+DlgCellVerAlignTop	: "Haut",
+DlgCellVerAlignMiddle	: "Milieu",
+DlgCellVerAlignBottom	: "Bas",
+DlgCellVerAlignBaseline	: "Bas du texte",
+DlgCellRowSpan		: "Lignes fusionnées",
+DlgCellCollSpan		: "Colonnes fusionnées",
+DlgCellBackColor	: "Fond",
+DlgCellBorderColor	: "Bordure",
+DlgCellBtnSelect	: "Choisir...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Chercher et Remplacer",
+
+// Find Dialog
+DlgFindTitle		: "Chercher",
+DlgFindFindBtn		: "Chercher",
+DlgFindNotFoundMsg	: "Le texte indiqué est introuvable.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Remplacer",
+DlgReplaceFindLbl		: "Rechercher:",
+DlgReplaceReplaceLbl	: "Remplacer par:",
+DlgReplaceCaseChk		: "Respecter la casse",
+DlgReplaceReplaceBtn	: "Remplacer",
+DlgReplaceReplAllBtn	: "Tout remplacer",
+DlgReplaceWordChk		: "Mot entier",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl+X).",
+PasteErrorCopy	: "Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl+C).",
+
+PasteAsText		: "Coller comme texte",
+PasteFromWord	: "Coller à partir de Word",
+
+DlgPasteMsg2	: "Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl+V</STRONG>) et cliquez sur <STRONG>OK</STRONG>.",
+DlgPasteSec		: "A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.",
+DlgPasteIgnoreFont		: "Ignorer les polices de caractères",
+DlgPasteRemoveStyles	: "Supprimer les styles",
+
+// Color Picker
+ColorAutomatic	: "Automatique",
+ColorMoreColors	: "Plus de couleurs...",
+
+// Document Properties
+DocProps		: "Propriétés du document",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propriétés de l'ancre",
+DlgAnchorName		: "Nom de l'ancre",
+DlgAnchorErrorName	: "Veuillez saisir le nom de l'ancre",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Pas dans le dictionnaire",
+DlgSpellChangeTo		: "Changer en",
+DlgSpellBtnIgnore		: "Ignorer",
+DlgSpellBtnIgnoreAll	: "Ignorer tout",
+DlgSpellBtnReplace		: "Remplacer",
+DlgSpellBtnReplaceAll	: "Remplacer tout",
+DlgSpellBtnUndo			: "Annuler",
+DlgSpellNoSuggestions	: "- Aucune suggestion -",
+DlgSpellProgress		: "Vérification d'orthographe en cours...",
+DlgSpellNoMispell		: "Vérification d'orthographe terminée: Aucune erreur trouvée",
+DlgSpellNoChanges		: "Vérification d'orthographe terminée: Pas de modifications",
+DlgSpellOneChange		: "Vérification d'orthographe terminée: Un mot modifié",
+DlgSpellManyChanges		: "Vérification d'orthographe terminée: %1 mots modifiés",
+
+IeSpellDownload			: "Le Correcteur n'est pas installé. Souhaitez-vous le télécharger maintenant?",
+
+// Button Dialog
+DlgButtonText		: "Texte (valeur)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Bouton",
+DlgButtonTypeSbm	: "Envoyer",
+DlgButtonTypeRst	: "Réinitialiser",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nom",
+DlgCheckboxValue	: "Valeur",
+DlgCheckboxSelected	: "Sélectionné",
+
+// Form Dialog
+DlgFormName		: "Nom",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Méthode",
+
+// Select Field Dialog
+DlgSelectName		: "Nom",
+DlgSelectValue		: "Valeur",
+DlgSelectSize		: "Taille",
+DlgSelectLines		: "lignes",
+DlgSelectChkMulti	: "Sélection multiple",
+DlgSelectOpAvail	: "Options disponibles",
+DlgSelectOpText		: "Texte",
+DlgSelectOpValue	: "Valeur",
+DlgSelectBtnAdd		: "Ajouter",
+DlgSelectBtnModify	: "Modifier",
+DlgSelectBtnUp		: "Monter",
+DlgSelectBtnDown	: "Descendre",
+DlgSelectBtnSetValue : "Valeur sélectionnée",
+DlgSelectBtnDelete	: "Supprimer",
+
+// Textarea Dialog
+DlgTextareaName	: "Nom",
+DlgTextareaCols	: "Colonnes",
+DlgTextareaRows	: "Lignes",
+
+// Text Field Dialog
+DlgTextName			: "Nom",
+DlgTextValue		: "Valeur",
+DlgTextCharWidth	: "Largeur en caractères",
+DlgTextMaxChars		: "Nombre maximum de caractères",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Texte",
+DlgTextTypePass		: "Mot de passe",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nom",
+DlgHiddenValue	: "Valeur",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propriétés de liste à puces",
+NumberedListProp	: "Propriétés de liste numérotée",
+DlgLstStart			: "Début",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Cercle",
+DlgLstTypeDisc		: "Disque",
+DlgLstTypeSquare	: "Carré",
+DlgLstTypeNumbers	: "Nombres (1, 2, 3)",
+DlgLstTypeLCase		: "Lettres minuscules (a, b, c)",
+DlgLstTypeUCase		: "Lettres majuscules (A, B, C)",
+DlgLstTypeSRoman	: "Chiffres romains minuscules (i, ii, iii)",
+DlgLstTypeLRoman	: "Chiffres romains majuscules (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Général",
+DlgDocBackTab		: "Fond",
+DlgDocColorsTab		: "Couleurs et marges",
+DlgDocMetaTab		: "Métadonnées",
+
+DlgDocPageTitle		: "Titre de la page",
+DlgDocLangDir		: "Sens d'écriture",
+DlgDocLangDirLTR	: "De la gauche vers la droite (LTR)",
+DlgDocLangDirRTL	: "De la droite vers la gauche (RTL)",
+DlgDocLangCode		: "Code langue",
+DlgDocCharSet		: "Encodage de caractère",
+DlgDocCharSetCE		: "Europe Centrale",
+DlgDocCharSetCT		: "Chinois Traditionnel (Big5)",
+DlgDocCharSetCR		: "Cyrillique",
+DlgDocCharSetGR		: "Grec",
+DlgDocCharSetJP		: "Japonais",
+DlgDocCharSetKR		: "Coréen",
+DlgDocCharSetTR		: "Turc",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Occidental",
+DlgDocCharSetOther	: "Autre encodage de caractère",
+
+DlgDocDocType		: "Type de document",
+DlgDocDocTypeOther	: "Autre type de document",
+DlgDocIncXHTML		: "Inclure les déclarations XHTML",
+DlgDocBgColor		: "Couleur de fond",
+DlgDocBgImage		: "Image de fond",
+DlgDocBgNoScroll	: "Image fixe sans défilement",
+DlgDocCText			: "Texte",
+DlgDocCLink			: "Lien",
+DlgDocCVisited		: "Lien visité",
+DlgDocCActive		: "Lien activé",
+DlgDocMargins		: "Marges",
+DlgDocMaTop			: "Haut",
+DlgDocMaLeft		: "Gauche",
+DlgDocMaRight		: "Droite",
+DlgDocMaBottom		: "Bas",
+DlgDocMeIndex		: "Mots-clés (séparés par des virgules)",
+DlgDocMeDescr		: "Description",
+DlgDocMeAuthor		: "Auteur",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Prévisualisation",
+
+// Templates Dialog
+Templates			: "Modèles",
+DlgTemplatesTitle	: "Modèles de contenu",
+DlgTemplatesSelMsg	: "Veuillez sélectionner le modèle à ouvrir dans l'éditeur<br>(le contenu actuel sera remplacé):",
+DlgTemplatesLoading	: "Chargement de la liste des modèles. Veuillez patienter...",
+DlgTemplatesNoTpl	: "(Aucun modèle disponible)",
+DlgTemplatesReplace	: "Remplacer tout le contenu",
+
+// About Dialog
+DlgAboutAboutTab	: "A propos de",
+DlgAboutBrowserInfoTab	: "Navigateur",
+DlgAboutLicenseTab	: "Licence",
+DlgAboutVersion		: "Version",
+DlgAboutInfo		: "Pour plus d'informations, aller à",
+
+// Div Dialog
+DlgDivGeneralTab	: "Général",
+DlgDivAdvancedTab	: "Avancé",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Attribut Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/gl.js b/modules/editor/skins/fckeditor/editor/lang/gl.js
new file mode 100644
index 000000000..560969f79
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/gl.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Galician language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Ocultar Ferramentas",
+ToolbarExpand		: "Mostrar Ferramentas",
+
+// Toolbar Items and Context Menu
+Save				: "Gardar",
+NewPage				: "Nova Páxina",
+Preview				: "Vista Previa",
+Cut					: "Cortar",
+Copy				: "Copiar",
+Paste				: "Pegar",
+PasteText			: "Pegar como texto plano",
+PasteWord			: "Pegar dende Word",
+Print				: "Imprimir",
+SelectAll			: "Seleccionar todo",
+RemoveFormat		: "Eliminar Formato",
+InsertLinkLbl		: "Ligazón",
+InsertLink			: "Inserir/Editar Ligazón",
+RemoveLink			: "Eliminar Ligazón",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Inserir/Editar Referencia",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Imaxe",
+InsertImage			: "Inserir/Editar Imaxe",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Inserir/Editar Flash",
+InsertTableLbl		: "Tabla",
+InsertTable			: "Inserir/Editar Tabla",
+InsertLineLbl		: "Liña",
+InsertLine			: "Inserir Liña Horizontal",
+InsertSpecialCharLbl: "Carácter Special",
+InsertSpecialChar	: "Inserir Carácter Especial",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Inserir Smiley",
+About				: "Acerca de FCKeditor",
+Bold				: "Negrita",
+Italic				: "Cursiva",
+Underline			: "Sub-raiado",
+StrikeThrough		: "Tachado",
+Subscript			: "Subíndice",
+Superscript			: "Superíndice",
+LeftJustify			: "Aliñar á Esquerda",
+CenterJustify		: "Centrado",
+RightJustify		: "Aliñar á Dereita",
+BlockJustify		: "Xustificado",
+DecreaseIndent		: "Disminuir Sangría",
+IncreaseIndent		: "Aumentar Sangría",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Desfacer",
+Redo				: "Refacer",
+NumberedListLbl		: "Lista Numerada",
+NumberedList		: "Inserir/Eliminar Lista Numerada",
+BulletedListLbl		: "Marcas",
+BulletedList		: "Inserir/Eliminar Marcas",
+ShowTableBorders	: "Mostrar Bordes das Táboas",
+ShowDetails			: "Mostrar Marcas Parágrafo",
+Style				: "Estilo",
+FontFormat			: "Formato",
+Font				: "Tipo",
+FontSize			: "Tamaño",
+TextColor			: "Cor do Texto",
+BGColor				: "Cor do Fondo",
+Source				: "Código Fonte",
+Find				: "Procurar",
+Replace				: "Substituir",
+SpellCheck			: "Corrección Ortográfica",
+UniversalKeyboard	: "Teclado Universal",
+PageBreakLbl		: "Salto de Páxina",
+PageBreak			: "Inserir Salto de Páxina",
+
+Form			: "Formulario",
+Checkbox		: "Cadro de Verificación",
+RadioButton		: "Botón de Radio",
+TextField		: "Campo de Texto",
+Textarea		: "Área de Texto",
+HiddenField		: "Campo Oculto",
+Button			: "Botón",
+SelectionField	: "Campo de Selección",
+ImageButton		: "Botón de Imaxe",
+
+FitWindow		: "Maximizar o tamaño do editor",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Editar Ligazón",
+CellCM				: "Cela",
+RowCM				: "Fila",
+ColumnCM			: "Columna",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Borrar Filas",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Borrar Columnas",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Borrar Cela",
+MergeCells			: "Unir Celas",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Borrar Táboa",
+CellProperties		: "Propriedades da Cela",
+TableProperties		: "Propriedades da Táboa",
+ImageProperties		: "Propriedades Imaxe",
+FlashProperties		: "Propriedades Flash",
+
+AnchorProp			: "Propriedades da Referencia",
+ButtonProp			: "Propriedades do Botón",
+CheckboxProp		: "Propriedades do Cadro de Verificación",
+HiddenFieldProp		: "Propriedades do Campo Oculto",
+RadioButtonProp		: "Propriedades do Botón de Radio",
+ImageButtonProp		: "Propriedades do Botón de Imaxe",
+TextFieldProp		: "Propriedades do Campo de Texto",
+SelectionFieldProp	: "Propriedades do Campo de Selección",
+TextareaProp		: "Propriedades da Área de Texto",
+FormProp			: "Propriedades do Formulario",
+
+FontFormats			: "Normal;Formateado;Enderezo;Enacabezado 1;Encabezado 2;Encabezado 3;Encabezado 4;Encabezado 5;Encabezado 6;Paragraph (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Procesando XHTML. Por facor, agarde...",
+Done				: "Feiro",
+PasteWordConfirm	: "Parece que o texto que quere pegar está copiado do Word.¿Quere limpar o formato antes de pegalo?",
+NotCompatiblePaste	: "Este comando está disponible para Internet Explorer versión 5.5 ou superior. ¿Quere pegalo sen limpar o formato?",
+UnknownToolbarItem	: "Ítem de ferramentas descoñecido \"%1\"",
+UnknownCommand		: "Nome de comando descoñecido \"%1\"",
+NotImplemented		: "Comando non implementado",
+UnknownToolbarSet	: "O conxunto de ferramentas \"%1\" non existe",
+NoActiveX			: "As opcións de seguridade do seu navegador poderían limitar algunha das características de editor. Debe activar a opción \"Executar controis ActiveX e plug-ins\". Pode notar que faltan características e experimentar erros",
+BrowseServerBlocked : "Non se poido abrir o navegador de recursos. Asegúrese de que están desactivados os bloqueadores de xanelas emerxentes",
+DialogBlocked		: "Non foi posible abrir a xanela de diálogo. Asegúrese de que están desactivados os bloqueadores de xanelas emerxentes",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancelar",
+DlgBtnClose			: "Pechar",
+DlgBtnBrowseServer	: "Navegar no Servidor",
+DlgAdvancedTag		: "Advanzado",
+DlgOpOther			: "<Outro>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Por favor, insira a URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<non definido>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Orientación do Idioma",
+DlgGenLangDirLtr	: "Esquerda a Dereita (LTR)",
+DlgGenLangDirRtl	: "Dereita a Esquerda (RTL)",
+DlgGenLangCode		: "Código do Idioma",
+DlgGenAccessKey		: "Chave de Acceso",
+DlgGenName			: "Nome",
+DlgGenTabIndex		: "Índice de Tabulación",
+DlgGenLongDescr		: "Descrición Completa da URL",
+DlgGenClass			: "Clases da Folla de Estilos",
+DlgGenTitle			: "Título",
+DlgGenContType		: "Tipo de Contido",
+DlgGenLinkCharset	: "Fonte de Caracteres Vinculado",
+DlgGenStyle			: "Estilo",
+
+// Image Dialog
+DlgImgTitle			: "Propriedades da Imaxe",
+DlgImgInfoTab		: "Información da Imaxe",
+DlgImgBtnUpload		: "Enviar ó Servidor",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Carregar",
+DlgImgAlt			: "Texto Alternativo",
+DlgImgWidth			: "Largura",
+DlgImgHeight		: "Altura",
+DlgImgLockRatio		: "Proporcional",
+DlgBtnResetSize		: "Tamaño Orixinal",
+DlgImgBorder		: "Límite",
+DlgImgHSpace		: "Esp. Horiz.",
+DlgImgVSpace		: "Esp. Vert.",
+DlgImgAlign			: "Aliñamento",
+DlgImgAlignLeft		: "Esquerda",
+DlgImgAlignAbsBottom: "Abs Inferior",
+DlgImgAlignAbsMiddle: "Abs Centro",
+DlgImgAlignBaseline	: "Liña Base",
+DlgImgAlignBottom	: "Pé",
+DlgImgAlignMiddle	: "Centro",
+DlgImgAlignRight	: "Dereita",
+DlgImgAlignTextTop	: "Tope do Texto",
+DlgImgAlignTop		: "Tope",
+DlgImgPreview		: "Vista Previa",
+DlgImgAlertUrl		: "Por favor, escriba a URL da imaxe",
+DlgImgLinkTab		: "Ligazón",
+
+// Flash Dialog
+DlgFlashTitle		: "Propriedades Flash",
+DlgFlashChkPlay		: "Auto Execución",
+DlgFlashChkLoop		: "Bucle",
+DlgFlashChkMenu		: "Activar Menú Flash",
+DlgFlashScale		: "Escalar",
+DlgFlashScaleAll	: "Amosar Todo",
+DlgFlashScaleNoBorder	: "Sen Borde",
+DlgFlashScaleFit	: "Encaixar axustando",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Ligazón",
+DlgLnkInfoTab		: "Información da Ligazón",
+DlgLnkTargetTab		: "Referencia a esta páxina",
+
+DlgLnkType			: "Tipo de Ligazón",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Referencia nesta páxina",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocolo",
+DlgLnkProtoOther	: "<outro>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Seleccionar unha Referencia",
+DlgLnkAnchorByName	: "Por Nome de Referencia",
+DlgLnkAnchorById	: "Por Element Id",
+DlgLnkNoAnchors		: "(Non hai referencias disponibles no documento)",
+DlgLnkEMail			: "Enderezo de E-Mail",
+DlgLnkEMailSubject	: "Asunto do Mensaxe",
+DlgLnkEMailBody		: "Corpo do Mensaxe",
+DlgLnkUpload		: "Carregar",
+DlgLnkBtnUpload		: "Enviar ó servidor",
+
+DlgLnkTarget		: "Destino",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<Xanela Emerxente>",
+DlgLnkTargetBlank	: "Nova Xanela (_blank)",
+DlgLnkTargetParent	: "Xanela Pai (_parent)",
+DlgLnkTargetSelf	: "Mesma Xanela (_self)",
+DlgLnkTargetTop		: "Xanela Primaria (_top)",
+DlgLnkTargetFrameName	: "Nome do Marco Destino",
+DlgLnkPopWinName	: "Nome da Xanela Emerxente",
+DlgLnkPopWinFeat	: "Características da Xanela Emerxente",
+DlgLnkPopResize		: "Axustable",
+DlgLnkPopLocation	: "Barra de Localización",
+DlgLnkPopMenu		: "Barra de Menú",
+DlgLnkPopScroll		: "Barras de Desplazamento",
+DlgLnkPopStatus		: "Barra de Estado",
+DlgLnkPopToolbar	: "Barra de Ferramentas",
+DlgLnkPopFullScrn	: "A Toda Pantalla (IE)",
+DlgLnkPopDependent	: "Dependente (Netscape)",
+DlgLnkPopWidth		: "Largura",
+DlgLnkPopHeight		: "Altura",
+DlgLnkPopLeft		: "Posición Esquerda",
+DlgLnkPopTop		: "Posición dende Arriba",
+
+DlnLnkMsgNoUrl		: "Por favor, escriba a ligazón URL",
+DlnLnkMsgNoEMail	: "Por favor, escriba o enderezo de e-mail",
+DlnLnkMsgNoAnchor	: "Por favor, seleccione un destino",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Seleccionar Color",
+DlgColorBtnClear	: "Nengunha",
+DlgColorHighlight	: "Destacado",
+DlgColorSelected	: "Seleccionado",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Inserte un Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Seleccione Caracter Especial",
+
+// Table Dialog
+DlgTableTitle		: "Propiedades da Táboa",
+DlgTableRows		: "Filas",
+DlgTableColumns		: "Columnas",
+DlgTableBorder		: "Tamaño do Borde",
+DlgTableAlign		: "Aliñamento",
+DlgTableAlignNotSet	: "<Non Definido>",
+DlgTableAlignLeft	: "Esquerda",
+DlgTableAlignCenter	: "Centro",
+DlgTableAlignRight	: "Ereita",
+DlgTableWidth		: "Largura",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Altura",
+DlgTableCellSpace	: "Marxe entre Celas",
+DlgTableCellPad		: "Marxe interior",
+DlgTableCaption		: "Título",
+DlgTableSummary		: "Sumario",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propriedades da Cela",
+DlgCellWidth		: "Largura",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Altura",
+DlgCellWordWrap		: "Axustar Liñas",
+DlgCellWordWrapNotSet	: "<Non Definido>",
+DlgCellWordWrapYes	: "Si",
+DlgCellWordWrapNo	: "Non",
+DlgCellHorAlign		: "Aliñamento Horizontal",
+DlgCellHorAlignNotSet	: "<Non definido>",
+DlgCellHorAlignLeft	: "Esquerda",
+DlgCellHorAlignCenter	: "Centro",
+DlgCellHorAlignRight: "Dereita",
+DlgCellVerAlign		: "Aliñamento Vertical",
+DlgCellVerAlignNotSet	: "<Non definido>",
+DlgCellVerAlignTop	: "Arriba",
+DlgCellVerAlignMiddle	: "Medio",
+DlgCellVerAlignBottom	: "Abaixo",
+DlgCellVerAlignBaseline	: "Liña de Base",
+DlgCellRowSpan		: "Ocupar Filas",
+DlgCellCollSpan		: "Ocupar Columnas",
+DlgCellBackColor	: "Color de Fondo",
+DlgCellBorderColor	: "Color de Borde",
+DlgCellBtnSelect	: "Seleccionar...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Procurar",
+DlgFindFindBtn		: "Procurar",
+DlgFindNotFoundMsg	: "Non te atopou o texto indicado.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Substituir",
+DlgReplaceFindLbl		: "Texto a procurar:",
+DlgReplaceReplaceLbl	: "Substituir con:",
+DlgReplaceCaseChk		: "Coincidir Mai./min.",
+DlgReplaceReplaceBtn	: "Substituir",
+DlgReplaceReplAllBtn	: "Substitiur Todo",
+DlgReplaceWordChk		: "Coincidir con toda a palabra",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de corte. Por favor, use o teclado para iso (Ctrl+X).",
+PasteErrorCopy	: "Os axustes de seguridade do seu navegador non permiten que o editor realice automáticamente as tarefas de copia. Por favor, use o teclado para iso (Ctrl+C).",
+
+PasteAsText		: "Pegar como texto plano",
+PasteFromWord	: "Pegar dende Word",
+
+DlgPasteMsg2	: "Por favor, pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl+V</STRONG>) e pulse <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignorar as definicións de Tipografía",
+DlgPasteRemoveStyles	: "Eliminar as definicións de Estilos",
+
+// Color Picker
+ColorAutomatic	: "Automático",
+ColorMoreColors	: "Máis Cores...",
+
+// Document Properties
+DocProps		: "Propriedades do Documento",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propriedades da Referencia",
+DlgAnchorName		: "Nome da Referencia",
+DlgAnchorErrorName	: "Por favor, escriba o nome da referencia",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Non está no diccionario",
+DlgSpellChangeTo		: "Cambiar a",
+DlgSpellBtnIgnore		: "Ignorar",
+DlgSpellBtnIgnoreAll	: "Ignorar Todas",
+DlgSpellBtnReplace		: "Substituir",
+DlgSpellBtnReplaceAll	: "Substituir Todas",
+DlgSpellBtnUndo			: "Desfacer",
+DlgSpellNoSuggestions	: "- Sen candidatos -",
+DlgSpellProgress		: "Corrección ortográfica en progreso...",
+DlgSpellNoMispell		: "Corrección ortográfica rematada: Non se atoparon erros",
+DlgSpellNoChanges		: "Corrección ortográfica rematada: Non se substituiu nengunha verba",
+DlgSpellOneChange		: "Corrección ortográfica rematada: Unha verba substituida",
+DlgSpellManyChanges		: "Corrección ortográfica rematada: %1 verbas substituidas",
+
+IeSpellDownload			: "O corrector ortográfico non está instalado. ¿Quere descargalo agora?",
+
+// Button Dialog
+DlgButtonText		: "Texto (Valor)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nome",
+DlgCheckboxValue	: "Valor",
+DlgCheckboxSelected	: "Seleccionado",
+
+// Form Dialog
+DlgFormName		: "Nome",
+DlgFormAction	: "Acción",
+DlgFormMethod	: "Método",
+
+// Select Field Dialog
+DlgSelectName		: "Nome",
+DlgSelectValue		: "Valor",
+DlgSelectSize		: "Tamaño",
+DlgSelectLines		: "liñas",
+DlgSelectChkMulti	: "Permitir múltiples seleccións",
+DlgSelectOpAvail	: "Opcións Disponibles",
+DlgSelectOpText		: "Texto",
+DlgSelectOpValue	: "Valor",
+DlgSelectBtnAdd		: "Engadir",
+DlgSelectBtnModify	: "Modificar",
+DlgSelectBtnUp		: "Subir",
+DlgSelectBtnDown	: "Baixar",
+DlgSelectBtnSetValue : "Definir como valor por defecto",
+DlgSelectBtnDelete	: "Borrar",
+
+// Textarea Dialog
+DlgTextareaName	: "Nome",
+DlgTextareaCols	: "Columnas",
+DlgTextareaRows	: "Filas",
+
+// Text Field Dialog
+DlgTextName			: "Nome",
+DlgTextValue		: "Valor",
+DlgTextCharWidth	: "Tamaño do Caracter",
+DlgTextMaxChars		: "Máximo de Caracteres",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Texto",
+DlgTextTypePass		: "Chave",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nome",
+DlgHiddenValue	: "Valor",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propriedades das Marcas",
+NumberedListProp	: "Propriedades da Lista de Numeración",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Círculo",
+DlgLstTypeDisc		: "Disco",
+DlgLstTypeSquare	: "Cuadrado",
+DlgLstTypeNumbers	: "Números (1, 2, 3)",
+DlgLstTypeLCase		: "Letras Minúsculas (a, b, c)",
+DlgLstTypeUCase		: "Letras Maiúsculas (A, B, C)",
+DlgLstTypeSRoman	: "Números Romanos en minúscula (i, ii, iii)",
+DlgLstTypeLRoman	: "Números Romanos en Maiúscula (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Xeral",
+DlgDocBackTab		: "Fondo",
+DlgDocColorsTab		: "Cores e Marxes",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Título da Páxina",
+DlgDocLangDir		: "Orientación do Idioma",
+DlgDocLangDirLTR	: "Esquerda a Dereita (LTR)",
+DlgDocLangDirRTL	: "Dereita a Esquerda (RTL)",
+DlgDocLangCode		: "Código de Idioma",
+DlgDocCharSet		: "Codificación do Xogo de Caracteres",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Outra Codificación do Xogo de Caracteres",
+
+DlgDocDocType		: "Encabezado do Tipo de Documento",
+DlgDocDocTypeOther	: "Outro Encabezado do Tipo de Documento",
+DlgDocIncXHTML		: "Incluir Declaracións XHTML",
+DlgDocBgColor		: "Cor de Fondo",
+DlgDocBgImage		: "URL da Imaxe de Fondo",
+DlgDocBgNoScroll	: "Fondo Fixo",
+DlgDocCText			: "Texto",
+DlgDocCLink			: "Ligazóns",
+DlgDocCVisited		: "Ligazón Visitada",
+DlgDocCActive		: "Ligazón Activa",
+DlgDocMargins		: "Marxes da Páxina",
+DlgDocMaTop			: "Arriba",
+DlgDocMaLeft		: "Esquerda",
+DlgDocMaRight		: "Dereita",
+DlgDocMaBottom		: "Abaixo",
+DlgDocMeIndex		: "Palabras Chave de Indexación do Documento (separadas por comas)",
+DlgDocMeDescr		: "Descripción do Documento",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Vista Previa",
+
+// Templates Dialog
+Templates			: "Plantillas",
+DlgTemplatesTitle	: "Plantillas de Contido",
+DlgTemplatesSelMsg	: "Por favor, seleccione a plantilla a abrir no editor<br>(o contido actual perderase):",
+DlgTemplatesLoading	: "Cargando listado de plantillas. Por favor, espere...",
+DlgTemplatesNoTpl	: "(Non hai plantillas definidas)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Acerca de",
+DlgAboutBrowserInfoTab	: "Información do Navegador",
+DlgAboutLicenseTab	: "Licencia",
+DlgAboutVersion		: "versión",
+DlgAboutInfo		: "Para máis información visitar:",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/gu.js b/modules/editor/skins/fckeditor/editor/lang/gu.js
new file mode 100644
index 000000000..e14eca70e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/gu.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Gujarati language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "ટૂલબાર નાનું કરવું",
+ToolbarExpand		: "ટૂલબાર મોટું કરવું",
+
+// Toolbar Items and Context Menu
+Save				: "સેવ",
+NewPage				: "નવુ પાનું",
+Preview				: "પૂર્વદર્શન",
+Cut					: "કાપવું",
+Copy				: "નકલ",
+Paste				: "પેસ્ટ",
+PasteText			: "પેસ્ટ (સાદી ટેક્સ્ટ)",
+PasteWord			: "પેસ્ટ (વડૅ ટેક્સ્ટ)",
+Print				: "પ્રિન્ટ",
+SelectAll			: "બઘું પસંદ કરવું",
+RemoveFormat		: "ફૉર્મટ કાઢવું",
+InsertLinkLbl		: "સંબંધન, લિંક",
+InsertLink			: "લિંક ઇન્સર્ટ/દાખલ કરવી",
+RemoveLink			: "લિંક કાઢવી",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "ઍંકર ઇન્સર્ટ/દાખલ કરવી",
+AnchorDelete		: "ઍંકર કાઢવી",
+InsertImageLbl		: "ચિત્ર",
+InsertImage			: "ચિત્ર ઇન્સર્ટ/દાખલ કરવું",
+InsertFlashLbl		: "ફ્લૅશ",
+InsertFlash			: "ફ્લૅશ ઇન્સર્ટ/દાખલ કરવું",
+InsertTableLbl		: "ટેબલ, કોઠો",
+InsertTable			: "ટેબલ, કોઠો ઇન્સર્ટ/દાખલ કરવું",
+InsertLineLbl		: "રેખા",
+InsertLine			: "સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી",
+InsertSpecialCharLbl: "વિશિષ્ટ અક્ષર",
+InsertSpecialChar	: "વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું",
+InsertSmileyLbl		: "સ્માઇલી",
+InsertSmiley		: "સ્માઇલી ઇન્સર્ટ/દાખલ કરવી",
+About				: "FCKeditorના વિષે",
+Bold				: "બોલ્ડ/સ્પષ્ટ",
+Italic				: "ઇટેલિક, ત્રાંસા",
+Underline			: "અન્ડર્લાઇન, નીચે લીટી",
+StrikeThrough		: "છેકી નાખવું",
+Subscript			: "એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન",
+Superscript			: "એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.",
+LeftJustify			: "ડાબી બાજુએ/બાજુ તરફ",
+CenterJustify		: "સંકેંદ્રણ/સેંટરિંગ",
+RightJustify		: "જમણી બાજુએ/બાજુ તરફ",
+BlockJustify		: "બ્લૉક, અંતરાય જસ્ટિફાઇ",
+DecreaseIndent		: "ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી",
+IncreaseIndent		: "ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી",
+Blockquote			: "બ્લૉક-કોટ, અવતરણચિહ્નો",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી",
+Redo				: "રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી",
+NumberedListLbl		: "સંખ્યાંકન સૂચિ",
+NumberedList		: "સંખ્યાંકન સૂચિ ઇન્સર્ટ/દાખલ કરવી",
+BulletedListLbl		: "બુલેટ સૂચિ",
+BulletedList		: "બુલેટ સૂચિ ઇન્સર્ટ/દાખલ કરવી",
+ShowTableBorders	: "ટેબલ, કોઠાની બાજુ(બોર્ડર) બતાવવી",
+ShowDetails			: "વિસ્તૃત વિગતવાર બતાવવું",
+Style				: "શૈલી/રીત",
+FontFormat			: "ફૉન્ટ ફૉર્મટ, રચનાની શૈલી",
+Font				: "ફૉન્ટ",
+FontSize			: "ફૉન્ટ સાઇઝ/કદ",
+TextColor			: "શબ્દનો રંગ",
+BGColor				: "બૅકગ્રાઉન્ડ રંગ,",
+Source				: "મૂળ કે પ્રાથમિક દસ્તાવેજ",
+Find				: "શોધવું",
+Replace				: "રિપ્લેસ/બદલવું",
+SpellCheck			: "જોડણી (સ્પેલિંગ) તપાસવી",
+UniversalKeyboard	: "યૂનિવર્સલ/વિશ્વવ્યાપક કીબૉર્ડ",
+PageBreakLbl		: "પેજબ્રેક/પાનાને અલગ કરવું",
+PageBreak			: "ઇન્સર્ટ પેજબ્રેક/પાનાને અલગ કરવું/દાખલ કરવું",
+
+Form			: "ફૉર્મ/પત્રક",
+Checkbox		: "ચેક બોક્સ",
+RadioButton		: "રેડિઓ બટન",
+TextField		: "ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર",
+Textarea		: "ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર",
+HiddenField		: "ગુપ્ત ક્ષેત્ર",
+Button			: "બટન",
+SelectionField	: "પસંદગી ક્ષેત્ર",
+ImageButton		: "ચિત્ર બટન",
+
+FitWindow		: "એડિટરની સાઇઝ અધિકતમ કરવી",
+ShowBlocks		: "બ્લૉક બતાવવું",
+
+// Context Menu
+EditLink			: " લિંક એડિટ/માં ફેરફાર કરવો",
+CellCM				: "કોષના ખાના",
+RowCM				: "પંક્તિના ખાના",
+ColumnCM			: "કૉલમ/ઊભી કટાર",
+InsertRowAfter		: "પછી પંક્તિ ઉમેરવી",
+InsertRowBefore		: "પહેલાં પંક્તિ ઉમેરવી",
+DeleteRows			: "પંક્તિઓ ડિલીટ/કાઢી નાખવી",
+InsertColumnAfter	: "પછી કૉલમ/ઊભી કટાર ઉમેરવી",
+InsertColumnBefore	: "પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી",
+DeleteColumns		: "કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી",
+InsertCellAfter		: "પછી કોષ ઉમેરવો",
+InsertCellBefore	: "પહેલાં કોષ ઉમેરવો",
+DeleteCells			: "કોષ ડિલીટ/કાઢી નાખવો",
+MergeCells			: "કોષ ભેગા કરવા",
+MergeRight			: "જમણી બાજુ ભેગા કરવા",
+MergeDown			: "નીચે ભેગા કરવા",
+HorizontalSplitCell	: "કોષને સમસ્તરીય વિભાજન કરવું",
+VerticalSplitCell	: "કોષને સીધું ને ઊભું વિભાજન કરવું",
+TableDelete			: "કોઠો ડિલીટ/કાઢી નાખવું",
+CellProperties		: "કોષના ગુણ",
+TableProperties		: "કોઠાના  ગુણ",
+ImageProperties		: "ચિત્રના ગુણ",
+FlashProperties		: "ફ્લૅશના ગુણ",
+
+AnchorProp			: "ઍંકરના ગુણ",
+ButtonProp			: "બટનના ગુણ",
+CheckboxProp		: "ચેક બોક્સ ગુણ",
+HiddenFieldProp		: "ગુપ્ત ક્ષેત્રના ગુણ",
+RadioButtonProp		: "રેડિઓ બટનના ગુણ",
+ImageButtonProp		: "ચિત્ર બટનના ગુણ",
+TextFieldProp		: "ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્રના ગુણ",
+SelectionFieldProp	: "પસંદગી ક્ષેત્રના ગુણ",
+TextareaProp		: "ટેક્સ્ટ એઅરિઆ, શબ્દ વિસ્તારના ગુણ",
+FormProp			: "ફૉર્મ/પત્રકના ગુણ",
+
+FontFormats			: "સામાન્ય;ફૉર્મટેડ;સરનામું;શીર્ષક 1;શીર્ષક 2;શીર્ષક 3;શીર્ષક 4;શીર્ષક 5;શીર્ષક 6;શીર્ષક (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML પ્રક્રિયા ચાલુ છે. મહેરબાની કરીને રાહ જોવો...",
+Done				: "પતી ગયું",
+PasteWordConfirm	: "તમે જે ટેક્સ્ટ પેસ્ટ કરવા માંગો છો, તે વડૅમાંથી કોપી કરેલુ લાગે છે. પેસ્ટ કરતા પહેલાં ટેક્સ્ટ સાફ કરવી છે?",
+NotCompatiblePaste	: "આ કમાન્ડ ઈનટરનેટ એક્સપ્લોરર(Internet Explorer) 5.5 અથવા એના પછીના વર્ઝન માટેજ છે. ટેક્સ્ટને સાફ કયૅા પહેલાં પેસ્ટ કરવી છે?",
+UnknownToolbarItem	: "અજાણી ટૂલબાર આઇટમ \"%1\"",
+UnknownCommand		: "અજાણયો કમાન્ડ \"%1\"",
+NotImplemented		: "કમાન્ડ ઇમ્પ્લિમન્ટ નથી કરોયો",
+UnknownToolbarSet	: "ટૂલબાર સેટ \"%1\" ઉપલબ્ધ નથી",
+NoActiveX			: "તમારા બ્રાઉઝરની સુરક્ષા સેટિંગસ એડિટરના અમુક ફીચરને પરવાનગી આપતી નથી. કૃપયા \"Run ActiveX controls and plug-ins\" વિકલ્પને ઇનેબલ/સમર્થ કરો. તમારા બ્રાઉઝરમાં એરર ઇન્વિઝિબલ ફીચરનો અનુભવ થઈ શકે છે. કૃપયા પૉપ-અપ બ્લૉકર ડિસેબલ કરો.",
+BrowseServerBlocked : "રિસૉર્સ બ્રાઉઝર ખોલી ન સકાયું.",
+DialogBlocked		: "ડાયલૉગ વિન્ડો ખોલી ન સકાયું. કૃપયા પૉપ-અપ બ્લૉકર ડિસેબલ કરો.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ઠીક છે",
+DlgBtnCancel		: "રદ કરવું",
+DlgBtnClose			: "બંધ કરવું",
+DlgBtnBrowseServer	: "સર્વર બ્રાઉઝ કરો",
+DlgAdvancedTag		: "અડ્વાન્સડ",
+DlgOpOther			: "<અન્ય>",
+DlgInfoTab			: "સૂચના",
+DlgAlertUrl			: "URL ઇન્સર્ટ કરો",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<સેટ નથી>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "ભાષા લેખવાની પદ્ધતિ",
+DlgGenLangDirLtr	: "ડાબે થી જમણે (LTR)",
+DlgGenLangDirRtl	: "જમણે થી ડાબે (RTL)",
+DlgGenLangCode		: "ભાષા કોડ",
+DlgGenAccessKey		: "ઍક્સેસ કી",
+DlgGenName			: "નામ",
+DlgGenTabIndex		: "ટૅબ ઇન્ડેક્સ",
+DlgGenLongDescr		: "વધારે માહિતી માટે URL",
+DlgGenClass			: "સ્ટાઇલ-શીટ ક્લાસ",
+DlgGenTitle			: "મુખ્ય મથાળું",
+DlgGenContType		: "મુખ્ય કન્ટેન્ટ પ્રકાર",
+DlgGenLinkCharset	: "લિંક રિસૉર્સ કૅરિક્ટર સેટ",
+DlgGenStyle			: "સ્ટાઇલ",
+
+// Image Dialog
+DlgImgTitle			: "ચિત્રના ગુણ",
+DlgImgInfoTab		: "ચિત્ર ની જાણકારી",
+DlgImgBtnUpload		: "આ સર્વરને મોકલવું",
+DlgImgURL			: "URL",
+DlgImgUpload		: "અપલોડ",
+DlgImgAlt			: "ઑલ્ટર્નટ ટેક્સ્ટ",
+DlgImgWidth			: "પહોળાઈ",
+DlgImgHeight		: "ઊંચાઈ",
+DlgImgLockRatio		: "લૉક ગુણોત્તર",
+DlgBtnResetSize		: "રીસેટ સાઇઝ",
+DlgImgBorder		: "બોર્ડર",
+DlgImgHSpace		: "સમસ્તરીય જગ્યા",
+DlgImgVSpace		: "લંબરૂપ જગ્યા",
+DlgImgAlign			: "લાઇનદોરીમાં ગોઠવવું",
+DlgImgAlignLeft		: "ડાબી બાજુ ગોઠવવું",
+DlgImgAlignAbsBottom: "Abs નીચે",
+DlgImgAlignAbsMiddle: "Abs ઉપર",
+DlgImgAlignBaseline	: "આધાર લીટી",
+DlgImgAlignBottom	: "નીચે",
+DlgImgAlignMiddle	: "વચ્ચે",
+DlgImgAlignRight	: "જમણી",
+DlgImgAlignTextTop	: "ટેક્સ્ટ ઉપર",
+DlgImgAlignTop		: "ઉપર",
+DlgImgPreview		: "પૂર્વદર્શન",
+DlgImgAlertUrl		: "ચિત્રની URL ટાઇપ કરો",
+DlgImgLinkTab		: "લિંક",
+
+// Flash Dialog
+DlgFlashTitle		: "ફ્લૅશ ગુણ",
+DlgFlashChkPlay		: "ઑટો/સ્વયં પ્લે",
+DlgFlashChkLoop		: "લૂપ",
+DlgFlashChkMenu		: "ફ્લૅશ મેન્યૂ નો પ્રયોગ કરો",
+DlgFlashScale		: "સ્કેલ",
+DlgFlashScaleAll	: "સ્કેલ ઓલ/બધુ બતાવો",
+DlgFlashScaleNoBorder	: "સ્કેલ બોર્ડર વગર",
+DlgFlashScaleFit	: "સ્કેલ એકદમ ફીટ",
+
+// Link Dialog
+DlgLnkWindowTitle	: "લિંક",
+DlgLnkInfoTab		: "લિંક ઇન્ફૉ ટૅબ",
+DlgLnkTargetTab		: "ટાર્ગેટ/લક્ષ્ય ટૅબ",
+
+DlgLnkType			: "લિંક પ્રકાર",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "આ પેજનો ઍંકર",
+DlgLnkTypeEMail		: "ઈ-મેલ",
+DlgLnkProto			: "પ્રોટોકૉલ",
+DlgLnkProtoOther	: "<અન્ય>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "ઍંકર પસંદ કરો",
+DlgLnkAnchorByName	: "ઍંકર નામથી પસંદ કરો",
+DlgLnkAnchorById	: "ઍંકર એલિમન્ટ Id થી પસંદ કરો",
+DlgLnkNoAnchors		: "(ડૉક્યુમન્ટમાં ઍંકરની સંખ્યા)",
+DlgLnkEMail			: "ઈ-મેલ સરનામું",
+DlgLnkEMailSubject	: "ઈ-મેલ વિષય",
+DlgLnkEMailBody		: "સંદેશ",
+DlgLnkUpload		: "અપલોડ",
+DlgLnkBtnUpload		: "આ સર્વરને મોકલવું",
+
+DlgLnkTarget		: "ટાર્ગેટ/લક્ષ્ય",
+DlgLnkTargetFrame	: "<ફ્રેમ>",
+DlgLnkTargetPopup	: "<પૉપ-અપ વિન્ડો>",
+DlgLnkTargetBlank	: "નવી  વિન્ડો (_blank)",
+DlgLnkTargetParent	: "મૂળ વિન્ડો (_parent)",
+DlgLnkTargetSelf	: "આજ વિન્ડો (_self)",
+DlgLnkTargetTop		: "ઉપરની વિન્ડો (_top)",
+DlgLnkTargetFrameName	: "ટાર્ગેટ ફ્રેમ નું નામ",
+DlgLnkPopWinName	: "પૉપ-અપ વિન્ડો નું નામ",
+DlgLnkPopWinFeat	: "પૉપ-અપ વિન્ડો ફીચરસૅ",
+DlgLnkPopResize		: "સાઇઝ બદલી સકાય છે",
+DlgLnkPopLocation	: "લોકેશન બાર",
+DlgLnkPopMenu		: "મેન્યૂ બાર",
+DlgLnkPopScroll		: "સ્ક્રોલ બાર",
+DlgLnkPopStatus		: "સ્ટૅટસ બાર",
+DlgLnkPopToolbar	: "ટૂલ બાર",
+DlgLnkPopFullScrn	: "ફુલ સ્ક્રીન (IE)",
+DlgLnkPopDependent	: "ડિપેન્ડન્ટ (Netscape)",
+DlgLnkPopWidth		: "પહોળાઈ",
+DlgLnkPopHeight		: "ઊંચાઈ",
+DlgLnkPopLeft		: "ડાબી બાજુ",
+DlgLnkPopTop		: "જમણી બાજુ",
+
+DlnLnkMsgNoUrl		: "લિંક  URL ટાઇપ કરો",
+DlnLnkMsgNoEMail	: "ઈ-મેલ સરનામું ટાઇપ કરો",
+DlnLnkMsgNoAnchor	: "ઍંકર પસંદ કરો",
+DlnLnkMsgInvPopName	: "પૉપ-અપ વિન્ડો નું નામ ઍલ્ફબેટથી શરૂ કરવો અને તેમાં સ્પેઇસ ન હોવી જોઈએ",
+
+// Color Dialog
+DlgColorTitle		: "રંગ  પસંદ કરો",
+DlgColorBtnClear	: "સાફ કરો",
+DlgColorHighlight	: "હાઈલાઇટ",
+DlgColorSelected	: "સિલેક્ટેડ/પસંદ કરવું",
+
+// Smiley Dialog
+DlgSmileyTitle		: "સ્માઇલી  પસંદ કરો",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો",
+
+// Table Dialog
+DlgTableTitle		: "ટેબલ, કોઠાનું મથાળું",
+DlgTableRows		: "પંક્તિના ખાના",
+DlgTableColumns		: "કૉલમ/ઊભી કટાર",
+DlgTableBorder		: "કોઠાની બાજુ(બોર્ડર) સાઇઝ",
+DlgTableAlign		: "અલાઇનમન્ટ/ગોઠવાયેલું ",
+DlgTableAlignNotSet	: "<સેટ નથી>",
+DlgTableAlignLeft	: "ડાબી બાજુ",
+DlgTableAlignCenter	: "મધ્ય સેન્ટર",
+DlgTableAlignRight	: "જમણી બાજુ",
+DlgTableWidth		: "પહોળાઈ",
+DlgTableWidthPx		: "પિકસલ",
+DlgTableWidthPc		: "પ્રતિશત",
+DlgTableHeight		: "ઊંચાઈ",
+DlgTableCellSpace	: "સેલ અંતર",
+DlgTableCellPad		: "સેલ પૅડિંગ",
+DlgTableCaption		: "મથાળું/કૅપ્શન ",
+DlgTableSummary		: "ટૂંકો એહેવાલ",
+
+// Table Cell Dialog
+DlgCellTitle		: "પંક્તિના ખાનાના ગુણ",
+DlgCellWidth		: "પહોળાઈ",
+DlgCellWidthPx		: "પિકસલ",
+DlgCellWidthPc		: "પ્રતિશત",
+DlgCellHeight		: "ઊંચાઈ",
+DlgCellWordWrap		: "વર્ડ રૅપ",
+DlgCellWordWrapNotSet	: "<સેટ નથી>",
+DlgCellWordWrapYes	: "હા",
+DlgCellWordWrapNo	: "ના",
+DlgCellHorAlign		: "સમસ્તરીય ગોઠવવું",
+DlgCellHorAlignNotSet	: "<સેટ નથી>",
+DlgCellHorAlignLeft	: "ડાબી બાજુ",
+DlgCellHorAlignCenter	: "મધ્ય સેન્ટર",
+DlgCellHorAlignRight: "જમણી બાજુ",
+DlgCellVerAlign		: "લંબરૂપ ગોઠવવું",
+DlgCellVerAlignNotSet	: "<સેટ નથી>",
+DlgCellVerAlignTop	: "ઉપર",
+DlgCellVerAlignMiddle	: "મધ્ય સેન્ટર",
+DlgCellVerAlignBottom	: "નીચે",
+DlgCellVerAlignBaseline	: "મૂળ રેખા",
+DlgCellRowSpan		: "પંક્તિ સ્પાન",
+DlgCellCollSpan		: "કૉલમ/ઊભી કટાર સ્પાન",
+DlgCellBackColor	: "બૅકગ્રાઉન્ડ રંગ",
+DlgCellBorderColor	: "બોર્ડરનો રંગ",
+DlgCellBtnSelect	: "પસંદ કરો...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "શોધવું અને બદલવું",
+
+// Find Dialog
+DlgFindTitle		: "શોધવું",
+DlgFindFindBtn		: "શોધવું",
+DlgFindNotFoundMsg	: "તમે શોધેલી ટેક્સ્ટ નથી મળી",
+
+// Replace Dialog
+DlgReplaceTitle			: "બદલવું",
+DlgReplaceFindLbl		: "આ શોધો",
+DlgReplaceReplaceLbl	: "આનાથી બદલો",
+DlgReplaceCaseChk		: "કેસ સરખા રાખો",
+DlgReplaceReplaceBtn	: "બદલવું",
+DlgReplaceReplAllBtn	: "બઘા બદલી ",
+DlgReplaceWordChk		: "બઘા શબ્દ સરખા રાખો",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl+X) નો ઉપયોગ કરો.",
+PasteErrorCopy	: "તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl+C) का प्रयोग करें।",
+
+PasteAsText		: "પેસ્ટ (ટેક્સ્ટ)",
+PasteFromWord	: "પેસ્ટ (વર્ડ થી)",
+
+DlgPasteMsg2	: "Ctrl+V નો પ્રયોગ કરી પેસ્ટ કરો",
+DlgPasteSec		: "તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.",
+DlgPasteIgnoreFont		: "ફૉન્ટફેસ વ્યાખ્યાની અવગણના",
+DlgPasteRemoveStyles	: "સ્ટાઇલ વ્યાખ્યા કાઢી નાખવી",
+
+// Color Picker
+ColorAutomatic	: "સ્વચાલિત",
+ColorMoreColors	: "ઔર રંગ...",
+
+// Document Properties
+DocProps		: "ડૉક્યુમન્ટ ગુણ/પ્રૉપર્ટિઝ",
+
+// Anchor Dialog
+DlgAnchorTitle		: "ઍંકર ગુણ/પ્રૉપર્ટિઝ",
+DlgAnchorName		: "ઍંકરનું નામ",
+DlgAnchorErrorName	: "ઍંકરનું નામ ટાઈપ કરો",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "શબ્દકોશમાં નથી",
+DlgSpellChangeTo		: "આનાથી બદલવું",
+DlgSpellBtnIgnore		: "ઇગ્નોર/અવગણના કરવી",
+DlgSpellBtnIgnoreAll	: "બધાની ઇગ્નોર/અવગણના કરવી",
+DlgSpellBtnReplace		: "બદલવું",
+DlgSpellBtnReplaceAll	: "બધા બદલી કરો",
+DlgSpellBtnUndo			: "અન્ડૂ",
+DlgSpellNoSuggestions	: "- કઇ સજેશન નથી -",
+DlgSpellProgress		: "શબ્દની જોડણી/સ્પેલ ચેક ચાલુ છે...",
+DlgSpellNoMispell		: "શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: ખોટી જોડણી મળી નથી",
+DlgSpellNoChanges		: "શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એકપણ શબ્દ બદલયો નથી",
+DlgSpellOneChange		: "શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: એક શબ્દ બદલયો છે",
+DlgSpellManyChanges		: "શબ્દની જોડણી/સ્પેલ ચેક પૂર્ણ: %1 શબ્દ બદલયા છે",
+
+IeSpellDownload			: "સ્પેલ-ચેકર ઇન્સ્ટોલ નથી. શું તમે ડાઉનલોડ કરવા માંગો છો?",
+
+// Button Dialog
+DlgButtonText		: "ટેક્સ્ટ (વૅલ્યૂ)",
+DlgButtonType		: "પ્રકાર",
+DlgButtonTypeBtn	: "બટન",
+DlgButtonTypeSbm	: "સબ્મિટ",
+DlgButtonTypeRst	: "રિસેટ",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "નામ",
+DlgCheckboxValue	: "વૅલ્યૂ",
+DlgCheckboxSelected	: "સિલેક્ટેડ",
+
+// Form Dialog
+DlgFormName		: "નામ",
+DlgFormAction	: "ક્રિયા",
+DlgFormMethod	: "પદ્ધતિ",
+
+// Select Field Dialog
+DlgSelectName		: "નામ",
+DlgSelectValue		: "વૅલ્યૂ",
+DlgSelectSize		: "સાઇઝ",
+DlgSelectLines		: "લીટીઓ",
+DlgSelectChkMulti	: "એકથી વધારે પસંદ કરી શકો",
+DlgSelectOpAvail	: "ઉપલબ્ધ વિકલ્પ",
+DlgSelectOpText		: "ટેક્સ્ટ",
+DlgSelectOpValue	: "વૅલ્યૂ",
+DlgSelectBtnAdd		: "ઉમેરવું",
+DlgSelectBtnModify	: "બદલવું",
+DlgSelectBtnUp		: "ઉપર",
+DlgSelectBtnDown	: "નીચે",
+DlgSelectBtnSetValue : "પસંદ કરલી વૅલ્યૂ સેટ કરો",
+DlgSelectBtnDelete	: "રદ કરવું",
+
+// Textarea Dialog
+DlgTextareaName	: "નામ",
+DlgTextareaCols	: "કૉલમ/ઊભી કટાર",
+DlgTextareaRows	: "પંક્તિઓ",
+
+// Text Field Dialog
+DlgTextName			: "નામ",
+DlgTextValue		: "વૅલ્યૂ",
+DlgTextCharWidth	: "કેરેક્ટરની પહોળાઈ",
+DlgTextMaxChars		: "અધિકતમ કેરેક્ટર",
+DlgTextType			: "ટાઇપ",
+DlgTextTypeText		: "ટેક્સ્ટ",
+DlgTextTypePass		: "પાસવર્ડ",
+
+// Hidden Field Dialog
+DlgHiddenName	: "નામ",
+DlgHiddenValue	: "વૅલ્યૂ",
+
+// Bulleted List Dialog
+BulletedListProp	: "બુલેટ સૂચિ ગુણ",
+NumberedListProp	: "સંખ્યાંક્તિ સૂચિ ગુણ",
+DlgLstStart			: "શરૂઆતથી",
+DlgLstType			: "પ્રકાર",
+DlgLstTypeCircle	: "વર્તુળ",
+DlgLstTypeDisc		: "ડિસ્ક",
+DlgLstTypeSquare	: "ચોરસ",
+DlgLstTypeNumbers	: "સંખ્યા (1, 2, 3)",
+DlgLstTypeLCase		: "નાના અક્ષર (a, b, c)",
+DlgLstTypeUCase		: "મોટા અક્ષર (A, B, C)",
+DlgLstTypeSRoman	: "નાના રોમન આંક (i, ii, iii)",
+DlgLstTypeLRoman	: "મોટા રોમન આંક (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "સાધારણ",
+DlgDocBackTab		: "બૅકગ્રાઉન્ડ",
+DlgDocColorsTab		: "રંગ અને માર્જિન/કિનાર",
+DlgDocMetaTab		: "મેટાડૅટા",
+
+DlgDocPageTitle		: "પેજ મથાળું/ટાઇટલ",
+DlgDocLangDir		: "ભાષા લેખવાની પદ્ધતિ",
+DlgDocLangDirLTR	: "ડાબે થી જમણે (LTR)",
+DlgDocLangDirRTL	: "જમણે થી ડાબે (RTL)",
+DlgDocLangCode		: "ભાષા કોડ",
+DlgDocCharSet		: "કેરેક્ટર સેટ એન્કોડિંગ",
+DlgDocCharSetCE		: "મધ્ય યુરોપિઅન (Central European)",
+DlgDocCharSetCT		: "ચાઇનીઝ (Chinese Traditional Big5)",
+DlgDocCharSetCR		: "સિરીલિક (Cyrillic)",
+DlgDocCharSetGR		: "ગ્રીક (Greek)",
+DlgDocCharSetJP		: "જાપાનિઝ (Japanese)",
+DlgDocCharSetKR		: "કોરીયન (Korean)",
+DlgDocCharSetTR		: "ટર્કિ (Turkish)",
+DlgDocCharSetUN		: "યૂનિકોડ (UTF-8)",
+DlgDocCharSetWE		: "પશ્ચિમ યુરોપિઅન (Western European)",
+DlgDocCharSetOther	: "અન્ય કેરેક્ટર સેટ એન્કોડિંગ",
+
+DlgDocDocType		: "ડૉક્યુમન્ટ પ્રકાર શીર્ષક",
+DlgDocDocTypeOther	: "અન્ય ડૉક્યુમન્ટ પ્રકાર શીર્ષક",
+DlgDocIncXHTML		: "XHTML સૂચના સમાવિષ્ટ કરવી",
+DlgDocBgColor		: "બૅકગ્રાઉન્ડ રંગ",
+DlgDocBgImage		: "બૅકગ્રાઉન્ડ ચિત્ર URL",
+DlgDocBgNoScroll	: "સ્ક્રોલ ન થાય તેવું બૅકગ્રાઉન્ડ",
+DlgDocCText			: "ટેક્સ્ટ",
+DlgDocCLink			: "લિંક",
+DlgDocCVisited		: "વિઝિટેડ લિંક",
+DlgDocCActive		: "સક્રિય લિંક",
+DlgDocMargins		: "પેજ માર્જિન",
+DlgDocMaTop			: "ઉપર",
+DlgDocMaLeft		: "ડાબી",
+DlgDocMaRight		: "જમણી",
+DlgDocMaBottom		: "નીચે",
+DlgDocMeIndex		: "ડૉક્યુમન્ટ ઇન્ડેક્સ સંકેતશબ્દ (અલ્પવિરામ (,) થી અલગ કરો)",
+DlgDocMeDescr		: "ડૉક્યુમન્ટ વર્ણન",
+DlgDocMeAuthor		: "લેખક",
+DlgDocMeCopy		: "કૉપિરાઇટ",
+DlgDocPreview		: "પૂર્વદર્શન",
+
+// Templates Dialog
+Templates			: "ટેમ્પ્લેટ",
+DlgTemplatesTitle	: "કન્ટેન્ટ ટેમ્પ્લેટ",
+DlgTemplatesSelMsg	: "એડિટરમાં ઓપન કરવા ટેમ્પ્લેટ પસંદ કરો (વર્તમાન કન્ટેન્ટ સેવ નહીં થાય):",
+DlgTemplatesLoading	: "ટેમ્પ્લેટ સૂચિ લોડ થાય છે. રાહ જુઓ...",
+DlgTemplatesNoTpl	: "(કોઈ ટેમ્પ્લેટ ડિફાઇન નથી)",
+DlgTemplatesReplace	: "મૂળ શબ્દને બદલો",
+
+// About Dialog
+DlgAboutAboutTab	: "FCKEditor ના વિષે",
+DlgAboutBrowserInfoTab	: "બ્રાઉઝર ના વિષે",
+DlgAboutLicenseTab	: "લાઇસન્સ",
+DlgAboutVersion		: "વર્ઝન",
+DlgAboutInfo		: "વધારે માહિતી માટે:",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/he.js b/modules/editor/skins/fckeditor/editor/lang/he.js
new file mode 100644
index 000000000..63cf97665
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/he.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Hebrew language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "rtl",
+
+ToolbarCollapse		: "כיווץ סרגל הכלים",
+ToolbarExpand		: "פתיחת סרגל הכלים",
+
+// Toolbar Items and Context Menu
+Save				: "שמירה",
+NewPage				: "דף חדש",
+Preview				: "תצוגה מקדימה",
+Cut					: "גזירה",
+Copy				: "העתקה",
+Paste				: "הדבקה",
+PasteText			: "הדבקה כטקסט פשוט",
+PasteWord			: "הדבקה מ-וורד",
+Print				: "הדפסה",
+SelectAll			: "בחירת הכל",
+RemoveFormat		: "הסרת העיצוב",
+InsertLinkLbl		: "קישור",
+InsertLink			: "הוספת/עריכת קישור",
+RemoveLink			: "הסרת הקישור",
+VisitLink			: "פתח קישור",
+Anchor				: "הוספת/עריכת נקודת עיגון",
+AnchorDelete		: "הסר נקודת עיגון",
+InsertImageLbl		: "תמונה",
+InsertImage			: "הוספת/עריכת תמונה",
+InsertFlashLbl		: "פלאש",
+InsertFlash			: "הוסף/ערוך פלאש",
+InsertTableLbl		: "טבלה",
+InsertTable			: "הוספת/עריכת טבלה",
+InsertLineLbl		: "קו",
+InsertLine			: "הוספת קו אופקי",
+InsertSpecialCharLbl: "תו מיוחד",
+InsertSpecialChar	: "הוספת תו מיוחד",
+InsertSmileyLbl		: "סמיילי",
+InsertSmiley		: "הוספת סמיילי",
+About				: "אודות FCKeditor",
+Bold				: "מודגש",
+Italic				: "נטוי",
+Underline			: "קו תחתון",
+StrikeThrough		: "כתיב מחוק",
+Subscript			: "כתיב תחתון",
+Superscript			: "כתיב עליון",
+LeftJustify			: "יישור לשמאל",
+CenterJustify		: "מרכוז",
+RightJustify		: "יישור לימין",
+BlockJustify		: "יישור לשוליים",
+DecreaseIndent		: "הקטנת אינדנטציה",
+IncreaseIndent		: "הגדלת אינדנטציה",
+Blockquote			: "בלוק ציטוט",
+CreateDiv			: "צור מיכל(תג)DIV",
+EditDiv				: "ערוך מיכל (תג)DIV",
+DeleteDiv			: "הסר מיכל(תג) DIV",
+Undo				: "ביטול צעד אחרון",
+Redo				: "חזרה על צעד אחרון",
+NumberedListLbl		: "רשימה ממוספרת",
+NumberedList		: "הוספת/הסרת רשימה ממוספרת",
+BulletedListLbl		: "רשימת נקודות",
+BulletedList		: "הוספת/הסרת רשימת נקודות",
+ShowTableBorders	: "הצגת מסגרת הטבלה",
+ShowDetails			: "הצגת פרטים",
+Style				: "סגנון",
+FontFormat			: "עיצוב",
+Font				: "גופן",
+FontSize			: "גודל",
+TextColor			: "צבע טקסט",
+BGColor				: "צבע רקע",
+Source				: "מקור",
+Find				: "חיפוש",
+Replace				: "החלפה",
+SpellCheck			: "בדיקת איות",
+UniversalKeyboard	: "מקלדת אוניברסלית",
+PageBreakLbl		: "שבירת דף",
+PageBreak			: "הוסף שבירת דף",
+
+Form			: "טופס",
+Checkbox		: "תיבת סימון",
+RadioButton		: "לחצן אפשרויות",
+TextField		: "שדה טקסט",
+Textarea		: "איזור טקסט",
+HiddenField		: "שדה חבוי",
+Button			: "כפתור",
+SelectionField	: "שדה בחירה",
+ImageButton		: "כפתור תמונה",
+
+FitWindow		: "הגדל את גודל העורך",
+ShowBlocks		: "הצג בלוקים",
+
+// Context Menu
+EditLink			: "עריכת קישור",
+CellCM				: "תא",
+RowCM				: "שורה",
+ColumnCM			: "עמודה",
+InsertRowAfter		: "הוסף שורה אחרי",
+InsertRowBefore		: "הוסף שורה לפני",
+DeleteRows			: "מחיקת שורות",
+InsertColumnAfter	: "הוסף עמודה אחרי",
+InsertColumnBefore	: "הוסף עמודה לפני",
+DeleteColumns		: "מחיקת עמודות",
+InsertCellAfter		: "הוסף תא אחרי",
+InsertCellBefore	: "הוסף תא אחרי",
+DeleteCells			: "מחיקת תאים",
+MergeCells			: "מיזוג תאים",
+MergeRight			: "מזג ימינה",
+MergeDown			: "מזג למטה",
+HorizontalSplitCell	: "פצל תא אופקית",
+VerticalSplitCell	: "פצל תא אנכית",
+TableDelete			: "מחק טבלה",
+CellProperties		: "תכונות התא",
+TableProperties		: "תכונות הטבלה",
+ImageProperties		: "תכונות התמונה",
+FlashProperties		: "מאפייני פלאש",
+
+AnchorProp			: "מאפייני נקודת עיגון",
+ButtonProp			: "מאפייני כפתור",
+CheckboxProp		: "מאפייני תיבת סימון",
+HiddenFieldProp		: "מאפיני שדה חבוי",
+RadioButtonProp		: "מאפייני לחצן אפשרויות",
+ImageButtonProp		: "מאפיני כפתור תמונה",
+TextFieldProp		: "מאפייני שדה טקסט",
+SelectionFieldProp	: "מאפייני שדה בחירה",
+TextareaProp		: "מאפיני איזור טקסט",
+FormProp			: "מאפיני טופס",
+
+FontFormats			: "נורמלי;קוד;כתובת;כותרת;כותרת 2;כותרת 3;כותרת 4;כותרת 5;כותרת 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "מעבד XHTML, נא להמתין...",
+Done				: "המשימה הושלמה",
+PasteWordConfirm	: "נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?",
+NotCompatiblePaste	: "פעולה זו זמינה לדפדפן אינטרנט אקספלורר מגירסא 5.5 ומעלה. האם להמשיך בהדבקה ללא הניקוי?",
+UnknownToolbarItem	: "פריט לא ידוע בסרגל הכלים \"%1\"",
+UnknownCommand		: "שם פעולה לא ידוע \"%1\"",
+NotImplemented		: "הפקודה לא מיושמת",
+UnknownToolbarSet	: "ערכת סרגל הכלים \"%1\" לא קיימת",
+NoActiveX			: "הגדרות אבטחה של הדפדפן עלולות לגביל את אפשרויות העריכה.יש לאפשר את האופציה \"הרץ פקדים פעילים ותוספות\". תוכל לחוות טעויות וחיווים של אפשרויות שחסרים.",
+BrowseServerBlocked : "לא ניתן לגשת לדפדפן משאבים.אנא וודא שחוסם חלונות הקופצים לא פעיל.",
+DialogBlocked		: "לא היה ניתן לפתוח חלון דיאלוג. אנא וודא שחוסם חלונות קופצים לא פעיל.",
+VisitLinkBlocked	: "לא ניתן לפתוח חלון חדש.נא לוודא שחוסמי החלונות הקופצים לא פעילים.",
+
+// Dialogs
+DlgBtnOK			: "אישור",
+DlgBtnCancel		: "ביטול",
+DlgBtnClose			: "סגירה",
+DlgBtnBrowseServer	: "סייר השרת",
+DlgAdvancedTag		: "אפשרויות מתקדמות",
+DlgOpOther			: "<אחר>",
+DlgInfoTab			: "מידע",
+DlgAlertUrl			: "אנא הזן URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<לא נקבע>",
+DlgGenId			: "זיהוי (Id)",
+DlgGenLangDir		: "כיוון שפה",
+DlgGenLangDirLtr	: "שמאל לימין (LTR)",
+DlgGenLangDirRtl	: "ימין לשמאל (RTL)",
+DlgGenLangCode		: "קוד שפה",
+DlgGenAccessKey		: "מקש גישה",
+DlgGenName			: "שם",
+DlgGenTabIndex		: "מספר טאב",
+DlgGenLongDescr		: "קישור לתיאור מפורט",
+DlgGenClass			: "גיליונות עיצוב קבוצות",
+DlgGenTitle			: "כותרת מוצעת",
+DlgGenContType		: "Content Type מוצע",
+DlgGenLinkCharset	: "קידוד המשאב המקושר",
+DlgGenStyle			: "סגנון",
+
+// Image Dialog
+DlgImgTitle			: "תכונות התמונה",
+DlgImgInfoTab		: "מידע על התמונה",
+DlgImgBtnUpload		: "שליחה לשרת",
+DlgImgURL			: "כתובת (URL)",
+DlgImgUpload		: "העלאה",
+DlgImgAlt			: "טקסט חלופי",
+DlgImgWidth			: "רוחב",
+DlgImgHeight		: "גובה",
+DlgImgLockRatio		: "נעילת היחס",
+DlgBtnResetSize		: "איפוס הגודל",
+DlgImgBorder		: "מסגרת",
+DlgImgHSpace		: "מרווח אופקי",
+DlgImgVSpace		: "מרווח אנכי",
+DlgImgAlign			: "יישור",
+DlgImgAlignLeft		: "לשמאל",
+DlgImgAlignAbsBottom: "לתחתית האבסולוטית",
+DlgImgAlignAbsMiddle: "מרכוז אבסולוטי",
+DlgImgAlignBaseline	: "לקו התחתית",
+DlgImgAlignBottom	: "לתחתית",
+DlgImgAlignMiddle	: "לאמצע",
+DlgImgAlignRight	: "לימין",
+DlgImgAlignTextTop	: "לראש הטקסט",
+DlgImgAlignTop		: "למעלה",
+DlgImgPreview		: "תצוגה מקדימה",
+DlgImgAlertUrl		: "נא להקליד את כתובת התמונה",
+DlgImgLinkTab		: "קישור",
+
+// Flash Dialog
+DlgFlashTitle		: "מאפיני פלאש",
+DlgFlashChkPlay		: "נגן אוטומטי",
+DlgFlashChkLoop		: "לולאה",
+DlgFlashChkMenu		: "אפשר תפריט פלאש",
+DlgFlashScale		: "גודל",
+DlgFlashScaleAll	: "הצג הכל",
+DlgFlashScaleNoBorder	: "ללא גבולות",
+DlgFlashScaleFit	: "התאמה מושלמת",
+
+// Link Dialog
+DlgLnkWindowTitle	: "קישור",
+DlgLnkInfoTab		: "מידע על הקישור",
+DlgLnkTargetTab		: "מטרה",
+
+DlgLnkType			: "סוג קישור",
+DlgLnkTypeURL		: "כתובת (URL)",
+DlgLnkTypeAnchor	: "עוגן בעמוד זה",
+DlgLnkTypeEMail		: "דוא''ל",
+DlgLnkProto			: "פרוטוקול",
+DlgLnkProtoOther	: "<אחר>",
+DlgLnkURL			: "כתובת (URL)",
+DlgLnkAnchorSel		: "בחירת עוגן",
+DlgLnkAnchorByName	: "עפ''י שם העוגן",
+DlgLnkAnchorById	: "עפ''י זיהוי (Id) הרכיב",
+DlgLnkNoAnchors		: "(אין עוגנים זמינים בדף)",
+DlgLnkEMail			: "כתובת הדוא''ל",
+DlgLnkEMailSubject	: "נושא ההודעה",
+DlgLnkEMailBody		: "גוף ההודעה",
+DlgLnkUpload		: "העלאה",
+DlgLnkBtnUpload		: "שליחה לשרת",
+
+DlgLnkTarget		: "מטרה",
+DlgLnkTargetFrame	: "<מסגרת>",
+DlgLnkTargetPopup	: "<חלון קופץ>",
+DlgLnkTargetBlank	: "חלון חדש (_blank)",
+DlgLnkTargetParent	: "חלון האב (_parent)",
+DlgLnkTargetSelf	: "באותו החלון (_self)",
+DlgLnkTargetTop		: "חלון ראשי (_top)",
+DlgLnkTargetFrameName	: "שם מסגרת היעד",
+DlgLnkPopWinName	: "שם החלון הקופץ",
+DlgLnkPopWinFeat	: "תכונות החלון הקופץ",
+DlgLnkPopResize		: "בעל גודל ניתן לשינוי",
+DlgLnkPopLocation	: "סרגל כתובת",
+DlgLnkPopMenu		: "סרגל תפריט",
+DlgLnkPopScroll		: "ניתן לגלילה",
+DlgLnkPopStatus		: "סרגל חיווי",
+DlgLnkPopToolbar	: "סרגל הכלים",
+DlgLnkPopFullScrn	: "מסך מלא (IE)",
+DlgLnkPopDependent	: "תלוי (Netscape)",
+DlgLnkPopWidth		: "רוחב",
+DlgLnkPopHeight		: "גובה",
+DlgLnkPopLeft		: "מיקום צד שמאל",
+DlgLnkPopTop		: "מיקום צד עליון",
+
+DlnLnkMsgNoUrl		: "נא להקליד את כתובת הקישור (URL)",
+DlnLnkMsgNoEMail	: "נא להקליד את כתובת הדוא''ל",
+DlnLnkMsgNoAnchor	: "נא לבחור עוגן במסמך",
+DlnLnkMsgInvPopName	: "שם החלון הקופץ חייב להתחיל באותיות ואסור לכלול רווחים",
+
+// Color Dialog
+DlgColorTitle		: "בחירת צבע",
+DlgColorBtnClear	: "איפוס",
+DlgColorHighlight	: "נוכחי",
+DlgColorSelected	: "נבחר",
+
+// Smiley Dialog
+DlgSmileyTitle		: "הוספת סמיילי",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "בחירת תו מיוחד",
+
+// Table Dialog
+DlgTableTitle		: "תכונות טבלה",
+DlgTableRows		: "שורות",
+DlgTableColumns		: "עמודות",
+DlgTableBorder		: "גודל מסגרת",
+DlgTableAlign		: "יישור",
+DlgTableAlignNotSet	: "<לא נקבע>",
+DlgTableAlignLeft	: "שמאל",
+DlgTableAlignCenter	: "מרכז",
+DlgTableAlignRight	: "ימין",
+DlgTableWidth		: "רוחב",
+DlgTableWidthPx		: "פיקסלים",
+DlgTableWidthPc		: "אחוז",
+DlgTableHeight		: "גובה",
+DlgTableCellSpace	: "מרווח תא",
+DlgTableCellPad		: "ריפוד תא",
+DlgTableCaption		: "כיתוב",
+DlgTableSummary		: "סיכום",
+
+// Table Cell Dialog
+DlgCellTitle		: "תכונות תא",
+DlgCellWidth		: "רוחב",
+DlgCellWidthPx		: "פיקסלים",
+DlgCellWidthPc		: "אחוז",
+DlgCellHeight		: "גובה",
+DlgCellWordWrap		: "גלילת שורות",
+DlgCellWordWrapNotSet	: "<לא נקבע>",
+DlgCellWordWrapYes	: "כן",
+DlgCellWordWrapNo	: "לא",
+DlgCellHorAlign		: "יישור אופקי",
+DlgCellHorAlignNotSet	: "<לא נקבע>",
+DlgCellHorAlignLeft	: "שמאל",
+DlgCellHorAlignCenter	: "מרכז",
+DlgCellHorAlignRight: "ימין",
+DlgCellVerAlign		: "יישור אנכי",
+DlgCellVerAlignNotSet	: "<לא נקבע>",
+DlgCellVerAlignTop	: "למעלה",
+DlgCellVerAlignMiddle	: "לאמצע",
+DlgCellVerAlignBottom	: "לתחתית",
+DlgCellVerAlignBaseline	: "קו תחתית",
+DlgCellRowSpan		: "טווח שורות",
+DlgCellCollSpan		: "טווח עמודות",
+DlgCellBackColor	: "צבע רקע",
+DlgCellBorderColor	: "צבע מסגרת",
+DlgCellBtnSelect	: "בחירה...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "חפש והחלף",
+
+// Find Dialog
+DlgFindTitle		: "חיפוש",
+DlgFindFindBtn		: "חיפוש",
+DlgFindNotFoundMsg	: "הטקסט המבוקש לא נמצא.",
+
+// Replace Dialog
+DlgReplaceTitle			: "החלפה",
+DlgReplaceFindLbl		: "חיפוש מחרוזת:",
+DlgReplaceReplaceLbl	: "החלפה במחרוזת:",
+DlgReplaceCaseChk		: "התאמת סוג אותיות (Case)",
+DlgReplaceReplaceBtn	: "החלפה",
+DlgReplaceReplAllBtn	: "החלפה בכל העמוד",
+DlgReplaceWordChk		: "התאמה למילה המלאה",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה  אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl+X).",
+PasteErrorCopy	: "הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl+C).",
+
+PasteAsText		: "הדבקה כטקסט פשוט",
+PasteFromWord	: "הדבקה מ-וורד",
+
+DlgPasteMsg2	: "אנא הדבק בתוך הקופסה באמצעות  (<STRONG>Ctrl+V</STRONG>) ולחץ על  <STRONG>אישור</STRONG>.",
+DlgPasteSec		: "עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (clipboard) בצורה ישירה.אנא בצע הדבק שוב בחלון זה.",
+DlgPasteIgnoreFont		: "התעלם מהגדרות סוג פונט",
+DlgPasteRemoveStyles	: "הסר הגדרות סגנון",
+
+// Color Picker
+ColorAutomatic	: "אוטומטי",
+ColorMoreColors	: "צבעים נוספים...",
+
+// Document Properties
+DocProps		: "מאפיני מסמך",
+
+// Anchor Dialog
+DlgAnchorTitle		: "מאפיני נקודת עיגון",
+DlgAnchorName		: "שם לנקודת עיגון",
+DlgAnchorErrorName	: "אנא הזן שם לנקודת עיגון",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "לא נמצא במילון",
+DlgSpellChangeTo		: "שנה ל",
+DlgSpellBtnIgnore		: "התעלם",
+DlgSpellBtnIgnoreAll	: "התעלם מהכל",
+DlgSpellBtnReplace		: "החלף",
+DlgSpellBtnReplaceAll	: "החלף הכל",
+DlgSpellBtnUndo			: "החזר",
+DlgSpellNoSuggestions	: "- אין הצעות -",
+DlgSpellProgress		: "בדיקות איות בתהליך ....",
+DlgSpellNoMispell		: "בדיקות איות הסתיימה: לא נמצאו שגיעות כתיב",
+DlgSpellNoChanges		: "בדיקות איות הסתיימה: לא שונתה אף מילה",
+DlgSpellOneChange		: "בדיקות איות הסתיימה: שונתה מילה אחת",
+DlgSpellManyChanges		: "בדיקות איות הסתיימה: %1 מילים שונו",
+
+IeSpellDownload			: "בודק האיות לא מותקן, האם אתה מעוניין להוריד?",
+
+// Button Dialog
+DlgButtonText		: "טקסט (ערך)",
+DlgButtonType		: "סוג",
+DlgButtonTypeBtn	: "כפתור",
+DlgButtonTypeSbm	: "שלח",
+DlgButtonTypeRst	: "אפס",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "שם",
+DlgCheckboxValue	: "ערך",
+DlgCheckboxSelected	: "בחור",
+
+// Form Dialog
+DlgFormName		: "שם",
+DlgFormAction	: "שלח אל",
+DlgFormMethod	: "סוג שליחה",
+
+// Select Field Dialog
+DlgSelectName		: "שם",
+DlgSelectValue		: "ערך",
+DlgSelectSize		: "גודל",
+DlgSelectLines		: "שורות",
+DlgSelectChkMulti	: "אפשר בחירות מרובות",
+DlgSelectOpAvail	: "אפשרויות זמינות",
+DlgSelectOpText		: "טקסט",
+DlgSelectOpValue	: "ערך",
+DlgSelectBtnAdd		: "הוסף",
+DlgSelectBtnModify	: "שנה",
+DlgSelectBtnUp		: "למעלה",
+DlgSelectBtnDown	: "למטה",
+DlgSelectBtnSetValue : "קבע כברירת מחדל",
+DlgSelectBtnDelete	: "מחק",
+
+// Textarea Dialog
+DlgTextareaName	: "שם",
+DlgTextareaCols	: "עמודות",
+DlgTextareaRows	: "שורות",
+
+// Text Field Dialog
+DlgTextName			: "שם",
+DlgTextValue		: "ערך",
+DlgTextCharWidth	: "רוחב באותיות",
+DlgTextMaxChars		: "מקסימות אותיות",
+DlgTextType			: "סוג",
+DlgTextTypeText		: "טקסט",
+DlgTextTypePass		: "סיסמה",
+
+// Hidden Field Dialog
+DlgHiddenName	: "שם",
+DlgHiddenValue	: "ערך",
+
+// Bulleted List Dialog
+BulletedListProp	: "מאפייני רשימה",
+NumberedListProp	: "מאפייני רשימה ממוספרת",
+DlgLstStart			: "התחלה",
+DlgLstType			: "סוג",
+DlgLstTypeCircle	: "עיגול",
+DlgLstTypeDisc		: "דיסק",
+DlgLstTypeSquare	: "מרובע",
+DlgLstTypeNumbers	: "מספרים (1, 2, 3)",
+DlgLstTypeLCase		: "אותיות קטנות (a, b, c)",
+DlgLstTypeUCase		: "אותיות גדולות (A, B, C)",
+DlgLstTypeSRoman	: "ספרות רומאיות קטנות (i, ii, iii)",
+DlgLstTypeLRoman	: "ספרות רומאיות גדולות (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "כללי",
+DlgDocBackTab		: "רקע",
+DlgDocColorsTab		: "צבעים וגבולות",
+DlgDocMetaTab		: "נתוני META",
+
+DlgDocPageTitle		: "כותרת דף",
+DlgDocLangDir		: "כיוון שפה",
+DlgDocLangDirLTR	: "שמאל לימין (LTR)",
+DlgDocLangDirRTL	: "ימין לשמאל (RTL)",
+DlgDocLangCode		: "קוד שפה",
+DlgDocCharSet		: "קידוד אותיות",
+DlgDocCharSetCE		: "מרכז אירופה",
+DlgDocCharSetCT		: "סיני מסורתי (Big5)",
+DlgDocCharSetCR		: "קירילי",
+DlgDocCharSetGR		: "יוונית",
+DlgDocCharSetJP		: "יפנית",
+DlgDocCharSetKR		: "קוראנית",
+DlgDocCharSetTR		: "טורקית",
+DlgDocCharSetUN		: "יוני קוד (UTF-8)",
+DlgDocCharSetWE		: "מערב אירופה",
+DlgDocCharSetOther	: "קידוד אותיות אחר",
+
+DlgDocDocType		: "הגדרות סוג מסמך",
+DlgDocDocTypeOther	: "הגדרות סוג מסמך אחרות",
+DlgDocIncXHTML		: "כלול הגדרות XHTML",
+DlgDocBgColor		: "צבע רקע",
+DlgDocBgImage		: "URL לתמונת רקע",
+DlgDocBgNoScroll	: "רגע ללא גלילה",
+DlgDocCText			: "טקסט",
+DlgDocCLink			: "קישור",
+DlgDocCVisited		: "קישור שבוקר",
+DlgDocCActive		: " קישור פעיל",
+DlgDocMargins		: "גבולות דף",
+DlgDocMaTop			: "למעלה",
+DlgDocMaLeft		: "שמאלה",
+DlgDocMaRight		: "ימינה",
+DlgDocMaBottom		: "למטה",
+DlgDocMeIndex		: "מפתח עניינים של המסמך )מופרד בפסיק(",
+DlgDocMeDescr		: "תאור מסמך",
+DlgDocMeAuthor		: "מחבר",
+DlgDocMeCopy		: "זכויות יוצרים",
+DlgDocPreview		: "תצוגה מקדימה",
+
+// Templates Dialog
+Templates			: "תבניות",
+DlgTemplatesTitle	: "תביות תוכן",
+DlgTemplatesSelMsg	: "אנא בחר תבנית לפתיחה בעורך <BR>התוכן המקורי ימחק:",
+DlgTemplatesLoading	: "מעלה רשימת תבניות אנא המתן",
+DlgTemplatesNoTpl	: "(לא הוגדרו תבניות)",
+DlgTemplatesReplace	: "החלפת תוכן ממשי",
+
+// About Dialog
+DlgAboutAboutTab	: "אודות",
+DlgAboutBrowserInfoTab	: "גירסת דפדפן",
+DlgAboutLicenseTab	: "רשיון",
+DlgAboutVersion		: "גירסא",
+DlgAboutInfo		: "מידע נוסף ניתן למצוא כאן:",
+
+// Div Dialog
+DlgDivGeneralTab	: "כללי",
+DlgDivAdvancedTab	: "מתקדם",
+DlgDivStyle		: "סגנון",
+DlgDivInlineStyle	: "סגנון בתוך השורה"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/hi.js b/modules/editor/skins/fckeditor/editor/lang/hi.js
new file mode 100644
index 000000000..52dacde20
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/hi.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Hindi language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "टूलबार सिमटायें",
+ToolbarExpand		: "टूलबार का विस्तार करें",
+
+// Toolbar Items and Context Menu
+Save				: "सेव",
+NewPage				: "नया पेज",
+Preview				: "प्रीव्यू",
+Cut					: "कट",
+Copy				: "कॉपी",
+Paste				: "पेस्ट",
+PasteText			: "पेस्ट (सादा टॅक्स्ट)",
+PasteWord			: "पेस्ट (वर्ड से)",
+Print				: "प्रिन्ट",
+SelectAll			: "सब सॅलॅक्ट करें",
+RemoveFormat		: "फ़ॉर्मैट हटायें",
+InsertLinkLbl		: "लिंक",
+InsertLink			: "लिंक इन्सर्ट/संपादन",
+RemoveLink			: "लिंक हटायें",
+VisitLink			: "लिंक खोलें",
+Anchor				: "ऐंकर इन्सर्ट/संपादन",
+AnchorDelete		: "ऐंकर हटायें",
+InsertImageLbl		: "तस्वीर",
+InsertImage			: "तस्वीर इन्सर्ट/संपादन",
+InsertFlashLbl		: "फ़्लैश",
+InsertFlash			: "फ़्लैश इन्सर्ट/संपादन",
+InsertTableLbl		: "टेबल",
+InsertTable			: "टेबल इन्सर्ट/संपादन",
+InsertLineLbl		: "रेखा",
+InsertLine			: "हॉरिज़ॉन्टल रेखा इन्सर्ट करें",
+InsertSpecialCharLbl: "विशेष करॅक्टर",
+InsertSpecialChar	: "विशेष करॅक्टर इन्सर्ट करें",
+InsertSmileyLbl		: "स्माइली",
+InsertSmiley		: "स्माइली इन्सर्ट करें",
+About				: "FCKeditor के बारे में",
+Bold				: "बोल्ड",
+Italic				: "इटैलिक",
+Underline			: "रेखांकण",
+StrikeThrough		: "स्ट्राइक थ्रू",
+Subscript			: "अधोलेख",
+Superscript			: "अभिलेख",
+LeftJustify			: "बायीं तरफ",
+CenterJustify		: "बीच में",
+RightJustify		: "दायीं तरफ",
+BlockJustify		: "ब्लॉक जस्टीफ़ाई",
+DecreaseIndent		: "इन्डॅन्ट कम करें",
+IncreaseIndent		: "इन्डॅन्ट बढ़ायें",
+Blockquote			: "ब्लॉक-कोट",
+CreateDiv			: "डिव (Div) कन्टेनर बनायें",
+EditDiv				: "डिव (Div) कन्टेनर बदलें",
+DeleteDiv			: "डिव कन्टेनर हटायें",
+Undo				: "अन्डू",
+Redo				: "रीडू",
+NumberedListLbl		: "अंकीय सूची",
+NumberedList		: "अंकीय सूची इन्सर्ट/संपादन",
+BulletedListLbl		: "बुलॅट सूची",
+BulletedList		: "बुलॅट सूची इन्सर्ट/संपादन",
+ShowTableBorders	: "टेबल बॉर्डरयें दिखायें",
+ShowDetails			: "ज्यादा   दिखायें",
+Style				: "स्टाइल",
+FontFormat			: "फ़ॉर्मैट",
+Font				: "फ़ॉन्ट",
+FontSize			: "साइज़",
+TextColor			: "टेक्स्ट रंग",
+BGColor				: "बैक्ग्राउन्ड रंग",
+Source				: "सोर्स",
+Find				: "खोजें",
+Replace				: "रीप्लेस",
+SpellCheck			: "वर्तनी (स्पेलिंग) जाँच",
+UniversalKeyboard	: "यूनीवर्सल कीबोर्ड",
+PageBreakLbl		: "पेज ब्रेक",
+PageBreak			: "पेज ब्रेक इन्सर्ट् करें",
+
+Form			: "फ़ॉर्म",
+Checkbox		: "चॅक बॉक्स",
+RadioButton		: "रेडिओ बटन",
+TextField		: "टेक्स्ट फ़ील्ड",
+Textarea		: "टेक्स्ट एरिया",
+HiddenField		: "गुप्त फ़ील्ड",
+Button			: "बटन",
+SelectionField	: "चुनाव फ़ील्ड",
+ImageButton		: "तस्वीर बटन",
+
+FitWindow		: "एडिटर साइज़ को चरम सीमा तक बढ़ायें",
+ShowBlocks		: "ब्लॉक दिखायें",
+
+// Context Menu
+EditLink			: "लिंक संपादन",
+CellCM				: "खाना",
+RowCM				: "पंक्ति",
+ColumnCM			: "कालम",
+InsertRowAfter		: "बाद में पंक्ति डालें",
+InsertRowBefore		: "पहले पंक्ति डालें",
+DeleteRows			: "पंक्तियाँ डिलीट करें",
+InsertColumnAfter	: "बाद में कालम डालें",
+InsertColumnBefore	: "पहले कालम डालें",
+DeleteColumns		: "कालम डिलीट करें",
+InsertCellAfter		: "बाद में सैल डालें",
+InsertCellBefore	: "पहले सैल डालें",
+DeleteCells			: "सैल डिलीट करें",
+MergeCells			: "सैल मिलायें",
+MergeRight			: "बाँया विलय",
+MergeDown			: "नीचे विलय करें",
+HorizontalSplitCell	: "सैल को क्षैतिज स्थिति में विभाजित करें",
+VerticalSplitCell	: "सैल को लम्बाकार में विभाजित करें",
+TableDelete			: "टेबल डिलीट करें",
+CellProperties		: "सैल प्रॉपर्टीज़",
+TableProperties		: "टेबल प्रॉपर्टीज़",
+ImageProperties		: "तस्वीर प्रॉपर्टीज़",
+FlashProperties		: "फ़्लैश प्रॉपर्टीज़",
+
+AnchorProp			: "ऐंकर प्रॉपर्टीज़",
+ButtonProp			: "बटन प्रॉपर्टीज़",
+CheckboxProp		: "चॅक बॉक्स प्रॉपर्टीज़",
+HiddenFieldProp		: "गुप्त फ़ील्ड प्रॉपर्टीज़",
+RadioButtonProp		: "रेडिओ बटन प्रॉपर्टीज़",
+ImageButtonProp		: "तस्वीर बटन प्रॉपर्टीज़",
+TextFieldProp		: "टेक्स्ट फ़ील्ड प्रॉपर्टीज़",
+SelectionFieldProp	: "चुनाव फ़ील्ड प्रॉपर्टीज़",
+TextareaProp		: "टेक्स्त एरिया प्रॉपर्टीज़",
+FormProp			: "फ़ॉर्म प्रॉपर्टीज़",
+
+FontFormats			: "साधारण;फ़ॉर्मैटॅड;पता;शीर्षक 1;शीर्षक 2;शीर्षक 3;शीर्षक 4;शीर्षक 5;शीर्षक 6;शीर्षक (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML प्रोसॅस हो रहा है। ज़रा ठहरें...",
+Done				: "पूरा हुआ",
+PasteWordConfirm	: "आप जो टेक्स्ट पेस्ट करना चाहते हैं, वह वर्ड से कॉपी किया हुआ लग रहा है। क्या पेस्ट करने से पहले आप इसे साफ़ करना चाहेंगे?",
+NotCompatiblePaste	: "यह कमांड इन्टरनॅट एक्स्प्लोरर(Internet Explorer) 5.5 या उसके बाद के वर्ज़न के लिए ही उपलब्ध है। क्या आप बिना साफ़ किए पेस्ट करना चाहेंगे?",
+UnknownToolbarItem	: "अनजान टूलबार आइटम \"%1\"",
+UnknownCommand		: "अनजान कमान्ड \"%1\"",
+NotImplemented		: "कमान्ड इम्प्लीमॅन्ट नहीं किया गया है",
+UnknownToolbarSet	: "टूलबार सॅट \"%1\" उपलब्ध नहीं है",
+NoActiveX			: "आपके ब्राउज़र् की सुरक्शा सेटिंग्स् एडिटर की कुछ् फ़ीचरों को सीमित कर् सकती हैं। क्रिपया \"Run ActiveX controls and plug-ins\" विकल्प को एनेबल करें. आपको एरर्स् और गायब फ़ीचर्स् का अनुभव हो सकता है।",
+BrowseServerBlocked : "रिसोर्सेज़ ब्राउज़र् नहीं खोला जा सका। क्रिपया सभी पॉप्-अप् ब्लॉकर्स् को निष्क्रिय करें।",
+DialogBlocked		: "डायलग विन्डो नहीं खोला जा सका। क्रिपया सभी पॉप्-अप् ब्लॉकर्स् को निष्क्रिय करें।",
+VisitLinkBlocked	: "नया विन्डो नहीं खोला जा सका। क्रिपया सभी पॉप्-अप् ब्लॉकर्स् को निष्क्रिय करें।",
+
+// Dialogs
+DlgBtnOK			: "ठीक है",
+DlgBtnCancel		: "रद्द करें",
+DlgBtnClose			: "बन्द करें",
+DlgBtnBrowseServer	: "सर्वर ब्राउज़ करें",
+DlgAdvancedTag		: "ऍड्वान्स्ड",
+DlgOpOther			: "<अन्य>",
+DlgInfoTab			: "सूचना",
+DlgAlertUrl			: "URL इन्सर्ट करें",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<सॅट नहीं>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "भाषा लिखने की दिशा",
+DlgGenLangDirLtr	: "बायें से दायें (LTR)",
+DlgGenLangDirRtl	: "दायें से बायें (RTL)",
+DlgGenLangCode		: "भाषा कोड",
+DlgGenAccessKey		: "ऍक्सॅस की",
+DlgGenName			: "नाम",
+DlgGenTabIndex		: "टैब इन्डॅक्स",
+DlgGenLongDescr		: "अधिक विवरण के लिए URL",
+DlgGenClass			: "स्टाइल-शीट क्लास",
+DlgGenTitle			: "परामर्श शीर्शक",
+DlgGenContType		: "परामर्श कन्टॅन्ट प्रकार",
+DlgGenLinkCharset	: "लिंक रिसोर्स करॅक्टर सॅट",
+DlgGenStyle			: "स्टाइल",
+
+// Image Dialog
+DlgImgTitle			: "तस्वीर प्रॉपर्टीज़",
+DlgImgInfoTab		: "तस्वीर की जानकारी",
+DlgImgBtnUpload		: "इसे सर्वर को भेजें",
+DlgImgURL			: "URL",
+DlgImgUpload		: "अपलोड",
+DlgImgAlt			: "वैकल्पिक टेक्स्ट",
+DlgImgWidth			: "चौड़ाई",
+DlgImgHeight		: "ऊँचाई",
+DlgImgLockRatio		: "लॉक अनुपात",
+DlgBtnResetSize		: "रीसॅट साइज़",
+DlgImgBorder		: "बॉर्डर",
+DlgImgHSpace		: "हॉरिज़ॉन्टल स्पेस",
+DlgImgVSpace		: "वर्टिकल स्पेस",
+DlgImgAlign			: "ऍलाइन",
+DlgImgAlignLeft		: "दायें",
+DlgImgAlignAbsBottom: "Abs नीचे",
+DlgImgAlignAbsMiddle: "Abs ऊपर",
+DlgImgAlignBaseline	: "मूल रेखा",
+DlgImgAlignBottom	: "नीचे",
+DlgImgAlignMiddle	: "मध्य",
+DlgImgAlignRight	: "दायें",
+DlgImgAlignTextTop	: "टेक्स्ट ऊपर",
+DlgImgAlignTop		: "ऊपर",
+DlgImgPreview		: "प्रीव्यू",
+DlgImgAlertUrl		: "तस्वीर का URL टाइप करें ",
+DlgImgLinkTab		: "लिंक",
+
+// Flash Dialog
+DlgFlashTitle		: "फ़्लैश प्रॉपर्टीज़",
+DlgFlashChkPlay		: "ऑटो प्ले",
+DlgFlashChkLoop		: "लूप",
+DlgFlashChkMenu		: "फ़्लैश मॅन्यू का प्रयोग करें",
+DlgFlashScale		: "स्केल",
+DlgFlashScaleAll	: "सभी दिखायें",
+DlgFlashScaleNoBorder	: "कोई बॉर्डर नहीं",
+DlgFlashScaleFit	: "बिल्कुल फ़िट",
+
+// Link Dialog
+DlgLnkWindowTitle	: "लिंक",
+DlgLnkInfoTab		: "लिंक  ",
+DlgLnkTargetTab		: "टार्गेट",
+
+DlgLnkType			: "लिंक प्रकार",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "इस पेज का ऐंकर",
+DlgLnkTypeEMail		: "ई-मेल",
+DlgLnkProto			: "प्रोटोकॉल",
+DlgLnkProtoOther	: "<अन्य>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "ऐंकर चुनें",
+DlgLnkAnchorByName	: "ऐंकर नाम से",
+DlgLnkAnchorById	: "ऍलीमॅन्ट Id से",
+DlgLnkNoAnchors		: "(डॉक्यूमॅन्ट में ऐंकर्स की संख्या)",
+DlgLnkEMail			: "ई-मेल पता",
+DlgLnkEMailSubject	: "संदेश विषय",
+DlgLnkEMailBody		: "संदेश",
+DlgLnkUpload		: "अपलोड",
+DlgLnkBtnUpload		: "इसे सर्वर को भेजें",
+
+DlgLnkTarget		: "टार्गेट",
+DlgLnkTargetFrame	: "<फ़्रेम>",
+DlgLnkTargetPopup	: "<पॉप-अप विन्डो>",
+DlgLnkTargetBlank	: "नया विन्डो (_blank)",
+DlgLnkTargetParent	: "मूल विन्डो (_parent)",
+DlgLnkTargetSelf	: "इसी विन्डो (_self)",
+DlgLnkTargetTop		: "शीर्ष विन्डो (_top)",
+DlgLnkTargetFrameName	: "टार्गेट फ़्रेम का नाम",
+DlgLnkPopWinName	: "पॉप-अप विन्डो का नाम",
+DlgLnkPopWinFeat	: "पॉप-अप विन्डो फ़ीचर्स",
+DlgLnkPopResize		: "साइज़ बदला जा सकता है",
+DlgLnkPopLocation	: "लोकेशन बार",
+DlgLnkPopMenu		: "मॅन्यू बार",
+DlgLnkPopScroll		: "स्क्रॉल बार",
+DlgLnkPopStatus		: "स्टेटस बार",
+DlgLnkPopToolbar	: "टूल बार",
+DlgLnkPopFullScrn	: "फ़ुल स्क्रीन (IE)",
+DlgLnkPopDependent	: "डिपेन्डॅन्ट (Netscape)",
+DlgLnkPopWidth		: "चौड़ाई",
+DlgLnkPopHeight		: "ऊँचाई",
+DlgLnkPopLeft		: "बायीं तरफ",
+DlgLnkPopTop		: "दायीं तरफ",
+
+DlnLnkMsgNoUrl		: "लिंक URL टाइप करें",
+DlnLnkMsgNoEMail	: "ई-मेल पता टाइप करें",
+DlnLnkMsgNoAnchor	: "ऐंकर चुनें",
+DlnLnkMsgInvPopName	: "पॉप-अप का नाम अल्फाबेट से शुरू होना चाहिये और उसमें स्पेस नहीं होने चाहिए",
+
+// Color Dialog
+DlgColorTitle		: "रंग चुनें",
+DlgColorBtnClear	: "साफ़ करें",
+DlgColorHighlight	: "हाइलाइट",
+DlgColorSelected	: "सॅलॅक्टॅड",
+
+// Smiley Dialog
+DlgSmileyTitle		: "स्माइली इन्सर्ट करें",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "विशेष करॅक्टर चुनें",
+
+// Table Dialog
+DlgTableTitle		: "टेबल प्रॉपर्टीज़",
+DlgTableRows		: "पंक्तियाँ",
+DlgTableColumns		: "कालम",
+DlgTableBorder		: "बॉर्डर साइज़",
+DlgTableAlign		: "ऍलाइन्मॅन्ट",
+DlgTableAlignNotSet	: "<सॅट नहीं>",
+DlgTableAlignLeft	: "दायें",
+DlgTableAlignCenter	: "बीच में",
+DlgTableAlignRight	: "बायें",
+DlgTableWidth		: "चौड़ाई",
+DlgTableWidthPx		: "पिक्सैल",
+DlgTableWidthPc		: "प्रतिशत",
+DlgTableHeight		: "ऊँचाई",
+DlgTableCellSpace	: "सैल अंतर",
+DlgTableCellPad		: "सैल पैडिंग",
+DlgTableCaption		: "शीर्षक",
+DlgTableSummary		: "सारांश",
+
+// Table Cell Dialog
+DlgCellTitle		: "सैल प्रॉपर्टीज़",
+DlgCellWidth		: "चौड़ाई",
+DlgCellWidthPx		: "पिक्सैल",
+DlgCellWidthPc		: "प्रतिशत",
+DlgCellHeight		: "ऊँचाई",
+DlgCellWordWrap		: "वर्ड रैप",
+DlgCellWordWrapNotSet	: "<सॅट नहीं>",
+DlgCellWordWrapYes	: "हाँ",
+DlgCellWordWrapNo	: "नहीं",
+DlgCellHorAlign		: "हॉरिज़ॉन्टल ऍलाइन्मॅन्ट",
+DlgCellHorAlignNotSet	: "<सॅट नहीं>",
+DlgCellHorAlignLeft	: "दायें",
+DlgCellHorAlignCenter	: "बीच में",
+DlgCellHorAlignRight: "बायें",
+DlgCellVerAlign		: "वर्टिकल ऍलाइन्मॅन्ट",
+DlgCellVerAlignNotSet	: "<सॅट नहीं>",
+DlgCellVerAlignTop	: "ऊपर",
+DlgCellVerAlignMiddle	: "मध्य",
+DlgCellVerAlignBottom	: "नीचे",
+DlgCellVerAlignBaseline	: "मूलरेखा",
+DlgCellRowSpan		: "पंक्ति स्पैन",
+DlgCellCollSpan		: "कालम स्पैन",
+DlgCellBackColor	: "बैक्ग्राउन्ड रंग",
+DlgCellBorderColor	: "बॉर्डर का रंग",
+DlgCellBtnSelect	: "चुनें...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "खोजें और बदलें",
+
+// Find Dialog
+DlgFindTitle		: "खोजें",
+DlgFindFindBtn		: "खोजें",
+DlgFindNotFoundMsg	: "आपके द्वारा दिया गया टेक्स्ट नहीं मिला",
+
+// Replace Dialog
+DlgReplaceTitle			: "रिप्लेस",
+DlgReplaceFindLbl		: "यह खोजें:",
+DlgReplaceReplaceLbl	: "इससे रिप्लेस करें:",
+DlgReplaceCaseChk		: "केस मिलायें",
+DlgReplaceReplaceBtn	: "रिप्लेस",
+DlgReplaceReplAllBtn	: "सभी रिप्लेस करें",
+DlgReplaceWordChk		: "पूरा शब्द मिलायें",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl+X) का प्रयोग करें।",
+PasteErrorCopy	: "आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl+C) का प्रयोग करें।",
+
+PasteAsText		: "पेस्ट (सादा टॅक्स्ट)",
+PasteFromWord	: "पेस्ट (वर्ड से)",
+
+DlgPasteMsg2	: "Ctrl+V का प्रयोग करके पेस्ट करें और ठीक है करें.",
+DlgPasteSec		: "आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.",
+DlgPasteIgnoreFont		: "फ़ॉन्ट परिभाषा निकालें",
+DlgPasteRemoveStyles	: "स्टाइल परिभाषा निकालें",
+
+// Color Picker
+ColorAutomatic	: "स्वचालित",
+ColorMoreColors	: "और रंग...",
+
+// Document Properties
+DocProps		: "डॉक्यूमॅन्ट प्रॉपर्टीज़",
+
+// Anchor Dialog
+DlgAnchorTitle		: "ऐंकर प्रॉपर्टीज़",
+DlgAnchorName		: "ऐंकर का नाम",
+DlgAnchorErrorName	: "ऐंकर का नाम टाइप करें",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "शब्दकोश में नहीं",
+DlgSpellChangeTo		: "इसमें बदलें",
+DlgSpellBtnIgnore		: "इग्नोर",
+DlgSpellBtnIgnoreAll	: "सभी इग्नोर करें",
+DlgSpellBtnReplace		: "रिप्लेस",
+DlgSpellBtnReplaceAll	: "सभी रिप्लेस करें",
+DlgSpellBtnUndo			: "अन्डू",
+DlgSpellNoSuggestions	: "- कोई सुझाव नहीं -",
+DlgSpellProgress		: "वर्तनी की जाँच (स्पॅल-चॅक) जारी है...",
+DlgSpellNoMispell		: "वर्तनी की जाँच : कोई गलत वर्तनी (स्पॅलिंग) नहीं पाई गई",
+DlgSpellNoChanges		: "वर्तनी की जाँच :कोई शब्द नहीं बदला गया",
+DlgSpellOneChange		: "वर्तनी की जाँच : एक शब्द बदला गया",
+DlgSpellManyChanges		: "वर्तनी की जाँच : %1 शब्द बदले गये",
+
+IeSpellDownload			: "स्पॅल-चॅकर इन्स्टाल नहीं किया गया है। क्या आप इसे डा‌उनलोड करना चाहेंगे?",
+
+// Button Dialog
+DlgButtonText		: "टेक्स्ट (वैल्यू)",
+DlgButtonType		: "प्रकार",
+DlgButtonTypeBtn	: "बटन",
+DlgButtonTypeSbm	: "सब्मिट",
+DlgButtonTypeRst	: "रिसेट",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "नाम",
+DlgCheckboxValue	: "वैल्यू",
+DlgCheckboxSelected	: "सॅलॅक्टॅड",
+
+// Form Dialog
+DlgFormName		: "नाम",
+DlgFormAction	: "क्रिया",
+DlgFormMethod	: "तरीका",
+
+// Select Field Dialog
+DlgSelectName		: "नाम",
+DlgSelectValue		: "वैल्यू",
+DlgSelectSize		: "साइज़",
+DlgSelectLines		: "पंक्तियाँ",
+DlgSelectChkMulti	: "एक से ज्यादा विकल्प चुनने दें",
+DlgSelectOpAvail	: "उपलब्ध विकल्प",
+DlgSelectOpText		: "टेक्स्ट",
+DlgSelectOpValue	: "वैल्यू",
+DlgSelectBtnAdd		: "जोड़ें",
+DlgSelectBtnModify	: "बदलें",
+DlgSelectBtnUp		: "ऊपर",
+DlgSelectBtnDown	: "नीचे",
+DlgSelectBtnSetValue : "चुनी गई वैल्यू सॅट करें",
+DlgSelectBtnDelete	: "डिलीट",
+
+// Textarea Dialog
+DlgTextareaName	: "नाम",
+DlgTextareaCols	: "कालम",
+DlgTextareaRows	: "पंक्तियां",
+
+// Text Field Dialog
+DlgTextName			: "नाम",
+DlgTextValue		: "वैल्यू",
+DlgTextCharWidth	: "करॅक्टर की चौढ़ाई",
+DlgTextMaxChars		: "अधिकतम करॅक्टर",
+DlgTextType			: "टाइप",
+DlgTextTypeText		: "टेक्स्ट",
+DlgTextTypePass		: "पास्वर्ड",
+
+// Hidden Field Dialog
+DlgHiddenName	: "नाम",
+DlgHiddenValue	: "वैल्यू",
+
+// Bulleted List Dialog
+BulletedListProp	: "बुलॅट सूची प्रॉपर्टीज़",
+NumberedListProp	: "अंकीय सूची प्रॉपर्टीज़",
+DlgLstStart			: "प्रारम्भ",
+DlgLstType			: "प्रकार",
+DlgLstTypeCircle	: "गोल",
+DlgLstTypeDisc		: "डिस्क",
+DlgLstTypeSquare	: "चौकॊण",
+DlgLstTypeNumbers	: "अंक (1, 2, 3)",
+DlgLstTypeLCase		: "छोटे अक्षर (a, b, c)",
+DlgLstTypeUCase		: "बड़े अक्षर (A, B, C)",
+DlgLstTypeSRoman	: "छोटे रोमन अंक (i, ii, iii)",
+DlgLstTypeLRoman	: "बड़े रोमन अंक (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "आम",
+DlgDocBackTab		: "बैक्ग्राउन्ड",
+DlgDocColorsTab		: "रंग और मार्जिन",
+DlgDocMetaTab		: "मॅटाडेटा",
+
+DlgDocPageTitle		: "पेज शीर्षक",
+DlgDocLangDir		: "भाषा लिखने की दिशा",
+DlgDocLangDirLTR	: "बायें से दायें (LTR)",
+DlgDocLangDirRTL	: "दायें से बायें (RTL)",
+DlgDocLangCode		: "भाषा कोड",
+DlgDocCharSet		: "करेक्टर सॅट ऍन्कोडिंग",
+DlgDocCharSetCE		: "मध्य यूरोपीय (Central European)",
+DlgDocCharSetCT		: "चीनी (Chinese Traditional Big5)",
+DlgDocCharSetCR		: "सिरीलिक (Cyrillic)",
+DlgDocCharSetGR		: "यवन (Greek)",
+DlgDocCharSetJP		: "जापानी (Japanese)",
+DlgDocCharSetKR		: "कोरीयन (Korean)",
+DlgDocCharSetTR		: "तुर्की (Turkish)",
+DlgDocCharSetUN		: "यूनीकोड (UTF-8)",
+DlgDocCharSetWE		: "पश्चिम यूरोपीय (Western European)",
+DlgDocCharSetOther	: "अन्य करेक्टर सॅट ऍन्कोडिंग",
+
+DlgDocDocType		: "डॉक्यूमॅन्ट प्रकार शीर्षक",
+DlgDocDocTypeOther	: "अन्य डॉक्यूमॅन्ट प्रकार शीर्षक",
+DlgDocIncXHTML		: "XHTML सूचना सम्मिलित करें",
+DlgDocBgColor		: "बैक्ग्राउन्ड रंग",
+DlgDocBgImage		: "बैक्ग्राउन्ड तस्वीर URL",
+DlgDocBgNoScroll	: "स्क्रॉल न करने वाला बैक्ग्राउन्ड",
+DlgDocCText			: "टेक्स्ट",
+DlgDocCLink			: "लिंक",
+DlgDocCVisited		: "विज़िट किया गया लिंक",
+DlgDocCActive		: "सक्रिय लिंक",
+DlgDocMargins		: "पेज मार्जिन",
+DlgDocMaTop			: "ऊपर",
+DlgDocMaLeft		: "बायें",
+DlgDocMaRight		: "दायें",
+DlgDocMaBottom		: "नीचे",
+DlgDocMeIndex		: "डॉक्युमॅन्ट इन्डेक्स संकेतशब्द (अल्पविराम से अलग करें)",
+DlgDocMeDescr		: "डॉक्यूमॅन्ट करॅक्टरन",
+DlgDocMeAuthor		: "लेखक",
+DlgDocMeCopy		: "कॉपीराइट",
+DlgDocPreview		: "प्रीव्यू",
+
+// Templates Dialog
+Templates			: "टॅम्प्लेट",
+DlgTemplatesTitle	: "कन्टेन्ट टॅम्प्लेट",
+DlgTemplatesSelMsg	: "ऍडिटर में ओपन करने हेतु टॅम्प्लेट चुनें(वर्तमान कन्टॅन्ट सेव नहीं होंगे):",
+DlgTemplatesLoading	: "टॅम्प्लेट सूची लोड की जा रही है। ज़रा ठहरें...",
+DlgTemplatesNoTpl	: "(कोई टॅम्प्लेट डिफ़ाइन नहीं किया गया है)",
+DlgTemplatesReplace	: "मूल शब्दों को बदलें",
+
+// About Dialog
+DlgAboutAboutTab	: "FCKEditor के बारे में",
+DlgAboutBrowserInfoTab	: "ब्राउज़र के बारे में",
+DlgAboutLicenseTab	: "लाइसैन्स",
+DlgAboutVersion		: "वर्ज़न",
+DlgAboutInfo		: "अधिक जानकारी के लिये यहाँ जायें:",
+
+// Div Dialog
+DlgDivGeneralTab	: "सामान्य",
+DlgDivAdvancedTab	: "एड्वान्स्ड",
+DlgDivStyle		: "स्टाइल",
+DlgDivInlineStyle	: "इनलाइन स्टाइल"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/hr.js b/modules/editor/skins/fckeditor/editor/lang/hr.js
new file mode 100644
index 000000000..4601e9629
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/hr.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Croatian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Smanji trake s alatima",
+ToolbarExpand		: "Proširi trake s alatima",
+
+// Toolbar Items and Context Menu
+Save				: "Snimi",
+NewPage				: "Nova stranica",
+Preview				: "Pregledaj",
+Cut					: "Izreži",
+Copy				: "Kopiraj",
+Paste				: "Zalijepi",
+PasteText			: "Zalijepi kao čisti tekst",
+PasteWord			: "Zalijepi iz Worda",
+Print				: "Ispiši",
+SelectAll			: "Odaberi sve",
+RemoveFormat		: "Ukloni formatiranje",
+InsertLinkLbl		: "Link",
+InsertLink			: "Ubaci/promijeni link",
+RemoveLink			: "Ukloni link",
+VisitLink			: "Otvori link",
+Anchor				: "Ubaci/promijeni sidro",
+AnchorDelete		: "Ukloni sidro",
+InsertImageLbl		: "Slika",
+InsertImage			: "Ubaci/promijeni sliku",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Ubaci/promijeni Flash",
+InsertTableLbl		: "Tablica",
+InsertTable			: "Ubaci/promijeni tablicu",
+InsertLineLbl		: "Linija",
+InsertLine			: "Ubaci vodoravnu liniju",
+InsertSpecialCharLbl: "Posebni karakteri",
+InsertSpecialChar	: "Ubaci posebne znakove",
+InsertSmileyLbl		: "Smješko",
+InsertSmiley		: "Ubaci smješka",
+About				: "O FCKeditoru",
+Bold				: "Podebljaj",
+Italic				: "Ukosi",
+Underline			: "Potcrtano",
+StrikeThrough		: "Precrtano",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Lijevo poravnanje",
+CenterJustify		: "Središnje poravnanje",
+RightJustify		: "Desno poravnanje",
+BlockJustify		: "Blok poravnanje",
+DecreaseIndent		: "Pomakni ulijevo",
+IncreaseIndent		: "Pomakni udesno",
+Blockquote			: "Blockquote",
+CreateDiv			: "Napravi Div kontejner",
+EditDiv				: "Uredi Div kontejner",
+DeleteDiv			: "Ukloni Div kontejner",
+Undo				: "Poništi",
+Redo				: "Ponovi",
+NumberedListLbl		: "Brojčana lista",
+NumberedList		: "Ubaci/ukloni brojčanu listu",
+BulletedListLbl		: "Obična lista",
+BulletedList		: "Ubaci/ukloni običnu listu",
+ShowTableBorders	: "Prikaži okvir tablice",
+ShowDetails			: "Prikaži detalje",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Veličina",
+TextColor			: "Boja teksta",
+BGColor				: "Boja pozadine",
+Source				: "Kôd",
+Find				: "Pronađi",
+Replace				: "Zamijeni",
+SpellCheck			: "Provjeri pravopis",
+UniversalKeyboard	: "Univerzalna tipkovnica",
+PageBreakLbl		: "Prijelom stranice",
+PageBreak			: "Ubaci prijelom stranice",
+
+Form			: "Form",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Hidden Field",
+Button			: "Button",
+SelectionField	: "Selection Field",
+ImageButton		: "Image Button",
+
+FitWindow		: "Povećaj veličinu editora",
+ShowBlocks		: "Prikaži blokove",
+
+// Context Menu
+EditLink			: "Promijeni link",
+CellCM				: "Ćelija",
+RowCM				: "Red",
+ColumnCM			: "Kolona",
+InsertRowAfter		: "Ubaci red poslije",
+InsertRowBefore		: "Ubaci red prije",
+DeleteRows			: "Izbriši redove",
+InsertColumnAfter	: "Ubaci kolonu poslije",
+InsertColumnBefore	: "Ubaci kolonu prije",
+DeleteColumns		: "Izbriši kolone",
+InsertCellAfter		: "Ubaci ćeliju poslije",
+InsertCellBefore	: "Ubaci ćeliju prije",
+DeleteCells			: "Izbriši ćelije",
+MergeCells			: "Spoji ćelije",
+MergeRight			: "Spoji desno",
+MergeDown			: "Spoji dolje",
+HorizontalSplitCell	: "Podijeli ćeliju vodoravno",
+VerticalSplitCell	: "Podijeli ćeliju okomito",
+TableDelete			: "Izbriši tablicu",
+CellProperties		: "Svojstva ćelije",
+TableProperties		: "Svojstva tablice",
+ImageProperties		: "Svojstva slike",
+FlashProperties		: "Flash svojstva",
+
+AnchorProp			: "Svojstva sidra",
+ButtonProp			: "Image Button svojstva",
+CheckboxProp		: "Checkbox svojstva",
+HiddenFieldProp		: "Hidden Field svojstva",
+RadioButtonProp		: "Radio Button svojstva",
+ImageButtonProp		: "Image Button svojstva",
+TextFieldProp		: "Text Field svojstva",
+SelectionFieldProp	: "Selection svojstva",
+TextareaProp		: "Textarea svojstva",
+FormProp			: "Form svojstva",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Obrađujem XHTML. Molimo pričekajte...",
+Done				: "Završio",
+PasteWordConfirm	: "Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?",
+NotCompatiblePaste	: "Ova naredba je dostupna samo u Internet Exploreru 5.5 ili novijem. Želite li nastaviti bez čišćenja?",
+UnknownToolbarItem	: "Nepoznati član trake s alatima \"%1\"",
+UnknownCommand		: "Nepoznata naredba \"%1\"",
+NotImplemented		: "Naredba nije implementirana",
+UnknownToolbarSet	: "Traka s alatima \"%1\" ne postoji",
+NoActiveX			: "Vaše postavke pretraživača mogle bi ograničiti neke od mogućnosti editora. Morate uključiti opciju \"Run ActiveX controls and plug-ins\" u postavkama. Ukoliko to ne učinite, moguće su razliite greške tijekom rada.",
+BrowseServerBlocked : "Pretraivač nije moguće otvoriti. Provjerite da li je uključeno blokiranje pop-up prozora.",
+DialogBlocked		: "Nije moguće otvoriti novi prozor. Provjerite da li je uključeno blokiranje pop-up prozora.",
+VisitLinkBlocked	: "Nije moguće otvoriti novi prozor. Provjerite da li je uključeno blokiranje pop-up prozora.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Poništi",
+DlgBtnClose			: "Zatvori",
+DlgBtnBrowseServer	: "Pretraži server",
+DlgAdvancedTag		: "Napredno",
+DlgOpOther			: "<Drugo>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Molimo unesite URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nije postavljeno>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Smjer jezika",
+DlgGenLangDirLtr	: "S lijeva na desno (LTR)",
+DlgGenLangDirRtl	: "S desna na lijevo (RTL)",
+DlgGenLangCode		: "Kôd jezika",
+DlgGenAccessKey		: "Pristupna tipka",
+DlgGenName			: "Naziv",
+DlgGenTabIndex		: "Tab Indeks",
+DlgGenLongDescr		: "Dugački opis URL",
+DlgGenClass			: "Stylesheet klase",
+DlgGenTitle			: "Advisory naslov",
+DlgGenContType		: "Advisory vrsta sadržaja",
+DlgGenLinkCharset	: "Kodna stranica povezanih resursa",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Svojstva slika",
+DlgImgInfoTab		: "Info slike",
+DlgImgBtnUpload		: "Pošalji na server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Pošalji",
+DlgImgAlt			: "Alternativni tekst",
+DlgImgWidth			: "Širina",
+DlgImgHeight		: "Visina",
+DlgImgLockRatio		: "Zaključaj odnos",
+DlgBtnResetSize		: "Obriši veličinu",
+DlgImgBorder		: "Okvir",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Poravnaj",
+DlgImgAlignLeft		: "Lijevo",
+DlgImgAlignAbsBottom: "Abs dolje",
+DlgImgAlignAbsMiddle: "Abs sredina",
+DlgImgAlignBaseline	: "Bazno",
+DlgImgAlignBottom	: "Dolje",
+DlgImgAlignMiddle	: "Sredina",
+DlgImgAlignRight	: "Desno",
+DlgImgAlignTextTop	: "Vrh teksta",
+DlgImgAlignTop		: "Vrh",
+DlgImgPreview		: "Pregledaj",
+DlgImgAlertUrl		: "Unesite URL slike",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash svojstva",
+DlgFlashChkPlay		: "Auto Play",
+DlgFlashChkLoop		: "Ponavljaj",
+DlgFlashChkMenu		: "Omogući Flash izbornik",
+DlgFlashScale		: "Omjer",
+DlgFlashScaleAll	: "Prikaži sve",
+DlgFlashScaleNoBorder	: "Bez okvira",
+DlgFlashScaleFit	: "Točna veličina",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Meta",
+
+DlgLnkType			: "Link vrsta",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Sidro na ovoj stranici",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<drugo>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Odaberi sidro",
+DlgLnkAnchorByName	: "Po nazivu sidra",
+DlgLnkAnchorById	: "Po Id elementa",
+DlgLnkNoAnchors		: "(Nema dostupnih sidra)",
+DlgLnkEMail			: "E-Mail adresa",
+DlgLnkEMailSubject	: "Naslov",
+DlgLnkEMailBody		: "Sadržaj poruke",
+DlgLnkUpload		: "Pošalji",
+DlgLnkBtnUpload		: "Pošalji na server",
+
+DlgLnkTarget		: "Meta",
+DlgLnkTargetFrame	: "<okvir>",
+DlgLnkTargetPopup	: "<popup prozor>",
+DlgLnkTargetBlank	: "Novi prozor (_blank)",
+DlgLnkTargetParent	: "Roditeljski prozor (_parent)",
+DlgLnkTargetSelf	: "Isti prozor (_self)",
+DlgLnkTargetTop		: "Vršni prozor (_top)",
+DlgLnkTargetFrameName	: "Ime ciljnog okvira",
+DlgLnkPopWinName	: "Naziv popup prozora",
+DlgLnkPopWinFeat	: "Mogućnosti popup prozora",
+DlgLnkPopResize		: "Promjenljive veličine",
+DlgLnkPopLocation	: "Traka za lokaciju",
+DlgLnkPopMenu		: "Izborna traka",
+DlgLnkPopScroll		: "Scroll traka",
+DlgLnkPopStatus		: "Statusna traka",
+DlgLnkPopToolbar	: "Traka s alatima",
+DlgLnkPopFullScrn	: "Cijeli ekran (IE)",
+DlgLnkPopDependent	: "Ovisno (Netscape)",
+DlgLnkPopWidth		: "Širina",
+DlgLnkPopHeight		: "Visina",
+DlgLnkPopLeft		: "Lijeva pozicija",
+DlgLnkPopTop		: "Gornja pozicija",
+
+DlnLnkMsgNoUrl		: "Molimo upišite URL link",
+DlnLnkMsgNoEMail	: "Molimo upišite e-mail adresu",
+DlnLnkMsgNoAnchor	: "Molimo odaberite sidro",
+DlnLnkMsgInvPopName	: "Ime popup prozora mora početi sa slovom i ne smije sadržavati razmake",
+
+// Color Dialog
+DlgColorTitle		: "Odaberite boju",
+DlgColorBtnClear	: "Obriši",
+DlgColorHighlight	: "Osvijetli",
+DlgColorSelected	: "Odaberi",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Ubaci smješka",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Odaberite posebni karakter",
+
+// Table Dialog
+DlgTableTitle		: "Svojstva tablice",
+DlgTableRows		: "Redova",
+DlgTableColumns		: "Kolona",
+DlgTableBorder		: "Veličina okvira",
+DlgTableAlign		: "Poravnanje",
+DlgTableAlignNotSet	: "<nije postavljeno>",
+DlgTableAlignLeft	: "Lijevo",
+DlgTableAlignCenter	: "Središnje",
+DlgTableAlignRight	: "Desno",
+DlgTableWidth		: "Širina",
+DlgTableWidthPx		: "piksela",
+DlgTableWidthPc		: "postotaka",
+DlgTableHeight		: "Visina",
+DlgTableCellSpace	: "Prostornost ćelija",
+DlgTableCellPad		: "Razmak ćelija",
+DlgTableCaption		: "Naslov",
+DlgTableSummary		: "Sažetak",
+
+// Table Cell Dialog
+DlgCellTitle		: "Svojstva ćelije",
+DlgCellWidth		: "Širina",
+DlgCellWidthPx		: "piksela",
+DlgCellWidthPc		: "postotaka",
+DlgCellHeight		: "Visina",
+DlgCellWordWrap		: "Word Wrap",
+DlgCellWordWrapNotSet	: "<nije postavljeno>",
+DlgCellWordWrapYes	: "Da",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Vodoravno poravnanje",
+DlgCellHorAlignNotSet	: "<nije postavljeno>",
+DlgCellHorAlignLeft	: "Lijevo",
+DlgCellHorAlignCenter	: "Središnje",
+DlgCellHorAlignRight: "Desno",
+DlgCellVerAlign		: "Okomito poravnanje",
+DlgCellVerAlignNotSet	: "<nije postavljeno>",
+DlgCellVerAlignTop	: "Gornje",
+DlgCellVerAlignMiddle	: "Srednišnje",
+DlgCellVerAlignBottom	: "Donje",
+DlgCellVerAlignBaseline	: "Bazno",
+DlgCellRowSpan		: "Spajanje redova",
+DlgCellCollSpan		: "Spajanje kolona",
+DlgCellBackColor	: "Boja pozadine",
+DlgCellBorderColor	: "Boja okvira",
+DlgCellBtnSelect	: "Odaberi...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Pronađi i zamijeni",
+
+// Find Dialog
+DlgFindTitle		: "Pronađi",
+DlgFindFindBtn		: "Pronađi",
+DlgFindNotFoundMsg	: "Traženi tekst nije pronađen.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Zamijeni",
+DlgReplaceFindLbl		: "Pronađi:",
+DlgReplaceReplaceLbl	: "Zamijeni s:",
+DlgReplaceCaseChk		: "Usporedi mala/velika slova",
+DlgReplaceReplaceBtn	: "Zamijeni",
+DlgReplaceReplAllBtn	: "Zamijeni sve",
+DlgReplaceWordChk		: "Usporedi cijele riječi",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl+X).",
+PasteErrorCopy	: "Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl+C).",
+
+PasteAsText		: "Zalijepi kao čisti tekst",
+PasteFromWord	: "Zalijepi iz Worda",
+
+DlgPasteMsg2	: "Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl+V</STRONG>) i kliknite <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.",
+DlgPasteIgnoreFont		: "Zanemari definiciju vrste fonta",
+DlgPasteRemoveStyles	: "Ukloni definicije stilova",
+
+// Color Picker
+ColorAutomatic	: "Automatski",
+ColorMoreColors	: "Više boja...",
+
+// Document Properties
+DocProps		: "Svojstva dokumenta",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Svojstva sidra",
+DlgAnchorName		: "Ime sidra",
+DlgAnchorErrorName	: "Molimo unesite ime sidra",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nije u rječniku",
+DlgSpellChangeTo		: "Promijeni u",
+DlgSpellBtnIgnore		: "Zanemari",
+DlgSpellBtnIgnoreAll	: "Zanemari sve",
+DlgSpellBtnReplace		: "Zamijeni",
+DlgSpellBtnReplaceAll	: "Zamijeni sve",
+DlgSpellBtnUndo			: "Vrati",
+DlgSpellNoSuggestions	: "-Nema preporuke-",
+DlgSpellProgress		: "Provjera u tijeku...",
+DlgSpellNoMispell		: "Provjera završena: Nema grešaka",
+DlgSpellNoChanges		: "Provjera završena: Nije napravljena promjena",
+DlgSpellOneChange		: "Provjera završena: Jedna riječ promjenjena",
+DlgSpellManyChanges		: "Provjera završena: Promijenjeno %1 riječi",
+
+IeSpellDownload			: "Provjera pravopisa nije instalirana. Želite li skinuti provjeru pravopisa?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (vrijednost)",
+DlgButtonType		: "Vrsta",
+DlgButtonTypeBtn	: "Gumb",
+DlgButtonTypeSbm	: "Pošalji",
+DlgButtonTypeRst	: "Poništi",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Ime",
+DlgCheckboxValue	: "Vrijednost",
+DlgCheckboxSelected	: "Odabrano",
+
+// Form Dialog
+DlgFormName		: "Ime",
+DlgFormAction	: "Akcija",
+DlgFormMethod	: "Metoda",
+
+// Select Field Dialog
+DlgSelectName		: "Ime",
+DlgSelectValue		: "Vrijednost",
+DlgSelectSize		: "Veličina",
+DlgSelectLines		: "linija",
+DlgSelectChkMulti	: "Dozvoli višestruki odabir",
+DlgSelectOpAvail	: "Dostupne opcije",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Vrijednost",
+DlgSelectBtnAdd		: "Dodaj",
+DlgSelectBtnModify	: "Promijeni",
+DlgSelectBtnUp		: "Gore",
+DlgSelectBtnDown	: "Dolje",
+DlgSelectBtnSetValue : "Postavi kao odabranu vrijednost",
+DlgSelectBtnDelete	: "Obriši",
+
+// Textarea Dialog
+DlgTextareaName	: "Ime",
+DlgTextareaCols	: "Kolona",
+DlgTextareaRows	: "Redova",
+
+// Text Field Dialog
+DlgTextName			: "Ime",
+DlgTextValue		: "Vrijednost",
+DlgTextCharWidth	: "Širina",
+DlgTextMaxChars		: "Najviše karaktera",
+DlgTextType			: "Vrsta",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Šifra",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Ime",
+DlgHiddenValue	: "Vrijednost",
+
+// Bulleted List Dialog
+BulletedListProp	: "Svojstva liste",
+NumberedListProp	: "Svojstva brojčane liste",
+DlgLstStart			: "Početak",
+DlgLstType			: "Vrsta",
+DlgLstTypeCircle	: "Krug",
+DlgLstTypeDisc		: "Disk",
+DlgLstTypeSquare	: "Kvadrat",
+DlgLstTypeNumbers	: "Brojevi (1, 2, 3)",
+DlgLstTypeLCase		: "Mala slova (a, b, c)",
+DlgLstTypeUCase		: "Velika slova (A, B, C)",
+DlgLstTypeSRoman	: "Male rimske brojke (i, ii, iii)",
+DlgLstTypeLRoman	: "Velike rimske brojke (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Općenito",
+DlgDocBackTab		: "Pozadina",
+DlgDocColorsTab		: "Boje i margine",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Naslov stranice",
+DlgDocLangDir		: "Smjer jezika",
+DlgDocLangDirLTR	: "S lijeva na desno",
+DlgDocLangDirRTL	: "S desna na lijevo",
+DlgDocLangCode		: "Kôd jezika",
+DlgDocCharSet		: "Enkodiranje znakova",
+DlgDocCharSetCE		: "Središnja Europa",
+DlgDocCharSetCT		: "Tradicionalna kineska (Big5)",
+DlgDocCharSetCR		: "Ćirilica",
+DlgDocCharSetGR		: "Grčka",
+DlgDocCharSetJP		: "Japanska",
+DlgDocCharSetKR		: "Koreanska",
+DlgDocCharSetTR		: "Turska",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Zapadna Europa",
+DlgDocCharSetOther	: "Ostalo enkodiranje znakova",
+
+DlgDocDocType		: "Zaglavlje vrste dokumenta",
+DlgDocDocTypeOther	: "Ostalo zaglavlje vrste dokumenta",
+DlgDocIncXHTML		: "Ubaci XHTML deklaracije",
+DlgDocBgColor		: "Boja pozadine",
+DlgDocBgImage		: "URL slike pozadine",
+DlgDocBgNoScroll	: "Pozadine se ne pomiče",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Posjećeni link",
+DlgDocCActive		: "Aktivni link",
+DlgDocMargins		: "Margine stranice",
+DlgDocMaTop			: "Vrh",
+DlgDocMaLeft		: "Lijevo",
+DlgDocMaRight		: "Desno",
+DlgDocMaBottom		: "Dolje",
+DlgDocMeIndex		: "Ključne riječi dokumenta (odvojene zarezom)",
+DlgDocMeDescr		: "Opis dokumenta",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Autorska prava",
+DlgDocPreview		: "Pregledaj",
+
+// Templates Dialog
+Templates			: "Predlošci",
+DlgTemplatesTitle	: "Predlošci sadržaja",
+DlgTemplatesSelMsg	: "Molimo odaberite predložak koji želite otvoriti<br>(stvarni sadržaj će biti izgubljen):",
+DlgTemplatesLoading	: "Učitavam listu predložaka. Molimo pričekajte...",
+DlgTemplatesNoTpl	: "(Nema definiranih predložaka)",
+DlgTemplatesReplace	: "Zamijeni trenutne sadržaje",
+
+// About Dialog
+DlgAboutAboutTab	: "O FCKEditoru",
+DlgAboutBrowserInfoTab	: "Podaci o pretraživaču",
+DlgAboutLicenseTab	: "Licenca",
+DlgAboutVersion		: "inačica",
+DlgAboutInfo		: "Za više informacija posjetite",
+
+// Div Dialog
+DlgDivGeneralTab	: "Općenito",
+DlgDivAdvancedTab	: "Napredno",
+DlgDivStyle		: "Stil",
+DlgDivInlineStyle	: "Stil u redu"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/hu.js b/modules/editor/skins/fckeditor/editor/lang/hu.js
new file mode 100644
index 000000000..b9803e63a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/hu.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Hungarian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Eszköztár elrejtése",
+ToolbarExpand		: "Eszköztár megjelenítése",
+
+// Toolbar Items and Context Menu
+Save				: "Mentés",
+NewPage				: "Új oldal",
+Preview				: "Előnézet",
+Cut					: "Kivágás",
+Copy				: "Másolás",
+Paste				: "Beillesztés",
+PasteText			: "Beillesztés formázás nélkül",
+PasteWord			: "Beillesztés Word-ből",
+Print				: "Nyomtatás",
+SelectAll			: "Mindent kijelöl",
+RemoveFormat		: "Formázás eltávolítása",
+InsertLinkLbl		: "Hivatkozás",
+InsertLink			: "Hivatkozás beillesztése/módosítása",
+RemoveLink			: "Hivatkozás törlése",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Horgony beillesztése/szerkesztése",
+AnchorDelete		: "Horgony eltávolítása",
+InsertImageLbl		: "Kép",
+InsertImage			: "Kép beillesztése/módosítása",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash beillesztése, módosítása",
+InsertTableLbl		: "Táblázat",
+InsertTable			: "Táblázat beillesztése/módosítása",
+InsertLineLbl		: "Vonal",
+InsertLine			: "Elválasztóvonal beillesztése",
+InsertSpecialCharLbl: "Speciális karakter",
+InsertSpecialChar	: "Speciális karakter beillesztése",
+InsertSmileyLbl		: "Hangulatjelek",
+InsertSmiley		: "Hangulatjelek beillesztése",
+About				: "FCKeditor névjegy",
+Bold				: "Félkövér",
+Italic				: "Dőlt",
+Underline			: "Aláhúzott",
+StrikeThrough		: "Áthúzott",
+Subscript			: "Alsó index",
+Superscript			: "Felső index",
+LeftJustify			: "Balra",
+CenterJustify		: "Középre",
+RightJustify		: "Jobbra",
+BlockJustify		: "Sorkizárt",
+DecreaseIndent		: "Behúzás csökkentése",
+IncreaseIndent		: "Behúzás növelése",
+Blockquote			: "Idézet blokk",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Visszavonás",
+Redo				: "Ismétlés",
+NumberedListLbl		: "Számozás",
+NumberedList		: "Számozás beillesztése/törlése",
+BulletedListLbl		: "Felsorolás",
+BulletedList		: "Felsorolás beillesztése/törlése",
+ShowTableBorders	: "Táblázat szegély mutatása",
+ShowDetails			: "Részletek mutatása",
+Style				: "Stílus",
+FontFormat			: "Formátum",
+Font				: "Betűtípus",
+FontSize			: "Méret",
+TextColor			: "Betűszín",
+BGColor				: "Háttérszín",
+Source				: "Forráskód",
+Find				: "Keresés",
+Replace				: "Csere",
+SpellCheck			: "Helyesírás-ellenőrzés",
+UniversalKeyboard	: "Univerzális billentyűzet",
+PageBreakLbl		: "Oldaltörés",
+PageBreak			: "Oldaltörés beillesztése",
+
+Form			: "Űrlap",
+Checkbox		: "Jelölőnégyzet",
+RadioButton		: "Választógomb",
+TextField		: "Szövegmező",
+Textarea		: "Szövegterület",
+HiddenField		: "Rejtettmező",
+Button			: "Gomb",
+SelectionField	: "Legördülő lista",
+ImageButton		: "Képgomb",
+
+FitWindow		: "Maximalizálás",
+ShowBlocks		: "Blokkok megjelenítése",
+
+// Context Menu
+EditLink			: "Hivatkozás módosítása",
+CellCM				: "Cella",
+RowCM				: "Sor",
+ColumnCM			: "Oszlop",
+InsertRowAfter		: "Sor beillesztése az aktuális sor mögé",
+InsertRowBefore		: "Sor beillesztése az aktuális sor elé",
+DeleteRows			: "Sorok törlése",
+InsertColumnAfter	: "Oszlop beillesztése az aktuális oszlop mögé",
+InsertColumnBefore	: "Oszlop beillesztése az aktuális oszlop elé",
+DeleteColumns		: "Oszlopok törlése",
+InsertCellAfter		: "Cella beillesztése az aktuális cella mögé",
+InsertCellBefore	: "Cella beillesztése az aktuális cella elé",
+DeleteCells			: "Cellák törlése",
+MergeCells			: "Cellák egyesítése",
+MergeRight			: "Cellák egyesítése jobbra",
+MergeDown			: "Cellák egyesítése lefelé",
+HorizontalSplitCell	: "Cellák szétválasztása vízszintesen",
+VerticalSplitCell	: "Cellák szétválasztása függőlegesen",
+TableDelete			: "Táblázat törlése",
+CellProperties		: "Cella tulajdonságai",
+TableProperties		: "Táblázat tulajdonságai",
+ImageProperties		: "Kép tulajdonságai",
+FlashProperties		: "Flash tulajdonságai",
+
+AnchorProp			: "Horgony tulajdonságai",
+ButtonProp			: "Gomb tulajdonságai",
+CheckboxProp		: "Jelölőnégyzet tulajdonságai",
+HiddenFieldProp		: "Rejtett mező tulajdonságai",
+RadioButtonProp		: "Választógomb tulajdonságai",
+ImageButtonProp		: "Képgomb tulajdonságai",
+TextFieldProp		: "Szövegmező tulajdonságai",
+SelectionFieldProp	: "Legördülő lista tulajdonságai",
+TextareaProp		: "Szövegterület tulajdonságai",
+FormProp			: "Űrlap tulajdonságai",
+
+FontFormats			: "Normál;Formázott;Címsor;Fejléc 1;Fejléc 2;Fejléc 3;Fejléc 4;Fejléc 5;Fejléc 6;Bekezdés (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML feldolgozása. Kérem várjon...",
+Done				: "Kész",
+PasteWordConfirm	: "A beilleszteni kívánt szöveg Word-ből van másolva. El kívánja távolítani a formázást a beillesztés előtt?",
+NotCompatiblePaste	: "Ez a parancs csak Internet Explorer 5.5 verziótól használható. Megpróbálja beilleszteni a szöveget az eredeti formázással?",
+UnknownToolbarItem	: "Ismeretlen eszköztár elem \"%1\"",
+UnknownCommand		: "Ismeretlen parancs \"%1\"",
+NotImplemented		: "A parancs nem hajtható végre",
+UnknownToolbarSet	: "Az eszközkészlet \"%1\" nem létezik",
+NoActiveX			: "A böngésző biztonsági beállításai korlátozzák a szerkesztő lehetőségeit. Engedélyezni kell ezt az opciót: \"Run ActiveX controls and plug-ins\". Ettől függetlenül előfordulhatnak hibaüzenetek ill. bizonyos funkciók hiányozhatnak.",
+BrowseServerBlocked : "Nem lehet megnyitni a fájlböngészőt. Bizonyosodjon meg róla, hogy a felbukkanó ablakok engedélyezve vannak.",
+DialogBlocked		: "Nem lehet megnyitni a párbeszédablakot. Bizonyosodjon meg róla, hogy a felbukkanó ablakok engedélyezve vannak.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Rendben",
+DlgBtnCancel		: "Mégsem",
+DlgBtnClose			: "Bezárás",
+DlgBtnBrowseServer	: "Böngészés a szerveren",
+DlgAdvancedTag		: "További opciók",
+DlgOpOther			: "Egyéb",
+DlgInfoTab			: "Alaptulajdonságok",
+DlgAlertUrl			: "Illessze be a webcímet",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nincs beállítva>",
+DlgGenId			: "Azonosító",
+DlgGenLangDir		: "Írás iránya",
+DlgGenLangDirLtr	: "Balról jobbra",
+DlgGenLangDirRtl	: "Jobbról balra",
+DlgGenLangCode		: "Nyelv kódja",
+DlgGenAccessKey		: "Billentyűkombináció",
+DlgGenName			: "Név",
+DlgGenTabIndex		: "Tabulátor index",
+DlgGenLongDescr		: "Részletes leírás webcíme",
+DlgGenClass			: "Stíluskészlet",
+DlgGenTitle			: "Súgócimke",
+DlgGenContType		: "Súgó tartalomtípusa",
+DlgGenLinkCharset	: "Hivatkozott tartalom kódlapja",
+DlgGenStyle			: "Stílus",
+
+// Image Dialog
+DlgImgTitle			: "Kép tulajdonságai",
+DlgImgInfoTab		: "Alaptulajdonságok",
+DlgImgBtnUpload		: "Küldés a szerverre",
+DlgImgURL			: "Hivatkozás",
+DlgImgUpload		: "Feltöltés",
+DlgImgAlt			: "Buborék szöveg",
+DlgImgWidth			: "Szélesség",
+DlgImgHeight		: "Magasság",
+DlgImgLockRatio		: "Arány megtartása",
+DlgBtnResetSize		: "Eredeti méret",
+DlgImgBorder		: "Keret",
+DlgImgHSpace		: "Vízsz. táv",
+DlgImgVSpace		: "Függ. táv",
+DlgImgAlign			: "Igazítás",
+DlgImgAlignLeft		: "Bal",
+DlgImgAlignAbsBottom: "Legaljára",
+DlgImgAlignAbsMiddle: "Közepére",
+DlgImgAlignBaseline	: "Alapvonalhoz",
+DlgImgAlignBottom	: "Aljára",
+DlgImgAlignMiddle	: "Középre",
+DlgImgAlignRight	: "Jobbra",
+DlgImgAlignTextTop	: "Szöveg tetejére",
+DlgImgAlignTop		: "Tetejére",
+DlgImgPreview		: "Előnézet",
+DlgImgAlertUrl		: "Töltse ki a kép webcímét",
+DlgImgLinkTab		: "Hivatkozás",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash tulajdonságai",
+DlgFlashChkPlay		: "Automata lejátszás",
+DlgFlashChkLoop		: "Folyamatosan",
+DlgFlashChkMenu		: "Flash menü engedélyezése",
+DlgFlashScale		: "Méretezés",
+DlgFlashScaleAll	: "Mindent mutat",
+DlgFlashScaleNoBorder	: "Keret nélkül",
+DlgFlashScaleFit	: "Teljes kitöltés",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Hivatkozás tulajdonságai",
+DlgLnkInfoTab		: "Alaptulajdonságok",
+DlgLnkTargetTab		: "Megjelenítés",
+
+DlgLnkType			: "Hivatkozás típusa",
+DlgLnkTypeURL		: "Webcím",
+DlgLnkTypeAnchor	: "Horgony az oldalon",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<más>",
+DlgLnkURL			: "Webcím",
+DlgLnkAnchorSel		: "Horgony választása",
+DlgLnkAnchorByName	: "Horgony név szerint",
+DlgLnkAnchorById	: "Azonosító szerint",
+DlgLnkNoAnchors		: "(Nincs horgony a dokumentumban)",
+DlgLnkEMail			: "E-Mail cím",
+DlgLnkEMailSubject	: "Üzenet tárgya",
+DlgLnkEMailBody		: "Üzenet",
+DlgLnkUpload		: "Feltöltés",
+DlgLnkBtnUpload		: "Küldés a szerverre",
+
+DlgLnkTarget		: "Tartalom megjelenítése",
+DlgLnkTargetFrame	: "<keretben>",
+DlgLnkTargetPopup	: "<felugró ablakban>",
+DlgLnkTargetBlank	: "Új ablakban (_blank)",
+DlgLnkTargetParent	: "Szülő ablakban (_parent)",
+DlgLnkTargetSelf	: "Azonos ablakban (_self)",
+DlgLnkTargetTop		: "Legfelső ablakban (_top)",
+DlgLnkTargetFrameName	: "Keret neve",
+DlgLnkPopWinName	: "Felugró ablak neve",
+DlgLnkPopWinFeat	: "Felugró ablak jellemzői",
+DlgLnkPopResize		: "Méretezhető",
+DlgLnkPopLocation	: "Címsor",
+DlgLnkPopMenu		: "Menü sor",
+DlgLnkPopScroll		: "Gördítősáv",
+DlgLnkPopStatus		: "Állapotsor",
+DlgLnkPopToolbar	: "Eszköztár",
+DlgLnkPopFullScrn	: "Teljes képernyő (csak IE)",
+DlgLnkPopDependent	: "Szülőhöz kapcsolt (csak Netscape)",
+DlgLnkPopWidth		: "Szélesség",
+DlgLnkPopHeight		: "Magasság",
+DlgLnkPopLeft		: "Bal pozíció",
+DlgLnkPopTop		: "Felső pozíció",
+
+DlnLnkMsgNoUrl		: "Adja meg a hivatkozás webcímét",
+DlnLnkMsgNoEMail	: "Adja meg az E-Mail címet",
+DlnLnkMsgNoAnchor	: "Válasszon egy horgonyt",
+DlnLnkMsgInvPopName	: "A felbukkanó ablak neve alfanumerikus karakterrel kezdôdjön, valamint ne tartalmazzon szóközt",
+
+// Color Dialog
+DlgColorTitle		: "Színválasztás",
+DlgColorBtnClear	: "Törlés",
+DlgColorHighlight	: "Előnézet",
+DlgColorSelected	: "Kiválasztott",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Hangulatjel beszúrása",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Speciális karakter választása",
+
+// Table Dialog
+DlgTableTitle		: "Táblázat tulajdonságai",
+DlgTableRows		: "Sorok",
+DlgTableColumns		: "Oszlopok",
+DlgTableBorder		: "Szegélyméret",
+DlgTableAlign		: "Igazítás",
+DlgTableAlignNotSet	: "<Nincs beállítva>",
+DlgTableAlignLeft	: "Balra",
+DlgTableAlignCenter	: "Középre",
+DlgTableAlignRight	: "Jobbra",
+DlgTableWidth		: "Szélesség",
+DlgTableWidthPx		: "képpont",
+DlgTableWidthPc		: "százalék",
+DlgTableHeight		: "Magasság",
+DlgTableCellSpace	: "Cella térköz",
+DlgTableCellPad		: "Cella belső margó",
+DlgTableCaption		: "Felirat",
+DlgTableSummary		: "Leírás",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cella tulajdonságai",
+DlgCellWidth		: "Szélesség",
+DlgCellWidthPx		: "képpont",
+DlgCellWidthPc		: "százalék",
+DlgCellHeight		: "Magasság",
+DlgCellWordWrap		: "Sortörés",
+DlgCellWordWrapNotSet	: "<Nincs beállítva>",
+DlgCellWordWrapYes	: "Igen",
+DlgCellWordWrapNo	: "Nem",
+DlgCellHorAlign		: "Vízsz. igazítás",
+DlgCellHorAlignNotSet	: "<Nincs beállítva>",
+DlgCellHorAlignLeft	: "Balra",
+DlgCellHorAlignCenter	: "Középre",
+DlgCellHorAlignRight: "Jobbra",
+DlgCellVerAlign		: "Függ. igazítás",
+DlgCellVerAlignNotSet	: "<Nincs beállítva>",
+DlgCellVerAlignTop	: "Tetejére",
+DlgCellVerAlignMiddle	: "Középre",
+DlgCellVerAlignBottom	: "Aljára",
+DlgCellVerAlignBaseline	: "Egyvonalba",
+DlgCellRowSpan		: "Sorok egyesítése",
+DlgCellCollSpan		: "Oszlopok egyesítése",
+DlgCellBackColor	: "Háttérszín",
+DlgCellBorderColor	: "Szegélyszín",
+DlgCellBtnSelect	: "Kiválasztás...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Keresés és csere",
+
+// Find Dialog
+DlgFindTitle		: "Keresés",
+DlgFindFindBtn		: "Keresés",
+DlgFindNotFoundMsg	: "A keresett szöveg nem található.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Csere",
+DlgReplaceFindLbl		: "Keresett szöveg:",
+DlgReplaceReplaceLbl	: "Csere erre:",
+DlgReplaceCaseChk		: "kis- és nagybetű megkülönböztetése",
+DlgReplaceReplaceBtn	: "Csere",
+DlgReplaceReplAllBtn	: "Az összes cseréje",
+DlgReplaceWordChk		: "csak ha ez a teljes szó",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl+X).",
+PasteErrorCopy	: "A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl+X).",
+
+PasteAsText		: "Beillesztés formázatlan szövegként",
+PasteFromWord	: "Beillesztés Word-ből",
+
+DlgPasteMsg2	: "Másolja be az alábbi mezőbe a <STRONG>Ctrl+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.",
+DlgPasteSec		: "A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.",
+DlgPasteIgnoreFont		: "Betű formázások megszüntetése",
+DlgPasteRemoveStyles	: "Stílusok eltávolítása",
+
+// Color Picker
+ColorAutomatic	: "Automatikus",
+ColorMoreColors	: "További színek...",
+
+// Document Properties
+DocProps		: "Dokumentum tulajdonságai",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Horgony tulajdonságai",
+DlgAnchorName		: "Horgony neve",
+DlgAnchorErrorName	: "Kérem adja meg a horgony nevét",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nincs a szótárban",
+DlgSpellChangeTo		: "Módosítás",
+DlgSpellBtnIgnore		: "Kihagyja",
+DlgSpellBtnIgnoreAll	: "Mindet kihagyja",
+DlgSpellBtnReplace		: "Csere",
+DlgSpellBtnReplaceAll	: "Összes cseréje",
+DlgSpellBtnUndo			: "Visszavonás",
+DlgSpellNoSuggestions	: "Nincs javaslat",
+DlgSpellProgress		: "Helyesírás-ellenőrzés folyamatban...",
+DlgSpellNoMispell		: "Helyesírás-ellenőrzés kész: Nem találtam hibát",
+DlgSpellNoChanges		: "Helyesírás-ellenőrzés kész: Nincs változtatott szó",
+DlgSpellOneChange		: "Helyesírás-ellenőrzés kész: Egy szó cserélve",
+DlgSpellManyChanges		: "Helyesírás-ellenőrzés kész: %1 szó cserélve",
+
+IeSpellDownload			: "A helyesírás-ellenőrző nincs telepítve. Szeretné letölteni most?",
+
+// Button Dialog
+DlgButtonText		: "Szöveg (Érték)",
+DlgButtonType		: "Típus",
+DlgButtonTypeBtn	: "Gomb",
+DlgButtonTypeSbm	: "Küldés",
+DlgButtonTypeRst	: "Alaphelyzet",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Név",
+DlgCheckboxValue	: "Érték",
+DlgCheckboxSelected	: "Kiválasztott",
+
+// Form Dialog
+DlgFormName		: "Név",
+DlgFormAction	: "Adatfeldolgozást végző hivatkozás",
+DlgFormMethod	: "Adatküldés módja",
+
+// Select Field Dialog
+DlgSelectName		: "Név",
+DlgSelectValue		: "Érték",
+DlgSelectSize		: "Méret",
+DlgSelectLines		: "sor",
+DlgSelectChkMulti	: "több sor is kiválasztható",
+DlgSelectOpAvail	: "Elérhető opciók",
+DlgSelectOpText		: "Szöveg",
+DlgSelectOpValue	: "Érték",
+DlgSelectBtnAdd		: "Hozzáad",
+DlgSelectBtnModify	: "Módosít",
+DlgSelectBtnUp		: "Fel",
+DlgSelectBtnDown	: "Le",
+DlgSelectBtnSetValue : "Legyen az alapértelmezett érték",
+DlgSelectBtnDelete	: "Töröl",
+
+// Textarea Dialog
+DlgTextareaName	: "Név",
+DlgTextareaCols	: "Karakterek száma egy sorban",
+DlgTextareaRows	: "Sorok száma",
+
+// Text Field Dialog
+DlgTextName			: "Név",
+DlgTextValue		: "Érték",
+DlgTextCharWidth	: "Megjelenített karakterek száma",
+DlgTextMaxChars		: "Maximális karakterszám",
+DlgTextType			: "Típus",
+DlgTextTypeText		: "Szöveg",
+DlgTextTypePass		: "Jelszó",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Név",
+DlgHiddenValue	: "Érték",
+
+// Bulleted List Dialog
+BulletedListProp	: "Felsorolás tulajdonságai",
+NumberedListProp	: "Számozás tulajdonságai",
+DlgLstStart			: "Start",
+DlgLstType			: "Formátum",
+DlgLstTypeCircle	: "Kör",
+DlgLstTypeDisc		: "Lemez",
+DlgLstTypeSquare	: "Négyzet",
+DlgLstTypeNumbers	: "Számok (1, 2, 3)",
+DlgLstTypeLCase		: "Kisbetűk (a, b, c)",
+DlgLstTypeUCase		: "Nagybetűk (A, B, C)",
+DlgLstTypeSRoman	: "Kis római számok (i, ii, iii)",
+DlgLstTypeLRoman	: "Nagy római számok (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Általános",
+DlgDocBackTab		: "Háttér",
+DlgDocColorsTab		: "Színek és margók",
+DlgDocMetaTab		: "Meta adatok",
+
+DlgDocPageTitle		: "Oldalcím",
+DlgDocLangDir		: "Írás iránya",
+DlgDocLangDirLTR	: "Balról jobbra",
+DlgDocLangDirRTL	: "Jobbról balra",
+DlgDocLangCode		: "Nyelv kód",
+DlgDocCharSet		: "Karakterkódolás",
+DlgDocCharSetCE		: "Közép-Európai",
+DlgDocCharSetCT		: "Kínai Tradicionális (Big5)",
+DlgDocCharSetCR		: "Cyrill",
+DlgDocCharSetGR		: "Görög",
+DlgDocCharSetJP		: "Japán",
+DlgDocCharSetKR		: "Koreai",
+DlgDocCharSetTR		: "Török",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Nyugat-Európai",
+DlgDocCharSetOther	: "Más karakterkódolás",
+
+DlgDocDocType		: "Dokumentum típus fejléc",
+DlgDocDocTypeOther	: "Más dokumentum típus fejléc",
+DlgDocIncXHTML		: "XHTML deklarációk beillesztése",
+DlgDocBgColor		: "Háttérszín",
+DlgDocBgImage		: "Háttérkép cím",
+DlgDocBgNoScroll	: "Nem gördíthető háttér",
+DlgDocCText			: "Szöveg",
+DlgDocCLink			: "Cím",
+DlgDocCVisited		: "Látogatott cím",
+DlgDocCActive		: "Aktív cím",
+DlgDocMargins		: "Oldal margók",
+DlgDocMaTop			: "Felső",
+DlgDocMaLeft		: "Bal",
+DlgDocMaRight		: "Jobb",
+DlgDocMaBottom		: "Alsó",
+DlgDocMeIndex		: "Dokumentum keresőszavak (vesszővel elválasztva)",
+DlgDocMeDescr		: "Dokumentum leírás",
+DlgDocMeAuthor		: "Szerző",
+DlgDocMeCopy		: "Szerzői jog",
+DlgDocPreview		: "Előnézet",
+
+// Templates Dialog
+Templates			: "Sablonok",
+DlgTemplatesTitle	: "Elérhető sablonok",
+DlgTemplatesSelMsg	: "Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):",
+DlgTemplatesLoading	: "Sablon lista betöltése. Kis türelmet...",
+DlgTemplatesNoTpl	: "(Nincs sablon megadva)",
+DlgTemplatesReplace	: "Kicseréli a jelenlegi tartalmat",
+
+// About Dialog
+DlgAboutAboutTab	: "Névjegy",
+DlgAboutBrowserInfoTab	: "Böngésző információ",
+DlgAboutLicenseTab	: "Licensz",
+DlgAboutVersion		: "verzió",
+DlgAboutInfo		: "További információkért látogasson el ide:",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/it.js b/modules/editor/skins/fckeditor/editor/lang/it.js
new file mode 100644
index 000000000..8b59211c4
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/it.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Italian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Nascondi la barra degli strumenti",
+ToolbarExpand		: "Mostra la barra degli strumenti",
+
+// Toolbar Items and Context Menu
+Save				: "Salva",
+NewPage				: "Nuova pagina vuota",
+Preview				: "Anteprima",
+Cut					: "Taglia",
+Copy				: "Copia",
+Paste				: "Incolla",
+PasteText			: "Incolla come testo semplice",
+PasteWord			: "Incolla da Word",
+Print				: "Stampa",
+SelectAll			: "Seleziona tutto",
+RemoveFormat		: "Elimina formattazione",
+InsertLinkLbl		: "Collegamento",
+InsertLink			: "Inserisci/Modifica collegamento",
+RemoveLink			: "Elimina collegamento",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Inserisci/Modifica Ancora",
+AnchorDelete		: "Rimuovi Ancora",
+InsertImageLbl		: "Immagine",
+InsertImage			: "Inserisci/Modifica immagine",
+InsertFlashLbl		: "Oggetto Flash",
+InsertFlash			: "Inserisci/Modifica Oggetto Flash",
+InsertTableLbl		: "Tabella",
+InsertTable			: "Inserisci/Modifica tabella",
+InsertLineLbl		: "Riga orizzontale",
+InsertLine			: "Inserisci riga orizzontale",
+InsertSpecialCharLbl: "Caratteri speciali",
+InsertSpecialChar	: "Inserisci carattere speciale",
+InsertSmileyLbl		: "Emoticon",
+InsertSmiley		: "Inserisci emoticon",
+About				: "Informazioni su FCKeditor",
+Bold				: "Grassetto",
+Italic				: "Corsivo",
+Underline			: "Sottolineato",
+StrikeThrough		: "Barrato",
+Subscript			: "Pedice",
+Superscript			: "Apice",
+LeftJustify			: "Allinea a sinistra",
+CenterJustify		: "Centra",
+RightJustify		: "Allinea a destra",
+BlockJustify		: "Giustifica",
+DecreaseIndent		: "Riduci rientro",
+IncreaseIndent		: "Aumenta rientro",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Annulla",
+Redo				: "Ripristina",
+NumberedListLbl		: "Elenco numerato",
+NumberedList		: "Inserisci/Modifica elenco numerato",
+BulletedListLbl		: "Elenco puntato",
+BulletedList		: "Inserisci/Modifica elenco puntato",
+ShowTableBorders	: "Mostra bordi tabelle",
+ShowDetails			: "Mostra dettagli",
+Style				: "Stile",
+FontFormat			: "Formato",
+Font				: "Font",
+FontSize			: "Dimensione",
+TextColor			: "Colore testo",
+BGColor				: "Colore sfondo",
+Source				: "Codice Sorgente",
+Find				: "Trova",
+Replace				: "Sostituisci",
+SpellCheck			: "Correttore ortografico",
+UniversalKeyboard	: "Tastiera universale",
+PageBreakLbl		: "Interruzione di pagina",
+PageBreak			: "Inserisci interruzione di pagina",
+
+Form			: "Modulo",
+Checkbox		: "Checkbox",
+RadioButton		: "Radio Button",
+TextField		: "Campo di testo",
+Textarea		: "Area di testo",
+HiddenField		: "Campo nascosto",
+Button			: "Bottone",
+SelectionField	: "Menu di selezione",
+ImageButton		: "Bottone immagine",
+
+FitWindow		: "Massimizza l'area dell'editor",
+ShowBlocks		: "Visualizza Blocchi",
+
+// Context Menu
+EditLink			: "Modifica collegamento",
+CellCM				: "Cella",
+RowCM				: "Riga",
+ColumnCM			: "Colonna",
+InsertRowAfter		: "Inserisci Riga Dopo",
+InsertRowBefore		: "Inserisci Riga Prima",
+DeleteRows			: "Elimina righe",
+InsertColumnAfter	: "Inserisci Colonna Dopo",
+InsertColumnBefore	: "Inserisci Colonna Prima",
+DeleteColumns		: "Elimina colonne",
+InsertCellAfter		: "Inserisci Cella Dopo",
+InsertCellBefore	: "Inserisci Cella Prima",
+DeleteCells			: "Elimina celle",
+MergeCells			: "Unisce celle",
+MergeRight			: "Unisci a Destra",
+MergeDown			: "Unisci in Basso",
+HorizontalSplitCell	: "Dividi Cella Orizzontalmente",
+VerticalSplitCell	: "Dividi Cella Verticalmente",
+TableDelete			: "Cancella Tabella",
+CellProperties		: "Proprietà cella",
+TableProperties		: "Proprietà tabella",
+ImageProperties		: "Proprietà immagine",
+FlashProperties		: "Proprietà Oggetto Flash",
+
+AnchorProp			: "Proprietà ancora",
+ButtonProp			: "Proprietà bottone",
+CheckboxProp		: "Proprietà checkbox",
+HiddenFieldProp		: "Proprietà campo nascosto",
+RadioButtonProp		: "Proprietà radio button",
+ImageButtonProp		: "Proprietà bottone immagine",
+TextFieldProp		: "Proprietà campo di testo",
+SelectionFieldProp	: "Proprietà menu di selezione",
+TextareaProp		: "Proprietà area di testo",
+FormProp			: "Proprietà modulo",
+
+FontFormats			: "Normale;Formattato;Indirizzo;Titolo 1;Titolo 2;Titolo 3;Titolo 4;Titolo 5;Titolo 6;Paragrafo (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Elaborazione XHTML in corso. Attendere prego...",
+Done				: "Completato",
+PasteWordConfirm	: "Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?",
+NotCompatiblePaste	: "Questa funzione è disponibile solo per Internet Explorer 5.5 o superiore. Desideri incollare il testo senza pulirlo?",
+UnknownToolbarItem	: "Elemento della barra strumenti sconosciuto \"%1\"",
+UnknownCommand		: "Comando sconosciuto \"%1\"",
+NotImplemented		: "Comando non implementato",
+UnknownToolbarSet	: "La barra di strumenti \"%1\" non esiste",
+NoActiveX			: "Le impostazioni di sicurezza del tuo browser potrebbero limitare alcune funzionalità dell'editor. Devi abilitare l'opzione \"Esegui controlli e plug-in ActiveX\". Potresti avere errori e notare funzionalità mancanti.",
+BrowseServerBlocked : "Non è possibile aprire la finestra di espolorazione risorse. Verifica che tutti i blocca popup siano bloccati.",
+DialogBlocked		: "Non è possibile aprire la finestra di dialogo. Verifica che tutti i blocca popup siano bloccati.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Annulla",
+DlgBtnClose			: "Chiudi",
+DlgBtnBrowseServer	: "Cerca sul server",
+DlgAdvancedTag		: "Avanzate",
+DlgOpOther			: "<Altro>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Devi inserire l'URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<non impostato>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Direzione scrittura",
+DlgGenLangDirLtr	: "Da Sinistra a Destra (LTR)",
+DlgGenLangDirRtl	: "Da Destra a Sinistra (RTL)",
+DlgGenLangCode		: "Codice Lingua",
+DlgGenAccessKey		: "Scorciatoia<br />da tastiera",
+DlgGenName			: "Nome",
+DlgGenTabIndex		: "Ordine di tabulazione",
+DlgGenLongDescr		: "URL descrizione estesa",
+DlgGenClass			: "Nome classe CSS",
+DlgGenTitle			: "Titolo",
+DlgGenContType		: "Tipo della risorsa collegata",
+DlgGenLinkCharset	: "Set di caretteri della risorsa collegata",
+DlgGenStyle			: "Stile",
+
+// Image Dialog
+DlgImgTitle			: "Proprietà immagine",
+DlgImgInfoTab		: "Informazioni immagine",
+DlgImgBtnUpload		: "Invia al server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Carica",
+DlgImgAlt			: "Testo alternativo",
+DlgImgWidth			: "Larghezza",
+DlgImgHeight		: "Altezza",
+DlgImgLockRatio		: "Blocca rapporto",
+DlgBtnResetSize		: "Reimposta dimensione",
+DlgImgBorder		: "Bordo",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Allineamento",
+DlgImgAlignLeft		: "Sinistra",
+DlgImgAlignAbsBottom: "In basso assoluto",
+DlgImgAlignAbsMiddle: "Centrato assoluto",
+DlgImgAlignBaseline	: "Linea base",
+DlgImgAlignBottom	: "In Basso",
+DlgImgAlignMiddle	: "Centrato",
+DlgImgAlignRight	: "Destra",
+DlgImgAlignTextTop	: "In alto al testo",
+DlgImgAlignTop		: "In Alto",
+DlgImgPreview		: "Anteprima",
+DlgImgAlertUrl		: "Devi inserire l'URL per l'immagine",
+DlgImgLinkTab		: "Collegamento",
+
+// Flash Dialog
+DlgFlashTitle		: "Proprietà Oggetto Flash",
+DlgFlashChkPlay		: "Avvio Automatico",
+DlgFlashChkLoop		: "Cicla",
+DlgFlashChkMenu		: "Abilita Menu di Flash",
+DlgFlashScale		: "Ridimensiona",
+DlgFlashScaleAll	: "Mostra Tutto",
+DlgFlashScaleNoBorder	: "Senza Bordo",
+DlgFlashScaleFit	: "Dimensione Esatta",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Collegamento",
+DlgLnkInfoTab		: "Informazioni collegamento",
+DlgLnkTargetTab		: "Destinazione",
+
+DlgLnkType			: "Tipo di Collegamento",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ancora nella pagina",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocollo",
+DlgLnkProtoOther	: "<altro>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Scegli Ancora",
+DlgLnkAnchorByName	: "Per Nome",
+DlgLnkAnchorById	: "Per id elemento",
+DlgLnkNoAnchors		: "(Nessuna ancora disponibile nel documento)",
+DlgLnkEMail			: "Indirizzo E-Mail",
+DlgLnkEMailSubject	: "Oggetto del messaggio",
+DlgLnkEMailBody		: "Corpo del messaggio",
+DlgLnkUpload		: "Carica",
+DlgLnkBtnUpload		: "Invia al Server",
+
+DlgLnkTarget		: "Destinazione",
+DlgLnkTargetFrame	: "<riquadro>",
+DlgLnkTargetPopup	: "<finestra popup>",
+DlgLnkTargetBlank	: "Nuova finestra (_blank)",
+DlgLnkTargetParent	: "Finestra padre (_parent)",
+DlgLnkTargetSelf	: "Stessa finestra (_self)",
+DlgLnkTargetTop		: "Finestra superiore (_top)",
+DlgLnkTargetFrameName	: "Nome del riquadro di destinazione",
+DlgLnkPopWinName	: "Nome finestra popup",
+DlgLnkPopWinFeat	: "Caratteristiche finestra popup",
+DlgLnkPopResize		: "Ridimensionabile",
+DlgLnkPopLocation	: "Barra degli indirizzi",
+DlgLnkPopMenu		: "Barra del menu",
+DlgLnkPopScroll		: "Barre di scorrimento",
+DlgLnkPopStatus		: "Barra di stato",
+DlgLnkPopToolbar	: "Barra degli strumenti",
+DlgLnkPopFullScrn	: "A tutto schermo (IE)",
+DlgLnkPopDependent	: "Dipendente (Netscape)",
+DlgLnkPopWidth		: "Larghezza",
+DlgLnkPopHeight		: "Altezza",
+DlgLnkPopLeft		: "Posizione da sinistra",
+DlgLnkPopTop		: "Posizione dall'alto",
+
+DlnLnkMsgNoUrl		: "Devi inserire l'URL del collegamento",
+DlnLnkMsgNoEMail	: "Devi inserire un'indirizzo e-mail",
+DlnLnkMsgNoAnchor	: "Devi selezionare un'ancora",
+DlnLnkMsgInvPopName	: "Il nome del popup deve iniziare con una lettera, e non può contenere spazi",
+
+// Color Dialog
+DlgColorTitle		: "Seleziona colore",
+DlgColorBtnClear	: "Vuota",
+DlgColorHighlight	: "Evidenziato",
+DlgColorSelected	: "Selezionato",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Inserisci emoticon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Seleziona carattere speciale",
+
+// Table Dialog
+DlgTableTitle		: "Proprietà tabella",
+DlgTableRows		: "Righe",
+DlgTableColumns		: "Colonne",
+DlgTableBorder		: "Dimensione bordo",
+DlgTableAlign		: "Allineamento",
+DlgTableAlignNotSet	: "<non impostato>",
+DlgTableAlignLeft	: "Sinistra",
+DlgTableAlignCenter	: "Centrato",
+DlgTableAlignRight	: "Destra",
+DlgTableWidth		: "Larghezza",
+DlgTableWidthPx		: "pixel",
+DlgTableWidthPc		: "percento",
+DlgTableHeight		: "Altezza",
+DlgTableCellSpace	: "Spaziatura celle",
+DlgTableCellPad		: "Padding celle",
+DlgTableCaption		: "Intestazione",
+DlgTableSummary		: "Indice",
+
+// Table Cell Dialog
+DlgCellTitle		: "Proprietà cella",
+DlgCellWidth		: "Larghezza",
+DlgCellWidthPx		: "pixel",
+DlgCellWidthPc		: "percento",
+DlgCellHeight		: "Altezza",
+DlgCellWordWrap		: "A capo automatico",
+DlgCellWordWrapNotSet	: "<non impostato>",
+DlgCellWordWrapYes	: "Si",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "Allineamento orizzontale",
+DlgCellHorAlignNotSet	: "<non impostato>",
+DlgCellHorAlignLeft	: "Sinistra",
+DlgCellHorAlignCenter	: "Centrato",
+DlgCellHorAlignRight: "Destra",
+DlgCellVerAlign		: "Allineamento verticale",
+DlgCellVerAlignNotSet	: "<non impostato>",
+DlgCellVerAlignTop	: "In Alto",
+DlgCellVerAlignMiddle	: "Centrato",
+DlgCellVerAlignBottom	: "In Basso",
+DlgCellVerAlignBaseline	: "Linea base",
+DlgCellRowSpan		: "Righe occupate",
+DlgCellCollSpan		: "Colonne occupate",
+DlgCellBackColor	: "Colore sfondo",
+DlgCellBorderColor	: "Colore bordo",
+DlgCellBtnSelect	: "Scegli...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Cerca e Sostituisci",
+
+// Find Dialog
+DlgFindTitle		: "Trova",
+DlgFindFindBtn		: "Trova",
+DlgFindNotFoundMsg	: "L'elemento cercato non è stato trovato.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Sostituisci",
+DlgReplaceFindLbl		: "Trova:",
+DlgReplaceReplaceLbl	: "Sostituisci con:",
+DlgReplaceCaseChk		: "Maiuscole/minuscole",
+DlgReplaceReplaceBtn	: "Sostituisci",
+DlgReplaceReplAllBtn	: "Sostituisci tutto",
+DlgReplaceWordChk		: "Solo parole intere",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl+X).",
+PasteErrorCopy	: "Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl+C).",
+
+PasteAsText		: "Incolla come testo semplice",
+PasteFromWord	: "Incolla da Word",
+
+DlgPasteMsg2	: "Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl+V</STRONG>) e premi <STRONG>OK</STRONG>.",
+DlgPasteSec		: "A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.",
+DlgPasteIgnoreFont		: "Ignora le definizioni di Font",
+DlgPasteRemoveStyles	: "Rimuovi le definizioni di Stile",
+
+// Color Picker
+ColorAutomatic	: "Automatico",
+ColorMoreColors	: "Altri colori...",
+
+// Document Properties
+DocProps		: "Proprietà del Documento",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Proprietà ancora",
+DlgAnchorName		: "Nome ancora",
+DlgAnchorErrorName	: "Inserici il nome dell'ancora",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Non nel dizionario",
+DlgSpellChangeTo		: "Cambia in",
+DlgSpellBtnIgnore		: "Ignora",
+DlgSpellBtnIgnoreAll	: "Ignora tutto",
+DlgSpellBtnReplace		: "Cambia",
+DlgSpellBtnReplaceAll	: "Cambia tutto",
+DlgSpellBtnUndo			: "Annulla",
+DlgSpellNoSuggestions	: "- Nessun suggerimento -",
+DlgSpellProgress		: "Controllo ortografico in corso",
+DlgSpellNoMispell		: "Controllo ortografico completato: nessun errore trovato",
+DlgSpellNoChanges		: "Controllo ortografico completato: nessuna parola cambiata",
+DlgSpellOneChange		: "Controllo ortografico completato: 1 parola cambiata",
+DlgSpellManyChanges		: "Controllo ortografico completato: %1 parole cambiate",
+
+IeSpellDownload			: "Contollo ortografico non installato. Lo vuoi scaricare ora?",
+
+// Button Dialog
+DlgButtonText		: "Testo (Value)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Bottone",
+DlgButtonTypeSbm	: "Invio",
+DlgButtonTypeRst	: "Annulla",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nome",
+DlgCheckboxValue	: "Valore",
+DlgCheckboxSelected	: "Selezionato",
+
+// Form Dialog
+DlgFormName		: "Nome",
+DlgFormAction	: "Azione",
+DlgFormMethod	: "Metodo",
+
+// Select Field Dialog
+DlgSelectName		: "Nome",
+DlgSelectValue		: "Valore",
+DlgSelectSize		: "Dimensione",
+DlgSelectLines		: "righe",
+DlgSelectChkMulti	: "Permetti selezione multipla",
+DlgSelectOpAvail	: "Opzioni disponibili",
+DlgSelectOpText		: "Testo",
+DlgSelectOpValue	: "Valore",
+DlgSelectBtnAdd		: "Aggiungi",
+DlgSelectBtnModify	: "Modifica",
+DlgSelectBtnUp		: "Su",
+DlgSelectBtnDown	: "Gi",
+DlgSelectBtnSetValue : "Imposta come predefinito",
+DlgSelectBtnDelete	: "Rimuovi",
+
+// Textarea Dialog
+DlgTextareaName	: "Nome",
+DlgTextareaCols	: "Colonne",
+DlgTextareaRows	: "Righe",
+
+// Text Field Dialog
+DlgTextName			: "Nome",
+DlgTextValue		: "Valore",
+DlgTextCharWidth	: "Larghezza",
+DlgTextMaxChars		: "Numero massimo di caratteri",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Testo",
+DlgTextTypePass		: "Password",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nome",
+DlgHiddenValue	: "Valore",
+
+// Bulleted List Dialog
+BulletedListProp	: "Proprietà lista puntata",
+NumberedListProp	: "Proprietà lista numerata",
+DlgLstStart			: "Inizio",
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Tondo",
+DlgLstTypeDisc		: "Disco",
+DlgLstTypeSquare	: "Quadrato",
+DlgLstTypeNumbers	: "Numeri (1, 2, 3)",
+DlgLstTypeLCase		: "Caratteri minuscoli (a, b, c)",
+DlgLstTypeUCase		: "Caratteri maiuscoli (A, B, C)",
+DlgLstTypeSRoman	: "Numeri Romani minuscoli (i, ii, iii)",
+DlgLstTypeLRoman	: "Numeri Romani maiuscoli (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Genarale",
+DlgDocBackTab		: "Sfondo",
+DlgDocColorsTab		: "Colori e margini",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Titolo pagina",
+DlgDocLangDir		: "Direzione scrittura",
+DlgDocLangDirLTR	: "Da Sinistra a Destra (LTR)",
+DlgDocLangDirRTL	: "Da Destra a Sinistra (RTL)",
+DlgDocLangCode		: "Codice Lingua",
+DlgDocCharSet		: "Set di caretteri",
+DlgDocCharSetCE		: "Europa Centrale",
+DlgDocCharSetCT		: "Cinese Tradizionale (Big5)",
+DlgDocCharSetCR		: "Cirillico",
+DlgDocCharSetGR		: "Greco",
+DlgDocCharSetJP		: "Giapponese",
+DlgDocCharSetKR		: "Coreano",
+DlgDocCharSetTR		: "Turco",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Europa Occidentale",
+DlgDocCharSetOther	: "Altro set di caretteri",
+
+DlgDocDocType		: "Intestazione DocType",
+DlgDocDocTypeOther	: "Altra intestazione DocType",
+DlgDocIncXHTML		: "Includi dichiarazione XHTML",
+DlgDocBgColor		: "Colore di sfondo",
+DlgDocBgImage		: "Immagine di sfondo",
+DlgDocBgNoScroll	: "Sfondo fissato",
+DlgDocCText			: "Testo",
+DlgDocCLink			: "Collegamento",
+DlgDocCVisited		: "Collegamento visitato",
+DlgDocCActive		: "Collegamento attivo",
+DlgDocMargins		: "Margini",
+DlgDocMaTop			: "In Alto",
+DlgDocMaLeft		: "A Sinistra",
+DlgDocMaRight		: "A Destra",
+DlgDocMaBottom		: "In Basso",
+DlgDocMeIndex		: "Chiavi di indicizzazione documento (separate da virgola)",
+DlgDocMeDescr		: "Descrizione documento",
+DlgDocMeAuthor		: "Autore",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Anteprima",
+
+// Templates Dialog
+Templates			: "Modelli",
+DlgTemplatesTitle	: "Contenuto dei modelli",
+DlgTemplatesSelMsg	: "Seleziona il modello da aprire nell'editor<br />(il contenuto attuale verrà eliminato):",
+DlgTemplatesLoading	: "Caricamento modelli in corso. Attendere prego...",
+DlgTemplatesNoTpl	: "(Nessun modello definito)",
+DlgTemplatesReplace	: "Cancella il contenuto corrente",
+
+// About Dialog
+DlgAboutAboutTab	: "Informazioni",
+DlgAboutBrowserInfoTab	: "Informazioni Browser",
+DlgAboutLicenseTab	: "Licenza",
+DlgAboutVersion		: "versione",
+DlgAboutInfo		: "Per maggiori informazioni visitare",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ja.js b/modules/editor/skins/fckeditor/editor/lang/ja.js
new file mode 100644
index 000000000..9f0cffa66
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ja.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Japanese language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "ツールバーを隠す",
+ToolbarExpand		: "ツールバーを表示",
+
+// Toolbar Items and Context Menu
+Save				: "保存",
+NewPage				: "新しいページ",
+Preview				: "プレビュー",
+Cut					: "切り取り",
+Copy				: "コピー",
+Paste				: "貼り付け",
+PasteText			: "プレーンテキスト貼り付け",
+PasteWord			: "ワード文章から貼り付け",
+Print				: "印刷",
+SelectAll			: "すべて選択",
+RemoveFormat		: "フォーマット削除",
+InsertLinkLbl		: "リンク",
+InsertLink			: "リンク挿入/編集",
+RemoveLink			: "リンク削除",
+VisitLink			: "リンクを開く",
+Anchor				: "アンカー挿入/編集",
+AnchorDelete		: "アンカー削除",
+InsertImageLbl		: "イメージ",
+InsertImage			: "イメージ挿入/編集",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash挿入/編集",
+InsertTableLbl		: "テーブル",
+InsertTable			: "テーブル挿入/編集",
+InsertLineLbl		: "ライン",
+InsertLine			: "横罫線",
+InsertSpecialCharLbl: "特殊文字",
+InsertSpecialChar	: "特殊文字挿入",
+InsertSmileyLbl		: "絵文字",
+InsertSmiley		: "絵文字挿入",
+About				: "FCKeditorヘルプ",
+Bold				: "太字",
+Italic				: "斜体",
+Underline			: "下線",
+StrikeThrough		: "打ち消し線",
+Subscript			: "添え字",
+Superscript			: "上付き文字",
+LeftJustify			: "左揃え",
+CenterJustify		: "中央揃え",
+RightJustify		: "右揃え",
+BlockJustify		: "両端揃え",
+DecreaseIndent		: "インデント解除",
+IncreaseIndent		: "インデント",
+Blockquote			: "ブロック引用",
+CreateDiv			: "Div 作成",
+EditDiv				: "Div 編集",
+DeleteDiv			: "Div 削除",
+Undo				: "元に戻す",
+Redo				: "やり直し",
+NumberedListLbl		: "段落番号",
+NumberedList		: "段落番号の追加/削除",
+BulletedListLbl		: "箇条書き",
+BulletedList		: "箇条書きの追加/削除",
+ShowTableBorders	: "テーブルボーダー表示",
+ShowDetails			: "詳細表示",
+Style				: "スタイル",
+FontFormat			: "フォーマット",
+Font				: "フォント",
+FontSize			: "サイズ",
+TextColor			: "テキスト色",
+BGColor				: "背景色",
+Source				: "ソース",
+Find				: "検索",
+Replace				: "置き換え",
+SpellCheck			: "スペルチェック",
+UniversalKeyboard	: "ユニバーサル・キーボード",
+PageBreakLbl		: "改ページ",
+PageBreak			: "改ページ挿入",
+
+Form			: "フォーム",
+Checkbox		: "チェックボックス",
+RadioButton		: "ラジオボタン",
+TextField		: "１行テキスト",
+Textarea		: "テキストエリア",
+HiddenField		: "不可視フィールド",
+Button			: "ボタン",
+SelectionField	: "選択フィールド",
+ImageButton		: "画像ボタン",
+
+FitWindow		: "エディタサイズを最大にします",
+ShowBlocks		: "ブロック表示",
+
+// Context Menu
+EditLink			: "リンク編集",
+CellCM				: "セル",
+RowCM				: "行",
+ColumnCM			: "カラム",
+InsertRowAfter		: "列の後に挿入",
+InsertRowBefore		: "列の前に挿入",
+DeleteRows			: "行削除",
+InsertColumnAfter	: "カラムの後に挿入",
+InsertColumnBefore	: "カラムの前に挿入",
+DeleteColumns		: "列削除",
+InsertCellAfter		: "セルの後に挿入",
+InsertCellBefore	: "セルの前に挿入",
+DeleteCells			: "セル削除",
+MergeCells			: "セル結合",
+MergeRight			: "右に結合",
+MergeDown			: "下に結合",
+HorizontalSplitCell	: "セルを水平方向分割",
+VerticalSplitCell	: "セルを垂直方向に分割",
+TableDelete			: "テーブル削除",
+CellProperties		: "セル プロパティ",
+TableProperties		: "テーブル プロパティ",
+ImageProperties		: "イメージ プロパティ",
+FlashProperties		: "Flash プロパティ",
+
+AnchorProp			: "アンカー プロパティ",
+ButtonProp			: "ボタン プロパティ",
+CheckboxProp		: "チェックボックス プロパティ",
+HiddenFieldProp		: "不可視フィールド プロパティ",
+RadioButtonProp		: "ラジオボタン プロパティ",
+ImageButtonProp		: "画像ボタン プロパティ",
+TextFieldProp		: "１行テキスト プロパティ",
+SelectionFieldProp	: "選択フィールド プロパティ",
+TextareaProp		: "テキストエリア プロパティ",
+FormProp			: "フォーム プロパティ",
+
+FontFormats			: "標準;書式付き;アドレス;見出し 1;見出し 2;見出し 3;見出し 4;見出し 5;見出し 6;標準 (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML処理中. しばらくお待ちください...",
+Done				: "完了",
+PasteWordConfirm	: "貼り付けを行うテキストは、ワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？",
+NotCompatiblePaste	: "このコマンドはインターネット・エクスプローラーバージョン5.5以上で利用可能です。クリーニングしないで貼り付けを行いますか？",
+UnknownToolbarItem	: "未知のツールバー項目 \"%1\"",
+UnknownCommand		: "未知のコマンド名 \"%1\"",
+NotImplemented		: "コマンドはインプリメントされませんでした。",
+UnknownToolbarSet	: "ツールバー設定 \"%1\" 存在しません。",
+NoActiveX			: "エラー、警告メッセージなどが発生した場合、ブラウザーのセキュリティ設定によりエディタのいくつかの機能が制限されている可能性があります。セキュリティ設定のオプションで\"ActiveXコントロールとプラグインの実行\"を有効にするにしてください。",
+BrowseServerBlocked : "サーバーブラウザーを開くことができませんでした。ポップアップ・ブロック機能が無効になっているか確認してください。",
+DialogBlocked		: "ダイアログウィンドウを開くことができませんでした。ポップアップ・ブロック機能が無効になっているか確認してください。",
+VisitLinkBlocked	: "新しいウィンドウを開くことができませんでした。ポップアップ・ブロック機能が無効になっているか確認してください。",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "キャンセル",
+DlgBtnClose			: "閉じる",
+DlgBtnBrowseServer	: "サーバーブラウザー",
+DlgAdvancedTag		: "高度な設定",
+DlgOpOther			: "<その他>",
+DlgInfoTab			: "情報",
+DlgAlertUrl			: "URLを挿入してください",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<なし>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "文字表記の方向",
+DlgGenLangDirLtr	: "左から右 (LTR)",
+DlgGenLangDirRtl	: "右から左 (RTL)",
+DlgGenLangCode		: "言語コード",
+DlgGenAccessKey		: "アクセスキー",
+DlgGenName			: "Name属性",
+DlgGenTabIndex		: "タブインデックス",
+DlgGenLongDescr		: "longdesc属性(長文説明)",
+DlgGenClass			: "スタイルシートクラス",
+DlgGenTitle			: "Title属性",
+DlgGenContType		: "Content Type属性",
+DlgGenLinkCharset	: "リンクcharset属性",
+DlgGenStyle			: "スタイルシート",
+
+// Image Dialog
+DlgImgTitle			: "イメージ プロパティ",
+DlgImgInfoTab		: "イメージ 情報",
+DlgImgBtnUpload		: "サーバーに送信",
+DlgImgURL			: "URL",
+DlgImgUpload		: "アップロード",
+DlgImgAlt			: "代替テキスト",
+DlgImgWidth			: "幅",
+DlgImgHeight		: "高さ",
+DlgImgLockRatio		: "ロック比率",
+DlgBtnResetSize		: "サイズリセット",
+DlgImgBorder		: "ボーダー",
+DlgImgHSpace		: "横間隔",
+DlgImgVSpace		: "縦間隔",
+DlgImgAlign			: "行揃え",
+DlgImgAlignLeft		: "左",
+DlgImgAlignAbsBottom: "下部(絶対的)",
+DlgImgAlignAbsMiddle: "中央(絶対的)",
+DlgImgAlignBaseline	: "ベースライン",
+DlgImgAlignBottom	: "下",
+DlgImgAlignMiddle	: "中央",
+DlgImgAlignRight	: "右",
+DlgImgAlignTextTop	: "テキスト上部",
+DlgImgAlignTop		: "上",
+DlgImgPreview		: "プレビュー",
+DlgImgAlertUrl		: "イメージのURLを入力してください。",
+DlgImgLinkTab		: "リンク",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash プロパティ",
+DlgFlashChkPlay		: "再生",
+DlgFlashChkLoop		: "ループ再生",
+DlgFlashChkMenu		: "Flashメニュー可能",
+DlgFlashScale		: "拡大縮小設定",
+DlgFlashScaleAll	: "すべて表示",
+DlgFlashScaleNoBorder	: "外が見えない様に拡大",
+DlgFlashScaleFit	: "上下左右にフィット",
+
+// Link Dialog
+DlgLnkWindowTitle	: "ハイパーリンク",
+DlgLnkInfoTab		: "ハイパーリンク 情報",
+DlgLnkTargetTab		: "ターゲット",
+
+DlgLnkType			: "リンクタイプ",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "このページのアンカー",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "プロトコル",
+DlgLnkProtoOther	: "<その他>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "アンカーを選択",
+DlgLnkAnchorByName	: "アンカー名",
+DlgLnkAnchorById	: "エレメントID",
+DlgLnkNoAnchors		: "(ドキュメントにおいて利用可能なアンカーはありません。)",
+DlgLnkEMail			: "E-Mail アドレス",
+DlgLnkEMailSubject	: "件名",
+DlgLnkEMailBody		: "本文",
+DlgLnkUpload		: "アップロード",
+DlgLnkBtnUpload		: "サーバーに送信",
+
+DlgLnkTarget		: "ターゲット",
+DlgLnkTargetFrame	: "<フレーム>",
+DlgLnkTargetPopup	: "<ポップアップウィンドウ>",
+DlgLnkTargetBlank	: "新しいウィンドウ (_blank)",
+DlgLnkTargetParent	: "親ウィンドウ (_parent)",
+DlgLnkTargetSelf	: "同じウィンドウ (_self)",
+DlgLnkTargetTop		: "最上位ウィンドウ (_top)",
+DlgLnkTargetFrameName	: "目的のフレーム名",
+DlgLnkPopWinName	: "ポップアップウィンドウ名",
+DlgLnkPopWinFeat	: "ポップアップウィンドウ特徴",
+DlgLnkPopResize		: "リサイズ可能",
+DlgLnkPopLocation	: "ロケーションバー",
+DlgLnkPopMenu		: "メニューバー",
+DlgLnkPopScroll		: "スクロールバー",
+DlgLnkPopStatus		: "ステータスバー",
+DlgLnkPopToolbar	: "ツールバー",
+DlgLnkPopFullScrn	: "全画面モード(IE)",
+DlgLnkPopDependent	: "開いたウィンドウに連動して閉じる (Netscape)",
+DlgLnkPopWidth		: "幅",
+DlgLnkPopHeight		: "高さ",
+DlgLnkPopLeft		: "左端からの座標で指定",
+DlgLnkPopTop		: "上端からの座標で指定",
+
+DlnLnkMsgNoUrl		: "リンクURLを入力してください。",
+DlnLnkMsgNoEMail	: "メールアドレスを入力してください。",
+DlnLnkMsgNoAnchor	: "アンカーを選択してください。",
+DlnLnkMsgInvPopName	: "ポップ・アップ名は英字で始まる文字で指定してくだい。ポップ・アップ名にスペースは含めません",
+
+// Color Dialog
+DlgColorTitle		: "色選択",
+DlgColorBtnClear	: "クリア",
+DlgColorHighlight	: "ハイライト",
+DlgColorSelected	: "選択色",
+
+// Smiley Dialog
+DlgSmileyTitle		: "顔文字挿入",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "特殊文字選択",
+
+// Table Dialog
+DlgTableTitle		: "テーブル プロパティ",
+DlgTableRows		: "行",
+DlgTableColumns		: "列",
+DlgTableBorder		: "ボーダーサイズ",
+DlgTableAlign		: "キャプションの整列",
+DlgTableAlignNotSet	: "<なし>",
+DlgTableAlignLeft	: "左",
+DlgTableAlignCenter	: "中央",
+DlgTableAlignRight	: "右",
+DlgTableWidth		: "テーブル幅",
+DlgTableWidthPx		: "ピクセル",
+DlgTableWidthPc		: "パーセント",
+DlgTableHeight		: "テーブル高さ",
+DlgTableCellSpace	: "セル内余白",
+DlgTableCellPad		: "セル内間隔",
+DlgTableCaption		: "ｷｬﾌﾟｼｮﾝ",
+DlgTableSummary		: "テーブル目的/構造",
+
+// Table Cell Dialog
+DlgCellTitle		: "セル プロパティ",
+DlgCellWidth		: "幅",
+DlgCellWidthPx		: "ピクセル",
+DlgCellWidthPc		: "パーセント",
+DlgCellHeight		: "高さ",
+DlgCellWordWrap		: "折り返し",
+DlgCellWordWrapNotSet	: "<なし>",
+DlgCellWordWrapYes	: "Yes",
+DlgCellWordWrapNo	: "No",
+DlgCellHorAlign		: "セル横の整列",
+DlgCellHorAlignNotSet	: "<なし>",
+DlgCellHorAlignLeft	: "左",
+DlgCellHorAlignCenter	: "中央",
+DlgCellHorAlignRight: "右",
+DlgCellVerAlign		: "セル縦の整列",
+DlgCellVerAlignNotSet	: "<なし>",
+DlgCellVerAlignTop	: "上",
+DlgCellVerAlignMiddle	: "中央",
+DlgCellVerAlignBottom	: "下",
+DlgCellVerAlignBaseline	: "ベースライン",
+DlgCellRowSpan		: "縦幅(行数)",
+DlgCellCollSpan		: "横幅(列数)",
+DlgCellBackColor	: "背景色",
+DlgCellBorderColor	: "ボーダーカラー",
+DlgCellBtnSelect	: "選択...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "検索して置換",
+
+// Find Dialog
+DlgFindTitle		: "検索",
+DlgFindFindBtn		: "検索",
+DlgFindNotFoundMsg	: "指定された文字列は見つかりませんでした。",
+
+// Replace Dialog
+DlgReplaceTitle			: "置き換え",
+DlgReplaceFindLbl		: "検索する文字列:",
+DlgReplaceReplaceLbl	: "置換えする文字列:",
+DlgReplaceCaseChk		: "部分一致",
+DlgReplaceReplaceBtn	: "置換え",
+DlgReplaceReplAllBtn	: "すべて置換え",
+DlgReplaceWordChk		: "単語単位で一致",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "ブラウザーのセキュリティ設定によりエディタの切り取り操作が自動で実行することができません。実行するには手動でキーボードの(Ctrl+X)を使用してください。",
+PasteErrorCopy	: "ブラウザーのセキュリティ設定によりエディタのコピー操作が自動で実行することができません。実行するには手動でキーボードの(Ctrl+C)を使用してください。",
+
+PasteAsText		: "プレーンテキスト貼り付け",
+PasteFromWord	: "ワード文章から貼り付け",
+
+DlgPasteMsg2	: "キーボード(<STRONG>Ctrl+V</STRONG>)を使用して、次の入力エリア内で貼って、<STRONG>OK</STRONG>を押してください。",
+DlgPasteSec		: "ブラウザのセキュリティ設定により、エディタはクリップボード・データに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。",
+DlgPasteIgnoreFont		: "FontタグのFace属性を無視します。",
+DlgPasteRemoveStyles	: "スタイル定義を削除します。",
+
+// Color Picker
+ColorAutomatic	: "自動",
+ColorMoreColors	: "その他の色...",
+
+// Document Properties
+DocProps		: "文書 プロパティ",
+
+// Anchor Dialog
+DlgAnchorTitle		: "アンカー プロパティ",
+DlgAnchorName		: "アンカー名",
+DlgAnchorErrorName	: "アンカー名を必ず入力してください。",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "辞書にありません",
+DlgSpellChangeTo		: "変更",
+DlgSpellBtnIgnore		: "無視",
+DlgSpellBtnIgnoreAll	: "すべて無視",
+DlgSpellBtnReplace		: "置換",
+DlgSpellBtnReplaceAll	: "すべて置換",
+DlgSpellBtnUndo			: "やり直し",
+DlgSpellNoSuggestions	: "- 該当なし -",
+DlgSpellProgress		: "スペルチェック処理中...",
+DlgSpellNoMispell		: "スペルチェック完了: スペルの誤りはありませんでした",
+DlgSpellNoChanges		: "スペルチェック完了: 語句は変更されませんでした",
+DlgSpellOneChange		: "スペルチェック完了: １語句変更されました",
+DlgSpellManyChanges		: "スペルチェック完了: %1 語句変更されました",
+
+IeSpellDownload			: "スペルチェッカーがインストールされていません。今すぐダウンロードしますか?",
+
+// Button Dialog
+DlgButtonText		: "テキスト (値)",
+DlgButtonType		: "タイプ",
+DlgButtonTypeBtn	: "ボタン",
+DlgButtonTypeSbm	: "送信",
+DlgButtonTypeRst	: "リセット",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "名前",
+DlgCheckboxValue	: "値",
+DlgCheckboxSelected	: "選択済み",
+
+// Form Dialog
+DlgFormName		: "フォーム名",
+DlgFormAction	: "アクション",
+DlgFormMethod	: "メソッド",
+
+// Select Field Dialog
+DlgSelectName		: "名前",
+DlgSelectValue		: "値",
+DlgSelectSize		: "サイズ",
+DlgSelectLines		: "行",
+DlgSelectChkMulti	: "複数項目選択を許可",
+DlgSelectOpAvail	: "利用可能なオプション",
+DlgSelectOpText		: "選択項目名",
+DlgSelectOpValue	: "選択項目値",
+DlgSelectBtnAdd		: "追加",
+DlgSelectBtnModify	: "編集",
+DlgSelectBtnUp		: "上へ",
+DlgSelectBtnDown	: "下へ",
+DlgSelectBtnSetValue : "選択した値を設定",
+DlgSelectBtnDelete	: "削除",
+
+// Textarea Dialog
+DlgTextareaName	: "名前",
+DlgTextareaCols	: "列",
+DlgTextareaRows	: "行",
+
+// Text Field Dialog
+DlgTextName			: "名前",
+DlgTextValue		: "値",
+DlgTextCharWidth	: "サイズ",
+DlgTextMaxChars		: "最大長",
+DlgTextType			: "タイプ",
+DlgTextTypeText		: "テキスト",
+DlgTextTypePass		: "パスワード入力",
+
+// Hidden Field Dialog
+DlgHiddenName	: "名前",
+DlgHiddenValue	: "値",
+
+// Bulleted List Dialog
+BulletedListProp	: "箇条書き プロパティ",
+NumberedListProp	: "段落番号 プロパティ",
+DlgLstStart			: "開始文字",
+DlgLstType			: "タイプ",
+DlgLstTypeCircle	: "白丸",
+DlgLstTypeDisc		: "黒丸",
+DlgLstTypeSquare	: "四角",
+DlgLstTypeNumbers	: "アラビア数字 (1, 2, 3)",
+DlgLstTypeLCase		: "英字小文字 (a, b, c)",
+DlgLstTypeUCase		: "英字大文字 (A, B, C)",
+DlgLstTypeSRoman	: "ローマ数字小文字 (i, ii, iii)",
+DlgLstTypeLRoman	: "ローマ数字大文字 (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "全般",
+DlgDocBackTab		: "背景",
+DlgDocColorsTab		: "色とマージン",
+DlgDocMetaTab		: "メタデータ",
+
+DlgDocPageTitle		: "ページタイトル",
+DlgDocLangDir		: "言語文字表記の方向",
+DlgDocLangDirLTR	: "左から右に表記(LTR)",
+DlgDocLangDirRTL	: "右から左に表記(RTL)",
+DlgDocLangCode		: "言語コード",
+DlgDocCharSet		: "文字セット符号化",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "他の文字セット符号化",
+
+DlgDocDocType		: "文書タイプヘッダー",
+DlgDocDocTypeOther	: "その他文書タイプヘッダー",
+DlgDocIncXHTML		: "XHTML宣言をインクルード",
+DlgDocBgColor		: "背景色",
+DlgDocBgImage		: "背景画像 URL",
+DlgDocBgNoScroll	: "スクロールしない背景",
+DlgDocCText			: "テキスト",
+DlgDocCLink			: "リンク",
+DlgDocCVisited		: "アクセス済みリンク",
+DlgDocCActive		: "アクセス中リンク",
+DlgDocMargins		: "ページ・マージン",
+DlgDocMaTop			: "上部",
+DlgDocMaLeft		: "左",
+DlgDocMaRight		: "右",
+DlgDocMaBottom		: "下部",
+DlgDocMeIndex		: "文書のキーワード(カンマ区切り)",
+DlgDocMeDescr		: "文書の概要",
+DlgDocMeAuthor		: "文書の作者",
+DlgDocMeCopy		: "文書の著作権",
+DlgDocPreview		: "プレビュー",
+
+// Templates Dialog
+Templates			: "テンプレート(雛形)",
+DlgTemplatesTitle	: "テンプレート内容",
+DlgTemplatesSelMsg	: "エディターで使用するテンプレートを選択してください。<br>(現在のエディタの内容は失われます):",
+DlgTemplatesLoading	: "テンプレート一覧読み込み中. しばらくお待ちください...",
+DlgTemplatesNoTpl	: "(テンプレートが定義されていません)",
+DlgTemplatesReplace	: "現在のエディタの内容と置換えをします",
+
+// About Dialog
+DlgAboutAboutTab	: "バージョン情報",
+DlgAboutBrowserInfoTab	: "ブラウザ情報",
+DlgAboutLicenseTab	: "ライセンス",
+DlgAboutVersion		: "バージョン",
+DlgAboutInfo		: "より詳しい情報はこちらで",
+
+// Div Dialog
+DlgDivGeneralTab	: "全般",
+DlgDivAdvancedTab	: "高度な設定",
+DlgDivStyle		: "スタイル",
+DlgDivInlineStyle	: "インラインスタイル"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/km.js b/modules/editor/skins/fckeditor/editor/lang/km.js
new file mode 100644
index 000000000..829e84342
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/km.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Khmer language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "បង្រួមរបាឧបរកណ៍",
+ToolbarExpand		: "ពង្រីករបាឧបរណ៍",
+
+// Toolbar Items and Context Menu
+Save				: "រក្សាទុក",
+NewPage				: "ទំព័រថ្មី",
+Preview				: "មើលសាកល្បង",
+Cut					: "កាត់យក",
+Copy				: "ចំលងយក",
+Paste				: "ចំលងដាក់",
+PasteText			: "ចំលងដាក់ជាអត្ថបទធម្មតា",
+PasteWord			: "ចំលងដាក់ពី Word",
+Print				: "បោះពុម្ភ",
+SelectAll			: "ជ្រើសរើសទាំងអស់",
+RemoveFormat		: "លប់ចោល ការរចនា",
+InsertLinkLbl		: "ឈ្នាប់",
+InsertLink			: "បន្ថែម/កែប្រែ ឈ្នាប់",
+RemoveLink			: "លប់ឈ្នាប់",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "បន្ថែម/កែប្រែ យុថ្កា",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "រូបភាព",
+InsertImage			: "បន្ថែម/កែប្រែ រូបភាព",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "បន្ថែម/កែប្រែ Flash",
+InsertTableLbl		: "តារាង",
+InsertTable			: "បន្ថែម/កែប្រែ តារាង",
+InsertLineLbl		: "បន្ទាត់",
+InsertLine			: "បន្ថែមបន្ទាត់ផ្តេក",
+InsertSpecialCharLbl: "អក្សរពិសេស",
+InsertSpecialChar	: "បន្ថែមអក្សរពិសេស",
+InsertSmileyLbl		: "រូបភាព",
+InsertSmiley		: "បន្ថែម រូបភាព",
+About				: "អំពី FCKeditor",
+Bold				: "អក្សរដិតធំ",
+Italic				: "អក្សរផ្តេក",
+Underline			: "ដិតបន្ទាត់ពីក្រោមអក្សរ",
+StrikeThrough		: "ដិតបន្ទាត់ពាក់កណ្តាលអក្សរ",
+Subscript			: "អក្សរតូចក្រោម",
+Superscript			: "អក្សរតូចលើ",
+LeftJustify			: "តំរឹមឆ្វេង",
+CenterJustify		: "តំរឹមកណ្តាល",
+RightJustify		: "តំរឹមស្តាំ",
+BlockJustify		: "តំរឹមសងខាង",
+DecreaseIndent		: "បន្ថយការចូលបន្ទាត់",
+IncreaseIndent		: "បន្ថែមការចូលបន្ទាត់",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "សារឡើងវិញ",
+Redo				: "ធ្វើឡើងវិញ",
+NumberedListLbl		: "បញ្ជីជាអក្សរ",
+NumberedList		: "បន្ថែម/លប់ បញ្ជីជាអក្សរ",
+BulletedListLbl		: "បញ្ជីជារង្វង់មូល",
+BulletedList		: "បន្ថែម/លប់ បញ្ជីជារង្វង់មូល",
+ShowTableBorders	: "បង្ហាញស៊ុមតារាង",
+ShowDetails			: "បង្ហាញពិស្តារ",
+Style				: "ម៉ូត",
+FontFormat			: "រចនា",
+Font				: "ហ្វុង",
+FontSize			: "ទំហំ",
+TextColor			: "ពណ៌អក្សរ",
+BGColor				: "ពណ៌ផ្ទៃខាងក្រោយ",
+Source				: "កូត",
+Find				: "ស្វែងរក",
+Replace				: "ជំនួស",
+SpellCheck			: "ពិនិត្យអក្ខរាវិរុទ្ធ",
+UniversalKeyboard	: "ក្តារពុម្ភអក្សរសកល",
+PageBreakLbl		: "ការផ្តាច់ទំព័រ",
+PageBreak			: "បន្ថែម ការផ្តាច់ទំព័រ",
+
+Form			: "បែបបទ",
+Checkbox		: "ប្រអប់ជ្រើសរើស",
+RadioButton		: "ប៉ូតុនរង្វង់មូល",
+TextField		: "ជួរសរសេរអត្ថបទ",
+Textarea		: "តំបន់សរសេរអត្ថបទ",
+HiddenField		: "ជួរលាក់",
+Button			: "ប៉ូតុន",
+SelectionField	: "ជួរជ្រើសរើស",
+ImageButton		: "ប៉ូតុនរូបភាព",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "កែប្រែឈ្នាប់",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "លប់ជួរផ្តេក",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "លប់ជួរឈរ",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "លប់សែល",
+MergeCells			: "បញ្ជូលសែល",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "លប់តារាង",
+CellProperties		: "ការកំណត់សែល",
+TableProperties		: "ការកំណត់តារាង",
+ImageProperties		: "ការកំណត់រូបភាព",
+FlashProperties		: "ការកំណត់ Flash",
+
+AnchorProp			: "ការកំណត់យុថ្កា",
+ButtonProp			: "ការកំណត់ ប៉ូតុន",
+CheckboxProp		: "ការកំណត់ប្រអប់ជ្រើសរើស",
+HiddenFieldProp		: "ការកំណត់ជួរលាក់",
+RadioButtonProp		: "ការកំណត់ប៉ូតុនរង្វង់",
+ImageButtonProp		: "ការកំណត់ប៉ូតុនរូបភាព",
+TextFieldProp		: "ការកំណត់ជួរអត្ថបទ",
+SelectionFieldProp	: "ការកំណត់ជួរជ្រើសរើស",
+TextareaProp		: "ការកំណត់កន្លែងសរសេរអត្ថបទ",
+FormProp			: "ការកំណត់បែបបទ",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "កំពុងដំណើរការ XHTML ។ សូមរងចាំ...",
+Done				: "ចប់រួចរាល់",
+PasteWordConfirm	: "អត្ថបទដែលលោកអ្នកបំរុងចំលងដាក់ ហាក់បីដូចជាត្រូវចំលងមកពីកម្មវិធី​Word​។ តើលោកអ្នកចង់សំអាតមុនចំលងអត្ថបទដាក់ទេ?",
+NotCompatiblePaste	: "ពាក្យបញ្ជានេះប្រើបានតែជាមួយ Internet Explorer កំរិត 5.5 រឺ លើសនេះ ។ តើលោកអ្នកចង់ចំលងដាក់ដោយមិនចាំបាច់សំអាតទេ?",
+UnknownToolbarItem	: "វត្ថុលើរបាឧបរកណ៍ មិនស្គាល់ \"%1\"",
+UnknownCommand		: "ឈ្មោះពាក្យបញ្ជា មិនស្គាល់ \"%1\"",
+NotImplemented		: "ពាក្យបញ្ជា មិនបានអនុវត្ត",
+UnknownToolbarSet	: "របាឧបរកណ៍ \"%1\" ពុំមាន ។",
+NoActiveX			: "ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​អាចធ្វើអោយលោកអ្នកមិនអាចប្រើមុខងារខ្លះរបស់កម្មវិធីតាក់តែងអត្ថបទនេះ ។ លោកអ្នកត្រូវកំណត់អោយ \"ActiveX និង​កម្មវិធីជំនួយក្នុង (plug-ins)\" អោយដំណើរការ ។ លោកអ្នកអាចជួបប្រទះនឹង បញ្ហា ព្រមជាមួយនឹងការបាត់បង់មុខងារណាមួយរបស់កម្មវិធីតាក់តែងអត្ថបទនេះ ។",
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "វីនដូវមិនអាចបើកបានទេ ។ សូមពិនិត្យចំពោះកម្មវិធីបិទ វីនដូវលោត (popup) ថាតើវាដំណើរការរឺទេ ។",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "យល់ព្រម",
+DlgBtnCancel		: "មិនយល់ព្រម",
+DlgBtnClose			: "បិទ",
+DlgBtnBrowseServer	: "មើល",
+DlgAdvancedTag		: "កំរិតខ្ពស់",
+DlgOpOther			: "<ផ្សេងទៅត>",
+DlgInfoTab			: "ពត៌មាន",
+DlgAlertUrl			: "សូមសរសេរ URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<មិនមែន>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "ទិសដៅភាសា",
+DlgGenLangDirLtr	: "ពីឆ្វេងទៅស្តាំ(LTR)",
+DlgGenLangDirRtl	: "ពីស្តាំទៅឆ្វេង(RTL)",
+DlgGenLangCode		: "លេខកូតភាសា",
+DlgGenAccessKey		: "ឃី សំរាប់ចូល",
+DlgGenName			: "ឈ្មោះ",
+DlgGenTabIndex		: "លេខ Tab",
+DlgGenLongDescr		: "អធិប្បាយ URL វែង",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "ចំណងជើង ប្រឹក្សា",
+DlgGenContType		: "ប្រភេទអត្ថបទ ប្រឹក្សា",
+DlgGenLinkCharset	: "លេខកូតអក្សររបស់ឈ្នាប់",
+DlgGenStyle			: "ម៉ូត",
+
+// Image Dialog
+DlgImgTitle			: "ការកំណត់រូបភាព",
+DlgImgInfoTab		: "ពត៌មានអំពីរូបភាព",
+DlgImgBtnUpload		: "បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្តល់សេវា",
+DlgImgURL			: "URL",
+DlgImgUpload		: "ទាញយក",
+DlgImgAlt			: "អត្ថបទជំនួស",
+DlgImgWidth			: "ទទឹង",
+DlgImgHeight		: "កំពស់",
+DlgImgLockRatio		: "អត្រាឡុក",
+DlgBtnResetSize		: "កំណត់ទំហំឡើងវិញ",
+DlgImgBorder		: "ស៊ុម",
+DlgImgHSpace		: "គំលាតទទឹង",
+DlgImgVSpace		: "គំលាតបណ្តោយ",
+DlgImgAlign			: "កំណត់ទីតាំង",
+DlgImgAlignLeft		: "ខាងឆ្វង",
+DlgImgAlignAbsBottom: "Abs Bottom",	//MISSING
+DlgImgAlignAbsMiddle: "Abs Middle",	//MISSING
+DlgImgAlignBaseline	: "បន្ទាត់ជាមូលដ្ឋាន",
+DlgImgAlignBottom	: "ខាងក្រោម",
+DlgImgAlignMiddle	: "កណ្តាល",
+DlgImgAlignRight	: "ខាងស្តាំ",
+DlgImgAlignTextTop	: "លើអត្ថបទ",
+DlgImgAlignTop		: "ខាងលើ",
+DlgImgPreview		: "មើលសាកល្បង",
+DlgImgAlertUrl		: "សូមសរសេរងាស័យដ្ឋានរបស់រូបភាព",
+DlgImgLinkTab		: "ឈ្នាប់",
+
+// Flash Dialog
+DlgFlashTitle		: "ការកំណត់ Flash",
+DlgFlashChkPlay		: "លេងដោយស្វ័យប្រវត្ត",
+DlgFlashChkLoop		: "ចំនួនដង",
+DlgFlashChkMenu		: "បង្ហាញ មឺនុយរបស់ Flash",
+DlgFlashScale		: "ទំហំ",
+DlgFlashScaleAll	: "បង្ហាញទាំងអស់",
+DlgFlashScaleNoBorder	: "មិនបង្ហាញស៊ុម",
+DlgFlashScaleFit	: "ត្រូវល្មម",
+
+// Link Dialog
+DlgLnkWindowTitle	: "ឈ្នាប់",
+DlgLnkInfoTab		: "ពត៌មានអំពីឈ្នាប់",
+DlgLnkTargetTab		: "គោលដៅ",
+
+DlgLnkType			: "ប្រភេទឈ្នាប់",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "យុថ្កានៅក្នុងទំព័រនេះ",
+DlgLnkTypeEMail		: "អ៊ីមែល",
+DlgLnkProto			: "ប្រូតូកូល",
+DlgLnkProtoOther	: "<ផ្សេងទៀត>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "ជ្រើសរើសយុថ្កា",
+DlgLnkAnchorByName	: "តាមឈ្មោះរបស់យុថ្កា",
+DlgLnkAnchorById	: "តាម Id",
+DlgLnkNoAnchors		: "(No anchors available in the document)",	//MISSING
+DlgLnkEMail			: "អ៊ីមែល",
+DlgLnkEMailSubject	: "ចំណងជើងអត្ថបទ",
+DlgLnkEMailBody		: "អត្ថបទ",
+DlgLnkUpload		: "ទាញយក",
+DlgLnkBtnUpload		: "ទាញយក",
+
+DlgLnkTarget		: "គោលដៅ",
+DlgLnkTargetFrame	: "<ហ្វ្រេម>",
+DlgLnkTargetPopup	: "<វីនដូវ លោត>",
+DlgLnkTargetBlank	: "វីនដូវថ្មី (_blank)",
+DlgLnkTargetParent	: "វីនដូវមេ (_parent)",
+DlgLnkTargetSelf	: "វីនដូវដដែល (_self)",
+DlgLnkTargetTop		: "វីនដូវនៅលើគេ(_top)",
+DlgLnkTargetFrameName	: "ឈ្មោះហ្រ្វេមដែលជាគោលដៅ",
+DlgLnkPopWinName	: "ឈ្មោះវីនដូវលោត",
+DlgLnkPopWinFeat	: "លក្ខណះរបស់វីនដូលលោត",
+DlgLnkPopResize		: "ទំហំអាចផ្លាស់ប្តូរ",
+DlgLnkPopLocation	: "របា ទីតាំង",
+DlgLnkPopMenu		: "របា មឺនុយ",
+DlgLnkPopScroll		: "របា ទាញ",
+DlgLnkPopStatus		: "របា ពត៌មាន",
+DlgLnkPopToolbar	: "របា ឩបករណ៍",
+DlgLnkPopFullScrn	: "អេក្រុងពេញ(IE)",
+DlgLnkPopDependent	: "អាស្រ័យលើ (Netscape)",
+DlgLnkPopWidth		: "ទទឹង",
+DlgLnkPopHeight		: "កំពស់",
+DlgLnkPopLeft		: "ទីតាំងខាងឆ្វេង",
+DlgLnkPopTop		: "ទីតាំងខាងលើ",
+
+DlnLnkMsgNoUrl		: "សូមសរសេរ អាស័យដ្ឋាន URL",
+DlnLnkMsgNoEMail	: "សូមសរសេរ អាស័យដ្ឋាន អ៊ីមែល",
+DlnLnkMsgNoAnchor	: "សូមជ្រើសរើស យុថ្កា",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "ជ្រើសរើស ពណ៌",
+DlgColorBtnClear	: "លប់",
+DlgColorHighlight	: "ផាត់ពណ៌",
+DlgColorSelected	: "បានជ្រើសរើស",
+
+// Smiley Dialog
+DlgSmileyTitle		: "បញ្ជូលរូបភាព",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "តូអក្សរពិសេស",
+
+// Table Dialog
+DlgTableTitle		: "ការកំណត់ តារាង",
+DlgTableRows		: "ជួរផ្តេក",
+DlgTableColumns		: "ជួរឈរ",
+DlgTableBorder		: "ទំហំស៊ុម",
+DlgTableAlign		: "ការកំណត់ទីតាំង",
+DlgTableAlignNotSet	: "<មិនកំណត់>",
+DlgTableAlignLeft	: "ខាងឆ្វេង",
+DlgTableAlignCenter	: "កណ្តាល",
+DlgTableAlignRight	: "ខាងស្តាំ",
+DlgTableWidth		: "ទទឹង",
+DlgTableWidthPx		: "ភីកសែល",
+DlgTableWidthPc		: "ភាគរយ",
+DlgTableHeight		: "កំពស់",
+DlgTableCellSpace	: "គំលាតសែល",
+DlgTableCellPad		: "គែមសែល",
+DlgTableCaption		: "ចំណងជើង",
+DlgTableSummary		: "សេចក្តីសង្ខេប",
+
+// Table Cell Dialog
+DlgCellTitle		: "ការកំណត់ សែល",
+DlgCellWidth		: "ទទឹង",
+DlgCellWidthPx		: "ភីកសែល",
+DlgCellWidthPc		: "ភាគរយ",
+DlgCellHeight		: "កំពស់",
+DlgCellWordWrap		: "បង្ហាញអត្ថបទទាំងអស់",
+DlgCellWordWrapNotSet	: "<មិនកំណត់>",
+DlgCellWordWrapYes	: "បាទ(ចា)",
+DlgCellWordWrapNo	: "ទេ",
+DlgCellHorAlign		: "តំរឹមផ្តេក",
+DlgCellHorAlignNotSet	: "<មិនកំណត់>",
+DlgCellHorAlignLeft	: "ខាងឆ្វេង",
+DlgCellHorAlignCenter	: "កណ្តាល",
+DlgCellHorAlignRight: "Right",	//MISSING
+DlgCellVerAlign		: "តំរឹមឈរ",
+DlgCellVerAlignNotSet	: "<មិនកណត់>",
+DlgCellVerAlignTop	: "ខាងលើ",
+DlgCellVerAlignMiddle	: "កណ្តាល",
+DlgCellVerAlignBottom	: "ខាងក្រោម",
+DlgCellVerAlignBaseline	: "បន្ទាត់ជាមូលដ្ឋាន",
+DlgCellRowSpan		: "បញ្ជូលជួរផ្តេក",
+DlgCellCollSpan		: "បញ្ជូលជួរឈរ",
+DlgCellBackColor	: "ពណ៌ផ្នែកខាងក្រោម",
+DlgCellBorderColor	: "ពណ៌ស៊ុម",
+DlgCellBtnSelect	: "ជ្រើសរើស...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "ស្វែងរក",
+DlgFindFindBtn		: "ស្វែងរក",
+DlgFindNotFoundMsg	: "ពាក្យនេះ រកមិនឃើញទេ ។",
+
+// Replace Dialog
+DlgReplaceTitle			: "ជំនួស",
+DlgReplaceFindLbl		: "ស្វែងរកអ្វី:",
+DlgReplaceReplaceLbl	: "ជំនួសជាមួយ:",
+DlgReplaceCaseChk		: "ករណ៉ត្រូវរក",
+DlgReplaceReplaceBtn	: "ជំនួស",
+DlgReplaceReplAllBtn	: "ជំនួសទាំងអស់",
+DlgReplaceWordChk		: "ត្រូវពាក្យទាំងអស់",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl+X) ។",
+PasteErrorCopy	: "ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl+C)។",
+
+PasteAsText		: "ចំលងដាក់អត្ថបទធម្មតា",
+PasteFromWord	: "ចំលងពាក្យពីកម្មវិធី Word",
+
+DlgPasteMsg2	: "សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "មិនគិតអំពីប្រភេទពុម្ភអក្សរ",
+DlgPasteRemoveStyles	: "លប់ម៉ូត",
+
+// Color Picker
+ColorAutomatic	: "ស្វ័យប្រវត្ត",
+ColorMoreColors	: "ពណ៌ផ្សេងទៀត..",
+
+// Document Properties
+DocProps		: "ការកំណត់ ឯកសារ",
+
+// Anchor Dialog
+DlgAnchorTitle		: "ការកំណត់ចំណងជើងយុទ្ធថ្កា",
+DlgAnchorName		: "ឈ្មោះយុទ្ធថ្កា",
+DlgAnchorErrorName	: "សូមសរសេរ ឈ្មោះយុទ្ធថ្កា",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "គ្មានក្នុងវចនានុក្រម",
+DlgSpellChangeTo		: "ផ្លាស់ប្តូរទៅ",
+DlgSpellBtnIgnore		: "មិនផ្លាស់ប្តូរ",
+DlgSpellBtnIgnoreAll	: "មិនផ្លាស់ប្តូរ ទាំងអស់",
+DlgSpellBtnReplace		: "ជំនួស",
+DlgSpellBtnReplaceAll	: "ជំនួសទាំងអស់",
+DlgSpellBtnUndo			: "សារឡើងវិញ",
+DlgSpellNoSuggestions	: "- គ្មានសំណើរ -",
+DlgSpellProgress		: "កំពុងពិនិត្យអក្ខរាវិរុទ្ធ...",
+DlgSpellNoMispell		: "ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: គ្មានកំហុស",
+DlgSpellNoChanges		: "ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពុំមានផ្លាស់ប្តូរ",
+DlgSpellOneChange		: "ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: ពាក្យមួយត្រូចបានផ្លាស់ប្តូរ",
+DlgSpellManyChanges		: "ការពិនិត្យអក្ខរាវិរុទ្ធបានចប់: %1 ពាក្យបានផ្លាស់ប្តូរ",
+
+IeSpellDownload			: "ពុំមានកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ ។ តើចង់ទាញយកពីណា?",
+
+// Button Dialog
+DlgButtonText		: "អត្ថបទ(តំលៃ)",
+DlgButtonType		: "ប្រភេទ",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "ឈ្មោះ",
+DlgCheckboxValue	: "តំលៃ",
+DlgCheckboxSelected	: "បានជ្រើសរើស",
+
+// Form Dialog
+DlgFormName		: "ឈ្មោះ",
+DlgFormAction	: "សកម្មភាព",
+DlgFormMethod	: "វិធី",
+
+// Select Field Dialog
+DlgSelectName		: "ឈ្មោះ",
+DlgSelectValue		: "តំលៃ",
+DlgSelectSize		: "ទំហំ",
+DlgSelectLines		: "បន្ទាត់",
+DlgSelectChkMulti	: "អនុញ្ញាតអោយជ្រើសរើសច្រើន",
+DlgSelectOpAvail	: "ការកំណត់ជ្រើសរើស ដែលអាចកំណត់បាន",
+DlgSelectOpText		: "ពាក្យ",
+DlgSelectOpValue	: "តំលៃ",
+DlgSelectBtnAdd		: "បន្ថែម",
+DlgSelectBtnModify	: "ផ្លាស់ប្តូរ",
+DlgSelectBtnUp		: "លើ",
+DlgSelectBtnDown	: "ក្រោម",
+DlgSelectBtnSetValue : "Set as selected value",	//MISSING
+DlgSelectBtnDelete	: "លប់",
+
+// Textarea Dialog
+DlgTextareaName	: "ឈ្មោះ",
+DlgTextareaCols	: "ជូរឈរ",
+DlgTextareaRows	: "ជូរផ្តេក",
+
+// Text Field Dialog
+DlgTextName			: "ឈ្មោះ",
+DlgTextValue		: "តំលៃ",
+DlgTextCharWidth	: "ទទឹង អក្សរ",
+DlgTextMaxChars		: "អក្សរអតិបរិមា",
+DlgTextType			: "ប្រភេទ",
+DlgTextTypeText		: "ពាក្យ",
+DlgTextTypePass		: "ពាក្យសំងាត់",
+
+// Hidden Field Dialog
+DlgHiddenName	: "ឈ្មោះ",
+DlgHiddenValue	: "តំលៃ",
+
+// Bulleted List Dialog
+BulletedListProp	: "កំណត់បញ្ជីរង្វង់",
+NumberedListProp	: "កំណត់បញ្េជីលេខ",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "ប្រភេទ",
+DlgLstTypeCircle	: "រង្វង់",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "ការេ",
+DlgLstTypeNumbers	: "លេខ(1, 2, 3)",
+DlgLstTypeLCase		: "អក្សរតូច(a, b, c)",
+DlgLstTypeUCase		: "អក្សរធំ(A, B, C)",
+DlgLstTypeSRoman	: "អក្សរឡាតាំងតូច(i, ii, iii)",
+DlgLstTypeLRoman	: "អក្សរឡាតាំងធំ(I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "ទូទៅ",
+DlgDocBackTab		: "ផ្នែកខាងក្រោយ",
+DlgDocColorsTab		: "ទំព័រ​និង ស៊ុម",
+DlgDocMetaTab		: "ទិន្នន័យមេ",
+
+DlgDocPageTitle		: "ចំណងជើងទំព័រ",
+DlgDocLangDir		: "ទិសដៅសរសេរភាសា",
+DlgDocLangDirLTR	: "ពីឆ្វេងទៅស្ដាំ(LTR)",
+DlgDocLangDirRTL	: "ពីស្ដាំទៅឆ្វេង(RTL)",
+DlgDocLangCode		: "លេខកូតភាសា",
+DlgDocCharSet		: "កំណត់លេខកូតភាសា",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "កំណត់លេខកូតភាសាផ្សេងទៀត",
+
+DlgDocDocType		: "ប្រភេទក្បាលទំព័រ",
+DlgDocDocTypeOther	: "ប្រភេទក្បាលទំព័រផ្សេងទៀត",
+DlgDocIncXHTML		: "បញ្ជូល XHTML",
+DlgDocBgColor		: "ពណ៌ខាងក្រោម",
+DlgDocBgImage		: "URL របស់រូបភាពខាងក្រោម",
+DlgDocBgNoScroll	: "ទំព័រក្រោមមិនប្តូរ",
+DlgDocCText			: "អត្តបទ",
+DlgDocCLink			: "ឈ្នាប់",
+DlgDocCVisited		: "ឈ្នាប់មើលហើយ",
+DlgDocCActive		: "ឈ្នាប់កំពុងមើល",
+DlgDocMargins		: "ស៊ុមទំព័រ",
+DlgDocMaTop			: "លើ",
+DlgDocMaLeft		: "ឆ្វេង",
+DlgDocMaRight		: "ស្ដាំ",
+DlgDocMaBottom		: "ក្រោម",
+DlgDocMeIndex		: "ពាក្យនៅក្នុងឯកសារ (ផ្តាច់ពីគ្នាដោយក្បៀស)",
+DlgDocMeDescr		: "សេចក្តីអត្ថាធិប្បាយអំពីឯកសារ",
+DlgDocMeAuthor		: "អ្នកនិពន្ធ",
+DlgDocMeCopy		: "រក្សាសិទ្ធិ៏",
+DlgDocPreview		: "មើលសាកល្បង",
+
+// Templates Dialog
+Templates			: "ឯកសារគំរូ",
+DlgTemplatesTitle	: "ឯកសារគំរូ របស់អត្ថន័យ",
+DlgTemplatesSelMsg	: "សូមជ្រើសរើសឯកសារគំរូ ដើម្បីបើកនៅក្នុងកម្មវិធីតាក់តែងអត្ថបទ<br>(អត្ថបទនឹងបាត់បង់):",
+DlgTemplatesLoading	: "កំពុងអានបញ្ជីឯកសារគំរូ ។ សូមរងចាំ...",
+DlgTemplatesNoTpl	: "(ពុំមានឯកសារគំរូត្រូវបានកំណត់)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "អំពី",
+DlgAboutBrowserInfoTab	: "ព៌តមានកម្មវិធីរុករក",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "ជំនាន់",
+DlgAboutInfo		: "សំរាប់ព៌តមានផ្សេងទៀត សូមទាក់ទង",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ko.js b/modules/editor/skins/fckeditor/editor/lang/ko.js
new file mode 100644
index 000000000..00870ded1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ko.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Korean language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "툴바 감추기",
+ToolbarExpand		: "툴바 보이기",
+
+// Toolbar Items and Context Menu
+Save				: "저장하기",
+NewPage				: "새 문서",
+Preview				: "미리보기",
+Cut					: "잘라내기",
+Copy				: "복사하기",
+Paste				: "붙여넣기",
+PasteText			: "텍스트로 붙여넣기",
+PasteWord			: "MS Word 형식에서 붙여넣기",
+Print				: "인쇄하기",
+SelectAll			: "전체선택",
+RemoveFormat		: "포맷 지우기",
+InsertLinkLbl		: "링크",
+InsertLink			: "링크 삽입/변경",
+RemoveLink			: "링크 삭제",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "책갈피 삽입/변경",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "이미지",
+InsertImage			: "이미지 삽입/변경",
+InsertFlashLbl		: "플래쉬",
+InsertFlash			: "플래쉬 삽입/변경",
+InsertTableLbl		: "표",
+InsertTable			: "표 삽입/변경",
+InsertLineLbl		: "수평선",
+InsertLine			: "수평선 삽입",
+InsertSpecialCharLbl: "특수문자 삽입",
+InsertSpecialChar	: "특수문자 삽입",
+InsertSmileyLbl		: "아이콘",
+InsertSmiley		: "아이콘 삽입",
+About				: "FCKeditor에 대하여",
+Bold				: "진하게",
+Italic				: "이텔릭",
+Underline			: "밑줄",
+StrikeThrough		: "취소선",
+Subscript			: "아래 첨자",
+Superscript			: "위 첨자",
+LeftJustify			: "왼쪽 정렬",
+CenterJustify		: "가운데 정렬",
+RightJustify		: "오른쪽 정렬",
+BlockJustify		: "양쪽 맞춤",
+DecreaseIndent		: "내어쓰기",
+IncreaseIndent		: "들여쓰기",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "취소",
+Redo				: "재실행",
+NumberedListLbl		: "순서있는 목록",
+NumberedList		: "순서있는 목록",
+BulletedListLbl		: "순서없는 목록",
+BulletedList		: "순서없는 목록",
+ShowTableBorders	: "표 테두리 보기",
+ShowDetails			: "문서기호 보기",
+Style				: "스타일",
+FontFormat			: "포맷",
+Font				: "폰트",
+FontSize			: "글자 크기",
+TextColor			: "글자 색상",
+BGColor				: "배경 색상",
+Source				: "소스",
+Find				: "찾기",
+Replace				: "바꾸기",
+SpellCheck			: "철자검사",
+UniversalKeyboard	: "다국어 입력기",
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "폼",
+Checkbox		: "체크박스",
+RadioButton		: "라디오버튼",
+TextField		: "입력필드",
+Textarea		: "입력영역",
+HiddenField		: "숨김필드",
+Button			: "버튼",
+SelectionField	: "펼침목록",
+ImageButton		: "이미지버튼",
+
+FitWindow		: "에디터 최대화",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "링크 수정",
+CellCM				: "셀/칸(Cell)",
+RowCM				: "행(Row)",
+ColumnCM			: "열(Column)",
+InsertRowAfter		: "뒤에 행 삽입",
+InsertRowBefore		: "앞에 행 삽입",
+DeleteRows			: "가로줄 삭제",
+InsertColumnAfter	: "뒤에 열 삽입",
+InsertColumnBefore	: "앞에 열 삽입",
+DeleteColumns		: "세로줄 삭제",
+InsertCellAfter		: "뒤에 셀/칸 삽입",
+InsertCellBefore	: "앞에 셀/칸 삽입",
+DeleteCells			: "셀 삭제",
+MergeCells			: "셀 합치기",
+MergeRight			: "오른쪽 뭉치기",
+MergeDown			: "왼쪽 뭉치기",
+HorizontalSplitCell	: "수평 나누기",
+VerticalSplitCell	: "수직 나누기",
+TableDelete			: "표 삭제",
+CellProperties		: "셀 속성",
+TableProperties		: "표 속성",
+ImageProperties		: "이미지 속성",
+FlashProperties		: "플래쉬 속성",
+
+AnchorProp			: "책갈피 속성",
+ButtonProp			: "버튼 속성",
+CheckboxProp		: "체크박스 속성",
+HiddenFieldProp		: "숨김필드 속성",
+RadioButtonProp		: "라디오버튼 속성",
+ImageButtonProp		: "이미지버튼 속성",
+TextFieldProp		: "입력필드 속성",
+SelectionFieldProp	: "펼침목록 속성",
+TextareaProp		: "입력영역 속성",
+FormProp			: "폼 속성",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML 처리중. 잠시만 기다려주십시요.",
+Done				: "완료",
+PasteWordConfirm	: "붙여넣기 할 텍스트는 MS Word에서 복사한 것입니다. 붙여넣기 전에 MS Word 포멧을 삭제하시겠습니까?",
+NotCompatiblePaste	: "이 명령은 인터넷익스플로러 5.5 버전 이상에서만 작동합니다. 포멧을 삭제하지 않고 붙여넣기 하시겠습니까?",
+UnknownToolbarItem	: "알수없는 툴바입니다. : \"%1\"",
+UnknownCommand		: "알수없는 기능입니다. : \"%1\"",
+NotImplemented		: "기능이 실행되지 않았습니다.",
+UnknownToolbarSet	: "툴바 설정이 없습니다. : \"%1\"",
+NoActiveX			: "브러우저의 보안 설정으로 인해 몇몇 기능의 작동에 장애가 있을 수 있습니다. \"액티브-액스 기능과 플러그 인\" 옵션을 허용하여 주시지 않으면 오류가 발생할 수 있습니다.",
+BrowseServerBlocked : "브러우저 요소가 열리지 않습니다. 팝업차단 설정이 꺼져있는지 확인하여 주십시오.",
+DialogBlocked		: "윈도우 대화창을 열 수 없습니다. 팝업차단 설정이 꺼져있는지 확인하여 주십시오.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "예",
+DlgBtnCancel		: "아니오",
+DlgBtnClose			: "닫기",
+DlgBtnBrowseServer	: "서버 보기",
+DlgAdvancedTag		: "자세히",
+DlgOpOther			: "<기타>",
+DlgInfoTab			: "정보",
+DlgAlertUrl			: "URL을 입력하십시요",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<설정되지 않음>",
+DlgGenId			: "ID",
+DlgGenLangDir		: "쓰기 방향",
+DlgGenLangDirLtr	: "왼쪽에서 오른쪽 (LTR)",
+DlgGenLangDirRtl	: "오른쪽에서 왼쪽 (RTL)",
+DlgGenLangCode		: "언어 코드",
+DlgGenAccessKey		: "엑세스 키",
+DlgGenName			: "Name",
+DlgGenTabIndex		: "탭 순서",
+DlgGenLongDescr		: "URL 설명",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "이미지 설정",
+DlgImgInfoTab		: "이미지 정보",
+DlgImgBtnUpload		: "서버로 전송",
+DlgImgURL			: "URL",
+DlgImgUpload		: "업로드",
+DlgImgAlt			: "이미지 설명",
+DlgImgWidth			: "너비",
+DlgImgHeight		: "높이",
+DlgImgLockRatio		: "비율 유지",
+DlgBtnResetSize		: "원래 크기로",
+DlgImgBorder		: "테두리",
+DlgImgHSpace		: "수평여백",
+DlgImgVSpace		: "수직여백",
+DlgImgAlign			: "정렬",
+DlgImgAlignLeft		: "왼쪽",
+DlgImgAlignAbsBottom: "줄아래(Abs Bottom)",
+DlgImgAlignAbsMiddle: "줄중간(Abs Middle)",
+DlgImgAlignBaseline	: "기준선",
+DlgImgAlignBottom	: "아래",
+DlgImgAlignMiddle	: "중간",
+DlgImgAlignRight	: "오른쪽",
+DlgImgAlignTextTop	: "글자상단",
+DlgImgAlignTop		: "위",
+DlgImgPreview		: "미리보기",
+DlgImgAlertUrl		: "이미지 URL을 입력하십시요",
+DlgImgLinkTab		: "링크",
+
+// Flash Dialog
+DlgFlashTitle		: "플래쉬 등록정보",
+DlgFlashChkPlay		: "자동재생",
+DlgFlashChkLoop		: "반복",
+DlgFlashChkMenu		: "플래쉬메뉴 가능",
+DlgFlashScale		: "영역",
+DlgFlashScaleAll	: "모두보기",
+DlgFlashScaleNoBorder	: "경계선없음",
+DlgFlashScaleFit	: "영역자동조절",
+
+// Link Dialog
+DlgLnkWindowTitle	: "링크",
+DlgLnkInfoTab		: "링크 정보",
+DlgLnkTargetTab		: "타겟",
+
+DlgLnkType			: "링크 종류",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "책갈피",
+DlgLnkTypeEMail		: "이메일",
+DlgLnkProto			: "프로토콜",
+DlgLnkProtoOther	: "<기타>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "책갈피 선택",
+DlgLnkAnchorByName	: "책갈피 이름",
+DlgLnkAnchorById	: "책갈피 ID",
+DlgLnkNoAnchors		: "(문서에 책갈피가 없습니다.)",
+DlgLnkEMail			: "이메일 주소",
+DlgLnkEMailSubject	: "제목",
+DlgLnkEMailBody		: "내용",
+DlgLnkUpload		: "업로드",
+DlgLnkBtnUpload		: "서버로 전송",
+
+DlgLnkTarget		: "타겟",
+DlgLnkTargetFrame	: "<프레임>",
+DlgLnkTargetPopup	: "<팝업창>",
+DlgLnkTargetBlank	: "새 창 (_blank)",
+DlgLnkTargetParent	: "부모 창 (_parent)",
+DlgLnkTargetSelf	: "현재 창 (_self)",
+DlgLnkTargetTop		: "최 상위 창 (_top)",
+DlgLnkTargetFrameName	: "타겟 프레임 이름",
+DlgLnkPopWinName	: "팝업창 이름",
+DlgLnkPopWinFeat	: "팝업창 설정",
+DlgLnkPopResize		: "크기조정",
+DlgLnkPopLocation	: "주소표시줄",
+DlgLnkPopMenu		: "메뉴바",
+DlgLnkPopScroll		: "스크롤바",
+DlgLnkPopStatus		: "상태바",
+DlgLnkPopToolbar	: "툴바",
+DlgLnkPopFullScrn	: "전체화면 (IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "너비",
+DlgLnkPopHeight		: "높이",
+DlgLnkPopLeft		: "왼쪽 위치",
+DlgLnkPopTop		: "윗쪽 위치",
+
+DlnLnkMsgNoUrl		: "링크 URL을 입력하십시요.",
+DlnLnkMsgNoEMail	: "이메일주소를 입력하십시요.",
+DlnLnkMsgNoAnchor	: "책갈피명을 입력하십시요.",
+DlnLnkMsgInvPopName	: "팝업창의 타이틀은 공백을 허용하지 않습니다.",
+
+// Color Dialog
+DlgColorTitle		: "색상 선택",
+DlgColorBtnClear	: "지우기",
+DlgColorHighlight	: "현재",
+DlgColorSelected	: "선택됨",
+
+// Smiley Dialog
+DlgSmileyTitle		: "아이콘 삽입",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "특수문자 선택",
+
+// Table Dialog
+DlgTableTitle		: "표 설정",
+DlgTableRows		: "가로줄",
+DlgTableColumns		: "세로줄",
+DlgTableBorder		: "테두리 크기",
+DlgTableAlign		: "정렬",
+DlgTableAlignNotSet	: "<설정되지 않음>",
+DlgTableAlignLeft	: "왼쪽",
+DlgTableAlignCenter	: "가운데",
+DlgTableAlignRight	: "오른쪽",
+DlgTableWidth		: "너비",
+DlgTableWidthPx		: "픽셀",
+DlgTableWidthPc		: "퍼센트",
+DlgTableHeight		: "높이",
+DlgTableCellSpace	: "셀 간격",
+DlgTableCellPad		: "셀 여백",
+DlgTableCaption		: "캡션",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "셀 설정",
+DlgCellWidth		: "너비",
+DlgCellWidthPx		: "픽셀",
+DlgCellWidthPc		: "퍼센트",
+DlgCellHeight		: "높이",
+DlgCellWordWrap		: "워드랩",
+DlgCellWordWrapNotSet	: "<설정되지 않음>",
+DlgCellWordWrapYes	: "예",
+DlgCellWordWrapNo	: "아니오",
+DlgCellHorAlign		: "수평 정렬",
+DlgCellHorAlignNotSet	: "<설정되지 않음>",
+DlgCellHorAlignLeft	: "왼쪽",
+DlgCellHorAlignCenter	: "가운데",
+DlgCellHorAlignRight: "오른쪽",
+DlgCellVerAlign		: "수직 정렬",
+DlgCellVerAlignNotSet	: "<설정되지 않음>",
+DlgCellVerAlignTop	: "위",
+DlgCellVerAlignMiddle	: "중간",
+DlgCellVerAlignBottom	: "아래",
+DlgCellVerAlignBaseline	: "기준선",
+DlgCellRowSpan		: "세로 합치기",
+DlgCellCollSpan		: "가로 합치기",
+DlgCellBackColor	: "배경 색상",
+DlgCellBorderColor	: "테두리 색상",
+DlgCellBtnSelect	: "선택",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "찾기 & 바꾸기",
+
+// Find Dialog
+DlgFindTitle		: "찾기",
+DlgFindFindBtn		: "찾기",
+DlgFindNotFoundMsg	: "문자열을 찾을 수 없습니다.",
+
+// Replace Dialog
+DlgReplaceTitle			: "바꾸기",
+DlgReplaceFindLbl		: "찾을 문자열:",
+DlgReplaceReplaceLbl	: "바꿀 문자열:",
+DlgReplaceCaseChk		: "대소문자 구분",
+DlgReplaceReplaceBtn	: "바꾸기",
+DlgReplaceReplAllBtn	: "모두 바꾸기",
+DlgReplaceWordChk		: "온전한 단어",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "브라우저의 보안설정때문에 잘라내기 기능을 실행할 수 없습니다. 키보드 명령을 사용하십시요. (Ctrl+X).",
+PasteErrorCopy	: "브라우저의 보안설정때문에 복사하기 기능을 실행할 수 없습니다. 키보드 명령을 사용하십시요.  (Ctrl+C).",
+
+PasteAsText		: "텍스트로 붙여넣기",
+PasteFromWord	: "MS Word 형식에서 붙여넣기",
+
+DlgPasteMsg2	: "키보드의 (<STRONG>Ctrl+V</STRONG>) 를 이용해서 상자안에 붙여넣고 <STRONG>OK</STRONG> 를 누르세요.",
+DlgPasteSec		: "브러우저 보안 설정으로 인해, 클립보드의 자료를 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.",
+DlgPasteIgnoreFont		: "폰트 설정 무시",
+DlgPasteRemoveStyles	: "스타일 정의 제거",
+
+// Color Picker
+ColorAutomatic	: "기본색상",
+ColorMoreColors	: "색상선택...",
+
+// Document Properties
+DocProps		: "문서 속성",
+
+// Anchor Dialog
+DlgAnchorTitle		: "책갈피 속성",
+DlgAnchorName		: "책갈피 이름",
+DlgAnchorErrorName	: "책갈피 이름을 입력하십시요.",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "사전에 없는 단어",
+DlgSpellChangeTo		: "변경할 단어",
+DlgSpellBtnIgnore		: "건너뜀",
+DlgSpellBtnIgnoreAll	: "모두 건너뜀",
+DlgSpellBtnReplace		: "변경",
+DlgSpellBtnReplaceAll	: "모두 변경",
+DlgSpellBtnUndo			: "취소",
+DlgSpellNoSuggestions	: "- 추천단어 없음 -",
+DlgSpellProgress		: "철자검사를 진행중입니다...",
+DlgSpellNoMispell		: "철자검사 완료: 잘못된 철자가 없습니다.",
+DlgSpellNoChanges		: "철자검사 완료: 변경된 단어가 없습니다.",
+DlgSpellOneChange		: "철자검사 완료: 단어가 변경되었습니다.",
+DlgSpellManyChanges		: "철자검사 완료: %1 단어가 변경되었습니다.",
+
+IeSpellDownload			: "철자 검사기가 철치되지 않았습니다. 지금 다운로드하시겠습니까?",
+
+// Button Dialog
+DlgButtonText		: "버튼글자(값)",
+DlgButtonType		: "버튼종류",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "이름",
+DlgCheckboxValue	: "값",
+DlgCheckboxSelected	: "선택됨",
+
+// Form Dialog
+DlgFormName		: "폼이름",
+DlgFormAction	: "실행경로(Action)",
+DlgFormMethod	: "방법(Method)",
+
+// Select Field Dialog
+DlgSelectName		: "이름",
+DlgSelectValue		: "값",
+DlgSelectSize		: "세로크기",
+DlgSelectLines		: "줄",
+DlgSelectChkMulti	: "여러항목 선택 허용",
+DlgSelectOpAvail	: "선택옵션",
+DlgSelectOpText		: "이름",
+DlgSelectOpValue	: "값",
+DlgSelectBtnAdd		: "추가",
+DlgSelectBtnModify	: "변경",
+DlgSelectBtnUp		: "위로",
+DlgSelectBtnDown	: "아래로",
+DlgSelectBtnSetValue : "선택된것으로 설정",
+DlgSelectBtnDelete	: "삭제",
+
+// Textarea Dialog
+DlgTextareaName	: "이름",
+DlgTextareaCols	: "칸수",
+DlgTextareaRows	: "줄수",
+
+// Text Field Dialog
+DlgTextName			: "이름",
+DlgTextValue		: "값",
+DlgTextCharWidth	: "글자 너비",
+DlgTextMaxChars		: "최대 글자수",
+DlgTextType			: "종류",
+DlgTextTypeText		: "문자열",
+DlgTextTypePass		: "비밀번호",
+
+// Hidden Field Dialog
+DlgHiddenName	: "이름",
+DlgHiddenValue	: "값",
+
+// Bulleted List Dialog
+BulletedListProp	: "순서없는 목록 속성",
+NumberedListProp	: "순서있는 목록 속성",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "종류",
+DlgLstTypeCircle	: "원(Circle)",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "네모점(Square)",
+DlgLstTypeNumbers	: "번호 (1, 2, 3)",
+DlgLstTypeLCase		: "소문자 (a, b, c)",
+DlgLstTypeUCase		: "대문자 (A, B, C)",
+DlgLstTypeSRoman	: "로마자 수문자 (i, ii, iii)",
+DlgLstTypeLRoman	: "로마자 대문자 (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "일반",
+DlgDocBackTab		: "배경",
+DlgDocColorsTab		: "색상 및 여백",
+DlgDocMetaTab		: "메타데이터",
+
+DlgDocPageTitle		: "페이지명",
+DlgDocLangDir		: "문자 쓰기방향",
+DlgDocLangDirLTR	: "왼쪽에서 오른쪽 (LTR)",
+DlgDocLangDirRTL	: "오른쪽에서 왼쪽 (RTL)",
+DlgDocLangCode		: "언어코드",
+DlgDocCharSet		: "캐릭터셋 인코딩",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "다른 캐릭터셋 인코딩",
+
+DlgDocDocType		: "문서 헤드",
+DlgDocDocTypeOther	: "다른 문서헤드",
+DlgDocIncXHTML		: "XHTML 문서정의 포함",
+DlgDocBgColor		: "배경색상",
+DlgDocBgImage		: "배경이미지 URL",
+DlgDocBgNoScroll	: "스크롤되지않는 배경",
+DlgDocCText			: "텍스트",
+DlgDocCLink			: "링크",
+DlgDocCVisited		: "방문한 링크(Visited)",
+DlgDocCActive		: "활성화된 링크(Active)",
+DlgDocMargins		: "페이지 여백",
+DlgDocMaTop			: "위",
+DlgDocMaLeft		: "왼쪽",
+DlgDocMaRight		: "오른쪽",
+DlgDocMaBottom		: "아래",
+DlgDocMeIndex		: "문서 키워드 (콤마로 구분)",
+DlgDocMeDescr		: "문서 설명",
+DlgDocMeAuthor		: "작성자",
+DlgDocMeCopy		: "저작권",
+DlgDocPreview		: "미리보기",
+
+// Templates Dialog
+Templates			: "템플릿",
+DlgTemplatesTitle	: "내용 템플릿",
+DlgTemplatesSelMsg	: "에디터에서 사용할 템플릿을 선택하십시요.<br>(지금까지 작성된 내용은 사라집니다.):",
+DlgTemplatesLoading	: "템플릿 목록을 불러오는중입니다. 잠시만 기다려주십시요.",
+DlgTemplatesNoTpl	: "(템플릿이 없습니다.)",
+DlgTemplatesReplace	: "현재 내용 바꾸기",
+
+// About Dialog
+DlgAboutAboutTab	: "About",
+DlgAboutBrowserInfoTab	: "브라우저 정보",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "버전",
+DlgAboutInfo		: "더 많은 정보를 보시려면 다음 사이트로 가십시오.",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/lt.js b/modules/editor/skins/fckeditor/editor/lang/lt.js
new file mode 100644
index 000000000..de2f8f52e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/lt.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Lithuanian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Sutraukti mygtukų juostą",
+ToolbarExpand		: "Išplėsti mygtukų juostą",
+
+// Toolbar Items and Context Menu
+Save				: "Išsaugoti",
+NewPage				: "Naujas puslapis",
+Preview				: "Peržiūra",
+Cut					: "Iškirpti",
+Copy				: "Kopijuoti",
+Paste				: "Įdėti",
+PasteText			: "Įdėti kaip gryną tekstą",
+PasteWord			: "Įdėti iš Word",
+Print				: "Spausdinti",
+SelectAll			: "Pažymėti viską",
+RemoveFormat		: "Panaikinti formatą",
+InsertLinkLbl		: "Nuoroda",
+InsertLink			: "Įterpti/taisyti nuorodą",
+RemoveLink			: "Panaikinti nuorodą",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Įterpti/modifikuoti žymę",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Vaizdas",
+InsertImage			: "Įterpti/taisyti vaizdą",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Įterpti/taisyti Flash",
+InsertTableLbl		: "Lentelė",
+InsertTable			: "Įterpti/taisyti lentelę",
+InsertLineLbl		: "Linija",
+InsertLine			: "Įterpti horizontalią liniją",
+InsertSpecialCharLbl: "Spec. simbolis",
+InsertSpecialChar	: "Įterpti specialų simbolį",
+InsertSmileyLbl		: "Veideliai",
+InsertSmiley		: "Įterpti veidelį",
+About				: "Apie FCKeditor",
+Bold				: "Pusjuodis",
+Italic				: "Kursyvas",
+Underline			: "Pabrauktas",
+StrikeThrough		: "Perbrauktas",
+Subscript			: "Apatinis indeksas",
+Superscript			: "Viršutinis indeksas",
+LeftJustify			: "Lygiuoti kairę",
+CenterJustify		: "Centruoti",
+RightJustify		: "Lygiuoti dešinę",
+BlockJustify		: "Lygiuoti abi puses",
+DecreaseIndent		: "Sumažinti įtrauką",
+IncreaseIndent		: "Padidinti įtrauką",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Atšaukti",
+Redo				: "Atstatyti",
+NumberedListLbl		: "Numeruotas sąrašas",
+NumberedList		: "Įterpti/Panaikinti numeruotą sąrašą",
+BulletedListLbl		: "Suženklintas sąrašas",
+BulletedList		: "Įterpti/Panaikinti suženklintą sąrašą",
+ShowTableBorders	: "Rodyti lentelės rėmus",
+ShowDetails			: "Rodyti detales",
+Style				: "Stilius",
+FontFormat			: "Šrifto formatas",
+Font				: "Šriftas",
+FontSize			: "Šrifto dydis",
+TextColor			: "Teksto spalva",
+BGColor				: "Fono spalva",
+Source				: "Šaltinis",
+Find				: "Rasti",
+Replace				: "Pakeisti",
+SpellCheck			: "Rašybos tikrinimas",
+UniversalKeyboard	: "Universali klaviatūra",
+PageBreakLbl		: "Puslapių skirtukas",
+PageBreak			: "Įterpti puslapių skirtuką",
+
+Form			: "Forma",
+Checkbox		: "Žymimasis langelis",
+RadioButton		: "Žymimoji akutė",
+TextField		: "Teksto laukas",
+Textarea		: "Teksto sritis",
+HiddenField		: "Nerodomas laukas",
+Button			: "Mygtukas",
+SelectionField	: "Atrankos laukas",
+ImageButton		: "Vaizdinis mygtukas",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Taisyti nuorodą",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Šalinti eilutes",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Šalinti stulpelius",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Šalinti langelius",
+MergeCells			: "Sujungti langelius",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Šalinti lentelę",
+CellProperties		: "Langelio savybės",
+TableProperties		: "Lentelės savybės",
+ImageProperties		: "Vaizdo savybės",
+FlashProperties		: "Flash savybės",
+
+AnchorProp			: "Žymės savybės",
+ButtonProp			: "Mygtuko savybės",
+CheckboxProp		: "Žymimojo langelio savybės",
+HiddenFieldProp		: "Nerodomo lauko savybės",
+RadioButtonProp		: "Žymimosios akutės savybės",
+ImageButtonProp		: "Vaizdinio mygtuko savybės",
+TextFieldProp		: "Teksto lauko savybės",
+SelectionFieldProp	: "Atrankos lauko savybės",
+TextareaProp		: "Teksto srities savybės",
+FormProp			: "Formos savybės",
+
+FontFormats			: "Normalus;Formuotas;Kreipinio;Antraštinis 1;Antraštinis 2;Antraštinis 3;Antraštinis 4;Antraštinis 5;Antraštinis 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Apdorojamas XHTML. Prašome palaukti...",
+Done				: "Baigta",
+PasteWordConfirm	: "Įdedamas tekstas yra panašus į kopiją iš Word. Ar Jūs norite prieš įdėjimą išvalyti jį?",
+NotCompatiblePaste	: "Ši komanda yra prieinama tik per Internet Explorer 5.5 ar aukštesnę versiją. Ar Jūs norite įterpti be valymo?",
+UnknownToolbarItem	: "Nežinomas mygtukų juosta elementas \"%1\"",
+UnknownCommand		: "Nežinomas komandos vardas \"%1\"",
+NotImplemented		: "Komanda nėra įgyvendinta",
+UnknownToolbarSet	: "Mygtukų juostos rinkinys \"%1\" neegzistuoja",
+NoActiveX			: "Jūsų naršyklės saugumo nuostatos gali riboti kai kurias redaktoriaus savybes. Jūs turite aktyvuoti opciją \"Run ActiveX controls and plug-ins\". Kitu atveju Jums bus pranešama apie klaidas ir trūkstamas savybes.",
+BrowseServerBlocked : "Neįmanoma atidaryti naujo naršyklės lango. Įsitikinkite, kad iškylančių langų blokavimo programos neveiksnios.",
+DialogBlocked		: "Neįmanoma atidaryti dialogo lango. Įsitikinkite, kad iškylančių langų blokavimo programos neveiksnios.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Nutraukti",
+DlgBtnClose			: "Uždaryti",
+DlgBtnBrowseServer	: "Naršyti po serverį",
+DlgAdvancedTag		: "Papildomas",
+DlgOpOther			: "<Kita>",
+DlgInfoTab			: "Informacija",
+DlgAlertUrl			: "Prašome įrašyti URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nėra nustatyta>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Teksto kryptis",
+DlgGenLangDirLtr	: "Iš kairės į dešinę (LTR)",
+DlgGenLangDirRtl	: "Iš dešinės į kairę (RTL)",
+DlgGenLangCode		: "Kalbos kodas",
+DlgGenAccessKey		: "Prieigos raktas",
+DlgGenName			: "Vardas",
+DlgGenTabIndex		: "Tabuliavimo indeksas",
+DlgGenLongDescr		: "Ilgas aprašymas URL",
+DlgGenClass			: "Stilių lentelės klasės",
+DlgGenTitle			: "Konsultacinė antraštė",
+DlgGenContType		: "Konsultacinio turinio tipas",
+DlgGenLinkCharset	: "Susietų išteklių simbolių lentelė",
+DlgGenStyle			: "Stilius",
+
+// Image Dialog
+DlgImgTitle			: "Vaizdo savybės",
+DlgImgInfoTab		: "Vaizdo informacija",
+DlgImgBtnUpload		: "Siųsti į serverį",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Nusiųsti",
+DlgImgAlt			: "Alternatyvus Tekstas",
+DlgImgWidth			: "Plotis",
+DlgImgHeight		: "Aukštis",
+DlgImgLockRatio		: "Išlaikyti proporciją",
+DlgBtnResetSize		: "Atstatyti dydį",
+DlgImgBorder		: "Rėmelis",
+DlgImgHSpace		: "Hor.Erdvė",
+DlgImgVSpace		: "Vert.Erdvė",
+DlgImgAlign			: "Lygiuoti",
+DlgImgAlignLeft		: "Kairę",
+DlgImgAlignAbsBottom: "Absoliučią apačią",
+DlgImgAlignAbsMiddle: "Absoliutų vidurį",
+DlgImgAlignBaseline	: "Apatinę liniją",
+DlgImgAlignBottom	: "Apačią",
+DlgImgAlignMiddle	: "Vidurį",
+DlgImgAlignRight	: "Dešinę",
+DlgImgAlignTextTop	: "Teksto viršūnę",
+DlgImgAlignTop		: "Viršūnę",
+DlgImgPreview		: "Peržiūra",
+DlgImgAlertUrl		: "Prašome įvesti vaizdo URL",
+DlgImgLinkTab		: "Nuoroda",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash savybės",
+DlgFlashChkPlay		: "Automatinis paleidimas",
+DlgFlashChkLoop		: "Ciklas",
+DlgFlashChkMenu		: "Leisti Flash meniu",
+DlgFlashScale		: "Mastelis",
+DlgFlashScaleAll	: "Rodyti visą",
+DlgFlashScaleNoBorder	: "Be rėmelio",
+DlgFlashScaleFit	: "Tikslus atitikimas",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Nuoroda",
+DlgLnkInfoTab		: "Nuorodos informacija",
+DlgLnkTargetTab		: "Paskirtis",
+
+DlgLnkType			: "Nuorodos tipas",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Žymė šiame puslapyje",
+DlgLnkTypeEMail		: "El.paštas",
+DlgLnkProto			: "Protokolas",
+DlgLnkProtoOther	: "<kitas>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Pasirinkite žymę",
+DlgLnkAnchorByName	: "Pagal žymės vardą",
+DlgLnkAnchorById	: "Pagal žymės Id",
+DlgLnkNoAnchors		: "(Šiame dokumente žymių nėra)",
+DlgLnkEMail			: "El.pašto adresas",
+DlgLnkEMailSubject	: "Žinutės tema",
+DlgLnkEMailBody		: "Žinutės turinys",
+DlgLnkUpload		: "Siųsti",
+DlgLnkBtnUpload		: "Siųsti į serverį",
+
+DlgLnkTarget		: "Paskirties vieta",
+DlgLnkTargetFrame	: "<kadras>",
+DlgLnkTargetPopup	: "<išskleidžiamas langas>",
+DlgLnkTargetBlank	: "Naujas langas (_blank)",
+DlgLnkTargetParent	: "Pirminis langas (_parent)",
+DlgLnkTargetSelf	: "Tas pats langas (_self)",
+DlgLnkTargetTop		: "Svarbiausias langas (_top)",
+DlgLnkTargetFrameName	: "Paskirties kadro vardas",
+DlgLnkPopWinName	: "Paskirties lango vardas",
+DlgLnkPopWinFeat	: "Išskleidžiamo lango savybės",
+DlgLnkPopResize		: "Keičiamas dydis",
+DlgLnkPopLocation	: "Adreso juosta",
+DlgLnkPopMenu		: "Meniu juosta",
+DlgLnkPopScroll		: "Slinkties juostos",
+DlgLnkPopStatus		: "Būsenos juosta",
+DlgLnkPopToolbar	: "Mygtukų juosta",
+DlgLnkPopFullScrn	: "Visas ekranas (IE)",
+DlgLnkPopDependent	: "Priklausomas (Netscape)",
+DlgLnkPopWidth		: "Plotis",
+DlgLnkPopHeight		: "Aukštis",
+DlgLnkPopLeft		: "Kairė pozicija",
+DlgLnkPopTop		: "Viršutinė pozicija",
+
+DlnLnkMsgNoUrl		: "Prašome įvesti nuorodos URL",
+DlnLnkMsgNoEMail	: "Prašome įvesti el.pašto adresą",
+DlnLnkMsgNoAnchor	: "Prašome pasirinkti žymę",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Pasirinkite spalvą",
+DlgColorBtnClear	: "Trinti",
+DlgColorHighlight	: "Paryškinta",
+DlgColorSelected	: "Pažymėta",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Įterpti veidelį",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Pasirinkite specialų simbolį",
+
+// Table Dialog
+DlgTableTitle		: "Lentelės savybės",
+DlgTableRows		: "Eilutės",
+DlgTableColumns		: "Stulpeliai",
+DlgTableBorder		: "Rėmelio dydis",
+DlgTableAlign		: "Lygiuoti",
+DlgTableAlignNotSet	: "<Nenustatyta>",
+DlgTableAlignLeft	: "Kairę",
+DlgTableAlignCenter	: "Centrą",
+DlgTableAlignRight	: "Dešinę",
+DlgTableWidth		: "Plotis",
+DlgTableWidthPx		: "taškais",
+DlgTableWidthPc		: "procentais",
+DlgTableHeight		: "Aukštis",
+DlgTableCellSpace	: "Tarpas tarp langelių",
+DlgTableCellPad		: "Trapas nuo langelio rėmo iki teksto",
+DlgTableCaption		: "Antraštė",
+DlgTableSummary		: "Santrauka",
+
+// Table Cell Dialog
+DlgCellTitle		: "Langelio savybės",
+DlgCellWidth		: "Plotis",
+DlgCellWidthPx		: "taškais",
+DlgCellWidthPc		: "procentais",
+DlgCellHeight		: "Aukštis",
+DlgCellWordWrap		: "Teksto laužymas",
+DlgCellWordWrapNotSet	: "<Nenustatyta>",
+DlgCellWordWrapYes	: "Taip",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Horizontaliai lygiuoti",
+DlgCellHorAlignNotSet	: "<Nenustatyta>",
+DlgCellHorAlignLeft	: "Kairę",
+DlgCellHorAlignCenter	: "Centrą",
+DlgCellHorAlignRight: "Dešinę",
+DlgCellVerAlign		: "Vertikaliai lygiuoti",
+DlgCellVerAlignNotSet	: "<Nenustatyta>",
+DlgCellVerAlignTop	: "Viršų",
+DlgCellVerAlignMiddle	: "Vidurį",
+DlgCellVerAlignBottom	: "Apačią",
+DlgCellVerAlignBaseline	: "Apatinę liniją",
+DlgCellRowSpan		: "Eilučių apjungimas",
+DlgCellCollSpan		: "Stulpelių apjungimas",
+DlgCellBackColor	: "Fono spalva",
+DlgCellBorderColor	: "Rėmelio spalva",
+DlgCellBtnSelect	: "Pažymėti...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Paieška",
+DlgFindFindBtn		: "Surasti",
+DlgFindNotFoundMsg	: "Nurodytas tekstas nerastas.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Pakeisti",
+DlgReplaceFindLbl		: "Surasti tekstą:",
+DlgReplaceReplaceLbl	: "Pakeisti tekstu:",
+DlgReplaceCaseChk		: "Skirti didžiąsias ir mažąsias raides",
+DlgReplaceReplaceBtn	: "Pakeisti",
+DlgReplaceReplAllBtn	: "Pakeisti viską",
+DlgReplaceWordChk		: "Atitikti pilną žodį",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl+X).",
+PasteErrorCopy	: "Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl+C).",
+
+PasteAsText		: "Įdėti kaip gryną tekstą",
+PasteFromWord	: "Įdėti iš Word",
+
+DlgPasteMsg2	: "Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl+V</STRONG>) ir spūstelkite mygtuką <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignoruoti šriftų nustatymus",
+DlgPasteRemoveStyles	: "Pašalinti stilių nustatymus",
+
+// Color Picker
+ColorAutomatic	: "Automatinis",
+ColorMoreColors	: "Daugiau spalvų...",
+
+// Document Properties
+DocProps		: "Dokumento savybės",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Žymės savybės",
+DlgAnchorName		: "Žymės vardas",
+DlgAnchorErrorName	: "Prašome įvesti žymės vardą",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Žodyne nerastas",
+DlgSpellChangeTo		: "Pakeisti į",
+DlgSpellBtnIgnore		: "Ignoruoti",
+DlgSpellBtnIgnoreAll	: "Ignoruoti visus",
+DlgSpellBtnReplace		: "Pakeisti",
+DlgSpellBtnReplaceAll	: "Pakeisti visus",
+DlgSpellBtnUndo			: "Atšaukti",
+DlgSpellNoSuggestions	: "- Nėra pasiūlymų -",
+DlgSpellProgress		: "Vyksta rašybos tikrinimas...",
+DlgSpellNoMispell		: "Rašybos tikrinimas baigtas: Nerasta rašybos klaidų",
+DlgSpellNoChanges		: "Rašybos tikrinimas baigtas: Nėra pakeistų žodžių",
+DlgSpellOneChange		: "Rašybos tikrinimas baigtas: Vienas žodis pakeistas",
+DlgSpellManyChanges		: "Rašybos tikrinimas baigtas: Pakeista %1 žodžių",
+
+IeSpellDownload			: "Rašybos tikrinimas neinstaliuotas. Ar Jūs norite jį dabar atsisiųsti?",
+
+// Button Dialog
+DlgButtonText		: "Tekstas (Reikšmė)",
+DlgButtonType		: "Tipas",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Vardas",
+DlgCheckboxValue	: "Reikšmė",
+DlgCheckboxSelected	: "Pažymėtas",
+
+// Form Dialog
+DlgFormName		: "Vardas",
+DlgFormAction	: "Veiksmas",
+DlgFormMethod	: "Metodas",
+
+// Select Field Dialog
+DlgSelectName		: "Vardas",
+DlgSelectValue		: "Reikšmė",
+DlgSelectSize		: "Dydis",
+DlgSelectLines		: "eilučių",
+DlgSelectChkMulti	: "Leisti daugeriopą atranką",
+DlgSelectOpAvail	: "Galimos parinktys",
+DlgSelectOpText		: "Tekstas",
+DlgSelectOpValue	: "Reikšmė",
+DlgSelectBtnAdd		: "Įtraukti",
+DlgSelectBtnModify	: "Modifikuoti",
+DlgSelectBtnUp		: "Aukštyn",
+DlgSelectBtnDown	: "Žemyn",
+DlgSelectBtnSetValue : "Laikyti pažymėta reikšme",
+DlgSelectBtnDelete	: "Trinti",
+
+// Textarea Dialog
+DlgTextareaName	: "Vardas",
+DlgTextareaCols	: "Ilgis",
+DlgTextareaRows	: "Plotis",
+
+// Text Field Dialog
+DlgTextName			: "Vardas",
+DlgTextValue		: "Reikšmė",
+DlgTextCharWidth	: "Ilgis simboliais",
+DlgTextMaxChars		: "Maksimalus simbolių skaičius",
+DlgTextType			: "Tipas",
+DlgTextTypeText		: "Tekstas",
+DlgTextTypePass		: "Slaptažodis",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Vardas",
+DlgHiddenValue	: "Reikšmė",
+
+// Bulleted List Dialog
+BulletedListProp	: "Suženklinto sąrašo savybės",
+NumberedListProp	: "Numeruoto sąrašo savybės",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tipas",
+DlgLstTypeCircle	: "Apskritimas",
+DlgLstTypeDisc		: "Diskas",
+DlgLstTypeSquare	: "Kvadratas",
+DlgLstTypeNumbers	: "Skaičiai (1, 2, 3)",
+DlgLstTypeLCase		: "Mažosios raidės (a, b, c)",
+DlgLstTypeUCase		: "Didžiosios raidės (A, B, C)",
+DlgLstTypeSRoman	: "Romėnų mažieji skaičiai (i, ii, iii)",
+DlgLstTypeLRoman	: "Romėnų didieji skaičiai (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Bendros savybės",
+DlgDocBackTab		: "Fonas",
+DlgDocColorsTab		: "Spalvos ir kraštinės",
+DlgDocMetaTab		: "Meta duomenys",
+
+DlgDocPageTitle		: "Puslapio antraštė",
+DlgDocLangDir		: "Kalbos kryptis",
+DlgDocLangDirLTR	: "Iš kairės į dešinę (LTR)",
+DlgDocLangDirRTL	: "Iš dešinės į kairę (RTL)",
+DlgDocLangCode		: "Kalbos kodas",
+DlgDocCharSet		: "Simbolių kodavimo lentelė",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Kita simbolių kodavimo lentelė",
+
+DlgDocDocType		: "Dokumento tipo antraštė",
+DlgDocDocTypeOther	: "Kita dokumento tipo antraštė",
+DlgDocIncXHTML		: "Įtraukti XHTML deklaracijas",
+DlgDocBgColor		: "Fono spalva",
+DlgDocBgImage		: "Fono paveikslėlio nuoroda (URL)",
+DlgDocBgNoScroll	: "Neslenkantis fonas",
+DlgDocCText			: "Tekstas",
+DlgDocCLink			: "Nuoroda",
+DlgDocCVisited		: "Aplankyta nuoroda",
+DlgDocCActive		: "Aktyvi nuoroda",
+DlgDocMargins		: "Puslapio kraštinės",
+DlgDocMaTop			: "Viršuje",
+DlgDocMaLeft		: "Kairėje",
+DlgDocMaRight		: "Dešinėje",
+DlgDocMaBottom		: "Apačioje",
+DlgDocMeIndex		: "Dokumento indeksavimo raktiniai žodžiai (atskirti kableliais)",
+DlgDocMeDescr		: "Dokumento apibūdinimas",
+DlgDocMeAuthor		: "Autorius",
+DlgDocMeCopy		: "Autorinės teisės",
+DlgDocPreview		: "Peržiūra",
+
+// Templates Dialog
+Templates			: "Šablonai",
+DlgTemplatesTitle	: "Turinio šablonai",
+DlgTemplatesSelMsg	: "Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):",
+DlgTemplatesLoading	: "Įkeliamas šablonų sąrašas. Prašome palaukti...",
+DlgTemplatesNoTpl	: "(Šablonų sąrašas tuščias)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Apie",
+DlgAboutBrowserInfoTab	: "Naršyklės informacija",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "versija",
+DlgAboutInfo		: "Papildomą informaciją galima gauti",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/lv.js b/modules/editor/skins/fckeditor/editor/lang/lv.js
new file mode 100644
index 000000000..1db14abfd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/lv.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Latvian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Samazināt rīku joslu",
+ToolbarExpand		: "Paplašināt rīku joslu",
+
+// Toolbar Items and Context Menu
+Save				: "Saglabāt",
+NewPage				: "Jauna lapa",
+Preview				: "Pārskatīt",
+Cut					: "Izgriezt",
+Copy				: "Kopēt",
+Paste				: "Ievietot",
+PasteText			: "Ievietot kā vienkāršu tekstu",
+PasteWord			: "Ievietot no Worda",
+Print				: "Drukāt",
+SelectAll			: "Iezīmēt visu",
+RemoveFormat		: "Noņemt stilus",
+InsertLinkLbl		: "Hipersaite",
+InsertLink			: "Ievietot/Labot hipersaiti",
+RemoveLink			: "Noņemt hipersaiti",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Ievietot/Labot iezīmi",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Attēls",
+InsertImage			: "Ievietot/Labot Attēlu",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Ievietot/Labot Flash",
+InsertTableLbl		: "Tabula",
+InsertTable			: "Ievietot/Labot Tabulu",
+InsertLineLbl		: "Atdalītājsvītra",
+InsertLine			: "Ievietot horizontālu Atdalītājsvītru",
+InsertSpecialCharLbl: "Īpašs simbols",
+InsertSpecialChar	: "Ievietot speciālo simbolu",
+InsertSmileyLbl		: "Smaidiņi",
+InsertSmiley		: "Ievietot smaidiņu",
+About				: "Īsumā par FCKeditor",
+Bold				: "Treknu šriftu",
+Italic				: "Slīprakstā",
+Underline			: "Apakšsvītra",
+StrikeThrough		: "Pārsvītrots",
+Subscript			: "Zemrakstā",
+Superscript			: "Augšrakstā",
+LeftJustify			: "Izlīdzināt pa kreisi",
+CenterJustify		: "Izlīdzināt pret centru",
+RightJustify		: "Izlīdzināt pa labi",
+BlockJustify		: "Izlīdzināt malas",
+DecreaseIndent		: "Samazināt atkāpi",
+IncreaseIndent		: "Palielināt atkāpi",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Atcelt",
+Redo				: "Atkārtot",
+NumberedListLbl		: "Numurēts saraksts",
+NumberedList		: "Ievietot/Noņemt numerēto sarakstu",
+BulletedListLbl		: "Izcelts saraksts",
+BulletedList		: "Ievietot/Noņemt izceltu sarakstu",
+ShowTableBorders	: "Parādīt tabulas robežas",
+ShowDetails			: "Parādīt sīkāku informāciju",
+Style				: "Stils",
+FontFormat			: "Formāts",
+Font				: "Šrifts",
+FontSize			: "Izmērs",
+TextColor			: "Teksta krāsa",
+BGColor				: "Fona krāsa",
+Source				: "HTML kods",
+Find				: "Meklēt",
+Replace				: "Nomainīt",
+SpellCheck			: "Pareizrakstības pārbaude",
+UniversalKeyboard	: "Universāla klaviatūra",
+PageBreakLbl		: "Lapas pārtraukums",
+PageBreak			: "Ievietot lapas pārtraukumu",
+
+Form			: "Forma",
+Checkbox		: "Atzīmēšanas kastīte",
+RadioButton		: "Izvēles poga",
+TextField		: "Teksta rinda",
+Textarea		: "Teksta laukums",
+HiddenField		: "Paslēpta teksta rinda",
+Button			: "Poga",
+SelectionField	: "Iezīmēšanas lauks",
+ImageButton		: "Attēlpoga",
+
+FitWindow		: "Maksimizēt redaktora izmēru",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Labot hipersaiti",
+CellCM				: "Šūna",
+RowCM				: "Rinda",
+ColumnCM			: "Kolonna",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Dzēst rindas",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Dzēst kolonnas",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Dzēst rūtiņas",
+MergeCells			: "Apvienot rūtiņas",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Dzēst tabulu",
+CellProperties		: "Rūtiņas īpašības",
+TableProperties		: "Tabulas īpašības",
+ImageProperties		: "Attēla īpašības",
+FlashProperties		: "Flash īpašības",
+
+AnchorProp			: "Iezīmes īpašības",
+ButtonProp			: "Pogas īpašības",
+CheckboxProp		: "Atzīmēšanas kastītes īpašības",
+HiddenFieldProp		: "Paslēptās teksta rindas īpašības",
+RadioButtonProp		: "Izvēles poga īpašības",
+ImageButtonProp		: "Attēlpogas īpašības",
+TextFieldProp		: "Teksta rindas  īpašības",
+SelectionFieldProp	: "Iezīmēšanas lauka īpašības",
+TextareaProp		: "Teksta laukuma īpašības",
+FormProp			: "Formas īpašības",
+
+FontFormats			: "Normāls teksts;Formatēts teksts;Adrese;Virsraksts 1;Virsraksts 2;Virsraksts 3;Virsraksts 4;Virsraksts 5;Virsraksts 6;Rindkopa (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Tiek apstrādāts XHTML. Lūdzu uzgaidiet...",
+Done				: "Darīts",
+PasteWordConfirm	: "Teksta fragments, kas tiek ievietots, izskatās, ka būtu sagatavots Word'ā. Vai vēlaties to apstrādāt pirms ievietošanas?",
+NotCompatiblePaste	: "Šī darbība ir pieejama Internet Explorer'ī, kas jaunāks par 5.5 versiju. Vai vēlaties ievietot bez apstrādes?",
+UnknownToolbarItem	: "Nezināms rīku joslas objekts \"%1\"",
+UnknownCommand		: "Nezināmas darbības nosaukums \"%1\"",
+NotImplemented		: "Darbība netika paveikta",
+UnknownToolbarSet	: "Rīku joslas komplekts \"%1\" neeksistē",
+NoActiveX			: "Interneta pārlūkprogrammas drošības uzstādījumi varētu ietekmēt dažas no redaktora īpašībām. Jābūt aktivizētai sadaļai \"Run ActiveX controls and plug-ins\". Savādāk ir iespējamas kļūdas darbībā un kļūdu paziņojumu parādīšanās.",
+BrowseServerBlocked : "Resursu pārlūks nevar tikt atvērts. Pārliecinieties, ka uznirstošo logu bloķētāji ir atslēgti.",
+DialogBlocked		: "Nav iespējams atvērt dialoglogu. Pārliecinieties, ka uznirstošo logu bloķētāji ir atslēgti.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Darīts!",
+DlgBtnCancel		: "Atcelt",
+DlgBtnClose			: "Aizvērt",
+DlgBtnBrowseServer	: "Skatīt servera saturu",
+DlgAdvancedTag		: "Izvērstais",
+DlgOpOther			: "<Cits>",
+DlgInfoTab			: "Informācija",
+DlgAlertUrl			: "Lūdzu, ievietojiet hipersaiti",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nav iestatīts>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Valodas lasīšanas virziens",
+DlgGenLangDirLtr	: "No kreisās uz labo (LTR)",
+DlgGenLangDirRtl	: "No labās uz kreiso (RTL)",
+DlgGenLangCode		: "Valodas kods",
+DlgGenAccessKey		: "Pieejas kods",
+DlgGenName			: "Nosaukums",
+DlgGenTabIndex		: "Ciļņu indekss",
+DlgGenLongDescr		: "Gara apraksta Hipersaite",
+DlgGenClass			: "Stilu saraksta klases",
+DlgGenTitle			: "Konsultatīvs virsraksts",
+DlgGenContType		: "Konsultatīvs satura tips",
+DlgGenLinkCharset	: "Pievienotā resursa kodu tabula",
+DlgGenStyle			: "Stils",
+
+// Image Dialog
+DlgImgTitle			: "Attēla īpašības",
+DlgImgInfoTab		: "Informācija par attēlu",
+DlgImgBtnUpload		: "Nosūtīt serverim",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Augšupielādēt",
+DlgImgAlt			: "Alternatīvais teksts",
+DlgImgWidth			: "Platums",
+DlgImgHeight		: "Augstums",
+DlgImgLockRatio		: "Nemainīga Augstuma/Platuma attiecība",
+DlgBtnResetSize		: "Atjaunot sākotnējo izmēru",
+DlgImgBorder		: "Rāmis",
+DlgImgHSpace		: "Horizontālā telpa",
+DlgImgVSpace		: "Vertikālā telpa",
+DlgImgAlign			: "Nolīdzināt",
+DlgImgAlignLeft		: "Pa kreisi",
+DlgImgAlignAbsBottom: "Absolūti apakšā",
+DlgImgAlignAbsMiddle: "Absolūti vertikāli centrēts",
+DlgImgAlignBaseline	: "Pamatrindā",
+DlgImgAlignBottom	: "Apakšā",
+DlgImgAlignMiddle	: "Vertikāli centrēts",
+DlgImgAlignRight	: "Pa labi",
+DlgImgAlignTextTop	: "Teksta augšā",
+DlgImgAlignTop		: "Augšā",
+DlgImgPreview		: "Pārskats",
+DlgImgAlertUrl		: "Lūdzu norādīt attēla hipersaiti",
+DlgImgLinkTab		: "Hipersaite",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash īpašības",
+DlgFlashChkPlay		: "Automātiska atskaņošana",
+DlgFlashChkLoop		: "Nepārtraukti",
+DlgFlashChkMenu		: "Atļaut Flash izvēlni",
+DlgFlashScale		: "Mainīt izmēru",
+DlgFlashScaleAll	: "Rādīt visu",
+DlgFlashScaleNoBorder	: "Bez rāmja",
+DlgFlashScaleFit	: "Precīzs izmērs",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Hipersaite",
+DlgLnkInfoTab		: "Hipersaites informācija",
+DlgLnkTargetTab		: "Mērķis",
+
+DlgLnkType			: "Hipersaites tips",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Iezīme šajā lapā",
+DlgLnkTypeEMail		: "E-pasts",
+DlgLnkProto			: "Protokols",
+DlgLnkProtoOther	: "<cits>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Izvēlēties iezīmi",
+DlgLnkAnchorByName	: "Pēc iezīmes nosaukuma",
+DlgLnkAnchorById	: "Pēc elementa ID",
+DlgLnkNoAnchors		: "(Šajā dokumentā nav iezīmju)",
+DlgLnkEMail			: "E-pasta adrese",
+DlgLnkEMailSubject	: "Ziņas tēma",
+DlgLnkEMailBody		: "Ziņas saturs",
+DlgLnkUpload		: "Augšupielādēt",
+DlgLnkBtnUpload		: "Nosūtīt serverim",
+
+DlgLnkTarget		: "Mērķis",
+DlgLnkTargetFrame	: "<ietvars>",
+DlgLnkTargetPopup	: "<uznirstošā logā>",
+DlgLnkTargetBlank	: "Jaunā logā (_blank)",
+DlgLnkTargetParent	: "Esošajā logā (_parent)",
+DlgLnkTargetSelf	: "Tajā pašā logā (_self)",
+DlgLnkTargetTop		: "Visredzamākajā logā (_top)",
+DlgLnkTargetFrameName	: "Mērķa ietvara nosaukums",
+DlgLnkPopWinName	: "Uznirstošā loga nosaukums",
+DlgLnkPopWinFeat	: "Uznirstošā loga nosaukums īpašības",
+DlgLnkPopResize		: "Ar maināmu izmēru",
+DlgLnkPopLocation	: "Atrašanās vietas josla",
+DlgLnkPopMenu		: "Izvēlnes josla",
+DlgLnkPopScroll		: "Ritjoslas",
+DlgLnkPopStatus		: "Statusa josla",
+DlgLnkPopToolbar	: "Rīku josla",
+DlgLnkPopFullScrn	: "Pilnā ekrānā (IE)",
+DlgLnkPopDependent	: "Atkarīgs (Netscape)",
+DlgLnkPopWidth		: "Platums",
+DlgLnkPopHeight		: "Augstums",
+DlgLnkPopLeft		: "Kreisā koordināte",
+DlgLnkPopTop		: "Augšējā koordināte",
+
+DlnLnkMsgNoUrl		: "Lūdzu norādi hipersaiti",
+DlnLnkMsgNoEMail	: "Lūdzu norādi e-pasta adresi",
+DlnLnkMsgNoAnchor	: "Lūdzu norādi iezīmi",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Izvēlies krāsu",
+DlgColorBtnClear	: "Dzēst",
+DlgColorHighlight	: "Izcelt",
+DlgColorSelected	: "Iezīmētais",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Ievietot smaidiņu",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Ievietot īpašu simbolu",
+
+// Table Dialog
+DlgTableTitle		: "Tabulas īpašības",
+DlgTableRows		: "Rindas",
+DlgTableColumns		: "Kolonnas",
+DlgTableBorder		: "Rāmja izmērs",
+DlgTableAlign		: "Novietojums",
+DlgTableAlignNotSet	: "<nav norādīts>",
+DlgTableAlignLeft	: "Pa kreisi",
+DlgTableAlignCenter	: "Centrēti",
+DlgTableAlignRight	: "Pa labi",
+DlgTableWidth		: "Platums",
+DlgTableWidthPx		: "pikseļos",
+DlgTableWidthPc		: "procentuāli",
+DlgTableHeight		: "Augstums",
+DlgTableCellSpace	: "Rūtiņu atstatums",
+DlgTableCellPad		: "Rūtiņu nobīde",
+DlgTableCaption		: "Leģenda",
+DlgTableSummary		: "Anotācija",
+
+// Table Cell Dialog
+DlgCellTitle		: "Rūtiņas īpašības",
+DlgCellWidth		: "Platums",
+DlgCellWidthPx		: "pikseļi",
+DlgCellWidthPc		: "procentos",
+DlgCellHeight		: "Augstums",
+DlgCellWordWrap		: "Teksta pārnese",
+DlgCellWordWrapNotSet	: "<nav norādīta>",
+DlgCellWordWrapYes	: "Jā",
+DlgCellWordWrapNo	: "Nē",
+DlgCellHorAlign		: "Horizontāla novietojums",
+DlgCellHorAlignNotSet	: "<Nav norādīts>",
+DlgCellHorAlignLeft	: "Pa kreisi",
+DlgCellHorAlignCenter	: "Centrēti",
+DlgCellHorAlignRight: "Pa labi",
+DlgCellVerAlign		: "Vertikālais novietojums",
+DlgCellVerAlignNotSet	: "<nav norādīts>",
+DlgCellVerAlignTop	: "Augša",
+DlgCellVerAlignMiddle	: "Vidus",
+DlgCellVerAlignBottom	: "Apakša",
+DlgCellVerAlignBaseline	: "Pamatrindā",
+DlgCellRowSpan		: "Rindu pārnese",
+DlgCellCollSpan		: "Kolonnu pārnese",
+DlgCellBackColor	: "Fona krāsa",
+DlgCellBorderColor	: "Rāmja krāsa",
+DlgCellBtnSelect	: "Iezīmē...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Meklētājs",
+DlgFindFindBtn		: "Meklēt",
+DlgFindNotFoundMsg	: "Norādītā frāze netika atrasta.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Aizvietošana",
+DlgReplaceFindLbl		: "Meklēt:",
+DlgReplaceReplaceLbl	: "Nomainīt uz:",
+DlgReplaceCaseChk		: "Reģistrjūtīgs",
+DlgReplaceReplaceBtn	: "Aizvietot",
+DlgReplaceReplAllBtn	: "Aizvietot visu",
+DlgReplaceWordChk		: "Jāsakrīt pilnībā",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj editoram automātiski veikt izgriešanas darbību.  Lūdzu, izmantojiet (Ctrl+X, lai veiktu šo darbību.",
+PasteErrorCopy	: "Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj editoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl+C), lai veiktu šo darbību.",
+
+PasteAsText		: "Ievietot kā vienkāršu tekstu",
+PasteFromWord	: "Ievietot no Worda",
+
+DlgPasteMsg2	: "Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignorēt iepriekš norādītos fontus",
+DlgPasteRemoveStyles	: "Noņemt norādītos stilus",
+
+// Color Picker
+ColorAutomatic	: "Automātiska",
+ColorMoreColors	: "Plašāka palete...",
+
+// Document Properties
+DocProps		: "Dokumenta īpašības",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Iezīmes īpašības",
+DlgAnchorName		: "Iezīmes nosaukums",
+DlgAnchorErrorName	: "Lūdzu norādiet iezīmes nosaukumu",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Netika atrasts vārdnīcā",
+DlgSpellChangeTo		: "Nomainīt uz",
+DlgSpellBtnIgnore		: "Ignorēt",
+DlgSpellBtnIgnoreAll	: "Ignorēt visu",
+DlgSpellBtnReplace		: "Aizvietot",
+DlgSpellBtnReplaceAll	: "Aizvietot visu",
+DlgSpellBtnUndo			: "Atcelt",
+DlgSpellNoSuggestions	: "- Nav ieteikumu -",
+DlgSpellProgress		: "Notiek pareizrakstības pārbaude...",
+DlgSpellNoMispell		: "Pareizrakstības pārbaude pabeigta: kļūdas netika atrastas",
+DlgSpellNoChanges		: "Pareizrakstības pārbaude pabeigta: nekas netika labots",
+DlgSpellOneChange		: "Pareizrakstības pārbaude pabeigta: 1 vārds izmainīts",
+DlgSpellManyChanges		: "Pareizrakstības pārbaude pabeigta: %1 vārdi tika mainīti",
+
+IeSpellDownload			: "Pareizrakstības pārbaudītājs nav pievienots. Vai vēlaties to lejupielādēt tagad?",
+
+// Button Dialog
+DlgButtonText		: "Teksts (vērtība)",
+DlgButtonType		: "Tips",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nosaukums",
+DlgCheckboxValue	: "Vērtība",
+DlgCheckboxSelected	: "Iezīmēts",
+
+// Form Dialog
+DlgFormName		: "Nosaukums",
+DlgFormAction	: "Darbība",
+DlgFormMethod	: "Metode",
+
+// Select Field Dialog
+DlgSelectName		: "Nosaukums",
+DlgSelectValue		: "Vērtība",
+DlgSelectSize		: "Izmērs",
+DlgSelectLines		: "rindas",
+DlgSelectChkMulti	: "Atļaut vairākus iezīmējumus",
+DlgSelectOpAvail	: "Pieejamās iespējas",
+DlgSelectOpText		: "Teksts",
+DlgSelectOpValue	: "Vērtība",
+DlgSelectBtnAdd		: "Pievienot",
+DlgSelectBtnModify	: "Veikt izmaiņas",
+DlgSelectBtnUp		: "Augšup",
+DlgSelectBtnDown	: "Lejup",
+DlgSelectBtnSetValue : "Noteikt kā iezīmēto vērtību",
+DlgSelectBtnDelete	: "Dzēst",
+
+// Textarea Dialog
+DlgTextareaName	: "Nosaukums",
+DlgTextareaCols	: "Kolonnas",
+DlgTextareaRows	: "Rindas",
+
+// Text Field Dialog
+DlgTextName			: "Nosaukums",
+DlgTextValue		: "Vērtība",
+DlgTextCharWidth	: "Simbolu platums",
+DlgTextMaxChars		: "Simbolu maksimālais daudzums",
+DlgTextType			: "Tips",
+DlgTextTypeText		: "Teksts",
+DlgTextTypePass		: "Parole",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nosaukums",
+DlgHiddenValue	: "Vērtība",
+
+// Bulleted List Dialog
+BulletedListProp	: "Aizzīmju saraksta īpašības",
+NumberedListProp	: "Numerētā saraksta īpašības",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tips",
+DlgLstTypeCircle	: "Aplis",
+DlgLstTypeDisc		: "Disks",
+DlgLstTypeSquare	: "Kvadrāts",
+DlgLstTypeNumbers	: "Skaitļi (1, 2, 3)",
+DlgLstTypeLCase		: "Maziem burtiem (a, b, c)",
+DlgLstTypeUCase		: "Lieliem burtiem (A, B, C)",
+DlgLstTypeSRoman	: "Maziem romiešu cipariem (i, ii, iii)",
+DlgLstTypeLRoman	: "Lieliem romiešu cipariem (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Vispārīga informācija",
+DlgDocBackTab		: "Fons",
+DlgDocColorsTab		: "Krāsas un robežu nobīdes",
+DlgDocMetaTab		: "META dati",
+
+DlgDocPageTitle		: "Dokumenta virsraksts <Title>",
+DlgDocLangDir		: "Valodas lasīšanas virziens",
+DlgDocLangDirLTR	: "No kreisās uz labo (LTR)",
+DlgDocLangDirRTL	: "No labās uz kreiso (RTL)",
+DlgDocLangCode		: "Valodas kods",
+DlgDocCharSet		: "Simbolu kodējums",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Cits simbolu kodējums",
+
+DlgDocDocType		: "Dokumenta tips",
+DlgDocDocTypeOther	: "Cits dokumenta tips",
+DlgDocIncXHTML		: "Ietvert XHTML deklarācijas",
+DlgDocBgColor		: "Fona krāsa",
+DlgDocBgImage		: "Fona attēla hipersaite",
+DlgDocBgNoScroll	: "Fona attēls ir fiksēts",
+DlgDocCText			: "Teksts",
+DlgDocCLink			: "Hipersaite",
+DlgDocCVisited		: "Apmeklēta hipersaite",
+DlgDocCActive		: "Aktīva hipersaite",
+DlgDocMargins		: "Lapas robežas",
+DlgDocMaTop			: "Augšā",
+DlgDocMaLeft		: "Pa kreisi",
+DlgDocMaRight		: "Pa labi",
+DlgDocMaBottom		: "Apakšā",
+DlgDocMeIndex		: "Dokumentu aprakstoši atslēgvārdi (atdalīti ar komatu)",
+DlgDocMeDescr		: "Dokumenta apraksts",
+DlgDocMeAuthor		: "Autors",
+DlgDocMeCopy		: "Autortiesības",
+DlgDocPreview		: "Priekšskats",
+
+// Templates Dialog
+Templates			: "Sagataves",
+DlgTemplatesTitle	: "Satura sagataves",
+DlgTemplatesSelMsg	: "Lūdzu, norādiet sagatavi, ko atvērt editorā<br>(patreizējie dati tiks zaudēti):",
+DlgTemplatesLoading	: "Notiek sagatavju saraksta ielāde. Lūdzu, uzgaidiet...",
+DlgTemplatesNoTpl	: "(Nav norādītas sagataves)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Par",
+DlgAboutBrowserInfoTab	: "Informācija par pārlūkprogrammu",
+DlgAboutLicenseTab	: "Licence",
+DlgAboutVersion		: "versija",
+DlgAboutInfo		: "Papildus informācija ir pieejama",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/mn.js b/modules/editor/skins/fckeditor/editor/lang/mn.js
new file mode 100644
index 000000000..e78b16714
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/mn.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Mongolian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Багажны хэсэг эвдэх",
+ToolbarExpand		: "Багажны хэсэг өргөтгөх",
+
+// Toolbar Items and Context Menu
+Save				: "Хадгалах",
+NewPage				: "Шинэ хуудас",
+Preview				: "Уридчлан харах",
+Cut					: "Хайчлах",
+Copy				: "Хуулах",
+Paste				: "Буулгах",
+PasteText			: "plain text-ээс буулгах",
+PasteWord			: "Word-оос буулгах",
+Print				: "Хэвлэх",
+SelectAll			: "Бүгдийг нь сонгох",
+RemoveFormat		: "Формат авч хаях",
+InsertLinkLbl		: "Линк",
+InsertLink			: "Линк Оруулах/Засварлах",
+RemoveLink			: "Линк авч хаях",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Холбоос Оруулах/Засварлах",
+AnchorDelete		: "Холбоос Авах",
+InsertImageLbl		: "Зураг",
+InsertImage			: "Зураг Оруулах/Засварлах",
+InsertFlashLbl		: "Флаш",
+InsertFlash			: "Флаш Оруулах/Засварлах",
+InsertTableLbl		: "Хүснэгт",
+InsertTable			: "Хүснэгт Оруулах/Засварлах",
+InsertLineLbl		: "Зураас",
+InsertLine			: "Хөндлөн зураас оруулах",
+InsertSpecialCharLbl: "Онцгой тэмдэгт",
+InsertSpecialChar	: "Онцгой тэмдэгт оруулах",
+InsertSmileyLbl		: "Тодорхойлолт",
+InsertSmiley		: "Тодорхойлолт оруулах",
+About				: "FCKeditor-н тухай",
+Bold				: "Тод бүдүүн",
+Italic				: "Налуу",
+Underline			: "Доогуур нь зураастай болгох",
+StrikeThrough		: "Дундуур нь зураастай болгох",
+Subscript			: "Суурь болгох",
+Superscript			: "Зэрэг болгох",
+LeftJustify			: "Зүүн талд байрлуулах",
+CenterJustify		: "Төвд байрлуулах",
+RightJustify		: "Баруун талд байрлуулах",
+BlockJustify		: "Блок хэлбэрээр байрлуулах",
+DecreaseIndent		: "Догол мөр нэмэх",
+IncreaseIndent		: "Догол мөр хасах",
+Blockquote			: "Хайрцаглах",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Хүчингүй болгох",
+Redo				: "Өмнөх үйлдлээ сэргээх",
+NumberedListLbl		: "Дугаарлагдсан жагсаалт",
+NumberedList		: "Дугаарлагдсан жагсаалт Оруулах/Авах",
+BulletedListLbl		: "Цэгтэй жагсаалт",
+BulletedList		: "Цэгтэй жагсаалт Оруулах/Авах",
+ShowTableBorders	: "Хүснэгтийн хүрээг үзүүлэх",
+ShowDetails			: "Деталчлан үзүүлэх",
+Style				: "Загвар",
+FontFormat			: "Формат",
+Font				: "Фонт",
+FontSize			: "Хэмжээ",
+TextColor			: "Фонтны өнгө",
+BGColor				: "Фонны өнгө",
+Source				: "Код",
+Find				: "Хайх",
+Replace				: "Солих",
+SpellCheck			: "Үгийн дүрэх шалгах",
+UniversalKeyboard	: "Униварсал гар",
+PageBreakLbl		: "Хуудас тусгаарлах",
+PageBreak			: "Хуудас тусгаарлагч оруулах",
+
+Form			: "Форм",
+Checkbox		: "Чекбокс",
+RadioButton		: "Радио товч",
+TextField		: "Техт талбар",
+Textarea		: "Техт орчин",
+HiddenField		: "Нууц талбар",
+Button			: "Товч",
+SelectionField	: "Сонгогч талбар",
+ImageButton		: "Зурагтай товч",
+
+FitWindow		: "editor-н хэмжээг томруулах",
+ShowBlocks		: "Block-уудыг үзүүлэх",
+
+// Context Menu
+EditLink			: "Холбоос засварлах",
+CellCM				: "Нүх/зай",
+RowCM				: "Мөр",
+ColumnCM			: "Багана",
+InsertRowAfter		: "Мөр дараа нь оруулах",
+InsertRowBefore		: "Мөр өмнө нь оруулах",
+DeleteRows			: "Мөр устгах",
+InsertColumnAfter	: "Багана дараа нь оруулах",
+InsertColumnBefore	: "Багана өмнө нь оруулах",
+DeleteColumns		: "Багана устгах",
+InsertCellAfter		: "Нүх/зай дараа нь оруулах",
+InsertCellBefore	: "Нүх/зай өмнө нь оруулах",
+DeleteCells			: "Нүх устгах",
+MergeCells			: "Нүх нэгтэх",
+MergeRight			: "Баруун тийш нэгтгэх",
+MergeDown			: "Доош нэгтгэх",
+HorizontalSplitCell	: "Нүх/зайг босоогоор нь тусгаарлах",
+VerticalSplitCell	: "Нүх/зайг хөндлөнгөөр нь тусгаарлах",
+TableDelete			: "Хүснэгт устгах",
+CellProperties		: "Нүх/зай зайн шинж чанар",
+TableProperties		: "Хүснэгт",
+ImageProperties		: "Зураг",
+FlashProperties		: "Флаш шинж чанар",
+
+AnchorProp			: "Холбоос шинж чанар",
+ButtonProp			: "Товчны шинж чанар",
+CheckboxProp		: "Чекбоксны шинж чанар",
+HiddenFieldProp		: "Нууц талбарын шинж чанар",
+RadioButtonProp		: "Радио товчны шинж чанар",
+ImageButtonProp		: "Зурган товчны шинж чанар",
+TextFieldProp		: "Текст талбарын шинж чанар",
+SelectionFieldProp	: "Согогч талбарын шинж чанар",
+TextareaProp		: "Текст орчны шинж чанар",
+FormProp			: "Форм шинж чанар",
+
+FontFormats			: "Хэвийн;Formatted;Хаяг;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Paragraph (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML үйл явц явагдаж байна. Хүлээнэ үү...",
+Done				: "Хийх",
+PasteWordConfirm	: "Word-оос хуулсан текстээ санаж байгааг нь буулгахыг та хүсч байна уу. Та текст-ээ буулгахын өмнө цэвэрлэх үү?",
+NotCompatiblePaste	: "Энэ комманд Internet Explorer-ын 5.5 буюу түүнээс дээш хувилбарт идвэхшинэ. Та цэвэрлэхгүйгээр буулгахыг хүсч байна?",
+UnknownToolbarItem	: "Багажны хэсгийн \"%1\" item мэдэгдэхгүй байна",
+UnknownCommand		: "\"%1\" комманд нэр мэдагдэхгүй байна",
+NotImplemented		: "Зөвшөөрөгдөхгүй комманд",
+UnknownToolbarSet	: "Багажны хэсэгт \"%1\" оноох, үүсээгүй байна",
+NoActiveX			: "Таны үзүүлэгч/browser-н хамгаалалтын тохиргоо editor-н зарим боломжийг хязгаарлаж байна. Та \"Run ActiveX controls ба plug-ins\" сонголыг идвэхитэй болго.",
+BrowseServerBlocked : "Нөөц үзүүгч нээж чадсангүй. Бүх popup blocker-г disabled болгоно уу.",
+DialogBlocked		: "Харилцах цонхонд энийг нээхэд боломжгүй ээ. Бүх popup blocker-г disabled болгоно уу.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Болих",
+DlgBtnClose			: "Хаах",
+DlgBtnBrowseServer	: "Сервер харуулах",
+DlgAdvancedTag		: "Нэмэлт",
+DlgOpOther			: "<Бусад>",
+DlgInfoTab			: "Мэдээлэл",
+DlgAlertUrl			: "URL оруулна уу",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Оноохгүй>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Хэлний чиглэл",
+DlgGenLangDirLtr	: "Зүүнээс баруун (LTR)",
+DlgGenLangDirRtl	: "Баруунаас зүүн (RTL)",
+DlgGenLangCode		: "Хэлний код",
+DlgGenAccessKey		: "Холбох түлхүүр",
+DlgGenName			: "Нэр",
+DlgGenTabIndex		: "Tab индекс",
+DlgGenLongDescr		: "URL-ын тайлбар",
+DlgGenClass			: "Stylesheet классууд",
+DlgGenTitle			: "Зөвлөлдөх гарчиг",
+DlgGenContType		: "Зөвлөлдөх төрлийн агуулга",
+DlgGenLinkCharset	: "Тэмдэгт оноох нөөцөд холбогдсон",
+DlgGenStyle			: "Загвар",
+
+// Image Dialog
+DlgImgTitle			: "Зураг",
+DlgImgInfoTab		: "Зурагны мэдээлэл",
+DlgImgBtnUpload		: "Үүнийг сервэррүү илгээ",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Хуулах",
+DlgImgAlt			: "Тайлбар текст",
+DlgImgWidth			: "Өргөн",
+DlgImgHeight		: "Өндөр",
+DlgImgLockRatio		: "Радио түгжих",
+DlgBtnResetSize		: "хэмжээ дахин оноох",
+DlgImgBorder		: "Хүрээ",
+DlgImgHSpace		: "Хөндлөн зай",
+DlgImgVSpace		: "Босоо зай",
+DlgImgAlign			: "Эгнээ",
+DlgImgAlignLeft		: "Зүүн",
+DlgImgAlignAbsBottom: "Abs доод талд",
+DlgImgAlignAbsMiddle: "Abs Дунд талд",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Доод талд",
+DlgImgAlignMiddle	: "Дунд талд",
+DlgImgAlignRight	: "Баруун",
+DlgImgAlignTextTop	: "Текст дээр",
+DlgImgAlignTop		: "Дээд талд",
+DlgImgPreview		: "Уридчлан харах",
+DlgImgAlertUrl		: "Зурагны URL-ын төрлийн сонгоно уу",
+DlgImgLinkTab		: "Линк",
+
+// Flash Dialog
+DlgFlashTitle		: "Флаш  шинж чанар",
+DlgFlashChkPlay		: "Автоматаар тоглох",
+DlgFlashChkLoop		: "Давтах",
+DlgFlashChkMenu		: "Флаш цэс идвэхжүүлэх",
+DlgFlashScale		: "Өргөгтгөх",
+DlgFlashScaleAll	: "Бүгдийг харуулах",
+DlgFlashScaleNoBorder	: "Хүрээгүй",
+DlgFlashScaleFit	: "Яг тааруулах",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Линк",
+DlgLnkInfoTab		: "Линкийн мэдээлэл",
+DlgLnkTargetTab		: "Байрлал",
+
+DlgLnkType			: "Линкийн төрөл",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Энэ хуудасандах холбоос",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Протокол",
+DlgLnkProtoOther	: "<бусад>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Холбоос сонгох",
+DlgLnkAnchorByName	: "Холбоосын нэрээр",
+DlgLnkAnchorById	: "Элемэнт Id-гаар",
+DlgLnkNoAnchors		: "(Баримт бичиг холбоосгүй байна)",
+DlgLnkEMail			: "E-Mail Хаяг",
+DlgLnkEMailSubject	: "Message гарчиг",
+DlgLnkEMailBody		: "Message-ийн агуулга",
+DlgLnkUpload		: "Хуулах",
+DlgLnkBtnUpload		: "Үүнийг серверрүү илгээ",
+
+DlgLnkTarget		: "Байрлал",
+DlgLnkTargetFrame	: "<Агуулах хүрээ>",
+DlgLnkTargetPopup	: "<popup цонх>",
+DlgLnkTargetBlank	: "Шинэ цонх (_blank)",
+DlgLnkTargetParent	: "Эцэг цонх (_parent)",
+DlgLnkTargetSelf	: "Төстэй цонх (_self)",
+DlgLnkTargetTop		: "Хамгийн түрүүн байх цонх (_top)",
+DlgLnkTargetFrameName	: "Очих фремын нэр",
+DlgLnkPopWinName	: "Popup цонхны нэр",
+DlgLnkPopWinFeat	: "Popup цонхны онцлог",
+DlgLnkPopResize		: "Хэмжээ өөрчлөх",
+DlgLnkPopLocation	: "Location хэсэг",
+DlgLnkPopMenu		: "Meню хэсэг",
+DlgLnkPopScroll		: "Скрол хэсэгүүд",
+DlgLnkPopStatus		: "Статус хэсэг",
+DlgLnkPopToolbar	: "Багажны хэсэг",
+DlgLnkPopFullScrn	: "Цонх дүүргэх (IE)",
+DlgLnkPopDependent	: "Хамаатай (Netscape)",
+DlgLnkPopWidth		: "Өргөн",
+DlgLnkPopHeight		: "Өндөр",
+DlgLnkPopLeft		: "Зүүн байрлал",
+DlgLnkPopTop		: "Дээд байрлал",
+
+DlnLnkMsgNoUrl		: "Линк URL-ээ төрөлжүүлнэ үү",
+DlnLnkMsgNoEMail	: "Е-mail хаягаа төрөлжүүлнэ үү",
+DlnLnkMsgNoAnchor	: "Холбоосоо сонгоно уу",
+DlnLnkMsgInvPopName	: "popup нэр нь үсгэн тэмдэгтээр эхэлсэн байх ба хоосон зай агуулаагүй байх ёстой.",
+
+// Color Dialog
+DlgColorTitle		: "Өнгө сонгох",
+DlgColorBtnClear	: "Цэвэрлэх",
+DlgColorHighlight	: "Өнгө",
+DlgColorSelected	: "Сонгогдсон",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Тодорхойлолт оруулах",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Онцгой тэмдэгт сонгох",
+
+// Table Dialog
+DlgTableTitle		: "Хүснэгт",
+DlgTableRows		: "Мөр",
+DlgTableColumns		: "Багана",
+DlgTableBorder		: "Хүрээний хэмжээ",
+DlgTableAlign		: "Эгнээ",
+DlgTableAlignNotSet	: "<Оноохгүй>",
+DlgTableAlignLeft	: "Зүүн талд",
+DlgTableAlignCenter	: "Төвд",
+DlgTableAlignRight	: "Баруун талд",
+DlgTableWidth		: "Өргөн",
+DlgTableWidthPx		: "цэг",
+DlgTableWidthPc		: "хувь",
+DlgTableHeight		: "Өндөр",
+DlgTableCellSpace	: "Нүх хоорондын зай (spacing)",
+DlgTableCellPad		: "Нүх доторлох(padding)",
+DlgTableCaption		: "Тайлбар",
+DlgTableSummary		: "Тайлбар",
+
+// Table Cell Dialog
+DlgCellTitle		: "Хоосон зайн шинж чанар",
+DlgCellWidth		: "Өргөн",
+DlgCellWidthPx		: "цэг",
+DlgCellWidthPc		: "хувь",
+DlgCellHeight		: "Өндөр",
+DlgCellWordWrap		: "Үг таслах",
+DlgCellWordWrapNotSet	: "<Оноохгүй>",
+DlgCellWordWrapYes	: "Тийм",
+DlgCellWordWrapNo	: "Үгүй",
+DlgCellHorAlign		: "Босоо эгнээ",
+DlgCellHorAlignNotSet	: "<Оноохгүй>",
+DlgCellHorAlignLeft	: "Зүүн",
+DlgCellHorAlignCenter	: "Төв",
+DlgCellHorAlignRight: "Баруун",
+DlgCellVerAlign		: "Хөндлөн эгнээ",
+DlgCellVerAlignNotSet	: "<Оноохгүй>",
+DlgCellVerAlignTop	: "Дээд тал",
+DlgCellVerAlignMiddle	: "Дунд",
+DlgCellVerAlignBottom	: "Доод тал",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Нийт мөр (span)",
+DlgCellCollSpan		: "Нийт багана (span)",
+DlgCellBackColor	: "Фонны өнгө",
+DlgCellBorderColor	: "Хүрээний өнгө",
+DlgCellBtnSelect	: "Сонго...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Хай мөн Дарж бич",
+
+// Find Dialog
+DlgFindTitle		: "Хайх",
+DlgFindFindBtn		: "Хайх",
+DlgFindNotFoundMsg	: "Хайсан текст олсонгүй.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Солих",
+DlgReplaceFindLbl		: "Хайх үг/үсэг:",
+DlgReplaceReplaceLbl	: "Солих үг:",
+DlgReplaceCaseChk		: "Тэнцэх төлөв",
+DlgReplaceReplaceBtn	: "Солих",
+DlgReplaceReplAllBtn	: "Бүгдийг нь Солих",
+DlgReplaceWordChk		: "Тэнцэх бүтэн үг",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl+X) товчны хослолыг ашиглана уу.",
+PasteErrorCopy	: "Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl+C) товчны хослолыг ашиглана уу.",
+
+PasteAsText		: "Plain Text-ээс буулгах",
+PasteFromWord	: "Word-оос буулгах",
+
+DlgPasteMsg2	: "(<strong>Ctrl+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.",
+DlgPasteSec		: "Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.",
+DlgPasteIgnoreFont		: "Тодорхойлогдсон Font Face зөвшөөрнө",
+DlgPasteRemoveStyles	: "Тодорхойлогдсон загварыг авах",
+
+// Color Picker
+ColorAutomatic	: "Автоматаар",
+ColorMoreColors	: "Нэмэлт өнгөнүүд...",
+
+// Document Properties
+DocProps		: "Баримт бичиг шинж чанар",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Холбоос шинж чанар",
+DlgAnchorName		: "Холбоос нэр",
+DlgAnchorErrorName	: "Холбоос төрөл оруулна уу",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Толь бичиггүй",
+DlgSpellChangeTo		: "Өөрчлөх",
+DlgSpellBtnIgnore		: "Зөвшөөрөх",
+DlgSpellBtnIgnoreAll	: "Бүгдийг зөвшөөрөх",
+DlgSpellBtnReplace		: "Дарж бичих",
+DlgSpellBtnReplaceAll	: "Бүгдийг Дарж бичих",
+DlgSpellBtnUndo			: "Буцаах",
+DlgSpellNoSuggestions	: "- Тайлбаргүй -",
+DlgSpellProgress		: "Дүрэм шалгаж байгаа үйл явц...",
+DlgSpellNoMispell		: "Дүрэм шалгаад дууссан: Алдаа олдсонгүй",
+DlgSpellNoChanges		: "Дүрэм шалгаад дууссан: үг өөрчлөгдөөгүй",
+DlgSpellOneChange		: "Дүрэм шалгаад дууссан: 1 үг өөрчлөгдсөн",
+DlgSpellManyChanges		: "Дүрэм шалгаад дууссан: %1 үг өөрчлөгдсөн",
+
+IeSpellDownload			: "Дүрэм шалгагч суугаагүй байна. Татаж авахыг хүсч байна уу?",
+
+// Button Dialog
+DlgButtonText		: "Тэкст (Утга)",
+DlgButtonType		: "Төрөл",
+DlgButtonTypeBtn	: "Товч",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Болих",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Нэр",
+DlgCheckboxValue	: "Утга",
+DlgCheckboxSelected	: "Сонгогдсон",
+
+// Form Dialog
+DlgFormName		: "Нэр",
+DlgFormAction	: "Үйлдэл",
+DlgFormMethod	: "Арга",
+
+// Select Field Dialog
+DlgSelectName		: "Нэр",
+DlgSelectValue		: "Утга",
+DlgSelectSize		: "Хэмжээ",
+DlgSelectLines		: "Мөр",
+DlgSelectChkMulti	: "Олон сонголт зөвшөөрөх",
+DlgSelectOpAvail	: "Идвэхтэй сонголт",
+DlgSelectOpText		: "Тэкст",
+DlgSelectOpValue	: "Утга",
+DlgSelectBtnAdd		: "Нэмэх",
+DlgSelectBtnModify	: "Өөрчлөх",
+DlgSelectBtnUp		: "Дээш",
+DlgSelectBtnDown	: "Доош",
+DlgSelectBtnSetValue : "Сонгогдсан утга оноох",
+DlgSelectBtnDelete	: "Устгах",
+
+// Textarea Dialog
+DlgTextareaName	: "Нэр",
+DlgTextareaCols	: "Багана",
+DlgTextareaRows	: "Мөр",
+
+// Text Field Dialog
+DlgTextName			: "Нэр",
+DlgTextValue		: "Утга",
+DlgTextCharWidth	: "Тэмдэгтын өргөн",
+DlgTextMaxChars		: "Хамгийн их тэмдэгт",
+DlgTextType			: "Төрөл",
+DlgTextTypeText		: "Текст",
+DlgTextTypePass		: "Нууц үг",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Нэр",
+DlgHiddenValue	: "Утга",
+
+// Bulleted List Dialog
+BulletedListProp	: "Bulleted жагсаалын шинж чанар",
+NumberedListProp	: "Дугаарласан жагсаалын шинж чанар",
+DlgLstStart			: "Эхлэх",
+DlgLstType			: "Төрөл",
+DlgLstTypeCircle	: "Тойрог",
+DlgLstTypeDisc		: "Тайлбар",
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Тоо (1, 2, 3)",
+DlgLstTypeLCase		: "Жижиг үсэг (a, b, c)",
+DlgLstTypeUCase		: "Том үсэг (A, B, C)",
+DlgLstTypeSRoman	: "Жижиг Ром тоо (i, ii, iii)",
+DlgLstTypeLRoman	: "Том Ром тоо (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Ерөнхий",
+DlgDocBackTab		: "Фоно",
+DlgDocColorsTab		: "Захын зай ба Өнгө",
+DlgDocMetaTab		: "Meta өгөгдөл",
+
+DlgDocPageTitle		: "Хуудасны гарчиг",
+DlgDocLangDir		: "Хэлний чиглэл",
+DlgDocLangDirLTR	: "Зүүнээс баруунруу (LTR)",
+DlgDocLangDirRTL	: "Баруунаас зүүнрүү (RTL)",
+DlgDocLangCode		: "Хэлний код",
+DlgDocCharSet		: "Encoding тэмдэгт",
+DlgDocCharSetCE		: "Төв европ",
+DlgDocCharSetCT		: "Хятадын уламжлалт (Big5)",
+DlgDocCharSetCR		: "Крил",
+DlgDocCharSetGR		: "Гред",
+DlgDocCharSetJP		: "Япон",
+DlgDocCharSetKR		: "Солонгос",
+DlgDocCharSetTR		: "Tурк",
+DlgDocCharSetUN		: "Юникод (UTF-8)",
+DlgDocCharSetWE		: "Баруун европ",
+DlgDocCharSetOther	: "Encoding-д өөр тэмдэгт оноох",
+
+DlgDocDocType		: "Баримт бичгийн төрөл Heading",
+DlgDocDocTypeOther	: "Бусад баримт бичгийн төрөл Heading",
+DlgDocIncXHTML		: "XHTML агуулж зарлах",
+DlgDocBgColor		: "Фоно өнгө",
+DlgDocBgImage		: "Фоно зурагны URL",
+DlgDocBgNoScroll	: "Гүйдэггүй фоно",
+DlgDocCText			: "Текст",
+DlgDocCLink			: "Линк",
+DlgDocCVisited		: "Зочилсон линк",
+DlgDocCActive		: "Идвэхитэй линк",
+DlgDocMargins		: "Хуудасны захын зай",
+DlgDocMaTop			: "Дээд тал",
+DlgDocMaLeft		: "Зүүн тал",
+DlgDocMaRight		: "Баруун тал",
+DlgDocMaBottom		: "Доод тал",
+DlgDocMeIndex		: "Баримт бичгийн индекс түлхүүр үг (таслалаар тусгаарлагдана)",
+DlgDocMeDescr		: "Баримт бичгийн тайлбар",
+DlgDocMeAuthor		: "Зохиогч",
+DlgDocMeCopy		: "Зохиогчийн эрх",
+DlgDocPreview		: "Харах",
+
+// Templates Dialog
+Templates			: "Загварууд",
+DlgTemplatesTitle	: "Загварын агуулга",
+DlgTemplatesSelMsg	: "Загварыг нээж editor-рүү сонгож оруулна уу<br />(Одоогийн агууллагыг устаж магадгүй):",
+DlgTemplatesLoading	: "Загваруудыг ачааллаж байна. Түр хүлээнэ үү...",
+DlgTemplatesNoTpl	: "(Загвар тодорхойлогдоогүй байна)",
+DlgTemplatesReplace	: "Одоогийн агууллагыг дарж бичих",
+
+// About Dialog
+DlgAboutAboutTab	: "Тухай",
+DlgAboutBrowserInfoTab	: "Мэдээлэл үзүүлэгч",
+DlgAboutLicenseTab	: "Лиценз",
+DlgAboutVersion		: "Хувилбар",
+DlgAboutInfo		: "Мэдээллээр туслах",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ms.js b/modules/editor/skins/fckeditor/editor/lang/ms.js
new file mode 100644
index 000000000..278c4c9a2
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ms.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Malay language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Collapse Toolbar",
+ToolbarExpand		: "Expand Toolbar",
+
+// Toolbar Items and Context Menu
+Save				: "Simpan",
+NewPage				: "Helaian Baru",
+Preview				: "Prebiu",
+Cut					: "Potong",
+Copy				: "Salin",
+Paste				: "Tampal",
+PasteText			: "Tampal sebagai Text Biasa",
+PasteWord			: "Tampal dari Word",
+Print				: "Cetak",
+SelectAll			: "Pilih Semua",
+RemoveFormat		: "Buang Format",
+InsertLinkLbl		: "Sambungan",
+InsertLink			: "Masukkan/Sunting Sambungan",
+RemoveLink			: "Buang Sambungan",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Masukkan/Sunting Pautan",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Gambar",
+InsertImage			: "Masukkan/Sunting Gambar",
+InsertFlashLbl		: "Flash",	//MISSING
+InsertFlash			: "Insert/Edit Flash",	//MISSING
+InsertTableLbl		: "Jadual",
+InsertTable			: "Masukkan/Sunting Jadual",
+InsertLineLbl		: "Garisan",
+InsertLine			: "Masukkan Garisan Membujur",
+InsertSpecialCharLbl: "Huruf Istimewa",
+InsertSpecialChar	: "Masukkan Huruf Istimewa",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Masukkan Smiley",
+About				: "Tentang FCKeditor",
+Bold				: "Bold",
+Italic				: "Italic",
+Underline			: "Underline",
+StrikeThrough		: "Strike Through",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Jajaran Kiri",
+CenterJustify		: "Jajaran Tengah",
+RightJustify		: "Jajaran Kanan",
+BlockJustify		: "Jajaran Blok",
+DecreaseIndent		: "Kurangkan Inden",
+IncreaseIndent		: "Tambahkan Inden",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Batalkan",
+Redo				: "Ulangkan",
+NumberedListLbl		: "Senarai bernombor",
+NumberedList		: "Masukkan/Sunting Senarai bernombor",
+BulletedListLbl		: "Senarai tidak bernombor",
+BulletedList		: "Masukkan/Sunting Senarai tidak bernombor",
+ShowTableBorders	: "Tunjukkan Border Jadual",
+ShowDetails			: "Tunjukkan Butiran",
+Style				: "Stail",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Saiz",
+TextColor			: "Warna Text",
+BGColor				: "Warna Latarbelakang",
+Source				: "Sumber",
+Find				: "Cari",
+Replace				: "Ganti",
+SpellCheck			: "Semak Ejaan",
+UniversalKeyboard	: "Papan Kekunci Universal",
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "Borang",
+Checkbox		: "Checkbox",
+RadioButton		: "Butang Radio",
+TextField		: "Text Field",
+Textarea		: "Textarea",
+HiddenField		: "Field Tersembunyi",
+Button			: "Butang",
+SelectionField	: "Field Pilihan",
+ImageButton		: "Butang Bergambar",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Sunting Sambungan",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Buangkan Baris",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Buangkan Lajur",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Buangkan Sel-sel",
+MergeCells			: "Cantumkan Sel-sel",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Delete Table",	//MISSING
+CellProperties		: "Ciri-ciri Sel",
+TableProperties		: "Ciri-ciri Jadual",
+ImageProperties		: "Ciri-ciri Gambar",
+FlashProperties		: "Flash Properties",	//MISSING
+
+AnchorProp			: "Ciri-ciri Pautan",
+ButtonProp			: "Ciri-ciri Butang",
+CheckboxProp		: "Ciri-ciri Checkbox",
+HiddenFieldProp		: "Ciri-ciri Field Tersembunyi",
+RadioButtonProp		: "Ciri-ciri Butang Radio",
+ImageButtonProp		: "Ciri-ciri Butang Bergambar",
+TextFieldProp		: "Ciri-ciri Text Field",
+SelectionFieldProp	: "Ciri-ciri Selection Field",
+TextareaProp		: "Ciri-ciri Textarea",
+FormProp			: "Ciri-ciri Borang",
+
+FontFormats			: "Normal;Telah Diformat;Alamat;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Perenggan (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Memproses XHTML. Sila tunggu...",
+Done				: "Siap",
+PasteWordConfirm	: "Text yang anda hendak tampal adalah berasal dari Word. Adakah anda mahu membuang semua format Word sebelum tampal ke dalam text?",
+NotCompatiblePaste	: "Arahan ini bole dilakukan jika anda mempuunyai Internet Explorer version 5.5 atau yang lebih tinggi. Adakah anda hendak tampal text tanpa membuang format Word?",
+UnknownToolbarItem	: "Toolbar item tidak diketahui\"%1\"",
+UnknownCommand		: "Arahan tidak diketahui \"%1\"",
+NotImplemented		: "Arahan tidak terdapat didalam sistem",
+UnknownToolbarSet	: "Set toolbar \"%1\" tidak wujud",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Batal",
+DlgBtnClose			: "Tutup",
+DlgBtnBrowseServer	: "Browse Server",
+DlgAdvancedTag		: "Advanced",
+DlgOpOther			: "<Lain-lain>",
+DlgInfoTab			: "Info",	//MISSING
+DlgAlertUrl			: "Please insert the URL",	//MISSING
+
+// General Dialogs Labels
+DlgGenNotSet		: "<tidak di set>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Arah Tulisan",
+DlgGenLangDirLtr	: "Kiri ke Kanan (LTR)",
+DlgGenLangDirRtl	: "Kanan ke Kiri (RTL)",
+DlgGenLangCode		: "Kod Bahasa",
+DlgGenAccessKey		: "Kunci Akses",
+DlgGenName			: "Nama",
+DlgGenTabIndex		: "Indeks Tab ",
+DlgGenLongDescr		: "Butiran Panjang URL",
+DlgGenClass			: "Kelas-kelas Stylesheet",
+DlgGenTitle			: "Tajuk Makluman",
+DlgGenContType		: "Jenis Kandungan Makluman",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Stail",
+
+// Image Dialog
+DlgImgTitle			: "Ciri-ciri Imej",
+DlgImgInfoTab		: "Info Imej",
+DlgImgBtnUpload		: "Hantar ke Server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Muat Naik",
+DlgImgAlt			: "Text Alternatif",
+DlgImgWidth			: "Lebar",
+DlgImgHeight		: "Tinggi",
+DlgImgLockRatio		: "Tetapkan Nisbah",
+DlgBtnResetSize		: "Saiz Set Semula",
+DlgImgBorder		: "Border",
+DlgImgHSpace		: "Ruang Melintang",
+DlgImgVSpace		: "Ruang Menegak",
+DlgImgAlign			: "Jajaran",
+DlgImgAlignLeft		: "Kiri",
+DlgImgAlignAbsBottom: "Bawah Mutlak",
+DlgImgAlignAbsMiddle: "Pertengahan Mutlak",
+DlgImgAlignBaseline	: "Garis Dasar",
+DlgImgAlignBottom	: "Bawah",
+DlgImgAlignMiddle	: "Pertengahan",
+DlgImgAlignRight	: "Kanan",
+DlgImgAlignTextTop	: "Atas Text",
+DlgImgAlignTop		: "Atas",
+DlgImgPreview		: "Prebiu",
+DlgImgAlertUrl		: "Sila taip URL untuk fail gambar",
+DlgImgLinkTab		: "Sambungan",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Properties",	//MISSING
+DlgFlashChkPlay		: "Auto Play",	//MISSING
+DlgFlashChkLoop		: "Loop",	//MISSING
+DlgFlashChkMenu		: "Enable Flash Menu",	//MISSING
+DlgFlashScale		: "Scale",	//MISSING
+DlgFlashScaleAll	: "Show all",	//MISSING
+DlgFlashScaleNoBorder	: "No Border",	//MISSING
+DlgFlashScaleFit	: "Exact Fit",	//MISSING
+
+// Link Dialog
+DlgLnkWindowTitle	: "Sambungan",
+DlgLnkInfoTab		: "Butiran Sambungan",
+DlgLnkTargetTab		: "Sasaran",
+
+DlgLnkType			: "Jenis Sambungan",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Pautan dalam muka surat ini",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<lain-lain>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Sila pilih pautan",
+DlgLnkAnchorByName	: "dengan menggunakan nama pautan",
+DlgLnkAnchorById	: "dengan menggunakan ID elemen",
+DlgLnkNoAnchors		: "(Tiada pautan terdapat dalam dokumen ini)",
+DlgLnkEMail			: "Alamat E-Mail",
+DlgLnkEMailSubject	: "Subjek Mesej",
+DlgLnkEMailBody		: "Isi Kandungan Mesej",
+DlgLnkUpload		: "Muat Naik",
+DlgLnkBtnUpload		: "Hantar ke Server",
+
+DlgLnkTarget		: "Sasaran",
+DlgLnkTargetFrame	: "<bingkai>",
+DlgLnkTargetPopup	: "<tetingkap popup>",
+DlgLnkTargetBlank	: "Tetingkap Baru (_blank)",
+DlgLnkTargetParent	: "Tetingkap Parent (_parent)",
+DlgLnkTargetSelf	: "Tetingkap yang Sama (_self)",
+DlgLnkTargetTop		: "Tetingkap yang paling atas (_top)",
+DlgLnkTargetFrameName	: "Nama Bingkai Sasaran",
+DlgLnkPopWinName	: "Nama Tetingkap Popup",
+DlgLnkPopWinFeat	: "Ciri Tetingkap Popup",
+DlgLnkPopResize		: "Saiz bolehubah",
+DlgLnkPopLocation	: "Bar Lokasi",
+DlgLnkPopMenu		: "Bar Menu",
+DlgLnkPopScroll		: "Bar-bar skrol",
+DlgLnkPopStatus		: "Bar Status",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Skrin Penuh (IE)",
+DlgLnkPopDependent	: "Bergantungan (Netscape)",
+DlgLnkPopWidth		: "Lebar",
+DlgLnkPopHeight		: "Tinggi",
+DlgLnkPopLeft		: "Posisi Kiri",
+DlgLnkPopTop		: "Posisi Atas",
+
+DlnLnkMsgNoUrl		: "Sila taip sambungan URL",
+DlnLnkMsgNoEMail	: "Sila taip alamat e-mail",
+DlnLnkMsgNoAnchor	: "Sila pilih pautan berkenaaan",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Pilihan Warna",
+DlgColorBtnClear	: "Nyahwarna",
+DlgColorHighlight	: "Terang",
+DlgColorSelected	: "Dipilih",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Masukkan Smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Sila pilih huruf istimewa",
+
+// Table Dialog
+DlgTableTitle		: "Ciri-ciri Jadual",
+DlgTableRows		: "Barisan",
+DlgTableColumns		: "Jaluran",
+DlgTableBorder		: "Saiz Border",
+DlgTableAlign		: "Penjajaran",
+DlgTableAlignNotSet	: "<Tidak diset>",
+DlgTableAlignLeft	: "Kiri",
+DlgTableAlignCenter	: "Tengah",
+DlgTableAlignRight	: "Kanan",
+DlgTableWidth		: "Lebar",
+DlgTableWidthPx		: "piksel-piksel",
+DlgTableWidthPc		: "peratus",
+DlgTableHeight		: "Tinggi",
+DlgTableCellSpace	: "Ruangan Antara Sel",
+DlgTableCellPad		: "Tambahan Ruang Sel",
+DlgTableCaption		: "Keterangan",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "Ciri-ciri Sel",
+DlgCellWidth		: "Lebar",
+DlgCellWidthPx		: "piksel-piksel",
+DlgCellWidthPc		: "peratus",
+DlgCellHeight		: "Tinggi",
+DlgCellWordWrap		: "Mengulung Perkataan",
+DlgCellWordWrapNotSet	: "<Tidak diset>",
+DlgCellWordWrapYes	: "Ya",
+DlgCellWordWrapNo	: "Tidak",
+DlgCellHorAlign		: "Jajaran Membujur",
+DlgCellHorAlignNotSet	: "<Tidak diset>",
+DlgCellHorAlignLeft	: "Kiri",
+DlgCellHorAlignCenter	: "Tengah",
+DlgCellHorAlignRight: "Kanan",
+DlgCellVerAlign		: "Jajaran Menegak",
+DlgCellVerAlignNotSet	: "<Tidak diset>",
+DlgCellVerAlignTop	: "Atas",
+DlgCellVerAlignMiddle	: "Tengah",
+DlgCellVerAlignBottom	: "Bawah",
+DlgCellVerAlignBaseline	: "Garis Dasar",
+DlgCellRowSpan		: "Penggunaan Baris",
+DlgCellCollSpan		: "Penggunaan Lajur",
+DlgCellBackColor	: "Warna Latarbelakang",
+DlgCellBorderColor	: "Warna Border",
+DlgCellBtnSelect	: "Pilih...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Carian",
+DlgFindFindBtn		: "Cari",
+DlgFindNotFoundMsg	: "Text yang dicari tidak dijumpai.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Gantian",
+DlgReplaceFindLbl		: "Perkataan yang dicari:",
+DlgReplaceReplaceLbl	: "Diganti dengan:",
+DlgReplaceCaseChk		: "Padanan case huruf",
+DlgReplaceReplaceBtn	: "Ganti",
+DlgReplaceReplAllBtn	: "Ganti semua",
+DlgReplaceWordChk		: "Padana Keseluruhan perkataan",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl+X).",
+PasteErrorCopy	: "Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl+C).",
+
+PasteAsText		: "Tampal sebagai text biasa",
+PasteFromWord	: "Tampal dari perisian \"Word\"",
+
+DlgPasteMsg2	: "Please paste inside the following box using the keyboard (<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.",	//MISSING
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignore Font Face definitions",	//MISSING
+DlgPasteRemoveStyles	: "Remove Styles definitions",	//MISSING
+
+// Color Picker
+ColorAutomatic	: "Otomatik",
+ColorMoreColors	: "Warna lain-lain...",
+
+// Document Properties
+DocProps		: "Ciri-ciri dokumen",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ciri-ciri Pautan",
+DlgAnchorName		: "Nama Pautan",
+DlgAnchorErrorName	: "Sila taip nama pautan",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Tidak terdapat didalam kamus",
+DlgSpellChangeTo		: "Tukarkan kepada",
+DlgSpellBtnIgnore		: "Biar",
+DlgSpellBtnIgnoreAll	: "Biarkan semua",
+DlgSpellBtnReplace		: "Ganti",
+DlgSpellBtnReplaceAll	: "Gantikan Semua",
+DlgSpellBtnUndo			: "Batalkan",
+DlgSpellNoSuggestions	: "- Tiada cadangan -",
+DlgSpellProgress		: "Pemeriksaan ejaan sedang diproses...",
+DlgSpellNoMispell		: "Pemeriksaan ejaan siap: Tiada salah ejaan",
+DlgSpellNoChanges		: "Pemeriksaan ejaan siap: Tiada perkataan diubah",
+DlgSpellOneChange		: "Pemeriksaan ejaan siap: Satu perkataan telah diubah",
+DlgSpellManyChanges		: "Pemeriksaan ejaan siap: %1 perkataan diubah",
+
+IeSpellDownload			: "Pemeriksa ejaan tidak dipasang. Adakah anda mahu muat turun sekarang?",
+
+// Button Dialog
+DlgButtonText		: "Teks (Nilai)",
+DlgButtonType		: "Jenis",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nama",
+DlgCheckboxValue	: "Nilai",
+DlgCheckboxSelected	: "Dipilih",
+
+// Form Dialog
+DlgFormName		: "Nama",
+DlgFormAction	: "Tindakan borang",
+DlgFormMethod	: "Cara borang dihantar",
+
+// Select Field Dialog
+DlgSelectName		: "Nama",
+DlgSelectValue		: "Nilai",
+DlgSelectSize		: "Saiz",
+DlgSelectLines		: "garisan",
+DlgSelectChkMulti	: "Benarkan pilihan pelbagai",
+DlgSelectOpAvail	: "Pilihan sediada",
+DlgSelectOpText		: "Teks",
+DlgSelectOpValue	: "Nilai",
+DlgSelectBtnAdd		: "Tambah Pilihan",
+DlgSelectBtnModify	: "Ubah Pilihan",
+DlgSelectBtnUp		: "Naik ke atas",
+DlgSelectBtnDown	: "Turun ke bawah",
+DlgSelectBtnSetValue : "Set sebagai nilai terpilih",
+DlgSelectBtnDelete	: "Padam",
+
+// Textarea Dialog
+DlgTextareaName	: "Nama",
+DlgTextareaCols	: "Lajur",
+DlgTextareaRows	: "Baris",
+
+// Text Field Dialog
+DlgTextName			: "Nama",
+DlgTextValue		: "Nilai",
+DlgTextCharWidth	: "Lebar isian",
+DlgTextMaxChars		: "Isian Maksimum",
+DlgTextType			: "Jenis",
+DlgTextTypeText		: "Teks",
+DlgTextTypePass		: "Kata Laluan",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nama",
+DlgHiddenValue	: "Nilai",
+
+// Bulleted List Dialog
+BulletedListProp	: "Ciri-ciri senarai berpeluru",
+NumberedListProp	: "Ciri-ciri senarai bernombor",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Jenis",
+DlgLstTypeCircle	: "Circle",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "Square",
+DlgLstTypeNumbers	: "Nombor-nombor (1, 2, 3)",
+DlgLstTypeLCase		: "Huruf-huruf kecil (a, b, c)",
+DlgLstTypeUCase		: "Huruf-huruf besar (A, B, C)",
+DlgLstTypeSRoman	: "Nombor Roman Kecil (i, ii, iii)",
+DlgLstTypeLRoman	: "Nombor Roman Besar (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Umum",
+DlgDocBackTab		: "Latarbelakang",
+DlgDocColorsTab		: "Warna dan margin",
+DlgDocMetaTab		: "Data Meta",
+
+DlgDocPageTitle		: "Tajuk Muka Surat",
+DlgDocLangDir		: "Arah Tulisan",
+DlgDocLangDirLTR	: "Kiri ke Kanan (LTR)",
+DlgDocLangDirRTL	: "Kanan ke Kiri (RTL)",
+DlgDocLangCode		: "Kod Bahasa",
+DlgDocCharSet		: "Enkod Set Huruf",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Enkod Set Huruf yang Lain",
+
+DlgDocDocType		: "Jenis Kepala Dokumen",
+DlgDocDocTypeOther	: "Jenis Kepala Dokumen yang Lain",
+DlgDocIncXHTML		: "Masukkan pemula kod XHTML",
+DlgDocBgColor		: "Warna Latarbelakang",
+DlgDocBgImage		: "URL Gambar Latarbelakang",
+DlgDocBgNoScroll	: "Imej Latarbelakang tanpa Skrol",
+DlgDocCText			: "Teks",
+DlgDocCLink			: "Sambungan",
+DlgDocCVisited		: "Sambungan telah Dilawati",
+DlgDocCActive		: "Sambungan Aktif",
+DlgDocMargins		: "Margin Muka Surat",
+DlgDocMaTop			: "Atas",
+DlgDocMaLeft		: "Kiri",
+DlgDocMaRight		: "Kanan",
+DlgDocMaBottom		: "Bawah",
+DlgDocMeIndex		: "Kata Kunci Indeks Dokumen (dipisahkan oleh koma)",
+DlgDocMeDescr		: "Keterangan Dokumen",
+DlgDocMeAuthor		: "Penulis",
+DlgDocMeCopy		: "Hakcipta",
+DlgDocPreview		: "Prebiu",
+
+// Templates Dialog
+Templates			: "Templat",
+DlgTemplatesTitle	: "Templat Kandungan",
+DlgTemplatesSelMsg	: "Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):",
+DlgTemplatesLoading	: "Senarai Templat sedang diproses. Sila Tunggu...",
+DlgTemplatesNoTpl	: "(Tiada Templat Disimpan)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Tentang",
+DlgAboutBrowserInfoTab	: "Maklumat Perisian Browser",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "versi",
+DlgAboutInfo		: "Untuk maklumat lanjut sila pergi ke",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/nb.js b/modules/editor/skins/fckeditor/editor/lang/nb.js
new file mode 100644
index 000000000..debbe2b31
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/nb.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Norwegian Bokmål language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skjul verktøylinje",
+ToolbarExpand		: "Vis verktøylinje",
+
+// Toolbar Items and Context Menu
+Save				: "Lagre",
+NewPage				: "Ny Side",
+Preview				: "Forhåndsvis",
+Cut					: "Klipp ut",
+Copy				: "Kopier",
+Paste				: "Lim inn",
+PasteText			: "Lim inn som ren tekst",
+PasteWord			: "Lim inn fra Word",
+Print				: "Skriv ut",
+SelectAll			: "Merk alt",
+RemoveFormat		: "Fjern format",
+InsertLinkLbl		: "Lenke",
+InsertLink			: "Sett inn/Rediger lenke",
+RemoveLink			: "Fjern lenke",
+VisitLink			: "Åpne lenke",
+Anchor				: "Sett inn/Rediger anker",
+AnchorDelete		: "Fjern anker",
+InsertImageLbl		: "Bilde",
+InsertImage			: "Sett inn/Rediger bilde",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Sett inn/Rediger Flash",
+InsertTableLbl		: "Tabell",
+InsertTable			: "Sett inn/Rediger tabell",
+InsertLineLbl		: "Linje",
+InsertLine			: "Sett inn horisontal linje",
+InsertSpecialCharLbl: "Spesielt tegn",
+InsertSpecialChar	: "Sett inn spesielt tegn",
+InsertSmileyLbl		: "Smil",
+InsertSmiley		: "Sett inn smil",
+About				: "Om FCKeditor",
+Bold				: "Fet",
+Italic				: "Kursiv",
+Underline			: "Understrek",
+StrikeThrough		: "Gjennomstrek",
+Subscript			: "Senket skrift",
+Superscript			: "Hevet skrift",
+LeftJustify			: "Venstrejuster",
+CenterJustify		: "Midtjuster",
+RightJustify		: "Høyrejuster",
+BlockJustify		: "Blokkjuster",
+DecreaseIndent		: "Senk nivå",
+IncreaseIndent		: "Øk nivå",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Angre",
+Redo				: "Gjør om",
+NumberedListLbl		: "Nummerert liste",
+NumberedList		: "Sett inn/Fjern nummerert liste",
+BulletedListLbl		: "Uordnet liste",
+BulletedList		: "Sett inn/Fjern uordnet liste",
+ShowTableBorders	: "Vis tabellrammer",
+ShowDetails			: "Vis detaljer",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Skrift",
+FontSize			: "Størrelse",
+TextColor			: "Tekstfarge",
+BGColor				: "Bakgrunnsfarge",
+Source				: "Kilde",
+Find				: "Søk",
+Replace				: "Erstatt",
+SpellCheck			: "Stavekontroll",
+UniversalKeyboard	: "Universelt tastatur",
+PageBreakLbl		: "Sideskift",
+PageBreak			: "Sett inn sideskift",
+
+Form			: "Skjema",
+Checkbox		: "Avmerkingsboks",
+RadioButton		: "Alternativknapp",
+TextField		: "Tekstboks",
+Textarea		: "Tekstområde",
+HiddenField		: "Skjult felt",
+Button			: "Knapp",
+SelectionField	: "Rullegardinliste",
+ImageButton		: "Bildeknapp",
+
+FitWindow		: "Maksimer størrelsen på redigeringsverktøyet",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Rediger lenke",
+CellCM				: "Celle",
+RowCM				: "Rader",
+ColumnCM			: "Kolonne",
+InsertRowAfter		: "Sett inn rad etter",
+InsertRowBefore		: "Sett inn rad før",
+DeleteRows			: "Slett rader",
+InsertColumnAfter	: "Sett inn kolonne etter",
+InsertColumnBefore	: "Sett inn kolonne før",
+DeleteColumns		: "Slett kolonner",
+InsertCellAfter		: "Sett inn celle etter",
+InsertCellBefore	: "Sett inn celle før",
+DeleteCells			: "Slett celler",
+MergeCells			: "Slå sammen celler",
+MergeRight			: "Slå sammen høyre",
+MergeDown			: "Slå sammen ned",
+HorizontalSplitCell	: "Del celle horisontalt",
+VerticalSplitCell	: "Del celle vertikalt",
+TableDelete			: "Slett tabell",
+CellProperties		: "Egenskaper for celle",
+TableProperties		: "Egenskaper for tabell",
+ImageProperties		: "Egenskaper for bilde",
+FlashProperties		: "Egenskaper for Flash-objekt",
+
+AnchorProp			: "Egenskaper for anker",
+ButtonProp			: "Egenskaper for knapp",
+CheckboxProp		: "Egenskaper for avmerkingsboks",
+HiddenFieldProp		: "Egenskaper for skjult felt",
+RadioButtonProp		: "Egenskaper for alternativknapp",
+ImageButtonProp		: "Egenskaper for bildeknapp",
+TextFieldProp		: "Egenskaper for tekstfelt",
+SelectionFieldProp	: "Egenskaper for rullegardinliste",
+TextareaProp		: "Egenskaper for tekstområde",
+FormProp			: "Egenskaper for skjema",
+
+FontFormats			: "Normal;Formatert;Adresse;Tittel 1;Tittel 2;Tittel 3;Tittel 4;Tittel 5;Tittel 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Lager XHTML. Vennligst vent...",
+Done				: "Ferdig",
+PasteWordConfirm	: "Teksten du prøver å lime inn ser ut som om den kommer fra Word. Vil du rense den for unødvendig kode før du limer inn?",
+NotCompatiblePaste	: "Denne kommandoen er kun tilgjenglig for Internet Explorer versjon 5.5 eller bedre. Vil du fortsette uten å rense? (Du kan lime inn som ren tekst)",
+UnknownToolbarItem	: "Ukjent menyvalg \"%1\"",
+UnknownCommand		: "Ukjent kommando \"%1\"",
+NotImplemented		: "Kommando ikke implimentert",
+UnknownToolbarSet	: "Verktøylinjesett \"%1\" finnes ikke",
+NoActiveX			: "Din nettlesers sikkerhetsinstillinger kan begrense noen av funksjonene i redigeringsverktøyet. Du må aktivere \"Kjør ActiveX-kontroller og plugin-modeller\". Du kan oppleve feil og advarsler om manglende funksjoner",
+BrowseServerBlocked : "Kunne ikke åpne dialogboksen for filarkiv. Sjekk at popup-blokkering er deaktivert.",
+DialogBlocked		: "Kunne ikke åpne dialogboksen. Sjekk at popup-blokkering er deaktivert.",
+VisitLinkBlocked	: "Kunne ikke åpne et nytt vindu. Sjekk at popup-blokkering er deaktivert.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Avbryt",
+DlgBtnClose			: "Lukk",
+DlgBtnBrowseServer	: "Bla igjennom server",
+DlgAdvancedTag		: "Avansert",
+DlgOpOther			: "<Annet>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Vennligst skriv inn URL-en",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ikke satt>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Språkretning",
+DlgGenLangDirLtr	: "Venstre til høyre (VTH)",
+DlgGenLangDirRtl	: "Høyre til venstre (HTV)",
+DlgGenLangCode		: "Språkkode",
+DlgGenAccessKey		: "Aksessknapp",
+DlgGenName			: "Navn",
+DlgGenTabIndex		: "Tab Indeks",
+DlgGenLongDescr		: "Utvidet beskrivelse",
+DlgGenClass			: "Stilarkklasser",
+DlgGenTitle			: "Tittel",
+DlgGenContType		: "Type",
+DlgGenLinkCharset	: "Lenket språkkart",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Bildeegenskaper",
+DlgImgInfoTab		: "Bildeinformasjon",
+DlgImgBtnUpload		: "Send det til serveren",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Last opp",
+DlgImgAlt			: "Alternativ tekst",
+DlgImgWidth			: "Bredde",
+DlgImgHeight		: "Høyde",
+DlgImgLockRatio		: "Lås forhold",
+DlgBtnResetSize		: "Tilbakestill størrelse",
+DlgImgBorder		: "Ramme",
+DlgImgHSpace		: "HMarg",
+DlgImgVSpace		: "VMarg",
+DlgImgAlign			: "Juster",
+DlgImgAlignLeft		: "Venstre",
+DlgImgAlignAbsBottom: "Abs bunn",
+DlgImgAlignAbsMiddle: "Abs midten",
+DlgImgAlignBaseline	: "Bunnlinje",
+DlgImgAlignBottom	: "Bunn",
+DlgImgAlignMiddle	: "Midten",
+DlgImgAlignRight	: "Høyre",
+DlgImgAlignTextTop	: "Tekst topp",
+DlgImgAlignTop		: "Topp",
+DlgImgPreview		: "Forhåndsvis",
+DlgImgAlertUrl		: "Vennligst skriv bilde-urlen",
+DlgImgLinkTab		: "Lenke",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash-egenskaper",
+DlgFlashChkPlay		: "Autospill",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Slå på Flash-meny",
+DlgFlashScale		: "Skaler",
+DlgFlashScaleAll	: "Vis alt",
+DlgFlashScaleNoBorder	: "Ingen ramme",
+DlgFlashScaleFit	: "Skaler til å passe",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Lenke",
+DlgLnkInfoTab		: "Lenkeinfo",
+DlgLnkTargetTab		: "Mål",
+
+DlgLnkType			: "Lenketype",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Lenke til anker i teksten",
+DlgLnkTypeEMail		: "E-post",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<annet>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Velg et anker",
+DlgLnkAnchorByName	: "Anker etter navn",
+DlgLnkAnchorById	: "Element etter ID",
+DlgLnkNoAnchors		: "(Ingen anker i dokumentet)",
+DlgLnkEMail			: "E-postadresse",
+DlgLnkEMailSubject	: "Meldingsemne",
+DlgLnkEMailBody		: "Melding",
+DlgLnkUpload		: "Last opp",
+DlgLnkBtnUpload		: "Send til server",
+
+DlgLnkTarget		: "Mål",
+DlgLnkTargetFrame	: "<ramme>",
+DlgLnkTargetPopup	: "<popup vindu>",
+DlgLnkTargetBlank	: "Nytt vindu (_blank)",
+DlgLnkTargetParent	: "Foreldrevindu (_parent)",
+DlgLnkTargetSelf	: "Samme vindu (_self)",
+DlgLnkTargetTop		: "Hele vindu (_top)",
+DlgLnkTargetFrameName	: "Målramme",
+DlgLnkPopWinName	: "Navn på popup-vindus",
+DlgLnkPopWinFeat	: "Egenskaper for popup-vindu",
+DlgLnkPopResize		: "Endre størrelse",
+DlgLnkPopLocation	: "Adresselinje",
+DlgLnkPopMenu		: "Menylinje",
+DlgLnkPopScroll		: "Scrollbar",
+DlgLnkPopStatus		: "Statuslinje",
+DlgLnkPopToolbar	: "Verktøylinje",
+DlgLnkPopFullScrn	: "Full skjerm (IE)",
+DlgLnkPopDependent	: "Avhenging (Netscape)",
+DlgLnkPopWidth		: "Bredde",
+DlgLnkPopHeight		: "Høyde",
+DlgLnkPopLeft		: "Venstre posisjon",
+DlgLnkPopTop		: "Topp-posisjon",
+
+DlnLnkMsgNoUrl		: "Vennligst skriv inn lenkens url",
+DlnLnkMsgNoEMail	: "Vennligst skriv inn e-postadressen",
+DlnLnkMsgNoAnchor	: "Vennligst velg et anker",
+DlnLnkMsgInvPopName	: "Popup-vinduets navn må begynne med en bokstav, og kan ikke inneholde mellomrom",
+
+// Color Dialog
+DlgColorTitle		: "Velg farge",
+DlgColorBtnClear	: "Tøm",
+DlgColorHighlight	: "Marker",
+DlgColorSelected	: "Valgt",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Sett inn smil",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Velg spesielt tegn",
+
+// Table Dialog
+DlgTableTitle		: "Egenskaper for tabell",
+DlgTableRows		: "Rader",
+DlgTableColumns		: "Kolonner",
+DlgTableBorder		: "Rammestørrelse",
+DlgTableAlign		: "Justering",
+DlgTableAlignNotSet	: "<Ikke satt>",
+DlgTableAlignLeft	: "Venstre",
+DlgTableAlignCenter	: "Midtjuster",
+DlgTableAlignRight	: "Høyre",
+DlgTableWidth		: "Bredde",
+DlgTableWidthPx		: "piksler",
+DlgTableWidthPc		: "prosent",
+DlgTableHeight		: "Høyde",
+DlgTableCellSpace	: "Cellemarg",
+DlgTableCellPad		: "Cellepolstring",
+DlgTableCaption		: "Tittel",
+DlgTableSummary		: "Sammendrag",
+
+// Table Cell Dialog
+DlgCellTitle		: "Celleegenskaper",
+DlgCellWidth		: "Bredde",
+DlgCellWidthPx		: "piksler",
+DlgCellWidthPc		: "prosent",
+DlgCellHeight		: "Høyde",
+DlgCellWordWrap		: "Tekstbrytning",
+DlgCellWordWrapNotSet	: "<Ikke satt>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nei",
+DlgCellHorAlign		: "Horisontal justering",
+DlgCellHorAlignNotSet	: "<Ikke satt>",
+DlgCellHorAlignLeft	: "Venstre",
+DlgCellHorAlignCenter	: "Midtjuster",
+DlgCellHorAlignRight: "Høyre",
+DlgCellVerAlign		: "Vertikal justering",
+DlgCellVerAlignNotSet	: "<Ikke satt>",
+DlgCellVerAlignTop	: "Topp",
+DlgCellVerAlignMiddle	: "Midten",
+DlgCellVerAlignBottom	: "Bunn",
+DlgCellVerAlignBaseline	: "Bunnlinje",
+DlgCellRowSpan		: "Radspenn",
+DlgCellCollSpan		: "Kolonnespenn",
+DlgCellBackColor	: "Bakgrunnsfarge",
+DlgCellBorderColor	: "Rammefarge",
+DlgCellBtnSelect	: "Velg...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Søk og erstatt",
+
+// Find Dialog
+DlgFindTitle		: "Søk",
+DlgFindFindBtn		: "Søk",
+DlgFindNotFoundMsg	: "Fant ikke søketeksten.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Erstatt",
+DlgReplaceFindLbl		: "Søk etter:",
+DlgReplaceReplaceLbl	: "Erstatt med:",
+DlgReplaceCaseChk		: "Skill mellom store og små bokstaver",
+DlgReplaceReplaceBtn	: "Erstatt",
+DlgReplaceReplAllBtn	: "Erstatt alle",
+DlgReplaceWordChk		: "Bare hele ord",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Din nettlesers sikkerhetsinstillinger tillater ikke automatisk klipping av tekst. Vennligst bruk snareveien (Ctrl+X).",
+PasteErrorCopy	: "Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snareveien (Ctrl+C).",
+
+PasteAsText		: "Lim inn som ren tekst",
+PasteFromWord	: "Lim inn fra Word",
+
+DlgPasteMsg2	: "Vennligst lim inn i den følgende boksen med tastaturet (<STRONG>Ctrl+V</STRONG>) og trykk <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må lime det igjen i dette vinduet.",
+DlgPasteIgnoreFont		: "Fjern skrifttyper",
+DlgPasteRemoveStyles	: "Fjern stildefinisjoner",
+
+// Color Picker
+ColorAutomatic	: "Automatisk",
+ColorMoreColors	: "Flere farger...",
+
+// Document Properties
+DocProps		: "Dokumentegenskaper",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankeregenskaper",
+DlgAnchorName		: "Ankernavn",
+DlgAnchorErrorName	: "Vennligst skriv inn ankernavnet",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ikke i ordboken",
+DlgSpellChangeTo		: "Endre til",
+DlgSpellBtnIgnore		: "Ignorer",
+DlgSpellBtnIgnoreAll	: "Ignorer alle",
+DlgSpellBtnReplace		: "Erstatt",
+DlgSpellBtnReplaceAll	: "Erstatt alle",
+DlgSpellBtnUndo			: "Angre",
+DlgSpellNoSuggestions	: "- Ingen forslag -",
+DlgSpellProgress		: "Stavekontroll pågår...",
+DlgSpellNoMispell		: "Stavekontroll fullført: ingen feilstavinger funnet",
+DlgSpellNoChanges		: "Stavekontroll fullført: ingen ord endret",
+DlgSpellOneChange		: "Stavekontroll fullført: Ett ord endret",
+DlgSpellManyChanges		: "Stavekontroll fullført: %1 ord endret",
+
+IeSpellDownload			: "Stavekontroll er ikke installert. Vil du laste den ned nå?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (verdi)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Knapp",
+DlgButtonTypeSbm	: "Send",
+DlgButtonTypeRst	: "Nullstill",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Navn",
+DlgCheckboxValue	: "Verdi",
+DlgCheckboxSelected	: "Valgt",
+
+// Form Dialog
+DlgFormName		: "Navn",
+DlgFormAction	: "Handling",
+DlgFormMethod	: "Metode",
+
+// Select Field Dialog
+DlgSelectName		: "Navn",
+DlgSelectValue		: "Verdi",
+DlgSelectSize		: "Størrelse",
+DlgSelectLines		: "Linjer",
+DlgSelectChkMulti	: "Tillat flervalg",
+DlgSelectOpAvail	: "Tilgjenglige alternativer",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Verdi",
+DlgSelectBtnAdd		: "Legg til",
+DlgSelectBtnModify	: "Endre",
+DlgSelectBtnUp		: "Opp",
+DlgSelectBtnDown	: "Ned",
+DlgSelectBtnSetValue : "Sett som valgt",
+DlgSelectBtnDelete	: "Slett",
+
+// Textarea Dialog
+DlgTextareaName	: "Navn",
+DlgTextareaCols	: "Kolonner",
+DlgTextareaRows	: "Rader",
+
+// Text Field Dialog
+DlgTextName			: "Navn",
+DlgTextValue		: "Verdi",
+DlgTextCharWidth	: "Tegnbredde",
+DlgTextMaxChars		: "Maks antall tegn",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Passord",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Navn",
+DlgHiddenValue	: "Verdi",
+
+// Bulleted List Dialog
+BulletedListProp	: "Egenskaper for uordnet liste",
+NumberedListProp	: "Egenskaper for ordnet liste",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Sirkel",
+DlgLstTypeDisc		: "Hel sirkel",
+DlgLstTypeSquare	: "Firkant",
+DlgLstTypeNumbers	: "Numre (1, 2, 3)",
+DlgLstTypeLCase		: "Små bokstaver (a, b, c)",
+DlgLstTypeUCase		: "Store bokstaver (A, B, C)",
+DlgLstTypeSRoman	: "Små romerske tall (i, ii, iii)",
+DlgLstTypeLRoman	: "Store romerske tall (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Generelt",
+DlgDocBackTab		: "Bakgrunn",
+DlgDocColorsTab		: "Farger og marginer",
+DlgDocMetaTab		: "Meta-data",
+
+DlgDocPageTitle		: "Sidetittel",
+DlgDocLangDir		: "Språkretning",
+DlgDocLangDirLTR	: "Venstre til høyre (LTR)",
+DlgDocLangDirRTL	: "Høyre til venstre (RTL)",
+DlgDocLangCode		: "Språkkode",
+DlgDocCharSet		: "Tegnsett",
+DlgDocCharSetCE		: "Sentraleuropeisk",
+DlgDocCharSetCT		: "Tradisonell kinesisk(Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Gresk",
+DlgDocCharSetJP		: "Japansk",
+DlgDocCharSetKR		: "Koreansk",
+DlgDocCharSetTR		: "Tyrkisk",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Vesteuropeisk",
+DlgDocCharSetOther	: "Annet tegnsett",
+
+DlgDocDocType		: "Dokumenttype header",
+DlgDocDocTypeOther	: "Annet dokumenttype header",
+DlgDocIncXHTML		: "Inkluder XHTML-deklarasjon",
+DlgDocBgColor		: "Bakgrunnsfarge",
+DlgDocBgImage		: "URL for bakgrunnsbilde",
+DlgDocBgNoScroll	: "Lås bakgrunnsbilde",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Besøkt lenke",
+DlgDocCActive		: "Aktiv lenke",
+DlgDocMargins		: "Sidemargin",
+DlgDocMaTop			: "Topp",
+DlgDocMaLeft		: "Venstre",
+DlgDocMaRight		: "Høyre",
+DlgDocMaBottom		: "Bunn",
+DlgDocMeIndex		: "Dokument nøkkelord (kommaseparert)",
+DlgDocMeDescr		: "Dokumentbeskrivelse",
+DlgDocMeAuthor		: "Forfatter",
+DlgDocMeCopy		: "Kopirett",
+DlgDocPreview		: "Forhåndsvising",
+
+// Templates Dialog
+Templates			: "Maler",
+DlgTemplatesTitle	: "Innholdsmaler",
+DlgTemplatesSelMsg	: "Velg malen du vil åpne<br>(innholdet du har skrevet blir tapt!):",
+DlgTemplatesLoading	: "Laster malliste. Vennligst vent...",
+DlgTemplatesNoTpl	: "(Ingen maler definert)",
+DlgTemplatesReplace	: "Erstatt faktisk innold",
+
+// About Dialog
+DlgAboutAboutTab	: "Om",
+DlgAboutBrowserInfoTab	: "Nettleserinfo",
+DlgAboutLicenseTab	: "Lisens",
+DlgAboutVersion		: "versjon",
+DlgAboutInfo		: "For mer informasjon, se",
+
+// Div Dialog
+DlgDivGeneralTab	: "Generelt",
+DlgDivAdvancedTab	: "Avansert",
+DlgDivStyle		: "Stil",
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/nl.js b/modules/editor/skins/fckeditor/editor/lang/nl.js
new file mode 100644
index 000000000..adf4b58f7
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/nl.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Dutch language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Menubalk inklappen",
+ToolbarExpand		: "Menubalk uitklappen",
+
+// Toolbar Items and Context Menu
+Save				: "Opslaan",
+NewPage				: "Nieuwe pagina",
+Preview				: "Voorbeeld",
+Cut					: "Knippen",
+Copy				: "Kopiëren",
+Paste				: "Plakken",
+PasteText			: "Plakken als platte tekst",
+PasteWord			: "Plakken als Word-gegevens",
+Print				: "Printen",
+SelectAll			: "Alles selecteren",
+RemoveFormat		: "Opmaak verwijderen",
+InsertLinkLbl		: "Link",
+InsertLink			: "Link invoegen/wijzigen",
+RemoveLink			: "Link verwijderen",
+VisitLink			: "Link volgen",
+Anchor				: "Interne link",
+AnchorDelete		: "Anker verwijderen",
+InsertImageLbl		: "Afbeelding",
+InsertImage			: "Afbeelding invoegen/wijzigen",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash invoegen/wijzigen",
+InsertTableLbl		: "Tabel",
+InsertTable			: "Tabel invoegen/wijzigen",
+InsertLineLbl		: "Lijn",
+InsertLine			: "Horizontale lijn invoegen",
+InsertSpecialCharLbl: "Speciale tekens",
+InsertSpecialChar	: "Speciaal teken invoegen",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Smiley invoegen",
+About				: "Over FCKeditor",
+Bold				: "Vet",
+Italic				: "Schuingedrukt",
+Underline			: "Onderstreept",
+StrikeThrough		: "Doorhalen",
+Subscript			: "Subscript",
+Superscript			: "Superscript",
+LeftJustify			: "Links uitlijnen",
+CenterJustify		: "Centreren",
+RightJustify		: "Rechts uitlijnen",
+BlockJustify		: "Uitvullen",
+DecreaseIndent		: "Inspringen verkleinen",
+IncreaseIndent		: "Inspringen vergroten",
+Blockquote			: "Citaatblok",
+CreateDiv			: "DIV aanmaken",
+EditDiv				: "DIV wijzigen",
+DeleteDiv			: "DIV verwijderen",
+Undo				: "Ongedaan maken",
+Redo				: "Opnieuw uitvoeren",
+NumberedListLbl		: "Genummerde lijst",
+NumberedList		: "Genummerde lijst invoegen/verwijderen",
+BulletedListLbl		: "Opsomming",
+BulletedList		: "Opsomming invoegen/verwijderen",
+ShowTableBorders	: "Randen tabel weergeven",
+ShowDetails			: "Details weergeven",
+Style				: "Stijl",
+FontFormat			: "Opmaak",
+Font				: "Lettertype",
+FontSize			: "Grootte",
+TextColor			: "Tekstkleur",
+BGColor				: "Achtergrondkleur",
+Source				: "Code",
+Find				: "Zoeken",
+Replace				: "Vervangen",
+SpellCheck			: "Spellingscontrole",
+UniversalKeyboard	: "Universeel toetsenbord",
+PageBreakLbl		: "Pagina-einde",
+PageBreak			: "Pagina-einde invoegen",
+
+Form			: "Formulier",
+Checkbox		: "Aanvinkvakje",
+RadioButton		: "Selectievakje",
+TextField		: "Tekstveld",
+Textarea		: "Tekstvak",
+HiddenField		: "Verborgen veld",
+Button			: "Knop",
+SelectionField	: "Selectieveld",
+ImageButton		: "Afbeeldingsknop",
+
+FitWindow		: "De editor maximaliseren",
+ShowBlocks		: "Toon blokken",
+
+// Context Menu
+EditLink			: "Link wijzigen",
+CellCM				: "Cel",
+RowCM				: "Rij",
+ColumnCM			: "Kolom",
+InsertRowAfter		: "Voeg rij in achter",
+InsertRowBefore		: "Voeg rij in voor",
+DeleteRows			: "Rijen verwijderen",
+InsertColumnAfter	: "Voeg kolom in achter",
+InsertColumnBefore	: "Voeg kolom in voor",
+DeleteColumns		: "Kolommen verwijderen",
+InsertCellAfter		: "Voeg cel in achter",
+InsertCellBefore	: "Voeg cel in voor",
+DeleteCells			: "Cellen verwijderen",
+MergeCells			: "Cellen samenvoegen",
+MergeRight			: "Voeg samen naar rechts",
+MergeDown			: "Voeg samen naar beneden",
+HorizontalSplitCell	: "Splits cellen horizontaal",
+VerticalSplitCell	: "Splits cellen verticaal",
+TableDelete			: "Tabel verwijderen",
+CellProperties		: "Eigenschappen cel",
+TableProperties		: "Eigenschappen tabel",
+ImageProperties		: "Eigenschappen afbeelding",
+FlashProperties		: "Eigenschappen Flash",
+
+AnchorProp			: "Eigenschappen interne link",
+ButtonProp			: "Eigenschappen knop",
+CheckboxProp		: "Eigenschappen aanvinkvakje",
+HiddenFieldProp		: "Eigenschappen verborgen veld",
+RadioButtonProp		: "Eigenschappen selectievakje",
+ImageButtonProp		: "Eigenschappen afbeeldingsknop",
+TextFieldProp		: "Eigenschappen tekstveld",
+SelectionFieldProp	: "Eigenschappen selectieveld",
+TextareaProp		: "Eigenschappen tekstvak",
+FormProp			: "Eigenschappen formulier",
+
+FontFormats			: "Normaal;Met opmaak;Adres;Kop 1;Kop 2;Kop 3;Kop 4;Kop 5;Kop 6;Normaal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Bezig met verwerken XHTML. Even geduld aub...",
+Done				: "Klaar",
+PasteWordConfirm	: "De tekst die je plakte lijkt gekopieerd uit te zijn Word. Wil je de tekst opschonen voordat deze geplakt wordt?",
+NotCompatiblePaste	: "Deze opdracht is beschikbaar voor Internet Explorer versie 5.5 of hoger. Wil je plakken zonder op te schonen?",
+UnknownToolbarItem	: "Onbekend item op menubalk \"%1\"",
+UnknownCommand		: "Onbekende opdrachtnaam: \"%1\"",
+NotImplemented		: "Opdracht niet geïmplementeerd.",
+UnknownToolbarSet	: "Menubalk \"%1\" bestaat niet.",
+NoActiveX			: "De beveilingsinstellingen van je browser zouden sommige functies van de editor kunnen beperken. De optie \"Activeer ActiveX-elementen en plug-ins\" dient ingeschakeld te worden. Het kan zijn dat er nu functies ontbreken of niet werken.",
+BrowseServerBlocked : "De bestandsbrowser kon niet geopend worden. Zorg ervoor dat pop-up-blokkeerders uit staan.",
+DialogBlocked		: "Kan het dialoogvenster niet weergeven. Zorg ervoor dat pop-up-blokkeerders uit staan.",
+VisitLinkBlocked	: "Het was niet mogelijk een nieuw venster te openen. Controleer of er geen pop-up-blocker aktief is.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Annuleren",
+DlgBtnClose			: "Afsluiten",
+DlgBtnBrowseServer	: "Bladeren op server",
+DlgAdvancedTag		: "Geavanceerd",
+DlgOpOther			: "<Anders>",
+DlgInfoTab			: "Informatie",
+DlgAlertUrl			: "Geef URL op",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<niet ingevuld>",
+DlgGenId			: "Kenmerk",
+DlgGenLangDir		: "Schrijfrichting",
+DlgGenLangDirLtr	: "Links naar rechts (LTR)",
+DlgGenLangDirRtl	: "Rechts naar links (RTL)",
+DlgGenLangCode		: "Taalcode",
+DlgGenAccessKey		: "Toegangstoets",
+DlgGenName			: "Naam",
+DlgGenTabIndex		: "Tabvolgorde",
+DlgGenLongDescr		: "Lange URL-omschrijving",
+DlgGenClass			: "Stylesheet-klassen",
+DlgGenTitle			: "Aanbevolen titel",
+DlgGenContType		: "Aanbevolen content-type",
+DlgGenLinkCharset	: "Karakterset van gelinkte bron",
+DlgGenStyle			: "Stijl",
+
+// Image Dialog
+DlgImgTitle			: "Eigenschappen afbeelding",
+DlgImgInfoTab		: "Informatie afbeelding",
+DlgImgBtnUpload		: "Naar server verzenden",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Upload",
+DlgImgAlt			: "Alternatieve tekst",
+DlgImgWidth			: "Breedte",
+DlgImgHeight		: "Hoogte",
+DlgImgLockRatio		: "Afmetingen vergrendelen",
+DlgBtnResetSize		: "Afmetingen resetten",
+DlgImgBorder		: "Rand",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Uitlijning",
+DlgImgAlignLeft		: "Links",
+DlgImgAlignAbsBottom: "Absoluut-onder",
+DlgImgAlignAbsMiddle: "Absoluut-midden",
+DlgImgAlignBaseline	: "Basislijn",
+DlgImgAlignBottom	: "Beneden",
+DlgImgAlignMiddle	: "Midden",
+DlgImgAlignRight	: "Rechts",
+DlgImgAlignTextTop	: "Boven tekst",
+DlgImgAlignTop		: "Boven",
+DlgImgPreview		: "Voorbeeld",
+DlgImgAlertUrl		: "Geef de URL van de afbeelding",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Eigenschappen Flash",
+DlgFlashChkPlay		: "Automatisch afspelen",
+DlgFlashChkLoop		: "Herhalen",
+DlgFlashChkMenu		: "Flashmenu\'s inschakelen",
+DlgFlashScale		: "Schaal",
+DlgFlashScaleAll	: "Alles tonen",
+DlgFlashScaleNoBorder	: "Geen rand",
+DlgFlashScaleFit	: "Precies passend",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Linkomschrijving",
+DlgLnkTargetTab		: "Doel",
+
+DlgLnkType			: "Linktype",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Interne link in pagina",
+DlgLnkTypeEMail		: "E-mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<anders>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Kies een interne link",
+DlgLnkAnchorByName	: "Op naam interne link",
+DlgLnkAnchorById	: "Op kenmerk interne link",
+DlgLnkNoAnchors		: "(Geen interne links in document gevonden)",
+DlgLnkEMail			: "E-mailadres",
+DlgLnkEMailSubject	: "Onderwerp bericht",
+DlgLnkEMailBody		: "Inhoud bericht",
+DlgLnkUpload		: "Upload",
+DlgLnkBtnUpload		: "Naar de server versturen",
+
+DlgLnkTarget		: "Doel",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<popup window>",
+DlgLnkTargetBlank	: "Nieuw venster (_blank)",
+DlgLnkTargetParent	: "Origineel venster (_parent)",
+DlgLnkTargetSelf	: "Zelfde venster (_self)",
+DlgLnkTargetTop		: "Hele venster (_top)",
+DlgLnkTargetFrameName	: "Naam doelframe",
+DlgLnkPopWinName	: "Naam popupvenster",
+DlgLnkPopWinFeat	: "Instellingen popupvenster",
+DlgLnkPopResize		: "Grootte wijzigen",
+DlgLnkPopLocation	: "Locatiemenu",
+DlgLnkPopMenu		: "Menubalk",
+DlgLnkPopScroll		: "Schuifbalken",
+DlgLnkPopStatus		: "Statusbalk",
+DlgLnkPopToolbar	: "Menubalk",
+DlgLnkPopFullScrn	: "Volledig scherm (IE)",
+DlgLnkPopDependent	: "Afhankelijk (Netscape)",
+DlgLnkPopWidth		: "Breedte",
+DlgLnkPopHeight		: "Hoogte",
+DlgLnkPopLeft		: "Positie links",
+DlgLnkPopTop		: "Positie boven",
+
+DlnLnkMsgNoUrl		: "Geef de link van de URL",
+DlnLnkMsgNoEMail	: "Geef een e-mailadres",
+DlnLnkMsgNoAnchor	: "Selecteer een interne link",
+DlnLnkMsgInvPopName	: "De naam van de popup moet met een alfa-numerieke waarde beginnen, en mag geen spaties bevatten.",
+
+// Color Dialog
+DlgColorTitle		: "Selecteer kleur",
+DlgColorBtnClear	: "Opschonen",
+DlgColorHighlight	: "Accentueren",
+DlgColorSelected	: "Geselecteerd",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Smiley invoegen",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Selecteer speciaal teken",
+
+// Table Dialog
+DlgTableTitle		: "Eigenschappen tabel",
+DlgTableRows		: "Rijen",
+DlgTableColumns		: "Kolommen",
+DlgTableBorder		: "Breedte rand",
+DlgTableAlign		: "Uitlijning",
+DlgTableAlignNotSet	: "<Niet ingevoerd>",
+DlgTableAlignLeft	: "Links",
+DlgTableAlignCenter	: "Centreren",
+DlgTableAlignRight	: "Rechts",
+DlgTableWidth		: "Breedte",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "procent",
+DlgTableHeight		: "Hoogte",
+DlgTableCellSpace	: "Afstand tussen cellen",
+DlgTableCellPad		: "Afstand vanaf rand cel",
+DlgTableCaption		: "Naam",
+DlgTableSummary		: "Samenvatting",
+
+// Table Cell Dialog
+DlgCellTitle		: "Eigenschappen cel",
+DlgCellWidth		: "Breedte",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "procent",
+DlgCellHeight		: "Hoogte",
+DlgCellWordWrap		: "Afbreken woorden",
+DlgCellWordWrapNotSet	: "<Niet ingevoerd>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nee",
+DlgCellHorAlign		: "Horizontale uitlijning",
+DlgCellHorAlignNotSet	: "<Niet ingevoerd>",
+DlgCellHorAlignLeft	: "Links",
+DlgCellHorAlignCenter	: "Centreren",
+DlgCellHorAlignRight: "Rechts",
+DlgCellVerAlign		: "Verticale uitlijning",
+DlgCellVerAlignNotSet	: "<Niet ingevoerd>",
+DlgCellVerAlignTop	: "Boven",
+DlgCellVerAlignMiddle	: "Midden",
+DlgCellVerAlignBottom	: "Beneden",
+DlgCellVerAlignBaseline	: "Basislijn",
+DlgCellRowSpan		: "Overkoepeling rijen",
+DlgCellCollSpan		: "Overkoepeling kolommen",
+DlgCellBackColor	: "Achtergrondkleur",
+DlgCellBorderColor	: "Randkleur",
+DlgCellBtnSelect	: "Selecteren...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Zoeken en vervangen",
+
+// Find Dialog
+DlgFindTitle		: "Zoeken",
+DlgFindFindBtn		: "Zoeken",
+DlgFindNotFoundMsg	: "De opgegeven tekst is niet gevonden.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Vervangen",
+DlgReplaceFindLbl		: "Zoeken naar:",
+DlgReplaceReplaceLbl	: "Vervangen met:",
+DlgReplaceCaseChk		: "Hoofdlettergevoelig",
+DlgReplaceReplaceBtn	: "Vervangen",
+DlgReplaceReplAllBtn	: "Alles vervangen",
+DlgReplaceWordChk		: "Hele woord moet voorkomen",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl+X van het toetsenbord.",
+PasteErrorCopy	: "De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl+C van het toetsenbord.",
+
+PasteAsText		: "Plakken als platte tekst",
+PasteFromWord	: "Plakken als Word-gegevens",
+
+DlgPasteMsg2	: "Plak de tekst in het volgende vak gebruik makend van je toetstenbord (<strong>Ctrl+V</strong>) en klik op <strong>OK</strong>.",
+DlgPasteSec		: "Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.",
+DlgPasteIgnoreFont		: "Negeer \"Font Face\"-definities",
+DlgPasteRemoveStyles	: "Verwijder \"Style\"-definities",
+
+// Color Picker
+ColorAutomatic	: "Automatisch",
+ColorMoreColors	: "Meer kleuren...",
+
+// Document Properties
+DocProps		: "Eigenschappen document",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Eigenschappen interne link",
+DlgAnchorName		: "Naam interne link",
+DlgAnchorErrorName	: "Geef de naam van de interne link op",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Niet in het woordenboek",
+DlgSpellChangeTo		: "Wijzig in",
+DlgSpellBtnIgnore		: "Negeren",
+DlgSpellBtnIgnoreAll	: "Alles negeren",
+DlgSpellBtnReplace		: "Vervangen",
+DlgSpellBtnReplaceAll	: "Alles vervangen",
+DlgSpellBtnUndo			: "Ongedaan maken",
+DlgSpellNoSuggestions	: "-Geen suggesties-",
+DlgSpellProgress		: "Bezig met spellingscontrole...",
+DlgSpellNoMispell		: "Klaar met spellingscontrole: geen fouten gevonden",
+DlgSpellNoChanges		: "Klaar met spellingscontrole: geen woorden aangepast",
+DlgSpellOneChange		: "Klaar met spellingscontrole: één woord aangepast",
+DlgSpellManyChanges		: "Klaar met spellingscontrole: %1 woorden aangepast",
+
+IeSpellDownload			: "De spellingscontrole niet geïnstalleerd. Wil je deze nu downloaden?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (waarde)",
+DlgButtonType		: "Soort",
+DlgButtonTypeBtn	: "Knop",
+DlgButtonTypeSbm	: "Versturen",
+DlgButtonTypeRst	: "Leegmaken",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Naam",
+DlgCheckboxValue	: "Waarde",
+DlgCheckboxSelected	: "Geselecteerd",
+
+// Form Dialog
+DlgFormName		: "Naam",
+DlgFormAction	: "Actie",
+DlgFormMethod	: "Methode",
+
+// Select Field Dialog
+DlgSelectName		: "Naam",
+DlgSelectValue		: "Waarde",
+DlgSelectSize		: "Grootte",
+DlgSelectLines		: "Regels",
+DlgSelectChkMulti	: "Gecombineerde selecties toestaan",
+DlgSelectOpAvail	: "Beschikbare opties",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Waarde",
+DlgSelectBtnAdd		: "Toevoegen",
+DlgSelectBtnModify	: "Wijzigen",
+DlgSelectBtnUp		: "Omhoog",
+DlgSelectBtnDown	: "Omlaag",
+DlgSelectBtnSetValue : "Als geselecteerde waarde instellen",
+DlgSelectBtnDelete	: "Verwijderen",
+
+// Textarea Dialog
+DlgTextareaName	: "Naam",
+DlgTextareaCols	: "Kolommen",
+DlgTextareaRows	: "Rijen",
+
+// Text Field Dialog
+DlgTextName			: "Naam",
+DlgTextValue		: "Waarde",
+DlgTextCharWidth	: "Breedte (tekens)",
+DlgTextMaxChars		: "Maximum aantal tekens",
+DlgTextType			: "Soort",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Wachtwoord",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Naam",
+DlgHiddenValue	: "Waarde",
+
+// Bulleted List Dialog
+BulletedListProp	: "Eigenschappen opsommingslijst",
+NumberedListProp	: "Eigenschappen genummerde opsommingslijst",
+DlgLstStart			: "Start",
+DlgLstType			: "Soort",
+DlgLstTypeCircle	: "Cirkel",
+DlgLstTypeDisc		: "Schijf",
+DlgLstTypeSquare	: "Vierkant",
+DlgLstTypeNumbers	: "Nummers (1, 2, 3)",
+DlgLstTypeLCase		: "Kleine letters (a, b, c)",
+DlgLstTypeUCase		: "Hoofdletters (A, B, C)",
+DlgLstTypeSRoman	: "Klein Romeins (i, ii, iii)",
+DlgLstTypeLRoman	: "Groot Romeins (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Algemeen",
+DlgDocBackTab		: "Achtergrond",
+DlgDocColorsTab		: "Kleuring en marges",
+DlgDocMetaTab		: "META-data",
+
+DlgDocPageTitle		: "Paginatitel",
+DlgDocLangDir		: "Schrijfrichting",
+DlgDocLangDirLTR	: "Links naar rechts",
+DlgDocLangDirRTL	: "Rechts naar links",
+DlgDocLangCode		: "Taalcode",
+DlgDocCharSet		: "Karakterset-encoding",
+DlgDocCharSetCE		: "Centraal Europees",
+DlgDocCharSetCT		: "Traditioneel Chinees (Big5)",
+DlgDocCharSetCR		: "Cyriliaans",
+DlgDocCharSetGR		: "Grieks",
+DlgDocCharSetJP		: "Japans",
+DlgDocCharSetKR		: "Koreaans",
+DlgDocCharSetTR		: "Turks",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "West europees",
+DlgDocCharSetOther	: "Andere karakterset-encoding",
+
+DlgDocDocType		: "Opschrift documentsoort",
+DlgDocDocTypeOther	: "Ander opschrift documentsoort",
+DlgDocIncXHTML		: "XHTML-declaraties meenemen",
+DlgDocBgColor		: "Achtergrondkleur",
+DlgDocBgImage		: "URL achtergrondplaatje",
+DlgDocBgNoScroll	: "Vaste achtergrond",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Bezochte link",
+DlgDocCActive		: "Active link",
+DlgDocMargins		: "Afstandsinstellingen document",
+DlgDocMaTop			: "Boven",
+DlgDocMaLeft		: "Links",
+DlgDocMaRight		: "Rechts",
+DlgDocMaBottom		: "Onder",
+DlgDocMeIndex		: "Trefwoorden betreffende document (kommagescheiden)",
+DlgDocMeDescr		: "Beschrijving document",
+DlgDocMeAuthor		: "Auteur",
+DlgDocMeCopy		: "Copyright",
+DlgDocPreview		: "Voorbeeld",
+
+// Templates Dialog
+Templates			: "Sjablonen",
+DlgTemplatesTitle	: "Inhoud sjabonen",
+DlgTemplatesSelMsg	: "Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):",
+DlgTemplatesLoading	: "Bezig met laden sjabonen. Even geduld alstublieft...",
+DlgTemplatesNoTpl	: "(Geen sjablonen gedefinieerd)",
+DlgTemplatesReplace	: "Vervang de huidige inhoud",
+
+// About Dialog
+DlgAboutAboutTab	: "Over",
+DlgAboutBrowserInfoTab	: "Browserinformatie",
+DlgAboutLicenseTab	: "Licentie",
+DlgAboutVersion		: "Versie",
+DlgAboutInfo		: "Voor meer informatie ga naar ",
+
+// Div Dialog
+DlgDivGeneralTab	: "Algemeen",
+DlgDivAdvancedTab	: "Geavanceerd",
+DlgDivStyle		: "Style",
+DlgDivInlineStyle	: "Inline Style"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/no.js b/modules/editor/skins/fckeditor/editor/lang/no.js
new file mode 100644
index 000000000..a4e3515b1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/no.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Norwegian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skjul verktøylinje",
+ToolbarExpand		: "Vis verktøylinje",
+
+// Toolbar Items and Context Menu
+Save				: "Lagre",
+NewPage				: "Ny Side",
+Preview				: "Forhåndsvis",
+Cut					: "Klipp ut",
+Copy				: "Kopier",
+Paste				: "Lim inn",
+PasteText			: "Lim inn som ren tekst",
+PasteWord			: "Lim inn fra Word",
+Print				: "Skriv ut",
+SelectAll			: "Merk alt",
+RemoveFormat		: "Fjern format",
+InsertLinkLbl		: "Lenke",
+InsertLink			: "Sett inn/Rediger lenke",
+RemoveLink			: "Fjern lenke",
+VisitLink			: "Åpne lenke",
+Anchor				: "Sett inn/Rediger anker",
+AnchorDelete		: "Fjern anker",
+InsertImageLbl		: "Bilde",
+InsertImage			: "Sett inn/Rediger bilde",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Sett inn/Rediger Flash",
+InsertTableLbl		: "Tabell",
+InsertTable			: "Sett inn/Rediger tabell",
+InsertLineLbl		: "Linje",
+InsertLine			: "Sett inn horisontal linje",
+InsertSpecialCharLbl: "Spesielt tegn",
+InsertSpecialChar	: "Sett inn spesielt tegn",
+InsertSmileyLbl		: "Smil",
+InsertSmiley		: "Sett inn smil",
+About				: "Om FCKeditor",
+Bold				: "Fet",
+Italic				: "Kursiv",
+Underline			: "Understrek",
+StrikeThrough		: "Gjennomstrek",
+Subscript			: "Senket skrift",
+Superscript			: "Hevet skrift",
+LeftJustify			: "Venstrejuster",
+CenterJustify		: "Midtjuster",
+RightJustify		: "Høyrejuster",
+BlockJustify		: "Blokkjuster",
+DecreaseIndent		: "Senk nivå",
+IncreaseIndent		: "Øk nivå",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Angre",
+Redo				: "Gjør om",
+NumberedListLbl		: "Nummerert liste",
+NumberedList		: "Sett inn/Fjern nummerert liste",
+BulletedListLbl		: "Uordnet liste",
+BulletedList		: "Sett inn/Fjern uordnet liste",
+ShowTableBorders	: "Vis tabellrammer",
+ShowDetails			: "Vis detaljer",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Skrift",
+FontSize			: "Størrelse",
+TextColor			: "Tekstfarge",
+BGColor				: "Bakgrunnsfarge",
+Source				: "Kilde",
+Find				: "Søk",
+Replace				: "Erstatt",
+SpellCheck			: "Stavekontroll",
+UniversalKeyboard	: "Universelt tastatur",
+PageBreakLbl		: "Sideskift",
+PageBreak			: "Sett inn sideskift",
+
+Form			: "Skjema",
+Checkbox		: "Avmerkingsboks",
+RadioButton		: "Alternativknapp",
+TextField		: "Tekstboks",
+Textarea		: "Tekstområde",
+HiddenField		: "Skjult felt",
+Button			: "Knapp",
+SelectionField	: "Rullegardinliste",
+ImageButton		: "Bildeknapp",
+
+FitWindow		: "Maksimer størrelsen på redigeringsverktøyet",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Rediger lenke",
+CellCM				: "Celle",
+RowCM				: "Rader",
+ColumnCM			: "Kolonne",
+InsertRowAfter		: "Sett inn rad etter",
+InsertRowBefore		: "Sett inn rad før",
+DeleteRows			: "Slett rader",
+InsertColumnAfter	: "Sett inn kolonne etter",
+InsertColumnBefore	: "Sett inn kolonne før",
+DeleteColumns		: "Slett kolonner",
+InsertCellAfter		: "Sett inn celle etter",
+InsertCellBefore	: "Sett inn celle før",
+DeleteCells			: "Slett celler",
+MergeCells			: "Slå sammen celler",
+MergeRight			: "Slå sammen høyre",
+MergeDown			: "Slå sammen ned",
+HorizontalSplitCell	: "Del celle horisontalt",
+VerticalSplitCell	: "Del celle vertikalt",
+TableDelete			: "Slett tabell",
+CellProperties		: "Egenskaper for celle",
+TableProperties		: "Egenskaper for tabell",
+ImageProperties		: "Egenskaper for bilde",
+FlashProperties		: "Egenskaper for Flash-objekt",
+
+AnchorProp			: "Egenskaper for anker",
+ButtonProp			: "Egenskaper for knapp",
+CheckboxProp		: "Egenskaper for avmerkingsboks",
+HiddenFieldProp		: "Egenskaper for skjult felt",
+RadioButtonProp		: "Egenskaper for alternativknapp",
+ImageButtonProp		: "Egenskaper for bildeknapp",
+TextFieldProp		: "Egenskaper for tekstfelt",
+SelectionFieldProp	: "Egenskaper for rullegardinliste",
+TextareaProp		: "Egenskaper for tekstområde",
+FormProp			: "Egenskaper for skjema",
+
+FontFormats			: "Normal;Formatert;Adresse;Tittel 1;Tittel 2;Tittel 3;Tittel 4;Tittel 5;Tittel 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Lager XHTML. Vennligst vent...",
+Done				: "Ferdig",
+PasteWordConfirm	: "Teksten du prøver å lime inn ser ut som om den kommer fra Word. Vil du rense den for unødvendig kode før du limer inn?",
+NotCompatiblePaste	: "Denne kommandoen er kun tilgjenglig for Internet Explorer versjon 5.5 eller bedre. Vil du fortsette uten å rense? (Du kan lime inn som ren tekst)",
+UnknownToolbarItem	: "Ukjent menyvalg \"%1\"",
+UnknownCommand		: "Ukjent kommando \"%1\"",
+NotImplemented		: "Kommando ikke implimentert",
+UnknownToolbarSet	: "Verktøylinjesett \"%1\" finnes ikke",
+NoActiveX			: "Din nettlesers sikkerhetsinstillinger kan begrense noen av funksjonene i redigeringsverktøyet. Du må aktivere \"Kjør ActiveX-kontroller og plugin-modeller\". Du kan oppleve feil og advarsler om manglende funksjoner",
+BrowseServerBlocked : "Kunne ikke åpne dialogboksen for filarkiv. Sjekk at popup-blokkering er deaktivert.",
+DialogBlocked		: "Kunne ikke åpne dialogboksen. Sjekk at popup-blokkering er deaktivert.",
+VisitLinkBlocked	: "Kunne ikke åpne et nytt vindu. Sjekk at popup-blokkering er deaktivert.",
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Avbryt",
+DlgBtnClose			: "Lukk",
+DlgBtnBrowseServer	: "Bla igjennom server",
+DlgAdvancedTag		: "Avansert",
+DlgOpOther			: "<Annet>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Vennligst skriv inn URL-en",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ikke satt>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Språkretning",
+DlgGenLangDirLtr	: "Venstre til høyre (VTH)",
+DlgGenLangDirRtl	: "Høyre til venstre (HTV)",
+DlgGenLangCode		: "Språkkode",
+DlgGenAccessKey		: "Aksessknapp",
+DlgGenName			: "Navn",
+DlgGenTabIndex		: "Tab Indeks",
+DlgGenLongDescr		: "Utvidet beskrivelse",
+DlgGenClass			: "Stilarkklasser",
+DlgGenTitle			: "Tittel",
+DlgGenContType		: "Type",
+DlgGenLinkCharset	: "Lenket språkkart",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Bildeegenskaper",
+DlgImgInfoTab		: "Bildeinformasjon",
+DlgImgBtnUpload		: "Send det til serveren",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Last opp",
+DlgImgAlt			: "Alternativ tekst",
+DlgImgWidth			: "Bredde",
+DlgImgHeight		: "Høyde",
+DlgImgLockRatio		: "Lås forhold",
+DlgBtnResetSize		: "Tilbakestill størrelse",
+DlgImgBorder		: "Ramme",
+DlgImgHSpace		: "HMarg",
+DlgImgVSpace		: "VMarg",
+DlgImgAlign			: "Juster",
+DlgImgAlignLeft		: "Venstre",
+DlgImgAlignAbsBottom: "Abs bunn",
+DlgImgAlignAbsMiddle: "Abs midten",
+DlgImgAlignBaseline	: "Bunnlinje",
+DlgImgAlignBottom	: "Bunn",
+DlgImgAlignMiddle	: "Midten",
+DlgImgAlignRight	: "Høyre",
+DlgImgAlignTextTop	: "Tekst topp",
+DlgImgAlignTop		: "Topp",
+DlgImgPreview		: "Forhåndsvis",
+DlgImgAlertUrl		: "Vennligst skriv bilde-urlen",
+DlgImgLinkTab		: "Lenke",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash-egenskaper",
+DlgFlashChkPlay		: "Autospill",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Slå på Flash-meny",
+DlgFlashScale		: "Skaler",
+DlgFlashScaleAll	: "Vis alt",
+DlgFlashScaleNoBorder	: "Ingen ramme",
+DlgFlashScaleFit	: "Skaler til å passe",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Lenke",
+DlgLnkInfoTab		: "Lenkeinfo",
+DlgLnkTargetTab		: "Mål",
+
+DlgLnkType			: "Lenketype",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Lenke til anker i teksten",
+DlgLnkTypeEMail		: "E-post",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<annet>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Velg et anker",
+DlgLnkAnchorByName	: "Anker etter navn",
+DlgLnkAnchorById	: "Element etter ID",
+DlgLnkNoAnchors		: "(Ingen anker i dokumentet)",
+DlgLnkEMail			: "E-postadresse",
+DlgLnkEMailSubject	: "Meldingsemne",
+DlgLnkEMailBody		: "Melding",
+DlgLnkUpload		: "Last opp",
+DlgLnkBtnUpload		: "Send til server",
+
+DlgLnkTarget		: "Mål",
+DlgLnkTargetFrame	: "<ramme>",
+DlgLnkTargetPopup	: "<popup vindu>",
+DlgLnkTargetBlank	: "Nytt vindu (_blank)",
+DlgLnkTargetParent	: "Foreldrevindu (_parent)",
+DlgLnkTargetSelf	: "Samme vindu (_self)",
+DlgLnkTargetTop		: "Hele vindu (_top)",
+DlgLnkTargetFrameName	: "Målramme",
+DlgLnkPopWinName	: "Navn på popup-vindus",
+DlgLnkPopWinFeat	: "Egenskaper for popup-vindu",
+DlgLnkPopResize		: "Endre størrelse",
+DlgLnkPopLocation	: "Adresselinje",
+DlgLnkPopMenu		: "Menylinje",
+DlgLnkPopScroll		: "Scrollbar",
+DlgLnkPopStatus		: "Statuslinje",
+DlgLnkPopToolbar	: "Verktøylinje",
+DlgLnkPopFullScrn	: "Full skjerm (IE)",
+DlgLnkPopDependent	: "Avhenging (Netscape)",
+DlgLnkPopWidth		: "Bredde",
+DlgLnkPopHeight		: "Høyde",
+DlgLnkPopLeft		: "Venstre posisjon",
+DlgLnkPopTop		: "Topp-posisjon",
+
+DlnLnkMsgNoUrl		: "Vennligst skriv inn lenkens url",
+DlnLnkMsgNoEMail	: "Vennligst skriv inn e-postadressen",
+DlnLnkMsgNoAnchor	: "Vennligst velg et anker",
+DlnLnkMsgInvPopName	: "Popup-vinduets navn må begynne med en bokstav, og kan ikke inneholde mellomrom",
+
+// Color Dialog
+DlgColorTitle		: "Velg farge",
+DlgColorBtnClear	: "Tøm",
+DlgColorHighlight	: "Marker",
+DlgColorSelected	: "Valgt",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Sett inn smil",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Velg spesielt tegn",
+
+// Table Dialog
+DlgTableTitle		: "Egenskaper for tabell",
+DlgTableRows		: "Rader",
+DlgTableColumns		: "Kolonner",
+DlgTableBorder		: "Rammestørrelse",
+DlgTableAlign		: "Justering",
+DlgTableAlignNotSet	: "<Ikke satt>",
+DlgTableAlignLeft	: "Venstre",
+DlgTableAlignCenter	: "Midtjuster",
+DlgTableAlignRight	: "Høyre",
+DlgTableWidth		: "Bredde",
+DlgTableWidthPx		: "piksler",
+DlgTableWidthPc		: "prosent",
+DlgTableHeight		: "Høyde",
+DlgTableCellSpace	: "Cellemarg",
+DlgTableCellPad		: "Cellepolstring",
+DlgTableCaption		: "Tittel",
+DlgTableSummary		: "Sammendrag",
+
+// Table Cell Dialog
+DlgCellTitle		: "Celleegenskaper",
+DlgCellWidth		: "Bredde",
+DlgCellWidthPx		: "piksler",
+DlgCellWidthPc		: "prosent",
+DlgCellHeight		: "Høyde",
+DlgCellWordWrap		: "Tekstbrytning",
+DlgCellWordWrapNotSet	: "<Ikke satt>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nei",
+DlgCellHorAlign		: "Horisontal justering",
+DlgCellHorAlignNotSet	: "<Ikke satt>",
+DlgCellHorAlignLeft	: "Venstre",
+DlgCellHorAlignCenter	: "Midtjuster",
+DlgCellHorAlignRight: "Høyre",
+DlgCellVerAlign		: "Vertikal justering",
+DlgCellVerAlignNotSet	: "<Ikke satt>",
+DlgCellVerAlignTop	: "Topp",
+DlgCellVerAlignMiddle	: "Midten",
+DlgCellVerAlignBottom	: "Bunn",
+DlgCellVerAlignBaseline	: "Bunnlinje",
+DlgCellRowSpan		: "Radspenn",
+DlgCellCollSpan		: "Kolonnespenn",
+DlgCellBackColor	: "Bakgrunnsfarge",
+DlgCellBorderColor	: "Rammefarge",
+DlgCellBtnSelect	: "Velg...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Søk og erstatt",
+
+// Find Dialog
+DlgFindTitle		: "Søk",
+DlgFindFindBtn		: "Søk",
+DlgFindNotFoundMsg	: "Fant ikke søketeksten.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Erstatt",
+DlgReplaceFindLbl		: "Søk etter:",
+DlgReplaceReplaceLbl	: "Erstatt med:",
+DlgReplaceCaseChk		: "Skill mellom store og små bokstaver",
+DlgReplaceReplaceBtn	: "Erstatt",
+DlgReplaceReplAllBtn	: "Erstatt alle",
+DlgReplaceWordChk		: "Bare hele ord",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Din nettlesers sikkerhetsinstillinger tillater ikke automatisk klipping av tekst. Vennligst bruk snareveien (Ctrl+X).",
+PasteErrorCopy	: "Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snareveien (Ctrl+C).",
+
+PasteAsText		: "Lim inn som ren tekst",
+PasteFromWord	: "Lim inn fra Word",
+
+DlgPasteMsg2	: "Vennligst lim inn i den følgende boksen med tastaturet (<STRONG>Ctrl+V</STRONG>) og trykk <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må lime det igjen i dette vinduet.",
+DlgPasteIgnoreFont		: "Fjern skrifttyper",
+DlgPasteRemoveStyles	: "Fjern stildefinisjoner",
+
+// Color Picker
+ColorAutomatic	: "Automatisk",
+ColorMoreColors	: "Flere farger...",
+
+// Document Properties
+DocProps		: "Dokumentegenskaper",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankeregenskaper",
+DlgAnchorName		: "Ankernavn",
+DlgAnchorErrorName	: "Vennligst skriv inn ankernavnet",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ikke i ordboken",
+DlgSpellChangeTo		: "Endre til",
+DlgSpellBtnIgnore		: "Ignorer",
+DlgSpellBtnIgnoreAll	: "Ignorer alle",
+DlgSpellBtnReplace		: "Erstatt",
+DlgSpellBtnReplaceAll	: "Erstatt alle",
+DlgSpellBtnUndo			: "Angre",
+DlgSpellNoSuggestions	: "- Ingen forslag -",
+DlgSpellProgress		: "Stavekontroll pågår...",
+DlgSpellNoMispell		: "Stavekontroll fullført: ingen feilstavinger funnet",
+DlgSpellNoChanges		: "Stavekontroll fullført: ingen ord endret",
+DlgSpellOneChange		: "Stavekontroll fullført: Ett ord endret",
+DlgSpellManyChanges		: "Stavekontroll fullført: %1 ord endret",
+
+IeSpellDownload			: "Stavekontroll er ikke installert. Vil du laste den ned nå?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (verdi)",
+DlgButtonType		: "Type",
+DlgButtonTypeBtn	: "Knapp",
+DlgButtonTypeSbm	: "Send",
+DlgButtonTypeRst	: "Nullstill",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Navn",
+DlgCheckboxValue	: "Verdi",
+DlgCheckboxSelected	: "Valgt",
+
+// Form Dialog
+DlgFormName		: "Navn",
+DlgFormAction	: "Handling",
+DlgFormMethod	: "Metode",
+
+// Select Field Dialog
+DlgSelectName		: "Navn",
+DlgSelectValue		: "Verdi",
+DlgSelectSize		: "Størrelse",
+DlgSelectLines		: "Linjer",
+DlgSelectChkMulti	: "Tillat flervalg",
+DlgSelectOpAvail	: "Tilgjenglige alternativer",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Verdi",
+DlgSelectBtnAdd		: "Legg til",
+DlgSelectBtnModify	: "Endre",
+DlgSelectBtnUp		: "Opp",
+DlgSelectBtnDown	: "Ned",
+DlgSelectBtnSetValue : "Sett som valgt",
+DlgSelectBtnDelete	: "Slett",
+
+// Textarea Dialog
+DlgTextareaName	: "Navn",
+DlgTextareaCols	: "Kolonner",
+DlgTextareaRows	: "Rader",
+
+// Text Field Dialog
+DlgTextName			: "Navn",
+DlgTextValue		: "Verdi",
+DlgTextCharWidth	: "Tegnbredde",
+DlgTextMaxChars		: "Maks antall tegn",
+DlgTextType			: "Type",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Passord",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Navn",
+DlgHiddenValue	: "Verdi",
+
+// Bulleted List Dialog
+BulletedListProp	: "Egenskaper for uordnet liste",
+NumberedListProp	: "Egenskaper for ordnet liste",
+DlgLstStart			: "Start",
+DlgLstType			: "Type",
+DlgLstTypeCircle	: "Sirkel",
+DlgLstTypeDisc		: "Hel sirkel",
+DlgLstTypeSquare	: "Firkant",
+DlgLstTypeNumbers	: "Numre (1, 2, 3)",
+DlgLstTypeLCase		: "Små bokstaver (a, b, c)",
+DlgLstTypeUCase		: "Store bokstaver (A, B, C)",
+DlgLstTypeSRoman	: "Små romerske tall (i, ii, iii)",
+DlgLstTypeLRoman	: "Store romerske tall (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Generelt",
+DlgDocBackTab		: "Bakgrunn",
+DlgDocColorsTab		: "Farger og marginer",
+DlgDocMetaTab		: "Meta-data",
+
+DlgDocPageTitle		: "Sidetittel",
+DlgDocLangDir		: "Språkretning",
+DlgDocLangDirLTR	: "Venstre til høyre (LTR)",
+DlgDocLangDirRTL	: "Høyre til venstre (RTL)",
+DlgDocLangCode		: "Språkkode",
+DlgDocCharSet		: "Tegnsett",
+DlgDocCharSetCE		: "Sentraleuropeisk",
+DlgDocCharSetCT		: "Tradisonell kinesisk(Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Gresk",
+DlgDocCharSetJP		: "Japansk",
+DlgDocCharSetKR		: "Koreansk",
+DlgDocCharSetTR		: "Tyrkisk",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Vesteuropeisk",
+DlgDocCharSetOther	: "Annet tegnsett",
+
+DlgDocDocType		: "Dokumenttype header",
+DlgDocDocTypeOther	: "Annet dokumenttype header",
+DlgDocIncXHTML		: "Inkluder XHTML-deklarasjon",
+DlgDocBgColor		: "Bakgrunnsfarge",
+DlgDocBgImage		: "URL for bakgrunnsbilde",
+DlgDocBgNoScroll	: "Lås bakgrunnsbilde",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Besøkt lenke",
+DlgDocCActive		: "Aktiv lenke",
+DlgDocMargins		: "Sidemargin",
+DlgDocMaTop			: "Topp",
+DlgDocMaLeft		: "Venstre",
+DlgDocMaRight		: "Høyre",
+DlgDocMaBottom		: "Bunn",
+DlgDocMeIndex		: "Dokument nøkkelord (kommaseparert)",
+DlgDocMeDescr		: "Dokumentbeskrivelse",
+DlgDocMeAuthor		: "Forfatter",
+DlgDocMeCopy		: "Kopirett",
+DlgDocPreview		: "Forhåndsvising",
+
+// Templates Dialog
+Templates			: "Maler",
+DlgTemplatesTitle	: "Innholdsmaler",
+DlgTemplatesSelMsg	: "Velg malen du vil åpne<br>(innholdet du har skrevet blir tapt!):",
+DlgTemplatesLoading	: "Laster malliste. Vennligst vent...",
+DlgTemplatesNoTpl	: "(Ingen maler definert)",
+DlgTemplatesReplace	: "Erstatt faktisk innold",
+
+// About Dialog
+DlgAboutAboutTab	: "Om",
+DlgAboutBrowserInfoTab	: "Nettleserinfo",
+DlgAboutLicenseTab	: "Lisens",
+DlgAboutVersion		: "versjon",
+DlgAboutInfo		: "For mer informasjon, se",
+
+// Div Dialog
+DlgDivGeneralTab	: "Generelt",
+DlgDivAdvancedTab	: "Avansert",
+DlgDivStyle		: "Stil",
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/pl.js b/modules/editor/skins/fckeditor/editor/lang/pl.js
new file mode 100644
index 000000000..e6d2ba4cd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/pl.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Polish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Zwiń pasek narzędzi",
+ToolbarExpand		: "Rozwiń pasek narzędzi",
+
+// Toolbar Items and Context Menu
+Save				: "Zapisz",
+NewPage				: "Nowa strona",
+Preview				: "Podgląd",
+Cut					: "Wytnij",
+Copy				: "Kopiuj",
+Paste				: "Wklej",
+PasteText			: "Wklej jako czysty tekst",
+PasteWord			: "Wklej z Worda",
+Print				: "Drukuj",
+SelectAll			: "Zaznacz wszystko",
+RemoveFormat		: "Usuń formatowanie",
+InsertLinkLbl		: "Hiperłącze",
+InsertLink			: "Wstaw/edytuj hiperłącze",
+RemoveLink			: "Usuń hiperłącze",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Wstaw/edytuj kotwicę",
+AnchorDelete		: "Usuń kotwicę",
+InsertImageLbl		: "Obrazek",
+InsertImage			: "Wstaw/edytuj obrazek",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Dodaj/Edytuj element Flash",
+InsertTableLbl		: "Tabela",
+InsertTable			: "Wstaw/edytuj tabelę",
+InsertLineLbl		: "Linia pozioma",
+InsertLine			: "Wstaw poziomą linię",
+InsertSpecialCharLbl: "Znak specjalny",
+InsertSpecialChar	: "Wstaw znak specjalny",
+InsertSmileyLbl		: "Emotikona",
+InsertSmiley		: "Wstaw emotikonę",
+About				: "O programie FCKeditor",
+Bold				: "Pogrubienie",
+Italic				: "Kursywa",
+Underline			: "Podkreślenie",
+StrikeThrough		: "Przekreślenie",
+Subscript			: "Indeks dolny",
+Superscript			: "Indeks górny",
+LeftJustify			: "Wyrównaj do lewej",
+CenterJustify		: "Wyrównaj do środka",
+RightJustify		: "Wyrównaj do prawej",
+BlockJustify		: "Wyrównaj do lewej i prawej",
+DecreaseIndent		: "Zmniejsz wcięcie",
+IncreaseIndent		: "Zwiększ wcięcie",
+Blockquote			: "Cytat",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Cofnij",
+Redo				: "Ponów",
+NumberedListLbl		: "Lista numerowana",
+NumberedList		: "Wstaw/usuń numerowanie listy",
+BulletedListLbl		: "Lista wypunktowana",
+BulletedList		: "Wstaw/usuń wypunktowanie listy",
+ShowTableBorders	: "Pokazuj ramkę tabeli",
+ShowDetails			: "Pokaż szczegóły",
+Style				: "Styl",
+FontFormat			: "Format",
+Font				: "Czcionka",
+FontSize			: "Rozmiar",
+TextColor			: "Kolor tekstu",
+BGColor				: "Kolor tła",
+Source				: "Źródło dokumentu",
+Find				: "Znajdź",
+Replace				: "Zamień",
+SpellCheck			: "Sprawdź pisownię",
+UniversalKeyboard	: "Klawiatura Uniwersalna",
+PageBreakLbl		: "Odstęp",
+PageBreak			: "Wstaw odstęp",
+
+Form			: "Formularz",
+Checkbox		: "Pole wyboru (checkbox)",
+RadioButton		: "Pole wyboru (radio)",
+TextField		: "Pole tekstowe",
+Textarea		: "Obszar tekstowy",
+HiddenField		: "Pole ukryte",
+Button			: "Przycisk",
+SelectionField	: "Lista wyboru",
+ImageButton		: "Przycisk-obrazek",
+
+FitWindow		: "Maksymalizuj rozmiar edytora",
+ShowBlocks		: "Pokaż bloki",
+
+// Context Menu
+EditLink			: "Edytuj hiperłącze",
+CellCM				: "Komórka",
+RowCM				: "Wiersz",
+ColumnCM			: "Kolumna",
+InsertRowAfter		: "Wstaw wiersz poniżej",
+InsertRowBefore		: "Wstaw wiersz powyżej",
+DeleteRows			: "Usuń wiersze",
+InsertColumnAfter	: "Wstaw kolumnę z prawej",
+InsertColumnBefore	: "Wstaw kolumnę z lewej",
+DeleteColumns		: "Usuń kolumny",
+InsertCellAfter		: "Wstaw komórkę z prawej",
+InsertCellBefore	: "Wstaw komórkę z lewej",
+DeleteCells			: "Usuń komórki",
+MergeCells			: "Połącz komórki",
+MergeRight			: "Połącz z komórką z prawej",
+MergeDown			: "Połącz z komórką poniżej",
+HorizontalSplitCell	: "Podziel komórkę poziomo",
+VerticalSplitCell	: "Podziel komórkę pionowo",
+TableDelete			: "Usuń tabelę",
+CellProperties		: "Właściwości komórki",
+TableProperties		: "Właściwości tabeli",
+ImageProperties		: "Właściwości obrazka",
+FlashProperties		: "Właściwości elementu Flash",
+
+AnchorProp			: "Właściwości kotwicy",
+ButtonProp			: "Właściwości przycisku",
+CheckboxProp		: "Właściwości pola wyboru (checkbox)",
+HiddenFieldProp		: "Właściwości pola ukrytego",
+RadioButtonProp		: "Właściwości pola wyboru (radio)",
+ImageButtonProp		: "Właściwości przycisku obrazka",
+TextFieldProp		: "Właściwości pola tekstowego",
+SelectionFieldProp	: "Właściwości listy wyboru",
+TextareaProp		: "Właściwości obszaru tekstowego",
+FormProp			: "Właściwości formularza",
+
+FontFormats			: "Normalny;Tekst sformatowany;Adres;Nagłówek 1;Nagłówek 2;Nagłówek 3;Nagłówek 4;Nagłówek 5;Nagłówek 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Przetwarzanie XHTML. Proszę czekać...",
+Done				: "Gotowe",
+PasteWordConfirm	: "Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Word. Czy chcesz go wyczyścic przed wklejeniem?",
+NotCompatiblePaste	: "Ta funkcja jest dostępna w programie Internet Explorer w wersji 5.5 lub wyższej. Czy chcesz wkleić tekst bez czyszczenia?",
+UnknownToolbarItem	: "Nieznany element paska narzędzi \"%1\"",
+UnknownCommand		: "Nieznana komenda \"%1\"",
+NotImplemented		: "Komenda niezaimplementowana",
+UnknownToolbarSet	: "Pasek narzędzi \"%1\" nie istnieje",
+NoActiveX			: "Ustawienia zabezpieczeń twojej przeglądarki mogą ograniczyć niektóre funkcje edytora. Musisz włączyć opcję \"Uruchamianie formantów Activex i dodatków plugin\". W przeciwnym wypadku mogą pojawiać się błędy.",
+BrowseServerBlocked : "Nie można otworzyć okno menadżera plików. Upewnij się, że wszystkie blokady wyskakujących okienek są wyłączone.",
+DialogBlocked		: "Nie można otworzyć okna dialogowego. Upewnij się, że wszystkie blokady wyskakujących okienek są wyłączone.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Anuluj",
+DlgBtnClose			: "Zamknij",
+DlgBtnBrowseServer	: "Przeglądaj",
+DlgAdvancedTag		: "Zaawansowane",
+DlgOpOther			: "<Inny>",
+DlgInfoTab			: "Informacje",
+DlgAlertUrl			: "Proszę podać URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nie ustawione>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Kierunek tekstu",
+DlgGenLangDirLtr	: "Od lewej do prawej (LTR)",
+DlgGenLangDirRtl	: "Od prawej do lewej (RTL)",
+DlgGenLangCode		: "Kod języka",
+DlgGenAccessKey		: "Klawisz dostępu",
+DlgGenName			: "Nazwa",
+DlgGenTabIndex		: "Indeks tabeli",
+DlgGenLongDescr		: "Długi opis hiperłącza",
+DlgGenClass			: "Nazwa klasy CSS",
+DlgGenTitle			: "Opis obiektu docelowego",
+DlgGenContType		: "Typ MIME obiektu docelowego",
+DlgGenLinkCharset	: "Kodowanie znaków obiektu docelowego",
+DlgGenStyle			: "Styl",
+
+// Image Dialog
+DlgImgTitle			: "Właściwości obrazka",
+DlgImgInfoTab		: "Informacje o obrazku",
+DlgImgBtnUpload		: "Wyślij",
+DlgImgURL			: "Adres URL",
+DlgImgUpload		: "Wyślij",
+DlgImgAlt			: "Tekst zastępczy",
+DlgImgWidth			: "Szerokość",
+DlgImgHeight		: "Wysokość",
+DlgImgLockRatio		: "Zablokuj proporcje",
+DlgBtnResetSize		: "Przywróć rozmiar",
+DlgImgBorder		: "Ramka",
+DlgImgHSpace		: "Odstęp poziomy",
+DlgImgVSpace		: "Odstęp pionowy",
+DlgImgAlign			: "Wyrównaj",
+DlgImgAlignLeft		: "Do lewej",
+DlgImgAlignAbsBottom: "Do dołu",
+DlgImgAlignAbsMiddle: "Do środka w pionie",
+DlgImgAlignBaseline	: "Do linii bazowej",
+DlgImgAlignBottom	: "Do dołu",
+DlgImgAlignMiddle	: "Do środka",
+DlgImgAlignRight	: "Do prawej",
+DlgImgAlignTextTop	: "Do góry tekstu",
+DlgImgAlignTop		: "Do góry",
+DlgImgPreview		: "Podgląd",
+DlgImgAlertUrl		: "Podaj adres obrazka.",
+DlgImgLinkTab		: "Hiperłącze",
+
+// Flash Dialog
+DlgFlashTitle		: "Właściwości elementu Flash",
+DlgFlashChkPlay		: "Auto Odtwarzanie",
+DlgFlashChkLoop		: "Pętla",
+DlgFlashChkMenu		: "Włącz menu",
+DlgFlashScale		: "Skaluj",
+DlgFlashScaleAll	: "Pokaż wszystko",
+DlgFlashScaleNoBorder	: "Bez Ramki",
+DlgFlashScaleFit	: "Dokładne dopasowanie",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Hiperłącze",
+DlgLnkInfoTab		: "Informacje ",
+DlgLnkTargetTab		: "Cel",
+
+DlgLnkType			: "Typ hiperłącza",
+DlgLnkTypeURL		: "Adres URL",
+DlgLnkTypeAnchor	: "Odnośnik wewnątrz strony",
+DlgLnkTypeEMail		: "Adres e-mail",
+DlgLnkProto			: "Protokół",
+DlgLnkProtoOther	: "<inny>",
+DlgLnkURL			: "Adres URL",
+DlgLnkAnchorSel		: "Wybierz etykietę",
+DlgLnkAnchorByName	: "Wg etykiety",
+DlgLnkAnchorById	: "Wg identyfikatora elementu",
+DlgLnkNoAnchors		: "(W dokumencie nie zdefiniowano żadnych etykiet)",
+DlgLnkEMail			: "Adres e-mail",
+DlgLnkEMailSubject	: "Temat",
+DlgLnkEMailBody		: "Treść",
+DlgLnkUpload		: "Wyślij",
+DlgLnkBtnUpload		: "Wyślij",
+
+DlgLnkTarget		: "Cel",
+DlgLnkTargetFrame	: "<ramka>",
+DlgLnkTargetPopup	: "<wyskakujące okno>",
+DlgLnkTargetBlank	: "Nowe okno (_blank)",
+DlgLnkTargetParent	: "Okno nadrzędne (_parent)",
+DlgLnkTargetSelf	: "To samo okno (_self)",
+DlgLnkTargetTop		: "Okno najwyższe w hierarchii (_top)",
+DlgLnkTargetFrameName	: "Nazwa Ramki Docelowej",
+DlgLnkPopWinName	: "Nazwa wyskakującego okna",
+DlgLnkPopWinFeat	: "Właściwości wyskakującego okna",
+DlgLnkPopResize		: "Możliwa zmiana rozmiaru",
+DlgLnkPopLocation	: "Pasek adresu",
+DlgLnkPopMenu		: "Pasek menu",
+DlgLnkPopScroll		: "Paski przewijania",
+DlgLnkPopStatus		: "Pasek statusu",
+DlgLnkPopToolbar	: "Pasek narzędzi",
+DlgLnkPopFullScrn	: "Pełny ekran (IE)",
+DlgLnkPopDependent	: "Okno zależne (Netscape)",
+DlgLnkPopWidth		: "Szerokość",
+DlgLnkPopHeight		: "Wysokość",
+DlgLnkPopLeft		: "Pozycja w poziomie",
+DlgLnkPopTop		: "Pozycja w pionie",
+
+DlnLnkMsgNoUrl		: "Podaj adres URL",
+DlnLnkMsgNoEMail	: "Podaj adres e-mail",
+DlnLnkMsgNoAnchor	: "Wybierz etykietę",
+DlnLnkMsgInvPopName	: "Nazwa wyskakującego okienka musi zaczynać się od znaku alfanumerycznego i nie może zawierać spacji",
+
+// Color Dialog
+DlgColorTitle		: "Wybierz kolor",
+DlgColorBtnClear	: "Wyczyść",
+DlgColorHighlight	: "Podgląd",
+DlgColorSelected	: "Wybrane",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Wstaw emotikonę",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Wybierz znak specjalny",
+
+// Table Dialog
+DlgTableTitle		: "Właściwości tabeli",
+DlgTableRows		: "Liczba wierszy",
+DlgTableColumns		: "Liczba kolumn",
+DlgTableBorder		: "Grubość ramki",
+DlgTableAlign		: "Wyrównanie",
+DlgTableAlignNotSet	: "<brak ustawień>",
+DlgTableAlignLeft	: "Do lewej",
+DlgTableAlignCenter	: "Do środka",
+DlgTableAlignRight	: "Do prawej",
+DlgTableWidth		: "Szerokość",
+DlgTableWidthPx		: "piksele",
+DlgTableWidthPc		: "%",
+DlgTableHeight		: "Wysokość",
+DlgTableCellSpace	: "Odstęp pomiędzy komórkami",
+DlgTableCellPad		: "Margines wewnętrzny komórek",
+DlgTableCaption		: "Tytuł",
+DlgTableSummary		: "Podsumowanie",
+
+// Table Cell Dialog
+DlgCellTitle		: "Właściwości komórki",
+DlgCellWidth		: "Szerokość",
+DlgCellWidthPx		: "piksele",
+DlgCellWidthPc		: "%",
+DlgCellHeight		: "Wysokość",
+DlgCellWordWrap		: "Zawijanie tekstu",
+DlgCellWordWrapNotSet	: "<brak ustawień>",
+DlgCellWordWrapYes	: "Tak",
+DlgCellWordWrapNo	: "Nie",
+DlgCellHorAlign		: "Wyrównanie poziome",
+DlgCellHorAlignNotSet	: "<brak ustawień>",
+DlgCellHorAlignLeft	: "Do lewej",
+DlgCellHorAlignCenter	: "Do środka",
+DlgCellHorAlignRight: "Do prawej",
+DlgCellVerAlign		: "Wyrównanie pionowe",
+DlgCellVerAlignNotSet	: "<brak ustawień>",
+DlgCellVerAlignTop	: "Do góry",
+DlgCellVerAlignMiddle	: "Do środka",
+DlgCellVerAlignBottom	: "Do dołu",
+DlgCellVerAlignBaseline	: "Do linii bazowej",
+DlgCellRowSpan		: "Zajętość wierszy",
+DlgCellCollSpan		: "Zajętość kolumn",
+DlgCellBackColor	: "Kolor tła",
+DlgCellBorderColor	: "Kolor ramki",
+DlgCellBtnSelect	: "Wybierz...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Znajdź i zamień",
+
+// Find Dialog
+DlgFindTitle		: "Znajdź",
+DlgFindFindBtn		: "Znajdź",
+DlgFindNotFoundMsg	: "Nie znaleziono szukanego hasła.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Zamień",
+DlgReplaceFindLbl		: "Znajdź:",
+DlgReplaceReplaceLbl	: "Zastąp przez:",
+DlgReplaceCaseChk		: "Uwzględnij wielkość liter",
+DlgReplaceReplaceBtn	: "Zastąp",
+DlgReplaceReplAllBtn	: "Zastąp wszystko",
+DlgReplaceWordChk		: "Całe słowa",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl+X.",
+PasteErrorCopy	: "Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl+C.",
+
+PasteAsText		: "Wklej jako czysty tekst",
+PasteFromWord	: "Wklej z Worda",
+
+DlgPasteMsg2	: "Proszę wkleić w poniższym polu używając klawiaturowego skrótu (<STRONG>Ctrl+V</STRONG>) i kliknąć <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę dane wkleić ponownie w tym okienku.",
+DlgPasteIgnoreFont		: "Ignoruj definicje 'Font Face'",
+DlgPasteRemoveStyles	: "Usuń definicje Stylów",
+
+// Color Picker
+ColorAutomatic	: "Automatycznie",
+ColorMoreColors	: "Więcej kolorów...",
+
+// Document Properties
+DocProps		: "Właściwości dokumentu",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Właściwości kotwicy",
+DlgAnchorName		: "Nazwa kotwicy",
+DlgAnchorErrorName	: "Wpisz nazwę kotwicy",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Słowa nie ma w słowniku",
+DlgSpellChangeTo		: "Zmień na",
+DlgSpellBtnIgnore		: "Ignoruj",
+DlgSpellBtnIgnoreAll	: "Ignoruj wszystkie",
+DlgSpellBtnReplace		: "Zmień",
+DlgSpellBtnReplaceAll	: "Zmień wszystkie",
+DlgSpellBtnUndo			: "Cofnij",
+DlgSpellNoSuggestions	: "- Brak sugestii -",
+DlgSpellProgress		: "Trwa sprawdzanie ...",
+DlgSpellNoMispell		: "Sprawdzanie zakończone: nie znaleziono błędów",
+DlgSpellNoChanges		: "Sprawdzanie zakończone: nie zmieniono żadnego słowa",
+DlgSpellOneChange		: "Sprawdzanie zakończone: zmieniono jedno słowo",
+DlgSpellManyChanges		: "Sprawdzanie zakończone: zmieniono %l słów",
+
+IeSpellDownload			: "Słownik nie jest zainstalowany. Chcesz go ściągnąć?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (Wartość)",
+DlgButtonType		: "Typ",
+DlgButtonTypeBtn	: "Przycisk",
+DlgButtonTypeSbm	: "Wyślij",
+DlgButtonTypeRst	: "Wyzeruj",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nazwa",
+DlgCheckboxValue	: "Wartość",
+DlgCheckboxSelected	: "Zaznaczone",
+
+// Form Dialog
+DlgFormName		: "Nazwa",
+DlgFormAction	: "Akcja",
+DlgFormMethod	: "Metoda",
+
+// Select Field Dialog
+DlgSelectName		: "Nazwa",
+DlgSelectValue		: "Wartość",
+DlgSelectSize		: "Rozmiar",
+DlgSelectLines		: "linii",
+DlgSelectChkMulti	: "Wielokrotny wybór",
+DlgSelectOpAvail	: "Dostępne opcje",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Wartość",
+DlgSelectBtnAdd		: "Dodaj",
+DlgSelectBtnModify	: "Zmień",
+DlgSelectBtnUp		: "Do góry",
+DlgSelectBtnDown	: "Do dołu",
+DlgSelectBtnSetValue : "Ustaw wartość zaznaczoną",
+DlgSelectBtnDelete	: "Usuń",
+
+// Textarea Dialog
+DlgTextareaName	: "Nazwa",
+DlgTextareaCols	: "Kolumnu",
+DlgTextareaRows	: "Wiersze",
+
+// Text Field Dialog
+DlgTextName			: "Nazwa",
+DlgTextValue		: "Wartość",
+DlgTextCharWidth	: "Szerokość w znakach",
+DlgTextMaxChars		: "Max. szerokość",
+DlgTextType			: "Typ",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Hasło",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nazwa",
+DlgHiddenValue	: "Wartość",
+
+// Bulleted List Dialog
+BulletedListProp	: "Właściwości listy punktowanej",
+NumberedListProp	: "Właściwości listy numerowanej",
+DlgLstStart			: "Początek",
+DlgLstType			: "Typ",
+DlgLstTypeCircle	: "Koło",
+DlgLstTypeDisc		: "Dysk",
+DlgLstTypeSquare	: "Kwadrat",
+DlgLstTypeNumbers	: "Cyfry (1, 2, 3)",
+DlgLstTypeLCase		: "Małe litery (a, b, c)",
+DlgLstTypeUCase		: "Duże litery (A, B, C)",
+DlgLstTypeSRoman	: "Numeracja rzymska (i, ii, iii)",
+DlgLstTypeLRoman	: "Numeracja rzymska (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Ogólne",
+DlgDocBackTab		: "Tło",
+DlgDocColorsTab		: "Kolory i marginesy",
+DlgDocMetaTab		: "Meta Dane",
+
+DlgDocPageTitle		: "Tytuł strony",
+DlgDocLangDir		: "Kierunek pisania",
+DlgDocLangDirLTR	: "Od lewej do prawej (LTR)",
+DlgDocLangDirRTL	: "Od prawej do lewej (RTL)",
+DlgDocLangCode		: "Kod języka",
+DlgDocCharSet		: "Kodowanie znaków",
+DlgDocCharSetCE		: "Środkowoeuropejskie",
+DlgDocCharSetCT		: "Chińskie tradycyjne (Big5)",
+DlgDocCharSetCR		: "Cyrylica",
+DlgDocCharSetGR		: "Greckie",
+DlgDocCharSetJP		: "Japońskie",
+DlgDocCharSetKR		: "Koreańskie",
+DlgDocCharSetTR		: "Tureckie",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Zachodnioeuropejskie",
+DlgDocCharSetOther	: "Inne kodowanie znaków",
+
+DlgDocDocType		: "Nagłówek typu dokumentu",
+DlgDocDocTypeOther	: "Inny typ dokumentu",
+DlgDocIncXHTML		: "Dołącz deklarację XHTML",
+DlgDocBgColor		: "Kolor tła",
+DlgDocBgImage		: "Obrazek tła",
+DlgDocBgNoScroll	: "Tło nieruchome",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Hiperłącze",
+DlgDocCVisited		: "Odwiedzane hiperłącze",
+DlgDocCActive		: "Aktywne hiperłącze",
+DlgDocMargins		: "Marginesy strony",
+DlgDocMaTop			: "Górny",
+DlgDocMaLeft		: "Lewy",
+DlgDocMaRight		: "Prawy",
+DlgDocMaBottom		: "Dolny",
+DlgDocMeIndex		: "Słowa kluczowe (oddzielone przecinkami)",
+DlgDocMeDescr		: "Opis dokumentu",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Prawa autorskie",
+DlgDocPreview		: "Podgląd",
+
+// Templates Dialog
+Templates			: "Sablony",
+DlgTemplatesTitle	: "Szablony zawartości",
+DlgTemplatesSelMsg	: "Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):",
+DlgTemplatesLoading	: "Ładowanie listy szablonów. Proszę czekać...",
+DlgTemplatesNoTpl	: "(Brak zdefiniowanych szablonów)",
+DlgTemplatesReplace	: "Zastąp aktualną zawartość",
+
+// About Dialog
+DlgAboutAboutTab	: "O ...",
+DlgAboutBrowserInfoTab	: "O przeglądarce",
+DlgAboutLicenseTab	: "Licencja",
+DlgAboutVersion		: "wersja",
+DlgAboutInfo		: "Więcej informacji uzyskasz pod adresem",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/pt-br.js b/modules/editor/skins/fckeditor/editor/lang/pt-br.js
new file mode 100644
index 000000000..8b1381181
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/pt-br.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Brazilian Portuguese language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Ocultar Barra de Ferramentas",
+ToolbarExpand		: "Exibir Barra de Ferramentas",
+
+// Toolbar Items and Context Menu
+Save				: "Salvar",
+NewPage				: "Novo",
+Preview				: "Visualizar",
+Cut					: "Recortar",
+Copy				: "Copiar",
+Paste				: "Colar",
+PasteText			: "Colar como Texto sem Formatação",
+PasteWord			: "Colar do Word",
+Print				: "Imprimir",
+SelectAll			: "Selecionar Tudo",
+RemoveFormat		: "Remover Formatação",
+InsertLinkLbl		: "Hiperlink",
+InsertLink			: "Inserir/Editar Hiperlink",
+RemoveLink			: "Remover Hiperlink",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Inserir/Editar Âncora",
+AnchorDelete		: "Remover Âncora",
+InsertImageLbl		: "Figura",
+InsertImage			: "Inserir/Editar Figura",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Insere/Edita Flash",
+InsertTableLbl		: "Tabela",
+InsertTable			: "Inserir/Editar Tabela",
+InsertLineLbl		: "Linha",
+InsertLine			: "Inserir Linha Horizontal",
+InsertSpecialCharLbl: "Caracteres Especiais",
+InsertSpecialChar	: "Inserir Caractere Especial",
+InsertSmileyLbl		: "Emoticon",
+InsertSmiley		: "Inserir Emoticon",
+About				: "Sobre FCKeditor",
+Bold				: "Negrito",
+Italic				: "Itálico",
+Underline			: "Sublinhado",
+StrikeThrough		: "Tachado",
+Subscript			: "Subscrito",
+Superscript			: "Sobrescrito",
+LeftJustify			: "Alinhar Esquerda",
+CenterJustify		: "Centralizar",
+RightJustify		: "Alinhar Direita",
+BlockJustify		: "Justificado",
+DecreaseIndent		: "Diminuir Recuo",
+IncreaseIndent		: "Aumentar Recuo",
+Blockquote			: "Recuo",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Desfazer",
+Redo				: "Refazer",
+NumberedListLbl		: "Numeração",
+NumberedList		: "Inserir/Remover Numeração",
+BulletedListLbl		: "Marcadores",
+BulletedList		: "Inserir/Remover Marcadores",
+ShowTableBorders	: "Exibir Bordas da Tabela",
+ShowDetails			: "Exibir Detalhes",
+Style				: "Estilo",
+FontFormat			: "Formatação",
+Font				: "Fonte",
+FontSize			: "Tamanho",
+TextColor			: "Cor do Texto",
+BGColor				: "Cor do Plano de Fundo",
+Source				: "Código-Fonte",
+Find				: "Localizar",
+Replace				: "Substituir",
+SpellCheck			: "Verificar Ortografia",
+UniversalKeyboard	: "Teclado Universal",
+PageBreakLbl		: "Quebra de Página",
+PageBreak			: "Inserir Quebra de Página",
+
+Form			: "Formulário",
+Checkbox		: "Caixa de Seleção",
+RadioButton		: "Botão de Opção",
+TextField		: "Caixa de Texto",
+Textarea		: "Área de Texto",
+HiddenField		: "Campo Oculto",
+Button			: "Botão",
+SelectionField	: "Caixa de Listagem",
+ImageButton		: "Botão de Imagem",
+
+FitWindow		: "Maximizar o tamanho do editor",
+ShowBlocks		: "Mostrar blocos",
+
+// Context Menu
+EditLink			: "Editar Hiperlink",
+CellCM				: "Célula",
+RowCM				: "Linha",
+ColumnCM			: "Coluna",
+InsertRowAfter		: "Inserir linha abaixo",
+InsertRowBefore		: "Inserir linha acima",
+DeleteRows			: "Remover Linhas",
+InsertColumnAfter	: "Inserir coluna à direita",
+InsertColumnBefore	: "Inserir coluna à esquerda",
+DeleteColumns		: "Remover Colunas",
+InsertCellAfter		: "Inserir célula à direita",
+InsertCellBefore	: "Inserir célula à esquerda",
+DeleteCells			: "Remover Células",
+MergeCells			: "Mesclar Células",
+MergeRight			: "Mesclar com célula à direita",
+MergeDown			: "Mesclar com célula abaixo",
+HorizontalSplitCell	: "Dividir célula horizontalmente",
+VerticalSplitCell	: "Dividir célula verticalmente",
+TableDelete			: "Apagar Tabela",
+CellProperties		: "Formatar Célula",
+TableProperties		: "Formatar Tabela",
+ImageProperties		: "Formatar Figura",
+FlashProperties		: "Propriedades Flash",
+
+AnchorProp			: "Formatar Âncora",
+ButtonProp			: "Formatar Botão",
+CheckboxProp		: "Formatar Caixa de Seleção",
+HiddenFieldProp		: "Formatar Campo Oculto",
+RadioButtonProp		: "Formatar Botão de Opção",
+ImageButtonProp		: "Formatar Botão de Imagem",
+TextFieldProp		: "Formatar Caixa de Texto",
+SelectionFieldProp	: "Formatar Caixa de Listagem",
+TextareaProp		: "Formatar Área de Texto",
+FormProp			: "Formatar Formulário",
+
+FontFormats			: "Normal;Formatado;Endereço;Título 1;Título 2;Título 3;Título 4;Título 5;Título 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Processando XHTML. Por favor, aguarde...",
+Done				: "Pronto",
+PasteWordConfirm	: "O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?",
+NotCompatiblePaste	: "Este comando está disponível para o navegador Internet Explorer 5.5 ou superior. Você gostaria de colar sem remover a formatação?",
+UnknownToolbarItem	: "O item da barra de ferramentas \"%1\" não é reconhecido",
+UnknownCommand		: "O comando \"%1\" não é reconhecido",
+NotImplemented		: "O comando não foi implementado",
+UnknownToolbarSet	: "A barra de ferramentas \"%1\" não existe",
+NoActiveX			: "As configurações de segurança do seu browser podem limitar algumas características do editor. Você precisa habilitar a opção \"Executar controles e plug-ins ActiveX\". Você pode experimentar erros e alertas de características faltantes.",
+BrowseServerBlocked : "Os recursos do browser não puderam ser abertos. Tenha certeza que todos os bloqueadores de popup estão desabilitados.",
+DialogBlocked		: "Não foi possível abrir a janela de diálogo. Tenha certeza que todos os bloqueadores de popup estão desabilitados.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancelar",
+DlgBtnClose			: "Fechar",
+DlgBtnBrowseServer	: "Localizar no Servidor",
+DlgAdvancedTag		: "Avançado",
+DlgOpOther			: "<Outros>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Inserir a URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<não ajustado>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Direção do idioma",
+DlgGenLangDirLtr	: "Esquerda para Direita (LTR)",
+DlgGenLangDirRtl	: "Direita para Esquerda (RTL)",
+DlgGenLangCode		: "Idioma",
+DlgGenAccessKey		: "Chave de Acesso",
+DlgGenName			: "Nome",
+DlgGenTabIndex		: "Índice de Tabulação",
+DlgGenLongDescr		: "Descrição da URL",
+DlgGenClass			: "Classe de Folhas de Estilo",
+DlgGenTitle			: "Título",
+DlgGenContType		: "Tipo de Conteúdo",
+DlgGenLinkCharset	: "Conjunto de Caracteres do Hiperlink",
+DlgGenStyle			: "Estilos",
+
+// Image Dialog
+DlgImgTitle			: "Formatar Figura",
+DlgImgInfoTab		: "Informações da Figura",
+DlgImgBtnUpload		: "Enviar para o Servidor",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Submeter",
+DlgImgAlt			: "Texto Alternativo",
+DlgImgWidth			: "Largura",
+DlgImgHeight		: "Altura",
+DlgImgLockRatio		: "Manter proporções",
+DlgBtnResetSize		: "Redefinir para o Tamanho Original",
+DlgImgBorder		: "Borda",
+DlgImgHSpace		: "Horizontal",
+DlgImgVSpace		: "Vertical",
+DlgImgAlign			: "Alinhamento",
+DlgImgAlignLeft		: "Esquerda",
+DlgImgAlignAbsBottom: "Inferior Absoluto",
+DlgImgAlignAbsMiddle: "Centralizado Absoluto",
+DlgImgAlignBaseline	: "Baseline",
+DlgImgAlignBottom	: "Inferior",
+DlgImgAlignMiddle	: "Centralizado",
+DlgImgAlignRight	: "Direita",
+DlgImgAlignTextTop	: "Superior Absoluto",
+DlgImgAlignTop		: "Superior",
+DlgImgPreview		: "Visualização",
+DlgImgAlertUrl		: "Por favor, digite o URL da figura.",
+DlgImgLinkTab		: "Hiperlink",
+
+// Flash Dialog
+DlgFlashTitle		: "Propriedades Flash",
+DlgFlashChkPlay		: "Tocar Automaticamente",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Habilita Menu Flash",
+DlgFlashScale		: "Escala",
+DlgFlashScaleAll	: "Mostrar tudo",
+DlgFlashScaleNoBorder	: "Sem Borda",
+DlgFlashScaleFit	: "Escala Exata",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Hiperlink",
+DlgLnkInfoTab		: "Informações",
+DlgLnkTargetTab		: "Destino",
+
+DlgLnkType			: "Tipo de hiperlink",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Âncora nesta página",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocolo",
+DlgLnkProtoOther	: "<outro>",
+DlgLnkURL			: "URL do hiperlink",
+DlgLnkAnchorSel		: "Selecione uma âncora",
+DlgLnkAnchorByName	: "Pelo Nome da âncora",
+DlgLnkAnchorById	: "Pelo Id do Elemento",
+DlgLnkNoAnchors		: "(Não há âncoras disponíveis neste documento)",
+DlgLnkEMail			: "Endereço E-Mail",
+DlgLnkEMailSubject	: "Assunto da Mensagem",
+DlgLnkEMailBody		: "Corpo da Mensagem",
+DlgLnkUpload		: "Enviar ao Servidor",
+DlgLnkBtnUpload		: "Enviar ao Servidor",
+
+DlgLnkTarget		: "Destino",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<janela popup>",
+DlgLnkTargetBlank	: "Nova Janela (_blank)",
+DlgLnkTargetParent	: "Janela Pai (_parent)",
+DlgLnkTargetSelf	: "Mesma Janela (_self)",
+DlgLnkTargetTop		: "Janela Superior (_top)",
+DlgLnkTargetFrameName	: "Nome do Frame de Destino",
+DlgLnkPopWinName	: "Nome da Janela Pop-up",
+DlgLnkPopWinFeat	: "Atributos da Janela Pop-up",
+DlgLnkPopResize		: "Redimensionável",
+DlgLnkPopLocation	: "Barra de Endereços",
+DlgLnkPopMenu		: "Barra de Menus",
+DlgLnkPopScroll		: "Barras de Rolagem",
+DlgLnkPopStatus		: "Barra de Status",
+DlgLnkPopToolbar	: "Barra de Ferramentas",
+DlgLnkPopFullScrn	: "Modo Tela Cheia (IE)",
+DlgLnkPopDependent	: "Dependente (Netscape)",
+DlgLnkPopWidth		: "Largura",
+DlgLnkPopHeight		: "Altura",
+DlgLnkPopLeft		: "Esquerda",
+DlgLnkPopTop		: "Superior",
+
+DlnLnkMsgNoUrl		: "Por favor, digite o endereço do Hiperlink",
+DlnLnkMsgNoEMail	: "Por favor, digite o endereço de e-mail",
+DlnLnkMsgNoAnchor	: "Por favor, selecione uma âncora",
+DlnLnkMsgInvPopName	: "O nome da janela popup deve começar com uma letra ou sublinhado (_) e não pode conter espaços",
+
+// Color Dialog
+DlgColorTitle		: "Selecione uma Cor",
+DlgColorBtnClear	: "Limpar",
+DlgColorHighlight	: "Visualização",
+DlgColorSelected	: "Selecionada",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Inserir Emoticon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Selecione um Caractere Especial",
+
+// Table Dialog
+DlgTableTitle		: "Formatar Tabela",
+DlgTableRows		: "Linhas",
+DlgTableColumns		: "Colunas",
+DlgTableBorder		: "Borda",
+DlgTableAlign		: "Alinhamento",
+DlgTableAlignNotSet	: "<Não ajustado>",
+DlgTableAlignLeft	: "Esquerda",
+DlgTableAlignCenter	: "Centralizado",
+DlgTableAlignRight	: "Direita",
+DlgTableWidth		: "Largura",
+DlgTableWidthPx		: "pixels",
+DlgTableWidthPc		: "%",
+DlgTableHeight		: "Altura",
+DlgTableCellSpace	: "Espaçamento",
+DlgTableCellPad		: "Enchimento",
+DlgTableCaption		: "Legenda",
+DlgTableSummary		: "Resumo",
+
+// Table Cell Dialog
+DlgCellTitle		: "Formatar célula",
+DlgCellWidth		: "Largura",
+DlgCellWidthPx		: "pixels",
+DlgCellWidthPc		: "%",
+DlgCellHeight		: "Altura",
+DlgCellWordWrap		: "Quebra de Linha",
+DlgCellWordWrapNotSet	: "<Não ajustado>",
+DlgCellWordWrapYes	: "Sim",
+DlgCellWordWrapNo	: "Não",
+DlgCellHorAlign		: "Alinhamento Horizontal",
+DlgCellHorAlignNotSet	: "<Não ajustado>",
+DlgCellHorAlignLeft	: "Esquerda",
+DlgCellHorAlignCenter	: "Centralizado",
+DlgCellHorAlignRight: "Direita",
+DlgCellVerAlign		: "Alinhamento Vertical",
+DlgCellVerAlignNotSet	: "<Não ajustado>",
+DlgCellVerAlignTop	: "Superior",
+DlgCellVerAlignMiddle	: "Centralizado",
+DlgCellVerAlignBottom	: "Inferior",
+DlgCellVerAlignBaseline	: "Baseline",
+DlgCellRowSpan		: "Transpor Linhas",
+DlgCellCollSpan		: "Transpor Colunas",
+DlgCellBackColor	: "Cor do Plano de Fundo",
+DlgCellBorderColor	: "Cor da Borda",
+DlgCellBtnSelect	: "Selecionar...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Localizar e Substituir",
+
+// Find Dialog
+DlgFindTitle		: "Localizar...",
+DlgFindFindBtn		: "Localizar",
+DlgFindNotFoundMsg	: "O texto especificado não foi encontrado.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Substituir",
+DlgReplaceFindLbl		: "Procurar por:",
+DlgReplaceReplaceLbl	: "Substituir por:",
+DlgReplaceCaseChk		: "Coincidir Maiúsculas/Minúsculas",
+DlgReplaceReplaceBtn	: "Substituir",
+DlgReplaceReplAllBtn	: "Substituir Tudo",
+DlgReplaceWordChk		: "Coincidir a palavra inteira",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl+X).",
+PasteErrorCopy	: "As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl+C).",
+
+PasteAsText		: "Colar como Texto sem Formatação",
+PasteFromWord	: "Colar do Word",
+
+DlgPasteMsg2	: "Transfira o link usado no box usando o teclado com (<STRONG>Ctrl+V</STRONG>) e <STRONG>OK</STRONG>.",
+DlgPasteSec		: "As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo novamente nesta janela.",
+DlgPasteIgnoreFont		: "Ignorar definições de fonte",
+DlgPasteRemoveStyles	: "Remove definições de estilo",
+
+// Color Picker
+ColorAutomatic	: "Automático",
+ColorMoreColors	: "Mais Cores...",
+
+// Document Properties
+DocProps		: "Propriedades Documento",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Formatar Âncora",
+DlgAnchorName		: "Nome da Âncora",
+DlgAnchorErrorName	: "Por favor, digite o nome da âncora",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Não encontrada",
+DlgSpellChangeTo		: "Alterar para",
+DlgSpellBtnIgnore		: "Ignorar uma vez",
+DlgSpellBtnIgnoreAll	: "Ignorar Todas",
+DlgSpellBtnReplace		: "Alterar",
+DlgSpellBtnReplaceAll	: "Alterar Todas",
+DlgSpellBtnUndo			: "Desfazer",
+DlgSpellNoSuggestions	: "-sem sugestões de ortografia-",
+DlgSpellProgress		: "Verificação ortográfica em andamento...",
+DlgSpellNoMispell		: "Verificação encerrada: Não foram encontrados erros de ortografia",
+DlgSpellNoChanges		: "Verificação ortográfica encerrada: Não houve alterações",
+DlgSpellOneChange		: "Verificação ortográfica encerrada: Uma palavra foi alterada",
+DlgSpellManyChanges		: "Verificação ortográfica encerrada: %1 foram alteradas",
+
+IeSpellDownload			: "A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?",
+
+// Button Dialog
+DlgButtonText		: "Texto (Valor)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Botão",
+DlgButtonTypeSbm	: "Enviar",
+DlgButtonTypeRst	: "Limpar",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nome",
+DlgCheckboxValue	: "Valor",
+DlgCheckboxSelected	: "Selecionado",
+
+// Form Dialog
+DlgFormName		: "Nome",
+DlgFormAction	: "Action",
+DlgFormMethod	: "Método",
+
+// Select Field Dialog
+DlgSelectName		: "Nome",
+DlgSelectValue		: "Valor",
+DlgSelectSize		: "Tamanho",
+DlgSelectLines		: "linhas",
+DlgSelectChkMulti	: "Permitir múltiplas seleções",
+DlgSelectOpAvail	: "Opções disponíveis",
+DlgSelectOpText		: "Texto",
+DlgSelectOpValue	: "Valor",
+DlgSelectBtnAdd		: "Adicionar",
+DlgSelectBtnModify	: "Modificar",
+DlgSelectBtnUp		: "Para cima",
+DlgSelectBtnDown	: "Para baixo",
+DlgSelectBtnSetValue : "Definir como selecionado",
+DlgSelectBtnDelete	: "Remover",
+
+// Textarea Dialog
+DlgTextareaName	: "Nome",
+DlgTextareaCols	: "Colunas",
+DlgTextareaRows	: "Linhas",
+
+// Text Field Dialog
+DlgTextName			: "Nome",
+DlgTextValue		: "Valor",
+DlgTextCharWidth	: "Comprimento (em caracteres)",
+DlgTextMaxChars		: "Número Máximo de Caracteres",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Texto",
+DlgTextTypePass		: "Senha",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nome",
+DlgHiddenValue	: "Valor",
+
+// Bulleted List Dialog
+BulletedListProp	: "Formatar Marcadores",
+NumberedListProp	: "Formatar Numeração",
+DlgLstStart			: "Iniciar",
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Círculo",
+DlgLstTypeDisc		: "Disco",
+DlgLstTypeSquare	: "Quadrado",
+DlgLstTypeNumbers	: "Números (1, 2, 3)",
+DlgLstTypeLCase		: "Letras Minúsculas (a, b, c)",
+DlgLstTypeUCase		: "Letras Maiúsculas (A, B, C)",
+DlgLstTypeSRoman	: "Números Romanos Minúsculos (i, ii, iii)",
+DlgLstTypeLRoman	: "Números Romanos Maiúsculos (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Geral",
+DlgDocBackTab		: "Plano de Fundo",
+DlgDocColorsTab		: "Cores e Margens",
+DlgDocMetaTab		: "Meta Dados",
+
+DlgDocPageTitle		: "Título da Página",
+DlgDocLangDir		: "Direção do Idioma",
+DlgDocLangDirLTR	: "Esquerda para Direita (LTR)",
+DlgDocLangDirRTL	: "Direita para Esquerda (RTL)",
+DlgDocLangCode		: "Código do Idioma",
+DlgDocCharSet		: "Codificação de Caracteres",
+DlgDocCharSetCE		: "Europa Central",
+DlgDocCharSetCT		: "Chinês Tradicional (Big5)",
+DlgDocCharSetCR		: "Cirílico",
+DlgDocCharSetGR		: "Grego",
+DlgDocCharSetJP		: "Japonês",
+DlgDocCharSetKR		: "Coreano",
+DlgDocCharSetTR		: "Turco",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Europa Ocidental",
+DlgDocCharSetOther	: "Outra Codificação de Caracteres",
+
+DlgDocDocType		: "Cabeçalho Tipo de Documento",
+DlgDocDocTypeOther	: "Other Document Type Heading",
+DlgDocIncXHTML		: "Incluir Declarações XHTML",
+DlgDocBgColor		: "Cor do Plano de Fundo",
+DlgDocBgImage		: "URL da Imagem de Plano de Fundo",
+DlgDocBgNoScroll	: "Plano de Fundo Fixo",
+DlgDocCText			: "Texto",
+DlgDocCLink			: "Hiperlink",
+DlgDocCVisited		: "Hiperlink Visitado",
+DlgDocCActive		: "Hiperlink Ativo",
+DlgDocMargins		: "Margens da Página",
+DlgDocMaTop			: "Superior",
+DlgDocMaLeft		: "Inferior",
+DlgDocMaRight		: "Direita",
+DlgDocMaBottom		: "Inferior",
+DlgDocMeIndex		: "Palavras-chave de Indexação do Documento (separadas por vírgula)",
+DlgDocMeDescr		: "Descrição do Documento",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Direitos Autorais",
+DlgDocPreview		: "Visualizar",
+
+// Templates Dialog
+Templates			: "Modelos de layout",
+DlgTemplatesTitle	: "Modelo de layout do conteúdo",
+DlgTemplatesSelMsg	: "Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):",
+DlgTemplatesLoading	: "Carregando a lista de modelos de layout. Aguarde...",
+DlgTemplatesNoTpl	: "(Não foram definidos modelos de layout)",
+DlgTemplatesReplace	: "Substituir o conteúdo atual",
+
+// About Dialog
+DlgAboutAboutTab	: "Sobre",
+DlgAboutBrowserInfoTab	: "Informações do Navegador",
+DlgAboutLicenseTab	: "Licença",
+DlgAboutVersion		: "versão",
+DlgAboutInfo		: "Para maiores informações visite",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/pt.js b/modules/editor/skins/fckeditor/editor/lang/pt.js
new file mode 100644
index 000000000..e70961499
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/pt.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Portuguese language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Fechar Barra",
+ToolbarExpand		: "Expandir Barra",
+
+// Toolbar Items and Context Menu
+Save				: "Guardar",
+NewPage				: "Nova Página",
+Preview				: "Pré-visualizar",
+Cut					: "Cortar",
+Copy				: "Copiar",
+Paste				: "Colar",
+PasteText			: "Colar como texto não formatado",
+PasteWord			: "Colar do Word",
+Print				: "Imprimir",
+SelectAll			: "Seleccionar Tudo",
+RemoveFormat		: "Eliminar Formato",
+InsertLinkLbl		: "Hiperligação",
+InsertLink			: "Inserir/Editar Hiperligação",
+RemoveLink			: "Eliminar Hiperligação",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: " Inserir/Editar Âncora",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Imagem",
+InsertImage			: "Inserir/Editar Imagem",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Inserir/Editar Flash",
+InsertTableLbl		: "Tabela",
+InsertTable			: "Inserir/Editar Tabela",
+InsertLineLbl		: "Linha",
+InsertLine			: "Inserir Linha Horizontal",
+InsertSpecialCharLbl: "Caracter Especial",
+InsertSpecialChar	: "Inserir Caracter Especial",
+InsertSmileyLbl		: "Emoticons",
+InsertSmiley		: "Inserir Emoticons",
+About				: "Acerca do FCKeditor",
+Bold				: "Negrito",
+Italic				: "Itálico",
+Underline			: "Sublinhado",
+StrikeThrough		: "Rasurado",
+Subscript			: "Superior à Linha",
+Superscript			: "Inferior à Linha",
+LeftJustify			: "Alinhar à Esquerda",
+CenterJustify		: "Alinhar ao Centro",
+RightJustify		: "Alinhar à Direita",
+BlockJustify		: "Justificado",
+DecreaseIndent		: "Diminuir Avanço",
+IncreaseIndent		: "Aumentar Avanço",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Anular",
+Redo				: "Repetir",
+NumberedListLbl		: "Numeração",
+NumberedList		: "Inserir/Eliminar Numeração",
+BulletedListLbl		: "Marcas",
+BulletedList		: "Inserir/Eliminar Marcas",
+ShowTableBorders	: "Mostrar Limites da Tabelas",
+ShowDetails			: "Mostrar Parágrafo",
+Style				: "Estilo",
+FontFormat			: "Formato",
+Font				: "Tipo de Letra",
+FontSize			: "Tamanho",
+TextColor			: "Cor do Texto",
+BGColor				: "Cor de Fundo",
+Source				: "Fonte",
+Find				: "Procurar",
+Replace				: "Substituir",
+SpellCheck			: "Verificação Ortográfica",
+UniversalKeyboard	: "Teclado Universal",
+PageBreakLbl		: "Quebra de Página",
+PageBreak			: "Inserir Quebra de Página",
+
+Form			: "Formulário",
+Checkbox		: "Caixa de Verificação",
+RadioButton		: "Botão de Opção",
+TextField		: "Campo de Texto",
+Textarea		: "Área de Texto",
+HiddenField		: "Campo Escondido",
+Button			: "Botão",
+SelectionField	: "Caixa de Combinação",
+ImageButton		: "Botão de Imagem",
+
+FitWindow		: "Maximizar o tamanho do editor",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Editar Hiperligação",
+CellCM				: "Célula",
+RowCM				: "Linha",
+ColumnCM			: "Coluna",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Eliminar Linhas",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Eliminar Coluna",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Eliminar Célula",
+MergeCells			: "Unir Células",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Eliminar Tabela",
+CellProperties		: "Propriedades da Célula",
+TableProperties		: "Propriedades da Tabela",
+ImageProperties		: "Propriedades da Imagem",
+FlashProperties		: "Propriedades do Flash",
+
+AnchorProp			: "Propriedades da Âncora",
+ButtonProp			: "Propriedades do Botão",
+CheckboxProp		: "Propriedades da Caixa de Verificação",
+HiddenFieldProp		: "Propriedades do Campo Escondido",
+RadioButtonProp		: "Propriedades do Botão de Opção",
+ImageButtonProp		: "Propriedades do Botão de imagens",
+TextFieldProp		: "Propriedades do Campo de Texto",
+SelectionFieldProp	: "Propriedades da Caixa de Combinação",
+TextareaProp		: "Propriedades da Área de Texto",
+FormProp			: "Propriedades do Formulário",
+
+FontFormats			: "Normal;Formatado;Endereço;Título 1;Título 2;Título 3;Título 4;Título 5;Título 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "A Processar XHTML. Por favor, espere...",
+Done				: "Concluído",
+PasteWordConfirm	: "O texto que deseja parece ter sido copiado do Word. Deseja limpar a formatação antes de colar?",
+NotCompatiblePaste	: "Este comando só está disponível para Internet Explorer versão 5.5 ou superior. Deseja colar sem limpar a formatação?",
+UnknownToolbarItem	: "Item de barra desconhecido \"%1\"",
+UnknownCommand		: "Nome de comando desconhecido \"%1\"",
+NotImplemented		: "Comando não implementado",
+UnknownToolbarSet	: "Nome de barra \"%1\" não definido",
+NoActiveX			: "As definições de segurança do navegador podem limitar algumas potencalidades do editr. Deve activar a opção \"Executar controlos e extensões ActiveX\". Pode ocorrer erros ou verificar que faltam potencialidades.",
+BrowseServerBlocked : "Não foi possível abrir o navegador de recursos. Certifique-se que todos os bloqueadores de popup estão desactivados.",
+DialogBlocked		: "Não foi possível abrir a janela de diálogo. Certifique-se que todos os bloqueadores de popup estão desactivados.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Cancelar",
+DlgBtnClose			: "Fechar",
+DlgBtnBrowseServer	: "Navegar no Servidor",
+DlgAdvancedTag		: "Avançado",
+DlgOpOther			: "<Outro>",
+DlgInfoTab			: "Informação",
+DlgAlertUrl			: "Por favor introduza o URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<Não definido>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Orientação de idioma",
+DlgGenLangDirLtr	: "Esquerda à Direita (LTR)",
+DlgGenLangDirRtl	: "Direita a Esquerda (RTL)",
+DlgGenLangCode		: "Código de Idioma",
+DlgGenAccessKey		: "Chave de Acesso",
+DlgGenName			: "Nome",
+DlgGenTabIndex		: "Índice de Tubulação",
+DlgGenLongDescr		: "Descrição Completa do URL",
+DlgGenClass			: "Classes de Estilo de Folhas Classes",
+DlgGenTitle			: "Título",
+DlgGenContType		: "Tipo de Conteúdo",
+DlgGenLinkCharset	: "Fonte de caracteres vinculado",
+DlgGenStyle			: "Estilo",
+
+// Image Dialog
+DlgImgTitle			: "Propriedades da Imagem",
+DlgImgInfoTab		: "Informação da Imagem",
+DlgImgBtnUpload		: "Enviar para o Servidor",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Carregar",
+DlgImgAlt			: "Texto Alternativo",
+DlgImgWidth			: "Largura",
+DlgImgHeight		: "Altura",
+DlgImgLockRatio		: "Proporcional",
+DlgBtnResetSize		: "Tamanho Original",
+DlgImgBorder		: "Limite",
+DlgImgHSpace		: "Esp.Horiz",
+DlgImgVSpace		: "Esp.Vert",
+DlgImgAlign			: "Alinhamento",
+DlgImgAlignLeft		: "Esquerda",
+DlgImgAlignAbsBottom: "Abs inferior",
+DlgImgAlignAbsMiddle: "Abs centro",
+DlgImgAlignBaseline	: "Linha de base",
+DlgImgAlignBottom	: "Fundo",
+DlgImgAlignMiddle	: "Centro",
+DlgImgAlignRight	: "Direita",
+DlgImgAlignTextTop	: "Topo do texto",
+DlgImgAlignTop		: "Topo",
+DlgImgPreview		: "Pré-visualizar",
+DlgImgAlertUrl		: "Por favor introduza o URL da imagem",
+DlgImgLinkTab		: "Hiperligação",
+
+// Flash Dialog
+DlgFlashTitle		: "Propriedades do Flash",
+DlgFlashChkPlay		: "Reproduzir automaticamente",
+DlgFlashChkLoop		: "Loop",
+DlgFlashChkMenu		: "Permitir Menu do Flash",
+DlgFlashScale		: "Escala",
+DlgFlashScaleAll	: "Mostrar tudo",
+DlgFlashScaleNoBorder	: "Sem Limites",
+DlgFlashScaleFit	: "Tamanho Exacto",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Hiperligação",
+DlgLnkInfoTab		: "Informação de Hiperligação",
+DlgLnkTargetTab		: "Destino",
+
+DlgLnkType			: "Tipo de Hiperligação",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Referência a esta página",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocolo",
+DlgLnkProtoOther	: "<outro>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Seleccionar una referência",
+DlgLnkAnchorByName	: "Por Nome de Referência",
+DlgLnkAnchorById	: "Por ID de elemento",
+DlgLnkNoAnchors		: "(Não há referências disponíveis no documento)",
+DlgLnkEMail			: "Endereço de E-Mail",
+DlgLnkEMailSubject	: "Título de Mensagem",
+DlgLnkEMailBody		: "Corpo da Mensagem",
+DlgLnkUpload		: "Carregar",
+DlgLnkBtnUpload		: "Enviar ao Servidor",
+
+DlgLnkTarget		: "Destino",
+DlgLnkTargetFrame	: "<Frame>",
+DlgLnkTargetPopup	: "<Janela de popup>",
+DlgLnkTargetBlank	: "Nova Janela(_blank)",
+DlgLnkTargetParent	: "Janela Pai (_parent)",
+DlgLnkTargetSelf	: "Mesma janela (_self)",
+DlgLnkTargetTop		: "Janela primaria (_top)",
+DlgLnkTargetFrameName	: "Nome do Frame Destino",
+DlgLnkPopWinName	: "Nome da Janela de Popup",
+DlgLnkPopWinFeat	: "Características de Janela de Popup",
+DlgLnkPopResize		: "Ajustável",
+DlgLnkPopLocation	: "Barra de localização",
+DlgLnkPopMenu		: "Barra de Menu",
+DlgLnkPopScroll		: "Barras de deslocamento",
+DlgLnkPopStatus		: "Barra de Estado",
+DlgLnkPopToolbar	: "Barra de Ferramentas",
+DlgLnkPopFullScrn	: "Janela Completa (IE)",
+DlgLnkPopDependent	: "Dependente (Netscape)",
+DlgLnkPopWidth		: "Largura",
+DlgLnkPopHeight		: "Altura",
+DlgLnkPopLeft		: "Posição Esquerda",
+DlgLnkPopTop		: "Posição Direita",
+
+DlnLnkMsgNoUrl		: "Por favor introduza a hiperligação URL",
+DlnLnkMsgNoEMail	: "Por favor introduza o endereço de e-mail",
+DlnLnkMsgNoAnchor	: "Por favor seleccione uma referência",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Seleccionar Cor",
+DlgColorBtnClear	: "Nenhuma",
+DlgColorHighlight	: "Destacado",
+DlgColorSelected	: "Seleccionado",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Inserir um Emoticon",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Seleccione um caracter especial",
+
+// Table Dialog
+DlgTableTitle		: "Propriedades da Tabela",
+DlgTableRows		: "Linhas",
+DlgTableColumns		: "Colunas",
+DlgTableBorder		: "Tamanho do Limite",
+DlgTableAlign		: "Alinhamento",
+DlgTableAlignNotSet	: "<Não definido>",
+DlgTableAlignLeft	: "Esquerda",
+DlgTableAlignCenter	: "Centrado",
+DlgTableAlignRight	: "Direita",
+DlgTableWidth		: "Largura",
+DlgTableWidthPx		: "pixeis",
+DlgTableWidthPc		: "percentagem",
+DlgTableHeight		: "Altura",
+DlgTableCellSpace	: "Esp. e/células",
+DlgTableCellPad		: "Esp. interior",
+DlgTableCaption		: "Título",
+DlgTableSummary		: "Sumário",
+
+// Table Cell Dialog
+DlgCellTitle		: "Propriedades da Célula",
+DlgCellWidth		: "Largura",
+DlgCellWidthPx		: "pixeis",
+DlgCellWidthPc		: "percentagem",
+DlgCellHeight		: "Altura",
+DlgCellWordWrap		: "Moldar Texto",
+DlgCellWordWrapNotSet	: "<Não definido>",
+DlgCellWordWrapYes	: "Sim",
+DlgCellWordWrapNo	: "Não",
+DlgCellHorAlign		: "Alinhamento Horizontal",
+DlgCellHorAlignNotSet	: "<Não definido>",
+DlgCellHorAlignLeft	: "Esquerda",
+DlgCellHorAlignCenter	: "Centrado",
+DlgCellHorAlignRight: "Direita",
+DlgCellVerAlign		: "Alinhamento Vertical",
+DlgCellVerAlignNotSet	: "<Não definido>",
+DlgCellVerAlignTop	: "Topo",
+DlgCellVerAlignMiddle	: "Médio",
+DlgCellVerAlignBottom	: "Fundi",
+DlgCellVerAlignBaseline	: "Linha de Base",
+DlgCellRowSpan		: "Unir Linhas",
+DlgCellCollSpan		: "Unir Colunas",
+DlgCellBackColor	: "Cor do Fundo",
+DlgCellBorderColor	: "Cor do Limite",
+DlgCellBtnSelect	: "Seleccione...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Procurar",
+DlgFindFindBtn		: "Procurar",
+DlgFindNotFoundMsg	: "O texto especificado não foi encontrado.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Substituir",
+DlgReplaceFindLbl		: "Texto a Procurar:",
+DlgReplaceReplaceLbl	: "Substituir por:",
+DlgReplaceCaseChk		: "Maiúsculas/Minúsculas",
+DlgReplaceReplaceBtn	: "Substituir",
+DlgReplaceReplAllBtn	: "Substituir Tudo",
+DlgReplaceWordChk		: "Coincidir com toda a palavra",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl+X).",
+PasteErrorCopy	: "A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl+C).",
+
+PasteAsText		: "Colar como Texto Simples",
+PasteFromWord	: "Colar do Word",
+
+DlgPasteMsg2	: "Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl+V</STRONG>) e prima <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignorar da definições do Tipo de Letra ",
+DlgPasteRemoveStyles	: "Remover as definições de Estilos",
+
+// Color Picker
+ColorAutomatic	: "Automático",
+ColorMoreColors	: "Mais Cores...",
+
+// Document Properties
+DocProps		: "Propriedades do Documento",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Propriedades da Âncora",
+DlgAnchorName		: "Nome da Âncora",
+DlgAnchorErrorName	: "Por favor, introduza o nome da âncora",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Não está num directório",
+DlgSpellChangeTo		: "Mudar para",
+DlgSpellBtnIgnore		: "Ignorar",
+DlgSpellBtnIgnoreAll	: "Ignorar Tudo",
+DlgSpellBtnReplace		: "Substituir",
+DlgSpellBtnReplaceAll	: "Substituir Tudo",
+DlgSpellBtnUndo			: "Anular",
+DlgSpellNoSuggestions	: "- Sem sugestões -",
+DlgSpellProgress		: "Verificação ortográfica em progresso…",
+DlgSpellNoMispell		: "Verificação ortográfica completa: não foram encontrados erros",
+DlgSpellNoChanges		: "Verificação ortográfica completa: não houve alteração de palavras",
+DlgSpellOneChange		: "Verificação ortográfica completa: uma palavra alterada",
+DlgSpellManyChanges		: "Verificação ortográfica completa: %1 palavras alteradas",
+
+IeSpellDownload			: " Verificação ortográfica não instalada. Quer descarregar agora?",
+
+// Button Dialog
+DlgButtonText		: "Texto (Valor)",
+DlgButtonType		: "Tipo",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nome",
+DlgCheckboxValue	: "Valor",
+DlgCheckboxSelected	: "Seleccionado",
+
+// Form Dialog
+DlgFormName		: "Nome",
+DlgFormAction	: "Acção",
+DlgFormMethod	: "Método",
+
+// Select Field Dialog
+DlgSelectName		: "Nome",
+DlgSelectValue		: "Valor",
+DlgSelectSize		: "Tamanho",
+DlgSelectLines		: "linhas",
+DlgSelectChkMulti	: "Permitir selecções múltiplas",
+DlgSelectOpAvail	: "Opções Possíveis",
+DlgSelectOpText		: "Texto",
+DlgSelectOpValue	: "Valor",
+DlgSelectBtnAdd		: "Adicionar",
+DlgSelectBtnModify	: "Modificar",
+DlgSelectBtnUp		: "Para cima",
+DlgSelectBtnDown	: "Para baixo",
+DlgSelectBtnSetValue : "Definir um valor por defeito",
+DlgSelectBtnDelete	: "Apagar",
+
+// Textarea Dialog
+DlgTextareaName	: "Nome",
+DlgTextareaCols	: "Colunas",
+DlgTextareaRows	: "Linhas",
+
+// Text Field Dialog
+DlgTextName			: "Nome",
+DlgTextValue		: "Valor",
+DlgTextCharWidth	: "Tamanho do caracter",
+DlgTextMaxChars		: "Nr. Máximo de Caracteres",
+DlgTextType			: "Tipo",
+DlgTextTypeText		: "Texto",
+DlgTextTypePass		: "Palavra-chave",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nome",
+DlgHiddenValue	: "Valor",
+
+// Bulleted List Dialog
+BulletedListProp	: "Propriedades da Marca",
+NumberedListProp	: "Propriedades da Numeração",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tipo",
+DlgLstTypeCircle	: "Circulo",
+DlgLstTypeDisc		: "Disco",
+DlgLstTypeSquare	: "Quadrado",
+DlgLstTypeNumbers	: "Números (1, 2, 3)",
+DlgLstTypeLCase		: "Letras Minúsculas (a, b, c)",
+DlgLstTypeUCase		: "Letras Maiúsculas (A, B, C)",
+DlgLstTypeSRoman	: "Numeração Romana em Minúsculas (i, ii, iii)",
+DlgLstTypeLRoman	: "Numeração Romana em Maiúsculas (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Geral",
+DlgDocBackTab		: "Fundo",
+DlgDocColorsTab		: "Cores e Margens",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Título da Página",
+DlgDocLangDir		: "Orientação de idioma",
+DlgDocLangDirLTR	: "Esquerda à Direita (LTR)",
+DlgDocLangDirRTL	: "Direita à Esquerda (RTL)",
+DlgDocLangCode		: "Código de Idioma",
+DlgDocCharSet		: "Codificação de Caracteres",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Outra Codificação de Caracteres",
+
+DlgDocDocType		: "Tipo de Cabeçalho do Documento",
+DlgDocDocTypeOther	: "Outro Tipo de Cabeçalho do Documento",
+DlgDocIncXHTML		: "Incluir Declarações XHTML",
+DlgDocBgColor		: "Cor de Fundo",
+DlgDocBgImage		: "Caminho para a Imagem de Fundo",
+DlgDocBgNoScroll	: "Fundo Fixo",
+DlgDocCText			: "Texto",
+DlgDocCLink			: "Hiperligação",
+DlgDocCVisited		: "Hiperligação Visitada",
+DlgDocCActive		: "Hiperligação Activa",
+DlgDocMargins		: "Margem das Páginas",
+DlgDocMaTop			: "Topo",
+DlgDocMaLeft		: "Esquerda",
+DlgDocMaRight		: "Direita",
+DlgDocMaBottom		: "Fundo",
+DlgDocMeIndex		: "Palavras de Indexação do Documento (separadas por virgula)",
+DlgDocMeDescr		: "Descrição do Documento",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Direitos de Autor",
+DlgDocPreview		: "Pré-visualizar",
+
+// Templates Dialog
+Templates			: "Modelos",
+DlgTemplatesTitle	: "Modelo de Conteúdo",
+DlgTemplatesSelMsg	: "Por favor, seleccione o modelo a abrir no editor<br>(o conteúdo actual será perdido):",
+DlgTemplatesLoading	: "A carregar a lista de modelos. Aguarde por favor...",
+DlgTemplatesNoTpl	: "(Sem modelos definidos)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "Acerca",
+DlgAboutBrowserInfoTab	: "Informação do Nevegador",
+DlgAboutLicenseTab	: "Licença",
+DlgAboutVersion		: "versão",
+DlgAboutInfo		: "Para mais informações por favor dirija-se a",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ro.js b/modules/editor/skins/fckeditor/editor/lang/ro.js
new file mode 100644
index 000000000..a85472e6f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ro.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Romanian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Ascunde bara cu opţiuni",
+ToolbarExpand		: "Expandează bara cu opţiuni",
+
+// Toolbar Items and Context Menu
+Save				: "Salvează",
+NewPage				: "Pagină nouă",
+Preview				: "Previzualizare",
+Cut					: "Taie",
+Copy				: "Copiază",
+Paste				: "Adaugă",
+PasteText			: "Adaugă ca text simplu",
+PasteWord			: "Adaugă din Word",
+Print				: "Printează",
+SelectAll			: "Selectează tot",
+RemoveFormat		: "Înlătură formatarea",
+InsertLinkLbl		: "Link (Legătură web)",
+InsertLink			: "Inserează/Editează link (legătură web)",
+RemoveLink			: "Înlătură link (legătură web)",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Inserează/Editează ancoră",
+AnchorDelete		: "Şterge ancoră",
+InsertImageLbl		: "Imagine",
+InsertImage			: "Inserează/Editează imagine",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Inserează/Editează flash",
+InsertTableLbl		: "Tabel",
+InsertTable			: "Inserează/Editează tabel",
+InsertLineLbl		: "Linie",
+InsertLine			: "Inserează linie orizontă",
+InsertSpecialCharLbl: "Caracter special",
+InsertSpecialChar	: "Inserează caracter special",
+InsertSmileyLbl		: "Figură expresivă (Emoticon)",
+InsertSmiley		: "Inserează Figură expresivă (Emoticon)",
+About				: "Despre FCKeditor",
+Bold				: "Îngroşat (bold)",
+Italic				: "Înclinat (italic)",
+Underline			: "Subliniat (underline)",
+StrikeThrough		: "Tăiat (strike through)",
+Subscript			: "Indice (subscript)",
+Superscript			: "Putere (superscript)",
+LeftJustify			: "Aliniere la stânga",
+CenterJustify		: "Aliniere centrală",
+RightJustify		: "Aliniere la dreapta",
+BlockJustify		: "Aliniere în bloc (Block Justify)",
+DecreaseIndent		: "Scade indentarea",
+IncreaseIndent		: "Creşte indentarea",
+Blockquote			: "Citat",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Starea anterioară (undo)",
+Redo				: "Starea ulterioară (redo)",
+NumberedListLbl		: "Listă numerotată",
+NumberedList		: "Inserează/Şterge listă numerotată",
+BulletedListLbl		: "Listă cu puncte",
+BulletedList		: "Inserează/Şterge listă cu puncte",
+ShowTableBorders	: "Arată marginile tabelului",
+ShowDetails			: "Arată detalii",
+Style				: "Stil",
+FontFormat			: "Formatare",
+Font				: "Font",
+FontSize			: "Mărime",
+TextColor			: "Culoarea textului",
+BGColor				: "Coloarea fundalului",
+Source				: "Sursa",
+Find				: "Găseşte",
+Replace				: "Înlocuieşte",
+SpellCheck			: "Verifică text",
+UniversalKeyboard	: "Tastatură universală",
+PageBreakLbl		: "Separator de pagină (Page Break)",
+PageBreak			: "Inserează separator de pagină (Page Break)",
+
+Form			: "Formular (Form)",
+Checkbox		: "Bifă (Checkbox)",
+RadioButton		: "Buton radio (RadioButton)",
+TextField		: "Câmp text (TextField)",
+Textarea		: "Suprafaţă text (Textarea)",
+HiddenField		: "Câmp ascuns (HiddenField)",
+Button			: "Buton",
+SelectionField	: "Câmp selecţie (SelectionField)",
+ImageButton		: "Buton imagine (ImageButton)",
+
+FitWindow		: "Maximizează mărimea editorului",
+ShowBlocks		: "Arată blocurile",
+
+// Context Menu
+EditLink			: "Editează Link",
+CellCM				: "Celulă",
+RowCM				: "Linie",
+ColumnCM			: "Coloană",
+InsertRowAfter		: "Inserează linie după",
+InsertRowBefore		: "Inserează linie înainte",
+DeleteRows			: "Şterge linii",
+InsertColumnAfter	: "Inserează coloană după",
+InsertColumnBefore	: "Inserează coloană înainte",
+DeleteColumns		: "Şterge celule",
+InsertCellAfter		: "Inserează celulă după",
+InsertCellBefore	: "Inserează celulă înainte",
+DeleteCells			: "Şterge celule",
+MergeCells			: "Uneşte celule",
+MergeRight			: "Uneşte la dreapta",
+MergeDown			: "Uneşte jos",
+HorizontalSplitCell	: "Împarte celula pe orizontală",
+VerticalSplitCell	: "Împarte celula pe verticală",
+TableDelete			: "Şterge tabel",
+CellProperties		: "Proprietăţile celulei",
+TableProperties		: "Proprietăţile tabelului",
+ImageProperties		: "Proprietăţile imaginii",
+FlashProperties		: "Proprietăţile flash-ului",
+
+AnchorProp			: "Proprietăţi ancoră",
+ButtonProp			: "Proprietăţi buton",
+CheckboxProp		: "Proprietăţi bifă (Checkbox)",
+HiddenFieldProp		: "Proprietăţi câmp ascuns (Hidden Field)",
+RadioButtonProp		: "Proprietăţi buton radio (Radio Button)",
+ImageButtonProp		: "Proprietăţi buton imagine (Image Button)",
+TextFieldProp		: "Proprietăţi câmp text (Text Field)",
+SelectionFieldProp	: "Proprietăţi câmp selecţie (Selection Field)",
+TextareaProp		: "Proprietăţi suprafaţă text (Textarea)",
+FormProp			: "Proprietăţi formular (Form)",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",	//MISSING
+
+// Alerts and Messages
+ProcessingXHTML		: "Procesăm XHTML. Vă rugăm aşteptaţi...",
+Done				: "Am terminat",
+PasteWordConfirm	: "Textul pe care doriţi să-l adăugaţi pare a fi formatat pentru Word. Doriţi să-l curăţaţi de această formatare înainte de a-l adăuga?",
+NotCompatiblePaste	: "Această facilitate e disponibilă doar pentru Microsoft Internet Explorer, versiunea 5.5 sau ulterioară. Vreţi să-l adăugaţi fără a-i fi înlăturat formatarea?",
+UnknownToolbarItem	: "Obiectul \"%1\" din bara cu opţiuni necunoscut",
+UnknownCommand		: "Comanda \"%1\" necunoscută",
+NotImplemented		: "Comandă neimplementată",
+UnknownToolbarSet	: "Grupul din bara cu opţiuni \"%1\" nu există",
+NoActiveX			: "Setările de securitate ale programului dvs. cu care navigaţi pe internet (browser) pot limita anumite funcţionalităţi ale editorului. Pentru a evita asta, trebuie să activaţi opţiunea \"Run ActiveX controls and plug-ins\". Poate veţi întâlni erori sau veţi observa funcţionalităţi lipsă.",
+BrowseServerBlocked : "The resources browser could not be opened. Asiguraţi-vă că nu e activ niciun \"popup blocker\" (funcţionalitate a programului de navigat (browser) sau a unui plug-in al acestuia de a bloca deschiderea unui noi ferestre).",
+DialogBlocked		: "Nu a fost posibilă deschiderea unei ferestre de dialog. Asiguraţi-vă că nu e activ niciun \"popup blocker\" (funcţionalitate a programului de navigat (browser) sau a unui plug-in al acestuia de a bloca deschiderea unui noi ferestre).",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Bine",
+DlgBtnCancel		: "Anulare",
+DlgBtnClose			: "Închidere",
+DlgBtnBrowseServer	: "Răsfoieşte server",
+DlgAdvancedTag		: "Avansat",
+DlgOpOther			: "<Altul>",
+DlgInfoTab			: "Informaţii",
+DlgAlertUrl			: "Vă rugăm să scrieţi URL-ul",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nesetat>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Direcţia cuvintelor",
+DlgGenLangDirLtr	: "stânga-dreapta (LTR)",
+DlgGenLangDirRtl	: "dreapta-stânga (RTL)",
+DlgGenLangCode		: "Codul limbii",
+DlgGenAccessKey		: "Tasta de acces",
+DlgGenName			: "Nume",
+DlgGenTabIndex		: "Indexul tabului",
+DlgGenLongDescr		: "Descrierea lungă URL",
+DlgGenClass			: "Clasele cu stilul paginii (CSS)",
+DlgGenTitle			: "Titlul consultativ",
+DlgGenContType		: "Tipul consultativ al titlului",
+DlgGenLinkCharset	: "Setul de caractere al resursei legate",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Proprietăţile imaginii",
+DlgImgInfoTab		: "Informaţii despre imagine",
+DlgImgBtnUpload		: "Trimite la server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Încarcă",
+DlgImgAlt			: "Text alternativ",
+DlgImgWidth			: "Lăţime",
+DlgImgHeight		: "Înălţime",
+DlgImgLockRatio		: "Păstrează proporţiile",
+DlgBtnResetSize		: "Resetează mărimea",
+DlgImgBorder		: "Margine",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Aliniere",
+DlgImgAlignLeft		: "Stânga",
+DlgImgAlignAbsBottom: "Jos absolut (Abs Bottom)",
+DlgImgAlignAbsMiddle: "Mijloc absolut (Abs Middle)",
+DlgImgAlignBaseline	: "Linia de jos (Baseline)",
+DlgImgAlignBottom	: "Jos",
+DlgImgAlignMiddle	: "Mijloc",
+DlgImgAlignRight	: "Dreapta",
+DlgImgAlignTextTop	: "Text sus",
+DlgImgAlignTop		: "Sus",
+DlgImgPreview		: "Previzualizare",
+DlgImgAlertUrl		: "Vă rugăm să scrieţi URL-ul imaginii",
+DlgImgLinkTab		: "Link (Legătură web)",
+
+// Flash Dialog
+DlgFlashTitle		: "Proprietăţile flash-ului",
+DlgFlashChkPlay		: "Rulează automat",
+DlgFlashChkLoop		: "Repetă (Loop)",
+DlgFlashChkMenu		: "Activează meniul flash",
+DlgFlashScale		: "Scală",
+DlgFlashScaleAll	: "Arată tot",
+DlgFlashScaleNoBorder	: "Fără margini (No border)",
+DlgFlashScaleFit	: "Potriveşte",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link (Legătură web)",
+DlgLnkInfoTab		: "Informaţii despre link (Legătură web)",
+DlgLnkTargetTab		: "Ţintă (Target)",
+
+DlgLnkType			: "Tipul link-ului (al legăturii web)",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ancoră în această pagină",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protocol",
+DlgLnkProtoOther	: "<altul>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Selectaţi o ancoră",
+DlgLnkAnchorByName	: "după numele ancorei",
+DlgLnkAnchorById	: "după Id-ul elementului",
+DlgLnkNoAnchors		: "(Nicio ancoră disponibilă în document)",
+DlgLnkEMail			: "Adresă de e-mail",
+DlgLnkEMailSubject	: "Subiectul mesajului",
+DlgLnkEMailBody		: "Conţinutul mesajului",
+DlgLnkUpload		: "Încarcă",
+DlgLnkBtnUpload		: "Trimite la server",
+
+DlgLnkTarget		: "Ţintă (Target)",
+DlgLnkTargetFrame	: "<frame>",
+DlgLnkTargetPopup	: "<fereastra popup>",
+DlgLnkTargetBlank	: "Fereastră nouă (_blank)",
+DlgLnkTargetParent	: "Fereastra părinte (_parent)",
+DlgLnkTargetSelf	: "Aceeaşi fereastră (_self)",
+DlgLnkTargetTop		: "Fereastra din topul ierarhiei (_top)",
+DlgLnkTargetFrameName	: "Numele frame-ului ţintă",
+DlgLnkPopWinName	: "Numele ferestrei popup",
+DlgLnkPopWinFeat	: "Proprietăţile ferestrei popup",
+DlgLnkPopResize		: "Scalabilă",
+DlgLnkPopLocation	: "Bara de locaţie",
+DlgLnkPopMenu		: "Bara de meniu",
+DlgLnkPopScroll		: "Scroll Bars",
+DlgLnkPopStatus		: "Bara de status",
+DlgLnkPopToolbar	: "Bara de opţiuni",
+DlgLnkPopFullScrn	: "Tot ecranul (Full Screen)(IE)",
+DlgLnkPopDependent	: "Dependent (Netscape)",
+DlgLnkPopWidth		: "Lăţime",
+DlgLnkPopHeight		: "Înălţime",
+DlgLnkPopLeft		: "Poziţia la stânga",
+DlgLnkPopTop		: "Poziţia la dreapta",
+
+DlnLnkMsgNoUrl		: "Vă rugăm să scrieţi URL-ul",
+DlnLnkMsgNoEMail	: "Vă rugăm să scrieţi adresa de e-mail",
+DlnLnkMsgNoAnchor	: "Vă rugăm să selectaţi o ancoră",
+DlnLnkMsgInvPopName	: "Numele 'popup'-ului trebuie să înceapă cu un caracter alfabetic şi trebuie să nu conţină spaţii",
+
+// Color Dialog
+DlgColorTitle		: "Selectează culoare",
+DlgColorBtnClear	: "Curăţă",
+DlgColorHighlight	: "Subliniază (Highlight)",
+DlgColorSelected	: "Selectat",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Inserează o figură expresivă (Emoticon)",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Selectează caracter special",
+
+// Table Dialog
+DlgTableTitle		: "Proprietăţile tabelului",
+DlgTableRows		: "Linii",
+DlgTableColumns		: "Coloane",
+DlgTableBorder		: "Mărimea marginii",
+DlgTableAlign		: "Aliniament",
+DlgTableAlignNotSet	: "<Nesetat>",
+DlgTableAlignLeft	: "Stânga",
+DlgTableAlignCenter	: "Centru",
+DlgTableAlignRight	: "Dreapta",
+DlgTableWidth		: "Lăţime",
+DlgTableWidthPx		: "pixeli",
+DlgTableWidthPc		: "procente",
+DlgTableHeight		: "Înălţime",
+DlgTableCellSpace	: "Spaţiu între celule",
+DlgTableCellPad		: "Spaţiu în cadrul celulei",
+DlgTableCaption		: "Titlu (Caption)",
+DlgTableSummary		: "Rezumat",
+
+// Table Cell Dialog
+DlgCellTitle		: "Proprietăţile celulei",
+DlgCellWidth		: "Lăţime",
+DlgCellWidthPx		: "pixeli",
+DlgCellWidthPc		: "procente",
+DlgCellHeight		: "Înălţime",
+DlgCellWordWrap		: "Desparte cuvintele (Wrap)",
+DlgCellWordWrapNotSet	: "<Nesetat>",
+DlgCellWordWrapYes	: "Da",
+DlgCellWordWrapNo	: "Nu",
+DlgCellHorAlign		: "Aliniament orizontal",
+DlgCellHorAlignNotSet	: "<Nesetat>",
+DlgCellHorAlignLeft	: "Stânga",
+DlgCellHorAlignCenter	: "Centru",
+DlgCellHorAlignRight: "Dreapta",
+DlgCellVerAlign		: "Aliniament vertical",
+DlgCellVerAlignNotSet	: "<Nesetat>",
+DlgCellVerAlignTop	: "Sus",
+DlgCellVerAlignMiddle	: "Mijloc",
+DlgCellVerAlignBottom	: "Jos",
+DlgCellVerAlignBaseline	: "Linia de jos (Baseline)",
+DlgCellRowSpan		: "Lungimea în linii (Span)",
+DlgCellCollSpan		: "Lungimea în coloane (Span)",
+DlgCellBackColor	: "Culoarea fundalului",
+DlgCellBorderColor	: "Culoarea marginii",
+DlgCellBtnSelect	: "Selectaţi...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Găseşte şi înlocuieşte",
+
+// Find Dialog
+DlgFindTitle		: "Găseşte",
+DlgFindFindBtn		: "Găseşte",
+DlgFindNotFoundMsg	: "Textul specificat nu a fost găsit.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Replace",
+DlgReplaceFindLbl		: "Găseşte:",
+DlgReplaceReplaceLbl	: "Înlocuieşte cu:",
+DlgReplaceCaseChk		: "Deosebeşte majuscule de minuscule (Match case)",
+DlgReplaceReplaceBtn	: "Înlocuieşte",
+DlgReplaceReplAllBtn	: "Înlocuieşte tot",
+DlgReplaceWordChk		: "Doar cuvintele întregi",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl+X).",
+PasteErrorCopy	: "Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl+C).",
+
+PasteAsText		: "Adaugă ca text simplu (Plain Text)",
+PasteFromWord	: "Adaugă din Word",
+
+DlgPasteMsg2	: "Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<STRONG>Ctrl+V</STRONG>) şi apăsaţi <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.",
+DlgPasteIgnoreFont		: "Ignoră definiţiile Font Face",
+DlgPasteRemoveStyles	: "Şterge definiţiile stilurilor",
+
+// Color Picker
+ColorAutomatic	: "Automatic",
+ColorMoreColors	: "Mai multe culori...",
+
+// Document Properties
+DocProps		: "Proprietăţile documentului",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Proprietăţile ancorei",
+DlgAnchorName		: "Numele ancorei",
+DlgAnchorErrorName	: "Vă rugăm scrieţi numele ancorei",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nu e în dicţionar",
+DlgSpellChangeTo		: "Schimbă în",
+DlgSpellBtnIgnore		: "Ignoră",
+DlgSpellBtnIgnoreAll	: "Ignoră toate",
+DlgSpellBtnReplace		: "Înlocuieşte",
+DlgSpellBtnReplaceAll	: "Înlocuieşte tot",
+DlgSpellBtnUndo			: "Starea anterioară (undo)",
+DlgSpellNoSuggestions	: "- Fără sugestii -",
+DlgSpellProgress		: "Verificarea textului în desfăşurare...",
+DlgSpellNoMispell		: "Verificarea textului terminată: Nicio greşeală găsită",
+DlgSpellNoChanges		: "Verificarea textului terminată: Niciun cuvânt modificat",
+DlgSpellOneChange		: "Verificarea textului terminată: Un cuvânt modificat",
+DlgSpellManyChanges		: "Verificarea textului terminată: 1% cuvinte modificate",
+
+IeSpellDownload			: "Unealta pentru verificat textul (Spell checker) neinstalată. Doriţi să o descărcaţi acum?",
+
+// Button Dialog
+DlgButtonText		: "Text (Valoare)",
+DlgButtonType		: "Tip",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Nume",
+DlgCheckboxValue	: "Valoare",
+DlgCheckboxSelected	: "Selectat",
+
+// Form Dialog
+DlgFormName		: "Nume",
+DlgFormAction	: "Acţiune",
+DlgFormMethod	: "Metodă",
+
+// Select Field Dialog
+DlgSelectName		: "Nume",
+DlgSelectValue		: "Valoare",
+DlgSelectSize		: "Mărime",
+DlgSelectLines		: "linii",
+DlgSelectChkMulti	: "Permite selecţii multiple",
+DlgSelectOpAvail	: "Opţiuni disponibile",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Valoare",
+DlgSelectBtnAdd		: "Adaugă",
+DlgSelectBtnModify	: "Modifică",
+DlgSelectBtnUp		: "Sus",
+DlgSelectBtnDown	: "Jos",
+DlgSelectBtnSetValue : "Setează ca valoare selectată",
+DlgSelectBtnDelete	: "Şterge",
+
+// Textarea Dialog
+DlgTextareaName	: "Nume",
+DlgTextareaCols	: "Coloane",
+DlgTextareaRows	: "Linii",
+
+// Text Field Dialog
+DlgTextName			: "Nume",
+DlgTextValue		: "Valoare",
+DlgTextCharWidth	: "Lărgimea caracterului",
+DlgTextMaxChars		: "Caractere maxime",
+DlgTextType			: "Tip",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Parolă",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Nume",
+DlgHiddenValue	: "Valoare",
+
+// Bulleted List Dialog
+BulletedListProp	: "Proprietăţile listei punctate (Bulleted List)",
+NumberedListProp	: "Proprietăţile listei numerotate (Numbered List)",
+DlgLstStart			: "Start",
+DlgLstType			: "Tip",
+DlgLstTypeCircle	: "Cerc",
+DlgLstTypeDisc		: "Disc",
+DlgLstTypeSquare	: "Pătrat",
+DlgLstTypeNumbers	: "Numere (1, 2, 3)",
+DlgLstTypeLCase		: "Minuscule-litere mici (a, b, c)",
+DlgLstTypeUCase		: "Majuscule (A, B, C)",
+DlgLstTypeSRoman	: "Cifre romane mici (i, ii, iii)",
+DlgLstTypeLRoman	: "Cifre romane mari (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "General",
+DlgDocBackTab		: "Fundal",
+DlgDocColorsTab		: "Culori si margini",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Titlul paginii",
+DlgDocLangDir		: "Descrierea limbii",
+DlgDocLangDirLTR	: "stânga-dreapta (LTR)",
+DlgDocLangDirRTL	: "dreapta-stânga (RTL)",
+DlgDocLangCode		: "Codul limbii",
+DlgDocCharSet		: "Encoding setului de caractere",
+DlgDocCharSetCE		: "Central european",
+DlgDocCharSetCT		: "Chinezesc tradiţional (Big5)",
+DlgDocCharSetCR		: "Chirilic",
+DlgDocCharSetGR		: "Grecesc",
+DlgDocCharSetJP		: "Japonez",
+DlgDocCharSetKR		: "Corean",
+DlgDocCharSetTR		: "Turcesc",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Vest european",
+DlgDocCharSetOther	: "Alt encoding al setului de caractere",
+
+DlgDocDocType		: "Document Type Heading",
+DlgDocDocTypeOther	: "Alt Document Type Heading",
+DlgDocIncXHTML		: "Include declaraţii XHTML",
+DlgDocBgColor		: "Culoarea fundalului (Background Color)",
+DlgDocBgImage		: "URL-ul imaginii din fundal (Background Image URL)",
+DlgDocBgNoScroll	: "Fundal neflotant, fix (Nonscrolling Background)",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Link (Legătură web)",
+DlgDocCVisited		: "Link (Legătură web) vizitat",
+DlgDocCActive		: "Link (Legătură web) activ",
+DlgDocMargins		: "Marginile paginii",
+DlgDocMaTop			: "Sus",
+DlgDocMaLeft		: "Stânga",
+DlgDocMaRight		: "Dreapta",
+DlgDocMaBottom		: "Jos",
+DlgDocMeIndex		: "Cuvinte cheie după care se va indexa documentul (separate prin virgulă)",
+DlgDocMeDescr		: "Descrierea documentului",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Drepturi de autor",
+DlgDocPreview		: "Previzualizare",
+
+// Templates Dialog
+Templates			: "Template-uri (şabloane)",
+DlgTemplatesTitle	: "Template-uri (şabloane) de conţinut",
+DlgTemplatesSelMsg	: "Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):",
+DlgTemplatesLoading	: "Se încarcă lista cu template-uri (şabloane). Vă rugăm aşteptaţi...",
+DlgTemplatesNoTpl	: "(Niciun template (şablon) definit)",
+DlgTemplatesReplace	: "Înlocuieşte cuprinsul actual",
+
+// About Dialog
+DlgAboutAboutTab	: "Despre",
+DlgAboutBrowserInfoTab	: "Informaţii browser",
+DlgAboutLicenseTab	: "Licenţă",
+DlgAboutVersion		: "versiune",
+DlgAboutInfo		: "Pentru informaţii amănunţite, vizitaţi",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/ru.js b/modules/editor/skins/fckeditor/editor/lang/ru.js
new file mode 100644
index 000000000..bfdacffbc
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/ru.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Russian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Свернуть панель инструментов",
+ToolbarExpand		: "Развернуть панель инструментов",
+
+// Toolbar Items and Context Menu
+Save				: "Сохранить",
+NewPage				: "Новая страница",
+Preview				: "Предварительный просмотр",
+Cut					: "Вырезать",
+Copy				: "Копировать",
+Paste				: "Вставить",
+PasteText			: "Вставить только текст",
+PasteWord			: "Вставить из Word",
+Print				: "Печать",
+SelectAll			: "Выделить все",
+RemoveFormat		: "Убрать форматирование",
+InsertLinkLbl		: "Ссылка",
+InsertLink			: "Вставить/Редактировать ссылку",
+RemoveLink			: "Убрать ссылку",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Вставить/Редактировать якорь",
+AnchorDelete		: "Убрать якорь",
+InsertImageLbl		: "Изображение",
+InsertImage			: "Вставить/Редактировать изображение",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Вставить/Редактировать Flash",
+InsertTableLbl		: "Таблица",
+InsertTable			: "Вставить/Редактировать таблицу",
+InsertLineLbl		: "Линия",
+InsertLine			: "Вставить горизонтальную линию",
+InsertSpecialCharLbl: "Специальный символ",
+InsertSpecialChar	: "Вставить специальный символ",
+InsertSmileyLbl		: "Смайлик",
+InsertSmiley		: "Вставить смайлик",
+About				: "О FCKeditor",
+Bold				: "Жирный",
+Italic				: "Курсив",
+Underline			: "Подчеркнутый",
+StrikeThrough		: "Зачеркнутый",
+Subscript			: "Подстрочный индекс",
+Superscript			: "Надстрочный индекс",
+LeftJustify			: "По левому краю",
+CenterJustify		: "По центру",
+RightJustify		: "По правому краю",
+BlockJustify		: "По ширине",
+DecreaseIndent		: "Уменьшить отступ",
+IncreaseIndent		: "Увеличить отступ",
+Blockquote			: "Цитата",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Отменить",
+Redo				: "Повторить",
+NumberedListLbl		: "Нумерованный список",
+NumberedList		: "Вставить/Удалить нумерованный список",
+BulletedListLbl		: "Маркированный список",
+BulletedList		: "Вставить/Удалить маркированный список",
+ShowTableBorders	: "Показать бордюры таблицы",
+ShowDetails			: "Показать детали",
+Style				: "Стиль",
+FontFormat			: "Форматирование",
+Font				: "Шрифт",
+FontSize			: "Размер",
+TextColor			: "Цвет текста",
+BGColor				: "Цвет фона",
+Source				: "Источник",
+Find				: "Найти",
+Replace				: "Заменить",
+SpellCheck			: "Проверить орфографию",
+UniversalKeyboard	: "Универсальная клавиатура",
+PageBreakLbl		: "Разрыв страницы",
+PageBreak			: "Вставить разрыв страницы",
+
+Form			: "Форма",
+Checkbox		: "Флаговая кнопка",
+RadioButton		: "Кнопка выбора",
+TextField		: "Текстовое поле",
+Textarea		: "Текстовая область",
+HiddenField		: "Скрытое поле",
+Button			: "Кнопка",
+SelectionField	: "Список",
+ImageButton		: "Кнопка с изображением",
+
+FitWindow		: "Развернуть окно редактора",
+ShowBlocks		: "Показать блоки",
+
+// Context Menu
+EditLink			: "Вставить ссылку",
+CellCM				: "Ячейка",
+RowCM				: "Строка",
+ColumnCM			: "Колонка",
+InsertRowAfter		: "Вставить строку после",
+InsertRowBefore		: "Вставить строку до",
+DeleteRows			: "Удалить строки",
+InsertColumnAfter	: "Вставить колонку после",
+InsertColumnBefore	: "Вставить колонку до",
+DeleteColumns		: "Удалить колонки",
+InsertCellAfter		: "Вставить ячейку после",
+InsertCellBefore	: "Вставить ячейку до",
+DeleteCells			: "Удалить ячейки",
+MergeCells			: "Соединить ячейки",
+MergeRight			: "Соединить вправо",
+MergeDown			: "Соединить вниз",
+HorizontalSplitCell	: "Разбить ячейку горизонтально",
+VerticalSplitCell	: "Разбить ячейку вертикально",
+TableDelete			: "Удалить таблицу",
+CellProperties		: "Свойства ячейки",
+TableProperties		: "Свойства таблицы",
+ImageProperties		: "Свойства изображения",
+FlashProperties		: "Свойства Flash",
+
+AnchorProp			: "Свойства якоря",
+ButtonProp			: "Свойства кнопки",
+CheckboxProp		: "Свойства флаговой кнопки",
+HiddenFieldProp		: "Свойства скрытого поля",
+RadioButtonProp		: "Свойства кнопки выбора",
+ImageButtonProp		: "Свойства кнопки с изображением",
+TextFieldProp		: "Свойства текстового поля",
+SelectionFieldProp	: "Свойства списка",
+TextareaProp		: "Свойства текстовой области",
+FormProp			: "Свойства формы",
+
+FontFormats			: "Нормальный;Форматированный;Адрес;Заголовок 1;Заголовок 2;Заголовок 3;Заголовок 4;Заголовок 5;Заголовок 6;Нормальный (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Обработка XHTML. Пожалуйста, подождите...",
+Done				: "Сделано",
+PasteWordConfirm	: "Текст, который вы хотите вставить, похож на копируемый из Word. Вы хотите очистить его перед вставкой?",
+NotCompatiblePaste	: "Эта команда доступна для Internet Explorer версии 5.5 или выше. Вы хотите вставить без очистки?",
+UnknownToolbarItem	: "Не известный элемент панели инструментов \"%1\"",
+UnknownCommand		: "Не известное имя команды \"%1\"",
+NotImplemented		: "Команда не реализована",
+UnknownToolbarSet	: "Панель инструментов \"%1\" не существует",
+NoActiveX			: "Настройки безопасности вашего браузера могут ограничивать некоторые свойства редактора. Вы должны включить опцию \"Запускать элементы управления ActiveX и плугины\". Вы можете видеть ошибки и замечать отсутствие возможностей.",
+BrowseServerBlocked : "Ресурсы браузера не могут быть открыты. Проверьте что блокировки всплывающих окон выключены.",
+DialogBlocked		: "Невозможно открыть окно диалога. Проверьте что блокировки всплывающих окон выключены.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ОК",
+DlgBtnCancel		: "Отмена",
+DlgBtnClose			: "Закрыть",
+DlgBtnBrowseServer	: "Просмотреть на сервере",
+DlgAdvancedTag		: "Расширенный",
+DlgOpOther			: "<Другое>",
+DlgInfoTab			: "Информация",
+DlgAlertUrl			: "Пожалуйста, вставьте URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<не определено>",
+DlgGenId			: "Идентификатор",
+DlgGenLangDir		: "Направление языка",
+DlgGenLangDirLtr	: "Слева на право (LTR)",
+DlgGenLangDirRtl	: "Справа на лево (RTL)",
+DlgGenLangCode		: "Язык",
+DlgGenAccessKey		: "Горячая клавиша",
+DlgGenName			: "Имя",
+DlgGenTabIndex		: "Последовательность перехода",
+DlgGenLongDescr		: "Длинное описание URL",
+DlgGenClass			: "Класс CSS",
+DlgGenTitle			: "Заголовок",
+DlgGenContType		: "Тип содержимого",
+DlgGenLinkCharset	: "Кодировка",
+DlgGenStyle			: "Стиль CSS",
+
+// Image Dialog
+DlgImgTitle			: "Свойства изображения",
+DlgImgInfoTab		: "Информация о изображении",
+DlgImgBtnUpload		: "Послать на сервер",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Закачать",
+DlgImgAlt			: "Альтернативный текст",
+DlgImgWidth			: "Ширина",
+DlgImgHeight		: "Высота",
+DlgImgLockRatio		: "Сохранять пропорции",
+DlgBtnResetSize		: "Сбросить размер",
+DlgImgBorder		: "Бордюр",
+DlgImgHSpace		: "Горизонтальный отступ",
+DlgImgVSpace		: "Вертикальный отступ",
+DlgImgAlign			: "Выравнивание",
+DlgImgAlignLeft		: "По левому краю",
+DlgImgAlignAbsBottom: "Абс понизу",
+DlgImgAlignAbsMiddle: "Абс посередине",
+DlgImgAlignBaseline	: "По базовой линии",
+DlgImgAlignBottom	: "Понизу",
+DlgImgAlignMiddle	: "Посередине",
+DlgImgAlignRight	: "По правому краю",
+DlgImgAlignTextTop	: "Текст наверху",
+DlgImgAlignTop		: "По верху",
+DlgImgPreview		: "Предварительный просмотр",
+DlgImgAlertUrl		: "Пожалуйста, введите URL изображения",
+DlgImgLinkTab		: "Ссылка",
+
+// Flash Dialog
+DlgFlashTitle		: "Свойства Flash",
+DlgFlashChkPlay		: "Авто проигрывание",
+DlgFlashChkLoop		: "Повтор",
+DlgFlashChkMenu		: "Включить меню Flash",
+DlgFlashScale		: "Масштабировать",
+DlgFlashScaleAll	: "Показывать все",
+DlgFlashScaleNoBorder	: "Без бордюра",
+DlgFlashScaleFit	: "Точное совпадение",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Ссылка",
+DlgLnkInfoTab		: "Информация ссылки",
+DlgLnkTargetTab		: "Цель",
+
+DlgLnkType			: "Тип ссылки",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Якорь на эту страницу",
+DlgLnkTypeEMail		: "Эл. почта",
+DlgLnkProto			: "Протокол",
+DlgLnkProtoOther	: "<другое>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Выберите якорь",
+DlgLnkAnchorByName	: "По имени якоря",
+DlgLnkAnchorById	: "По идентификатору элемента",
+DlgLnkNoAnchors		: "(Нет якорей доступных в этом документе)",
+DlgLnkEMail			: "Адрес эл. почты",
+DlgLnkEMailSubject	: "Заголовок сообщения",
+DlgLnkEMailBody		: "Тело сообщения",
+DlgLnkUpload		: "Закачать",
+DlgLnkBtnUpload		: "Послать на сервер",
+
+DlgLnkTarget		: "Цель",
+DlgLnkTargetFrame	: "<фрейм>",
+DlgLnkTargetPopup	: "<всплывающее окно>",
+DlgLnkTargetBlank	: "Новое окно (_blank)",
+DlgLnkTargetParent	: "Родительское окно (_parent)",
+DlgLnkTargetSelf	: "Тоже окно (_self)",
+DlgLnkTargetTop		: "Самое верхнее окно (_top)",
+DlgLnkTargetFrameName	: "Имя целевого фрейма",
+DlgLnkPopWinName	: "Имя всплывающего окна",
+DlgLnkPopWinFeat	: "Свойства всплывающего окна",
+DlgLnkPopResize		: "Изменяющееся в размерах",
+DlgLnkPopLocation	: "Панель локации",
+DlgLnkPopMenu		: "Панель меню",
+DlgLnkPopScroll		: "Полосы прокрутки",
+DlgLnkPopStatus		: "Строка состояния",
+DlgLnkPopToolbar	: "Панель инструментов",
+DlgLnkPopFullScrn	: "Полный экран (IE)",
+DlgLnkPopDependent	: "Зависимый (Netscape)",
+DlgLnkPopWidth		: "Ширина",
+DlgLnkPopHeight		: "Высота",
+DlgLnkPopLeft		: "Позиция слева",
+DlgLnkPopTop		: "Позиция сверху",
+
+DlnLnkMsgNoUrl		: "Пожалуйста, введите URL ссылки",
+DlnLnkMsgNoEMail	: "Пожалуйста, введите адрес эл. почты",
+DlnLnkMsgNoAnchor	: "Пожалуйста, выберете якорь",
+DlnLnkMsgInvPopName	: "Название вспывающего окна должно начинаться буквы и не может содержать пробелов",
+
+// Color Dialog
+DlgColorTitle		: "Выберите цвет",
+DlgColorBtnClear	: "Очистить",
+DlgColorHighlight	: "Подсвеченный",
+DlgColorSelected	: "Выбранный",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Вставить смайлик",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Выберите специальный символ",
+
+// Table Dialog
+DlgTableTitle		: "Свойства таблицы",
+DlgTableRows		: "Строки",
+DlgTableColumns		: "Колонки",
+DlgTableBorder		: "Размер бордюра",
+DlgTableAlign		: "Выравнивание",
+DlgTableAlignNotSet	: "<Не уст.>",
+DlgTableAlignLeft	: "Слева",
+DlgTableAlignCenter	: "По центру",
+DlgTableAlignRight	: "Справа",
+DlgTableWidth		: "Ширина",
+DlgTableWidthPx		: "пикселей",
+DlgTableWidthPc		: "процентов",
+DlgTableHeight		: "Высота",
+DlgTableCellSpace	: "Промежуток (spacing)",
+DlgTableCellPad		: "Отступ (padding)",
+DlgTableCaption		: "Заголовок",
+DlgTableSummary		: "Резюме",
+
+// Table Cell Dialog
+DlgCellTitle		: "Свойства ячейки",
+DlgCellWidth		: "Ширина",
+DlgCellWidthPx		: "пикселей",
+DlgCellWidthPc		: "процентов",
+DlgCellHeight		: "Высота",
+DlgCellWordWrap		: "Заворачивание текста",
+DlgCellWordWrapNotSet	: "<Не уст.>",
+DlgCellWordWrapYes	: "Да",
+DlgCellWordWrapNo	: "Нет",
+DlgCellHorAlign		: "Гор. выравнивание",
+DlgCellHorAlignNotSet	: "<Не уст.>",
+DlgCellHorAlignLeft	: "Слева",
+DlgCellHorAlignCenter	: "По центру",
+DlgCellHorAlignRight: "Справа",
+DlgCellVerAlign		: "Верт. выравнивание",
+DlgCellVerAlignNotSet	: "<Не уст.>",
+DlgCellVerAlignTop	: "Сверху",
+DlgCellVerAlignMiddle	: "Посередине",
+DlgCellVerAlignBottom	: "Снизу",
+DlgCellVerAlignBaseline	: "По базовой линии",
+DlgCellRowSpan		: "Диапазон строк (span)",
+DlgCellCollSpan		: "Диапазон колонок (span)",
+DlgCellBackColor	: "Цвет фона",
+DlgCellBorderColor	: "Цвет бордюра",
+DlgCellBtnSelect	: "Выберите...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Найти и заменить",
+
+// Find Dialog
+DlgFindTitle		: "Найти",
+DlgFindFindBtn		: "Найти",
+DlgFindNotFoundMsg	: "Указанный текст не найден.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Заменить",
+DlgReplaceFindLbl		: "Найти:",
+DlgReplaceReplaceLbl	: "Заменить на:",
+DlgReplaceCaseChk		: "Учитывать регистр",
+DlgReplaceReplaceBtn	: "Заменить",
+DlgReplaceReplAllBtn	: "Заменить все",
+DlgReplaceWordChk		: "Совпадение целых слов",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Настройки безопасности вашего браузера не позволяют редактору автоматически выполнять операции вырезания. Пожалуйста, используйте клавиатуру для этого (Ctrl+X).",
+PasteErrorCopy	: "Настройки безопасности вашего браузера не позволяют редактору автоматически выполнять операции копирования. Пожалуйста, используйте клавиатуру для этого (Ctrl+C).",
+
+PasteAsText		: "Вставить только текст",
+PasteFromWord	: "Вставить из Word",
+
+DlgPasteMsg2	: "Пожалуйста, вставьте текст в прямоугольник, используя сочетание клавиш (<STRONG>Ctrl+V</STRONG>), и нажмите <STRONG>OK</STRONG>.",
+DlgPasteSec		: "По причине настроек безопасности браузера, редактор не имеет доступа к данным буфера обмена напрямую. Вам необходимо вставить текст снова в это окно.",
+DlgPasteIgnoreFont		: "Игнорировать определения гарнитуры",
+DlgPasteRemoveStyles	: "Убрать определения стилей",
+
+// Color Picker
+ColorAutomatic	: "Автоматический",
+ColorMoreColors	: "Цвета...",
+
+// Document Properties
+DocProps		: "Свойства документа",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Свойства якоря",
+DlgAnchorName		: "Имя якоря",
+DlgAnchorErrorName	: "Пожалуйста, введите имя якоря",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Нет в словаре",
+DlgSpellChangeTo		: "Заменить на",
+DlgSpellBtnIgnore		: "Игнорировать",
+DlgSpellBtnIgnoreAll	: "Игнорировать все",
+DlgSpellBtnReplace		: "Заменить",
+DlgSpellBtnReplaceAll	: "Заменить все",
+DlgSpellBtnUndo			: "Отменить",
+DlgSpellNoSuggestions	: "- Нет предположений -",
+DlgSpellProgress		: "Идет проверка орфографии...",
+DlgSpellNoMispell		: "Проверка орфографии закончена: ошибок не найдено",
+DlgSpellNoChanges		: "Проверка орфографии закончена: ни одного слова не изменено",
+DlgSpellOneChange		: "Проверка орфографии закончена: одно слово изменено",
+DlgSpellManyChanges		: "Проверка орфографии закончена: 1% слов изменен",
+
+IeSpellDownload			: "Модуль проверки орфографии не установлен. Хотите скачать его сейчас?",
+
+// Button Dialog
+DlgButtonText		: "Текст (Значение)",
+DlgButtonType		: "Тип",
+DlgButtonTypeBtn	: "Кнопка",
+DlgButtonTypeSbm	: "Отправить",
+DlgButtonTypeRst	: "Сбросить",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Имя",
+DlgCheckboxValue	: "Значение",
+DlgCheckboxSelected	: "Выбранная",
+
+// Form Dialog
+DlgFormName		: "Имя",
+DlgFormAction	: "Действие",
+DlgFormMethod	: "Метод",
+
+// Select Field Dialog
+DlgSelectName		: "Имя",
+DlgSelectValue		: "Значение",
+DlgSelectSize		: "Размер",
+DlgSelectLines		: "линии",
+DlgSelectChkMulti	: "Разрешить множественный выбор",
+DlgSelectOpAvail	: "Доступные варианты",
+DlgSelectOpText		: "Текст",
+DlgSelectOpValue	: "Значение",
+DlgSelectBtnAdd		: "Добавить",
+DlgSelectBtnModify	: "Модифицировать",
+DlgSelectBtnUp		: "Вверх",
+DlgSelectBtnDown	: "Вниз",
+DlgSelectBtnSetValue : "Установить как выбранное значение",
+DlgSelectBtnDelete	: "Удалить",
+
+// Textarea Dialog
+DlgTextareaName	: "Имя",
+DlgTextareaCols	: "Колонки",
+DlgTextareaRows	: "Строки",
+
+// Text Field Dialog
+DlgTextName			: "Имя",
+DlgTextValue		: "Значение",
+DlgTextCharWidth	: "Ширина",
+DlgTextMaxChars		: "Макс. кол-во символов",
+DlgTextType			: "Тип",
+DlgTextTypeText		: "Текст",
+DlgTextTypePass		: "Пароль",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Имя",
+DlgHiddenValue	: "Значение",
+
+// Bulleted List Dialog
+BulletedListProp	: "Свойства маркированного списка",
+NumberedListProp	: "Свойства нумерованного списка",
+DlgLstStart			: "Начало",
+DlgLstType			: "Тип",
+DlgLstTypeCircle	: "Круг",
+DlgLstTypeDisc		: "Диск",
+DlgLstTypeSquare	: "Квадрат",
+DlgLstTypeNumbers	: "Номера (1, 2, 3)",
+DlgLstTypeLCase		: "Буквы нижнего регистра (a, b, c)",
+DlgLstTypeUCase		: "Буквы верхнего регистра (A, B, C)",
+DlgLstTypeSRoman	: "Малые римские буквы (i, ii, iii)",
+DlgLstTypeLRoman	: "Большие римские буквы (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Общие",
+DlgDocBackTab		: "Задний фон",
+DlgDocColorsTab		: "Цвета и отступы",
+DlgDocMetaTab		: "Мета данные",
+
+DlgDocPageTitle		: "Заголовок страницы",
+DlgDocLangDir		: "Направление текста",
+DlgDocLangDirLTR	: "Слева направо (LTR)",
+DlgDocLangDirRTL	: "Справа налево (RTL)",
+DlgDocLangCode		: "Код языка",
+DlgDocCharSet		: "Кодировка набора символов",
+DlgDocCharSetCE		: "Центрально-европейская",
+DlgDocCharSetCT		: "Китайская традиционная (Big5)",
+DlgDocCharSetCR		: "Кириллица",
+DlgDocCharSetGR		: "Греческая",
+DlgDocCharSetJP		: "Японская",
+DlgDocCharSetKR		: "Корейская",
+DlgDocCharSetTR		: "Турецкая",
+DlgDocCharSetUN		: "Юникод (UTF-8)",
+DlgDocCharSetWE		: "Западно-европейская",
+DlgDocCharSetOther	: "Другая кодировка набора символов",
+
+DlgDocDocType		: "Заголовок типа документа",
+DlgDocDocTypeOther	: "Другой заголовок типа документа",
+DlgDocIncXHTML		: "Включить XHTML объявления",
+DlgDocBgColor		: "Цвет фона",
+DlgDocBgImage		: "URL изображения фона",
+DlgDocBgNoScroll	: "Нескроллируемый фон",
+DlgDocCText			: "Текст",
+DlgDocCLink			: "Ссылка",
+DlgDocCVisited		: "Посещенная ссылка",
+DlgDocCActive		: "Активная ссылка",
+DlgDocMargins		: "Отступы страницы",
+DlgDocMaTop			: "Верхний",
+DlgDocMaLeft		: "Левый",
+DlgDocMaRight		: "Правый",
+DlgDocMaBottom		: "Нижний",
+DlgDocMeIndex		: "Ключевые слова документа (разделенные запятой)",
+DlgDocMeDescr		: "Описание документа",
+DlgDocMeAuthor		: "Автор",
+DlgDocMeCopy		: "Авторские права",
+DlgDocPreview		: "Предварительный просмотр",
+
+// Templates Dialog
+Templates			: "Шаблоны",
+DlgTemplatesTitle	: "Шаблоны содержимого",
+DlgTemplatesSelMsg	: "Пожалуйста, выберете шаблон для открытия в редакторе<br>(текущее содержимое будет потеряно):",
+DlgTemplatesLoading	: "Загрузка списка шаблонов. Пожалуйста, подождите...",
+DlgTemplatesNoTpl	: "(Ни одного шаблона не определено)",
+DlgTemplatesReplace	: "Заменить текущее содержание",
+
+// About Dialog
+DlgAboutAboutTab	: "О программе",
+DlgAboutBrowserInfoTab	: "Информация браузера",
+DlgAboutLicenseTab	: "Лицензия",
+DlgAboutVersion		: "Версия",
+DlgAboutInfo		: "Для большей информации, посетите",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/sk.js b/modules/editor/skins/fckeditor/editor/lang/sk.js
new file mode 100644
index 000000000..8d2940e05
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/sk.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Slovak language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Skryť panel nástrojov",
+ToolbarExpand		: "Zobraziť panel nástrojov",
+
+// Toolbar Items and Context Menu
+Save				: "Uložit",
+NewPage				: "Nová stránka",
+Preview				: "Náhľad",
+Cut					: "Vystrihnúť",
+Copy				: "Kopírovať",
+Paste				: "Vložiť",
+PasteText			: "Vložiť ako čistý text",
+PasteWord			: "Vložiť z Wordu",
+Print				: "Tlač",
+SelectAll			: "Vybrať všetko",
+RemoveFormat		: "Odstrániť formátovanie",
+InsertLinkLbl		: "Odkaz",
+InsertLink			: "Vložiť/zmeniť odkaz",
+RemoveLink			: "Odstrániť odkaz",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Vložiť/zmeniť kotvu",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Obrázok",
+InsertImage			: "Vložiť/zmeniť obrázok",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Vložiť/zmeniť Flash",
+InsertTableLbl		: "Tabuľka",
+InsertTable			: "Vložiť/zmeniť tabuľku",
+InsertLineLbl		: "Čiara",
+InsertLine			: "Vložiť vodorovnú čiaru",
+InsertSpecialCharLbl: "Špeciálne znaky",
+InsertSpecialChar	: "Vložiť špeciálne znaky",
+InsertSmileyLbl		: "Smajlíky",
+InsertSmiley		: "Vložiť smajlíka",
+About				: "O aplikáci FCKeditor",
+Bold				: "Tučné",
+Italic				: "Kurzíva",
+Underline			: "Podčiarknuté",
+StrikeThrough		: "Prečiarknuté",
+Subscript			: "Dolný index",
+Superscript			: "Horný index",
+LeftJustify			: "Zarovnať vľavo",
+CenterJustify		: "Zarovnať na stred",
+RightJustify		: "Zarovnať vpravo",
+BlockJustify		: "Zarovnať do bloku",
+DecreaseIndent		: "Zmenšiť odsadenie",
+IncreaseIndent		: "Zväčšiť odsadenie",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Späť",
+Redo				: "Znovu",
+NumberedListLbl		: "Číslovanie",
+NumberedList		: "Vložiť/odstrániť číslovaný zoznam",
+BulletedListLbl		: "Odrážky",
+BulletedList		: "Vložiť/odstraniť odrážky",
+ShowTableBorders	: "Zobraziť okraje tabuliek",
+ShowDetails			: "Zobraziť podrobnosti",
+Style				: "Štýl",
+FontFormat			: "Formát",
+Font				: "Písmo",
+FontSize			: "Veľkosť",
+TextColor			: "Farba textu",
+BGColor				: "Farba pozadia",
+Source				: "Zdroj",
+Find				: "Hľadať",
+Replace				: "Nahradiť",
+SpellCheck			: "Kontrola pravopisu",
+UniversalKeyboard	: "Univerzálna klávesnica",
+PageBreakLbl		: "Oddeľovač stránky",
+PageBreak			: "Vložiť oddeľovač stránky",
+
+Form			: "Formulár",
+Checkbox		: "Zaškrtávacie políčko",
+RadioButton		: "Prepínač",
+TextField		: "Textové pole",
+Textarea		: "Textová oblasť",
+HiddenField		: "Skryté pole",
+Button			: "Tlačíidlo",
+SelectionField	: "Rozbaľovací zoznam",
+ImageButton		: "Obrázkové tlačidlo",
+
+FitWindow		: "Maximalizovať veľkosť okna editora",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Zmeniť odkaz",
+CellCM				: "Bunka",
+RowCM				: "Riadok",
+ColumnCM			: "Stĺpec",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Vymazať riadok",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Zmazať stĺpec",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Vymazať bunky",
+MergeCells			: "Zlúčiť bunky",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Vymazať tabuľku",
+CellProperties		: "Vlastnosti bunky",
+TableProperties		: "Vlastnosti tabuľky",
+ImageProperties		: "Vlastnosti obrázku",
+FlashProperties		: "Vlastnosti Flashu",
+
+AnchorProp			: "Vlastnosti kotvy",
+ButtonProp			: "Vlastnosti tlačidla",
+CheckboxProp		: "Vlastnosti zaškrtávacieho políčka",
+HiddenFieldProp		: "Vlastnosti skrytého poľa",
+RadioButtonProp		: "Vlastnosti prepínača",
+ImageButtonProp		: "Vlastnosti obrázkového tlačidla",
+TextFieldProp		: "Vlastnosti textového poľa",
+SelectionFieldProp	: "Vlastnosti rozbaľovacieho zoznamu",
+TextareaProp		: "Vlastnosti textovej oblasti",
+FormProp			: "Vlastnosti formulára",
+
+FontFormats			: "Normálny;Formátovaný;Adresa;Nadpis 1;Nadpis 2;Nadpis 3;Nadpis 4;Nadpis 5;Nadpis 6;Odsek (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Prebieha spracovanie XHTML. Čakajte prosím...",
+Done				: "Dokončené.",
+PasteWordConfirm	: "Vyzerá to tak, že vkladaný text je kopírovaný z Wordu. Chcete ho pred vložením vyčistiť?",
+NotCompatiblePaste	: "Tento príkaz je dostupný len v prehliadači Internet Explorer verzie 5.5 alebo vyššej. Chcete vložiť text bez vyčistenia?",
+UnknownToolbarItem	: "Neznáma položka panela nástrojov \"%1\"",
+UnknownCommand		: "Neznámy príkaz \"%1\"",
+NotImplemented		: "Príkaz nie je implementovaný",
+UnknownToolbarSet	: "Panel nástrojov \"%1\" neexistuje",
+NoActiveX			: "Bezpečnostné nastavenia vášho prehliadača môžu obmedzovať niektoré funkcie editora. Pre ich plnú funkčnosť musíte zapnúť voľbu \"Spúšťať ActiveX moduly a zásuvné moduly\", inak sa môžete stretnúť s chybami a nefunkčnosťou niektorých funkcií.",
+BrowseServerBlocked : "Prehliadač zdrojových prvkov nebolo možné otvoriť. Uistite sa, že máte vypnuté všetky blokovače vyskakujúcich okien.",
+DialogBlocked		: "Dialógové okno nebolo možné otvoriť. Uistite sa, že máte vypnuté všetky blokovače vyskakujúcich okien.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Zrušiť",
+DlgBtnClose			: "Zavrieť",
+DlgBtnBrowseServer	: "Prechádzať server",
+DlgAdvancedTag		: "Rozšírené",
+DlgOpOther			: "<Ďalšie>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Prosím vložte URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nenastavené>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Orientácia jazyka",
+DlgGenLangDirLtr	: "Zľava doprava (LTR)",
+DlgGenLangDirRtl	: "Sprava doľava (RTL)",
+DlgGenLangCode		: "Kód jazyka",
+DlgGenAccessKey		: "Prístupový kľúč",
+DlgGenName			: "Meno",
+DlgGenTabIndex		: "Poradie prvku",
+DlgGenLongDescr		: "Dlhý popis URL",
+DlgGenClass			: "Trieda štýlu",
+DlgGenTitle			: "Pomocný titulok",
+DlgGenContType		: "Pomocný typ obsahu",
+DlgGenLinkCharset	: "Priradená znaková sada",
+DlgGenStyle			: "Štýl",
+
+// Image Dialog
+DlgImgTitle			: "Vlastnosti obrázku",
+DlgImgInfoTab		: "Informácie o obrázku",
+DlgImgBtnUpload		: "Odoslať na server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Odoslať",
+DlgImgAlt			: "Alternatívny text",
+DlgImgWidth			: "Šírka",
+DlgImgHeight		: "Výška",
+DlgImgLockRatio		: "Zámok",
+DlgBtnResetSize		: "Pôvodná veľkosť",
+DlgImgBorder		: "Okraje",
+DlgImgHSpace		: "H-medzera",
+DlgImgVSpace		: "V-medzera",
+DlgImgAlign			: "Zarovnanie",
+DlgImgAlignLeft		: "Vľavo",
+DlgImgAlignAbsBottom: "Úplne dole",
+DlgImgAlignAbsMiddle: "Do stredu",
+DlgImgAlignBaseline	: "Na základňu",
+DlgImgAlignBottom	: "Dole",
+DlgImgAlignMiddle	: "Na stred",
+DlgImgAlignRight	: "Vpravo",
+DlgImgAlignTextTop	: "Na horný okraj textu",
+DlgImgAlignTop		: "Nahor",
+DlgImgPreview		: "Náhľad",
+DlgImgAlertUrl		: "Zadajte prosím URL obrázku",
+DlgImgLinkTab		: "Odkaz",
+
+// Flash Dialog
+DlgFlashTitle		: "Vlastnosti Flashu",
+DlgFlashChkPlay		: "Automatické prehrávanie",
+DlgFlashChkLoop		: "Opakovanie",
+DlgFlashChkMenu		: "Povoliť Flash Menu",
+DlgFlashScale		: "Mierka",
+DlgFlashScaleAll	: "Zobraziť mierku",
+DlgFlashScaleNoBorder	: "Bez okrajov",
+DlgFlashScaleFit	: "Roztiahnuť na celé",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Odkaz",
+DlgLnkInfoTab		: "Informácie o odkaze",
+DlgLnkTargetTab		: "Cieľ",
+
+DlgLnkType			: "Typ odkazu",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Kotva v tejto stránke",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<iný>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Vybrať kotvu",
+DlgLnkAnchorByName	: "Podľa mena kotvy",
+DlgLnkAnchorById	: "Podľa Id objektu",
+DlgLnkNoAnchors		: "(V stránke nie je definovaná žiadna kotva)",
+DlgLnkEMail			: "E-Mailová adresa",
+DlgLnkEMailSubject	: "Predmet správy",
+DlgLnkEMailBody		: "Telo správy",
+DlgLnkUpload		: "Odoslať",
+DlgLnkBtnUpload		: "Odoslať na server",
+
+DlgLnkTarget		: "Cieľ",
+DlgLnkTargetFrame	: "<rámec>",
+DlgLnkTargetPopup	: "<vyskakovacie okno>",
+DlgLnkTargetBlank	: "Nové okno (_blank)",
+DlgLnkTargetParent	: "Rodičovské okno (_parent)",
+DlgLnkTargetSelf	: "Rovnaké okno (_self)",
+DlgLnkTargetTop		: "Hlavné okno (_top)",
+DlgLnkTargetFrameName	: "Meno rámu cieľa",
+DlgLnkPopWinName	: "Názov vyskakovacieho okna",
+DlgLnkPopWinFeat	: "Vlastnosti vyskakovacieho okna",
+DlgLnkPopResize		: "Meniteľná veľkosť",
+DlgLnkPopLocation	: "Panel umiestnenia",
+DlgLnkPopMenu		: "Panel ponuky",
+DlgLnkPopScroll		: "Posuvníky",
+DlgLnkPopStatus		: "Stavový riadok",
+DlgLnkPopToolbar	: "Panel nástrojov",
+DlgLnkPopFullScrn	: "Celá obrazovka (IE)",
+DlgLnkPopDependent	: "Závislosť (Netscape)",
+DlgLnkPopWidth		: "Šírka",
+DlgLnkPopHeight		: "Výška",
+DlgLnkPopLeft		: "Ľavý okraj",
+DlgLnkPopTop		: "Horný okraj",
+
+DlnLnkMsgNoUrl		: "Zadajte prosím URL odkazu",
+DlnLnkMsgNoEMail	: "Zadajte prosím e-mailovú adresu",
+DlnLnkMsgNoAnchor	: "Vyberte prosím kotvu",
+DlnLnkMsgInvPopName	: "Názov vyskakovacieho okna sa musá začínať písmenom a nemôže obsahovať medzery",
+
+// Color Dialog
+DlgColorTitle		: "Výber farby",
+DlgColorBtnClear	: "Vymazať",
+DlgColorHighlight	: "Zvýraznená",
+DlgColorSelected	: "Vybraná",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Vkladanie smajlíkov",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Výber špeciálneho znaku",
+
+// Table Dialog
+DlgTableTitle		: "Vlastnosti tabuľky",
+DlgTableRows		: "Riadky",
+DlgTableColumns		: "Stĺpce",
+DlgTableBorder		: "Ohraničenie",
+DlgTableAlign		: "Zarovnanie",
+DlgTableAlignNotSet	: "<nenastavené>",
+DlgTableAlignLeft	: "Vľavo",
+DlgTableAlignCenter	: "Na stred",
+DlgTableAlignRight	: "Vpravo",
+DlgTableWidth		: "Šírka",
+DlgTableWidthPx		: "pixelov",
+DlgTableWidthPc		: "percent",
+DlgTableHeight		: "Výška",
+DlgTableCellSpace	: "Vzdialenosť buniek",
+DlgTableCellPad		: "Odsadenie obsahu",
+DlgTableCaption		: "Popis",
+DlgTableSummary		: "Prehľad",
+
+// Table Cell Dialog
+DlgCellTitle		: "Vlastnosti bunky",
+DlgCellWidth		: "Šírka",
+DlgCellWidthPx		: "bodov",
+DlgCellWidthPc		: "percent",
+DlgCellHeight		: "Výška",
+DlgCellWordWrap		: "Zalamovannie",
+DlgCellWordWrapNotSet	: "<nenastavené>",
+DlgCellWordWrapYes	: "Áno",
+DlgCellWordWrapNo	: "Nie",
+DlgCellHorAlign		: "Vodorovné zarovnanie",
+DlgCellHorAlignNotSet	: "<nenastavené>",
+DlgCellHorAlignLeft	: "Vľavo",
+DlgCellHorAlignCenter	: "Na stred",
+DlgCellHorAlignRight: "Vpravo",
+DlgCellVerAlign		: "Zvislé zarovnanie",
+DlgCellVerAlignNotSet	: "<nenastavené>",
+DlgCellVerAlignTop	: "Nahor",
+DlgCellVerAlignMiddle	: "Doprostred",
+DlgCellVerAlignBottom	: "Dole",
+DlgCellVerAlignBaseline	: "Na základňu",
+DlgCellRowSpan		: "Zlúčené riadky",
+DlgCellCollSpan		: "Zlúčené stĺpce",
+DlgCellBackColor	: "Farba pozadia",
+DlgCellBorderColor	: "Farba ohraničenia",
+DlgCellBtnSelect	: "Výber...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Hľadať",
+DlgFindFindBtn		: "Hľadať",
+DlgFindNotFoundMsg	: "Hľadaný text nebol nájdený.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Nahradiť",
+DlgReplaceFindLbl		: "Čo hľadať:",
+DlgReplaceReplaceLbl	: "Čím nahradiť:",
+DlgReplaceCaseChk		: "Rozlišovať malé/veľké písmená",
+DlgReplaceReplaceBtn	: "Nahradiť",
+DlgReplaceReplAllBtn	: "Nahradiť všetko",
+DlgReplaceWordChk		: "Len celé slová",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Bezpečnostné nastavenie Vášho prehliadača nedovoľujú editoru spustiť funkciu pre vystrihnutie zvoleného textu do schránky. Prosím vystrihnite zvolený text do schránky pomocou klávesnice (Ctrl+X).",
+PasteErrorCopy	: "Bezpečnostné nastavenie Vášho prehliadača nedovoľujú editoru spustiť funkciu pre kopírovanie zvoleného textu do schránky. Prosím skopírujte zvolený text do schránky pomocou klávesnice (Ctrl+C).",
+
+PasteAsText		: "Vložiť ako čistý text",
+PasteFromWord	: "Vložiť text z Wordu",
+
+DlgPasteMsg2	: "Prosím vložte nasledovný rámček použitím klávesnice (<STRONG>Ctrl+V</STRONG>) a stlačte <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignorovať nastavenia typu písma",
+DlgPasteRemoveStyles	: "Odstrániť formátovanie",
+
+// Color Picker
+ColorAutomatic	: "Automaticky",
+ColorMoreColors	: "Viac farieb...",
+
+// Document Properties
+DocProps		: "Vlastnosti dokumentu",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Vlastnosti kotvy",
+DlgAnchorName		: "Meno kotvy",
+DlgAnchorErrorName	: "Zadajte prosím meno kotvy",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nie je v slovníku",
+DlgSpellChangeTo		: "Zmeniť na",
+DlgSpellBtnIgnore		: "Ignorovať",
+DlgSpellBtnIgnoreAll	: "Ignorovať všetko",
+DlgSpellBtnReplace		: "Prepísat",
+DlgSpellBtnReplaceAll	: "Prepísat všetko",
+DlgSpellBtnUndo			: "Späť",
+DlgSpellNoSuggestions	: "- Žiadny návrh -",
+DlgSpellProgress		: "Prebieha kontrola pravopisu...",
+DlgSpellNoMispell		: "Kontrola pravopisu dokončená: bez chýb",
+DlgSpellNoChanges		: "Kontrola pravopisu dokončená: žiadne slová nezmenené",
+DlgSpellOneChange		: "Kontrola pravopisu dokončená: zmenené jedno slovo",
+DlgSpellManyChanges		: "Kontrola pravopisu dokončená: zmenených %1 slov",
+
+IeSpellDownload			: "Kontrola pravopisu nie je naištalovaná. Chcete ju hneď stiahnuť?",
+
+// Button Dialog
+DlgButtonText		: "Text",
+DlgButtonType		: "Typ",
+DlgButtonTypeBtn	: "Tlačidlo",
+DlgButtonTypeSbm	: "Odoslať",
+DlgButtonTypeRst	: "Vymazať",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Názov",
+DlgCheckboxValue	: "Hodnota",
+DlgCheckboxSelected	: "Vybrané",
+
+// Form Dialog
+DlgFormName		: "Názov",
+DlgFormAction	: "Akcie",
+DlgFormMethod	: "Metóda",
+
+// Select Field Dialog
+DlgSelectName		: "Názov",
+DlgSelectValue		: "Hodnota",
+DlgSelectSize		: "Veľkosť",
+DlgSelectLines		: "riadkov",
+DlgSelectChkMulti	: "Povoliť viacnásobný výber",
+DlgSelectOpAvail	: "Dostupné možnosti",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Hodnota",
+DlgSelectBtnAdd		: "Pridať",
+DlgSelectBtnModify	: "Zmeniť",
+DlgSelectBtnUp		: "Hore",
+DlgSelectBtnDown	: "Dole",
+DlgSelectBtnSetValue : "Nastaviť ako vybranú hodnotu",
+DlgSelectBtnDelete	: "Zmazať",
+
+// Textarea Dialog
+DlgTextareaName	: "Názov",
+DlgTextareaCols	: "Stĺpce",
+DlgTextareaRows	: "Riadky",
+
+// Text Field Dialog
+DlgTextName			: "Názov",
+DlgTextValue		: "Hodnota",
+DlgTextCharWidth	: "Šírka pola (znakov)",
+DlgTextMaxChars		: "Maximálny počet znakov",
+DlgTextType			: "Typ",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Heslo",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Názov",
+DlgHiddenValue	: "Hodnota",
+
+// Bulleted List Dialog
+BulletedListProp	: "Vlastnosti odrážok",
+NumberedListProp	: "Vlastnosti číslovania",
+DlgLstStart			: "Štart",
+DlgLstType			: "Typ",
+DlgLstTypeCircle	: "Krúžok",
+DlgLstTypeDisc		: "Disk",
+DlgLstTypeSquare	: "Štvorec",
+DlgLstTypeNumbers	: "Číslovanie (1, 2, 3)",
+DlgLstTypeLCase		: "Malé písmená (a, b, c)",
+DlgLstTypeUCase		: "Veľké písmená (A, B, C)",
+DlgLstTypeSRoman	: "Malé rímske číslice (i, ii, iii)",
+DlgLstTypeLRoman	: "Veľké rímske číslice (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Všeobecné",
+DlgDocBackTab		: "Pozadie",
+DlgDocColorsTab		: "Farby a okraje",
+DlgDocMetaTab		: "Meta Data",
+
+DlgDocPageTitle		: "Titulok",
+DlgDocLangDir		: "Orientácie jazyka",
+DlgDocLangDirLTR	: "Zľava doprava (LTR)",
+DlgDocLangDirRTL	: "Sprava doľava (RTL)",
+DlgDocLangCode		: "Kód jazyka",
+DlgDocCharSet		: "Kódová stránka",
+DlgDocCharSetCE		: "Stredoeurópske",
+DlgDocCharSetCT		: "Čínština tradičná (Big5)",
+DlgDocCharSetCR		: "Cyrillika",
+DlgDocCharSetGR		: "Gréčtina",
+DlgDocCharSetJP		: "Japončina",
+DlgDocCharSetKR		: "Korejčina",
+DlgDocCharSetTR		: "Turečtina",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Západná európa",
+DlgDocCharSetOther	: "Iná kódová stránka",
+
+DlgDocDocType		: "Typ záhlavia dokumentu",
+DlgDocDocTypeOther	: "Iný typ záhlavia dokumentu",
+DlgDocIncXHTML		: "Obsahuje deklarácie XHTML",
+DlgDocBgColor		: "Farba pozadia",
+DlgDocBgImage		: "URL adresa obrázku na pozadí",
+DlgDocBgNoScroll	: "Fixné pozadie",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Odkaz",
+DlgDocCVisited		: "Navštívený odkaz",
+DlgDocCActive		: "Aktívny odkaz",
+DlgDocMargins		: "Okraje stránky",
+DlgDocMaTop			: "Horný",
+DlgDocMaLeft		: "Ľavý",
+DlgDocMaRight		: "Pravý",
+DlgDocMaBottom		: "Dolný",
+DlgDocMeIndex		: "Kľúčové slová pre indexovanie (oddelené čiarkou)",
+DlgDocMeDescr		: "Popis stránky",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Autorské práva",
+DlgDocPreview		: "Náhľad",
+
+// Templates Dialog
+Templates			: "Šablóny",
+DlgTemplatesTitle	: "Šablóny obsahu",
+DlgTemplatesSelMsg	: "Prosím vyberte šablóny na otvorenie v editore<br>(súšasný obsah bude stratený):",
+DlgTemplatesLoading	: "Nahrávam zoznam šablón. Čakajte prosím...",
+DlgTemplatesNoTpl	: "(žiadne šablóny nenájdené)",
+DlgTemplatesReplace	: "Nahradiť aktuálny obsah",
+
+// About Dialog
+DlgAboutAboutTab	: "O aplikáci",
+DlgAboutBrowserInfoTab	: "Informácie o prehliadači",
+DlgAboutLicenseTab	: "Licencia",
+DlgAboutVersion		: "verzia",
+DlgAboutInfo		: "Viac informácií získate na",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/sl.js b/modules/editor/skins/fckeditor/editor/lang/sl.js
new file mode 100644
index 000000000..affae6c97
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/sl.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Slovenian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Zloži orodno vrstico",
+ToolbarExpand		: "Razširi orodno vrstico",
+
+// Toolbar Items and Context Menu
+Save				: "Shrani",
+NewPage				: "Nova stran",
+Preview				: "Predogled",
+Cut					: "Izreži",
+Copy				: "Kopiraj",
+Paste				: "Prilepi",
+PasteText			: "Prilepi kot golo besedilo",
+PasteWord			: "Prilepi iz Worda",
+Print				: "Natisni",
+SelectAll			: "Izberi vse",
+RemoveFormat		: "Odstrani oblikovanje",
+InsertLinkLbl		: "Povezava",
+InsertLink			: "Vstavi/uredi povezavo",
+RemoveLink			: "Odstrani povezavo",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Vstavi/uredi zaznamek",
+AnchorDelete		: "Odstrani zaznamek",
+InsertImageLbl		: "Slika",
+InsertImage			: "Vstavi/uredi sliko",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Vstavi/Uredi Flash",
+InsertTableLbl		: "Tabela",
+InsertTable			: "Vstavi/uredi tabelo",
+InsertLineLbl		: "Črta",
+InsertLine			: "Vstavi vodoravno črto",
+InsertSpecialCharLbl: "Posebni znak",
+InsertSpecialChar	: "Vstavi posebni znak",
+InsertSmileyLbl		: "Smeško",
+InsertSmiley		: "Vstavi smeška",
+About				: "O FCKeditorju",
+Bold				: "Krepko",
+Italic				: "Ležeče",
+Underline			: "Podčrtano",
+StrikeThrough		: "Prečrtano",
+Subscript			: "Podpisano",
+Superscript			: "Nadpisano",
+LeftJustify			: "Leva poravnava",
+CenterJustify		: "Sredinska poravnava",
+RightJustify		: "Desna poravnava",
+BlockJustify		: "Obojestranska poravnava",
+DecreaseIndent		: "Zmanjšaj zamik",
+IncreaseIndent		: "Povečaj zamik",
+Blockquote			: "Citat",
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Razveljavi",
+Redo				: "Ponovi",
+NumberedListLbl		: "Oštevilčen seznam",
+NumberedList		: "Vstavi/odstrani oštevilčevanje",
+BulletedListLbl		: "Označen seznam",
+BulletedList		: "Vstavi/odstrani označevanje",
+ShowTableBorders	: "Pokaži meje tabele",
+ShowDetails			: "Pokaži podrobnosti",
+Style				: "Slog",
+FontFormat			: "Oblika",
+Font				: "Pisava",
+FontSize			: "Velikost",
+TextColor			: "Barva besedila",
+BGColor				: "Barva ozadja",
+Source				: "Izvorna koda",
+Find				: "Najdi",
+Replace				: "Zamenjaj",
+SpellCheck			: "Preveri črkovanje",
+UniversalKeyboard	: "Večjezična tipkovnica",
+PageBreakLbl		: "Prelom strani",
+PageBreak			: "Vstavi prelom strani",
+
+Form			: "Obrazec",
+Checkbox		: "Potrditveno polje",
+RadioButton		: "Izbirno polje",
+TextField		: "Vnosno polje",
+Textarea		: "Vnosno območje",
+HiddenField		: "Skrito polje",
+Button			: "Gumb",
+SelectionField	: "Spustni seznam",
+ImageButton		: "Gumb s sliko",
+
+FitWindow		: "Razširi velikost urejevalnika čez cel zaslon",
+ShowBlocks		: "Prikaži ograde",
+
+// Context Menu
+EditLink			: "Uredi povezavo",
+CellCM				: "Celica",
+RowCM				: "Vrstica",
+ColumnCM			: "Stolpec",
+InsertRowAfter		: "Vstavi vrstico za",
+InsertRowBefore		: "Vstavi vrstico pred",
+DeleteRows			: "Izbriši vrstice",
+InsertColumnAfter	: "Vstavi stolpec za",
+InsertColumnBefore	: "Vstavi stolpec pred",
+DeleteColumns		: "Izbriši stolpce",
+InsertCellAfter		: "Vstavi celico za",
+InsertCellBefore	: "Vstavi celico pred",
+DeleteCells			: "Izbriši celice",
+MergeCells			: "Združi celice",
+MergeRight			: "Združi desno",
+MergeDown			: "Druži navzdol",
+HorizontalSplitCell	: "Razdeli celico vodoravno",
+VerticalSplitCell	: "Razdeli celico navpično",
+TableDelete			: "Izbriši tabelo",
+CellProperties		: "Lastnosti celice",
+TableProperties		: "Lastnosti tabele",
+ImageProperties		: "Lastnosti slike",
+FlashProperties		: "Lastnosti Flash",
+
+AnchorProp			: "Lastnosti zaznamka",
+ButtonProp			: "Lastnosti gumba",
+CheckboxProp		: "Lastnosti potrditvenega polja",
+HiddenFieldProp		: "Lastnosti skritega polja",
+RadioButtonProp		: "Lastnosti izbirnega polja",
+ImageButtonProp		: "Lastnosti gumba s sliko",
+TextFieldProp		: "Lastnosti vnosnega polja",
+SelectionFieldProp	: "Lastnosti spustnega seznama",
+TextareaProp		: "Lastnosti vnosnega območja",
+FormProp			: "Lastnosti obrazca",
+
+FontFormats			: "Navaden;Oblikovan;Napis;Naslov 1;Naslov 2;Naslov 3;Naslov 4;Naslov 5;Naslov 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Obdelujem XHTML. Prosim počakajte...",
+Done				: "Narejeno",
+PasteWordConfirm	: "Izgleda, da želite prilepiti besedilo iz Worda. Ali ga želite očistiti, preden ga prilepite?",
+NotCompatiblePaste	: "Ta ukaz deluje le v Internet Explorerje različice 5.5 ali višje. Ali želite prilepiti brez čiščenja?",
+UnknownToolbarItem	: "Neznan element orodne vrstice \"%1\"",
+UnknownCommand		: "Neznano ime ukaza \"%1\"",
+NotImplemented		: "Ukaz ni izdelan",
+UnknownToolbarSet	: "Skupina orodnih vrstic \"%1\" ne obstoja",
+NoActiveX			: "Varnostne nastavitve vašega brskalnika lahko omejijo delovanje nekaterih zmožnosti urejevalnika. Če ne želite zaznavati napak in sporočil o manjkajočih zmožnostih, omogočite možnost \"Zaženi ActiveX kontrolnike in vtičnike\".",
+BrowseServerBlocked : "Brskalnik virov se ne more odpreti. Prepričajte se, da je preprečevanje pojavnih oken onemogočeno.",
+DialogBlocked		: "Pogovorno okno se ni moglo odpreti. Prepričajte se, da je preprečevanje pojavnih oken onemogočeno.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "V redu",
+DlgBtnCancel		: "Prekliči",
+DlgBtnClose			: "Zapri",
+DlgBtnBrowseServer	: "Prebrskaj na strežniku",
+DlgAdvancedTag		: "Napredno",
+DlgOpOther			: "<Ostalo>",
+DlgInfoTab			: "Podatki",
+DlgAlertUrl			: "Prosim vpiši spletni naslov",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ni postavljen>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Smer jezika",
+DlgGenLangDirLtr	: "Od leve proti desni (LTR)",
+DlgGenLangDirRtl	: "Od desne proti levi (RTL)",
+DlgGenLangCode		: "Oznaka jezika",
+DlgGenAccessKey		: "Vstopno geslo",
+DlgGenName			: "Ime",
+DlgGenTabIndex		: "Številka tabulatorja",
+DlgGenLongDescr		: "Dolg opis URL-ja",
+DlgGenClass			: "Razred stilne predloge",
+DlgGenTitle			: "Predlagani naslov",
+DlgGenContType		: "Predlagani tip vsebine (content-type)",
+DlgGenLinkCharset	: "Kodna tabela povezanega vira",
+DlgGenStyle			: "Slog",
+
+// Image Dialog
+DlgImgTitle			: "Lastnosti slike",
+DlgImgInfoTab		: "Podatki o sliki",
+DlgImgBtnUpload		: "Pošlji na strežnik",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Pošlji",
+DlgImgAlt			: "Nadomestno besedilo",
+DlgImgWidth			: "Širina",
+DlgImgHeight		: "Višina",
+DlgImgLockRatio		: "Zakleni razmerje",
+DlgBtnResetSize		: "Ponastavi velikost",
+DlgImgBorder		: "Obroba",
+DlgImgHSpace		: "Vodoravni razmik",
+DlgImgVSpace		: "Navpični razmik",
+DlgImgAlign			: "Poravnava",
+DlgImgAlignLeft		: "Levo",
+DlgImgAlignAbsBottom: "Popolnoma na dno",
+DlgImgAlignAbsMiddle: "Popolnoma v sredino",
+DlgImgAlignBaseline	: "Na osnovno črto",
+DlgImgAlignBottom	: "Na dno",
+DlgImgAlignMiddle	: "V sredino",
+DlgImgAlignRight	: "Desno",
+DlgImgAlignTextTop	: "Besedilo na vrh",
+DlgImgAlignTop		: "Na vrh",
+DlgImgPreview		: "Predogled",
+DlgImgAlertUrl		: "Vnesite URL slike",
+DlgImgLinkTab		: "Povezava",
+
+// Flash Dialog
+DlgFlashTitle		: "Lastnosti Flash",
+DlgFlashChkPlay		: "Samodejno predvajaj",
+DlgFlashChkLoop		: "Ponavljanje",
+DlgFlashChkMenu		: "Omogoči Flash Meni",
+DlgFlashScale		: "Povečava",
+DlgFlashScaleAll	: "Pokaži vse",
+DlgFlashScaleNoBorder	: "Brez obrobe",
+DlgFlashScaleFit	: "Natančno prileganje",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Povezava",
+DlgLnkInfoTab		: "Podatki o povezavi",
+DlgLnkTargetTab		: "Cilj",
+
+DlgLnkType			: "Vrsta povezave",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Zaznamek na tej strani",
+DlgLnkTypeEMail		: "Elektronski naslov",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<drugo>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Izberi zaznamek",
+DlgLnkAnchorByName	: "Po imenu zaznamka",
+DlgLnkAnchorById	: "Po ID-ju elementa",
+DlgLnkNoAnchors		: "(V tem dokumentu ni zaznamkov)",
+DlgLnkEMail			: "Elektronski naslov",
+DlgLnkEMailSubject	: "Predmet sporočila",
+DlgLnkEMailBody		: "Vsebina sporočila",
+DlgLnkUpload		: "Prenesi",
+DlgLnkBtnUpload		: "Pošlji na strežnik",
+
+DlgLnkTarget		: "Cilj",
+DlgLnkTargetFrame	: "<okvir>",
+DlgLnkTargetPopup	: "<pojavno okno>",
+DlgLnkTargetBlank	: "Novo okno (_blank)",
+DlgLnkTargetParent	: "Starševsko okno (_parent)",
+DlgLnkTargetSelf	: "Isto okno (_self)",
+DlgLnkTargetTop		: "Najvišje okno (_top)",
+DlgLnkTargetFrameName	: "Ime ciljnega okvirja",
+DlgLnkPopWinName	: "Ime pojavnega okna",
+DlgLnkPopWinFeat	: "Značilnosti pojavnega okna",
+DlgLnkPopResize		: "Spremenljive velikosti",
+DlgLnkPopLocation	: "Naslovna vrstica",
+DlgLnkPopMenu		: "Menijska vrstica",
+DlgLnkPopScroll		: "Drsniki",
+DlgLnkPopStatus		: "Vrstica stanja",
+DlgLnkPopToolbar	: "Orodna vrstica",
+DlgLnkPopFullScrn	: "Celozaslonska slika (IE)",
+DlgLnkPopDependent	: "Podokno (Netscape)",
+DlgLnkPopWidth		: "Širina",
+DlgLnkPopHeight		: "Višina",
+DlgLnkPopLeft		: "Lega levo",
+DlgLnkPopTop		: "Lega na vrhu",
+
+DlnLnkMsgNoUrl		: "Vnesite URL povezave",
+DlnLnkMsgNoEMail	: "Vnesite elektronski naslov",
+DlnLnkMsgNoAnchor	: "Izberite zaznamek",
+DlnLnkMsgInvPopName	: "Ime pojavnega okna se mora začeti s črko ali številko in ne sme vsebovati presledkov",
+
+// Color Dialog
+DlgColorTitle		: "Izberite barvo",
+DlgColorBtnClear	: "Počisti",
+DlgColorHighlight	: "Označi",
+DlgColorSelected	: "Izbrano",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Vstavi smeška",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Izberi posebni znak",
+
+// Table Dialog
+DlgTableTitle		: "Lastnosti tabele",
+DlgTableRows		: "Vrstice",
+DlgTableColumns		: "Stolpci",
+DlgTableBorder		: "Velikost obrobe",
+DlgTableAlign		: "Poravnava",
+DlgTableAlignNotSet	: "<Ni nastavljeno>",
+DlgTableAlignLeft	: "Levo",
+DlgTableAlignCenter	: "Sredinsko",
+DlgTableAlignRight	: "Desno",
+DlgTableWidth		: "Širina",
+DlgTableWidthPx		: "pik",
+DlgTableWidthPc		: "procentov",
+DlgTableHeight		: "Višina",
+DlgTableCellSpace	: "Razmik med celicami",
+DlgTableCellPad		: "Polnilo med celicami",
+DlgTableCaption		: "Naslov",
+DlgTableSummary		: "Povzetek",
+
+// Table Cell Dialog
+DlgCellTitle		: "Lastnosti celice",
+DlgCellWidth		: "Širina",
+DlgCellWidthPx		: "pik",
+DlgCellWidthPc		: "procentov",
+DlgCellHeight		: "Višina",
+DlgCellWordWrap		: "Pomikanje besedila",
+DlgCellWordWrapNotSet	: "<Ni nastavljeno>",
+DlgCellWordWrapYes	: "Da",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Vodoravna poravnava",
+DlgCellHorAlignNotSet	: "<Ni nastavljeno>",
+DlgCellHorAlignLeft	: "Levo",
+DlgCellHorAlignCenter	: "Sredinsko",
+DlgCellHorAlignRight: "Desno",
+DlgCellVerAlign		: "Navpična poravnava",
+DlgCellVerAlignNotSet	: "<Ni nastavljeno>",
+DlgCellVerAlignTop	: "Na vrh",
+DlgCellVerAlignMiddle	: "V sredino",
+DlgCellVerAlignBottom	: "Na dno",
+DlgCellVerAlignBaseline	: "Na osnovno črto",
+DlgCellRowSpan		: "Spojenih vrstic (row-span)",
+DlgCellCollSpan		: "Spojenih stolpcev (col-span)",
+DlgCellBackColor	: "Barva ozadja",
+DlgCellBorderColor	: "Barva obrobe",
+DlgCellBtnSelect	: "Izberi...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Najdi in zamenjaj",
+
+// Find Dialog
+DlgFindTitle		: "Najdi",
+DlgFindFindBtn		: "Najdi",
+DlgFindNotFoundMsg	: "Navedeno besedilo ni bilo najdeno.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Zamenjaj",
+DlgReplaceFindLbl		: "Najdi:",
+DlgReplaceReplaceLbl	: "Zamenjaj z:",
+DlgReplaceCaseChk		: "Razlikuj velike in male črke",
+DlgReplaceReplaceBtn	: "Zamenjaj",
+DlgReplaceReplAllBtn	: "Zamenjaj vse",
+DlgReplaceWordChk		: "Samo cele besede",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl+X).",
+PasteErrorCopy	: "Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl+C).",
+
+PasteAsText		: "Prilepi kot golo besedilo",
+PasteFromWord	: "Prilepi iz Worda",
+
+DlgPasteMsg2	: "Prosim prilepite v sleči okvir s pomočjo tipkovnice (<STRONG>Ctrl+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.",
+DlgPasteSec		: "Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.",
+DlgPasteIgnoreFont		: "Prezri obliko pisave",
+DlgPasteRemoveStyles	: "Odstrani nastavitve stila",
+
+// Color Picker
+ColorAutomatic	: "Samodejno",
+ColorMoreColors	: "Več barv...",
+
+// Document Properties
+DocProps		: "Lastnosti dokumenta",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Lastnosti zaznamka",
+DlgAnchorName		: "Ime zaznamka",
+DlgAnchorErrorName	: "Prosim vnesite ime zaznamka",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Ni v slovarju",
+DlgSpellChangeTo		: "Spremeni v",
+DlgSpellBtnIgnore		: "Prezri",
+DlgSpellBtnIgnoreAll	: "Prezri vse",
+DlgSpellBtnReplace		: "Zamenjaj",
+DlgSpellBtnReplaceAll	: "Zamenjaj vse",
+DlgSpellBtnUndo			: "Razveljavi",
+DlgSpellNoSuggestions	: "- Ni predlogov -",
+DlgSpellProgress		: "Preverjanje črkovanja se izvaja...",
+DlgSpellNoMispell		: "Črkovanje je končano: Brez napak",
+DlgSpellNoChanges		: "Črkovanje je končano: Nobena beseda ni bila spremenjena",
+DlgSpellOneChange		: "Črkovanje je končano: Spremenjena je bila ena beseda",
+DlgSpellManyChanges		: "Črkovanje je končano: Spremenjenih je bilo %1 besed",
+
+IeSpellDownload			: "Črkovalnik ni nameščen. Ali ga želite prenesti sedaj?",
+
+// Button Dialog
+DlgButtonText		: "Besedilo (Vrednost)",
+DlgButtonType		: "Tip",
+DlgButtonTypeBtn	: "Gumb",
+DlgButtonTypeSbm	: "Potrdi",
+DlgButtonTypeRst	: "Ponastavi",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Ime",
+DlgCheckboxValue	: "Vrednost",
+DlgCheckboxSelected	: "Izbrano",
+
+// Form Dialog
+DlgFormName		: "Ime",
+DlgFormAction	: "Akcija",
+DlgFormMethod	: "Metoda",
+
+// Select Field Dialog
+DlgSelectName		: "Ime",
+DlgSelectValue		: "Vrednost",
+DlgSelectSize		: "Velikost",
+DlgSelectLines		: "vrstic",
+DlgSelectChkMulti	: "Dovoli izbor večih vrstic",
+DlgSelectOpAvail	: "Razpoložljive izbire",
+DlgSelectOpText		: "Besedilo",
+DlgSelectOpValue	: "Vrednost",
+DlgSelectBtnAdd		: "Dodaj",
+DlgSelectBtnModify	: "Spremeni",
+DlgSelectBtnUp		: "Gor",
+DlgSelectBtnDown	: "Dol",
+DlgSelectBtnSetValue : "Postavi kot privzeto izbiro",
+DlgSelectBtnDelete	: "Izbriši",
+
+// Textarea Dialog
+DlgTextareaName	: "Ime",
+DlgTextareaCols	: "Stolpcev",
+DlgTextareaRows	: "Vrstic",
+
+// Text Field Dialog
+DlgTextName			: "Ime",
+DlgTextValue		: "Vrednost",
+DlgTextCharWidth	: "Dolžina",
+DlgTextMaxChars		: "Največje število znakov",
+DlgTextType			: "Tip",
+DlgTextTypeText		: "Besedilo",
+DlgTextTypePass		: "Geslo",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Ime",
+DlgHiddenValue	: "Vrednost",
+
+// Bulleted List Dialog
+BulletedListProp	: "Lastnosti označenega seznama",
+NumberedListProp	: "Lastnosti oštevilčenega seznama",
+DlgLstStart			: "Začetek",
+DlgLstType			: "Tip",
+DlgLstTypeCircle	: "Pikica",
+DlgLstTypeDisc		: "Kroglica",
+DlgLstTypeSquare	: "Kvadratek",
+DlgLstTypeNumbers	: "Številke (1, 2, 3)",
+DlgLstTypeLCase		: "Male črke (a, b, c)",
+DlgLstTypeUCase		: "Velike črke (A, B, C)",
+DlgLstTypeSRoman	: "Male rimske številke (i, ii, iii)",
+DlgLstTypeLRoman	: "Velike rimske številke (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Splošno",
+DlgDocBackTab		: "Ozadje",
+DlgDocColorsTab		: "Barve in zamiki",
+DlgDocMetaTab		: "Meta podatki",
+
+DlgDocPageTitle		: "Naslov strani",
+DlgDocLangDir		: "Smer jezika",
+DlgDocLangDirLTR	: "Od leve proti desni (LTR)",
+DlgDocLangDirRTL	: "Od desne proti levi (RTL)",
+DlgDocLangCode		: "Oznaka jezika",
+DlgDocCharSet		: "Kodna tabela",
+DlgDocCharSetCE		: "Srednjeevropsko",
+DlgDocCharSetCT		: "Tradicionalno Kitajsko (Big5)",
+DlgDocCharSetCR		: "Cirilica",
+DlgDocCharSetGR		: "Grško",
+DlgDocCharSetJP		: "Japonsko",
+DlgDocCharSetKR		: "Korejsko",
+DlgDocCharSetTR		: "Turško",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Zahodnoevropsko",
+DlgDocCharSetOther	: "Druga kodna tabela",
+
+DlgDocDocType		: "Glava tipa dokumenta",
+DlgDocDocTypeOther	: "Druga glava tipa dokumenta",
+DlgDocIncXHTML		: "Vstavi XHTML deklaracije",
+DlgDocBgColor		: "Barva ozadja",
+DlgDocBgImage		: "URL slike za ozadje",
+DlgDocBgNoScroll	: "Nepremično ozadje",
+DlgDocCText			: "Besedilo",
+DlgDocCLink			: "Povezava",
+DlgDocCVisited		: "Obiskana povezava",
+DlgDocCActive		: "Aktivna povezava",
+DlgDocMargins		: "Zamiki strani",
+DlgDocMaTop			: "Na vrhu",
+DlgDocMaLeft		: "Levo",
+DlgDocMaRight		: "Desno",
+DlgDocMaBottom		: "Spodaj",
+DlgDocMeIndex		: "Ključne besede (ločene z vejicami)",
+DlgDocMeDescr		: "Opis strani",
+DlgDocMeAuthor		: "Avtor",
+DlgDocMeCopy		: "Avtorske pravice",
+DlgDocPreview		: "Predogled",
+
+// Templates Dialog
+Templates			: "Predloge",
+DlgTemplatesTitle	: "Vsebinske predloge",
+DlgTemplatesSelMsg	: "Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):",
+DlgTemplatesLoading	: "Nalagam seznam predlog. Prosim počakajte...",
+DlgTemplatesNoTpl	: "(Ni pripravljenih predlog)",
+DlgTemplatesReplace	: "Zamenjaj trenutno vsebino",
+
+// About Dialog
+DlgAboutAboutTab	: "Vizitka",
+DlgAboutBrowserInfoTab	: "Informacije o brskalniku",
+DlgAboutLicenseTab	: "Dovoljenja",
+DlgAboutVersion		: "različica",
+DlgAboutInfo		: "Za več informacij obiščite",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/sr-latn.js b/modules/editor/skins/fckeditor/editor/lang/sr-latn.js
new file mode 100644
index 000000000..a5ccb9edb
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/sr-latn.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Serbian (Latin) language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Smanji liniju sa alatkama",
+ToolbarExpand		: "Proiri liniju sa alatkama",
+
+// Toolbar Items and Context Menu
+Save				: "Sačuvaj",
+NewPage				: "Nova stranica",
+Preview				: "Izgled stranice",
+Cut					: "Iseci",
+Copy				: "Kopiraj",
+Paste				: "Zalepi",
+PasteText			: "Zalepi kao neformatiran tekst",
+PasteWord			: "Zalepi iz Worda",
+Print				: "Štampa",
+SelectAll			: "Označi sve",
+RemoveFormat		: "Ukloni formatiranje",
+InsertLinkLbl		: "Link",
+InsertLink			: "Unesi/izmeni link",
+RemoveLink			: "Ukloni link",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Unesi/izmeni sidro",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Slika",
+InsertImage			: "Unesi/izmeni sliku",
+InsertFlashLbl		: "Fleš",
+InsertFlash			: "Unesi/izmeni fleš",
+InsertTableLbl		: "Tabela",
+InsertTable			: "Unesi/izmeni tabelu",
+InsertLineLbl		: "Linija",
+InsertLine			: "Unesi horizontalnu liniju",
+InsertSpecialCharLbl: "Specijalni karakteri",
+InsertSpecialChar	: "Unesi specijalni karakter",
+InsertSmileyLbl		: "Smajli",
+InsertSmiley		: "Unesi smajlija",
+About				: "O FCKeditoru",
+Bold				: "Podebljano",
+Italic				: "Kurziv",
+Underline			: "Podvučeno",
+StrikeThrough		: "Precrtano",
+Subscript			: "Indeks",
+Superscript			: "Stepen",
+LeftJustify			: "Levo ravnanje",
+CenterJustify		: "Centriran tekst",
+RightJustify		: "Desno ravnanje",
+BlockJustify		: "Obostrano ravnanje",
+DecreaseIndent		: "Smanji levu marginu",
+IncreaseIndent		: "Uvećaj levu marginu",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Poni�ti akciju",
+Redo				: "Ponovi akciju",
+NumberedListLbl		: "Nabrojiva lista",
+NumberedList		: "Unesi/ukloni nabrojivu listu",
+BulletedListLbl		: "Nenabrojiva lista",
+BulletedList		: "Unesi/ukloni nenabrojivu listu",
+ShowTableBorders	: "Prikaži okvir tabele",
+ShowDetails			: "Prikaži detalje",
+Style				: "Stil",
+FontFormat			: "Format",
+Font				: "Font",
+FontSize			: "Veličina fonta",
+TextColor			: "Boja teksta",
+BGColor				: "Boja pozadine",
+Source				: "Kôd",
+Find				: "Pretraga",
+Replace				: "Zamena",
+SpellCheck			: "Proveri spelovanje",
+UniversalKeyboard	: "Univerzalna tastatura",
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "Forma",
+Checkbox		: "Polje za potvrdu",
+RadioButton		: "Radio-dugme",
+TextField		: "Tekstualno polje",
+Textarea		: "Zona teksta",
+HiddenField		: "Skriveno polje",
+Button			: "Dugme",
+SelectionField	: "Izborno polje",
+ImageButton		: "Dugme sa slikom",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Izmeni link",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Obriši redove",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Obriši kolone",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Obriši ćelije",
+MergeCells			: "Spoj celije",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Delete Table",	//MISSING
+CellProperties		: "Osobine celije",
+TableProperties		: "Osobine tabele",
+ImageProperties		: "Osobine slike",
+FlashProperties		: "Osobine fleša",
+
+AnchorProp			: "Osobine sidra",
+ButtonProp			: "Osobine dugmeta",
+CheckboxProp		: "Osobine polja za potvrdu",
+HiddenFieldProp		: "Osobine skrivenog polja",
+RadioButtonProp		: "Osobine radio-dugmeta",
+ImageButtonProp		: "Osobine dugmeta sa slikom",
+TextFieldProp		: "Osobine tekstualnog polja",
+SelectionFieldProp	: "Osobine izbornog polja",
+TextareaProp		: "Osobine zone teksta",
+FormProp			: "Osobine forme",
+
+FontFormats			: "Normal;Formatirano;Adresa;Naslov 1;Naslov 2;Naslov 3;Naslov 4;Naslov 5;Naslov 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Obradujem XHTML. Malo strpljenja...",
+Done				: "Završio",
+PasteWordConfirm	: "Tekst koji želite da nalepite kopiran je iz Worda. Da li želite da bude očišćen od formata pre lepljenja?",
+NotCompatiblePaste	: "Ova komanda je dostupna samo za Internet Explorer od verzije 5.5. Da li želite da nalepim tekst bez čišćenja?",
+UnknownToolbarItem	: "Nepoznata stavka toolbara \"%1\"",
+UnknownCommand		: "Nepoznata naredba \"%1\"",
+NotImplemented		: "Naredba nije implementirana",
+UnknownToolbarSet	: "Toolbar \"%1\" ne postoji",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Otkaži",
+DlgBtnClose			: "Zatvori",
+DlgBtnBrowseServer	: "Pretraži server",
+DlgAdvancedTag		: "Napredni tagovi",
+DlgOpOther			: "<Ostali>",
+DlgInfoTab			: "Info",
+DlgAlertUrl			: "Molimo Vas, unesite URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<nije postavljeno>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Smer jezika",
+DlgGenLangDirLtr	: "S leva na desno (LTR)",
+DlgGenLangDirRtl	: "S desna na levo (RTL)",
+DlgGenLangCode		: "Kôd jezika",
+DlgGenAccessKey		: "Pristupni taster",
+DlgGenName			: "Naziv",
+DlgGenTabIndex		: "Tab indeks",
+DlgGenLongDescr		: "Pun opis URL",
+DlgGenClass			: "Stylesheet klase",
+DlgGenTitle			: "Advisory naslov",
+DlgGenContType		: "Advisory vrsta sadržaja",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Stil",
+
+// Image Dialog
+DlgImgTitle			: "Osobine slika",
+DlgImgInfoTab		: "Info slike",
+DlgImgBtnUpload		: "Pošalji na server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Pošalji",
+DlgImgAlt			: "Alternativni tekst",
+DlgImgWidth			: "Širina",
+DlgImgHeight		: "Visina",
+DlgImgLockRatio		: "Zaključaj odnos",
+DlgBtnResetSize		: "Resetuj veličinu",
+DlgImgBorder		: "Okvir",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Ravnanje",
+DlgImgAlignLeft		: "Levo",
+DlgImgAlignAbsBottom: "Abs dole",
+DlgImgAlignAbsMiddle: "Abs sredina",
+DlgImgAlignBaseline	: "Bazno",
+DlgImgAlignBottom	: "Dole",
+DlgImgAlignMiddle	: "Sredina",
+DlgImgAlignRight	: "Desno",
+DlgImgAlignTextTop	: "Vrh teksta",
+DlgImgAlignTop		: "Vrh",
+DlgImgPreview		: "Izgled",
+DlgImgAlertUrl		: "Unesite URL slike",
+DlgImgLinkTab		: "Link",
+
+// Flash Dialog
+DlgFlashTitle		: "Osobine fleša",
+DlgFlashChkPlay		: "Automatski start",
+DlgFlashChkLoop		: "Ponavljaj",
+DlgFlashChkMenu		: "Uključi fleš meni",
+DlgFlashScale		: "Skaliraj",
+DlgFlashScaleAll	: "Prikaži sve",
+DlgFlashScaleNoBorder	: "Bez ivice",
+DlgFlashScaleFit	: "Popuni površinu",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Link",
+DlgLnkInfoTab		: "Link Info",
+DlgLnkTargetTab		: "Meta",
+
+DlgLnkType			: "Vrsta linka",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Sidro na ovoj stranici",
+DlgLnkTypeEMail		: "E-Mail",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<drugo>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Odaberi sidro",
+DlgLnkAnchorByName	: "Po nazivu sidra",
+DlgLnkAnchorById	: "Po Id-ju elementa",
+DlgLnkNoAnchors		: "(Nema dostupnih sidra)",
+DlgLnkEMail			: "E-Mail adresa",
+DlgLnkEMailSubject	: "Naslov",
+DlgLnkEMailBody		: "Sadržaj poruke",
+DlgLnkUpload		: "Pošalji",
+DlgLnkBtnUpload		: "Pošalji na server",
+
+DlgLnkTarget		: "Meta",
+DlgLnkTargetFrame	: "<okvir>",
+DlgLnkTargetPopup	: "<popup prozor>",
+DlgLnkTargetBlank	: "Novi prozor (_blank)",
+DlgLnkTargetParent	: "Roditeljski prozor (_parent)",
+DlgLnkTargetSelf	: "Isti prozor (_self)",
+DlgLnkTargetTop		: "Prozor na vrhu (_top)",
+DlgLnkTargetFrameName	: "Naziv odredišnog frejma",
+DlgLnkPopWinName	: "Naziv popup prozora",
+DlgLnkPopWinFeat	: "Mogućnosti popup prozora",
+DlgLnkPopResize		: "Promenljiva velicina",
+DlgLnkPopLocation	: "Lokacija",
+DlgLnkPopMenu		: "Kontekstni meni",
+DlgLnkPopScroll		: "Scroll bar",
+DlgLnkPopStatus		: "Statusna linija",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Prikaz preko celog ekrana (IE)",
+DlgLnkPopDependent	: "Zavisno (Netscape)",
+DlgLnkPopWidth		: "Širina",
+DlgLnkPopHeight		: "Visina",
+DlgLnkPopLeft		: "Od leve ivice ekrana (px)",
+DlgLnkPopTop		: "Od vrha ekrana (px)",
+
+DlnLnkMsgNoUrl		: "Unesite URL linka",
+DlnLnkMsgNoEMail	: "Otkucajte adresu elektronske pote",
+DlnLnkMsgNoAnchor	: "Odaberite sidro",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Odaberite boju",
+DlgColorBtnClear	: "Obriši",
+DlgColorHighlight	: "Posvetli",
+DlgColorSelected	: "Odaberi",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Unesi smajlija",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Odaberite specijalni karakter",
+
+// Table Dialog
+DlgTableTitle		: "Osobine tabele",
+DlgTableRows		: "Redova",
+DlgTableColumns		: "Kolona",
+DlgTableBorder		: "Veličina okvira",
+DlgTableAlign		: "Ravnanje",
+DlgTableAlignNotSet	: "<nije postavljeno>",
+DlgTableAlignLeft	: "Levo",
+DlgTableAlignCenter	: "Sredina",
+DlgTableAlignRight	: "Desno",
+DlgTableWidth		: "Širina",
+DlgTableWidthPx		: "piksela",
+DlgTableWidthPc		: "procenata",
+DlgTableHeight		: "Visina",
+DlgTableCellSpace	: "Ćelijski prostor",
+DlgTableCellPad		: "Razmak ćelija",
+DlgTableCaption		: "Naslov tabele",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "Osobine ćelije",
+DlgCellWidth		: "Širina",
+DlgCellWidthPx		: "piksela",
+DlgCellWidthPc		: "procenata",
+DlgCellHeight		: "Visina",
+DlgCellWordWrap		: "Deljenje reči",
+DlgCellWordWrapNotSet	: "<nije postavljeno>",
+DlgCellWordWrapYes	: "Da",
+DlgCellWordWrapNo	: "Ne",
+DlgCellHorAlign		: "Vodoravno ravnanje",
+DlgCellHorAlignNotSet	: "<nije postavljeno>",
+DlgCellHorAlignLeft	: "Levo",
+DlgCellHorAlignCenter	: "Sredina",
+DlgCellHorAlignRight: "Desno",
+DlgCellVerAlign		: "Vertikalno ravnanje",
+DlgCellVerAlignNotSet	: "<nije postavljeno>",
+DlgCellVerAlignTop	: "Gornje",
+DlgCellVerAlignMiddle	: "Sredina",
+DlgCellVerAlignBottom	: "Donje",
+DlgCellVerAlignBaseline	: "Bazno",
+DlgCellRowSpan		: "Spajanje redova",
+DlgCellCollSpan		: "Spajanje kolona",
+DlgCellBackColor	: "Boja pozadine",
+DlgCellBorderColor	: "Boja okvira",
+DlgCellBtnSelect	: "Odaberi...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Pronađi",
+DlgFindFindBtn		: "Pronađi",
+DlgFindNotFoundMsg	: "Traženi tekst nije pronađen.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Zameni",
+DlgReplaceFindLbl		: "Pronadi:",
+DlgReplaceReplaceLbl	: "Zameni sa:",
+DlgReplaceCaseChk		: "Razlikuj mala i velika slova",
+DlgReplaceReplaceBtn	: "Zameni",
+DlgReplaceReplAllBtn	: "Zameni sve",
+DlgReplaceWordChk		: "Uporedi cele reci",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl+X).",
+PasteErrorCopy	: "Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl+C).",
+
+PasteAsText		: "Zalepi kao čist tekst",
+PasteFromWord	: "Zalepi iz Worda",
+
+DlgPasteMsg2	: "Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Ignoriši definicije fontova",
+DlgPasteRemoveStyles	: "Ukloni definicije stilova",
+
+// Color Picker
+ColorAutomatic	: "Automatski",
+ColorMoreColors	: "Više boja...",
+
+// Document Properties
+DocProps		: "Osobine dokumenta",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Osobine sidra",
+DlgAnchorName		: "Ime sidra",
+DlgAnchorErrorName	: "Unesite ime sidra",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Nije u rečniku",
+DlgSpellChangeTo		: "Izmeni",
+DlgSpellBtnIgnore		: "Ignoriši",
+DlgSpellBtnIgnoreAll	: "Ignoriši sve",
+DlgSpellBtnReplace		: "Zameni",
+DlgSpellBtnReplaceAll	: "Zameni sve",
+DlgSpellBtnUndo			: "Vrati akciju",
+DlgSpellNoSuggestions	: "- Bez sugestija -",
+DlgSpellProgress		: "Provera spelovanja u toku...",
+DlgSpellNoMispell		: "Provera spelovanja završena: greške nisu pronadene",
+DlgSpellNoChanges		: "Provera spelovanja završena: Nije izmenjena nijedna rec",
+DlgSpellOneChange		: "Provera spelovanja završena: Izmenjena je jedna reč",
+DlgSpellManyChanges		: "Provera spelovanja završena: %1 reč(i) je izmenjeno",
+
+IeSpellDownload			: "Provera spelovanja nije instalirana. Da li želite da je skinete sa Interneta?",
+
+// Button Dialog
+DlgButtonText		: "Tekst (vrednost)",
+DlgButtonType		: "Tip",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Naziv",
+DlgCheckboxValue	: "Vrednost",
+DlgCheckboxSelected	: "Označeno",
+
+// Form Dialog
+DlgFormName		: "Naziv",
+DlgFormAction	: "Akcija",
+DlgFormMethod	: "Metoda",
+
+// Select Field Dialog
+DlgSelectName		: "Naziv",
+DlgSelectValue		: "Vrednost",
+DlgSelectSize		: "Veličina",
+DlgSelectLines		: "linija",
+DlgSelectChkMulti	: "Dozvoli višestruku selekciju",
+DlgSelectOpAvail	: "Dostupne opcije",
+DlgSelectOpText		: "Tekst",
+DlgSelectOpValue	: "Vrednost",
+DlgSelectBtnAdd		: "Dodaj",
+DlgSelectBtnModify	: "Izmeni",
+DlgSelectBtnUp		: "Gore",
+DlgSelectBtnDown	: "Dole",
+DlgSelectBtnSetValue : "Podesi kao označenu vrednost",
+DlgSelectBtnDelete	: "Obriši",
+
+// Textarea Dialog
+DlgTextareaName	: "Naziv",
+DlgTextareaCols	: "Broj kolona",
+DlgTextareaRows	: "Broj redova",
+
+// Text Field Dialog
+DlgTextName			: "Naziv",
+DlgTextValue		: "Vrednost",
+DlgTextCharWidth	: "Širina (karaktera)",
+DlgTextMaxChars		: "Maksimalno karaktera",
+DlgTextType			: "Tip",
+DlgTextTypeText		: "Tekst",
+DlgTextTypePass		: "Lozinka",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Naziv",
+DlgHiddenValue	: "Vrednost",
+
+// Bulleted List Dialog
+BulletedListProp	: "Osobine nenabrojive liste",
+NumberedListProp	: "Osobine nabrojive liste",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Tip",
+DlgLstTypeCircle	: "Krug",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "Kvadrat",
+DlgLstTypeNumbers	: "Brojevi (1, 2, 3)",
+DlgLstTypeLCase		: "mala slova (a, b, c)",
+DlgLstTypeUCase		: "VELIKA slova (A, B, C)",
+DlgLstTypeSRoman	: "Male rimske cifre (i, ii, iii)",
+DlgLstTypeLRoman	: "Velike rimske cifre (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Opšte osobine",
+DlgDocBackTab		: "Pozadina",
+DlgDocColorsTab		: "Boje i margine",
+DlgDocMetaTab		: "Metapodaci",
+
+DlgDocPageTitle		: "Naslov stranice",
+DlgDocLangDir		: "Smer jezika",
+DlgDocLangDirLTR	: "Sleva nadesno (LTR)",
+DlgDocLangDirRTL	: "Zdesna nalevo (RTL)",
+DlgDocLangCode		: "Šifra jezika",
+DlgDocCharSet		: "Kodiranje skupa karaktera",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Ostala kodiranja skupa karaktera",
+
+DlgDocDocType		: "Zaglavlje tipa dokumenta",
+DlgDocDocTypeOther	: "Ostala zaglavlja tipa dokumenta",
+DlgDocIncXHTML		: "Ukljuci XHTML deklaracije",
+DlgDocBgColor		: "Boja pozadine",
+DlgDocBgImage		: "URL pozadinske slike",
+DlgDocBgNoScroll	: "Fiksirana pozadina",
+DlgDocCText			: "Tekst",
+DlgDocCLink			: "Link",
+DlgDocCVisited		: "Posećeni link",
+DlgDocCActive		: "Aktivni link",
+DlgDocMargins		: "Margine stranice",
+DlgDocMaTop			: "Gornja",
+DlgDocMaLeft		: "Leva",
+DlgDocMaRight		: "Desna",
+DlgDocMaBottom		: "Donja",
+DlgDocMeIndex		: "Ključne reci za indeksiranje dokumenta (razdvojene zarezima)",
+DlgDocMeDescr		: "Opis dokumenta",
+DlgDocMeAuthor		: "Autor",
+DlgDocMeCopy		: "Autorska prava",
+DlgDocPreview		: "Izgled stranice",
+
+// Templates Dialog
+Templates			: "Obrasci",
+DlgTemplatesTitle	: "Obrasci za sadržaj",
+DlgTemplatesSelMsg	: "Molimo Vas da odaberete obrazac koji ce biti primenjen na stranicu (trenutni sadržaj ce biti obrisan):",
+DlgTemplatesLoading	: "Učitavam listu obrazaca. Malo strpljenja...",
+DlgTemplatesNoTpl	: "(Nema definisanih obrazaca)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "O editoru",
+DlgAboutBrowserInfoTab	: "Informacije o pretraživacu",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "verzija",
+DlgAboutInfo		: "Za više informacija posetite",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/sr.js b/modules/editor/skins/fckeditor/editor/lang/sr.js
new file mode 100644
index 000000000..2aea3d32f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/sr.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Serbian (Cyrillic) language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Смањи линију са алаткама",
+ToolbarExpand		: "Прошири линију са алаткама",
+
+// Toolbar Items and Context Menu
+Save				: "Сачувај",
+NewPage				: "Нова страница",
+Preview				: "Изглед странице",
+Cut					: "Исеци",
+Copy				: "Копирај",
+Paste				: "Залепи",
+PasteText			: "Залепи као неформатиран текст",
+PasteWord			: "Залепи из Worda",
+Print				: "Штампа",
+SelectAll			: "Означи све",
+RemoveFormat		: "Уклони форматирање",
+InsertLinkLbl		: "Линк",
+InsertLink			: "Унеси/измени линк",
+RemoveLink			: "Уклони линк",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Унеси/измени сидро",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Слика",
+InsertImage			: "Унеси/измени слику",
+InsertFlashLbl		: "Флеш елемент",
+InsertFlash			: "Унеси/измени флеш",
+InsertTableLbl		: "Табела",
+InsertTable			: "Унеси/измени табелу",
+InsertLineLbl		: "Линија",
+InsertLine			: "Унеси хоризонталну линију",
+InsertSpecialCharLbl: "Специјални карактери",
+InsertSpecialChar	: "Унеси специјални карактер",
+InsertSmileyLbl		: "Смајли",
+InsertSmiley		: "Унеси смајлија",
+About				: "О ФЦКедитору",
+Bold				: "Подебљано",
+Italic				: "Курзив",
+Underline			: "Подвучено",
+StrikeThrough		: "Прецртано",
+Subscript			: "Индекс",
+Superscript			: "Степен",
+LeftJustify			: "Лево равнање",
+CenterJustify		: "Центриран текст",
+RightJustify		: "Десно равнање",
+BlockJustify		: "Обострано равнање",
+DecreaseIndent		: "Смањи леву маргину",
+IncreaseIndent		: "Увећај леву маргину",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Поништи акцију",
+Redo				: "Понови акцију",
+NumberedListLbl		: "Набројиву листу",
+NumberedList		: "Унеси/уклони набројиву листу",
+BulletedListLbl		: "Ненабројива листа",
+BulletedList		: "Унеси/уклони ненабројиву листу",
+ShowTableBorders	: "Прикажи оквир табеле",
+ShowDetails			: "Прикажи детаље",
+Style				: "Стил",
+FontFormat			: "Формат",
+Font				: "Фонт",
+FontSize			: "Величина фонта",
+TextColor			: "Боја текста",
+BGColor				: "Боја позадине",
+Source				: "Kôд",
+Find				: "Претрага",
+Replace				: "Замена",
+SpellCheck			: "Провери спеловање",
+UniversalKeyboard	: "Универзална тастатура",
+PageBreakLbl		: "Page Break",	//MISSING
+PageBreak			: "Insert Page Break",	//MISSING
+
+Form			: "Форма",
+Checkbox		: "Поље за потврду",
+RadioButton		: "Радио-дугме",
+TextField		: "Текстуално поље",
+Textarea		: "Зона текста",
+HiddenField		: "Скривено поље",
+Button			: "Дугме",
+SelectionField	: "Изборно поље",
+ImageButton		: "Дугме са сликом",
+
+FitWindow		: "Maximize the editor size",	//MISSING
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Промени линк",
+CellCM				: "Cell",	//MISSING
+RowCM				: "Row",	//MISSING
+ColumnCM			: "Column",	//MISSING
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Обриши редове",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Обриши колоне",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Обриши ћелије",
+MergeCells			: "Спој ћелије",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Delete Table",	//MISSING
+CellProperties		: "Особине ћелије",
+TableProperties		: "Особине табеле",
+ImageProperties		: "Особине слике",
+FlashProperties		: "Особине Флеша",
+
+AnchorProp			: "Особине сидра",
+ButtonProp			: "Особине дугмета",
+CheckboxProp		: "Особине поља за потврду",
+HiddenFieldProp		: "Особине скривеног поља",
+RadioButtonProp		: "Особине радио-дугмета",
+ImageButtonProp		: "Особине дугмета са сликом",
+TextFieldProp		: "Особине текстуалног поља",
+SelectionFieldProp	: "Особине изборног поља",
+TextareaProp		: "Особине зоне текста",
+FormProp			: "Особине форме",
+
+FontFormats			: "Normal;Formatirano;Adresa;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6",
+
+// Alerts and Messages
+ProcessingXHTML		: "Обрађујем XHTML. Maлo стрпљења...",
+Done				: "Завршио",
+PasteWordConfirm	: "Текст који желите да налепите копиран је из Worda. Да ли желите да буде очишћен од формата пре лепљења?",
+NotCompatiblePaste	: "Ова команда је доступна само за Интернет Екплорер од верзије 5.5. Да ли желите да налепим текст без чишћења?",
+UnknownToolbarItem	: "Непозната ставка toolbara \"%1\"",
+UnknownCommand		: "Непозната наредба \"%1\"",
+NotImplemented		: "Наредба није имплементирана",
+UnknownToolbarSet	: "Toolbar \"%1\" не постоји",
+NoActiveX			: "Your browser's security settings could limit some features of the editor. You must enable the option \"Run ActiveX controls and plug-ins\". You may experience errors and notice missing features.",	//MISSING
+BrowseServerBlocked : "The resources browser could not be opened. Make sure that all popup blockers are disabled.",	//MISSING
+DialogBlocked		: "It was not possible to open the dialog window. Make sure all popup blockers are disabled.",	//MISSING
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Oткажи",
+DlgBtnClose			: "Затвори",
+DlgBtnBrowseServer	: "Претражи сервер",
+DlgAdvancedTag		: "Напредни тагови",
+DlgOpOther			: "<Остали>",
+DlgInfoTab			: "Инфо",
+DlgAlertUrl			: "Молимо Вас, унесите УРЛ",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<није постављено>",
+DlgGenId			: "Ид",
+DlgGenLangDir		: "Смер језика",
+DlgGenLangDirLtr	: "С лева на десно (LTR)",
+DlgGenLangDirRtl	: "С десна на лево (RTL)",
+DlgGenLangCode		: "Kôд језика",
+DlgGenAccessKey		: "Приступни тастер",
+DlgGenName			: "Назив",
+DlgGenTabIndex		: "Таб индекс",
+DlgGenLongDescr		: "Пун опис УРЛ",
+DlgGenClass			: "Stylesheet класе",
+DlgGenTitle			: "Advisory наслов",
+DlgGenContType		: "Advisory врста садржаја",
+DlgGenLinkCharset	: "Linked Resource Charset",
+DlgGenStyle			: "Стил",
+
+// Image Dialog
+DlgImgTitle			: "Особине слика",
+DlgImgInfoTab		: "Инфо слике",
+DlgImgBtnUpload		: "Пошаљи на сервер",
+DlgImgURL			: "УРЛ",
+DlgImgUpload		: "Пошаљи",
+DlgImgAlt			: "Алтернативни текст",
+DlgImgWidth			: "Ширина",
+DlgImgHeight		: "Висина",
+DlgImgLockRatio		: "Закључај однос",
+DlgBtnResetSize		: "Ресетуј величину",
+DlgImgBorder		: "Оквир",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Равнање",
+DlgImgAlignLeft		: "Лево",
+DlgImgAlignAbsBottom: "Abs доле",
+DlgImgAlignAbsMiddle: "Abs средина",
+DlgImgAlignBaseline	: "Базно",
+DlgImgAlignBottom	: "Доле",
+DlgImgAlignMiddle	: "Средина",
+DlgImgAlignRight	: "Десно",
+DlgImgAlignTextTop	: "Врх текста",
+DlgImgAlignTop		: "Врх",
+DlgImgPreview		: "Изглед",
+DlgImgAlertUrl		: "Унесите УРЛ слике",
+DlgImgLinkTab		: "Линк",
+
+// Flash Dialog
+DlgFlashTitle		: "Особине флеша",
+DlgFlashChkPlay		: "Аутоматски старт",
+DlgFlashChkLoop		: "Понављај",
+DlgFlashChkMenu		: "Укључи флеш мени",
+DlgFlashScale		: "Скалирај",
+DlgFlashScaleAll	: "Прикажи све",
+DlgFlashScaleNoBorder	: "Без ивице",
+DlgFlashScaleFit	: "Попуни површину",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Линк",
+DlgLnkInfoTab		: "Линк инфо",
+DlgLnkTargetTab		: "Мета",
+
+DlgLnkType			: "Врста линка",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Сидро на овој страници",
+DlgLnkTypeEMail		: "Eлектронска пошта",
+DlgLnkProto			: "Протокол",
+DlgLnkProtoOther	: "<друго>",
+DlgLnkURL			: "УРЛ",
+DlgLnkAnchorSel		: "Одабери сидро",
+DlgLnkAnchorByName	: "По називу сидра",
+DlgLnkAnchorById	: "Пo Ид-jу елемента",
+DlgLnkNoAnchors		: "(Нема доступних сидра)",
+DlgLnkEMail			: "Адреса електронске поште",
+DlgLnkEMailSubject	: "Наслов",
+DlgLnkEMailBody		: "Садржај поруке",
+DlgLnkUpload		: "Пошаљи",
+DlgLnkBtnUpload		: "Пошаљи на сервер",
+
+DlgLnkTarget		: "Meтa",
+DlgLnkTargetFrame	: "<оквир>",
+DlgLnkTargetPopup	: "<искачући прозор>",
+DlgLnkTargetBlank	: "Нови прозор (_blank)",
+DlgLnkTargetParent	: "Родитељски прозор (_parent)",
+DlgLnkTargetSelf	: "Исти прозор (_self)",
+DlgLnkTargetTop		: "Прозор на врху (_top)",
+DlgLnkTargetFrameName	: "Назив одредишног фрејма",
+DlgLnkPopWinName	: "Назив искачућег прозора",
+DlgLnkPopWinFeat	: "Могућности искачућег прозора",
+DlgLnkPopResize		: "Променљива величина",
+DlgLnkPopLocation	: "Локација",
+DlgLnkPopMenu		: "Контекстни мени",
+DlgLnkPopScroll		: "Скрол бар",
+DlgLnkPopStatus		: "Статусна линија",
+DlgLnkPopToolbar	: "Toolbar",
+DlgLnkPopFullScrn	: "Приказ преко целог екрана (ИE)",
+DlgLnkPopDependent	: "Зависно (Netscape)",
+DlgLnkPopWidth		: "Ширина",
+DlgLnkPopHeight		: "Висина",
+DlgLnkPopLeft		: "Од леве ивице екрана (пиксела)",
+DlgLnkPopTop		: "Од врха екрана (пиксела)",
+
+DlnLnkMsgNoUrl		: "Унесите УРЛ линка",
+DlnLnkMsgNoEMail	: "Откуцајте адресу електронске поште",
+DlnLnkMsgNoAnchor	: "Одаберите сидро",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
+
+// Color Dialog
+DlgColorTitle		: "Одаберите боју",
+DlgColorBtnClear	: "Обриши",
+DlgColorHighlight	: "Посветли",
+DlgColorSelected	: "Одабери",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Унеси смајлија",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Одаберите специјални карактер",
+
+// Table Dialog
+DlgTableTitle		: "Особине табеле",
+DlgTableRows		: "Редова",
+DlgTableColumns		: "Kолона",
+DlgTableBorder		: "Величина оквира",
+DlgTableAlign		: "Равнање",
+DlgTableAlignNotSet	: "<није постављено>",
+DlgTableAlignLeft	: "Лево",
+DlgTableAlignCenter	: "Средина",
+DlgTableAlignRight	: "Десно",
+DlgTableWidth		: "Ширина",
+DlgTableWidthPx		: "пиксела",
+DlgTableWidthPc		: "процената",
+DlgTableHeight		: "Висина",
+DlgTableCellSpace	: "Ћелијски простор",
+DlgTableCellPad		: "Размак ћелија",
+DlgTableCaption		: "Наслов табеле",
+DlgTableSummary		: "Summary",	//MISSING
+
+// Table Cell Dialog
+DlgCellTitle		: "Особине ћелије",
+DlgCellWidth		: "Ширина",
+DlgCellWidthPx		: "пиксела",
+DlgCellWidthPc		: "процената",
+DlgCellHeight		: "Висина",
+DlgCellWordWrap		: "Дељење речи",
+DlgCellWordWrapNotSet	: "<није постављено>",
+DlgCellWordWrapYes	: "Да",
+DlgCellWordWrapNo	: "Не",
+DlgCellHorAlign		: "Водоравно равнање",
+DlgCellHorAlignNotSet	: "<није постављено>",
+DlgCellHorAlignLeft	: "Лево",
+DlgCellHorAlignCenter	: "Средина",
+DlgCellHorAlignRight: "Десно",
+DlgCellVerAlign		: "Вертикално равнање",
+DlgCellVerAlignNotSet	: "<није постављено>",
+DlgCellVerAlignTop	: "Горње",
+DlgCellVerAlignMiddle	: "Средина",
+DlgCellVerAlignBottom	: "Доње",
+DlgCellVerAlignBaseline	: "Базно",
+DlgCellRowSpan		: "Спајање редова",
+DlgCellCollSpan		: "Спајање колона",
+DlgCellBackColor	: "Боја позадине",
+DlgCellBorderColor	: "Боја оквира",
+DlgCellBtnSelect	: "Oдабери...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Пронађи",
+DlgFindFindBtn		: "Пронађи",
+DlgFindNotFoundMsg	: "Тражени текст није пронађен.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Замени",
+DlgReplaceFindLbl		: "Пронађи:",
+DlgReplaceReplaceLbl	: "Замени са:",
+DlgReplaceCaseChk		: "Разликуј велика и мала слова",
+DlgReplaceReplaceBtn	: "Замени",
+DlgReplaceReplAllBtn	: "Замени све",
+DlgReplaceWordChk		: "Упореди целе речи",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl+X).",
+PasteErrorCopy	: "Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl+C).",
+
+PasteAsText		: "Залепи као чист текст",
+PasteFromWord	: "Залепи из Worda",
+
+DlgPasteMsg2	: "Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Игнориши Font Face дефиниције",
+DlgPasteRemoveStyles	: "Уклони дефиниције стилова",
+
+// Color Picker
+ColorAutomatic	: "Аутоматски",
+ColorMoreColors	: "Више боја...",
+
+// Document Properties
+DocProps		: "Особине документа",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Особине сидра",
+DlgAnchorName		: "Име сидра",
+DlgAnchorErrorName	: "Молимо Вас да унесете име сидра",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Није у речнику",
+DlgSpellChangeTo		: "Измени",
+DlgSpellBtnIgnore		: "Игнориши",
+DlgSpellBtnIgnoreAll	: "Игнориши све",
+DlgSpellBtnReplace		: "Замени",
+DlgSpellBtnReplaceAll	: "Замени све",
+DlgSpellBtnUndo			: "Врати акцију",
+DlgSpellNoSuggestions	: "- Без сугестија -",
+DlgSpellProgress		: "Провера спеловања у току...",
+DlgSpellNoMispell		: "Провера спеловања завршена: грешке нису пронађене",
+DlgSpellNoChanges		: "Провера спеловања завршена: Није измењена ниједна реч",
+DlgSpellOneChange		: "Провера спеловања завршена: Измењена је једна реч",
+DlgSpellManyChanges		: "Провера спеловања завршена:  %1 реч(и) је измењено",
+
+IeSpellDownload			: "Провера спеловања није инсталирана. Да ли желите да је скинете са Интернета?",
+
+// Button Dialog
+DlgButtonText		: "Текст (вредност)",
+DlgButtonType		: "Tип",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Назив",
+DlgCheckboxValue	: "Вредност",
+DlgCheckboxSelected	: "Означено",
+
+// Form Dialog
+DlgFormName		: "Назив",
+DlgFormAction	: "Aкција",
+DlgFormMethod	: "Mетода",
+
+// Select Field Dialog
+DlgSelectName		: "Назив",
+DlgSelectValue		: "Вредност",
+DlgSelectSize		: "Величина",
+DlgSelectLines		: "линија",
+DlgSelectChkMulti	: "Дозволи вишеструку селекцију",
+DlgSelectOpAvail	: "Доступне опције",
+DlgSelectOpText		: "Текст",
+DlgSelectOpValue	: "Вредност",
+DlgSelectBtnAdd		: "Додај",
+DlgSelectBtnModify	: "Измени",
+DlgSelectBtnUp		: "Горе",
+DlgSelectBtnDown	: "Доле",
+DlgSelectBtnSetValue : "Подеси као означену вредност",
+DlgSelectBtnDelete	: "Обриши",
+
+// Textarea Dialog
+DlgTextareaName	: "Назив",
+DlgTextareaCols	: "Број колона",
+DlgTextareaRows	: "Број редова",
+
+// Text Field Dialog
+DlgTextName			: "Назив",
+DlgTextValue		: "Вредност",
+DlgTextCharWidth	: "Ширина (карактера)",
+DlgTextMaxChars		: "Максимално карактера",
+DlgTextType			: "Тип",
+DlgTextTypeText		: "Текст",
+DlgTextTypePass		: "Лозинка",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Назив",
+DlgHiddenValue	: "Вредност",
+
+// Bulleted List Dialog
+BulletedListProp	: "Особине Bulleted листе",
+NumberedListProp	: "Особине набројиве листе",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "Тип",
+DlgLstTypeCircle	: "Круг",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "Квадрат",
+DlgLstTypeNumbers	: "Бројеви (1, 2, 3)",
+DlgLstTypeLCase		: "мала слова (a, b, c)",
+DlgLstTypeUCase		: "ВЕЛИКА СЛОВА (A, B, C)",
+DlgLstTypeSRoman	: "Мале римске цифре (i, ii, iii)",
+DlgLstTypeLRoman	: "Велике римске цифре (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Опште особине",
+DlgDocBackTab		: "Позадина",
+DlgDocColorsTab		: "Боје и маргине",
+DlgDocMetaTab		: "Метаподаци",
+
+DlgDocPageTitle		: "Наслов странице",
+DlgDocLangDir		: "Смер језика",
+DlgDocLangDirLTR	: "Слева надесно (LTR)",
+DlgDocLangDirRTL	: "Здесна налево (RTL)",
+DlgDocLangCode		: "Шифра језика",
+DlgDocCharSet		: "Кодирање скупа карактера",
+DlgDocCharSetCE		: "Central European",	//MISSING
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",	//MISSING
+DlgDocCharSetCR		: "Cyrillic",	//MISSING
+DlgDocCharSetGR		: "Greek",	//MISSING
+DlgDocCharSetJP		: "Japanese",	//MISSING
+DlgDocCharSetKR		: "Korean",	//MISSING
+DlgDocCharSetTR		: "Turkish",	//MISSING
+DlgDocCharSetUN		: "Unicode (UTF-8)",	//MISSING
+DlgDocCharSetWE		: "Western European",	//MISSING
+DlgDocCharSetOther	: "Остала кодирања скупа карактера",
+
+DlgDocDocType		: "Заглавље типа документа",
+DlgDocDocTypeOther	: "Остала заглавља типа документа",
+DlgDocIncXHTML		: "Улључи XHTML декларације",
+DlgDocBgColor		: "Боја позадине",
+DlgDocBgImage		: "УРЛ позадинске слике",
+DlgDocBgNoScroll	: "Фиксирана позадина",
+DlgDocCText			: "Текст",
+DlgDocCLink			: "Линк",
+DlgDocCVisited		: "Посећени линк",
+DlgDocCActive		: "Активни линк",
+DlgDocMargins		: "Маргине странице",
+DlgDocMaTop			: "Горња",
+DlgDocMaLeft		: "Лева",
+DlgDocMaRight		: "Десна",
+DlgDocMaBottom		: "Доња",
+DlgDocMeIndex		: "Кључне речи за индексирање документа (раздвојене зарезом)",
+DlgDocMeDescr		: "Опис документа",
+DlgDocMeAuthor		: "Аутор",
+DlgDocMeCopy		: "Ауторска права",
+DlgDocPreview		: "Изглед странице",
+
+// Templates Dialog
+Templates			: "Обрасци",
+DlgTemplatesTitle	: "Обрасци за садржај",
+DlgTemplatesSelMsg	: "Молимо Вас да одаберете образац који ће бити примењен на страницу (тренутни садржај ће бити обрисан):",
+DlgTemplatesLoading	: "Учитавам листу образаца. Мало стрпљења...",
+DlgTemplatesNoTpl	: "(Нема дефинисаних образаца)",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
+
+// About Dialog
+DlgAboutAboutTab	: "О едитору",
+DlgAboutBrowserInfoTab	: "Информације о претраживачу",
+DlgAboutLicenseTab	: "License",	//MISSING
+DlgAboutVersion		: "верзија",
+DlgAboutInfo		: "За више информација посетите",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/sv.js b/modules/editor/skins/fckeditor/editor/lang/sv.js
new file mode 100644
index 000000000..633639d92
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/sv.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Swedish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Dölj verktygsfält",
+ToolbarExpand		: "Visa verktygsfält",
+
+// Toolbar Items and Context Menu
+Save				: "Spara",
+NewPage				: "Ny sida",
+Preview				: "Förhandsgranska",
+Cut					: "Klipp ut",
+Copy				: "Kopiera",
+Paste				: "Klistra in",
+PasteText			: "Klistra in som text",
+PasteWord			: "Klistra in från Word",
+Print				: "Skriv ut",
+SelectAll			: "Markera allt",
+RemoveFormat		: "Radera formatering",
+InsertLinkLbl		: "Länk",
+InsertLink			: "Infoga/Redigera länk",
+RemoveLink			: "Radera länk",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Infoga/Redigera ankarlänk",
+AnchorDelete		: "Radera ankarlänk",
+InsertImageLbl		: "Bild",
+InsertImage			: "Infoga/Redigera bild",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Infoga/Redigera Flash",
+InsertTableLbl		: "Tabell",
+InsertTable			: "Infoga/Redigera tabell",
+InsertLineLbl		: "Linje",
+InsertLine			: "Infoga horisontal linje",
+InsertSpecialCharLbl: "Utökade tecken",
+InsertSpecialChar	: "Klistra in utökat tecken",
+InsertSmileyLbl		: "Smiley",
+InsertSmiley		: "Infoga Smiley",
+About				: "Om FCKeditor",
+Bold				: "Fet",
+Italic				: "Kursiv",
+Underline			: "Understruken",
+StrikeThrough		: "Genomstruken",
+Subscript			: "Nedsänkta tecken",
+Superscript			: "Upphöjda tecken",
+LeftJustify			: "Vänsterjustera",
+CenterJustify		: "Centrera",
+RightJustify		: "Högerjustera",
+BlockJustify		: "Justera till marginaler",
+DecreaseIndent		: "Minska indrag",
+IncreaseIndent		: "Öka indrag",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Ångra",
+Redo				: "Gör om",
+NumberedListLbl		: "Numrerad lista",
+NumberedList		: "Infoga/Radera numrerad lista",
+BulletedListLbl		: "Punktlista",
+BulletedList		: "Infoga/Radera punktlista",
+ShowTableBorders	: "Visa tabellkant",
+ShowDetails			: "Visa radbrytningar",
+Style				: "Anpassad stil",
+FontFormat			: "Teckenformat",
+Font				: "Typsnitt",
+FontSize			: "Storlek",
+TextColor			: "Textfärg",
+BGColor				: "Bakgrundsfärg",
+Source				: "Källa",
+Find				: "Sök",
+Replace				: "Ersätt",
+SpellCheck			: "Stavningskontroll",
+UniversalKeyboard	: "Universellt tangentbord",
+PageBreakLbl		: "Sidbrytning",
+PageBreak			: "Infoga sidbrytning",
+
+Form			: "Formulär",
+Checkbox		: "Kryssruta",
+RadioButton		: "Alternativknapp",
+TextField		: "Textfält",
+Textarea		: "Textruta",
+HiddenField		: "Dolt fält",
+Button			: "Knapp",
+SelectionField	: "Flervalslista",
+ImageButton		: "Bildknapp",
+
+FitWindow		: "Anpassa till fönstrets storlek",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Redigera länk",
+CellCM				: "Cell",
+RowCM				: "Rad",
+ColumnCM			: "Kolumn",
+InsertRowAfter		: "Lägg till Rad Efter",
+InsertRowBefore		: "Lägg till Rad Före",
+DeleteRows			: "Radera rad",
+InsertColumnAfter	: "Lägg till Kolumn Efter",
+InsertColumnBefore	: "Lägg till Kolumn Före",
+DeleteColumns		: "Radera kolumn",
+InsertCellAfter		: "Lägg till Cell Efter",
+InsertCellBefore	: "Lägg till Cell Före",
+DeleteCells			: "Radera celler",
+MergeCells			: "Sammanfoga celler",
+MergeRight			: "Sammanfoga Höger",
+MergeDown			: "Sammanfoga Ner",
+HorizontalSplitCell	: "Dela Cell Horisontellt",
+VerticalSplitCell	: "Dela Cell Vertikalt",
+TableDelete			: "Radera tabell",
+CellProperties		: "Cellegenskaper",
+TableProperties		: "Tabellegenskaper",
+ImageProperties		: "Bildegenskaper",
+FlashProperties		: "Flashegenskaper",
+
+AnchorProp			: "Egenskaper för ankarlänk",
+ButtonProp			: "Egenskaper för knapp",
+CheckboxProp		: "Egenskaper för kryssruta",
+HiddenFieldProp		: "Egenskaper för dolt fält",
+RadioButtonProp		: "Egenskaper för alternativknapp",
+ImageButtonProp		: "Egenskaper för bildknapp",
+TextFieldProp		: "Egenskaper för textfält",
+SelectionFieldProp	: "Egenskaper för flervalslista",
+TextareaProp		: "Egenskaper för textruta",
+FormProp			: "Egenskaper för formulär",
+
+FontFormats			: "Normal;Formaterad;Adress;Rubrik 1;Rubrik 2;Rubrik 3;Rubrik 4;Rubrik 5;Rubrik 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Bearbetar XHTML. Var god vänta...",
+Done				: "Klar",
+PasteWordConfirm	: "Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa innan du klistar in?",
+NotCompatiblePaste	: "Denna åtgärd är inte tillgängligt för Internet Explorer version 5.5 eller högre. Vill du klistra in utan att rensa?",
+UnknownToolbarItem	: "Okänt verktygsfält \"%1\"",
+UnknownCommand		: "Okänt kommando \"%1\"",
+NotImplemented		: "Kommandot finns ej",
+UnknownToolbarSet	: "Verktygsfält \"%1\" finns ej",
+NoActiveX			: "Din webläsares säkerhetsinställningar kan begränsa funktionaliteten. Du bör aktivera \"Kör ActiveX kontroller och plug-ins\". Fel och avsaknad av funktioner kan annars uppstå.",
+BrowseServerBlocked : "Kunde Ej öppna resursfönstret. Var god och avaktivera alla popup-blockerare.",
+DialogBlocked		: "Kunde Ej öppna dialogfönstret. Var god och avaktivera alla popup-blockerare.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "OK",
+DlgBtnCancel		: "Avbryt",
+DlgBtnClose			: "Stäng",
+DlgBtnBrowseServer	: "Bläddra på server",
+DlgAdvancedTag		: "Avancerad",
+DlgOpOther			: "Övrigt",
+DlgInfoTab			: "Information",
+DlgAlertUrl			: "Var god och ange en URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ej angivet>",
+DlgGenId			: "Id",
+DlgGenLangDir		: "Språkriktning",
+DlgGenLangDirLtr	: "Vänster till Höger (VTH)",
+DlgGenLangDirRtl	: "Höger till Vänster (HTV)",
+DlgGenLangCode		: "Språkkod",
+DlgGenAccessKey		: "Behörighetsnyckel",
+DlgGenName			: "Namn",
+DlgGenTabIndex		: "Tabindex",
+DlgGenLongDescr		: "URL-beskrivning",
+DlgGenClass			: "Stylesheet class",
+DlgGenTitle			: "Titel",
+DlgGenContType		: "Innehållstyp",
+DlgGenLinkCharset	: "Teckenuppställning",
+DlgGenStyle			: "Style",
+
+// Image Dialog
+DlgImgTitle			: "Bildegenskaper",
+DlgImgInfoTab		: "Bildinformation",
+DlgImgBtnUpload		: "Skicka till server",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Ladda upp",
+DlgImgAlt			: "Alternativ text",
+DlgImgWidth			: "Bredd",
+DlgImgHeight		: "Höjd",
+DlgImgLockRatio		: "Lås höjd/bredd förhållanden",
+DlgBtnResetSize		: "Återställ storlek",
+DlgImgBorder		: "Kant",
+DlgImgHSpace		: "Horis. marginal",
+DlgImgVSpace		: "Vert. marginal",
+DlgImgAlign			: "Justering",
+DlgImgAlignLeft		: "Vänster",
+DlgImgAlignAbsBottom: "Absolut nederkant",
+DlgImgAlignAbsMiddle: "Absolut centrering",
+DlgImgAlignBaseline	: "Baslinje",
+DlgImgAlignBottom	: "Nederkant",
+DlgImgAlignMiddle	: "Mitten",
+DlgImgAlignRight	: "Höger",
+DlgImgAlignTextTop	: "Text överkant",
+DlgImgAlignTop		: "Överkant",
+DlgImgPreview		: "Förhandsgranska",
+DlgImgAlertUrl		: "Var god och ange bildens URL",
+DlgImgLinkTab		: "Länk",
+
+// Flash Dialog
+DlgFlashTitle		: "Flashegenskaper",
+DlgFlashChkPlay		: "Automatisk uppspelning",
+DlgFlashChkLoop		: "Upprepa/Loopa",
+DlgFlashChkMenu		: "Aktivera Flashmeny",
+DlgFlashScale		: "Skala",
+DlgFlashScaleAll	: "Visa allt",
+DlgFlashScaleNoBorder	: "Ingen ram",
+DlgFlashScaleFit	: "Exakt passning",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Länk",
+DlgLnkInfoTab		: "Länkinformation",
+DlgLnkTargetTab		: "Mål",
+
+DlgLnkType			: "Länktyp",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Ankare i sidan",
+DlgLnkTypeEMail		: "E-post",
+DlgLnkProto			: "Protokoll",
+DlgLnkProtoOther	: "<övrigt>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Välj ett ankare",
+DlgLnkAnchorByName	: "efter ankarnamn",
+DlgLnkAnchorById	: "efter objektid",
+DlgLnkNoAnchors		: "(Inga ankare kunde hittas)",
+DlgLnkEMail			: "E-postadress",
+DlgLnkEMailSubject	: "Ämne",
+DlgLnkEMailBody		: "Innehåll",
+DlgLnkUpload		: "Ladda upp",
+DlgLnkBtnUpload		: "Skicka till servern",
+
+DlgLnkTarget		: "Mål",
+DlgLnkTargetFrame	: "<ram>",
+DlgLnkTargetPopup	: "<popup-fönster>",
+DlgLnkTargetBlank	: "Nytt fönster (_blank)",
+DlgLnkTargetParent	: "Föregående Window (_parent)",
+DlgLnkTargetSelf	: "Detta fönstret (_self)",
+DlgLnkTargetTop		: "Översta fönstret (_top)",
+DlgLnkTargetFrameName	: "Målets ramnamn",
+DlgLnkPopWinName	: "Popup-fönstrets namn",
+DlgLnkPopWinFeat	: "Popup-fönstrets egenskaper",
+DlgLnkPopResize		: "Kan ändra storlek",
+DlgLnkPopLocation	: "Adressfält",
+DlgLnkPopMenu		: "Menyfält",
+DlgLnkPopScroll		: "Scrolllista",
+DlgLnkPopStatus		: "Statusfält",
+DlgLnkPopToolbar	: "Verktygsfält",
+DlgLnkPopFullScrn	: "Helskärm (endast IE)",
+DlgLnkPopDependent	: "Beroende (endest Netscape)",
+DlgLnkPopWidth		: "Bredd",
+DlgLnkPopHeight		: "Höjd",
+DlgLnkPopLeft		: "Position från vänster",
+DlgLnkPopTop		: "Position från sidans topp",
+
+DlnLnkMsgNoUrl		: "Var god ange länkens URL",
+DlnLnkMsgNoEMail	: "Var god ange E-postadress",
+DlnLnkMsgNoAnchor	: "Var god ange ett ankare",
+DlnLnkMsgInvPopName	: "Popup-rutans namn måste börja med en alfabetisk bokstav och får inte innehålla mellanslag",
+
+// Color Dialog
+DlgColorTitle		: "Välj färg",
+DlgColorBtnClear	: "Rensa",
+DlgColorHighlight	: "Markera",
+DlgColorSelected	: "Vald",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Infoga smiley",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Välj utökat tecken",
+
+// Table Dialog
+DlgTableTitle		: "Tabellegenskaper",
+DlgTableRows		: "Rader",
+DlgTableColumns		: "Kolumner",
+DlgTableBorder		: "Kantstorlek",
+DlgTableAlign		: "Justering",
+DlgTableAlignNotSet	: "<ej angivet>",
+DlgTableAlignLeft	: "Vänster",
+DlgTableAlignCenter	: "Centrerad",
+DlgTableAlignRight	: "Höger",
+DlgTableWidth		: "Bredd",
+DlgTableWidthPx		: "pixlar",
+DlgTableWidthPc		: "procent",
+DlgTableHeight		: "Höjd",
+DlgTableCellSpace	: "Cellavstånd",
+DlgTableCellPad		: "Cellutfyllnad",
+DlgTableCaption		: "Rubrik",
+DlgTableSummary		: "Sammanfattning",
+
+// Table Cell Dialog
+DlgCellTitle		: "Cellegenskaper",
+DlgCellWidth		: "Bredd",
+DlgCellWidthPx		: "pixlar",
+DlgCellWidthPc		: "procent",
+DlgCellHeight		: "Höjd",
+DlgCellWordWrap		: "Automatisk radbrytning",
+DlgCellWordWrapNotSet	: "<Ej angivet>",
+DlgCellWordWrapYes	: "Ja",
+DlgCellWordWrapNo	: "Nej",
+DlgCellHorAlign		: "Horisontal justering",
+DlgCellHorAlignNotSet	: "<Ej angivet>",
+DlgCellHorAlignLeft	: "Vänster",
+DlgCellHorAlignCenter	: "Centrerad",
+DlgCellHorAlignRight: "Höger",
+DlgCellVerAlign		: "Vertikal justering",
+DlgCellVerAlignNotSet	: "<Ej angivet>",
+DlgCellVerAlignTop	: "Topp",
+DlgCellVerAlignMiddle	: "Mitten",
+DlgCellVerAlignBottom	: "Nederkant",
+DlgCellVerAlignBaseline	: "Underst",
+DlgCellRowSpan		: "Radomfång",
+DlgCellCollSpan		: "Kolumnomfång",
+DlgCellBackColor	: "Bakgrundsfärg",
+DlgCellBorderColor	: "Kantfärg",
+DlgCellBtnSelect	: "Välj...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Sök och ersätt",
+
+// Find Dialog
+DlgFindTitle		: "Sök",
+DlgFindFindBtn		: "Sök",
+DlgFindNotFoundMsg	: "Angiven text kunde ej hittas.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Ersätt",
+DlgReplaceFindLbl		: "Sök efter:",
+DlgReplaceReplaceLbl	: "Ersätt med:",
+DlgReplaceCaseChk		: "Skiftläge",
+DlgReplaceReplaceBtn	: "Ersätt",
+DlgReplaceReplAllBtn	: "Ersätt alla",
+DlgReplaceWordChk		: "Inkludera hela ord",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Säkerhetsinställningar i Er webläsare tillåter inte åtgården Klipp ut. Använd (Ctrl+X) istället.",
+PasteErrorCopy	: "Säkerhetsinställningar i Er webläsare tillåter inte åtgården Kopiera. Använd (Ctrl+C) istället",
+
+PasteAsText		: "Klistra in som vanlig text",
+PasteFromWord	: "Klistra in från Word",
+
+DlgPasteMsg2	: "Var god och klistra in Er text i rutan nedan genom att använda (<STRONG>Ctrl+V</STRONG>) klicka sen på <STRONG>OK</STRONG>.",
+DlgPasteSec		: "På grund av din webläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.",
+DlgPasteIgnoreFont		: "Ignorera typsnittsdefinitioner",
+DlgPasteRemoveStyles	: "Radera Stildefinitioner",
+
+// Color Picker
+ColorAutomatic	: "Automatisk",
+ColorMoreColors	: "Fler färger...",
+
+// Document Properties
+DocProps		: "Dokumentegenskaper",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Ankaregenskaper",
+DlgAnchorName		: "Ankarnamn",
+DlgAnchorErrorName	: "Var god ange ett ankarnamn",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Saknas i ordlistan",
+DlgSpellChangeTo		: "Ändra till",
+DlgSpellBtnIgnore		: "Ignorera",
+DlgSpellBtnIgnoreAll	: "Ignorera alla",
+DlgSpellBtnReplace		: "Ersätt",
+DlgSpellBtnReplaceAll	: "Ersätt alla",
+DlgSpellBtnUndo			: "Ångra",
+DlgSpellNoSuggestions	: "- Förslag saknas -",
+DlgSpellProgress		: "Stavningskontroll pågår...",
+DlgSpellNoMispell		: "Stavningskontroll slutförd: Inga stavfel påträffades.",
+DlgSpellNoChanges		: "Stavningskontroll slutförd: Inga ord rättades.",
+DlgSpellOneChange		: "Stavningskontroll slutförd: Ett ord rättades.",
+DlgSpellManyChanges		: "Stavningskontroll slutförd: %1 ord rättades.",
+
+IeSpellDownload			: "Stavningskontrollen är ej installerad. Vill du göra det nu?",
+
+// Button Dialog
+DlgButtonText		: "Text (Värde)",
+DlgButtonType		: "Typ",
+DlgButtonTypeBtn	: "Knapp",
+DlgButtonTypeSbm	: "Skicka",
+DlgButtonTypeRst	: "Återställ",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Namn",
+DlgCheckboxValue	: "Värde",
+DlgCheckboxSelected	: "Vald",
+
+// Form Dialog
+DlgFormName		: "Namn",
+DlgFormAction	: "Funktion",
+DlgFormMethod	: "Metod",
+
+// Select Field Dialog
+DlgSelectName		: "Namn",
+DlgSelectValue		: "Värde",
+DlgSelectSize		: "Storlek",
+DlgSelectLines		: "Linjer",
+DlgSelectChkMulti	: "Tillåt flerval",
+DlgSelectOpAvail	: "Befintliga val",
+DlgSelectOpText		: "Text",
+DlgSelectOpValue	: "Värde",
+DlgSelectBtnAdd		: "Lägg till",
+DlgSelectBtnModify	: "Redigera",
+DlgSelectBtnUp		: "Upp",
+DlgSelectBtnDown	: "Ner",
+DlgSelectBtnSetValue : "Markera som valt värde",
+DlgSelectBtnDelete	: "Radera",
+
+// Textarea Dialog
+DlgTextareaName	: "Namn",
+DlgTextareaCols	: "Kolumner",
+DlgTextareaRows	: "Rader",
+
+// Text Field Dialog
+DlgTextName			: "Namn",
+DlgTextValue		: "Värde",
+DlgTextCharWidth	: "Teckenbredd",
+DlgTextMaxChars		: "Max antal tecken",
+DlgTextType			: "Typ",
+DlgTextTypeText		: "Text",
+DlgTextTypePass		: "Lösenord",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Namn",
+DlgHiddenValue	: "Värde",
+
+// Bulleted List Dialog
+BulletedListProp	: "Egenskaper för punktlista",
+NumberedListProp	: "Egenskaper för numrerad lista",
+DlgLstStart			: "Start",
+DlgLstType			: "Typ",
+DlgLstTypeCircle	: "Cirkel",
+DlgLstTypeDisc		: "Punkt",
+DlgLstTypeSquare	: "Ruta",
+DlgLstTypeNumbers	: "Nummer (1, 2, 3)",
+DlgLstTypeLCase		: "Gemener (a, b, c)",
+DlgLstTypeUCase		: "Versaler (A, B, C)",
+DlgLstTypeSRoman	: "Små romerska siffror (i, ii, iii)",
+DlgLstTypeLRoman	: "Stora romerska siffror (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Allmän",
+DlgDocBackTab		: "Bakgrund",
+DlgDocColorsTab		: "Färg och marginal",
+DlgDocMetaTab		: "Metadata",
+
+DlgDocPageTitle		: "Sidtitel",
+DlgDocLangDir		: "Språkriktning",
+DlgDocLangDirLTR	: "Vänster till Höger",
+DlgDocLangDirRTL	: "Höger till Vänster",
+DlgDocLangCode		: "Språkkod",
+DlgDocCharSet		: "Teckenuppsättningar",
+DlgDocCharSetCE		: "Central Europa",
+DlgDocCharSetCT		: "Traditionell Kinesisk (Big5)",
+DlgDocCharSetCR		: "Kyrillisk",
+DlgDocCharSetGR		: "Grekiska",
+DlgDocCharSetJP		: "Japanska",
+DlgDocCharSetKR		: "Koreanska",
+DlgDocCharSetTR		: "Turkiska",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Väst Europa",
+DlgDocCharSetOther	: "Övriga teckenuppsättningar",
+
+DlgDocDocType		: "Sidhuvud",
+DlgDocDocTypeOther	: "Övriga sidhuvuden",
+DlgDocIncXHTML		: "Inkludera XHTML deklaration",
+DlgDocBgColor		: "Bakgrundsfärg",
+DlgDocBgImage		: "Bakgrundsbildens URL",
+DlgDocBgNoScroll	: "Fast bakgrund",
+DlgDocCText			: "Text",
+DlgDocCLink			: "Länk",
+DlgDocCVisited		: "Besökt länk",
+DlgDocCActive		: "Aktiv länk",
+DlgDocMargins		: "Sidmarginal",
+DlgDocMaTop			: "Topp",
+DlgDocMaLeft		: "Vänster",
+DlgDocMaRight		: "Höger",
+DlgDocMaBottom		: "Botten",
+DlgDocMeIndex		: "Sidans nyckelord",
+DlgDocMeDescr		: "Sidans beskrivning",
+DlgDocMeAuthor		: "Författare",
+DlgDocMeCopy		: "Upphovsrätt",
+DlgDocPreview		: "Förhandsgranska",
+
+// Templates Dialog
+Templates			: "Sidmallar",
+DlgTemplatesTitle	: "Sidmallar",
+DlgTemplatesSelMsg	: "Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):",
+DlgTemplatesLoading	: "Laddar mallar. Var god vänta...",
+DlgTemplatesNoTpl	: "(Ingen mall är vald)",
+DlgTemplatesReplace	: "Ersätt aktuellt innehåll",
+
+// About Dialog
+DlgAboutAboutTab	: "Om",
+DlgAboutBrowserInfoTab	: "Webläsare",
+DlgAboutLicenseTab	: "Licens",
+DlgAboutVersion		: "version",
+DlgAboutInfo		: "För mer information se",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/th.js b/modules/editor/skins/fckeditor/editor/lang/th.js
new file mode 100644
index 000000000..a0f880e06
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/th.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Thai language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "ซ่อนแถบเครื่องมือ",
+ToolbarExpand		: "แสดงแถบเครื่องมือ",
+
+// Toolbar Items and Context Menu
+Save				: "บันทึก",
+NewPage				: "สร้างหน้าเอกสารใหม่",
+Preview				: "ดูหน้าเอกสารตัวอย่าง",
+Cut					: "ตัด",
+Copy				: "สำเนา",
+Paste				: "วาง",
+PasteText			: "วางสำเนาจากตัวอักษรธรรมดา",
+PasteWord			: "วางสำเนาจากตัวอักษรเวิร์ด",
+Print				: "สั่งพิมพ์",
+SelectAll			: "เลือกทั้งหมด",
+RemoveFormat		: "ล้างรูปแบบ",
+InsertLinkLbl		: "ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ",
+InsertLink			: "แทรก/แก้ไข ลิงค์",
+RemoveLink			: "ลบ ลิงค์",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "แทรก/แก้ไข Anchor",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "รูปภาพ",
+InsertImage			: "แทรก/แก้ไข รูปภาพ",
+InsertFlashLbl		: "ไฟล์ Flash",
+InsertFlash			: "แทรก/แก้ไข ไฟล์ Flash",
+InsertTableLbl		: "ตาราง",
+InsertTable			: "แทรก/แก้ไข ตาราง",
+InsertLineLbl		: "เส้นคั่นบรรทัด",
+InsertLine			: "แทรกเส้นคั่นบรรทัด",
+InsertSpecialCharLbl: "ตัวอักษรพิเศษ",
+InsertSpecialChar	: "แทรกตัวอักษรพิเศษ",
+InsertSmileyLbl		: "รูปสื่ออารมณ์",
+InsertSmiley		: "แทรกรูปสื่ออารมณ์",
+About				: "เกี่ยวกับโปรแกรม FCKeditor",
+Bold				: "ตัวหนา",
+Italic				: "ตัวเอียง",
+Underline			: "ตัวขีดเส้นใต้",
+StrikeThrough		: "ตัวขีดเส้นทับ",
+Subscript			: "ตัวห้อย",
+Superscript			: "ตัวยก",
+LeftJustify			: "จัดชิดซ้าย",
+CenterJustify		: "จัดกึ่งกลาง",
+RightJustify		: "จัดชิดขวา",
+BlockJustify		: "จัดพอดีหน้ากระดาษ",
+DecreaseIndent		: "ลดระยะย่อหน้า",
+IncreaseIndent		: "เพิ่มระยะย่อหน้า",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "ยกเลิกคำสั่ง",
+Redo				: "ทำซ้ำคำสั่ง",
+NumberedListLbl		: "ลำดับรายการแบบตัวเลข",
+NumberedList		: "แทรก/แก้ไข ลำดับรายการแบบตัวเลข",
+BulletedListLbl		: "ลำดับรายการแบบสัญลักษณ์",
+BulletedList		: "แทรก/แก้ไข ลำดับรายการแบบสัญลักษณ์",
+ShowTableBorders	: "แสดงขอบของตาราง",
+ShowDetails			: "แสดงรายละเอียด",
+Style				: "ลักษณะ",
+FontFormat			: "รูปแบบ",
+Font				: "แบบอักษร",
+FontSize			: "ขนาด",
+TextColor			: "สีตัวอักษร",
+BGColor				: "สีพื้นหลัง",
+Source				: "ดูรหัส HTML",
+Find				: "ค้นหา",
+Replace				: "ค้นหาและแทนที่",
+SpellCheck			: "ตรวจการสะกดคำ",
+UniversalKeyboard	: "คีย์บอร์ดหลากภาษา",
+PageBreakLbl		: "ใส่ตัวแบ่งหน้า Page Break",
+PageBreak			: "แทรกตัวแบ่งหน้า Page Break",
+
+Form			: "แบบฟอร์ม",
+Checkbox		: "เช็คบ๊อก",
+RadioButton		: "เรดิโอบัตตอน",
+TextField		: "เท็กซ์ฟิลด์",
+Textarea		: "เท็กซ์แอเรีย",
+HiddenField		: "ฮิดเดนฟิลด์",
+Button			: "ปุ่ม",
+SelectionField	: "แถบตัวเลือก",
+ImageButton		: "ปุ่มแบบรูปภาพ",
+
+FitWindow		: "ขยายขนาดตัวอีดิตเตอร์",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "แก้ไข ลิงค์",
+CellCM				: "ช่องตาราง",
+RowCM				: "แถว",
+ColumnCM			: "คอลัมน์",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "ลบแถว",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "ลบสดมน์",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "ลบช่อง",
+MergeCells			: "ผสานช่อง",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "ลบตาราง",
+CellProperties		: "คุณสมบัติของช่อง",
+TableProperties		: "คุณสมบัติของตาราง",
+ImageProperties		: "คุณสมบัติของรูปภาพ",
+FlashProperties		: "คุณสมบัติของไฟล์ Flash",
+
+AnchorProp			: "รายละเอียด Anchor",
+ButtonProp			: "รายละเอียดของ ปุ่ม",
+CheckboxProp		: "คุณสมบัติของ เช็คบ๊อก",
+HiddenFieldProp		: "คุณสมบัติของ ฮิดเดนฟิลด์",
+RadioButtonProp		: "คุณสมบัติของ เรดิโอบัตตอน",
+ImageButtonProp		: "คุณสมบัติของ ปุ่มแบบรูปภาพ",
+TextFieldProp		: "คุณสมบัติของ เท็กซ์ฟิลด์",
+SelectionFieldProp	: "คุณสมบัติของ แถบตัวเลือก",
+TextareaProp		: "คุณสมบัติของ เท็กแอเรีย",
+FormProp			: "คุณสมบัติของ แบบฟอร์ม",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Paragraph (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "โปรแกรมกำลังทำงานด้วยเทคโนโลยี XHTML กรุณารอสักครู่...",
+Done				: "โปรแกรมทำงานเสร็จสมบูรณ์",
+PasteWordConfirm	: "ข้อมูลที่ท่านต้องการวางลงในแผ่นงาน ถูกจัดรูปแบบจากโปรแกรมเวิร์ด. ท่านต้องการล้างรูปแบบที่มาจากโปรแกรมเวิร์ดหรือไม่?",
+NotCompatiblePaste	: "คำสั่งนี้ทำงานในโปรแกรมท่องเว็บ Internet Explorer version รุ่น 5.5 หรือใหม่กว่าเท่านั้น. ท่านต้องการวางตัวอักษรโดยไม่ล้างรูปแบบที่มาจากโปรแกรมเวิร์ดหรือไม่?",
+UnknownToolbarItem	: "ไม่สามารถระบุปุ่มเครื่องมือได้ \"%1\"",
+UnknownCommand		: "ไม่สามารถระบุชื่อคำสั่งได้ \"%1\"",
+NotImplemented		: "ไม่สามารถใช้งานคำสั่งได้",
+UnknownToolbarSet	: "ไม่มีการติดตั้งชุดคำสั่งในแถบเครื่องมือ \"%1\" กรุณาติดต่อผู้ดูแลระบบ",
+NoActiveX			: "โปรแกรมท่องอินเตอร์เน็ตของท่านไม่อนุญาติให้อีดิตเตอร์ทำงาน \"Run ActiveX controls and plug-ins\". หากไม่อนุญาติให้ใช้งาน ActiveX controls ท่านจะไม่สามารถใช้งานได้อย่างเต็มประสิทธิภาพ.",
+BrowseServerBlocked : "เปิดหน้าต่างป๊อบอัพเพื่อทำงานต่อไม่ได้ กรุณาปิดเครื่องมือป้องกันป๊อบอัพในโปรแกรมท่องอินเตอร์เน็ตของท่านด้วย",
+DialogBlocked		: "เปิดหน้าต่างป๊อบอัพเพื่อทำงานต่อไม่ได้ กรุณาปิดเครื่องมือป้องกันป๊อบอัพในโปรแกรมท่องอินเตอร์เน็ตของท่านด้วย",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ตกลง",
+DlgBtnCancel		: "ยกเลิก",
+DlgBtnClose			: "ปิด",
+DlgBtnBrowseServer	: "เปิดหน้าต่างจัดการไฟล์อัพโหลด",
+DlgAdvancedTag		: "ขั้นสูง",
+DlgOpOther			: "<อื่นๆ>",
+DlgInfoTab			: "อินโฟ",
+DlgAlertUrl			: "กรุณาระบุ URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<ไม่ระบุ>",
+DlgGenId			: "ไอดี",
+DlgGenLangDir		: "การเขียน-อ่านภาษา",
+DlgGenLangDirLtr	: "จากซ้ายไปขวา (LTR)",
+DlgGenLangDirRtl	: "จากขวามาซ้าย (RTL)",
+DlgGenLangCode		: "รหัสภาษา",
+DlgGenAccessKey		: "แอคเซส คีย์",
+DlgGenName			: "ชื่อ",
+DlgGenTabIndex		: "ลำดับของ แท็บ",
+DlgGenLongDescr		: "คำอธิบายประกอบ URL",
+DlgGenClass			: "คลาสของไฟล์กำหนดลักษณะการแสดงผล",
+DlgGenTitle			: "คำเกริ่นนำ",
+DlgGenContType		: "ชนิดของคำเกริ่นนำ",
+DlgGenLinkCharset	: "ลิงค์เชื่อมโยงไปยังชุดตัวอักษร",
+DlgGenStyle			: "ลักษณะการแสดงผล",
+
+// Image Dialog
+DlgImgTitle			: "คุณสมบัติของ รูปภาพ",
+DlgImgInfoTab		: "ข้อมูลของรูปภาพ",
+DlgImgBtnUpload		: "อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)",
+DlgImgURL			: "ที่อยู่อ้างอิง URL",
+DlgImgUpload		: "อัพโหลดไฟล์",
+DlgImgAlt			: "คำประกอบรูปภาพ",
+DlgImgWidth			: "ความกว้าง",
+DlgImgHeight		: "ความสูง",
+DlgImgLockRatio		: "กำหนดอัตราส่วน กว้าง-สูง แบบคงที่",
+DlgBtnResetSize		: "กำหนดรูปเท่าขนาดจริง",
+DlgImgBorder		: "ขนาดขอบรูป",
+DlgImgHSpace		: "ระยะแนวนอน",
+DlgImgVSpace		: "ระยะแนวตั้ง",
+DlgImgAlign			: "การจัดวาง",
+DlgImgAlignLeft		: "ชิดซ้าย",
+DlgImgAlignAbsBottom: "ชิดด้านล่างสุด",
+DlgImgAlignAbsMiddle: "กึ่งกลาง",
+DlgImgAlignBaseline	: "ชิดบรรทัด",
+DlgImgAlignBottom	: "ชิดด้านล่าง",
+DlgImgAlignMiddle	: "กึ่งกลางแนวตั้ง",
+DlgImgAlignRight	: "ชิดขวา",
+DlgImgAlignTextTop	: "ใต้ตัวอักษร",
+DlgImgAlignTop		: "บนสุด",
+DlgImgPreview		: "หน้าเอกสารตัวอย่าง",
+DlgImgAlertUrl		: "กรุณาระบุที่อยู่อ้างอิงออนไลน์ของไฟล์รูปภาพ (URL)",
+DlgImgLinkTab		: "ลิ้งค์",
+
+// Flash Dialog
+DlgFlashTitle		: "คุณสมบัติของไฟล์ Flash",
+DlgFlashChkPlay		: "เล่นอัตโนมัติ Auto Play",
+DlgFlashChkLoop		: "เล่นวนรอบ Loop",
+DlgFlashChkMenu		: "ให้ใช้งานเมนูของ Flash",
+DlgFlashScale		: "อัตราส่วน Scale",
+DlgFlashScaleAll	: "แสดงให้เห็นทั้งหมด Show all",
+DlgFlashScaleNoBorder	: "ไม่แสดงเส้นขอบ No Border",
+DlgFlashScaleFit	: "แสดงให้พอดีกับพื้นที่ Exact Fit",
+
+// Link Dialog
+DlgLnkWindowTitle	: "ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ",
+DlgLnkInfoTab		: "รายละเอียด",
+DlgLnkTargetTab		: "การเปิดหน้าจอ",
+
+DlgLnkType			: "ประเภทของลิงค์",
+DlgLnkTypeURL		: "ที่อยู่อ้างอิงออนไลน์ (URL)",
+DlgLnkTypeAnchor	: "จุดเชื่อมโยง (Anchor)",
+DlgLnkTypeEMail		: "ส่งอีเมล์ (E-Mail)",
+DlgLnkProto			: "โปรโตคอล",
+DlgLnkProtoOther	: "<อื่นๆ>",
+DlgLnkURL			: "ที่อยู่อ้างอิงออนไลน์ (URL)",
+DlgLnkAnchorSel		: "ระบุข้อมูลของจุดเชื่อมโยง (Anchor)",
+DlgLnkAnchorByName	: "ชื่อ",
+DlgLnkAnchorById	: "ไอดี",
+DlgLnkNoAnchors		: "(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอกสารนี้)",
+DlgLnkEMail			: "อีเมล์ (E-Mail)",
+DlgLnkEMailSubject	: "หัวเรื่อง",
+DlgLnkEMailBody		: "ข้อความ",
+DlgLnkUpload		: "อัพโหลดไฟล์",
+DlgLnkBtnUpload		: "บันทึกไฟล์ไว้บนเซิร์ฟเวอร์",
+
+DlgLnkTarget		: "การเปิดหน้าลิงค์",
+DlgLnkTargetFrame	: "<เปิดในเฟรม>",
+DlgLnkTargetPopup	: "<เปิดหน้าจอเล็ก (Pop-up)>",
+DlgLnkTargetBlank	: "เปิดหน้าจอใหม่ (_blank)",
+DlgLnkTargetParent	: "เปิดในหน้าหลัก (_parent)",
+DlgLnkTargetSelf	: "เปิดในหน้าปัจจุบัน (_self)",
+DlgLnkTargetTop		: "เปิดในหน้าบนสุด (_top)",
+DlgLnkTargetFrameName	: "ชื่อทาร์เก็ตเฟรม",
+DlgLnkPopWinName	: "ระบุชื่อหน้าจอเล็ก (Pop-up)",
+DlgLnkPopWinFeat	: "คุณสมบัติของหน้าจอเล็ก (Pop-up)",
+DlgLnkPopResize		: "ปรับขนาดหน้าจอ",
+DlgLnkPopLocation	: "แสดงที่อยู่ของไฟล์",
+DlgLnkPopMenu		: "แสดงแถบเมนู",
+DlgLnkPopScroll		: "แสดงแถบเลื่อน",
+DlgLnkPopStatus		: "แสดงแถบสถานะ",
+DlgLnkPopToolbar	: "แสดงแถบเครื่องมือ",
+DlgLnkPopFullScrn	: "แสดงเต็มหน้าจอ (IE5.5++ เท่านั้น)",
+DlgLnkPopDependent	: "แสดงเต็มหน้าจอ (Netscape)",
+DlgLnkPopWidth		: "กว้าง",
+DlgLnkPopHeight		: "สูง",
+DlgLnkPopLeft		: "พิกัดซ้าย (Left Position)",
+DlgLnkPopTop		: "พิกัดบน (Top Position)",
+
+DlnLnkMsgNoUrl		: "กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)",
+DlnLnkMsgNoEMail	: "กรุณาระบุอีเมล์ (E-mail)",
+DlnLnkMsgNoAnchor	: "กรุณาระบุจุดเชื่อมโยง (Anchor)",
+DlnLnkMsgInvPopName	: "ชื่อของหน้าต่างป๊อบอัพ จะต้องขึ้นต้นด้วยตัวอักษรเท่านั้น และต้องไม่มีช่องว่างในชื่อ",
+
+// Color Dialog
+DlgColorTitle		: "เลือกสี",
+DlgColorBtnClear	: "ล้างค่ารหัสสี",
+DlgColorHighlight	: "ตัวอย่างสี",
+DlgColorSelected	: "สีที่เลือก",
+
+// Smiley Dialog
+DlgSmileyTitle		: "แทรกสัญลักษณ์สื่ออารมณ์",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "แทรกตัวอักษรพิเศษ",
+
+// Table Dialog
+DlgTableTitle		: "คุณสมบัติของ ตาราง",
+DlgTableRows		: "แถว",
+DlgTableColumns		: "สดมน์",
+DlgTableBorder		: "ขนาดเส้นขอบ",
+DlgTableAlign		: "การจัดตำแหน่ง",
+DlgTableAlignNotSet	: "<ไม่ระบุ>",
+DlgTableAlignLeft	: "ชิดซ้าย",
+DlgTableAlignCenter	: "กึ่งกลาง",
+DlgTableAlignRight	: "ชิดขวา",
+DlgTableWidth		: "กว้าง",
+DlgTableWidthPx		: "จุดสี",
+DlgTableWidthPc		: "เปอร์เซ็น",
+DlgTableHeight		: "สูง",
+DlgTableCellSpace	: "ระยะแนวนอนน",
+DlgTableCellPad		: "ระยะแนวตั้ง",
+DlgTableCaption		: "หัวเรื่องของตาราง",
+DlgTableSummary		: "สรุปความ",
+
+// Table Cell Dialog
+DlgCellTitle		: "คุณสมบัติของ ช่อง",
+DlgCellWidth		: "กว้าง",
+DlgCellWidthPx		: "จุดสี",
+DlgCellWidthPc		: "เปอร์เซ็น",
+DlgCellHeight		: "สูง",
+DlgCellWordWrap		: "ตัดบรรทัดอัตโนมัติ",
+DlgCellWordWrapNotSet	: "<ไม่ระบุ>",
+DlgCellWordWrapYes	: "ใ่ช่",
+DlgCellWordWrapNo	: "ไม่",
+DlgCellHorAlign		: "การจัดวางแนวนอน",
+DlgCellHorAlignNotSet	: "<ไม่ระบุ>",
+DlgCellHorAlignLeft	: "ชิดซ้าย",
+DlgCellHorAlignCenter	: "กึ่งกลาง",
+DlgCellHorAlignRight: "ชิดขวา",
+DlgCellVerAlign		: "การจัดวางแนวตั้ง",
+DlgCellVerAlignNotSet	: "<ไม่ระบุ>",
+DlgCellVerAlignTop	: "บนสุด",
+DlgCellVerAlignMiddle	: "กึ่งกลาง",
+DlgCellVerAlignBottom	: "ล่างสุด",
+DlgCellVerAlignBaseline	: "อิงบรรทัด",
+DlgCellRowSpan		: "จำนวนแถวที่คร่อมกัน",
+DlgCellCollSpan		: "จำนวนสดมน์ที่คร่อมกัน",
+DlgCellBackColor	: "สีพื้นหลัง",
+DlgCellBorderColor	: "สีเส้นขอบ",
+DlgCellBtnSelect	: "เลือก..",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "ค้นหา",
+DlgFindFindBtn		: "ค้นหา",
+DlgFindNotFoundMsg	: "ไม่พบคำที่ค้นหา.",
+
+// Replace Dialog
+DlgReplaceTitle			: "ค้นหาและแทนที่",
+DlgReplaceFindLbl		: "ค้นหาคำว่า:",
+DlgReplaceReplaceLbl	: "แทนที่ด้วย:",
+DlgReplaceCaseChk		: "ตัวโหญ่-เล็ก ต้องตรงกัน",
+DlgReplaceReplaceBtn	: "แทนที่",
+DlgReplaceReplAllBtn	: "แทนที่ทั้งหมดที่พบ",
+DlgReplaceWordChk		: "ต้องตรงกันทุกคำ",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl และตัว X พร้อมกัน).",
+PasteErrorCopy	: "ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl และตัว C พร้อมกัน).",
+
+PasteAsText		: "วางแบบตัวอักษรธรรมดา",
+PasteFromWord	: "วางแบบตัวอักษรจากโปรแกรมเวิร์ด",
+
+DlgPasteMsg2	: "กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "ไม่สนใจ Font Face definitions",
+DlgPasteRemoveStyles	: "ลบ Styles definitions",
+
+// Color Picker
+ColorAutomatic	: "สีอัตโนมัติ",
+ColorMoreColors	: "เลือกสีอื่นๆ...",
+
+// Document Properties
+DocProps		: "คุณสมบัติของเอกสาร",
+
+// Anchor Dialog
+DlgAnchorTitle		: "คุณสมบัติของ Anchor",
+DlgAnchorName		: "ชื่อ Anchor",
+DlgAnchorErrorName	: "กรุณาระบุชื่อของ Anchor",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "ไม่พบในดิกชันนารี",
+DlgSpellChangeTo		: "แก้ไขเป็น",
+DlgSpellBtnIgnore		: "ยกเว้น",
+DlgSpellBtnIgnoreAll	: "ยกเว้นทั้งหมด",
+DlgSpellBtnReplace		: "แทนที่",
+DlgSpellBtnReplaceAll	: "แทนที่ทั้งหมด",
+DlgSpellBtnUndo			: "ยกเลิก",
+DlgSpellNoSuggestions	: "- ไม่มีคำแนะนำใดๆ -",
+DlgSpellProgress		: "กำลังตรวจสอบคำสะกด...",
+DlgSpellNoMispell		: "ตรวจสอบคำสะกดเสร็จสิ้น: ไม่พบคำสะกดผิด",
+DlgSpellNoChanges		: "ตรวจสอบคำสะกดเสร็จสิ้น: ไม่มีการแก้คำใดๆ",
+DlgSpellOneChange		: "ตรวจสอบคำสะกดเสร็จสิ้น: แก้ไข1คำ",
+DlgSpellManyChanges		: "ตรวจสอบคำสะกดเสร็จสิ้น:: แก้ไข %1 คำ",
+
+IeSpellDownload			: "ไม่ได้ติดตั้งระบบตรวจสอบคำสะกด. ต้องการติดตั้งไหมครับ?",
+
+// Button Dialog
+DlgButtonText		: "ข้อความ (ค่าตัวแปร)",
+DlgButtonType		: "ข้อความ",
+DlgButtonTypeBtn	: "Button",
+DlgButtonTypeSbm	: "Submit",
+DlgButtonTypeRst	: "Reset",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "ชื่อ",
+DlgCheckboxValue	: "ค่าตัวแปร",
+DlgCheckboxSelected	: "เลือกเป็นค่าเริ่มต้น",
+
+// Form Dialog
+DlgFormName		: "ชื่อ",
+DlgFormAction	: "แอคชั่น",
+DlgFormMethod	: "เมธอด",
+
+// Select Field Dialog
+DlgSelectName		: "ชื่อ",
+DlgSelectValue		: "ค่าตัวแปร",
+DlgSelectSize		: "ขนาด",
+DlgSelectLines		: "บรรทัด",
+DlgSelectChkMulti	: "เลือกหลายค่าได้",
+DlgSelectOpAvail	: "รายการตัวเลือก",
+DlgSelectOpText		: "ข้อความ",
+DlgSelectOpValue	: "ค่าตัวแปร",
+DlgSelectBtnAdd		: "เพิ่ม",
+DlgSelectBtnModify	: "แก้ไข",
+DlgSelectBtnUp		: "บน",
+DlgSelectBtnDown	: "ล่าง",
+DlgSelectBtnSetValue : "เลือกเป็นค่าเริ่มต้น",
+DlgSelectBtnDelete	: "ลบ",
+
+// Textarea Dialog
+DlgTextareaName	: "ชื่อ",
+DlgTextareaCols	: "สดมภ์",
+DlgTextareaRows	: "แถว",
+
+// Text Field Dialog
+DlgTextName			: "ชื่อ",
+DlgTextValue		: "ค่าตัวแปร",
+DlgTextCharWidth	: "ความกว้าง",
+DlgTextMaxChars		: "จำนวนตัวอักษรสูงสุด",
+DlgTextType			: "ชนิด",
+DlgTextTypeText		: "ข้อความ",
+DlgTextTypePass		: "รหัสผ่าน",
+
+// Hidden Field Dialog
+DlgHiddenName	: "ชื่อ",
+DlgHiddenValue	: "ค่าตัวแปร",
+
+// Bulleted List Dialog
+BulletedListProp	: "คุณสมบัติของ บูลเล็ตลิสต์",
+NumberedListProp	: "คุณสมบัติของ นัมเบอร์ลิสต์",
+DlgLstStart			: "Start",	//MISSING
+DlgLstType			: "ชนิด",
+DlgLstTypeCircle	: "รูปวงกลม",
+DlgLstTypeDisc		: "Disc",	//MISSING
+DlgLstTypeSquare	: "รูปสี่เหลี่ยม",
+DlgLstTypeNumbers	: "หมายเลข (1, 2, 3)",
+DlgLstTypeLCase		: "ตัวพิมพ์เล็ก (a, b, c)",
+DlgLstTypeUCase		: "ตัวพิมพ์ใหญ่ (A, B, C)",
+DlgLstTypeSRoman	: "เลขโรมันพิมพ์เล็ก (i, ii, iii)",
+DlgLstTypeLRoman	: "เลขโรมันพิมพ์ใหญ่ (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "ลักษณะทั่วไปของเอกสาร",
+DlgDocBackTab		: "พื้นหลัง",
+DlgDocColorsTab		: "สีและระยะขอบ",
+DlgDocMetaTab		: "ข้อมูลสำหรับเสิร์ชเอนจิ้น",
+
+DlgDocPageTitle		: "ชื่อไตเติ้ล",
+DlgDocLangDir		: "การอ่านภาษา",
+DlgDocLangDirLTR	: "จากซ้ายไปขวา (LTR)",
+DlgDocLangDirRTL	: "จากขวาไปซ้าย (RTL)",
+DlgDocLangCode		: "รหัสภาษา",
+DlgDocCharSet		: "ชุดตัวอักษร",
+DlgDocCharSetCE		: "Central European",
+DlgDocCharSetCT		: "Chinese Traditional (Big5)",
+DlgDocCharSetCR		: "Cyrillic",
+DlgDocCharSetGR		: "Greek",
+DlgDocCharSetJP		: "Japanese",
+DlgDocCharSetKR		: "Korean",
+DlgDocCharSetTR		: "Turkish",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Western European",
+DlgDocCharSetOther	: "ชุดตัวอักษรอื่นๆ",
+
+DlgDocDocType		: "ประเภทของเอกสาร",
+DlgDocDocTypeOther	: "ประเภทเอกสารอื่นๆ",
+DlgDocIncXHTML		: "รวมเอา  XHTML Declarations ไว้ด้วย",
+DlgDocBgColor		: "สีพื้นหลัง",
+DlgDocBgImage		: "ที่อยู่อ้างอิงออนไลน์ของรูปพื้นหลัง (Image URL)",
+DlgDocBgNoScroll	: "พื้นหลังแบบไม่มีแถบเลื่อน",
+DlgDocCText			: "ข้อความ",
+DlgDocCLink			: "ลิงค์",
+DlgDocCVisited		: "ลิงค์ที่เคยคลิ้กแล้ว Visited Link",
+DlgDocCActive		: "ลิงค์ที่กำลังคลิ้ก Active Link",
+DlgDocMargins		: "ระยะขอบของหน้าเอกสาร",
+DlgDocMaTop			: "ด้านบน",
+DlgDocMaLeft		: "ด้านซ้าย",
+DlgDocMaRight		: "ด้านขวา",
+DlgDocMaBottom		: "ด้านล่าง",
+DlgDocMeIndex		: "คำสำคัญอธิบายเอกสาร (คั่นคำด้วย คอมม่า)",
+DlgDocMeDescr		: "ประโยคอธิบายเกี่ยวกับเอกสาร",
+DlgDocMeAuthor		: "ผู้สร้างเอกสาร",
+DlgDocMeCopy		: "สงวนลิขสิทธิ์",
+DlgDocPreview		: "ตัวอย่างหน้าเอกสาร",
+
+// Templates Dialog
+Templates			: "เทมเพลต",
+DlgTemplatesTitle	: "เทมเพลตของส่วนเนื้อหาเว็บไซต์",
+DlgTemplatesSelMsg	: "กรุณาเลือก เทมเพลต เพื่อนำไปแก้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):",
+DlgTemplatesLoading	: "กำลังโหลดรายการเทมเพลตทั้งหมด...",
+DlgTemplatesNoTpl	: "(ยังไม่มีการกำหนดเทมเพลต)",
+DlgTemplatesReplace	: "แทนที่เนื้อหาเว็บไซต์ที่เลือก",
+
+// About Dialog
+DlgAboutAboutTab	: "เกี่ยวกับโปรแกรม",
+DlgAboutBrowserInfoTab	: "โปรแกรมท่องเว็บที่ท่านใช้",
+DlgAboutLicenseTab	: "ลิขสิทธิ์",
+DlgAboutVersion		: "รุ่น",
+DlgAboutInfo		: "For further information go to",	//MISSING
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/tr.js b/modules/editor/skins/fckeditor/editor/lang/tr.js
new file mode 100644
index 000000000..e7d55f2ec
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/tr.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Turkish language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Araç Çubuğunu Kapat",
+ToolbarExpand		: "Araç Çubuğunu Aç",
+
+// Toolbar Items and Context Menu
+Save				: "Kaydet",
+NewPage				: "Yeni Sayfa",
+Preview				: "Ön İzleme",
+Cut					: "Kes",
+Copy				: "Kopyala",
+Paste				: "Yapıştır",
+PasteText			: "Düzyazı Olarak Yapıştır",
+PasteWord			: "Word'den Yapıştır",
+Print				: "Yazdır",
+SelectAll			: "Tümünü Seç",
+RemoveFormat		: "Biçimi Kaldır",
+InsertLinkLbl		: "Köprü",
+InsertLink			: "Köprü Ekle/Düzenle",
+RemoveLink			: "Köprü Kaldır",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Çapa Ekle/Düzenle",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Resim",
+InsertImage			: "Resim Ekle/Düzenle",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Flash Ekle/Düzenle",
+InsertTableLbl		: "Tablo",
+InsertTable			: "Tablo Ekle/Düzenle",
+InsertLineLbl		: "Satır",
+InsertLine			: "Yatay Satır Ekle",
+InsertSpecialCharLbl: "Özel Karakter",
+InsertSpecialChar	: "Özel Karakter Ekle",
+InsertSmileyLbl		: "İfade",
+InsertSmiley		: "İfade Ekle",
+About				: "FCKeditor Hakkında",
+Bold				: "Kalın",
+Italic				: "İtalik",
+Underline			: "Altı Çizgili",
+StrikeThrough		: "Üstü Çizgili",
+Subscript			: "Alt Simge",
+Superscript			: "Üst Simge",
+LeftJustify			: "Sola Dayalı",
+CenterJustify		: "Ortalanmış",
+RightJustify		: "Sağa Dayalı",
+BlockJustify		: "İki Kenara Yaslanmış",
+DecreaseIndent		: "Sekme Azalt",
+IncreaseIndent		: "Sekme Arttır",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Geri Al",
+Redo				: "Tekrarla",
+NumberedListLbl		: "Numaralı Liste",
+NumberedList		: "Numaralı Liste Ekle/Kaldır",
+BulletedListLbl		: "Simgeli Liste",
+BulletedList		: "Simgeli Liste Ekle/Kaldır",
+ShowTableBorders	: "Tablo Kenarlarını Göster",
+ShowDetails			: "Detayları Göster",
+Style				: "Biçem",
+FontFormat			: "Biçim",
+Font				: "Yazı Türü",
+FontSize			: "Boyut",
+TextColor			: "Yazı Rengi",
+BGColor				: "Arka Renk",
+Source				: "Kaynak",
+Find				: "Bul",
+Replace				: "Değiştir",
+SpellCheck			: "Yazım Denetimi",
+UniversalKeyboard	: "Evrensel Klavye",
+PageBreakLbl		: "Sayfa sonu",
+PageBreak			: "Sayfa Sonu Ekle",
+
+Form			: "Form",
+Checkbox		: "Onay Kutusu",
+RadioButton		: "Seçenek Düğmesi",
+TextField		: "Metin Girişi",
+Textarea		: "Çok Satırlı Metin",
+HiddenField		: "Gizli Veri",
+Button			: "Düğme",
+SelectionField	: "Seçim Menüsü",
+ImageButton		: "Resimli Düğme",
+
+FitWindow		: "Düzenleyici boyutunu büyüt",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Köprü Düzenle",
+CellCM				: "Hücre",
+RowCM				: "Satır",
+ColumnCM			: "Sütun",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Satır Sil",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Sütun Sil",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Hücre Sil",
+MergeCells			: "Hücreleri Birleştir",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Tabloyu Sil",
+CellProperties		: "Hücre Özellikleri",
+TableProperties		: "Tablo Özellikleri",
+ImageProperties		: "Resim Özellikleri",
+FlashProperties		: "Flash Özellikleri",
+
+AnchorProp			: "Çapa Özellikleri",
+ButtonProp			: "Düğme Özellikleri",
+CheckboxProp		: "Onay Kutusu Özellikleri",
+HiddenFieldProp		: "Gizli Veri Özellikleri",
+RadioButtonProp		: "Seçenek Düğmesi Özellikleri",
+ImageButtonProp		: "Resimli Düğme Özellikleri",
+TextFieldProp		: "Metin Girişi Özellikleri",
+SelectionFieldProp	: "Seçim Menüsü Özellikleri",
+TextareaProp		: "Çok Satırlı Metin Özellikleri",
+FormProp			: "Form Özellikleri",
+
+FontFormats			: "Normal;Biçimli;Adres;Başlık 1;Başlık 2;Başlık 3;Başlık 4;Başlık 5;Başlık 6;Paragraf (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "XHTML işleniyor. Lütfen bekleyin...",
+Done				: "Bitti",
+PasteWordConfirm	: "Yapıştırdığınız yazı Word'den gelmişe benziyor. Yapıştırmadan önce gereksiz eklentileri silmek ister misiniz?",
+NotCompatiblePaste	: "Bu komut Internet Explorer 5.5 ve ileriki sürümleri için mevcuttur. Temizlenmeden yapıştırılmasını ister misiniz ?",
+UnknownToolbarItem	: "Bilinmeyen araç çubugu öğesi \"%1\"",
+UnknownCommand		: "Bilinmeyen komut \"%1\"",
+NotImplemented		: "Komut uyarlanamadı",
+UnknownToolbarSet	: "\"%1\" araç çubuğu öğesi mevcut değil",
+NoActiveX			: "Kullandığınız tarayıcının güvenlik ayarları bazı özelliklerin kullanılmasını engelliyor. Bu özelliklerin çalışması için \"Run ActiveX controls and plug-ins (Activex ve eklentileri çalıştır)\" seçeneğinin aktif yapılması gerekiyor. Kullanılamayan eklentiler ve hatalar konusunda daha fazla bilgi sahibi olun.",
+BrowseServerBlocked : "Kaynak tarayıcısı açılamadı. Tüm \"popup blocker\" programlarının devre dışı olduğundan emin olun. (Yahoo toolbar, Msn toolbar, Google toolbar gibi)",
+DialogBlocked		: "Diyalog açmak mümkün olmadı. Tüm \"Popup Blocker\" programlarının devre dışı olduğundan emin olun.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "Tamam",
+DlgBtnCancel		: "İptal",
+DlgBtnClose			: "Kapat",
+DlgBtnBrowseServer	: "Sunucuyu Gez",
+DlgAdvancedTag		: "Gelişmiş",
+DlgOpOther			: "<Diğer>",
+DlgInfoTab			: "Bilgi",
+DlgAlertUrl			: "Lütfen URL girin",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<tanımlanmamış>",
+DlgGenId			: "Kimlik",
+DlgGenLangDir		: "Dil Yönü",
+DlgGenLangDirLtr	: "Soldan Sağa (LTR)",
+DlgGenLangDirRtl	: "Sağdan Sola (RTL)",
+DlgGenLangCode		: "Dil Kodlaması",
+DlgGenAccessKey		: "Erişim Tuşu",
+DlgGenName			: "Ad",
+DlgGenTabIndex		: "Sekme İndeksi",
+DlgGenLongDescr		: "Uzun Tanımlı URL",
+DlgGenClass			: "Biçem Sayfası Sınıfları",
+DlgGenTitle			: "Danışma Başlığı",
+DlgGenContType		: "Danışma İçerik Türü",
+DlgGenLinkCharset	: "Bağlı Kaynak Karakter Gurubu",
+DlgGenStyle			: "Biçem",
+
+// Image Dialog
+DlgImgTitle			: "Resim Özellikleri",
+DlgImgInfoTab		: "Resim Bilgisi",
+DlgImgBtnUpload		: "Sunucuya Yolla",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Karşıya Yükle",
+DlgImgAlt			: "Alternatif Yazı",
+DlgImgWidth			: "Genişlik",
+DlgImgHeight		: "Yükseklik",
+DlgImgLockRatio		: "Oranı Kilitle",
+DlgBtnResetSize		: "Boyutu Başa Döndür",
+DlgImgBorder		: "Kenar",
+DlgImgHSpace		: "Yatay Boşluk",
+DlgImgVSpace		: "Dikey Boşluk",
+DlgImgAlign			: "Hizalama",
+DlgImgAlignLeft		: "Sol",
+DlgImgAlignAbsBottom: "Tam Altı",
+DlgImgAlignAbsMiddle: "Tam Ortası",
+DlgImgAlignBaseline	: "Taban Çizgisi",
+DlgImgAlignBottom	: "Alt",
+DlgImgAlignMiddle	: "Orta",
+DlgImgAlignRight	: "Sağ",
+DlgImgAlignTextTop	: "Yazı Tepeye",
+DlgImgAlignTop		: "Tepe",
+DlgImgPreview		: "Ön İzleme",
+DlgImgAlertUrl		: "Lütfen resmin URL'sini yazınız",
+DlgImgLinkTab		: "Köprü",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash Özellikleri",
+DlgFlashChkPlay		: "Otomatik Oynat",
+DlgFlashChkLoop		: "Döngü",
+DlgFlashChkMenu		: "Flash Menüsünü Kullan",
+DlgFlashScale		: "Boyutlandır",
+DlgFlashScaleAll	: "Hepsini Göster",
+DlgFlashScaleNoBorder	: "Kenar Yok",
+DlgFlashScaleFit	: "Tam Sığdır",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Köprü",
+DlgLnkInfoTab		: "Köprü Bilgisi",
+DlgLnkTargetTab		: "Hedef",
+
+DlgLnkType			: "Köprü Türü",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Bu sayfada çapa",
+DlgLnkTypeEMail		: "E-Posta",
+DlgLnkProto			: "Protokol",
+DlgLnkProtoOther	: "<diğer>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Çapa Seç",
+DlgLnkAnchorByName	: "Çapa Adı ile",
+DlgLnkAnchorById	: "Eleman Kimlik Numarası ile",
+DlgLnkNoAnchors		: "(Bu belgede hiç çapa yok)",
+DlgLnkEMail			: "E-Posta Adresi",
+DlgLnkEMailSubject	: "İleti Konusu",
+DlgLnkEMailBody		: "İleti Gövdesi",
+DlgLnkUpload		: "Karşıya Yükle",
+DlgLnkBtnUpload		: "Sunucuya Gönder",
+
+DlgLnkTarget		: "Hedef",
+DlgLnkTargetFrame	: "<çerçeve>",
+DlgLnkTargetPopup	: "<yeni açılan pencere>",
+DlgLnkTargetBlank	: "Yeni Pencere(_blank)",
+DlgLnkTargetParent	: "Anne Pencere (_parent)",
+DlgLnkTargetSelf	: "Kendi Penceresi (_self)",
+DlgLnkTargetTop		: "En Üst Pencere (_top)",
+DlgLnkTargetFrameName	: "Hedef Çerçeve Adı",
+DlgLnkPopWinName	: "Yeni Açılan Pencere Adı",
+DlgLnkPopWinFeat	: "Yeni Açılan Pencere Özellikleri",
+DlgLnkPopResize		: "Boyutlandırılabilir",
+DlgLnkPopLocation	: "Yer Çubuğu",
+DlgLnkPopMenu		: "Menü Çubuğu",
+DlgLnkPopScroll		: "Kaydırma Çubukları",
+DlgLnkPopStatus		: "Durum Çubuğu",
+DlgLnkPopToolbar	: "Araç Çubuğu",
+DlgLnkPopFullScrn	: "Tam Ekran (IE)",
+DlgLnkPopDependent	: "Bağımlı (Netscape)",
+DlgLnkPopWidth		: "Genişlik",
+DlgLnkPopHeight		: "Yükseklik",
+DlgLnkPopLeft		: "Sola Göre Konum",
+DlgLnkPopTop		: "Yukarıya Göre Konum",
+
+DlnLnkMsgNoUrl		: "Lütfen köprü URL'sini yazın",
+DlnLnkMsgNoEMail	: "Lütfen E-posta adresini yazın",
+DlnLnkMsgNoAnchor	: "Lütfen bir çapa seçin",
+DlnLnkMsgInvPopName	: "Açılır pencere adı abecesel bir karakterle başlamalı ve boşluk içermemelidir",
+
+// Color Dialog
+DlgColorTitle		: "Renk Seç",
+DlgColorBtnClear	: "Temizle",
+DlgColorHighlight	: "Vurgula",
+DlgColorSelected	: "Seçilmiş",
+
+// Smiley Dialog
+DlgSmileyTitle		: "İfade Ekle",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Özel Karakter Seç",
+
+// Table Dialog
+DlgTableTitle		: "Tablo Özellikleri",
+DlgTableRows		: "Satırlar",
+DlgTableColumns		: "Sütunlar",
+DlgTableBorder		: "Kenar Kalınlığı",
+DlgTableAlign		: "Hizalama",
+DlgTableAlignNotSet	: "<Tanımlanmamış>",
+DlgTableAlignLeft	: "Sol",
+DlgTableAlignCenter	: "Merkez",
+DlgTableAlignRight	: "Sağ",
+DlgTableWidth		: "Genişlik",
+DlgTableWidthPx		: "piksel",
+DlgTableWidthPc		: "yüzde",
+DlgTableHeight		: "Yükseklik",
+DlgTableCellSpace	: "Izgara kalınlığı",
+DlgTableCellPad		: "Izgara yazı arası",
+DlgTableCaption		: "Başlık",
+DlgTableSummary		: "Özet",
+
+// Table Cell Dialog
+DlgCellTitle		: "Hücre Özellikleri",
+DlgCellWidth		: "Genişlik",
+DlgCellWidthPx		: "piksel",
+DlgCellWidthPc		: "yüzde",
+DlgCellHeight		: "Yükseklik",
+DlgCellWordWrap		: "Sözcük Kaydır",
+DlgCellWordWrapNotSet	: "<Tanımlanmamış>",
+DlgCellWordWrapYes	: "Evet",
+DlgCellWordWrapNo	: "Hayır",
+DlgCellHorAlign		: "Yatay Hizalama",
+DlgCellHorAlignNotSet	: "<Tanımlanmamış>",
+DlgCellHorAlignLeft	: "Sol",
+DlgCellHorAlignCenter	: "Merkez",
+DlgCellHorAlignRight: "Sağ",
+DlgCellVerAlign		: "Dikey Hizalama",
+DlgCellVerAlignNotSet	: "<Tanımlanmamış>",
+DlgCellVerAlignTop	: "Tepe",
+DlgCellVerAlignMiddle	: "Orta",
+DlgCellVerAlignBottom	: "Alt",
+DlgCellVerAlignBaseline	: "Taban Çizgisi",
+DlgCellRowSpan		: "Satır Kapla",
+DlgCellCollSpan		: "Sütun Kapla",
+DlgCellBackColor	: "Arka Plan Rengi",
+DlgCellBorderColor	: "Kenar Rengi",
+DlgCellBtnSelect	: "Seç...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Bul",
+DlgFindFindBtn		: "Bul",
+DlgFindNotFoundMsg	: "Belirtilen yazı bulunamadı.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Değiştir",
+DlgReplaceFindLbl		: "Aranan:",
+DlgReplaceReplaceLbl	: "Bununla değiştir:",
+DlgReplaceCaseChk		: "Büyük/küçük harf duyarlı",
+DlgReplaceReplaceBtn	: "Değiştir",
+DlgReplaceReplAllBtn	: "Tümünü Değiştir",
+DlgReplaceWordChk		: "Kelimenin tamamı uysun",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl+X) tuşlarını kullanın.",
+PasteErrorCopy	: "Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl+C) tuşlarını kullanın.",
+
+PasteAsText		: "Düz Metin Olarak Yapıştır",
+PasteFromWord	: "Word'den yapıştır",
+
+DlgPasteMsg2	: "Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Yazı Tipi tanımlarını yoksay",
+DlgPasteRemoveStyles	: "Biçem Tanımlarını çıkar",
+
+// Color Picker
+ColorAutomatic	: "Otomatik",
+ColorMoreColors	: "Diğer renkler...",
+
+// Document Properties
+DocProps		: "Belge Özellikleri",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Çapa Özellikleri",
+DlgAnchorName		: "Çapa Adı",
+DlgAnchorErrorName	: "Lütfen çapa için ad giriniz",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Sözlükte Yok",
+DlgSpellChangeTo		: "Şuna değiştir:",
+DlgSpellBtnIgnore		: "Yoksay",
+DlgSpellBtnIgnoreAll	: "Tümünü Yoksay",
+DlgSpellBtnReplace		: "Değiştir",
+DlgSpellBtnReplaceAll	: "Tümünü Değiştir",
+DlgSpellBtnUndo			: "Geri Al",
+DlgSpellNoSuggestions	: "- Öneri Yok -",
+DlgSpellProgress		: "Yazım denetimi işlemde...",
+DlgSpellNoMispell		: "Yazım denetimi tamamlandı: Yanlış yazıma rastlanmadı",
+DlgSpellNoChanges		: "Yazım denetimi tamamlandı: Hiçbir kelime değiştirilmedi",
+DlgSpellOneChange		: "Yazım denetimi tamamlandı: Bir kelime değiştirildi",
+DlgSpellManyChanges		: "Yazım denetimi tamamlandı: %1 kelime değiştirildi",
+
+IeSpellDownload			: "Yazım denetimi yüklenmemiş. Şimdi yüklemek ister misiniz?",
+
+// Button Dialog
+DlgButtonText		: "Metin (Değer)",
+DlgButtonType		: "Tip",
+DlgButtonTypeBtn	: "Düğme",
+DlgButtonTypeSbm	: "Gönder",
+DlgButtonTypeRst	: "Sıfırla",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Ad",
+DlgCheckboxValue	: "Değer",
+DlgCheckboxSelected	: "Seçili",
+
+// Form Dialog
+DlgFormName		: "Ad",
+DlgFormAction	: "İşlem",
+DlgFormMethod	: "Yöntem",
+
+// Select Field Dialog
+DlgSelectName		: "Ad",
+DlgSelectValue		: "Değer",
+DlgSelectSize		: "Boyut",
+DlgSelectLines		: "satır",
+DlgSelectChkMulti	: "Çoklu seçime izin ver",
+DlgSelectOpAvail	: "Mevcut Seçenekler",
+DlgSelectOpText		: "Metin",
+DlgSelectOpValue	: "Değer",
+DlgSelectBtnAdd		: "Ekle",
+DlgSelectBtnModify	: "Düzenle",
+DlgSelectBtnUp		: "Yukarı",
+DlgSelectBtnDown	: "Aşağı",
+DlgSelectBtnSetValue : "Seçili değer olarak ata",
+DlgSelectBtnDelete	: "Sil",
+
+// Textarea Dialog
+DlgTextareaName	: "Ad",
+DlgTextareaCols	: "Sütunlar",
+DlgTextareaRows	: "Satırlar",
+
+// Text Field Dialog
+DlgTextName			: "Ad",
+DlgTextValue		: "Değer",
+DlgTextCharWidth	: "Karakter Genişliği",
+DlgTextMaxChars		: "En Fazla Karakter",
+DlgTextType			: "Tür",
+DlgTextTypeText		: "Metin",
+DlgTextTypePass		: "Parola",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Ad",
+DlgHiddenValue	: "Değer",
+
+// Bulleted List Dialog
+BulletedListProp	: "Simgeli Liste Özellikleri",
+NumberedListProp	: "Numaralı Liste Özellikleri",
+DlgLstStart			: "Başlangıç",
+DlgLstType			: "Tip",
+DlgLstTypeCircle	: "Çember",
+DlgLstTypeDisc		: "Disk",
+DlgLstTypeSquare	: "Kare",
+DlgLstTypeNumbers	: "Sayılar (1, 2, 3)",
+DlgLstTypeLCase		: "Küçük Harfler (a, b, c)",
+DlgLstTypeUCase		: "Büyük Harfler (A, B, C)",
+DlgLstTypeSRoman	: "Küçük Romen Rakamları (i, ii, iii)",
+DlgLstTypeLRoman	: "Büyük Romen Rakamları (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Genel",
+DlgDocBackTab		: "Arka Plan",
+DlgDocColorsTab		: "Renkler ve Kenar Boşlukları",
+DlgDocMetaTab		: "Tanım Bilgisi (Meta)",
+
+DlgDocPageTitle		: "Sayfa Başlığı",
+DlgDocLangDir		: "Dil Yönü",
+DlgDocLangDirLTR	: "Soldan Sağa (LTR)",
+DlgDocLangDirRTL	: "Sağdan Sola (RTL)",
+DlgDocLangCode		: "Dil Kodu",
+DlgDocCharSet		: "Karakter Kümesi Kodlaması",
+DlgDocCharSetCE		: "Orta Avrupa",
+DlgDocCharSetCT		: "Geleneksel Çince (Big5)",
+DlgDocCharSetCR		: "Kiril",
+DlgDocCharSetGR		: "Yunanca",
+DlgDocCharSetJP		: "Japonca",
+DlgDocCharSetKR		: "Korece",
+DlgDocCharSetTR		: "Türkçe",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Batı Avrupa",
+DlgDocCharSetOther	: "Diğer Karakter Kümesi Kodlaması",
+
+DlgDocDocType		: "Belge Türü Başlığı",
+DlgDocDocTypeOther	: "Diğer Belge Türü Başlığı",
+DlgDocIncXHTML		: "XHTML Bildirimlerini Dahil Et",
+DlgDocBgColor		: "Arka Plan Rengi",
+DlgDocBgImage		: "Arka Plan Resim URLsi",
+DlgDocBgNoScroll	: "Sabit Arka Plan",
+DlgDocCText			: "Metin",
+DlgDocCLink			: "Köprü",
+DlgDocCVisited		: "Ziyaret Edilmiş Köprü",
+DlgDocCActive		: "Etkin Köprü",
+DlgDocMargins		: "Kenar Boşlukları",
+DlgDocMaTop			: "Tepe",
+DlgDocMaLeft		: "Sol",
+DlgDocMaRight		: "Sağ",
+DlgDocMaBottom		: "Alt",
+DlgDocMeIndex		: "Belge Dizinleme Anahtar Kelimeleri (virgülle ayrılmış)",
+DlgDocMeDescr		: "Belge Tanımı",
+DlgDocMeAuthor		: "Yazar",
+DlgDocMeCopy		: "Telif",
+DlgDocPreview		: "Ön İzleme",
+
+// Templates Dialog
+Templates			: "Şablonlar",
+DlgTemplatesTitle	: "İçerik Şablonları",
+DlgTemplatesSelMsg	: "Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):",
+DlgTemplatesLoading	: "Şablon listesi yüklenmekte. Lütfen bekleyiniz...",
+DlgTemplatesNoTpl	: "(Belirli bir şablon seçilmedi)",
+DlgTemplatesReplace	: "Mevcut içerik ile değiştir",
+
+// About Dialog
+DlgAboutAboutTab	: "Hakkında",
+DlgAboutBrowserInfoTab	: "Gezgin Bilgisi",
+DlgAboutLicenseTab	: "Lisans",
+DlgAboutVersion		: "sürüm",
+DlgAboutInfo		: "Daha fazla bilgi için:",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/uk.js b/modules/editor/skins/fckeditor/editor/lang/uk.js
new file mode 100644
index 000000000..683b13d30
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/uk.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Ukrainian language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Згорнути панель інструментів",
+ToolbarExpand		: "Розгорнути панель інструментів",
+
+// Toolbar Items and Context Menu
+Save				: "Зберегти",
+NewPage				: "Нова сторінка",
+Preview				: "Попередній перегляд",
+Cut					: "Вирізати",
+Copy				: "Копіювати",
+Paste				: "Вставити",
+PasteText			: "Вставити тільки текст",
+PasteWord			: "Вставити з Word",
+Print				: "Друк",
+SelectAll			: "Виділити все",
+RemoveFormat		: "Прибрати форматування",
+InsertLinkLbl		: "Посилання",
+InsertLink			: "Вставити/Редагувати посилання",
+RemoveLink			: "Знищити посилання",
+VisitLink			: "Open Link",	//MISSING
+Anchor				: "Вставити/Редагувати якір",
+AnchorDelete		: "Remove Anchor",	//MISSING
+InsertImageLbl		: "Зображення",
+InsertImage			: "Вставити/Редагувати зображення",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Вставити/Редагувати Flash",
+InsertTableLbl		: "Таблиця",
+InsertTable			: "Вставити/Редагувати таблицю",
+InsertLineLbl		: "Лінія",
+InsertLine			: "Вставити горизонтальну лінію",
+InsertSpecialCharLbl: "Спеціальний символ",
+InsertSpecialChar	: "Вставити спеціальний символ",
+InsertSmileyLbl		: "Смайлик",
+InsertSmiley		: "Вставити смайлик",
+About				: "Про FCKeditor",
+Bold				: "Жирний",
+Italic				: "Курсив",
+Underline			: "Підкреслений",
+StrikeThrough		: "Закреслений",
+Subscript			: "Підрядковий індекс",
+Superscript			: "Надрядковий индекс",
+LeftJustify			: "По лівому краю",
+CenterJustify		: "По центру",
+RightJustify		: "По правому краю",
+BlockJustify		: "По ширині",
+DecreaseIndent		: "Зменшити відступ",
+IncreaseIndent		: "Збільшити відступ",
+Blockquote			: "Blockquote",	//MISSING
+CreateDiv			: "Create Div Container",	//MISSING
+EditDiv				: "Edit Div Container",	//MISSING
+DeleteDiv			: "Remove Div Container",	//MISSING
+Undo				: "Повернути",
+Redo				: "Повторити",
+NumberedListLbl		: "Нумерований список",
+NumberedList		: "Вставити/Видалити нумерований список",
+BulletedListLbl		: "Маркований список",
+BulletedList		: "Вставити/Видалити маркований список",
+ShowTableBorders	: "Показати бордюри таблиці",
+ShowDetails			: "Показати деталі",
+Style				: "Стиль",
+FontFormat			: "Форматування",
+Font				: "Шрифт",
+FontSize			: "Розмір",
+TextColor			: "Колір тексту",
+BGColor				: "Колір фону",
+Source				: "Джерело",
+Find				: "Пошук",
+Replace				: "Заміна",
+SpellCheck			: "Перевірити орфографію",
+UniversalKeyboard	: "Універсальна клавіатура",
+PageBreakLbl		: "Розривши сторінки",
+PageBreak			: "Вставити розривши сторінки",
+
+Form			: "Форма",
+Checkbox		: "Флагова кнопка",
+RadioButton		: "Кнопка вибору",
+TextField		: "Текстове поле",
+Textarea		: "Текстова область",
+HiddenField		: "Приховане поле",
+Button			: "Кнопка",
+SelectionField	: "Список",
+ImageButton		: "Кнопка із зображенням",
+
+FitWindow		: "Розвернути вікно редактора",
+ShowBlocks		: "Show Blocks",	//MISSING
+
+// Context Menu
+EditLink			: "Вставити посилання",
+CellCM				: "Осередок",
+RowCM				: "Рядок",
+ColumnCM			: "Колонка",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Видалити строки",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
+DeleteColumns		: "Видалити колонки",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
+DeleteCells			: "Видалити комірки",
+MergeCells			: "Об'єднати комірки",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
+TableDelete			: "Видалити таблицю",
+CellProperties		: "Властивості комірки",
+TableProperties		: "Властивості таблиці",
+ImageProperties		: "Властивості зображення",
+FlashProperties		: "Властивості Flash",
+
+AnchorProp			: "Властивості якоря",
+ButtonProp			: "Властивості кнопки",
+CheckboxProp		: "Властивості флагової кнопки",
+HiddenFieldProp		: "Властивості прихованого поля",
+RadioButtonProp		: "Властивості кнопки вибору",
+ImageButtonProp		: "Властивості кнопки із зображенням",
+TextFieldProp		: "Властивості текстового поля",
+SelectionFieldProp	: "Властивості списку",
+TextareaProp		: "Властивості текстової області",
+FormProp			: "Властивості форми",
+
+FontFormats			: "Нормальний;Форматований;Адреса;Заголовок 1;Заголовок 2;Заголовок 3;Заголовок 4;Заголовок 5;Заголовок 6;Нормальний (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Обробка XHTML. Зачекайте, будь ласка...",
+Done				: "Зроблено",
+PasteWordConfirm	: "Текст, що ви хочете вставити, схожий на копійований з Word. Ви хочете очистити його перед вставкою?",
+NotCompatiblePaste	: "Ця команда доступна для Internet Explorer версії 5.5 або вище. Ви хочете вставити без очищення?",
+UnknownToolbarItem	: "Невідомий елемент панелі інструментів \"%1\"",
+UnknownCommand		: "Невідоме ім'я команди \"%1\"",
+NotImplemented		: "Команда не реалізована",
+UnknownToolbarSet	: "Панель інструментів \"%1\" не існує",
+NoActiveX			: "Настройки безпеки вашого браузера можуть обмежувати деякі властивості редактора. Ви повинні включити опцію \"Запускати елементи управління ACTIVEX і плугіни\". Ви можете бачити помилки і помічати відсутність можливостей.",
+BrowseServerBlocked : "Ресурси браузера не можуть бути відкриті. Перевірте що блокування спливаючих вікон вимкнені.",
+DialogBlocked		: "Не можливо відкрити вікно діалогу. Перевірте що блокування спливаючих вікон вимкнені.",
+VisitLinkBlocked	: "It was not possible to open a new window. Make sure all popup blockers are disabled.",	//MISSING
+
+// Dialogs
+DlgBtnOK			: "ОК",
+DlgBtnCancel		: "Скасувати",
+DlgBtnClose			: "Зачинити",
+DlgBtnBrowseServer	: "Передивитися на сервері",
+DlgAdvancedTag		: "Розширений",
+DlgOpOther			: "<Інше>",
+DlgInfoTab			: "Інфо",
+DlgAlertUrl			: "Вставте, будь-ласка, URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<не визначено>",
+DlgGenId			: "Ідентифікатор",
+DlgGenLangDir		: "Напрямок мови",
+DlgGenLangDirLtr	: "Зліва на право (LTR)",
+DlgGenLangDirRtl	: "Зправа на ліво (RTL)",
+DlgGenLangCode		: "Мова",
+DlgGenAccessKey		: "Гаряча клавіша",
+DlgGenName			: "Им'я",
+DlgGenTabIndex		: "Послідовність переходу",
+DlgGenLongDescr		: "Довгий опис URL",
+DlgGenClass			: "Клас CSS",
+DlgGenTitle			: "Заголовок",
+DlgGenContType		: "Тип вмісту",
+DlgGenLinkCharset	: "Кодировка",
+DlgGenStyle			: "Стиль CSS",
+
+// Image Dialog
+DlgImgTitle			: "Властивості зображення",
+DlgImgInfoTab		: "Інформація про изображении",
+DlgImgBtnUpload		: "Надіслати на сервер",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Закачати",
+DlgImgAlt			: "Альтернативний текст",
+DlgImgWidth			: "Ширина",
+DlgImgHeight		: "Висота",
+DlgImgLockRatio		: "Зберегти пропорції",
+DlgBtnResetSize		: "Скинути розмір",
+DlgImgBorder		: "Бордюр",
+DlgImgHSpace		: "Горизонтальний відступ",
+DlgImgVSpace		: "Вертикальний відступ",
+DlgImgAlign			: "Вирівнювання",
+DlgImgAlignLeft		: "По лівому краю",
+DlgImgAlignAbsBottom: "Абс по низу",
+DlgImgAlignAbsMiddle: "Абс по середині",
+DlgImgAlignBaseline	: "По базовій лінії",
+DlgImgAlignBottom	: "По низу",
+DlgImgAlignMiddle	: "По середині",
+DlgImgAlignRight	: "По правому краю",
+DlgImgAlignTextTop	: "Текст на верху",
+DlgImgAlignTop		: "По верху",
+DlgImgPreview		: "Попередній перегляд",
+DlgImgAlertUrl		: "Будь ласка, введіть URL зображення",
+DlgImgLinkTab		: "Посилання",
+
+// Flash Dialog
+DlgFlashTitle		: "Властивості Flash",
+DlgFlashChkPlay		: "Авто програвання",
+DlgFlashChkLoop		: "Зациклити",
+DlgFlashChkMenu		: "Дозволити меню Flash",
+DlgFlashScale		: "Масштаб",
+DlgFlashScaleAll	: "Показати всі",
+DlgFlashScaleNoBorder	: "Без рамки",
+DlgFlashScaleFit	: "Дійсний розмір",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Посилання",
+DlgLnkInfoTab		: "Інформація посилання",
+DlgLnkTargetTab		: "Ціль",
+
+DlgLnkType			: "Тип посилання",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Якір на цю сторінку",
+DlgLnkTypeEMail		: "Эл. пошта",
+DlgLnkProto			: "Протокол",
+DlgLnkProtoOther	: "<інше>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Оберіть якір",
+DlgLnkAnchorByName	: "За ім'ям якоря",
+DlgLnkAnchorById	: "За ідентифікатором елемента",
+DlgLnkNoAnchors		: "(Немає якорів доступних в цьому документі)",
+DlgLnkEMail			: "Адреса ел. пошти",
+DlgLnkEMailSubject	: "Тема листа",
+DlgLnkEMailBody		: "Тіло повідомлення",
+DlgLnkUpload		: "Закачати",
+DlgLnkBtnUpload		: "Переслати на сервер",
+
+DlgLnkTarget		: "Ціль",
+DlgLnkTargetFrame	: "<фрейм>",
+DlgLnkTargetPopup	: "<спливаюче вікно>",
+DlgLnkTargetBlank	: "Нове вікно (_blank)",
+DlgLnkTargetParent	: "Батьківське вікно (_parent)",
+DlgLnkTargetSelf	: "Теж вікно (_self)",
+DlgLnkTargetTop		: "Найвище вікно (_top)",
+DlgLnkTargetFrameName	: "Ім'я целевого фрейма",
+DlgLnkPopWinName	: "Ім'я спливаючого вікна",
+DlgLnkPopWinFeat	: "Властивості спливаючого вікна",
+DlgLnkPopResize		: "Змінюється в розмірах",
+DlgLnkPopLocation	: "Панель локації",
+DlgLnkPopMenu		: "Панель меню",
+DlgLnkPopScroll		: "Полоси прокрутки",
+DlgLnkPopStatus		: "Строка статусу",
+DlgLnkPopToolbar	: "Панель інструментів",
+DlgLnkPopFullScrn	: "Повний екран (IE)",
+DlgLnkPopDependent	: "Залежний (Netscape)",
+DlgLnkPopWidth		: "Ширина",
+DlgLnkPopHeight		: "Висота",
+DlgLnkPopLeft		: "Позиція зліва",
+DlgLnkPopTop		: "Позиція зверху",
+
+DlnLnkMsgNoUrl		: "Будь ласка, занесіть URL посилання",
+DlnLnkMsgNoEMail	: "Будь ласка, занесіть адрес эл. почты",
+DlnLnkMsgNoAnchor	: "Будь ласка, оберіть якір",
+DlnLnkMsgInvPopName	: "Назва спливаючого вікна повинна починатися букви і не може містити пропусків",
+
+// Color Dialog
+DlgColorTitle		: "Оберіть колір",
+DlgColorBtnClear	: "Очистити",
+DlgColorHighlight	: "Підсвічений",
+DlgColorSelected	: "Обраний",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Вставити смайлик",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Оберіть спеціальний символ",
+
+// Table Dialog
+DlgTableTitle		: "Властивості таблиці",
+DlgTableRows		: "Строки",
+DlgTableColumns		: "Колонки",
+DlgTableBorder		: "Розмір бордюра",
+DlgTableAlign		: "Вирівнювання",
+DlgTableAlignNotSet	: "<Не вст.>",
+DlgTableAlignLeft	: "Зліва",
+DlgTableAlignCenter	: "По центру",
+DlgTableAlignRight	: "Зправа",
+DlgTableWidth		: "Ширина",
+DlgTableWidthPx		: "пікселів",
+DlgTableWidthPc		: "відсотків",
+DlgTableHeight		: "Висота",
+DlgTableCellSpace	: "Проміжок (spacing)",
+DlgTableCellPad		: "Відступ (padding)",
+DlgTableCaption		: "Заголовок",
+DlgTableSummary		: "Резюме",
+
+// Table Cell Dialog
+DlgCellTitle		: "Властивості комірки",
+DlgCellWidth		: "Ширина",
+DlgCellWidthPx		: "пікселів",
+DlgCellWidthPc		: "відсотків",
+DlgCellHeight		: "Висота",
+DlgCellWordWrap		: "Згортання текста",
+DlgCellWordWrapNotSet	: "<Не вст.>",
+DlgCellWordWrapYes	: "Так",
+DlgCellWordWrapNo	: "Ні",
+DlgCellHorAlign		: "Горизонтальне вирівнювання",
+DlgCellHorAlignNotSet	: "<Не вст.>",
+DlgCellHorAlignLeft	: "Зліва",
+DlgCellHorAlignCenter	: "По центру",
+DlgCellHorAlignRight: "Зправа",
+DlgCellVerAlign		: "Вертикальное вирівнювання",
+DlgCellVerAlignNotSet	: "<Не вст.>",
+DlgCellVerAlignTop	: "Зверху",
+DlgCellVerAlignMiddle	: "Посередині",
+DlgCellVerAlignBottom	: "Знизу",
+DlgCellVerAlignBaseline	: "По базовій лінії",
+DlgCellRowSpan		: "Діапазон строк (span)",
+DlgCellCollSpan		: "Діапазон колонок (span)",
+DlgCellBackColor	: "Колір фона",
+DlgCellBorderColor	: "Колір бордюра",
+DlgCellBtnSelect	: "Оберіть...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
+
+// Find Dialog
+DlgFindTitle		: "Пошук",
+DlgFindFindBtn		: "Пошук",
+DlgFindNotFoundMsg	: "Вказаний текст не знайдений.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Замінити",
+DlgReplaceFindLbl		: "Шукати:",
+DlgReplaceReplaceLbl	: "Замінити на:",
+DlgReplaceCaseChk		: "Учитывать регистр",
+DlgReplaceReplaceBtn	: "Замінити",
+DlgReplaceReplAllBtn	: "Замінити все",
+DlgReplaceWordChk		: "Збіг цілих слів",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Настройки безпеки вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl+X).",
+PasteErrorCopy	: "Настройки безпеки вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl+C).",
+
+PasteAsText		: "Вставити тільки текст",
+PasteFromWord	: "Вставити з Word",
+
+DlgPasteMsg2	: "Будь-ласка, вставте з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl+V</STRONG>) та натисніть <STRONG>OK</STRONG>.",
+DlgPasteSec		: "Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями вашого браузера. Вам потрібно вставити інформацію повторно в це вікно.",
+DlgPasteIgnoreFont		: "Ігнорувати налаштування шрифтів",
+DlgPasteRemoveStyles	: "Видалити налаштування стилів",
+
+// Color Picker
+ColorAutomatic	: "Автоматичний",
+ColorMoreColors	: "Кольори...",
+
+// Document Properties
+DocProps		: "Властивості документа",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Властивості якоря",
+DlgAnchorName		: "Ім'я якоря",
+DlgAnchorErrorName	: "Будь ласка, занесіть ім'я якоря",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Не має в словнику",
+DlgSpellChangeTo		: "Замінити на",
+DlgSpellBtnIgnore		: "Ігнорувати",
+DlgSpellBtnIgnoreAll	: "Ігнорувати все",
+DlgSpellBtnReplace		: "Замінити",
+DlgSpellBtnReplaceAll	: "Замінити все",
+DlgSpellBtnUndo			: "Назад",
+DlgSpellNoSuggestions	: "- Немає припущень -",
+DlgSpellProgress		: "Виконується перевірка орфографії...",
+DlgSpellNoMispell		: "Перевірку орфографії завершено: помилок не знайдено",
+DlgSpellNoChanges		: "Перевірку орфографії завершено: жодне слово не змінено",
+DlgSpellOneChange		: "Перевірку орфографії завершено: змінено одно слово",
+DlgSpellManyChanges		: "Перевірку орфографії завершено: 1% слів змінено",
+
+IeSpellDownload			: "Модуль перевірки орфографії не встановлено. Бажаєтн завантажити його зараз?",
+
+// Button Dialog
+DlgButtonText		: "Текст (Значення)",
+DlgButtonType		: "Тип",
+DlgButtonTypeBtn	: "Кнопка",
+DlgButtonTypeSbm	: "Відправити",
+DlgButtonTypeRst	: "Скинути",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Ім'я",
+DlgCheckboxValue	: "Значення",
+DlgCheckboxSelected	: "Обрана",
+
+// Form Dialog
+DlgFormName		: "Ім'я",
+DlgFormAction	: "Дія",
+DlgFormMethod	: "Метод",
+
+// Select Field Dialog
+DlgSelectName		: "Ім'я",
+DlgSelectValue		: "Значення",
+DlgSelectSize		: "Розмір",
+DlgSelectLines		: "лінії",
+DlgSelectChkMulti	: "Дозволити обрання декількох позицій",
+DlgSelectOpAvail	: "Доступні варіанти",
+DlgSelectOpText		: "Текст",
+DlgSelectOpValue	: "Значення",
+DlgSelectBtnAdd		: "Добавити",
+DlgSelectBtnModify	: "Змінити",
+DlgSelectBtnUp		: "Вгору",
+DlgSelectBtnDown	: "Вниз",
+DlgSelectBtnSetValue : "Встановити як вибране значення",
+DlgSelectBtnDelete	: "Видалити",
+
+// Textarea Dialog
+DlgTextareaName	: "Ім'я",
+DlgTextareaCols	: "Колонки",
+DlgTextareaRows	: "Строки",
+
+// Text Field Dialog
+DlgTextName			: "Ім'я",
+DlgTextValue		: "Значення",
+DlgTextCharWidth	: "Ширина",
+DlgTextMaxChars		: "Макс. кіл-ть символів",
+DlgTextType			: "Тип",
+DlgTextTypeText		: "Текст",
+DlgTextTypePass		: "Пароль",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Ім'я",
+DlgHiddenValue	: "Значення",
+
+// Bulleted List Dialog
+BulletedListProp	: "Властивості маркованого списка",
+NumberedListProp	: "Властивості нумерованного списка",
+DlgLstStart			: "Початок",
+DlgLstType			: "Тип",
+DlgLstTypeCircle	: "Коло",
+DlgLstTypeDisc		: "Диск",
+DlgLstTypeSquare	: "Квадрат",
+DlgLstTypeNumbers	: "Номери (1, 2, 3)",
+DlgLstTypeLCase		: "Літери нижнього регістра(a, b, c)",
+DlgLstTypeUCase		: "Букви верхнього регістра (A, B, C)",
+DlgLstTypeSRoman	: "Малі римські літери (i, ii, iii)",
+DlgLstTypeLRoman	: "Великі римські літери (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Загальні",
+DlgDocBackTab		: "Заднє тло",
+DlgDocColorsTab		: "Кольори та відступи",
+DlgDocMetaTab		: "Мета дані",
+
+DlgDocPageTitle		: "Заголовок сторінки",
+DlgDocLangDir		: "Напрямок тексту",
+DlgDocLangDirLTR	: "Зліва на право (LTR)",
+DlgDocLangDirRTL	: "Зправа на лево (RTL)",
+DlgDocLangCode		: "Код мови",
+DlgDocCharSet		: "Кодування набору символів",
+DlgDocCharSetCE		: "Центрально-європейська",
+DlgDocCharSetCT		: "Китайська традиційна (Big5)",
+DlgDocCharSetCR		: "Кирилиця",
+DlgDocCharSetGR		: "Грецька",
+DlgDocCharSetJP		: "Японська",
+DlgDocCharSetKR		: "Корейська",
+DlgDocCharSetTR		: "Турецька",
+DlgDocCharSetUN		: "Юнікод (UTF-8)",
+DlgDocCharSetWE		: "Західно-европейская",
+DlgDocCharSetOther	: "Інше кодування набору символів",
+
+DlgDocDocType		: "Заголовок типу документу",
+DlgDocDocTypeOther	: "Інший заголовок типу документу",
+DlgDocIncXHTML		: "Ввімкнути XHTML оголошення",
+DlgDocBgColor		: "Колір тла",
+DlgDocBgImage		: "URL зображення тла",
+DlgDocBgNoScroll	: "Тло без прокрутки",
+DlgDocCText			: "Текст",
+DlgDocCLink			: "Посилання",
+DlgDocCVisited		: "Відвідане посилання",
+DlgDocCActive		: "Активне посилання",
+DlgDocMargins		: "Відступи сторінки",
+DlgDocMaTop			: "Верхній",
+DlgDocMaLeft		: "Лівий",
+DlgDocMaRight		: "Правий",
+DlgDocMaBottom		: "Нижній",
+DlgDocMeIndex		: "Ключові слова документа (розділені комами)",
+DlgDocMeDescr		: "Опис документа",
+DlgDocMeAuthor		: "Автор",
+DlgDocMeCopy		: "Авторські права",
+DlgDocPreview		: "Попередній перегляд",
+
+// Templates Dialog
+Templates			: "Шаблони",
+DlgTemplatesTitle	: "Шаблони змісту",
+DlgTemplatesSelMsg	: "Оберіть, будь ласка, шаблон для відкриття в редакторі<br>(поточний зміст буде втрачено):",
+DlgTemplatesLoading	: "Завантаження списку шаблонів. Зачекайте, будь ласка...",
+DlgTemplatesNoTpl	: "(Не визначено жодного шаблону)",
+DlgTemplatesReplace	: "Замінити поточний вміст",
+
+// About Dialog
+DlgAboutAboutTab	: "Про програму",
+DlgAboutBrowserInfoTab	: "Інформація браузера",
+DlgAboutLicenseTab	: "Ліцензія",
+DlgAboutVersion		: "Версія",
+DlgAboutInfo		: "Додаткову інформацію дивіться на ",
+
+// Div Dialog
+DlgDivGeneralTab	: "General",	//MISSING
+DlgDivAdvancedTab	: "Advanced",	//MISSING
+DlgDivStyle		: "Style",	//MISSING
+DlgDivInlineStyle	: "Inline Style"	//MISSING
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/vi.js b/modules/editor/skins/fckeditor/editor/lang/vi.js
new file mode 100644
index 000000000..29940567a
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/vi.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Vietnamese language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "Thu gọn Thanh công cụ",
+ToolbarExpand		: "Mở rộng Thanh công cụ",
+
+// Toolbar Items and Context Menu
+Save				: "Lưu",
+NewPage				: "Trang mới",
+Preview				: "Xem trước",
+Cut					: "Cắt",
+Copy				: "Sao chép",
+Paste				: "Dán",
+PasteText			: "Dán theo dạng văn bản thuần",
+PasteWord			: "Dán với định dạng Word",
+Print				: "In",
+SelectAll			: "Chọn Tất cả",
+RemoveFormat		: "Xoá Định dạng",
+InsertLinkLbl		: "Liên kết",
+InsertLink			: "Chèn/Sửa Liên kết",
+RemoveLink			: "Xoá Liên kết",
+VisitLink			: "Mở Liên Kết",
+Anchor				: "Chèn/Sửa Neo",
+AnchorDelete		: "Gỡ bỏ Neo",
+InsertImageLbl		: "Hình ảnh",
+InsertImage			: "Chèn/Sửa Hình ảnh",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "Chèn/Sửa Flash",
+InsertTableLbl		: "Bảng",
+InsertTable			: "Chèn/Sửa Bảng",
+InsertLineLbl		: "Đường phân cách ngang",
+InsertLine			: "Chèn Đường phân cách ngang",
+InsertSpecialCharLbl: "Ký tự đặc biệt",
+InsertSpecialChar	: "Chèn Ký tự đặc biệt",
+InsertSmileyLbl		: "Hình biểu lộ cảm xúc (mặt cười)",
+InsertSmiley		: "Chèn Hình biểu lộ cảm xúc (mặt cười)",
+About				: "Giới thiệu về FCKeditor",
+Bold				: "Đậm",
+Italic				: "Nghiêng",
+Underline			: "Gạch chân",
+StrikeThrough		: "Gạch xuyên ngang",
+Subscript			: "Chỉ số dưới",
+Superscript			: "Chỉ số trên",
+LeftJustify			: "Canh trái",
+CenterJustify		: "Canh giữa",
+RightJustify		: "Canh phải",
+BlockJustify		: "Canh đều",
+DecreaseIndent		: "Dịch ra ngoài",
+IncreaseIndent		: "Dịch vào trong",
+Blockquote			: "Khối Trích dẫn",
+CreateDiv			: "Tạo Div Container",
+EditDiv				: "Chỉnh sửa Div Container",
+DeleteDiv			: "Gỡ bỏ Div Container",
+Undo				: "Khôi phục thao tác",
+Redo				: "Làm lại thao tác",
+NumberedListLbl		: "Danh sách có thứ tự",
+NumberedList		: "Chèn/Xoá Danh sách có thứ tự",
+BulletedListLbl		: "Danh sách không thứ tự",
+BulletedList		: "Chèn/Xoá Danh sách không thứ tự",
+ShowTableBorders	: "Hiển thị Đường viền bảng",
+ShowDetails			: "Hiển thị Chi tiết",
+Style				: "Mẫu",
+FontFormat			: "Định dạng",
+Font				: "Phông",
+FontSize			: "Cỡ chữ",
+TextColor			: "Màu chữ",
+BGColor				: "Màu nền",
+Source				: "Mã HTML",
+Find				: "Tìm kiếm",
+Replace				: "Thay thế",
+SpellCheck			: "Kiểm tra Chính tả",
+UniversalKeyboard	: "Bàn phím Quốc tế",
+PageBreakLbl		: "Ngắt trang",
+PageBreak			: "Chèn Ngắt trang",
+
+Form			: "Biểu mẫu",
+Checkbox		: "Nút kiểm",
+RadioButton		: "Nút chọn",
+TextField		: "Trường văn bản",
+Textarea		: "Vùng văn bản",
+HiddenField		: "Trường ẩn",
+Button			: "Nút",
+SelectionField	: "Ô chọn",
+ImageButton		: "Nút hình ảnh",
+
+FitWindow		: "Mở rộng tối đa kích thước trình biên tập",
+ShowBlocks		: "Hiển thị các Khối",
+
+// Context Menu
+EditLink			: "Sửa Liên kết",
+CellCM				: "Ô",
+RowCM				: "Hàng",
+ColumnCM			: "Cột",
+InsertRowAfter		: "Chèn Hàng Phía sau",
+InsertRowBefore		: "Chèn Hàng Phía trước",
+DeleteRows			: "Xoá Hàng",
+InsertColumnAfter	: "Chèn Cột Phía sau",
+InsertColumnBefore	: "Chèn Cột Phía trước",
+DeleteColumns		: "Xoá Cột",
+InsertCellAfter		: "Chèn Ô Phía sau",
+InsertCellBefore	: "Chèn Ô Phía trước",
+DeleteCells			: "Xoá Ô",
+MergeCells			: "Kết hợp Ô",
+MergeRight			: "Kết hợp Sang phải",
+MergeDown			: "Kết hợp Xuống dưới",
+HorizontalSplitCell	: "Tách ngang Ô",
+VerticalSplitCell	: "Tách dọc Ô",
+TableDelete			: "Xóa Bảng",
+CellProperties		: "Thuộc tính Ô",
+TableProperties		: "Thuộc tính Bảng",
+ImageProperties		: "Thuộc tính Hình ảnh",
+FlashProperties		: "Thuộc tính Flash",
+
+AnchorProp			: "Thuộc tính Neo",
+ButtonProp			: "Thuộc tính Nút",
+CheckboxProp		: "Thuộc tính Nút kiểm",
+HiddenFieldProp		: "Thuộc tính Trường ẩn",
+RadioButtonProp		: "Thuộc tính Nút chọn",
+ImageButtonProp		: "Thuộc tính Nút hình ảnh",
+TextFieldProp		: "Thuộc tính Trường văn bản",
+SelectionFieldProp	: "Thuộc tính Ô chọn",
+TextareaProp		: "Thuộc tính Vùng văn bản",
+FormProp			: "Thuộc tính Biểu mẫu",
+
+FontFormats			: "Normal;Formatted;Address;Heading 1;Heading 2;Heading 3;Heading 4;Heading 5;Heading 6;Normal (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "Đang xử lý XHTML. Vui lòng đợi trong giây lát...",
+Done				: "Đã hoàn thành",
+PasteWordConfirm	: "Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?",
+NotCompatiblePaste	: "Lệnh này chỉ được hỗ trợ từ trình duyệt Internet Explorer phiên bản 5.5 hoặc mới hơn. Bạn có muốn dán nguyên mẫu?",
+UnknownToolbarItem	: "Không rõ mục trên thanh công cụ \"%1\"",
+UnknownCommand		: "Không rõ lệnh \"%1\"",
+NotImplemented		: "Lệnh không được thực hiện",
+UnknownToolbarSet	: "Thanh công cụ \"%1\" không tồn tại",
+NoActiveX			: "Các thiết lập bảo mật của trình duyệt có thể giới hạn một số chức năng của trình biên tập. Bạn phải bật tùy chọn \"Run ActiveX controls and plug-ins\". Bạn có thể gặp một số lỗi và thấy thiếu một số chức năng.",
+BrowseServerBlocked : "Không thể mở được bộ duyệt tài nguyên. Hãy đảm bảo chức năng chặn popup đã bị vô hiệu hóa.",
+DialogBlocked		: "Không thể mở được cửa sổ hộp thoại. Hãy đảm bảo chức năng chặn popup đã bị vô hiệu hóa.",
+VisitLinkBlocked	: "Không thể mở được cửa sổ trình duyệt mới. Hãy đảm bảo chức năng chặn popup đã bị vô hiệu hóa.",
+
+// Dialogs
+DlgBtnOK			: "Đồng ý",
+DlgBtnCancel		: "Bỏ qua",
+DlgBtnClose			: "Đóng",
+DlgBtnBrowseServer	: "Duyệt trên máy chủ",
+DlgAdvancedTag		: "Mở rộng",
+DlgOpOther			: "<Khác>",
+DlgInfoTab			: "Thông tin",
+DlgAlertUrl			: "Hãy nhập vào một URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<không thiết lập>",
+DlgGenId			: "Định danh",
+DlgGenLangDir		: "Đường dẫn Ngôn ngữ",
+DlgGenLangDirLtr	: "Trái sang Phải (LTR)",
+DlgGenLangDirRtl	: "Phải sang Trái (RTL)",
+DlgGenLangCode		: "Mã Ngôn ngữ",
+DlgGenAccessKey		: "Phím Hỗ trợ truy cập",
+DlgGenName			: "Tên",
+DlgGenTabIndex		: "Chỉ số của Tab",
+DlgGenLongDescr		: "Mô tả URL",
+DlgGenClass			: "Lớp Stylesheet",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Bảng mã của tài nguyên được liên kết đến",
+DlgGenStyle			: "Mẫu",
+
+// Image Dialog
+DlgImgTitle			: "Thuộc tính Hình ảnh",
+DlgImgInfoTab		: "Thông tin Hình ảnh",
+DlgImgBtnUpload		: "Tải lên Máy chủ",
+DlgImgURL			: "URL",
+DlgImgUpload		: "Tải lên",
+DlgImgAlt			: "Chú thích Hình ảnh",
+DlgImgWidth			: "Rộng",
+DlgImgHeight		: "Cao",
+DlgImgLockRatio		: "Giữ nguyên tỷ lệ",
+DlgBtnResetSize		: "Kích thước gốc",
+DlgImgBorder		: "Đường viền",
+DlgImgHSpace		: "HSpace",
+DlgImgVSpace		: "VSpace",
+DlgImgAlign			: "Vị trí",
+DlgImgAlignLeft		: "Trái",
+DlgImgAlignAbsBottom: "Dưới tuyệt đối",
+DlgImgAlignAbsMiddle: "Giữa tuyệt đối",
+DlgImgAlignBaseline	: "Đường cơ sở",
+DlgImgAlignBottom	: "Dưới",
+DlgImgAlignMiddle	: "Giữa",
+DlgImgAlignRight	: "Phải",
+DlgImgAlignTextTop	: "Phía trên chữ",
+DlgImgAlignTop		: "Trên",
+DlgImgPreview		: "Xem trước",
+DlgImgAlertUrl		: "Hãy đưa vào URL của hình ảnh",
+DlgImgLinkTab		: "Liên kết",
+
+// Flash Dialog
+DlgFlashTitle		: "Thuộc tính Flash",
+DlgFlashChkPlay		: "Tự động chạy",
+DlgFlashChkLoop		: "Lặp",
+DlgFlashChkMenu		: "Cho phép bật Menu của Flash",
+DlgFlashScale		: "Tỷ lệ",
+DlgFlashScaleAll	: "Hiển thị tất cả",
+DlgFlashScaleNoBorder	: "Không đường viền",
+DlgFlashScaleFit	: "Vừa vặn",
+
+// Link Dialog
+DlgLnkWindowTitle	: "Liên kết",
+DlgLnkInfoTab		: "Thông tin Liên kết",
+DlgLnkTargetTab		: "Đích",
+
+DlgLnkType			: "Kiểu Liên kết",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "Neo trong trang này",
+DlgLnkTypeEMail		: "Thư điện tử",
+DlgLnkProto			: "Giao thức",
+DlgLnkProtoOther	: "<khác>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "Chọn một Neo",
+DlgLnkAnchorByName	: "Theo Tên Neo",
+DlgLnkAnchorById	: "Theo Định danh Element",
+DlgLnkNoAnchors		: "(Không có Neo nào trong tài liệu)",
+DlgLnkEMail			: "Thư điện tử",
+DlgLnkEMailSubject	: "Tiêu đề Thông điệp",
+DlgLnkEMailBody		: "Nội dung Thông điệp",
+DlgLnkUpload		: "Tải lên",
+DlgLnkBtnUpload		: "Tải lên Máy chủ",
+
+DlgLnkTarget		: "Đích",
+DlgLnkTargetFrame	: "<khung>",
+DlgLnkTargetPopup	: "<cửa sổ popup>",
+DlgLnkTargetBlank	: "Cửa sổ mới (_blank)",
+DlgLnkTargetParent	: "Cửa sổ cha (_parent)",
+DlgLnkTargetSelf	: "Cùng cửa sổ (_self)",
+DlgLnkTargetTop		: "Cửa sổ trên cùng(_top)",
+DlgLnkTargetFrameName	: "Tên Khung đích",
+DlgLnkPopWinName	: "Tên Cửa sổ Popup",
+DlgLnkPopWinFeat	: "Đặc điểm của Cửa sổ Popup",
+DlgLnkPopResize		: "Kích thước thay đổi",
+DlgLnkPopLocation	: "Thanh vị trí",
+DlgLnkPopMenu		: "Thanh Menu",
+DlgLnkPopScroll		: "Thanh cuộn",
+DlgLnkPopStatus		: "Thanh trạng thái",
+DlgLnkPopToolbar	: "Thanh công cụ",
+DlgLnkPopFullScrn	: "Toàn màn hình (IE)",
+DlgLnkPopDependent	: "Phụ thuộc (Netscape)",
+DlgLnkPopWidth		: "Rộng",
+DlgLnkPopHeight		: "Cao",
+DlgLnkPopLeft		: "Vị trí Trái",
+DlgLnkPopTop		: "Vị trí Trên",
+
+DlnLnkMsgNoUrl		: "Hãy đưa vào Liên kết URL",
+DlnLnkMsgNoEMail	: "Hãy đưa vào địa chỉ thư điện tử",
+DlnLnkMsgNoAnchor	: "Hãy chọn một Neo",
+DlnLnkMsgInvPopName	: "Tên của cửa sổ Popup phải bắt đầu bằng một ký tự và không được chứa khoảng trắng",
+
+// Color Dialog
+DlgColorTitle		: "Chọn màu",
+DlgColorBtnClear	: "Xoá",
+DlgColorHighlight	: "Tô sáng",
+DlgColorSelected	: "Đã chọn",
+
+// Smiley Dialog
+DlgSmileyTitle		: "Chèn Hình biểu lộ cảm xúc (mặt cười)",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "Hãy chọn Ký tự đặc biệt",
+
+// Table Dialog
+DlgTableTitle		: "Thuộc tính bảng",
+DlgTableRows		: "Hàng",
+DlgTableColumns		: "Cột",
+DlgTableBorder		: "Cỡ Đường viền",
+DlgTableAlign		: "Canh lề",
+DlgTableAlignNotSet	: "<Chưa thiết lập>",
+DlgTableAlignLeft	: "Trái",
+DlgTableAlignCenter	: "Giữa",
+DlgTableAlignRight	: "Phải",
+DlgTableWidth		: "Rộng",
+DlgTableWidthPx		: "điểm (px)",
+DlgTableWidthPc		: "%",
+DlgTableHeight		: "Cao",
+DlgTableCellSpace	: "Khoảng cách Ô",
+DlgTableCellPad		: "Đệm Ô",
+DlgTableCaption		: "Đầu đề",
+DlgTableSummary		: "Tóm lược",
+
+// Table Cell Dialog
+DlgCellTitle		: "Thuộc tính Ô",
+DlgCellWidth		: "Rộng",
+DlgCellWidthPx		: "điểm (px)",
+DlgCellWidthPc		: "%",
+DlgCellHeight		: "Cao",
+DlgCellWordWrap		: "Bọc từ",
+DlgCellWordWrapNotSet	: "<Chưa thiết lập>",
+DlgCellWordWrapYes	: "Đồng ý",
+DlgCellWordWrapNo	: "Không",
+DlgCellHorAlign		: "Canh theo Chiều ngang",
+DlgCellHorAlignNotSet	: "<Chưa thiết lập>",
+DlgCellHorAlignLeft	: "Trái",
+DlgCellHorAlignCenter	: "Giữa",
+DlgCellHorAlignRight: "Phải",
+DlgCellVerAlign		: "Canh theo Chiều dọc",
+DlgCellVerAlignNotSet	: "<Chưa thiết lập>",
+DlgCellVerAlignTop	: "Trên",
+DlgCellVerAlignMiddle	: "Giữa",
+DlgCellVerAlignBottom	: "Dưới",
+DlgCellVerAlignBaseline	: "Đường cơ sở",
+DlgCellRowSpan		: "Nối Hàng",
+DlgCellCollSpan		: "Nối Cột",
+DlgCellBackColor	: "Màu nền",
+DlgCellBorderColor	: "Màu viền",
+DlgCellBtnSelect	: "Chọn...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "Tìm kiếm và Thay Thế",
+
+// Find Dialog
+DlgFindTitle		: "Tìm kiếm",
+DlgFindFindBtn		: "Tìm kiếm",
+DlgFindNotFoundMsg	: "Không tìm thấy chuỗi cần tìm.",
+
+// Replace Dialog
+DlgReplaceTitle			: "Thay thế",
+DlgReplaceFindLbl		: "Tìm chuỗi:",
+DlgReplaceReplaceLbl	: "Thay bằng:",
+DlgReplaceCaseChk		: "Phân biệt chữ hoa/thường",
+DlgReplaceReplaceBtn	: "Thay thế",
+DlgReplaceReplAllBtn	: "Thay thế Tất cả",
+DlgReplaceWordChk		: "Đúng toàn bộ từ",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl+X).",
+PasteErrorCopy	: "Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl+C).",
+
+PasteAsText		: "Dán theo định dạng văn bản thuần",
+PasteFromWord	: "Dán với định dạng Word",
+
+DlgPasteMsg2	: "Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.",
+DlgPasteSec		: "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.",	//MISSING
+DlgPasteIgnoreFont		: "Chấp nhận các định dạng phông",
+DlgPasteRemoveStyles	: "Gỡ bỏ các định dạng Styles",
+
+// Color Picker
+ColorAutomatic	: "Tự động",
+ColorMoreColors	: "Màu khác...",
+
+// Document Properties
+DocProps		: "Thuộc tính Tài liệu",
+
+// Anchor Dialog
+DlgAnchorTitle		: "Thuộc tính Neo",
+DlgAnchorName		: "Tên của Neo",
+DlgAnchorErrorName	: "Hãy nhập vào tên của Neo",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "Không có trong từ điển",
+DlgSpellChangeTo		: "Chuyển thành",
+DlgSpellBtnIgnore		: "Bỏ qua",
+DlgSpellBtnIgnoreAll	: "Bỏ qua Tất cả",
+DlgSpellBtnReplace		: "Thay thế",
+DlgSpellBtnReplaceAll	: "Thay thế Tất cả",
+DlgSpellBtnUndo			: "Phục hồi lại",
+DlgSpellNoSuggestions	: "- Không đưa ra gợi ý về từ -",
+DlgSpellProgress		: "Đang tiến hành kiểm tra chính tả...",
+DlgSpellNoMispell		: "Hoàn tất kiểm tra chính tả: Không có lỗi chính tả",
+DlgSpellNoChanges		: "Hoàn tất kiểm tra chính tả: Không có từ nào được thay đổi",
+DlgSpellOneChange		: "Hoàn tất kiểm tra chính tả: Một từ đã được thay đổi",
+DlgSpellManyChanges		: "Hoàn tất kiểm tra chính tả: %1 từ đã được thay đổi",
+
+IeSpellDownload			: "Chức năng kiểm tra chính tả chưa được cài đặt. Bạn có muốn tải về ngay bây giờ?",
+
+// Button Dialog
+DlgButtonText		: "Chuỗi hiển thị (Giá trị)",
+DlgButtonType		: "Kiểu",
+DlgButtonTypeBtn	: "Nút Bấm",
+DlgButtonTypeSbm	: "Nút Gửi",
+DlgButtonTypeRst	: "Nút Nhập lại",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "Tên",
+DlgCheckboxValue	: "Giá trị",
+DlgCheckboxSelected	: "Được chọn",
+
+// Form Dialog
+DlgFormName		: "Tên",
+DlgFormAction	: "Hành động",
+DlgFormMethod	: "Phương thức",
+
+// Select Field Dialog
+DlgSelectName		: "Tên",
+DlgSelectValue		: "Giá trị",
+DlgSelectSize		: "Kích cỡ",
+DlgSelectLines		: "dòng",
+DlgSelectChkMulti	: "Cho phép chọn nhiều",
+DlgSelectOpAvail	: "Các tùy chọn có thể sử dụng",
+DlgSelectOpText		: "Văn bản",
+DlgSelectOpValue	: "Giá trị",
+DlgSelectBtnAdd		: "Thêm",
+DlgSelectBtnModify	: "Thay đổi",
+DlgSelectBtnUp		: "Lên",
+DlgSelectBtnDown	: "Xuống",
+DlgSelectBtnSetValue : "Giá trị được chọn",
+DlgSelectBtnDelete	: "Xoá",
+
+// Textarea Dialog
+DlgTextareaName	: "Tên",
+DlgTextareaCols	: "Cột",
+DlgTextareaRows	: "Hàng",
+
+// Text Field Dialog
+DlgTextName			: "Tên",
+DlgTextValue		: "Giá trị",
+DlgTextCharWidth	: "Rộng",
+DlgTextMaxChars		: "Số Ký tự tối đa",
+DlgTextType			: "Kiểu",
+DlgTextTypeText		: "Ký tự",
+DlgTextTypePass		: "Mật khẩu",
+
+// Hidden Field Dialog
+DlgHiddenName	: "Tên",
+DlgHiddenValue	: "Giá trị",
+
+// Bulleted List Dialog
+BulletedListProp	: "Thuộc tính Danh sách không thứ tự",
+NumberedListProp	: "Thuộc tính Danh sách có thứ tự",
+DlgLstStart			: "Bắt đầu",
+DlgLstType			: "Kiểu",
+DlgLstTypeCircle	: "Hình tròn",
+DlgLstTypeDisc		: "Hình đĩa",
+DlgLstTypeSquare	: "Hình vuông",
+DlgLstTypeNumbers	: "Số thứ tự (1, 2, 3)",
+DlgLstTypeLCase		: "Chữ cái thường (a, b, c)",
+DlgLstTypeUCase		: "Chữ cái hoa (A, B, C)",
+DlgLstTypeSRoman	: "Số La Mã thường (i, ii, iii)",
+DlgLstTypeLRoman	: "Số La Mã hoa (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "Toàn thể",
+DlgDocBackTab		: "Nền",
+DlgDocColorsTab		: "Màu sắc và Đường biên",
+DlgDocMetaTab		: "Siêu dữ liệu",
+
+DlgDocPageTitle		: "Tiêu đề Trang",
+DlgDocLangDir		: "Đường dẫn Ngôn ngữ",
+DlgDocLangDirLTR	: "Trái sang Phải (LTR)",
+DlgDocLangDirRTL	: "Phải sang Trái (RTL)",
+DlgDocLangCode		: "Mã Ngôn ngữ",
+DlgDocCharSet		: "Bảng mã ký tự",
+DlgDocCharSetCE		: "Trung Âu",
+DlgDocCharSetCT		: "Tiếng Trung Quốc (Big5)",
+DlgDocCharSetCR		: "Tiếng Kirin",
+DlgDocCharSetGR		: "Tiếng Hy Lạp",
+DlgDocCharSetJP		: "Tiếng Nhật",
+DlgDocCharSetKR		: "Tiếng Hàn",
+DlgDocCharSetTR		: "Tiếng Thổ Nhĩ Kỳ",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "Tây Âu",
+DlgDocCharSetOther	: "Bảng mã ký tự khác",
+
+DlgDocDocType		: "Kiểu Đề mục Tài liệu",
+DlgDocDocTypeOther	: "Kiểu Đề mục Tài liệu khác",
+DlgDocIncXHTML		: "Bao gồm cả định nghĩa XHTML",
+DlgDocBgColor		: "Màu nền",
+DlgDocBgImage		: "URL của Hình ảnh nền",
+DlgDocBgNoScroll	: "Không cuộn nền",
+DlgDocCText			: "Văn bản",
+DlgDocCLink			: "Liên kết",
+DlgDocCVisited		: "Liên kết Đã ghé thăm",
+DlgDocCActive		: "Liên kết Hiện hành",
+DlgDocMargins		: "Đường biên của Trang",
+DlgDocMaTop			: "Trên",
+DlgDocMaLeft		: "Trái",
+DlgDocMaRight		: "Phải",
+DlgDocMaBottom		: "Dưới",
+DlgDocMeIndex		: "Các từ khóa chỉ mục tài liệu (phân cách bởi dấu phẩy)",
+DlgDocMeDescr		: "Mô tả tài liệu",
+DlgDocMeAuthor		: "Tác giả",
+DlgDocMeCopy		: "Bản quyền",
+DlgDocPreview		: "Xem trước",
+
+// Templates Dialog
+Templates			: "Mẫu dựng sẵn",
+DlgTemplatesTitle	: "Nội dung Mẫu dựng sẵn",
+DlgTemplatesSelMsg	: "Hãy chọn Mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):",
+DlgTemplatesLoading	: "Đang nạp Danh sách Mẫu dựng sẵn. Vui lòng đợi trong giây lát...",
+DlgTemplatesNoTpl	: "(Không có Mẫu dựng sẵn nào được định nghĩa)",
+DlgTemplatesReplace	: "Thay thế nội dung hiện tại",
+
+// About Dialog
+DlgAboutAboutTab	: "Giới thiệu",
+DlgAboutBrowserInfoTab	: "Thông tin trình duyệt",
+DlgAboutLicenseTab	: "Giấy phép",
+DlgAboutVersion		: "phiên bản",
+DlgAboutInfo		: "Để biết thêm thông tin, hãy truy cập",
+
+// Div Dialog
+DlgDivGeneralTab	: "Chung",
+DlgDivAdvancedTab	: "Nâng cao",
+DlgDivStyle		: "Kiểu Style",
+DlgDivInlineStyle	: "Kiểu Style Trực tiếp"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/zh-cn.js b/modules/editor/skins/fckeditor/editor/lang/zh-cn.js
new file mode 100644
index 000000000..724f9c6ac
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/zh-cn.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Chinese Simplified language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "折叠工具栏",
+ToolbarExpand		: "展开工具栏",
+
+// Toolbar Items and Context Menu
+Save				: "保存",
+NewPage				: "新建",
+Preview				: "预览",
+Cut					: "剪切",
+Copy				: "复制",
+Paste				: "粘贴",
+PasteText			: "粘贴为无格式文本",
+PasteWord			: "从 MS Word 粘贴",
+Print				: "打印",
+SelectAll			: "全选",
+RemoveFormat		: "清除格式",
+InsertLinkLbl		: "超链接",
+InsertLink			: "插入/编辑超链接",
+RemoveLink			: "取消超链接",
+VisitLink			: "打开超链接",
+Anchor				: "插入/编辑锚点链接",
+AnchorDelete		: "清除锚点链接",
+InsertImageLbl		: "图象",
+InsertImage			: "插入/编辑图象",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "插入/编辑 Flash",
+InsertTableLbl		: "表格",
+InsertTable			: "插入/编辑表格",
+InsertLineLbl		: "水平线",
+InsertLine			: "插入水平线",
+InsertSpecialCharLbl: "特殊符号",
+InsertSpecialChar	: "插入特殊符号",
+InsertSmileyLbl		: "表情符",
+InsertSmiley		: "插入表情图标",
+About				: "关于 FCKeditor",
+Bold				: "加粗",
+Italic				: "倾斜",
+Underline			: "下划线",
+StrikeThrough		: "删除线",
+Subscript			: "下标",
+Superscript			: "上标",
+LeftJustify			: "左对齐",
+CenterJustify		: "居中对齐",
+RightJustify		: "右对齐",
+BlockJustify		: "两端对齐",
+DecreaseIndent		: "减少缩进量",
+IncreaseIndent		: "增加缩进量",
+Blockquote			: "块引用",
+CreateDiv			: "新增 Div 标籤",
+EditDiv				: "更改 Div 标籤",
+DeleteDiv			: "删除 Div 标籤",
+Undo				: "撤消",
+Redo				: "重做",
+NumberedListLbl		: "编号列表",
+NumberedList		: "插入/删除编号列表",
+BulletedListLbl		: "项目列表",
+BulletedList		: "插入/删除项目列表",
+ShowTableBorders	: "显示表格边框",
+ShowDetails			: "显示详细资料",
+Style				: "样式",
+FontFormat			: "格式",
+Font				: "字体",
+FontSize			: "大小",
+TextColor			: "文本颜色",
+BGColor				: "背景颜色",
+Source				: "源代码",
+Find				: "查找",
+Replace				: "替换",
+SpellCheck			: "拼写检查",
+UniversalKeyboard	: "软键盘",
+PageBreakLbl		: "分页符",
+PageBreak			: "插入分页符",
+
+Form			: "表单",
+Checkbox		: "复选框",
+RadioButton		: "单选按钮",
+TextField		: "单行文本",
+Textarea		: "多行文本",
+HiddenField		: "隐藏域",
+Button			: "按钮",
+SelectionField	: "列表/菜单",
+ImageButton		: "图像域",
+
+FitWindow		: "全屏编辑",
+ShowBlocks		: "显示区块",
+
+// Context Menu
+EditLink			: "编辑超链接",
+CellCM				: "单元格",
+RowCM				: "行",
+ColumnCM			: "列",
+InsertRowAfter		: "下插入行",
+InsertRowBefore		: "上插入行",
+DeleteRows			: "删除行",
+InsertColumnAfter	: "右插入列",
+InsertColumnBefore	: "左插入列",
+DeleteColumns		: "删除列",
+InsertCellAfter		: "右插入单元格",
+InsertCellBefore	: "左插入单元格",
+DeleteCells			: "删除单元格",
+MergeCells			: "合并单元格",
+MergeRight			: "右合并单元格",
+MergeDown			: "下合并单元格",
+HorizontalSplitCell	: "橫拆分单元格",
+VerticalSplitCell	: "縱拆分单元格",
+TableDelete			: "删除表格",
+CellProperties		: "单元格属性",
+TableProperties		: "表格属性",
+ImageProperties		: "图象属性",
+FlashProperties		: "Flash 属性",
+
+AnchorProp			: "锚点链接属性",
+ButtonProp			: "按钮属性",
+CheckboxProp		: "复选框属性",
+HiddenFieldProp		: "隐藏域属性",
+RadioButtonProp		: "单选按钮属性",
+ImageButtonProp		: "图像域属性",
+TextFieldProp		: "单行文本属性",
+SelectionFieldProp	: "菜单/列表属性",
+TextareaProp		: "多行文本属性",
+FormProp			: "表单属性",
+
+FontFormats			: "普通;已编排格式;地址;标题 1;标题 2;标题 3;标题 4;标题 5;标题 6;段落(DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "正在处理 XHTML，请稍等...",
+Done				: "完成",
+PasteWordConfirm	: "您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？",
+NotCompatiblePaste	: "该命令需要 Internet Explorer 5.5 或更高版本的支持，是否按常规粘贴进行？",
+UnknownToolbarItem	: "未知工具栏项目 \"%1\"",
+UnknownCommand		: "未知命令名称 \"%1\"",
+NotImplemented		: "命令无法执行",
+UnknownToolbarSet	: "工具栏设置 \"%1\" 不存在",
+NoActiveX			: "浏览器安全设置限制了本编辑器的某些功能。您必须启用安全设置中的“运行 ActiveX 控件和插件”，否则将出现某些错误并缺少功能。",
+BrowseServerBlocked : "无法打开资源浏览器，请确认是否启用了禁止弹出窗口。",
+DialogBlocked		: "无法打开对话框窗口，请确认是否启用了禁止弹出窗口或网页对话框（IE）。",
+VisitLinkBlocked	: "无法打开新窗口，请确认是否启用了禁止弹出窗口或网页对话框（IE）。",
+
+// Dialogs
+DlgBtnOK			: "确定",
+DlgBtnCancel		: "取消",
+DlgBtnClose			: "关闭",
+DlgBtnBrowseServer	: "浏览服务器",
+DlgAdvancedTag		: "高级",
+DlgOpOther			: "<其它>",
+DlgInfoTab			: "信息",
+DlgAlertUrl			: "请插入 URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<没有设置>",
+DlgGenId			: "ID",
+DlgGenLangDir		: "语言方向",
+DlgGenLangDirLtr	: "从左到右 (LTR)",
+DlgGenLangDirRtl	: "从右到左 (RTL)",
+DlgGenLangCode		: "语言代码",
+DlgGenAccessKey		: "访问键",
+DlgGenName			: "名称",
+DlgGenTabIndex		: "Tab 键次序",
+DlgGenLongDescr		: "详细说明地址",
+DlgGenClass			: "样式类名称",
+DlgGenTitle			: "标题",
+DlgGenContType		: "内容类型",
+DlgGenLinkCharset	: "字符编码",
+DlgGenStyle			: "行内样式",
+
+// Image Dialog
+DlgImgTitle			: "图象属性",
+DlgImgInfoTab		: "图象",
+DlgImgBtnUpload		: "发送到服务器上",
+DlgImgURL			: "源文件",
+DlgImgUpload		: "上传",
+DlgImgAlt			: "替换文本",
+DlgImgWidth			: "宽度",
+DlgImgHeight		: "高度",
+DlgImgLockRatio		: "锁定比例",
+DlgBtnResetSize		: "恢复尺寸",
+DlgImgBorder		: "边框大小",
+DlgImgHSpace		: "水平间距",
+DlgImgVSpace		: "垂直间距",
+DlgImgAlign			: "对齐方式",
+DlgImgAlignLeft		: "左对齐",
+DlgImgAlignAbsBottom: "绝对底边",
+DlgImgAlignAbsMiddle: "绝对居中",
+DlgImgAlignBaseline	: "基线",
+DlgImgAlignBottom	: "底边",
+DlgImgAlignMiddle	: "居中",
+DlgImgAlignRight	: "右对齐",
+DlgImgAlignTextTop	: "文本上方",
+DlgImgAlignTop		: "顶端",
+DlgImgPreview		: "预览",
+DlgImgAlertUrl		: "请输入图象地址",
+DlgImgLinkTab		: "链接",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash 属性",
+DlgFlashChkPlay		: "自动播放",
+DlgFlashChkLoop		: "循环",
+DlgFlashChkMenu		: "启用 Flash 菜单",
+DlgFlashScale		: "缩放",
+DlgFlashScaleAll	: "全部显示",
+DlgFlashScaleNoBorder	: "无边框",
+DlgFlashScaleFit	: "严格匹配",
+
+// Link Dialog
+DlgLnkWindowTitle	: "超链接",
+DlgLnkInfoTab		: "超链接信息",
+DlgLnkTargetTab		: "目标",
+
+DlgLnkType			: "超链接类型",
+DlgLnkTypeURL		: "超链接",
+DlgLnkTypeAnchor	: "页内锚点链接",
+DlgLnkTypeEMail		: "电子邮件",
+DlgLnkProto			: "协议",
+DlgLnkProtoOther	: "<其它>",
+DlgLnkURL			: "地址",
+DlgLnkAnchorSel		: "选择一个锚点",
+DlgLnkAnchorByName	: "按锚点名称",
+DlgLnkAnchorById	: "按锚点 ID",
+DlgLnkNoAnchors		: "(此文档没有可用的锚点)",
+DlgLnkEMail			: "地址",
+DlgLnkEMailSubject	: "主题",
+DlgLnkEMailBody		: "内容",
+DlgLnkUpload		: "上传",
+DlgLnkBtnUpload		: "发送到服务器上",
+
+DlgLnkTarget		: "目标",
+DlgLnkTargetFrame	: "<框架>",
+DlgLnkTargetPopup	: "<弹出窗口>",
+DlgLnkTargetBlank	: "新窗口 (_blank)",
+DlgLnkTargetParent	: "父窗口 (_parent)",
+DlgLnkTargetSelf	: "本窗口 (_self)",
+DlgLnkTargetTop		: "整页 (_top)",
+DlgLnkTargetFrameName	: "目标框架名称",
+DlgLnkPopWinName	: "弹出窗口名称",
+DlgLnkPopWinFeat	: "弹出窗口属性",
+DlgLnkPopResize		: "调整大小",
+DlgLnkPopLocation	: "地址栏",
+DlgLnkPopMenu		: "菜单栏",
+DlgLnkPopScroll		: "滚动条",
+DlgLnkPopStatus		: "状态栏",
+DlgLnkPopToolbar	: "工具栏",
+DlgLnkPopFullScrn	: "全屏 (IE)",
+DlgLnkPopDependent	: "依附 (NS)",
+DlgLnkPopWidth		: "宽",
+DlgLnkPopHeight		: "高",
+DlgLnkPopLeft		: "左",
+DlgLnkPopTop		: "右",
+
+DlnLnkMsgNoUrl		: "请输入超链接地址",
+DlnLnkMsgNoEMail	: "请输入电子邮件地址",
+DlnLnkMsgNoAnchor	: "请选择一个锚点",
+DlnLnkMsgInvPopName	: "弹出窗口名称必须以字母开头，并且不能含有空格。",
+
+// Color Dialog
+DlgColorTitle		: "选择颜色",
+DlgColorBtnClear	: "清除",
+DlgColorHighlight	: "预览",
+DlgColorSelected	: "选择",
+
+// Smiley Dialog
+DlgSmileyTitle		: "插入表情图标",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "选择特殊符号",
+
+// Table Dialog
+DlgTableTitle		: "表格属性",
+DlgTableRows		: "行数",
+DlgTableColumns		: "列数",
+DlgTableBorder		: "边框",
+DlgTableAlign		: "对齐",
+DlgTableAlignNotSet	: "<没有设置>",
+DlgTableAlignLeft	: "左对齐",
+DlgTableAlignCenter	: "居中",
+DlgTableAlignRight	: "右对齐",
+DlgTableWidth		: "宽度",
+DlgTableWidthPx		: "像素",
+DlgTableWidthPc		: "百分比",
+DlgTableHeight		: "高度",
+DlgTableCellSpace	: "间距",
+DlgTableCellPad		: "边距",
+DlgTableCaption		: "标题",
+DlgTableSummary		: "摘要",
+
+// Table Cell Dialog
+DlgCellTitle		: "单元格属性",
+DlgCellWidth		: "宽度",
+DlgCellWidthPx		: "像素",
+DlgCellWidthPc		: "百分比",
+DlgCellHeight		: "高度",
+DlgCellWordWrap		: "自动换行",
+DlgCellWordWrapNotSet	: "<没有设置>",
+DlgCellWordWrapYes	: "是",
+DlgCellWordWrapNo	: "否",
+DlgCellHorAlign		: "水平对齐",
+DlgCellHorAlignNotSet	: "<没有设置>",
+DlgCellHorAlignLeft	: "左对齐",
+DlgCellHorAlignCenter	: "居中",
+DlgCellHorAlignRight: "右对齐",
+DlgCellVerAlign		: "垂直对齐",
+DlgCellVerAlignNotSet	: "<没有设置>",
+DlgCellVerAlignTop	: "顶端",
+DlgCellVerAlignMiddle	: "居中",
+DlgCellVerAlignBottom	: "底部",
+DlgCellVerAlignBaseline	: "基线",
+DlgCellRowSpan		: "纵跨行数",
+DlgCellCollSpan		: "横跨列数",
+DlgCellBackColor	: "背景颜色",
+DlgCellBorderColor	: "边框颜色",
+DlgCellBtnSelect	: "选择...",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "查找和替换",
+
+// Find Dialog
+DlgFindTitle		: "查找",
+DlgFindFindBtn		: "查找",
+DlgFindNotFoundMsg	: "指定文本没有找到。",
+
+// Replace Dialog
+DlgReplaceTitle			: "替换",
+DlgReplaceFindLbl		: "查找:",
+DlgReplaceReplaceLbl	: "替换:",
+DlgReplaceCaseChk		: "区分大小写",
+DlgReplaceReplaceBtn	: "替换",
+DlgReplaceReplAllBtn	: "全部替换",
+DlgReplaceWordChk		: "全字匹配",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl+X)来完成。",
+PasteErrorCopy	: "您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl+C)来完成。",
+
+PasteAsText		: "粘贴为无格式文本",
+PasteFromWord	: "从 MS Word 粘贴",
+
+DlgPasteMsg2	: "请使用键盘快捷键(<STRONG>Ctrl+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>。",
+DlgPasteSec		: "因为你的浏览器的安全设置原因，本编辑器不能直接访问你的剪贴板内容，你需要在本窗口重新粘贴一次。",
+DlgPasteIgnoreFont		: "忽略 Font 标签",
+DlgPasteRemoveStyles	: "清理 CSS 样式",
+
+// Color Picker
+ColorAutomatic	: "自动",
+ColorMoreColors	: "其它颜色...",
+
+// Document Properties
+DocProps		: "页面属性",
+
+// Anchor Dialog
+DlgAnchorTitle		: "命名锚点",
+DlgAnchorName		: "锚点名称",
+DlgAnchorErrorName	: "请输入锚点名称",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "没有在字典里",
+DlgSpellChangeTo		: "更改为",
+DlgSpellBtnIgnore		: "忽略",
+DlgSpellBtnIgnoreAll	: "全部忽略",
+DlgSpellBtnReplace		: "替换",
+DlgSpellBtnReplaceAll	: "全部替换",
+DlgSpellBtnUndo			: "撤消",
+DlgSpellNoSuggestions	: "- 没有建议 -",
+DlgSpellProgress		: "正在进行拼写检查...",
+DlgSpellNoMispell		: "拼写检查完成：没有发现拼写错误",
+DlgSpellNoChanges		: "拼写检查完成：没有更改任何单词",
+DlgSpellOneChange		: "拼写检查完成：更改了一个单词",
+DlgSpellManyChanges		: "拼写检查完成：更改了 %1 个单词",
+
+IeSpellDownload			: "拼写检查插件还没安装，你是否想现在就下载？",
+
+// Button Dialog
+DlgButtonText		: "标签(值)",
+DlgButtonType		: "类型",
+DlgButtonTypeBtn	: "按钮",
+DlgButtonTypeSbm	: "提交",
+DlgButtonTypeRst	: "重设",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "名称",
+DlgCheckboxValue	: "选定值",
+DlgCheckboxSelected	: "已勾选",
+
+// Form Dialog
+DlgFormName		: "名称",
+DlgFormAction	: "动作",
+DlgFormMethod	: "方法",
+
+// Select Field Dialog
+DlgSelectName		: "名称",
+DlgSelectValue		: "选定",
+DlgSelectSize		: "高度",
+DlgSelectLines		: "行",
+DlgSelectChkMulti	: "允许多选",
+DlgSelectOpAvail	: "列表值",
+DlgSelectOpText		: "标签",
+DlgSelectOpValue	: "值",
+DlgSelectBtnAdd		: "新增",
+DlgSelectBtnModify	: "修改",
+DlgSelectBtnUp		: "上移",
+DlgSelectBtnDown	: "下移",
+DlgSelectBtnSetValue : "设为初始化时选定",
+DlgSelectBtnDelete	: "删除",
+
+// Textarea Dialog
+DlgTextareaName	: "名称",
+DlgTextareaCols	: "字符宽度",
+DlgTextareaRows	: "行数",
+
+// Text Field Dialog
+DlgTextName			: "名称",
+DlgTextValue		: "初始值",
+DlgTextCharWidth	: "字符宽度",
+DlgTextMaxChars		: "最多字符数",
+DlgTextType			: "类型",
+DlgTextTypeText		: "文本",
+DlgTextTypePass		: "密码",
+
+// Hidden Field Dialog
+DlgHiddenName	: "名称",
+DlgHiddenValue	: "初始值",
+
+// Bulleted List Dialog
+BulletedListProp	: "项目列表属性",
+NumberedListProp	: "编号列表属性",
+DlgLstStart			: "开始序号",
+DlgLstType			: "列表类型",
+DlgLstTypeCircle	: "圆圈",
+DlgLstTypeDisc		: "圆点",
+DlgLstTypeSquare	: "方块",
+DlgLstTypeNumbers	: "数字 (1, 2, 3)",
+DlgLstTypeLCase		: "小写字母 (a, b, c)",
+DlgLstTypeUCase		: "大写字母 (A, B, C)",
+DlgLstTypeSRoman	: "小写罗马数字 (i, ii, iii)",
+DlgLstTypeLRoman	: "大写罗马数字 (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "常规",
+DlgDocBackTab		: "背景",
+DlgDocColorsTab		: "颜色和边距",
+DlgDocMetaTab		: "Meta 数据",
+
+DlgDocPageTitle		: "页面标题",
+DlgDocLangDir		: "语言方向",
+DlgDocLangDirLTR	: "从左到右 (LTR)",
+DlgDocLangDirRTL	: "从右到左 (RTL)",
+DlgDocLangCode		: "语言代码",
+DlgDocCharSet		: "字符编码",
+DlgDocCharSetCE		: "中欧",
+DlgDocCharSetCT		: "繁体中文 (Big5)",
+DlgDocCharSetCR		: "西里尔文",
+DlgDocCharSetGR		: "希腊文",
+DlgDocCharSetJP		: "日文",
+DlgDocCharSetKR		: "韩文",
+DlgDocCharSetTR		: "土耳其文",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "西欧",
+DlgDocCharSetOther	: "其它字符编码",
+
+DlgDocDocType		: "文档类型",
+DlgDocDocTypeOther	: "其它文档类型",
+DlgDocIncXHTML		: "包含 XHTML 声明",
+DlgDocBgColor		: "背景颜色",
+DlgDocBgImage		: "背景图像",
+DlgDocBgNoScroll	: "不滚动背景图像",
+DlgDocCText			: "文本",
+DlgDocCLink			: "超链接",
+DlgDocCVisited		: "已访问的超链接",
+DlgDocCActive		: "活动超链接",
+DlgDocMargins		: "页面边距",
+DlgDocMaTop			: "上",
+DlgDocMaLeft		: "左",
+DlgDocMaRight		: "右",
+DlgDocMaBottom		: "下",
+DlgDocMeIndex		: "页面索引关键字 (用半角逗号[,]分隔)",
+DlgDocMeDescr		: "页面说明",
+DlgDocMeAuthor		: "作者",
+DlgDocMeCopy		: "版权",
+DlgDocPreview		: "预览",
+
+// Templates Dialog
+Templates			: "模板",
+DlgTemplatesTitle	: "内容模板",
+DlgTemplatesSelMsg	: "请选择编辑器内容模板<br>(当前内容将会被清除替换):",
+DlgTemplatesLoading	: "正在加载模板列表，请稍等...",
+DlgTemplatesNoTpl	: "(没有模板)",
+DlgTemplatesReplace	: "替换当前内容",
+
+// About Dialog
+DlgAboutAboutTab	: "关于",
+DlgAboutBrowserInfoTab	: "浏览器信息",
+DlgAboutLicenseTab	: "许可证",
+DlgAboutVersion		: "版本",
+DlgAboutInfo		: "要获得更多信息请访问 ",
+
+// Div Dialog
+DlgDivGeneralTab	: "常规",
+DlgDivAdvancedTab	: "高级",
+DlgDivStyle		: "样式",
+DlgDivInlineStyle	: "CSS 样式"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/zh-tw.js b/modules/editor/skins/fckeditor/editor/lang/zh-tw.js
new file mode 100644
index 000000000..724ca2f67
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/zh-tw.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Chinese Traditional language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "隱藏面板",
+ToolbarExpand		: "顯示面板",
+
+// Toolbar Items and Context Menu
+Save				: "儲存",
+NewPage				: "開新檔案",
+Preview				: "預覽",
+Cut					: "剪下",
+Copy				: "複製",
+Paste				: "貼上",
+PasteText			: "貼為純文字格式",
+PasteWord			: "自 Word 貼上",
+Print				: "列印",
+SelectAll			: "全選",
+RemoveFormat		: "清除格式",
+InsertLinkLbl		: "超連結",
+InsertLink			: "插入/編輯超連結",
+RemoveLink			: "移除超連結",
+VisitLink			: "開啟超連結",
+Anchor				: "插入/編輯錨點",
+AnchorDelete		: "移除錨點",
+InsertImageLbl		: "影像",
+InsertImage			: "插入/編輯影像",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "插入/編輯 Flash",
+InsertTableLbl		: "表格",
+InsertTable			: "插入/編輯表格",
+InsertLineLbl		: "水平線",
+InsertLine			: "插入水平線",
+InsertSpecialCharLbl: "特殊符號",
+InsertSpecialChar	: "插入特殊符號",
+InsertSmileyLbl		: "表情符號",
+InsertSmiley		: "插入表情符號",
+About				: "關於 FCKeditor",
+Bold				: "粗體",
+Italic				: "斜體",
+Underline			: "底線",
+StrikeThrough		: "刪除線",
+Subscript			: "下標",
+Superscript			: "上標",
+LeftJustify			: "靠左對齊",
+CenterJustify		: "置中",
+RightJustify		: "靠右對齊",
+BlockJustify		: "左右對齊",
+DecreaseIndent		: "減少縮排",
+IncreaseIndent		: "增加縮排",
+Blockquote			: "引用文字",
+CreateDiv			: "新增 Div 標籤",
+EditDiv				: "變更 Div 標籤",
+DeleteDiv			: "移除 Div 標籤",
+Undo				: "復原",
+Redo				: "重複",
+NumberedListLbl		: "編號清單",
+NumberedList		: "插入/移除編號清單",
+BulletedListLbl		: "項目清單",
+BulletedList		: "插入/移除項目清單",
+ShowTableBorders	: "顯示表格邊框",
+ShowDetails			: "顯示詳細資料",
+Style				: "樣式",
+FontFormat			: "格式",
+Font				: "字體",
+FontSize			: "大小",
+TextColor			: "文字顏色",
+BGColor				: "背景顏色",
+Source				: "原始碼",
+Find				: "尋找",
+Replace				: "取代",
+SpellCheck			: "拼字檢查",
+UniversalKeyboard	: "萬國鍵盤",
+PageBreakLbl		: "分頁符號",
+PageBreak			: "插入分頁符號",
+
+Form			: "表單",
+Checkbox		: "核取方塊",
+RadioButton		: "選項按鈕",
+TextField		: "文字方塊",
+Textarea		: "文字區域",
+HiddenField		: "隱藏欄位",
+Button			: "按鈕",
+SelectionField	: "清單/選單",
+ImageButton		: "影像按鈕",
+
+FitWindow		: "編輯器最大化",
+ShowBlocks		: "顯示區塊",
+
+// Context Menu
+EditLink			: "編輯超連結",
+CellCM				: "儲存格",
+RowCM				: "列",
+ColumnCM			: "欄",
+InsertRowAfter		: "向下插入列",
+InsertRowBefore		: "向上插入列",
+DeleteRows			: "刪除列",
+InsertColumnAfter	: "向右插入欄",
+InsertColumnBefore	: "向左插入欄",
+DeleteColumns		: "刪除欄",
+InsertCellAfter		: "向右插入儲存格",
+InsertCellBefore	: "向左插入儲存格",
+DeleteCells			: "刪除儲存格",
+MergeCells			: "合併儲存格",
+MergeRight			: "向右合併儲存格",
+MergeDown			: "向下合併儲存格",
+HorizontalSplitCell	: "橫向分割儲存格",
+VerticalSplitCell	: "縱向分割儲存格",
+TableDelete			: "刪除表格",
+CellProperties		: "儲存格屬性",
+TableProperties		: "表格屬性",
+ImageProperties		: "影像屬性",
+FlashProperties		: "Flash 屬性",
+
+AnchorProp			: "錨點屬性",
+ButtonProp			: "按鈕屬性",
+CheckboxProp		: "核取方塊屬性",
+HiddenFieldProp		: "隱藏欄位屬性",
+RadioButtonProp		: "選項按鈕屬性",
+ImageButtonProp		: "影像按鈕屬性",
+TextFieldProp		: "文字方塊屬性",
+SelectionFieldProp	: "清單/選單屬性",
+TextareaProp		: "文字區域屬性",
+FormProp			: "表單屬性",
+
+FontFormats			: "一般;已格式化;位址;標題 1;標題 2;標題 3;標題 4;標題 5;標題 6;一般 (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "處理 XHTML 中，請稍候…",
+Done				: "完成",
+PasteWordConfirm	: "您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？",
+NotCompatiblePaste	: "此指令僅在 Internet Explorer 5.5 或以上的版本有效。請問您是否同意不清除格式即貼上？",
+UnknownToolbarItem	: "未知工具列項目 \"%1\"",
+UnknownCommand		: "未知指令名稱 \"%1\"",
+NotImplemented		: "尚未安裝此指令",
+UnknownToolbarSet	: "工具列設定 \"%1\" 不存在",
+NoActiveX			: "瀏覽器的安全性設定限制了本編輯器的某些功能。您必須啟用安全性設定中的「執行ActiveX控制項與外掛程式」項目，否則本編輯器將會出現錯誤並缺少某些功能",
+BrowseServerBlocked : "無法開啟資源瀏覽器，請確定所有快顯視窗封鎖程式是否關閉",
+DialogBlocked		: "無法開啟對話視窗，請確定所有快顯視窗封鎖程式是否關閉",
+VisitLinkBlocked	: "無法開啟新視窗，請確定所有快顯視窗封鎖程式是否關閉",
+
+// Dialogs
+DlgBtnOK			: "確定",
+DlgBtnCancel		: "取消",
+DlgBtnClose			: "關閉",
+DlgBtnBrowseServer	: "瀏覽伺服器端",
+DlgAdvancedTag		: "進階",
+DlgOpOther			: "<其他>",
+DlgInfoTab			: "資訊",
+DlgAlertUrl			: "請插入 URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<尚未設定>",
+DlgGenId			: "ID",
+DlgGenLangDir		: "語言方向",
+DlgGenLangDirLtr	: "由左而右 (LTR)",
+DlgGenLangDirRtl	: "由右而左 (RTL)",
+DlgGenLangCode		: "語言代碼",
+DlgGenAccessKey		: "存取鍵",
+DlgGenName			: "名稱",
+DlgGenTabIndex		: "定位順序",
+DlgGenLongDescr		: "詳細 URL",
+DlgGenClass			: "樣式表類別",
+DlgGenTitle			: "標題",
+DlgGenContType		: "內容類型",
+DlgGenLinkCharset	: "連結資源之編碼",
+DlgGenStyle			: "樣式",
+
+// Image Dialog
+DlgImgTitle			: "影像屬性",
+DlgImgInfoTab		: "影像資訊",
+DlgImgBtnUpload		: "上傳至伺服器",
+DlgImgURL			: "URL",
+DlgImgUpload		: "上傳",
+DlgImgAlt			: "替代文字",
+DlgImgWidth			: "寬度",
+DlgImgHeight		: "高度",
+DlgImgLockRatio		: "等比例",
+DlgBtnResetSize		: "重設為原大小",
+DlgImgBorder		: "邊框",
+DlgImgHSpace		: "水平距離",
+DlgImgVSpace		: "垂直距離",
+DlgImgAlign			: "對齊",
+DlgImgAlignLeft		: "靠左對齊",
+DlgImgAlignAbsBottom: "絕對下方",
+DlgImgAlignAbsMiddle: "絕對中間",
+DlgImgAlignBaseline	: "基準線",
+DlgImgAlignBottom	: "靠下對齊",
+DlgImgAlignMiddle	: "置中對齊",
+DlgImgAlignRight	: "靠右對齊",
+DlgImgAlignTextTop	: "文字上方",
+DlgImgAlignTop		: "靠上對齊",
+DlgImgPreview		: "預覽",
+DlgImgAlertUrl		: "請輸入影像 URL",
+DlgImgLinkTab		: "超連結",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash 屬性",
+DlgFlashChkPlay		: "自動播放",
+DlgFlashChkLoop		: "重複",
+DlgFlashChkMenu		: "開啟選單",
+DlgFlashScale		: "縮放",
+DlgFlashScaleAll	: "全部顯示",
+DlgFlashScaleNoBorder	: "無邊框",
+DlgFlashScaleFit	: "精確符合",
+
+// Link Dialog
+DlgLnkWindowTitle	: "超連結",
+DlgLnkInfoTab		: "超連結資訊",
+DlgLnkTargetTab		: "目標",
+
+DlgLnkType			: "超連接類型",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "本頁錨點",
+DlgLnkTypeEMail		: "電子郵件",
+DlgLnkProto			: "通訊協定",
+DlgLnkProtoOther	: "<其他>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "請選擇錨點",
+DlgLnkAnchorByName	: "依錨點名稱",
+DlgLnkAnchorById	: "依元件 ID",
+DlgLnkNoAnchors		: "(本文件尚無可用之錨點)",
+DlgLnkEMail			: "電子郵件",
+DlgLnkEMailSubject	: "郵件主旨",
+DlgLnkEMailBody		: "郵件內容",
+DlgLnkUpload		: "上傳",
+DlgLnkBtnUpload		: "傳送至伺服器",
+
+DlgLnkTarget		: "目標",
+DlgLnkTargetFrame	: "<框架>",
+DlgLnkTargetPopup	: "<快顯視窗>",
+DlgLnkTargetBlank	: "新視窗 (_blank)",
+DlgLnkTargetParent	: "父視窗 (_parent)",
+DlgLnkTargetSelf	: "本視窗 (_self)",
+DlgLnkTargetTop		: "最上層視窗 (_top)",
+DlgLnkTargetFrameName	: "目標框架名稱",
+DlgLnkPopWinName	: "快顯視窗名稱",
+DlgLnkPopWinFeat	: "快顯視窗屬性",
+DlgLnkPopResize		: "可調整大小",
+DlgLnkPopLocation	: "網址列",
+DlgLnkPopMenu		: "選單列",
+DlgLnkPopScroll		: "捲軸",
+DlgLnkPopStatus		: "狀態列",
+DlgLnkPopToolbar	: "工具列",
+DlgLnkPopFullScrn	: "全螢幕 (IE)",
+DlgLnkPopDependent	: "從屬 (NS)",
+DlgLnkPopWidth		: "寬",
+DlgLnkPopHeight		: "高",
+DlgLnkPopLeft		: "左",
+DlgLnkPopTop		: "右",
+
+DlnLnkMsgNoUrl		: "請輸入欲連結的 URL",
+DlnLnkMsgNoEMail	: "請輸入電子郵件位址",
+DlnLnkMsgNoAnchor	: "請選擇錨點",
+DlnLnkMsgInvPopName	: "快顯名稱必須以「英文字母」為開頭，且不得含有空白",
+
+// Color Dialog
+DlgColorTitle		: "請選擇顏色",
+DlgColorBtnClear	: "清除",
+DlgColorHighlight	: "預覽",
+DlgColorSelected	: "選擇",
+
+// Smiley Dialog
+DlgSmileyTitle		: "插入表情符號",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "請選擇特殊符號",
+
+// Table Dialog
+DlgTableTitle		: "表格屬性",
+DlgTableRows		: "列數",
+DlgTableColumns		: "欄數",
+DlgTableBorder		: "邊框",
+DlgTableAlign		: "對齊",
+DlgTableAlignNotSet	: "<未設定>",
+DlgTableAlignLeft	: "靠左對齊",
+DlgTableAlignCenter	: "置中",
+DlgTableAlignRight	: "靠右對齊",
+DlgTableWidth		: "寬度",
+DlgTableWidthPx		: "像素",
+DlgTableWidthPc		: "百分比",
+DlgTableHeight		: "高度",
+DlgTableCellSpace	: "間距",
+DlgTableCellPad		: "內距",
+DlgTableCaption		: "標題",
+DlgTableSummary		: "摘要",
+
+// Table Cell Dialog
+DlgCellTitle		: "儲存格屬性",
+DlgCellWidth		: "寬度",
+DlgCellWidthPx		: "像素",
+DlgCellWidthPc		: "百分比",
+DlgCellHeight		: "高度",
+DlgCellWordWrap		: "自動換行",
+DlgCellWordWrapNotSet	: "<尚未設定>",
+DlgCellWordWrapYes	: "是",
+DlgCellWordWrapNo	: "否",
+DlgCellHorAlign		: "水平對齊",
+DlgCellHorAlignNotSet	: "<尚未設定>",
+DlgCellHorAlignLeft	: "靠左對齊",
+DlgCellHorAlignCenter	: "置中",
+DlgCellHorAlignRight: "靠右對齊",
+DlgCellVerAlign		: "垂直對齊",
+DlgCellVerAlignNotSet	: "<尚未設定>",
+DlgCellVerAlignTop	: "靠上對齊",
+DlgCellVerAlignMiddle	: "置中",
+DlgCellVerAlignBottom	: "靠下對齊",
+DlgCellVerAlignBaseline	: "基準線",
+DlgCellRowSpan		: "合併列數",
+DlgCellCollSpan		: "合併欄数",
+DlgCellBackColor	: "背景顏色",
+DlgCellBorderColor	: "邊框顏色",
+DlgCellBtnSelect	: "請選擇…",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "尋找與取代",
+
+// Find Dialog
+DlgFindTitle		: "尋找",
+DlgFindFindBtn		: "尋找",
+DlgFindNotFoundMsg	: "未找到指定的文字。",
+
+// Replace Dialog
+DlgReplaceTitle			: "取代",
+DlgReplaceFindLbl		: "尋找:",
+DlgReplaceReplaceLbl	: "取代:",
+DlgReplaceCaseChk		: "大小寫須相符",
+DlgReplaceReplaceBtn	: "取代",
+DlgReplaceReplAllBtn	: "全部取代",
+DlgReplaceWordChk		: "全字相符",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用快捷鍵 (Ctrl+X) 剪下。",
+PasteErrorCopy	: "瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用快捷鍵 (Ctrl+C) 複製。",
+
+PasteAsText		: "貼為純文字格式",
+PasteFromWord	: "自 Word 貼上",
+
+DlgPasteMsg2	: "請使用快捷鍵 (<strong>Ctrl+V</strong>) 貼到下方區域中並按下 <strong>確定</strong>",
+DlgPasteSec		: "因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。",
+DlgPasteIgnoreFont		: "移除字型設定",
+DlgPasteRemoveStyles	: "移除樣式設定",
+
+// Color Picker
+ColorAutomatic	: "自動",
+ColorMoreColors	: "更多顏色…",
+
+// Document Properties
+DocProps		: "文件屬性",
+
+// Anchor Dialog
+DlgAnchorTitle		: "命名錨點",
+DlgAnchorName		: "錨點名稱",
+DlgAnchorErrorName	: "請輸入錨點名稱",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "不在字典中",
+DlgSpellChangeTo		: "更改為",
+DlgSpellBtnIgnore		: "忽略",
+DlgSpellBtnIgnoreAll	: "全部忽略",
+DlgSpellBtnReplace		: "取代",
+DlgSpellBtnReplaceAll	: "全部取代",
+DlgSpellBtnUndo			: "復原",
+DlgSpellNoSuggestions	: "- 無建議值 -",
+DlgSpellProgress		: "進行拼字檢查中…",
+DlgSpellNoMispell		: "拼字檢查完成：未發現拼字錯誤",
+DlgSpellNoChanges		: "拼字檢查完成：未更改任何單字",
+DlgSpellOneChange		: "拼字檢查完成：更改了 1 個單字",
+DlgSpellManyChanges		: "拼字檢查完成：更改了 %1 個單字",
+
+IeSpellDownload			: "尚未安裝拼字檢查元件。您是否想要現在下載？",
+
+// Button Dialog
+DlgButtonText		: "顯示文字 (值)",
+DlgButtonType		: "類型",
+DlgButtonTypeBtn	: "按鈕 (Button)",
+DlgButtonTypeSbm	: "送出 (Submit)",
+DlgButtonTypeRst	: "重設 (Reset)",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "名稱",
+DlgCheckboxValue	: "選取值",
+DlgCheckboxSelected	: "已選取",
+
+// Form Dialog
+DlgFormName		: "名稱",
+DlgFormAction	: "動作",
+DlgFormMethod	: "方法",
+
+// Select Field Dialog
+DlgSelectName		: "名稱",
+DlgSelectValue		: "選取值",
+DlgSelectSize		: "大小",
+DlgSelectLines		: "行",
+DlgSelectChkMulti	: "可多選",
+DlgSelectOpAvail	: "可用選項",
+DlgSelectOpText		: "顯示文字",
+DlgSelectOpValue	: "值",
+DlgSelectBtnAdd		: "新增",
+DlgSelectBtnModify	: "修改",
+DlgSelectBtnUp		: "上移",
+DlgSelectBtnDown	: "下移",
+DlgSelectBtnSetValue : "設為預設值",
+DlgSelectBtnDelete	: "刪除",
+
+// Textarea Dialog
+DlgTextareaName	: "名稱",
+DlgTextareaCols	: "字元寬度",
+DlgTextareaRows	: "列數",
+
+// Text Field Dialog
+DlgTextName			: "名稱",
+DlgTextValue		: "值",
+DlgTextCharWidth	: "字元寬度",
+DlgTextMaxChars		: "最多字元數",
+DlgTextType			: "類型",
+DlgTextTypeText		: "文字",
+DlgTextTypePass		: "密碼",
+
+// Hidden Field Dialog
+DlgHiddenName	: "名稱",
+DlgHiddenValue	: "值",
+
+// Bulleted List Dialog
+BulletedListProp	: "項目清單屬性",
+NumberedListProp	: "編號清單屬性",
+DlgLstStart			: "起始編號",
+DlgLstType			: "清單類型",
+DlgLstTypeCircle	: "圓圈",
+DlgLstTypeDisc		: "圓點",
+DlgLstTypeSquare	: "方塊",
+DlgLstTypeNumbers	: "數字 (1, 2, 3)",
+DlgLstTypeLCase		: "小寫字母 (a, b, c)",
+DlgLstTypeUCase		: "大寫字母 (A, B, C)",
+DlgLstTypeSRoman	: "小寫羅馬數字 (i, ii, iii)",
+DlgLstTypeLRoman	: "大寫羅馬數字 (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "一般",
+DlgDocBackTab		: "背景",
+DlgDocColorsTab		: "顯色與邊界",
+DlgDocMetaTab		: "Meta 資料",
+
+DlgDocPageTitle		: "頁面標題",
+DlgDocLangDir		: "語言方向",
+DlgDocLangDirLTR	: "由左而右 (LTR)",
+DlgDocLangDirRTL	: "由右而左 (RTL)",
+DlgDocLangCode		: "語言代碼",
+DlgDocCharSet		: "字元編碼",
+DlgDocCharSetCE		: "中歐語系",
+DlgDocCharSetCT		: "正體中文 (Big5)",
+DlgDocCharSetCR		: "斯拉夫文",
+DlgDocCharSetGR		: "希臘文",
+DlgDocCharSetJP		: "日文",
+DlgDocCharSetKR		: "韓文",
+DlgDocCharSetTR		: "土耳其文",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "西歐語系",
+DlgDocCharSetOther	: "其他字元編碼",
+
+DlgDocDocType		: "文件類型",
+DlgDocDocTypeOther	: "其他文件類型",
+DlgDocIncXHTML		: "包含 XHTML 定義",
+DlgDocBgColor		: "背景顏色",
+DlgDocBgImage		: "背景影像",
+DlgDocBgNoScroll	: "浮水印",
+DlgDocCText			: "文字",
+DlgDocCLink			: "超連結",
+DlgDocCVisited		: "已瀏覽過的超連結",
+DlgDocCActive		: "作用中的超連結",
+DlgDocMargins		: "頁面邊界",
+DlgDocMaTop			: "上",
+DlgDocMaLeft		: "左",
+DlgDocMaRight		: "右",
+DlgDocMaBottom		: "下",
+DlgDocMeIndex		: "文件索引關鍵字 (用半形逗號[,]分隔)",
+DlgDocMeDescr		: "文件說明",
+DlgDocMeAuthor		: "作者",
+DlgDocMeCopy		: "版權所有",
+DlgDocPreview		: "預覽",
+
+// Templates Dialog
+Templates			: "樣版",
+DlgTemplatesTitle	: "內容樣版",
+DlgTemplatesSelMsg	: "請選擇欲開啟的樣版<br> (原有的內容將會被清除):",
+DlgTemplatesLoading	: "讀取樣版清單中，請稍候…",
+DlgTemplatesNoTpl	: "(無樣版)",
+DlgTemplatesReplace	: "取代原有內容",
+
+// About Dialog
+DlgAboutAboutTab	: "關於",
+DlgAboutBrowserInfoTab	: "瀏覽器資訊",
+DlgAboutLicenseTab	: "許可證",
+DlgAboutVersion		: "版本",
+DlgAboutInfo		: "想獲得更多資訊請至 ",
+
+// Div Dialog
+DlgDivGeneralTab	: "一般",
+DlgDivAdvancedTab	: "進階",
+DlgDivStyle		: "樣式",
+DlgDivInlineStyle	: "CSS 樣式"
+};
diff --git a/modules/editor/skins/fckeditor/editor/lang/zh.js b/modules/editor/skins/fckeditor/editor/lang/zh.js
new file mode 100644
index 000000000..724ca2f67
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/lang/zh.js
@@ -0,0 +1,526 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Chinese Traditional language file.
+ */
+
+var FCKLang =
+{
+// Language direction : "ltr" (left to right) or "rtl" (right to left).
+Dir					: "ltr",
+
+ToolbarCollapse		: "隱藏面板",
+ToolbarExpand		: "顯示面板",
+
+// Toolbar Items and Context Menu
+Save				: "儲存",
+NewPage				: "開新檔案",
+Preview				: "預覽",
+Cut					: "剪下",
+Copy				: "複製",
+Paste				: "貼上",
+PasteText			: "貼為純文字格式",
+PasteWord			: "自 Word 貼上",
+Print				: "列印",
+SelectAll			: "全選",
+RemoveFormat		: "清除格式",
+InsertLinkLbl		: "超連結",
+InsertLink			: "插入/編輯超連結",
+RemoveLink			: "移除超連結",
+VisitLink			: "開啟超連結",
+Anchor				: "插入/編輯錨點",
+AnchorDelete		: "移除錨點",
+InsertImageLbl		: "影像",
+InsertImage			: "插入/編輯影像",
+InsertFlashLbl		: "Flash",
+InsertFlash			: "插入/編輯 Flash",
+InsertTableLbl		: "表格",
+InsertTable			: "插入/編輯表格",
+InsertLineLbl		: "水平線",
+InsertLine			: "插入水平線",
+InsertSpecialCharLbl: "特殊符號",
+InsertSpecialChar	: "插入特殊符號",
+InsertSmileyLbl		: "表情符號",
+InsertSmiley		: "插入表情符號",
+About				: "關於 FCKeditor",
+Bold				: "粗體",
+Italic				: "斜體",
+Underline			: "底線",
+StrikeThrough		: "刪除線",
+Subscript			: "下標",
+Superscript			: "上標",
+LeftJustify			: "靠左對齊",
+CenterJustify		: "置中",
+RightJustify		: "靠右對齊",
+BlockJustify		: "左右對齊",
+DecreaseIndent		: "減少縮排",
+IncreaseIndent		: "增加縮排",
+Blockquote			: "引用文字",
+CreateDiv			: "新增 Div 標籤",
+EditDiv				: "變更 Div 標籤",
+DeleteDiv			: "移除 Div 標籤",
+Undo				: "復原",
+Redo				: "重複",
+NumberedListLbl		: "編號清單",
+NumberedList		: "插入/移除編號清單",
+BulletedListLbl		: "項目清單",
+BulletedList		: "插入/移除項目清單",
+ShowTableBorders	: "顯示表格邊框",
+ShowDetails			: "顯示詳細資料",
+Style				: "樣式",
+FontFormat			: "格式",
+Font				: "字體",
+FontSize			: "大小",
+TextColor			: "文字顏色",
+BGColor				: "背景顏色",
+Source				: "原始碼",
+Find				: "尋找",
+Replace				: "取代",
+SpellCheck			: "拼字檢查",
+UniversalKeyboard	: "萬國鍵盤",
+PageBreakLbl		: "分頁符號",
+PageBreak			: "插入分頁符號",
+
+Form			: "表單",
+Checkbox		: "核取方塊",
+RadioButton		: "選項按鈕",
+TextField		: "文字方塊",
+Textarea		: "文字區域",
+HiddenField		: "隱藏欄位",
+Button			: "按鈕",
+SelectionField	: "清單/選單",
+ImageButton		: "影像按鈕",
+
+FitWindow		: "編輯器最大化",
+ShowBlocks		: "顯示區塊",
+
+// Context Menu
+EditLink			: "編輯超連結",
+CellCM				: "儲存格",
+RowCM				: "列",
+ColumnCM			: "欄",
+InsertRowAfter		: "向下插入列",
+InsertRowBefore		: "向上插入列",
+DeleteRows			: "刪除列",
+InsertColumnAfter	: "向右插入欄",
+InsertColumnBefore	: "向左插入欄",
+DeleteColumns		: "刪除欄",
+InsertCellAfter		: "向右插入儲存格",
+InsertCellBefore	: "向左插入儲存格",
+DeleteCells			: "刪除儲存格",
+MergeCells			: "合併儲存格",
+MergeRight			: "向右合併儲存格",
+MergeDown			: "向下合併儲存格",
+HorizontalSplitCell	: "橫向分割儲存格",
+VerticalSplitCell	: "縱向分割儲存格",
+TableDelete			: "刪除表格",
+CellProperties		: "儲存格屬性",
+TableProperties		: "表格屬性",
+ImageProperties		: "影像屬性",
+FlashProperties		: "Flash 屬性",
+
+AnchorProp			: "錨點屬性",
+ButtonProp			: "按鈕屬性",
+CheckboxProp		: "核取方塊屬性",
+HiddenFieldProp		: "隱藏欄位屬性",
+RadioButtonProp		: "選項按鈕屬性",
+ImageButtonProp		: "影像按鈕屬性",
+TextFieldProp		: "文字方塊屬性",
+SelectionFieldProp	: "清單/選單屬性",
+TextareaProp		: "文字區域屬性",
+FormProp			: "表單屬性",
+
+FontFormats			: "一般;已格式化;位址;標題 1;標題 2;標題 3;標題 4;標題 5;標題 6;一般 (DIV)",
+
+// Alerts and Messages
+ProcessingXHTML		: "處理 XHTML 中，請稍候…",
+Done				: "完成",
+PasteWordConfirm	: "您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？",
+NotCompatiblePaste	: "此指令僅在 Internet Explorer 5.5 或以上的版本有效。請問您是否同意不清除格式即貼上？",
+UnknownToolbarItem	: "未知工具列項目 \"%1\"",
+UnknownCommand		: "未知指令名稱 \"%1\"",
+NotImplemented		: "尚未安裝此指令",
+UnknownToolbarSet	: "工具列設定 \"%1\" 不存在",
+NoActiveX			: "瀏覽器的安全性設定限制了本編輯器的某些功能。您必須啟用安全性設定中的「執行ActiveX控制項與外掛程式」項目，否則本編輯器將會出現錯誤並缺少某些功能",
+BrowseServerBlocked : "無法開啟資源瀏覽器，請確定所有快顯視窗封鎖程式是否關閉",
+DialogBlocked		: "無法開啟對話視窗，請確定所有快顯視窗封鎖程式是否關閉",
+VisitLinkBlocked	: "無法開啟新視窗，請確定所有快顯視窗封鎖程式是否關閉",
+
+// Dialogs
+DlgBtnOK			: "確定",
+DlgBtnCancel		: "取消",
+DlgBtnClose			: "關閉",
+DlgBtnBrowseServer	: "瀏覽伺服器端",
+DlgAdvancedTag		: "進階",
+DlgOpOther			: "<其他>",
+DlgInfoTab			: "資訊",
+DlgAlertUrl			: "請插入 URL",
+
+// General Dialogs Labels
+DlgGenNotSet		: "<尚未設定>",
+DlgGenId			: "ID",
+DlgGenLangDir		: "語言方向",
+DlgGenLangDirLtr	: "由左而右 (LTR)",
+DlgGenLangDirRtl	: "由右而左 (RTL)",
+DlgGenLangCode		: "語言代碼",
+DlgGenAccessKey		: "存取鍵",
+DlgGenName			: "名稱",
+DlgGenTabIndex		: "定位順序",
+DlgGenLongDescr		: "詳細 URL",
+DlgGenClass			: "樣式表類別",
+DlgGenTitle			: "標題",
+DlgGenContType		: "內容類型",
+DlgGenLinkCharset	: "連結資源之編碼",
+DlgGenStyle			: "樣式",
+
+// Image Dialog
+DlgImgTitle			: "影像屬性",
+DlgImgInfoTab		: "影像資訊",
+DlgImgBtnUpload		: "上傳至伺服器",
+DlgImgURL			: "URL",
+DlgImgUpload		: "上傳",
+DlgImgAlt			: "替代文字",
+DlgImgWidth			: "寬度",
+DlgImgHeight		: "高度",
+DlgImgLockRatio		: "等比例",
+DlgBtnResetSize		: "重設為原大小",
+DlgImgBorder		: "邊框",
+DlgImgHSpace		: "水平距離",
+DlgImgVSpace		: "垂直距離",
+DlgImgAlign			: "對齊",
+DlgImgAlignLeft		: "靠左對齊",
+DlgImgAlignAbsBottom: "絕對下方",
+DlgImgAlignAbsMiddle: "絕對中間",
+DlgImgAlignBaseline	: "基準線",
+DlgImgAlignBottom	: "靠下對齊",
+DlgImgAlignMiddle	: "置中對齊",
+DlgImgAlignRight	: "靠右對齊",
+DlgImgAlignTextTop	: "文字上方",
+DlgImgAlignTop		: "靠上對齊",
+DlgImgPreview		: "預覽",
+DlgImgAlertUrl		: "請輸入影像 URL",
+DlgImgLinkTab		: "超連結",
+
+// Flash Dialog
+DlgFlashTitle		: "Flash 屬性",
+DlgFlashChkPlay		: "自動播放",
+DlgFlashChkLoop		: "重複",
+DlgFlashChkMenu		: "開啟選單",
+DlgFlashScale		: "縮放",
+DlgFlashScaleAll	: "全部顯示",
+DlgFlashScaleNoBorder	: "無邊框",
+DlgFlashScaleFit	: "精確符合",
+
+// Link Dialog
+DlgLnkWindowTitle	: "超連結",
+DlgLnkInfoTab		: "超連結資訊",
+DlgLnkTargetTab		: "目標",
+
+DlgLnkType			: "超連接類型",
+DlgLnkTypeURL		: "URL",
+DlgLnkTypeAnchor	: "本頁錨點",
+DlgLnkTypeEMail		: "電子郵件",
+DlgLnkProto			: "通訊協定",
+DlgLnkProtoOther	: "<其他>",
+DlgLnkURL			: "URL",
+DlgLnkAnchorSel		: "請選擇錨點",
+DlgLnkAnchorByName	: "依錨點名稱",
+DlgLnkAnchorById	: "依元件 ID",
+DlgLnkNoAnchors		: "(本文件尚無可用之錨點)",
+DlgLnkEMail			: "電子郵件",
+DlgLnkEMailSubject	: "郵件主旨",
+DlgLnkEMailBody		: "郵件內容",
+DlgLnkUpload		: "上傳",
+DlgLnkBtnUpload		: "傳送至伺服器",
+
+DlgLnkTarget		: "目標",
+DlgLnkTargetFrame	: "<框架>",
+DlgLnkTargetPopup	: "<快顯視窗>",
+DlgLnkTargetBlank	: "新視窗 (_blank)",
+DlgLnkTargetParent	: "父視窗 (_parent)",
+DlgLnkTargetSelf	: "本視窗 (_self)",
+DlgLnkTargetTop		: "最上層視窗 (_top)",
+DlgLnkTargetFrameName	: "目標框架名稱",
+DlgLnkPopWinName	: "快顯視窗名稱",
+DlgLnkPopWinFeat	: "快顯視窗屬性",
+DlgLnkPopResize		: "可調整大小",
+DlgLnkPopLocation	: "網址列",
+DlgLnkPopMenu		: "選單列",
+DlgLnkPopScroll		: "捲軸",
+DlgLnkPopStatus		: "狀態列",
+DlgLnkPopToolbar	: "工具列",
+DlgLnkPopFullScrn	: "全螢幕 (IE)",
+DlgLnkPopDependent	: "從屬 (NS)",
+DlgLnkPopWidth		: "寬",
+DlgLnkPopHeight		: "高",
+DlgLnkPopLeft		: "左",
+DlgLnkPopTop		: "右",
+
+DlnLnkMsgNoUrl		: "請輸入欲連結的 URL",
+DlnLnkMsgNoEMail	: "請輸入電子郵件位址",
+DlnLnkMsgNoAnchor	: "請選擇錨點",
+DlnLnkMsgInvPopName	: "快顯名稱必須以「英文字母」為開頭，且不得含有空白",
+
+// Color Dialog
+DlgColorTitle		: "請選擇顏色",
+DlgColorBtnClear	: "清除",
+DlgColorHighlight	: "預覽",
+DlgColorSelected	: "選擇",
+
+// Smiley Dialog
+DlgSmileyTitle		: "插入表情符號",
+
+// Special Character Dialog
+DlgSpecialCharTitle	: "請選擇特殊符號",
+
+// Table Dialog
+DlgTableTitle		: "表格屬性",
+DlgTableRows		: "列數",
+DlgTableColumns		: "欄數",
+DlgTableBorder		: "邊框",
+DlgTableAlign		: "對齊",
+DlgTableAlignNotSet	: "<未設定>",
+DlgTableAlignLeft	: "靠左對齊",
+DlgTableAlignCenter	: "置中",
+DlgTableAlignRight	: "靠右對齊",
+DlgTableWidth		: "寬度",
+DlgTableWidthPx		: "像素",
+DlgTableWidthPc		: "百分比",
+DlgTableHeight		: "高度",
+DlgTableCellSpace	: "間距",
+DlgTableCellPad		: "內距",
+DlgTableCaption		: "標題",
+DlgTableSummary		: "摘要",
+
+// Table Cell Dialog
+DlgCellTitle		: "儲存格屬性",
+DlgCellWidth		: "寬度",
+DlgCellWidthPx		: "像素",
+DlgCellWidthPc		: "百分比",
+DlgCellHeight		: "高度",
+DlgCellWordWrap		: "自動換行",
+DlgCellWordWrapNotSet	: "<尚未設定>",
+DlgCellWordWrapYes	: "是",
+DlgCellWordWrapNo	: "否",
+DlgCellHorAlign		: "水平對齊",
+DlgCellHorAlignNotSet	: "<尚未設定>",
+DlgCellHorAlignLeft	: "靠左對齊",
+DlgCellHorAlignCenter	: "置中",
+DlgCellHorAlignRight: "靠右對齊",
+DlgCellVerAlign		: "垂直對齊",
+DlgCellVerAlignNotSet	: "<尚未設定>",
+DlgCellVerAlignTop	: "靠上對齊",
+DlgCellVerAlignMiddle	: "置中",
+DlgCellVerAlignBottom	: "靠下對齊",
+DlgCellVerAlignBaseline	: "基準線",
+DlgCellRowSpan		: "合併列數",
+DlgCellCollSpan		: "合併欄数",
+DlgCellBackColor	: "背景顏色",
+DlgCellBorderColor	: "邊框顏色",
+DlgCellBtnSelect	: "請選擇…",
+
+// Find and Replace Dialog
+DlgFindAndReplaceTitle	: "尋找與取代",
+
+// Find Dialog
+DlgFindTitle		: "尋找",
+DlgFindFindBtn		: "尋找",
+DlgFindNotFoundMsg	: "未找到指定的文字。",
+
+// Replace Dialog
+DlgReplaceTitle			: "取代",
+DlgReplaceFindLbl		: "尋找:",
+DlgReplaceReplaceLbl	: "取代:",
+DlgReplaceCaseChk		: "大小寫須相符",
+DlgReplaceReplaceBtn	: "取代",
+DlgReplaceReplAllBtn	: "全部取代",
+DlgReplaceWordChk		: "全字相符",
+
+// Paste Operations / Dialog
+PasteErrorCut	: "瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用快捷鍵 (Ctrl+X) 剪下。",
+PasteErrorCopy	: "瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用快捷鍵 (Ctrl+C) 複製。",
+
+PasteAsText		: "貼為純文字格式",
+PasteFromWord	: "自 Word 貼上",
+
+DlgPasteMsg2	: "請使用快捷鍵 (<strong>Ctrl+V</strong>) 貼到下方區域中並按下 <strong>確定</strong>",
+DlgPasteSec		: "因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。",
+DlgPasteIgnoreFont		: "移除字型設定",
+DlgPasteRemoveStyles	: "移除樣式設定",
+
+// Color Picker
+ColorAutomatic	: "自動",
+ColorMoreColors	: "更多顏色…",
+
+// Document Properties
+DocProps		: "文件屬性",
+
+// Anchor Dialog
+DlgAnchorTitle		: "命名錨點",
+DlgAnchorName		: "錨點名稱",
+DlgAnchorErrorName	: "請輸入錨點名稱",
+
+// Speller Pages Dialog
+DlgSpellNotInDic		: "不在字典中",
+DlgSpellChangeTo		: "更改為",
+DlgSpellBtnIgnore		: "忽略",
+DlgSpellBtnIgnoreAll	: "全部忽略",
+DlgSpellBtnReplace		: "取代",
+DlgSpellBtnReplaceAll	: "全部取代",
+DlgSpellBtnUndo			: "復原",
+DlgSpellNoSuggestions	: "- 無建議值 -",
+DlgSpellProgress		: "進行拼字檢查中…",
+DlgSpellNoMispell		: "拼字檢查完成：未發現拼字錯誤",
+DlgSpellNoChanges		: "拼字檢查完成：未更改任何單字",
+DlgSpellOneChange		: "拼字檢查完成：更改了 1 個單字",
+DlgSpellManyChanges		: "拼字檢查完成：更改了 %1 個單字",
+
+IeSpellDownload			: "尚未安裝拼字檢查元件。您是否想要現在下載？",
+
+// Button Dialog
+DlgButtonText		: "顯示文字 (值)",
+DlgButtonType		: "類型",
+DlgButtonTypeBtn	: "按鈕 (Button)",
+DlgButtonTypeSbm	: "送出 (Submit)",
+DlgButtonTypeRst	: "重設 (Reset)",
+
+// Checkbox and Radio Button Dialogs
+DlgCheckboxName		: "名稱",
+DlgCheckboxValue	: "選取值",
+DlgCheckboxSelected	: "已選取",
+
+// Form Dialog
+DlgFormName		: "名稱",
+DlgFormAction	: "動作",
+DlgFormMethod	: "方法",
+
+// Select Field Dialog
+DlgSelectName		: "名稱",
+DlgSelectValue		: "選取值",
+DlgSelectSize		: "大小",
+DlgSelectLines		: "行",
+DlgSelectChkMulti	: "可多選",
+DlgSelectOpAvail	: "可用選項",
+DlgSelectOpText		: "顯示文字",
+DlgSelectOpValue	: "值",
+DlgSelectBtnAdd		: "新增",
+DlgSelectBtnModify	: "修改",
+DlgSelectBtnUp		: "上移",
+DlgSelectBtnDown	: "下移",
+DlgSelectBtnSetValue : "設為預設值",
+DlgSelectBtnDelete	: "刪除",
+
+// Textarea Dialog
+DlgTextareaName	: "名稱",
+DlgTextareaCols	: "字元寬度",
+DlgTextareaRows	: "列數",
+
+// Text Field Dialog
+DlgTextName			: "名稱",
+DlgTextValue		: "值",
+DlgTextCharWidth	: "字元寬度",
+DlgTextMaxChars		: "最多字元數",
+DlgTextType			: "類型",
+DlgTextTypeText		: "文字",
+DlgTextTypePass		: "密碼",
+
+// Hidden Field Dialog
+DlgHiddenName	: "名稱",
+DlgHiddenValue	: "值",
+
+// Bulleted List Dialog
+BulletedListProp	: "項目清單屬性",
+NumberedListProp	: "編號清單屬性",
+DlgLstStart			: "起始編號",
+DlgLstType			: "清單類型",
+DlgLstTypeCircle	: "圓圈",
+DlgLstTypeDisc		: "圓點",
+DlgLstTypeSquare	: "方塊",
+DlgLstTypeNumbers	: "數字 (1, 2, 3)",
+DlgLstTypeLCase		: "小寫字母 (a, b, c)",
+DlgLstTypeUCase		: "大寫字母 (A, B, C)",
+DlgLstTypeSRoman	: "小寫羅馬數字 (i, ii, iii)",
+DlgLstTypeLRoman	: "大寫羅馬數字 (I, II, III)",
+
+// Document Properties Dialog
+DlgDocGeneralTab	: "一般",
+DlgDocBackTab		: "背景",
+DlgDocColorsTab		: "顯色與邊界",
+DlgDocMetaTab		: "Meta 資料",
+
+DlgDocPageTitle		: "頁面標題",
+DlgDocLangDir		: "語言方向",
+DlgDocLangDirLTR	: "由左而右 (LTR)",
+DlgDocLangDirRTL	: "由右而左 (RTL)",
+DlgDocLangCode		: "語言代碼",
+DlgDocCharSet		: "字元編碼",
+DlgDocCharSetCE		: "中歐語系",
+DlgDocCharSetCT		: "正體中文 (Big5)",
+DlgDocCharSetCR		: "斯拉夫文",
+DlgDocCharSetGR		: "希臘文",
+DlgDocCharSetJP		: "日文",
+DlgDocCharSetKR		: "韓文",
+DlgDocCharSetTR		: "土耳其文",
+DlgDocCharSetUN		: "Unicode (UTF-8)",
+DlgDocCharSetWE		: "西歐語系",
+DlgDocCharSetOther	: "其他字元編碼",
+
+DlgDocDocType		: "文件類型",
+DlgDocDocTypeOther	: "其他文件類型",
+DlgDocIncXHTML		: "包含 XHTML 定義",
+DlgDocBgColor		: "背景顏色",
+DlgDocBgImage		: "背景影像",
+DlgDocBgNoScroll	: "浮水印",
+DlgDocCText			: "文字",
+DlgDocCLink			: "超連結",
+DlgDocCVisited		: "已瀏覽過的超連結",
+DlgDocCActive		: "作用中的超連結",
+DlgDocMargins		: "頁面邊界",
+DlgDocMaTop			: "上",
+DlgDocMaLeft		: "左",
+DlgDocMaRight		: "右",
+DlgDocMaBottom		: "下",
+DlgDocMeIndex		: "文件索引關鍵字 (用半形逗號[,]分隔)",
+DlgDocMeDescr		: "文件說明",
+DlgDocMeAuthor		: "作者",
+DlgDocMeCopy		: "版權所有",
+DlgDocPreview		: "預覽",
+
+// Templates Dialog
+Templates			: "樣版",
+DlgTemplatesTitle	: "內容樣版",
+DlgTemplatesSelMsg	: "請選擇欲開啟的樣版<br> (原有的內容將會被清除):",
+DlgTemplatesLoading	: "讀取樣版清單中，請稍候…",
+DlgTemplatesNoTpl	: "(無樣版)",
+DlgTemplatesReplace	: "取代原有內容",
+
+// About Dialog
+DlgAboutAboutTab	: "關於",
+DlgAboutBrowserInfoTab	: "瀏覽器資訊",
+DlgAboutLicenseTab	: "許可證",
+DlgAboutVersion		: "版本",
+DlgAboutInfo		: "想獲得更多資訊請至 ",
+
+// Div Dialog
+DlgDivGeneralTab	: "一般",
+DlgDivAdvancedTab	: "進階",
+DlgDivStyle		: "樣式",
+DlgDivInlineStyle	: "CSS 樣式"
+};
diff --git a/modules/editor/skins/fckeditor/editor/plugins/autogrow/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/autogrow/fckplugin.js
new file mode 100644
index 000000000..8873b059f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/autogrow/fckplugin.js
@@ -0,0 +1,99 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Plugin: automatically resizes the editor until a configurable maximun
+ * height (FCKConfig.AutoGrowMax), based on its contents.
+ */
+
+var FCKAutoGrow_Min = window.frameElement.offsetHeight ;
+
+function FCKAutoGrow_Check()
+{
+	var oInnerDoc = FCK.EditorDocument ;
+
+	var iFrameHeight, iInnerHeight ;
+
+	if ( FCKBrowserInfo.IsIE )
+	{
+		iFrameHeight = FCK.EditorWindow.frameElement.offsetHeight ;
+		iInnerHeight = oInnerDoc.body.scrollHeight ;
+	}
+	else
+	{
+		iFrameHeight = FCK.EditorWindow.innerHeight ;
+		iInnerHeight = oInnerDoc.body.offsetHeight ;
+	}
+
+	var iDiff = iInnerHeight - iFrameHeight ;
+
+	if ( iDiff != 0 )
+	{
+		var iMainFrameSize = window.frameElement.offsetHeight ;
+
+		if ( iDiff > 0 && iMainFrameSize < FCKConfig.AutoGrowMax )
+		{
+			iMainFrameSize += iDiff ;
+			if ( iMainFrameSize > FCKConfig.AutoGrowMax )
+				iMainFrameSize = FCKConfig.AutoGrowMax ;
+		}
+		else if ( iDiff < 0 && iMainFrameSize > FCKAutoGrow_Min )
+		{
+			iMainFrameSize += iDiff ;
+			if ( iMainFrameSize < FCKAutoGrow_Min )
+				iMainFrameSize = FCKAutoGrow_Min ;
+		}
+		else
+			return ;
+
+		window.frameElement.height = iMainFrameSize ;
+
+		// Gecko browsers use an onresize handler to update the innermost
+		// IFRAME's height. If the document is modified before the onresize
+		// is triggered, the plugin will miscalculate the new height. Thus,
+		// forcibly trigger onresize. #1336
+		if ( typeof window.onresize == 'function' )
+			window.onresize() ;
+	}
+}
+
+FCK.AttachToOnSelectionChange( FCKAutoGrow_Check ) ;
+
+function FCKAutoGrow_SetListeners()
+{
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+		return ;
+
+	FCK.EditorWindow.attachEvent( 'onscroll', FCKAutoGrow_Check ) ;
+	FCK.EditorDocument.attachEvent( 'onkeyup', FCKAutoGrow_Check ) ;
+}
+
+if ( FCKBrowserInfo.IsIE )
+{
+//	FCKAutoGrow_SetListeners() ;
+	FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKAutoGrow_SetListeners ) ;
+}
+
+function FCKAutoGrow_CheckEditorStatus( sender, status )
+{
+	if ( status == FCK_STATUS_COMPLETE )
+		FCKAutoGrow_Check() ;
+}
+
+FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.config.js b/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
new file mode 100644
index 000000000..782e669dc
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
@@ -0,0 +1,26 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Sample custom configuration settings used by the BBCode plugin. It simply
+ * loads the plugin. All the rest is done by the plugin itself.
+ */
+
+// Add the BBCode plugin.
+FCKConfig.Plugins.Add( 'bbcode' ) ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.html b/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.html
new file mode 100644
index 000000000..246f3a517
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/bbcode/_sample/sample.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Sample page.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - BBCode Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../../../../_samples/sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../../../fckeditor.js"></script>
+</head>
+<body>
+	<h1>
+		FCKeditor - BBCode Sample</h1>
+	<p>
+		This is a sample of custom Data Processor implementation for (very) basic BBCode
+		syntax. Only <strong>[b]</strong>, <strong>[i]</strong>, <strong>[u]</strong> and
+		<strong>[url]</strong> may be used. It may be extended, but this is out of this
+		sample purpose.
+	</p>
+	<p>
+		Note that the input and output of the editor is not HTML, but BBCode
+	</p>
+	<hr />
+	<form action="../../../../_samples/html/sampleposteddata.asp" method="post" target="_blank">
+		<script type="text/javascript">
+<!--
+// Automatically calculates the editor base path based on the _samples directory.
+// This is usefull only for these samples. A real application should use something like this:
+// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
+var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('editor')) ;
+
+var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
+oFCKeditor.BasePath	= sBasePath ;
+
+// Set the custom configurations file path (in this way the original file is mantained).
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + 'editor/plugins/bbcode/_sample/sample.config.js' ;
+
+oFCKeditor.Value = 'This is some [b]sample text[/b]. You are using [url=http://www.fckeditor.net/]FCKeditor[/url].' ;
+oFCKeditor.Create() ;
+//-->
+		</script>
+		<br />
+		<input type="submit" value="Submit" />
+	</form>
+</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/plugins/bbcode/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/bbcode/fckplugin.js
new file mode 100644
index 000000000..640f820e8
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/bbcode/fckplugin.js
@@ -0,0 +1,123 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is a sample implementation for a custom Data Processor for basic BBCode.
+ */
+
+FCK.DataProcessor =
+{
+	/*
+	 * Returns a string representing the HTML format of "data". The returned
+	 * value will be loaded in the editor.
+	 * The HTML must be from <html> to </html>, eventually including
+	 * the DOCTYPE.
+	 *     @param {String} data The data to be converted in the
+	 *            DataProcessor specific format.
+	 */
+	ConvertToHtml : function( data )
+	{
+		// Convert < and > to their HTML entities.
+        data = data.replace( /</g, '&lt;' ) ;
+        data = data.replace( />/g, '&gt;' ) ;
+
+        // Convert line breaks to <br>.
+        data = data.replace( /(?:\r\n|\n|\r)/g, '<br>' ) ;
+
+        // [url]
+        data = data.replace( /\[url\](.+?)\[\/url]/gi, '<a href="$1">$1</a>' ) ;
+        data = data.replace( /\[url\=([^\]]+)](.+?)\[\/url]/gi, '<a href="$1">$2</a>' ) ;
+
+        // [b]
+        data = data.replace( /\[b\](.+?)\[\/b]/gi, '<b>$1</b>' ) ;
+
+        // [i]
+        data = data.replace( /\[i\](.+?)\[\/i]/gi, '<i>$1</i>' ) ;
+
+        // [u]
+        data = data.replace( /\[u\](.+?)\[\/u]/gi, '<u>$1</u>' ) ;
+
+		return '<html><head><title></title></head><body>' + data + '</body></html>' ;
+	},
+
+	/*
+	 * Converts a DOM (sub-)tree to a string in the data format.
+	 *     @param {Object} rootNode The node that contains the DOM tree to be
+	 *            converted to the data format.
+	 *     @param {Boolean} excludeRoot Indicates that the root node must not
+	 *            be included in the conversion, only its children.
+	 *     @param {Boolean} format Indicates that the data must be formatted
+	 *            for human reading. Not all Data Processors may provide it.
+	 */
+	ConvertToDataFormat : function( rootNode, excludeRoot, ignoreIfEmptyParagraph, format )
+	{
+		var data = rootNode.innerHTML ;
+
+		// Convert <br> to line breaks.
+		data = data.replace( /<br(?=[ \/>]).*?>/gi, '\r\n') ;
+
+		// [url]
+		data = data.replace( /<a .*?href=(["'])(.+?)\1.*?>(.+?)<\/a>/gi, '[url=$2]$3[/url]') ;
+
+		// [b]
+		data = data.replace( /<(?:b|strong)>/gi, '[b]') ;
+		data = data.replace( /<\/(?:b|strong)>/gi, '[/b]') ;
+
+		// [i]
+		data = data.replace( /<(?:i|em)>/gi, '[i]') ;
+		data = data.replace( /<\/(?:i|em)>/gi, '[/i]') ;
+
+		// [u]
+		data = data.replace( /<u>/gi, '[u]') ;
+		data = data.replace( /<\/u>/gi, '[/u]') ;
+
+		// Remove remaining tags.
+		data = data.replace( /<[^>]+>/g, '') ;
+
+		return data ;
+	},
+
+	/*
+	 * Makes any necessary changes to a piece of HTML for insertion in the
+	 * editor selection position.
+	 *     @param {String} html The HTML to be fixed.
+	 */
+	FixHtml : function( html )
+	{
+		return html ;
+	}
+} ;
+
+// This Data Processor doesn't support <p>, so let's use <br>.
+FCKConfig.EnterMode = 'br' ;
+
+// To avoid pasting invalid markup (which is discarded in any case), let's
+// force pasting to plain text.
+FCKConfig.ForcePasteAsPlainText	= true ;
+
+// Rename the "Source" buttom to "BBCode".
+FCKToolbarItems.RegisterItem( 'Source', new FCKToolbarButton( 'Source', 'BBCode', null, FCK_TOOLBARITEM_ICONTEXT, true, true, 1 ) ) ;
+
+// Let's enforce the toolbar to the limits of this Data Processor. A custom
+// toolbar set may be defined in the configuration file with more or less entries.
+FCKConfig.ToolbarSets["Default"] = [
+	['Source'],
+	['Bold','Italic','Underline','-','Link'],
+	['About']
+] ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/dragresizetable/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/dragresizetable/fckplugin.js
new file mode 100644
index 000000000..c4f1c8344
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/dragresizetable/fckplugin.js
@@ -0,0 +1,524 @@
+var FCKDragTableHandler =
+{
+	"_DragState" : 0,
+	"_LeftCell" : null,
+	"_RightCell" : null,
+	"_MouseMoveMode" : 0,	// 0 - find candidate cells for resizing, 1 - drag to resize
+	"_ResizeBar" : null,
+	"_OriginalX" : null,
+	"_MinimumX" : null,
+	"_MaximumX" : null,
+	"_LastX" : null,
+	"_TableMap" : null,
+	"_doc" : document,
+	"_IsInsideNode" : function( w, domNode, pos )
+	{
+		var myCoords = FCKTools.GetWindowPosition( w, domNode ) ;
+		var xMin = myCoords.x ;
+		var yMin = myCoords.y ;
+		var xMax = parseInt( xMin, 10 ) + parseInt( domNode.offsetWidth, 10 ) ;
+		var yMax = parseInt( yMin, 10 ) + parseInt( domNode.offsetHeight, 10 ) ;
+		if ( pos.x >= xMin && pos.x <= xMax && pos.y >= yMin && pos.y <= yMax )
+			return true;
+		return false;
+	},
+	"_GetBorderCells" : function( w, tableNode, tableMap, mouse )
+	{
+		// Enumerate all the cells in the table.
+		var cells = [] ;
+		for ( var i = 0 ; i < tableNode.rows.length ; i++ )
+		{
+			var r = tableNode.rows[i] ;
+			for ( var j = 0 ; j < r.cells.length ; j++ )
+				cells.push( r.cells[j] ) ;
+		}
+
+		if ( cells.length < 1 )
+			return null ;
+
+		// Get the cells whose right or left border is nearest to the mouse cursor's x coordinate.
+		var minRxDist = null ;
+		var lxDist = null ;
+		var minYDist = null ;
+		var rbCell = null ;
+		var lbCell = null ;
+		for ( var i = 0 ; i < cells.length ; i++ )
+		{
+			var pos = FCKTools.GetWindowPosition( w, cells[i] ) ;
+			var rightX = pos.x + parseInt( cells[i].clientWidth, 10 ) ;
+			var rxDist = mouse.x - rightX ;
+			var yDist = mouse.y - ( pos.y + ( cells[i].clientHeight / 2 ) ) ;
+			if ( minRxDist == null ||
+					( Math.abs( rxDist ) <= Math.abs( minRxDist ) &&
+					  ( minYDist == null || Math.abs( yDist ) <= Math.abs( minYDist ) ) ) )
+			{
+				minRxDist = rxDist ;
+				minYDist = yDist ;
+				rbCell = cells[i] ;
+			}
+		}
+		/*
+		var rowNode = FCKTools.GetElementAscensor( rbCell, "tr" ) ;
+		var cellIndex = rbCell.cellIndex + 1 ;
+		if ( cellIndex >= rowNode.cells.length )
+			return null ;
+		lbCell = rowNode.cells.item( cellIndex ) ;
+		*/
+		var rowIdx = rbCell.parentNode.rowIndex ;
+		var colIdx = FCKTableHandler._GetCellIndexSpan( tableMap, rowIdx, rbCell ) ;
+		var colSpan = isNaN( rbCell.colSpan ) ? 1 : rbCell.colSpan ;
+		lbCell = tableMap[rowIdx][colIdx + colSpan] ;
+
+		if ( ! lbCell )
+			return null ;
+
+		// Abort if too far from the border.
+		lxDist = mouse.x - FCKTools.GetWindowPosition( w, lbCell ).x ;
+		if ( lxDist < 0 && minRxDist < 0 && minRxDist < -2 )
+			return null ;
+		if ( lxDist > 0 && minRxDist > 0 && lxDist > 3 )
+			return null ;
+
+		return { "leftCell" : rbCell, "rightCell" : lbCell } ;
+	},
+	"_GetResizeBarPosition" : function()
+	{
+		var row = FCKTools.GetElementAscensor( this._RightCell, "tr" ) ;
+		return FCKTableHandler._GetCellIndexSpan( this._TableMap, row.rowIndex, this._RightCell ) ;
+	},
+	"_ResizeBarMouseDownListener" : function( evt )
+	{
+		if ( FCKDragTableHandler._LeftCell )
+			FCKDragTableHandler._MouseMoveMode = 1 ;
+		if ( FCKBrowserInfo.IsIE )
+			FCKDragTableHandler._ResizeBar.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 50 ;
+		else
+			FCKDragTableHandler._ResizeBar.style.opacity = 0.5 ;
+		FCKDragTableHandler._OriginalX = evt.clientX ;
+
+		// Calculate maximum and minimum x-coordinate delta.
+		var borderIndex = FCKDragTableHandler._GetResizeBarPosition() ;
+		var offset = FCKDragTableHandler._GetIframeOffset();
+		var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" );
+		var minX = null ;
+		var maxX = null ;
+		for ( var r = 0 ; r < FCKDragTableHandler._TableMap.length ; r++ )
+		{
+			var leftCell = FCKDragTableHandler._TableMap[r][borderIndex - 1] ;
+			var rightCell = FCKDragTableHandler._TableMap[r][borderIndex] ;
+			var leftPosition = FCKTools.GetWindowPosition( FCK.EditorWindow, leftCell ) ;
+			var rightPosition = FCKTools.GetWindowPosition( FCK.EditorWindow, rightCell ) ;
+			var leftPadding = FCKDragTableHandler._GetCellPadding( table, leftCell ) ;
+			var rightPadding = FCKDragTableHandler._GetCellPadding( table, rightCell ) ;
+			if ( minX == null || leftPosition.x + leftPadding > minX )
+				minX = leftPosition.x + leftPadding ;
+			if ( maxX == null || rightPosition.x + rightCell.clientWidth - rightPadding < maxX )
+				maxX = rightPosition.x + rightCell.clientWidth - rightPadding ;
+		}
+
+		FCKDragTableHandler._MinimumX = minX + offset.x ;
+		FCKDragTableHandler._MaximumX = maxX + offset.x ;
+		FCKDragTableHandler._LastX = null ;
+
+		if (evt.preventDefault)
+			evt.preventDefault();
+		else
+			evt.returnValue = false;
+	},
+	"_ResizeBarMouseUpListener" : function( evt )
+	{
+		FCKDragTableHandler._MouseMoveMode = 0 ;
+		FCKDragTableHandler._HideResizeBar() ;
+
+		if ( FCKDragTableHandler._LastX == null )
+			return ;
+
+		// Calculate the delta value.
+		var deltaX = FCKDragTableHandler._LastX - FCKDragTableHandler._OriginalX ;
+
+		// Then, build an array of current column width values.
+		// This algorithm can be very slow if the cells have insane colSpan values. (e.g. colSpan=1000).
+		var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" ) ;
+		var colArray = [] ;
+		var tableMap = FCKDragTableHandler._TableMap ;
+		for ( var i = 0 ; i < tableMap.length ; i++ )
+		{
+			for ( var j = 0 ; j < tableMap[i].length ; j++ )
+			{
+				var cell = tableMap[i][j] ;
+				var width = FCKDragTableHandler._GetCellWidth( table, cell ) ;
+				var colSpan = isNaN( cell.colSpan) ? 1 : cell.colSpan ;
+				if ( colArray.length <= j )
+					colArray.push( { width : width / colSpan, colSpan : colSpan } ) ;
+				else
+				{
+					var guessItem = colArray[j] ;
+					if ( guessItem.colSpan > colSpan )
+					{
+						guessItem.width = width / colSpan ;
+						guessItem.colSpan = colSpan ;
+					}
+				}
+			}
+		}
+
+		// Find out the equivalent column index of the two cells selected for resizing.
+		colIndex = FCKDragTableHandler._GetResizeBarPosition() ;
+
+		// Note that colIndex must be at least 1 here, so it's safe to subtract 1 from it.
+		colIndex-- ;
+
+		// Modify the widths in the colArray according to the mouse coordinate delta value.
+		colArray[colIndex].width += deltaX ;
+		colArray[colIndex + 1].width -= deltaX ;
+
+		// Clear all cell widths, delete all <col> elements from the table.
+		for ( var r = 0 ; r < table.rows.length ; r++ )
+		{
+			var row = table.rows.item( r ) ;
+			for ( var c = 0 ; c < row.cells.length ; c++ )
+			{
+				var cell = row.cells.item( c ) ;
+				cell.width = "" ;
+				cell.style.width = "" ;
+			}
+		}
+		var colElements = table.getElementsByTagName( "col" ) ;
+		for ( var i = colElements.length - 1 ; i >= 0 ; i-- )
+			colElements[i].parentNode.removeChild( colElements[i] ) ;
+
+		// Set new cell widths.
+		var processedCells = [] ;
+		for ( var i = 0 ; i < tableMap.length ; i++ )
+		{
+			for ( var j = 0 ; j < tableMap[i].length ; j++ )
+			{
+				var cell = tableMap[i][j] ;
+				if ( cell._Processed )
+					continue ;
+				if ( tableMap[i][j-1] != cell )
+					cell.width = colArray[j].width ;
+				else
+					cell.width = parseInt( cell.width, 10 ) + parseInt( colArray[j].width, 10 ) ;
+				if ( tableMap[i][j+1] != cell )
+				{
+					processedCells.push( cell ) ;
+					cell._Processed = true ;
+				}
+			}
+		}
+		for ( var i = 0 ; i < processedCells.length ; i++ )
+		{
+			if ( FCKBrowserInfo.IsIE )
+				processedCells[i].removeAttribute( '_Processed' ) ;
+			else
+				delete processedCells[i]._Processed ;
+		}
+
+		FCKDragTableHandler._LastX = null ;
+	},
+	"_ResizeBarMouseMoveListener" : function( evt )
+	{
+		if ( FCKDragTableHandler._MouseMoveMode == 0 )
+			return FCKDragTableHandler._MouseFindHandler( FCK, evt ) ;
+		else
+			return FCKDragTableHandler._MouseDragHandler( FCK, evt ) ;
+	},
+	// Calculate the padding of a table cell.
+	// It returns the value of paddingLeft + paddingRight of a table cell.
+	// This function is used, in part, to calculate the width parameter that should be used for setting cell widths.
+	// The equation in question is clientWidth = paddingLeft + paddingRight + width.
+	// So that width = clientWidth - paddingLeft - paddingRight.
+	// The return value of this function must be pixel accurate acorss all supported browsers, so be careful if you need to modify it.
+	"_GetCellPadding" : function( table, cell )
+	{
+		var attrGuess = parseInt( table.cellPadding, 10 ) * 2 ;
+		var cssGuess = null ;
+		if ( typeof( window.getComputedStyle ) == "function" )
+		{
+			var styleObj = window.getComputedStyle( cell, null ) ;
+			cssGuess = parseInt( styleObj.getPropertyValue( "padding-left" ), 10 ) +
+				parseInt( styleObj.getPropertyValue( "padding-right" ), 10 ) ;
+		}
+		else
+			cssGuess = parseInt( cell.currentStyle.paddingLeft, 10 ) + parseInt (cell.currentStyle.paddingRight, 10 ) ;
+
+		var cssRuntime = cell.style.padding ;
+		if ( isFinite( cssRuntime ) )
+			cssGuess = parseInt( cssRuntime, 10 ) * 2 ;
+		else
+		{
+			cssRuntime = cell.style.paddingLeft ;
+			if ( isFinite( cssRuntime ) )
+				cssGuess = parseInt( cssRuntime, 10 ) ;
+			cssRuntime = cell.style.paddingRight ;
+			if ( isFinite( cssRuntime ) )
+				cssGuess += parseInt( cssRuntime, 10 ) ;
+		}
+
+		attrGuess = parseInt( attrGuess, 10 ) ;
+		cssGuess = parseInt( cssGuess, 10 ) ;
+		if ( isNaN( attrGuess ) )
+			attrGuess = 0 ;
+		if ( isNaN( cssGuess ) )
+			cssGuess = 0 ;
+		return Math.max( attrGuess, cssGuess ) ;
+	},
+	// Calculate the real width of the table cell.
+	// The real width of the table cell is the pixel width that you can set to the width attribute of the table cell and after
+	// that, the table cell should be of exactly the same width as before.
+	// The real width of a table cell can be calculated as:
+	// width = clientWidth - paddingLeft - paddingRight.
+	"_GetCellWidth" : function( table, cell )
+	{
+		var clientWidth = cell.clientWidth ;
+		if ( isNaN( clientWidth ) )
+			clientWidth = 0 ;
+		return clientWidth - this._GetCellPadding( table, cell ) ;
+	},
+	"MouseMoveListener" : function( FCK, evt )
+	{
+		if ( FCKDragTableHandler._MouseMoveMode == 0 )
+			return FCKDragTableHandler._MouseFindHandler( FCK, evt ) ;
+		else
+			return FCKDragTableHandler._MouseDragHandler( FCK, evt ) ;
+	},
+	"_MouseFindHandler" : function( FCK, evt )
+	{
+		if ( FCK.MouseDownFlag )
+			return ;
+		var node = evt.srcElement || evt.target ;
+		try
+		{
+			if ( ! node || node.nodeType != 1 )
+			{
+				this._HideResizeBar() ;
+				return ;
+			}
+		}
+		catch ( e )
+		{
+			this._HideResizeBar() ;
+			return ;
+		}
+
+		// Since this function might be called from the editing area iframe or the outer fckeditor iframe,
+		// the mouse point coordinates from evt.clientX/Y can have different reference points.
+		// We need to resolve the mouse pointer position relative to the editing area iframe.
+		var mouseX = evt.clientX ;
+		var mouseY = evt.clientY ;
+		if ( FCKTools.GetElementDocument( node ) == document )
+		{
+			var offset = this._GetIframeOffset() ;
+			mouseX -= offset.x ;
+			mouseY -= offset.y ;
+		}
+
+
+		if ( this._ResizeBar && this._LeftCell )
+		{
+			var leftPos = FCKTools.GetWindowPosition( FCK.EditorWindow, this._LeftCell ) ;
+			var rightPos = FCKTools.GetWindowPosition( FCK.EditorWindow, this._RightCell ) ;
+			var rxDist = mouseX - ( leftPos.x + this._LeftCell.clientWidth ) ;
+			var lxDist = mouseX - rightPos.x ;
+			var inRangeFlag = false ;
+			if ( lxDist >= 0 && rxDist <= 0 )
+				inRangeFlag = true ;
+			else if ( rxDist > 0 && lxDist <= 3 )
+				inRangeFlag = true ;
+			else if ( lxDist < 0 && rxDist >= -2 )
+				inRangeFlag = true ;
+			if ( inRangeFlag )
+			{
+				this._ShowResizeBar( FCK.EditorWindow,
+					FCKTools.GetElementAscensor( this._LeftCell, "table" ),
+					{ "x" : mouseX, "y" : mouseY } ) ;
+				return ;
+			}
+		}
+
+		var tagName = node.tagName.toLowerCase() ;
+		if ( tagName != "table" && tagName != "td" && tagName != "th" )
+		{
+			if ( this._LeftCell )
+				this._LeftCell = this._RightCell = this._TableMap = null ;
+			this._HideResizeBar() ;
+			return ;
+		}
+		node = FCKTools.GetElementAscensor( node, "table" ) ;
+		var tableMap = FCKTableHandler._CreateTableMap( node ) ;
+		var cellTuple = this._GetBorderCells( FCK.EditorWindow, node, tableMap, { "x" : mouseX, "y" : mouseY } ) ;
+
+		if ( cellTuple == null )
+		{
+			if ( this._LeftCell )
+				this._LeftCell = this._RightCell = this._TableMap = null ;
+			this._HideResizeBar() ;
+		}
+		else
+		{
+			this._LeftCell = cellTuple["leftCell"] ;
+			this._RightCell = cellTuple["rightCell"] ;
+			this._TableMap = tableMap ;
+			this._ShowResizeBar( FCK.EditorWindow,
+					FCKTools.GetElementAscensor( this._LeftCell, "table" ),
+					{ "x" : mouseX, "y" : mouseY } ) ;
+		}
+	},
+	"_MouseDragHandler" : function( FCK, evt )
+	{
+		var mouse = { "x" : evt.clientX, "y" : evt.clientY } ;
+
+		// Convert mouse coordinates in reference to the outer iframe.
+		var node = evt.srcElement || evt.target ;
+		if ( FCKTools.GetElementDocument( node ) == FCK.EditorDocument )
+		{
+			var offset = this._GetIframeOffset() ;
+			mouse.x += offset.x ;
+			mouse.y += offset.y ;
+		}
+
+		// Calculate the mouse position delta and see if we've gone out of range.
+		if ( mouse.x >= this._MaximumX - 5 )
+			mouse.x = this._MaximumX - 5 ;
+		if ( mouse.x <= this._MinimumX + 5 )
+			mouse.x = this._MinimumX + 5 ;
+
+		var docX = mouse.x + FCKTools.GetScrollPosition( window ).X ;
+		this._ResizeBar.style.left = ( docX - this._ResizeBar.offsetWidth / 2 ) + "px" ;
+		this._LastX = mouse.x ;
+	},
+	"_ShowResizeBar" : function( w, table, mouse )
+	{
+		if ( this._ResizeBar == null )
+		{
+			this._ResizeBar = this._doc.createElement( "div" ) ;
+			var paddingBar = this._ResizeBar ;
+			var paddingStyles = { 'position' : 'absolute', 'cursor' : 'e-resize' } ;
+			if ( FCKBrowserInfo.IsIE )
+				paddingStyles.filter = "progid:DXImageTransform.Microsoft.Alpha(opacity=10,enabled=true)" ;
+			else
+				paddingStyles.opacity = 0.10 ;
+			FCKDomTools.SetElementStyles( paddingBar, paddingStyles ) ;
+			this._avoidStyles( paddingBar );
+			paddingBar.setAttribute('_fcktemp', true);
+			this._doc.body.appendChild( paddingBar ) ;
+			FCKTools.AddEventListener( paddingBar, "mousemove", this._ResizeBarMouseMoveListener ) ;
+			FCKTools.AddEventListener( paddingBar, "mousedown", this._ResizeBarMouseDownListener ) ;
+			FCKTools.AddEventListener( document, "mouseup", this._ResizeBarMouseUpListener ) ;
+			FCKTools.AddEventListener( FCK.EditorDocument, "mouseup", this._ResizeBarMouseUpListener ) ;
+
+			// IE doesn't let the tranparent part of the padding block to receive mouse events unless there's something inside.
+			// So we need to create a spacer image to fill the block up.
+			var filler = this._doc.createElement( "img" ) ;
+			filler.setAttribute('_fcktemp', true);
+			filler.border = 0 ;
+			filler.src = FCKConfig.BasePath + "images/spacer.gif" ;
+			filler.style.position = "absolute" ;
+			paddingBar.appendChild( filler ) ;
+
+			// Disable drag and drop, and selection for the filler image.
+			var disabledListener = function( evt )
+			{
+				if ( evt.preventDefault )
+					evt.preventDefault() ;
+				else
+					evt.returnValue = false ;
+			}
+			FCKTools.AddEventListener( filler, "dragstart", disabledListener ) ;
+			FCKTools.AddEventListener( filler, "selectstart", disabledListener ) ;
+		}
+
+		var paddingBar = this._ResizeBar ;
+		var offset = this._GetIframeOffset() ;
+		var tablePos = this._GetTablePosition( w, table ) ;
+		var barHeight = table.offsetHeight ;
+		var barTop = offset.y + tablePos.y ;
+		// Do not let the resize bar intrude into the toolbar area.
+		if ( tablePos.y < 0 )
+		{
+			barHeight += tablePos.y ;
+			barTop -= tablePos.y ;
+		}
+		var bw = parseInt( table.border, 10 ) ;
+		if ( isNaN( bw ) )
+			bw = 0 ;
+		var cs = parseInt( table.cellSpacing, 10 ) ;
+		if ( isNaN( cs ) )
+			cs = 0 ;
+		var barWidth = Math.max( bw+100, cs+100 ) ;
+		var paddingStyles =
+		{
+			'top'		: barTop + 'px',
+			'height'	: barHeight + 'px',
+			'width'		: barWidth + 'px',
+			'left'		: ( offset.x + mouse.x + FCKTools.GetScrollPosition( w ).X - barWidth / 2 ) + 'px'
+		} ;
+		if ( FCKBrowserInfo.IsIE )
+			paddingBar.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 10 ;
+		else
+			paddingStyles.opacity = 0.1 ;
+
+		FCKDomTools.SetElementStyles( paddingBar, paddingStyles ) ;
+		var filler = paddingBar.getElementsByTagName( "img" )[0] ;
+
+		FCKDomTools.SetElementStyles( filler,
+			{
+				width	: paddingBar.offsetWidth + 'px',
+				height	: barHeight + 'px'
+			} ) ;
+
+		barWidth = Math.max( bw, cs, 3 ) ;
+		var visibleBar = null ;
+		if ( paddingBar.getElementsByTagName( "div" ).length < 1 )
+		{
+			visibleBar = this._doc.createElement( "div" ) ;
+			this._avoidStyles( visibleBar );
+			visibleBar.setAttribute('_fcktemp', true);
+			paddingBar.appendChild( visibleBar ) ;
+		}
+		else
+			visibleBar = paddingBar.getElementsByTagName( "div" )[0] ;
+
+		FCKDomTools.SetElementStyles( visibleBar,
+			{
+				position		: 'absolute',
+				backgroundColor	: 'blue',
+				width			: barWidth + 'px',
+				height			: barHeight + 'px',
+				left			: '50px',
+				top				: '0px'
+			} ) ;
+	},
+	"_HideResizeBar" : function()
+	{
+		if ( this._ResizeBar )
+			// IE bug: display : none does not hide the resize bar for some reason.
+			// so set the position to somewhere invisible.
+			FCKDomTools.SetElementStyles( this._ResizeBar,
+				{
+					top		: '-100000px',
+					left	: '-100000px'
+				} ) ;
+	},
+	"_GetIframeOffset" : function ()
+	{
+		return FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+	},
+	"_GetTablePosition" : function ( w, table )
+	{
+		return FCKTools.GetWindowPosition( w, table ) ;
+	},
+	"_avoidStyles" : function( element )
+	{
+		FCKDomTools.SetElementStyles( element,
+			{
+				padding		: '0',
+				backgroundImage	: 'none',
+				border		: '0'
+			} ) ;
+	}
+
+};
+
+FCK.Events.AttachEvent( "OnMouseMove", FCKDragTableHandler.MouseMoveListener ) ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/fck_placeholder.html b/modules/editor/skins/fckeditor/editor/plugins/placeholder/fck_placeholder.html
new file mode 100644
index 000000000..359a7a12e
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/fck_placeholder.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placeholder Plugin.
+-->
+<html>
+	<head>
+		<title>Placeholder Properties</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta content="noindex, nofollow" name="robots">
+		<script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
+		<script language="javascript">
+
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var FCKLang = oEditor.FCKLang ;
+var FCKPlaceholders = oEditor.FCKPlaceholders ;
+
+window.onload = function ()
+{
+	// First of all, translate the dialog box texts
+	oEditor.FCKLanguageManager.TranslatePage( document ) ;
+
+	LoadSelected() ;
+
+	// Show the "Ok" button.
+	dialog.SetOkButton( true ) ;
+
+	// Select text field on load.
+	SelectField( 'txtName' ) ;
+}
+
+var eSelected = dialog.Selection.GetSelectedElement() ;
+
+function LoadSelected()
+{
+	if ( !eSelected )
+		return ;
+
+	if ( eSelected.tagName == 'SPAN' && eSelected._fckplaceholder )
+		document.getElementById('txtName').value = eSelected._fckplaceholder ;
+	else
+		eSelected == null ;
+}
+
+function Ok()
+{
+	var sValue = document.getElementById('txtName').value ;
+
+	if ( eSelected && eSelected._fckplaceholder == sValue )
+		return true ;
+
+	if ( sValue.length == 0 )
+	{
+		alert( FCKLang.PlaceholderErrNoName ) ;
+		return false ;
+	}
+
+	if ( FCKPlaceholders.Exist( sValue ) )
+	{
+		alert( FCKLang.PlaceholderErrNameInUse ) ;
+		return false ;
+	}
+
+	FCKPlaceholders.Add( sValue ) ;
+	return true ;
+}
+
+		</script>
+	</head>
+	<body scroll="no" style="OVERFLOW: hidden">
+		<table height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0">
+			<tr>
+				<td>
+					<table cellSpacing="0" cellPadding="0" align="center" border="0">
+						<tr>
+							<td>
+								<span fckLang="PlaceholderDlgName">Placeholder Name</span><br>
+								<input id="txtName" type="text">
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/fckplugin.js
new file mode 100644
index 000000000..bda9d7821
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/fckplugin.js
@@ -0,0 +1,187 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Plugin to insert "Placeholders" in the editor.
+ */
+
+// Register the related command.
+FCKCommands.RegisterCommand( 'Placeholder', new FCKDialogCommand( 'Placeholder', FCKLang.PlaceholderDlgTitle, FCKPlugins.Items['placeholder'].Path + 'fck_placeholder.html', 340, 160 ) ) ;
+
+// Create the "Plaholder" toolbar button.
+var oPlaceholderItem = new FCKToolbarButton( 'Placeholder', FCKLang.PlaceholderBtn ) ;
+oPlaceholderItem.IconPath = FCKPlugins.Items['placeholder'].Path + 'placeholder.gif' ;
+
+FCKToolbarItems.RegisterItem( 'Placeholder', oPlaceholderItem ) ;
+
+
+// The object used for all Placeholder operations.
+var FCKPlaceholders = new Object() ;
+
+// Add a new placeholder at the actual selection.
+FCKPlaceholders.Add = function( name )
+{
+	var oSpan = FCK.InsertElement( 'span' ) ;
+	this.SetupSpan( oSpan, name ) ;
+}
+
+FCKPlaceholders.SetupSpan = function( span, name )
+{
+	span.innerHTML = '[[ ' + name + ' ]]' ;
+
+	span.style.backgroundColor = '#ffff00' ;
+	span.style.color = '#000000' ;
+
+	if ( FCKBrowserInfo.IsGecko )
+		span.style.cursor = 'default' ;
+
+	span._fckplaceholder = name ;
+	span.contentEditable = false ;
+
+	// To avoid it to be resized.
+	span.onresizestart = function()
+	{
+		FCK.EditorWindow.event.returnValue = false ;
+		return false ;
+	}
+}
+
+// On Gecko we must do this trick so the user select all the SPAN when clicking on it.
+FCKPlaceholders._SetupClickListener = function()
+{
+	FCKPlaceholders._ClickListener = function( e )
+	{
+		if ( e.target.tagName == 'SPAN' && e.target._fckplaceholder )
+			FCKSelection.SelectNode( e.target ) ;
+	}
+
+	FCK.EditorDocument.addEventListener( 'click', FCKPlaceholders._ClickListener, true ) ;
+}
+
+// Open the Placeholder dialog on double click.
+FCKPlaceholders.OnDoubleClick = function( span )
+{
+	if ( span.tagName == 'SPAN' && span._fckplaceholder )
+		FCKCommands.GetCommand( 'Placeholder' ).Execute() ;
+}
+
+FCK.RegisterDoubleClickHandler( FCKPlaceholders.OnDoubleClick, 'SPAN' ) ;
+
+// Check if a Placholder name is already in use.
+FCKPlaceholders.Exist = function( name )
+{
+	var aSpans = FCK.EditorDocument.getElementsByTagName( 'SPAN' ) ;
+
+	for ( var i = 0 ; i < aSpans.length ; i++ )
+	{
+		if ( aSpans[i]._fckplaceholder == name )
+			return true ;
+	}
+
+	return false ;
+}
+
+if ( FCKBrowserInfo.IsIE )
+{
+	FCKPlaceholders.Redraw = function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return ;
+
+		var aPlaholders = FCK.EditorDocument.body.innerText.match( /\[\[[^\[\]]+\]\]/g ) ;
+		if ( !aPlaholders )
+			return ;
+
+		var oRange = FCK.EditorDocument.body.createTextRange() ;
+
+		for ( var i = 0 ; i < aPlaholders.length ; i++ )
+		{
+			if ( oRange.findText( aPlaholders[i] ) )
+			{
+				var sName = aPlaholders[i].match( /\[\[\s*([^\]]*?)\s*\]\]/ )[1] ;
+				oRange.pasteHTML( '<span style="color: #000000; background-color: #ffff00" contenteditable="false" _fckplaceholder="' + sName + '">' + aPlaholders[i] + '</span>' ) ;
+			}
+		}
+	}
+}
+else
+{
+	FCKPlaceholders.Redraw = function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return ;
+
+		var oInteractor = FCK.EditorDocument.createTreeWalker( FCK.EditorDocument.body, NodeFilter.SHOW_TEXT, FCKPlaceholders._AcceptNode, true ) ;
+
+		var	aNodes = new Array() ;
+
+		while ( ( oNode = oInteractor.nextNode() ) )
+		{
+			aNodes[ aNodes.length ] = oNode ;
+		}
+
+		for ( var n = 0 ; n < aNodes.length ; n++ )
+		{
+			var aPieces = aNodes[n].nodeValue.split( /(\[\[[^\[\]]+\]\])/g ) ;
+
+			for ( var i = 0 ; i < aPieces.length ; i++ )
+			{
+				if ( aPieces[i].length > 0 )
+				{
+					if ( aPieces[i].indexOf( '[[' ) == 0 )
+					{
+						var sName = aPieces[i].match( /\[\[\s*([^\]]*?)\s*\]\]/ )[1] ;
+
+						var oSpan = FCK.EditorDocument.createElement( 'span' ) ;
+						FCKPlaceholders.SetupSpan( oSpan, sName ) ;
+
+						aNodes[n].parentNode.insertBefore( oSpan, aNodes[n] ) ;
+					}
+					else
+						aNodes[n].parentNode.insertBefore( FCK.EditorDocument.createTextNode( aPieces[i] ) , aNodes[n] ) ;
+				}
+			}
+
+			aNodes[n].parentNode.removeChild( aNodes[n] ) ;
+		}
+
+		FCKPlaceholders._SetupClickListener() ;
+	}
+
+	FCKPlaceholders._AcceptNode = function( node )
+	{
+		if ( /\[\[[^\[\]]+\]\]/.test( node.nodeValue ) )
+			return NodeFilter.FILTER_ACCEPT ;
+		else
+			return NodeFilter.FILTER_SKIP ;
+	}
+}
+
+FCK.Events.AttachEvent( 'OnAfterSetHTML', FCKPlaceholders.Redraw ) ;
+
+// We must process the SPAN tags to replace then with the real resulting value of the placeholder.
+FCKXHtml.TagProcessors['span'] = function( node, htmlNode )
+{
+	if ( htmlNode._fckplaceholder )
+		node = FCKXHtml.XML.createTextNode( '[[' + htmlNode._fckplaceholder + ']]' ) ;
+	else
+		FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+
+	return node ;
+}
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/de.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/de.js
new file mode 100644
index 000000000..8e6f14917
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/de.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placholder German language file.
+ */
+FCKLang.PlaceholderBtn			= 'Einfügen/editieren Platzhalter' ;
+FCKLang.PlaceholderDlgTitle		= 'Platzhalter Eigenschaften' ;
+FCKLang.PlaceholderDlgName		= 'Platzhalter Name' ;
+FCKLang.PlaceholderErrNoName	= 'Bitte den Namen des Platzhalters schreiben' ;
+FCKLang.PlaceholderErrNameInUse	= 'Der angegebene Namen ist schon in Gebrauch' ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/en.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/en.js
new file mode 100644
index 000000000..6bef72bf4
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/en.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placholder English language file.
+ */
+FCKLang.PlaceholderBtn			= 'Insert/Edit Placeholder' ;
+FCKLang.PlaceholderDlgTitle		= 'Placeholder Properties' ;
+FCKLang.PlaceholderDlgName		= 'Placeholder Name' ;
+FCKLang.PlaceholderErrNoName	= 'Please type the placeholder name' ;
+FCKLang.PlaceholderErrNameInUse	= 'The specified name is already in use' ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/es.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/es.js
new file mode 100644
index 000000000..893f9157d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/es.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placholder Spanish language file.
+ */
+FCKLang.PlaceholderBtn			= 'Insertar/Editar contenedor' ;
+FCKLang.PlaceholderDlgTitle		= 'Propiedades del contenedor ' ;
+FCKLang.PlaceholderDlgName		= 'Nombre de contenedor' ;
+FCKLang.PlaceholderErrNoName	= 'Por favor escriba el nombre de contenedor' ;
+FCKLang.PlaceholderErrNameInUse	= 'El nombre especificado ya esta en uso' ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/fr.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/fr.js
new file mode 100644
index 000000000..c64809c73
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/fr.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placeholder French language file.
+ */
+FCKLang.PlaceholderBtn			= "Insérer/Modifier l'Espace réservé" ;
+FCKLang.PlaceholderDlgTitle		= "Propriétés de l'Espace réservé" ;
+FCKLang.PlaceholderDlgName		= "Nom de l'Espace réservé" ;
+FCKLang.PlaceholderErrNoName	= "Veuillez saisir le nom de l'Espace réservé" ;
+FCKLang.PlaceholderErrNameInUse	= "Ce nom est déjà utilisé" ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/it.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/it.js
new file mode 100644
index 000000000..117507333
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/it.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placholder Italian language file.
+ */
+FCKLang.PlaceholderBtn			= 'Aggiungi/Modifica Placeholder' ;
+FCKLang.PlaceholderDlgTitle		= 'Proprietà del Placeholder' ;
+FCKLang.PlaceholderDlgName		= 'Nome del Placeholder' ;
+FCKLang.PlaceholderErrNoName	= 'Digitare il nome del placeholder' ;
+FCKLang.PlaceholderErrNameInUse	= 'Il nome inserito è già in uso' ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/pl.js b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/pl.js
new file mode 100644
index 000000000..1b68fd330
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/placeholder/lang/pl.js
@@ -0,0 +1,27 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Placholder Polish language file.
+ */
+FCKLang.PlaceholderBtn			= 'Wstaw/Edytuj nagłówek' ;
+FCKLang.PlaceholderDlgTitle		= 'Właśności nagłówka' ;
+FCKLang.PlaceholderDlgName		= 'Nazwa nagłówka' ;
+FCKLang.PlaceholderErrNoName	= 'Proszę wprowadzić nazwę nagłówka' ;
+FCKLang.PlaceholderErrNameInUse	= 'Podana nazwa jest już w użyciu' ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/placeholder/placeholder.gif b/modules/editor/skins/fckeditor/editor/plugins/placeholder/placeholder.gif
new file mode 100644
index 000000000..c07078c17
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/plugins/placeholder/placeholder.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/plugins/simplecommands/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/simplecommands/fckplugin.js
new file mode 100644
index 000000000..59eae89d8
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/simplecommands/fckplugin.js
@@ -0,0 +1,29 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This plugin register Toolbar items for the combos modifying the style to
+ * not show the box.
+ */
+
+FCKToolbarItems.RegisterItem( 'SourceSimple'	, new FCKToolbarButton( 'Source', FCKLang.Source, null, FCK_TOOLBARITEM_ONLYICON, true, true, 1 ) ) ;
+FCKToolbarItems.RegisterItem( 'StyleSimple'		, new FCKToolbarStyleCombo( null, FCK_TOOLBARITEM_ONLYTEXT ) ) ;
+FCKToolbarItems.RegisterItem( 'FontNameSimple'	, new FCKToolbarFontsCombo( null, FCK_TOOLBARITEM_ONLYTEXT ) ) ;
+FCKToolbarItems.RegisterItem( 'FontSizeSimple'	, new FCKToolbarFontSizeCombo( null, FCK_TOOLBARITEM_ONLYTEXT ) ) ;
+FCKToolbarItems.RegisterItem( 'FontFormatSimple', new FCKToolbarFontFormatCombo( null, FCK_TOOLBARITEM_ONLYTEXT ) ) ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/tablecommands/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/tablecommands/fckplugin.js
new file mode 100644
index 000000000..890f277c5
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/tablecommands/fckplugin.js
@@ -0,0 +1,33 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This plugin register the required Toolbar items to be able to insert the
+ * table commands in the toolbar.
+ */
+
+FCKToolbarItems.RegisterItem( 'TableInsertRowAfter'		, new FCKToolbarButton( 'TableInsertRowAfter'	, FCKLang.InsertRowAfter, null, null, null, true, 62 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableDeleteRows'		, new FCKToolbarButton( 'TableDeleteRows'	, FCKLang.DeleteRows, null, null, null, true, 63 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableInsertColumnAfter'	, new FCKToolbarButton( 'TableInsertColumnAfter'	, FCKLang.InsertColumnAfter, null, null, null, true, 64 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableDeleteColumns'	, new FCKToolbarButton( 'TableDeleteColumns', FCKLang.DeleteColumns, null, null, null, true, 65 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableInsertCellAfter'		, new FCKToolbarButton( 'TableInsertCellAfter'	, FCKLang.InsertCellAfter, null, null, null, true, 58 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableDeleteCells'	, new FCKToolbarButton( 'TableDeleteCells'	, FCKLang.DeleteCells, null, null, null, true, 59 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableMergeCells'		, new FCKToolbarButton( 'TableMergeCells'	, FCKLang.MergeCells, null, null, null, true, 60 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableHorizontalSplitCell'		, new FCKToolbarButton( 'TableHorizontalSplitCell'	, FCKLang.SplitCell, null, null, null, true, 61 ) ) ;
+FCKToolbarItems.RegisterItem( 'TableCellProp'		, new FCKToolbarButton( 'TableCellProp'	, FCKLang.CellProperties, null, null, null, true, 57 ) ) ;
diff --git a/modules/editor/skins/fckeditor/editor/plugins/xecomponent/fckplugin.js b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/fckplugin.js
new file mode 100644
index 000000000..593130ec3
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/fckplugin.js
@@ -0,0 +1,59 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the sample plugin definition file.
+ */
+
+
+
+
+
+// Register the related commands.
+FCKCommands.RegisterCommand( 'XeComponent', new FCKDialogCommand('XE Component', 'XE Component', FCKConfig.PluginsPath + 'xecomponent/xecomponent.html'	, 340, 170 ) ) ;
+
+// Create the "Find" toolbar button.
+var oFindItem		= new FCKToolbarButton( 'XeComponent', 'XE Component' ) ;
+oFindItem.IconPath	= FCKConfig.PluginsPath + 'xecomponent/xecomponent.gif' ;
+
+FCKToolbarItems.RegisterItem( 'XeComponent', oFindItem ) ;			// 'My_Find' is the name used in the Toolbar config.
+
+
+/*
+
+var EquationEditorCommand=function(){};
+
+EquationEditorCommand.prototype.Execute=function(){}
+
+EquationEditorCommand.GetState=function() {
+        return FCK_TRISTATE_OFF;
+}
+
+EquationEditorCommand.Execute=function() {
+//alert(window.event);
+}
+
+// Register the related commands.
+FCKCommands.RegisterCommand( 'My_Find' , EquationEditorCommand) ;
+
+// Create the "Find" toolbar button.
+var oFindItem       = new FCKToolbarButton( 'My_Find', FCKLang['DlgMyFindTitle'] ) ;
+oFindItem.IconPath  = FCKConfig.PluginsPath + 'findreplace/find.gif' ;
+FCKToolbarItems.RegisterItem( 'My_Find', oFindItem ) ;          // 'My_Find' is the name used in the Toolbar config.
+*/
\ No newline at end of file
diff --git a/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.gif b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.gif
new file mode 100644
index 000000000..5c3fa478f
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.html b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.html
new file mode 100644
index 000000000..7ad9af132
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/plugins/xecomponent/xecomponent.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+    <head>
+    <style type="text/css">
+        *{margin:0;padding:0;list-style:none;vertical-align:middle; }
+        img{ border:0; margin-right:3px;}
+        a{text-decoration:none;}
+    </style>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta content="noindex, nofollow" name="robots">
+        <script type="text/javascript" src="../../../../../../../common/js/x.js"></script>
+        <script type="text/javascript">
+
+var oEditor = window.parent.InnerDialogLoaded();
+var editor_sequence = oEditor.FCK.Name.replace(/.*_/,"");
+var editorExtension = window.parent.parent.getEditorExtension(editor_sequence);
+
+function OnLoad()
+{
+    oEditor.FCKLanguageManager.TranslatePage( document ) ;
+    document.getElementById('fck_editorExtension').innerHTML = editorExtension;
+    window.parent.SetAutoSize( true ) ;
+}
+
+function feditorExtension(e){
+    var e = new xEvent(e);
+    var id = e.target.id;
+    var component_name = id.replace(/^component_([0-9]+)_/,'');
+    if(id && editor_sequence && component_name){
+        window.parent.parent.openComponent(component_name,editor_sequence);
+    }else{
+    }
+}
+
+        </script>
+    </head>
+    <body onload="OnLoad()" >
+    <div id="fck_editorExtension" onclick="feditorExtension(event)"></div>
+    </body>
+</html>
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog.css b/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog.css
new file mode 100644
index 000000000..3eb1aec5c
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog.css
@@ -0,0 +1,402 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+	background-color: #f1f1e3;
+}
+
+.PopupBody
+{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	background-color: transparent;
+	padding: 0px;
+}
+
+#header
+{
+	cursor: move;
+}
+
+.PopupTitle
+{
+	font-weight: bold;
+	font-size: 14pt;
+	color: #737357;
+	background-color: #e3e3c7;
+	padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+	position: absolute;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	border-top: #d5d59d 1px solid;
+	background-color: #e3e3c7;
+	padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+	border: #737357 1px solid;
+	color: #3b3b1f;
+	background-color: #c7c78f;
+}
+
+#btnOk
+{
+	width: 100px;
+}
+
+.DarkBackground
+{
+	background-color: #eaead1;
+}
+
+.LightBackground
+{
+	background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #d5d59d 1px solid;
+}
+
+.PopupTabArea
+{
+	color: #737357;
+	background-color: #e3e3c7;
+}
+
+.PopupTabEmptyArea
+{
+	padding-left: 10px;
+	border-bottom: #d5d59d 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #d5d59d 1px solid;
+	border-top: #d5d59d 1px solid;
+	border-left: #d5d59d 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #737357;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #d5d59d 1px solid;
+	cursor: pointer;
+	cursor: hand;
+}
+
+.PopupTabSelected
+{
+	font-weight: bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f1f1e3 1px solid;
+	background-color: #f1f1e3;
+}
+
+.PopupSelectionBox
+{
+	border: #ff9933 1px solid !important;
+	background-color: #fffacd !important;
+	cursor: pointer;
+	cursor: hand;
+}
+
+#tdBrowse
+{
+	vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+	position: absolute;
+	top: 2px;
+	left: 16px;
+	right: 16px;
+	bottom: 20px;
+	background-color: #f1f1e3;
+	overflow: hidden;
+	z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+	position: absolute;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+	background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.png);
+	background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.rtl.png);
+	background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+	top: 0px;
+	left: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+	background-position: -16px -397px;
+}
+
+.tr
+{
+	top: 0px;
+	right: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+	background-position: -16px -457px;
+}
+
+.tc
+{
+	top: 0px;
+	right: 16px;
+	left: 16px;
+	height: 16px;
+	background-position: 0px -136px;
+	background-repeat: repeat-x;
+}
+
+.ml
+{
+	top: 16px;
+	left: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: 0px 0px;
+}
+
+.mr
+{
+	top: 16px;
+	right: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: -16px 0px;
+}
+
+.bl
+{
+	bottom: 0px;
+	left: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+	background-position: -16px -517px;
+}
+
+.br
+{
+	bottom: 0px;
+	right: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -263px;
+}
+
+.rtl .br
+{
+	background-position: -16px -584px;
+}
+
+.bc
+{
+	bottom: 0px;
+	right: 30px;
+	left: 30px;
+	height: 51px;
+	background-position: 0px -330px;
+	background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 12;
+	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+	position: absolute;
+	top: 0px;
+	left: 14px;
+	right: 14px;
+	bottom: 18px;
+	z-index: 11;
+}
+
+#closeButton
+{
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	margin-top: 5px;
+	margin-right: 10px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+	background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+	cursor: hand;
+	background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+	right: auto;
+	left: 10px;
+	margin-right: 0px;
+}
+
+#closeButton:hover
+{
+	background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+	z-index: 10;
+}
+
+#throbberBlock div
+{
+	float: left;
+	width: 8px;
+	height: 9px;
+	margin-left: 2px;
+	margin-right: 2px;
+	font-size: 1px;	/* IE6 */
+}
+
+/*
+	Color Gradient Generator:
+	http://www.herethere.net/~samson/php/color_gradient/?cbegin=737357&cend=E3E3C7&steps=4
+*/
+
+.throbber_1
+{
+	background-color: #737357;
+}
+
+.throbber_2
+{
+	background-color: #8f8f73;
+}
+
+.throbber_3
+{
+	background-color: #abab8f;
+}
+
+.throbber_4
+{
+	background-color: #c7c7ab;
+}
+
+.throbber_5
+{
+	background-color: #e3e3c7;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog_ie6.js b/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog_ie6.js
new file mode 100644
index 000000000..cd3cb75fd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/default/fck_dialog_ie6.js
@@ -0,0 +1,110 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+	// IE6 doens't handle absolute positioning properly (it is always in quirks
+	// mode). This function fixes the sizes and positions of many elements that
+	// compose the skin (this is skin specific).
+	var fixSizes = window.DoResizeFixes = function()
+	{
+		var fckDlg = window.document.body ;
+
+		for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+		{
+			var child = fckDlg.childNodes[i] ;
+			switch ( child.className )
+			{
+				case 'contents' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ;	// -left -right
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ;	// -bottom -top
+					break ;
+
+				case 'blocker' :
+				case 'cover' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ;	// -left -right + 4
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ;	// -bottom -top + 4
+					break ;
+
+				case 'tr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					break ;
+
+				case 'tc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ;
+					break ;
+
+				case 'ml' :
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'mr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'bl' :
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'br' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'bc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+			}
+		}
+	}
+
+	var closeButtonOver = function()
+	{
+		this.style.backgroundPosition = '-16px -687px' ;
+	} ;
+
+	var closeButtonOut = function()
+	{
+		this.style.backgroundPosition = '-16px -651px' ;
+	} ;
+
+	var fixCloseButton = function()
+	{
+		var closeButton = document.getElementById ( 'closeButton' ) ;
+
+		closeButton.onmouseover	= closeButtonOver ;
+		closeButton.onmouseout	= closeButtonOut ;
+	}
+
+	var onLoad = function()
+	{
+		fixSizes() ;
+		fixCloseButton() ;
+
+		window.attachEvent( 'onresize', fixSizes ) ;
+		window.detachEvent( 'onload', onLoad ) ;
+	}
+
+	window.attachEvent( 'onload', onLoad ) ;
+
+})() ;
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/fck_editor.css b/modules/editor/skins/fckeditor/editor/skins/default/fck_editor.css
new file mode 100644
index 000000000..e59e35ed4
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/default/fck_editor.css
@@ -0,0 +1,464 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+	### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+	padding: 1px;
+	margin: 0;
+	background-color: #ffffff;
+}
+
+#xEditingArea
+{
+    border: #696969 1px solid;
+}
+
+.SourceField
+{
+    padding: 5px;
+    margin: 0px;
+    font-family: Monospace;
+}
+
+/*
+	Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+    cursor: default;
+    background-color: #efefde;
+}
+
+.TB_ToolbarSet
+{
+    border-top: #efefde 1px outset;
+    border-bottom: #efefde 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+	height: 24px;
+    display: inline-table;	/* inline = Opera jumping buttons bug */
+}
+
+.TB_Separator
+{
+    width: 1px;
+    height: 16px;
+    margin: 2px;
+    background-color: #999966;
+}
+
+.TB_Start
+{
+    background-image: url(images/toolbar.start.gif);
+    margin: 2px;
+    width: 3px;
+    background-repeat: no-repeat;
+    height: 16px;
+}
+
+.TB_End
+{
+    display: none;
+}
+
+.TB_ExpandImg
+{
+    background-image: url(images/toolbar.expand.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+    background-image: url(images/toolbar.collapse.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+    background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+    padding: 2px 2px 2px 2px;
+    border: #efefde 1px outset;
+}
+
+.TB_Collapse
+{
+    width: 5px;
+}
+
+.TB_Break
+{
+    height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+	Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+    border: #efefde 1px solid; /* This is the default border */
+    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+    border: #316ac5 1px solid;
+    background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+    filter: alpha(opacity=70); /* IE */
+    opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 22px;
+}
+
+.TB_Button_Image
+{
+    overflow: hidden;
+    width: 16px;
+    height: 16px;
+    margin: 3px;
+    background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+    position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+   	background-color: #efefde;  /* Needed because of a bug on Clear Type */
+}
+
+.TB_ConnectionLine
+{
+    background-color: #ffffff;
+    height: 1px;
+    margin-left: 1px;   /* ltr */
+    margin-right: 1px;  /* rtl */
+}
+
+.TB_Text
+{
+	height: 22px;
+}
+
+.TB_Button_Off .TB_Text
+{
+   	background-color: #efefde ;  /* Needed because of a bug on ClearType */
+}
+
+.TB_Button_On_Over .TB_Text
+{
+   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
+}
+
+/*
+	Menu
+*/
+
+.MN_Menu
+{
+    border: 1px solid #8f8f73;
+    padding: 2px;
+    background-color: #ffffff;
+    cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 20px;
+}
+
+.MN_Icon
+{
+    background-color: #e3e3c7;
+    text-align: center;
+    height: 20px;
+}
+
+.MN_Label
+{
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.MN_Separator
+{
+    height: 3px;
+}
+
+.MN_Separator_Line
+{
+    border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+    filter: alpha(opacity=70);
+    opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+    color: #ffffff;
+    background-color: #8f8f73;
+}
+
+.MN_Item_Over .MN_Icon
+{
+    background-color: #737357;
+}
+
+.MN_Item_Disabled IMG
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+    color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+    padding-right: 3px;
+    padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+    background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+    border: #8f8f73 1px solid;
+    background-color: #ffffff;
+}
+
+/*
+	### Panel Styles
+*/
+
+.FCK_Panel
+{
+    border: #8f8f73 1px solid;
+    padding: 2px;
+    background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+    font-size: 11px;
+}
+
+/*
+	### Special Combos
+*/
+
+.SC_Panel
+{
+    overflow: auto;
+    white-space: nowrap;
+    cursor: default;
+    border: 1px solid #8f8f73;
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    background-position: left center;
+    padding-left: 11px;
+    padding-right: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    background-repeat: no-repeat;
+    border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+    border: #9a9afb 1px solid;
+    background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_Field
+{
+    border: #b7b7a6 1px solid;
+    cursor: default;
+}
+
+.SC_FieldCaption
+{
+    overflow: visible;
+    padding-right: 5px;
+    padding-left: 5px;
+    opacity: 0.75; /* Safari, Opera and Mozilla */
+    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+    height: 23px;
+    background-color: #efefde;
+}
+
+.SC_FieldLabel
+{
+    white-space: nowrap;
+    padding: 2px;
+    width: 100%;
+    cursor: default;
+    background-color: #ffffff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.SC_FieldButton
+{
+    background-position: center center;
+    background-image: url(images/toolbar.buttonarrow.gif);
+    border-left: #b7b7a6 1px solid;
+    width: 14px;
+    background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+    border-left: #316ac5 1px solid;
+}
+
+/*
+	### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+    border: #808080 1px solid;
+    position: static;
+}
+
+.ColorBox
+{
+    font-size: 1px;
+    width: 10px;
+    position: static;
+    height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+    cursor: default;
+}
+
+.ColorDeselected
+{
+    border: #ffffff 1px solid;
+    padding: 2px;
+    float: left;
+}
+
+.ColorSelected
+{
+    border: #330066 1px solid;
+    padding: 2px;
+    float: left;
+    background-color: #c4cdd6;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/fck_strip.gif b/modules/editor/skins/fckeditor/editor/skins/default/fck_strip.gif
new file mode 100644
index 000000000..fbb8568ad
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/fck_strip.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.gif
new file mode 100644
index 000000000..8f91b4753
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.png b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.png
new file mode 100644
index 000000000..1042a61cf
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.rtl.png b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.rtl.png
new file mode 100644
index 000000000..d7f7b49fc
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/dialog.sides.rtl.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.gif
new file mode 100644
index 000000000..2f57d9314
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.png b/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.png
new file mode 100644
index 000000000..5be90edd2
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/sprites.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.arrowright.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.arrowright.gif
new file mode 100644
index 000000000..6843c8d41
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.arrowright.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif
new file mode 100644
index 000000000..ea60995e1
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.collapse.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.collapse.gif
new file mode 100644
index 000000000..87aa56d3b
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.collapse.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.end.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.end.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.end.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.expand.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.expand.gif
new file mode 100644
index 000000000..79075e7c3
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.expand.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.separator.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.separator.gif
new file mode 100644
index 000000000..eaed04a7a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.separator.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.start.gif b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.start.gif
new file mode 100644
index 000000000..1774246c2
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/default/images/toolbar.start.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog.css b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog.css
new file mode 100644
index 000000000..70c734a77
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog.css
@@ -0,0 +1,402 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+	background-color: #f7f8fd;
+}
+
+.PopupBody
+{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	background-color: transparent;
+	padding: 0px;
+}
+
+#header
+{
+	cursor: move;
+}
+
+.PopupTitle
+{
+	font-weight: bold;
+	font-size: 14pt;
+	color: #0e3460;
+	background-color: #8cb2fd;
+	padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+	position: absolute;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	border-top: #466ca6 1px solid;
+	background-color: #8cb2fd;
+	padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+	border: #1c3460 1px solid;
+	color: #000a28;
+	background-color: #7096d3;
+}
+
+#btnOk
+{
+	width: 100px;
+}
+
+.DarkBackground
+{
+	background-color: #eaf2f8;
+}
+
+.LightBackground
+{
+	background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #d5d59d 1px solid;
+}
+
+.PopupTabArea
+{
+	color: #0e3460;
+	background-color: #8cb2fd;
+}
+
+.PopupTabEmptyArea
+{
+	padding-left: 10px ;
+	border-bottom: #466ca6 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #466ca6 1px solid;
+	border-top: #466ca6 1px solid;
+	border-left: #466ca6 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #0e3460;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #466ca6 1px solid;
+	cursor: pointer;
+	cursor: hand;
+}
+
+.PopupTabSelected
+{
+	font-weight: bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f7f8fd 1px solid;
+	background-color: #f7f8fd;
+}
+
+.PopupSelectionBox
+{
+	border: #1e90ff 1px solid !important;
+	background-color: #add8e6 !important;
+	cursor: pointer;
+	cursor: hand;
+}
+
+#tdBrowse
+{
+	vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+	position: absolute;
+	top: 2px;
+	left: 16px;
+	right: 16px;
+	bottom: 20px;
+	background-color: #f7f8fD;
+	overflow: hidden;
+	z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+	position: absolute;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+	background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.png);
+	background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.rtl.png);
+	background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+	top: 0px;
+	left: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+	background-position: -16px -397px;
+}
+
+.tr
+{
+	top: 0px;
+	right: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+	background-position: -16px -457px;
+}
+
+.tc
+{
+	top: 0px;
+	right: 16px;
+	left: 16px;
+	height: 16px;
+	background-position: 0px -136px;
+	background-repeat: repeat-x;
+}
+
+.ml
+{
+	top: 16px;
+	left: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: 0px 0px;
+}
+
+.mr
+{
+	top: 16px;
+	right: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: -16px 0px;
+}
+
+.bl
+{
+	bottom: 0px;
+	left: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+	background-position: -16px -517px;
+}
+
+.br
+{
+	bottom: 0px;
+	right: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -263px;
+}
+
+.rtl .br
+{
+	background-position: -16px -584px;
+}
+
+.bc
+{
+	bottom: 0px;
+	right: 30px;
+	left: 30px;
+	height: 51px;
+	background-position: 0px -330px;
+	background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 12;
+	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+	position: absolute;
+	top: 0px;
+	left: 14px;
+	right: 14px;
+	bottom: 18px;
+	z-index: 11;
+}
+
+#closeButton
+{
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	margin-top: 5px;
+	margin-right: 10px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+	background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+	cursor: hand;
+	background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+	right: auto;
+	left: 10px;
+	margin-right: 0px;
+}
+
+#closeButton:hover
+{
+	background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+	z-index: 10;
+}
+
+#throbberBlock div
+{
+	float: left;
+	width: 8px;
+	height: 9px;
+	margin-left: 2px;
+	margin-right: 2px;
+	font-size: 1px;	/* IE6 */
+}
+
+/*
+	Color Gradient Generator:
+	http://www.herethere.net/~samson/php/color_gradient/?cbegin=0E3460&cend=8cb2fd&steps=4
+*/
+
+.throbber_1
+{
+	background-color: #0E3460;
+}
+
+.throbber_2
+{
+	background-color: #2D5387;
+}
+
+.throbber_3
+{
+	background-color: #4D73AE;
+}
+
+.throbber_4
+{
+	background-color: #6C92D5;
+}
+
+.throbber_5
+{
+	background-color: #8CB2FD;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog_ie6.js b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
new file mode 100644
index 000000000..cd3cb75fd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
@@ -0,0 +1,110 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+	// IE6 doens't handle absolute positioning properly (it is always in quirks
+	// mode). This function fixes the sizes and positions of many elements that
+	// compose the skin (this is skin specific).
+	var fixSizes = window.DoResizeFixes = function()
+	{
+		var fckDlg = window.document.body ;
+
+		for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+		{
+			var child = fckDlg.childNodes[i] ;
+			switch ( child.className )
+			{
+				case 'contents' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ;	// -left -right
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ;	// -bottom -top
+					break ;
+
+				case 'blocker' :
+				case 'cover' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ;	// -left -right + 4
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ;	// -bottom -top + 4
+					break ;
+
+				case 'tr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					break ;
+
+				case 'tc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ;
+					break ;
+
+				case 'ml' :
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'mr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'bl' :
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'br' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'bc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+			}
+		}
+	}
+
+	var closeButtonOver = function()
+	{
+		this.style.backgroundPosition = '-16px -687px' ;
+	} ;
+
+	var closeButtonOut = function()
+	{
+		this.style.backgroundPosition = '-16px -651px' ;
+	} ;
+
+	var fixCloseButton = function()
+	{
+		var closeButton = document.getElementById ( 'closeButton' ) ;
+
+		closeButton.onmouseover	= closeButtonOver ;
+		closeButton.onmouseout	= closeButtonOut ;
+	}
+
+	var onLoad = function()
+	{
+		fixSizes() ;
+		fixCloseButton() ;
+
+		window.attachEvent( 'onresize', fixSizes ) ;
+		window.detachEvent( 'onload', onLoad ) ;
+	}
+
+	window.attachEvent( 'onload', onLoad ) ;
+
+})() ;
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/fck_editor.css b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_editor.css
new file mode 100644
index 000000000..962908a9f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_editor.css
@@ -0,0 +1,476 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+	### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+	padding: 1px;
+	margin: 0;
+	background-color: #ffffff;
+}
+
+#xEditingArea
+{
+    border: #696969 1px solid;
+}
+
+.SourceField
+{
+    padding: 5px;
+    margin: 0px;
+    font-family: Monospace;
+}
+
+/*
+	Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+    cursor: default;
+    background-color: #f7f8fd;
+}
+
+.TB_ToolbarSet
+{
+    border-top: #f7f8fd 1px outset;
+    border-bottom: #f7f8fd 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+   	background-color: #d6dff7;
+	background-image: url(images/toolbar.bg.gif);
+	background-repeat: repeat-x;
+    display: inline-table;
+}
+
+.TB_Separator
+{
+    width: 1px;
+    height: 16px;
+    margin: 2px;
+    background-color: #B2CBFF;
+}
+
+.TB_Start
+{
+    background-image: url(images/toolbar.start.gif);
+    background-repeat: no-repeat;
+    background-position: center center;
+    margin: 0px;
+    width: 7px;
+    height: 24px;
+}
+
+.TB_End
+{
+    background-image: url(images/toolbar.end.gif);
+    background-repeat: no-repeat;
+    background-position: center left;
+    height: 24px;
+    width: 4px;
+}
+
+.TB_ExpandImg
+{
+    background-image: url(images/toolbar.expand.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+    background-image: url(images/toolbar.collapse.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+    background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+    padding: 2px 2px 2px 2px;
+    border: #f7f8fd 1px outset;
+}
+
+.TB_Collapse
+{
+    width: 5px;
+}
+
+.TB_Break
+{
+    height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+	Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+    margin: 1px;
+    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+    margin: 0px;
+    border: #316ac5 1px solid;
+    background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+    margin: 0px ;
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+    filter: alpha(opacity=70); /* IE */
+    opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 22px;
+}
+
+.TB_Button_Image
+{
+    overflow: hidden;
+    width: 16px;
+    height: 16px;
+    margin: 3px;
+    background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+    position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
+	background-image: url(images/toolbar.bg.gif);
+	background-repeat: repeat-x;
+}
+
+.TB_ConnectionLine
+{
+    background-color: #f7f8fd;
+    height: 1px;
+    margin-left: 1px;   /* ltr */
+    margin-right: 1px;  /* rtl */
+}
+
+.TB_Button_Off .TB_Text
+{
+   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
+	background-image: url(images/toolbar.bg.gif);
+	background-repeat: repeat-x;
+}
+
+.TB_Button_On_Over .TB_Text
+{
+   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
+}
+
+/*
+	Menu
+*/
+
+.MN_Menu
+{
+    border: 1px solid #8f8f73;
+    padding: 2px;
+    background-color: #f7f8fd;
+    cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 20px;
+}
+
+.MN_Icon
+{
+    background-color: #d6dff7;
+    text-align: center;
+    height: 20px;
+}
+
+.MN_Label
+{
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.MN_Separator
+{
+    height: 3px;
+}
+
+.MN_Separator_Line
+{
+    border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+    filter: alpha(opacity=70);
+    opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+    color: #ffffff;
+    background-color: #7096FA;
+}
+
+.MN_Item_Over .MN_Icon
+{
+    background-color: #466ca6;
+}
+
+.MN_Item_Disabled IMG
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+    color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+    padding-right: 3px;
+    padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+    background-color: #f7f8fd;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+    border: #8f8f73 1px solid;
+    background-color: #f7f8fd;
+}
+
+/*
+	### Panel Styles
+*/
+
+.FCK_Panel
+{
+    border: #8f8f73 1px solid;
+    padding: 2px;
+    background-color: #f7f8fd;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+    font-size: 11px;
+}
+
+/*
+	### Special Combos
+*/
+
+.SC_Panel
+{
+    overflow: auto;
+    white-space: nowrap;
+    cursor: default;
+    border: 1px solid #8f8f73;
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    background-position: left center;
+    padding-left: 11px;
+    padding-right: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    background-repeat: no-repeat;
+    border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+    border: #9a9afb 1px solid;
+    background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_Field
+{
+    margin-top: 2px ;
+    border: #b7b7a6 1px solid;
+    cursor: default;
+}
+
+.SC_FieldCaption
+{
+    overflow: visible;
+    padding-right: 5px;
+    padding-left: 5px;
+    opacity: 0.75; /* Safari, Opera and Mozilla */
+    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+    height: 23px;
+   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
+	background-image: url(images/toolbar.bg.gif);
+	background-repeat: repeat-x;
+/*    background-color:  inherit;     Maybe this is needed wait to check */
+}
+
+.SC_FieldLabel
+{
+    white-space: nowrap;
+    padding: 2px;
+    width: 100%;
+    cursor: default;
+    background-color: #ffffff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.SC_FieldButton
+{
+    background-position: center center;
+    background-image: url(images/toolbar.buttonarrow.gif);
+    border-left: #b7b7a6 1px solid;
+    width: 14px;
+    background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+    border-left: #316ac5 1px solid;
+}
+
+/*
+	### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+    border: #808080 1px solid;
+    position: static;
+}
+
+.ColorBox
+{
+    font-size: 1px;
+    width: 10px;
+    position: static;
+    height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+    cursor: default;
+}
+
+.ColorDeselected
+{
+    border: #ffffff 1px solid;
+    padding: 2px;
+    float: left;
+}
+
+.ColorSelected
+{
+    border: #330066 1px solid;
+    padding: 2px;
+    float: left;
+    background-color: #c4cdd6;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/fck_strip.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_strip.gif
new file mode 100644
index 000000000..5607cc8b6
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/fck_strip.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.gif
new file mode 100644
index 000000000..921fa1aea
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.png b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.png
new file mode 100644
index 000000000..be15730bf
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.rtl.png b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.rtl.png
new file mode 100644
index 000000000..e18f13d52
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/dialog.sides.rtl.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.gif
new file mode 100644
index 000000000..8763e4871
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.png b/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.png
new file mode 100644
index 000000000..7f4e196c3
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/sprites.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif
new file mode 100644
index 000000000..6843c8d41
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.bg.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.bg.gif
new file mode 100644
index 000000000..b03960b1b
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.bg.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
new file mode 100644
index 000000000..ea60995e1
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif
new file mode 100644
index 000000000..d549166d1
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.end.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.end.gif
new file mode 100644
index 000000000..7ff599dee
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.end.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.expand.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.expand.gif
new file mode 100644
index 000000000..c4a7326e1
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.expand.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.separator.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.separator.gif
new file mode 100644
index 000000000..27db9c38d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.separator.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.start.gif b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.start.gif
new file mode 100644
index 000000000..41f1241b9
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/office2003/images/toolbar.start.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog.css b/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog.css
new file mode 100644
index 000000000..53f16ef8d
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog.css
@@ -0,0 +1,402 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+	background-color: #f7f7f7;
+}
+
+.PopupBody
+{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	background-color: transparent;
+	padding: 0px;
+}
+
+#header
+{
+	cursor: move;
+}
+
+.PopupTitle
+{
+	font-weight: bold;
+	font-size: 14pt;
+	color: #504845;
+	background-color: #dedede;
+	padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+	position: absolute;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	border-top: #cec6b5 1px solid;
+	background-color: #DEDEDE;
+	padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+	border: #7a7261 1px solid;
+	color: #504845;
+	background-color: #cec6b5;
+}
+
+#btnOk
+{
+	width: 100px;
+}
+
+.DarkBackground
+{
+	background-color: #f2f2f2;
+}
+
+.LightBackground
+{
+	background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTabArea
+{
+	color: #504845;
+	background-color: #DEDEDE;
+}
+
+.PopupTabEmptyArea
+{
+	padding-left: 10px ;
+	border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #cec6b5 1px solid;
+	border-top: #cec6b5 1px solid;
+	border-left: #cec6b5 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #504845;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #cec6b5 1px solid;
+	cursor: pointer;
+	cursor: hand;
+}
+
+.PopupTabSelected
+{
+	font-weight:bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f1f1e3 1px solid;
+	background-color: #f7f7f7;
+}
+
+.PopupSelectionBox
+{
+	border: #a9a9a9 1px solid !important;
+	background-color: #dcdcdc !important;
+	cursor: pointer;
+	cursor: hand;
+}
+
+#tdBrowse
+{
+	vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+	position: absolute;
+	top: 2px;
+	left: 16px;
+	right: 16px;
+	bottom: 20px;
+	background-color: #f7f7f7;
+	overflow: hidden;
+	z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+	position: absolute;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+	background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.png);
+	background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.rtl.png);
+	background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+	top: 0px;
+	left: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+	background-position: -16px -397px;
+}
+
+.tr
+{
+	top: 0px;
+	right: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+	background-position: -16px -457px;
+}
+
+.tc
+{
+	top: 0px;
+	right: 16px;
+	left: 16px;
+	height: 16px;
+	background-position: 0px -136px;
+	background-repeat: repeat-x;
+}
+
+.ml
+{
+	top: 16px;
+	left: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: 0px 0px;
+}
+
+.mr
+{
+	top: 16px;
+	right: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: -16px 0px;
+}
+
+.bl
+{
+	bottom: 0px;
+	left: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+	background-position: -16px -517px;
+}
+
+.br
+{
+	bottom: 0px;
+	right: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -263px;
+}
+
+.rtl .br
+{
+	background-position: -16px -584px;
+}
+
+.bc
+{
+	bottom: 0px;
+	right: 30px;
+	left: 30px;
+	height: 51px;
+	background-position: 0px -330px;
+	background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 12;
+	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+	position: absolute;
+	top: 0px;
+	left: 14px;
+	right: 14px;
+	bottom: 18px;
+	z-index: 11;
+}
+
+#closeButton
+{
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	margin-top: 5px;
+	margin-right: 10px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+	background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+	cursor: hand;
+	background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+	right: auto;
+	left: 10px;
+	margin-right: 0px;
+}
+
+#closeButton:hover
+{
+	background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+	z-index: 10;
+}
+
+#throbberBlock div
+{
+	float: left;
+	width: 8px;
+	height: 9px;
+	margin-left: 2px;
+	margin-right: 2px;
+	font-size: 1px;	/* IE6 */
+}
+
+/*
+	Color Gradient Generator:
+	http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
+*/
+
+.throbber_1
+{
+	background-color: #504845;
+}
+
+.throbber_2
+{
+	background-color: #736D6B;
+}
+
+.throbber_3
+{
+	background-color: #979391;
+}
+
+.throbber_4
+{
+	background-color: #BAB8B7;
+}
+
+.throbber_5
+{
+	background-color: #DEDEDE;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog_ie6.js b/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog_ie6.js
new file mode 100644
index 000000000..cd3cb75fd
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/silver/fck_dialog_ie6.js
@@ -0,0 +1,110 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+	// IE6 doens't handle absolute positioning properly (it is always in quirks
+	// mode). This function fixes the sizes and positions of many elements that
+	// compose the skin (this is skin specific).
+	var fixSizes = window.DoResizeFixes = function()
+	{
+		var fckDlg = window.document.body ;
+
+		for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+		{
+			var child = fckDlg.childNodes[i] ;
+			switch ( child.className )
+			{
+				case 'contents' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ;	// -left -right
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ;	// -bottom -top
+					break ;
+
+				case 'blocker' :
+				case 'cover' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ;	// -left -right + 4
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ;	// -bottom -top + 4
+					break ;
+
+				case 'tr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					break ;
+
+				case 'tc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ;
+					break ;
+
+				case 'ml' :
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'mr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'bl' :
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'br' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'bc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+			}
+		}
+	}
+
+	var closeButtonOver = function()
+	{
+		this.style.backgroundPosition = '-16px -687px' ;
+	} ;
+
+	var closeButtonOut = function()
+	{
+		this.style.backgroundPosition = '-16px -651px' ;
+	} ;
+
+	var fixCloseButton = function()
+	{
+		var closeButton = document.getElementById ( 'closeButton' ) ;
+
+		closeButton.onmouseover	= closeButtonOver ;
+		closeButton.onmouseout	= closeButtonOut ;
+	}
+
+	var onLoad = function()
+	{
+		fixSizes() ;
+		fixCloseButton() ;
+
+		window.attachEvent( 'onresize', fixSizes ) ;
+		window.detachEvent( 'onload', onLoad ) ;
+	}
+
+	window.attachEvent( 'onload', onLoad ) ;
+
+})() ;
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/fck_editor.css b/modules/editor/skins/fckeditor/editor/skins/silver/fck_editor.css
new file mode 100644
index 000000000..6286dfa01
--- /dev/null
+++ b/modules/editor/skins/fckeditor/editor/skins/silver/fck_editor.css
@@ -0,0 +1,473 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+	### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+	padding: 1px;
+	margin: 0;
+	background-color: #ffffff;
+}
+
+#xEditingArea
+{
+	border: #696969 1px solid;
+}
+
+.SourceField
+{
+	padding: 5px;
+	margin: 0px;
+	font-family: Monospace;
+}
+
+/*
+	Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+    cursor: default;
+	background-color: #f7f7f7;
+}
+
+.TB_ToolbarSet
+{
+	padding: 1px;
+	border-top: #efefde 1px outset;
+	border-bottom: #efefde 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+    display: inline-table;
+}
+
+.TB_Separator
+{
+    width: 1px;
+    height: 21px;
+    margin: 2px;
+    background-color: #C6C3BD;
+}
+
+.TB_Start
+{
+    background-image: url(images/toolbar.start.gif);
+    margin-left: 2px;
+    margin-right: 2px;
+    width: 3px;
+    background-repeat: no-repeat;
+    height: 27px;
+    background-position: center center;
+}
+
+.TB_End
+{
+	display: none;
+}
+
+.TB_ExpandImg
+{
+	background-image: url(images/toolbar.expand.gif);
+	background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+	background-image: url(images/toolbar.collapse.gif);
+	background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+	background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+	padding: 2px 2px 2px 2px;
+	border: #efefde 1px outset;
+}
+
+.TB_Collapse
+{
+	border: #efefde 1px outset;
+	width: 5px;
+}
+
+.TB_Break
+{
+	height: 27px;
+}
+
+/*
+	Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+	padding: 1px ;
+	margin:1px;
+	height: 21px;
+}
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+	border: #cec6b5 1px solid;
+}
+
+.TB_Button_On
+{
+	border-color: #316ac5;
+	background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+	background: #efefef url(images/toolbar.buttonbg.gif) repeat-x;
+}
+
+.TB_Button_Off, .TB_Combo_Off
+{
+	opacity: 0.70; /* Safari, Opera and Mozilla */
+	filter: alpha(opacity=70); /* IE */
+	/* -moz-opacity: 0.70; Mozilla (Old) */
+}
+
+.TB_Button_Disabled
+{
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+    filter: gray() alpha(opacity=30); /* IE */
+}
+
+.TB_Button_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 21px;
+}
+
+.TB_Button_Image
+{
+    overflow: hidden;
+    width: 16px;
+    height: 16px;
+    margin: 3px;
+    margin-top: 4px;
+    margin-bottom: 2px;
+    background-repeat: no-repeat;
+}
+
+/* For composed button ( icon + text, icon + arrow ), we must compensate the table */
+.TB_Button_On TABLE .TB_Button_Image,
+.TB_Button_Off TABLE .TB_Button_Image,
+.TB_Button_On_Over TABLE .TB_Button_Image,
+.TB_Button_Off_Over TABLE .TB_Button_Image,
+.TB_Button_Disabled TABLE .TB_Button_Image
+{
+    margin-top: 3px;
+}
+
+.TB_Button_Image img
+{
+    position: relative;
+}
+
+.TB_ConnectionLine
+{
+    background-color: #ffffff;
+    height: 1px;
+    margin-left: 1px;   /* ltr */
+    margin-right: 1px;  /* rtl */
+}
+
+/*
+	Menu
+*/
+
+.MN_Menu
+{
+    border: 1px solid #8f8f73;
+    padding: 2px;
+    background-color: #f7f7f7;
+    cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 20px;
+}
+
+.MN_Icon
+{
+    background-color: #dedede;
+    text-align: center;
+    height: 20px;
+}
+
+.MN_Label
+{
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.MN_Separator
+{
+    height: 3px;
+}
+
+.MN_Separator_Line
+{
+    border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+    filter: alpha(opacity=70);
+    opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+    color: #ffffff;
+    background-color: #8a857d;
+}
+
+.MN_Item_Over .MN_Icon
+{
+    background-color: #6c6761;
+}
+
+.MN_Item_Disabled IMG
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+    color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+    padding-right: 3px;
+    padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+    background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+    border: #8f8f73 1px solid;
+    background-color: #ffffff;
+}
+
+/*
+	### Panel Styles
+*/
+
+.FCK_Panel
+{
+    border: #8f8f73 1px solid;
+    padding: 2px;
+    background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+    font-size: 11px;
+}
+
+/*
+	### Special Combos
+*/
+
+.SC_Panel
+{
+    overflow: auto;
+    white-space: nowrap;
+    cursor: default;
+    border: 1px solid #8f8f73;
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    background-position: left center;
+    padding-left: 11px;
+    padding-right: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    background-repeat: no-repeat;
+    border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+    border: #9a9afb 1px solid;
+    background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_Field
+{
+    margin-top:1px ;
+    border: #b7b7a6 1px solid;
+    cursor: default;
+}
+
+.SC_FieldCaption
+{
+    padding-top: 1px ;
+    overflow: visible;
+    padding-right: 5px;
+    padding-left: 5px;
+    opacity: 0.75; /* Safari, Opera and Mozilla */
+    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+    height: 23px;
+    background-color: #f7f7f7;
+}
+
+.SC_FieldLabel
+{
+    white-space: nowrap;
+    padding: 2px;
+    width: 100%;
+    cursor: default;
+    background-color: #ffffff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.SC_FieldButton
+{
+    background-position: center center;
+    background-image: url(images/toolbar.buttonarrow.gif);
+    border-left: #b7b7a6 1px solid;
+    width: 14px;
+    background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+    border-left: #316ac5 1px solid;
+}
+
+/*
+	### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+    border: #808080 1px solid;
+    position: static;
+}
+
+.ColorBox
+{
+    font-size: 1px;
+    width: 10px;
+    position: static;
+    height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+    cursor: default;
+}
+
+.ColorDeselected
+{
+    border: #ffffff 1px solid;
+    padding: 2px;
+    float: left;
+}
+
+.ColorSelected
+{
+    border: #316ac5 1px solid;
+    padding: 2px;
+    float: left;
+    background-color: #c1d2ee;
+}
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/fck_strip.gif b/modules/editor/skins/fckeditor/editor/skins/silver/fck_strip.gif
new file mode 100644
index 000000000..fbb8568ad
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/fck_strip.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.gif
new file mode 100644
index 000000000..49a4d8d70
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.png b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.png
new file mode 100644
index 000000000..ab1ff32bf
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.rtl.png b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.rtl.png
new file mode 100644
index 000000000..e0a7aa77d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/dialog.sides.rtl.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.gif
new file mode 100644
index 000000000..6a17ed1a8
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.png b/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.png
new file mode 100644
index 000000000..0ab521998
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/sprites.png differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif
new file mode 100644
index 000000000..6843c8d41
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif
new file mode 100644
index 000000000..ea60995e1
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif
new file mode 100644
index 000000000..a93ffcaa3
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.collapse.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.collapse.gif
new file mode 100644
index 000000000..87aa56d3b
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.collapse.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.end.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.end.gif
new file mode 100644
index 000000000..5bfd67a2d
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.end.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.expand.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.expand.gif
new file mode 100644
index 000000000..79075e7c3
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.expand.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.separator.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.separator.gif
new file mode 100644
index 000000000..eaed04a7a
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.separator.gif differ
diff --git a/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.start.gif b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.start.gif
new file mode 100644
index 000000000..1774246c2
Binary files /dev/null and b/modules/editor/skins/fckeditor/editor/skins/silver/images/toolbar.start.gif differ
diff --git a/modules/editor/skins/fckeditor/fckconfig.js b/modules/editor/skins/fckeditor/fckconfig.js
new file mode 100644
index 000000000..952ca6951
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fckconfig.js
@@ -0,0 +1,344 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Editor configuration settings.
+ *
+ * Follow this link for more information:
+ * http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
+ */
+
+FCKConfig.CustomConfigurationsPath = '' ;
+
+FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ;
+FCKConfig.EditorAreaStyles = '' ;
+FCKConfig.ToolbarComboPreviewCSS = '' ;
+
+FCKConfig.DocType = '' ;
+
+FCKConfig.BaseHref = '' ;
+
+FCKConfig.FullPage = false ;
+
+// The following option determines whether the "Show Blocks" feature is enabled or not at startup.
+FCKConfig.StartupShowBlocks = false ;
+
+FCKConfig.Debug = false ;
+FCKConfig.AllowQueryStringDebug = true ;
+
+FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
+FCKConfig.SkinEditorCSS = '' ;  // FCKConfig.SkinPath + "|<minified css>" ;
+FCKConfig.SkinDialogCSS = '' ;  // FCKConfig.SkinPath + "|<minified css>" ;
+
+FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
+
+FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
+
+FCKConfig.Plugins.Add( 'xecomponent') ;
+FCKConfig.Plugins.Add( 'findreplace') ;
+
+//FCKConfig.Plugins.Add( 'placeholder' ) ;
+//FCKConfig.Plugins.Add( 'dragresizetable' );
+FCKConfig.AutoGrowMax = 400 ;
+
+// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ;   // ASP style server side code <%...%>
+// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code
+// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ;    // ASP.Net style tags <asp:control>
+
+FCKConfig.AutoDetectLanguage    = true ;
+FCKConfig.DefaultLanguage       = 'ko' ;
+FCKConfig.ContentLangDirection  = 'ltr' ;
+
+FCKConfig.ProcessHTMLEntities   = true ;
+FCKConfig.IncludeLatinEntities  = true ;
+FCKConfig.IncludeGreekEntities  = true ;
+
+FCKConfig.ProcessNumericEntities = false ;
+
+FCKConfig.AdditionalNumericEntities = ''  ;     // Single Quote: "'"
+
+FCKConfig.FillEmptyBlocks   = true ;
+
+FCKConfig.FormatSource      = true ;
+FCKConfig.FormatOutput      = true ;
+FCKConfig.FormatIndentator  = '    ' ;
+
+FCKConfig.EMailProtection = 'encode' ; // none | encode | function
+FCKConfig.EMailProtectionFunction = 'mt(NAME,DOMAIN,SUBJECT,BODY)' ;
+
+FCKConfig.StartupFocus  = false ;
+FCKConfig.ForcePasteAsPlainText = false ;
+FCKConfig.AutoDetectPasteFromWord = true ;  // IE only.
+FCKConfig.ShowDropDialog = true ;
+FCKConfig.ForceSimpleAmpersand  = false ;
+FCKConfig.TabSpaces     = 0 ;
+FCKConfig.ShowBorders   = true ;
+FCKConfig.SourcePopup   = false ;
+FCKConfig.ToolbarStartExpanded  = true ;
+FCKConfig.ToolbarCanCollapse    = true ;
+FCKConfig.IgnoreEmptyParagraphValue = true ;
+FCKConfig.FloatingPanelsZIndex = 10000 ;
+FCKConfig.HtmlEncodeOutput = false ;
+
+FCKConfig.TemplateReplaceAll = true ;
+FCKConfig.TemplateReplaceCheckbox = true ;
+
+FCKConfig.ToolbarLocation = 'In' ;
+
+FCKConfig.ToolbarSets["Default"] = [
+    ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
+    ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
+    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+    ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+    '/',
+    ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
+    ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+    ['Link','Unlink','Anchor'],
+    ['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak'],
+    '/',
+    ['Style','FontFormat','FontName','FontSize'],
+    ['TextColor','BGColor'],
+    ['FitWindow','ShowBlocks','-','About']      // No comma for the last row.
+] ;
+
+
+FCKConfig.ToolbarSets["XE"] = [
+    ['FitWindow','ShowBlocks','Source','DocProps','-','Save','Preview','-'],
+    ['Cut','Copy','Paste','PasteText','PasteWord','-','Print'],
+    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+    '/',
+    ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
+    ['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+    ['Link','Unlink','Anchor'],
+    ['Table','Rule','Smiley','SpecialChar','PageBreak','XeComponent'],
+    '/',
+    ['Style','FontFormat','FontName','FontSize','TextColor','BGColor'],
+    ['About']       // No comma for the last row.
+] ;
+
+FCKConfig.ToolbarSets["Basic"] = [
+    ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
+] ;
+
+FCKConfig.EnterMode = 'p' ;         // p | div | br
+FCKConfig.ShiftEnterMode = 'br' ;   // p | div | br
+
+FCKConfig.Keystrokes = [
+    [ CTRL + 65 /*A*/, true ],
+    [ CTRL + 67 /*C*/, true ],
+    [ CTRL + 70 /*F*/, true ],
+    [ CTRL + 83 /*S*/, true ],
+    [ CTRL + 84 /*T*/, true ],
+    [ CTRL + 88 /*X*/, true ],
+    [ CTRL + 86 /*V*/, 'Paste' ],
+    [ CTRL + 45 /*INS*/, true ],
+    [ SHIFT + 45 /*INS*/, 'Paste' ],
+    [ CTRL + 88 /*X*/, 'Cut' ],
+    [ SHIFT + 46 /*DEL*/, 'Cut' ],
+    [ CTRL + 90 /*Z*/, 'Undo' ],
+    [ CTRL + 89 /*Y*/, 'Redo' ],
+    [ CTRL + SHIFT + 90 /*Z*/, 'Redo' ],
+    [ CTRL + 76 /*L*/, 'Link' ],
+    [ CTRL + 66 /*B*/, 'Bold' ],
+    [ CTRL + 73 /*I*/, 'Italic' ],
+    [ CTRL + 85 /*U*/, 'Underline' ],
+    [ CTRL + SHIFT + 83 /*S*/, 'Save' ],
+    [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
+    [ SHIFT + 32 /*SPACE*/, 'Nbsp' ]
+] ;
+
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form','DivContainer'] ;
+FCKConfig.BrowserContextMenuOnCtrl = false ;
+FCKConfig.BrowserContextMenu = false ;
+
+FCKConfig.EnableMoreFontColors = true ;
+FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
+
+FCKConfig.FontFormats   = 'p;h1;h2;h3;h4;h5;h6;pre;address;div' ;
+FCKConfig.FontNames     = 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
+FCKConfig.FontSizes     = 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
+
+FCKConfig.StylesXmlPath     = FCKConfig.EditorPath + 'fckstyles.xml' ;
+FCKConfig.TemplatesXmlPath  = FCKConfig.EditorPath + 'fcktemplates.xml' ;
+
+FCKConfig.SpellChecker          = 'ieSpell' ;   // 'ieSpell' | 'SpellerPages'
+FCKConfig.IeSpellDownloadUrl    = 'http://www.iespell.com/download.php' ;
+FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ;    // Available extension: .php .cfm .pl
+FCKConfig.FirefoxSpellChecker   = false ;
+
+FCKConfig.MaxUndoLevels = 15 ;
+
+FCKConfig.DisableObjectResizing = false ;
+FCKConfig.DisableFFTableHandles = true ;
+
+FCKConfig.LinkDlgHideTarget     = false ;
+FCKConfig.LinkDlgHideAdvanced   = false ;
+
+FCKConfig.ImageDlgHideLink      = false ;
+FCKConfig.ImageDlgHideAdvanced  = false ;
+
+FCKConfig.FlashDlgHideAdvanced  = false ;
+
+FCKConfig.ProtectedTags = '' ;
+
+// This will be applied to the body element of the editor
+FCKConfig.BodyId = '' ;
+FCKConfig.BodyClass = '' ;
+
+FCKConfig.DefaultStyleLabel = '' ;
+FCKConfig.DefaultFontFormatLabel = '' ;
+FCKConfig.DefaultFontLabel = '' ;
+FCKConfig.DefaultFontSizeLabel = '' ;
+
+FCKConfig.DefaultLinkTarget = '' ;
+
+// The option switches between trying to keep the html structure or do the changes so the content looks like it was in Word
+FCKConfig.CleanWordKeepsStructure = false ;
+
+// Only inline elements are valid.
+FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ;
+
+// Attributes that will be removed
+FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ;
+
+FCKConfig.CustomStyles =
+{
+    'Red Title' : { Element : 'h3', Styles : { 'color' : 'Red' } }
+};
+
+// Do not add, rename or remove styles here. Only apply definition changes.
+FCKConfig.CoreStyles =
+{
+    // Basic Inline Styles.
+    'Bold'          : { Element : 'strong', Overrides : 'b' },
+    'Italic'        : { Element : 'em', Overrides : 'i' },
+    'Underline'     : { Element : 'u' },
+    'StrikeThrough' : { Element : 'strike' },
+    'Subscript'     : { Element : 'sub' },
+    'Superscript'   : { Element : 'sup' },
+
+    // Basic Block Styles (Font Format Combo).
+    'p'             : { Element : 'p' },
+    'div'           : { Element : 'div' },
+    'pre'           : { Element : 'pre' },
+    'address'       : { Element : 'address' },
+    'h1'            : { Element : 'h1' },
+    'h2'            : { Element : 'h2' },
+    'h3'            : { Element : 'h3' },
+    'h4'            : { Element : 'h4' },
+    'h5'            : { Element : 'h5' },
+    'h6'            : { Element : 'h6' },
+
+    // Other formatting features.
+    'FontFace' :
+    {
+        Element     : 'span',
+        Styles      : { 'font-family' : '#("Font")' },
+        Overrides   : [ { Element : 'font', Attributes : { 'face' : null } } ]
+    },
+
+    'Size' :
+    {
+        Element     : 'span',
+        Styles      : { 'font-size' : '#("Size","fontSize")' },
+        Overrides   : [ { Element : 'font', Attributes : { 'size' : null } } ]
+    },
+
+    'Color' :
+    {
+        Element     : 'span',
+        Styles      : { 'color' : '#("Color","color")' },
+        Overrides   : [ { Element : 'font', Attributes : { 'color' : null } } ]
+    },
+
+    'BackColor'     : { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } },
+
+    'SelectionHighlight' : { Element : 'span', Styles : { 'background-color' : 'navy', 'color' : 'white' } }
+};
+
+// The distance of an indentation step.
+FCKConfig.IndentLength = 40 ;
+FCKConfig.IndentUnit = 'px' ;
+
+// Alternatively, FCKeditor allows the use of CSS classes for block indentation.
+// This overrides the IndentLength/IndentUnit settings.
+FCKConfig.IndentClasses = [] ;
+
+// [ Left, Center, Right, Justified ]
+FCKConfig.JustifyClasses = [] ;
+
+// The following value defines which File Browser connector and Quick Upload
+// "uploader" to use. It is valid for the default implementaion and it is here
+// just to make this configuration file cleaner.
+// It is not possible to change this value using an external file or even
+// inline when creating the editor instance. In that cases you must set the
+// values of LinkBrowserURL, ImageBrowserURL and so on.
+// Custom implementations should just ignore it.
+var _FileBrowserLanguage    = 'php' ;   // asp | aspx | cfm | lasso | perl | php | py
+var _QuickUploadLanguage    = 'php' ;   // asp | aspx | cfm | lasso | perl | php | py
+
+// Don't care about the following two lines. It just calculates the correct connector
+// extension to use for the default File Browser (Perl uses "cgi").
+var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowserLanguage ;
+var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
+
+FCKConfig.LinkBrowser = true ;
+FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
+FCKConfig.LinkBrowserWindowWidth    = FCKConfig.ScreenWidth * 0.7 ;     // 70%
+FCKConfig.LinkBrowserWindowHeight   = FCKConfig.ScreenHeight * 0.7 ;    // 70%
+
+FCKConfig.ImageBrowser = true ;
+FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
+FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;  // 70% ;
+FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; // 70% ;
+
+FCKConfig.FlashBrowser = true ;
+FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
+FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;  //70% ;
+FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;
+
+FCKConfig.LinkUpload = true ;
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension ;
+FCKConfig.LinkUploadAllowedExtensions   = ".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$" ;            // empty for all
+FCKConfig.LinkUploadDeniedExtensions    = "" ;  // empty for no one
+
+FCKConfig.ImageUpload = true ;
+FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Image' ;
+FCKConfig.ImageUploadAllowedExtensions  = ".(jpg|gif|jpeg|png|bmp)$" ;      // empty for all
+FCKConfig.ImageUploadDeniedExtensions   = "" ;                          // empty for no one
+
+FCKConfig.FlashUpload = true ;
+FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Flash' ;
+FCKConfig.FlashUploadAllowedExtensions  = ".(swf|flv)$" ;       // empty for all
+FCKConfig.FlashUploadDeniedExtensions   = "" ;                  // empty for no one
+
+FCKConfig.SmileyPath    = FCKConfig.BasePath + 'images/smiley/msn/' ;
+FCKConfig.SmileyImages  = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ;
+FCKConfig.SmileyColumns = 8 ;
+FCKConfig.SmileyWindowWidth     = 320 ;
+FCKConfig.SmileyWindowHeight    = 210 ;
+
+FCKConfig.BackgroundBlockerColor = '#ffffff' ;
+FCKConfig.BackgroundBlockerOpacity = 0.50 ;
+
+FCKConfig.MsWebBrowserControlCompat = false ;
+
+FCKConfig.PreventSubmitHandler = false ;
diff --git a/modules/editor/skins/fckeditor/fckeditor.js b/modules/editor/skins/fckeditor/fckeditor.js
new file mode 100644
index 000000000..a91b28ed0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fckeditor.js
@@ -0,0 +1,328 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the integration file for JavaScript.
+ *
+ * It defines the FCKeditor class that can be used to create editor
+ * instances in a HTML page in the client side. For server side
+ * operations, use the specific integration system.
+ */
+
+// FCKeditor Class
+var FCKeditor = function( instanceName, width, height, toolbarSet, value )
+{
+	// Properties
+	this.InstanceName	= instanceName ;
+	this.Width			= width			|| '100%' ;
+	this.Height			= height		|| '200' ;
+	this.ToolbarSet		= toolbarSet	|| 'Default' ;
+	this.Value			= value			|| '' ;
+	this.BasePath		= FCKeditor.BasePath ;
+	this.CheckBrowser	= true ;
+	this.DisplayErrors	= true ;
+
+	this.Config			= new Object() ;
+
+	// Events
+	this.OnError		= null ;	// function( source, errorNumber, errorDescription )
+}
+
+/**
+ * This is the default BasePath used by all editor instances.
+ */
+FCKeditor.BasePath = '/fckeditor/' ;
+
+/**
+ * The minimum height used when replacing textareas.
+ */
+FCKeditor.MinHeight = 200 ;
+
+/**
+ * The minimum width used when replacing textareas.
+ */
+FCKeditor.MinWidth = 750 ;
+
+FCKeditor.prototype.Version			= '2.6.3' ;
+FCKeditor.prototype.VersionBuild	= '19836' ;
+
+FCKeditor.prototype.Create = function()
+{
+	document.write( this.CreateHtml() ) ;
+}
+
+FCKeditor.prototype.CreateHtml = function()
+{
+	// Check for errors
+	if ( !this.InstanceName || this.InstanceName.length == 0 )
+	{
+		this._ThrowError( 701, 'You must specify an instance name.' ) ;
+		return '' ;
+	}
+
+	var sHtml = '' ;
+
+	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
+	{
+		sHtml += '<input type="hidden" id="' + this.InstanceName + '" name="' + this.InstanceName + '" value="' + this._HTMLEncode( this.Value ) + '" style="display:none" />' ;
+		sHtml += this._GetConfigHtml() ;
+		sHtml += this._GetIFrameHtml() ;
+	}
+	else
+	{
+		var sWidth  = this.Width.toString().indexOf('%')  > 0 ? this.Width  : this.Width  + 'px' ;
+		var sHeight = this.Height.toString().indexOf('%') > 0 ? this.Height : this.Height + 'px' ;
+
+		sHtml += '<textarea name="' + this.InstanceName +
+			'" rows="4" cols="40" style="width:' + sWidth +
+			';height:' + sHeight ;
+
+		if ( this.TabIndex )
+			sHtml += '" tabindex="' + this.TabIndex ;
+
+		sHtml += '">' +
+			this._HTMLEncode( this.Value ) +
+			'<\/textarea>' ;
+	}
+
+	return sHtml ;
+}
+
+FCKeditor.prototype.ReplaceTextarea = function()
+{
+	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
+	{
+		// We must check the elements firstly using the Id and then the name.
+		var oTextarea = document.getElementById( this.InstanceName ) ;
+		var colElementsByName = document.getElementsByName( this.InstanceName ) ;
+		var i = 0;
+		while ( oTextarea || i == 0 )
+		{
+			if ( oTextarea && oTextarea.tagName.toLowerCase() == 'textarea' )
+				break ;
+			oTextarea = colElementsByName[i++] ;
+		}
+
+		if ( !oTextarea )
+		{
+			alert( 'Error: The TEXTAREA with id or name set to "' + this.InstanceName + '" was not found' ) ;
+			return ;
+		}
+
+		oTextarea.style.display = 'none' ;
+
+		if ( oTextarea.tabIndex )
+			this.TabIndex = oTextarea.tabIndex ;
+
+		this._InsertHtmlBefore( this._GetConfigHtml(), oTextarea ) ;
+		this._InsertHtmlBefore( this._GetIFrameHtml(), oTextarea ) ;
+	}
+}
+
+FCKeditor.prototype._InsertHtmlBefore = function( html, element )
+{
+	if ( element.insertAdjacentHTML )	// IE
+		element.insertAdjacentHTML( 'beforeBegin', html ) ;
+	else								// Gecko
+	{
+		var oRange = document.createRange() ;
+		oRange.setStartBefore( element ) ;
+		var oFragment = oRange.createContextualFragment( html );
+		element.parentNode.insertBefore( oFragment, element ) ;
+	}
+}
+
+FCKeditor.prototype._GetConfigHtml = function()
+{
+	var sConfig = '' ;
+	for ( var o in this.Config )
+	{
+		if ( sConfig.length > 0 ) sConfig += '&amp;' ;
+		sConfig += encodeURIComponent( o ) + '=' + encodeURIComponent( this.Config[o] ) ;
+	}
+
+	return '<input type="hidden" id="' + this.InstanceName + '___Config" value="' + sConfig + '" style="display:none" />' ;
+}
+
+FCKeditor.prototype._GetIFrameHtml = function()
+{
+	var sFile = 'fckeditor.html' ;
+
+	try
+	{
+		if ( (/fcksource=true/i).test( window.top.location.search ) )
+			sFile = 'fckeditor.original.html' ;
+	}
+	catch (e) { /* Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error). */ }
+
+	var sLink = this.BasePath + 'editor/' + sFile + '?InstanceName=' + encodeURIComponent( this.InstanceName ) ;
+	if (this.ToolbarSet)
+		sLink += '&amp;Toolbar=' + this.ToolbarSet ;
+
+	html = '<iframe id="' + this.InstanceName +
+		'___Frame" src="' + sLink +
+		'" width="' + this.Width +
+		'" height="' + this.Height ;
+
+	if ( this.TabIndex )
+		html += '" tabindex="' + this.TabIndex ;
+
+	html += '" frameborder="0" scrolling="no"></iframe>' ;
+
+	return html ;
+}
+
+FCKeditor.prototype._IsCompatibleBrowser = function()
+{
+	return FCKeditor_IsCompatibleBrowser() ;
+}
+
+FCKeditor.prototype._ThrowError = function( errorNumber, errorDescription )
+{
+	this.ErrorNumber		= errorNumber ;
+	this.ErrorDescription	= errorDescription ;
+
+	if ( this.DisplayErrors )
+	{
+		document.write( '<div style="COLOR: #ff0000">' ) ;
+		document.write( '[ FCKeditor Error ' + this.ErrorNumber + ': ' + this.ErrorDescription + ' ]' ) ;
+		document.write( '</div>' ) ;
+	}
+
+	if ( typeof( this.OnError ) == 'function' )
+		this.OnError( this, errorNumber, errorDescription ) ;
+}
+
+FCKeditor.prototype._HTMLEncode = function( text )
+{
+	if ( typeof( text ) != "string" )
+		text = text.toString() ;
+
+	text = text.replace(
+		/&/g, "&amp;").replace(
+		/"/g, "&quot;").replace(
+		/</g, "&lt;").replace(
+		/>/g, "&gt;") ;
+
+	return text ;
+}
+
+;(function()
+{
+	var textareaToEditor = function( textarea )
+	{
+		var editor = new FCKeditor( textarea.name ) ;
+
+		editor.Width = Math.max( textarea.offsetWidth, FCKeditor.MinWidth ) ;
+		editor.Height = Math.max( textarea.offsetHeight, FCKeditor.MinHeight ) ;
+
+		return editor ;
+	}
+
+	/**
+	 * Replace all <textarea> elements available in the document with FCKeditor
+	 * instances.
+	 *
+	 *	// Replace all <textarea> elements in the page.
+	 *	FCKeditor.ReplaceAllTextareas() ;
+	 *
+	 *	// Replace all <textarea class="myClassName"> elements in the page.
+	 *	FCKeditor.ReplaceAllTextareas( 'myClassName' ) ;
+	 *
+	 *	// Selectively replace <textarea> elements, based on custom assertions.
+	 *	FCKeditor.ReplaceAllTextareas( function( textarea, editor )
+	 *		{
+	 *			// Custom code to evaluate the replace, returning false if it
+	 *			// must not be done.
+	 *			// It also passes the "editor" parameter, so the developer can
+	 *			// customize the instance.
+	 *		} ) ;
+	 */
+	FCKeditor.ReplaceAllTextareas = function()
+	{
+		var textareas = document.getElementsByTagName( 'textarea' ) ;
+
+		for ( var i = 0 ; i < textareas.length ; i++ )
+		{
+			var editor = null ;
+			var textarea = textareas[i] ;
+			var name = textarea.name ;
+
+			// The "name" attribute must exist.
+			if ( !name || name.length == 0 )
+				continue ;
+
+			if ( typeof arguments[0] == 'string' )
+			{
+				// The textarea class name could be passed as the function
+				// parameter.
+
+				var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ) ;
+
+				if ( !classRegex.test( textarea.className ) )
+					continue ;
+			}
+			else if ( typeof arguments[0] == 'function' )
+			{
+				// An assertion function could be passed as the function parameter.
+				// It must explicitly return "false" to ignore a specific <textarea>.
+				editor = textareaToEditor( textarea ) ;
+				if ( arguments[0]( textarea, editor ) === false )
+					continue ;
+			}
+
+			if ( !editor )
+				editor = textareaToEditor( textarea ) ;
+
+			editor.ReplaceTextarea() ;
+		}
+	}
+})() ;
+
+function FCKeditor_IsCompatibleBrowser()
+{
+	var sAgent = navigator.userAgent.toLowerCase() ;
+
+	// Internet Explorer 5.5+
+	if ( /*@cc_on!@*/false && sAgent.indexOf("mac") == -1 )
+	{
+		var sBrowserVersion = navigator.appVersion.match(/MSIE (.\..)/)[1] ;
+		return ( sBrowserVersion >= 5.5 ) ;
+	}
+
+	// Gecko (Opera 9 tries to behave like Gecko at this point).
+	if ( navigator.product == "Gecko" && navigator.productSub >= 20030210 && !( typeof(opera) == 'object' && opera.postError ) )
+		return true ;
+
+	// Opera 9.50+
+	if ( window.opera && window.opera.version && parseFloat( window.opera.version() ) >= 9.5 )
+		return true ;
+
+	// Adobe AIR
+	// Checked before Safari because AIR have the WebKit rich text editor
+	// features from Safari 3.0.4, but the version reported is 420.
+	if ( sAgent.indexOf( ' adobeair/' ) != -1 )
+		return ( sAgent.match( / adobeair\/(\d+)/ )[1] >= 1 ) ;	// Build must be at least v1
+
+	// Safari 3+
+	if ( sAgent.indexOf( ' applewebkit/' ) != -1 )
+		return ( sAgent.match( / applewebkit\/(\d+)/ )[1] >= 522 ) ;	// Build must be at least 522 (v3)
+
+	return false ;
+}
diff --git a/modules/editor/skins/fckeditor/fckpackager.xml b/modules/editor/skins/fckeditor/fckpackager.xml
new file mode 100644
index 000000000..396106c9f
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fckpackager.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the configuration file to be used with FCKpackager to generate the
+ * compressed code files in the "js" folder.
+ *
+ * Please check http://www.fckeditor.net for more info.
+-->
+<Package>
+	<Header><![CDATA[/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This file has been compressed for better performance. The original source
+ * can be found at "editor/_source".
+ */
+]]></Header>
+	<Constants removeDeclaration="false">
+		<Constant name="FCK_STATUS_NOTLOADED" value="0" />
+		<Constant name="FCK_STATUS_ACTIVE" value="1" />
+		<Constant name="FCK_STATUS_COMPLETE" value="2" />
+		<Constant name="FCK_TRISTATE_OFF" value="0" />
+		<Constant name="FCK_TRISTATE_ON" value="1" />
+		<Constant name="FCK_TRISTATE_DISABLED" value="-1" />
+		<Constant name="FCK_UNKNOWN" value="-9" />
+		<Constant name="FCK_TOOLBARITEM_ONLYICON" value="0" />
+		<Constant name="FCK_TOOLBARITEM_ONLYTEXT" value="1" />
+		<Constant name="FCK_TOOLBARITEM_ICONTEXT" value="2" />
+		<Constant name="FCK_EDITMODE_WYSIWYG" value="0" />
+		<Constant name="FCK_EDITMODE_SOURCE" value="1" />
+		<Constant name="FCK_STYLE_BLOCK" value="0" />
+		<Constant name="FCK_STYLE_INLINE" value="1" />
+		<Constant name="FCK_STYLE_OBJECT" value="2" />
+	</Constants>
+	<PackageFile path="editor/js/fckeditorcode_ie.js">
+		<File path="editor/_source/fckconstants.js" />
+		<File path="editor/_source/fckjscoreextensions.js" />
+		<File path="editor/_source/classes/fckiecleanup.js" />
+		<File path="editor/_source/internals/fckbrowserinfo.js" />
+		<File path="editor/_source/internals/fckurlparams.js" />
+		<File path="editor/_source/classes/fckevents.js" />
+		<File path="editor/_source/classes/fckdataprocessor.js" />
+		<File path="editor/_source/internals/fck.js" />
+		<File path="editor/_source/internals/fck_ie.js" />
+		<File path="editor/_source/internals/fckconfig.js" />
+		<File path="editor/_source/internals/fckdebug_empty.js" />
+		<File path="editor/_source/internals/fckdomtools.js" />
+		<File path="editor/_source/internals/fcktools.js" />
+		<File path="editor/_source/internals/fcktools_ie.js" />
+		<File path="editor/_source/fckeditorapi.js" />
+		<File path="editor/_source/classes/fckimagepreloader.js" />
+
+		<File path="editor/_source/internals/fckregexlib.js" />
+		<File path="editor/_source/internals/fcklistslib.js" />
+		<File path="editor/_source/internals/fcklanguagemanager.js" />
+		<File path="editor/_source/internals/fckxhtmlentities.js" />
+		<File path="editor/_source/internals/fckxhtml.js" />
+		<File path="editor/_source/internals/fckxhtml_ie.js" />
+		<File path="editor/_source/internals/fckcodeformatter.js" />
+		<File path="editor/_source/internals/fckundo.js" />
+		<File path="editor/_source/classes/fckeditingarea.js" />
+		<File path="editor/_source/classes/fckkeystrokehandler.js" />
+
+		<File path="editor/dtd/fck_xhtml10transitional.js" />
+		<File path="editor/_source/classes/fckstyle.js" />
+		<File path="editor/_source/internals/fckstyles.js" />
+
+		<File path="editor/_source/internals/fcklisthandler.js" />
+		<File path="editor/_source/classes/fckelementpath.js" />
+		<File path="editor/_source/classes/fckdomrange.js" />
+		<File path="editor/_source/classes/fckdomrange_ie.js" />
+		<File path="editor/_source/classes/fckdomrangeiterator.js" />
+		<File path="editor/_source/classes/fckdocumentfragment_ie.js" />
+		<File path="editor/_source/classes/fckw3crange.js" />
+		<File path="editor/_source/classes/fckenterkey.js" />
+
+		<File path="editor/_source/internals/fckdocumentprocessor.js" />
+		<File path="editor/_source/internals/fckselection.js" />
+		<File path="editor/_source/internals/fckselection_ie.js" />
+
+		<File path="editor/_source/internals/fcktablehandler.js" />
+		<File path="editor/_source/internals/fcktablehandler_ie.js" />
+		<File path="editor/_source/classes/fckxml.js" />
+		<File path="editor/_source/classes/fckxml_ie.js" />
+
+		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
+		<File path="editor/_source/commandclasses/fckstylecommand.js" />
+		<File path="editor/_source/commandclasses/fck_othercommands.js" />
+		<File path="editor/_source/commandclasses/fckshowblocks.js" />
+		<File path="editor/_source/commandclasses/fckspellcheckcommand_ie.js" />
+		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
+		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
+		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
+		<File path="editor/_source/commandclasses/fcktablecommand.js" />
+		<File path="editor/_source/commandclasses/fckfitwindow.js" />
+		<File path="editor/_source/commandclasses/fcklistcommands.js" />
+		<File path="editor/_source/commandclasses/fckjustifycommands.js" />
+		<File path="editor/_source/commandclasses/fckindentcommands.js" />
+		<File path="editor/_source/commandclasses/fckblockquotecommand.js" />
+		<File path="editor/_source/commandclasses/fckcorestylecommand.js" />
+		<File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
+		<File path="editor/_source/internals/fckcommands.js" />
+
+		<File path="editor/_source/classes/fckpanel.js" />
+		<File path="editor/_source/classes/fckicon.js" />
+		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
+		<File path="editor/_source/classes/fcktoolbarbutton.js" />
+		<File path="editor/_source/classes/fckspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
+		<File path="editor/_source/internals/fcktoolbaritems.js" />
+		<File path="editor/_source/classes/fcktoolbar.js" />
+		<File path="editor/_source/classes/fcktoolbarbreak_ie.js" />
+		<File path="editor/_source/internals/fcktoolbarset.js" />
+		<File path="editor/_source/internals/fckdialog.js" />
+
+		<File path="editor/_source/classes/fckmenuitem.js" />
+		<File path="editor/_source/classes/fckmenublock.js" />
+		<File path="editor/_source/classes/fckmenublockpanel.js" />
+		<File path="editor/_source/classes/fckcontextmenu.js" />
+		<File path="editor/_source/internals/fck_contextmenu.js" />
+		<File path="editor/_source/classes/fckhtmliterator.js" />
+
+		<File path="editor/_source/classes/fckplugin.js" />
+		<File path="editor/_source/internals/fckplugins.js" />
+	</PackageFile>
+
+	<PackageFile path="editor/js/fckeditorcode_gecko.js">
+		<File path="editor/_source/fckconstants.js" />
+		<File path="editor/_source/fckjscoreextensions.js" />
+		<File path="editor/_source/internals/fckbrowserinfo.js" />
+		<File path="editor/_source/internals/fckurlparams.js" />
+		<File path="editor/_source/classes/fckevents.js" />
+		<File path="editor/_source/classes/fckdataprocessor.js" />
+		<File path="editor/_source/internals/fck.js" />
+		<File path="editor/_source/internals/fck_gecko.js" />
+		<File path="editor/_source/internals/fckconfig.js" />
+		<File path="editor/_source/internals/fckdebug_empty.js" />
+		<File path="editor/_source/internals/fckdomtools.js" />
+		<File path="editor/_source/internals/fcktools.js" />
+		<File path="editor/_source/internals/fcktools_gecko.js" />
+		<File path="editor/_source/fckeditorapi.js" />
+		<File path="editor/_source/classes/fckimagepreloader.js" />
+
+		<File path="editor/_source/internals/fckregexlib.js" />
+		<File path="editor/_source/internals/fcklistslib.js" />
+		<File path="editor/_source/internals/fcklanguagemanager.js" />
+		<File path="editor/_source/internals/fckxhtmlentities.js" />
+		<File path="editor/_source/internals/fckxhtml.js" />
+		<File path="editor/_source/internals/fckxhtml_gecko.js" />
+		<File path="editor/_source/internals/fckcodeformatter.js" />
+		<File path="editor/_source/internals/fckundo.js" />
+		<File path="editor/_source/classes/fckeditingarea.js" />
+		<File path="editor/_source/classes/fckkeystrokehandler.js" />
+
+		<File path="editor/dtd/fck_xhtml10transitional.js" />
+		<File path="editor/_source/classes/fckstyle.js" />
+		<File path="editor/_source/internals/fckstyles.js" />
+
+		<File path="editor/_source/internals/fcklisthandler.js" />
+		<File path="editor/_source/classes/fckelementpath.js" />
+		<File path="editor/_source/classes/fckdomrange.js" />
+		<File path="editor/_source/classes/fckdomrange_gecko.js" />
+		<File path="editor/_source/classes/fckdomrangeiterator.js" />
+		<File path="editor/_source/classes/fckdocumentfragment_gecko.js" />
+		<File path="editor/_source/classes/fckw3crange.js" />
+		<File path="editor/_source/classes/fckenterkey.js" />
+
+		<File path="editor/_source/internals/fckdocumentprocessor.js" />
+		<File path="editor/_source/internals/fckselection.js" />
+		<File path="editor/_source/internals/fckselection_gecko.js" />
+
+		<File path="editor/_source/internals/fcktablehandler.js" />
+		<File path="editor/_source/internals/fcktablehandler_gecko.js" />
+		<File path="editor/_source/classes/fckxml.js" />
+		<File path="editor/_source/classes/fckxml_gecko.js" />
+
+		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
+		<File path="editor/_source/commandclasses/fckstylecommand.js" />
+		<File path="editor/_source/commandclasses/fck_othercommands.js" />
+		<File path="editor/_source/commandclasses/fckshowblocks.js" />
+		<File path="editor/_source/commandclasses/fckspellcheckcommand_gecko.js" />
+		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
+		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
+		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
+		<File path="editor/_source/commandclasses/fcktablecommand.js" />
+		<File path="editor/_source/commandclasses/fckfitwindow.js" />
+		<File path="editor/_source/commandclasses/fcklistcommands.js" />
+		<File path="editor/_source/commandclasses/fckjustifycommands.js" />
+		<File path="editor/_source/commandclasses/fckindentcommands.js" />
+		<File path="editor/_source/commandclasses/fckblockquotecommand.js" />
+		<File path="editor/_source/commandclasses/fckcorestylecommand.js" />
+		<File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
+		<File path="editor/_source/internals/fckcommands.js" />
+
+		<File path="editor/_source/classes/fckpanel.js" />
+		<File path="editor/_source/classes/fckicon.js" />
+		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
+		<File path="editor/_source/classes/fcktoolbarbutton.js" />
+		<File path="editor/_source/classes/fckspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
+		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
+		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
+		<File path="editor/_source/internals/fcktoolbaritems.js" />
+		<File path="editor/_source/classes/fcktoolbar.js" />
+		<File path="editor/_source/classes/fcktoolbarbreak_gecko.js" />
+		<File path="editor/_source/internals/fcktoolbarset.js" />
+		<File path="editor/_source/internals/fckdialog.js" />
+
+		<File path="editor/_source/classes/fckmenuitem.js" />
+		<File path="editor/_source/classes/fckmenublock.js" />
+		<File path="editor/_source/classes/fckmenublockpanel.js" />
+		<File path="editor/_source/classes/fckcontextmenu.js" />
+		<File path="editor/_source/internals/fck_contextmenu.js" />
+		<File path="editor/_source/classes/fckhtmliterator.js" />
+
+		<File path="editor/_source/classes/fckplugin.js" />
+		<File path="editor/_source/internals/fckplugins.js" />
+	</PackageFile>
+
+</Package>
diff --git a/modules/editor/skins/fckeditor/fckstyles.xml b/modules/editor/skins/fckeditor/fckstyles.xml
new file mode 100644
index 000000000..76ca2adc1
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fckstyles.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the sample style definitions file. It makes the styles combo
+ * completely customizable.
+ *
+ * See FCKConfig.StylesXmlPath in the configuration file.
+-->
+<Styles>
+
+	<!-- Block Styles -->
+
+	<!--
+	# These styles are already available in the "Format" combo, so they are not
+	# needed here by default.
+
+	<Style name="Heading 1" element="h1" />
+	<Style name="Heading 2" element="h2" />
+	<Style name="Heading 3" element="h3" />
+	<Style name="Heading 4" element="h4" />
+	<Style name="Heading 5" element="h5" />
+	<Style name="Heading 6" element="h6" />
+	<Style name="Paragraph" element="p" />
+	<Style name="Document Block" element="div" />
+	<Style name="Preformatted Text" element="pre" />
+	<Style name="Address" element="address" />
+	-->
+
+	<!-- Inline Styles -->
+
+	<!--
+	# These are core styles available as toolbar buttons.
+
+	<Style name="Bold" element="b">
+		<Override element="strong" />
+	</Style>
+	<Style name="Italic" element="i">
+		<Override element="em" />
+	</Style>
+	<Style name="Underline" element="u" />
+	<Style name="Strikethrough" element="strike" />
+	<Style name="Subscript" element="sub" />
+	<Style name="Superscript" element="sup" />
+	-->
+
+	<Style name="Marker: Yellow" element="span">
+		<Style name="background-color" value="Yellow" />
+	</Style>
+	<Style name="Marker: Green" element="span">
+		<Style name="background-color" value="Lime" />
+	</Style>
+
+	<Style name="Big" element="big" />
+	<Style name="Small" element="small" />
+	<Style name="Typewriter" element="tt" />
+
+	<Style name="Computer Code" element="code" />
+	<Style name="Keyboard Phrase" element="kbd" />
+	<Style name="Sample Text" element="samp" />
+	<Style name="Variable" element="var" />
+
+	<Style name="Deleted Text" element="del" />
+	<Style name="Inserted Text" element="ins" />
+
+	<Style name="Cited Work" element="cite" />
+	<Style name="Inline Quotation" element="q" />
+
+	<Style name="Language: RTL" element="span">
+		<Attribute name="dir" value="rtl" />
+	</Style>
+	<Style name="Language: LTR" element="span">
+		<Attribute name="dir" value="ltr" />
+	</Style>
+	<Style name="Language: RTL Strong" element="bdo">
+		<Attribute name="dir" value="rtl" />
+	</Style>
+	<Style name="Language: LTR Strong" element="bdo">
+		<Attribute name="dir" value="ltr" />
+	</Style>
+
+	<!-- Object Styles -->
+
+	<Style name="Image on Left" element="img">
+		<Attribute name="style" value="padding: 5px; margin-right: 5px" />
+		<Attribute name="border" value="2" />
+		<Attribute name="align" value="left" />
+	</Style>
+	<Style name="Image on Right" element="img">
+		<Attribute name="style" value="padding: 5px; margin-left: 5px" />
+		<Attribute name="border" value="2" />
+		<Attribute name="align" value="right" />
+	</Style>
+</Styles>
diff --git a/modules/editor/skins/fckeditor/fcktemplates.xml b/modules/editor/skins/fckeditor/fcktemplates.xml
new file mode 100644
index 000000000..4c5b55a86
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fcktemplates.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the sample templates definitions file. It makes the "templates"
+ * command completely customizable.
+ *
+ * See FCKConfig.TemplatesXmlPath in the configuration file.
+-->
+<Templates imagesBasePath="fck_template/images/">
+	<Template title="Image and Title" image="template1.gif">
+		<Description>One main image with a title and text that surround the image.</Description>
+		<Html>
+			<![CDATA[
+				<img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
+				<h3>Type the title here</h3>
+				Type the text here
+			]]>
+		</Html>
+	</Template>
+	<Template title="Strange Template" image="template2.gif">
+		<Description>A template that defines two colums, each one with a title, and some text.</Description>
+		<Html>
+			<![CDATA[
+				<table cellspacing="0" cellpadding="0" width="100%" border="0">
+					<tbody>
+						<tr>
+							<td width="50%">
+							<h3>Title 1</h3>
+							</td>
+							<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td>
+							<td width="50%">
+							<h3>Title 2</h3>
+							</td>
+						</tr>
+						<tr>
+							<td>Text 1</td>
+							<td>&nbsp;</td>
+							<td>Text 2</td>
+						</tr>
+					</tbody>
+				</table>
+				More text goes here.
+			]]>
+		</Html>
+	</Template>
+	<Template title="Text and Table" image="template3.gif">
+		<Description>A title with some text and a table.</Description>
+		<Html>
+			<![CDATA[
+				<table align="left" width="80%" border="0" cellspacing="0" cellpadding="0"><tr><td>
+					<h3>Title goes here</h3>
+					<p>
+					<table style="FLOAT: right" cellspacing="0" cellpadding="0" width="150" border="1">
+						<tbody>
+							<tr>
+								<td align="center" colspan="3"><strong>Table title</strong></td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+						</tbody>
+					</table>
+					Type the text here</p>
+				</td></tr></table>
+			]]>
+		</Html>
+	</Template>
+</Templates>
diff --git a/modules/editor/skins/fckeditor/fckutils.cfm b/modules/editor/skins/fckeditor/fckutils.cfm
new file mode 100644
index 000000000..fa40995f0
--- /dev/null
+++ b/modules/editor/skins/fckeditor/fckutils.cfm
@@ -0,0 +1,78 @@
+<!---
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * ColdFusion integration.
+ * This function is used by FCKeditor module to check browser compatibility
+ --->
+<cfscript>
+function FCKeditor_IsCompatibleBrowser()
+{
+	sAgent = lCase( cgi.HTTP_USER_AGENT );
+	isCompatibleBrowser = false;
+
+	// check for Internet Explorer ( >= 5.5 )
+	if( find( "msie", sAgent ) and not find( "mac", sAgent ) and not find( "opera", sAgent ) )
+	{
+		// try to extract IE version
+		stResult = reFind( "msie ([5-9]\.[0-9])", sAgent, 1, true );
+		if( arrayLen( stResult.pos ) eq 2 )
+		{
+			// get IE Version
+			sBrowserVersion = mid( sAgent, stResult.pos[2], stResult.len[2] );
+			if( sBrowserVersion GTE 5.5 )
+				isCompatibleBrowser = true;
+		}
+	}
+	// check for Gecko ( >= 20030210+ )
+	else if( find( "gecko/", sAgent ) )
+	{
+		// try to extract Gecko version date
+		stResult = reFind( "gecko/(200[3-9][0-1][0-9][0-3][0-9])", sAgent, 1, true );
+		if( arrayLen( stResult.pos ) eq 2 )
+		{
+			// get Gecko build (i18n date)
+			sBrowserVersion = mid( sAgent, stResult.pos[2], stResult.len[2] );
+			if( sBrowserVersion GTE 20030210 )
+				isCompatibleBrowser = true;
+		}
+	}
+	else if( find( "opera/", sAgent ) )
+	{
+		// try to extract Opera version
+		stResult = reFind( "opera/([0-9]+\.[0-9]+)", sAgent, 1, true );
+		if( arrayLen( stResult.pos ) eq 2 )
+		{
+			if ( mid( sAgent, stResult.pos[2], stResult.len[2] ) gte 9.5)
+				isCompatibleBrowser = true;
+		}
+	}
+	else if( find( "applewebkit", sAgent ) )
+	{
+		// try to extract Gecko version date
+		stResult = reFind( "applewebkit/([0-9]+)", sAgent, 1, true );
+		if( arrayLen( stResult.pos ) eq 2 )
+		{
+			if( mid( sAgent, stResult.pos[2], stResult.len[2] ) gte 522 )
+				isCompatibleBrowser = true;
+		}
+	}
+	return isCompatibleBrowser;
+}
+</cfscript>
diff --git a/modules/editor/skins/fckeditor/js/xe_interface.js b/modules/editor/skins/fckeditor/js/xe_interface.js
new file mode 100644
index 000000000..eca723345
--- /dev/null
+++ b/modules/editor/skins/fckeditor/js/xe_interface.js
@@ -0,0 +1,87 @@
+function editorGetForm_fck(element) {
+    var fo_obj = element.parentNode;
+    while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; }
+    if(fo_obj.nodeName == 'FORM') return fo_obj;
+    return;
+}
+
+
+function editorGetContent_fck(editor_sequence) {
+    return getEditor(editor_sequence).GetHTML();
+}
+
+function getEditor(editor_sequence){
+    return FCKeditorAPI.GetInstance('fckeditor_'+editor_sequence);
+}
+
+function editorStart_fck(editor, element, editor_sequence, content_key, editor_height, primary_key, basepath) {
+
+    var fo_obj = editorGetForm_fck(element);
+    fo_obj.setAttribute('editor_sequence', editor_sequence);
+
+    try{
+        element.innerHTML = fo_obj[content_key].value;
+    }catch(e) {
+    }
+    try{
+        element.value = fo_obj[content_key].value;
+    }catch(e) {
+    }
+
+
+//alert(fo_obj[content_key].value);
+
+    editor = new FCKeditor('fckeditor_'+editor_sequence,null,editor_height,'XE') ;
+    editor.BasePath = basepath ;
+
+    if(primary_key == 'comment_srl') editor.Config['ToolbarStartExpanded'] = false ;
+    editor.ReplaceTextarea();
+    editor.getFrame = function(){ return getEditor(editor_sequence).EditorWindow._FCKEditingArea.IFrame;}
+
+
+    editorRelKeys[editor_sequence] = new Array();
+    editorRelKeys[editor_sequence]['editor'] = editor;
+    editorRelKeys[editor_sequence]['func'] = editorGetContent_fck;
+
+    editorRelKeys[editor_sequence]['content'] = fo_obj[content_key];
+    editorRelKeys[editor_sequence]['primary'] = fo_obj[primary_key];
+    editorMode[editor_sequence]=='wysiwyg';
+
+        // saved document(자동저장 문서)에 대한 확인
+    if(typeof(fo_obj._saved_doc_title)!="undefined" ) { ///<< _saved_doc_title field가 없으면 자동저장 하지 않음
+        var saved_title = fo_obj._saved_doc_title.value;
+        var saved_content = fo_obj._saved_doc_content.value;
+        if(saved_title || saved_content) {
+            // 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
+            if(confirm(fo_obj._saved_doc_message.value)) {
+                if(typeof(fo_obj.title)!='undefined') fo_obj.title.value = saved_title;
+                setTimeout(function(){
+                            setContent(editor_sequence,saved_content);
+                        }, 100);
+            } else {
+                editorRemoveSavedDoc();
+            }
+        }
+    }
+
+    // 위젯 감시를 위한 더블클릭 이벤트 걸기
+    try {
+        xAddEventListener(editor.getFrame().contentWindow.document,'dblclick',editorSearchComponent);
+    } catch(e) {
+    }
+
+    if(typeof(fo_obj._saved_doc_title)!="undefined" ) editorEnableAutoSave(fo_obj, editor_sequence);
+}
+
+
+function setContent(editor_sequence,content){
+    try {
+       var editor = getEditor(editor_sequence);
+       editor.SetHTML(content);
+    } catch(e) {
+        setTimeout(function(){
+            setContent(editor_sequence,content);
+        }, 100);
+
+    }
+}
\ No newline at end of file
diff --git a/modules/editor/skins/fckeditor/license.txt b/modules/editor/skins/fckeditor/license.txt
new file mode 100644
index 000000000..43ac59d82
--- /dev/null
+++ b/modules/editor/skins/fckeditor/license.txt
@@ -0,0 +1,1246 @@
+FCKeditor - The text editor for Internet - http://www.fckeditor.net
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
+
+Licensed under the terms of any of the following licenses at your
+choice:
+
+ - GNU General Public License Version 2 or later (the "GPL")
+   http://www.gnu.org/licenses/gpl.html
+   (See Appendix A)
+
+ - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+   http://www.gnu.org/licenses/lgpl.html
+   (See Appendix B)
+
+ - Mozilla Public License Version 1.1 or later (the "MPL")
+   http://www.mozilla.org/MPL/MPL-1.1.html
+   (See Appendix C)
+
+You are not required to, but if you want to explicitly declare the
+license you have chosen to be bound to when using, reproducing,
+modifying and distributing this software, just include a text file
+titled "legal.txt" in your version of this software, indicating your
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
+
+Appendix A: The GPL License
+===========================
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix B: The LGPL License
+============================
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+
+Appendix C: The MPL License
+===========================
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
diff --git a/modules/editor/skins/fckeditor/skin.xml b/modules/editor/skins/fckeditor/skin.xml
new file mode 100644
index 000000000..6a6686ccf
--- /dev/null
+++ b/modules/editor/skins/fckeditor/skin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">fckeditor Skin</title>
+	<title xml:lang="es">Cuidado fckeditor</title>
+	<title xml:lang="en">fckeditor Skin</title>
+    <title xml:lang="jp">fckeditorスキン</title>
+    <title xml:lang="zh-CN">fckeditor皮肤</title>
+    <title xml:lang="zh-TW">fckeditor面板</title>
+    <description xml:lang="ko">
+        http://fckeditor.net
+		by sol
+    </description>
+	<description xml:lang="en">
+        http://fckeditor.net
+		by sol
+    </description>
+	<description xml:lang="es">
+        http://fckeditor.net
+		by sol
+    </description>
+    <description xml:lang="jp">
+        http://fckeditor.net
+		by sol
+    </description>
+    <description xml:lang="zh-CN">
+        http://fckeditor.net
+		by sol
+    </description>
+    <description xml:lang="zh-TW">
+        http://fckeditor.net
+		by sol
+    </description>
+    <version>0.1</version>
+    <date>2008-11-25</date>
+    <author email_address="sol@ngleader.com" link="http://ngleader.com">
+        <name xml:lang="ko">sol</name>
+	<name xml:lang="es">sol</name>
+	<name xml:lang="en">sol</name>
+        <name xml:lang="jp">sol</name>
+	<name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+</skin>
\ No newline at end of file
diff --git a/modules/editor/skins/xquared/javascripts/xe_interface.js b/modules/editor/skins/xquared/javascripts/xe_interface.js
index 3787bb7a3..51acd99c9 100644
--- a/modules/editor/skins/xquared/javascripts/xe_interface.js
+++ b/modules/editor/skins/xquared/javascripts/xe_interface.js
@@ -67,7 +67,8 @@ function editorStart_xq(editor, element, editor_sequence, content_key, editor_he
 function setEditMode(editor, editor_height, editor_sequence) {
     editor.setEditMode('wysiwyg');
     editor.getFrame().style.width = "100%";
-    editor.getFrame().parentNode.style.height = editor_height;
+    editor.setWidth("100%");
+    editor.setHeight(editor_height);
     editor.getBody().setAttribute('editor_sequence', editor_sequence);
     editor.addAutocompletions(getAdditionalAutocompletions());
 
diff --git a/modules/editor/skins/xquared/skin.xml b/modules/editor/skins/xquared/skin.xml
index 355fc10c6..bcadbf905 100644
--- a/modules/editor/skins/xquared/skin.xml
+++ b/modules/editor/skins/xquared/skin.xml
@@ -3,43 +3,51 @@
     <title xml:lang="ko">XE Xquared Editor Skin</title>
     <title xml:lang="zh-CN">Xquared编辑器皮肤</title>
     <title xml:lang="en">XE Xquared Editor Skin</title>
+    <title xml:lang="es">XE Xquared Editor de la piel</title>
     <title xml:lang="jp">XE Xquared Editor Skin</title>
     <title xml:lang="zh-TW">XE Xquared編輯器面板</title>
     <description xml:lang="ko">
         오픈소스 에디터인 Xquared를 이용한 위지윅 에디터입니다.
         자세한 정보는 Xquared 홈페이지를 참조하세요.
         http://labs.openmaru.com/projects/xquared
-        Xquared is copyrighted free software by Alan Kang <jania902@gmail.com>.
+        Xquared is copyrighted free software by Alan Kang (jania902@gmail.com).
     </description>
     <description xml:lang="zh-CN">
         开源编辑器Xquared皮肤。
         详细信息请访问Xquared主页。
         http://labs.openmaru.com/projects/xquared
-        Xquared is copyrighted free software by Alan Kang <jania902@gmail.com>.
+        Xquared is copyrighted free software by Alan Kang (jania902@gmail.com).
     </description>
     <description xml:lang="en">
         This is the editor skin based on the open source WYSIWYG Editor, Xquared.
         You can find more deatiled information from Xquared's official homepage.
         http://labs.openmaru.com/projects/xquared/
-        Xquared is copyrighted free software by Alan Kang <jania902@gmail.com>.
+        Xquared is copyrighted free software by Alan Kang (jania902@gmail.com).
+    </description>
+    <description xml:lang="es">
+        Este es el editor de la piel basado en el editor WYSIWYG de código abierto, Xquared.
+        Puede encontrar más información deatiled de Xquared la página oficial.
+        http://labs.openmaru.com/projects/xquared/
+        Xquared está protegido por derechos de autor de software libre por Alan Kang (jania902@gmail.com).
     </description>
     <description xml:lang="jp">
         オープンソースのエディターであるXquaredを利用したウイジウイグエディターです。
         詳細な情報は、 Xquared サイトを参照してください。
         http://labs.openmaru.com/projects/xquared
-        Xquared is copyrighted free software by Alan Kang <jania902@gmail.com>.
+        Xquared is copyrighted free software by Alan Kang (jania902@gmail.com).
     </description>
     <description xml:lang="zh-TW">
         Xquared編輯器面板開放原始碼。
         詳細情形請至 Xquared主頁。
         http://labs.openmaru.com/projects/xquared
-        Xquared is copyrighted free software by Alan Kang <jania902@gmail.com>.
+        Xquared is copyrighted free software by Alan Kang (jania902@gmail.com).
     </description>
     <version>0.1</version>
     <date>2007-11-21</date>
 
     <author email_address="haneul0318@gmail.com" link="http://haneul.zetyx.net">
         <name xml:lang="ko">haneul</name>
+	<name xml:lang="es">haneul</name>
         <name xml:lang="zh-CN">haneul</name>
         <name xml:lang="en">haneul</name>
         <name xml:lang="jp">Haneul</name>
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index 12918f941..da432e7bf 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -1,8 +1,8 @@
 <!--%import("js/editor_admin.js")-->
 
-<h3>{$lang->editor} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->editor} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<table cellspacing="0" class="adminTable gap1">
+<table cellspacing="0" class="crossTable">
 <thead>
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
@@ -15,15 +15,15 @@
     <!--@foreach($component_list as $component_name => $xml_info)-->
     <tr class="row2">
         <th colspan="2" scope="row"><div><a href="{getUrl('module','editor','act','dispEditorComponentInfo','component_name',$component_name)}" onclick="popopen(this.href);return false;"><strong>{$xml_info->title}</strong></a> ({$component_name})</div></th>
-        <td class="setup center"><a href="#" onclick="doSetupComponent('{$component_name}'); return false;">{$lang->cmd_setup}</a></td>
-        <td class="center <!--@if($xml_info->enabled=='Y')-->activated<!--@else-->deactivated<!--@end-->">
+        <th><a href="#" onclick="doSetupComponent('{$component_name}'); return false;" title="{htmlspecialchars($lang->cmd_setup)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></th>
+        <th>
             <!--@if($xml_info->enabled=='Y')-->
-                <a href="#" onclick="doDisableComponent('{$component_name}');return false;">{$lang->cmd_enable}</a>
+                <a href="#" onclick="doDisableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_enable)}" class="buttonSet buttonActive"><span>{$lang->cmd_enable}</span></a>
             <!--@else-->
-                <a href="#" onclick="doEnableComponent('{$component_name}');return false;">{$lang->cmd_disable}</a>
+                <a href="#" onclick="doEnableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_disable)}" class="buttonSet buttonDisable"><span>{$lang->cmd_disable}</span></a>
             <!--@end-->
-        </td>
-        <td class="center moveupdown"><a href="#" onclick="doMoveListOrder('{$component_name}','up');return false;" class="up">{$lang->cmd_move_up}</a><a href="#" onclick="doMoveListOrder('{$component_name}','down');return false;" class="down">{$lang->cmd_move_down}</a></td>
+        </th>
+        <th><a href="#" onclick="doMoveListOrder('{$component_name}','up');return false;" title="{htmlspecialchars($lang->cmd_move_up)}" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><a href="#" onclick="doMoveListOrder('{$component_name}','down');return false;" title="{htmlspecialchars($lang->cmd_move_down)}" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a></th>
     </tr>
     <tr>
         <td>{nl2br($xml_info->description)}</td>
@@ -32,8 +32,8 @@
             <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
             <!--@endforeach-->
         </td>
-        <td class="number center" colspan="2">{$xml_info->version}</td>
-        <td class="date center nowrap">{zdate($xml_info->date, 'Y-m-d')}</td>
+        <td colspan="2">{$xml_info->version}</td>
+        <td>{zdate($xml_info->date, 'Y-m-d')}</td>
     </tr>
     <!--@end-->
 </tbody>
diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html
index 8ec54ec8a..8888d96e7 100644
--- a/modules/editor/tpl/editor_module_config.html
+++ b/modules/editor/tpl/editor_module_config.html
@@ -4,18 +4,19 @@
 <form action="./" method="post" onsubmit="return procFilter(this, insert_editor_module_config)">
 <input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->editor}</caption>
+    <h4 class="xeAdmin">{$lang->editor}</h4>
+    <table cellspacing="0" class="crossTable">
     <thead>
     <tr>
-        <th scope="col"><div>&nbsp;</div></th>
         <th scope="col" class="half_wide"><div>{$lang->document}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->comment}</div></th>
     </tr>
     </thead>
     <tbody>
     <tr>
-        <th rowspan="2"><div>{$lang->editor_skin}</div></th>
+        <th colspan="2"><div>{$lang->editor_skin}</div></th>
+    </tr>
+    <tr>
         <td>
             <select name="editor_skin" onchange="getEditorSkinColorList(this.value)">
             <!--@foreach($editor_skin_list as $editor)-->
@@ -45,36 +46,38 @@
         <td colspan="2"><p>{$lang->about_editor_skin}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->enable_html_grant}</div></th>
+        <th colspan="2"><div>{$lang->enable_html_grant}</div></th>
+    </tr>
+    <tr>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_html_grant" value="{$k}" id="enable_html_{$k}" <!--@if(in_array($k, $editor_config->enable_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_html_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_html_grant" value="{$k}" id="enable_html_{$k}" <!--@if(in_array($k, $editor_config->enable_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_html_{$k}">{$v->title}</label>
             <!--@end-->
-
-        <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-        <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
+            <br/>
+            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
+            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
         </td>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_html_grant" value="{$k}" id="enable_comment_html_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_comment_html_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_comment_html_grant" value="{$k}" id="enable_comment_html_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_comment_html_{$k}">{$v->title}</label>
             <!--@end-->
-
-
+            <br/>
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
         </td>
     </tr>
     <tr>
         <td colspan="2"><p>{$lang->about_enable_html_grant}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->upload_file_grant}</div></th>
+        <th colspan="2"><div>{$lang->upload_file_grant}</div></th>
+    </tr>
+    <tr>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="upload_file_grant" value="{$k}" id="fileupload_{$k}" <!--@if(in_array($k, $editor_config->upload_file_grant))-->checked="checked"<!--@end-->/> <label for="fileupload_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="upload_file_grant" value="{$k}" id="fileupload_{$k}" <!--@if(in_array($k, $editor_config->upload_file_grant))-->checked="checked"<!--@end-->/> <label for="fileupload_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
 
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
@@ -82,8 +85,9 @@
         </td>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="comment_upload_file_grant" value="{$k}" id="comment_fileupload_{$k}" <!--@if(in_array($k, $editor_config->comment_upload_file_grant))-->checked="checked"<!--@end-->/> <label for="comment_fileupload_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="comment_upload_file_grant" value="{$k}" id="comment_fileupload_{$k}" <!--@if(in_array($k, $editor_config->comment_upload_file_grant))-->checked="checked"<!--@end-->/> <label for="comment_fileupload_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
 
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
@@ -94,18 +98,22 @@
         <td colspan="2"><p>{$lang->about_upload_file_grant}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->enable_default_component_grant}</div></th>
+        <th colspan="2"><div>{$lang->enable_default_component_grant}</div></th>
+    </tr>
+    <tr>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_default_component_grant" value="{$k}" id="default_componen_{$k}" <!--@if(in_array($k, $editor_config->enable_default_component_grant))-->checked="checked"<!--@end-->/> <label for="default_componen_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_default_component_grant" value="{$k}" id="default_componen_{$k}" <!--@if(in_array($k, $editor_config->enable_default_component_grant))-->checked="checked"<!--@end-->/> <label for="default_componen_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
         </td>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_default_component_grant" value="{$k}" id="comment_default_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_default_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_default_component_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_comment_default_component_grant" value="{$k}" id="comment_default_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_default_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_default_component_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
 
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
@@ -116,11 +124,14 @@
         <td colspan="2"><p>{$lang->about_default_component_grant}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->enable_component_grant}</div></th>
+        <th colspan="2"><div>{$lang->enable_component_grant}</div></th>
+    </tr>
+    <tr>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_component_grant" value="{$k}" id="componen_{$k}" <!--@if(in_array($k, $editor_config->enable_component_grant))-->checked="checked"<!--@end-->/> <label for="componen_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_component_grant" value="{$k}" id="componen_{$k}" <!--@if(in_array($k, $editor_config->enable_component_grant))-->checked="checked"<!--@end-->/> <label for="componen_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
 
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
@@ -128,8 +139,9 @@
         </td>
         <td>
             <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_component_grant" value="{$k}" id="comment_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_component_{$k}">{$v->title}</label> <br />
+            <input type="checkbox" name="enable_comment_component_grant" value="{$k}" id="comment_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_component_{$k}">{$v->title}</label>
             <!--@end-->
+            <br/>
 
             <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
             <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
@@ -140,7 +152,9 @@
         <td colspan="2"><p>{$lang->about_component_grant}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->editor_height}</div></th>
+        <th colspan="2"><div>{$lang->editor_height}</div></th>
+    </tr>
+    <tr>
         <td>
             <input type="text" name="editor_height" value="{$editor_config->editor_height}" class="inputTypeText w80" />px
         </td>
@@ -152,16 +166,18 @@
         <td colspan="2"><p>{$lang->about_editor_height}</p></td>
     </tr>
     <tr>
-        <th rowspan="2"><div>{$lang->enable_autosave}</div></th>
+        <th colspan="2"><div>{$lang->enable_autosave}</div></th>
+    </tr>
+    <tr>
         <td colspan="2"><input type="checkbox" value="Y" name="enable_autosave" <!--@if($editor_config->enable_autosave=='Y')-->checked="checked"<!--@end-->/></td>
     </tr>
     <tr>
         <td colspan="2"><p>{$lang->about_enable_autosave}</p></td>
     </tr>
     <tr>
-        <td class="right" colspan="3">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}"/></span>
-        </td>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"/></span>
+        </th>
     </tr>
     </tbody>
     </table>
diff --git a/modules/editor/tpl/images/files.gif b/modules/editor/tpl/images/files.gif
new file mode 100644
index 000000000..40cb65b25
Binary files /dev/null and b/modules/editor/tpl/images/files.gif differ
diff --git a/modules/editor/tpl/js/editor_admin.js b/modules/editor/tpl/js/editor_admin.js
index 4a74514dd..d0190cc99 100644
--- a/modules/editor/tpl/js/editor_admin.js
+++ b/modules/editor/tpl/js/editor_admin.js
@@ -27,12 +27,11 @@ function doMoveListOrder(component_name, mode) {
 }
 
 function completeUpdate(ret_obj) {
-    alert(ret_obj['message']);
-    location.href = location.href;
+    location.reload();
 }
 
 function doSetupComponent(component_name) {
-    popopen("./?module=editor&act=dispEditorAdminSetupComponent&component_name="+component_name, "SetupComponent");
+    popopen(request_uri.setQuery('module','editor').setQuery('act','dispEditorAdminSetupComponent').setQuery('component_name',component_name), 'SetupComponent');
 }
 
 function toggleSectionCheckBox(obj, id) {
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index 70dbadf06..80291536b 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -258,6 +258,7 @@ function completeReloadFileList(ret_obj, response_tags, settings) {
                 uploadedFiles[file_srl] = item[i];
                 var opt = new Option(item[i].source_filename+" ("+item[i].disp_file_size+")", file_srl, true, true);
                 listObj.options[listObj.options.length] = opt;
+                previewFiles('', file_srl);
             }
         }
     }
@@ -265,7 +266,9 @@ function completeReloadFileList(ret_obj, response_tags, settings) {
     xAddEventListener(listObj,'click',previewFiles);
 }
 
-function previewFiles(evt) {
+var img_loaded_check = Array();
+function previewFiles(evt, given_file_srl) {
+    if(!given_file_srl) {
     var e = new xEvent(evt);
     var obj = e.target;
     var selObj = null;
@@ -276,13 +279,21 @@ function previewFiles(evt) {
     obj = selObj.options[selObj.selectedIndex];
 
     var file_srl = obj.value;
+    }
+    else {
+        var file_srl = given_file_srl;
+    }
     if(!file_srl || typeof(uploadedFiles[file_srl])=="undefined") return;
     var file_info = uploadedFiles[file_srl];
     var previewAreaID = file_info.previewAreaID;
     var previewObj = xGetElementById("previewAreaID");
     if(!previewAreaID) return;
     xInnerHtml(previewAreaID,"&nbsp;");
-    if(file_info.direct_download != "Y") return;
+    if(file_info.direct_download != "Y") {
+        var html = "<img src=\""+request_uri+"./modules/editor/tpl/images/files.gif\" border=\"0\" width=\"100%\" height=\"100%\" />";
+        xInnerHtml(previewAreaID, html);
+        return;
+    }
 
     var html = "";
     var uploaded_filename = file_info.download_url;
@@ -302,9 +313,30 @@ function previewFiles(evt) {
     // 이미지 파일의 경우
     } else if(/\.(jpg|jpeg|png|gif)$/i.test(uploaded_filename)) {
         html = "<img src=\""+uploaded_filename+"\" border=\"0\" width=\"100%\" height=\"100%\" />";
-
+    } else if(uploaded_filename) {
+        html = "<img src=\""+request_uri+"/modules/editor/tpl/images/files.gif\" border=\"0\" width=\"100%\" height=\"100%\" />";
     }
     xInnerHtml(previewAreaID, html);
+
+    // 이미지 파일중, 파일 목록 리로드시 불러오는 이미지는 미리 로드시킴, 로드시키는 이유는 이미지 가로/세로 크기를 얻기 위함. 로드 횟수는 4번을 초과하지 않게 (그 이상은 포기)
+    if(given_file_srl) {
+        if(/\.(jpg|jpeg|png|gif)$/i.test(uploaded_filename)) {
+            var uploaded_obj = new Image();
+            uploaded_obj.src = uploaded_filename;
+            if(!uploaded_obj.width || !uploaded_obj.width) {
+                if(!img_loaded_check[given_file_srl]) {
+                    img_loaded_check[given_file_srl] = 1;
+                }
+                else {
+                    img_loaded_check[given_file_srl]++;
+                }
+
+                if(img_loaded_check[given_file_srl] < 5) {
+                    previewFiles('', given_file_srl);
+                }
+            }
+        }
+    }
 }
 
 function removeUploadedFile(editorSequence) {
@@ -354,7 +386,9 @@ function insertUploadedFile(editorSequence) {
         if(file.direct_download == 'Y') {
             // 이미지 파일의 경우 image_link 컴포넌트 열결
             if(/\.(jpg|jpeg|png|gif)$/i.test(file.download_url)) {
-                text.push("<img editor_component=\"image_link\" src=\""+file.download_url+"\" alt=\""+file.source_filename+"\" />");
+                var obj = new Image();
+                obj.src = file.download_url;
+                text.push("<img editor_component=\"image_link\" src=\""+file.download_url+"\" alt=\""+file.source_filename+"\" width=\""+obj.width+"\" height=\""+obj.height+"\" />");
             // 이미지외의 경우는 multimedia_link 컴포넌트 연결
             } else {
                 text.push("<img src=\"./common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+file.download_url+"\" width=\"400\" height=\"320\" style=\"display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\"false\" alt=\"\" />");
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html
index 966a57955..81bf322e2 100644
--- a/modules/editor/tpl/setup_component.html
+++ b/modules/editor/tpl/setup_component.html
@@ -3,15 +3,15 @@
 <!--%import("js/editor_admin.js")-->
 <!--%import("filter/setup_component.xml")-->
 
-<div id="popHeadder">
-    <h3>{$lang->cmd_setup}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_setup}</h3>
 </div>
 
 <form action="./" method="get" onsubmit="return procFilter(this, setup_component);">
 <input type="hidden" name="component_name" value="{$component_name}" />
 
     <div id="popBody">
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <tr class="row2">
             <th scope="row"><div>{$lang->component_name}</div></th>
             <td>{$component->component_name} ver. {$component->version}</td>
@@ -83,9 +83,8 @@
         </table>
     </div>
 
-    <div id="popFooter" class="tCenter gap1">
-        <span class="button"><input type="submit" value="{$lang->cmd_apply}" /></span>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
     </div>
 
 </form>
diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html
index c8bd80c0c..58aba3f44 100644
--- a/modules/editor/tpl/view_component.html
+++ b/modules/editor/tpl/view_component.html
@@ -1,12 +1,12 @@
 <!--%import("css/editor.css")-->
 <!--%import("../../../modules/admin/tpl/css/admin.css")-->
 
-<div id="popHeadder">
-    <h3>{$component->title} ver. {$component->version}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$component->title} ver. {$component->version}</h3>
 </div>
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->component_author}</div></th>
         <td>
@@ -43,11 +43,11 @@
 
 <!--@if($component->history)-->
 <div id="popHistoryHeadder">
-    <h3>{$lang->component_history}</h3>
+    <h3 class="xeAdmin">{$lang->component_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <!--@foreach($component->history as $history)-->
     <tr class="row{$cycle_idx}">
         <th scope="row"><div>
@@ -78,7 +78,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter" class="tCenter gap1">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/file/conf/info.xml b/modules/file/conf/info.xml
index bd84a7771..fb1bafaa1 100644
--- a/modules/file/conf/info.xml
+++ b/modules/file/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">첨부파일</title>
-    <title xml:lang="zh-CN">上传附件</title>
+    <title xml:lang="zh-CN">附件管理</title>
     <title xml:lang="en">Attachment</title>
     <title xml:lang="es">Adjuntar archivos</title>
     <title xml:lang="jp">添付ファイル</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理附加檔案的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>utility</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml
index 0c1f97186..27040180c 100644
--- a/modules/file/conf/module.xml
+++ b/modules/file/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispFileAdminList" type="view" admin_index="true" standalone="true" />
         <action name="dispFileAdminConfig" type="view" standalone="true" />
diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index e5ded7f37..c91c2a28e 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -82,6 +82,7 @@
             $config->allowed_attach_size = Context::get('allowed_attach_size');
             $config->allowed_filetypes = Context::get('allowed_filetypes');
             $config->allow_outlink = Context::get('allow_outlink');
+            $config->allow_outlink_format = Context::get('allow_outlink_format');
             $config->allow_outlink_site = Context::get('allow_outlink_site');
 
             // module Controller 객체 생성하여 입력
@@ -104,6 +105,7 @@
             $download_grant = trim(Context::get('download_grant'));
 
             $file_config->allow_outlink = Context::get('allow_outlink');
+            $file_config->allow_outlink_format = Context::get('allow_outlink_format');
             $file_config->allow_outlink_site = Context::get('allow_outlink_site');
             $file_config->allowed_filesize = Context::get('allowed_filesize');
             $file_config->allowed_attach_size = Context::get('allowed_attach_size');
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index 22e26247b..e0408f90e 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -18,8 +18,8 @@
          **/
         function getFileList($obj) {
             // 검색 옵션 정리
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
 
             if($search_target && $search_keyword) {
                 switch($search_target) {
@@ -58,6 +58,10 @@
             if($obj->isvalid == 'Y') $args->isvalid = 'Y';
             elseif($obj->isvalid == 'N') $args->isvalid = 'N';
 
+            // 멀티미디어/ 일반 상태 설정
+            if($obj->direct_download == 'Y') $args->direct_download = 'Y';
+            elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+
             // 변수 설정
             $args->sort_index = $obj->sort_index;
             $args->page = $obj->page?$obj->page:1;
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index c883a3e57..a9a0d1434 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -19,7 +19,7 @@
         function dispFileAdminList() {
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'file_srl'; ///< 소팅 값
@@ -30,30 +30,6 @@
             $oFileModel = &getAdminModel('file');
             $output = $oFileModel->getFileList($args);
 
-            // mid목록을 구함
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
-
-            // 목록의 loop를 돌면서 mid를 구하기 위한 module_srl값을 구함
-            $file_count = count($output->data);
-            if($file_count) {
-                $module_srl_list = array();
-                foreach($output->data as $key => $val) {
-                    $module_srl = $val->module_srl;
-                    if(!in_array($module_srl, $module_srl_list)) $module_srl_list[] = $module_srl;
-                }
-                if(count($module_srl_list)) {
-                    $args->module_srls = implode(',',$module_srl_list);
-                    $mid_output = executeQuery('module.getModuleInfoByModuleSrl', $args);
-                    if($mid_output->data && !is_array($mid_output->data)) $mid_output->data = array($mid_output->data);
-                    for($i=0;$i<count($mid_output->data);$i++) {
-                        $mid_info = $mid_output->data[$i];
-                        $module_list[$mid_info->module_srl] = $mid_info;
-                    }
-                }
-            }
-
             // 목록의 loop를 돌면서 document를 구하기
             if($file_count) {
                 $document_srl_list = array();
@@ -99,7 +75,6 @@
             Context::set('page', $output->page);
             Context::set('file_list', $output->data);
             Context::set('page_navigation', $output->page_navigation);
-            Context::set('module_list', $module_list);
             Context::set('document_list', $document_list);
 
             // 템플릿 지정
diff --git a/modules/file/file.class.php b/modules/file/file.class.php
index 580046c0c..5e861aaec 100644
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@@ -13,11 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('file', 'view', 'dispFileAdminList');
-            $oModuleController->insertActionForward('file', 'view', 'dispFileAdminConfig');
-            $oModuleController->insertActionForward('file', 'controller', 'procFileUpload');
-            $oModuleController->insertActionForward('file', 'controller', 'procFileDelete');
-            $oModuleController->insertActionForward('file', 'controller', 'procFileDownload');
             
             // 첨부파일의 기본 설정 저장
             $config->allowed_filesize = '2';
@@ -132,38 +127,5 @@
         function recompileCache() {
         }
 
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procFileAdminInsertModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 8e8a5c507..c6d328674 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -54,26 +54,47 @@
             $file_obj = $oFileModel->getFile($file_srl);
             if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid || $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
 
+            // 파일 이름
+            $filename = $file_obj->source_filename;
+
             $file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
             // 파일 외부링크 차단
             if($file_module_config->allow_outlink == 'N') {
-                $referer = parse_url($_SERVER["HTTP_REFERER"]);
-                if($referer['host'] != $_SERVER['HTTP_HOST']) {
-                    if($file_module_config->allow_outlink_site) {
-                        $allow_outlink_site_array = array();
-                        $allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-                        if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
-                        foreach($allow_outlink_site_array as $val) {
-                            $site = parse_url(trim($val));
-                            if($site['host'] == $referer['host']) {
-                                $file_module_config->allow_outlink = 'Y';
-                                break;
+                //외부링크 허용 확장자 처리
+                if($file_module_config->allow_outlink_format) {
+                    $allow_outlink_format_array = array();
+                    $allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
+                    if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+
+                    foreach($allow_outlink_format_array as $val) {
+                        $val = trim($val);
+                        if(preg_match("/\.{$val}$/i", $filename)) {
+                            $file_module_config->allow_outlink = 'Y';
+                            break;
+                        }
+                    }
+                }
+                //외부링크 허용 사이트 처리
+                if($file_module_config->allow_outlink != 'Y') {
+                    $referer = parse_url($_SERVER["HTTP_REFERER"]);
+                    if($referer['host'] != $_SERVER['HTTP_HOST']) {
+                        if($file_module_config->allow_outlink_site) {
+                            $allow_outlink_site_array = array();
+                            $allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
+                            if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+
+                            foreach($allow_outlink_site_array as $val) {
+                                $site = parse_url(trim($val));
+                                if($site['host'] == $referer['host']) {
+                                    $file_module_config->allow_outlink = 'Y';
+                                    break;
+                                }
                             }
                         }
-                        if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_permitted_download');
                     }
-                    else return $this->stop('msg_not_permitted_download');
+                    else $file_module_config->allow_outlink = 'Y';
                 }
+                if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_permitted_download');
             }
             // 파일 다운로드 권한이 있는지 확인
             if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant)>0) {
@@ -97,8 +118,6 @@
             if(!$output->toBool()) return $this->stop('msg_not_permitted_download');
 
             // 파일 출력
-            $filename = $file_obj->source_filename;
-
             if(strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
                 $filename = urlencode($filename);
                 $filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
@@ -169,8 +188,7 @@
          **/
         function triggerAttachFiles(&$obj) {
             $document_srl = $obj->document_srl;
-            $uploaded_count = $obj->uploaded_count;
-            if(!$document_srl || !$uploaded_count) return new Object();
+            if(!$document_srl) return new Object();
 
             $output = $this->setFilesValid($document_srl);
             if(!$output->toBool()) return $output;
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index 22893f708..81a1780ea 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -95,6 +95,7 @@
                 $config->download_grant = $file_config->download_grant;
                 $config->allow_outlink = $file_config->allow_outlink;
                 $config->allow_outlink_site = $file_config->allow_outlink_site;
+                $config->allow_outlink_format = $file_config->allow_outlink_format;
             }
 
             // 전체 파일첨부 속성을 먼저 따른다
@@ -103,6 +104,7 @@
             if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
             if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
             if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+            if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
             if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 
             // 그래도 없으면 default로 
diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php
index bcf6886b9..bc9bacdf3 100644
--- a/modules/file/lang/en.lang.php
+++ b/modules/file/lang/en.lang.php
@@ -15,12 +15,14 @@
     $lang->file_list = 'Attachments List';
     $lang->allow_outlink = '파일 외부 링크';
     $lang->allow_outlink_site = '파일 외부 허용 사이트';
+    $lang->allow_outlink_format = '파일 외부 링크 허용 확장자';
     $lang->allowed_filesize = 'Maximum File Size';
     $lang->allowed_attach_size = 'Maximum Attachments';
     $lang->allowed_filetypes = 'Allowed Extensions';
     $lang->enable_download_group = 'Download Allowed Groups';
 
     $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
+    $lang->about_allow_outlink_format = '파일 외부 링크 설정에 관계 없이 허용하는 파일 확장자입니다. 여러개 입력시에 쉼표(,)을 이용해서 구분해주세요.<br />eg)hwp,doc,zip,pdf';
     $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://www.zeroboard.com';
 	$lang->about_allowed_filesize = 'You can assign file size limit for each file. (Exclude administrators)';
     $lang->about_allowed_attach_size = 'You can assign file size limit for each document. (Exclude administrators)';
diff --git a/modules/file/lang/es.lang.php b/modules/file/lang/es.lang.php
index 3566453ca..e2a53d881 100644
--- a/modules/file/lang/es.lang.php
+++ b/modules/file/lang/es.lang.php
@@ -13,15 +13,15 @@
     $lang->is_valid = 'Válido';
     $lang->is_stand_by = 'En espera';
     $lang->file_list = 'Lista de archivos adjuntos';
-    $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 허용 사이트';
+    $lang->allow_outlink = 'Archivo Enlaces externos';
+    $lang->allow_outlink_site = 'Fuera del archivo de sitios permitidos';
     $lang->allowed_filesize = 'Límite del tamaño del archivo adjunto';
     $lang->allowed_attach_size = 'Límite del tamaño total de los archivos adjuntos por documento';
     $lang->allowed_filetypes = 'Tipos de archivos permitidos';
     $lang->enable_download_group = 'Descargar permitió grupos';
 
-    $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://www.zeroboard.com';
+    $lang->about_allow_outlink = 'Enlaces externos a Rusia Ripper puede bloquear el archivo. (*. WMV, *. mp3, etc, excepto los archivos multimedia)';
+    $lang->about_allow_outlink_site = 'Archivos, independientemente de la configuración para permitir a los enlaces externos es la dirección del sitio. Entrada múltiples gubunhaeju un cambio en la línea, por favor. <br /> Ej.) http://www.zeroboard.com';
 	$lang->about_allowed_filesize = 'Puede definir el límite del tamaño del archivo adjunto. (exceptuando el administrador)';
     $lang->about_allowed_attach_size = 'Puede definir el límite del tamaño total de los archivos adjuntos por documento. (exceptuando el administrador)';
     $lang->about_allowed_filetypes = 'Puede definir las extensiones de los archivos permitidos. Para permitir una extensión use "*.extensión". Para permitir más de una extensión use ";".<br />ej) *.* o *.jpg;*.gif;etc.<br />(exceptuando el administrador)';
@@ -38,11 +38,11 @@
     $lang->file_search_target_list = array(
         'filename' => 'Nombre del archivo',
         'filesize' => 'Tamaño del archivo (Byte, sobre)',
-        'filesize_mega' => '파일크기 (Mb, 이상)',
+        'filesize_mega' => 'Tamaño del archivo (Mb, o mb)',
         'download_count' => 'Descargados (Sobre)',
-        'user_id' => '아이디',
-        'user_name' => '이름',
-        'nick_name' => '닉네임',
+        'user_id' => 'ID',
+        'user_name' => 'Nombre',
+        'nick_name' => 'Apodo',
         'regdate' => 'La fecha registrada',
         'ipaddress' => 'Dirección IP',
     );
diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php
index e9a9b5581..12eaf6c4e 100644
--- a/modules/file/lang/ko.lang.php
+++ b/modules/file/lang/ko.lang.php
@@ -14,14 +14,16 @@
     $lang->is_stand_by = '대기';
     $lang->file_list = '첨부 파일 목록';
     $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 허용 사이트';
+    $lang->allow_outlink_site = '파일 외부 링크 허용 사이트';
+    $lang->allow_outlink_format = '파일 외부 링크 허용 확장자';
     $lang->allowed_filesize = '파일 제한 크기';
     $lang->allowed_attach_size = '문서 첨부 제한';
     $lang->allowed_filetypes = '허용 확장자';
     $lang->enable_download_group = '다운로드 가능 그룹';
 
     $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://www.zeroboard.com';
+    $lang->about_allow_outlink_format = '파일 외부 링크 설정에 관계 없이 허용하는 파일 확장자입니다. 여러개 입력시에 쉼표(,)을 이용해서 구분해주세요.<br />eg)hwp,doc,zip,pdf';
+    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />eg)http://www.zeroboard.com';
     $lang->about_allowed_filesize = '하나의 파일에 대해 최고 용량을 지정할 수 있습니다. (관리자는 제외)';
     $lang->about_allowed_attach_size = '하나의 문서에 첨부할 수 있는 최고 용량을 지정할 수 있습니다. (관리자는 제외)';
     $lang->about_allowed_filetypes = '허용한 확장자만 첨부할 수 있습니다. "*.확장자"로 지정할 수 있고 ";" 으로 여러개 지정이 가능합니다.<br />ex) *.* or *.jpg;*.gif;<br />(관리자는 제외)';
diff --git a/modules/file/lang/zh-CN.lang.php b/modules/file/lang/zh-CN.lang.php
index a73a95d3c..2954efbc3 100644
--- a/modules/file/lang/zh-CN.lang.php
+++ b/modules/file/lang/zh-CN.lang.php
@@ -13,16 +13,16 @@
     $lang->is_valid = '有效';
     $lang->is_stand_by = '等待';
     $lang->file_list = '附件目录';
-    $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 허용 사이트';
-	$lang->allowed_filesize = '文件大小限制';
+    $lang->allow_outlink = '防盗链';
+    $lang->allow_outlink_site = '允许外链站点';
+    $lang->allowed_filesize = '文件大小限制';
     $lang->allowed_attach_size = '上传限制';
     $lang->allowed_filetypes = '可用扩展名';
     $lang->enable_download_group = '允许下载的用户组';
 
-    $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://www.zeroboard.com';
-	$lang->about_allowed_filesize = '最大单个上传文件大小(管理员不受此限制)。';
+    $lang->about_allow_outlink = '根据反向链接防止盗链。(*.wmv, *.mp3等媒体文件除外)';
+    $lang->about_allow_outlink_site = '可以设置允许外链的站点。多个站点以换行来区分，即一行一个。<br />ex)http://www.zeroboard.com';
+    $lang->about_allowed_filesize = '最大单个上传文件大小(管理员不受此限制)。';
     $lang->about_allowed_attach_size = '每个主题最大上传文件大小(管理员不受此限制)。';
     $lang->about_allowed_filetypes = '只允许上传指定的扩展名。 可以用"*.扩展名"来指定或用 ";"来 区分多个扩展名<br />例) *.* or *.jpg;*.gif;<br />(管理员不受此限制)';
 
diff --git a/modules/file/lang/zh-TW.lang.php b/modules/file/lang/zh-TW.lang.php
index 5e565db86..b4a637207 100644
--- a/modules/file/lang/zh-TW.lang.php
+++ b/modules/file/lang/zh-TW.lang.php
@@ -2,7 +2,7 @@
     /**
      * @file   modules/file/lang/zh-TW.lang.php
      * @author zero <zero@nzeo.com> 翻譯：royallin
-     * @brief  附加檔案(file) 模組語言
+     * @brief  附加檔案(file)模組語言
      **/
 
     $lang->file = '附加檔案';
@@ -13,18 +13,20 @@
     $lang->is_valid = '有效';
     $lang->is_stand_by = '等待';
     $lang->file_list = '檔案清單';
-    $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 허용 사이트';
+    $lang->allow_outlink = '外部檔案連結';
+    $lang->allow_outlink_site = '允許的外連網站';
+    $lang->allow_outlink_format = '允許外連的副檔名';
     $lang->allowed_filesize = '檔案大小限制';
     $lang->allowed_attach_size = '上傳限制';
     $lang->allowed_filetypes = '允許檔案類型';
     $lang->enable_download_group = '允許下載的用戶組';
 
-    $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://www.zeroboard.com';
+    $lang->about_allow_outlink = '是否允許連結外部檔案。(*.wmv, *.mp3等影音檔案除外)';
+    $lang->about_allow_outlink_format = '파일 외부 링크 설정에 관계 없이 허용하는 파일 확장자입니다. 여러개 입력시에 쉼표(,)을 이용해서 구분해주세요.<br />例)hwp,doc,zip,pdf';
+    $lang->about_allow_outlink_site = '可設置允許外部檔案連結的網站名單。當數量太多時，可換行輸入。<br />例)http://www.zeroboard.com';
 	$lang->about_allowed_filesize = '最大單一上傳檔案大小(管理員不受此限制)。';
     $lang->about_allowed_attach_size = '每個主題最大上傳檔案大小(管理員不受此限制)。';
-    $lang->about_allowed_filetypes = '設定允許上傳的檔案類型。 可以用"*.副檔名"來指定或用 ";"來 區分多個副檔名<br />例) *.* or *.jpg;*.gif;<br />(管理員不受此限制)';
+    $lang->about_allowed_filetypes = '設定允許上傳的檔案類型。可以用"*.副檔名"來指定或用";"來區隔多個副檔名<br />例) *.* or *.jpg;*.gif;<br />(管理員不受此限制)';
 
     $lang->cmd_delete_checked_file = '刪除所選項目';
     $lang->cmd_move_to_document = '檢視原始主題';
diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml
index 515f77629..95ad3d193 100644
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@@ -7,8 +7,9 @@
         <column name="files.*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="files.module_srl" var="s_module_srl" />
+        <condition operation="in" column="files.module_srl" var="s_module_srl" />
         <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
+        <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
         <condition operation="equal" column="files.member_srl" default="member.member_srl" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
diff --git a/modules/file/queries/getOneFileInDocument.xml b/modules/file/queries/getOneFileInDocument.xml
index 0ac54ba1b..e9eb3164a 100644
--- a/modules/file/queries/getOneFileInDocument.xml
+++ b/modules/file/queries/getOneFileInDocument.xml
@@ -1,16 +1,19 @@
 <query id="getOneFileInDocument" action="select">
     <tables>
         <table name="files" alias="files"/>
+        <table name="modules" alias="modules"/>
         <table name="documents" alias="documents"/>
     </tables>
     <columns>
         <column name="files.upload_target_srl" alias="document_srl"/>
     </columns>
     <conditions>
-        <condition operation="in" column="files.module_srl" var="module_srls" notnull="notnull" filter="numbers" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" />
+        <condition operation="in" column="modules.module_srl" var="module_srls" filter="numbers" pipe="and" />
+        <condition operation="equal" column="files.module_srl" default="modules.module_srl" pipe="and" />
         <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
         <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
-        <condition operation="equal" column="files.upload_target_srl" var="documents.document_srl" pipe="and" />
+        <condition operation="equal" column="documents.document_srl" default="files.upload_target_srl" pipe="and" />
     </conditions>
     <groups>
         <group column="files.upload_target_srl" />
diff --git a/modules/file/tpl/file_config.html b/modules/file/tpl/file_config.html
index f215d4e45..59ec81090 100644
--- a/modules/file/tpl/file_config.html
+++ b/modules/file/tpl/file_config.html
@@ -2,7 +2,7 @@
 <!--%import("filter/insert_config.xml")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="col"><div>{$lang->allow_outlink}</div></th>
         <td>
@@ -13,10 +13,17 @@
             <p>{$lang->about_allow_outlink}</p>
         </td>
     </tr>
+    <tr class="row2">
+        <th scope="col"><div>{$lang->allow_outlink_format}</div></th>
+        <td>
+            <input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}" class="inputTypeText" />
+            <p>{$lang->about_allow_outlink_format}</p>
+        </td>
+    </tr>
     <tr class="row2">
         <th scope="col"><div>{$lang->allow_outlink_site}</div></th>
         <td>
-            <textarea name="allow_outlink_site" cols="70">{$config->allow_outlink_site}</textarea>
+            <textarea name="allow_outlink_site" class="fullWidth">{$config->allow_outlink_site}</textarea>
             <p>{$lang->about_allow_outlink_site}</p>
         </td>
     </tr>
@@ -43,9 +50,9 @@
         </td>
     </tr>
     <tr>
-        <td scope="row" colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 0bc5ac8a5..702d4cc38 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -2,30 +2,50 @@
 <!--%import("css/file_list.css")-->
 <!--#include("header.html")-->
 
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+<!-- 검색 -->
+<div class="fl">
+    <form action="./" method="get" class="adminSearch">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+
+        <fieldset>
+            <select name="isvalid">
+                <option value="">{$lang->status}</option>
+                <option value="Y" <!--@if($isvalid=="Y")-->selected="selected"<!--@end-->>{$lang->is_valid}</option>
+                <option value="N" <!--@if($isvalid=="N")-->selected="selected"<!--@end-->>{$lang->is_stand_by}</option>
+            </select>
+            <select name="search_target">
+                <option value="">{$lang->search_target}</option>
+                <!--@foreach($lang->file_search_target_list as $key => $val)-->
+                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
+            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
+        </fieldset>
+    </form>
 </div>
 
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
+<!-- 모듈 선택 -->
+<div class="fr">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
+    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_file}" /></span>
+</div>
+
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable clear">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide">
-            <div>
-                <select name="module_srl" id="module_srl" class="w120">
-                    <option value=""><div>{$lang->module}</option>
-                    <!--@foreach($mid_list as $key => $val)-->
-                    <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
-                    <!--@end-->
-                </select>
-                <input type="button" name="go_button" id="go_button" value="GO" class="buttonTypeGo" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;"/>
-            </div>
-        </th>
+        <th scope="col" class="wide"><div>{$lang->file}</div></th>
         <th scope="col"><div>{$lang->file_size}</div></th>
         <th scope="col"><div>{$lang->status}</div></th>
         <th scope="col"><div>{$lang->cmd_download}</div></th>
@@ -46,13 +66,13 @@
         <!--@end-->
         {@ $cur_upload_target_srl = $val->upload_target_srl}
     <tr class="row{$cycle_idx} bg1">
-        <td colspan="8">
+        <th colspan="8">
             <!--@if(!$document_list[$document_srl])-->
             {$lang->cmd_save}
             <!--@else-->
             <a href="{getUrl('', 'mid', $module_list[$val->module_srl]->mid)}" onclick="window.open(this.href);return false;" class="blue">{$module_list[$val->module_srl]->browser_title}</a> - <a href="{$move_uri}" onclick="window.open(this.href);return false;">{htmlspecialchars($document_list[$document_srl]->title)}</a>
             <!--@end-->
-        </td>
+        </th>
     </tr>
     <!--@endif-->
 
@@ -68,20 +88,12 @@
         <!--@end-->
         <td class="number center">{$val->download_count}</td>
         <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="number center">{$val->ipaddress}</td>
+        <td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
     </tr>
 <!--@endforeach-->
-    <tr>
-        <td colspan="8" class="right">
-            <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
-            <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_file}" /></span>
-        </td>
-    </tr>
 </tbody>
 </table>
 
-
 </form>
 
 <!-- 페이지 네비게이션 -->
@@ -97,27 +109,3 @@
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
 
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <fieldset>
-        <select name="isvalid">
-            <option value="">{$lang->status}</option>
-            <option value="Y" <!--@if($isvalid=="Y")-->selected="selected"<!--@end-->>{$lang->is_valid}</option>
-            <option value="N" <!--@if($isvalid=="N")-->selected="selected"<!--@end-->>{$lang->is_stand_by}</option>
-        </select>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->file_search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="{getUrl('','module',$module,'act',$act)}" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
diff --git a/modules/file/tpl/file_module_config.html b/modules/file/tpl/file_module_config.html
index a44b34468..c8c976f39 100644
--- a/modules/file/tpl/file_module_config.html
+++ b/modules/file/tpl/file_module_config.html
@@ -2,8 +2,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, insert_file_module_config)">
 <input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->file}</caption>
+    <h4 class="xeAdmin">{$lang->file}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="col"><div>{$lang->allowed_filesize}</div></th>
         <td>
@@ -37,9 +37,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td class="right" colspan="2">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </td>
+        <th class="button" colspan="2">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/file/tpl/header.html b/modules/file/tpl/header.html
index bfd30b3e8..7091732ce 100644
--- a/modules/file/tpl/header.html
+++ b/modules/file/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/file_admin.js")-->
 
-<h3>{$lang->file} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->file} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
     <ul class="localNavigation">
diff --git a/modules/file/tpl/js/file_admin.js b/modules/file/tpl/js/file_admin.js
index e69de29bb..d9ae12920 100644
--- a/modules/file/tpl/js/file_admin.js
+++ b/modules/file/tpl/js/file_admin.js
@@ -0,0 +1,3 @@
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    location.href = current_url.setQuery('module_srl',module_srl);
+}
diff --git a/modules/homepage/conf/info.xml b/modules/homepage/conf/info.xml
index be0ac53d7..fec263966 100644
--- a/modules/homepage/conf/info.xml
+++ b/modules/homepage/conf/info.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
-    <title xml:lang="ko">홈페이지</title>
-    <title xml:lang="en">Homepage</title>
+    <title xml:lang="ko">CafeXE</title>
+    <title xml:lang="en">CafeXE</title>
+	<title xml:lang="es">CafeXE</title>
     <title xml:lang="zh-CN">站点</title>
-    <title xml:lang="zh-TW">網站</title>
-    <title xml:lang="jp">ホームページ</title>
-    <description xml:lang="ko">XE의 여러 모듈들을 조합하여 홈페이지를 생성하기 가장 좋은 관리자 기능을 제공합니다</description>
-    <description xml:lang="en">Homepage package provides convenient adminitration features to create an to manage homepages by combining several modules of XE.</description>
-    <description xml:lang="zh-CN">组合XE各模块，快速新建站点。</description>
-    <description xml:lang="zh-TW">網站模組結合XE的所有模組可快速又簡單地建立網站。</description>
-    <description xml:lang="jp">各種XEモジュールを組み合わせてホームページを作成する便利な機能です。</description>
-    <version>0.1</version>
-    <date>2008-11-04</date>
+    <title xml:lang="zh-TW">虛擬網站</title>
+    <title xml:lang="jp">CafeXE</title>
+    <description xml:lang="ko">XE 내에서 Cafe를 분양하고 관리할 수 있는 기능을 제공합니다</description>
+    <description xml:lang="en">XE 내에서 Cafe를 분양하고 관리할 수 있는 기능을 제공합니다</description>
+    <description xml:lang="es">XE 내에서 Cafe를 분양하고 관리할 수 있는 기능을 제공합니다</description>
+    <description xml:lang="zh-CN">提供一种在XE内迅速建立子站点的功能。</description>
+    <description xml:lang="zh-TW">提供XE運作及管理虛擬網站的功能。</description>
+    <description xml:lang="jp">Cafeを運営・管理する機能を提供します。</description>
+    <version>0.2</version>
+    <date>2009-02-11</date>
     <category>package</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
 		<name xml:lang="en">zero</name>
+		<name xml:lang="es">zero</name>
 		<name xml:lang="zh-CN">zero</name>
 		<name xml:lang="zh-TW">zero</name>
         <name xml:lang="jp">zero</name>
diff --git a/modules/homepage/conf/module.xml b/modules/homepage/conf/module.xml
index a502a11fa..1ebb49f3b 100644
--- a/modules/homepage/conf/module.xml
+++ b/modules/homepage/conf/module.xml
@@ -1,19 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions>
+        <permission action="dispHomepageManage" target="manager" />
+        <permission action="dispHomepageMemberGroupManage" target="manager" />
+        <permission action="dispHomepageMemberManage" target="manager" />
+
+        <permission action="dispHomepageTopMenu" target="manager" />
+        <permission action="dispHomepageBottomMenu" target="manager" />
+        <permission action="dispHomepageMidSetup" target="manager" />
+        <permission action="dispHomepageCounter" target="manager" />
+        <permission action="dispHomepageComponent" target="manager" />
+        <permission action="dispHomepageBoardInfo" target="manager" />
+        <permission action="dispHomepageBoardAddition" target="manager" />
+        <permission action="dispHomepageBoardGrant" target="manager" />
+        <permission action="dispHomepageBoardSkin" target="manager" />
+        <permission action="dispHomepagePageGrant" target="manager" />
+        <permission action="dispHomepageBoardCategoryInfo" target="manager" />
+        <permission action="dispHomepageBoardExtraVars" target="manager" />
+
+        <permission action="procHomepageChangeLayout" target="manager" />
+        <permission action="procHomepageChangeLanguage" target="manager" />
+        <permission action="procHomepageLayoutUpdate" target="manager" />
+        <permission action="procHomepageInsertMenuItem" target="manager" />
+        <permission action="procHomepageDeleteMenuItem" target="manager" />
+        <permission action="procHomepageMenuItemMove" target="manager" />
+        <permission action="procHomepageMenuUploadButton" target="manager" />
+        <permission action="procHomepageDeleteButton" target="manager" />
+        <permission action="procHomepageDeleteGroup" target="manager" />
+        <permission action="procHomepageInsertGroup" target="manager" />
+        <permission action="procHomepageUpdateMemberGroup" target="manager" />
+        <permission action="procHomepageDeleteMember" target="manager" />
+        <permission action="procHomepageInsertBoard" target="manager" />
+        <permission action="procHomepageInsertPage" target="manager" />
+        <permission action="procHomepageUpdateBoardSkin" target="manager" />
+        <permission action="procHomepageChangeIndex" target="manager" />
+    </permissions>
     <actions>
         <action name="dispHomepageManage" type="view" standalone="true" index="true" />
+        <action name="dispHomepageMemberGroupManage" type="view" standalone="true" />
+        <action name="dispHomepageMemberManage" type="view" standalone="true" />
         <action name="dispHomepageTopMenu" type="view" standalone="true" />
         <action name="dispHomepageBottomMenu" type="view" standalone="true" />
         <action name="dispHomepageMidSetup" type="view" standalone="true" />
+        <action name="dispHomepageCounter" type="view" standalone="true" />
+        <action name="dispHomepageComponent" type="view" standalone="true" />
+
         <action name="dispHomepageBoardInfo" type="view" standalone="true" />
         <action name="dispHomepageBoardAddition" type="view" standalone="true" />
         <action name="dispHomepageBoardGrant" type="view" standalone="true" />
         <action name="dispHomepageBoardSkin" type="view" standalone="true" />
+        <action name="dispHomepagePageGrant" type="view" standalone="true" />
+        <action name="dispHomepageBoardCategoryInfo" type="view" standalone="true" />
+        <action name="dispHomepageBoardExtraVars" type="view" standalone="true" />
 
         <action name="getHomepageMenuItem" type="model" standalone="true" />
 
         <action name="procHomepageChangeLayout" type="controller" standalone="true" />
+        <action name="procHomepageChangeLanguage" type="controller" standalone="true" />
         <action name="procHomepageLayoutUpdate" type="controller" standalone="true" />
         <action name="procHomepageInsertMenuItem" type="controller" standalone="true" />
         <action name="procHomepageDeleteMenuItem" type="controller" standalone="true" />
@@ -22,11 +66,10 @@
         <action name="procHomepageDeleteButton" type="controller" standalone="true" />
         <action name="procHomepageDeleteGroup" type="controller" standalone="true" />
         <action name="procHomepageInsertGroup" type="controller" standalone="true" />
+        <action name="procHomepageDeleteMember" type="controller" standalone="true" />
         <action name="procHomepageUpdateMemberGroup" type="controller" standalone="true" />
         <action name="procHomepageInsertBoard" type="controller" standalone="true" />
         <action name="procHomepageInsertPage" type="controller" standalone="true" />
-        <action name="procHomepageUpdateBoardSkin" type="controller" standalone="true" />
-        <action name="procHomepageInsertBoardGrant" type="controller" standalone="true" />
         <action name="procHomepageChangeIndex" type="controller" standalone="true" />
 
         <action name="dispHomepageAdminContent" type="view" standalone="true" admin_index="true" />
diff --git a/modules/homepage/homepage.admin.controller.php b/modules/homepage/homepage.admin.controller.php
index 9d504da98..7aa9845ea 100644
--- a/modules/homepage/homepage.admin.controller.php
+++ b/modules/homepage/homepage.admin.controller.php
@@ -24,115 +24,151 @@
             $oModuleController = &getController('module');
             $oModuleModel = &getModel('module');
 
-            $default_menus = Context::getLang('homepage_default_menus');
-
             $info->title = $title;
             $info->domain = $domain;
 
+            // 언어 코드 추출
+            $files = FileHandler::readDir('./modules/homepage/lang');
+            foreach($files as $filename) {
+                $lang_code = str_replace('.lang.php', '', $filename);
+                $lang = null;
+                @include('./modules/homepage/lang/'.$filename);
+                if(count($lang->default_menus)) {
+                    foreach($lang->default_menus as $key => $val) {
+                        $defined_lang[$lang_code]->{$key} = $val;
+                    }
+                }
+            }
+            $lang = null;
+
             // 도메인 검사
             $domain_info = $oModuleModel->getSiteInfoByDomain($domain);
             if($domain_info) return new Object(-1,'msg_already_registed_domain');
 
-            // virtual site 생성
-            $info->site_srl = $oModuleController->insertSite($domain, $info->first->home_srl);
+            // virtual site 생성하고 site_srl을 보관
+            $info->site_srl = $oModuleController->insertSite($domain, 0);
+
+            // 언어 코드 등록 (홈, 공지사항, 등업신청, 자유게시판, 전체 글 보기, 한줄이야기, 카페앨범, 메뉴등)
+            foreach($defined_lang as $lang_code => $v) {
+                foreach($v as $key => $val) {
+                    unset($lang_args);
+                    $lang_args->site_srl = $info->site_srl;
+                    $lang_args->name = $key;
+                    $lang_args->lang_code = $lang_code;
+                    $lang_args->value = $val;
+                    executeQuery('module.insertLang', $lang_args);
+                }
+            }
+            $oModuleAdminController = &getAdminController('module');
+            $oModuleAdminController->makeCacheDefinedLangCode($info->site_srl);
 
             // 레이아웃 생성
-            $info->layout_srl = $this->makeLayout($title,'xe_official');
+            $info->layout_srl = $this->makeLayout($info->site_srl, $title,'cafeXE');
 
             // 기본 게시판+페이지 생성
-            $info->first->home_srl = $this->makePage($info->site_srl, 'home', $default_menus['first']['home'], $this->getHomeContent($default_menus), $content, $info->layout_srl);
-            $info->first->notice_srl = $this->makeBoard($info->site_srl, 'notice', $default_menus['first']['notice'], $info->layout_srl);
-            $info->first->download_srl = $this->makeBoard($info->site_srl, 'download', $default_menus['first']['download'], $info->layout_srl);
-            $info->first->gallery_srl = $this->makeBoard($info->site_srl, 'gallery', $default_menus['first']['gallery'], $info->layout_srl);
-            $info->first->community_srl = $this->makePage($info->site_srl, 'community', $default_menus['first']['community'], $content, $info->layout_srl);
-            $info->first->freeboard_srl = $this->makeBoard($info->site_srl, 'freeboard', $default_menus['first']['freeboard'], $info->layout_srl);
-            $info->first->humor_srl = $this->makeBoard($info->site_srl, 'humor', $default_menus['first']['humor'], $info->layout_srl);
-            $info->first->qa_srl = $this->makeBoard($info->site_srl, 'qa', $default_menus['first']['qa'], $info->layout_srl);
-
-            $info->second->profile = $this->makePage($info->site_srl, 'profile', $default_menus['second']['profile'], $content, $info->layout_srl);
-            $info->second->rule = $this->makePage($info->site_srl, 'rule', $default_menus['second']['rule'], $content, $info->layout_srl);
+            $info->module->home_srl = $this->makePage($info->site_srl, 'home', '$user_lang->home', $info->layout_srl, $this->getHomeContent());
+            $info->module->notice_srl = $this->makeBoard($info->site_srl, 'notice', '$user_lang->notice', $info->layout_srl);
+            $info->module->notice_srl = $this->makeBoard($info->site_srl, 'levelup', '$user_lang->levelup', $info->layout_srl);
+            $info->module->freeboard_srl = $this->makeBoard($info->site_srl, 'freeboard', '$user_lang->freeboard', $info->layout_srl);
 
             // 메뉴 생성
-            $info->first_menu_srl = $this->makeMenu($title, $default_menus['menu']['first']);
-            $info->second_menu_srl = $this->makeMenu($title, $default_menus['menu']['second']);
+            $info->menu_srl = $this->makeMenu($info->site_srl, $title, 'Main Menu');
 
-            // first menu 설정
-            $item_srl = $this->insertMenuItem($info->first_menu_srl, 0, 'home', $default_menus['first']['home']);
-            $this->insertMenuItem($info->first_menu_srl, $item_srl, 'notice', $default_menus['first']['notice']);
-            $this->insertMenuItem($info->first_menu_srl, 0, 'download', $default_menus['first']['download']);
-            $this->insertMenuItem($info->first_menu_srl, 0, 'gallery', $default_menus['first']['gallery']);
-            $item_srl = $this->insertMenuItem($info->first_menu_srl, 0, 'community', $default_menus['first']['community']);
-            $this->insertMenuItem($info->first_menu_srl, $item_srl, 'freeboard', $default_menus['first']['freeboard']);
-            $this->insertMenuItem($info->first_menu_srl, $item_srl, 'humor', $default_menus['first']['humor']);
-            $this->insertMenuItem($info->first_menu_srl, $item_srl, 'qa', $default_menus['first']['qa']);
-
-            // second menu 설정
-            $this->insertMenuItem($info->second_menu_srl, 0, 'profile', $default_menus['second']['profile']);
-            $this->insertMenuItem($info->second_menu_srl, 0, 'rule', $default_menus['second']['rule']);
+            // menu 설정
+            $this->insertMenuItem($info->menu_srl, 0, 'home', '$user_lang->home');
+            $this->insertMenuItem($info->menu_srl, 0, 'notice', '$user_lang->notice');
+            $this->insertMenuItem($info->menu_srl, 0, 'levelup', '$user_lang->levelup');
+            $this->insertMenuItem($info->menu_srl, 0, 'freeboard', '$user_lang->freeboard');
 
             // layout의 설정
             $oLayoutModel = &getModel('layout');
             $layout_args = $oLayoutModel->getLayout($info->layout_srl);
-
-            $layout->colorset = 'default';
+            $layout->colorset = 'white';
             if($domain) $layout->index_url = 'http://'.$domain; else $layout->index_url = Context::getRequestUri();
-            $layout->main_menu = $info->first_menu_srl;
-            $layout->bottom_menu = $info->second_menu_srl;
-
+            $layout->main_menu = $info->menu_srl;
             $layout_args->extra_vars = serialize($layout);
 
             $oLayoutController = &getAdminController('layout');
             $oLayoutController->updateLayout($layout_args);
 
             // 생성된 게시판/ 페이지들의 레이아웃 변경
-            $menu_args = null;
-            $menu_args->menu_srl = $info->first_menu_srl;
+            $menu_args->menu_srl = $info->menu_srl;
             $output = executeQueryArray('layout.getLayoutModules', $menu_args);
-
-            $menu_args->menu_srl = $info->second_menu_srl;
-            $output = executeQueryArray('layout.getLayoutModules', $menu_args);
-
             $modules = array();
-            foreach($info->first as $module_srl) $modules[] = $module_srl;
-            foreach($info->second as $module_srl) $modules[] = $module_srl;
+            foreach($info->module as $module_srl) $modules[] = $module_srl;
             $layout_module_args->layout_srl = $info->layout_srl;
             $layout_module_args->module_srls = implode(',',$modules);
             $output = executeQuery('layout.updateModuleLayout', $layout_module_args);
 
             // 메뉴 XML 파일 생성
             $oMenuAdminController = &getAdminController('menu');
-            $oMenuAdminController->makeXmlFile($info->first_menu_srl);
-            $oMenuAdminController->makeXmlFile($info->second_menu_srl);
+            $oMenuAdminController->makeXmlFile($info->menu_srl, $info->site_srl);
 
+            // 홈페이지 등록
             $args->site_srl = $info->site_srl;
             $args->title = $info->title;
             $args->layout_srl = $info->layout_srl;
-            $args->first_menu_srl = $info->first_menu_srl;
-            $args->second_menu_srl = $info->second_menu_srl;
+            $args->first_menu_srl = $info->menu_srl;
             $args->list_order = $info->site_srl * -1;
             $output = executeQuery('homepage.insertHomepage', $args);
 
             // site의 index_module_srl 을 변경
             $site_args->site_srl = $info->site_srl;
-            $site_args->index_module_srl = $info->first->home_srl;
+            $site_args->index_module_srl = $info->module->home_srl;
             $oModuleController->updateSite($site_args);
 
-            // 기본 그룹 (준회원, 정회원)을 추가
+            // 기본그룹 추가
             $oMemberAdminController = &getAdminController('member');
             unset($args);
-            $args->title = Context::getLang('default_group_1');
+            $args->title = '$user_lang->default_group1';
             $args->is_default = 'Y';
             $args->is_admin = 'N';
             $args->site_srl = $info->site_srl;
             $oMemberAdminController->insertGroup($args);
 
             unset($args);
-            $args->title = Context::getLang('default_group_2');
+            $args->title = '$user_lang->default_group2';
             $args->is_default = 'N';
             $args->is_admin = 'N';
             $args->site_srl = $info->site_srl;
             $oMemberAdminController->insertGroup($args);
 
+            unset($args);
+            $args->title = '$user_lang->default_group3';
+            $args->is_default = 'N';
+            $args->is_admin = 'N';
+            $args->site_srl = $info->site_srl;
+            $oMemberAdminController->insertGroup($args);
+
+            // 기본 애드온 On
+            $oAddonController = &getAdminController('addon');
+            $oAddonController->doInsert('autolink', $info->site_srl);
+            $oAddonController->doInsert('counter', $info->site_srl);
+            $oAddonController->doInsert('member_communication', $info->site_srl);
+            $oAddonController->doInsert('member_extra_info', $info->site_srl);
+            $oAddonController->doInsert('referer', $info->site_srl);
+            $oAddonController->doInsert('resize_image', $info->site_srl);
+            $oAddonController->doActivate('autolink', $info->site_srl);
+            $oAddonController->doActivate('counter', $info->site_srl);
+            $oAddonController->doActivate('member_communication', $info->site_srl);
+            $oAddonController->doActivate('member_extra_info', $info->site_srl);
+            $oAddonController->doActivate('referer', $info->site_srl);
+            $oAddonController->doActivate('resize_image', $info->site_srl);
+            $oAddonController->makeCacheFile($info->site_srl);
+
+            // 기본 에디터 컴포넌트 On
+            $oEditorController = &getAdminController('editor');
+            $oEditorController->insertComponent('colorpicker_text',true, $info->site_srl);
+            $oEditorController->insertComponent('colorpicker_bg',true, $info->site_srl);
+            $oEditorController->insertComponent('emoticon',true, $info->site_srl);
+            $oEditorController->insertComponent('url_link',true, $info->site_srl);
+            $oEditorController->insertComponent('image_link',true, $info->site_srl);
+            $oEditorController->insertComponent('multimedia_link',true, $info->site_srl);
+            $oEditorController->insertComponent('quotation',true, $info->site_srl);
+            $oEditorController->insertComponent('table_maker',true, $info->site_srl);
+            $oEditorController->insertComponent('poll_maker',true, $info->site_srl);
+            $oEditorController->insertComponent('image_gallery',true, $info->site_srl);
+
             $this->add('site_srl', $info->site_srl);
             $this->add('url', getSiteUrl($info->domain, ''));
         }
@@ -152,7 +188,7 @@
             return $output->get('module_srl');
         }
 
-        function makePage($site_srl, $mid, $browser_title, $content, $layout_srl) {
+        function makePage($site_srl, $mid, $browser_title, $layout_srl, $content) {
             $args->site_srl = $site_srl;
             $args->module_srl = getNextSequence();
             $args->module = 'page';
@@ -167,7 +203,8 @@
             return $output->get('module_srl');
         }
 
-        function makeMenu($title, $menu_title) {
+        function makeMenu($site_srl, $title, $menu_title) {
+            $args->site_srl = $site_srl;
             $args->title = $title.' - '.$menu_title;
             $args->menu_srl = getNextSequence();
             $args->listorder = $args->menu_srl * -1;
@@ -178,12 +215,14 @@
             return $args->menu_srl;
         }
 
-        function makeLayout($title, $layout) {
+        function makeLayout($site_srl, $title, $layout) {
+            $args->site_srl = $site_srl;
             $args->layout_srl = getNextSequence();
             $args->layout = $layout;
             $args->title = $title;
 
-            $output = executeQuery("layout.insertLayout", $args);
+            $oLayoutAdminController = &getAdminController('layout');
+            $output = $oLayoutAdminController->insertLayout($args);
             if(!$output->toBool()) return $output;
 
             return $args->layout_srl;
@@ -207,8 +246,12 @@
             return $args->menu_item_srl;
         }
 
-        function getHomeContent( $default_menus) {
-            return '<div widget="widgetBox" style="border: 3px solid rgb(221, 221, 221); margin: 0pt; background-position: 0pt 50%; float: left; width: 500px; background-repeat: repeat; background-color: transparent; background-image: none;" widget_padding_left="8px" widget_padding_right="8px" widget_padding_top="8px" widget_padding_bottom="8px"><div><div><img style="border: 0px solid rgb(255, 255, 255); margin: 0pt; background-position: 0pt 50%; float: left; width: 482px; background-repeat: repeat; background-color: transparent; height: 200px;" widget="webzine" widget_sequence="'.getNextSequence().'" skin="notice_style" colorset="normal" widget_cache="5" order_target="list_order" order_type="desc" content_cut_size="400" thumbnail_type="crop" thumbnail_width="130" thumbnail_height="130" cols_list_count="1" rows_list_count="1" display_author="N" display_regdate="Y" display_readed_count="N" display_voted_count="N" mid_list="notice"  /><img style="border: 0px solid rgb(255, 255, 255); margin: 5px 0px 0px; background-position: 0pt 50%; float: left; width: 481px; background-repeat: repeat; height: 59px; background-color: transparent;" widget="newest_document" widget_sequence="'.getNextSequence().'" widget_cache="5" mid_list="notice" order_type="desc" order_target="list_order" skin="xe_official" colorset="white" list_count="3" duration_new="96" /><div class="clear"></div></div></div></div><div widget="widgetBox" style="border: 0px solid rgb(255, 255, 255); margin: 0pt; background-position: 0pt 50%; float: right; width: 252px; background-repeat: repeat; height: 797px; background-color: transparent;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"><div><div><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 0pt; background-position: 0pt 50%; float: left; width: 240px; background-repeat: repeat; height: 22px; background-color: transparent;" body="'.base64_encode($default_menus['first']['gallery']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 0px solid rgb(255, 255, 255); margin: 5px 0pt 0pt; background-position: 0pt 50%; float: left; width: 246px; background-repeat: repeat; background-color: transparent;" widget="webzine" module_srl="0" widget_sequence="'.getNextSequence().'" skin="xe_official" colorset="normal" widget_cache="10" order_target="list_order" order_type="desc" subject_cut_size="8" content_cut_size="40" thumbnail_type="crop" thumbnail_width="70" thumbnail_height="70" cols_list_count="1" rows_list_count="2" display_author="N" display_regdate="N" display_readed_count="Y" display_voted_count="Y" mid_list="gallery"  /><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 0pt; background-position: 0pt 50%; float: left; width: 240px; background-repeat: repeat; height: 22px; background-color: transparent;" body="'.base64_encode($default_menus['first']['download']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 0px solid rgb(255, 255, 255); margin: 5px 0pt 0pt; background-position: 0pt 50%; float: left; width: 246px; background-repeat: repeat; background-color: transparent;" widget="webzine" module_srl="0" widget_sequence="'.getNextSequence().'" skin="xe_official" colorset="normal" widget_cache="10" order_target="list_order" order_type="desc" subject_cut_size="8" content_cut_size="40" thumbnail_type="crop" thumbnail_width="70" thumbnail_height="70" cols_list_count="1" rows_list_count="2" display_author="N" display_regdate="N" display_readed_count="Y" display_voted_count="Y" mid_list="download"  /><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 5px 0pt 0pt; background-position: 0pt 50%; float: left; width: 240px; background-repeat: repeat; height: 22px; background-color: transparent; background-image: none;" body="'.base64_encode($default_menus['widget']['download_rank']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 0px solid rgb(255, 255, 255); margin: 0pt; float: left; width: 246px; background-color: transparent; background-image: none; background-repeat: repeat; background-position: 0pt 0pt;" widget="rank_download" module_srl="85" skin="sz_xe" colorset="Box_000" widget_cache="10" widget_sequence=".getNextSequence()." list_count="5" attach_type="all" download="Y" mid_list="download" order_type="desc"  /><div class="clear"></div></div></div></div><div widget="widgetBox" style="border: 0px solid rgb(255, 255, 255); margin: 10px 0pt 0pt; background-position: 0pt 50%; float: left; width: 508px; background-repeat: repeat; height: 530px; background-color: transparent;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"><div><div><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 10px 0px 0px; background-position: 0pt 50%; float: left; background-image: none; width: 500px; background-repeat: repeat; height: 22px; background-color: transparent;" body="'.base64_encode($default_menus['first']['freeboard']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 1px solid rgb(227, 227, 227); margin: 2px 0pt 0pt; background-position: 0pt 50%; float: left; width: 504px; background-repeat: repeat; background-color: transparent; height: 108px;" widget="newest_document" mid_list="freeboard" subject_cut_size="0" duration_new="96" list_count="5" order_type="desc" order_target="list_order" widget_cache="10" colorset="white" skin="xe_official" widget_sequence="'.getNextSequence().'" widget_padding_left="5px" widget_padding_bottom="5px" widget_padding_right="5px" widget_padding_top="5px"  /><div class="clear"></div><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 10px 0px 0px; background-position: 0pt 50%; float: left; background-image: none; width: 500px; background-repeat: repeat; height: 22px; background-color: transparent;" body="'.base64_encode($default_menus['first']['humor']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 1px solid rgb(227, 227, 227); margin: 2px 0pt 0pt; background-position: 0pt 50%; float: left; width: 504px; background-repeat: repeat; background-color: transparent; height: 108px;" widget="newest_document" mid_list="humor" subject_cut_size="0" duration_new="96" list_count="5" order_type="desc" order_target="list_order" widget_cache="10" colorset="white" skin="xe_official" widget_sequence="'.getNextSequence().'" widget_padding_left="5px" widget_padding_bottom="5px" widget_padding_right="5px" widget_padding_top="5px"  /><div class="clear"></div><img widget="widgetContent" style="border: 3px solid rgb(221, 221, 221); margin: 10px 0px 0px; background-position: 0pt 50%; float: left; background-image: none; width: 500px; background-repeat: repeat; height: 22px; background-color: transparent;" body="'.base64_encode($default_menus['first']['qa']).'" widget_padding_left="5px" widget_padding_right="0" widget_padding_top="3px" widget_padding_bottom="0" /><img style="border: 1px solid rgb(227, 227, 227); margin: 2px 0pt 0pt; background-position: 0pt 50%; float: left; width: 504px; background-repeat: repeat; background-color: transparent; height: 108px;" widget="newest_document" mid_list="qa" subject_cut_size="0" duration_new="96" list_count="5" order_type="desc" order_target="list_order" widget_cache="10" colorset="white" skin="xe_official" widget_sequence="'.getNextSequence().'" widget_padding_left="5px" widget_padding_bottom="5px" widget_padding_right="5px" widget_padding_top="5px"  /><div class="clear"></div></div></div></div>';
+        function getHomeContent() {
+            return 
+                '<img class="zbxe_widget_output" widget="content" skin="default" colorset="layout" content_type="document" list_type="normal" tab_type="none" option_view="title,regdate,nickname" show_browser_title="Y" show_comment_count="Y" show_trackback_count="Y" show_category="Y" show_icon="Y" order_target="list_order" order_type="desc" thumbnail_type="crop" page_count="2" duration_new="24" widgetstyle="simple" list_count="7" ws_colorset="layout" ws_title="$user_lang->view_total" ws_more_url="" ws_more_text="" style="float:left;width:100%"/>'.
+                '<img class="zbxe_widget_output" widget="content" skin="default" colorset="layout" content_type="comment" list_type="normal" tab_type="none" option_view="title,regdate,nickname" show_browser_title="Y" show_comment_count="Y" show_trackback_count="Y" show_category="Y" show_icon="Y" order_target="list_order" order_type="desc" thumbnail_type="crop" page_count="2" duration_new="24" widgetstyle="simple" list_count="7" ws_colorset="layout" ws_title="$user_lang->view_comment" ws_more_url="" ws_more_text="" style="float:left;width:100%" />'.
+                '<img class="zbxe_widget_output" widget="content" skin="default" colorset="layout" content_type="image" list_type="gallery" tab_type="none" option_view="title,regdate,nickname" show_browser_title="Y" show_comment_count="Y" show_trackback_count="Y" show_category="Y" show_icon="Y" order_target="list_order" order_type="desc" thumbnail_type="crop" thumbnail_width="100" thumbnail_height="75" list_count="10" page_count="1" cols_list_count="5" duration_new="24" content_cut_size="20" widgetstyle="simple" ws_colorset="layout" ws_title="$user_lang->cafe_album" ws_more_url="" ws_more_text="" style="float:left;width:100%"/>'.
+                '';
         }
 
         function procHomepageAdminUpdateHomepage() {
@@ -260,10 +303,19 @@
 
             // 메뉴 삭제
             $oMenuAdminController = &getAdminController('menu');
-            Context::set('menu_srl', $homepage_info->first_menu_srl);
-            $oMenuAdminController->procMenuAdminDelete();
-            Context::set('menu_srl', $homepage_info->second_menu_srl);
-            $oMenuAdminController->procMenuAdminDelete();
+            $oMenuAdminController->deleteMenu($homepage_info->first_menu_srl);
+
+            // 카운터 정보 삭제
+            $oCounterController = &getController('counter');
+            $oCounterController->deleteSiteCounterLogs($site_srl);
+
+            // 애드온 삭제
+            $oAddonController = &getController('addon');
+            $oAddonController->removeAddonConfig($site_srl);
+
+            // 에디터 컴포넌트 삭제
+            $oEditorController = &getController('editor');
+            $oEditorController->removeEditorConfig($site_srl);
 
             // 레이아웃 삭제
             Context::set('layout_srl', $homepage_info->layout_srl);
@@ -272,16 +324,11 @@
 
             // 게시판 & 페이지 삭제
             $oModuleModel = &getModel('module');
+            $oModuleController =&getController('module');
             $mid_list = $oModuleModel->getMidList($args);
-            $oBoardAdminController = &getAdminController('board');
-            $oPageAdminController = &getAdminController('page');
             foreach($mid_list as $key => $val) {
-                Context::set('module_srl', $val->module_srl);
-                if($val->module == 'page') {
-                    $oPageAdminController->procPageAdminDelete();
-                } elseif($val->module == 'board') {
-                    $oBoardAdminController->procBoardAdminDeleteBoard();
-                }
+                $module_srl = $val->module_srl;
+                $oModuleController->deleteModule($module_srl);
             }
 
             $this->setMessage('success_deleted');
diff --git a/modules/homepage/homepage.class.php b/modules/homepage/homepage.class.php
index 624d9c303..92f472ff3 100644
--- a/modules/homepage/homepage.class.php
+++ b/modules/homepage/homepage.class.php
@@ -12,20 +12,7 @@
          **/
         function moduleInstall() {
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminContent');
-            $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminSetup');
-            $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminDelete');
-
-            // 신규 홈페이지 추가
-            /*
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getDefaultMid()) {
-                $tmp_url = parse_url(Context::getRequestUri());
-                $domain = sprintf('%s%s%s', $tmp_url['host'], $tmp_url['port']&&$tmp_url['port']!=80?':'.$tmp_url['port']:'',$tmp_url['path']);
-                $oHomepageAdminController = &getAdminController('homepage');
-                $oHomepageAdminController->insertHomepage('homepage', $domain);
-            }
-            */
+            $oModuleController->insertTrigger('display', 'homepage', 'controller', 'triggerMemberMenu', 'before');
 
             return new Object();
         }
@@ -34,12 +21,11 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oModuleController = &getController('module');
             $oModuleModel = &getModel('module');
 
-            if(!$oModuleModel->getActionForward('dispHomepageAdminContent')) return true;
-            if(!$oModuleModel->getActionForward('dispHomepageAdminSetup')) return true;
-            if(!$oModuleModel->getActionForward('dispHomepageAdminDelete')) return true;
-
+            // 2009. 02. 11 가상 사이트의 로그인 정보 영역에 관리 기능이 추가되어 표시되도록 트리거 등록
+            if(!$oModuleModel->getTrigger('display', 'homepage', 'controller', 'triggerMemberMenu', 'before')) return true;
             return false;
         }
 
@@ -47,15 +33,12 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
 
-            if(!$oModuleModel->getActionForward('dispHomepageAdminContent'))
-                $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminContent');
-            if(!$oModuleModel->getActionForward('dispHomepageAdminSetup'))
-                $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminSetup');
-            if(!$oModuleModel->getActionForward('dispHomepageAdminDelete'))
-                $oModuleController->insertActionForward('homepage', 'view', 'dispHomepageAdminDelete');
+            // 2009. 02. 11 가상 사이트의 로그인 정보 영역에 관리 기능이 추가되어 표시되도록 트리거 등록
+            if(!$oModuleModel->getTrigger('display', 'homepage', 'controller', 'triggerMemberMenu', 'before')) 
+                $oModuleController->insertTrigger('display', 'homepage', 'controller', 'triggerMemberMenu', 'before');
 
             return new Object(0, 'success_updated');
         }
diff --git a/modules/homepage/homepage.controller.php b/modules/homepage/homepage.controller.php
index 149f7757a..8abcb171b 100644
--- a/modules/homepage/homepage.controller.php
+++ b/modules/homepage/homepage.controller.php
@@ -14,7 +14,9 @@
 
         function init() {
             $oModuleModel = &getModel('module');
-            if(!$oModuleModel->isSiteAdmin()) return $this->stop('msg_not_permitted');
+
+            $logged_info = Context::get('logged_info');
+            if(!$oModuleModel->isSiteAdmin($logged_info)) return $this->stop('msg_not_permitted');
 
             // site_module_info값으로 홈페이지의 정보를 구함
             $this->site_module_info = Context::get('site_module_info');
@@ -28,19 +30,38 @@
 
         }
 
+        function procHomepageChangeLanguage() {
+            $lang_code = Context::get('language');
+            if(!$lang_code) return;
+            $args->site_srl = $this->site_module_info->site_srl;
+            $args->index_module_srl= $this->site_module_info->index_module_srl;
+            $args->domain = $this->site_module_info->domain;
+            $args->default_language = $lang_code;
+            $oModuleController = &getController('module');
+            return $oModuleController->updateSite($args);
+        }
+
         function procHomepageChangeLayout() {
-            $layout = Context::get('layout');
-            if(!$layout || !is_dir(_XE_PATH_.'layouts/'.$layout)) return new Object(-1,'msg_invalid_request');
-
-            $layout_srl = $this->selected_layout->layout_srl;
-
-            if($layout == $this->selected_layout->layout) return;
-
             $oLayoutAdminController = &getAdminController('layout');
+            $oLayoutModel = &getModel('layout');
+
+            $layout = Context::get('layout');
+            if(!$layout || ($layout!='faceoff' && !is_dir(_XE_PATH_.'layouts/'.$layout))) return new Object(-1,'msg_invalid_request');
+
+            // 원래 레이아웃 정보를 가져옴
+            $layout_srl = $this->selected_layout->layout_srl;
             $args->layout_srl = $layout_srl;
-            $args->layout = $layout;
-            $args->layout_path = '';
-            return $oLayoutAdminController->updateLayout($args);
+            $output = executeQuery('layout.getLayout', $args);
+            if(!$output->toBool() || !$output->data) return $output;
+            $layout_info = $output->data;
+
+            if($layout == $layout_info->layout) return new Object();
+
+            $layout_info->layout = $layout;
+            $output = $oLayoutAdminController->updateLayout($layout_info);
+            if(!$output->toBool()) return $output;
+
+            $oLayoutAdminController->initLayout($layout_srl, $layout);
         }
 
         function procHomepageLayoutUpdate() {
@@ -79,17 +100,6 @@
             $oMenuAdminModel = &getAdminModel('menu');
             $oMenuAdminController = &getAdminController('menu');
 
-            // 메뉴 이름 체크
-            $lang_supported = Context::get('lang_supported');
-            $name_inserted = false;
-            foreach($lang_supported as $key => $val) {
-                $menu_name[$key] = $source_args->{"menu_name_".strtolower($key )};
-                if($menu_name[$key]) $name_inserted = true;
-            }
-            if(!$name_inserted) {
-                return new Object(-1, sprintf($lang->filter->isnull, $lang->menu_name));
-            }
-
             $mode = Context::get('mode');
 
             // module_type이 url이 아니면 게시판 또는 페이지를 생성한다
@@ -117,7 +127,7 @@
             $args->menu_item_srl = $source_args->menu_item_srl;
             $args->parent_srl = $source_args->parent_srl;
             $args->menu_srl = $source_args->menu_srl;
-            $args->name = serialize($menu_name);
+            $args->name = $source_args->menu_name;
             if($module_type=='url') $args->url = 'http://'.preg_replace('/^(http|https):\/\//i','',$url);
             else $args->url = $module_id;
             $args->open_window = $source_args->menu_open_window;
@@ -274,6 +284,17 @@
             if(!$output->toBool()) return $output;
         }
 
+        function procHomepageDeleteMember() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(-1,'msg_invalid_request');
+
+            $args->site_srl= $this->site_srl;
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.deleteMembersGroup', $args);
+            if(!$output->toBool()) return $output;
+            $this->setMessage('success_deleted');
+        }
+
         function procHomepageUpdateMemberGroup() {
             if(!Context::get('cart')) return new Object();
             $args->site_srl = $this->site_srl;
@@ -283,16 +304,6 @@
             return $oMemberController->replaceMemberGroup($args);
         }
 
-        function procHomepageUpdateBoardSkin() {
-            $oBoardAdminController = &getAdminController('board');
-            $oBoardAdminController->procBoardAdminUpdateSkinInfo();
-
-            $this->setLayoutPath($oBoardAdminController->getLayoutPath());
-            $this->setLayoutFile($oBoardAdminController->getLayoutFile());
-            $this->setTemplatePath($oBoardAdminController->getTemplatePath());
-            $this->setTemplateFile($oBoardAdminController->getTemplateFile());
-        }
-
         function procHomepageInsertBoardGrant() {
             $module_srl = Context::get('module_srl');
 
@@ -348,8 +359,20 @@
 
             $oModuleController = &getController('module');
             $output = $oModuleController->updateSite($args);
-            debugPrint($output);
             return $output;
         }
+
+        function triggerMemberMenu(&$content) {
+            $site_module_info = Context::get('site_module_info');
+            $logged_info = Context::get('logged_info');
+            if(!$site_module_info->site_srl || !$logged_info->member_srl) return new Object();
+
+            if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin) {
+                $oMemberController = &getController('member');
+                $oMemberController->addMemberMenu('dispHomepageManage','cmd_cafe_setup');
+            } 
+            return new Object();
+
+        }
     }
 ?>
diff --git a/modules/homepage/homepage.view.php b/modules/homepage/homepage.view.php
index 670c1c80b..54bcd02ec 100644
--- a/modules/homepage/homepage.view.php
+++ b/modules/homepage/homepage.view.php
@@ -11,40 +11,54 @@
         var $site_srl = 0;
         var $homepage_info = null;
 
+        /**
+         * @brief 초기화 
+         **/
         function init() {
             $oModuleModel = &getModel('module');
-            if(!$oModuleModel->isSiteAdmin()) return $this->stop('msg_not_permitted');
+
+            // 현재 접속 권한 체크하여 사이트 관리자가 아니면 접근 금지
+            $logged_info = Context::get('logged_info');
+            if(!Context::get('is_logged') || !$oModuleModel->isSiteAdmin($logged_info)) return $this->stop('msg_not_permitted');
 
             // site_module_info값으로 홈페이지의 정보를 구함
             $this->site_module_info = Context::get('site_module_info');
             $this->site_srl = $this->site_module_info->site_srl;
-            if(!$this->site_srl) exit();
+            if(!$this->site_srl) return $this->stop('msg_invalid_request');
 
             // 홈페이지 정보를 추출하여 세팅
             $oHomepageModel = &getModel('homepage');
             $this->homepage_info = $oHomepageModel->getHomepageInfo($this->site_srl);
             Context::set('homepage_info', $this->homepage_info);
 
-            // 기본 스킨 디렉토리를 구함
-            $template_path = sprintf("%sskins/xe_official",$this->module_path);
+            // 템플릿 디렉토리를 구함
+            $template_path = sprintf("%stpl",$this->module_path);
             $this->setTemplatePath($template_path);
 
-            // 홈페이지 관리 화면은 별도의 레이아웃으로 설정하여 운영
-            $this->setLayoutPath($template_path);
-            $this->setLayoutFile('layout');
-
-            // 레이아웃 정보 가져옴
-            $oLayoutModel = &getModel('layout');
-            $this->selected_layout = $oLayoutModel->getLayout($this->homepage_info->layout_srl);
-            Context::set('selected_layout', $this->selected_layout);
+            // 모듈 번호가 있으면 해동 모듈의 정보를 구해와서 세팅
+            $module_srl = Context::get('module_srl');
+            if($module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if(!$module_info || $module_info->site_srl != $this->site_srl) return new Object(-1,'msg_invalid_request');
+                $this->module_info = $module_info;
+                Context::set('module_info', $module_info);
+            }
         }
 
+        /**
+         * @brief 홈페이지 기본 관리
+         **/
         function dispHomepageManage() {
             // 다운로드 되어 있는 레이아웃 목록을 구함
             $oLayoutModel = &getModel('layout');
             $layout_list = $oLayoutModel->getDownloadedLayoutList();
             Context::set('layout_list', $layout_list);
 
+            // 레이아웃 정보 가져옴
+            $oLayoutModel = &getModel('layout');
+            $this->selected_layout = $oLayoutModel->getLayout($this->homepage_info->layout_srl);
+            Context::set('selected_layout', $this->selected_layout);
+
             // 메뉴 목록을 가져옴
             $oMenuAdminModel = &getAdminModel('menu');
             $menu_list = $oMenuAdminModel->getMenus();
@@ -52,9 +66,17 @@
 
             if(!Context::get('act')) Context::set('act', 'dispHomepageManage');
 
-            $this->setTemplateFile('index');
+            $args->site_srl = $this->site_srl;
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList($args);
+            Context::set('mid_list', $mid_list);
+
+            $this->setTemplateFile('layout_setup');
         }
 
+        /**
+         * @brief 홈페이지 회원 그룹 관리
+         **/
         function dispHomepageMemberGroupManage() {
             // 멤버모델 객체 생성
             $oMemberModel = &getModel('member');
@@ -67,159 +89,15 @@
             }
 
             // group 목록 가져오기
-            $this->group_list = $oMemberModel->getGroups($this->site_srl);
-            Context::set('group_list', $this->group_list);
+            $group_list = $oMemberModel->getGroups($this->site_srl);
+            Context::set('group_list', $group_list);
 
             $this->setTemplateFile('group_list');
         }
 
-        function dispHomepageTopMenu() {
-            // 메뉴 정보 가져오기
-            $menu_srl = $this->homepage_info->first_menu_srl;
-            $oMenuModel = &getAdminModel('menu');
-            $menu_info = $oMenuModel->getMenu($menu_srl);
-            Context::set('menu_info', $menu_info);
-
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            $_menu_info = get_object_vars($this->selected_layout->menu);
-            $menu = array_shift($_menu_info);
-            Context::set('menu_max_depth', $menu->maxdepth);
-
-            $this->setTemplateFile('menu_manage');
-        }
-
-
-        function dispHomepageBottomMenu() {
-            // 메뉴 정보 가져오기
-            $menu_srl = $this->homepage_info->second_menu_srl;
-            $oMenuModel = &getAdminModel('menu');
-            $menu_info = $oMenuModel->getMenu($menu_srl);
-            Context::set('menu_info', $menu_info);
-
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            $_menu_info = get_object_vars($this->selected_layout->menu);
-            $menu = array_pop($_menu_info);
-            Context::set('menu_max_depth', $menu->maxdepth);
-
-            $this->setTemplateFile('menu_manage');
-        }
-
-        function dispHomepageMidSetup() {
-            // 현재 site_srl 에 등록된 것들을 가져오기 
-            $args->site_srl = $this->site_srl;
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList($args);
-            Context::set('mid_list', $mid_list);
-
-            $this->setTemplateFile('mid_list');
-        }
-
-        function dispHomepageBoardInfo() {
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info || $module_info->site_srl != $this->site_srl) return new Object(-1,'msg_invalid_request');
-            Context::set('module_info', $module_info);
-
-            // 스킨 목록을 구해옴
-            $oModuleModel = &getModel('module');
-            $skin_list = $oModuleModel->getSkins($this->module_path);
-            Context::set('skin_list',$skin_list);
-
-            // 템플릿 파일 지정
-            if($module_info->module == 'board') {
-                $oBoardAdminView = &getAdminView('board');
-                $oBoardAdminView->init();
-                $this->setTemplateFile('board_insert');
-            } else {
-                $oMemberModel = &getModel('member');
-                $group_list = $oMemberModel->getGroups($this->site_srl);
-                Context::set('group_list', $group_list);
-
-                $xml_info = $oModuleModel->getModuleActionXml('page');
-                $grant_list = $xml_info->grant;
-                Context::set('grant_list', $grant_list);
-
-                $oPage = &getClass('page');
-                $this->setTemplateFile('page_insert');
-            }
-        }
-
-        function dispHomepageBoardAddition() {
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info || $module_info->site_srl != $this->site_srl) return new Object(-1,'msg_invalid_request');
-            Context::set('module_info', $module_info);
-            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
-            $content = '';
-
-            // 추가 설정을 위한 트리거 호출 
-            // 게시판 모듈이지만 차후 다른 모듈에서의 사용도 고려하여 trigger 이름을 공용으로 사용할 수 있도록 하였음
-            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
-            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
-            Context::set('setup_content', $content);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('board_addition_setup');
-        }
-
-        function dispHomepageBoardGrant() {
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info || $module_info->site_srl != $this->site_srl) return new Object(-1,'msg_invalid_request');
-            Context::set('module_info', $module_info);
-
-            $xml_info = $oModuleModel->getModuleActionXml('board');
-            $grant_list = $xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups($this->site_srl);
-            Context::set('group_list', $group_list);
-
-            $this->setTemplateFile('board_grant_list');
-        }
-
-        function dispHomepageBoardSkin() {
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info || $module_info->site_srl != $this->site_srl) return new Object(-1,'msg_invalid_request');
-            Context::set('module_info', $module_info);
-            $skin = $module_info->skin;
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo('./modules/board/', $skin);
-            if(!$skin_info) {
-                $skin = 'xe_board';
-                $skin_info = $oModuleModel->loadSkinInfo('./modules/board/', $skin);
-            }
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $group = $val->group;
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $module_info->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
-            $this->setTemplateFile('board_skin_info');
-        }
-
+        /**
+         * @brief 홈페이지 모듈의 회원 관리
+         **/
         function dispHomepageMemberManage() {
             // member model 객체 생성후 목록을 구해옴
             $oMemberAdminModel = &getAdminModel('member');
@@ -227,8 +105,10 @@
             $output = $oMemberAdminModel->getSiteMemberList($this->site_srl);
 
             $members = array();
-            foreach($output->data as $key=>$val) {
-                $members[] = $val->member_srl;
+            if(count($output->data)) {
+                foreach($output->data as $key=>$val) {
+                    $members[] = $val->member_srl;
+                }
             }
             $members_groups = $oMemberModel->getMembersGroups($members, $this->site_srl);
             Context::set('members_groups',$members_groups);
@@ -245,6 +125,197 @@
 
             $this->setTemplateFile('member_list');
         }
-    }
 
+
+        /**
+         * @brief 홈페이지 상단 메뉴 관리
+         **/
+        function dispHomepageTopMenu() {
+            // 메뉴 정보 가져오기
+            $menu_srl = $this->homepage_info->first_menu_srl;
+
+            $oMenuModel = &getAdminModel('menu');
+            $menu_info = $oMenuModel->getMenu($menu_srl);
+            Context::set('menu_info', $menu_info);
+
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($this->site_srl);
+            Context::set('group_list', $group_list);
+
+            $oLayoutModel = &getModel('layout');
+            $selected_layout = $oLayoutModel->getLayout($this->homepage_info->layout_srl);
+
+            $_menu_info = get_object_vars($selected_layout->menu);
+            $menu = array_shift($_menu_info);
+            Context::set('menu_max_depth', $menu->maxdepth);
+
+            $this->setTemplateFile('menu_manage');
+        }
+
+        /**
+         * @brief 홈페이지 모듈 목록
+         **/
+        function dispHomepageMidSetup() {
+            // 현재 site_srl 에 등록된 것들을 가져오기 
+            $args->site_srl = $this->site_srl;
+            $oModuleModel = &getModel('module');
+            $mid_list = $oModuleModel->getMidList($args);
+            Context::set('mid_list', $mid_list);
+
+            $this->setTemplateFile('mid_list');
+        }
+
+        /**
+         * @brief 홈페이지 게시판 정보
+         **/
+        function dispHomepageBoardInfo() {
+            // 스킨 목록을 구해옴
+            $oModuleModel = &getModel('module');
+            $skin_path = sprintf('./modules/%s', $this->module_info->module);
+            $skin_list = $oModuleModel->getSkins($skin_path);
+            Context::set('skin_list',$skin_list);
+
+            $oBoardAdminView = &getAdminView('board');
+            $oBoardAdminView->init();
+
+            Context::set('module_info', $this->module_info);
+            $this->setTemplateFile('board_insert');
+        }
+
+        /**
+         * @brief 홈페이지 모듈의 게시판 분류
+         **/
+        function dispHomepageBoardCategoryInfo() {
+            $oDocumentModel = &getModel('document');
+            $catgegory_content = $oDocumentModel->getCategoryHTML($this->module_info->module_srl);
+            Context::set('category_content', $catgegory_content);
+
+            Context::set('module_info', $this->module_info);
+            $this->setTemplateFile('category_list');
+        }
+
+
+
+        /**
+         * @brief 홈페이지 게시판 추가 설정
+         **/
+        function dispHomepageBoardAddition() {
+            $oModuleModel = &getModel('module');
+            Context::set('module_info', $this->module_info);
+
+            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
+            $content = '';
+
+            // 추가 설정을 위한 트리거 호출 
+            // 게시판 모듈이지만 차후 다른 모듈에서의 사용도 고려하여 trigger 이름을 공용으로 사용할 수 있도록 하였음
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
+            Context::set('setup_content', $content);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('board_addition_setup');
+        }
+
+        /**
+         * @brief 홈페이지 게시판 권한 설정
+         **/
+        function dispHomepageBoardGrant() {
+            $oModuleModel = &getModel('module');
+            $xml_info = $oModuleModel->getModuleActionXml('board');
+
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('board_grant_list');
+        }
+
+        /**
+         * @breif 홈페이지 게시판 스킨 설정
+         **/
+        function dispHomepageBoardSkin() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
+
+            $this->setTemplateFile('board_skin_info');
+        }
+
+        /**
+         * @brief 홈페이지 모듈의 페이지 정보 
+         **/
+        function dispHomepagePageGrant() {
+            Context::set('module_info', $this->module_info);
+
+            $oModuleModel = &getModel('module');
+            $xml_info = $oModuleModel->getModuleActionXml('page');
+
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('page_grant_list');
+        }
+
+        /**
+         * @brief 홈페이지 모듈의 확장 변수 
+         **/
+        function dispHomepageBoardExtraVars() {
+            $oDocumentAdminModel = &getModel('document');
+            $extra_vars_content = $oDocumentAdminModel->getExtraVarsHTML($this->module_info->module_srl);
+            Context::set('extra_vars_content', $extra_vars_content);
+
+            $this->setTemplateFile('extra_vars');
+        }
+
+        /**
+         * @brief 접속 통계
+         **/
+        function dispHomepageCounter() {
+            // 정해진 일자가 없으면 오늘자로 설정
+            $selected_date = Context::get('selected_date');
+            if(!$selected_date) $selected_date = date("Ymd");
+            Context::set('selected_date', $selected_date);
+
+            // counter model 객체 생성
+            $oCounterModel = &getModel('counter');
+
+            // 전체 카운터 및 지정된 일자의 현황 가져오기
+            $status = $oCounterModel->getStatus(array(0,$selected_date),$this->site_srl);
+            Context::set('total_counter', $status[0]);
+            Context::set('selected_day_counter', $status[$selected_date]);
+
+            // 시간, 일, 월, 년도별로 데이터 가져오기
+            $type = Context::get('type');
+            if(!$type) {
+                $type = 'day';
+                Context::set('type',$type);
+            }
+            $detail_status = $oCounterModel->getHourlyStatus($type, $selected_date, $this->site_srl);
+            Context::set('detail_status', $detail_status);
+            
+            // 표시
+            $this->setTemplateFile('site_status');
+        }
+
+        /**
+         * @brief 애드온/ 컴포넌트 설정
+         **/
+        function dispHomepageComponent() {
+            // 애드온 목록을 가져옴
+            $oAddonModel = &getAdminModel('addon');
+            $addon_list = $oAddonModel->getAddonList($this->site_srl);
+            Context::set('addon_list', $addon_list);
+
+            // 에디터 컴포넌트 목록을 가져옴
+            $oEditorModel = &getModel('editor');
+            Context::set('component_list', $oEditorModel->getComponentList(false, $this->site_srl));
+
+            // 표시
+            $this->setTemplateFile('components');
+        }
+    }
 ?>
diff --git a/modules/homepage/lang/en.lang.php b/modules/homepage/lang/en.lang.php
index 8b5e92185..dbead4d15 100644
--- a/modules/homepage/lang/en.lang.php
+++ b/modules/homepage/lang/en.lang.php
@@ -2,71 +2,66 @@
     /**
      * @file   en.lang.php
      * @author zero (zero@nzeo.com)
-     * @brief  Default language pack for the homepage module.
+     * @brief  Default language pack for the CafeXE module.
      **/
 
-    $lang->homepage = "Homepage"; 
-    $lang->homepage_title = "Title of homepage";
+    $lang->cafe = "CafeXE"; 
+    $lang->cafe_title = "Title of cafe";
     $lang->module_type = "Type of target module";
     $lang->board = "Board";
     $lang->page = "Page";
     $lang->module_id = "module ID";
     $lang->item_group_grant = "Accessible group";
-    $lang->homepage_admin = "Homepage administrator";
+    $lang->cafe_info = "Cafe Infomation";
+    $lang->cafe_admin = "CafeXE administrator";
     $lang->do_selected_member = "Change the selected members into : ";
 
-    $lang->homepage_default_menus = array(
-        'first' => array(
-            'home' => 'Home',
-            'notice' => 'Notice',
-            'download' => 'Download',
-            'gallery' => 'Gallery',
-            'community' => 'Community',
-            'freeboard' => 'Off-topics',
-            'humor' => 'Humor',
-            'qa' => 'Q and A',
-        ),
-        'second' => array(
-            'profile' => 'Introduction',
-            'rule' => 'Rules',
-        ),
-        'menu' => array(
-            'first' => 'Default Menu',
-            'second' => 'Bottom Menu',
-        ),
-        'widget' => array(
-            'download_rank' => 'Download Ranking',
-        ),
+    $lang->default_menus = array(
+        'home' => 'Home',
+        'notice' => 'Notice',
+        'levelup' => 'Request rating up',
+        'freeboard' => 'Off-topics',
+        'view_total' => 'View full text',
+        'view_comment' => 'Story line',
+        'cafe_album' => 'Cafe album',
+        'menu' => 'menu',
+        'default_group1' => 'Pending members ',
+        'default_group2' => 'Associate',
+        'default_group3' => 'Member',
     );
 
-    $lang->cmd_homepage_menus = array(
+    $lang->cmd_admin_menus = array(
         "dispHomepageManage" => "Configuration",
         "dispHomepageMemberGroupManage" => "Manage groups",
         "dispHomepageMemberManage" => "Member list",
         "dispHomepageTopMenu" => "Manage default menu",
-        "dispHomepageBottomMenu" => "Manage bottom menu",
+        "dispHomepageComponent" => "기능 설정",
+        "dispHomepageCounter" => "접속 통계",
         "dispHomepageMidSetup" => "Module configuration",
     );
-    $lang->cmd_homepage_registration = "Create a homepage";
-    $lang->cmd_homepage_setup = "Configure homepage";
-    $lang->cmd_homepage_delete = "Delete ";
+    $lang->cmd_cafe_registration = "Create a cafe";
+    $lang->cmd_cafe_setup = "Configure cafe";
+    $lang->cmd_cafe_delete = "Delete ";
     $lang->cmd_go_home = "Move home";
-    $lang->cmd_go_homepage_admin = 'Homepage package';
+    $lang->cmd_go_cafe_admin = 'CafeXE package';
     $lang->cmd_change_layout = "Change";
     $lang->cmd_select_index = "Select the index page";
     $lang->cmd_add_new_menu = "Add a new menu";
+    $lang->default_language = "기본 언어";
+    $lang->about_default_language = "처음 접속하는 사용자의 언어 설정을 지정할 수 있습니다.";
 
-    $lang->about_homepage_act = array(
-        "dispHomepageManage" => "You can decorate homepage's layout here.",
-        "dispHomepageMemberGroupManage" => "You can manage groups used in this homepage.",
+    $lang->about_cafe_act = array(
+        "dispHomepageManage" => "You can decorate cafe's layout here.",
+        "dispHomepageMemberGroupManage" => "You can manage groups used in this cafe.",
         "dispHomepageMemberManage" => "You can list up members registered and manage them.",
         "dispHomepageTopMenu" => "You can manage the default menus",
-        "dispHomepageBottomMenu" => "You can manage the bottom menus",
-        "dispHomepageMidSetup" => "You can configure modules, such as pages and boards, used in the homepage."
+        "dispHomepageComponent" => "에디터 컴포넌트/ 애드온을 활성화 하거나 설정을 변경할 수 있습니다",
+        "dispHomepageCounter" => "Cafe의 접속 현황을 볼 수 있습니다",
+        "dispHomepageMidSetup" => "You can configure modules, such as pages and boards, used in the cafe."
     );
-    $lang->about_homepage = "Homepage package provides features to create homepages and to configure them conveniently";
-    $lang->about_homepage_title = "The title is only used for management, it would not be displayed.";
-    $lang->about_domain = "In order to create more than one homepage, each of them needs to have own domain name.<br />Sub-domain (e.g., aaa.bbb.com of bbb.com) also can be used. Input the address including the path installed xe. <br /> ex) www.zeroboard.com/zbxe";
+    $lang->about_cafe = "CafeXE package provides features to create cafes and to configure them conveniently";
+    $lang->about_cafe_title = "The title is only used for management, it would not be displayed.";
+    $lang->about_domain = "In order to create more than one cafe, each of them needs to have own domain name.<br />Sub-domain (e.g., aaa.bbb.com of bbb.com) also can be used. Input the address including the path installed xe. <br /> ex) www.zeroboard.com/zbxe";
     $lang->about_menu_names = "You can set the title of the menu for each language displayed in the menus<br />If you input one of the titles, titles for other languages will be set as same.";
     $lang->about_menu_option = "You can assign it to open a page in a new window when the menu clicked.<br />The option for menu expand may work depending on the layout.";
     
@@ -76,8 +71,8 @@
     $lang->about_module_id = "The module id will be used for accessing the board or page, <br /> ex) http://address/[moduleID]";
     $lang->about_menu_item_url = "If the target is URL, input the address here <br />Do not include http://";
     $lang->about_menu_image_button = "Instead of the title, the menu image can be used.";
-    $lang->about_homepage_delete = "Caution! If you delete the homepage, all the modules(boards, pages) linked to the homepage and all the documents will be removed.";
-    $lang->about_homepage_admin = "You can set administrators of the homepage. <br />The administrators can access the administration page via http://address/?module=homepage . Only existing IDs can be registered as administrator";
+    $lang->about_cafe_delete = "Caution! If you delete the cafe, all the modules(boards, pages) linked to the cafe and all the documents will be removed.";
+    $lang->about_cafe_admin = "You can set administrators of the cafe. <br />The administrators can access the administration page via http://address/?act=dispHomepageManage. Only existing IDs can be registered as administrator";
     
     $lang->confirm_change_layout = "If you change the layout, some information of the layout might be reset. Would you like to change it?";
     $lang->confirm_delete_menu_item = "If you delete the menu item, the linked module(board or page) will be removed, too. Would you like to delete it?";
diff --git a/modules/homepage/lang/jp.lang.php b/modules/homepage/lang/jp.lang.php
index 2012ae4b5..71bcfb1c4 100644
--- a/modules/homepage/lang/jp.lang.php
+++ b/modules/homepage/lang/jp.lang.php
@@ -2,70 +2,65 @@
     /**
      * @file   jp.lang.php
           * @author zero (zero@nzeo.com)　翻訳：ミニミ
-     * @brief  ホームページ(homepage)モジュールの日本語言語パッケージ（基本的な内容のみ）
+     * @brief  CafeXE(homepage)モジュールの日本語言語パッケージ（基本的な内容のみ）
      **/
 
-    $lang->homepage = "ホームページ"; 
-    $lang->homepage_title = "ホームページ名";
+    $lang->cafe = "CafeXE"; 
+    $lang->cafe_title = "ホームページ名";
     $lang->module_type = "タイプ";
     $lang->board = "掲示板";
     $lang->page = "ページ";
     $lang->module_id = "モジュール ID";
     $lang->item_group_grant = "メニューを見せるグループ";
-    $lang->homepage_admin = "ホームページ管理者";
+    $lang->cafe_info = "Cafe Infomation";
+    $lang->cafe_admin = "ホームページ管理者";
     $lang->do_selected_member = "選択した会員を : ";
 
-    $lang->homepage_default_menus = array(
-        'first' => array(
-            'home' => 'ホーム',
-            'notice' => 'お知らせ',
-            'download' => 'ダウンロード',
-            'gallery' => 'ギャラリー',
-            'community' => 'コミュニティー',
-            'freeboard' => '自由掲示板',
-            'humor' => 'ユーモア掲示板',
-            'qa' => 'Q and A',
-        ),
-        'second' => array(
-            'profile' => 'ホームページ紹介',
-            'rule' => '運営規則',
-        ),
-        'menu' => array(
-            'first' => '基本メニュー',
-            'second' => 'フッターメニュー',
-        ),
-        'widget' => array(
-            'download_rank' => 'ダウンロードランキング',
-        ),
+    $lang->default_menus = array(
+        'home' => 'ホーム',
+        'notice' => 'お知らせ',
+        'levelup' => 'レベルアップ',
+        'freeboard' => '自由掲示板',
+        'view_total' => '全文を表示',
+        'view_comment' => '一行の物語',
+        'cafe_album' => 'カフェアルバム',
+        'menu' => 'メニュー',
+        'default_group1' => 'スタンバイ会員',
+        'default_group2' => '準会員',
+        'default_group3' => '正会員',
     );
 
-    $lang->cmd_homepage_menus = array(
+    $lang->cmd_admin_menus = array(
         "dispHomepageManage" => "ホームページ設定",
         "dispHomepageMemberGroupManage" => "会員のグループ管理",
         "dispHomepageMemberManage" => "会員リスト",
         "dispHomepageTopMenu" => "基本メニュー 管理",
-        "dispHomepageBottomMenu" => "フッターメニュー 管理",
+        "dispHomepageComponent" => "기능 설정",
+        "dispHomepageCounter" => "접속 통계",
         "dispHomepageMidSetup" => "モジュール詳細設定",
     );
-    $lang->cmd_homepage_registration = "ホームページ作成";
-    $lang->cmd_homepage_setup = "ホームページ設定";
-    $lang->cmd_homepage_delete = "ホームページ削除";
+    $lang->cmd_cafe_registration = "ホームページ作成";
+    $lang->cmd_cafe_setup = "ホームページ設定";
+    $lang->cmd_cafe_delete = "ホームページ削除";
     $lang->cmd_go_home = "ホームへ移動";
-    $lang->cmd_go_homepage_admin = 'ホームページ全体管理';
+    $lang->cmd_go_cafe_admin = 'ホームページ全体管理';
     $lang->cmd_change_layout = "変更";
     $lang->cmd_select_index = "初期ページ選択";
     $lang->cmd_add_new_menu = "新しいメニュー追加";
+    $lang->default_language = "基本言語";
+    $lang->about_default_language = "初めてアクセスするユーザーに見せるページの言語を指定します。";
 
-    $lang->about_homepage_act = array(
+    $lang->about_cafe_act = array(
         "dispHomepageManage" => "ホームページのレイアウトを変更します。",
         "dispHomepageMemberGroupManage" => "ホームページ内のグループを管理します。",
         "dispHomepageMemberManage" => "ホームページに登録されている会員を管理します。",
         "dispHomepageTopMenu" => "ホームページのヘッダー（header、上段）や左側などのメニューを管理します。",
-        "dispHomepageBottomMenu" => "ホームページのフッター(footer、下段)のメニューを管理します。",
+        "dispHomepageComponent" => "에디터 컴포넌트/ 애드온을 활성화 하거나 설정을 변경할 수 있습니다",
+        "dispHomepageCounter" => "Cafe의 접속 현황을 볼 수 있습니다",
         "dispHomepageMidSetup" => "ホームページの掲示板、ページなどのモジュールを管理します。",
     );
-    $lang->about_homepage = "ホームページサービス管理者は複数のホームページ作成、および各ホームページを簡単に管理が出来ます。";
-    $lang->about_homepage_title = "ホームページ名は管理のためのみ使われ、実サービスには表示されません。";
+    $lang->about_cafe = "ホームページサービス管理者は複数のホームページ作成、および各ホームページを簡単に管理が出来ます。";
+    $lang->about_cafe_title = "ホームページ名は管理のためのみ使われ、実サービスには表示されません。";
     $lang->about_domain = "複数のホームページを作成するためには、専用のドメインが必要です。オリジナルドメインやサブ ドメインがあれば結構です。<br />また、 XEインストールパスも一緒に記入してください。<br />ex) www.zeroboard.com/zbxe";
     $lang->about_menu_names = "ホームページに使うメニュー名を言語別に指定出来ます。<br/>一個だけ記入した場合、他言語に一括適用されます。";
     $lang->about_menu_option = "メニューを選択するとき新しいウィンドウズに開けるかを選択します。<br />拡張メニューはレイアウトによって動作します。";
@@ -75,8 +70,8 @@
     $lang->about_module_id = "掲示板、ページなどにリンクさせるアドレスです。<br/>例) http://ドメイン/[モジュールID], http://ドメイン/?mid=[モジュールID]";
     $lang->about_menu_item_url = "タイプをURLにした場合、リンク先を入れて下さい。<br/>http://は省いて入力して下さい。";
     $lang->about_menu_image_button = "テキストのメニュー名の代わりに、イメージのメニューを使えます。";
-    $lang->about_homepage_delete = "ホームページを削除すると、リンクされている全てのモジュール(掲示板、ページなど)とそれに付随する書き込みが削除されます。<br />ご注意ください。";
-    $lang->about_homepage_admin = "ホームページ管理者の設定が出来ます。<br/>ホームページ管理者は 「 http://ドメイン/?module=homepage 」 として管理者ページにアクセスが出来ます。<br />存在しない会員は管理者に登録できません。";
+    $lang->about_cafe_delete = "ホームページを削除すると、リンクされている全てのモジュール(掲示板、ページなど)とそれに付随する書き込みが削除されます。<br />ご注意ください。";
+    $lang->about_cafe_admin = "ホームページ管理者の設定が出来ます。<br/>ホームページ管理者は 「 http://ドメイン/?act=dispHomepageManage」 として管理者ページにアクセスが出来ます。<br />存在しない会員は管理者に登録できません。";
 
     $lang->confirm_change_layout = "レイアウトの変更時、一部のレイアウト情報が失われる可能性があります。 変更しますか?";
     $lang->confirm_delete_menu_item = "メニュー削除時、リンクされている掲示板やページモジュールも一緒に削除されます。削除しますか?";
diff --git a/modules/homepage/lang/ko.lang.php b/modules/homepage/lang/ko.lang.php
index 0f8262853..0443a7f56 100644
--- a/modules/homepage/lang/ko.lang.php
+++ b/modules/homepage/lang/ko.lang.php
@@ -2,83 +2,78 @@
     /**
      * @file   ko.lang.php
      * @author zero (zero@nzeo.com)
-     * @brief  홈페이지(homepage) 모듈의 기본 언어팩
+     * @brief  CafeXE(homepage) 모듈의 기본 언어팩
      **/
 
-    $lang->homepage = "홈페이지"; 
-    $lang->homepage_title = "홈페이지 이름";
-    $lang->module_type = "대상";
-    $lang->board = "게시판";
-    $lang->page = "페이지";
-    $lang->module_id = "모듈 ID";
-    $lang->item_group_grant = "보여줄 그룹";
-    $lang->homepage_admin = "홈페이지 관리자";
-    $lang->do_selected_member = "선택된 회원을 : ";
+    $lang->cafe = 'CafeXE'; 
+    $lang->cafe_title = 'Cafe 이름';
+    $lang->module_type = '대상';
+    $lang->board = '게시판';
+    $lang->page = '페이지';
+    $lang->module_id = '모듈 ID';
+    $lang->item_group_grant = '보여줄 그룹';
+    $lang->cafe_info = '카페 정보';
+    $lang->cafe_admin = 'Cafe 관리자';
+    $lang->do_selected_member = '선택된 회원을 : ';
 
-    $lang->homepage_default_menus = array(
-        'first' => array(
-            'home' => '홈',
-            'notice' => '공지사항',
-            'download' => '자료실',
-            'gallery' => '갤러리',
-            'community' => '커뮤니티',
-            'freeboard' => '자유게시판',
-            'humor' => '재밌는 이야기',
-            'qa' => '질문/답변',
-        ),
-        'second' => array(
-            'profile' => '홈페이지 소개',
-            'rule' => '운영원칙',
-        ),
-        'menu' => array(
-            'first' => '기본메뉴',
-            'second' => '아래메뉴',
-        ),
-        'widget' => array(
-            'download_rank' => '다운로드 순위',
-        ),
+    $lang->default_menus = array(
+        'home' => '홈',
+        'notice' => '공지사항',
+        'levelup' => '등업신청',
+        'freeboard' => '자유게시판',
+        'view_total' => '전체 글 보기',
+        'view_comment' => '한줄 이야기',
+        'cafe_album' => '카페 앨범',
+        'menu' => '메뉴',
+        'default_group1' => '대기회원',
+        'default_group2' => '준회원',
+        'default_group3' => '정회원',
     );
 
-    $lang->cmd_homepage_menus = array(
-        "dispHomepageManage" => "홈페이지 설정",
-        "dispHomepageMemberGroupManage" => "회원그룹관리",
-        "dispHomepageMemberManage" => "회원 목록",
-        "dispHomepageTopMenu" => "기본 메뉴 관리",
-        "dispHomepageBottomMenu" => "하부 메뉴 관리",
-        "dispHomepageMidSetup" => "모듈 세부 설정",
+    $lang->cmd_admin_menus = array(
+        'dispHomepageManage' => 'Cafe 설정',
+        'dispHomepageMemberGroupManage' => '회원그룹관리',
+        'dispHomepageMemberManage' => '회원 목록',
+        'dispHomepageTopMenu' => '기본 메뉴 관리',
+        "dispHomepageComponent" => "기능 설정",
+        'dispHomepageCounter' => '접속 통계',
+        'dispHomepageMidSetup' => '모듈 세부 설정',
     );
-    $lang->cmd_homepage_registration = "홈페이지 생성";
-    $lang->cmd_homepage_setup = "홈페이지 설정";
-    $lang->cmd_homepage_delete = "홈페이지 삭제";
-    $lang->cmd_go_home = "홈으로 이동";
-    $lang->cmd_go_homepage_admin = '홈페이지 전체 관리';
-    $lang->cmd_change_layout = "변경";
-    $lang->cmd_select_index = "초기화면 선택";
-    $lang->cmd_add_new_menu = "새로운 메뉴 추가";
+    $lang->cmd_cafe_registration = 'Cafe 생성';
+    $lang->cmd_cafe_setup = 'Cafe 설정';
+    $lang->cmd_cafe_delete = 'Cafe 삭제';
+    $lang->cmd_go_home = '홈으로 이동';
+    $lang->cmd_go_cafe_admin = 'Cafe 전체 관리';
+    $lang->cmd_change_layout = '변경';
+    $lang->cmd_select_index = '초기화면 선택';
+    $lang->cmd_add_new_menu = '새로운 메뉴 추가';
+    $lang->default_language = '기본 언어';
+    $lang->about_default_language = '처음 접속하는 사용자의 언어 설정을 지정할 수 있습니다.';
 
-    $lang->about_homepage_act = array(
-        "dispHomepageManage" => "홈페이지의 모양을 꾸밀 수 있습니다",
-        "dispHomepageMemberGroupManage" => "홈페이지 내에서 사용되는 그룹 관리를 할 수 있습니다",
-        "dispHomepageMemberManage" => "홈페이지에 등록된 회원들을 보거나 관리할 수 있습니다",
-        "dispHomepageTopMenu" => "홈페이지의 상단이나 좌측등에 나타나는 일반적인 메뉴를 수정하거나 추가할 수 있습니다",
-        "dispHomepageBottomMenu" => "홈페이지의 하단에 나타나는 작은 메뉴들을 수정하거나 추가할 수 있습니다",
-        "dispHomepageMidSetup" => "홈페이지에서 사용하는 게시판, 페이지등의 모듈 세부 설정을 할 수 있습니다",
+    $lang->about_cafe_act = array(
+        'dispHomepageManage' => 'Cafe의 모양을 꾸밀 수 있습니다',
+        'dispHomepageMemberGroupManage' => 'Cafe 내에서 사용되는 그룹 관리를 할 수 있습니다',
+        'dispHomepageMemberManage' => 'Cafe에 등록된 회원들을 보거나 관리할 수 있습니다',
+        'dispHomepageTopMenu' => 'Cafe의 상단이나 좌측등에 나타나는 일반적인 메뉴를 수정하거나 추가할 수 있습니다',
+        "dispHomepageComponent" => "에디터 컴포넌트/ 애드온을 활성화 하거나 설정을 변경할 수 있습니다",
+        'dispHomepageCounter' => 'Cafe의 접속 현황을 볼 수 있습니다',
+        'dispHomepageMidSetup' => 'Cafe에서 사용하는 게시판, 페이지등의 모듈 세부 설정을 할 수 있습니다',
     );
-    $lang->about_homepage = "홈페이지 서비스 관리자는 다수의 홈페이지를 만들 수 있고 또 각 홈페이지를 편하게 설정할 수 있도록 합니다.";
-    $lang->about_homepage_title = "홈페이지 이름은 관리를 위해서만 사용될 뿐 서비스에는 나타나지 않습니다";
-    $lang->about_domain = "1개 이상의 홈페이지를 만들기 위해서는 전용 도메인이 있어야 합니다.<br/>독립 도메인이나 서브 도메인이 있으면 되고 XE가 설치된 경로까지 같이 넣어주세요.<br />ex) www.zeroboard.com/zbxe";
-    $lang->about_menu_names = "홈페이지에 나타날 메뉴 이름을 언어에 따라서 지정할 수 있습니다.<br/>하나만 입력하셔도 모두 같이 적용됩니다";
-    $lang->about_menu_option = "메뉴를 선택시 새창으로 열지를 선택할 수 있습니다.<br />펼침 메뉴는 레이아웃에 따라 동작합니다";
-    $lang->about_group_grant = "그룹을 선택하면 선택된 그룹만 메뉴가 보입니다.<br/>모두 해제하면 비회원도 볼 수 있습니다";
-    $lang->about_module_type = "게시판,페이지는 모듈을 생성하고 URL은 링크만 합니다.<br/>생성후 수정할 수 없습니다";
-    $lang->about_browser_title = "메뉴에 접속시 브라우저의 제목으로 나타날 내용입니다";
-    $lang->about_module_id = "게시판,페이지등 접속할때 사용될 주소입니다.<br/>예) http://도메인/[모듈ID], http://도메인/?mid=[모듈ID]";
-    $lang->about_menu_item_url = "대상을 URL로 할때 연결할 링크주소입니다.<br/>http://는 빼고 입력해주세요";
-    $lang->about_menu_image_button = "메뉴명 대신 이미지로 메뉴를 사용할 수 있습니다.";
-    $lang->about_homepage_delete = "홈페이지를 삭제하게 되면 연결되어 있는 모든 모듈(게시판,페이지등)과 그에 따른 글들이 삭제됩니다.<br />주의가 필요합니다";
-    $lang->about_homepage_admin = "홈페이지 관리자를 설정할 수 있습니다.<br/>홈페이지 관리자는 http://주소/?module=homepage 로 관리자 페이지로 접속할 수 있으며 존재하지 않는 사용자는 관리자로 등록되지 않습니다";
+    $lang->about_cafe = 'Cafe 서비스 관리자는 다수의 Cafe를 만들 수 있고 또 각 Cafe를 편하게 설정할 수 있도록 합니다.';
+    $lang->about_cafe_title = 'Cafe 이름은 관리를 위해서만 사용될 뿐 서비스에는 나타나지 않습니다';
+    $lang->about_domain = '1개 이상의 Cafe를 만들기 위해서는 전용 도메인이 있어야 합니다.<br/>독립 도메인이나 서브 도메인이 있으면 되고 XE가 설치된 경로까지 같이 넣어주세요.<br />ex) www.zeroboard.com/zbxe';
+    $lang->about_menu_names = 'Cafe에 나타날 메뉴 이름을 언어에 따라서 지정할 수 있습니다.<br/>하나만 입력하셔도 모두 같이 적용됩니다';
+    $lang->about_menu_option = '메뉴를 선택시 새창으로 열지를 선택할 수 있습니다.<br />펼침 메뉴는 레이아웃에 따라 동작합니다';
+    $lang->about_group_grant = '그룹을 선택하면 선택된 그룹만 메뉴가 보입니다.<br/>모두 해제하면 비회원도 볼 수 있습니다';
+    $lang->about_module_type = '게시판,페이지는 모듈을 생성하고 URL은 링크만 합니다.<br/>생성후 수정할 수 없습니다';
+    $lang->about_browser_title = '메뉴에 접속시 브라우저의 제목으로 나타날 내용입니다';
+    $lang->about_module_id = '게시판,페이지등 접속할때 사용될 주소입니다.<br/>예) http://도메인/[모듈ID], http://도메인/?mid=[모듈ID]';
+    $lang->about_menu_item_url = '대상을 URL로 할때 연결할 링크주소입니다.<br/>http://는 빼고 입력해주세요';
+    $lang->about_menu_image_button = '메뉴명 대신 이미지로 메뉴를 사용할 수 있습니다.';
+    $lang->about_cafe_delete = 'Cafe를 삭제하게 되면 연결되어 있는 모든 모듈(게시판,페이지등)과 그에 따른 글들이 삭제됩니다.<br />주의가 필요합니다';
+    $lang->about_cafe_admin = 'Cafe 관리자를 설정할 수 있습니다.<br/>Cafe 관리자는 http://주소/?act=dispHomepageManage 로 관리자 페이지로 접속할 수 있으며 존재하지 않는 사용자는 관리자로 등록되지 않습니다';
 
-    $lang->confirm_change_layout = "레이아웃을 변경할 경우 레이아웃 정보들 중 일부가 사라질 수가 있습니다. 변경하시겠습니까?";
-    $lang->confirm_delete_menu_item = "메뉴 항목 삭제시 연결되어 있는 게시판이나 페이지 모듈도 같이 삭제가 됩니다. 그래도 삭제하시겠습니까?";
-    $lang->msg_already_registed_domain = "이미 등록된 도메인입니다. 다른 도메인을 사용해주세요";
+    $lang->confirm_change_layout = '레이아웃을 변경할 경우 레이아웃 정보들 중 일부가 사라질 수가 있습니다. 변경하시겠습니까?';
+    $lang->confirm_delete_menu_item = '메뉴 항목 삭제시 연결되어 있는 게시판이나 페이지 모듈도 같이 삭제가 됩니다. 그래도 삭제하시겠습니까?';
+    $lang->msg_already_registed_domain = '이미 등록된 도메인입니다. 다른 도메인을 사용해주세요';
 ?>
diff --git a/modules/homepage/lang/zh-CN.lang.php b/modules/homepage/lang/zh-CN.lang.php
index 7d0ed9217..a137d10d9 100644
--- a/modules/homepage/lang/zh-CN.lang.php
+++ b/modules/homepage/lang/zh-CN.lang.php
@@ -5,67 +5,62 @@
      * @brief  站点(homepage)模块语言包
      **/
 
-    $lang->homepage = "站点"; 
-    $lang->homepage_title = "站点名称";
+    $lang->cafe = "站点"; 
+    $lang->cafe_title = "站点名称";
     $lang->module_type = "对象";
     $lang->board = "版面";
     $lang->page = "页面";
     $lang->module_id = "模块ID";
     $lang->item_group_grant = "用户组";
-    $lang->homepage_admin = "管理员";
-    $lang->do_selected_member = "把被选用户 : ";
+    $lang->cafe_info = "站点信息";
+    $lang->cafe_admin = "管理员";
+    $lang->do_selected_member = "把所选用户 : ";
 
-    $lang->homepage_default_menus = array(
-        'first' => array(
-            'home' => '首页',
-            'notice' => '公告',
-            'download' => '下载',
-            'gallery' => '图片',
-            'community' => '社区',
-            'freeboard' => '自由交流区',
-            'humor' => '幽默/休闲',
-            'qa' => 'Q and A',
-        ),
-        'second' => array(
-            'profile' => '关于我们',
-            'rule' => '使用条款',
-        ),
-        'menu' => array(
-            'first' => '主菜单',
-            'second' => '尾部菜单',
-        ),
-        'widget' => array(
-            'download_rank' => '下载排名',
-        ),
+    $lang->default_menus = array(
+        'home' => '首页',
+        'notice' => '站点公告',
+        'levelup' => '级别审批',
+        'freeboard' => '自由交流区',
+        'view_total' => '查看全文',
+        'view_comment' => '问候一句',
+        'cafe_album' => '站点相册',
+        'menu' => '菜单',
+        'default_group1' => '待审批会员',
+        'default_group2' => '准会员',
+        'default_group3' => '正会员',
     );
 
-    $lang->cmd_homepage_menus = array(
+    $lang->cmd_admin_menus = array(
         "dispHomepageManage" => "站点设置",
         "dispHomepageMemberGroupManage" => "用户组管理",
         "dispHomepageMemberManage" => "用户列表",
-        "dispHomepageTopMenu" => "主菜单管理",
-        "dispHomepageBottomMenu" => "尾部菜单管理",
-        "dispHomepageMidSetup" => "模块详细设置",
+        "dispHomepageTopMenu" => "菜单管理",
+        "dispHomepageComponent" => "扩展管理",
+        "dispHomepageCounter" => "访问统计",
+        "dispHomepageMidSetup" => "模块设置",
     );
-    $lang->cmd_homepage_registration = "生成站点";
-    $lang->cmd_homepage_setup = "站点设置";
-    $lang->cmd_homepage_delete = "删除站点";
+    $lang->cmd_cafe_registration = "生成站点";
+    $lang->cmd_cafe_setup = "站点设置";
+    $lang->cmd_cafe_delete = "删除站点";
     $lang->cmd_go_home = "查看主页";
-    $lang->cmd_go_homepage_admin = '站点管理';
+    $lang->cmd_go_cafe_admin = '站点管理';
     $lang->cmd_change_layout = "修改";
     $lang->cmd_select_index = "选择默认首页";
     $lang->cmd_add_new_menu = "添加新菜单";
+    $lang->default_language = "默认语言";
+    $lang->about_default_language = "可以设置显示给首次访问者的同一语言环境。";
 
-    $lang->about_homepage_act = array(
+    $lang->about_cafe_act = array(
         "dispHomepageManage" => "在此可以设置站点风格。",
         "dispHomepageMemberGroupManage" => "在此可以管理站点内的用户组。",
         "dispHomepageMemberManage" => "在此可以查看或管理用户。",
         "dispHomepageTopMenu" => "在此可以设置主菜单及所属子菜单。",
-        "dispHomepageBottomMenu" => "在此可以设置站点尾部菜单。",
+        "dispHomepageComponent" => "可以激活及设置网页编辑器组件/插件。",
+        "dispHomepageCounter" => "可以查看站点的访问统计数据。",
         "dispHomepageMidSetup" => "在此可以设置站点内的版面，页面等模块的详细设置。",
     );
-    $lang->about_homepage = "站点工具不仅可以迅速建立多个站点，而且非常方便各项设置。";
-    $lang->about_homepage_title = "建议使用一个即简洁又直观的名称。此名称不会显示到用户页面当中。";
+    $lang->about_cafe = "站点工具不仅可以迅速建立多个站点，而且非常方便各项设置。";
+    $lang->about_cafe_title = "建议使用一个即简洁又直观的名称。此名称不会显示到用户页面当中。";
     $lang->about_domain = "要创建一个站点必须有一个专用域名。<br/>一级域名或二级域名皆可。输入的时候请把XE安装路径也一起输入。<br />ex) www.zeroboard.com/zbxe";
     $lang->about_menu_names = "在此可以指定多国语言菜单。<br/>如只输入一项，其他语言同时只应用此项语言。";
     $lang->about_menu_option = "可以设置点击菜单时是否要在新窗口中打开。<br />展开选项随布局。";
@@ -75,8 +70,8 @@
     $lang->about_module_id = "访问版面，页面时使用的地址。<br/>例) http://域名/[模块ID], http://域名/?mid=[模块ID]";
     $lang->about_menu_item_url = "对象选择URL时，要链接的地址。<br/>输入的时候请不要输入http://头。";
     $lang->about_menu_image_button = "可以用图片来代替菜单名。";
-    $lang->about_homepage_delete = "删除站点：即删除所以所属模块(版面，页面等)及所属主题。<br />一定要慎重操作。";
-    $lang->about_homepage_admin = "可以指定站点管理员。<br/>管理员登录口为http://域名/?module=homepage。管理员只能在已有的用户中指定。";
+    $lang->about_cafe_delete = "删除站点：即删除所以所属模块(版面，页面等)及所属主题。<br />一定要慎重操作。";
+    $lang->about_cafe_admin = "可以指定站点管理员。<br/>管理员登录口为http://域名/?act=dispHomepageManage。管理员只能在已有的用户中指定。";
 
     $lang->confirm_change_layout = "切换布局可能一些原有的信息将无法显示。你确定要切换吗？";
     $lang->confirm_delete_menu_item = "删除菜单：即同时删除链接到此菜单的版面或页面模块。你确定要删除吗？";
diff --git a/modules/homepage/lang/zh-TW.lang.php b/modules/homepage/lang/zh-TW.lang.php
index 22cce3ed0..7a60c424e 100644
--- a/modules/homepage/lang/zh-TW.lang.php
+++ b/modules/homepage/lang/zh-TW.lang.php
@@ -1,83 +1,78 @@
 <?php
     /**
      * @file   zh-TW.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  網站(homepage) 基本模組
+     * @author zero (zero@nzeo.com) 翻譯︰royallin
+     * @brief  虛擬網站(homepage)基本模組
      **/
 
-    $lang->homepage = "網站"; 
-    $lang->homepage_title = "網站名稱";
+    $lang->cafe = "虛擬網站"; 
+    $lang->cafe_title = "網站名稱";
     $lang->module_type = "目標";
     $lang->board = "討論板";
     $lang->page = "頁面";
     $lang->module_id = "模組 ID";
     $lang->item_group_grant = "顯示群組";
-    $lang->homepage_admin = "網站管理者";
+    $lang->cafe_info = "網站資訊";
+    $lang->cafe_admin = "網站管理者";
     $lang->do_selected_member = "選擇會員 : ";
 
-    $lang->homepage_default_menus = array(
-        'first' => array(
-            'home' => '首頁',
-            'notice' => '公告事項',
-            'download' => '下載',
-            'gallery' => '相簿',
-            'community' => '討論',
-            'freeboard' => '自由討論',
-            'humor' => '新鮮趣事',
-            'qa' => 'Q and A',
-        ),
-        'second' => array(
-            'profile' => '網站介紹',
-            'rule' => '使用規範',
-        ),
-        'menu' => array(
-            'first' => '基本選單',
-            'second' => '子選單',
-        ),
-        'widget' => array(
-            'download_rank' => '下載排行',
-        ),
+    $lang->default_menus = array(
+        'home' => '首頁',
+        'notice' => '公告事項',
+        'levelup' => '等級審核',
+        'freeboard' => '自由討論',
+        'view_total' => '檢視全部',
+        'view_comment' => '故事線',
+        'cafe_album' => '網站相簿',
+        'menu' => '選單',
+        'default_group1' => '待審會員',
+        'default_group2' => '準會員',
+        'default_group3' => '正會員',
     );
 
-    $lang->cmd_homepage_menus = array(
+    $lang->cmd_admin_menus = array(
         "dispHomepageManage" => "網站設定",
         "dispHomepageMemberGroupManage" => "會員群組管理",
         "dispHomepageMemberManage" => "會員列表",
         "dispHomepageTopMenu" => "主選單",
-        "dispHomepageBottomMenu" => "底部選單",
+        "dispHomepageComponent" => "功能設定",
+        "dispHomepageCounter" => "訪問統計",
         "dispHomepageMidSetup" => "詳細設定",
     );
-    $lang->cmd_homepage_registration = "建立網站";
-    $lang->cmd_homepage_setup = "網站設置";
-    $lang->cmd_homepage_delete = "刪除網站";
+    $lang->cmd_cafe_registration = "建立網站";
+    $lang->cmd_cafe_setup = "網站設置";
+    $lang->cmd_cafe_delete = "刪除網站";
     $lang->cmd_go_home = "移至首頁";
-    $lang->cmd_go_homepage_admin = '管理頁面';
+    $lang->cmd_go_cafe_admin = '管理頁面';
     $lang->cmd_change_layout = "變更";
     $lang->cmd_select_index = "選擇初始頁面";
     $lang->cmd_add_new_menu = "新增選單";
+    $lang->default_language = "預設語言";
+    $lang->about_default_language = "可以設置顯示語言給首次訪問的使用者。";
 
-    $lang->about_homepage_act = array(
+    $lang->about_cafe_act = array(
         "dispHomepageManage" => "可設定網站風格",
         "dispHomepageMemberGroupManage" => "可管理網站內的用戶群組",
         "dispHomepageMemberManage" => "可以檢視和管理會員",
         "dispHomepageTopMenu" => "可建立或管理左側或上端的選單",
-        "dispHomepageBottomMenu" => "可設置和管理底部選單",
+        "dispHomepageComponent" => "可選擇是否啟用網頁編輯器組件/附加元件",
+        "dispHomepageCounter" => "可以檢視虛擬網站的訪問數據統計。",
         "dispHomepageMidSetup" => "可詳細設定網站所使用的討論板，頁面等模組",
     );
-    $lang->about_homepage = "網站模組可快速建立網站，且容易進行設定。";
-    $lang->about_homepage_title = "只有在管理時才看的到此標題。";
+    $lang->about_cafe = "虛擬網站模組可快速建立網站，且容易進行設定。";
+    $lang->about_cafe_title = "只有在管理時才看的到此標題。";
     $lang->about_domain = "要建立網站必須要有個專屬域名。<br/>頂級域名或次級域名都可以。輸入時，請將XE安裝路徑也一起輸入。<br />例) www.zeroboard.com/zbxe";
     $lang->about_menu_names = "可指定語言。<br/>如果只輸入其中一項，其他語言將會顯示一樣。";
     $lang->about_menu_option = "可設定案選單時，是否要以新視窗開啟。<br />選展開的話，是隨版面。";
 
     $lang->about_group_grant = "有選擇用戶群組的話，只有被選擇的用戶群組才看的到。<br/>沒有選擇的話，非會員也能觀看。";
-    $lang->about_module_type = "討論板，頁面可直接建立該模組和 URL。<br/>注意：建立後無法再修改";
+    $lang->about_module_type = "討論板，頁面可直接建立該模組和連結網址。<br/>注意：建立後無法再修改";
     $lang->about_browser_title = "連結選單後，顯示在瀏覽器視窗的標題。";
-    $lang->about_module_id = "連結討論板，頁面等模組時，所要輸入的格式。<br/>例) http://域名/[模組 ID], http://域名/?mid=[模組 ID]";
-    $lang->about_menu_item_url = "目標是 URL時，在此輸入網址。<br/>請勿輸入 http://";
+    $lang->about_module_id = "連結討論板，頁面等模組時，所要輸入的格式。<br/>例) http://域名/[模組 ID]，或 http://域名/?mid=[模組 ID]";
+    $lang->about_menu_item_url = "目標是連結網址時，在此輸入網址。<br/>請勿輸入 http://";
     $lang->about_menu_image_button = "可用圖片代替選單名稱";
-    $lang->about_homepage_delete = "刪除網站：即刪除所有相關的模組(討論板，頁面等)以及相關文章。請慎重使用。";
-    $lang->about_homepage_admin = "可以建立網站管理員。<br/>管理員登入網址是 http://域名/?module=homepage。只能在現有的會員中指定管理員。";
+    $lang->about_cafe_delete = "刪除網站：即刪除所有相關的模組(討論板，頁面等)以及相關文章。請慎重使用。";
+    $lang->about_cafe_admin = "可以建立網站管理員。<br/>管理員登入網址是 http://域名/?act=dispHomepageManage。只能在現有的會員中指定管理員。";
 
     $lang->confirm_change_layout = "變換版面可能會使原來的資料無法顯示。確定要變換嗎？";
     $lang->confirm_delete_menu_item = "刪除選單：刪除選單的同時，將會使連結到選單的討論板或頁面一起刪除。確定要刪除嗎？";
diff --git a/modules/homepage/skins/xe_official/board_addition_setup.html b/modules/homepage/skins/xe_official/board_addition_setup.html
deleted file mode 100644
index 29ba91962..000000000
--- a/modules/homepage/skins/xe_official/board_addition_setup.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--#include("board_header.html")-->
-
-{$setup_content}
diff --git a/modules/homepage/skins/xe_official/board_grant_list.html b/modules/homepage/skins/xe_official/board_grant_list.html
deleted file mode 100644
index f804af9d2..000000000
--- a/modules/homepage/skins/xe_official/board_grant_list.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--#include("./board_header.html")-->
-<!--%import("filter/insert_grant.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl?$module_srl:$module_srls}" />
-
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->about_grant}</caption>
-<thead>
-<tr>
-    <th scope="col"><div>{$lang->grant}</div></th>
-    <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-</tr>
-</thead>
-
-<tbody>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true });return false;">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false });return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td colspan="4" class="right">
-            <span class="button blue"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </td>
-    </tr>
-</tbody>
-</table>
-</form>
diff --git a/modules/homepage/skins/xe_official/board_header.html b/modules/homepage/skins/xe_official/board_header.html
deleted file mode 100644
index 1bc3e9356..000000000
--- a/modules/homepage/skins/xe_official/board_header.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3 class="title">{$lang->board} > {$module_info->browser_title} <span class="gray">{$lang->cmd_setup}</span></h3>
-
-<ul class="localNavigation">
-    <li><a href="{getUrl('act','dispHomepageBoardInfo','module_srl',$module_srl)}">{$lang->cmd_setup}</a></li>
-    <li><a href="{getUrl('act','dispHomepageBoardAddition','module_srl',$module_srl)}">{$lang->cmd_addition_setup}</a></li>
-    <li><a href="{getUrl('act','dispHomepageBoardGrant','module_srl',$module_srl)}">{$lang->grant}</a></li>
-    <li><a href="{getUrl('act','dispHomepageBoardSkin','module_srl',$module_srl)}">{$lang->skin}</a></li>
-    <li><a href="{getUrl('','mid',$module_info->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></li>
-</ul>
diff --git a/modules/homepage/skins/xe_official/css/default.css b/modules/homepage/skins/xe_official/css/default.css
deleted file mode 100644
index 14a3e8f49..000000000
--- a/modules/homepage/skins/xe_official/css/default.css
+++ /dev/null
@@ -1,195 +0,0 @@
-@charset "utf-8"; 
-
-#menuItem { visibility:hidden; position:absolute; left:0; top:0; background-color:#FFFFFF; z-index:1000; border:2px solid #DDDDDD; padding:10px;}
-#menu_normal_btn_zone { display:none; }
-#menu_hover_btn_zone { display:none; }
-#menu_active_btn_zone { display:none; }
-
-.topGap { margin-top:10px; }
-.rightGap { margin-right:10px; }
-.bottomGap { margin-bottom:15px; }
-.leftGap { margin-left:10px; }
-textarea { padding:.3em 0 0 .3em;}
-
-h3.title { margin:0; padding:8px 0 0 10px; border:1px solid #5E95BC; border-left:1px solid #8EB9D8; border-top:1px solid #8EB9D8; background:url("../images/n_title_bg.gif") repeat-x left top; font-size:1em; color:#27536C; height:22px;}
-h3.title .gray { color:#8AB2CE;}
-.infoText { background:#FFFFFF; padding:10px; color:#27536C; border-left:1px solid #8AB2CE; border-bottom:1px solid #8AB2CE; border-right:1px solid #8AB2CE; line-height:1.5; margin-bottom:10px; }
-.subInfoText { background:#FFFFFF; padding:10px; color:#27536C; border:1px solid #EEEEEE; line-height:1.5; margin-bottom:10px; }
-
-h4 { text-align:right; font-size:12pt; color:#f2250d; padding-left:10px; margin:0;}
-h4 .bracket { font-weight:normal; color:#9d9d9d;}
-h4 .vr { font-weight:normal; color:#d1d1d1;}
-h4 .view { color:#158692; padding-right:.6em; font:bold 9pt Tahoma; text-decoration:none; }
-
-div.summary { clear:both; font:8pt tahoma; color:#636363; margin-bottom:5px; }
-div.summary .vr { font-weight:normal; color:#d1d1d1; }
-div.summary em { color:#ff1d00; font-style:normal;}
-
-.adminLeftContent { float:left; width:60%; margin-right:2%; _margin-right:1.9%;}
-.adminRightExtra { float:left; width:38%; }
-
-.adminTable { width:100%; border:1px solid #9BC2DE; border-bottom:none; border-right:none; margin-bottom:15px; }
-.adminTable caption { background:url("../images/n_caption_head.gif") no-repeat left top; padding:8px 0 5px 30px; text-align:left; font-weight:bold; color:#FFFFFF; background-color:#548DB5; border-bottom:1px solid #FFFFFF; }
-
-.adminTable thead tr th div { text-align:center;}
-.adminTable thead tr th { background-color:#70A2C6; color:#FFFFFF; }
-.adminTable tr th { background-color:#FFFFFF; padding:6px; font-weight:bold; text-align:left; color:#666; border-right:1px solid #9BC2DE; border-bottom:1px solid #9BC2DE; }
-.adminTable tr.row2 th { background-color:#F3F3F3; }
-.adminTable tr th { width:10px; }
-.adminTable tr th div { white-space:nowrap; margin:0 5px; }
-.adminTable tr th select { height:20px; }
-.adminTable tr th.wide { width:100%; }
-.adminTable tr th.half_wide { width:50%; }
-.adminTable tr th.quarter_wide { width:25%; }
-.adminTable tr td.wide { width:100%; }
-
-.adminTable tr td { background-color:#FFFFFF;white-space:normal; font-weight:normal; text-align:left; color:#222222;  border-bottom:1px solid #9BC2DE; border-right:1px solid #9BC2DE; padding:4px 6px 4px 6px;}
-.adminTable tr.row2 td { background-color:#F3F3F3; }
-.adminTable tr a { color:#222222; text-decoration:none; }
-.adminTable tr a:hover { color:#3D83B8; }
-.adminTable tr td.nowrap { white-space:nowrap !important; }
-.adminTable tr td.alert, .adminTable tr td.alert a { color:red; }
-.adminTable tr td.number { font-size:8pt; font-family:tahoma; color:#27536C; }
-.adminTable tr td.date,
-.adminTable tr td span.date { font-size:8pt; font-family:tahoma; color:#666666;}
-.adminTable tr td.center { text-align:center; }
-.adminTable tr td.right { text-align:right; }
-.adminTable tr td.paper { background:transparent url("../images/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.paper { background:#F3F3F3 url("../images/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr td.circle { background:#FFFFFF url("../images/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.circle { background:#F3F3F3 url("../images/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr td strong.alert { color:red; }
-.adminTable tr td p { padding:0; margin:5px 0 0 5px; color:#777777; }
-.adminTable tr td p a { color:#9F875F; font-weight:bold; text-decoration:underline; }
-.adminTable tr td.modify a,
-.adminTable tr td.delete a,
-.adminTable tr td.copy a,
-.adminTable tr td.setup a,
-.adminTable tr td.activated a,
-.adminTable tr td.deactivated a,
-.adminTable tr td.moveupdown a,
-.adminTable tr td.selectAll a,
-.adminTable tr td.deSelectAll a,
-.adminTable tr td.view a { margin:0 auto; }
-.adminTable tr td.modify a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_modify.gif") no-repeat left top; }
-.adminTable tr td.delete a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_delete.gif") no-repeat left top; }
-.adminTable tr td.copy a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_copy.gif") no-repeat left top; }
-.adminTable tr td.view a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_view.gif") no-repeat left top; }
-.adminTable tr td.setup a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_setup.gif") no-repeat left top; }
-.adminTable tr td.activated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_light_on.gif") no-repeat left top; }
-.adminTable tr td.deactivated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_light_off.gif") no-repeat left top;   }
-.adminTable tr td.selectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_select_all.gif") no-repeat left top; }
-.adminTable tr td.deSelectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/n_icon_remove.gif") no-repeat left top; }
-.adminTable tr td.moveupdown a.up { float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/button_up.gif") no-repeat left top; margin-right:5px; }
-.adminTable tr td.moveupdown a.down{ float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../images/button_down.gif") no-repeat left top; }
-.adminTable tr td.blue, .adminTable tr td.blue a { color:blue; } 
-.adminTable tr td.red, .adminTable tr td.red a { color:red; }
-
-ul.localNavigation { position:relative; clear:both; margin:10px 0 10px 0; padding:0 0 0 10px; height:25px; overflow:hidden; border-bottom:1px solid #86B4D2; }
-ul.localNavigation li { list-style:none; background:url("../images/n_small_tab.gif") no-repeat scroll left -26px; float:left; margin-right:10px; position:relative; text-align:center; top:4px; height:25px;}
-ul.localNavigation li a { background:url("../images/n_small_tab.gif") no-repeat scroll right -26px; color:#27536C; display:block; float:left; left:3px; padding:5px 15px 0 10px; position:relative; text-decoration:none; height:25px;}
-ul.localNavigation li a:hover { color:#000000; }
-ul.localNavigation li.on { background-position:left top; top:0; height:25px; }
-ul.localNavigation li.on a { background-position:right top; padding:8px 15px 5px 10px; height:25px; color:#222227; font-weight:bold; }
-
-#popHeadder, #popHistoryHeadder { margin-bottom:10px;}
-#popHeadder h1, #popHistoryHeadder h1 { background:url("../images/top_head_title_bg.gif") repeat-x left top; font-size:1em; border:1px solid #E3E3E2; padding:9px; color:#555555; margin:0; }
-#popBody, #popHistoryBody { width:600px; padding:10px; background:#ffffff;}
-#popHistoryBody { height: 200px; overflow: auto; padding-right:0; }
-#popFooter { width:620px; background:#70A2C6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; }
-#popFooter .close { position:relative; left:50%; margin-left:-1em; float:left;}
-
-.adminSearch { text-align:right; clear:both; width:100%; margin:0 0 10px 0;}
-.adminSearch fieldset { border:none; display:inline; overflow:visible; padding:0;}
-.adminSearch * { vertical-align:middle;} 
-
-.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; position:relative; top:-1px; font:.75em Tahoma; text-align:center; background:url(../images/buttonTypeInput24.gif) no-repeat; }
-
-.layout_editor { width:99%; height:500px; border:0px; font-size:1em; }
-.layout_editor_box { padding:10px; border:1px solid #DDDDDD; }
-
-.fixWidth { width:90%; }
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-.pagination.a2 a,
-.pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-.pagination.a2 a.prev{ padding-left:10px; background:#fff url(../images/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../images/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a2 a.next{ padding-right:10px; background:#fff url(../images/arrowNextA1.gif) no-repeat right center; }
-.pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../images/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-.pagination.b1 a,
-.pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-.pagination.b1 a.prev{ padding-left:16px; background:url(../images/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b1 a.next{ padding-right:16px; background:url(../images/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-.pagination.b2 a,
-.pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-.pagination.b2 a.prev{ padding-left:12px; background:url(../images/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b2 a.next{ padding-right:12px; background:url(../images/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-.pagination.c1 a,
-.pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-.pagination.c1 a.prev,
-.pagination.c1 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c1 a.prev{ background:url(../images/arrowPrevC1.gif) no-repeat center;}
-.pagination.c1 a.next{ background:url(../images/arrowNextC1.gif) no-repeat center;}
-.pagination.c1 a.prev span,
-.pagination.c1 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-.pagination.c2 a,
-.pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-.pagination.c2 a.prev,
-.pagination.c2 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c2 a.prev{ background:url(../images/arrowPrevC1.gif) no-repeat center;}
-.pagination.c2 a.next{ background:url(../images/arrowNextC1.gif) no-repeat center;}
-.pagination.c2 a.prev span,
-.pagination.c2 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-
-.midDefault { border:1px solid #EEEEEE; padding:10px; margin-bottom:10px; color:#888888;}
-.midDefault select { margin-left:5px; }
-
-div.page { padding-left:20px; background:transparent url("../images/page.gif") no-repeat left 5px; }
-div.page { color:#444444; font-weight:bold; }
-div.page a.insert img { background:transparent url("../images/btn_insert.gif") no-repeat left top; width:14px; height:14px; margin-left:10px;}
-div.page a.modify img { background:transparent url("../images/btn_modify.gif") no-repeat left top; width:14px; height:14px; margin-left:2px;}
-div.page a.delete img { background:transparent url("../images/btn_delete.gif") no-repeat left top; width:14px; height:14px; margin-left:2px;}
-
-ul.nav { margin:0 !important; padding:0; border:1px solid #EEEEEE; background-color:#EFEFEF;}
-ul.nav li { margin:5px; padding:8px !important; border:1px solid #5E95BC; list-style:none; background-color:#FFFFFF;}
-ul.nav li.active { background-color:#70A2C6; }
-ul.nav li a { color:#27536C; text-decoration:none; }
-ul.nav li.active a { font-weight:bold; color:#FFFFFF; }
-
-div.blog_widget_ ul.items li { text-decoration:none; color:#000000; margin-bottom:5px;}
-div.blog_widget_ ul.items li a { text-decoration:none; color:#000000;}
-
-#menu_form { width:100%; }
diff --git a/modules/homepage/skins/xe_official/css/layout.css b/modules/homepage/skins/xe_official/css/layout.css
deleted file mode 100644
index 92821e2d2..000000000
--- a/modules/homepage/skins/xe_official/css/layout.css
+++ /dev/null
@@ -1,44 +0,0 @@
-@charset "utf-8"; 
-@import url("./layoutTemplate.css");
-/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
-
-/* Reset */
-body { margin:2em; font-size:.75em; font-family:Sans-serif;  }
-.liquid hr { display:none; }
-.liquid address { font-style:normal; }
-.liquid h1.title { margin:0;}
-.liquid ul.gnb { position:absolute; right:0; top:0; margin:0; padding:0;}
-.liquid ul.gnb li { display:inline; margin:0; padding:0;}
-
-/* Container */
-#container { margin:0 auto; } /* alignCenter = margin:0 auto | alignLeft = margin:0 | alignRight = margin:0 0 0 auto  */
-
-/* Header */
-#header { margin-bottom:2em; border-bottom:3px solid #5E95BC; }
-#header h1 a { color:#000000; text-decoration:none; color:#27536C;}
-
-/* Body */
-#body { *margin-bottom:2em; }
-
-/* Content */
-#content { text-align:justify; margin-bottom:2em; }
-#content .section { margin-bottom:2em; }
-
-/* Navigation */
-#navigation { }
-#navigation .section { margin-bottom:2em; }
-#navigation .section .nav{ padding:0; margin:0; margin-left:1.25em;}
-
-/* Extra */
-#extra { }
-#extra .section { margin-bottom:2em; }
-#extra .section ul{ padding:0; margin:0; margin-left:1.25em;}
-
-/* Footer */
-#footer { padding:1em 0; border-top:1px solid #000; }
-
-/* Heading : h1~h6 */
-#body h2 { position:relative; border-bottom:2px solid #ddd; margin:0 0 1em 0; }
-#body p{ margin:0 0 1em 0;}
-
-
diff --git a/modules/homepage/skins/xe_official/css/layoutTemplate.css b/modules/homepage/skins/xe_official/css/layoutTemplate.css
deleted file mode 100644
index ce3e0c9cd..000000000
--- a/modules/homepage/skins/xe_official/css/layoutTemplate.css
+++ /dev/null
@@ -1,555 +0,0 @@
-@charset "utf-8"; 
-/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
-
-/* Float Clear */
-.fClear { display:block; float:none; clear:both; margin:0; padding:0; width:0; height:0; overflow:hidden; font:0/0 Sans-serif; visibility:hidden; } /* Use it when you want to float clearing */
-
-/* Container */
-#container { position:relative; height:auto !important;}
-
-/* Header */
-#header { position:relative; *zoom:1; }
-
-/* Body */
-#body { position:relative; *zoom:1; }
-#body:after { content:""; display:block; clear:both; }
-
-/* Content */
-#content { position:relative; }
-#content .section { position:relative; }
-
-/* Navigation */
-#navigation { position:relative; }
-#navigation .section { position:relative; }
-
-/* Extra */
-#extra { position:relative; }
-#extra .section { position:relative; }
-
-/* Footer */
-#footer { position:relative; }
-
-/* ---------- Common Display ---------- */
-/* c = #content, n = #navigation, e = #extra */
-.c1 #navigation,
-.c2 #navigation,
-.c3 #navigation,
-.c1 #extra,
-.c2 #extra,
-.c3 #extra
-.cn #extra,
-.nc #extra { display:none; }
-
-.cn #navigation,
-.nc #navigation,
-.ce #navigation,
-.ec #navigation,
-.ne #navigation,
-.en #navigation,
-.cne #navigation,
-.ecn #navigation,
-.nec #navigation,
-.cen #navigation,
-.nce #navigation,
-.enc #navigation,
-.cee #navigation,
-.eec #navigation,
-.ece #navigation,
-.ce #extra,
-.ec #extra,
-.ne #extra,
-.en #extra,
-.cne #extra,
-.ecn #extra,
-.nec #extra,
-.cen #extra,
-.nce #extra,
-.enc #extra,
-.cee #extra,
-.eec #extra,
-.ece #extra { display:block; }
-
-#extra .section{ display:none; }
-.e0 #extra { display:none;}
-.e1 #extra,
-.e2 #extra,
-.e3 #extra,
-.e4 #extra,
-.e5 #extra,
-.e6 #extra,
-.e7 #extra,
-.e8 #extra,
-.e9 #extra,
-.e10 #extra,
-.e1 #extra .extra1,
-.e2 #extra .extra1,
-.e2 #extra .extra2,
-.e3 #extra .extra1,
-.e3 #extra .extra2,
-.e3 #extra .extra3,
-.e4 #extra .extra1,
-.e4 #extra .extra2,
-.e4 #extra .extra3,
-.e4 #extra .extra4,
-.e5 #extra .extra1,
-.e5 #extra .extra2,
-.e5 #extra .extra3,
-.e5 #extra .extra4,
-.e5 #extra .extra5,
-.e6 #extra .extra1,
-.e6 #extra .extra2,
-.e6 #extra .extra3,
-.e6 #extra .extra4,
-.e6 #extra .extra5,
-.e6 #extra .extra6,
-.e7 #extra .extra1,
-.e7 #extra .extra2,
-.e7 #extra .extra3,
-.e7 #extra .extra4,
-.e7 #extra .extra5,
-.e7 #extra .extra6,
-.e7 #extra .extra7,
-.e8 #extra .extra1,
-.e8 #extra .extra2,
-.e8 #extra .extra3,
-.e8 #extra .extra4,
-.e8 #extra .extra5,
-.e8 #extra .extra6,
-.e8 #extra .extra7,
-.e8 #extra .extra8,
-.e9 #extra .extra1,
-.e9 #extra .extra2,
-.e9 #extra .extra3,
-.e9 #extra .extra4,
-.e9 #extra .extra5,
-.e9 #extra .extra6,
-.e9 #extra .extra7,
-.e9 #extra .extra8,
-.e9 #extra .extra9,
-.e10 #extra .extra1,
-.e10 #extra .extra2,
-.e10 #extra .extra3,
-.e10 #extra .extra4,
-.e10 #extra .extra5,
-.e10 #extra .extra6,
-.e10 #extra .extra7,
-.e10 #extra .extra8,
-.e10 #extra .extra9,
-.e10 #extra .extra10 { display:block;}
-
-.nTop #navigation { display:block; }
-
-.ne #navigation,
-.ne #extra,
-.ne #extra .section { float:left; }
-.en #navigation,
-.en #extra,
-.en #extra .section { float:right; }
-
-/* ---------- Fixed Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.fixed #container { width:960px; }
-.fixed #body { width:auto; }
-.fixed #navigation,
-.fixed #extra .section { width:200px; }
-.fixed .c1 #content { width:100%; }
-.fixed .c1 #navigation { width:300px; }
-.fixed .c1 #extra { width:auto; }
-.fixed .c1 #extra .section { width:300px; }
-.fixed .c2 #content { width:740px; }
-.fixed .c3 #content { width:520px;}
-.fixed .cee #extra,
-.fixed .eec #extra{ width:420px;}
-.fixed .ece #extra { width:100%;}
-
-/* Floating 1 Columns */
-.fixed .c1 #content { clear:both; }
-
-.fixed .ne #navigation,
-.fixed .ne #extra .extra1,
-.fixed .ne #extra .extra3,
-.fixed .ne #extra .extra5,
-.fixed .ne #extra .extra7,
-.fixed .ne #extra .extra9 { margin-right:30px; clear:left; *clear:none; }
-
-.fixed .ne #extra .extra2,
-.fixed .ne #extra .extra4,
-.fixed .ne #extra .extra6,
-.fixed .ne #extra .extra8,
-.fixed .ne #extra .extra10 { clear:right; }
-
-.fixed .en #navigation,
-.fixed .en #extra .extra1,
-.fixed .en #extra .extra3,
-.fixed .en #extra .extra5,
-.fixed .en #extra .extra7
-.fixed .en #extra .extra9 { margin-left:30px; clear:right; *clear:none; }
-
-.fixed .en #extra .extra2,
-.fixed .en #extra .extra4,
-.fixed .en #extra .extra6,
-.fixed .en #extra .extra8,
-.fixed .en #extra .extra10 { clear:left; }
-
-/* Floating 2 Columns */
-.fixed .cn #content { float:left; }
-.fixed .cn #navigation,
-.fixed .cn #extra { float:right; }
-
-.fixed .nc #content { float:right; }
-.fixed .nc #navigation,
-.fixed .nc #extra { float:left; }
-
-.fixed .ce #content { float:left; }
-.fixed .ce #navigation,
-.fixed .ce #extra { float:right; *float:none; *left:20px; _left:17px;  }
-
-.fixed .ec #content { float:right; }
-.fixed .ec #navigation,
-.fixed .ec #extra { float:left; *float:none; }
-
-/* Floating 3 Columns */
-.fixed .cne #content { float:left; margin-right:20px; }
-.fixed .cne #navigation { float:left; }
-.fixed .cne #extra { float:right; }
-
-.fixed .ecn #content { float:left; margin-right:-520px; left:220px; }
-.fixed .ecn #navigation { float:right; }
-.fixed .ecn #extra { float:left; }
-
-.fixed .nec #content { float:right; }
-.fixed .nec #navigation { float:left; margin-right:20px; }
-.fixed .nec #extra { float:left; }
-
-.fixed .cen #content { float:left; margin-right:20px; }
-.fixed .cen #navigation { float:right; }
-.fixed .cen #extra { float:left; }
-
-.fixed .nce #content { float:left; margin-right:-520px; left:220px; }
-.fixed .nce #navigation { float:left; }
-.fixed .nce #extra { float:right; }
-
-.fixed .enc #content { float:right; margin-left:20px; }
-.fixed .enc #navigation { float:right; }
-.fixed .enc #extra { float:left; }
-
-.fixed .cee #content { float:left; _margin-right:-3px; }
-.fixed .cee #extra { float:right; *float:none; *left:20px; }
-.fixed .cee .section { float:left; }
-.fixed .cee .extra1,
-.fixed .cee .extra3,
-.fixed .cee .extra5,
-.fixed .cee .extra7,
-.fixed .cee .extra9{ margin-right:20px; }
-
-.fixed .eec #content { float:right; _margin-left:-3px; }
-.fixed .eec #extra { float:left; *float:none; *left:0; }
-.fixed .eec .section{ float:left;}
-.fixed .eec .extra1,
-.fixed .eec .extra3,
-.fixed .eec .extra5,
-.fixed .eec .extra7,
-.fixed .eec .extra9{ margin-right:20px; }
-
-.fixed .ece #content { float:left; margin-right:-100%; left:220px;}
-.fixed .ece #extra { float:left; }
-.fixed .ece .extra1,
-.fixed .ece .extra3,
-.fixed .ece .extra5,
-.fixed .ece .extra7,
-.fixed .ece .extra9 { float:left; clear:left; *clear:both;}
-.fixed .ece .extra2,
-.fixed .ece .extra4,
-.fixed .ece .extra6,
-.fixed .ece .extra8,
-.fixed .ece .extra10 { float:right; clear:right; }
-
-/* ---------- Liquid Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.liquid #container { width:100%; }
-.liquid #body { width:auto; }
-.liquid .c1 #content { width:100%; }
-.liquid .c1 #navigation { width:32%; }
-.liquid .c1 #extra { width:66%; }
-.liquid .c1 #extra .section { width:48.4%; }
-.liquid .c2 #content { width:75%; }
-.liquid .c2 #navigation,
-.liquid .c2 #extra { width:23%; }
-.liquid .c3 #content { width:56%; }
-.liquid .c3 #navigation { width:20%; }
-.liquid .c3 #extra { width:20%; }
-.liquid .cee #extra,
-.liquid .eec #extra { width:42%;}
-.liquid .ece #extra { width:100%;}
-.liquid .cee #extra .section,
-.liquid .eec #extra .section{ width:48%; }
-.liquid .ece #extra .section { width:20%; }
-
-/* Floating 1 Columns */
-.liquid .c1 #content { clear:both; }
-
-.liquid .ne #navigation { margin-right:2%; }
-.liquid .ne #extra .extra1,
-.liquid .ne #extra .extra3,
-.liquid .ne #extra .extra5,
-.liquid .ne #extra .extra7,
-.liquid .ne #extra .extra9 { float:left; clear:left; }
-
-.liquid .ne #extra .extra2,
-.liquid .ne #extra .extra4,
-.liquid .ne #extra .extra6,
-.liquid .ne #extra .extra8,
-.liquid .ne #extra .extra10 { float:right; clear:right; }
-
-.liquid .en #navigation { margin-left:2%; }
-.liquid .en #extra .extra1,
-.liquid .en #extra .extra3,
-.liquid .en #extra .extra5,
-.liquid .en #extra .extra7,
-.liquid .en #extra .extra9 { float:right; clear:right; }
-
-.liquid .en #extra .extra2,
-.liquid .en #extra .extra4,
-.liquid .en #extra .extra6,
-.liquid .en #extra .extra8,
-.liquid .en #extra .extra10 { float:left; clear:left; }
-
-/* Floating 2 Columns */
-.liquid .cn #content { float:left; }
-.liquid .cn #navigation,
-.liquid .cn #extra { float:right; }
-
-.liquid .nc #content { float:right; }
-.liquid .nc #navigation,
-.liquid .nc #extra { float:left; }
-
-.liquid .ce #content { float:left; _margin-right:-3px; }
-.liquid .ce #navigation,
-.liquid .ce #extra { float:right; *float:none; *left:2%; }
-
-.liquid .ec #content { float:right; }
-.liquid .ec #navigation,
-.liquid .ec #extra { float:left; *float:none; }
-
-/* Floating 3 Columns */
-.liquid .cne #content { float:left; margin-right:2%; }
-.liquid .cne #navigation { float:left; }
-.liquid .cne #extra { float:right; }
-
-.liquid .ecn #content { float:left; margin-right:-100%; left:22%; }
-.liquid .ecn #navigation { float:right; }
-.liquid .ecn #extra { float:left; }
-
-.liquid .nec #content { float:right; }
-.liquid .nec #navigation { float:left; margin-right:2%; }
-.liquid .nec #extra { float:left; }
-
-.liquid .cen #content { float:left; margin-right:2%; }
-.liquid .cen #navigation { float:right; }
-.liquid .cen #extra { float:left; }
-
-.liquid .nce #content { float:left; margin-right:-100%; left:22%; }
-.liquid .nce #navigation { float:left; }
-.liquid .nce #extra { float:right; }
-
-.liquid .enc #content { float:right; margin-left:2%; }
-.liquid .enc #navigation { float:right; }
-.liquid .enc #extra { float:left; }
-
-.liquid .cee #content { float:left; _margin-right:-3px; }
-.liquid .cee #extra { float:right; *float:none; *left:2%; }
-.liquid .cee .extra1,
-.liquid .cee .extra3,
-.liquid .cee .extra5,
-.liquid .cee .extra7,
-.liquid .cee .extra9 { float:left; clear:left; }
-.liquid .cee .extra2,
-.liquid .cee .extra4,
-.liquid .cee .extra6,
-.liquid .cee .extra8,
-.liquid .cee .extra10 { float:right; clear:right; }
-
-.liquid .eec #content { float:right; _margin-left:-3px; }
-.liquid .eec #extra { float:left; *float:none; *left:0; }
-.liquid .eec .extra1,
-.liquid .eec .extra3,
-.liquid .eec .extra5,
-.liquid .eec .extra7,
-.liquid .eec .extra9 { float:left; clear:left; }
-.liquid .eec .extra2,
-.liquid .eec .extra4,
-.liquid .eec .extra6,
-.liquid .eec .extra8,
-.liquid .eec .extra10 { float:right; clear:right; }
-
-.liquid .ece #content { float:left; margin-right:-100%; left:22%;}
-.liquid .ece #extra { float:left; }
-.liquid .ece .extra1,
-.liquid .ece .extra3,
-.liquid .ece .extra5,
-.liquid .ece .extra7,
-.liquid .ece .extra9 { float:left; clear:left; *clear:both; }
-.liquid .ece .extra2,
-.liquid .ece .extra4,
-.liquid .ece .extra6,
-.liquid .ece .extra8,
-.liquid .ece .extra10 { float:right; clear:right; }
-
-/* ---------- Hybrid Layout Preset ---------- */
-/* c = #content, n = #navigation, e = #extra */
-
-/* Width */
-.hybrid #container { width:100%; }
-.hybrid #body { width:auto; }
-.hybrid #content { width:100%; }
-.hybrid #navigation { width:200px; }
-.hybrid #extra { width:200px; }
-.hybrid .c1 #navigation { width:300px; }
-.hybrid .c1 #extra { width:auto; }
-.hybrid .c1 #extra .section { width:300px; }
-.hybrid .cee #extra,
-.hybrid .eec #extra { width:420px;}
-.hybrid .ece #extra { width:100%;}
-.hybrid .cee #extra .section,
-.hybrid .eec #extra .section,
-.hybrid .ece #extra .section { width:200px; }
-
-/* Floating 1 Columns */
-.hybrid .c1 #content { clear:both; }
-
-.hybrid .ne #navigation,
-.hybrid .ne #extra .extra1,
-.hybrid .ne #extra .extra3,
-.hybrid .ne #extra .extra5,
-.hybrid .ne #extra .extra7,
-.hybrid .ne #extra .extra9 { margin-right:30px; clear:left; *clear:none; }
-.hybrid .ne #extra .extra2,
-.hybrid .ne #extra .extra4,
-.hybrid .ne #extra .extra6,
-.hybrid .ne #extra .extra8,
-.hybrid .ne #extra .extra10 { margin-left:30px; clear:right;  }
-
-.hybrid .en #navigation,
-.hybrid .en #extra .extra1,
-.hybrid .en #extra .extra3,
-.hybrid .en #extra .extra5,
-.hybrid .en #extra .extra7,
-.hybrid .en #extra .extra9 { margin-left:30px; clear:right; *clear:none; }
-.hybrid .en #extra .extra2,
-.hybrid .en #extra .extra4,
-.hybrid .en #extra .extra6,
-.hybrid .en #extra .extra8,
-.hybrid .en #extra .extra10 { margin-right:30px; clear:left; }
-
-/* Floating 2 Columns */
-.hybrid .cn #body { margin-right:220px; }
-.hybrid .cn #content { float:left; margin-right:-100%; }
-.hybrid .cn #navigation,
-.hybrid .cn #extra { float:right; left:220px; clear:right; }
-
-.hybrid .nc #body { margin-left:220px; }
-.hybrid .nc #content { float:right; margin-left:-100%; *margin-left:0; }
-.hybrid .nc #navigation,
-.hybrid .nc #extra { float:left; left:-220px; clear:left; }
-
-.hybrid .ce #body { margin-right:220px; }
-.hybrid .ce #content { float:left; margin-right:-100%; }
-.hybrid .ce #navigation,
-.hybrid .ce #extra { float:right; left:220px; clear:right; *float:none; *left:100%; *margin-left:20px; *margin-right:-200px; }
-.hybrid .ce #navigation { width:100% !important; right:-220px; }
-
-.hybrid .ec #body { margin-left:220px; }
-.hybrid .ec #content { float:right; margin-left:-100%; _float:left; _margin-left:0; _margin-right:-100%; }
-.hybrid .ec #navigation,
-.hybrid .ec #extra { float:left; left:-220px; clear:left; *float:none; *margin-right:-200px; }
-.hybrid .ec #navigation { width:100% !important; }
-
-/* Floating 3 Columns */
-.hybrid .cne #body { margin-right:440px; }
-.hybrid .cne #content { float:left; }
-.hybrid .cne #navigation { float:left; margin-right:-200px; left:20px; }
-.hybrid .cne #extra { float:right; margin-left:-200px; left:440px; }
-
-.hybrid .ecn #body { margin-left:220px; margin-right:220px; }
-.hybrid .ecn #content { float:left; margin-right:-100%; }
-.hybrid .ecn #navigation { float:right; margin-left:-200px; left:220px; }
-.hybrid .ecn #extra { float:left; left:-220px; }
-
-.hybrid .nec #body { margin-left:440px; }
-.hybrid .nec #content { float:right; }
-.hybrid .nec #navigation { float:left; margin-right:-200px; left:-440px; }
-.hybrid .nec #extra { float:left; margin-right:-200px; left:-220px; }
-
-.hybrid .cen #body { margin-right:440px; }
-.hybrid .cen #content { float:left; }
-.hybrid .cen #navigation { float:right; margin-left:-200px; left:440px; }
-.hybrid .cen #extra { float:left; margin-right:-200px; left:20px; }
-
-.hybrid .nce #body { margin-left:220px; margin-right:220px; }
-.hybrid .nce #content { float:left; margin-right:-100%; }
-.hybrid .nce #navigation { float:left; margin-right:-200px; left:-220px; }
-.hybrid .nce #extra { float:right; right:-220px; }
-
-.hybrid .enc #body { margin-left:440px; }
-.hybrid .enc #content { float:right; }
-.hybrid .enc #navigation { float:right; margin-left:-200px; left:-20px; }
-.hybrid .enc #extra { float:left; margin-right:-200px; left:-440px; }
-
-.hybrid .cee #body { margin-right:440px;}
-.hybrid .cee #content { float:left; margin-right:-100%; }
-.hybrid .cee #navigation { right:-440px;}
-.hybrid .cee #extra { float:right; left:440px; *float:none; *left:100%; *margin-left:20px; *margin-right:-420px; }
-
-.hybrid .cee .extra1,
-.hybrid .cee .extra3,
-.hybrid .cee .extra5,
-.hybrid .cee .extra7,
-.hybrid .cee .extra9{ float:left; clear:left; }
-
-.hybrid .cee .extra2,
-.hybrid .cee .extra4,
-.hybrid .cee .extra6,
-.hybrid .cee .extra8,
-.hybrid .cee .extra10{ float:right; clear:right; }
-
-.hybrid .eec #body { margin-left:440px;}
-.hybrid .eec #content { float:left; margin-right:-100%; }
-.hybrid .eec #extra { float:left; left:-440px; *float:none; *margin-right:-420px; }
-.hybrid .eec .section{ float:left;}
-.hybrid .eec .extra1,
-.hybrid .eec .extra3,
-.hybrid .eec .extra5,
-.hybrid .eec .extra7,
-.hybrid .eec .extra9{ float:left; clear:left; }
-.hybrid .eec .extra2,
-.hybrid .eec .extra4,
-.hybrid .eec .extra6,
-.hybrid .eec .extra8,
-.hybrid .eec .extra10{ float:right; clear:right; }
-
-.hybrid .ece #body { margin:0 220px; }
-.hybrid .ece #content { float:left; margin-right:-100%; }
-.hybrid .ece #navigation { right:-220px; }
-.hybrid .ece #extra { float:left; }
-.hybrid .ece .extra1,
-.hybrid .ece .extra3,
-.hybrid .ece .extra5,
-.hybrid .ece .extra7,
-.hybrid .ece .extra9{ float:left; left:-220px; margin-right:-200px; *margin-right:0; clear:left; *clear:both; }
-.hybrid .ece .extra2,
-.hybrid .ece .extra4,
-.hybrid .ece .extra6,
-.hybrid .ece .extra8,
-.hybrid .ece .extra10{ float:right; right:-220px; margin-left:-200px; *margin-left:0; clear:right; *clear:both; }
-
-/* Navigation Top */
-.nTop #navigation { position:absolute; float:right !important; width:960px !important; margin:0 !important; *clear:none !important; overflow:visible; top:-4em; left:auto !important; right:0; }
-.nTop #navigation .section { position:absolute; float:right; top:0; right:0; width:auto; margin:0; padding:0; }
-.nTop #navigation .section:after { content:""; display:block; clear:both; width:0; height:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif;}
-.nTop #navigation h2 { position:absolute; left:0; top:0; width:0; height:0; border:0; overflow:hidden; visibility:hidden; font:0/0 Sans-serif;  }
-.nTop #navigation ul.nav { position:relative; display:block; float:right; margin:0; padding:0; list-style:none; overflow:hidden; text-align:right; white-space:nowrap; }
-.nTop #navigation ul.nav li { position:relative; left:-1px; display:inline; white-space:nowrap; border-left:1px solid #ccc; padding-left:5px; }
diff --git a/modules/homepage/skins/xe_official/filter/change_layout.xml b/modules/homepage/skins/xe_official/filter/change_layout.xml
deleted file mode 100644
index 2cfb38f06..000000000
--- a/modules/homepage/skins/xe_official/filter/change_layout.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<filter name="change_layout" module="homepage" act="procHomepageChangeLayout" confirm_msg_code="confirm_change_layout">
-    <form>
-        <node target="layout" required="true" />
-    </form>
-    <response callback_func="completeChangeLayout">
-        <tag name="error" />
-        <tag name="message" />
-    </response>
-</filter>
diff --git a/modules/homepage/skins/xe_official/filter/insert_board.xml b/modules/homepage/skins/xe_official/filter/insert_board.xml
deleted file mode 100644
index 6703d7d06..000000000
--- a/modules/homepage/skins/xe_official/filter/insert_board.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<filter name="insert_board" module="homepage" act="procHomepageInsertBoard" confirm_msg_code="confirm_submit">
-    <form>
-        <node target="mid" required="true" filter="alpha_number" />
-        <node target="browser_title" required="true" maxlength="250" />
-        <node target="list_count" required="true" filter="number" />
-        <node target="search_list_count" required="true" filter="number" />
-        <node target="page_count" required="true" filter="number" />
-    </form>
-    <parameter>
-        <param name="board_name" target="mid" />
-        <param name="module_srl" target="module_srl" />
-        <param name="module_category_srl" target="module_category_srl" />
-        <param name="layout_srl" target="layout_srl" />
-        <param name="skin" target="skin" />
-        <param name="browser_title" target="browser_title" />
-        <param name="use_category" target="use_category" />
-        <param name="order_target" target="order_target" />
-        <param name="order_type" target="order_type" />
-        <param name="list_count" target="list_count" />
-        <param name="search_list_count" target="search_list_count" />
-        <param name="except_notice" target="except_notice" />
-        <param name="consultation" target="consultation" />
-        <param name="admin_mail" target="admin_mail" />
-        <param name="page_count" target="page_count" />
-        <param name="is_default" target="is_default" />
-        <param name="description" target="description" />
-        <param name="header_text" target="header_text" />
-        <param name="footer_text" target="footer_text" />
-        <param name="admin_id" target="admin_id" />
-        <param name="extra_vars_1_name" target="extra_vars_1_name" />
-        <param name="extra_vars_1_type" target="extra_vars_1_type" />
-        <param name="extra_vars_1_is_required" target="extra_vars_1_is_required" />
-        <param name="extra_vars_1_search" target="extra_vars_1_search" />
-        <param name="extra_vars_1_default" target="extra_vars_1_default" />
-        <param name="extra_vars_1_desc" target="extra_vars_1_desc" />
-        <param name="extra_vars_2_name" target="extra_vars_2_name" />
-        <param name="extra_vars_2_type" target="extra_vars_2_type" />
-        <param name="extra_vars_2_is_required" target="extra_vars_2_is_required" />
-        <param name="extra_vars_2_search" target="extra_vars_2_search" />
-        <param name="extra_vars_2_default" target="extra_vars_2_default" />
-        <param name="extra_vars_2_desc" target="extra_vars_2_desc" />
-        <param name="extra_vars_3_name" target="extra_vars_3_name" />
-        <param name="extra_vars_3_type" target="extra_vars_3_type" />
-        <param name="extra_vars_3_is_required" target="extra_vars_3_is_required" />
-        <param name="extra_vars_3_search" target="extra_vars_3_search" />
-        <param name="extra_vars_3_default" target="extra_vars_3_default" />
-        <param name="extra_vars_3_desc" target="extra_vars_3_desc" />
-        <param name="extra_vars_4_name" target="extra_vars_4_name" />
-        <param name="extra_vars_4_type" target="extra_vars_4_type" />
-        <param name="extra_vars_4_is_required" target="extra_vars_4_is_required" />
-        <param name="extra_vars_4_search" target="extra_vars_4_search" />
-        <param name="extra_vars_4_default" target="extra_vars_4_default" />
-        <param name="extra_vars_4_desc" target="extra_vars_4_desc" />
-        <param name="extra_vars_5_name" target="extra_vars_5_name" />
-        <param name="extra_vars_5_type" target="extra_vars_5_type" />
-        <param name="extra_vars_5_is_required" target="extra_vars_5_is_required" />
-        <param name="extra_vars_5_search" target="extra_vars_5_search" />
-        <param name="extra_vars_5_default" target="extra_vars_5_default" />
-        <param name="extra_vars_5_desc" target="extra_vars_5_desc" />
-        <param name="extra_vars_6_name" target="extra_vars_6_name" />
-        <param name="extra_vars_6_type" target="extra_vars_6_type" />
-        <param name="extra_vars_6_is_required" target="extra_vars_6_is_required" />
-        <param name="extra_vars_6_search" target="extra_vars_6_search" />
-        <param name="extra_vars_6_default" target="extra_vars_6_default" />
-        <param name="extra_vars_6_desc" target="extra_vars_6_desc" />
-        <param name="extra_vars_7_name" target="extra_vars_7_name" />
-        <param name="extra_vars_7_type" target="extra_vars_7_type" />
-        <param name="extra_vars_7_is_required" target="extra_vars_7_is_required" />
-        <param name="extra_vars_7_search" target="extra_vars_7_search" />
-        <param name="extra_vars_7_default" target="extra_vars_7_default" />
-        <param name="extra_vars_7_desc" target="extra_vars_7_desc" />
-        <param name="extra_vars_8_name" target="extra_vars_8_name" />
-        <param name="extra_vars_8_type" target="extra_vars_8_type" />
-        <param name="extra_vars_8_is_required" target="extra_vars_8_is_required" />
-        <param name="extra_vars_8_search" target="extra_vars_8_search" />
-        <param name="extra_vars_8_default" target="extra_vars_8_default" />
-        <param name="extra_vars_8_desc" target="extra_vars_8_desc" />
-        <param name="extra_vars_9_name" target="extra_vars_9_name" />
-        <param name="extra_vars_9_type" target="extra_vars_9_type" />
-        <param name="extra_vars_9_is_required" target="extra_vars_9_is_required" />
-        <param name="extra_vars_9_search" target="extra_vars_9_search" />
-        <param name="extra_vars_9_default" target="extra_vars_9_default" />
-        <param name="extra_vars_9_desc" target="extra_vars_9_desc" />
-        <param name="extra_vars_10_name" target="extra_vars_10_name" />
-        <param name="extra_vars_10_type" target="extra_vars_10_type" />
-        <param name="extra_vars_10_is_required" target="extra_vars_10_is_required" />
-        <param name="extra_vars_10_search" target="extra_vars_10_search" />
-        <param name="extra_vars_10_default" target="extra_vars_10_default" />
-        <param name="extra_vars_10_desc" target="extra_vars_10_desc" />
-        <param name="extra_vars_11_name" target="extra_vars_11_name" />
-        <param name="extra_vars_11_type" target="extra_vars_11_type" />
-        <param name="extra_vars_11_is_required" target="extra_vars_11_is_required" />
-        <param name="extra_vars_11_search" target="extra_vars_11_search" />
-        <param name="extra_vars_11_default" target="extra_vars_11_default" />
-        <param name="extra_vars_11_desc" target="extra_vars_11_desc" />
-        <param name="extra_vars_12_name" target="extra_vars_12_name" />
-        <param name="extra_vars_12_type" target="extra_vars_12_type" />
-        <param name="extra_vars_12_is_required" target="extra_vars_12_is_required" />
-        <param name="extra_vars_12_search" target="extra_vars_12_search" />
-        <param name="extra_vars_12_default" target="extra_vars_12_default" />
-        <param name="extra_vars_12_desc" target="extra_vars_12_desc" />
-        <param name="extra_vars_13_name" target="extra_vars_13_name" />
-        <param name="extra_vars_13_type" target="extra_vars_13_type" />
-        <param name="extra_vars_13_is_required" target="extra_vars_13_is_required" />
-        <param name="extra_vars_13_search" target="extra_vars_13_search" />
-        <param name="extra_vars_13_default" target="extra_vars_13_default" />
-        <param name="extra_vars_13_desc" target="extra_vars_13_desc" />
-        <param name="extra_vars_14_name" target="extra_vars_14_name" />
-        <param name="extra_vars_14_type" target="extra_vars_14_type" />
-        <param name="extra_vars_14_is_required" target="extra_vars_14_is_required" />
-        <param name="extra_vars_14_search" target="extra_vars_14_search" />
-        <param name="extra_vars_14_default" target="extra_vars_14_default" />
-        <param name="extra_vars_14_desc" target="extra_vars_14_desc" />
-        <param name="extra_vars_15_name" target="extra_vars_15_name" />
-        <param name="extra_vars_15_type" target="extra_vars_15_type" />
-        <param name="extra_vars_15_is_required" target="extra_vars_15_is_required" />
-        <param name="extra_vars_15_search" target="extra_vars_15_search" />
-        <param name="extra_vars_15_default" target="extra_vars_15_default" />
-        <param name="extra_vars_15_desc" target="extra_vars_15_desc" />
-        <param name="extra_vars_16_name" target="extra_vars_16_name" />
-        <param name="extra_vars_16_type" target="extra_vars_16_type" />
-        <param name="extra_vars_16_is_required" target="extra_vars_16_is_required" />
-        <param name="extra_vars_16_search" target="extra_vars_16_search" />
-        <param name="extra_vars_16_default" target="extra_vars_16_default" />
-        <param name="extra_vars_16_desc" target="extra_vars_16_desc" />
-        <param name="extra_vars_17_name" target="extra_vars_17_name" />
-        <param name="extra_vars_17_type" target="extra_vars_17_type" />
-        <param name="extra_vars_17_is_required" target="extra_vars_17_is_required" />
-        <param name="extra_vars_17_search" target="extra_vars_17_search" />
-        <param name="extra_vars_17_default" target="extra_vars_17_default" />
-        <param name="extra_vars_17_desc" target="extra_vars_17_desc" />
-        <param name="extra_vars_18_name" target="extra_vars_18_name" />
-        <param name="extra_vars_18_type" target="extra_vars_18_type" />
-        <param name="extra_vars_18_is_required" target="extra_vars_18_is_required" />
-        <param name="extra_vars_18_search" target="extra_vars_18_search" />
-        <param name="extra_vars_18_default" target="extra_vars_18_default" />
-        <param name="extra_vars_18_desc" target="extra_vars_18_desc" />
-        <param name="extra_vars_19_name" target="extra_vars_19_name" />
-        <param name="extra_vars_19_type" target="extra_vars_19_type" />
-        <param name="extra_vars_19_is_required" target="extra_vars_19_is_required" />
-        <param name="extra_vars_19_search" target="extra_vars_19_search" />
-        <param name="extra_vars_19_default" target="extra_vars_19_default" />
-        <param name="extra_vars_19_desc" target="extra_vars_19_desc" />
-        <param name="extra_vars_20_name" target="extra_vars_20_name" />
-        <param name="extra_vars_20_type" target="extra_vars_20_type" />
-        <param name="extra_vars_20_is_required" target="extra_vars_20_is_required" />
-        <param name="extra_vars_20_search" target="extra_vars_20_search" />
-        <param name="extra_vars_20_default" target="extra_vars_20_default" />
-        <param name="extra_vars_20_desc" target="extra_vars_20_desc" />
-    </parameter>
-    <response callback_func="completeInsertBoard">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="module" />
-        <tag name="act" />
-        <tag name="page" />
-        <tag name="module_srl" />
-    </response>
-</filter>
diff --git a/modules/homepage/skins/xe_official/images/btn_delete.gif b/modules/homepage/skins/xe_official/images/btn_delete.gif
deleted file mode 100644
index 71e9eb0cd..000000000
Binary files a/modules/homepage/skins/xe_official/images/btn_delete.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/btn_insert.gif b/modules/homepage/skins/xe_official/images/btn_insert.gif
deleted file mode 100644
index 19f871b84..000000000
Binary files a/modules/homepage/skins/xe_official/images/btn_insert.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/btn_modify.gif b/modules/homepage/skins/xe_official/images/btn_modify.gif
deleted file mode 100644
index 383b82192..000000000
Binary files a/modules/homepage/skins/xe_official/images/btn_modify.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/button_down.gif b/modules/homepage/skins/xe_official/images/button_down.gif
deleted file mode 100644
index d89fe1a5a..000000000
Binary files a/modules/homepage/skins/xe_official/images/button_down.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/button_up.gif b/modules/homepage/skins/xe_official/images/button_up.gif
deleted file mode 100644
index 1660d5ced..000000000
Binary files a/modules/homepage/skins/xe_official/images/button_up.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_caption_head.gif b/modules/homepage/skins/xe_official/images/n_caption_head.gif
deleted file mode 100644
index a1577e609..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_caption_head.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_circle_bullet.gif b/modules/homepage/skins/xe_official/images/n_circle_bullet.gif
deleted file mode 100644
index 58386fd7c..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_circle_bullet.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_copy.gif b/modules/homepage/skins/xe_official/images/n_icon_copy.gif
deleted file mode 100644
index a5ab0a98b..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_icon_copy.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_remove.gif b/modules/homepage/skins/xe_official/images/n_icon_remove.gif
deleted file mode 100644
index aad07232d..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_icon_remove.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_select_all.gif b/modules/homepage/skins/xe_official/images/n_icon_select_all.gif
deleted file mode 100644
index e4795c7ed..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_icon_select_all.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_icon_view.gif b/modules/homepage/skins/xe_official/images/n_icon_view.gif
deleted file mode 100644
index 79eb97164..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_icon_view.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_paper_bullet.gif b/modules/homepage/skins/xe_official/images/n_paper_bullet.gif
deleted file mode 100644
index 127f18e66..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_paper_bullet.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_setup.gif b/modules/homepage/skins/xe_official/images/n_setup.gif
deleted file mode 100644
index a620bceae..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_setup.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_small_tab.gif b/modules/homepage/skins/xe_official/images/n_small_tab.gif
deleted file mode 100644
index 8b07ad415..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_small_tab.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/n_title_bg.gif b/modules/homepage/skins/xe_official/images/n_title_bg.gif
deleted file mode 100644
index cc45194b0..000000000
Binary files a/modules/homepage/skins/xe_official/images/n_title_bg.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/images/page.gif b/modules/homepage/skins/xe_official/images/page.gif
deleted file mode 100644
index 5f39482ed..000000000
Binary files a/modules/homepage/skins/xe_official/images/page.gif and /dev/null differ
diff --git a/modules/homepage/skins/xe_official/index.html b/modules/homepage/skins/xe_official/index.html
deleted file mode 100644
index b20c632a3..000000000
--- a/modules/homepage/skins/xe_official/index.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<h3 class="title">{$lang->cmd_homepage_menus[$act]}</h3>
-<p class="infoText">{$lang->about_homepage_act[$act]}</p>
-
-<!--%import("./filter/change_layout.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, change_layout);">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->layout}</caption>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->layout}</div></th>
-        <td>
-            <select name="layout">
-            <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout}" <!--@if($selected_layout->layout == $val->layout)-->selected="selected"<!--@end-->>{$val->title} ver {$val->version} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <span class="button blue"><input type="submit" value="{$lang->cmd_change_layout}" /></span>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->path}</div></th>
-        <td>{$selected_layout->path}</td>
-    </tr>
-    <!--@if(count($selected_layout->author))-->
-    <tr class="row2">  
-        <th scope="row"><div>{$lang->author}</div></th>
-        <td>
-            <!--@foreach($selected_layout->author as $k => $v)-->
-            <a href="{$v->homepage}" onclick="window.open(this.href);return false;">{$v->name}</a>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($selected_layout->description)-->
-    <tr class="row2">  
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br(trim($selected_layout->description))}</td>
-    </tr>
-    <!--@end-->
-    </table>
-</form>
-
-<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="homepage" />
-<input type="hidden" name="act" value="procHomepageLayoutUpdate" />
-<input type="hidden" name="layout_srl" value="{$selected_layout->layout_srl}" />
-<input type="hidden" name="title" value="{htmlspecialchars($homepage_info->title)}" />
-<!--@if($logged_info->is_admin != 'Y')-->
-    <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
-<input type="hidden" name="{$menu_name}" value="{$menu_info->menu_srl}" />
-    <!--@end-->
-<!--@end-->
-
-    <table cellspacing="0" class="adminTable">
-    <tr class="row2">
-        <th scope="row"><div>{$lang->header_script}</div></th>
-        <td>
-            <textarea name="header_script" class="inputTypeTextArea w400">{htmlspecialchars($selected_layout->header_script)}</textarea>
-            <p>{$lang->about_header_script}</p>
-        </td>
-    </tr>
-    <!--@foreach($selected_layout->extra_var as $name => $var)-->
-
-        <!--@if($var->group && ((!$group) || $group != $var->group))-->
-        {@$group = $var->group}
-        </table>
-        <table cellspacing="0" class="adminTable">
-        <col width="150" />
-        <col width="*" />
-        <caption>{$group}</caption>
-        <!--@end-->
-
-        <tr class="row{$cycle_idx+1}">
-            <th scope="row"><div>{$var->title}</div></th>
-
-            <td>
-            <!--@if($var->type == "text")-->
-                <input type="text" name="{$name}" value="{htmlspecialchars($var->value)}"  class="inputTypeText w400"/>
-
-            <!--@elseif($var->type == "textarea")-->
-                <textarea name="{$name}" class="inputTypeTextArea w400">{htmlspecialchars($var->value)}</textarea>
-
-            <!--@elseif($var->type=="image")-->
-
-              <!--@if($var->value)-->
-              <div>
-                  <img src="{$var->value}" alt="image" /><br />
-                  <input type="checkbox" name="del_{$name}" value="Y" id="del_{$name}" class="checkbox" />
-                  <label for="del_{$name}">{$lang->cmd_delete}</label>
-              </div>
-              <!--@end-->
-
-              <input type="file" name="{$name}" value="" />
-
-            <!--@elseif($var->type == "select")-->
-                <select name="{$name}">
-                    <!--@foreach($var->options as $key => $val)-->
-                    <option value="{$key}" <!--@if($key==$var->value)-->selected="selected"<!--@end-->>{$val}</option>
-                    <!--@end-->
-                </select>
-            <!--@end-->
-                <p>{$var->description}</p>
-            </td>
-        </tr>
-    <!--@end-->
-
-    <!--@if($var->group)-->
-    <!--@end-->
-
-    <!--@if($logged_info->is_admin == 'Y')-->
-    <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
-    <tr>
-        <th scope="row"><div>{$menu_info->title}<br />({$menu_name})</div></th>
-        <td class="left tahoma">
-            <select name="{$menu_name}">
-                <option value="0">------------------------</option>
-                <!--@foreach($menu_list as $key => $val)-->
-                <option value="{$val->menu_srl}" <!--@if($val->menu_srl == $menu_info->menu_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <!--@end-->
-    <!--@end-->
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button strong blue"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </td>
-    </tr>
-    </table>
-
-    <iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
-</form>
diff --git a/modules/homepage/skins/xe_official/js/homepage.js b/modules/homepage/skins/xe_official/js/homepage.js
deleted file mode 100644
index 6887ab843..000000000
--- a/modules/homepage/skins/xe_official/js/homepage.js
+++ /dev/null
@@ -1,322 +0,0 @@
-
-function homepageLoadMenuInfo(url){
-    // clear tree;
-    jQuery('#menu > ul > li > ul').remove();
-    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){homepageAddMenu(0,e);}).appendTo("ul.simpleTree > li");
-
-    //ajax get data and transeform ul il
-    jQuery.get(url,function(data){
-        jQuery(data).find("node").each(function(i){
-            var text = jQuery(this).attr("text");
-            var node_srl = jQuery(this).attr("node_srl");
-            var parent_srl = jQuery(this).attr("parent_srl");
-            var url = jQuery(this).attr("url");
-
-            // node
-            var node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
-
-            // button
-            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){
-                jQuery("#tree_"+node_srl+" > span").click();
-                homepageAddMenu(node_srl,e);
-                return false;
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" /></a>').bind("click",function(e){
-                jQuery.exec_json("homepage.getHomepageMenuItem",{ "node_srl":node_srl},function(data){
-                    jQuery("#tree_"+node_srl+" > span").click();
-                    data.menu_info['mode'] = 'update';
-                    menuFormInsert(data.menu_info);
-                    jQuery("#menuItem").css('position','absolute').css('visibility','visible').css('top',e.pageY - jQuery("#header").height() - 70).css('left',e.pageX - jQuery("#navigation").width() -40);
-                    jQuery('#itemAttr4').css("display",'block');
-                });
-                return false;
-
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" /></a>').bind("click",function(e){
-                homepageDeleteMenu(node_srl);
-                return false;
-            }).appendTo(node);
-
-            // insert parent child
-            if(parent_srl>0){
-                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
-                jQuery('#tree_'+parent_srl+'> ul').append(node);
-            }else{
-                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
-                jQuery('#menu ul.simpleTree > li > ul').append(node);
-            }
-
-        });
-
-        //button show hide
-        jQuery("#menu li").each(function(){
-            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
-            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
-        });
-
-
-        // draw tree
-        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
-            autoclose: false,
-            afterClick:function(node){
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterDblClick:function(node){
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterMove:function(destination, source, pos){
-                jQuery('#menuItem').css("visibility",'hidden');
-                if(destination.size() == 0){
-                    homepageLoadMenuInfo(xml_url);
-                    return;
-                }
-                var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
-                var parent_srl = destination.attr('id').replace(/.*_/g,'');
-                var target_srl = source.attr('id').replace(/.*_/g,'');
-                var brothers = jQuery('#'+destination.attr('id')+' > ul > li:not([class^=line])').length;
-                var mode = brothers >1 ? 'move':'insert';
-                var source_srl = pos == 0 ? 0: source.prevAll("li:not(.line)").get(0).id.replace(/.*_/g,'');
-
-                jQuery.exec_json("homepage.procHomepageMenuItemMove",{ "menu_srl":menu_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl,"mode":mode},
-                function(data){
-                    if(data.error>0){
-                        homepageLoadMenuInfo(xml_url);
-                    }
-                });
-            },
-
-            // i want you !! made by sol
-            beforeMovedToLine : function(destination, source, pos){
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
-            },
-
-            // i want you !! made by sol
-            beforeMovedToFolder : function(destination, source, pos){
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
-            },
-            afterAjax:function()
-            {
-                //alert('Loaded');
-            },
-            animate:true
-            ,docToFolderConvert:true
-        });
-
-        // open all node
-        nodeToggleAll();
-    },"xml");
-}
-
-
-function menuFormInsert(obj) {
-    if(typeof(obj)=='undefined') return;
-
-    var fo_obj = jQuery("#fo_menu").get(0);
-
-    if(typeof(obj.parent_srl)!='undefined') fo_obj.parent_srl.value = obj.parent_srl;
-    if(typeof(obj.menu_item_srl)!='undefined') fo_obj.menu_item_srl.value = obj.menu_item_srl;
-    if(typeof(obj.mode)!='undefined') fo_obj.mode.value = obj.mode;
-
-    if(typeof(obj.name)!='undefined') {
-        for(var i in obj.name) {
-            var o = fo_obj['menu_name_'+i];
-            if(!o) continue;
-            o.value = obj.name[i];
-        }
-    }
-
-    if(typeof(obj.browser_title)!='undefined') fo_obj.browser_title.value = obj.browser_title;
-
-    if(typeof(obj.open_window)!='undefined' && obj.open_window=='Y') fo_obj.menu_open_window.checked = true;
-    if(typeof(obj.expand)!='undefined' && obj.expand=='Y') fo_obj.menu_expand.checked = true;
-
-    if(typeof(obj.group_srls)!='undefined' && obj.group_srls && typeof(obj.group_srls.item)!='undefined' && obj.group_srls.item) {
-        for(var j in obj.group_srls.item) {
-            for(var i=0; i<fo_obj.group_srls.length;i++) {
-                if(obj.group_srls.item[j]==fo_obj.group_srls[i].value) fo_obj.group_srls[i].checked = true;
-            }
-        }
-    }
-
-    if(typeof(obj.module_type)!='undefined') {
-        if(obj.module_type == 'url') {
-            fo_obj.module_type.selectedIndex = 2;
-            if(typeof(obj.url)!='undefined') fo_obj.url.value = obj.url;
-            fo_obj.module_type.disabled = "disabled";
-            jQuery('#itemAttr2').css('display','none');
-            jQuery('#itemAttr3').css('display','block');
-        } else {
-            if(obj.module_type == 'page') fo_obj.module_type.selectedIndex = 1;
-            else fo_obj.module_type.selectedIndex = 1;
-            if(typeof(obj.module_id)!='undefined') fo_obj.module_id.value = obj.module_id;
-            fo_obj.module_type.disabled = "disabled";
-            jQuery('#itemAttr2').css('display','block');
-            jQuery('#itemAttr3').css('display','none');
-        }
-    }
-
-    if(typeof(obj.normal_btn)!='undefined' && obj.normal_btn) {
-        jQuery('#menu_normal_btn_img').attr("src",obj.normal_btn);
-        jQuery('#menu_normal_btn_zone','#itemAttr4').css("display",'block');
-        fo_obj.normal_btn.value = obj.normal_btn;
-    }
-    if(typeof(obj.hover_btn)!='undefined' && obj.hover_btn) {
-        jQuery('#menu_hover_btn_img').attr("src",obj.hover_btn);
-        jQuery('#menu_hover_btn_zone','#itemAttr4').css("display",'block');
-        fo_obj.hover_btn.value = obj.hover_btn;
-    }
-    if(typeof(obj.active_btn)!='undefined' && obj.active_btn) {
-        jQuery('#menu_active_btn_img').attr("src",obj.active_btn);
-        jQuery('#menu_active_btn_zone','#itemAttr4').css("display",'block');
-        fo_obj.active_btn.value = obj.active_btn;
-    }
-}
-
-
-function menuFormReset() {
-    var fo_obj = jQuery("#fo_menu").get(0);
-
-    fo_obj.parent_srl.value = '';
-    fo_obj.menu_item_srl.value = '';
-    fo_obj.mode.value = '';
-
-    jQuery(".menu_names").each(function(){ jQuery(this).val(''); });
-
-    fo_obj.browser_title.value = '';
-
-    fo_obj.menu_open_window.checked = false;
-    fo_obj.menu_expand.checked = false;
-
-    for(var i=0; i<fo_obj.group_srls.length;i++) fo_obj.group_srls[i].checked = false;
-
-    fo_obj.module_type.selectedIndex = 0;
-    fo_obj.module_type.disabled = "";
-
-    fo_obj.module_id.value = '';
-    fo_obj.url.value = '';
-    jQuery('#itemAttr3').css("display","none");
-    jQuery('#menu_normal_btn_zone','#menu_hover_btn_zone','#menu_active_btn_zone').css("display","none");
-    jQuery('#menu_normal_btn_img','#menu_hover_btn_img','#menu_active_btn_img').attr("src","");
-    jQuery('#itemAttr4').css("display","none");
-    fo_obj.reset();
-    location.href = '#';
-}
-
-function completeInsertMenuItem(data) {
-    var xml_file = data['xml_file'];
-    if(!xml_file) return;
-    homepageLoadMenuInfo(xml_url);
-    jQuery('#menuItem').css("visibility",'hidden');
-    menuFormReset();
-}
-
-
-function homepageAddMenu(node_srl,e) {
-    menuFormReset();
-    var obj = new Array();
-    obj['mode'] = 'insert';
-    if(typeof(node_srl)!='undefined' && node_srl > 0) {
-        obj['parent_srl'] = node_srl;
-    }
-
-    menuFormInsert(obj);
-
-    jQuery("#menuItem").css('position','absolute').css('visibility','visible').css('top',e.pageY - jQuery("#header").height() - 70).css('left',e.pageX - jQuery("#navigation").width() -40);
-    jQuery('#itemAttr4').css("display",'block');
-}
-
-
-function homepageDeleteMenu(node_srl) {
-    if(confirm(lang_confirm_delete)){
-        jQuery('#menuItem').css("visibility",'hidden');
-        var fo_obj = jQuery('#menu_item_form').get(0);
-        fo_obj.menu_item_srl.value = node_srl;
-        procFilter(fo_obj, delete_menu_item);
-    }
-}
-
-
-function nodeToggleAll(){
-    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
-        simpleTreeCollection[0].nodeToggle(this);
-    });
-}
-
-function doReloadTreeMenu(){
-    var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
-
-    jQuery.exec_json("menu.procMenuAdminMakeXmlFile",{ "menu_srl":menu_srl},
-            function(data){
-                 homepageLoadMenuInfo(xml_url);
-            }
-    );
-    jQuery('#menuItem').css("visibility",'hidden');
-    menuFormReset();
-}
-
-function closeTreeMenuInfo(){
-    jQuery('#menuItem').css("visibility",'hidden');
-}
-
-
-/* 모듈 생성 후 */
-function completeInsertBoard(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-
-    var url = current_url.setQuery('act','dispHomepageBoardInfo');
-    if(module_srl) url = url.setQuery('module_srl',module_srl);
-    if(page) url.setQuery('page',page);
-    location.href = url;
-}
-function completeInsertGroup(ret_obj) {
-    location.href = current_url.setQuery('group_srl','');
-}
-
-function completeDeleteGroup(ret_obj) {
-    location.href = current_url.setQuery('group_srl','');
-
-}
-
-function completeInsertGrant(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-}
-
-function completeInsertPage(ret_obj) {
-    alert(ret_obj['message']);
-    location.reload();
-}
-
-function completeChangeLayout(ret_obj) {
-    location.reload();
-}
-
-function doDeleteGroup(group_srl) {
-    var fo_obj = xGetElementById('fo_group');
-    fo_obj.group_srl.value = group_srl;
-    procFilter(fo_obj, delete_group);
-}
-
-function changeMenuType(obj) {
-    if(obj.selectedIndex == 2) {
-        xGetElementById('itemAttr2').style.display = 'none';
-        xGetElementById('itemAttr3').style.display = 'block';
-        return;
-    } 
-
-    xGetElementById('itemAttr2').style.display = 'block';
-    xGetElementById('itemAttr3').style.display = 'none';
-
-}
\ No newline at end of file
diff --git a/modules/homepage/skins/xe_official/layout.html b/modules/homepage/skins/xe_official/layout.html
deleted file mode 100644
index 28ae1f5a9..000000000
--- a/modules/homepage/skins/xe_official/layout.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--%import("./css/layout.css",optimized=false)-->
-<!--%import("./css/default.css",optimized=false)-->
-<!--%import("./js/homepage.js",optimized=false)-->
-
-<div class="liquid">
-	<div id="container" class="c3 nce e2">
-		<div id="header">
-			<h1 class="title"><a href="{getUrl('','module','homepage','act','dispHomepageManage')}">{$homepage_info->title}</a></h1>
-
-            <ul class="gnb">
-                <!--@if($logged_info->is_admin == 'Y')--><li><a href="{getUrl('','module','admin','act','dispHomepageAdminContent')}" class="button red"><span>{$lang->cmd_go_homepage_admin}</span></a></li><!--@end-->
-                <li><a href="{getSiteUrl($site_module_info->domain, '', 'mid', $site_module_info->mid)}" class="button blue"><span>{$lang->cmd_go_home}</span></a></li>
-            </ul>
-		</div>
-		<hr />
-		<div id="body">
-			<div id="content">
-				<div class="section">
-                    {$content}
-				</div>
-			</div>
-			<hr />
-			<div id="navigation">
-				<div class="section">
-					<ul class="nav">
-
-                    <!--@foreach($lang->cmd_homepage_menus as $key => $val)-->
-						<li <!--@if($key==$act)-->class="active"<!--@end-->><a href="{getUrl('','module','homepage','act', $key)}" <!--@if($act==$val)-->class="selected"<!--@end-->>{$val}</a></li>
-                    <!--@end-->
-					</ul>
-				</div>
-			</div>
-
-			<div id="extra">
-				<div class="section extra1">
-                    <img widget="newest_document" skin="blog_newest_document" colorset="layout" list_count="5" subject_cut_size="100"/>
-				</div>
-				<div class="section extra2">
-                    <img widget="newest_comment" skin="blog_newest_comment" colorset="layout" list_count="5" />
-				</div>
-			</div>
-
-
-			<div class="fClear"></div>
-		</div>
-		<hr />
-	</div>
-
-</div>
-
diff --git a/modules/homepage/skins/xe_official/menu_manage.html b/modules/homepage/skins/xe_official/menu_manage.html
deleted file mode 100644
index f3078d83b..000000000
--- a/modules/homepage/skins/xe_official/menu_manage.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!--%import("./filter/insert_menu_item.xml")-->
-<!--%import("./filter/delete_menu_item.xml")-->
-
-<!--// tree javascript plugin load -->
-<!--%load_js_plugin("ui.tree")-->
-
-<h3 class="title">{$lang->cmd_homepage_menus[$act]}</h3>
-<p class="infoText">{$lang->about_homepage_act[$act]}</p>
-<span style="float:right"><a href="#" onclick="doReloadTreeMenu('{$menu_info->menu_srl}');return false;" class="button"><span>{$lang->cmd_remake_cache}</span></a></span>
-<form method="post" action="./" id="menu_item_form">
-    <input type="hidden" name="menu_item_srl" value="" />
-</form>
-
-<form method="post" action="./" id="menu_form">
-    <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
-    <div id="menu">
-        <ul class="simpleTree">
-            <li class="root" id='tree_0'><span>{$lang->menu}</span></li>
-        </ul>
-    </div>
-    <br />
-</form>
-
-<div id="menuItem">
-    <form id="fo_menu" action="./" method="post" onsubmit="return procFilter(this, insert_menu_item);" class="clear" target="tmp_upload_iframe" enctype="multipart/form-data">
-    <input type="hidden" name="module" value="homepage" />
-    <input type="hidden" name="act" value="procHompageUpdateMenuItem" />
-    <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
-    <input type="hidden" name="parent_srl" value="" />
-    <input type="hidden" name="menu_item_srl" value="" />
-    <input type="hidden" name="mode" value="" />
-    <input type="hidden" name="target" value="" />
-    <input type="hidden" name="normal_btn" value="" />
-    <input type="hidden" name="hover_btn" value="" />
-    <input type="hidden" name="active_btn" value="" />
-
-    <table cellspacing="0" class="adminTable">
-    <tr>
-        <td>
-
-        <span class="button green"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button red"><input type="button" onclick="closeTreeMenuInfo();return false" value="{$lang->cmd_close}" /></span>
-
-        </td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable" id="itemAttr1">
-    {@ $_row = 0;}
-    <!--@foreach($lang_supported as $key => $val)-->
-    <tr>
-        <!--@if($_row==0)--><th scope="row" rowspan="{count($lang_supported)+1}"><div>{$lang->menu_name}</div></th><!--@end-->
-        <th><div>{$val}</div></th>
-        <td><input type="checkbox" name="ck_menu_name_{$key}" /><input type="text" name="menu_name_{$key}" value="" class="inputTypeText w300 menu_names"  />
-        </td>
-        {@ $_row ++ }
-    </tr>
-    <!--@end-->
-    <tr>
-        <td colspan="2">{$lang->about_menu_names}</td>
-    </tr>
-    <tr>
-        <th scope="row" colspan="2"><div>{$lang->cmd_option}</div></th>
-        <td>
-            <input type="checkbox" id="menu_open_window" name="menu_open_window" value="Y" />
-            <label for="menu_open_window">{$lang->menu_open_window}</label>
-            <input type="checkbox" id="menu_expand" name="menu_expand" value="Y" />
-            <label for="menu_expand">{$lang->menu_expand}</label>
-            <p>{$lang->about_menu_option}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row" colspan="2"><div>{$lang->item_group_grant}</div></th>
-        <td>
-            <!--@foreach($group_list as $key=>$val)-->
-            <input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
-            <label for="group_{$key}">{$val->title}</label>
-            <!--@end-->
-            <p>{$lang->about_group_grant}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row" colspan="2"><div>{$lang->module_type}</div></th>
-        <td>
-            <select name="module_type" onchange="changeMenuType(this)">
-                <option value="board">{$lang->board}</option>
-                <option value="page">{$lang->page}</option>
-                <option value="url">{$lang->url}</option>
-            </select>
-            <p>{$lang->about_module_type}</p>
-        </td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable" id="itemAttr2">
-    <tr>
-        <th scope="row"><div>{$lang->browser_title}</div></th>
-        <td>
-            <input type="text" name="browser_title" value="" class="inputTypeText w400" />
-            <p>{$lang->about_browser_title}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->module_id}</div></th>
-        <td>
-            <input type="text" name="module_id" value="" class="inputTypeText w400" />
-            <p>{$lang->about_module_id}</p>
-        </td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable" id="itemAttr3">
-    <tr>
-        <th scope="row"><div>{$lang->url}</div></th>
-        <td>
-            http://<input type="text" name="url" value="" class="inputTypeText w400" />
-            <p>{$lang->about_menu_item_url}</p>
-        </td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable" id="itemAttr4">
-    <tr>
-        <th scope="row" rowspan="4"><div>{$lang->menu_img_btn}</div></th>
-        <th scope="row"><div>{$lang->menu_normal_btn}</div></th>
-        <td>
-            <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->>
-                <img src="" alt="" id="menu_normal_btn_img" /><br />
-                <a href="#" onclick="doDeleteButton('menu_normal_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <input type="file" name="menu_normal_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->menu_hover_btn}</div></th>
-        <td>
-            <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->>
-                <img src="" alt="" id="menu_hover_btn_img" /><br />
-                <a href="#" onclick="doDeleteButton('menu_hover_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <input type="file" name="menu_hover_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->menu_active_btn}</div></th>
-        <td>
-            <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->>
-                <img src="" alt="" id="menu_active_btn_img" /><br />
-                <a href="#" onclick="doDeleteButton('menu_active_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <input type="file" name="menu_active_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="2">{$lang->about_menu_image_button}</td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <tr>
-        <td>
-
-        <span class="button green"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button red"><input type="button" onclick="closeTreeMenuInfo();return false" value="{$lang->cmd_close}" /></span>
-
-        </td>
-    </tr>
-    </table>
-    </form>
-</div>
-
-<iframe id='tmp_upload_iframe' name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>
-
-<script type="text/javascript">
-var max_menu_depth = 999; //{$menu_max_depth};
-var simpleTreeCollection;
-var alertImageOnly = "{$lang->alert_image_only}";
-var confirmMenuMove = "{$lang->confirm_move}";
-var lang_confirm_delete = "{$lang->confirm_delete}";
-var xml_url = "{$menu_info->xml_file}";
-homepageLoadMenuInfo(xml_url);
-
-(function($){
-$("[name^=menu_name_]").bind("blur",function(e){
-	if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
-		$("[name^=ck_menu_name_]:checked").each(function(i){
-			$("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
-		});
-	}
-});
-})(jQuery);
-</script>
diff --git a/modules/homepage/skins/xe_official/mid_list.html b/modules/homepage/skins/xe_official/mid_list.html
deleted file mode 100644
index c7133e041..000000000
--- a/modules/homepage/skins/xe_official/mid_list.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<h3 class="title">{$lang->cmd_homepage_menus[$act]}</h3>
-<p class="infoText">{$lang->about_homepage_act[$act]}</p>
-
-<!--%import("filter/update_index_mid.xml")-->
-
-<form method="post" action="./" onsubmit="return procFilter(this,update_index_mid)" class="midDefault">
-{$lang->cmd_select_index}
-<select name="index_mid">
-    <!--@foreach($mid_list as $no => $val)-->
-    <option value="{$val->module_srl}" <!--@if($val->module_srl==$homepage_info->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title} ({$val->mid})</option>
-    <!--@end-->
-</select>
-<span class="button"><input type="submit" value="{$lang->cmd_select}" /></span>
-</form>
-
-<table cellspacing="0" class="adminTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->module}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_setup}</div></th>
-        <th scope="col"><div>{$lang->cmd_view}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($mid_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="center">{Context::getLang($val->module)}</td>
-        <td>{htmlspecialchars($val->mid)}</td>
-        <td>{htmlspecialchars($val->browser_title)}</td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <!--@if($val->module=='board')-->
-        <td class="setup center"><a href="{getUrl('act','dispHomepageBoardInfo','module_srl',$val->module_srl)}">{$lang->cmd_setup}</a></td>
-        <!--@else-->
-        <td class="setup center"><a href="{getUrl('act','dispHomepageBoardInfo','module_srl',$val->module_srl)}">{$lang->cmd_setup}</a></td>
-        <!--@end-->
-        <td class="view center"><a href="{getSiteUrl($site_module_info->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-</form>
-
diff --git a/modules/homepage/tpl/_board_header.html b/modules/homepage/tpl/_board_header.html
new file mode 100644
index 000000000..8f1d96688
--- /dev/null
+++ b/modules/homepage/tpl/_board_header.html
@@ -0,0 +1,13 @@
+<!--#include("_header.html")-->
+
+<h4 class="xeAdmin">{$lang->board} > {$module_info->browser_title} <span class="gray">{$lang->cmd_setup}</span></h4>
+
+<ul class="localNavigation">
+    <li <!--@if($act=='dispHomepageBoardInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardInfo')}">{$lang->cmd_setup}</a></li>
+    <li <!--@if($act=='dispHomepageBoardCategoryInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardCategoryInfo')}">{$lang->cmd_manage_category}</a></li>
+    <li <!--@if($act=='dispHomepageBoardExtraVars')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardExtraVars')}">{$lang->extra_vars}</a></li>
+    <li <!--@if($act=='dispHomepageBoardGrant')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardGrant')}">{$lang->cmd_manage_grant}</a></li>
+    <li <!--@if($act=='dispHomepageBoardAddition')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardAddition')}">{$lang->cmd_addition_setup}</a></li>
+    <li <!--@if($act=='dispHomepageBoardSkin')-->class="on"<!--@end-->><a href="{getUrl('act','dispHomepageBoardSkin')}">{$lang->cmd_manage_skin}</a></li>
+    <li><a href="{getUrl('','mid',$module_info->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></li>
+</ul>
diff --git a/modules/homepage/tpl/_footer.html b/modules/homepage/tpl/_footer.html
new file mode 100644
index 000000000..04f5b8449
--- /dev/null
+++ b/modules/homepage/tpl/_footer.html
@@ -0,0 +1 @@
+</div>
diff --git a/modules/homepage/tpl/_header.html b/modules/homepage/tpl/_header.html
new file mode 100644
index 000000000..000670281
--- /dev/null
+++ b/modules/homepage/tpl/_header.html
@@ -0,0 +1,17 @@
+<!--%import("../../admin/tpl/css/font.css")-->
+<!--%import("../../admin/tpl/css/pagination.css")-->
+<!--%import("../../admin/tpl/css/admin.css")-->
+<!--%import("./js/homepage.js",optimized=false)-->
+<div id="xeAdmin">
+
+    <h3 class="xeAdmin">{$lang->cafe_admin}</h3>
+
+    <div class="header4">
+        <ul class="localNavigation">
+        {@$_s = false; }
+        <!--@foreach($lang->cmd_admin_menus as $key => $val)-->
+            <li <!--@if($key==$act || (!$_s && $key=='dispHomepageMidSetup'))-->{@$_s=true}class="on"<!--@end-->><a href="{getUrl('act', $key)}" <!--@if($act==$val)-->class="selected"<!--@end-->>{$val}</a></li>
+        <!--@end-->
+        </ul>
+
+    </div>
diff --git a/modules/homepage/tpl/_page_header.html b/modules/homepage/tpl/_page_header.html
new file mode 100644
index 000000000..35190287c
--- /dev/null
+++ b/modules/homepage/tpl/_page_header.html
@@ -0,0 +1,8 @@
+<!--#include("_header.html")-->
+
+<h4 class="xeAdmin">{$lang->page} > {$module_info->browser_title} <span class="gray">{$lang->cmd_setup}</span></h4>
+
+<ul class="localNavigation">
+    <li class="on"><a href="{getUrl('act','dispHomepagePageGrant','module_srl',$module_srl)}">{$lang->grant}</a></li>
+    <li><a href="{getUrl('','mid',$module_info->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></li>
+</ul>
diff --git a/modules/homepage/tpl/board_addition_setup.html b/modules/homepage/tpl/board_addition_setup.html
new file mode 100644
index 000000000..1ea4b5dac
--- /dev/null
+++ b/modules/homepage/tpl/board_addition_setup.html
@@ -0,0 +1,5 @@
+<!--#include("_board_header.html")-->
+
+{$setup_content}
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/board_grant_list.html b/modules/homepage/tpl/board_grant_list.html
new file mode 100644
index 000000000..e2e54d6ca
--- /dev/null
+++ b/modules/homepage/tpl/board_grant_list.html
@@ -0,0 +1,5 @@
+<!--#include("./_board_header.html")-->
+
+{$grant_content}
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/skins/xe_official/board_insert.html b/modules/homepage/tpl/board_insert.html
similarity index 57%
rename from modules/homepage/skins/xe_official/board_insert.html
rename to modules/homepage/tpl/board_insert.html
index 304baa1ce..9b6d0b2eb 100644
--- a/modules/homepage/skins/xe_official/board_insert.html
+++ b/modules/homepage/tpl/board_insert.html
@@ -1,5 +1,6 @@
 <!--%import("./filter/insert_board.xml")-->
-<!--#include("board_header.html")-->
+
+<!--#include("_board_header.html")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert_board)" enctype="multipart/form-data">
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
@@ -8,7 +9,7 @@
 <input type="hidden" name="layout_srl" value="{$module_info->layout_srl}" />
 <input type="hidden" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->skin}</div></th>
         <td>
@@ -85,87 +86,30 @@
     <tr>
         <th scope="row"><div>{$lang->admin_mail}</div></th>
         <td>
-            <input type="text" name="admin_mail" value="{$module_info->admin_mail}"  class="inputTypeText w400" />
+            <input type="text" name="admin_mail" value="{$module_info->admin_mail}"  class="inputTypeText fullWidth" />
             <p>{$lang->about_admin_mail}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->header_text}</div></th>
         <td>
-            <textarea name="header_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->header_text)}</textarea>
+            <textarea name="header_text" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->header_text)}</textarea>
             <p>{$lang->about_header_text}</p>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->footer_text}</div></th>
         <td>
-            <textarea name="footer_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <textarea name="footer_text" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
             <p>{$lang->about_footer_text}</p>
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </table>
 
-    <!--@if(!$module_srls)-->
-        <!--@for($i=1;$i<=20;$i++)-->
-            <div class="gap1"></div>
-            {@ $extra_vars_name = ''}
-            {@ $extra_vars_type = ''}
-            {@ $extra_vars_is_required = ''}
-            {@ $extra_vars_default_value = ''}
-            {@ $extra_vars_desc = ''}
-            {@ $extra_vars_search = ''}
-            <!--@if($module_info->extra_vars[$i])-->
-                {@ $extra_vars_name = $module_info->extra_vars[$i]->name}
-                {@ $extra_vars_type = $module_info->extra_vars[$i]->type}
-                {@ $extra_vars_is_required = $module_info->extra_vars[$i]->is_required}
-                {@ $extra_vars_default_value = $module_info->extra_vars[$i]->default}
-                {@ $extra_vars_desc = $module_info->extra_vars[$i]->desc}
-                {@ $extra_vars_search = $module_info->extra_vars[$i]->search}
-            <!--@end-->
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->extra_vars} {$i}</caption>
-        <tr class="row2">
-            <th><div>{$lang->column_name}</div></th>
-            <td class="wide"><input type="text" name="extra_vars_{$i}_name" value="{$extra_vars_name}" class="inputTypeText w200" /> </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->column_type}</div></th>
-            <td>
-                <select name="extra_vars_{$i}_type">
-                    <!--@foreach($lang->column_type_list as $key => $val)-->
-                        <!--@if($key != 'kr_zip')-->
-                        <option value="{$key}" <!--@if($extra_vars_type==$key)-->selected="selected"<!--@end-->>{$lang->column_type_list[$key]}</option>
-                        <!--@end-->
-                    <!--@end-->
-                </select>
-            </td>
-        </tr>
-        <tr class="row2">
-            <th><div>{$lang->is_required}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_is_required" value="Y" <!--@if($extra_vars_is_required=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->default_value}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_default" value="{$extra_vars_default_value}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
-        </tr>
-        <tr class="row2">
-            <th><div>{$lang->description}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_desc" value="{$extra_vars_desc}" class="inputTypeText w400" /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->cmd_search}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_search" value="Y" <!--@if($extra_vars_search=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr class="row2">
-            <td colspan="2" class="right"><span class="button blue"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></div></th>
-        </tr>
-        </table>
-        <!--@end-->
-    <!--@end-->
-
-
 </form>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/board_skin_info.html b/modules/homepage/tpl/board_skin_info.html
new file mode 100644
index 000000000..134f6593a
--- /dev/null
+++ b/modules/homepage/tpl/board_skin_info.html
@@ -0,0 +1,5 @@
+<!--#include("./_board_header.html")-->
+
+{$skin_content}
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/tpl/category_list.html b/modules/homepage/tpl/category_list.html
new file mode 100644
index 000000000..0236205b8
--- /dev/null
+++ b/modules/homepage/tpl/category_list.html
@@ -0,0 +1,5 @@
+<!--#include("./_board_header.html")-->
+
+{$category_content}
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/tpl/components.html b/modules/homepage/tpl/components.html
new file mode 100644
index 000000000..407428eee
--- /dev/null
+++ b/modules/homepage/tpl/components.html
@@ -0,0 +1,83 @@
+<!--#include("_header.html")-->
+
+<!--%import("../../editor/tpl/js/editor_admin.js")-->
+<!--%import("../../addon/tpl/js/addon.js")-->
+<!--%import("../../admin/tpl/js/admin.js")-->
+
+<h4 class="xeAdmin">{$lang->cmd_admin_menus[$act]}</h4>
+<p class="summary">{$lang->about_cafe_act[$act]}</p>
+
+<ul class="localNavigation">
+    <li class="on" id="moduleOn"><a href="#" onclick="toggleModuleAddon('module');return false;">{$lang->editor}</a></li>
+    <li id="addonOn"><a href="#" onclick="toggleModuleAddon('addon');return false;">{$lang->addon}</a></li>
+</ul>
+
+<div id="xeModules">
+    <table cellspacing="0" class="crossTable">
+    <thead>
+        <tr>
+            <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
+            <th scope="col" class="half_wide"><div>{$lang->component_author}</div></th>
+            <th scope="col" colspan="2"><div>{$lang->component_version}</div></th>
+            <th scope="col"><div>{$lang->component_date}</div></th>
+        </tr>
+    </thead>
+    <tbody>
+        <!--@foreach($component_list as $component_name => $xml_info)-->
+        <tr class="row2">
+            <th colspan="2" scope="row"><div><a href="{getUrl('module','editor','act','dispEditorComponentInfo','component_name',$component_name)}" onclick="popopen(this.href);return false;"><strong>{$xml_info->title}</strong></a> ({$component_name})</div></th>
+            <th><a href="#" onclick="doSetupComponent('{$component_name}'); return false;" title="{htmlspecialchars($lang->cmd_setup)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></th>
+            <th>
+                <!--@if($xml_info->enabled=='Y')-->
+                    <a href="#" onclick="doDisableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_enable)}" class="buttonSet buttonActive"><span>{$lang->cmd_enable}</span></a>
+                <!--@else-->
+                    <a href="#" onclick="doEnableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_disable)}" class="buttonSet buttonDisable"><span>{$lang->cmd_disable}</span></a>
+                <!--@end-->
+            </th>
+            <th><a href="#" onclick="doMoveListOrder('{$component_name}','up');return false;" title="{htmlspecialchars($lang->cmd_move_up)}" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><a href="#" onclick="doMoveListOrder('{$component_name}','down');return false;" title="{htmlspecialchars($lang->cmd_move_down)}" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a></th>
+        </tr>
+        <tr>
+            <td>{nl2br($xml_info->description)}</td>
+            <td class="nowrap">
+                <!--@foreach($xml_info->author as $author)-->
+                <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
+                <!--@endforeach-->
+            </td>
+            <td colspan="2">{$xml_info->version}</td>
+            <td>{zdate($xml_info->date, 'Y-m-d')}</td>
+        </tr>
+        <!--@end-->
+    </tbody>
+    </table>
+</div>
+<div id="xeAddons" style="display:none;">
+    <form id="fo_addon" action="./" method="get">
+        <input type="hidden" name="addon" value="" />
+    </form>
+    <table cellspacing="0" class="rowTable">
+    <thead>
+        <tr>
+            <th><div>{$lang->addon}</div></th>
+            <th><div>{$lang->cmd_setup}</div></th>
+            <th><div>{$lang->status}</div></th>
+        </tr>
+    </thead>
+    <tbody>
+    <!--@foreach($addon_list as $key => $val)-->
+    <tr>
+        <td class="wide"><a href="{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{$val->title}</a></td>
+        <td><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td>
+            <!--@if($val->activated)-->
+            <a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
+            <!--@else-->
+            <a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
+            <!--@end-->
+        </td>
+    </tr>
+    <!--@end-->
+    </tbody>
+    </table>
+</div>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/delete.html b/modules/homepage/tpl/delete.html
index 57b95bdb2..ac4394c9f 100644
--- a/modules/homepage/tpl/delete.html
+++ b/modules/homepage/tpl/delete.html
@@ -1,29 +1,26 @@
 <!--%import("./js/homepage.js",optimized=false)-->
 <!--%import("./filter/delete_homepage.xml")-->
 
-<h3>{$lang->homepage} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->cafe} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<div class="infoText">{nl2br($lang->about_homepage)}</div>
+<div class="infoText">{nl2br($lang->about_cafe)}</div>
 
 <form action="./" method="post" onsubmit="return procFilter(this, delete_homepage)" id="fo_homepage">
 <input type="hidden" name="site_srl" value="{$homepage_info->site_srl}" />
-    <table cellspacing="0" class="adminTable">
-    <thead>
-        <tr>
-            <th colspan="2"><div>{$lang->cmd_homepage_delete}</div></th>
-        </tr>
-    </thead>
+    <h4 class="xeAdmin">{$lang->cmd_cafe_delete}</h4>
+    <p class="summary">{$lang->about_cafe_delete}</p>
+    <table cellspacing="0" class="rowTable">
     <tbody>
         <tr>
-            <th scope="row"><div>{$lang->homepage_title}</div></th>
-            <td>{$homepage_info->title}</td>
+            <th scope="row"><div>{$lang->cafe_title}</div></th>
+            <td class="wide">{$homepage_info->title}</td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->domain}</div></th>
             <td>http://{$homepage_info->domain}</td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->homepage_admin}</div></th>
+            <th scope="row"><div>{$lang->cafe_admin}</div></th>
             <td>
                 <!--@foreach($admin_list as $key => $val)-->
                     {$val->nick_name} ({$val->user_id})<br />
@@ -31,14 +28,9 @@
                 &nbsp;
             </td>
         </tr>
-        <tr>
-            <td colspan="2" class="red">
-                <p>{$lang->about_homepage_delete}</p>
-            </td>
-        </tr>
         <tr class="row2">
-            <td colspan="2" class="right">
-                <span class="button red strong"><input type="submit" value="{$lang->cmd_delete}" accesskey="s" /></span></div>
+            <th colspan="2" class="button">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" accesskey="s" /></span>
             </th>
         </tr>
     </tbody>
diff --git a/modules/homepage/tpl/extra_vars.html b/modules/homepage/tpl/extra_vars.html
new file mode 100644
index 000000000..73636ab8e
--- /dev/null
+++ b/modules/homepage/tpl/extra_vars.html
@@ -0,0 +1,5 @@
+<!--#include("./_board_header.html")-->
+
+{$extra_vars_content}
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/tpl/filter/change_language.xml b/modules/homepage/tpl/filter/change_language.xml
new file mode 100644
index 000000000..32e4a42b8
--- /dev/null
+++ b/modules/homepage/tpl/filter/change_language.xml
@@ -0,0 +1,7 @@
+<filter name="change_language" module="homepage" act="procHomepageChangeLanguage">
+    <form />
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/homepage/tpl/filter/change_layout.xml b/modules/homepage/tpl/filter/change_layout.xml
new file mode 100644
index 000000000..2d4b9087b
--- /dev/null
+++ b/modules/homepage/tpl/filter/change_layout.xml
@@ -0,0 +1,7 @@
+<filter name="change_layout" module="homepage" act="procHomepageChangeLayout">
+    <form />
+    <response classback_func="completeChangeLayout">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/homepage/skins/xe_official/filter/delete_group.xml b/modules/homepage/tpl/filter/delete_group.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/delete_group.xml
rename to modules/homepage/tpl/filter/delete_group.xml
diff --git a/modules/homepage/skins/xe_official/filter/delete_menu_item.xml b/modules/homepage/tpl/filter/delete_menu_item.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/delete_menu_item.xml
rename to modules/homepage/tpl/filter/delete_menu_item.xml
diff --git a/modules/homepage/tpl/filter/insert_board.xml b/modules/homepage/tpl/filter/insert_board.xml
new file mode 100644
index 000000000..3d5b02fdf
--- /dev/null
+++ b/modules/homepage/tpl/filter/insert_board.xml
@@ -0,0 +1,39 @@
+<filter name="insert_board" module="homepage" act="procHomepageInsertBoard" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="mid" required="true" filter="alpha_number" />
+        <node target="browser_title" required="true" maxlength="250" />
+        <node target="list_count" required="true" filter="number" />
+        <node target="search_list_count" required="true" filter="number" />
+        <node target="page_count" required="true" filter="number" />
+    </form>
+    <parameter>
+        <param name="board_name" target="mid" />
+        <param name="module_srl" target="module_srl" />
+        <param name="module_category_srl" target="module_category_srl" />
+        <param name="layout_srl" target="layout_srl" />
+        <param name="skin" target="skin" />
+        <param name="browser_title" target="browser_title" />
+        <param name="use_category" target="use_category" />
+        <param name="order_target" target="order_target" />
+        <param name="order_type" target="order_type" />
+        <param name="list_count" target="list_count" />
+        <param name="search_list_count" target="search_list_count" />
+        <param name="except_notice" target="except_notice" />
+        <param name="consultation" target="consultation" />
+        <param name="admin_mail" target="admin_mail" />
+        <param name="page_count" target="page_count" />
+        <param name="is_default" target="is_default" />
+        <param name="description" target="description" />
+        <param name="header_text" target="header_text" />
+        <param name="footer_text" target="footer_text" />
+        <param name="admin_id" target="admin_id" />
+    </parameter>
+    <response callback_func="completeInsertBoard">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="module" />
+        <tag name="act" />
+        <tag name="page" />
+        <tag name="module_srl" />
+    </response>
+</filter>
diff --git a/modules/homepage/skins/xe_official/filter/insert_grant.xml b/modules/homepage/tpl/filter/insert_grant.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/insert_grant.xml
rename to modules/homepage/tpl/filter/insert_grant.xml
diff --git a/modules/homepage/skins/xe_official/filter/insert_group.xml b/modules/homepage/tpl/filter/insert_group.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/insert_group.xml
rename to modules/homepage/tpl/filter/insert_group.xml
diff --git a/modules/homepage/skins/xe_official/filter/insert_menu_item.xml b/modules/homepage/tpl/filter/insert_menu_item.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/insert_menu_item.xml
rename to modules/homepage/tpl/filter/insert_menu_item.xml
diff --git a/modules/homepage/skins/xe_official/filter/insert_page.xml b/modules/homepage/tpl/filter/insert_page.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/insert_page.xml
rename to modules/homepage/tpl/filter/insert_page.xml
diff --git a/modules/homepage/skins/xe_official/filter/update_index_mid.xml b/modules/homepage/tpl/filter/update_index_mid.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/update_index_mid.xml
rename to modules/homepage/tpl/filter/update_index_mid.xml
diff --git a/modules/homepage/skins/xe_official/filter/update_member_group.xml b/modules/homepage/tpl/filter/update_member_group.xml
similarity index 100%
rename from modules/homepage/skins/xe_official/filter/update_member_group.xml
rename to modules/homepage/tpl/filter/update_member_group.xml
diff --git a/modules/homepage/skins/xe_official/group_list.html b/modules/homepage/tpl/group_list.html
similarity index 77%
rename from modules/homepage/skins/xe_official/group_list.html
rename to modules/homepage/tpl/group_list.html
index c3fee2f01..629289883 100644
--- a/modules/homepage/skins/xe_official/group_list.html
+++ b/modules/homepage/tpl/group_list.html
@@ -1,6 +1,8 @@
 <!--%import("filter/insert_group.xml")-->
 <!--%import("filter/delete_group.xml")-->
 
+<!--#include("_header.html")-->
+
 <h3 class="title">{$lang->cmd_homepage_menus[$act]}</h3>
 <p class="infoText">{$lang->about_homepage_act[$act]}</p>
 
@@ -8,7 +10,7 @@
 <input type="hidden" name="group_srl" value=""/>
 </form>
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->group_title}</div></th>
@@ -53,10 +55,13 @@
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->group_title}</div></th>
-        <td class="wide"><input type="text" name="title" value="{$selected_group->title}" class="inputTypeText w400" /></td>
+        <td class="wide">
+            <input type="text" name="title" value="{htmlspecialchars($selected_group->title)}" class="inputTypeText w400" id="groupTitle"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','groupTitle')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+        </td>
     </tr>
     <!--@if(!$selected_group->group_srl || $selected_group->is_default != 'Y')-->
     <tr class="row2">
@@ -69,16 +74,18 @@
         <td><textarea name="description" class="inputTypeTextArea w400">{$selected_group->description}</textarea></td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
+        <th colspan="2" class="button">
             <!--@if($selected_group->group_srl)-->
-            <span class="button blue"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
             <span class="button"><input type="button" value="{$lang->cmd_cancel}" onclick="location.href=current_url.setQuery('group_srl','');return false;"/></span>
             <!--@else-->
-            <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
             <!--@end-->
-        </td>
+        </th>
     </tr>
     </table>
 
 
 </form>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/index.html b/modules/homepage/tpl/index.html
index 4e74ec493..31ffc8ca2 100644
--- a/modules/homepage/tpl/index.html
+++ b/modules/homepage/tpl/index.html
@@ -1,37 +1,31 @@
 <!--%import("./js/homepage.js",optimized=false)-->
 <!--%import("./filter/insert_homepage.xml")-->
 
-<h3>{$lang->homepage} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->cafe} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<div class="infoText">{nl2br($lang->about_homepage)}</div>
-
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
+<div class="infoText">{nl2br($lang->about_cafe)}</div>
 
 <div class="adminLeftContent">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="colTable">
+    <caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
     <thead>
         <tr>
             <th scope="col"><div>{$lang->no}</div></th>
             <th scope="col" class="half_wide"><div>{$lang->title}</div></th>
             <th scope="col" class="half_wide"><div>{$lang->domain}</div></th>
             <th scope="col"><div>{$lang->regdate}</div></th>
-            <th scope="col"><div>{$lang->cmd_setup}</div></th>
-            <th scope="col"><div>{$lang->cmd_delete}</div></th>
-            <th scope="col"><div>{$lang->cmd_view}</div></th>
+            <th scope="col" colspan="3"><div>&nbsp;</div></th>
         </tr>
     </thead>
     <tbody>
         <!--@foreach($homepage_list as $no => $val)-->
         <tr class="row{$cycle_idx}">
-            <td class="center number">{$no}</td>
+            <td>{$no}</td>
             <td><a href="{getSiteUrl($val->domain,'module','homepage','act','dispHomepageManage','site_srl',$val->site_srl)}">{htmlspecialchars($val->homepage_title)}</a></td>
-            <td class="nowrap">http://<a href="http://{$val->domain}" onclick="window.open(this.href);return false;">{$val->domain}</a></td>
-            <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-            <td class="setup center"><a href="{getUrl('act','dispHomepageAdminSetup','site_srl',$val->site_srl)}">{$lang->cmd_setup}</a></td>
-            <td class="delete center"><a href="{getUrl('act','dispHomepageAdminDelete','site_srl',$val->site_srl)}">{$lang->cmd_delete}</a></td>
-            <td class="view center"><a href="{getSiteUrl($val->domain)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
+            <td>http://<a href="http://{$val->domain}" onclick="window.open(this.href);return false;">{$val->domain}</a></td>
+            <td>{zdate($val->regdate,"Y-m-d")}</td>
+            <td><a href="{getUrl('act','dispHomepageAdminSetup','site_srl',$val->site_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+            <td><a href="{getUrl('act','dispHomepageAdminDelete','site_srl',$val->site_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
         </tr>
         <!--@end-->
     </tbody>
@@ -54,29 +48,29 @@
 
 <div class="adminRightExtra">
     <form action="./" method="post" onsubmit="return procFilter(this, insert_homepage)">
-        <table cellspacing="0" class="adminTable">
-        <thead>
-            <tr>
-                <th colspan="2"><div>{$lang->cmd_homepage_registration}</div></th>
-            </tr>
-        </thead>
+        <table cellspacing="0" class="colTable">
+        <caption>&nbsp;</caption>
         <tbody>
             <tr>
-                <th scope="row"><div>{$lang->homepage_title}</div></th>
+                <th scope="row"><div>{$lang->cafe_title}</div></th>
+			</tr>
+			<tr>
                 <td>
                     <input type="text" name="homepage_title" value="" class="inputTypeText w200" />
-                    <p>{$lang->about_homepage_title}</p>
+                    <p>{$lang->about_cafe_title}</p>
                 </td>
             </tr>
             <tr>
                 <th scope="row"><div>{$lang->domain}</div></th>
+			</tr>
+			<tr>
                 <td>
                     http://<input type="text" name="domain" value="" class="inputTypeText w200" />
                     <p>{$lang->about_domain}</p>
                 </td>
             </tr>
             <tr class="row2">
-                <td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_make}" accesskey="s" /></span></div></th>
+                <td colspan="2" class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_cafe_registration}" accesskey="s" /></span></div></td>
             </tr>
         </tbody>
         </table>
diff --git a/modules/homepage/tpl/js/homepage.js b/modules/homepage/tpl/js/homepage.js
index cbc8a30bc..b78519103 100644
--- a/modules/homepage/tpl/js/homepage.js
+++ b/modules/homepage/tpl/js/homepage.js
@@ -47,3 +47,351 @@ function completeDeleteHomepage(ret_obj) {
     alert(ret_obj['message']);
     location.href = current_url.setQuery('act','dispHomepageAdminContent').setQuery('site_srl','');
 }
+
+function homepageLoadMenuInfo(url){
+    // clear tree;
+    jQuery('#menu > ul > li > ul').remove();
+    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){homepageAddMenu(0,e);}).appendTo("ul.simpleTree > li");
+
+    //ajax get data and transeform ul il
+    jQuery.get(url,function(data){
+        jQuery(data).find("node").each(function(i){
+            var text = jQuery(this).attr("text");
+            var node_srl = jQuery(this).attr("node_srl");
+            var parent_srl = jQuery(this).attr("parent_srl");
+            var url = jQuery(this).attr("url");
+
+            // node
+            var node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
+
+            // button
+            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){
+                jQuery("#tree_"+node_srl+" > span").click();
+                homepageAddMenu(node_srl,e);
+                return false;
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" /></a>').bind("click",function(e){
+                jQuery.exec_json("homepage.getHomepageMenuItem",{ "node_srl":node_srl},function(data){
+                    jQuery("#tree_"+node_srl+" > span").click();
+                    data.menu_info['mode'] = 'update';
+                    menuFormInsert(data.menu_info);
+                    jQuery("#menuItem").css('position','absolute').css('display','block').css('top',e.pageY).css('left',e.pageX).css('zIndex',9999);
+                    jQuery('#itemAttr4').css("display",'block');
+                });
+                return false;
+
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" /></a>').bind("click",function(e){
+                homepageDeleteMenu(node_srl);
+                return false;
+            }).appendTo(node);
+
+            // insert parent child
+            if(parent_srl>0){
+                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
+                jQuery('#tree_'+parent_srl+'> ul').append(node);
+            }else{
+                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
+                jQuery('#menu ul.simpleTree > li > ul').append(node);
+            }
+
+        });
+
+        //button show hide
+        jQuery("#menu li").each(function(){
+            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
+            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
+        });
+
+
+        // draw tree
+        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
+            autoclose: false,
+            afterClick:function(node){
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterDblClick:function(node){
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterMove:function(destination, source, pos){
+                jQuery('#menuItem').css("display",'none');
+                if(destination.size() == 0){
+                    homepageLoadMenuInfo(xml_url);
+                    return;
+                }
+                var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
+                var parent_srl = destination.attr('id').replace(/.*_/g,'');
+                var target_srl = source.attr('id').replace(/.*_/g,'');
+                var brothers = jQuery('#'+destination.attr('id')+' > ul > li:not([class^=line])').length;
+                var mode = brothers >1 ? 'move':'insert';
+                var source_srl = pos == 0 ? 0: source.prevAll("li:not(.line)").get(0).id.replace(/.*_/g,'');
+
+                jQuery.exec_json("homepage.procHomepageMenuItemMove",{ "menu_srl":menu_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl,"mode":mode},
+                function(data){
+                    if(data.error>0){
+                        homepageLoadMenuInfo(xml_url);
+                    }
+                });
+            },
+
+            // i want you !! made by sol
+            beforeMovedToLine : function(destination, source, pos){
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
+            },
+
+            // i want you !! made by sol
+            beforeMovedToFolder : function(destination, source, pos){
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
+            },
+            afterAjax:function()
+            {
+                //alert('Loaded');
+            },
+            animate:true
+            ,docToFolderConvert:true
+        });
+
+        // open all node
+        nodeToggleAll();
+    },"xml");
+}
+
+
+function menuFormInsert(obj) {
+    if(typeof(obj)=='undefined') return;
+
+    var fo_obj = jQuery("#fo_menu").get(0);
+
+    if(typeof(obj.parent_srl)!='undefined') fo_obj.parent_srl.value = obj.parent_srl;
+    if(typeof(obj.menu_item_srl)!='undefined') fo_obj.menu_item_srl.value = obj.menu_item_srl;
+    if(typeof(obj.mode)!='undefined') fo_obj.mode.value = obj.mode;
+    if(typeof(obj.name)!='undefined') fo_obj['menu_name'].value = obj.name;
+
+    if(typeof(obj.browser_title)!='undefined') fo_obj.browser_title.value = obj.browser_title;
+
+    if(typeof(obj.open_window)!='undefined' && obj.open_window=='Y') fo_obj.menu_open_window.checked = true;
+    if(typeof(obj.expand)!='undefined' && obj.expand=='Y') fo_obj.menu_expand.checked = true;
+    if(typeof(obj.group_srls)!='undefined' && obj.group_srls.length) {
+        for(var j=0;j<obj.group_srls.length;j++) {
+            var group_srl = obj.group_srls[j];
+            for(var i=0; i<fo_obj.group_srls.length;i++) {
+                if(group_srl==fo_obj.group_srls[i].value) fo_obj.group_srls[i].checked = true;
+            }
+        }
+    }
+
+    if(typeof(obj.module_type)!='undefined') {
+        if(obj.module_type == 'url') {
+            fo_obj.module_type.selectedIndex = 2;
+            if(typeof(obj.url)!='undefined') fo_obj.url.value = obj.url;
+            fo_obj.module_type.disabled = "disabled";
+            jQuery('#itemAttr2').css('display','none');
+            jQuery('#itemAttr3').css('display','block');
+        } else {
+            if(obj.module_type == 'page') fo_obj.module_type.selectedIndex = 1;
+            else fo_obj.module_type.selectedIndex = 1;
+            if(typeof(obj.module_id)!='undefined') fo_obj.module_id.value = obj.module_id;
+            fo_obj.module_type.disabled = "disabled";
+            jQuery('#itemAttr2').css('display','block');
+            jQuery('#itemAttr3').css('display','none');
+        }
+    }
+
+    if(typeof(obj.normal_btn)!='undefined' && obj.normal_btn) {
+        jQuery('#menu_normal_btn_img').attr("src",obj.normal_btn);
+        jQuery('#menu_normal_btn_zone','#itemAttr4').css("display",'block');
+        fo_obj.normal_btn.value = obj.normal_btn;
+    }
+    if(typeof(obj.hover_btn)!='undefined' && obj.hover_btn) {
+        jQuery('#menu_hover_btn_img').attr("src",obj.hover_btn);
+        jQuery('#menu_hover_btn_zone','#itemAttr4').css("display",'block');
+        fo_obj.hover_btn.value = obj.hover_btn;
+    }
+    if(typeof(obj.active_btn)!='undefined' && obj.active_btn) {
+        jQuery('#menu_active_btn_img').attr("src",obj.active_btn);
+        jQuery('#menu_active_btn_zone','#itemAttr4').css("display",'block');
+        fo_obj.active_btn.value = obj.active_btn;
+    }
+}
+
+
+function menuFormReset() {
+    var fo_obj = jQuery("#fo_menu").get(0);
+
+    fo_obj.parent_srl.value = '';
+    fo_obj.menu_item_srl.value = '';
+    fo_obj.mode.value = '';
+
+    jQuery(".menu_names").each(function(){ jQuery(this).val(''); });
+
+    fo_obj.browser_title.value = '';
+
+    fo_obj.menu_open_window.checked = false;
+    fo_obj.menu_expand.checked = false;
+
+    for(var i=0; i<fo_obj.group_srls.length;i++) fo_obj.group_srls[i].checked = false;
+
+    fo_obj.module_type.selectedIndex = 0;
+    fo_obj.module_type.disabled = "";
+
+    fo_obj.module_id.value = '';
+    fo_obj.url.value = '';
+    jQuery('#itemAttr3').css("display","none");
+    jQuery('#menu_normal_btn_zone','#menu_hover_btn_zone','#menu_active_btn_zone').css("display","none");
+    jQuery('#menu_normal_btn_img','#menu_hover_btn_img','#menu_active_btn_img').attr("src","");
+    jQuery('#itemAttr4').css("display","none");
+    fo_obj.reset();
+    location.href = '#';
+}
+
+function completeInsertMenuItem(data) {
+    var xml_file = data['xml_file'];
+    if(!xml_file) return;
+    homepageLoadMenuInfo(xml_url);
+    jQuery('#menuItem').css("display",'none');
+    menuFormReset();
+}
+
+
+function homepageAddMenu(node_srl,e) {
+    menuFormReset();
+    var obj = new Array();
+    obj['mode'] = 'insert';
+    if(typeof(node_srl)!='undefined' && node_srl > 0) {
+        obj['parent_srl'] = node_srl;
+    }
+
+    menuFormInsert(obj);
+
+    jQuery("#menuItem").css('position','absolute').css('display','block').css('top',e.pageY).css('left',e.pageX).css('zIndex',9999);
+    jQuery('#itemAttr4').css("display",'block');
+}
+
+
+function homepageDeleteMenu(node_srl) {
+    if(confirm(lang_confirm_delete)){
+        jQuery('#menuItem').css("display",'none');
+        var fo_obj = jQuery('#menu_item_form').get(0);
+        fo_obj.menu_item_srl.value = node_srl;
+        procFilter(fo_obj, delete_menu_item);
+    }
+}
+
+
+function nodeToggleAll(){
+    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
+        simpleTreeCollection[0].nodeToggle(this);
+    });
+}
+
+function doReloadTreeMenu(){
+    var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
+
+    jQuery.exec_json("menu.procMenuAdminMakeXmlFile",{ "menu_srl":menu_srl},
+            function(data){
+                 homepageLoadMenuInfo(xml_url);
+            }
+    );
+    jQuery('#menuItem').css("display",'none');
+    menuFormReset();
+}
+
+function closeTreeMenuInfo(){
+    jQuery('#menuItem').css("display",'none');
+}
+
+
+/* 모듈 생성 후 */
+function completeInsertBoard(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+
+    alert(message);
+
+    var url = current_url.setQuery('act','dispHomepageBoardInfo');
+    if(module_srl) url = url.setQuery('module_srl',module_srl);
+    if(page) url.setQuery('page',page);
+    location.href = url;
+}
+function completeInsertGroup(ret_obj) {
+    location.href = current_url.setQuery('group_srl','');
+}
+
+function completeDeleteGroup(ret_obj) {
+    location.href = current_url.setQuery('group_srl','');
+
+}
+
+function completeInsertGrant(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+
+    alert(message);
+}
+
+function completeInsertPage(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+function completeChangeLayout(ret_obj) {
+    location.reload();
+}
+
+function doDeleteGroup(group_srl) {
+    var fo_obj = xGetElementById('fo_group');
+    fo_obj.group_srl.value = group_srl;
+    procFilter(fo_obj, delete_group);
+}
+
+function changeMenuType(obj) {
+    if(obj.selectedIndex == 2) {
+        xGetElementById('itemAttr2').style.display = 'none';
+        xGetElementById('itemAttr3').style.display = 'block';
+        return;
+    } 
+
+    xGetElementById('itemAttr2').style.display = 'block';
+    xGetElementById('itemAttr3').style.display = 'none';
+
+}
+
+function homepageMoveMenuItem() {
+    xAddEventListener(window, 'load', function() { document.body.appendChild(xGetElementById("menuItem")); xGetElementById("menuItem").style.width="550px";} );
+}
+
+function doRemoveMember(confirm_msg) {
+    var fo_obj = xGetElementById('siteMembers');
+    var chk_obj = fo_obj.cart;
+    if(!chk_obj) return;
+
+
+    var values = new Array();
+    if(typeof(chk_obj.length)=='undefined') {
+        if(chk_obj.checked) values[values.length]=chk_obj.value;
+    } else {
+        for(var i=0;i<chk_obj.length;i++) {
+            if(chk_obj[i].checked) values[values.length]=chk_obj[i].value;
+        }
+    }
+    if(values.length<1) return;
+
+    if(!confirm(confirm_msg)) return;
+
+    params = new Array();
+    params['member_srl'] = values.join(',');
+
+    exec_xml('homepage','procHomepageDeleteMember', params, doCompleteRemoveMember);
+}
+
+function doCompleteRemoveMember(ret_obj) { 
+    alert(ret_obj['message']); 
+    location.reload(); 
+}
diff --git a/modules/homepage/tpl/layout_setup.html b/modules/homepage/tpl/layout_setup.html
new file mode 100644
index 000000000..103d10b16
--- /dev/null
+++ b/modules/homepage/tpl/layout_setup.html
@@ -0,0 +1,183 @@
+<!--%import("./filter/change_language.xml")-->
+<!--%import("./filter/change_layout.xml")-->
+<!--%import("filter/update_index_mid.xml")-->
+
+<!--#include("_header.html")-->
+
+
+<h4 class="xeAdmin">{$lang->cmd_select_index}</h4>
+<form method="post" action="./" onsubmit="return procFilter(this,update_index_mid)" class="midDefault">
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td>
+            <select name="index_mid">
+                <!--@foreach($mid_list as $no => $val)-->
+                <option value="{$val->module_srl}" <!--@if($val->module_srl==$homepage_info->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title} ({$val->mid})</option>
+                <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_select}" /></span>
+        </th>
+    </tr>
+    </table>
+</form>
+
+
+<h4 class="xeAdmin">{$lang->default_language}</h4>
+<p class="summary">{$lang->About_default_language}</p>
+<form action="./" method="get" onsubmit="return procFilter(this, change_language);">
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td>
+            <select name="language">
+            <!--@foreach($lang_supported as $key => $val)-->
+                <option value="{$key}" <!--@if($key==$site_module_info->default_language)-->selected="selected"<!--@end-->>{$val}</option>
+            <!--@endforeach-->
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+        </th>
+    </tr>
+    </table>
+</form>
+
+<form action="./" method="post" onsubmit="return procFilter(this, change_layout);" class="gap1">
+    <h4 class="xeAdmin">{$lang->layout}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th><div>{$lang->layout}</div></th>
+        <td colspan="2">
+            <select name="layout">
+                <option value="faceoff">faceoff</option>
+
+                <optgroup label="{$lang->downloaded_list}">
+                <!--@foreach($layout_list as $key => $val)-->
+                <option value="{$val->layout}" <!--@if($selected_layout->layout == $val->layout)-->selected="selected"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
+                <!--@end-->
+                </optgroup>
+
+            </select>
+            <span class="button black"><input type="submit" value="{$lang->cmd_change_layout}" /></span>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->path}</div></th>
+        <td colspan="2">{$selected_layout->path}</td>
+    </tr>
+    <!--@if(count($selected_layout->author))-->
+    <tr class="row2">  
+        <th scope="row"><div>{$lang->author}</div></th>
+        <td colspan="2">
+            <!--@foreach($selected_layout->author as $k => $v)-->
+            <a href="{$v->homepage}" onclick="window.open(this.href);return false;">{$v->name}</a>
+            <!--@end-->
+        </td>
+    </tr>
+    <!--@end-->
+
+    <!--@if($selected_layout->description)-->
+    <tr class="row2">  
+        <th scope="row"><div>{$lang->description}</div></th>
+        <td colspan="2">{nl2br(trim($selected_layout->description))}</td>
+    </tr>
+    <!--@end-->
+</form>
+
+<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
+<input type="hidden" name="module" value="homepage" />
+<input type="hidden" name="act" value="procHomepageLayoutUpdate" />
+<input type="hidden" name="layout_srl" value="{$selected_layout->layout_srl}" />
+<input type="hidden" name="title" value="{htmlspecialchars($homepage_info->title)}" />
+<input type="hidden" name="apply_layout" value="Y" />
+
+    <tr class="row2">
+        <th scope="row"><div>{$lang->header_script}</div></th>
+        <td colspan="2">
+            <textarea name="header_script" class="inputTypeTextArea w400">{htmlspecialchars($selected_layout->header_script)}</textarea>
+            <p>{$lang->about_header_script}</p>
+        </td>
+    </tr>
+    <!--@foreach($selected_layout->extra_var as $name => $var)-->
+        {@ $_rows[$var->group]++ }
+    <!--@end-->
+
+    <!--@foreach($selected_layout->extra_var as $name => $var)-->
+        <!--@if($var->group && ((!$_group) || $_group != $var->group))-->
+        {@$_group_idx = 0;}
+        {@$_group = $var->group}
+    <tr>
+        <th rowspan="{$_rows[$var->group]+1}"><div>{$_group}</div></th>
+    </tr>
+        <!--@end-->
+
+        <!--@if($_group_idx>0)-->
+    <tr>
+        <!--@end-->
+        <td class="nowrap"><div>{$var->title}</div></td>
+        <td <!--@if(!$var->group)-->colspan="2"<!--@end-->>
+        <!--@if($var->type == "text")-->
+            <input type="text" name="{$name}" value="{htmlspecialchars($var->value)}"  id="vars_{$name}"class="inputTypeText w400"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','vars_'.$name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+
+        <!--@elseif($var->type == "textarea")-->
+            <textarea name="{$name}" class="inputTypeTextArea w400" id="vars_{$name}">{htmlspecialchars($var->value)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','vars_'.$name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+
+        <!--@elseif($var->type=="image")-->
+
+          <!--@if($var->value)-->
+          <div>
+              <img src="../../../{$var->value}" alt="image" /><br />
+              <input type="checkbox" name="del_{$name}" value="Y" id="del_{$name}" class="checkbox" />
+              <label for="del_{$name}">{$lang->cmd_delete}</label>
+          </div>
+          <!--@end-->
+
+          <input type="file" name="{$name}" value="" />
+
+        <!--@elseif($var->type == "select")-->
+            <select name="{$name}">
+                <!--@foreach($var->options as $key => $val)-->
+                <option value="{$key}" <!--@if($key==$var->value)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+        <!--@end-->
+            <p>{$var->description}</p>
+        </td>
+    </tr>
+    <!--@end-->
+
+    <!--@if($var->group)-->
+    <!--@end-->
+
+    <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
+    <tr class="row{$cycle_idx}">
+        <th scope="row"><div>{$menu_info->title}<br />({$menu_name})</div></th>
+        <td class="left tahoma">
+            <select name="{$menu_name}">
+                <!--@foreach($menu_list as $key => $val)-->
+                <option value="{$val->menu_srl}" <!--@if($val->menu_srl == $menu_info->menu_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <!--@end-->
+
+    <tr class="row2">
+        <th colspan="3" class="button">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span>
+        </th>
+    </tr>
+    </table>
+
+</form>
+
+<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/skins/xe_official/member_list.html b/modules/homepage/tpl/member_list.html
similarity index 60%
rename from modules/homepage/skins/xe_official/member_list.html
rename to modules/homepage/tpl/member_list.html
index 43f028047..07c95b61d 100644
--- a/modules/homepage/skins/xe_official/member_list.html
+++ b/modules/homepage/tpl/member_list.html
@@ -1,17 +1,19 @@
 <!--%import("filter/update_member_group.xml")-->
 
-<h3 class="title">{$lang->cmd_homepage_menus[$act]}</h3>
-<p class="infoText">{$lang->about_homepage_act[$act]}</p>
+<!--#include("_header.html")-->
 
-<form method="post" action="./" onsubmit="return procFilter(this,update_member_group);">
-    <table cellspacing="0" class="adminTable">
+<h4 class="xeAdmin">{$lang->cmd_admin_menus[$act]}</h4>
+<p class="summary">{$lang->about_cafe_act[$act]}</p>
+
+<form method="post" action="./" onsubmit="return procFilter(this,update_member_group);" id="siteMembers">
+    <table cellspacing="0" class="crossTable">
     <thead>
         <tr>
             <th scope="col"><div>{$lang->no}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->nick_name}</div></th>
             <th scope="col" class="quarter_wide"><div>{$lang->user_id}</div></th>
-            <th scope="col"><div>{$lang->user_name}</div></th>
-            <th scope="col"><div>{$lang->nick_name}</div></th>
-            <th scope="col"><div>{$lang->group}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->user_name}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->group}</div></th>
             <th scope="col"><div>{$lang->signup_date}</div></th>
             <th scope="col"><div>{$lang->last_login}</div></th>
         </tr>
@@ -20,10 +22,10 @@
         <!--@foreach($member_list as $no => $val)-->
         {@ $val->group_list = implode(', ', $val->group_list)}
         <tr class="row{$cycle_idx}">
-            <td class="center number" > <input type="checkbox" name="cart" value="{$val->member_srl}" /> {$no}</td>
-            <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->user_id)}</span></td>
-            <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->user_name)}</span></td>
-            <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
+            <td class="center number"><input type="checkbox" name="cart" value="{$val->member_srl}" /> {$no}</td>
+            <td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
+            <td class="nowrap">{htmlspecialchars($val->user_id)}</td>
+            <td class="nowrap">{htmlspecialchars($val->user_name)}</td>
             <td class="nowrap">
                 <!--@if($members_groups[$val->member_srl])-->
                     {implode(',',$members_groups[$val->member_srl])}
@@ -36,14 +38,15 @@
         </tr>
         <!--@end-->
         <tr class="row1">
-            <td colspan="8">
+            <th colspan="8" class="button">
                 {$lang->do_selected_member} 
                 <select name="group_srl">
                     <!--@foreach($group_list as $key=>$val)-->
                     <option value="{$val->group_srl}">{$val->title}</option>
                     <!--@end-->
-                </select><input type="submit" value="{$lang->cmd_modify}" />
-            </td>
+                </select><span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" /></span>
+                <a href="#" onclick="doRemoveMember('{$lang->confirm_delete}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+            </th>
         </tr>
     </tbody>
     </table>
@@ -61,3 +64,5 @@
     <!--@end-->
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/menu_manage.html b/modules/homepage/tpl/menu_manage.html
new file mode 100644
index 000000000..c08f0dc0d
--- /dev/null
+++ b/modules/homepage/tpl/menu_manage.html
@@ -0,0 +1,195 @@
+<!--%import("./filter/insert_menu_item.xml")-->
+<!--%import("./filter/delete_menu_item.xml")-->
+
+<!--#include("_header.html")-->
+
+<!--// tree javascript plugin load -->
+<!--%load_js_plugin("ui.tree")-->
+
+<h4 class="xeAdmin">{$lang->cmd_admin_menus[$act]}</h4>
+<span style="float:right"><a href="#" onclick="doReloadTreeMenu('{$menu_info->menu_srl}');return false;" class="button"><span>{$lang->cmd_remake_cache}</span></a></span>
+<p class="summary">{$lang->about_cafe_act[$act]}</p>
+
+<form method="post" action="./" id="menu_item_form">
+    <input type="hidden" name="menu_item_srl" value="" />
+</form>
+
+<form method="post" action="./" id="menu_form">
+    <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
+    <div id="menu">
+        <ul class="simpleTree">
+            <li class="root" id='tree_0'><span>{$lang->menu}</span></li>
+        </ul>
+    </div>
+    <br />
+</form>
+
+<div id="menuItem" class="layer boxModelController">
+    <form id="fo_menu" action="./" method="post" onsubmit="return procFilter(this, insert_menu_item);" class="clear" target="tmp_upload_iframe" enctype="multipart/form-data">
+    <input type="hidden" name="module" value="homepage" />
+    <input type="hidden" name="act" value="procHompageUpdateMenuItem" />
+    <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
+    <input type="hidden" name="parent_srl" value="" />
+    <input type="hidden" name="menu_item_srl" value="" />
+    <input type="hidden" name="mode" value="" />
+    <input type="hidden" name="target" value="" />
+    <input type="hidden" name="normal_btn" value="" />
+    <input type="hidden" name="hover_btn" value="" />
+    <input type="hidden" name="active_btn" value="" />
+
+    <h4 class="xeAdmin">{$lang->menu}</h4>
+    <button class="xButton" type="button" onclick="closeTreeMenuInfo();return false" ><span>{$lang->cmd_close}</span></button>
+
+    <div class="layerBody">
+
+        <table cellspacing="0" class="rowTable" id="itemAttr1">
+        <col width="150" />
+        <col width="" />
+        <tr>
+            <th scope="row"><div>{$lang->menu_name}</div></th>
+            <td>
+                <input type="text" name="menu_name" id="menu_name" value="" class="inputTypeText"/>
+                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','menu_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+                <p class="clear">{$lang->about_langcode}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->cmd_option}</div></th>
+            <td>
+                <input type="checkbox" id="menu_open_window" name="menu_open_window" value="Y" />
+                <label for="menu_open_window">{$lang->menu_open_window}</label>
+                <input type="checkbox" id="menu_expand" name="menu_expand" value="Y" />
+                <label for="menu_expand">{$lang->menu_expand}</label>
+                <p>{$lang->about_menu_option}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->item_group_grant}</div></th>
+            <td>
+                <!--@foreach($group_list as $key=>$val)-->
+                <input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
+                <label for="group_{$key}">{$val->title}</label>
+                <!--@end-->
+                <p>{$lang->about_group_grant}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->module_type}</div></th>
+            <td>
+                <select name="module_type" onchange="changeMenuType(this)">
+                    <option value="board">{$lang->board}</option>
+                    <option value="page">{$lang->page}</option>
+                    <option value="url">{$lang->url}</option>
+                </select>
+                <p>{$lang->about_module_type}</p>
+            </td>
+        </tr>
+        </table>
+
+        <table cellspacing="0" class="rowTable" id="itemAttr2">
+        <col width="150" />
+        <col width="" />
+        <tr>
+            <th scope="row"><div>{$lang->browser_title}</div></th>
+            <td>
+                <input type="text" name="browser_title" value="" class="inputTypeText fullWidth" />
+                <p>{$lang->about_browser_title}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->module_id}</div></th>
+            <td>
+                <input type="text" name="module_id" value="" class="inputTypeText fullWidth" />
+                <p>{$lang->about_module_id}</p>
+            </td>
+        </tr>
+        </table>
+
+        <table cellspacing="0" class="rowTable" id="itemAttr3">
+        <col width="150" />
+        <col width="" />
+        <tr>
+            <th scope="row"><div>{$lang->url}</div></th>
+            <td>
+                http://<input type="text" name="url" value="" class="inputTypeText fullWidth" />
+                <p>{$lang->about_menu_item_url}</p>
+            </td>
+        </tr>
+        </table>
+
+        <table cellspacing="0" class="rowTable" id="itemAttr4">
+        <col width="150" />
+        <col width="150" />
+        <col width="" />
+        <tr>
+            <th scope="row" rowspan="4"><div>{$lang->menu_img_btn}</div></th>
+            <th scope="row"><div>{$lang->menu_normal_btn}</div></th>
+            <td>
+                <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->>
+                    <img src="" alt="" id="menu_normal_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_normal_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_normal_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_hover_btn}</div></th>
+            <td>
+                <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->>
+                    <img src="" alt="" id="menu_hover_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_hover_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_hover_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_active_btn}</div></th>
+            <td>
+                <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->>
+                    <img src="" alt="" id="menu_active_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_active_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_active_btn" value="" class="inputTypeText" onchange="doHomepageMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">{$lang->about_menu_image_button}</td>
+        </tr>
+        </table>
+
+        <table cellspacing="0" class="rowTable">
+        <tr>
+            <th scope="row" class="button"><div>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+            </div></th>
+        </tr>
+        </table>
+    </div>
+
+    </form>
+</div>
+
+<iframe id='tmp_upload_iframe' name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>
+
+<script type="text/javascript">
+var max_menu_depth = 999; //{$menu_max_depth};
+var simpleTreeCollection;
+var alertImageOnly = "{$lang->alert_image_only}";
+var confirmMenuMove = "{$lang->confirm_move}";
+var lang_confirm_delete = "{$lang->confirm_delete}";
+var xml_url = "{$menu_info->xml_file}";
+homepageLoadMenuInfo(xml_url);
+homepageMoveMenuItem();
+
+(function($){
+$("[name^=menu_name_]").bind("blur",function(e){
+	if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
+		$("[name^=ck_menu_name_]:checked").each(function(i){
+			$("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
+		});
+	}
+});
+})(jQuery);
+</script>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/mid_list.html b/modules/homepage/tpl/mid_list.html
new file mode 100644
index 000000000..7cc334408
--- /dev/null
+++ b/modules/homepage/tpl/mid_list.html
@@ -0,0 +1,34 @@
+<!--#include("_header.html")-->
+
+<h4 class="xeAdmin">{$lang->cmd_admin_menus[$act]}</h4>
+<p class="summary">{$lang->about_cafe_act[$act]}</p>
+
+<table cellspacing="0" class="rowTable">
+<thead>
+    <tr>
+        <th scope="col"><div>{$lang->module}</div></th>
+        <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
+        <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
+        <th scope="col"><div>{$lang->regdate}</div></th>
+        <th scope="col"><div>{$lang->cmd_setup}</div></th>
+    </tr>
+</thead>
+<tbody>
+    <!--@foreach($mid_list as $no => $val)-->
+    <tr class="row{$cycle_idx}">
+        <td class="nowrap">{Context::getLang($val->module)}</td>
+        <td class="nowrap"><a href="{getSiteUrl($site_module_info->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->mid)}</a></td>
+        <td class="wide"><a href="{getSiteUrl($site_module_info->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$val->browser_title}</a></td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <!--@if($val->module=='board')-->
+        <td><a href="{getUrl('act','dispHomepageBoardInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <!--@else-->
+        <td><a href="{getUrl('act','dispHomepagePageGrant','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <!--@end-->
+    </tr>
+    <!--@end-->
+</tbody>
+</table>
+</form>
+
+<!--#include("_footer.html")-->
diff --git a/modules/homepage/tpl/page_grant_list.html b/modules/homepage/tpl/page_grant_list.html
new file mode 100644
index 000000000..76ed308eb
--- /dev/null
+++ b/modules/homepage/tpl/page_grant_list.html
@@ -0,0 +1,5 @@
+<!--#include("./_page_header.html")-->
+
+{$grant_content}
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/skins/xe_official/page_insert.html b/modules/homepage/tpl/page_insert.html
similarity index 95%
rename from modules/homepage/skins/xe_official/page_insert.html
rename to modules/homepage/tpl/page_insert.html
index adb0e97d1..3faf18119 100644
--- a/modules/homepage/skins/xe_official/page_insert.html
+++ b/modules/homepage/tpl/page_insert.html
@@ -1,4 +1,5 @@
 <!--%import("filter/insert_page.xml")-->
+<!--#include("./_header.html")-->
 
 <h3 class="title">{$lang->page} > {$module_info->browser_title}</h1>
 
@@ -33,3 +34,5 @@
     </table>
 
 </form>
+
+<!--#include("./_footer.html")-->
diff --git a/modules/homepage/tpl/setup.html b/modules/homepage/tpl/setup.html
index 9605f5d5a..3e7b5bb4c 100644
--- a/modules/homepage/tpl/setup.html
+++ b/modules/homepage/tpl/setup.html
@@ -1,54 +1,54 @@
 <!--%import("./js/homepage.js",optimized=false)-->
 <!--%import("./filter/update_homepage.xml")-->
 
-<h3>{$lang->homepage} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->cafe} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<div class="infoText">{nl2br($lang->about_homepage)}</div>
+<div class="infoText">{nl2br($lang->about_cafe)}</div>
 
 <form action="./" method="post" onsubmit="return doUpdateHomepage(this, update_homepage)" id="fo_homepage">
 <input type="hidden" name="site_srl" value="{$homepage_info->site_srl}" />
 <input type="hidden" name="homepage_admin" value="<!--@foreach($admin_list as $key=>$val)-->{$val->member_srl},<!--@end-->" />
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="crossTable">
     <thead>
         <tr>
-            <th colspan="2"><div>{$lang->cmd_homepage_setup}</div></th>
+            <th colspan="2"><div>{$lang->cmd_cafe_setup}</div></th>
         </tr>
     </thead>
     <tbody>
         <tr>
-            <th scope="row"><div>{$lang->homepage_title}</div></th>
+            <th scope="row"><div>{$lang->cafe_title}</div></th>
             <td>
                 <input type="text" name="homepage_title" value="{$homepage_info->title}" class="inputTypeText w200" />
-                <a href="{getSiteUrl($homepage_info->domain,'', 'act','dispHomepageManage')}" onclick="window.open(this.href); return false;" class="button blue"><span>{$lang->cmd_management}</span></a>
-                <p>{$lang->about_homepage_title}</p>
+                <a href="{getSiteUrl($homepage_info->domain,'', 'module','homepage','act','dispHomepageManage')}" onclick="window.open(this.href); return false;" class="button"><span>{$lang->cmd_management}</span></a>
+                <p>{$lang->about_cafe_title}</p>
             </td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->domain}</div></th>
             <td>
                 http://<input type="text" name="domain" value="{$homepage_info->domain}" class="inputTypeText w200" />
-                <a href="{getSiteUrl($homepage_info->domain, '')}" onclick="window.open(this.href); return false;" class="button blue"><span>{$lang->cmd_move}</span></a>
+                <a href="{getSiteUrl($homepage_info->domain, '')}" onclick="window.open(this.href); return false;" class="button"><span>{$lang->cmd_move}</span></a>
                 <p>{$lang->about_domain}</p>
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->homepage_admin}</div></th>
+            <th scope="row"><div>{$lang->cafe_admin}</div></th>
             <td>
-                <select name="admin_list" multiple="multiple" size="{count($admin_list)?count($admin_list):1}" class="w200">
+                <select name="admin_list" multiple="multiple" size="{count($admin_list)?count($admin_list):1}" class="fullWidth">
                 <!--@foreach($admin_list as $key => $val)-->
                     <option value="{$val->user_id}">{$val->nick_name} ({$val->user_id})</option>
                 <!--@end-->
                 </select>
                 <br />
                 <input type="text" name="admin_id" class="inputTypeText w100" />
-                <span class="button blue"><button type="button" onclick="doHomepageInsertAdmin()">{$lang->cmd_insert}</button></span>
-                <span class="button red"><button type="button" onclick="doHomepageDeleteAdmin()">{$lang->cmd_delete}</button></span>
-                <p>{$lang->about_homepage_admin}</p>
+                <span class="button"><button type="button" onclick="doHomepageInsertAdmin()">{$lang->cmd_insert}</button></span>
+                <span class="button"><button type="button" onclick="doHomepageDeleteAdmin()">{$lang->cmd_delete}</button></span>
+                <p>{$lang->about_cafe_admin}</p>
             </td>
         </tr>
         <tr class="row2">
-            <td colspan="2" class="right">
-                <span class="button red strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span></div>
+            <th colspan="2" class="button">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
             </th>
         </tr>
     </tbody>
diff --git a/modules/homepage/tpl/site_status.html b/modules/homepage/tpl/site_status.html
new file mode 100644
index 000000000..e019baf2c
--- /dev/null
+++ b/modules/homepage/tpl/site_status.html
@@ -0,0 +1,140 @@
+<!--#include("_header.html")-->
+
+<!--%import("../../counter/tpl/js/counter_admin.js")-->
+
+<!--// datepicker javascript plugin load -->
+<!--%load_js_plugin("ui.datepicker")-->
+
+<script type="text/javascript">
+    function moveDate() {
+        xGetElementById('fo_calendar').submit();
+        return true;
+    }
+</script>
+
+
+<h3 class="xeAdmin">{$lang->counter} <span class="gray">{$lang->cmd_management}</span></h3>
+
+<div class="header4 gap1">
+
+    <form action="./index.php" method="get" id="fo_calendar">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="selected_date" id="selected_date" value="{zDate('Ymd',$selected_date)}" />
+
+    <table cellspacing="0" class="colTable">
+    <thead>
+    <tr>
+        <th scope="row" class="half_wide"><div>{$lang->total_counter}</div></th>
+        <th scope="row" class="half_wide">
+            <div>
+                <span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span>
+<input type="hidden" class="inputDate" value="{zdate($selected_date,'Y-m-d')}" />
+                <script type="text/javascript">
+(function($){
+    $(function(){
+        var option = {
+            gotoCurrent: false
+            ,yearRange:'-100:+10'
+            ,showOn:"button"
+            ,buttonImage:"./modules/counter/tpl/images/buttonCalendar.gif"
+            ,buttonImageOnly:true
+            ,mandatory:true
+            ,onSelect:function(){
+                $("#str_selected_date").html(this.value);
+                $("#selected_date").val(this.value.replace(/-/g,''));
+                moveDate();
+            }
+        };
+
+        $.extend(option,$.datepicker.regional['{$lang_type}']);
+        $(".inputDate").datepicker(option);
+    });
+})(jQuery);
+                </script>
+            </div>
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td class="number center">Visitor <strong>{number_format($total_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($total_counter->pageview)}</strong></td>
+        <td class="number center">Visitor : <strong>{number_format($selected_day_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($selected_day_counter->pageview)}</strong></td>
+    </tr>
+    </tbody>
+    </table>
+
+    </form>
+
+    <ul class="localNavigation">
+        <!--@foreach($lang->cmd_select_counter_type as $key => $val)-->
+        <li <!--@if($type==$key || (!$type && $key == "hour"))-->class="on"<!--@end-->><a href="{getUrl('type',$key)}">{$val}</a></li>
+        <!--@end-->
+    </ul>
+</div>
+
+
+<!-- 일자를 옮기는 form -->
+<form action="./" method="get" id="fo_counter">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="selected_date" value="{$selected_date}" />
+</form>
+
+
+<!-- unique visitor 그래프 -->
+<table cellspacing="0" class="rowTable">
+<!--@foreach($detail_status->list as $key => $val)-->
+    <!--@if($detail_status->sum>0)-->
+        {@$percent = sprintf("%0.2f", $val / $detail_status->sum * 100 )}
+        {@$img_width = sprintf("%0.0f", $val / $detail_status->max * 100 )}
+    <!--@else-->
+        {@$percent = 0}
+        {@$img_width = 1}
+    <!--@end-->
+<tr>
+    <!--@if(Context::getLangType()=='en')-->
+    <th scope="row">
+        <div>
+        <!--// 시간대별 -->
+        <!--@if($type == 'year')-->
+            <em>{$key}</em>
+        <!--@elseif($type == 'month')-->
+            <em>{$key}</em>
+        <!--@elseif($type == 'day')-->
+            <em>{$key}</em> {$lang->unit_day}
+        <!--@else-->
+            <em>{$key}</em>
+        <!--@end-->
+        </div>
+    </th>
+    <!--@else-->
+    <th scope="row">
+        <div>
+        <!--// 시간대별 -->
+        <!--@if($type == 'year')-->
+            <em>{$key}</em> {$lang->unit_year}
+        <!--@elseif($type == 'month')-->
+            <em>{$key}</em> {$lang->unit_month}
+        <!--@elseif($type == 'day')-->
+            <em>{$key}</em> {$lang->unit_day}
+        <!--@else-->
+            <em>{$key}</em> {$lang->unit_hour}
+        <!--@end-->
+        </div>
+    </th>
+    <!--@end-->
+    <td class="wide">
+        {@$img_percent = $percent-30}
+        <!--@if($img_percent<1)-->
+            <img class="graphHr" style="width:3px;" alt="" src="../../counter/tpl/images/iconBar.gif" />
+        <!--@else-->
+            <img class="graphHr" style="width:{$img_percent}%;" alt="" src="../../counter/tpl/images/iconBar.gif" />
+        <!--@end-->
+        {number_format($val)}({$percent}%) 
+    </td>
+</tr>
+<!--@end-->
+</table>
+
+<!--#include("_footer.html")-->
diff --git a/modules/importer/conf/info.xml b/modules/importer/conf/info.xml
index bbff64bcf..7fbfebfb6 100644
--- a/modules/importer/conf/info.xml
+++ b/modules/importer/conf/info.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
-    <title xml:lang="ko">XE 데이터 이전</title>
-    <title xml:lang="en">XE data transferation</title>
+    <title xml:lang="ko">데이터 이전</title>
+    <title xml:lang="en">data transferation</title>
     <title xml:lang="zh-CN">数据导入</title>
-    <title xml:lang="jp">XEデータ移転</title>
-    <title xml:lang="es">Transferencia de los datos de XE</title>
-    <title xml:lang="ru">Трансферинг данных XE</title>
+    <title xml:lang="jp">ータ移転</title>
+    <title xml:lang="es">Transferencia de los datos</title>
+    <title xml:lang="ru">Трансферинг</title>
     <title xml:lang="zh-TW">資料匯入</title>
     <description xml:lang="ko">XML파일을 이용하여 회원정보 또는 게시판등의 데이터를 입력합니다.</description>
     <description xml:lang="en">Inputting member information or board's data using XML file.</description>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">利用XML檔案匯入會員或討論板資料。</description>
     <version>0.2</version>
     <date>2007-12-13</date>
-    <category>accessory</category>
+    <category>migration</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/importer/conf/module.xml b/modules/importer/conf/module.xml
index b923bd987..2dae81e89 100644
--- a/modules/importer/conf/module.xml
+++ b/modules/importer/conf/module.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispImporterAdminContent" type="view" standalone="true" admin_index="true" />
 
diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php
index 8f16060fc..3e00c2849 100644
--- a/modules/importer/extract.class.php
+++ b/modules/importer/extract.class.php
@@ -6,8 +6,8 @@
      **/
     class extract {
         var $key = '';
-        var $cache_path = './files/cache/tmp';
-        var $cache_index_file = './files/cache/tmp';
+        var $cache_path = './files/cache/importer';
+        var $cache_index_file = './files/cache/importer';
         
         var $filename = null;
         var $startTag = '';
@@ -38,7 +38,7 @@
 
             $this->key = md5($filename);
 
-            $this->cache_path = './files/cache/tmp/'.$this->key;
+            $this->cache_path = './files/cache/importer/'.$this->key;
             $this->cache_index_file = $this->cache_path.'/index';
 
             if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 549982c1c..925ed4f98 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -36,6 +36,7 @@
          * @brief XML파일을 미리 분석하여 개발 단위로 캐싱
          **/
         function procImporterAdminPreProcessing() {
+            DebugPrint('procImporterAdminPreProcessing...');
             // 이전할 대상 xml파일을 구함
             $xml_file = Context::get('xml_file');
 
@@ -55,33 +56,62 @@
                         if($output->toBool()) $oExtract->saveItems();
                     break;
                 case 'ttxml' :
-                        // 카테고리 정보를 먼저 구함
-                        $output = $oExtract->set($xml_file,'','<author', '<category>', '<post ');
-                        if($output->toBool()) {
+                        DebugPrint('preprocessing ttxml started.');
+                        // 카테고리 정보를 구함
+                        $output = $oExtract->set($xml_file, '', '', '', '');
+                        if ($output->toBool()) {
                             // ttxml 카테고리는 별도로 구함
                             $started = false;
                             $buff = '';
-                            while(!feof($oExtract->fd)) {
+                            while (!feof($oExtract->fd)) {
                                 $str = fgets($oExtract->fd, 1024);
                                 if(substr($str,0,strlen('<category>'))=='<category>') $started = true;
-                                if(substr($str,0,strlen('<post '))=='<post ') break;
-                                if($started) $buff .= $str;
+                                if(substr($str,0,strlen('<post ')) == '<post ') break;
+                                if ($started) $buff .= $str;
                             }
-                            $buff = '<items>'.$buff.'</items>';
+                            $buff = '<categories>'.$buff.'</categories>';
                             $oExtract->closeFile();
-                            $category_filename = sprintf('%s/%s', $oExtract->cache_path, 'category');
+                            $category_filename = sprintf('%s/%s', $oExtract->cache_path, 'category.xml');
                             FileHandler::writeFile($category_filename, $buff);
 
-                            // 개별 아이템 구함
-                            $output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
-                            if($output->toBool()) $oExtract->saveItems();
+                            DebugPrint('category finished.');
+                            
+                            // 방명록 정보를 구함
+                            $output = $oExtract->set($xml_file, '', '', '', '');
+                            if ($output->toBool()) {
+                                $started = false;
+                                $buff = '';
+                                while (!feof($oExtract->fd)) {
+                                    $str = fgets($oExtract->fd, 1024);
+                                    if(substr($str,0,strlen('<guestbook>'))=='<guestbook>') $started = true;
+                                    if ($started) {
+                                        $pos = strpos($str, '</guestbook>');
+                                        if ($pos !== false) {
+                                            $buff .= substr($str, 0, $pos + strlen('</guestbook>'));
+                                            break;
+                                        }
+                                        $buff .= $str;
+                                    }
+                                }
+                                $oExtract->closeFile();
+                                $guestbook_filename = sprintf('%s/%s', $oExtract->cache_path, 'guestbook.xml');
+                                FileHandler::writeFile($guestbook_filename, $buff);
+
+                                DebugPrint('guestbook finished.');
+
+                                // 개별 아이템 구함
+                                $output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
+                                if($output->toBool()) $oExtract->saveItems();
+
+                                DebugPrint('data finished.');
+                            }
                         }
                     break;
                 default :
                         // 카테고리 정보를 먼저 구함
                         $output = $oExtract->set($xml_file,'<categories>', '</categories>', '<category','</category>');
                         if($output->toBool()) {
-                            $oExtract->mergeItems('category');
+                            $oExtract->mergeItems('category.xml');
 
                             // 개별 아이템 구함
                             $output = $oExtract->set($xml_file,'<posts ', '</posts>', '<post>', '</post>');
@@ -110,6 +140,7 @@
          * @brief xml파일의 내용이 extract되고 난후 차례대로 마이그레이션
          **/
         function procImporterAdminImport() {
+
             // 변수 설정
             $type = Context::get('type');
             $total = Context::get('total');
@@ -117,10 +148,11 @@
             $key = Context::get('key');
             $user_id = Context::get('user_id');
             $target_module = Context::get('target_module');
+            $guestbook_target_module = Context::get('guestbook_target_module');
             $this->unit_count = Context::get('unit_count');
             
             // index파일이 있는지 확인
-            $index_file = './files/cache/tmp/'.$key.'/index';
+            $index_file = './files/cache/importer/'.$key.'/index';
             if(!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file');
 
             switch($type) {
@@ -129,7 +161,7 @@
 
                         require_once('./modules/importer/ttimport.class.php');
                         $oTT = new ttimport();
-                        $cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $user_id);
+                        $cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id);
                     break;
                 case 'message' :
                         $cur = $this->importMessage($key, $cur, $index_file);
@@ -154,7 +186,7 @@
             // 모두 입력시 성공 메세지 출력하고 cache 파일제거
             if($total <= $cur) {
                 $this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
-                FileHandler::removeFilesInDir('./files/cache/tmp/');
+                FileHandler::removeFilesInDir('./files/cache/importer/'.$key);
             } else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
         }
 
@@ -404,7 +436,7 @@
             if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 
             // 먼저 카테고리 정보를 입력함
-            $category_file = preg_replace('/index$/i', 'category', $index_file);
+            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
             if(file_exists($category_file)) {
                 $buff = FileHandler::readFile($category_file);
                
@@ -793,7 +825,7 @@
                         // 디렉토리 생성
                         if(!FileHandler::makeDir($path)) continue;
 
-                        if(preg_match('/^\.\/files\/cache\/tmp/i',$file_obj->file)) FileHandler::rename($file_obj->file, $filename);
+                        if(preg_match('/^\.\/files\/cache\/importer/i',$file_obj->file)) FileHandler::rename($file_obj->file, $filename);
                         else @copy($file_obj->file, $filename);
 
                         // DB입력
@@ -825,7 +857,7 @@
          * @biref 임의로 사용할 파일이름을 return
          **/
         function getTmpFilename() {
-            $path = "./files/cache/tmp";
+            $path = "./files/cache/importer";
             if(!is_dir($path)) FileHandler::makeDir($path);
             $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
             if(file_exists($filename)) $filename .= rand(111,999);
diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php
index b3bf5e6ec..4a7ab2d71 100644
--- a/modules/importer/importer.class.php
+++ b/modules/importer/importer.class.php
@@ -11,10 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('importer', 'view', 'dispImporterAdminContent');
-
             return new Object();
         }
 
diff --git a/modules/importer/lang/en.lang.php b/modules/importer/lang/en.lang.php
index 41059276b..3af89015b 100644
--- a/modules/importer/lang/en.lang.php
+++ b/modules/importer/lang/en.lang.php
@@ -27,14 +27,18 @@
         13 => 'Step 1-3. Select target category',
         2 => 'Step 2. Upload XML file',
         3 => 'Step 2. Synchronize member data and article data',
+        99 => 'Transferring data',
     );
 
     $lang->import_step_desc = array(
         1 => 'Please select the XML file\'s type you wish to transfer.',
         12 => 'Please select the module you wish to transfer datas.',
+        121 => 'Posts:',
+        122 => 'Guestbook:',
         13 => 'Please select the target category you wish to tranfer datas.',
         2 => "Please input the XML file's location you wish to tranfer datas.\nIf it is located in the same account, input absolute/relative path. If not, input the url starting with http://..",
         3 => 'The member data and article data may not be correct after the transferation. If that is the case, synchronize to repair it based on user_id.',
+        99 => 'Transferring data in progress.',
     );
 
     // guide/alert
diff --git a/modules/importer/lang/es.lang.php b/modules/importer/lang/es.lang.php
index 024afdf83..40433d424 100644
--- a/modules/importer/lang/es.lang.php
+++ b/modules/importer/lang/es.lang.php
@@ -27,14 +27,18 @@
         13 => 'Paso 1-3. Seleccione la categoría del módulo',
         2 => 'Paso 2. Subir el archivo XML',
         3 => 'Paso 2. Sincronizar las informaciones del usuario y la del documento',
+        99 => '데이터 이전',
     );
 
     $lang->import_step_desc = array(
         1 => 'Seleccione el tipo de archivo XML a transfrerir.',
         12 => 'Seleccione el módulo para transferir los datos.',
+        121 => '글:',
+        122 => '방명록:',
         13 => 'Seleccione la categoría para transferir los datos.',
         2 => "Ingrese la ubicación del archivo XML para transfer los datos.\nPuede ser ruta absoluto o relativo.",
         3 => 'La información del usuario y del documento podría ser incorrecto luego de la transferencia. Si ese es el caso, sincroniza para la corrección basado a la ID del usuario.',
+        99 => '데이터를 이전중입니다',
     );
 
     // Guía/ Alerta
diff --git a/modules/importer/lang/fr.lang.php b/modules/importer/lang/fr.lang.php
index f50ac9bed..fc524bf94 100644
--- a/modules/importer/lang/fr.lang.php
+++ b/modules/importer/lang/fr.lang.php
@@ -33,6 +33,8 @@
     $lang->import_step_desc = array(
         1 => 'Choisissez la sorte du fichier en XML que vous voulez transférer.',
         12 => 'Choisissez le module objectif dans lequel vous voulez tranférer les données.',
+        121 => '글:',
+        122 => '방명록:',
         13 => 'Choisissez la catégorie objective dans laquelle vous voulez transférer les données.',
         2 => "Entrez le chemin du fichier en XML pour transférer les données.\nS'il est localisé dans le même compte, entréz le chemin absolut ou relatif. Sinon, entrez l'URL commençant avec http://..",
         3 => 'Les données des membres et ceux des articles peuvent ne pas s\'accorder après la transfèrement. Dans ce cas, synchronisez S.V.P. Ça arrangera les données en étant basé sur le compte d\'utilisateur.',
diff --git a/modules/importer/lang/jp.lang.php b/modules/importer/lang/jp.lang.php
index decd6450b..e0c1ea793 100644
--- a/modules/importer/lang/jp.lang.php
+++ b/modules/importer/lang/jp.lang.php
@@ -33,6 +33,8 @@
     $lang->import_step_desc = array(
         1 => '変換するXMLファイルの種類を選択してください。',
         12 => 'データ変換を行う対象モジュールを選択してください。',
+        121 => '글:',
+        122 => '방명록:',
         13 => 'データ変換を行う対象カテゴリを選択してください。',
         2 => "データ変換を行うXMLファイルパスを入力してください。同じアカウントのサーバ上では、相対または絶対パスを、異なるサーバにアップロードされている場合は「http://アドレス..」を入力してください。",
         3 => '会員情報と書き込みデータの情報の変換を行った後、データが合わない場合があります。この時に同期化を行うと「user_id」をもとに正しく動作するようにします。',
diff --git a/modules/importer/lang/ko.lang.php b/modules/importer/lang/ko.lang.php
index 990055e42..e032b845f 100644
--- a/modules/importer/lang/ko.lang.php
+++ b/modules/importer/lang/ko.lang.php
@@ -33,6 +33,8 @@
     $lang->import_step_desc = array(
         1 => '이전을 하려는 XML파일의 종류를 선택해주세요.',
         12 => '데이터 이전을 할 대상 모듈을 선택해주세요.',
+        121 => '글:',
+        122 => '방명록:',
         13 => '데이터 이전을 할 대상 분류를 선택해주세요.',
         2 => "데이터 이전을 할 XML파일의 경로를 입력해주세요.\n상대 또는 절대 경로를 입력하시면 됩니다",
         3 => '회원정보와 게시물의 정보가 이전후에 맞지 않을 수 있습니다. 이 때 동기화를 하시면 user_id를 기반으로 올바르게 동작하도록 합니다.',
diff --git a/modules/importer/lang/ru.lang.php b/modules/importer/lang/ru.lang.php
index 7d6548920..099bf88dd 100644
--- a/modules/importer/lang/ru.lang.php
+++ b/modules/importer/lang/ru.lang.php
@@ -27,14 +27,18 @@
         13 => 'Шаг 1-3. Выберите категорию назначения',
         2 => 'Шаг 2. Загрузить XML файл',
         3 => 'Шаг 2. Синхронизировать данные пользователей и статей',
+        99 => '데이터 이전',
     );
 
     $lang->import_step_desc = array(
         1 => 'Пожалуйста, выберите тип XML файла, который Вы хотите импортировать.',
         12 => 'Пожалуйста, выберите модуль, в который Вы хотите импортировать данные.',
+        121 => '글:',
+        122 => '방명록:',
         13 => 'Пожалуйста, выберите категорию назначения, в которую Вы хотите импортировать данные.',
         2 => "Пожайлуста, введите расположение XML файла, который Вы хотите импортировать.\nЕсли он находится в одном аккаунте, то введите абсолютный/относительный путь. Если нет, то введите URL, начинающийся с http://...",
         3 => 'Данные пользователей и статей могут быть некорректны после импорта. В таком случае, выполните синхронизацию для восстановления, основанного на user_id.',
+        99 => '데이터를 이전중입니다',
     );
 
     // гид/алерт
diff --git a/modules/importer/lang/zh-CN.lang.php b/modules/importer/lang/zh-CN.lang.php
index 2474733b3..0526b0ded 100644
--- a/modules/importer/lang/zh-CN.lang.php
+++ b/modules/importer/lang/zh-CN.lang.php
@@ -33,6 +33,8 @@
     $lang->import_step_desc = array(
         1 => '请选择要导入的XML文件种类。',
         12 => '请选择要导入的对象模块。',
+        121 => '主题:',
+        122 => '留言本:',
         13 => '请选择要导入的对象分类。',
         2 => "请输入要导入的XML文件的位置。\n可输入相对或绝对路径。",
         3 => '数据导入后可能会导致会员信息和文章内容信息的误差。这时以user_id进行同步即可解决问题。',
diff --git a/modules/importer/lang/zh-TW.lang.php b/modules/importer/lang/zh-TW.lang.php
index 2e1261505..30e05ad51 100644
--- a/modules/importer/lang/zh-TW.lang.php
+++ b/modules/importer/lang/zh-TW.lang.php
@@ -2,10 +2,10 @@
     /**
      * @file   zh-TW.lang.php
      * @author zero (zero@nzeo.com) 翻譯：royallin
-     * @brief  匯入模組語言
+     * @brief  匯入(importer)模組語言
      **/
 
-    // 按鈕上使用的語言
+    // 按鈕語言
     $lang->cmd_sync_member = '同步';
     $lang->cmd_continue = '繼續進行';
     $lang->preprocessing = '準備匯入資料...';
@@ -33,9 +33,11 @@
     $lang->import_step_desc = array(
         1 => '請選擇要匯入的XML檔案類型。',
         12 => '請選擇要匯入的目標模組。',
+        121 => '文章:',
+        122 => '討論板:',
         13 => '請選擇要匯入的目標分類。',
         2 => "請輸入要匯入的XML檔案位置。\n可輸入相對或絕對路徑。",
-        3 => '資料匯入後，可能會導致會員資料和文章內容產生誤差。請以user_id進行同步即可解決。',
+        3 => '資料匯入後，可能會導致會員資料和文章內容產生誤差。請以『user_id』進行同步即可解決。',
         99 => '資料匯入中...',
     );
 
@@ -43,17 +45,17 @@
     $lang->msg_sync_member = '按同步按鈕，即可開始進行會員資料和文章的同步。';
     $lang->msg_no_xml_file = '找不到XML檔案，請重新確認路徑。';
     $lang->msg_invalid_xml_file = 'XML檔案格式錯誤！';
-    $lang->msg_importing = '%d個的資料中正在輸入 %d個。 （長時間沒有回應時，請按「繼續進行」按鈕）';
+    $lang->msg_importing = '%d個的資料中正在輸入 %d個。(長時間沒有回應時，請按「繼續進行」按鈕)';
     $lang->msg_import_finished = '已完成輸入%d/%d個資料。根據情況的不同，可能會出現沒有被匯入的資料。';
     $lang->msg_sync_completed = '已完成會員和文章，評論的同步。';
 
-    // 說明
+    // 其他
     $lang->about_type_member = '資料匯入目標為會員資料時，請選擇此項。';
     $lang->about_type_message = '資料匯入目標為短信息(MemoBox)時，請選擇此項。';
     $lang->about_type_ttxml = '資料匯入目標為TTXML(textcube系列)時，請選擇此項。';
     $lang->about_ttxml_user_id = '請輸入匯入TTXML資料時，指定為主題發表者的ID(必須是已註冊會員)。';
     $lang->about_type_module = '資料匯入目標為討論板主題時，請選擇此項。';
     $lang->about_type_syncmember = '匯入會員和文章資料後，需要同步會員資料時，請選擇此項。';
-    $lang->about_importer = "不僅可以匯入Zeroboard 4，Zb5beta的資料，也能夠把其他程式資料匯入到XE當中。\n匯入資料時，請利用 <a href=\"http://svn.zeroboard.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>建立XML檔案後再上傳。";
-    $lang->about_target_path = "為了下載附件請輸入Zeroboard 4的安裝位置。\n位置在同一個主機時，請輸入如 /home/id/public_html/bbs的路徑,在不同主機時，請輸入如 http://域名/bbs的url地址。";
+    $lang->about_importer = "不僅可以匯入Zeroboard 4，Zb5beta的資料，也能夠把其他程式資料匯入到XE當中。\n匯入資料時，請利用<a href=\"http://svn.zeroboard.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>建立XML檔案後再上傳。";
+    $lang->about_target_path = "為了下載附檔請輸入Zeroboard 4的安裝位置。\n位置在同一個主機時，請輸入如『/home/id/public_html/bbs』的路徑，在不同主機時，請輸入如『http://域名/bbs』的URL網址。";
 ?>
diff --git a/modules/importer/tpl/header.html b/modules/importer/tpl/header.html
index f71cc75c2..9650b8eda 100644
--- a/modules/importer/tpl/header.html
+++ b/modules/importer/tpl/header.html
@@ -3,7 +3,7 @@
 
 {@ $type_list = array('module'=>$lang->type_module, 'ttxml'=>$lang->type_ttxml, 'member'=>$lang->type_member, 'sync'=>$lang->type_syncmember, 'message'=>$lang->type_message) }
 
-<h3>{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!-- 설명 -->
 <div class="infoText">{nl2br($lang->about_importer)}</div>
diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index 6a809cfb2..4eb61309d 100644
--- a/modules/importer/tpl/index.html
+++ b/modules/importer/tpl/index.html
@@ -1,7 +1,7 @@
 <!--%import("js/importer_admin.js")-->
 <!--%import("css/importer.css")-->
 
-<h3>{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!-- 설명 -->
 <div class="infoText">{nl2br($lang->about_importer)}</div>
@@ -11,11 +11,12 @@
     <form action="./" method="get">
         <input type="hidden" name="module" value="{$module}" />
         <input type="hidden" name="act" value="{$act}" />
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[1]} - {$lang->import_step_desc[1]}</caption>
+
+        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[1]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <th scope="col"><div><label for="source_type_module">1. {$lang->type_module}</label></div></th>
-            <td><input type="radio" name="source_type" value="module" id="source_type_module" /> <label for="source_type_module">{$lang->about_type_module}</label></td>
+            <td class="wide"><input type="radio" name="source_type" value="module" id="source_type_module" /> <label for="source_type_module">{$lang->about_type_module}</label></td>
         </tr>
         <tr>
             <th scope="col"><div><label for="source_type_ttxml">2. {$lang->type_ttxml}</label></div></th>
@@ -34,9 +35,9 @@
             <td><input type="radio" name="source_type" value="message" id="source_type_message" /> <label for="source_type_message">{$lang->about_type_message}</label></td>
         </tr>
         <tr>
-            <td colspan="2" class="right">
-                <span class="button"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </td>
+            <th colspan="2" class="button">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
+            </th>
         </tr>
         </table>
     </form>
diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js
index 479d9765b..095d86ac8 100644
--- a/modules/importer/tpl/js/importer_admin.js
+++ b/modules/importer/tpl/js/importer_admin.js
@@ -28,9 +28,9 @@ function doPreProcessing(fo_obj) {
 
     var type = fo_obj.type.value;
 
-    xDisplay('importForm','none');
-    xDisplay('process','block');
-    xInnerHtml('status','');
+    jQuery('#importForm').hide();
+    jQuery('#process').show();
+    jQuery('#status').empty();
     prepared = false;
     setTimeout(doPrepareDot, 50);
 
@@ -48,17 +48,18 @@ function doPreProcessing(fo_obj) {
 function doPrepareDot() {
     if(prepared) return;
 
-    var str = xInnerHtml('status');
-    if(str.length<1 || str.length - preProcessingMsg.length > 50) str = preProcessingMsg;
+    var str = jQuery('#status').html();
+    if(str.length < 1 || str.length - preProcessingMsg.length > 50) str = preProcessingMsg;
     else str += ".";
-    xInnerHtml('status', str);
+
+    jQuery('#status').html(str);
     setTimeout(doPrepareDot, 50);
 }
 
 /* 준비가 끝났을때 호출되는 함수 */
 function completePreProcessing(ret_obj, response_tags) {
     prepared = true;
-    xInnerHtml('status','');
+    jQuery('#status').empty();
 
     var status = ret_obj['status'];
     var message = ret_obj['message'];
@@ -76,17 +77,18 @@ function completePreProcessing(ret_obj, response_tags) {
         return;
     }
 
-    xDisplay('btn_reload','none');
-    xDisplay('btn_continue','block');
+    jQuery('#btn_reload').hide();
+    jQuery('#btn_continue').show();
 
-    var fo_obj = xGetElementById('fo_process');
+    var fo_obj = jQuery('#fo_process').get(0);
     fo_obj.type.value = type;
     fo_obj.total.value = total;
     fo_obj.cur.value = cur;
     fo_obj.key.value = key;
 
-    var fo_import = xGetElementById('fo_import');
+    var fo_import = jQuery('#fo_import').get(0);
     if(fo_import && fo_import.target_module) fo_obj.target_module.value = fo_import.target_module.value;
+    if(fo_import && fo_import.guestbook_target_module) fo_obj.guestbook_target_module.value = fo_import.guestbook_target_module.value;
     if(fo_import && fo_import.user_id) fo_obj.user_id.value = fo_import.user_id.value;
 
     fo_obj.unit_count.value = fo_import.unit_count.options[fo_import.unit_count.selectedIndex].value;
@@ -97,7 +99,7 @@ function completePreProcessing(ret_obj, response_tags) {
 
 /* @brief 임포트 시작 */
 function doImport() {
-    var fo_obj = xGetElementById('fo_process');
+    var fo_obj = jQuery('#fo_process').get(0);
 
     var params = new Array();
     params['type'] = fo_obj.type.value;
@@ -105,6 +107,7 @@ function doImport() {
     params['cur'] = fo_obj.cur.value;
     params['key'] = fo_obj.key.value;
     params['target_module'] = fo_obj.target_module.value;
+    params['guestbook_target_module'] = fo_obj.guestbook_target_module.value;
     params['unit_count'] = fo_obj.unit_count.value;
     params['user_id'] = fo_obj.user_id.value;
 
@@ -124,26 +127,26 @@ function doImport() {
 function completeImport(ret_obj, response_tags) {
     var message = ret_obj['message'];
     var type = ret_obj['type'];
-    var total = parseInt(ret_obj['total'],10);
-    var cur = parseInt(ret_obj['cur'],10);
+    var total = parseInt(ret_obj['total'], 10);
+    var cur = parseInt(ret_obj['cur'], 10);
     var key = ret_obj['key'];
 
     displayProgress(total, cur);
 
-    var fo_obj = xGetElementById('fo_process');
+    var fo_obj = jQuery('#fo_process').get(0);
     fo_obj.type.value = type;
     fo_obj.total.value = total;
     fo_obj.cur.value = cur;
     fo_obj.key.value = key;
     
     // extract된 파일을 이용해서 import
-    if(total>cur) doImport();
+    if(total > cur) doImport();
     else {
         alert(message);
         fo_obj.reset();
-        xDisplay('process','none');
-        xDisplay('importForm','block');
-        xGetElementById('fo_import').reset();
+        jQuery('#process').hide();
+        jQuery('#importForm').show();
+        jQuery('#fo_import').get(0).reset();
     }
 }
 
@@ -151,19 +154,17 @@ function completeImport(ret_obj, response_tags) {
 function displayProgress(total, cur) {
     // 진행률 구함
     var per = 0;
-    if(total > 0) per = Math.round(cur/total*100);
+    if(total > 0) per = Math.round(cur / total * 100);
     else per = 100;
     if(!per) per = 1;
 
     var status = '<div class="progressBox"><div class="progress1" style="width:'+per+'%;">'+per+'%&nbsp;</div>';
     status += '<div class="progress2">'+cur+'/'+total+'</div>';
     status += '<div class="clear"></div></div>';
-    xInnerHtml('status', status);
+    jQuery('#status').html(status);
 }
 
 function insertSelectedModule(id, module_srl, mid, browser_title) {
-    var obj= xGetElementById('_'+id);
-    var sObj = xGetElementById(id);
-    sObj.value = module_srl;
-    obj.value = browser_title+' ('+mid+')';
+    jQuery('#' + id).val(module_srl);
+    jQuery('#_' + id).val(browser_title+' ('+mid+')');
 }
diff --git a/modules/importer/tpl/member.html b/modules/importer/tpl/member.html
index 72287416e..b9a6bf53a 100644
--- a/modules/importer/tpl/member.html
+++ b/modules/importer/tpl/member.html
@@ -4,11 +4,11 @@
     <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
         <input type="hidden" name="type" value="member" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText w700" />
+                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
                 <p>ex1) ../member.xml</p>
                 <p>ex2) http://...../member.xml</p>
             </td>
@@ -24,7 +24,7 @@
                     <option value="500">500</option>
                     <option value="1000">1000</option>
                 </select>
-                <span class="button"><input type="submit" value="{$lang->cmd_next}" /></span>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
             </th>
         </tr>
         </table>
diff --git a/modules/importer/tpl/message.html b/modules/importer/tpl/message.html
index f15be63d8..4b0dc5fd2 100644
--- a/modules/importer/tpl/message.html
+++ b/modules/importer/tpl/message.html
@@ -4,11 +4,11 @@
     <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
         <input type="hidden" name="type" value="message" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText w700" />
+                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
                 <p>ex1) ../message.xml</p>
                 <p>ex2) http://...../message.xml</p>
             </td>
@@ -24,7 +24,7 @@
                     <option value="500">500</option>
                     <option value="1000">1000</option>
                 </select>
-                <span class="button"><input type="submit" value="{$lang->cmd_next}" /></span>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
             </th>
         </tr>
         </table>
diff --git a/modules/importer/tpl/module.html b/modules/importer/tpl/module.html
index 0f34d35a0..5ad6f6e82 100644
--- a/modules/importer/tpl/module.html
+++ b/modules/importer/tpl/module.html
@@ -6,26 +6,26 @@
         <input type="hidden" name="type" value="module" />
         <input type="hidden" name="target_module" value="" id="target_module" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
-                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleAdminSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
+                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
             </td>
         </tr>
         </table>
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText w700" />
+                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
                 <p>ex1) ../module.xml</p>
                 <p>ex2) http://...../module.xml</p>
             </td>
         </tr>
         <tr>    
-            <td>
+            <th>
                 <select name="unit_count" class="w100">
                     <option value="10" selected="selected">10</option>
                     <option value="20">20</option>
@@ -38,8 +38,8 @@
                     <option value="500">500</option>
                     <option value="1000">1000</option>
                 </select>
-                <span class="button"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </td>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
+            </th>
         </tr>
         </table>
 
diff --git a/modules/importer/tpl/process.html b/modules/importer/tpl/process.html
index 3f080939d..67a77842b 100644
--- a/modules/importer/tpl/process.html
+++ b/modules/importer/tpl/process.html
@@ -9,11 +9,12 @@
         <input type="hidden" name="cur" value="" />
         <input type="hidden" name="key" value="" />
         <input type="hidden" name="target_module" value="" />
+        <input type="hidden" name="guestbook_target_module" value="" />
         <input type="hidden" name="unit_count" value="" />
         <input type="hidden" name="user_id" value="" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[99]} - {$lang->import_step_desc[99]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[99]} - {$lang->import_step_desc[99]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
                 <div id="status"></div>
@@ -21,8 +22,8 @@
         </tr>
         <tr>    
             <th class="button">
+                <div id="btn_continue" style="display:none;"><span class="button black strong"><input type="submit" value="{$lang->cmd_continue}" /></span></div>
                 <div id="btn_reload" style="display:block;"><span class="button"><input type="button" value="{$lang->cmd_reload}" onclick="location.reload(); return false;"/></span></div>
-                <div id="btn_continue" style="display:none;"><span class="button"><input type="submit" value="{$lang->cmd_continue}" /></span></div>
             </th>
         </tr>
         </table>
diff --git a/modules/importer/tpl/sync.html b/modules/importer/tpl/sync.html
index d493ef23a..71f180f03 100644
--- a/modules/importer/tpl/sync.html
+++ b/modules/importer/tpl/sync.html
@@ -1,10 +1,10 @@
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return doSync(this)">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->import_step_title[3]} - {$lang->import_step_desc[3]}</caption>
+    <h4 class="xeAdmin">{$lang->import_step_title[3]} - {$lang->import_step_desc[3]}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <td><span class="button"><input type="submit" value="{$lang->cmd_sync_member}" /></span></td>
+        <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_sync_member}" /></span></th>
     </tr>
     </table>
 </form>
diff --git a/modules/importer/tpl/ttxml.html b/modules/importer/tpl/ttxml.html
index 430ae225d..2f944257c 100644
--- a/modules/importer/tpl/ttxml.html
+++ b/modules/importer/tpl/ttxml.html
@@ -5,17 +5,25 @@
     <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
         <input type="hidden" name="type" value="ttxml" />
         <input type="hidden" name="target_module" value="" id="target_module" />
+        <input type="hidden" name="guestbook_target_module" value="" id="guestbook_target_module" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
+            <td>{$lang->import_step_desc[121]} </td>
             <td>
-                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleAdminSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
+                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
+            </td>
+        </tr>
+        <tr>
+            <td>{$lang->import_step_desc[122]} </td>
+            <td>
+                <input type="text" name="_guestbook_target_module" id="_guestbook_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','guestbook_target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
             </td>
         </tr>
         </table>
 
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
                 {$lang->user_id} : <input type="text" name="user_id" value="{$logged_info->user_id}" class="inputTypeText w200" />
@@ -24,8 +32,8 @@
         </tr>
         </table>
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</caption>
+        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
+        <table cellspacing="0" class="rowTable">
         <tr>
             <td>
                 <input type="text" name="xml_file" value="./" class="inputTypeText w700" />
@@ -47,7 +55,7 @@
                     <option value="500">500</option>
                     <option value="1000">1000</option>
                 </select>
-                <span class="button"><input type="submit" value="{$lang->cmd_next}" /></span>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
             </th>
         </tr>
         </table>
diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php
index b7ad50d2d..258bda3b2 100644
--- a/modules/importer/ttimport.class.php
+++ b/modules/importer/ttimport.class.php
@@ -15,7 +15,8 @@
         /**
          * @brief module.xml 형식의 데이터 import
          **/
-        function importModule($key, $cur, $index_file, $unit_count, $module_srl, $user_id) {
+        function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id) {
+            DebugPrint('Import start...');
             // 필요한 객체 미리 생성
             $this->oXmlParser = new XmlParser();
 
@@ -27,18 +28,17 @@
             if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 
             // 먼저 카테고리 정보를 입력함
-            $category_file = preg_replace('/index$/i', 'category', $index_file);
+            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
             if(file_exists($category_file)) {
-                $buff = FileHandler::readFile($category_file);
-               
+                DebugPrint('Category importing...');
                 // xmlParser객체 생성
                 $xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
 
                 // 카테고리 정보를 정리
-                if($xmlDoc->items->category) {
+                if($xmlDoc->categories->category) {
                     $categories = array();
                     $idx = 0;
-                    $this->arrangeCategory($xmlDoc->items, $categories, $idx, 0);
+                    $this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
 
                     $match_sequence = array();
                     foreach($categories as $k => $v) {
@@ -51,11 +51,12 @@
                         if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
                         $output = $oDocumentController->insertCategory($obj);
 
-                        if($output->toBool()) $match_sequence[$v->sequence] = $output->get('category_srl');
+                        if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
                     }
                     $oDocumentController->makeCategoryFile($module_srl);
                 }
                 FileHandler::removeFile($category_file);
+                DebugPrint('Category imported.');
             }
             $category_list = $category_titles = array();
             $category_list = $oDocumentModel->getCategoryList($module_srl);
@@ -64,6 +65,79 @@
             // 관리자 정보를 구함
             $oMemberModel = &getModel('member');
             $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
+
+            // 방명록 정보를 입력함
+            $guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
+            if (file_exists($guestbook_file)) {
+                DebugPrint('Guestbook importing...');
+                // xmlParser객체 생성
+                $xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
+
+                // 방명록 정보를 처리
+                if($guestbook_module_srl && $xmlDoc->guestbook->comment) {
+                    DebugPrint('Started.');
+                    $comment = $xmlDoc->guestbook->comment;
+                    if(!is_array($comment)) $comment = array($comment);
+                    foreach($comment as $key => $val) {
+                        $obj = null;
+                        $obj->module_srl = $guestbook_module_srl;
+                        $obj->document_srl = getNextSequence();
+                        $obj->uploaded_count = 0;
+                        $obj->is_notice = 'N';
+                        $obj->is_secret = $val->secret->body=='1'?'Y':'N';
+                        $obj->content = nl2br($val->content->body);
+
+                        DebugPrint($obj->content);
+
+                        // 본문에서 제목 추출
+                        $obj->title = cut_str(strip_tags($obj->content),20,'...');
+                        if ($obj->title == '') $obj->title = 'Untitled';
+
+                        $obj->allow_comment = 'Y';
+                        $obj->allow_trackback = 'N';
+                        $obj->regdate = date("YmdHis",$val->written->body);
+                        $obj->last_update = date("YmdHis", $val->written->body);
+                        if(!$obj->last_update) $obj->last_update = $obj->regdate;
+                        $obj->tags = '';
+                        $obj->readed_count = 0;
+                        $obj->voted_count = 0;
+                        if ($val->commenter->attrs->id) {
+                            $obj->password = '';
+                            $obj->nick_name = $member_info->nick_name;
+                            $obj->user_name = $member_info->user_name;
+                            $obj->user_id = $member_info->user_id;
+                            $obj->member_srl = $member_info->member_srl;
+                            $obj->email_address = $member_info->email_address;
+                            $obj->homepage = $member_info->homepage;
+                        }
+                        else {
+                            $obj->password = $val->password->body;
+                            $obj->nick_name = $val->commenter->name->body;
+                            $obj->member_srl = 0;
+                            $homepage = $val->commenter->homepage->body;
+                        }
+                        $obj->ipaddress = $val->commenter->ip->body;
+                        $obj->list_order = $obj->update_order = $obj->document_srl*-1;
+                        $obj->lock_comment = 'N';
+                        $obj->notify_message = 'N';
+                        $obj->trackback_count = 0;
+
+                        $obj->comment_count = 0;
+                        if($val->comment) {
+                            $child_comment = $val->comment;
+                            if(!is_array($child_comment)) $child_comment = array($child_comment);
+                            foreach($child_comment as $k => $v) {
+                                $result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0);
+                                if($result !== false) $obj->comment_count++;
+                            }
+                        }
+                        
+                        // 문서 입력
+                        $output = executeQuery('document.insertDocument', $obj);
+                    }
+                }
+                FileHandler::removeFile($guestbook_file);
+            }
            
             if(!$cur) $cur = 0;
 
@@ -127,10 +201,10 @@
                 $obj->title = $xmlDoc->post->title->body;
                 $obj->content = $xmlDoc->post->content->body;
                 $obj->password = md5($xmlDoc->post->password->body);
-                //$obj->allow_comment = $xmlDoc->post->acceptComment->body==1?'Y':'N';
-                $obj->allow_comment = 'Y';
-                //$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body==1?'Y':'N';
-                $obj->allow_trackback = 'Y';
+                $obj->allow_comment = $xmlDoc->post->acceptcomment->body=='1'?'Y':'N';
+                $obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
+                //$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
+                //$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
                 $obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
                 $obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
                 if(!$obj->last_update) $obj->last_update = $obj->regdate;
@@ -202,7 +276,7 @@
                     $comment = $xmlDoc->post->comment;
                     if(!is_array($comment)) $comment = array($comment);
                     foreach($comment as $key => $val) {
-                        $parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, 0);
+                        $parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0);
                         if($parent_srl === false) continue;
 
                         $obj->comment_count++;
@@ -210,7 +284,7 @@
                             $child_comment = $val->comment;
                             if(!is_array($child_comment)) $child_comment = array($child_comment);
                             foreach($child_comment as $k => $v) {
-                                $result = $this->insertComment($v, $module_srl, $obj->document_srl, $parent_srl);
+                                $result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl);
                                 if($result !== false) $obj->comment_count++;
                             }
                         }
@@ -296,7 +370,7 @@
             }
 
             // 디렉토리 생성
-            if(!FileHandler::makeDir($path)) continue;
+            if(!FileHandler::makeDir($path)) return;
 
             FileHandler::rename($file_obj->file, $filename);
 
@@ -327,7 +401,7 @@
          * @biref 임의로 사용할 파일이름을 return
          **/
         function getTmpFilename() {
-            $path = "./files/cache/tmp";
+            $path = "./files/cache/importer";
             if(!is_dir($path)) FileHandler::makeDir($path);
             $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
             if(file_exists($filename)) $filename .= rand(111,999);
@@ -400,19 +474,29 @@
         /**
          * @brief 댓글 입력 
          **/
-        function insertComment($val, $module_srl, $document_srl, $parent_srl = 0) {
+        function insertComment($val, $module_srl, $document_srl, $member_info, $parent_srl = 0) {
             $tobj = null;
             $tobj->comment_srl = getNextSequence();
             $tobj->module_srl = $module_srl;
             $tobj->document_srl = $document_srl;
-            $tobj->is_secret = $val->secret->body==1?'Y':'N';
+            $tobj->is_secret = $val->secret->body=='1'?'Y':'N';
             $tobj->notify_message = 'N';
             $tobj->content = nl2br($val->content->body);
             $tobj->voted_count = 0;
-            $tobj->password = $val->password->body;
-            $tobj->nick_name = $val->commenter->name->body;
-            $tobj->member_srl = 0;
-            $tobj->homepage = $val->commenter->homepage->body;
+            if ($val->commenter->attrs->id) {
+                $tobj->password = '';
+                $tobj->nick_name = $member_info->nick_name;
+                $tobj->user_name = $member_info->user_name;
+                $tobj->user_id = $member_info->user_id;
+                $tobj->member_srl = $member_info->member_srl;
+                $tobj->homepage = $member_info->homepage;
+                $tobj->email_address = $member_info->email_address;
+            } else {
+                $tobj->password = $val->password->body;
+                $tobj->nick_name = $val->commenter->name->body;
+                $tobj->homepage = $val->commenter->homepage->body;
+                $tobj->member_srl = 0;
+            }
             $tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
             $tobj->ipaddress = $val->commenter->ip->body;
             $tobj->list_order = $tobj->comment_srl*-1;
diff --git a/modules/install/conf/info.xml b/modules/install/conf/info.xml
index 8c8e23d48..1e3424ff4 100644
--- a/modules/install/conf/info.xml
+++ b/modules/install/conf/info.xml
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">安裝管理模組</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>base</category>
+    <category>system</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 5b108833a..af2f4ca53 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispInstallIntroduce" type="view" standalone="true" index="true" />
         <action name="dispInstallCheckEnv" type="view" standalone="true" />
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 442241f4f..087e8e97f 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -63,29 +63,19 @@
             $https_port = Context::get('https_port');
 
             $db_info = Context::getDBInfo();
+            $db_info->default_url = Context::get('default_url');
+            if($db_info->default_url && !preg_match('/^(http|https):\/\//i', $db_info->default_url)) $db_info->default_url = 'http://'.$db_info->default_url;
             $db_info->time_zone = $time_zone;
             $db_info->qmail_compatibility = $qmail_compatibility;
             $db_info->use_rewrite = $use_rewrite;
             $db_info->use_optimizer = $use_optimizer;
-            $db_info->lang_type = Context::get('lang_type');
+            $db_info->lang_type = Context::get('change_lang_type');
             $db_info->use_ssl = $use_ssl;
-            if($http_port)
-            {
-                $db_info->http_port = (int) $http_port;
-            }
-            else if($db_info->http_port)
-            {
-                unset($db_info->http_port);
-            }
+            if($http_port) $db_info->http_port = (int) $http_port;
+            else if($db_info->http_port) unset($db_info->http_port);
 
-            if($https_port)
-            {
-                $db_info->https_port = (int) $https_port;
-            }
-            else if($db_info->https_port)
-            {
-                unset($db_info->https_port);
-            }
+            if($https_port) $db_info->https_port = (int) $https_port;
+            else if($db_info->https_port) unset($db_info->https_port);
 
             Context::setDBInfo($db_info);
 
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 9899c324a..7bd31014a 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -33,6 +33,7 @@
             // DB와 관련된 변수를 받음
             $db_info = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix','time_zone','use_rewrite');
             if($db_info->use_rewrite!='Y') $db_info->use_rewrite = 'N';
+            if(!$db_info->default_url) $db_info->default_url = Context::getRequestUri();
             $db_info->lang_type = Context::getLangType();
 
             // DB의 타입과 정보를 등록
@@ -213,14 +214,13 @@
                 $modules[$xml_info->category][] = $module;
             }
 
-            // 모듈을 category에 의거 설치 순서를 정함
-            $install_step = array('base','utility','manager','accessory','service','package');
-
             // module 모듈은 미리 설치
             $this->installModule('module','./modules/module');
             $oModule = &getClass('module');
             if($oModule->checkUpdate()) $oModule->moduleUpdate();
 
+            // 모듈을 category에 의거 설치 순서를 정함
+            $install_step = array('system','content','member');
             // 나머지 모든 모듈 설치
             foreach($install_step as $category) {
                 if(count($modules[$category])) {
@@ -231,6 +231,22 @@
                         $oModule = &getClass($module);
                         if($oModule->checkUpdate()) $oModule->moduleUpdate();
                     }
+                    unset($modules[$category]);
+                }
+            }
+
+            // 나머지 모든 모듈 설치
+            if(count($modules)) {
+                foreach($modules as $category => $module_list) {
+                    if(count($module_list)) {
+                        foreach($module_list as $module) {
+                            if($module == 'module') continue;
+                            $this->installModule($module, sprintf('./modules/%s', $module));
+
+                            $oModule = &getClass($module);
+                            if($oModule->checkUpdate()) $oModule->moduleUpdate();
+                        }
+                    }
                 }
             }
 
diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index 3f07ee0b5..b9835182b 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -140,7 +140,7 @@ EndOfLicense;
         'mysql_innodb' => 'Using innodb to use mysql DB.<br />Transaction is enabled for innodb',
         'sqlite2' => 'Supporting sqlite2 which saves the data into the file.<br />When installing, DB file should be created at unreachable place from web.<br />(Never got tested on stabilization)',
         'sqlite3_pdo' => 'Suppots sqlite3 by PHP\'s PDO.<br />When installing, DB file should be created at unreachable place from web.',
-        'cubrid' => 'Use CUBRID DB.',
+        'cubrid' => 'Use CUBRID DB.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'Use PostgreSql DB.',
         'firebird' => 'Use firebird DB.',
     );
diff --git a/modules/install/lang/es.lang.php b/modules/install/lang/es.lang.php
index 543870f41..1c294a0e6 100644
--- a/modules/install/lang/es.lang.php
+++ b/modules/install/lang/es.lang.php
@@ -236,7 +236,7 @@ EndOfLicense;
         'mysql_innodb' => 'Utilizando innodb usar BD mysql.<br />La transacción es hablilitado para innodb',
         'sqlite2' => 'Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)',
         'sqlite3_pdo' => 'A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.',
-        'cubrid' => 'Usar BD CUBRID.',
+        'cubrid' => 'Usar BD CUBRID. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'Usar BD PostgreSql.',
         'firebird' => 'Usar BD firebird.',
     );
diff --git a/modules/install/lang/fr.lang.php b/modules/install/lang/fr.lang.php
index b1477d786..b9f4ea960 100644
--- a/modules/install/lang/fr.lang.php
+++ b/modules/install/lang/fr.lang.php
@@ -194,7 +194,7 @@ EndOfLicense;
         'mysql_innodb' => 'Utilisera innodb pour utiliser Base de Données de mysql.<br />La transaction sera validé pour innodb',
         'sqlite2' => 'Surpporter sqlite2 qui conserve les données dans les fichiers.<br />Quand vous installez, vous devez créer le fichier de Base de Données dans une place que l\'on ne peut pas accéder par web.<br />(Jamais  testé sur  stabilization)',
         'sqlite3_pdo' => 'Supporter sqlite3 PDO de PHP.<br />Quand vous installez, vous devez cr?r le fichier de Base de Données dans une place que l\'on ne peut pas accéder par Web.',
-        'cubrid' => 'Utiliser la Base de Données de CUBRID.',
+        'cubrid' => 'Utiliser la Base de Données de CUBRID.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'Utiliser la Base de Données de PostgreSql.',
         'firebird' => 'Utiliser la Base de Données de firebird.',
     );
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index 8076e4c59..eb890d848 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -232,7 +232,7 @@ EndOfLicense;
         'mysql_innodb' => 'MySQL DBで「innodb」タイプでデータの入出力を行います。<br />「innodb」ではトランザクションの処理が行えます。',
         'sqlite2' => 'ファイルタイプデータベースである「sqlite2」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブがらアクセスできない場所に作成して下さい。<br />（安定化までのテストは行われていません）',
         'sqlite3_pdo' => 'PHPのPDOを経由うして「sqlite3」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブからアクセスできない場所に作成して下さい。',
-        'cubrid' => 'CUBRID DBを利用します。',
+        'cubrid' => 'CUBRID DBを利用します。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'PostgreSql DBを利用します。',
         'firebird' => 'Firebird DBを利用します。',
     );
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index 63319cdcf..bd6936753 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -232,7 +232,7 @@ EndOfLicense;
         'mysql_innodb' => 'mysql DB를 innodb를 이용하여 사용합니다.<br />innodb는 트랜잭션을 사용할 수 있습니다',
         'sqlite2' => '파일로 데이터를 저장하는 sqlite2를 지원합니다.<br />설치시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.<br />(안정화 테스트가 되지 않았습니다)',
         'sqlite3_pdo' => 'PHP의 PDO로 sqlite3를 지원합니다.<br />설치시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.',
-        'cubrid' => 'CUBRID DB를 이용합니다.',
+        'cubrid' => 'CUBRID DB를 이용합니다. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'PostgreSql을 이용합니다',
         'firebird' => 'Firebird를 이용합니다',
     );
@@ -257,8 +257,8 @@ EndOfLicense;
     $lang->use_rewrite = 'rewrite mod 사용';
     $lang->about_rewrite = '웹서버에서 rewrite mod를 지원하면 http://주소/?document_srl=123 같이 복잡한 주소를 http://주소/123과 같이 간단하게 줄일 수 있습니다.';
     $lang->time_zone = 'time zone';
-    $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 time zone을 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다';
-    $lang->qmail_compatibility = 'Qmail 호환';
+    $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 time zone을 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다';
+    $lang->qmail_compatibility = 'Qmail 호환';
     $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
 
     $lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다<br/><span style="color:red">데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.</span>';
@@ -271,5 +271,5 @@ EndOfLicense;
     $lang->msg_dbconnect_failed = "DB접속 오류가 발생하였습니다.\nDB정보를 다시 확인해주세요";
     $lang->msg_table_is_exists = "이미 DB에 테이블이 생성되어 있습니다.\nconfig파일을 재생성하였습니다";
     $lang->msg_install_completed = "설치가 완료되었습니다.\n감사합니다";
-    $lang->msg_install_failed = "설치 파일 생성시에 오류가 발생하였습니다.";
+    $lang->msg_install_failed = '설치 파일 생성시에 오류가 발생하였습니다.';
 ?>
diff --git a/modules/install/lang/ru.lang.php b/modules/install/lang/ru.lang.php
index e8cced765..f6dfa4773 100644
--- a/modules/install/lang/ru.lang.php
+++ b/modules/install/lang/ru.lang.php
@@ -324,7 +324,7 @@ EndOfLicense;
         'mysql_innodb' => 'Используем innodb  чтобы использовать базу данных mysql.<br />Транзакция включена для innodb',
         'sqlite2' => 'Поддерживает sqlite2, которая сохраняет данные в файл.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.<br />(Никогда не тестировалось на стабильность)',
         'sqlite3_pdo' => 'Поддерживает sqlite3 посредством PHP\'s PDO.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.',
-        'cubrid' => 'Используем CUBRID DB.',
+        'cubrid' => 'Используем CUBRID DB. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => 'Используем PostgreSql DB.',
         'firebird' => 'Используем firebird DB.',
     );
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index b76d4d48b..1208ae745 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -223,7 +223,7 @@ EndOfLicense;
         'mysql_innodb' => '利用innodb使用mysql DB。<br />innodb可以使用transaction。',
         'sqlite2' => '支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)',
         'sqlite3_pdo' => '用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。',
-        'cubrid' => '使用CUBRID DB。',
+        'cubrid' => '使用CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => '使用PostgreSql DB。',
         'firebird' => '使用Firebird DB。',
     );
diff --git a/modules/install/lang/zh-TW.lang.php b/modules/install/lang/zh-TW.lang.php
index 1f05ea754..ec0421feb 100644
--- a/modules/install/lang/zh-TW.lang.php
+++ b/modules/install/lang/zh-TW.lang.php
@@ -197,11 +197,11 @@ EndOfLicense;
         );
 
     $lang->install_checklist_desc = array(
-	        'php_version' => '[必須] 由於 PHP 5.2.2 版本的問題，無法安裝 XE程式。',
-            'permission' => '[必須] XE的資料夾或 ./files資料夾權限必須是『707』。',
-            'xml' => '[必須] 必須要安裝 XML Library，才能夠使用 XML通訊。',
+	        'php_version' => '[必須] 由於PHP 5.2.2版本的問題，無法安裝XE程式。',
+            'permission' => '[必須] XE的資料夾或『./files』資料夾權限必須是『707』。',
+            'xml' => '[必須] 必須要安裝『XML Library』，才能夠使用XML通訊。',
             'session' => '[必須] 在『php.ini』中必須要設定『session.auto_start=0』，才能使用暫存功能',
-            'iconv' => '安裝『iconv』，才能夠使 UTF-8和其他語言文字能互相轉換。',
+            'iconv' => '安裝『iconv』，才能使UTF-8和其他語言文字作互相轉換。',
             'gd' => '安裝『GD Library』才可以使用圖片轉換功能。',
         );
 
@@ -210,8 +210,8 @@ EndOfLicense;
     $lang->install_checklist_gd = '安裝 GD Library';
     $lang->install_without_gd  = '尚未安裝負責轉換圖片功能的 GD Library！';
     $lang->install_checklist_gd = '安裝 GD Library';
-    $lang->install_without_iconv = '尚未安裝負責處理字串的 iconv！';
-    $lang->install_session_auto_start = 'PHP設置中設置成 session.auto_start==1，可能在處理 session時會發生錯誤。';
+    $lang->install_without_iconv = '尚未安裝負責處理字串的『iconv』！';
+    $lang->install_session_auto_start = 'PHP設置中設置成『session.auto_start==1』，可能在處理session時會發生錯誤。';
     $lang->install_permission_denied = '安裝目錄權限不是『707』！';
 
     $lang->cmd_agree_license = '同意使用條款';
@@ -220,11 +220,11 @@ EndOfLicense;
     $lang->cmd_ignore = '忽略';
 
     $lang->db_desc = array(
-        'mysql' => '利用PHP的『mysql*()』函數使用MySQL資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現 transaction。',
+        'mysql' => '利用PHP的『mysql*()』函數使用MySQL資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現transaction。',
         'mysql_innodb' => '利用『innodb』使用 mysql 資料庫。<br />innodb可以使用 transaction。',
         'sqlite2' => '支援用檔案形式保存數據的『sqlite2』。<br />安裝時，資料庫數據應建立在 web無法訪問的地方。<br />(尚未通過安全測試)',
-        'sqlite3_pdo' => '用 PHP的 PDO支援『sqlite3』。<br />安裝時，資料庫數據應建立在 web無法訪問的地方。',
-        'cubrid' => '使用 CUBRID DB。',
+        'sqlite3_pdo' => '用 PHP的 PDO支援『sqlite3』。<br />安裝時，資料庫數據應建立在網頁無法訪問的地方。',
+        'cubrid' => '使用 CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
         'postgresql' => '使用 PostgreSql DB。',
         'firebird' => '使用 Firebird DB。',
     );
@@ -244,10 +244,10 @@ EndOfLicense;
     $lang->admin_title = '管理員資料';
 
     $lang->env_title = '環境設置';
-    $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->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 = '時區';
     $lang->about_time_zone = '主機時間和您所處的時間有差異時，可以設置時區來滿足你所需要的時間顯示。';
     $lang->qmail_compatibility = 'Qmail互換';
diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html
index ce4bc61ce..4018e7b5e 100644
--- a/modules/install/tpl/check_env.html
+++ b/modules/install/tpl/check_env.html
@@ -1,6 +1,6 @@
 <!--#include("header.html")-->
 
-<h2>{$lang->install_condition_title}</h2>
+<h2 class="xeAdmin">{$lang->install_condition_title}</h2>
 
 <table cellspacing="0" class="tableType6">
 <col width="180" /><col />
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
index 230f694f8..7a2070588 100644
--- a/modules/install/tpl/css/install.css
+++ b/modules/install/tpl/css/install.css
@@ -58,3 +58,5 @@ div.buttonCenter { text-align:center; }
 #content .tableType7 td p { line-height:1.4em; margin:5px 0 0 0; padding:0;}
 #content .tableType7 .borderBottomNone { border-bottom:none;}
 #content .tableType7 .none { color:#c95b53;}
+
+a.manual { background:url("../images/iconManual.gif") no-repeat left top; vertical-align:middle; display:inline-block; width:12px; height:13px; overflow:hidden; line-height:0; font-size:1px; text-decoration:none;}
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index ab20ae1f2..2743b70e1 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-    <h2>{$lang->form_title}</h2>
+    <h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.firebird.html b/modules/install/tpl/form.firebird.html
index ae6f15255..66889cf70 100644
--- a/modules/install/tpl/form.firebird.html
+++ b/modules/install/tpl/form.firebird.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-<h2>{$lang->form_title}</h2>
+<h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index e50233b57..3a3c8187b 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-<h2>{$lang->form_title}</h2>
+<h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html
index e50233b57..3a3c8187b 100644
--- a/modules/install/tpl/form.mysql_innodb.html
+++ b/modules/install/tpl/form.mysql_innodb.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-<h2>{$lang->form_title}</h2>
+<h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.postgresql.html b/modules/install/tpl/form.postgresql.html
index 3d42bbcd4..c60a9606e 100644
--- a/modules/install/tpl/form.postgresql.html
+++ b/modules/install/tpl/form.postgresql.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-<h2>{$lang->form_title}</h2>
+<h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.sqlite2.html b/modules/install/tpl/form.sqlite2.html
index b1795ae6d..7492dfc09 100644
--- a/modules/install/tpl/form.sqlite2.html
+++ b/modules/install/tpl/form.sqlite2.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-    <h2>{$lang->form_title}</h2>
+    <h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/form.sqlite3_pdo.html b/modules/install/tpl/form.sqlite3_pdo.html
index 35c0cdfcb..08f43593a 100644
--- a/modules/install/tpl/form.sqlite3_pdo.html
+++ b/modules/install/tpl/form.sqlite3_pdo.html
@@ -5,7 +5,7 @@
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
 <input type="hidden" name="db_type" value="{$db_type}" />
 
-<h2>{$lang->form_title}</h2>
+<h2 class="xeAdmin">{$lang->form_title}</h2>
 
     <table cellspacing="0" class="tableType7">
     <col width="100" />
diff --git a/modules/install/tpl/ftp.html b/modules/install/tpl/ftp.html
index db38aa41d..faef1e841 100644
--- a/modules/install/tpl/ftp.html
+++ b/modules/install/tpl/ftp.html
@@ -3,7 +3,7 @@
 
 <form action="./" method="post" onsubmit="return doInstallFTPInfo(this);" id="ftp_form">
 
-<h2>{$lang->ftp_form_title}</h2>
+<h2 class="xeAdmin">{$lang->ftp_form_title}</h2>
 
 <blockquote>{$lang->about_ftp_info}</blockquote>
 
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index c4ebf076b..6dfb5a0a9 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -1,4 +1,4 @@
 <!--%import("./css/install.css")-->
 <div id="box">
-    <h1><img src="./images/h1.png" alt="XE Install" width="750" height="36" class="iePngFix" /></h1>
+    <h1 class="xeAdmin"><img src="./images/h1.png" alt="XE Install" width="750" height="36" class="iePngFix" /></h1>
     <div id="content">
diff --git a/modules/install/tpl/images/iconManual.gif b/modules/install/tpl/images/iconManual.gif
new file mode 100644
index 000000000..1c83bcadd
Binary files /dev/null and b/modules/install/tpl/images/iconManual.gif differ
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index 5a06a443b..f89cd634b 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -1,6 +1,6 @@
 <!--#include("header.html")-->
 
-<h2>{$lang->introduce_title}</h2>
+<h2 class="xeAdmin">{$lang->introduce_title}</h2>
 
 <div id="agreement">{nl2br($lang->license)}</div>
 
diff --git a/modules/install/tpl/js/install_admin.js b/modules/install/tpl/js/install_admin.js
index 656a2fd96..3777cb5c3 100644
--- a/modules/install/tpl/js/install_admin.js
+++ b/modules/install/tpl/js/install_admin.js
@@ -21,7 +21,7 @@ function completeInstallFTPInfo(ret_obj) {
 }
 
 function doCheckFTPInfo() {
-    var fo_obj = xGetElementById("ftp_form");
+    var fo_obj = jQuery("#ftp_form").get(0);
     var oFilter = new XmlJsFilter(fo_obj, "install", "procInstallCheckFTP", completeInstallCheckFtpInfo);
     oFilter.addResponseItem("error");
     oFilter.addResponseItem("message");
diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html
index 2ac784785..0ac474c94 100644
--- a/modules/install/tpl/select_db.html
+++ b/modules/install/tpl/select_db.html
@@ -1,6 +1,6 @@
 <!--#include("header.html")-->
 
-<h2>{$lang->select_db_type}</h2>
+<h2 class="xeAdmin">{$lang->select_db_type}</h2>
 
     <form method="post" action="./">
     <input type="hidden" name="module" value="{$module}" />
@@ -11,10 +11,10 @@
     <!--@foreach(DB::getSupportedList() as $key => $val)-->
     <tr>
         <th scope="row">
-            <input type="radio" name="db_type" value="{$val}" id="db_type_{$val}" <!--@if($val=="mysql")-->checked="checked"<!--@end-->/>
-            <label for="db_type_{$val}">{$val}</label>
+            <input type="radio" name="db_type" value="{$val->db_type}" <!--@if(!$val->enable)-->disabled="disabled"<!--@end--> id="db_type_{$val->db_type}" <!--@if($val->db_type=="mysql")-->checked="checked"<!--@end-->/>
+            <label for="db_type_{$val->db_type}">{$val->db_type}</label>
         </th>
-        <td>{$lang->db_desc[$val]}</td>
+        <td>{$lang->db_desc[$val->db_type]}</td>
     </tr>
     <!--@end-->
     </table>
diff --git a/modules/integration_search/conf/info.xml b/modules/integration_search/conf/info.xml
index 30518c278..6b9070880 100644
--- a/modules/integration_search/conf/info.xml
+++ b/modules/integration_search/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">통합검색</title>
-    <title xml:lang="zh-CN">搜索</title>
+    <title xml:lang="zh-CN">综合搜索</title>
     <title xml:lang="jp">統合検索</title>
     <title xml:lang="en">Integrated Search</title>
     <title xml:lang="es">Búsqueda Integrada</title>
@@ -12,8 +12,8 @@
         선택된 모듈의 글중 비밀글만 검색을 하지 않고 나머지는 모두 검색을 하기에 공개되지 않은 모듈은 대상에 포함하지 않도록 하셔야 합니다.
     </description>
     <description xml:lang="zh-CN">
-        把被选模块作为搜索对象进行搜索。
-        被选模块当中只有密帖不会被搜索，因此请注意选择您不想搜索的模块。
+        把所选模块作为搜索对象。
+        所选模块当中只有密帖不会被搜索，因此请留意您不想搜索的模块。
     </description>
     <description xml:lang="jp">
         選択されたモジュールを対象に統合検索を行う機能をサポートします。
diff --git a/modules/integration_search/conf/module.xml b/modules/integration_search/conf/module.xml
index a1d6f0577..39b51ae64 100644
--- a/modules/integration_search/conf/module.xml
+++ b/modules/integration_search/conf/module.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
-    <grants>
-        <grant name="list" default="guest">
-            <title xml:lang="ko">목록</title>
-			<title xml:lang="zh-CN">目录</title>
-            <title xml:lang="jp">リスト</title>
-            <title xml:lang="en">list</title>
-			<title xml:lang="zh-TW">列表</title>
-        </grant>
-        <grant name="manager" default="root">
-            <title xml:lang="ko">관리</title>
-			<title xml:lang="zh-CN">管理</title>
-            <title xml:lang="jp">管理</title>
-            <title xml:lang="en">manager</title>
-			<title xml:lang="zh-TW">管理</title>
-        </grant>
-    </grants>
+    <grants />
+    <permissions />
     <actions>
         <action name="IS" type="view" standalone="true" />
         <action name="dispIntegration_searchAdminContent" type="view" admin_index="true" />
diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php
index eeb4e596f..1797cd073 100644
--- a/modules/integration_search/integration_search.admin.view.php
+++ b/modules/integration_search/integration_search.admin.view.php
@@ -38,7 +38,8 @@
             $module_categories = $oModuleModel->getModuleCategories();
 
             // 생성된 mid목록을 구함
-            $mid_list = $oModuleModel->getMidList();
+            $obj->site_srl = 0;
+            $mid_list = $oModuleModel->getMidList($obj);
 
             // module_category와 module의 조합
             if($module_categories) {
diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php
index c2834a9d4..145bff41d 100644
--- a/modules/integration_search/integration_search.class.php
+++ b/modules/integration_search/integration_search.class.php
@@ -14,8 +14,6 @@
             // action forward에 등록 
             $oModuleController = &getController('module');
             $oModuleController->insertActionForward('integration_search', 'view', 'IS');
-            $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminContent');
-            $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminSkinInfo');
 
             return new Object();
         }
@@ -24,11 +22,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            // IS act의 여부 체크 (2007. 7. 24 추가)
-            $oModuleModel = &getModel('module');
-            $act = $oModuleModel->getActionForward('dispIntegration_searchAdminSkinInfo');
-            if(!$act) return true;
-
             return false;
         }
 
@@ -36,10 +29,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('integration_search', 'view', 'IS');
-            $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminContent');
-            $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminSkinInfo');
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
new file mode 100644
index 000000000..f7e070346
--- /dev/null
+++ b/modules/integration_search/integration_search.model.php
@@ -0,0 +1,184 @@
+<?php
+    /**
+     * @class  integrationModel
+     * @author zero (zero@nzeo.com)
+     * @brief  integration 모듈의 Model class
+     **/
+
+    class integration_searchModel extends module {
+        /**
+         * @brief 초기화
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief 게시글 검색
+         **/
+        function getDocuments($module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)) $args->module_srl = implode(',',$module_srls_list);
+            else $args->module_srl = $module_srls_list;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = $search_target;
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+
+            // 대상 문서들을 가져옴
+            $oDocumentModel = &getModel('document');
+            return $oDocumentModel->getDocumentList($args);
+        }
+
+        /**
+         * @brief 댓글 검색
+         **/
+        function getComments($module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)) $args->module_srl = implode(',',$module_srls_list);
+            else $args->module_srl = $module_srls_list;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = 'content';
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+
+            // 대상 문서들을 가져옴
+            $oCommentModel = &getModel('comment');
+            $output = $oCommentModel->getTotalCommentList($args);
+            if(!$output->toBool()|| !$output->data) return $output;
+
+            $list = array();
+            foreach($output->data as $key => $val) {
+                $oComment = new commentItem(0);
+                $oComment->setAttribute($val);
+                $list[$key] = $oComment;
+            }
+            $output->data = $list;
+            return $output;
+        }
+
+        /**
+         * @brief 엮인글 검색
+         **/
+        function getTrackbacks($module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)) $args->module_srl = implode(',',$module_srls_list);
+            else $args->module_srl = $module_srls_list;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = $search_target;
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+
+            // 대상 문서들을 가져옴
+            $oTrackbackModel = &getAdminModel('trackback');
+            $output = $oTrackbackModel->getTotalTrackbackList($args);
+            if(!$output->toBool()|| !$output->data) return $output;
+            return $output;
+        }
+
+        /**
+         * @brief 파일 검색
+         **/
+        function _getFiles($module_srls_list, $search_keyword, $page, $list_count, $direct_download = 'Y') {
+            if(is_array($module_srls_list)) $args->module_srl = implode(',',$module_srls_list);
+            else $args->module_srl = $module_srls_list;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = 'filename';
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'files.file_srl'; 
+            $args->order_type = 'desc';
+            $args->isvalid = 'Y';
+            $args->direct_download = $direct_download=='Y'?'Y':'N';
+
+            // 대상 문서들을 가져옴
+            $oFileAdminModel = &getAdminModel('file');
+            $output = $oFileAdminModel->getFileList($args);
+            if(!$output->toBool() || !$output->data) return $output;
+
+            $list = array();
+            foreach($output->data as $key => $val) {
+                $obj = null;
+                $obj->filename = $val->source_filename;
+                $obj->download_count = $val->download_count;
+                if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+                $obj->download_url = Context::getRequestUri().$val->download_url;
+                $obj->target_srl = $val->upload_target_srl;
+                $obj->file_size = $val->file_size;
+
+                // 이미지 
+                if(preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename)) {
+                    $obj->type = 'image';
+
+                    $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($val->file_srl, 3));
+                    if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+                    $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
+                    $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
+                    if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+                    $obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename), 120, 120);
+
+                // 동영상
+                } elseif(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) {
+                    $obj->type = 'multimedia';
+                    $obj->src = sprintf('<script type="text/javascript">displayMultimedia("%s",120,120);</script>', $obj->download_url);
+
+                // 기타
+                } else {
+                    $obj->type = 'binary';
+                    $obj->src = '';
+                }
+
+                $list[] = $obj;
+                $target_list[] = $val->upload_target_srl;
+            }
+            $output->data = $list;
+
+            $oDocumentModel = &getModel('document');
+            $document_list = $oDocumentModel->getDocuments($target_list);
+            if($document_list) foreach($document_list as $key => $val) {
+                foreach($output->data as $k => $v) {
+                    if($v->target_srl== $val->document_srl) {
+                        $output->data[$k]->url = $val->getPermanentUrl();
+                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
+                        $output->data[$k]->nick_name = $val->getNickName();
+                    }
+                }
+            }
+
+            $oCommentModel = &getModel('comment');
+            $comment_list = $oCommentModel->getComments($target_list);
+            if($comment_list) foreach($comment_list as $key => $val) {
+                foreach($output->data as $k => $v) {
+                    if($v->target_srl== $val->comment_srl) {
+                        $output->data[$k]->url = $val->getPermanentUrl();
+                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
+                        $output->data[$k]->nick_name = $val->getNickName();
+                    }
+                }
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief 멀티미디어 검색
+         **/
+        function getImages($module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            return $this->_getFiles($module_srls_list, $search_keyword, $page, $list_count);
+        }
+
+        /**
+         * @brief 첨부파일 검색
+         **/
+        function getFiles($module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            return $this->_getFiles($module_srls_list, $search_keyword, $page, $list_count, 'N');
+        }
+
+    }
+?>
diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index 8e50648ab..87519d719 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -36,24 +36,30 @@
          * @brief 통합 검색 출력
          **/
         function IS() {
+            // 권한 체크
+            if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
+
             // 검색이 가능한 목록을 구하기 위해 전체 목록을 구해옴
             $oModuleModel = &getModel('module');
             $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $module_list = $oModuleModel->getMidList($args);
-
-            // 대상 모듈을 정리함
-            $module_srl_list = array();
-            foreach($module_list as $mid => $val) {
-                $mid_list[$val->module_srl] = $val;
-                if(count($this->target_mid) && !in_array($mid, $this->target_mid)) continue;
-                $module_srl_list[] = $val->module_srl;
+            if($site_module_info->site_srl) {
+                $args->site_srl = (int)$site_module_info->site_srl;
+                $module_list = $oModuleModel->getMidList($args);
+                foreach($module_list as $mid => $val) {
+                    $mid_list[$val->module_srl] = $val;
+                    $module_srl_list[] = $val->module_srl;
+                }
+            } else {
+                // 대상 모듈을 정리함
+                $module_list = $oModuleModel->getMidList($args);
+                $module_srl_list = array();
+                foreach($module_list as $mid => $val) {
+                    $mid_list[$val->module_srl] = $val;
+                    if(count($this->target_mid) && !in_array($mid, $this->target_mid)) continue;
+                    $module_srl_list[] = $val->module_srl;
+                }
             }
 
-            // 검색대상 변수 설정
-            $search_target = Context::get('search_target');
-            if(!in_array($search_target, array('title','content','title_content','comment','tag'))) $search_target = 'title';
-
             // 검색어 변수 설정
             $is_keyword = Context::get('is_keyword');
 
@@ -61,43 +67,61 @@
             $page = (int)Context::get('page');
             if(!$page) $page = 1;
 
+            // 검색탭에 따른 검색
+            $where = Context::get('where');
 
-            $list_count = (int)Context::get('list_count');
-            if(!$list_count|| $list_count>20) $list_count = 20;
+            $oFile = &getClass('file');
 
-            // 출력할 컨텐츠 추출을 위한 인자 정리
-            $args->module_srl = implode(',',$module_srl_list);
-            $args->page = $page;
-            $args->list_count = $list_count;
-            $args->page_count = 10;
-            $args->search_target = $search_target;
-            $args->search_keyword = Context::get('is_keyword'); 
-            $args->sort_index = 'list_order'; 
-            $args->order_type = 'asc';
+            // integration search model객체 생성
+            if($is_keyword) {
+                $oIS = &getModel('integration_search');
+                switch($where) {
+                    case 'document' :
+                            $search_target = Context::get('search_target');
+                            if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+                            Context::set('search_target', $search_target);
 
-            // 검색글이 있을 경우 검색 시도
-            if($args->search_keyword) {
+                            $output = $oIS->getDocuments($module_srl_list, $search_target, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("document", $page);
+                        break;
+                    case 'comment' :
+                            $output = $oIS->getComments($module_srl_list, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("comment", $page);
+                        break;
+                    case 'trackback' :
+                            $search_target = Context::get('search_target');
+                            if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+                            Context::set('search_target', $search_target);
 
-                // 대상 문서들을 가져옴
-                $oDocumentModel = &getModel('document');
-                $output = $oDocumentModel->getDocumentList($args);
-                Context::set('total_count', $output->total_count);
-                Context::set('total_page', $output->total_page);
-                Context::set('page', $output->page);
-                Context::set('document_list', $output->data);
-                Context::set('page_navigation', $output->page_navigation);
+                            $output = $oIS->getTrackbacks($module_srl_list, $search_target, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("trackback", $page);
+                        break;
+                    case 'multimedia' :
+                            $output = $oIS->getImages($module_srl_list, $is_keyword, $page,20);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("multimedia", $page);
+                        break;
+                    case 'file' :
+                            $output = $oIS->getFiles($module_srl_list, $is_keyword, $page, 20);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("file", $page);
+                        break;
+                    default :
+                            $output['document'] = $oIS->getDocuments($module_srl_list, 'title', $is_keyword, $page, 5);
+                            $output['comment'] = $oIS->getComments($module_srl_list, $is_keyword, $page, 5);
+                            $output['trackback'] = $oIS->getTrackbacks($module_srl_list, 'title', $is_keyword, $page, 5);
+                            $output['multimedia'] = $oIS->getImages($module_srl_list, $is_keyword, $page, 5);
+                            $output['file'] = $oIS->getFiles($module_srl_list, $is_keyword, $page, 5);
+                            Context::set('search_result', $output);
+                            $this->setTemplateFile("index", $page);
+                        break;
+                }
+            } else {
+                $this->setTemplateFile("no_keywords");
             }
-
-            // 텍스트 생성
-			if(Context::getLangType()=='en')
-				$result_text = sprintf(Context::getLang("is_result_text"), $output->total_count, htmlspecialchars($is_keyword, ENT_NOQUOTES, 'UTF-8'));
-			else
-				$result_text = sprintf(Context::getLang("is_result_text"), htmlspecialchars($is_keyword, ENT_NOQUOTES, 'UTF-8'), $output->total_count);
-            Context::set('result_text', $result_text);
-            Context::set('mid_list', $mid_list);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('index');
         }
     }
 ?>
diff --git a/modules/integration_search/lang/en.lang.php b/modules/integration_search/lang/en.lang.php
index 4689b4a44..c9f16b038 100644
--- a/modules/integration_search/lang/en.lang.php
+++ b/modules/integration_search/lang/en.lang.php
@@ -13,13 +13,21 @@
     $lang->msg_no_keyword = "Please input keyword to search";
 
     $lang->is_result_text = "There are <strong>%d</strong> result(s) for <strong>'%s'</strong>";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
-        'title' => 'Subject',
-        'content' => 'Content',
-        'title_content' => 'Subject+Content',
-        'comment' => 'Comment',
-        'tag' => 'Tags',
+        'document' => array(
+            'title_content' => 'Subject+Content',
+            'title' => 'Subject',
+            'content' => 'Content',
+            'tag' => 'Tags',
+        ),
+        'trackback' => array(
+            'url' => 'Target URL',
+            'blog_name' => 'Target Site Name',
+            'title' => 'Title',
+            'excerpt' => 'Excerpt',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/es.lang.php b/modules/integration_search/lang/es.lang.php
index 2287a2b0a..aab9ff9bc 100644
--- a/modules/integration_search/lang/es.lang.php
+++ b/modules/integration_search/lang/es.lang.php
@@ -13,13 +13,21 @@
     $lang->msg_no_keyword = "Ingrese la palabra para la búsqueda";
 
     $lang->is_result_text = "<strong>%d</strong> Resultados con la palabra <strong>'%s'</strong> ";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
+        'document' => array(
+        'title_content' => 'Título+Contenido',
         'title' => 'Título',
         'content' => 'Contenido',
-        'title_content' => 'Título+Contenido',
-        'comment' => 'Commentarios',
         'tag' => 'Etiqueta',
+        ),
+        'trackback' => array(
+            'url' => 'URL objetivo',
+            'blog_name' => 'Ojetivo del nombre de sitio',
+            'title' => 'Título',
+            'excerpt' => 'Contenido',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/fr.lang.php b/modules/integration_search/lang/fr.lang.php
index 55fba909c..557e34195 100644
--- a/modules/integration_search/lang/fr.lang.php
+++ b/modules/integration_search/lang/fr.lang.php
@@ -13,13 +13,21 @@
     $lang->msg_no_keyword = "Entrez le mot de clé à rechercher, S.V.P.";
 
     $lang->is_result_text = "Il y a <strong>%d</strong> résultat(s) pour <strong>'%s'</strong>";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
-        'title' => 'Titre',
-        'content' => 'Contenu',
-        'title_content' => 'Titre+Contenu',
-        'comment' => 'Commentaire',
-        'tag' => 'Balise',
+        'document' => array(
+            'title_content' => 'Titre+Contenu',
+            'title' => 'Titre',
+            'content' => 'Contenu',
+            'tag' => 'Balise',
+        ),
+        'trackback' => array(
+            'url' => 'URL objectif',
+            'blog_name' => 'Nom du Site objectif',
+            'title' => 'Titre',
+            'excerpt' => 'Contenu',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/jp.lang.php b/modules/integration_search/lang/jp.lang.php
index 64da850bf..83955730c 100644
--- a/modules/integration_search/lang/jp.lang.php
+++ b/modules/integration_search/lang/jp.lang.php
@@ -13,13 +13,21 @@
     $lang->msg_no_keyword = "検索語を入力してください。";
 
     $lang->is_result_text = "<strong>'%s'</strong>に対する検索結果<strong>%d</strong>件";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
-        'title' => 'タイトル',
-        'content' => '内容',
-        'title_content' => 'タイトル+内容',
-        'comment' => 'コメント',
-        'tag' => 'タグ',
+        'document' => array(
+            'title_content' => 'タイトル+内容',
+            'title' => 'タイトル',
+            'content' => '内容',
+            'tag' => 'タグ',
+        ),
+        'trackback' => array(
+            'url' => 'URL',
+            'blog_name' => 'サイト（ブログ）名',
+            'title' => 'タイトル',
+            'excerpt' => '要約内容',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/ko.lang.php b/modules/integration_search/lang/ko.lang.php
index 941ad6a60..07ad788b4 100644
--- a/modules/integration_search/lang/ko.lang.php
+++ b/modules/integration_search/lang/ko.lang.php
@@ -5,21 +5,30 @@
      * @brief  한국어 언어팩 (기본적인 내용만 수록)
      **/
 
-    $lang->integration_search = "통합검색";
+    $lang->integration_search = '통합검색';
 
-    $lang->sample_code = "샘플코드";
-    $lang->about_target_module = "선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다";
-    $lang->about_sample_code = "위 코드를 레이아웃등에 추가하시면 통합검색이 가능합니다";
-    $lang->msg_no_keyword = "검색어를 입력해주세요";
+    $lang->sample_code = '샘플코드';
+    $lang->about_target_module = '선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다';
+    $lang->about_sample_code = '위 코드를 레이아웃등에 추가하시면 통합검색이 가능합니다';
+    $lang->msg_no_keyword = '검색어를 입력해주세요';
+    $lang->msg_document_more_search  = '계속 검색 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다';
 
     $lang->is_result_text = "<strong>'%s'</strong> 에 대한 검색결과 <strong>%d</strong>건";
+    $lang->multimedia = '이미지/동영상';
 
     $lang->is_search_option = array(
-        'title' => '제목',
-        'content' => '내용',
-        'title_content' => '제목+내용',
-        'comment' => '댓글',
-        'tag' => '태그',
+        'document' => array(
+            'title_content' => '제목+내용',
+            'title' => '제목',
+            'content' => '내용',
+            'tag' => '태그',
+        ),
+        'trackback' => array(
+            'url' => '대상 URL',
+            'blog_name' => '대상 사이트 이름',
+            'title' => '제목',
+            'excerpt' => '내용',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/ru.lang.php b/modules/integration_search/lang/ru.lang.php
index 360ba1544..2f53ab13a 100644
--- a/modules/integration_search/lang/ru.lang.php
+++ b/modules/integration_search/lang/ru.lang.php
@@ -13,13 +13,21 @@
     $lang->msg_no_keyword = "Введите ключевое слово для поиска";
 
     $lang->is_result_text = "<strong>%d</strong> результатов для <strong>'%s'</strong>";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
-        'title' => 'Тема',
-        'content' => 'Содержание',
-        'title_content' => 'Тема+Содержание',
-        'comment' => 'Комментарии',
-        'tag' => 'Теги',
+        'document' => array(
+            'title_content' => 'Тема+Содержание',
+            'title' => 'Тема',
+            'content' => 'Содержание',
+            'tag' => 'Теги',
+        ),
+        'trackback' => array(
+            'url' => 'URL назначения',
+            'blog_name' => 'Имя сайта',
+            'title' => 'Заголовок',
+            'excerpt' => 'Выдержка',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/zh-CN.lang.php b/modules/integration_search/lang/zh-CN.lang.php
index bcdda9cb6..cf10df4d7 100644
--- a/modules/integration_search/lang/zh-CN.lang.php
+++ b/modules/integration_search/lang/zh-CN.lang.php
@@ -1,24 +1,32 @@
 <?php
     /**
      * @file   modules/integration_search/lang/ko.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  简体中文语言包
+     * @author zero <zero@nzeo.com> 翻译：guny
+     * @brief  综合搜索简体中文语言包
      **/
 
-    $lang->integration_search = "搜索";
+    $lang->integration_search = "综合搜索";
 
     $lang->sample_code = "代码";
-    $lang->about_target_module = "只把被选模块作为搜索对象。请注意权限设置。";
+    $lang->about_target_module = "所选模块作为搜索对象。请注意权限设置。";
     $lang->about_sample_code = "可把上述代码插入到相应布局当中即可实现搜索功能。";
 
     $lang->is_result_text = "符合<strong>'%s'</strong>的搜索结果约有<strong>%d</strong>项";
+    $lang->multimedia = "图片/视频";
 
     $lang->is_search_option = array(
+        'document' => array(
+        'title_content' => '标题+内容',
         'title' => '标题',
         'content' => '内容',
-        'title_content' => '标题+内容',
-        'comment' => '评论',
         'tag' => '标签',
+        ),
+        'trackback' => array(
+            'url' => '对象URL',
+            'blog_name' => '对象网站名称',
+            'title' => '标题',
+            'excerpt' => '内容',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/lang/zh-TW.lang.php b/modules/integration_search/lang/zh-TW.lang.php
index 3b93b3d41..7c16a5721 100644
--- a/modules/integration_search/lang/zh-TW.lang.php
+++ b/modules/integration_search/lang/zh-TW.lang.php
@@ -10,15 +10,25 @@
     $lang->sample_code = "原始碼";
     $lang->about_target_module = "只將所選擇的模組當作搜尋對象。請注意權限設置。";
     $lang->about_sample_code = "將上述原始碼插入到相對應版面當中，即可實現搜尋功能。";
+    $lang->msg_no_keyword = "請輸入關鍵字";
+    $lang->msg_document_more_search  = "계속 검색 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다";
 
     $lang->is_result_text = "符合<strong>'%s'</strong>的搜尋結果，約有<strong>%d</strong>項";
+    $lang->multimedia = "Images/ Movies";
 
     $lang->is_search_option = array(
-        'title' => '標題',
-        'content' => '內容',
-        'title_content' => '標題+內容',
-        'comment' => '評論',
-        'tag' => '標籤',
+        'document' => array(
+            'title_content' => '標題+內容',
+            'title' => '標題',
+            'content' => '內容',
+            'tag' => '標籤',
+        ),
+        'trackback' => array(
+            'url' => '目標網址',
+            'blog_name' => '目標網站名稱',
+            'title' => '標題',
+            'excerpt' => '內容',
+        ),
     );
 
     $lang->is_sort_option = array(
diff --git a/modules/integration_search/skins/default/comment.html b/modules/integration_search/skins/default/comment.html
new file mode 100644
index 000000000..d66a6ba88
--- /dev/null
+++ b/modules/integration_search/skins/default/comment.html
@@ -0,0 +1,35 @@
+<!--#include("header.html")-->
+
+<h3 class="subTitle">{$lang->comment} <span>({number_format($output->total_count)})</span> </h3>
+
+<!--@if(!count($output->data))-->
+    <span class="noResult">{$lang->msg_no_result}</span>
+<!--@else-->
+    <ul class="searchResult comment">
+    <!--@foreach($output->data as $no => $comment)-->
+        <li>
+            <!--@if($comment->thumbnailExists(80))-->
+            <a href="{$comment->getPermanentUrl()}" onclick="window.open(this.href);return false;"><img src="{$comment->getThumbnail(80)}" alt="" width="80" height="80" class="thumb" /></a>
+            <!--@end-->
+            <dl>
+                <dt><a href="{$comment->getPermanentUrl()}" onclick="window.open(this.href);return false;">{$comment->getSummary(400)}</a></dt>
+            </dl>
+            <address><strong>{$comment->getNickName()}</strong> | <span class="time">{$comment->getRegdate("Y-m-d H:i")}</span></address>
+        </li>
+    <!--@end-->
+    </ul>
+
+    <!--@if($where == 'comment' && $output->page_navigation)-->
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $output->page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$output->page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+    <!--@end-->
+<!--@end-->
diff --git a/modules/integration_search/skins/default/css/white.css b/modules/integration_search/skins/default/css/white.css
deleted file mode 100644
index ef0e5b9fa..000000000
--- a/modules/integration_search/skins/default/css/white.css
+++ /dev/null
@@ -1,102 +0,0 @@
-@charset "utf-8";
-#spot { border:8px solid #cecece; height:64px; position:relative; margin-bottom:30px;}
-#spot h2 { padding:0; margin:0; position:absolute; top:24px; left:-8px;}
-#spot .search { text-align:center; position:relative; top:22px;}
-#spot .search * { vertical-align:middle;}
-#spot .search select { margin-top:1px;}
-#spot .search .inputText { border:1px solid #b6b6b6; padding:2px 3px; width:252px; height:14px;}
-#spot .search .submit {}
-
-#content { width:100%; overflow:hidden; position:relative;}
-#content h3 { margin:0; padding:0; }
-#content h3.result { width:100%; height:23px; border-bottom:1px solid #cecece; margin-bottom:23px; margin-left:15px;}
-#content h3.result strong { color:#ff1a00;}
-#content .sortBy { position:absolute; top:0; right:0; overflow:hidden;}
-#content .sortBy li { list-style:none; float:left; padding:0 6px; position:relative; right:-6px; background:url(../images/white/vrType2.gif) no-repeat right 1px;}
-#content .sortBy li a { display:block; float:left; padding-left:9px; color:#3e3e3e; white-space:nowrap; background:url(../images/white/bulletSortBy.gif) no-repeat left 4px; text-decoration:none; }
-#content .sortBy li.on a { color:#ff1a00; background:url(../images/white/bulletSortByOn.gif) no-repeat left 4px;}
-
-.searchResult { margin:0 0 0 15px; padding:0;}
-.searchResult li { width:100%; margin-bottom:29px; clear:both; overflow:hidden;list-style:none; }
-.searchResult li .thumb { display:block; float:left; margin-right:14px;}
-.searchResult li dl { margin:0; padding:0; }
-.searchResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
-.searchResult li dl dt a { color:#1a3588; text-decoration:underline;}
-.searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;}
-.searchResult li dl dt .reply em { color:#fe6700; font:bold 1em Tahoma;}
-.searchResult li dl dt .category { color:#818181;}
-.searchResult li dl dt .category a { color:#818181; border:none; text-decoration:none;}
-.searchResult li dl dd { padding:0; margin:0; line-height:18px; color:#555555; margin-bottom:4px;}
-.searchResult li address { color:#d8d8d8; font-size:11px;}
-.searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
-.searchResult li address img { vertical-align:middle; margin-right:2px;}
-.searchResult li address .time { color:#818181; font:.8em Tahoma;}
-.searchResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchResult li address .readNum { color:#818181; font:.8em Tahoma;}
-.searchResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
-
-.searchNext { text-align:center; margin-top:10px;}
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/white/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/white/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/white/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/white/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-.pagination.a2 a,
-.pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-.pagination.a2 a.prev{ padding-left:10px; background:#fff url(../images/white/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../images/white/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a2 a.next{ padding-right:10px; background:#fff url(../images/white/arrowNextA1.gif) no-repeat right center; }
-.pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../images/white/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-.pagination.b1 a,
-.pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-.pagination.b1 a.prev{ padding-left:16px; background:url(../images/white/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b1 a.next{ padding-right:16px; background:url(../images/white/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-.pagination.b2 a,
-.pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-.pagination.b2 a.prev{ padding-left:12px; background:url(../images/white/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b2 a.next{ padding-right:12px; background:url(../images/white/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-.pagination.c1 a,
-.pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-.pagination.c1 a.prev,
-.pagination.c1 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c1 a.prev{ background:url(../images/white/arrowPrevC1.gif) no-repeat center;}
-.pagination.c1 a.next{ background:url(../images/white/arrowNextC1.gif) no-repeat center;}
-.pagination.c1 a.prev span,
-.pagination.c1 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-.pagination.c2 a,
-.pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-.pagination.c2 a.prev,
-.pagination.c2 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c2 a.prev{ background:url(../images/white/arrowPrevC1.gif) no-repeat center;}
-.pagination.c2 a.next{ background:url(../images/white/arrowNextC1.gif) no-repeat center;}
-.pagination.c2 a.prev span,
-.pagination.c2 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
diff --git a/modules/integration_search/skins/default/document.html b/modules/integration_search/skins/default/document.html
new file mode 100644
index 000000000..33bfc08ec
--- /dev/null
+++ b/modules/integration_search/skins/default/document.html
@@ -0,0 +1,54 @@
+<!--#include("header.html")-->
+
+<h3 class="subTitle">{$lang->document} <span>({number_format($output->total_count)})</span></h3>
+
+<ul class="subNavigation">
+    <!--@foreach($lang->is_search_option['document'] as $key => $val)-->
+    <li value="{$key}" class="<!--@if($search_target == $key)-->on<!--@end--><!--@if($key=="tag")--> last<!--@end-->"><a href="{getUrl('where','document','search_target',$key,'page',1,'division','')}">{$val}</a></li>
+    <!--@end-->
+</ul>
+
+
+<!--@if(!count($output->data))-->
+    <span class="noResult">
+        {$lang->msg_no_result}
+        <!--@if($last_division)-->
+        <br />{$lang->msg_document_more_search}
+        <br /><a href="{getUrl('where','document','page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}" class="button"><span>{$lang->cmd_search_next}</span></a>
+        <!--@end-->
+    </span>
+<!--@else-->
+    <ul class="searchResult">
+    <!--@foreach($output->data as $no => $document)-->
+        <li>
+            <!--@if($document->thumbnailExists(80))-->
+            <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href);return false;"><img src="{$document->getThumbnail(80)}" alt="" width="80" height="80" class="thumb" /></a>
+            <!--@end-->
+            <dl>
+                <dt><a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href);return false;">{$document->getTitle()}</a> <!--@if($document->getCommentCount())--><span class="reply">[<em>{$document->getCommentCount()}</em>]</span> <!--@end--></dt>
+
+                <dd>{$document->getSummary(200)}</dd>
+            </dl>
+            <address><strong>{$document->getNickName()}</strong> | <span class="time">{$document->getRegdate("Y-m-d H:i")}</span> | <span class="read">{$lang->readed_count}</span> <span class="readNum">{$document->get('readed_count')}</span><!--@if($document->get('voted_count'))--> | <span class="recom">{$lang->voted_count}</span> <span class="recomNum">{$document->get('voted_count')}</span><!--@end--></address>
+
+        </li>
+    <!--@end-->
+    </ul>
+
+    <!--@if($where == 'document' && $output->page_navigation)-->
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $output->page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$output->page_navigation->last_page)}" <!--@if(!$last_division)-->class="nextEnd"<!--@end-->>{$lang->last_page}</a>
+            <!--@if($last_division)-->
+            <a href="{getUrl('page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}" class="nextEnd">{$lang->cmd_search_next}</a>
+            <!--@end-->
+        </div>
+    <!--@end-->
+<!--@end-->
diff --git a/modules/integration_search/skins/default/file.html b/modules/integration_search/skins/default/file.html
new file mode 100644
index 000000000..648bdac07
--- /dev/null
+++ b/modules/integration_search/skins/default/file.html
@@ -0,0 +1,32 @@
+<!--#include("header.html")-->
+
+<h3 class="subTitle">{$lang->file} <span>({number_format($output->total_count)})</span></h3>
+
+<!--@if(!count($output->data))-->
+    <span class="noResult">{$lang->msg_no_result}</span>
+<!--@else-->
+    <ul class="searchResult">
+    <!--@foreach($output->data as $no => $file)-->
+        <li>
+            <dl>
+                <dt><a href="{$file->url}" onclick="window.open(this.href);return false;">{$file->filename}</a> ({FileHandler::filesize($file->file_size)})</dt>
+            </dl>
+            <address><strong>{$file->nick_name}</strong> | <span class="time">{$file->regdate}</span> | <span class="recomNum">{number_format($file->download_count)}</span> </address>
+        </li>
+    <!--@end-->
+    </ul>
+
+    <!--@if($where == 'file' &&  $output->page_navigation)-->
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $output->page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$output->page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+    <!--@end-->
+<!--@end-->
diff --git a/modules/integration_search/skins/default/header.html b/modules/integration_search/skins/default/header.html
new file mode 100644
index 000000000..81370bc3e
--- /dev/null
+++ b/modules/integration_search/skins/default/header.html
@@ -0,0 +1,34 @@
+<!--@if(!$_loaded)-->
+    {@ $_loaded = true; }
+
+    <!--// 컬러셋 체크 -->
+    <!--@if($module_info->colorset != "white")-->
+        {@$module_info->colorset = "white"}
+    <!--@end-->
+
+    <!--// CSS 파일 로드 (컬러셋에 따라서) -->
+    <!--@if($module_info->colorset == "white")-->
+        <!--%import("white.css")-->
+    <!--@end-->
+
+    <!--%import("is.js")-->
+
+    <div id="spot">
+        <form action="{getUrl()}" method="post" class="search" id="fo_is">
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="act" value="IS" />
+            <input type="hidden" name="where" value="{$where}" />
+            <input name="is_keyword" type="text" class="inputText" value="{htmlspecialchars($is_keyword)}"/>
+            <span class="button large strong black"><input type="submit" value="{$lang->cmd_search}" /></span>
+        </form>
+    </div>
+
+    <ul class="localNavigation">
+        <li <!--@if(!$where)-->class="on"<!--@end-->><a href="{getUrl('where','','page','','division','')}">{$lang->integration_search}</a></li>
+        <li <!--@if($where=='document')-->class="on"<!--@end-->><a href="{getUrl('where','document','page',1,'division','')}">{$lang->document}</a></li>
+        <li <!--@if($where=='comment')-->class="on"<!--@end-->><a href="{getUrl('where','comment','page',1,'division','')}">{$lang->comment}</a></li>
+        <li <!--@if($where=='trackback')-->class="on"<!--@end-->><a href="{getUrl('where','trackback','page',1,'division','')}">{$lang->trackback}</a></li>
+        <li <!--@if($where=='multimedia')-->class="on"<!--@end-->><a href="{getUrl('where','multimedia','page',1,'division','')}">{$lang->multimedia}</a></li>
+        <li <!--@if($where=='file')-->class="on"<!--@end-->><a href="{getUrl('where','file','page',1,'division','')}">{$lang->file}</a></li>
+    </ul>
+<!--@end-->
diff --git a/modules/integration_search/skins/default/images/white/arrowNextB1.gif b/modules/integration_search/skins/default/images/white/arrowNextB1.gif
deleted file mode 100644
index 7a563a182..000000000
Binary files a/modules/integration_search/skins/default/images/white/arrowNextB1.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/arrowNextC1.gif b/modules/integration_search/skins/default/images/white/arrowNextC1.gif
deleted file mode 100644
index 82deddc7b..000000000
Binary files a/modules/integration_search/skins/default/images/white/arrowNextC1.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/arrowPrevB1.gif b/modules/integration_search/skins/default/images/white/arrowPrevB1.gif
deleted file mode 100644
index a95ce58df..000000000
Binary files a/modules/integration_search/skins/default/images/white/arrowPrevB1.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/arrowPrevC1.gif b/modules/integration_search/skins/default/images/white/arrowPrevC1.gif
deleted file mode 100644
index 0bab510b5..000000000
Binary files a/modules/integration_search/skins/default/images/white/arrowPrevC1.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/bgTab.gif b/modules/integration_search/skins/default/images/white/bgTab.gif
new file mode 100755
index 000000000..8835361b8
Binary files /dev/null and b/modules/integration_search/skins/default/images/white/bgTab.gif differ
diff --git a/modules/integration_search/skins/default/images/white/bulletSortBy.gif b/modules/integration_search/skins/default/images/white/bulletSortBy.gif
deleted file mode 100644
index d90dcc88a..000000000
Binary files a/modules/integration_search/skins/default/images/white/bulletSortBy.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/bulletSortByOn.gif b/modules/integration_search/skins/default/images/white/bulletSortByOn.gif
deleted file mode 100644
index a1d5c3244..000000000
Binary files a/modules/integration_search/skins/default/images/white/bulletSortByOn.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/buttonSearch2.gif b/modules/integration_search/skins/default/images/white/buttonSearch2.gif
deleted file mode 100644
index 65e49c9dd..000000000
Binary files a/modules/integration_search/skins/default/images/white/buttonSearch2.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/h2Search.gif b/modules/integration_search/skins/default/images/white/h2Search.gif
deleted file mode 100644
index 147eed4cf..000000000
Binary files a/modules/integration_search/skins/default/images/white/h2Search.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/images/white/iconH2.gif b/modules/integration_search/skins/default/images/white/iconH2.gif
new file mode 100755
index 000000000..457867741
Binary files /dev/null and b/modules/integration_search/skins/default/images/white/iconH2.gif differ
diff --git a/modules/integration_search/skins/default/images/white/vrType2.gif b/modules/integration_search/skins/default/images/white/vrType2.gif
deleted file mode 100644
index a5e4df11d..000000000
Binary files a/modules/integration_search/skins/default/images/white/vrType2.gif and /dev/null differ
diff --git a/modules/integration_search/skins/default/index.html b/modules/integration_search/skins/default/index.html
index b435f4dcb..f8395012d 100644
--- a/modules/integration_search/skins/default/index.html
+++ b/modules/integration_search/skins/default/index.html
@@ -1,72 +1,33 @@
-<!--// 컬러셋 체크 -->
-<!--@if($module_info->colorset != "white")-->
-    {@$module_info->colorset = "white"}
+<!--#include("header.html")-->
+
+{@ $output = $search_result['document'] }
+{@ $search_target = 'title'; }
+<!--#include("document.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getUrl('where','document','page',1)}">more</a></div>
 <!--@end-->
 
-<!--// CSS 파일 로드 (컬러셋에 따라서) -->
-<!--@if($module_info->colorset == "white")-->
-    <!--%import("css/white.css")-->
+{@ $output = $search_result['comment'] }
+<!--#include("comment.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getUrl('where','comment','page',1)}">more</a></div>
 <!--@end-->
 
-<div id="spot">
-    <h2><img src="./images/white/h2Search.gif" alt="{$lang->cmd_search}" width="82" height="17" /></h2>
-    <form action="{getUrl()}" method="post" class="search">
-        <input type="hidden" name="mid" value="{$mid}" />
-        <input type="hidden" name="act" value="IS" />
-        <select name="search_target">
-            <!--@foreach($lang->is_search_option as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target == $key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input name="is_keyword" type="text" class="inputText" value="{htmlspecialchars($is_keyword)}"/>
-        <input type="image" src="./images/white/buttonSearch2.gif" alt="검색" class="submit" />
-    </form>
-</div>
-
-<!--@if(!$document_list)-->
-    <div id="content">
-        <!--@if(!$is_keyword)-->
-            <h3 class="result">{$lang->msg_no_keyword}</h3>
-        <!--@else-->
-            <h3 class="result">{$lang->msg_no_result}</h3>
-        <!--@end-->
-    </div>
-<!--@else-->
-    <div id="content">
-        <h3 class="result">{$result_text}</h3>
-        <ul class="searchResult">
-        <!--@foreach($document_list as $no => $document)-->
-            <li>
-                <!--@if($document->thumbnailExists(100))-->
-                <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href);return false;"><img src="{$document->getThumbnail(100)}" alt="" width="100" height="100" class="thumb" /></a>
-                <!--@end-->
-                <dl>
-                    <dt><a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href);return false;">{$document->getTitle()}</a> <!--@if($document->getCommentCount())--><span class="reply">[<em>{$document->getCommentCount()}</em>]</span> <!--@end--> | <span class="category"><a href="{getUrl('','mid',$mid_list[$document->get('module_srl')]->mid)}" onclick="window.open(this.href);return false;">{$mid_list[$document->get('module_srl')]->browser_title}</a></span></dt>
-
-                    <dd>{$document->getSummary(140)}</dd>
-                </dl>
-                <address><strong>{$document->getNickName()}</strong> | <span class="time">{$document->getRegdate("Y-m-d H:i")}</span> | <span class="read">{$lang->readed_count}</span> <span class="readNum">{$document->get('readed_count')}</span><!--@if($document->get('voted_count'))--> | <span class="recom">{$lang->voted_count}</span> <span class="recomNum">{$document->get('voted_count')}</span><!--@end--></address>
-
-            </li>
-        <!--@end-->
-        </ul>
-        <div class="pagination a1">
-            <a href="{getUrl('page','','document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$division,'last_division',$last_division)}" class="prevEnd">{$lang->first_page}</a> 
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong> 
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$division,'last_division',$last_division)}">{$page_no}</a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$division,'last_division',$last_division)}" class="nextEnd">{$lang->last_page}</a>
-        </div>
-    </div>
-
-
+{@ $output = $search_result['trackback'] }
+{@ $search_target = 'title'; }
+<!--#include("trackback.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getUrl('where','trackback','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['multimedia'] }
+<!--#include("multimedia.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getUrl('where','multimedia','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['file'] }
+<!--#include("file.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getUrl('where','file','page',1)}">more</a></div>
 <!--@end-->
-    <!--@if($last_division)-->
-    <div class="searchNext">
-        <span class="button"><input type="button" value="{$lang->cmd_search_next}" onclick="location.href='{getUrl('page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}';return false;" /></span>
-    </div>
-    <!--@end-->
diff --git a/modules/integration_search/skins/default/multimedia.html b/modules/integration_search/skins/default/multimedia.html
new file mode 100644
index 000000000..595347186
--- /dev/null
+++ b/modules/integration_search/skins/default/multimedia.html
@@ -0,0 +1,33 @@
+<!--#include("header.html")-->
+
+<h3 class="subTitle">{$lang->multimedia} <span>({number_format($output->total_count)})</span></h3>
+
+<!--@if(!count($output->data))-->
+    <span class="noResult">{$lang->msg_no_result}</span>
+<!--@else-->
+    <ul class="searchImageResult">
+    <!--@foreach($output->data as $no => $image)-->
+        <li>    
+            <a href="{$image->url}" onclick="window.open(this.href); return false;">{$image->src}</a>
+            <dl>
+                <dt><a href="{$image->url}" onclick="window.open(this.href); return false;">{$image->filename}</a></dt>
+            </dl>
+            <address><strong>{$image->nick_name}</strong><br /><span class="time">{$image->regdate}</span></address>
+        </li>
+    <!--@end-->
+    </ul>
+
+    <!--@if($where == 'multimedia' && $output->page_navigation)-->
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $output->page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$output->page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+    <!--@end-->
+<!--@end-->
diff --git a/modules/integration_search/skins/default/no_keywords.html b/modules/integration_search/skins/default/no_keywords.html
new file mode 100644
index 000000000..03193fcc0
--- /dev/null
+++ b/modules/integration_search/skins/default/no_keywords.html
@@ -0,0 +1,7 @@
+<!--#include("header.html")-->
+
+<strong class="noKeyword">{$lang->msg_no_keyword}</strong>
+
+<script type="text/javascript">
+    xAddEventListener(window,'load', function() { xGetElementById("fo_is").is_keyword.focus(); } );
+</script>
diff --git a/modules/integration_search/skins/default/trackback.html b/modules/integration_search/skins/default/trackback.html
new file mode 100644
index 000000000..1da20b43f
--- /dev/null
+++ b/modules/integration_search/skins/default/trackback.html
@@ -0,0 +1,41 @@
+<!--#include("header.html")-->
+
+<h3 class="subTitle">{$lang->trackback} <span>({number_format($output->total_count)})</span></h3>
+
+<ul class="subNavigation">
+    <!--@foreach($lang->is_search_option['trackback'] as $key => $val)-->
+    <li value="{$key}" class="<!--@if($search_target == $key)-->on<!--@end--><!--@if($key=="tag")--> last<!--@end-->"><a href="{getUrl('where','trackback','search_target',$key,'page',1)}">{$val}</a></li>
+    <!--@end-->
+</ul>
+
+
+<!--@if(!count($output->data))-->
+    <span class="noResult">{$lang->msg_no_result}</span>
+<!--@else-->
+    <ul class="searchResult">
+    <!--@foreach($output->data as $no => $trackback)-->
+        <li>
+            <dl>
+                <dt><a href="{getUrl('','document_srl',$trackback->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($trackback->title)}</a> </span></dt>
+                <dd>{cut_str(htmlspecialchars($trackback->excerpt))}</dd>
+            </dl>
+            <address><strong><a href="{$trackback->url}" onclick="window.open(this.href); return false;">{htmlspecialchars($trackback->blog_name)}</a></strong> | <span class="time">{zdate($trackback->regdate, "Y-m-d H:i")}</span> </address>
+
+        </li>
+    <!--@end-->
+    </ul>
+
+    <!--@if($where == 'trackback' && $output->page_navigation)-->
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $output->page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$output->page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+    <!--@end-->
+<!--@end-->
diff --git a/modules/integration_search/skins/default/white.css b/modules/integration_search/skins/default/white.css
new file mode 100644
index 000000000..d5fc4f064
--- /dev/null
+++ b/modules/integration_search/skins/default/white.css
@@ -0,0 +1,92 @@
+@charset "utf-8";
+
+#spot { padding-left:10px; margin-bottom:20px; }
+#spot .search * { vertical-align:middle;}
+#spot .search .inputText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
+
+.localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; padding-left:10px; }
+.localNavigation:after {content:""; display:block; clear:both;}
+.localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
+.localNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(images/white/bgTab.gif) repeat-x;}
+.localNavigation li.on { margin-bottom:-1px;}
+.localNavigation li.on a{ height:19px; background:none;}
+
+.subNavigation { *zoom:1; margin:0 0 20px 10px; padding:0 0 10px 0; overflow:hidden; border-bottom:1px solid #EFEFEF; }
+.subNavigation:after {content:""; display:block; clear:both;}
+.subNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0 }
+.subNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:0 10px 0 0; margin-right:10px; border-right:1px solid #ddd; }
+.subNavigation li.last a { border-right:0; }
+.subNavigation li.on { margin-bottom:-1px;}
+.subNavigation li.on a { font-weight:bold; }
+
+strong.noKeyword { font-size:16px; display:block; margin:50px 0 0 10px; }
+
+h3.subTitle { padding:0 0 0 20px; margin:10px 0 20px 10px; background:url(images/white/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
+h3.subTitle span { font-weight:normal; font-family:verdana; font-size:11px; }
+
+.noResult { display:block; margin:0 0 30px 10px; color:#666; padding:0 0 10px 20px; border-bottom:1px solid #EFEFEF; line-height:160%;}
+
+.searchResult { margin:10px 0 0 10px; padding:0;}
+.searchResult li { width:100%; margin-bottom:15px; clear:both; overflow:hidden;list-style:none; }
+.searchResult li .thumb { display:block; float:left; margin-right:14px; padding:1px; border:1px solid #DDD;}
+.searchResult li dl { margin:5px 0 0 0; padding:0; }
+.searchResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
+.searchResult li dl dt a { color:#1a3588; text-decoration:underline;}
+.searchResult.comment li dl dt a { color:#444444; text-decoration:none;}
+.searchResult.comment li dl dt a:hover { text-decoration:underline;}
+.searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;}
+.searchResult li dl dt .reply em { color:#fe6700; font:normal 10px Tahoma;}
+.searchResult li dl dt .category { color:#818181;}
+.searchResult li dl dt .category a { color:#818181; border:none; text-decoration:none;}
+.searchResult li dl dd { padding:0; margin:0; line-height:18px; color:#555555; margin-bottom:4px;}
+.searchResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
+.searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
+.searchResult li address img { vertical-align:middle; margin-right:2px;}
+.searchResult li address .time { color:#818181; font:.8em Tahoma;}
+.searchResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchResult li address .readNum { color:#818181; font:.8em Tahoma;}
+.searchResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
+
+.searchImageResult { margin:10px 0 0 10px; padding:0; overflow:hidden; *zoom:1;}
+.searchImageResult li { width:124px; height:190px; padding:0; margin:0 20px 15px 0; list-style:none; float:left; overflow:hidden; vertical-align:top;}
+.searchImageResult li img { display:block; margin-bottom:10px; padding:1px; border:1px solid #DDD;}
+.searchImageResult li dl { margin:0; padding:0; }
+.searchImageResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
+.searchImageResult li dl dt a { color:#1a3588; text-decoration:underline;}
+.searchImageResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
+.searchImageResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
+.searchImageResult li address img { vertical-align:middle; margin-right:2px;}
+.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
+.searchImageResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchImageResult li address .readNum { color:#818181; font:.8em Tahoma;}
+.searchImageResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchImageResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
+.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
+
+div.isMore { color:#666; text-align:right; margin-bottom:20px; padding-bottom:10px; border-bottom:1px solid #EFEFEF; }
+div.isMore a { color:#666; text-decoration:underline; }
+
+/* Pagination Reset */
+.pagination{ padding:15px 0; margin:0; text-align:center;}
+.pagination *{ margin:0; padding:0;}
+.pagination img{ border:0;}
+.pagination a,
+.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+.pagination a:hover,
+.pagination a:active,
+.pagination a:focus{ background-color:#f4f4f4 !important; }
+.pagination strong{ color:#ff6600 !important;}
+.pagination a.prev,
+.pagination a.prevEnd,
+.pagination a.next,
+.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+/* Pagination A1 */
+.pagination.a1 a,
+.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+.pagination.a1 a.prev{ padding-left:10px; background:#fff url(images/white/arrowPrevA1.gif) no-repeat left center; }
+.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(images/white/arrowPrevEndA1.gif) no-repeat left center; }
+.pagination.a1 a.next{ padding-right:10px; background:#fff url(images/white/arrowNextA1.gif) no-repeat right center; }
+.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(images/white/arrowNextEndA1.gif) no-repeat right center; }
+
diff --git a/modules/integration_search/tpl/header.html b/modules/integration_search/tpl/header.html
index 8c06c1099..8c057aead 100644
--- a/modules/integration_search/tpl/header.html
+++ b/modules/integration_search/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/integration_search_admin.js")-->
 
-<h3>{$lang->integration_search} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->integration_search} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
     <ul class="localNavigation">
diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html
index 96bcf0da1..ed52aa353 100644
--- a/modules/integration_search/tpl/index.html
+++ b/modules/integration_search/tpl/index.html
@@ -2,11 +2,11 @@
 <!--%import("filter/insert_config.xml")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->sample_code}<div></th>
         <td colspan="2" class="wide">
-            <textarea class="inputTypeTextArea w400" readonly="readonly">{$sample_code}</textarea>
+            <textarea class="inputTypeTextArea fullWidth" readonly="readonly">{$sample_code}</textarea>
             <p>{$lang->about_sample_code}</p>
         </td>
     </tr>
@@ -47,9 +47,9 @@
     <!--@end-->
     <!--@end-->
     <tr class="row2">
-        <td class="right" colspan="3">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th class="button" colspan="3">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/integration_search/tpl/skin_info.html b/modules/integration_search/tpl/skin_info.html
index 49e591a94..3c3a87845 100644
--- a/modules/integration_search/tpl/skin_info.html
+++ b/modules/integration_search/tpl/skin_info.html
@@ -4,8 +4,8 @@
 <input type="hidden" name="module" value="integration_search" />
 <input type="hidden" name="act" value="procIntegration_searchAdminInsertSkin" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
+    <h4 class="xeAdmin">{$lang->skin_default_info}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->skin}</div></th>
         <td class="wide" >{$skin_info->title}</td>
@@ -42,8 +42,8 @@
     </tr>
     </table>
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
+    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr valign="top">
         <th scope="row"><div>{$lang->colorset}</div></th>
         <td class="wide">
@@ -132,9 +132,9 @@
     <!--@end-->
 
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="right">
+            <span class="button strong black strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/issuetracker/classes/svn.class.php b/modules/issuetracker/classes/svn.class.php
index ec370b10e..4952f74de 100644
--- a/modules/issuetracker/classes/svn.class.php
+++ b/modules/issuetracker/classes/svn.class.php
@@ -80,8 +80,7 @@
             );
 
             $buff = $this->execCmd($command, $error);
-
-            $list = explode("\n",$buff);
+            $list = explode(PHP_EOL,$buff);
 
             if(!count($list)) return null;
 
@@ -365,7 +364,7 @@
 
         function explodePath($source_path, $is_file = false) {
             if(!$source_path) return;
-
+            $source_path = rtrim($source_path);
             $arr_path = explode('/', $source_path);
             if(substr($source_path,-1)!='/') $file = array_pop($arr_path);
 
diff --git a/modules/issuetracker/conf/info.xml b/modules/issuetracker/conf/info.xml
index 9d2953604..0b82a7d70 100644
--- a/modules/issuetracker/conf/info.xml
+++ b/modules/issuetracker/conf/info.xml
@@ -3,14 +3,14 @@
     <title xml:lang="ko">이슈트래커</title>
     <title xml:lang="jp">イシュートラッカー</title>
     <title xml:lang="zh-CN">问题跟踪</title>
-	<title xml:lang="en">Issue Tracker</title>
+    <title xml:lang="en">Issue Tracker</title>
     <title xml:lang="es">Issue Tracker</title>
     <title xml:lang="zh-TW">問題追蹤</title>
     <description xml:lang="ko">각종 이슈 처리를 위한 모듈입니다.</description>
     <description xml:lang="jp">各種イシューを処理するモジュールです。</description>
     <description xml:lang="zh-CN">一个具有项目跟踪功能的模块。</description>
-	<description xml:lang="en">This module handles many kinds of issues.</description>
-	<description xml:lang="es">Este módulo se ocupa de muchos tipos de cuestiones.</description>
+    <description xml:lang="en">This module handles many kinds of issues.</description>
+    <description xml:lang="es">Este módulo se ocupa de muchos tipos de cuestiones.</description>
     <description xml:lang="zh-TW">可以處理追蹤多種問題的模組。</description>
     <version>1.0</version>
     <date>2008-08-04</date>
@@ -19,8 +19,8 @@
         <name xml:lang="ko">haneul</name>
         <name xml:lang="jp">haneul</name>
         <name xml:lang="zh-CN">haneul</name>
-		<name xml:lang="en">haneul</name>
-		<name xml:lang="es">haneul</name>
+	<name xml:lang="en">haneul</name>
+	<name xml:lang="es">haneul</name>
         <name xml:lang="zh-TW">haneul</name>
     </author>
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
diff --git a/modules/issuetracker/conf/module.xml b/modules/issuetracker/conf/module.xml
index fc66e7e9b..12fc8ee43 100644
--- a/modules/issuetracker/conf/module.xml
+++ b/modules/issuetracker/conf/module.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants>
-        <grant name="access" default="guest">
-            <title xml:lang="ko">프로젝트 접근</title>
-            <title xml:lang="zh-CN">访问项目</title>
-            <title xml:lang="zh-TW">專案</title>
-            <title xml:lang="jp">プロジェクトへアクセス</title>
-        </grant>
         <grant name="ticket_view" default="guest">
             <title xml:lang="ko">티켓 열람</title>
             <title xml:lang="zh-CN">查看计划</title>
@@ -43,13 +37,8 @@
             <title xml:lang="zh-TW">下載</title>
             <title xml:lang="jp">ダウンロード</title>
         </grant>
-        <grant name="manager" default="root">
-            <title xml:lang="ko">프로젝트 관리</title>
-            <title xml:lang="zh-CN">项目管理</title>
-            <title xml:lang="zh-TW">專案管理</title>
-            <title xml:lang="jp">プロジェクト管理</title>
-        </grant>
     </grants>
+    <permissions />
     <actions>
         <action name="dispIssuetrackerViewMilestone" type="view" standalone="true" index="true" />
         <action name="dispIssuetrackerViewIssue" type="view" standalone="true" />
@@ -71,6 +60,7 @@
         <action name="dispIssuetrackerAdminProjectSetting" type="view" standalone="true" />
         <action name="dispIssuetrackerAdminReleaseSetting" type="view" standalone="true" />
         <action name="dispIssuetrackerAdminAdditionSetup" type="view" standalone="true" />
+        <action name="dispIssuetrackerAdminExtraVars" type="view" standalone="true" />
         <action name="dispIssuetrackerAdminGrantInfo" type="view" standalone="true" />
         <action name="dispIssuetrackerAdminSkinInfo" type="view" standalone="true" />
         <action name="dispIssuetrackerAdminProjectInfo" type="view" standalone="true" />
@@ -90,6 +80,7 @@
         <action name="procIssuetrackerAdminInsertMilestone" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminInsertPriority" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminInsertComponent" type="controller" standalone="true" />
+        <action name="procIssuetrackerAdminModifyDisplayOption" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminInsertType" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminInsertPackage" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminInsertRelease" type="controller" standalone="true" />
@@ -102,8 +93,6 @@
         <action name="procIssuetrackerAdminDeleteRelease" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminDeleteFile" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminAttachRelease" type="controller" standalone="true" />
-        <action name="procIssuetrackerAdminInsertGrant" type="controller" standalone="true" />
-        <action name="procIssuetrackerAdminUpdateSkinInfo" type="controller" standalone="true" />
         <action name="procIssuetrackerAdminManageCheckedIssue" type="controller" standalone="true" />
 
     </actions>
diff --git a/modules/issuetracker/issuetracker.admin.controller.php b/modules/issuetracker/issuetracker.admin.controller.php
index b76e025c6..23e401be4 100644
--- a/modules/issuetracker/issuetracker.admin.controller.php
+++ b/modules/issuetracker/issuetracker.admin.controller.php
@@ -13,103 +13,27 @@
         function init() {
         }
 
-        function procIssuetrackerAdminInsertProject($args = null) {
+        function procIssuetrackerAdminInsertProject() {
             // module 모듈의 model/controller 객체 생성
             $oModuleController = &getController('module');
             $oModuleModel = &getModel('module');
 
-            // 만약 module_srl이 , 로 연결되어 있다면 일괄 정보 수정으로 처리
-            if(strpos(Context::get('module_srl'),',')!==false) {
-                // 대상 모듈들을 구해옴
-                $modules = $oModuleModel->getModulesInfo(Context::get('module_srl'));
-                $args = Context::getRequestVars();
-
-                for($i=0;$i<count($modules);$i++) {
-                    $obj = $extra_vars = null;
-
-                    $obj = $modules[$i];
-                    $extra_vars = unserialize($obj->extra_vars);
-
-                    $obj->module = 'issuetracker';
-                    $obj->module_category_srl = $args->module_category_srl;
-                    $obj->layout_srl = $args->layout_srl;
-                    $obj->skin = $args->skin;
-                    $obj->description = $args->description;
-                    $obj->header_text = $args->header_text;
-                    $obj->footer_text = $args->footer_text;
-                    $obj->admin_id = $args->admin_id;
-
-                    $extra_vars->admin_mail = $args->admin_mail;
-
-                    $obj->extra_vars = serialize($extra_vars);
-
-                    $output = $oModuleController->updateModule($obj);
-                    if(!$output->toBool()) return $output;
-                }
-
-                return new Object(0,'success_updated');
-            }
-
             // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            if(!$args) {
-                $args = Context::gets('module_srl','module_category_srl','project_name','layout_srl','skin','browser_title','description','is_default','header_text','footer_text','admin_id');
-                $extra_var = delObjectVars(Context::getRequestVars(), $args);
-            }
-
+            $args = Context::getRequestVars();
             $args->module = 'issuetracker';
             $args->mid = $args->project_name;
             unset($args->project_name);
-            if($args->is_default!='Y') $args->is_default = 'N';
-
-            // 기본 값외의 것들을 정리
-            unset($extra_var->act);
-            unset($extra_var->page);
-            unset($extra_var->project_name);
-            unset($extra_var->module_srl);
-
-            // 확장변수(20개로 제한된 고정 변수) 체크
-            $user_defined_extra_vars = array();
-            foreach($extra_var as $key => $val) {
-                if(substr($key,0,11)!='extra_vars_') continue;
-                preg_match('/^extra_vars_([0-9]+)_(.*)$/i', $key, $matches);
-                if(!$matches[1] || !$matches[2]) continue;
-
-                $user_defined_extra_vars[$matches[1]]->{$matches[2]} = $val;
-                unset($extra_var->{$key});
-            }
-            for($i=1;$i<=20;$i++) if(!$user_defined_extra_vars[$i]->name) unset($user_defined_extra_vars[$i]);
-            $extra_var->extra_vars = $user_defined_extra_vars;
 
             // module_srl이 넘어오면 원 모듈이 있는지 확인
             if($args->module_srl) {
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-                // 만약 원래 모듈이 없으면 새로 입력하기 위한 처리
                 if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // $extra_var를 serialize
-            $args->extra_vars = serialize($extra_var);
-
-            // is_default=='Y' 이면
-            if($args->is_default=='Y') $oModuleController->clearDefaultModule();
-
             // module_srl의 값에 따라 insert/update
             if(!$args->module_srl) {
                 $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-
-                // 파일업로드, 댓글 파일업로드, 관리에 대한 권한 지정
-                if($output->toBool()) {
-                    $oMemberModel = &getModel('member');
-                    $admin_group = $oMemberModel->getAdminGroup();
-                    $admin_group_srl = $admin_group->group_srl;
-
-                    $module_srl = $output->get('module_srl');
-                    $grants = serialize(array('manager'=>array($admin_group_srl)));
-
-                    $oModuleController->updateModuleGrant($module_srl, $grants);
-                }
             } else {
                 $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
@@ -148,7 +72,6 @@
         function procIssuetrackerAdminInsertMilestone()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
             if($args->is_default=='Y') executeQuery('issuetracker.clearMilestoneDefault', $args);
 
             if(!$args->milestone_srl)
@@ -165,7 +88,6 @@
         function procIssuetrackerAdminInsertType()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
             if($args->is_default=='Y') executeQuery('issuetracker.clearTypeDefault', $args);
 
             if($args->type_srl) {
@@ -180,7 +102,7 @@
         function procIssuetrackerAdminInsertComponent()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
+            
             if($args->is_default=='Y') executeQuery('issuetracker.clearComponentsDefault', $args);
 
             if($args->component_srl) {
@@ -193,10 +115,18 @@
             }
         }
 
+        function procIssuetrackerAdminModifyDisplayOption()
+        {
+            $args = Context::getRequestVars();
+            
+            $oModuleController = &getController('module');
+            $module_config->display_option = explode('|@|', $args->displayopts);
+            $oModuleController->insertModulePartConfig('issuetracker',$args->module_srl,$module_config);
+        }
+        
         function procIssuetrackerAdminInsertPriority()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
             if($args->is_default=='Y') executeQuery('issuetracker.clearPrioritiesDefault',$args);
 
             if($args->priority_srl) {
@@ -243,7 +173,6 @@
         function procIssuetrackerAdminInsertPackage()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
 
             if(!$args->package_srl)
             {
@@ -259,7 +188,6 @@
         function procIssuetrackerAdminInsertRelease()
         {
             $args = Context::getRequestVars();
-            $args->module_srl = $this->module_srl;
 
             if(!$args->release_srl)
             {
@@ -350,108 +278,6 @@
             return $oFileController->deleteFile($file_srl);
         }
 
-        function procIssuetrackerAdminInsertGrant() {
-            $module_srl = Context::get('module_srl');
-
-            // 현 모듈의 권한 목록을 가져옴
-            $grant_list = $this->xml_info->grant;
-
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_srl, $grants);
-
-            $this->add('module_srl',Context::get('module_srl'));
-            $this->setMessage('success_registed');
-        }
-
-        function procIssuetrackerAdminUpdateSkinInfo() {
-            // module_srl에 해당하는 정보들을 가져오기
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            $skin = $module_info->skin;
-
-            // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($module_info->{$vars->name});
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) {
-                        $obj->{$vars->name} = $module_info->{$vars->name};
-                        continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    unset($obj->{$vars->name});
-                    $obj->{$vars->name} = $filename;
-                }
-            }
-
-            // serialize하여 저장
-            $skin_vars = serialize($obj);
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleSkinVars($module_srl, $skin_vars);
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
         function procIssuetrackerAdminManageCheckedIssue() {
             $module_srl = Context::get('module_srl');
             $cart = Context::get('cart');
diff --git a/modules/issuetracker/issuetracker.admin.view.php b/modules/issuetracker/issuetracker.admin.view.php
index 95a1684bb..d52a8e7a6 100644
--- a/modules/issuetracker/issuetracker.admin.view.php
+++ b/modules/issuetracker/issuetracker.admin.view.php
@@ -172,6 +172,22 @@
             // milestone
             $milestone_list = $oIssuetrackerModel->getList($module_srl, "Milestones");
             Context::set('milestone_list', $milestone_list);
+            
+            // display option
+            $oModuleModel = &getModel('module');
+            $module_config = $oModuleModel->getModulePartConfig('issuetracker',$this->module_srl);
+            if($module_config) $this->default_enable = $module_config->display_option;
+
+            // 템플릿에서 사용할 노출옵션 세팅
+            foreach($this->display_option as $opt) {
+                $obj = null;
+                $obj->title = Context::getLang($opt);
+                $checked = Context::get('d_'.$opt);
+                if($opt == 'title' || $checked==1 || (Context::get('d')!=1&&in_array($opt,$this->default_enable))) $obj->checked = true;
+                $display_option[$opt] = $obj;
+            }
+            
+            Context::set('display_option', $display_option);
 
             // type
             $type_list = $oIssuetrackerModel->getList($module_srl, "Types");
@@ -200,27 +216,7 @@
         }
 
         function dispIssuetrackerAdminProjectInfo() {
-
-            // module_srl 값이 없다면 그냥 index 페이지를 보여줌
-            if(!Context::get('module_srl')) return $this->dispIssuetrackerAdminContent();
-
-            // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
-            if($this->module_info->layout_srl) {
-                $oLayoutModel = &getModel('layout');
-                $layout_info = $oLayoutModel->getLayout($this->module_info->layout_srl);
-                $this->module_info->layout = $layout_info->layout;
-                $this->module_info->layout_title = $layout_info->layout_title;
-            }
-
-            // 정해진 스킨이 있으면 해당 스킨의 정보를 구함
-            if($this->module_info->skin) {
-                $oModuleModel = &getModel('module');
-                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->module_info->skin);
-                $this->module_info->skin_title = $skin_info->title;
-            }
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('project_info');
+            $this->dispIssuetrackerAdminInsertProject();
         }
 
         function dispIssuetrackerAdminAdditionSetup() {
@@ -240,49 +236,14 @@
          * @brief 권한 목록 출력
          **/
         function dispIssuetrackerAdminGrantInfo() {
-            // module_srl을 구함
-            $module_srl = Context::get('module_srl');
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
 
             $this->setTemplateFile('grant_list');
         }
 
-        /**
-         * @brief 스킨 정보 보여줌
-         **/
-        function dispIssuetrackerAdminSkinInfo() {
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $module_info = Context::get('module_info');
-            $skin = $module_info->skin;
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $group = $val->group;
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $module_info->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
-            $this->setTemplateFile('skin_info');
-        }
-
         /**
          * @brief 이슈트래커 삭제 화면 출력
          **/
@@ -336,5 +297,29 @@
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('checked_list');
         }
+
+        /**
+         * @brief 확장 변수 설정
+         **/
+        function dispIssuetrackerAdminExtraVars() {
+            $oDocumentModel = &getModel('document');
+            $extra_vars_content = $oDocumentModel->getExtraVarsHTML($this->module_info->module_srl);
+            Context::set('extra_vars_content', $extra_vars_content);
+
+            $this->setTemplateFile('extra_vars');
+        }
+
+        /**
+         * @brief 스킨 정보 보여줌
+         **/
+        function dispIssuetrackerAdminSkinInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
+
+            $this->setTemplateFile('skin_info');
+        }
+
     }
 ?>
diff --git a/modules/issuetracker/issuetracker.class.php b/modules/issuetracker/issuetracker.class.php
index 294a336e2..dd9eac213 100644
--- a/modules/issuetracker/issuetracker.class.php
+++ b/modules/issuetracker/issuetracker.class.php
@@ -18,39 +18,10 @@
 
         function moduleInstall() 
         {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerViewMilestone');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerViewSource');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerViewIssue');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerNewIssue');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerDeleteIssue');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerDeleteTrackback');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerDownload');
-
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminContent');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminProjectSetting');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminReleaseSetting');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminAdditionSetup');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminGrantInfo');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminSkinInfo');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminInsertProject');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminDeleteIssuetracker');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminProjectInfo');
-
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyMilestone');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyPriority');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyType');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyComponent');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyPackage');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminModifyRelease');
-            $oModuleController->insertActionForward('issuetracker', 'view', 'dispIssuetrackerAdminAttachRelease');
-
-            $oModuleController->insertActionForward('issuetracker', 'controller', 'procIssuetrackerAdminAttachRelease');
-
             // 아이디 클릭시 나타나는 팝업메뉴에 작성글 보기 기능 추가
+            $oModuleController = &getController('module');
             $oModuleController->insertTrigger('member.getMemberMenu', 'issuetracker', 'controller', 'triggerMemberMenu', 'after');
-
+            $oModuleController->insertTrigger('document.deleteDocument', 'issuetracker', 'controller', 'triggerDeleteDocument', 'after');
 
             $oDB = &DB::getInstance();
             $oDB->addIndex("issue_changesets","idx_unique_revision", array("module_srl","revision"), true);
@@ -61,6 +32,7 @@
             $oModuleModel = &getModel('module');
             // 아이디 클릭시 나타나는 팝업메뉴에 작성글 보기 기능 추가
             if(!$oModuleModel->getTrigger('member.getMemberMenu', 'issuetracker', 'controller', 'triggerMemberMenu', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'issuetracker', 'controller', 'triggerDeleteDocument', 'after')) return true;
             return false;
         }
 
@@ -71,7 +43,8 @@
             // 아이디 클릭시 나타나는 팝업메뉴에 작성글 보기 기능 추가
             if(!$oModuleModel->getTrigger('member.getMemberMenu', 'issuetracker', 'controller', 'triggerMemberMenu', 'after'))
                 $oModuleController->insertTrigger('member.getMemberMenu', 'issuetracker', 'controller', 'triggerMemberMenu', 'after');
-
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'issuetracker', 'controller', 'triggerDeleteDocument', 'after')) 
+                $oModuleController->insertTrigger('document.deleteDocument', 'issuetracker', 'controller', 'triggerDeleteDocument', 'after');
             return new Object(0, 'success_updated');
         }
     }
diff --git a/modules/issuetracker/issuetracker.controller.php b/modules/issuetracker/issuetracker.controller.php
index cdde83e61..fd7f12cb6 100644
--- a/modules/issuetracker/issuetracker.controller.php
+++ b/modules/issuetracker/issuetracker.controller.php
@@ -13,6 +13,7 @@
         function init() {
         }
 
+
         function procIssuetrackerInsertIssue() {
             // 권한 체크
             if(!$this->grant->ticket_write) return new Object(-1, 'msg_not_permitted');
@@ -28,6 +29,17 @@
                 unset($obj->title_color);
                 unset($obj->title_bold);
             }
+            // 커미터가 아니라면 마일스톤(계획), 우선순위, 소유자 설정 제거
+            // (이슈 상태는 여기서 건드릴수없음 / 종류, 컴포넌트, 패키지 설정은 ticket_write권한이면 가능)
+            if(!$this->grant->commiter) {
+                unset($obj->assignee_srl);
+                unset($obj->milestone_srl);
+                unset($obj->priority_srl);
+            }
+            if($obj->release_srl)
+            {
+                $obj->occured_version_srl = $obj->release_srl;
+            }
 
             if($obj->occured_version_srl == 0)
             {
@@ -52,11 +64,16 @@
 
             // 그렇지 않으면 신규 등록
             } else {
+            	// assignee name
+            	$oMemberModel = &getModel('member');
+                $member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->assignee_srl);
+                $obj->assignee_name = $member_info->nick_name;
+                
                 // transaction start
                 $oDB = &DB::getInstance();
                 $oDB->begin();
 
-                $output = executeQuery("issuetracker.insertIssue", $obj); 
+                $output = executeQuery("issuetracker.insertIssue", $obj);
                 if(!$output->toBool()) {
                     $oDB->rollback();
                     return $output;
@@ -116,8 +133,6 @@
             if(!$output->toBool()) return $output;
 
             // 이슈 삭제
-            $args->target_srl = $document_srl;
-            $output = executeQuery('issuetracker.deleteIssue', $args);
 
             // 성공 메세지 등록
             $this->add('mid', Context::get('mid'));
@@ -125,6 +140,17 @@
             $this->setMessage('success_deleted');
         }
 
+        function triggerDeleteDocument(&$obj)
+        {
+            $args->target_srl = $obj->document_srl;
+            if(!$args->target_srl) return new Object();
+            $output = executeQuery('issuetracker.deleteIssue', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('issuetracker.deleteHistories', $args);
+            return $output; 
+        }
+
         function insertHistory($target_srl, $objs, $module_srl, $grant)
         {
             $oIssuetrackerModel = &getModel('issuetracker');
@@ -399,6 +425,7 @@
 
         function syncChangeset($module_info)
         {
+            if(!$module_info->svn_url || !$module_info->svn_cmd) return;
             require_once($this->module_path.'classes/svn.class.php');
             $oSvn = new Svn($module_info->svn_url, $module_info->svn_cmd, $module_info->diff_cmd, $module_info->svn_userid, $module_info->svn_passwd);
             $oModel = &getModel('issuetracker');
diff --git a/modules/issuetracker/issuetracker.item.php b/modules/issuetracker/issuetracker.item.php
index 3922d87cd..f5c114252 100644
--- a/modules/issuetracker/issuetracker.item.php
+++ b/modules/issuetracker/issuetracker.item.php
@@ -86,7 +86,6 @@
         }
 
         function _loadFromDB() {
-            if(!$this->document_srl) return;
             parent::_loadFromDB();
 
             $obj->target_srl = $this->document_srl;
diff --git a/modules/issuetracker/issuetracker.model.php b/modules/issuetracker/issuetracker.model.php
index 5c46fd151..d107f90a9 100644
--- a/modules/issuetracker/issuetracker.model.php
+++ b/modules/issuetracker/issuetracker.model.php
@@ -17,8 +17,7 @@
     class issuetrackerModel extends issuetracker {
         var $oSvn = null;
 
-        function init()
-        {
+        function init() {
         }
 
         function &getProjectInfo($module_srl) {
@@ -96,7 +95,11 @@
                         break;
                     default :
                             preg_match('/^extra_vars([0-9]+)$/',$args->search_target,$matches);
-                            if($matches[1]) $args->{"s_extra_vars".$matches[1]} = $args->search_keyword;
+                            if($matches[1]) {
+                                $query_id = 'issuetracker.getIssueListWithExtraVars';
+                                $args->var_idx = $matches[1];
+                                $args->var_value = str_replace(' ','%',$args->search_keyword);
+                            }
                         break;
                 }
             }
@@ -353,11 +356,9 @@
             return $release;
         }
 
-        function getGroupMembers($group_srls) {
-            if(!$group_srls) return;
-            if(!is_array($group_srls)) $group_srls = array($group_srls);
-
-            $args->group_srls = implode(',',$group_srls);
+        function getGroupMembers($module_srl, $grant_name) {
+            $args->module_srl = $module_srl;
+            $args->name = $grant_name;
             $output = executeQueryArray('issuetracker.getGroupMembers', $args);
             return $output->data;
         }
@@ -383,7 +384,7 @@
         }
 
 
-        function getChangesets($module_srl, $enddate = null, $limit = 10)
+        function getChangesets($module_srl, $enddate = null, $limit = 10, $targets)
         {
             if(!$enddate)
             {
@@ -392,11 +393,13 @@
             $args->enddate = date("Ymd", ztime($enddate)+24*60*60);
             $args->startdate = date("Ymd", ztime($enddate)-24*60*60*$limit);
             $args->module_srl = $module_srl;
-            $output = executeQueryArray("issuetracker.getChangesets", $args);
-            if(!$output->toBool())
+            if(in_array('commit', $targets))
             {
-                debugPrint($output);
-                return array();
+                $output = executeQueryArray("issuetracker.getChangesets", $args);
+                if(!$output->toBool())
+                {
+                    return array();
+                }
             }
             if(!$output->data)
             {
@@ -407,46 +410,52 @@
                 $changeset->message = $this->_linkXE($changeset->message);
             }
 
-            $solvedHistory = array();
-            $output2 = executeQueryArray("issuetracker.getHistories", $args);
-            if(count($output2->data)) {
-                foreach($output2->data as $history)
-                {
-                    $hist = unserialize($history->history);
-                    $h = array();
-                    if(!is_array($hist)) continue;
-                    $res = "";
-                    $bFirst = true;
-                    foreach($hist as $key => $val) {
-                        if($bFirst) { $bFirst = false; }
-                        else { $res .= "<br />"; }
-                        if($val[0]) $str = Context::getLang('history_format');
-                        else $str = Context::getLang('history_format_not_source');
-                        $str = str_replace('[source]', $val[0], $str);
-                        $str = str_replace('[target]', $val[1], $str);
-                        $str = str_replace('[key]', Context::getLang($key), $str);
-                        $res .= $str;
+            if(in_array('issue_changed', $targets))
+            {
+                $solvedHistory = array();
+                $output2 = executeQueryArray("issuetracker.getHistories", $args);
+                if(count($output2->data)) {
+                    foreach($output2->data as $history)
+                    {
+                        $hist = unserialize($history->history);
+                        $h = array();
+                        if(!is_array($hist)) continue;
+                        $res = "";
+                        $bFirst = true;
+                        foreach($hist as $key => $val) {
+                            if($bFirst) { $bFirst = false; }
+                            else { $res .= "<br />"; }
+                            if($val[0]) $str = Context::getLang('history_format');
+                            else $str = Context::getLang('history_format_not_source');
+                            $str = str_replace('[source]', $val[0], $str);
+                            $str = str_replace('[target]', $val[1], $str);
+                            $str = str_replace('[key]', Context::getLang($key), $str);
+                            $res .= $str;
+                        }
+                        $obj = null;
+                        $obj->date = $history->regdate;
+                        $obj->type = "changed";
+                        $obj->message = $res;
+                        $obj->target_srl = $history->target_srl;
+                        $obj->author = $history->nick_name;
+                        $output->data[] = $obj;
                     }
-                    $obj = null;
-                    $obj->date = $history->regdate;
-                    $obj->type = "changed";
-                    $obj->message = $res;
-                    $obj->target_srl = $history->target_srl;
-                    $obj->author = $history->nick_name;
-                    $output->data[] = $obj;
                 }
             }
 
-            $output2 = executeQueryArray("issuetracker.getDocumentListForChangeset", $args);
-            if(count($output2->data)) {
-                foreach($output2->data as $history)
-                {
-                    $obj = null;
-                    $obj->date = $history->regdate;
-                    $obj->type = "created";
-                    $obj->author = $history->nick_name;
-                    $obj->target_srl = $history->document_srl;
-                    $output->data[] = $obj;
+            if(in_array('issue_created', $targets))
+            {
+                $output2 = executeQueryArray("issuetracker.getDocumentListForChangeset", $args);
+                if(count($output2->data)) {
+                    foreach($output2->data as $history)
+                    {
+                        $obj = null;
+                        $obj->date = $history->regdate;
+                        $obj->type = "created";
+                        $obj->author = $history->nick_name;
+                        $obj->target_srl = $history->document_srl;
+                        $output->data[] = $obj;
+                    }
                 }
             }
 
diff --git a/modules/issuetracker/issuetracker.view.php b/modules/issuetracker/issuetracker.view.php
index 21e19f67b..def1f9385 100644
--- a/modules/issuetracker/issuetracker.view.php
+++ b/modules/issuetracker/issuetracker.view.php
@@ -36,33 +36,31 @@
 
             $this->setTemplatePath($template_path);
 
-            // 권한에 따른 메뉴 제한
-            if(!$this->grant->access) {
-                $this->grant->ticket_view = $this->grant->ticket_write = $this->grant->timeline = $this->grant->browser_source = $this->grant->download = 0;
-                unset($GLOBALS['lang']->project_menus);
-            } else {
-                if(!$this->grant->ticket_view) unset($GLOBALS['lang']->project_menus['dispIssuetrackerViewIssue']);
-                if(!$this->grant->ticket_write) unset($GLOBALS['lang']->project_menus['dispIssuetrackerNewIssue']);
-                if(!$this->grant->timeline) unset($GLOBALS['lang']->project_menus['dispIssuetrackerTimeline']);
-                if(!$this->grant->browser_source) unset($GLOBALS['lang']->project_menus['dispIssuetrackerViewSource']);
-                if(!$this->grant->download) unset($GLOBALS['lang']->project_menus['dispIssuetrackerDownload']);
-            }
+            if(!$this->grant->ticket_view) unset($GLOBALS['lang']->project_menus['dispIssuetrackerViewIssue']);
+            if(!$this->grant->ticket_write) unset($GLOBALS['lang']->project_menus['dispIssuetrackerNewIssue']);
+            if(!$this->grant->timeline) unset($GLOBALS['lang']->project_menus['dispIssuetrackerTimeline']);
+            if(!$this->grant->browser_source) unset($GLOBALS['lang']->project_menus['dispIssuetrackerViewSource']);
+            if(!$this->grant->download) unset($GLOBALS['lang']->project_menus['dispIssuetrackerDownload']);
             if(!$this->grant->manager) unset($GLOBALS['lang']->project_menus['dispIssuetrackerAdminProjectSetting']);
 
             // 템플릿에서 사용할 검색옵션 세팅 (검색옵션 key값은 미리 선언되어 있는데 이에 대한 언어별 변경을 함)
-            $search_option = array();
-            foreach($this->search_option as $opt) {
-                $search_option[$opt] = Context::getLang($opt);
-            }
+            foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
+
+            $oDocumentModel = &getModel('document');
+            $extra_keys = $oDocumentModel->getExtraKeys($this->module_srl);
+            Context::set('extra_keys', $extra_keys);
 
             // 모듈정보를 확인하여 확장변수에서도 검색이 설정되어 있는지 확인
-            for($i=1;$i<=20;$i++) {
-                $ex_name = trim($this->module_info->extra_vars[$i]->name);
-                if(!$ex_name) continue;
-
-                if($this->module_info->extra_vars[$i]->search == 'Y') $search_option['extra_vars'.$i] = $ex_name;
+            if(count(Context::get('extra_keys'))) {
+                foreach(Context::get('extra_keys') as $key => $val) {
+                    if($val->search == 'Y') $search_option['extra_vars'.$val->idx] = $val->name;
+                }
             }
             Context::set('search_option', $search_option);
+            
+            $oModuleModel = &getModel('module');
+            $module_config = $oModuleModel->getModulePartConfig('issuetracker',$this->module_srl);
+            if($module_config) $this->default_enable = $module_config->display_option;
 
             // 템플릿에서 사용할 노출옵션 세팅
             foreach($this->display_option as $opt) {
@@ -83,6 +81,10 @@
                     Context::set('act','dispIssuetrackerViewIssue');
                 }
             }
+
+            // javascript, JS 필터 추가
+            Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');
+            Context::addJsFile($this->module_path.'tpl/js/issuetracker.js');
         }
 
         function dispIssuetrackerTimeline() {
@@ -90,7 +92,15 @@
             $oController = &getController('issuetracker');
             $oController->syncChangeset($this->module_info);
             $oModel = &getModel('issuetracker');
-            $changesets = $oModel->getChangesets($this->module_info->module_srl);
+            $duration = Context::get('duration');
+            if(!$duration) $duration = 10;
+            $targets = Context::get('targets');
+            if(!$targets || !is_array($targets) || !count($targets))
+            {
+                $targets = array('issue_created', 'issue_changed', 'commit');
+                Context::set('targets', $targets);
+            }
+            $changesets = $oModel->getChangesets($this->module_info->module_srl, Context::get('enddate'), $duration, $targets);
             Context::set('changesets', $changesets);
             $issues = array();
             foreach($changesets as $changeset)
@@ -212,6 +222,27 @@
 
                         $path_tree = Svn::explodePath($path, true);
                         Context::set('path_tree', $path_tree);
+                        
+                        $file_name = array_pop(array_keys($path_tree));
+                        $file_ext = array_pop(explode(".",$file_name));
+                        $extlist = array(
+                            "document" => array("doc", "pdf", "hwp"),
+                            "image" => array("jpg", "jpeg", "jpe", "gif", "png", "bmp"),
+                            "sound" => array("mp3", "ogg", "wma", "wav"),
+                            "movie" => array("avi", "mpg", "mpeg", "mpe", "wmv", "asf", "asx", "mov", "flv", "swf")
+                        );
+                        
+						foreach($extlist as $key => $exts) {
+							foreach($exts as $s_key => $ext) {
+                                if(!strcasecmp($file_ext, $ext)) {
+                                    $file_type = $key;
+                                    break 2;
+                                }
+                            }
+						}
+
+                        if(!$file_type) $file_type = "code";
+                        Context::set('file_type', $file_type);
 
                         $this->setTemplateFile('source_file_view');
                     break;
@@ -225,6 +256,8 @@
                         $this->setTemplateFile('source_list');
                     break;
             }
+
+            Context::addJsFile($this->module_path.'tpl/js/svn.js');
         }
 
         /**
@@ -273,7 +306,7 @@
 
                 // 목록을 구하기 위한 대상 모듈/ 페이지 수/ 목록 수/ 페이지 목록 수에 대한 옵션 설정
                 $args->page = Context::get('page');
-                $args->list_count = 50;
+                $args->list_count = 20;
                 $args->page_count = 10;
 
                 // issue 검색을 위한 변수 
@@ -298,10 +331,6 @@
                 $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
                 $args->search_keyword = Context::get('search_keyword'); ///< 검색어
 
-                // 커미터 목록 구함
-                $commiters = $oIssuetrackerModel->getGroupMembers($this->module_info->grants['commiter']);
-                Context::set('commiters', $commiters);
-
                 // 일반 글을 구해서 context set
                 $output = $oIssuetrackerModel->getIssueList($args);
                 Context::set('issue_list', $output->data);
@@ -322,12 +351,14 @@
                 // 스킨에서 사용하기 위해 context set
                 Context::set('oIssue', $oIssue);
 
-                // 커미터 목록을 추출
-                $commiters = $oIssuetrackerModel->getGroupMembers($this->module_info->grants['commiter']);
-                Context::set('commiters', $commiters);
+                // javascript 필터 추가
+                Context::addJsFilter($this->module_path.'tpl/filter', 'insert_history.xml');
 
                 $this->setTemplateFile('view_issue');
             }
+
+            // 커미터 목록을 추출
+            Context::set('commiters', $oIssuetrackerModel->getGroupMembers($this->module_info->module_srl,'commiter'));
         }
 
         /**
@@ -359,9 +390,16 @@
 
             // 확장변수처리를 위해 xml_js_filter를 직접 header에 적용
             $oDocumentController = &getController('document');
-            $oDocumentController->addXmlJsFilter($this->module_info);
+            $oDocumentController->addXmlJsFilter($this->module_info->module_srl);
+            if($oIssue->isExists()) Context::set('extra_keys', $oIssue->getExtraVars());
+
+            // javascript 필터 추가
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
 
             $this->setTemplateFile('newissue');
+            
+            // 커미터 목록을 추출
+            Context::set('commiters', $oIssuetrackerModel->getGroupMembers($this->module_info->module_srl,'commiter'));
         }
 
         function dispIssuetrackerDeleteIssue() {
@@ -384,6 +422,9 @@
 
             Context::set('oIssue', $oIssue);
 
+            // javascript 필터 추가
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_issue.xml');
+
             $this->setTemplateFile('delete_form');
         }
 
@@ -441,6 +482,9 @@
 
             Context::set('trackback',$trackback);
 
+            // javascript 필터 추가
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_trackback.xml');
+
             $this->setTemplateFile('delete_trackback');
         }
 
diff --git a/modules/issuetracker/lang/en.lang.php b/modules/issuetracker/lang/en.lang.php
index bcc53821e..64afe9730 100644
--- a/modules/issuetracker/lang/en.lang.php
+++ b/modules/issuetracker/lang/en.lang.php
@@ -41,6 +41,7 @@
      $lang->assignee = 'Assignee';
      $lang->status = 'Status';
      $lang->action = 'Action';
+     $lang->display_option = 'Display Option';
 
      $lang->history_format_not_source = '<span class="key">[key]</span> Modify to <span class="target">[target]</span>';
      $lang->history_format = '<span class="key">[key]</span> Modify from <span class="source">[source]</span> to <span class="target">[target]</span>';
@@ -99,4 +100,11 @@
         'created' => 'created'
     );
     $lang->cmd_manage_issue = 'Manage issues';
+    $lang->msg_changes_from = 'View changes from';
+    $lang->duration = 'Duration';
+    $lang->target_list = array(
+        'issue_created' => 'Created issues',
+        'issue_changed' => 'Changed issues',
+        'commit' => 'Repository checkins'
+        );
 ?>
diff --git a/modules/issuetracker/lang/es.lang.php b/modules/issuetracker/lang/es.lang.php
index 7c5696953..ebe04b237 100644
--- a/modules/issuetracker/lang/es.lang.php
+++ b/modules/issuetracker/lang/es.lang.php
@@ -41,6 +41,7 @@
      $lang->assignee = 'Propietario';
      $lang->status = 'Estado';
      $lang->action = 'Comportamiento';
+     $lang->display_option = 'Display Option';
 
      $lang->history_format_not_source = '<span class="target"> [objetivo] </ span> <span a class="key"> [clave] </ span> Cambiar';
      $lang->history_format = '<span class="source"> [fuente] </ span> <span class="target"> en el [objetivo] </ span> <span a class="key"> [clave] </ span> Cambiar';
@@ -100,4 +101,11 @@
     );
 
     $lang->cmd_manage_issue = 'Cuestiones de gestión';
+    $lang->msg_changes_from = 'View changes from';
+    $lang->duration = 'Duration';
+    $lang->target_list = array(
+        'issue_created' => 'Created issues',
+        'issue_changed' => 'Changed issues',
+        'commit' => 'Repository checkins'
+        );
 ?>
diff --git a/modules/issuetracker/lang/jp.lang.php b/modules/issuetracker/lang/jp.lang.php
index b268ba13f..e22c5c9c8 100644
--- a/modules/issuetracker/lang/jp.lang.php
+++ b/modules/issuetracker/lang/jp.lang.php
@@ -41,6 +41,7 @@
      $lang->assignee = '担当者';
      $lang->status = 'ステータス';
      $lang->action = '動作';
+     $lang->display_option = 'Display Option';
 
      $lang->history_format_not_source = '<span class="target">[target]</span> へ <span class="key">[key]</span> 変更';
      $lang->history_format = '<span class="source">[source]</span> から <span class="target">[target]</span> へ <span class="key">[key]</span> 変更';
@@ -100,4 +101,11 @@
     );
 
     $lang->cmd_manage_issue = 'イシューの管理';
+    $lang->msg_changes_from = 'View changes from';
+    $lang->duration = 'Duration';
+    $lang->target_list = array(
+        'issue_created' => 'Created issues',
+        'issue_changed' => 'Changed issues',
+        'commit' => 'Repository checkins'
+        );
 ?>
diff --git a/modules/issuetracker/lang/ko.lang.php b/modules/issuetracker/lang/ko.lang.php
index bd6d3f3b5..144093a9c 100644
--- a/modules/issuetracker/lang/ko.lang.php
+++ b/modules/issuetracker/lang/ko.lang.php
@@ -41,6 +41,7 @@
      $lang->assignee = '소유자';
      $lang->status = '상태';
      $lang->action = '동작';
+     $lang->display_option = '표시 옵션';
 
      $lang->history_format_not_source = '<span class="target">[target]</span> 으로 <span class="key">[key]</span> 변경';
      $lang->history_format = '<span class="source">[source]</span> 에서 <span class="target">[target]</span> 으로 <span class="key">[key]</span> 변경';
@@ -100,4 +101,11 @@
     );
 
     $lang->cmd_manage_issue = '이슈 관리';
+    $lang->msg_changes_from = '시작 날짜';
+    $lang->duration = '기간';
+    $lang->target_list = array(
+        'issue_created' => '생성된 이슈',
+        'issue_changed' => '변경된 이슈',
+        'commit' => '소스변경'
+        );
 ?>
diff --git a/modules/issuetracker/lang/zh-CN.lang.php b/modules/issuetracker/lang/zh-CN.lang.php
index 4de55aae3..93ef7555f 100644
--- a/modules/issuetracker/lang/zh-CN.lang.php
+++ b/modules/issuetracker/lang/zh-CN.lang.php
@@ -28,9 +28,9 @@
      $lang->diff_cmd = 'DIF应用程序位置';
      $lang->about_diff_cmd = '为比较SVN revision，请输入diff应用程序位置。 (ex: /usr/bin/diff)';
      $lang->svn_userid = 'SVN ID';
-     $lang->about_svn_userid = 'If authentication is necessary, input userid for accessing the SVN repository';
-     $lang->svn_passwd = 'SVN password';
-     $lang->about_svn_passwd = 'If authentication is necessary, input password for accessing the SVN repository';
+     $lang->about_svn_userid = '请输入SVN ID。';
+     $lang->svn_passwd = 'SVN密码';
+     $lang->about_svn_passwd = '请输入SVN密码。';
 
      $lang->issue = '问题';
      $lang->total_issue = '全部问题';
@@ -41,6 +41,7 @@
      $lang->assignee = '所有者';
      $lang->status = '状态';
      $lang->action = '动作';
+     $lang->display_option = '显示选项';
 
      $lang->history_format_not_source = '<span class="key">[key]</span>修改为<span class="target">[target]</span>';
      $lang->history_format = '<span class="key">[key]</span>，从<span class="source">[source]</span>修改为<span class="target">[target]</span>';
@@ -81,7 +82,7 @@
              'dispIssuetrackerViewIssue' => '查看问题',
              'dispIssuetrackerNewIssue' => '提交问题',
              'dispIssuetrackerViewMilestone' => '开发计划',
-             'dispIssuetrackerTimeline' => 'Timeline',
+             'dispIssuetrackerTimeline' => '时间轴',
              'dispIssuetrackerViewSource' => '查看代码',
              'dispIssuetrackerDownload' => '下载',
              'dispIssuetrackerAdminProjectSetting' => '设置',
@@ -95,8 +96,15 @@
     $lang->not_assigned = '没有分配';
     $lang->not_assigned_description = '没被分配的问题目录';
     $lang->timeline_msg = array(
-        'changed' => 'changed',
-        'created' => 'created'
+        'changed' => '修改',
+        'created' => '生成'
     );
-    $lang->cmd_manage_issue = 'Manage issues';
+    $lang->cmd_manage_issue = '问题管理';
+    $lang->msg_changes_from = '开始日期';
+    $lang->duration = '期间';
+    $lang->target_list = array(
+        'issue_created' => '生成的问题',
+        'issue_changed' => '修改过的问题',
+        'commit' => '代码更新'
+        );
 ?>
diff --git a/modules/issuetracker/lang/zh-TW.lang.php b/modules/issuetracker/lang/zh-TW.lang.php
index 2a412dad9..14d923c44 100644
--- a/modules/issuetracker/lang/zh-TW.lang.php
+++ b/modules/issuetracker/lang/zh-TW.lang.php
@@ -1,8 +1,8 @@
 <?php
     /**
-     * @file   zh-TW.lang.php
+     * @file   modules/issuetracker/lang/zh-TW.lang.php
      * @author zero (zero@nzeo.com) 翻譯：royallin
-     * @brief  問題追蹤模組語言
+     * @brief  問題追蹤(Issuetracker)模組語言
      **/
 
      $lang->issuetracker = '問題追蹤';
@@ -12,7 +12,7 @@
      $lang->cmd_view_info = '專案資訊';
      $lang->cmd_project_setting = '專案設置';
      $lang->cmd_release_setting = '發佈設置';
-     $lang->cmd_insert_package = '新增套裝包';
+     $lang->cmd_insert_package = '新增套裝軟體';
      $lang->cmd_insert_release = '新增發佈版';
      $lang->cmd_attach_file = '新增附加檔案';
      $lang->cmd_display_item = '顯示專案';
@@ -24,9 +24,9 @@
      $lang->svn_url = 'SVN位址';
      $lang->about_svn_url = '請輸入專案的 SVN 位址。';
      $lang->svn_cmd = 'SVN應用程式位置';
-     $lang->about_svn_cmd = '請輸入 SVN Client 應用程式位置。(ex: /usr/bin/svn)';
+     $lang->about_svn_cmd = '請輸入 SVN Client 應用程式位置。(例: /usr/bin/svn)';
      $lang->diff_cmd = 'DIFF應用程式位置';
-     $lang->about_diff_cmd = '為了比較 SVN 版本，請輸入 diff 應用程式位置。 (ex: /usr/bin/diff)';
+     $lang->about_diff_cmd = '為了比較 SVN 版本，請輸入 diff 應用程式位置。 (例: /usr/bin/diff)';
      $lang->svn_userid = 'SVN帳號';
      $lang->about_svn_userid = '必須要驗證時，請輸入帳號來登入 SVN 檔案庫';
      $lang->svn_passwd = 'SVN密碼';
@@ -41,6 +41,7 @@
      $lang->assignee = '所有者';
      $lang->status = '狀態';
      $lang->action = '動作';
+     $lang->display_option = '顯示選項';
 
      $lang->history_format_not_source = '<span class="key">[key]</span>修改為<span class="target">[target]</span>';
      $lang->history_format = '<span class="key">[key]</span>，從<span class="source">[source]</span>修改為<span class="target">[target]</span>';
@@ -52,7 +53,7 @@
      $lang->complete = '完成';
      $lang->completed_date = '結束日期';
      $lang->order = '順序';
-     $lang->package = $lang->package_srl = '套裝包';
+     $lang->package = $lang->package_srl = '套裝軟體';
      $lang->release = $lang->release_srl = '發佈版';
      $lang->release_note = '發佈記錄';
      $lang->release_changes = '更新日誌';
@@ -91,12 +92,20 @@
     $lang->msg_attached = '檔案已新增。';
     $lang->msg_no_releases = '尚未被新增的發佈版本。';
 
-    $lang->cmd_document_do = '將此問題.. ';
+    $lang->cmd_document_do = '將此問題...';
     $lang->not_assigned = '尚未分配';
     $lang->not_assigned_description = '尚未被分配的問題清單';
     $lang->timeline_msg = array(
-        'changed' => 'changed',
-        'created' => 'created'
+        'changed' => '變更',
+        'created' => '建立'
     );
-    $lang->cmd_manage_issue = 'Manage issues';
+
+    $lang->cmd_manage_issue = '問題管理';
+    $lang->msg_changes_from = 'View changes from';
+    $lang->duration = 'Duration';
+    $lang->target_list = array(
+        'issue_created' => '建立問題',
+        'issue_changed' => '變更問題',
+        'commit' => 'Repository checkins'
+        );
 ?>
diff --git a/modules/issuetracker/queries/deleteHistories.xml b/modules/issuetracker/queries/deleteHistories.xml
new file mode 100644
index 000000000..64f4dcd3f
--- /dev/null
+++ b/modules/issuetracker/queries/deleteHistories.xml
@@ -0,0 +1,8 @@
+<query id="deleteHistories" action="delete">
+    <tables>
+        <table name="issues_history" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="target_srl" var="target_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/issuetracker/queries/getDocumentList.xml b/modules/issuetracker/queries/getDocumentList.xml
index 73014421b..ccce16485 100644
--- a/modules/issuetracker/queries/getDocumentList.xml
+++ b/modules/issuetracker/queries/getDocumentList.xml
@@ -33,26 +33,6 @@
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
             <condition operation="like_prefix" column="last_update" var="s_last_update" pipe="or" />
             <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
-            <condition operation="like" column="extra_vars1" var="s_extra_vars1" pipe="or" />
-            <condition operation="like" column="extra_vars2" var="s_extra_vars2" pipe="or" />
-            <condition operation="like" column="extra_vars3" var="s_extra_vars3" pipe="or" />
-            <condition operation="like" column="extra_vars4" var="s_extra_vars4" pipe="or" />
-            <condition operation="like" column="extra_vars5" var="s_extra_vars5" pipe="or" />
-            <condition operation="like" column="extra_vars6" var="s_extra_vars6" pipe="or" />
-            <condition operation="like" column="extra_vars7" var="s_extra_vars7" pipe="or" />
-            <condition operation="like" column="extra_vars8" var="s_extra_vars8" pipe="or" />
-            <condition operation="like" column="extra_vars9" var="s_extra_vars9" pipe="or" />
-            <condition operation="like" column="extra_vars10" var="s_extra_vars10" pipe="or" />
-            <condition operation="like" column="extra_vars11" var="s_extra_vars11" pipe="or" />
-            <condition operation="like" column="extra_vars12" var="s_extra_vars12" pipe="or" />
-            <condition operation="like" column="extra_vars13" var="s_extra_vars13" pipe="or" />
-            <condition operation="like" column="extra_vars14" var="s_extra_vars14" pipe="or" />
-            <condition operation="like" column="extra_vars15" var="s_extra_vars15" pipe="or" />
-            <condition operation="like" column="extra_vars16" var="s_extra_vars16" pipe="or" />
-            <condition operation="like" column="extra_vars17" var="s_extra_vars17" pipe="or" />
-            <condition operation="like" column="extra_vars18" var="s_extra_vars18" pipe="or" />
-            <condition operation="like" column="extra_vars19" var="s_extra_vars19" pipe="or" />
-            <condition operation="like" column="extra_vars20" var="s_extra_vars20" pipe="or" />
         </group>
         <group pipe="and">
             <condition operation="more" column="last_update" var="start_date" pipe="and" />
diff --git a/modules/issuetracker/queries/getGroupMembers.xml b/modules/issuetracker/queries/getGroupMembers.xml
index a832ac2df..a5cb132d7 100644
--- a/modules/issuetracker/queries/getGroupMembers.xml
+++ b/modules/issuetracker/queries/getGroupMembers.xml
@@ -1,13 +1,16 @@
 <query id="getGroupMembers" action="select">
     <tables>
+        <table name="module_grants" alias="module_grants"/>
+        <table name="member_group_member" alias="member_group_member"/>
         <table name="member" alias="member"/>
-        <table name="member_group_member" alias="group_member"/>
     </tables>
     <columns>
         <column name="member.*" />
     </columns>
     <conditions>
-        <condition operation="in" column="group_member.group_srl" var="group_srls" />
-        <condition operation="equal" column="group_member.member_srl" var="member.member_srl" pipe="and" />
+        <condition operation="equal" column="module_grants.module_srl" var="module_srl" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="module_grants.name" var="name" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="member_group_member.group_srl" default="module_grants.group_srl" notnull="notnull" pipe="and"/>
+        <condition operation="equal" column="member.member_srl" default="member_group_member.member_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/issuetracker/queries/getIssueList.xml b/modules/issuetracker/queries/getIssueList.xml
index 684f56363..8a7e98860 100644
--- a/modules/issuetracker/queries/getIssueList.xml
+++ b/modules/issuetracker/queries/getIssueList.xml
@@ -25,26 +25,6 @@
             <condition operation="like" column="documents.user_id" var="s_user_id" pipe="or" />
             <condition operation="like" column="documents.user_name" var="s_user_name" pipe="or" />
             <condition operation="like" column="documents.nick_name" var="s_nick_name" pipe="or" />
-            <condition operation="like" column="documents.extra_vars1" var="s_extra_vars1" pipe="or" />
-            <condition operation="like" column="documents.extra_vars2" var="s_extra_vars2" pipe="or" />
-            <condition operation="like" column="documents.extra_vars3" var="s_extra_vars3" pipe="or" />
-            <condition operation="like" column="documents.extra_vars4" var="s_extra_vars4" pipe="or" />
-            <condition operation="like" column="documents.extra_vars5" var="s_extra_vars5" pipe="or" />
-            <condition operation="like" column="documents.extra_vars6" var="s_extra_vars6" pipe="or" />
-            <condition operation="like" column="documents.extra_vars7" var="s_extra_vars7" pipe="or" />
-            <condition operation="like" column="documents.extra_vars8" var="s_extra_vars8" pipe="or" />
-            <condition operation="like" column="documents.extra_vars9" var="s_extra_vars9" pipe="or" />
-            <condition operation="like" column="documents.extra_vars10" var="s_extra_vars10" pipe="or" />
-            <condition operation="like" column="documents.extra_vars11" var="s_extra_vars11" pipe="or" />
-            <condition operation="like" column="documents.extra_vars12" var="s_extra_vars12" pipe="or" />
-            <condition operation="like" column="documents.extra_vars13" var="s_extra_vars13" pipe="or" />
-            <condition operation="like" column="documents.extra_vars14" var="s_extra_vars14" pipe="or" />
-            <condition operation="like" column="documents.extra_vars15" var="s_extra_vars15" pipe="or" />
-            <condition operation="like" column="documents.extra_vars16" var="s_extra_vars16" pipe="or" />
-            <condition operation="like" column="documents.extra_vars17" var="s_extra_vars17" pipe="or" />
-            <condition operation="like" column="documents.extra_vars18" var="s_extra_vars18" pipe="or" />
-            <condition operation="like" column="documents.extra_vars19" var="s_extra_vars19" pipe="or" />
-            <condition operation="like" column="documents.extra_vars20" var="s_extra_vars20" pipe="or" />
         </group>
     </conditions>
     <navigation>
diff --git a/modules/issuetracker/queries/getIssueListWithExtraVars.xml b/modules/issuetracker/queries/getIssueListWithExtraVars.xml
new file mode 100644
index 000000000..ba10c631a
--- /dev/null
+++ b/modules/issuetracker/queries/getIssueListWithExtraVars.xml
@@ -0,0 +1,41 @@
+<query id="getIssueListWithExtraVars" action="select">
+    <tables>
+        <table name="documents" alias="documents" />
+        <table name="issues" alias="issues" />
+        <table name="document_extra_vars" alias="extra_vars" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="documents.module_srl" var="module_srl" filter="number" />
+        <condition operation="less" column="documents.update_order" default="2100000000" pipe="and" />
+        <condition operation="equal" column="issues.target_srl" default="documents.document_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
+        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="issues.milestone_srl" var="milestone_srl" pipe="and" />
+        <condition operation="equal" column="issues.priority_srl" var="priority_srl" pipe="and" />
+        <condition operation="equal" column="issues.type_srl" var="type_srl" pipe="and" />
+        <condition operation="equal" column="issues.component_srl" var="component_srl" pipe="and" />
+        <condition operation="in" column="issues.status" var="status" pipe="and" />
+        <condition operation="equal" column="issues.occured_version_srl" var="occured_version_srl" pipe="and" />
+        <condition operation="equal" column="issues.resolution_srl" var="resolution_srl" pipe="and" />
+        <condition operation="equal" column="issues.assignee_srl" var="assignee_srl" pipe="and" />
+        <condition operation="equal" column="extra_vars.var_idx" var="var_idx" notnull="notnull" pipe="and" />
+        <condition operation="like" column="extra_vars.value" var="var_value" pipe="and" notnull="notnull" />
+        <group pipe="and">
+            <condition operation="like" column="documents.title" var="s_title" pipe="or" />
+            <condition operation="like" column="documents.content" var="s_content" pipe="or" />
+            <condition operation="like" column="documents.user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="documents.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="documents.nick_name" var="s_nick_name" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="documents.update_order" order="asc" />
+        <list_count var="list_count" default="50" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/issuetracker/queries/insertIssue.xml b/modules/issuetracker/queries/insertIssue.xml
index 0ad2edcf2..821c9200e 100644
--- a/modules/issuetracker/queries/insertIssue.xml
+++ b/modules/issuetracker/queries/insertIssue.xml
@@ -5,6 +5,8 @@
     <columns>
         <column name="target_srl" var="document_srl" notnull="notnull" />
         <column name="module_srl" var="module_srl" notnull="notnull" />
+        <column name="assignee_srl" var="assignee_srl" />
+        <column name="assignee_name" var="assignee_name" />
         <column name="milestone_srl" var="milestone_srl" />
         <column name="priority_srl" var="priority_srl" />
         <column name="type_srl" var="type_srl" />
diff --git a/modules/issuetracker/skins/xe_issuetracker/css/common.css b/modules/issuetracker/skins/xe_issuetracker/css/common.css
index 3ada2b3ea..49e646fa0 100644
--- a/modules/issuetracker/skins/xe_issuetracker/css/common.css
+++ b/modules/issuetracker/skins/xe_issuetracker/css/common.css
@@ -49,9 +49,11 @@ table.issues tbody td.nick_name { text-align:left; }
 table.milestones { width:100%; clear:both; border:0; border-spacing:0; table-layout:fixed; border:1px solid #333333; border-bottom:none; }
 table.milestones thead tr { background:url("../images/tableHeader.gif") repeat left top; height:20px; color:#FFFFFF; }
 table.milestones thead tr th { white-space:nowrap; }
-table.milestones tbody tr.title td { background-color:#EFEFEF; padding:7px; }
+table.milestones tbody tr.title td { background-color:#EFEFEF; height:28px; vertical-align:baseline;}
 table.milestones tbody td { padding:5px; text-align:center; border-bottom:1px solid #EEEEEE; }
-table.milestones tbody td.title { font-weight:bold; text-align:left; font-size:10pt;}
+table.milestones tbody td.title { padding:0; font-weight:bold; text-align:left; font-size:10pt; }
+table.milestones tbody td.title div.progress { width:100px;height:28px;background-color:#DFDFDF; }
+table.milestones tbody td.title div.titlewrap { position:absolute;padding:6px; }
 table.milestones tbody td.title a { text-decoration:none; color:#444444; }
 table.milestones tbody td.deadline { color:#0A6E03; font-family:tahoma; font-size:9pt; white-space:nowrap;}
 table.milestones tbody td.status a { text-decoration:none; font-family:tahoma; font-size:8pt; font-weight:bold;}
@@ -280,3 +282,17 @@ dd span.target { color:#4F86B0; font-weight:bold; }
 dd span.key { color:#888888; font-weight:bold; }
 dt a { color:#373737; text-decoration: none; }
 dt span.closed { text-decoration: line-through; }
+
+.search { float: right; }
+.left { float: left; }
+
+
+/* 확장 변수 폼 */
+.extraVarForm .text { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; }
+.extraVarForm .email_address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarForm .homepage { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
+.extraVarForm .tel { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:40px; margin-right:10px;}
+.extraVarForm .textarea { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:90%; height:80px; font-size:12px;}
+.extraVarForm ul { margin:0; padding:0; list-style:none; }
+.extraVarForm .date { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:100px; }
+.extraVarForm .address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px;  margin-right:10px; width:300px; }
diff --git a/modules/issuetracker/skins/xe_issuetracker/delete_form.html b/modules/issuetracker/skins/xe_issuetracker/delete_form.html
index 83c72cedb..a0cfc9f7a 100644
--- a/modules/issuetracker/skins/xe_issuetracker/delete_form.html
+++ b/modules/issuetracker/skins/xe_issuetracker/delete_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_issue.xml")-->
 <!--#include("header.html")-->
 
 <div class="deleteIssue">
@@ -11,8 +10,8 @@
     <input type="hidden" name="document_srl" value="{$document_srl}" />
 
     <ul class="button">
-        <li><input type="submit" value="{$lang->cmd_delete}" accesskey="s" /></li>
-        <li><input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','dispIssuetrackerViewIssue')}'; return false;" /></li>
+        <li><span class="button"><input type="submit" value="{$lang->cmd_delete}" accesskey="s" /></span></li>
+        <li><span class="button"><input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','dispIssuetrackerViewIssue')}'; return false;" /></span></li>
     </ul>
 
     </form>
diff --git a/modules/issuetracker/skins/xe_issuetracker/delete_trackback.html b/modules/issuetracker/skins/xe_issuetracker/delete_trackback.html
index 847ddd45c..770b1b470 100644
--- a/modules/issuetracker/skins/xe_issuetracker/delete_trackback.html
+++ b/modules/issuetracker/skins/xe_issuetracker/delete_trackback.html
@@ -1,4 +1,3 @@
-<!--%import("filter/delete_trackback.xml")-->
 <!--#include("header.html")-->
 
 <div class="deleteIssue">
diff --git a/modules/issuetracker/skins/xe_issuetracker/extra_var_form.html b/modules/issuetracker/skins/xe_issuetracker/extra_var_form.html
deleted file mode 100644
index 278e29946..000000000
--- a/modules/issuetracker/skins/xe_issuetracker/extra_var_form.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--// 이 파일은 extra_vars의 form을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-
-<!--// type=select,checkbox이고 기본값이 , 로 연결되어 있으면 , 를 기준으로 explode하여 배열로 만든다 -->
-<!--@if(in_array($val->type,array('select','checkbox'))&&strpos($val->default,",")!==false)-->
-    {@ $val->default = explode(',',$val->default) }
-<!--@end-->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oIssue->getExtraValue($key)}
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText wide" />
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText wide" />
-
-<!-- Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="inputTypeText wide" />
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="inputTypeText" /> -
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="inputTypeText" /> -
-    <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="inputTypeText" />
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    <textarea name="{$val->column_name}" class="inputTypeTextArea wide">{htmlspecialchars($val->value)}</textarea>
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if($val->default)-->
-        <ul>
-        <!--@foreach($val->default as $v)-->
-            <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if($v==$val->value||is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/> {$v}</li>
-        <!--@end-->
-        </ul>
-    <!--@end-->
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    <select name="{$val->column_name}">
-    <!--@if($val->default)-->
-        <!--@foreach($val->default as $v)-->
-            <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-        <!--@end-->
-    <!--@end-->
-    </select>
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-
-    <!--// datepicker javascript plugin load -->
-    <!--%load_js_plugin("ui.datepicker")-->
-
-    <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-    <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
-
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-</script>
-
-<!--@end-->
-
-<!--@if($val->desc)-->
-<p>{$val->desc}</p>
-<!--@end-->
diff --git a/modules/issuetracker/skins/xe_issuetracker/extra_var_value.html b/modules/issuetracker/skins/xe_issuetracker/extra_var_value.html
deleted file mode 100644
index 66d6f14a0..000000000
--- a/modules/issuetracker/skins/xe_issuetracker/extra_var_value.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--// 이 파일은 extra_vars의 결과값을 출력하는 파일이며 다른 스킨에서 그대로 가져가서 css만 바꾸어 주면 된다 -->
-
-<!--// 확장변수의 이름을 지정 -->
-{@ $val->column_name = "extra_vars".$key}
-
-<!--// 확장변수의 값을 documentItem::getExtraValue로 가져옴 -->
-{@ $val->value = $oIssue->getExtraValue($key)}
-{@ $_tmp_value = array(); }
-
-<!--// 일반 text -->
-<!--@if($val->type == 'text')--> 
-    {htmlspecialchars($val->value)}
-
-<!--// 홈페이지 주소 -->
-<!--@elseif($val->type == 'homepage')-->
-    <!--@if($val->value)-->
-        <a href="{htmlspecialchars($val->value)}" onclick="window.open(this.href);return false;">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// Email 주소 -->
-<!--@elseif($val->type == 'email_address')-->
-    <!--@if($val->value)-->
-        <a href="mailto:{htmlspecialchars($val->value)}">{$val->value}</a>
-    <!--@else-->
-        &nbsp;
-    <!--@end-->
-
-<!--// 전화번호 -->
-<!--@elseif($val->type == 'tel')-->
-    {htmlspecialchars($val->value[0])} 
-    <!--@if($val->value[1])-->-<!--@end-->
-    {htmlspecialchars($val->value[1])} 
-    <!--@if($val->value[2])-->-<!--@end-->
-    {htmlspecialchars($val->value[2])} 
-    &nbsp;
-
-<!--// textarea -->
-<!--@elseif($val->type == 'textarea')-->
-    {nl2br(htmlspecialchars($val->value))}
-    &nbsp;
-
-<!--// 다중 선택 -->
-<!--@elseif($val->type == 'checkbox')-->
-    <!--@if(!is_array($val->value))-->{@ $val->value = array($val->value) }<!--@end-->
-    <!--@foreach($val->value as $v)-->
-        {@ $_tmp_value[] = htmlspecialchars($v)}
-    <!--@end-->
-    {implode(",",$_tmp_value)}
-    &nbsp;
-
-<!--// 단일 선택 -->
-<!--@elseif($val->type == 'select')-->
-    {htmlspecialchars($val->value)}
-    &nbsp;
-
-<!--// 날짜 입력 -->
-<!--@elseif($val->type == 'date')-->
-    {zdate($val->value,"Y-m-d")}
-    &nbsp;
-<!--@end-->
-
-<!--@if(!$val->value)-->&nbsp;<!--@end-->
diff --git a/modules/issuetracker/skins/xe_issuetracker/header.html b/modules/issuetracker/skins/xe_issuetracker/header.html
index 58a63737f..b78284d84 100644
--- a/modules/issuetracker/skins/xe_issuetracker/header.html
+++ b/modules/issuetracker/skins/xe_issuetracker/header.html
@@ -1,6 +1,3 @@
-<!--// JS 파일 로드 -->
-    <!--%import("js/issuetracker.js")-->
-
 <!--// 컬러셋 체크 -->
     <!--@if(!$module_info->colorset)-->
         {@$module_info->colorset = "white"}
diff --git a/modules/issuetracker/skins/xe_issuetracker/input_password_form.html b/modules/issuetracker/skins/xe_issuetracker/input_password_form.html
index 2dcf436b6..dd21e3258 100644
--- a/modules/issuetracker/skins/xe_issuetracker/input_password_form.html
+++ b/modules/issuetracker/skins/xe_issuetracker/input_password_form.html
@@ -1,4 +1,3 @@
-<!--%import("filter/input_password.xml")-->
 <!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w400">
diff --git a/modules/issuetracker/skins/xe_issuetracker/issue_list.html b/modules/issuetracker/skins/xe_issuetracker/issue_list.html
index f9ab49372..5d7c19183 100644
--- a/modules/issuetracker/skins/xe_issuetracker/issue_list.html
+++ b/modules/issuetracker/skins/xe_issuetracker/issue_list.html
@@ -177,7 +177,7 @@
 
 <!--@if($grant->is_admin)-->
 <div class="fr gap1">
-    <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
+    <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
     <a href="{getUrl('act','dispIssuetrackerAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_issue}</span></a>
 </div>
 <!--@end-->
diff --git a/modules/issuetracker/skins/xe_issuetracker/milestone.html b/modules/issuetracker/skins/xe_issuetracker/milestone.html
index f6d76cc91..0619b2184 100644
--- a/modules/issuetracker/skins/xe_issuetracker/milestone.html
+++ b/modules/issuetracker/skins/xe_issuetracker/milestone.html
@@ -21,7 +21,9 @@
 <!--@end-->
 <tr class="title">
     <td class="title <!--@if($val->is_completed=='Y')-->completed<!--@end-->" colspan="{$col_count}" >
-        <a href="{getUrl('','mid',$mid,'act','dispIssuetrackerViewIssue','milestone_srl', $val->milestone_srl)}">{$val->title}</a>
+    	{@$resolved = $val->issues['resolve'] + $val->issues['postponed'] + $val->issues['duplicated'] + $val->issues['invalid']}
+        <div class="progress" style="width:{$val->issues['total'] ? $resolved/$val->issues['total']*100 : 0}%;" />
+        <div class="titlewrap" style=""><a href="{getUrl('','mid',$mid,'act','dispIssuetrackerViewIssue','milestone_srl', $val->milestone_srl)}">{$val->title}</a></div>
     </td>
 </tr>
 <tr>
diff --git a/modules/issuetracker/skins/xe_issuetracker/newissue.html b/modules/issuetracker/skins/xe_issuetracker/newissue.html
index 895263984..b146903ad 100644
--- a/modules/issuetracker/skins/xe_issuetracker/newissue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/newissue.html
@@ -1,4 +1,3 @@
-<!--%import("filter/insert.xml")-->
 <!--#include("header.html")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, window.insert)" id="fo_write">
@@ -67,6 +66,27 @@
     </tr>
 
     <!--@if(!$oIssue->isExists())-->
+    <!--@if($grant->commiter)-->
+    <th><label for="inputMilestone">{$lang->milestone} :</label></th>
+        <td>
+            <select name="milestone_srl" id="inputMilestone">
+                <option value="0">{$lang->milestone}</option> 
+            <!--@foreach($project->milestones as $val)-->
+                <option value="{$val->milestone_srl}" <!--@if($oIssue->get('milestone_srl')==$val->milestone_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
+            <!--@end-->
+            </select>
+        </td>
+        <th><label for="inputPriority">{$lang->priority} :</label></th>
+        <td>
+            <select name="priority_srl" id="inputPriority">
+                <option value="">{$lang->priority}</option> 
+                <!--@foreach($project->priorities as $key => $val)-->
+                <option value="{$val->priority_srl}" <!--@if($val->priority_srl==$oIssue->get('priority_srl'))-->selected="selected"<!--@end-->>{$val->title}</option> 
+                <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <!--@end-->
     <tr>
         <th><label for="inputType">{$lang->type} :</label></th>
         <td>
@@ -87,24 +107,43 @@
             </select>
         </td>
     </tr>
+    <!--@if($grant->commiter)-->
+    <tr>
+        <th><label for="inputAssignee">{$lang->assignee} :</label></th>
+        <td>
+            <select name="assignee_srl" id="inputAssignee" >
+                <option value="" selected="selected">{$lang->assignee}</option>
+                <!--@foreach($commiters as $key => $val)-->
+                <option value="{$val->member_srl}">{$val->nick_name} ({$val->user_id})</option> 
+                <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <!--@end-->
     <!--@if(count($project->packages))-->
     <tr>
         <th><label for="inputPackage">{$lang->occured_version} :</label></th>
         <td colspan="3">
-            <select name="package_srl" id="inputPackage">
+            <select name="package_srl" id="inputPackage" onchange="showRelease(this,this.form);">
                 <option value="">{$lang->package}</option> 
                 <!--@foreach($project->packages as $key => $val)-->
                 <option value="{$val->package_srl}" <!--@if($val->package_srl==$oIssue->get('package_srl'))-->selected="selected"<!--@end-->>{$val->title}</option> 
                 <!--@end-->
             </select>
-            <select name="occured_version_srl">
+            <select name="release_srl">
                 <option value="">{$lang->release}</option> 
                 <!--@foreach($project->packages as $key => $val)-->
+
+                <!--@if($val->package_srl==$oIssue->get('package_srl'))-->
+
                 <!--@foreach($project->releases as $k => $v)-->
                 <!--@if($val->package_srl == $v->package_srl)-->
                 <option value="{$v->release_srl}" <!--@if($v->release_srl==$oIssue->get('occured_version_srl'))-->selected="selected"<!--@end-->>{$v->title}</option> 
                 <!--@end-->
                 <!--@end-->
+
+                <!--@end-->
+
                 <!--@end-->
             </select>
         </td>
@@ -112,14 +151,12 @@
     <!--@end-->
     <!--@end-->
 
-    <!--@if($module_info->extra_vars)--><!--@foreach($module_info->extra_vars as $key => $val)-->
-        <!--@if($val->name)-->
+    <!--@foreach($extra_keys as $key => $val)-->
     <tr>
         <th><label>{$val->name} <!--@if($val->is_required=='Y')-->*<!--@end--> :</label></th>
-        <td colspan="3"><!--#include("./extra_var_form.html")--></td>
+        <td colspan="3" class="extraVarForm">{$val->getFormHTML()}</td>
     </tr>
-        <!--@end-->
-    <!--@end--><!--@end-->
+    <!--@end-->
 
     <tr>
         <th><label for="inputTags">{$lang->tag} :</label></th>
@@ -172,3 +209,11 @@
 </select>
 <!--@end-->
 </form>
+<script type="text/javascript">
+    package = new Array();
+    <!--@foreach($project->releases as $k => $v)-->
+    if(!package['{$v->package_srl}']) package['{$v->package_srl}'] = new Array();
+    package['{$v->package_srl}'][package['{$v->package_srl}'].length] = new Array('{$v->release_srl}','{$v->title}');
+    <!--@end-->
+</script>
+
diff --git a/modules/issuetracker/skins/xe_issuetracker/skin.xml b/modules/issuetracker/skins/xe_issuetracker/skin.xml
index b23c39f8a..c88a6e699 100644
--- a/modules/issuetracker/skins/xe_issuetracker/skin.xml
+++ b/modules/issuetracker/skins/xe_issuetracker/skin.xml
@@ -2,12 +2,14 @@
 <skin version="0.2">
     <title xml:lang="ko">XE IssueTracker 기본 스킨</title>
     <title xml:lang="jp">XE イシュートラッカー（IssueTracker）デフォルトスキン</title>
-	<title xml:lang="en">Basic Skin of XE IssueTracker</title>
+    <title xml:lang="en">Basic Skin of XE IssueTracker</title>
+    <title xml:lang="es">Cuidado básico de XE IssueTracker</title>
     <title xml:lang="zh-CN">XE IssueTracker默认皮肤</title>
     <title xml:lang="zh-TW">XE 問題追蹤預設面板</title>
     <description xml:lang="ko">XE IssueTracker의 기본 스킨입니다. </description>
     <description xml:lang="jp">XE イシュートラッカー（IssueTracker）デフォルトスキンです。 </description>
-	<description xml:lang="en">This is the basic skin of XE IssueTracker. </description>
+    <description xml:lang="en">This is the basic skin of XE IssueTracker. </description>
+    <description xml:lang="es">Esta es la base de la piel XE IssueTracker. </description>
     <description xml:lang="zh-CN">XE IssueTracker默认皮肤。</description>
     <description xml:lang="zh-TW">XE 問題追蹤預設面板。</description>
     <version>0.1</version>
@@ -16,7 +18,8 @@
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
         <name xml:lang="jp">zero</name>
-		<name xml:lang="en">zero</name>
+	<name xml:lang="en">zero</name>
+	<name xml:lang="es">zero</name>
         <name xml:lang="zh-CN">zero</name>
         <name xml:lang="zh-TW">zero</name>
     </author>
@@ -25,14 +28,16 @@
         <color name="white" src="screenshot/white.gif">
             <title xml:lang="ko">일반</title>
             <title xml:lang="jp">普通</title>
-			<title xml:lang="en">General</title>
+	    <title xml:lang="en">General</title>
+	    <title xml:lang="es">General</title>
             <title xml:lang="zh-CN">普通</title>
             <title xml:lang="zh-TW">普通</title>
         </color>
         <color name="black" src="screenshot/black.gif">
             <title xml:lang="ko">검은색 배경용</title>
             <title xml:lang="jp">黒色の背景</title>
-			<title xml:lang="en">For Black Background</title>
+	    <title xml:lang="en">For Black Background</title>
+	    <title xml:lang="es">Antecedentes de Negro</title>
             <title xml:lang="zh-CN">黑色背景</title>
             <title xml:lang="zh-TW">黑色背景</title>
         </color>
@@ -42,30 +47,35 @@
         <group>
             <title xml:lang="ko">기본 설정</title>
             <title xml:lang="jp">基本設定</title>
-			<title xml:lang="en">Default Settings</title>
+	    <title xml:lang="en">Default Settings</title>
+	    <title xml:lang="es">Configuración predeterminada</title>
             <title xml:lang="zh-CN">默认设置</title>
             <title xml:lang="zh-TW">預設值</title>
             <var name="projectTitle" type="text">
                 <title xml:lang="ko">이슈트래커 제목</title>
                 <title xml:lang="jp">イシュートラッカー（IssueTracker）タイトル</title>
-				<title xml:lang="en">Issue Tracker Name</title>
+		<title xml:lang="en">Issue Tracker Name</title>
+		<title xml:lang="es">Issue Tracker Nombre</title>
                 <title xml:lang="zh-CN">IssueTracker标题</title>
                 <title xml:lang="zh-TW">問題追蹤名稱</title>
                 <description xml:lang="ko">이슈트래커의 상단에 큰 제목으로 표시가 됩니다.</description>
                 <description xml:lang="jp">イシュートラッカー（IssueTracker）の上段に大きくタイトルが表示されます。</description>
-				<description xml:lang="en">It will be displayed on top of the issue tracker.</description>
+		<description xml:lang="en">It will be displayed on top of the issue tracker.</description>
+		<description xml:lang="es">Que se visualizará en la parte superior de la cuestión tracker.</description>
                 <description xml:lang="zh-CN">在IssueTracker顶部大标题显示。</description>
                 <description xml:lang="zh-TW">將顯示在問題追蹤的最頂端。</description>
             </var>
             <var name="projectDescription" type="textarea">
                 <title xml:lang="ko">이슈트래커 설명</title>
                 <title xml:lang="jp">イシュートラッカー（IssueTracker）説明</title>
-				<title xml:lang="en">Description</title>
+		<title xml:lang="en">Description</title>
+		<title xml:lang="es">Descripción</title>
                 <title xml:lang="zh-CN">IssueTracker简要说明</title>
                 <title xml:lang="zh-TW">說明</title>
                 <description xml:lang="ko">입력하시면 이슈트래커의 메인에 설명이 노출됩니다.</description>
                 <description xml:lang="jp">登録するとイシュートラッカー（IssueTracker）のメインに説明が表示されます。</description>
-				<description xml:lang="en">It will be displayed on main of the issue tracker if you input the description.</description>
+		<description xml:lang="en">It will be displayed on main of the issue tracker if you input the description.</description>
+		<description xml:lang="es">Que se mostrará en el tema principal de seguimiento de si la descripción de entrada.</description>
                 <description xml:lang="zh-CN">将在IssueTracker页面中显示。</description>
                 <description xml:lang="zh-TW">會顯示在問題追蹤頁面中。</description>
             </var>
diff --git a/modules/issuetracker/skins/xe_issuetracker/source_file_view.html b/modules/issuetracker/skins/xe_issuetracker/source_file_view.html
index 8bd9ab65e..3c1109088 100644
--- a/modules/issuetracker/skins/xe_issuetracker/source_file_view.html
+++ b/modules/issuetracker/skins/xe_issuetracker/source_file_view.html
@@ -15,6 +15,16 @@
     <!--@end-->
 </ol>
 
-<pre>{htmlspecialchars($content->content)}</pre>
+<pre>
+<!--@if($file_type == "code")-->
+{htmlspecialchars($content->content)}
+<!--@elseif($file_type == "document")-->
+document file
+<!--@elseif($file_type == "image")-->
+image file
+<!--@elseif($file_type == "movie")-->
+movie file
+<!--@end-->
+</pre>
 
 <!--#include("source_footer.html")-->
diff --git a/modules/issuetracker/skins/xe_issuetracker/source_header.html b/modules/issuetracker/skins/xe_issuetracker/source_header.html
index 71197ef51..2940deb45 100644
--- a/modules/issuetracker/skins/xe_issuetracker/source_header.html
+++ b/modules/issuetracker/skins/xe_issuetracker/source_header.html
@@ -1,8 +1,6 @@
 <!--#include("header.html")-->
 
 <!--%import("css/svn.css")-->
-<!--%import("js/svn.js")-->
-
 <div class="sourceBrowser">
 
 <!--@if($path_tree)-->
diff --git a/modules/issuetracker/skins/xe_issuetracker/timeline.html b/modules/issuetracker/skins/xe_issuetracker/timeline.html
index 753a81fe2..2b67bbd52 100644
--- a/modules/issuetracker/skins/xe_issuetracker/timeline.html
+++ b/modules/issuetracker/skins/xe_issuetracker/timeline.html
@@ -1,5 +1,25 @@
 <!--#include('header.html')-->
-<h2> Timeline </h2>
+<!--%load_js_plugin("ui.datepicker")-->
+<div class="left"><h2> Timeline </h2></div>
+<div class="search">
+<form action="{getUrl()}" id="fo_search">
+    <br />
+    <input type="hidden" name="act" value="dispIssuetrackerTimeline" />
+    <input type="hidden" name="mid" value="{$mid}" />
+    {$lang->msg_changes_from}: 
+    <input type="hidden" name="enddate" id="enddate" class="inputTypeText" value="{$enddate}">
+    <input type="text" class="inputDate" value="<!--@if($enddate)-->{zdate($enddate,'Y-m-d')}<!--@end-->" readonly="readonly" />
+    , {$lang->duration}: <input type="text" name="duration" class="inputTypeText w40" value={$duration}>
+    <BR />
+    <!--@foreach($lang->target_list as $key => $val)-->
+    <input name="targets[]" type="checkbox" value="{$key}" <!--@if(in_array($key,$targets))-->checked="checked"<!--@end--> id="targets_{$key}"/><label for="targets_{$key}">{$val}</label>
+    <!--@end-->
+    <a href="#" onclick="xGetElementById('fo_search').submit();return false;" class="button {$btn_class}"><span>{$lang->cmd_update}</span></a>
+
+</form>
+</div>
+<div class="clear"></div>
+
 
 {@ $curDate = null }
 <!--@foreach($changesets as $changeset)-->
@@ -24,3 +44,15 @@
 <p><!--@if($changeset->type)--><!--@if($changeset->type == "changed")--><span class="status">{$changeset->message}</span><br><!--@endif-->{$issues[$changeset->target_srl]->getContentText(80)}<!--@else-->{$changeset->message}<!--@end--></p> </dd>
 <!--@end-->
 </dl>
+<script type="text/javascript">
+(function($){
+    $(function(){
+        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
+
+            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+        };
+        $.extend(option,$.datepicker.regional['{$lang_type}']);
+        $(".inputDate").datepicker(option);
+    });
+})(jQuery);
+</script>
diff --git a/modules/issuetracker/skins/xe_issuetracker/view_issue.html b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
index 6f513ba67..994fef2fd 100644
--- a/modules/issuetracker/skins/xe_issuetracker/view_issue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
@@ -42,15 +42,12 @@
         <td>{$oIssue->getReleaseTitle()}</td>
     </tr>
     <!--@end-->
-
-    <!--@if($module_info->extra_vars)--><!--@foreach($module_info->extra_vars as $key => $val)-->
-        <!--@if($val->name)-->
+    <!--@foreach($oIssue->getExtraVars() as $key => $val)-->
     <tr>
-        <th>{$val->name} :</th>
-        <td colspan="3"><!--#include("./extra_var_value.html")--></td>
+        <th>{$val->name}</th>
+        <td colspan="3">{$val->getValueHTML()}</td>
     </tr>
-        <!--@end-->
-    <!--@end--><!--@end-->
+    <!--@end-->
 
     {@ $tag_list = $oIssue->get('tag_list') }
     <!--@if(count($tag_list))-->
@@ -72,7 +69,6 @@
     <!--@else-->
     <tr>
         <td colspan="4" class="inputPassword">
-            <!--%import("filter/input_password.xml")-->
             <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
             <input type="hidden" name="mid" value="{$mid}" />
             <input type="hidden" name="document_srl" value="{$oIssue->document_srl}" />
@@ -147,7 +143,6 @@
 <!--@end-->
 
 <!--@if($grant->ticket_write || $grant->commiter)-->
-<!--%import("./filter/insert_history.xml")-->
 <div class="newIssue newHistory">
 <form action="./" method="post" onsubmit="return procFilter(this, insert_history)">
 <input type="hidden" name="mid" value="{$mid}" />
diff --git a/modules/issuetracker/tpl/attach_release.html b/modules/issuetracker/tpl/attach_release.html
index 3b16cd3cb..7995655c0 100644
--- a/modules/issuetracker/tpl/attach_release.html
+++ b/modules/issuetracker/tpl/attach_release.html
@@ -11,21 +11,21 @@
 <input type="hidden" name="package_srl" value="{$release->package_srl}" />
 <input type="hidden" name="act" value="procIssuetrackerAdminAttachRelease" />
 
-<table cellspacing="0" class="adminTable">
+<h4 class="xeAdmin">{$release->title}</h4>
+<table cellspacing="0" class="rowTable">
 <thead>
-<caption>{$release->title}</caption>
 <tr>
     <th><div>{$lang->cmd_attach_file}</div></th>
-    <td class="wide"><input type="file" name="file" value="" class="inputTypeTextArea w400" /></td>
+    <td class="wide"><input type="file" name="file" value="" class="inputTypeText" /></td>
 </tr>
 <tr>
     <th><div>{$lang->description}</div></th>
-    <td><textarea name="comment" class="inputTypeTextArea w400" />{$relese->description}</textarea></td>
+    <td><textarea name="comment" class="inputTypeTextArea fullWidth" />{$relese->description}</textarea></td>
 </tr>
 <tr>
-    <td colspan="2">
-        <input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" />
-    </td>
+    <th colspan="2" class="button">
+        <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+    </th>
 </tr>
 </table>
 
diff --git a/modules/issuetracker/tpl/checked_list.html b/modules/issuetracker/tpl/checked_list.html
index 5110d4521..7a9ba7f11 100644
--- a/modules/issuetracker/tpl/checked_list.html
+++ b/modules/issuetracker/tpl/checked_list.html
@@ -1,8 +1,8 @@
 <!--%import("filter/manage_checked_issue.xml")-->
 <!--%import("js/issue_admin.js")-->
 <!--%import("css/issuetracker.css")-->
-<div id="popHeadder">
-    <h3>{$lang->cmd_manage_document}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$lang->cmd_manage_document}</h3>
 </div>
 
 <form action="./" method="get" id="fo_management">
@@ -10,7 +10,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></div></th>
         <td colspan="3">
@@ -71,14 +71,10 @@
     </table>
 </div>
 
+<!--@if(count($document_list))-->
 <div id="popFooter">
-    <div class="tRight gap1">
-        <!--@if(count($document_list))-->
-
-        <a href="#" onclick="doManageIssue();return false;" class="button blue"><span>{$lang->cmd_modify}</span></a>
-        <!--@end-->
-        <a href="#" onclick="window.close(); return false;" class="button black"><span>{$lang->cmd_close}</span></a>
-    </div>
+    <a href="#" onclick="doManageIssue();return false;" class="button black strong"><span>{$lang->cmd_modify}</span></a>
 </div>
+<!--@end-->
 
 </form>
diff --git a/modules/issuetracker/tpl/css/issuetracker.css b/modules/issuetracker/tpl/css/issuetracker.css
index d9f155ead..90ff64515 100644
--- a/modules/issuetracker/tpl/css/issuetracker.css
+++ b/modules/issuetracker/tpl/css/issuetracker.css
@@ -18,6 +18,9 @@ td.summaryText div { line-height:20px; padding-left:20px; cursor:pointer;}
 td.summaryText div.open { background:url("../images/opener.gif") no-repeat left 4px; overflow:visible; }
 td.summaryText div.close { background:url("../images/closer.gif") no-repeat left 4px; height:20px; overflow:hidden; }
 
+ol.displayOpt { margin:0 2px 0 0; padding:0; border-bottom:none; }
+ol.displayOpt li { padding:0 2px; list-style:none; white-space:nowrap; overflow:hidden; float:left; letter-spacing:-2px;}
+
 img.btnDelete { vertical-align:middle; }
 
 td.filename { background-color:#EFEFEF; }
diff --git a/modules/issuetracker/tpl/extra_vars.html b/modules/issuetracker/tpl/extra_vars.html
new file mode 100644
index 000000000..7a45ee47b
--- /dev/null
+++ b/modules/issuetracker/tpl/extra_vars.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$extra_vars_content}
diff --git a/modules/issuetracker/skins/xe_issuetracker/filter/delete_issue.xml b/modules/issuetracker/tpl/filter/delete_issue.xml
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/filter/delete_issue.xml
rename to modules/issuetracker/tpl/filter/delete_issue.xml
diff --git a/modules/issuetracker/skins/xe_issuetracker/filter/delete_trackback.xml b/modules/issuetracker/tpl/filter/delete_trackback.xml
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/filter/delete_trackback.xml
rename to modules/issuetracker/tpl/filter/delete_trackback.xml
diff --git a/modules/issuetracker/skins/xe_issuetracker/filter/input_password.xml b/modules/issuetracker/tpl/filter/input_password.xml
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/filter/input_password.xml
rename to modules/issuetracker/tpl/filter/input_password.xml
diff --git a/modules/issuetracker/skins/xe_issuetracker/filter/insert.xml b/modules/issuetracker/tpl/filter/insert.xml
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/filter/insert.xml
rename to modules/issuetracker/tpl/filter/insert.xml
diff --git a/modules/issuetracker/tpl/filter/insert_grant.xml b/modules/issuetracker/tpl/filter/insert_grant.xml
deleted file mode 100644
index c84295c3d..000000000
--- a/modules/issuetracker/tpl/filter/insert_grant.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<filter name="insert_grant" module="issuetracker" act="procIssuetrackerAdminInsertGrant" confirm_msg_code="confirm_submit">
-    <form>
-        <node target="module_srl" required="true" />
-    </form>
-    <response callback_func="completeInsertGrant">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="page" />
-        <tag name="module_srl" />
-    </response>
-</filter>
diff --git a/modules/issuetracker/skins/xe_issuetracker/filter/insert_history.xml b/modules/issuetracker/tpl/filter/insert_history.xml
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/filter/insert_history.xml
rename to modules/issuetracker/tpl/filter/insert_history.xml
diff --git a/modules/issuetracker/tpl/filter/insert_project.xml b/modules/issuetracker/tpl/filter/insert_project.xml
index 757c44bbd..02759ff75 100644
--- a/modules/issuetracker/tpl/filter/insert_project.xml
+++ b/modules/issuetracker/tpl/filter/insert_project.xml
@@ -12,132 +12,11 @@
         <param name="browser_title" target="browser_title" />
         <param name="is_default" target="is_default" />
         <param name="description" target="description" />
-        <param name="admin_id" target="admin_id" />
         <param name="svn_url" target="svn_url" />
         <param name="svn_cmd" target="svn_cmd" />
         <param name="diff_cmd" target="diff_cmd" />
         <param name="svn_userid" target="svn_userid" />
         <param name="svn_passwd" target="svn_passwd" />
-        <param name="extra_vars_1_name" target="extra_vars_1_name" />
-        <param name="extra_vars_1_type" target="extra_vars_1_type" />
-        <param name="extra_vars_1_is_required" target="extra_vars_1_is_required" />
-        <param name="extra_vars_1_search" target="extra_vars_1_search" />
-        <param name="extra_vars_1_default" target="extra_vars_1_default" />
-        <param name="extra_vars_1_desc" target="extra_vars_1_desc" />
-        <param name="extra_vars_2_name" target="extra_vars_2_name" />
-        <param name="extra_vars_2_type" target="extra_vars_2_type" />
-        <param name="extra_vars_2_is_required" target="extra_vars_2_is_required" />
-        <param name="extra_vars_2_search" target="extra_vars_2_search" />
-        <param name="extra_vars_2_default" target="extra_vars_2_default" />
-        <param name="extra_vars_2_desc" target="extra_vars_2_desc" />
-        <param name="extra_vars_3_name" target="extra_vars_3_name" />
-        <param name="extra_vars_3_type" target="extra_vars_3_type" />
-        <param name="extra_vars_3_is_required" target="extra_vars_3_is_required" />
-        <param name="extra_vars_3_search" target="extra_vars_3_search" />
-        <param name="extra_vars_3_default" target="extra_vars_3_default" />
-        <param name="extra_vars_3_desc" target="extra_vars_3_desc" />
-        <param name="extra_vars_4_name" target="extra_vars_4_name" />
-        <param name="extra_vars_4_type" target="extra_vars_4_type" />
-        <param name="extra_vars_4_is_required" target="extra_vars_4_is_required" />
-        <param name="extra_vars_4_search" target="extra_vars_4_search" />
-        <param name="extra_vars_4_default" target="extra_vars_4_default" />
-        <param name="extra_vars_4_desc" target="extra_vars_4_desc" />
-        <param name="extra_vars_5_name" target="extra_vars_5_name" />
-        <param name="extra_vars_5_type" target="extra_vars_5_type" />
-        <param name="extra_vars_5_is_required" target="extra_vars_5_is_required" />
-        <param name="extra_vars_5_search" target="extra_vars_5_search" />
-        <param name="extra_vars_5_default" target="extra_vars_5_default" />
-        <param name="extra_vars_5_desc" target="extra_vars_5_desc" />
-        <param name="extra_vars_6_name" target="extra_vars_6_name" />
-        <param name="extra_vars_6_type" target="extra_vars_6_type" />
-        <param name="extra_vars_6_is_required" target="extra_vars_6_is_required" />
-        <param name="extra_vars_6_search" target="extra_vars_6_search" />
-        <param name="extra_vars_6_default" target="extra_vars_6_default" />
-        <param name="extra_vars_6_desc" target="extra_vars_6_desc" />
-        <param name="extra_vars_7_name" target="extra_vars_7_name" />
-        <param name="extra_vars_7_type" target="extra_vars_7_type" />
-        <param name="extra_vars_7_is_required" target="extra_vars_7_is_required" />
-        <param name="extra_vars_7_search" target="extra_vars_7_search" />
-        <param name="extra_vars_7_default" target="extra_vars_7_default" />
-        <param name="extra_vars_7_desc" target="extra_vars_7_desc" />
-        <param name="extra_vars_8_name" target="extra_vars_8_name" />
-        <param name="extra_vars_8_type" target="extra_vars_8_type" />
-        <param name="extra_vars_8_is_required" target="extra_vars_8_is_required" />
-        <param name="extra_vars_8_search" target="extra_vars_8_search" />
-        <param name="extra_vars_8_default" target="extra_vars_8_default" />
-        <param name="extra_vars_8_desc" target="extra_vars_8_desc" />
-        <param name="extra_vars_9_name" target="extra_vars_9_name" />
-        <param name="extra_vars_9_type" target="extra_vars_9_type" />
-        <param name="extra_vars_9_is_required" target="extra_vars_9_is_required" />
-        <param name="extra_vars_9_search" target="extra_vars_9_search" />
-        <param name="extra_vars_9_default" target="extra_vars_9_default" />
-        <param name="extra_vars_9_desc" target="extra_vars_9_desc" />
-        <param name="extra_vars_10_name" target="extra_vars_10_name" />
-        <param name="extra_vars_10_type" target="extra_vars_10_type" />
-        <param name="extra_vars_10_is_required" target="extra_vars_10_is_required" />
-        <param name="extra_vars_10_search" target="extra_vars_10_search" />
-        <param name="extra_vars_10_default" target="extra_vars_10_default" />
-        <param name="extra_vars_10_desc" target="extra_vars_10_desc" />
-        <param name="extra_vars_11_name" target="extra_vars_11_name" />
-        <param name="extra_vars_11_type" target="extra_vars_11_type" />
-        <param name="extra_vars_11_is_required" target="extra_vars_11_is_required" />
-        <param name="extra_vars_11_search" target="extra_vars_11_search" />
-        <param name="extra_vars_11_default" target="extra_vars_11_default" />
-        <param name="extra_vars_11_desc" target="extra_vars_11_desc" />
-        <param name="extra_vars_12_name" target="extra_vars_12_name" />
-        <param name="extra_vars_12_type" target="extra_vars_12_type" />
-        <param name="extra_vars_12_is_required" target="extra_vars_12_is_required" />
-        <param name="extra_vars_12_search" target="extra_vars_12_search" />
-        <param name="extra_vars_12_default" target="extra_vars_12_default" />
-        <param name="extra_vars_12_desc" target="extra_vars_12_desc" />
-        <param name="extra_vars_13_name" target="extra_vars_13_name" />
-        <param name="extra_vars_13_type" target="extra_vars_13_type" />
-        <param name="extra_vars_13_is_required" target="extra_vars_13_is_required" />
-        <param name="extra_vars_13_search" target="extra_vars_13_search" />
-        <param name="extra_vars_13_default" target="extra_vars_13_default" />
-        <param name="extra_vars_13_desc" target="extra_vars_13_desc" />
-        <param name="extra_vars_14_name" target="extra_vars_14_name" />
-        <param name="extra_vars_14_type" target="extra_vars_14_type" />
-        <param name="extra_vars_14_is_required" target="extra_vars_14_is_required" />
-        <param name="extra_vars_14_search" target="extra_vars_14_search" />
-        <param name="extra_vars_14_default" target="extra_vars_14_default" />
-        <param name="extra_vars_14_desc" target="extra_vars_14_desc" />
-        <param name="extra_vars_15_name" target="extra_vars_15_name" />
-        <param name="extra_vars_15_type" target="extra_vars_15_type" />
-        <param name="extra_vars_15_is_required" target="extra_vars_15_is_required" />
-        <param name="extra_vars_15_search" target="extra_vars_15_search" />
-        <param name="extra_vars_15_default" target="extra_vars_15_default" />
-        <param name="extra_vars_15_desc" target="extra_vars_15_desc" />
-        <param name="extra_vars_16_name" target="extra_vars_16_name" />
-        <param name="extra_vars_16_type" target="extra_vars_16_type" />
-        <param name="extra_vars_16_is_required" target="extra_vars_16_is_required" />
-        <param name="extra_vars_16_search" target="extra_vars_16_search" />
-        <param name="extra_vars_16_default" target="extra_vars_16_default" />
-        <param name="extra_vars_16_desc" target="extra_vars_16_desc" />
-        <param name="extra_vars_17_name" target="extra_vars_17_name" />
-        <param name="extra_vars_17_type" target="extra_vars_17_type" />
-        <param name="extra_vars_17_is_required" target="extra_vars_17_is_required" />
-        <param name="extra_vars_17_search" target="extra_vars_17_search" />
-        <param name="extra_vars_17_default" target="extra_vars_17_default" />
-        <param name="extra_vars_17_desc" target="extra_vars_17_desc" />
-        <param name="extra_vars_18_name" target="extra_vars_18_name" />
-        <param name="extra_vars_18_type" target="extra_vars_18_type" />
-        <param name="extra_vars_18_is_required" target="extra_vars_18_is_required" />
-        <param name="extra_vars_18_search" target="extra_vars_18_search" />
-        <param name="extra_vars_18_default" target="extra_vars_18_default" />
-        <param name="extra_vars_18_desc" target="extra_vars_18_desc" />
-        <param name="extra_vars_19_name" target="extra_vars_19_name" />
-        <param name="extra_vars_19_type" target="extra_vars_19_type" />
-        <param name="extra_vars_19_is_required" target="extra_vars_19_is_required" />
-        <param name="extra_vars_19_search" target="extra_vars_19_search" />
-        <param name="extra_vars_19_default" target="extra_vars_19_default" />
-        <param name="extra_vars_19_desc" target="extra_vars_19_desc" />
-        <param name="extra_vars_20_name" target="extra_vars_20_name" />
-        <param name="extra_vars_20_type" target="extra_vars_20_type" />
-        <param name="extra_vars_20_is_required" target="extra_vars_20_is_required" />
-        <param name="extra_vars_20_search" target="extra_vars_20_search" />
-        <param name="extra_vars_20_default" target="extra_vars_20_default" />
-        <param name="extra_vars_20_desc" target="extra_vars_20_desc" />
     </parameter>
     <response callback_func="completeInsertProject">
         <tag name="error" />
diff --git a/modules/issuetracker/tpl/filter/modify_display_option.xml b/modules/issuetracker/tpl/filter/modify_display_option.xml
new file mode 100644
index 000000000..c1b9e36f8
--- /dev/null
+++ b/modules/issuetracker/tpl/filter/modify_display_option.xml
@@ -0,0 +1,25 @@
+<filter name="modify_display_option" module="issuetracker" act="procIssuetrackerAdminModifyDisplayOption" confirm_msg_code="confirm_submit">
+    <form />
+    <parameter>
+    	<param name="module_srl" target="module_srl" />
+    	<param name="displayopts" target="displayopts" />
+        <!-- <param name="d_no" target="d_no" />
+        <param name="d_title" target="d_title" />
+        <param name="d_milestone" target="d_milestone" />
+        <param name="d_priority" target="d_priority" />
+        <param name="d_type" target="d_type" />
+        <param name="d_component" target="d_component" />
+        <param name="d_status" target="d_status" />
+        <param name="d_occured_version" target="d_occured_version" />
+        <param name="d_package" target="d_package" />
+        <param name="d_regdate" target="d_regdate" />
+        <param name="d_assignee" target="d_assignee" />
+        <param name="d_writer" target="d_writer" /> -->
+    </parameter>
+    <response callback_func="completeInsertSetting">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="module_srl" />
+    </response>
+</filter>
+
diff --git a/modules/issuetracker/tpl/grant_list.html b/modules/issuetracker/tpl/grant_list.html
index eeb0eafc6..c70bb3ab3 100644
--- a/modules/issuetracker/tpl/grant_list.html
+++ b/modules/issuetracker/tpl/grant_list.html
@@ -1,39 +1,3 @@
-<!--#include("./header.html")-->
-<!--%import("filter/insert_grant.xml")-->
-
-<form action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, insert_grant)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl?$module_srl:$module_srls}" />
-
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->about_grant}</caption>
-<thead>
-<tr>
-    <th scope="col"><div>{$lang->grant}</div></th>
-    <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-</tr>
-</thead>
-
-<tbody>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-                <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-                <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true });return false;">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false });return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
-        </td>
-    </tr>
-</tbody>
-</table>
-</form>
+<!--#include("./header.html")-->
+
+{$grant_content}
diff --git a/modules/issuetracker/tpl/header.html b/modules/issuetracker/tpl/header.html
index f075a1db5..f7a6d7afe 100644
--- a/modules/issuetracker/tpl/header.html
+++ b/modules/issuetracker/tpl/header.html
@@ -1,13 +1,13 @@
 <!--%import("js/issue_admin.js")-->
 
-<h3>{$lang->issuetracker} {$lang->project}<span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->issuetracker} {$lang->project}<span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_issuetracker)}</div>
 
 <!--@if($module_info)-->
 <div class="header4">
     <!--@if($module_info->mid)-->
-    <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>
+    <h4 class="xeAdmin">{$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">
@@ -25,6 +25,7 @@
         <li <!--@if($act=='dispIssuetrackerAdminProjectSetting')-->class="on"<!--@end-->><a href="{getUrl('','module_srl',$module_srl,'mid',$mid,'module',$module,'act','dispIssuetrackerAdminProjectSetting')}">{$lang->cmd_project_setting}</a></li>
         <li <!--@if($act=='dispIssuetrackerAdminReleaseSetting')-->class="on"<!--@end-->><a href="{getUrl('','module_srl',$module_srl,'mid',$mid,'module',$module,'act','dispIssuetrackerAdminReleaseSetting')}">{$lang->cmd_release_setting}</a></li>
         <li <!--@if($act=='dispIssuetrackerAdminAdditionSetup')-->class="on"<!--@end-->><a href="{getUrl('','module_srl',$module_srl,'mid',$mid,'module',$module,'act','dispIssuetrackerAdminAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
+        <li <!--@if($act=='dispIssuetrackerAdminExtraVars')-->class="on"<!--@end-->><a href="{getUrl('act','dispIssuetrackerAdminExtraVars')}">{$lang->extra_vars}</a></li>
         <li <!--@if($act=='dispIssuetrackerAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('','module_srl',$module_srl,'mid',$mid,'module',$module,'act','dispIssuetrackerAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
         <li <!--@if($act=='dispIssuetrackerAdminSkinInfo')-->class="on"<!--@end-->><a href="{getUrl('','module_srl',$module_srl,'mid',$mid,'module',$module,'act','dispIssuetrackerAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>
     </ul>
diff --git a/modules/issuetracker/tpl/index.html b/modules/issuetracker/tpl/index.html
index cf0067207..845939646 100644
--- a/modules/issuetracker/tpl/index.html
+++ b/modules/issuetracker/tpl/index.html
@@ -1,21 +1,20 @@
 <!--#include("./header.html")-->
 
 <!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
 
 <!-- 목록 -->
 <form action="{Context::getRequestUri()}" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
         <th scope="col">
             <div>
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="module_category_srl" class="w120">
+                <select name="module_category_srl" class="fullWidth">
                     <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>
@@ -29,13 +28,14 @@
         <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="2"><div>&nbsp;</div></th>
+        <th scope="col" colspan="3"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($project_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td class="center number">{$no}</td>
+        <td>{$no}</td>
+        <td><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
                 {$lang->not_exists}
@@ -43,20 +43,28 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispIssuetrackerAdminProjectInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispIssuetrackerAdminProjectInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view"><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="delete"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispIssuetrackerAdminDeleteIssuetracker','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispIssuetrackerAdminProjectInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="./?module=module&amp;act=dispModuleAdminCopyModule&amp;module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispIssuetrackerAdminDeleteIssuetracker','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else-->-<!--@end--></td>
     </tr>
     <!--@end-->
-    <tr class="row2">
-        <td colspan="7" class="right">
-            <a href="{getUrl('act','dispIssuetrackerAdminInsertProject','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
-    </tr>
 </tbody>
 </table>
+
+<!-- 버튼 -->
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleAdditionSetup')}" onclick="doCartSetup(this.href); return false;" class="button red"><span>{$lang->cmd_addition_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr gap1">
+        <a href="{getUrl('act','dispIssuetrackerAdminInsertProject','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
 </form>
 
 <!-- 페이지 네비게이션 -->
diff --git a/modules/issuetracker/tpl/issuetracker_delete.html b/modules/issuetracker/tpl/issuetracker_delete.html
index d55ece4be..45970e079 100644
--- a/modules/issuetracker/tpl/issuetracker_delete.html
+++ b/modules/issuetracker/tpl/issuetracker_delete.html
@@ -6,8 +6,8 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$module_info->mid}</td>
@@ -21,10 +21,10 @@
         <td>{$module_info->document_count}</td>
     </tr>
     <tr>
-        <td class="right" colspan="2">
+        <th class="button" colspan="2">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispIssuetrackerAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/issuetracker/tpl/js/issue_admin.js b/modules/issuetracker/tpl/js/issue_admin.js
index 3b82018b3..e339d253a 100644
--- a/modules/issuetracker/tpl/js/issue_admin.js
+++ b/modules/issuetracker/tpl/js/issue_admin.js
@@ -34,9 +34,8 @@ function completeInsertProject(ret_obj) {
 
 function deleteByFilter(target_srl, filter)
 {
-    var e = xGetElementById('target_srl');
-    e.value= target_srl;
-    var hF = xGetElementById("deleteForm");
+    var e = jQuery('#target_srl').val(target_srl);
+    var hF = jQuery("#deleteForm").get(0);
     procFilter(hF, filter);
 }
 
@@ -313,3 +312,16 @@ function openSummaryText(evt) {
         pObj = pObj.parentNode;
     }
 }
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
diff --git a/modules/issuetracker/skins/xe_issuetracker/js/issuetracker.js b/modules/issuetracker/tpl/js/issuetracker.js
similarity index 60%
rename from modules/issuetracker/skins/xe_issuetracker/js/issuetracker.js
rename to modules/issuetracker/tpl/js/issuetracker.js
index abc8d322c..4648b7d1c 100644
--- a/modules/issuetracker/skins/xe_issuetracker/js/issuetracker.js
+++ b/modules/issuetracker/tpl/js/issuetracker.js
@@ -58,11 +58,10 @@ function completeDeleteTrackback(ret_obj) {
 }
 
 /* 내용 숨김/열기 */
-xAddEventListener(document,'click',openSummaryText);
 function openSummaryText(evt) {
-    var e = new xEvent(evt);
-    if(!e.target) return;
-    var pObj = e.target;
+    var pObj = evt.target;
+    if(!pObj) return;
+
     while(pObj) {
         if(pObj.nodeName == "DIV" && (pObj.className == "open" || pObj.className == "close")) {
             if(pObj.className == 'open') {
@@ -76,34 +75,26 @@ function openSummaryText(evt) {
 }
 
 /* title 레이어 */
-xAddEventListener(document,'mouseover',showTitleLayer);
 function showTitleLayer(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    var layer = xGetElementById("titleLayer");
+    var obj = jQuery(evt.target);
+    var layer = jQuery("#titleLayer");
 
-    if(!obj || obj.nodeName != 'A' || !obj.getAttribute('rel')) {
-        if(layer) layer.style.visibility = "hidden";
-        return;
+    if(!layer.size()) {
+        layer = jQuery("<div>")
+            .attr('id', "titleLayer")
+            .css({
+                border : "1px solid #F3B95E",
+                backgroundColor : "#FBF2E4",
+                padding : "5px",
+                color : "#000000",
+                display : "none",
+                position : "absolute"
+            })
+            .appendTo(document.body);
     }
 
-    if(!layer) {
-        layer = xCreateElement("DIV");
-        layer.id = "titleLayer";
-        layer.style.border = "1px solid #F3B95E";
-        layer.style.backgroundColor = "#FBF2E4";
-        layer.style.padding = "5px";
-        layer.style.color = "#000000";
-        layer.style.visibility = "hidden";
-        layer.style.position = "absolute";
-        window.document.body.appendChild(layer);
-    }
-
-    var text = obj.getAttribute('rel');
-    xInnerHtml(layer, text);
-    xLeft(layer, e.pageX+5);
-    xTop(layer, e.pageY+5);
-    layer.style.visibility = "visible";
+    layer.text(obj.attr('rel'));
+    layer.css({left:evt.pageX+5, top:evt.pageY+5}).show();
 
     evt.cancel = true;
     //evt.returnValue = false;
@@ -111,23 +102,22 @@ function showTitleLayer(evt) {
 
 /* issue list에서 배포판 선택 */
 function showRelease(obj, fo_obj) {
-    var packge_srl = obj.options[obj.selectedIndex].value;
-    var target = xGetElementById('release_'+packge_srl);
-    if(!packge_srl || !target) return;
+    var packge_srl = jQuery('option:selected', obj).val();
+    if(!packge_srl) return;
 
-    var sel = fo_obj.release_srl;
-    while(sel.options.length) {
-        sel.remove(0);
-    }
+    var target = jQuery('#release_'+packge_srl);
+    if(!target.size()) return;
 
-    for(var i=0;i<target.options.length;i++) {
-        var opt = xCreateElement('option');
-        opt.text = target.options[i].text;
-        opt.value = target.options[i].value;
-        try {
-            sel.add(opt, null);
-        } catch(e) {
-            sel.add(opt);
-        }
-    }
+    var releaseEl = fo_obj.release_srl;
+    jQuery('option', releaseEl).remove();
+    jQuery('option', target).clone().appendTo(releaseEl);
 }
+
+
+jQuery(function ($) {
+    $('.summaryText').click(openSummaryText);
+    $('td.filename a[rel]')
+        .mouseover(showTitleLayer)
+        .mouseout(function() { $("#titleLayer").hide() });
+});
+
diff --git a/modules/issuetracker/skins/xe_issuetracker/js/svn.js b/modules/issuetracker/tpl/js/svn.js
similarity index 100%
rename from modules/issuetracker/skins/xe_issuetracker/js/svn.js
rename to modules/issuetracker/tpl/js/svn.js
diff --git a/modules/issuetracker/tpl/modify_component.html b/modules/issuetracker/tpl/modify_component.html
index 6011c1b44..0c62d1ea2 100644
--- a/modules/issuetracker/tpl/modify_component.html
+++ b/modules/issuetracker/tpl/modify_component.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="component_srl" value="{$component->component_srl}" />
 <!--@if($component->is_default=="Y")--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th scope="col" class="wide"><div>{$lang->name}</div></th>
@@ -27,7 +27,7 @@
         <!--@end-->
     </td>
     <td>
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
     </td>
 </tr>
 <tr>
diff --git a/modules/issuetracker/tpl/modify_milestone.html b/modules/issuetracker/tpl/modify_milestone.html
index ae44c3156..505ce8501 100644
--- a/modules/issuetracker/tpl/modify_milestone.html
+++ b/modules/issuetracker/tpl/modify_milestone.html
@@ -10,7 +10,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="milestone_srl" value="{$milestone->milestone_srl}" />
 <!--@if($milestone->is_default=="Y")--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th scope="col" class="wide"><div>{$lang->name} </div></th>
@@ -41,9 +41,9 @@
     </td>
 </tr>
 <tr>
-    <td colspan="4"><textarea name="description" class="inputTypeTextArea w400" />{$milestone->description}</textarea></td>
+    <td colspan="4"><textarea name="description" class="inputTypeTextArea fullWidth" />{$milestone->description}</textarea></td>
     <td>
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
     </td>
 </tr>
 <tr>
diff --git a/modules/issuetracker/tpl/modify_package.html b/modules/issuetracker/tpl/modify_package.html
index 7cb783661..1f538edf2 100644
--- a/modules/issuetracker/tpl/modify_package.html
+++ b/modules/issuetracker/tpl/modify_package.html
@@ -7,20 +7,20 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="package_srl" value="{$package->package_srl}" />
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th><div>{$lang->name}</div></th>
-    <td class="wide"><input name="title" type="text" value="{htmlspecialchars($package->title)}" class="inputTypeText w400" /></td>
+    <td class="wide"><input name="title" type="text" value="{htmlspecialchars($package->title)}" class="inputTypeText fullWidth" /></td>
 </tr>
 <tr>
     <th><div>{$lang->description}</div></th>
-    <td><textarea name="description" class="inputTypeTextArea w400" />{htmlspecialchars($package->description)}</textarea></td>
+    <td><textarea name="description" class="inputTypeTextArea fullWidth" />{htmlspecialchars($package->description)}</textarea></td>
 </tr>
 <tr>
-    <td colspan="2">
-        <input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" />
-    </td>
+    <th colspan="2" class="button">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+    </th>
 </tr>
 </table>
 
diff --git a/modules/issuetracker/tpl/modify_priority.html b/modules/issuetracker/tpl/modify_priority.html
index 134b8fec6..cd087d0cb 100644
--- a/modules/issuetracker/tpl/modify_priority.html
+++ b/modules/issuetracker/tpl/modify_priority.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="priority_srl" value="{$priority->priority_srl}" />
 <!--@if($priority->is_default=="Y")--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th scope="col" class="wide"><div>{$lang->name}<div></th>
@@ -29,7 +29,7 @@
         <!--@end-->
     </td>
     <td>
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
     </td>
 </tr>
 <tr>
diff --git a/modules/issuetracker/tpl/modify_release.html b/modules/issuetracker/tpl/modify_release.html
index 83cf83eac..1ecfee0a6 100644
--- a/modules/issuetracker/tpl/modify_release.html
+++ b/modules/issuetracker/tpl/modify_release.html
@@ -8,24 +8,24 @@
 <input type="hidden" name="release_srl" value="{$release->release_srl}" />
 <input type="hidden" name="package_srl" value="{$release->package_srl?$release->package_srl:$package_srl}" />
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th><div>{$lang->name}</div></th>
-    <td><input name="title" type="text" value="{htmlspecialchars($release->title)}" class="inputTypeText w400" /></td>
+    <td class="wide"><input name="title" type="text" value="{htmlspecialchars($release->title)}" class="inputTypeText fullWidth" /></td>
 </tr>
 <tr>
     <th><div>{$lang->release_note}</div></th>
-    <td><textarea name="release_note" class="inputTypeTextArea w400" />{htmlspecialchars($release->release_note)}</textarea></td>
+    <td><textarea name="release_note" class="inputTypeTextArea fullWidth" />{htmlspecialchars($release->release_note)}</textarea></td>
 </tr>
 <tr>
     <th><div>{$lang->release_changes}</div></th>
-    <td><textarea name="release_changes" class="inputTypeTextArea w400" />{htmlspecialchars($release->release_changes)}</textarea></td>
+    <td><textarea name="release_changes" class="inputTypeTextArea fullWidth" />{htmlspecialchars($release->release_changes)}</textarea></td>
 </tr>
 <tr>
-    <td colspan="2">
-        <input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" />
-    </td>
+    <th colspan="2" class="button">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+    </th>
 </tr>
 </table>
 
diff --git a/modules/issuetracker/tpl/modify_type.html b/modules/issuetracker/tpl/modify_type.html
index 29408ccb1..a0a70538f 100644
--- a/modules/issuetracker/tpl/modify_type.html
+++ b/modules/issuetracker/tpl/modify_type.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="type_srl" value="{$type->type_srl}" />
 <!--@if($type->is_default=="Y")--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
 <tr>
     <th scope="col" class="wide"><div>{$lang->name}</div></th>
@@ -27,7 +27,7 @@
         <!--@end-->
     </td>
     <td>
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
     </td>
 </tr>
 <tr>
diff --git a/modules/issuetracker/tpl/project_info.html b/modules/issuetracker/tpl/project_info.html
index 74571a9e3..f727006c9 100644
--- a/modules/issuetracker/tpl/project_info.html
+++ b/modules/issuetracker/tpl/project_info.html
@@ -1,6 +1,6 @@
 <!--#include("header.html")-->
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <tr class="row2">
     <th scope="row"><div>{$lang->module_category}</div></th>
     <td>
@@ -49,10 +49,6 @@
     <th scope="row2"><div>{$lang->description}</div></th>
     <td>{nl2br(htmlspecialchars($module_info->description))}&nbsp;</td>
 </tr>
-<tr class="row">
-    <th scope="row2"><div>{$lang->admin_id}</div></th>
-    <td>{implode(",",$module_info->admin_id)}&nbsp;</td>
-</tr>
 <tr>
     <td colspan="2" class="right">
         <a href="{getUrl('act','dispIssuetrackerAdminInsertProject')}" class="button"><span>{$lang->cmd_modify}</span></a>
@@ -72,8 +68,8 @@
     {@ $extra_vars_desc = $module_info->extra_vars[$i]->desc?$module_info->extra_vars[$i]->desc:'&nbsp;'}
     {@ $extra_vars_search = $module_info->extra_vars[$i]->search=='Y'?'Y':'N'}
 
-    <table cellspacing="0" class="adminTable topGap">
-    <caption>{$lang->extra_vars} {$i}</caption>
+    <h4 class="xeAdmin">{$lang->extra_vars} {$i}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th><div>{$lang->column_name}</div></th>
         <td class="wide">{$extra_vars_name}</td>
diff --git a/modules/issuetracker/tpl/project_insert.html b/modules/issuetracker/tpl/project_insert.html
index f90eff367..6df3ef8c6 100644
--- a/modules/issuetracker/tpl/project_insert.html
+++ b/modules/issuetracker/tpl/project_insert.html
@@ -9,7 +9,7 @@
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
 
     <!--@if(!$module_srls)-->
         <tr class="row2">
@@ -46,7 +46,8 @@
     <tr>
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td>
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -113,81 +114,31 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->description)}</textarea>
             <p>{$lang->about_description}</p>
         </td>
     </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->admin_id}</div></th>
+    <tr>
+        <th scope="row"><div>{$lang->header_text}</div></th>
         <td>
-            <textarea name="admin_id" class="inputTypeTextArea fixWidth"><!--@if($module_info->admin_id)-->{implode(",",$module_info->admin_id)}<!--@end--></textarea>
-            <p>{$lang->about_admin_id}</p>
+            <textarea name="header_text" class="inputTypeTextArea fullWidth" id="header_text">{htmlspecialchars($module_info->header_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','header_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            <p>{$lang->about_header_text}</p>
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
+        <th scope="row"><div>{$lang->footer_text}</div></th>
+        <td>
+            <textarea name="footer_text" class="inputTypeTextArea fullWidth" id="footer_text">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','footer_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            <p>{$lang->about_footer_text}</p>
         </td>
+    </tr>
+    <tr>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
+        </th>
     </table>
 
-    <!--@if(!$module_srls)-->
-        <!--@for($i=1;$i<=20;$i++)-->
-            <div class="gap1"></div>
-            {@ $extra_vars_name = ''}
-            {@ $extra_vars_type = ''}
-            {@ $extra_vars_is_required = ''}
-            {@ $extra_vars_default_value = ''}
-            {@ $extra_vars_desc = ''}
-            {@ $extra_vars_search = ''}
-            <!--@if($module_info->extra_vars[$i])-->
-                {@ $extra_vars_name = $module_info->extra_vars[$i]->name}
-                {@ $extra_vars_type = $module_info->extra_vars[$i]->type}
-                {@ $extra_vars_is_required = $module_info->extra_vars[$i]->is_required}
-                {@ $extra_vars_default_value = $module_info->extra_vars[$i]->default}
-                {@ $extra_vars_desc = $module_info->extra_vars[$i]->desc}
-                {@ $extra_vars_search = $module_info->extra_vars[$i]->search}
-            <!--@end-->
-        <table cellspacing="0" class="adminTable ">
-        <caption>{$lang->extra_vars} {$i}</caption>
-        <tr class="row2">
-            <th><div>{$lang->column_name}</div></th>
-            <td class="wide"><input type="text" name="extra_vars_{$i}_name" value="{$extra_vars_name}" class="inputTypeText w200" /> </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->column_type}</div></th>
-            <td>
-                <select name="extra_vars_{$i}_type">
-                    <!--@foreach($lang->column_type_list as $key => $val)-->
-                        <!--@if($key != 'kr_zip')-->
-                        <option value="{$key}" <!--@if($extra_vars_type==$key)-->selected="selected"<!--@end-->>{$lang->column_type_list[$key]}</option>
-                        <!--@end-->
-                    <!--@end-->
-                </select>
-            </td>
-        </tr>
-        <tr class="row2">
-            <th><div>{$lang->is_required}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_is_required" value="Y" <!--@if($extra_vars_is_required=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->default_value}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_default" value="{$extra_vars_default_value}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
-        </tr>
-        <tr class="row2">
-            <th><div>{$lang->description}</div></th>
-            <td><input type="text" name="extra_vars_{$i}_desc" value="{$extra_vars_desc}" class="inputTypeText w400" /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->cmd_search}</div></th>
-            <td><input type="checkbox" name="extra_vars_{$i}_search" value="Y" <!--@if($extra_vars_search=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr class="row2">
-            <td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></td>
-        </tr>
-        </table>
-        <!--@end-->
-    <!--@end-->
-
-
 </form>
diff --git a/modules/issuetracker/tpl/project_setting.html b/modules/issuetracker/tpl/project_setting.html
index f154f064c..e707a1ea0 100644
--- a/modules/issuetracker/tpl/project_setting.html
+++ b/modules/issuetracker/tpl/project_setting.html
@@ -8,6 +8,7 @@
 <!--%import("filter/delete_type.xml")-->
 <!--%import("filter/insert_component.xml")-->
 <!--%import("filter/delete_component.xml")-->
+<!--%import("filter/modify_display_option.xml")-->
 
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->
@@ -15,8 +16,8 @@
     <form action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, insert_milestone)">
     <input type="hidden" name="module_srl" value="{$module_srl}" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->milestone}</caption>
+        <h4 class="xeAdmin">{$lang->milestone}</h4>
+        <table cellspacing="0" class="crossTable">
         <thead>
         <tr>
             <th scope="col" class="wide"><div>{$lang->name}</div></th>
@@ -29,7 +30,7 @@
         <tbody>
         <!--@foreach($milestone_list as $val)-->
         <tr>
-            <td <!--@if($val->is_completed=='Y')-->class="strike"<!--@end-->>{$val->title}</td>
+            <td class="wide <!--@if($val->is_completed=='Y')-->strike<!--@end-->">{$val->title}</td>
             <td class="date center nowrap"><!--@if($val->released_date)-->{zdate($val->released_date,"Y-m-d")}<!--@else-->&nbsp;<!--@end--></td>
             <td class="date center nowrap"><!--@if($val->deadline)-->{zdate($val->deadline,"Y-m-d")}<!--@else-->&nbsp;<!--@end--></td>
             <td class="center"><!--@if($val->is_default=='Y')-->{$lang->is_default}<!--@else-->&nbsp;<!--@end--></td>
@@ -42,31 +43,30 @@
 
         <tr>
             <td colspan="2">
-                <input name="title" type="text" class="inputTypeText fixWidth" /><br />
+                <input name="title" type="text" class="inputTypeText fullWidth" /><br />
             </td>
             <td class="nowrap">
                 <input type="hidden" name="deadline" id="date_deadline" />
                 <input type="text" class="inputDate" value="" readonly="readonly" />
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-</script>
+                <script type="text/javascript">
+                (function($){
+                    $(function(){
+                        var option = { gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
 
+                            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+                        };
+                        $.extend(option,$.datepicker.regional['{$lang_type}']);
+                        $(".inputDate").datepicker(option);
+                    });
+                })(jQuery);
+                </script>
             </td>
             <td class="center"><input type="checkbox" name="is_default" value="Y" /></td>
             <td class="vtop" rowspan="2"><input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" /></td>
         </tr>
         <tr>
-            <td colspan="4">
-                <textarea name="description" class="inputTypeTextArea fixWidth" /></textarea>
+            <td colspan="5">
+                <textarea name="description" class="inputTypeTextArea fullWidth" /></textarea>
             </td>
         </tr>
         </tbody>
@@ -80,8 +80,8 @@
     <form action="./" method="post" onsubmit="return procFilter(this, insert_priority)">
     <input type="hidden" name="module_srl" value="{$module_srl}" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->priority}</caption>
+        <h4 class="xeAdmin">{$lang->priority}</h4>
+        <table cellspacing="0" class="crossTable">
         <thead>
         <tr>
             <th scope="col" class="wide"><div>{$lang->name}</div></th>
@@ -93,7 +93,7 @@
         <tbody>
         <!--@foreach($priority_list as $val)-->
         <tr>
-            <td>{$val->title}</td>
+            <td class="wide">{$val->title}</td>
             <td class="center number">{$val->listorder}</td>
             <td class="center"><!--@if($val->is_default=='Y')-->{$lang->is_default}<!--@else-->&nbsp;<!--@end--></td>
             <td class="button">
@@ -103,7 +103,7 @@
         </tr>
         <!--@end-->
         <tr>
-            <td><input name="title" type="text" class="inputTypeText fixWidth" /></td>
+            <td><input name="title" type="text" class="inputTypeText fullWidth" /></td>
             <td>&nbsp;</td>
             <td class="center"><input type="checkbox" name="is_default" value="Y" /></td>
             <td><input type="submit" value="{$lang->cmd_registration}" class="btnSubmit" accesskey="s"/></td>
@@ -115,8 +115,8 @@
 
     <form action="./" method="post" onsubmit="return procFilter(this, insert_type)">
     <input type="hidden" name="module_srl" value="{$module_srl}" />
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->type}</caption>
+        <h4 class="xeAdmin">{$lang->type}</h4>
+        <table cellspacing="0" class="crossTable">
         <thead>
         <tr>
             <th scope="col" class="wide"><div>{$lang->type}</div></th>
@@ -127,7 +127,7 @@
         <tbody>
         <!--@foreach($type_list as $val)-->
         <tr>
-            <td>{$val->title}</td>
+            <td class="wide">{$val->title}</td>
             <td class="center"><!--@if($val->is_default=='Y')-->{$lang->is_default}<!--@else-->&nbsp;<!--@end--></td>
             <td class="center">
                 <a href="{getUrl('module_srl',$module_srl,'act','dispIssuetrackerAdminModifyType','type_srl',$val->type_srl)}"><img src="images/buttonModify.gif" alt="" /></a> &nbsp;
@@ -136,7 +136,7 @@
         </tr>
         <!--@end-->
         <tr>
-            <td><input name="title" type="text" class="inputTypeText fixWidth" /></td>
+            <td><input name="title" type="text" class="inputTypeText fullWidth" /></td>
             <td class="center"><input type="checkbox" name="is_default" value="Y" /></td>
             <td><input type="submit" value="{$lang->cmd_registration}" class="btnSubmit" accesskey="s"/></td>
         </tbody>
@@ -147,8 +147,8 @@
     <form action="./" method="post" onsubmit="return procFilter(this, insert_component)">
     <input type="hidden" name="module_srl" value="{$module_srl}" />
 
-        <table cellspacing="0" class="adminTable">
-        <caption>{$lang->component}</caption>
+        <h4 class="xeAdmin">{$lang->component}</h4>
+        <table cellspacing="0" class="crossTable">
         <thead>
         <tr>
             <th scope="col" class="wide"><div>{$lang->component}</div></th>
@@ -159,7 +159,7 @@
         <tbody>
         <!--@foreach($component_list as $val)-->
         <tr>
-            <td>{$val->title}</td>
+            <td class="wide">{$val->title}</td>
             <td class="center"><!--@if($val->is_default=='Y')-->{$lang->is_default}<!--@else-->&nbsp;<!--@end--></td>
             <td class="center">
                 <a href="{getUrl('module_srl',$module_srl,'act','dispIssuetrackerAdminModifyComponent','component_srl',$val->component_srl)}"><img src="images/buttonModify.gif" alt="" /></a> &nbsp;
@@ -169,9 +169,23 @@
 
         <!--@end-->
         <tr>
-            <td><input name="title" type="text" class="inputTypeText fixWidth" /></td>
+            <td><input name="title" type="text" class="inputTypeText fullWidth" /></td>
             <td class="center"><input type="checkbox" name="is_default" value="Y" /></td>
             <td><input type="submit" value="{$lang->cmd_registration}" class="btnSubmit" accesskey="s"/></td>
         </tbody>
         </table>
     </form>
+
+    <form action="./" method="post" onsubmit="return procFilter(this, modify_display_option)">
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+
+        <h4 class="xeAdmin">{$lang->display_option}</h4>
+        <ol class="displayOpt">
+            <!--@foreach($display_option as $key => $val)-->
+            <li><input type="checkbox" name="displayopts" value="{$key}" id="display_{$key}" <!--@if($val->checked)-->checked="checked"<!--@end--> <!--@if($key=='title')-->disabled="disabled"<!--@end--> /><label for="display_{$key}">{$val->title}</label></li>
+            <!--@end-->
+        </ol>
+        <div class="right">
+        <input type="submit" value="{$lang->cmd_modify}" class="btnSubmit" accesskey="s"/>
+        </div>
+    </form>
\ No newline at end of file
diff --git a/modules/issuetracker/tpl/release_setting.html b/modules/issuetracker/tpl/release_setting.html
index c76c01dae..484119aeb 100644
--- a/modules/issuetracker/tpl/release_setting.html
+++ b/modules/issuetracker/tpl/release_setting.html
@@ -10,28 +10,26 @@
 </form>
 
 <div class="top1">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->package}</caption>
+    <h4 class="xeAdmin">{$lang->package}</h4>
+    <table cellspacing="0" class="rowTable">
     <!--@foreach($package_list as $key => $val)-->
     <tr>
         <th><div><a href="{getUrl('package_srl', $key)}">{$val->title}</a></div></th>
         <td class="wide summaryText"><div class="close">{nl2br($val->description)}</div></td>
-        <td class="modify center"><a href="{getUrl('module_srl',$module_srl,'act','dispIssuetrackerAdminModifyPackage','package_srl',$val->package_srl)}">{$lang->cmd_modify}</a></td>
-        <td class="delete center"><!--@if($val->is_default!='Y')--><a href="#" onclick="deleteByFilter('{$val->package_srl}', delete_package);">{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
+        <td><a href="{getUrl('module_srl',$module_srl,'act','dispIssuetrackerAdminModifyPackage','package_srl',$val->package_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="#" onclick="deleteByFilter('{$val->package_srl}', delete_package);" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</a></span><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="4">
-            <div class="fr">
-                <form action="{Context::getRequestUri()}" method="get">
-                <input type="hidden" name="module" value="{$module}"/>
-                <input type="hidden" name="mid" value="{$mid}"/>
-                <input type="hidden" name="module_srl" value="{$module_srl}"/>
-                <input type="hidden" name="act" value="dispIssuetrackerAdminModifyPackage" />
-                    <input type="submit" value="{$lang->cmd_insert_package}" class="btnSubmit" />
-                </form>
-            </div>
-        </td>
+        <th colspan="4" class="button">
+            <form action="{Context::getRequestUri()}" method="get">
+            <input type="hidden" name="module" value="{$module}"/>
+            <input type="hidden" name="mid" value="{$mid}"/>
+            <input type="hidden" name="module_srl" value="{$module_srl}"/>
+            <input type="hidden" name="act" value="dispIssuetrackerAdminModifyPackage" />
+                <input type="submit" value="{$lang->cmd_insert_package}" class="btnSubmit" />
+            </form>
+        </th>
     </tr>
     </table>
 </div>
@@ -40,8 +38,8 @@
     {@ $package = $package_list[$package_srl] }
 <div class="top2">
 
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->package} : {$package->title}</caption>
+<h4 class="xeAdmin">{$lang->package} : {$package->title}</h4>
+<table cellspacing="0" class="rowTable">
 <tbody>
     <tr>
         <td colspan="4">
@@ -81,7 +79,7 @@
         <td colspan="2">
             <!--@if($val->files)-->
             <!--@foreach($val->files as $file)-->
-            <table cellspacing="0" class="adminTable">
+            <table cellspacing="0" class="rowTable">
             <col width="180" />
             <col width="*" />
             <tbody>
diff --git a/modules/issuetracker/tpl/skin_info.html b/modules/issuetracker/tpl/skin_info.html
index 073342dd3..53617b1fe 100644
--- a/modules/issuetracker/tpl/skin_info.html
+++ b/modules/issuetracker/tpl/skin_info.html
@@ -1,144 +1,2 @@
 <!--#include("./header.html")-->
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="{$module_info->module}" />
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procIssuetrackerAdminUpdateSkinInfo" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide">{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-        &nbsp;
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br($skin_info->description)}</td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td class="wide">
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-                <!--@if($val->screenshot)-->
-                    {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-                <!--@else-->
-                    {@ $_width = 200; $_height = 20; $_talign = "left"; }
-                <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-                <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>  
-                <label for="colorset_{$key}">{$val->title}</label>
-                <!--@if($val->screenshot)-->
-                <br />
-                <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-                <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
-    <!--@end-->
-
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
-    </tr>
-    </table>
-
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+{$skin_content}
diff --git a/modules/krzip/conf/module.xml b/modules/krzip/conf/module.xml
index 9aef3127e..ff844c479 100644
--- a/modules/krzip/conf/module.xml
+++ b/modules/krzip/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispKrzipAdminConfig" type="view" admin_index="true" standalone="true" />
         <action name="procKrzipAdminInsertConfig" type="controller" standalone="true" />
diff --git a/modules/krzip/krzip.class.php b/modules/krzip/krzip.class.php
index 0fd7360dc..51b38af3f 100644
--- a/modules/krzip/krzip.class.php
+++ b/modules/krzip/krzip.class.php
@@ -15,10 +15,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('krzip', 'view', 'dispKrzipAdminConfig');
-
             return new Object();
         }
 
diff --git a/modules/krzip/lang/ko.lang.php b/modules/krzip/lang/ko.lang.php
index 59a02a445..7a821f5c5 100644
--- a/modules/krzip/lang/ko.lang.php
+++ b/modules/krzip/lang/ko.lang.php
@@ -6,17 +6,17 @@
      **/
 
     // 일반 단어들
-    $lang->krzip = "한국 우편번호";
-    $lang->krzip_server_hostname = "우편번호 검사 서버의 이름";
-    $lang->krzip_server_port = "우편번호 검사 서버 포트";
-    $lang->krzip_server_query = "우편번호 검사 서버 경로";
+    $lang->krzip = '한국 우편번호';
+    $lang->krzip_server_hostname = '우편번호 검사 서버의 이름';
+    $lang->krzip_server_port = '우편번호 검사 서버 포트';
+    $lang->krzip_server_query = '우편번호 검사 서버 경로';
 
     // 설명문
-    $lang->about_krzip_server_hostname = "우편번호를 검사하여 결과 목록을 가져올 서버의 도메인을 입력해주세요";
-    $lang->about_krzip_server_port = "우편번호를 검사서버의 포트 번호를 입력해주세요";
-    $lang->about_krzip_server_query = "우편번호를 검사서버에 요청할 query url을 입력해 주세요";
+    $lang->about_krzip_server_hostname = '우편번호를 검사하여 결과 목록을 가져올 서버의 도메인을 입력해주세요';
+    $lang->about_krzip_server_port = '우편번호를 검사서버의 포트 번호를 입력해주세요';
+    $lang->about_krzip_server_query = '우편번호를 검사서버에 요청할 query url을 입력해 주세요';
 
     // 에러 메세지들
-    $lang->msg_not_exists_addr = "검색하려는 대상이 없습니다";
-    $lang->msg_fail_to_socket_open = "우편번호 검색 대상 서버 접속이 실패하였습니다";
+    $lang->msg_not_exists_addr = '검색하려는 대상이 없습니다';
+    $lang->msg_fail_to_socket_open = '우편번호 검색 대상 서버 접속이 실패하였습니다';
 ?>
diff --git a/modules/krzip/tpl/index.html b/modules/krzip/tpl/index.html
index cf5e6fa58..4959360c9 100644
--- a/modules/krzip/tpl/index.html
+++ b/modules/krzip/tpl/index.html
@@ -1,9 +1,9 @@
 <!--%import("filter/insert_config.xml")-->
 
-<h3>{$lang->krzip} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->krzip} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<table cellspacing="0" class="adminTable gap1">
+<table cellspacing="0" class="rowTable">
 <tr>
     <th scope="col"><div>{$lang->krzip_server_hostname}</div></th>
     <td>
@@ -26,9 +26,9 @@
     </td>
 </tr>
 <tr class="row2">
-    <td colspan="2" class="right">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </td>
+    <th colspan="2" class="button">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+    </th>
 </tr>
 </table>
 </form>
diff --git a/modules/layout/conf/info.xml b/modules/layout/conf/info.xml
index 5f8dd22d2..c0a1af203 100644
--- a/modules/layout/conf/info.xml
+++ b/modules/layout/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">레이아웃</title>
-    <title xml:lang="zh-CN">布局</title>
+    <title xml:lang="zh-CN">布局管理</title>
     <title xml:lang="jp">レイアウト</title>
     <title xml:lang="en">Layout</title>
     <title xml:lang="es">Diseño</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">建立/管理版面的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>manager</category>
+    <category>construction</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 8ea2e15d9..445f5d725 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispLayoutInfo" type="view" standalone="true" />
         <action name="dispLayoutAdminContent" type="view" admin_index="true" standalone="true" />
@@ -9,11 +11,20 @@
         <action name="dispLayoutAdminDownloadedList" type="view" standalone="true" />
         <action name="dispLayoutAdminPreview" type="view" standalone="true" />
         <action name="dispLayoutAdminInfo" type="view" standalone="true" />
+        <action name="dispLayoutAdminLayoutModify" type="view" standalone="true" />
+        <action name="dispLayoutAdminLayoutImageList" type="view" standalone="true" />
+
 
         <action name="procLayoutAdminInsert" type="controller" standalone="true" />
         <action name="procLayoutAdminUpdate" type="controller" standalone="true" />
         <action name="procLayoutAdminDelete" type="controller" standalone="true" />
         <action name="procLayoutAdminCodeUpdate" type="controller" standalone="true" />
         <action name="procLayoutAdminCodeReset" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserImageUpload" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserImageDelete" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserValueInsert" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserLayoutExport" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserLayoutImport" type="controller" standalone="true" />
+
     </actions>
 </module>
diff --git a/modules/layout/faceoff/conf/info.xml b/modules/layout/faceoff/conf/info.xml
new file mode 100644
index 000000000..fd012d65c
--- /dev/null
+++ b/modules/layout/faceoff/conf/info.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2" type="faceoff">
+    <title xml:lang="ko">XE Face off 레이아웃</title>
+    <title xml:lang="zh-TW">XE Face off 版面</title>
+    <description xml:lang="ko">XE FaceOff 레이아웃입니다.</description>
+    <description xml:lang="zh-TW">XE FaceOff版面</description>
+    <version>0.1</version>
+    <date>2009-01-02</date>
+    <author email_address="sol@ngleader.com" link="http://ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="ge">sol</name>
+        <name xml:lang="ru">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+    <author email_address="" link="http://naradesign.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="ge">sol</name>
+        <name xml:lang="ru">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+
+    <extra_vars>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力してください。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站Logo後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+        </var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力してください。 (縦幅が23pxである透明イメージが最も合います。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+        </var>
+        <var name="logo_text" type="text">
+            <title xml:lang="ko">로고 글자</title>
+            <title xml:lang="jp">ロゴ文字</title>
+            <title xml:lang="zh-CN">标志字符</title>
+            <title xml:lang="zh-TW">Logo文字</title>
+            <title xml:lang="en">LOGO characters</title>
+            <title xml:lang="ge">LOGO Zeichen </title>
+            <title xml:lang="ru">LOGO символов </title>
+            <title xml:lang="es">LOGO caracteres </title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고 글자를 입력해주세요. 로고 이미지가 있으면 표시되지 않습니다.</description>
+            <description xml:lang="jp">レイアウトの上部に表示されるロゴの文字を入力してください。ロゴ画像がある場合は表示されません。</description>
+            <description xml:lang="zh-CN">顶部的徽标上的显示布局，请输入字母。如果图片不显示徽标。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上方的文字。</description>
+            <description xml:lang="en">Logo at the top of the display layout, please enter the letters. If the image does not display the logo.</description>
+            <description xml:lang="ge">Logo am oberen Rand des Displays Layout, geben Sie bitte die Buchstaben. Wenn das Bild nicht das Logo.</description>
+            <description xml:lang="ru">Логотип на верхней части дисплея формата, пожалуйста, введите буквы. Если изображение не отображается логотип.</description>
+            <description xml:lang="es">Logo en la parte superior de la pantalla de diseño, por favor, introduzca las letras. Si la imagen no se muestra el logotipo.</description>
+        </var>
+        <var name="copyright_text" type="text"> 
+            <title xml:lang="ko">카피라이트 문구</title>
+            <title xml:lang="jp">Copyright文具</title>
+            <title xml:lang="zh-CN">版权所有文具</title>
+            <title xml:lang="zh-TW">版權所有</title>
+            <title xml:lang="en">Copyright Stationery </title>
+            <title xml:lang="ge">Copyright Stationery </title>
+            <title xml:lang="ru">Copyright Канцтовары</title>
+            <title xml:lang="es">Papel del derecho de autor</title>
+            <description xml:lang="ko">하단에 표시될 카피라이트 문구를 설정할 수 있습니다</description>
+            <description xml:lang="jp">レイアウトの下部に表示されるcopyrightフレーズを入力してください。</description>
+            <description xml:lang="zh-CN">布局显示在下方的版权声明请。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面下方的版權聲明。</description>
+            <description xml:lang="en">Layout displayed in the bottom of the copyright notice please.</description>
+            <description xml:lang="ge">Layout angezeigt, im unteren Teil der Urheberrechtsschutz bitte.</description>
+            <description xml:lang="ru">Макет отображается в нижней части авторских прав, пожалуйста.</description>
+            <description xml:lang="es">Diseño de muestra en la parte inferior de la nota de copyright, por favor.</description>
+        </var>
+    </extra_vars>
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/modules/layout/faceoff/css/layout.css b/modules/layout/faceoff/css/layout.css
new file mode 100644
index 000000000..9609fd767
--- /dev/null
+++ b/modules/layout/faceoff/css/layout.css
@@ -0,0 +1,173 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* html{ overflow:auto;} */
+
+#header h1 a { text-decoration:none; }
+#footer address { font-style:normal; }
+#footer address a { text-decoration:none; }
+
+/* Skip To Content */
+a.skipToContent{ display:block; position:relative; top:0; clear:both; overflow:hidden; height:0; text-decoration:none;}
+a.skipToContent:hover,
+a.skipToContent:active,
+a.skipToContent:focus{ height:auto; margin:0 0 10px 0; padding:5px;}
+
+/* Hr */
+hr{ display:none; position:absolute;}
+
+/* Heading 
+h1{ position:relative; float:left; margin:0;}
+h2{ position:relative; margin:0 0 10px 0; border-bottom:2px solid;}
+h3{ position:relative; margin:0;}*/
+
+/* Container + Header + Body + Footer */
+#container{ position:relative; margin:0;}
+#header{ position:relative; *zoom:1; overflow:hidden; }
+#header:after{ content:""; display:block; clear:both;}
+#body{ position:relative; *zoom:1;}
+#body:after{ content:""; display:block; clear:both;}
+#content{ position:relative; text-align:justify; padding:0;}
+#footer{ position:relative; *zoom:1; padding:10px 0 10px 0; }
+#footer address{ text-align:center;}
+
+/* Layout Width */
+.fixed #container{ width:960px; margin-left:auto; margin-right:auto;}
+.liquid #container{ width:90%; margin-left:auto; margin-right:auto;}
+.hybrid #container{ width:90%; margin-left:auto; margin-right:auto;}
+
+/* Align Layout */
+.aLeft #container{ margin-left:0;}
+.aRight #container{ margin-right:0;}
+
+/* Neck */
+#neck{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
+#neck .extension{ /* margin-right:-30px;*/ *zoom:1;}
+#neck .extension:after{ content:""; display:block; clear:both;}
+
+/* Knee */
+#knee{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
+#knee .extension{ /* margin-right:-30px;*/ *zoom:1;}
+#knee .extension:after{ content:""; display:block; clear:both;}
+
+/* Extension */
+#body .extension{ position:relative; display:none; }
+
+/* ----- Fixed 2 Column Layout ----- */
+.fixed .ce #body .e1,
+.fixed .ec #body .e1{ width:200px; padding:10px;}
+
+.fixed .ce #body #content{ width:730px; padding:10px 0 10px 10px;}
+.fixed .ec #body #content{ width:730px; padding:10px 10px 10px 0;}
+
+.fixed .ce #body #content{ float:left;}
+.fixed .ec #body #content{ float:right;}
+.fixed .ce #body .e1,
+.fixed .ec #body .e1{ display:block;}
+.fixed .ce #body .e1{ float:right; clear:right;}
+.fixed .ec #body .e1{ float:left; clear:left;}
+
+/* ----- Fixed 3 Column Layout ----- */
+.fixed .cee #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .cee #body .e2 { display:block; width:200px; padding:10px;}
+.fixed .ece #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .ece #body .e2 { display:block; width:200px; padding:10px;}
+.fixed .eec #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .eec #body .e2 { display:block; width:200px; padding:10px;}
+
+.fixed .cee #body #content { width:510px; padding:10px 0 10px 10px; }
+.fixed .ece #body #content { width:520px; padding:10px 0 10px 0; }
+.fixed .eec #body #content { width:510px; padding:10px 10px 10px 0; }
+
+.fixed .cee #body #content{ float:left; }
+.fixed .ece #body #content{ float:left; margin-right:-100%; left:220px;}
+.fixed .eec #body #content{ float:right;}
+
+.fixed .ece #body .e1,
+.fixed .eec #body .e1{ float:left; }
+
+.fixed .cee #body .e1,
+.fixed .eec #body .e2{ float:left;}
+
+.fixed .cee #body .e2,
+.fixed .ece #body .e2{ float:right;}
+
+/* ----- Liquid 2 Column Layout ----- */
+.liquid .ce #body .e1,
+.liquid .ec #body .e1{ width:20%;}
+.liquid .ce #body #content,
+.liquid .ec #body #content{ width:80%;}
+.liquid .ce #body #content{ float:left;}
+.liquid .ec #body #content{ float:right;}
+.liquid .ce #body .e1,
+.liquid .ec #body .e1{ display:block;}
+.liquid .ce #body .e1{ float:right; clear:right;}
+.liquid .ec #body .e1{ float:left; clear:left;}
+
+/* ----- Liquid 3 Column Layout ----- */
+.liquid .cee #body .e1,
+.liquid .cee #body .e2,
+.liquid .ece #body .e1,
+.liquid .ece #body .e2,
+.liquid .eec #body .e1,
+.liquid .eec #body .e2{ display:block; width:21%;}
+
+.liquid .cee #body #content,
+.liquid .ece #body #content,
+.liquid .eec #body #content{ width:58%;}
+
+.liquid .cee #body #content{ float:left; }
+.liquid .ece #body #content{ float:left; margin-right:-100%; left:21%;}
+.liquid .eec #body #content{ float:right;}
+
+.liquid .ece #body .e1,
+.liquid .eec #body .e1{ float:left; }
+
+.liquid .cee #body .e1,
+.liquid .eec #body .e2{ float:left;}
+
+.liquid .cee #body .e2,
+.liquid .ece #body .e2{ float:right;}
+
+/* ----- Hybrid 2 Column Layout ----- */
+.hybrid .ce #body{ padding-right:230px;}
+.hybrid .ec #body{ padding-left:230px; }
+.hybrid .ce #body .e1,
+.hybrid .ec #body .e1{ width:200px; padding:10px;}
+.hybrid .ce #body #content{ width:100%; padding:10px 0 10px 10px; }
+.hybrid .ec #body #content{ width:100%; padding:10px 10px 10px 0; margin-left:-100%;}
+.hybrid .ce #body #content{ float:left;}
+.hybrid .ec #body #content{ float:right;}
+.hybrid .ce #body .e1,
+.hybrid .ec #body .e1{ display:block; }
+.hybrid .ce #body .e1{ float:right; clear:right; margin-left:-220px; right:-220px;}
+.hybrid .ec #body .e1{ float:left; clear:left; margin-right:-230px; left:-230px;}
+
+/* ----- Hybrid 3 Column Layout ----- */
+.hybrid .cee #body .e1,
+.hybrid .cee #body .e2,
+.hybrid .ece #body .e1,
+.hybrid .ece #body .e2,
+.hybrid .eec #body .e1,
+.hybrid .eec #body .e2{ display:block; width:200px; padding:10px; }
+
+.hybrid .cee #body{ padding-right:440px; padding-left:10px; }
+.hybrid .ece #body{ padding-left:220px; padding-right:220px;}
+.hybrid .eec #body{ padding-left:440px; padding-right:10px;}
+
+.hybrid .cee #body #content{width:100%;padding:10px 0 10px 0; }
+.hybrid .ece #body #content{width:100%;padding:10px 0 10px 0; }
+.hybrid .eec #body #content{width:100%;padding:10px 0 10px 0; }
+
+.hybrid .cee #body #content{ float:left; margin-right:-450px; }
+.hybrid .ece #body #content{ float:left; margin-right:-100%;}
+.hybrid .eec #body #content{ float:right;}
+
+.hybrid .ece #body .e1,
+.hybrid .eec #body .e2{ float:left; left:-220px; margin-right:-220px;}
+.hybrid .eec #body .e1{ float:left; left:-440px; margin-right:-220px;}
+
+.hybrid .cee #body .e1,
+.hybrid .ece #body .e2{ float:right; left:220px; margin-left:-220px;}
+.hybrid .cee #body .e2{ float:right; left:440px; margin-left:-220px;}
+
diff --git a/modules/layout/faceoff/js/layout.js b/modules/layout/faceoff/js/layout.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/layout/faceoff/layout.html b/modules/layout/faceoff/layout.html
new file mode 100644
index 000000000..21507410e
--- /dev/null
+++ b/modules/layout/faceoff/layout.html
@@ -0,0 +1,56 @@
+<div id="xe" class="{$layout_info->faceoff_ini_config['type']} {$layout_info->faceoff_ini_config['align']}">
+    <div id="container" class="{$layout_info->faceoff_ini_config['column']}">
+        <div id="header">
+            <a href="#content" class="skipToContent">Skip to content</a>
+            <h1><a href="{$layout_info->index_url}"><!--@if($layout_info->logo_image)--><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /><!--@elseif($layout_info->logo_text)-->{$layout_info->logo_text}<!--@else-->Title<!--@end--></a></h1>
+            <hr />
+        </div>
+        <hr />
+
+        <div id="neck">
+            <div class="extension neck">
+            <!-- start-neck -->
+
+            <!-- end-neck -->
+            </div>
+        </div>
+        <hr />
+
+        <div id="body">
+            <div id="content">
+            {$content}
+            </div>
+            <hr />
+            <div class="extension e1">
+            <!-- start-e1 -->
+
+            <!-- end-e1 -->
+            </div>
+            <hr />
+            <div class="extension e2">
+            <!-- start-e2 -->
+
+            <!-- end-e2 -->
+            </div>
+        </div>
+        <hr />
+        <div id="knee">
+            <div class="extension knee">
+            <!-- start-knee -->
+
+            <!-- end-knee -->
+            </div>
+        </div>
+        <hr />
+        <div id="footer">
+            <hr />
+            <address>
+                <!--@if($layout_info->copyright_text)-->
+                    {$layout_info->copyright_text}
+                <!--@else-->
+                    Copyright &copy; <a href="http://www.xpressengine.com" onclick="window.open(this.href);return false;"><abbr title="Xpress Engine">XE</abbr>.</a> All Rights Reserved.
+                <!--@end-->
+            </address>
+        </div>
+    </div>
+</div>
diff --git a/modules/layout/faceoff/layout.ini b/modules/layout/faceoff/layout.ini
new file mode 100644
index 000000000..328dcd02e
--- /dev/null
+++ b/modules/layout/faceoff/layout.ini
@@ -0,0 +1,3 @@
+type=hybrid
+align=aCenter
+column=ec
diff --git a/modules/layout/lang/en.lang.php b/modules/layout/lang/en.lang.php
index e88a9b430..5aa636891 100644
--- a/modules/layout/lang/en.lang.php
+++ b/modules/layout/lang/en.lang.php
@@ -30,4 +30,84 @@
         "It will be applied to the service when you save the layout code after editing it.
         Please first preview your code and then save it.
         You can refer grammar of XE's template from <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Template</a>.";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/es.lang.php b/modules/layout/lang/es.lang.php
index b6bd1d9bd..311da99cf 100644
--- a/modules/layout/lang/es.lang.php
+++ b/modules/layout/lang/es.lang.php
@@ -30,4 +30,83 @@
         "El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado.
 		Primero visualiza previamente tus códigos y luego guardalos
         Referente al código de planillas de XE dirijirse a<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Pamphlet(Ingles)</a> ";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/fr.lang.php b/modules/layout/lang/fr.lang.php
index f48fc61ce..8671c98dc 100644
--- a/modules/layout/lang/fr.lang.php
+++ b/modules/layout/lang/fr.lang.php
@@ -30,4 +30,83 @@
         "Vous conservez la code de Mise en Page après l'éditer, la code sera appliquée sur le service.
         Utilisez [Avant-première] avant conserver la code S.V.P.
         Vous pouvez référer la grammaire de modèle de XE sur <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">Modèle du XE</a>.";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/jp.lang.php b/modules/layout/lang/jp.lang.php
index 659f1b853..94bc48267 100644
--- a/modules/layout/lang/jp.lang.php
+++ b/modules/layout/lang/jp.lang.php
@@ -30,4 +30,83 @@
         "下のレイアウトコードを修正して保存するとサービスに反映されます。
         必ずプレビューで確認した上で保存してください。
         XEのテンプレート文法は<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XEテンプレート</a>を参考してください。";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index 90d1e6314..ab27d806c 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -9,25 +9,105 @@
     $lang->cmd_layout_edit = '레이아웃 편집';
 
     $lang->layout_name = '레이아웃 이름';
-    $lang->layout_maker = "레이아웃 제작자";
+    $lang->layout_maker = '레이아웃 제작자';
     $lang->layout_license = '라이선스';
     $lang->layout_history = '변경 이력';
-    $lang->layout_info = "레이아웃 정보";
+    $lang->layout_info = '레이아웃 정보';
     $lang->layout_list = '레이아웃 목록';
     $lang->menu_count = '메뉴수';
     $lang->downloaded_list = '다운로드 목록';
     $lang->layout_preview_content = '내용이 출력되는 부분입니다';
     $lang->not_apply_menu = '레이아웃 일괄 적용';
 
-    $lang->cmd_move_to_installed_list = "생성된 목록 보기";
+    $lang->cmd_move_to_installed_list = '생성된 목록 보기';
 
-    $lang->about_downloaded_layouts = "다운로드 되어 있는 레이아웃 목록";
+    $lang->about_downloaded_layouts = '다운로드 되어 있는 레이아웃 목록';
     $lang->about_title = '모듈에 연결시 쉽게 구분할 수 있는 제목을 입력해주세요';
     $lang->about_not_apply_menu = '체크를 하시면 연결된 모든 메뉴의 모듈 레이아웃을 일괄 변경합니다.';
 
-    $lang->about_layout = "레이아웃 모듈은 사이트의 레이아웃을 쉽게 만들 수 있도록 도와줍니다.<br />레이아웃 설정과 메뉴의 연결을 통해서 다양한 모듈이 완성된 사이트의 모습으로 보여줄 수 있도록 합니다.<br />* 삭제나 수정이 불가능한 레이아웃은 블로그나 기타 모듈의 자체 레이아웃이므로 해당 모듈로 가서 설정하셔야 합니다.";
+    $lang->about_layout = '레이아웃 모듈은 사이트의 레이아웃을 쉽게 만들 수 있도록 도와줍니다.<br />레이아웃 설정과 메뉴의 연결을 통해서 다양한 모듈이 완성된 사이트의 모습으로 보여줄 수 있도록 합니다.<br />* 삭제나 수정이 불가능한 레이아웃은 블로그나 기타 모듈의 자체 레이아웃이므로 해당 모듈로 가서 설정하셔야 합니다.';
     $lang->about_layout_code = 
         "아래 레이아웃의 코드를 직접 수정후 저장하시면 서비스에 반영이 됩니다.
         꼭 미리보기를 하신 후에 저장을 하세요.
         XE의 템플릿 문법은 <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE 템플릿</a> 을 참고하시면 됩니다.";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/ru.lang.php b/modules/layout/lang/ru.lang.php
index 13472a7d4..c1a10c43f 100644
--- a/modules/layout/lang/ru.lang.php
+++ b/modules/layout/lang/ru.lang.php
@@ -30,4 +30,83 @@
         "Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование.
         Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его.
         Вы можете обратиться к грамматике шаблонов XE с <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Template</a>.";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/zh-CN.lang.php b/modules/layout/lang/zh-CN.lang.php
index 0f01785c4..2114021e9 100644
--- a/modules/layout/lang/zh-CN.lang.php
+++ b/modules/layout/lang/zh-CN.lang.php
@@ -32,4 +32,83 @@
         "修改的布局代码保存后即可生效。
 	保存之前请必须先预览后再保存。
         XE 布局语法请参考<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE 模板</a>。";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/lang/zh-TW.lang.php b/modules/layout/lang/zh-TW.lang.php
index 22fab2df1..ac6792ea1 100644
--- a/modules/layout/lang/zh-TW.lang.php
+++ b/modules/layout/lang/zh-TW.lang.php
@@ -29,5 +29,85 @@
     $lang->about_layout_code = 
         "儲存修改後的版面，即可生效。
 	     儲存之前，請先預覽後再儲存。
-        XE 版面設計語法，請參考<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE 樣版</a>。";
+        XE版面設計語法，請參考<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE 樣版</a>。";
+
+    $lang->layout_export = '내보내기';
+    $lang->layout_btn_export = '내 레이아웃 다운로드';
+    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
+    $lang->layout_import = '가져오기';
+    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다.
+    가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
+    $lang->layout_manager = array(
+        0  => '레이아웃 매니저',
+        1  => '저장',
+        2  => '취소',
+        3  => '형태',
+        4  => '배열',
+        5  => '정렬',
+        6  => '고정 레이아웃',
+        7  => '가변 레이아웃',
+        8  => '고정+가변(내용)',
+        9  => '1칸',
+        10 => '2칸 (내용 왼쪽)',
+        11 => '2칸 (내용 오른쪽)',
+        12 => '3칸 (내용 왼쪽)',
+        13 => '3칸 (내용 가운데)',
+        14 => '3칸 (내용 오른쪽)',
+        15 => '왼쪽',
+        16 => '가운데',
+        17 => '오른쪽',
+        18 => '전체',
+        19 => '레이아웃',
+        20 => '위젯 추가',
+        21 => '내용 위젯 추가',
+        22 => '속성',
+        23 => '위젯 스타일',
+        24 => '수정',
+        25 => '삭제',
+        26 => '정렬',
+        27 => '한줄 차지',
+        28 => '왼쪽',
+        29 => '오른쪽',
+        30 => '가로 너비',
+        31 => '높이',
+        32 => '바깥 여백',
+        33 => '안쪽 여백',
+        34 => '위',
+        35 => '왼',
+        36 => '오른',
+        37 => '아래',
+        38 => '테두리', 
+        39 => '없음',
+        40 => '배경',
+        41 => '색상',
+        42 => '그림',
+        43 => '선택',
+        44 => '배경 그림 반복',
+        45 => '반복',
+        46 => '반복 안함',
+        47 => '가로 반복',
+        48 => '세로 반복',
+        49 => '적용',
+        50 => '취소',
+        51 => '초기화',
+        52 => '글자',
+        53 => '글자 폰트',
+        54 => '글자 색',
+    );
+
+    $lang->layout_image_repository = '레이아웃 파일 저장소';
+    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
+    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
+    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
+    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
+
+    $lang->about_faceoff = array(
+        'title' => 'XpressEngine FaceOff Layout 관리자',
+        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
+        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
+        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
+        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
+        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
+
+    );
 ?>
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 0751b7f6d..15a52b291 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -18,21 +18,43 @@
          * 레이아웃의 신규 생성은 제목만 받아서 layouts테이블에 입력함
          **/
         function procLayoutAdminInsert() {
+            // 레이아웃 생성과 관련된 기본 정보를 받음
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
             $args->layout_srl = getNextSequence();
             $args->layout = Context::get('layout');
             $args->title = Context::get('title');
 
+            // DB 입력
             $output = $this->insertLayout($args);
             if(!$output->toBool()) return $output;
 
+            // faceOff 레이아웃일 경우 init 필요
+            $this->initLayout($args->layout_srl, $args->layout);
+
+            // 결과 리턴
             $this->add('layout_srl', $args->layout_srl);
         }
 
+        // 레이아웃 정보를 DB에 입력
         function insertLayout($args) {
             $output = executeQuery("layout.insertLayout", $args);
             return $output;
         }
 
+        // faceOff 레이아웃을 경우 init
+        function initLayout($layout_srl, $layout_name){
+            $oLayoutModel = &getModel('layout');
+
+            // faceOff일 경우 sample import
+            if($oLayoutModel->useDefaultLayout($layout_name)) {
+                $this->importLayout($layout_srl, $this->module_path.'tpl/faceOff_sample.tar');
+            // 디렉토리 제거
+            } else {
+                FileHandler::removeDir($oLayoutModel->getUserLayoutPath($layout_srl));
+            }
+        }
+
         /**
          * @brief 레이아웃 정보 변경
          * 생성된 레이아웃의 제목과 확장변수(extra_vars)를 적용한다
@@ -46,22 +68,27 @@
             unset($extra_vars->layout);
             unset($extra_vars->title);
             unset($extra_vars->apply_layout);
-            unset($extra_vars->header_script);
 
             $args = Context::gets('layout_srl','title');
 
             // 레이아웃의 정보를 가져옴
             $oLayoutModel = &getModel('layout');
+            $oMenuAdminModel = &getAdminModel('menu');
             $layout_info = $oLayoutModel->getLayout($args->layout_srl);
             $menus = get_object_vars($layout_info->menu);
             if(count($menus) ) {
                 foreach($menus as $menu_id => $val) {
                     $menu_srl = Context::get($menu_id);
                     if(!$menu_srl) continue;
+
+                    $output = $oMenuAdminModel->getMenu($menu_srl);
                     $menu_srl_list[] = $menu_srl;
+                    $menu_name_list[$menu_srl] = $output->title;
+
                     if(Context::get('apply_layout')=='Y') {
                         $menu_args = null;
                         $menu_args->menu_srl = $menu_srl;
+                        $menu_args->site_srl = $layout_info->site_srl;
                         $output = executeQueryArray('layout.getLayoutModules', $menu_args);
                         if($output->data) {
                             $modules = array();
@@ -90,10 +117,11 @@
                     // 삭제 요청에 대한 변수를 구함
                     $del_var = $extra_vars->{"del_".$name};
                     unset($extra_vars->{"del_".$name});
-                    if($del_var == 'Y') {
-                        $extra_vars->{$name} = '';
+                    // 삭제 요청이 있거나, 새로운 파일이 업로드 되면, 기존 파일 삭제
+                    if($del_var == 'Y' || $image_obj['tmp_name']) {
                         FileHandler::removeFile($extra_vars->{$name});
-                        continue;
+                        $extra_vars->{$name} = '';
+                        if($del_var == 'Y' && !$image_obj['tmp_name']) continue;
                     }
 
                     // 정상적으로 업로드된 파일이 아니면 무시
@@ -122,8 +150,11 @@
             $oModuleController = &getController('module');
             $layout_config->header_script = Context::get('header_script');
             $oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
-            
-            // DB에 입력하기 위한 변수 설정 
+
+            //menu의 title도 저장하자
+            $extra_vars->menu_name_list = $menu_name_list;
+
+            // DB에 입력하기 위한 변수 설정
             $args->extra_vars = serialize($extra_vars);
 
             $output = $this->updateLayout($args);
@@ -138,7 +169,8 @@
         function updateLayout($args) {
             $output = executeQuery('layout.updateLayout', $args);
             if($output->toBool()) {
-                $cache_file = sprintf('./files/cache/layout/%s.%s.cache.php', $args->layout_srl, Context::getLangType());
+                $oLayoutModel = &getModel('layout');
+                $cache_file = $oLayoutModel->getUserLayoutCache($args->layout_srl, Context::getLangType());
                 FileHandler::removeFile($cache_file);
             }
             return $output;
@@ -150,31 +182,24 @@
          **/
         function procLayoutAdminDelete() {
             $layout_srl = Context::get('layout_srl');
+            return $this->deleteLayout($layout_srl);
+        }
 
-            // 캐시 파일 삭제 
-            $cache_list = FileHandler::readDir("./files/cache/layout","",false,true);
-            if(count($cache_list)) {
-                foreach($cache_list as $cache_file) {
-                    $pos = strpos($cache_file, $layout_srl.'.');
-                    if($pos>0)FileHandler::removeFile($cache_file);
-                }
-            }
+        function deleteLayout($layout_srl) {
+            $oLayoutModel = &getModel('layout');
 
-            $layout_file = sprintf('./files/cache/layout/%d.html', $layout_srl);
+            $path = $oLayoutModel->getUserLayoutPath($layout_srl);
+            FileHandler::removeDir($path);
+
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
             if(file_exists($layout_file)) FileHandler::removeFile($layout_file);
 
             // 레이아웃 삭제
             $args->layout_srl = $layout_srl;
-
-            $output = $this->deleteLayout($args);
+            $output = executeQuery("layout.deleteLayout", $args);
             if(!$output->toBool()) return $output;
 
-            $this->setMessage('success_deleted');
-        }
-
-        function deleteLayout($args) {
-            $output = executeQuery("layout.deleteLayout", $args);
-            return $output;
+            return new Object(0,'success_deleted');
         }
 
         /**
@@ -183,11 +208,15 @@
         function procLayoutAdminCodeUpdate() {
             $layout_srl = Context::get('layout_srl');
             $code = Context::get('code');
+            $code_css = Context::get('code_css');
             if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
 
-            $layout_file = sprintf('./files/cache/layout/%d.html', $layout_srl);
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
             FileHandler::writeFile($layout_file, $code);
 
+            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_srl);
+            FileHandler::writeFile($layout_css_file, $code_css);
             $this->setMessage('success_updated');
         }
 
@@ -198,10 +227,271 @@
             $layout_srl = Context::get('layout_srl');
             if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
 
-            $layout_file = sprintf('./files/cache/layout/%d.html', $layout_srl);
+            // delete user layout file
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
             FileHandler::removeFile($layout_file);
 
+            $info = $oLayoutModel->getLayout($layout_srl);
+
+            // if face off delete, tmp file
+            if($oLayoutModel->useDefaultLayout($info->layout)){
+                $this->deleteUserLayoutTempFile($layout_srl);
+                $faceoff_css = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
+                FileHandler::removeFile($faceoff_css);
+            }
+
+            $this->initLayout($layout_srl, $info->layout);
             $this->setMessage('success_reset');
         }
+
+
+        /**
+         * @brief 레이아웃 설정페이지 -> 이미지 업로드
+         *
+         **/
+        function procLayoutAdminUserImageUpload(){
+            if(!Context::isUploaded()) exit();
+
+            $image = Context::get('user_layout_image');
+            $layout_srl = Context::get('layout_srl');
+            if(!is_uploaded_file($image['tmp_name'])) exit();
+
+            if(!preg_match('/\.(gif|jpg|jpeg|gif|png|swf|flv)$/i', $image['name'])){
+                return false;
+            }
+
+            $this->insertUserLayoutImage($layout_srl, $image);
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+        /**
+         * @brief 레이아웃 설정페이지 -> 이미지 업로드
+         *
+         **/
+        function insertUserLayoutImage($layout_srl,$source){
+            $oLayoutModel = &getModel('layout');
+            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            if(!is_dir($path)) FileHandler::makeDir($path);
+
+            $filename = strtolower($source['name']);
+            if($filename != urlencode($filename)){
+                $ext = substr(strrchr($filename,'.'),1);
+                $filename = sprintf('%s.%s', md5($filename), $ext);
+            }
+
+            if(file_exists($path .'/'. $filename)) @unlink($path . $filename);
+            if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false;
+            return true;
+        }
+
+
+        /**
+         * @brief 레이아웃 설정페이지 -> 이미지 삭제
+         *
+         **/
+        function removeUserLayoutImage($layout_srl,$filename){
+            $oLayoutModel = &getModel('layout');
+            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            @unlink($path . $filename);
+        }
+
+        /**
+         * @brief 레이아웃 설정페이지 -> 이미지 삭제
+         *
+         **/
+        function procLayoutAdminUserImageDelete(){
+            $filename = Context::get('filename');
+            $layout_srl = Context::get('layout_srl');
+            $this->removeUserLayoutImage($layout_srl,$filename);
+            $this->setMessage('success_deleted');
+        }
+
+
+        /**
+         * @brief 레이아웃 설정 저장
+         * ini 로 저장한다 faceoff 용
+         **/
+        function procLayoutAdminUserValueInsert(){
+            $oModuleModel = &getModel('module');
+
+            $mid = Context::get('mid');
+            if(!$mid) return new Object(-1, 'msg_invalid_request');
+
+            $site_module_info = Context::get('site_module_info');
+            $module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl);
+            $layout_srl = $module_info->layout_srl;
+            if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
+
+            $oLayoutModel = &getModel('layout');
+
+            // save tmp?
+            $temp = Context::get('saveTemp');
+            if($temp =='Y'){
+                $oLayoutModel->setUseUserLayoutTemp();
+            }else{
+                // delete temp files
+                $this->deleteUserLayoutTempFile($layout_srl);
+            }
+
+            $this->add('saveTemp',$temp);
+
+            // write user layout
+            $extension_obj = Context::gets('e1','e2','neck','knee');
+
+            $file = $oLayoutModel->getUserLayoutHtml($layout_srl);
+            $content = FileHandler::readFile($file);
+            $content = $this->addExtension($layout_srl,$extension_obj,$content);
+            FileHandler::writeFile($file,$content);
+
+            // write faceoff.css
+            $css = Context::get('css');
+
+            $css_file = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
+            FileHandler::writeFile($css_file,$css);
+
+            // write ini
+            $obj = Context::gets('type','align','column');
+            $obj = (array)$obj;
+            $src = $oLayoutModel->getUserLayoutIniConfig($layout_srl);
+            foreach($obj as $key => $val) $src[$key] = $val;
+            $this->insertUserLayoutValue($layout_srl,$src);
+        }
+
+        /**
+         * @brief 레이아웃 설정 ini 저장
+         *
+         **/
+        function insertUserLayoutValue($layout_srl,$arr){
+            $oLayoutModel = &getModel('layout');
+            $file = $oLayoutModel->getUserLayoutIni($layout_srl);
+            FileHandler::writeIniFile($file, $arr);
+        }
+
+        function writeUserLayoutCss(){
+
+        }
+
+        /**
+         * @brief faceoff용 위젯코드를 사용자 layout 파일에 직접 추가한다
+         *
+         **/
+        function addExtension($layout_srl,$arg,$content){
+            $oLayoutModel = &getModel('layout');
+             $reg = '(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)';
+             $extension_content =  '\1' .stripslashes($arg->e1) . '\3';
+             $content = eregi_replace($reg,$extension_content,$content);
+
+             $reg = '(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)';
+             $extension_content =  '\1' .stripslashes($arg->e2) . '\3';
+             $content = eregi_replace($reg,$extension_content,$content);
+
+             $reg = '(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)';
+             $extension_content =  '\1' .stripslashes($arg->neck) . '\3';
+             $content = eregi_replace($reg,$extension_content,$content);
+
+             $reg = '(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)';
+             $extension_content =  '\1' .stripslashes($arg->knee) . '\3';
+             $content = eregi_replace($reg,$extension_content,$content);
+            return $content;
+        }
+
+
+        /**
+         * @brief faceoff용 temp file들을 지운다
+         *
+         **/
+         function deleteUserLayoutTempFile($layout_srl){
+             $oLayoutModel = &getModel('layout');
+             $file_list = $oLayoutModel->getUserLayoutTempFileList($layout_srl);
+             foreach($file_list as $key => $file){
+                FileHandler::removeFile($file);
+             }
+         }
+
+        /**
+         * @brief faceoff export
+         *
+         **/
+         function procLayoutAdminUserLayoutExport(){
+            $layout_srl = Context::get('layout_srl');
+            if(!$layout_srl) return new Object('-1','msg_invalid_request');
+
+            require_once(_XE_PATH_.'libs/tar.class.php');
+
+            // 압축할 파일 목록을 가져온다
+            $oLayoutModel = &getModel('layout');
+            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
+
+            // 압축을 한다.
+            $tar = new tar();
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
+            chdir($user_layout_path);
+            $replace_path = getNumberingPath($layout_srl,3);
+            foreach($file_list as $key => $file) $tar->addFile($file,$replace_path,'__LAYOUT_PATH__');
+
+            $stream = $tar->toTarStream();
+            $filename = 'faceoff_' . date('YmdHis') . '.tar';
+            header("Cache-Control: ");
+            header("Pragma: ");
+            header("Content-Type: application/x-compressed");
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+//            header("Content-Length: " .strlen($stream)); ?? why??
+            header('Content-Disposition: attachment; filename="'. $filename .'"');
+            header("Content-Transfer-Encoding: binary\n");
+            echo $stream;
+
+            // Context를 강제로 닫고 종료한다.
+            Context::close();
+            exit();
+         }
+
+        /**
+         * @brief faceoff import
+         *
+         **/
+         function procLayoutAdminUserLayoutImport(){
+            // check upload
+            if(!Context::isUploaded()) exit();
+            $file = Context::get('file');
+            if(!is_uploaded_file($file['tmp_name'])) exit();
+            if(!preg_match('/\.(tar)$/i', $file['name'])) exit();
+
+            $layout_srl = Context::get('layout_srl');
+            if(!$layout_srl) exit();
+
+            $oLayoutModel = &getModel('layout');
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
+            if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
+
+            $this->importLayout($layout_srl, $user_layout_path.'faceoff.tar');
+        }
+
+        function importLayout($layout_srl, $source_file) {
+            $oLayoutModel = &getModel('layout');
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
+            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
+            foreach($file_list as $key => $file){
+                FileHandler::removeFile($user_layout_path . $file);
+            }
+
+            require_once(_XE_PATH_.'libs/tar.class.php');
+            $image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            FileHandler::makeDir($image_path);
+            $tar = new tar();
+            $tar->openTAR($source_file);
+
+            // layout.ini 파일이 없으면 
+            if(!$tar->getFile('layout.ini')) return;
+
+            $replace_path = getNumberingPath($layout_srl,3);
+            foreach($tar->files as $key => $info) {
+                FileHandler::writeFile($user_layout_path . $info['name'],str_replace('__LAYOUT_PATH__',$replace_path,$info['file']));
+            }
+
+            // 업로드한 파일을 삭제
+            FileHandler::removeFile($source_file);
+         }
     }
 ?>
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 10bc47936..1f7f485d2 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -24,9 +24,9 @@
 
             $this->setTemplateFile('index');
         }
- 
+
         /**
-         * @brief 레이아웃 등록 페이지 
+         * @brief 레이아웃 등록 페이지
          * 1차적으로 레이아웃만 선택한 후 DB 에 빈 값을 넣고 그 후 상세 값 설정하는 단계를 거침
          **/
         function dispLayoutAdminInsert() {
@@ -42,7 +42,8 @@
          * @brief 레이아웃 세부 정보 입력
          **/
         function dispLayoutAdminModify() {
-            // 선택된 레이아웃의 정보르 구해서 세팅 
+
+            // 선택된 레이아웃의 정보르 구해서 세팅
             $layout_srl = Context::get('layout_srl');
 
             // 레이아웃의 정보를 가져옴
@@ -52,6 +53,8 @@
             // 등록된 레이아웃이 없으면 오류 표시
             if(!$layout_info) return $this->dispLayoutAdminContent();
 
+            // faceoff면 경로를 보여줄 필요는 없다
+            if($layout_info->type == 'faceoff') unset($layout_info->path);
             Context::set('selected_layout', $layout_info);
 
             // 메뉴 목록을 가져옴
@@ -66,7 +69,7 @@
          * @brief 레이아웃 코드 편집
          **/
         function dispLayoutAdminEdit() {
-            // 선택된 레이아웃의 정보르 구해서 세팅 
+            // 선택된 레이아웃의 정보르 구해서 세팅
             $layout_srl = Context::get('layout_srl');
 
             // 레이아웃의 정보를 가져옴
@@ -76,14 +79,35 @@
             // 등록된 레이아웃이 없으면 오류 표시
             if(!$layout_info) return $this->dispLayoutAdminContent();
             Context::set('selected_layout', $layout_info);
-            
+
             // 레이아웃 코드 가져오기
-            $layout_file = sprintf('./files/cache/layout/%d.html', $layout_info->layout_srl);
-            if(!file_exists($layout_file)) $layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+            if(!file_exists($layout_file)){
+                // faceoff 면
+                if($oLayoutModel->useDefaultLayout($layout_info->layout_srl)){
+                    $layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+                }else{
+                    $layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
+                }
+            }
+
+            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
+            if(file_exists($layout_css_file)){
+                $layout_code_css = FileHandler::readFile($layout_css_file);
+                Context::set('layout_code_css', $layout_code_css);
+            }
 
             $layout_code = FileHandler::readFile($layout_file);
             Context::set('layout_code', $layout_code);
 
+            // set User Images
+            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_info->layout_srl);
+            Context::set('layout_image_list', $layout_image_list);
+
+            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl);
+            Context::set('layout_image_path', $layout_image_path);
+
             // 위젯 목록을 세팅
             $oWidgetModel = &getModel('widget');
             $widget_list = $oWidgetModel->getDownloadedWidgetList();
@@ -119,6 +143,15 @@
             $layout_info = $oLayoutModel->getLayout($layout_srl);
             if(!$layout_info) return new Object(-1, 'msg_invalid_request');
 
+            // faceoff 레이아웃일 경우 별도 처리
+            if($layout_info && $layout_info->type == 'faceoff') {
+                $oLayoutModel->doActivateFaceOff($layout_info);
+            }
+
+            // 관리자 레이아웃 수정화면에서 변경된 CSS가 있는지 조사
+            $edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
+            if(file_exists($edited_layout_css)) Context::addCSSFile($edited_layout_css);
+
             // 레이아웃 정보중 extra_vars의 이름과 값을 $layout_info에 입력
             if($layout_info->extra_var_count) {
                 foreach($layout_info->extra_var as $var_id => $val) {
@@ -153,7 +186,7 @@
             $oContext = &Context::getInstance();
             $layout_tpl = $oContext->transContent($layout_tpl);
             Context::set('layout_tpl', $layout_tpl);
-            
+
             // 임시 파일 삭제
             FileHandler::removeFile($edited_layout_file);
 
@@ -164,7 +197,7 @@
          * @brief 레이아웃의 상세 정보(conf/info.xml)를 팝업 출력
          **/
         function dispLayoutAdminInfo() {
-            // 선택된 레이아웃 정보를 구함 
+            // 선택된 레이아웃 정보를 구함
             $oLayoutModel = &getModel('layout');
             $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
             Context::set('layout_info', $layout_info);
@@ -175,5 +208,73 @@
             // 템플릿 파일 지정
             $this->setTemplateFile('layout_detail_info');
         }
+
+
+        /**
+         * @brief faceoff의 관리자 layout 수정
+         **/
+        function dispLayoutAdminLayoutModify(){
+            // widget 을 수정용으로 컴파일
+            Context::setTransWidgetCodeIncludeInfo(true);
+
+            //layout_srl 를 가져온다
+            $current_module_info = Context::get('current_module_info');
+            $layout_srl = $current_module_info->layout_srl;
+
+            // 파일로 임시저장을 하기때문에 남아 있을지 모르는 tmp를 지운다
+            // to do 개선이 필요
+            $delete_tmp = Context::get('delete_tmp');
+            if($delete_tmp =='Y'){
+                $oLayoutAdminController = &getAdminController('layout');
+                $oLayoutAdminController->deleteUserLayoutTempFile($layout_srl);
+            }
+
+            $oLayoutModel = &getModel('layout');
+
+            // layout file들은 temp로 사용한다.
+            $oLayoutModel->setUseUserLayoutTemp();
+
+            // css 를 inline style로 뽑는다
+            $faceoffcss = $oLayoutModel->_getUserLayoutFaceOffCss($current_module_info->layout_srl);
+
+            $css = FileHandler::readFile($faceoffcss);
+            $match = null;
+            preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match);
+            for($i=0,$c=count($match[1]);$i<$c;$i++) {
+                $name = trim($match[1][$i]);
+                $css = trim($match[2][$i]);
+                if(!$css) continue;
+                $css = str_replace('./images/',Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl),$css);
+                $style[] .= sprintf('"%s":"%s"',$name,$css);
+            }
+
+            if(count($style)) {
+                $script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',',$style).'}; </script>';
+                Context::addHtmlHeader($script);
+            }
+
+            $oTemplate = &TemplateHandler::getInstance();
+            Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('faceoff_layout_edit');
+        }
+
+        function dispLayoutAdminLayoutImageList(){
+            $layout_srl = Context::get('layout_srl');
+            $oLayoutModel = &getModel('layout');
+
+            // 이미지 목록
+            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_srl);
+            Context::set('layout_image_list',$layout_image_list);
+
+            // 경로
+            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            Context::set('layout_image_path',$layout_image_path);
+
+            $this->setLayoutFile('popup_layout');
+
+            $this->setTemplateFile('layout_image_list');
+        }
     }
 ?>
diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php
index 93def1d09..1e9a808ce 100644
--- a/modules/layout/layout.class.php
+++ b/modules/layout/layout.class.php
@@ -11,15 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminContent');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminInsert');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminModify');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminEdit');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminDownloadedList');
-            $oModuleController->insertActionForward('layout', 'view', 'dispLayoutAdminInfo');
-            
             // 레이아웃에서 사용할 디렉토리 생성
             FileHandler::makeDir('./files/cache/layout');
 
@@ -30,6 +21,18 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oDB = &DB::getInstance();
+
+            // 2009. 02. 11 layout 테이블에 site_srl 추가
+            if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+
+            // 2009. 02. 26 faceOff에 맞춰 기존 레이아웃 편집본을 이동
+            $files = FileHandler::readDir('./files/cache/layout');
+            for($i=0,$c=count($files);$i<$c;$i++) {
+                $filename = $files[$i];
+                if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+            }
+
             return false;
         }
 
@@ -37,9 +40,31 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            return new Object();
+            $oDB = &DB::getInstance();
+
+            // 2009. 02. 11 menu 테이블에 site_srl 추가
+            if(!$oDB->isColumnExists('layouts', 'site_srl')) {
+                $oDB->addColumn('layouts','site_srl','number',11,0,true);
+            }
+
+            // 2009. 02. 26 faceOff에 맞춰 기존 레이아웃 편집본을 이동
+            $oLayoutModel = &getModel('layout');
+            $files = FileHandler::readDir('./files/cache/layout');
+            for($i=0,$c=count($files);$i<$c;$i++) {
+                $filename = $files[$i];
+                if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+                $layout_srl = $match[1];
+                if(!$layout_srl) continue;
+                $path = $oLayoutModel->getUserLayoutPath($layout_srl);
+                if(!is_dir($path)) FileHandler::makeDir($path);
+                FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
+                @unlink('./files/cache/layout/'.$filename);
+            }
+
+            return new Object(0, 'success_updated');
         }
 
+
         /**
          * @brief 캐시 파일 재생성
          **/
@@ -50,6 +75,7 @@
                 FileHandler::makeDir($path);
                 return;
             }
+
             $directory = dir($path);
             while($entry = $directory->read()) {
                 if ($entry == "." || $entry == ".." || preg_match('/\.html$/i',$entry) ) continue;
@@ -57,52 +83,5 @@
             }
             $directory->close();
         }
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procLayoutAdminUpdate' :
-                case 'dispLayoutAdminPreview' :
-                case 'procLayoutAdminCodeReset' :
-                case 'procLayoutAdminCodeUpdate' :
-                        // 레이아웃 정보에 할당된 srl이 없으면 패스
-                        if(!$args->layout_srl) return false;
-
-                        // 모듈중 레이아웃이 해당 srl에 연결될 것이 있는지 확인
-                        $oModuleModel = &getModel('module');
-                        $module_list = $oModuleModel->getModulesInfoByLayout($args->layout_srl);
-                        $module_count = count($module_list);
-
-                        $is_granted = false;
-                        for($i=0;$i<$module_count;$i++) {
-                            $module_info = $module_list[$i];
-                            if($oModuleModel->isModuleAdmin($module_list[$i],$logged_info)) {
-                                $is_granted = true;
-                                break;
-                            }
-                        }
-                        return $is_granted;
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 07baa0a16..9508018e0 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -8,6 +8,7 @@
 
     class layoutModel extends layout {
 
+        var $useUserLayoutTemp = null;
         /**
          * @brief 초기화
          **/
@@ -18,10 +19,14 @@
          * @brief DB 에 생성된 레이아웃의 목록을 구함
          * 생성되었다는 것은 DB에 등록이 되었다는 것을 의미
          **/
-        function getLayoutList() {
-            $output = executeQuery('layout.getLayoutList');
+        function getLayoutList($site_srl = 0) {
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
+            }
+            $args->site_srl = $site_srl;
+            $output = executeQuery('layout.getLayoutList', $args);
             if(!$output->data) return;
-
             if(is_array($output->data)) return $output->data;
             return array($output->data);
         }
@@ -45,9 +50,12 @@
          * @brief 레이아웃의 경로를 구함
          **/
         function getLayoutPath($layout_name) {
-            $class_path = sprintf('./layouts/%s/', $layout_name);
+            if($layout_name == 'faceoff'){
+                $class_path = './modules/layout/faceoff/';
+            }else{
+                $class_path = sprintf('./layouts/%s/', $layout_name);
+            }
             if(is_dir($class_path)) return $class_path;
-
             return "";
         }
 
@@ -83,6 +91,7 @@
                 $layout_title = $info->title;
                 $layout = $info->layout;
                 $layout_srl = $info->layout_srl;
+                $site_srl = $info->site_srl;
                 $vars = unserialize($info->extra_vars);
 
                 if($info->module_srl) {
@@ -105,8 +114,11 @@
             }
 
             // cache 파일을 비교하여 문제 없으면 include하고 $layout_info 변수를 return
-            if(!$layout_srl) $cache_file = sprintf('./files/cache/layout/%s.%s.cache.php', $layout, Context::getLangType());
-            else $cache_file = sprintf('./files/cache/layout/%s.%s.cache.php', $layout_srl, Context::getLangType());
+            if(!$layout_srl){
+                $cache_file = $this->getLayoutCache($layout, Context::getLangType());
+            }else{
+                $cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
+            }
 
             if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
                 @include($cache_file);
@@ -130,12 +142,14 @@
             if(!$xml_obj) return;
 
             $buff = '';
+            $buff .= sprintf('$layout_info->site_srl = "%s";', $site_srl);
 
             if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
                 // 레이아웃의 제목, 버전
                 sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
                 $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
                 $buff .= sprintf('$layout_info->layout = "%s";', $layout);
+                $buff .= sprintf('$layout_info->type = "%s";', $xml_obj->attrs->type);
                 $buff .= sprintf('$layout_info->path = "%s";', $layout_path);
                 $buff .= sprintf('$layout_info->title = "%s";', $xml_obj->title->body);
                 $buff .= sprintf('$layout_info->description = "%s";', $xml_obj->description->body);
@@ -342,5 +356,245 @@
             return $layout_info;
         }
 
+
+        /**
+         * @brief layout설정화면에서의 업로드한 이미지목록을 반환한다
+         **/
+        function getUserLayoutImageList($layout_srl){
+            $path = $this->getUserLayoutImagePath($layout_srl);
+            $list = FileHandler::readDir($path);
+            return $list;
+        }
+
+
+        /**
+         * @brief ini config들을 가져온다 array다.
+         **/
+        function getUserLayoutIniConfig($layout_srl, $layout_name=null){
+            $file = $this->getUserLayoutIni($layout_srl);
+            if($layout_name && !file_exists(FileHandler::getRealPath($file))){
+                FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
+            }
+
+            $output = FileHandler::readIniFile($file);
+            return $output;
+        }
+
+        /**
+         * @brief user layout path
+         **/
+        function getUserLayoutPath($layout_srl){
+            return sprintf("./files/faceOff/%s",getNumberingPath($layout_srl,3));
+        }
+
+        /**
+         * @brief user layout image path
+         **/
+        function getUserLayoutImagePath($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'images/';
+        }
+
+        /**
+         * @brief user layout css 관리자가 설정화면에서 저장한 css
+         **/
+        function getUserLayoutCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'layout.css';
+        }
+
+
+        /**
+         * @brief faceoff용 css module handler에서 import 한다
+         **/
+        function getUserLayoutFaceOffCss($layout_srl){
+            $src = $this->_getUserLayoutFaceOffCss($layout_srl);
+            if($this->useUserLayoutTemp == 'temp') return;
+            return $src;
+        }
+
+
+        /**
+         * @brief faceoff용 css module handler에서 import 한다
+         **/
+        function _getUserLayoutFaceOffCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
+        }
+
+        /**
+         * @brief user layout tmp html
+         **/
+        function getUserLayoutTempFaceOffCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
+        }
+
+
+
+        /**
+         * @brief user layout html
+         **/
+        function getUserLayoutHtml($layout_srl){
+            $src = $this->getUserLayoutPath($layout_srl). 'layout.html';
+            $temp = $this->getUserLayoutTempHtml($layout_srl);
+            if($this->useUserLayoutTemp == 'temp'){
+                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+                return $temp;
+            }else{
+                return $src;
+            }
+        }
+
+        /**
+         * @brief user layout tmp html
+         **/
+        function getUserLayoutTempHtml($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
+        }
+
+
+        /**
+         * @brief user layout ini
+         **/
+        function getUserLayoutIni($layout_srl){
+            $src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
+            $temp = $this->getUserLayoutTempIni($layout_srl);
+            if($this->useUserLayoutTemp == 'temp'){
+                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+                return $temp;
+            }else{
+                return $src;
+            }
+        }
+
+        /**
+         * @brief user layout tmp ini
+         **/
+        function getUserLayoutTempIni($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
+        }
+
+        /**
+         * @brief user layout cache 
+         * todo 파일 자체를 삭제 필요가 있다
+         **/
+        function getUserLayoutCache($layout_srl,$lang_type){
+            return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
+        }
+
+        /**
+         * @brief layout cache 
+         **/
+        function getLayoutCache($layout_name,$lang_type){
+            return sprintf("./files/cache/layout/%s.%s.cache.php",$layout_name,$lang_type);
+        }
+
+        /**
+         * @brief default layout ini  사용자의 임의 수정을 막기 위해 
+         **/
+        function getDefaultLayoutIni($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
+        }
+
+        /**
+         * @brief default layout html 사용자의 임의 수정을 막기 위해 
+         **/
+        function getDefaultLayoutHtml($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'layout.html';
+        }
+
+        /**
+         * @brief default layout css 사용자의 임의 수정을 막기 위해 
+         **/
+        function getDefaultLayoutCss($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
+        }
+
+        /**
+         * @brief default layout path 사용자의 임의 수정을 막기 위해 
+         **/
+        function getDefaultLayoutPath() {
+            return "./modules/layout/faceoff/";
+        }
+
+
+        /**
+         * @brief faceoff 인지 
+         **/
+        function useDefaultLayout($layout_name){
+            $info = $this->getLayoutInfo($layout_name);
+            if($info->type == 'faceoff') return true;
+            else return false;
+        }
+
+
+        /**
+         * @brief User Layout 을 임시 저장 모드로
+         **/
+        function setUseUserLayoutTemp($flag='temp'){
+            $this->useUserLayoutTemp = $flag;
+        }
+
+
+        /**
+         * @brief User Layout 임시 저장 파일 목록.
+         **/
+        function getUserLayoutTempFileList($layout_srl){
+            $file_list = array(
+                $this->getUserLayoutTempHtml($layout_srl)
+                ,$this->getUserLayoutTempFaceOffCss($layout_srl)
+                ,$this->getUserLayoutTempIni($layout_srl)
+            );
+            return $file_list;
+        }
+
+
+        /**
+         * @brief User Layout 저장 파일 목록.
+         **/
+        function getUserLayoutFileList($layout_srl){
+            $file_list = array(
+                basename($this->getUserLayoutHtml($layout_srl))
+                ,basename($this->getUserLayoutFaceOffCss($layout_srl))
+                ,basename($this->getUserLayoutIni($layout_srl))
+                ,basename($this->getUserLayoutCss($layout_srl))
+            );
+
+            $image_path = $this->getUserLayoutImagePath($layout_srl);
+            $image_list = FileHandler::readDir($image_path,'/(.*(?:swf|jpg|jpeg|gif|bmp|png)$)/i');
+
+            for($i=0,$c=count($image_list);$i<$c;$i++) $file_list[] = 'images/' . $image_list[$i];
+            return $file_list;
+        }
+
+        /**
+         * @brief faceOff관련 서비스 출력을 위한 동작 실행
+         **/
+        function doActivateFaceOff(&$layout_info) {
+            $layout_info->faceoff_ini_config = $this->getUserLayoutIniConfig($layout_info->layout_srl, $layout_info->layout);
+
+            // 기본 faceoff layout CSS
+            Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
+
+            // 레이아웃 매니져에서 생성된 CSS
+            $faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
+            if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+
+            // 레이아웃의 위젯을 위한 css출력
+            Context::addCSSFile($this->module_path.'/tpl/css/widget.css');
+            if($layout_info->extra_var->colorset->value == 'black') Context::addCSSFile($this->module_path.'/tpl/css/widget@black.css');
+            else Context::addCSSFile($this->module_path.'/tpl/css/widget@white.css');
+
+            // 권한에 따른 다른 내용 출력
+            $logged_info = Context::get('logged_info');
+
+            // faceOff 레이아웃 편집 버튼 노출
+            if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
+                Context::addHtmlFooter("<div class=\"faceOffManager\"><a href=\"".getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y')."\" class=\"buttonSet buttonLayoutEditor\"><span>".Context::getLang('cmd_layout_edit')."</span></a></div>");
+            }
+
+            // faceOff페이지 수정시에 메뉴 출력
+            if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
+                $oTemplate = &TemplateHandler::getInstance();
+                Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));
+            }
+        }
     }
 ?>
diff --git a/modules/layout/queries/getLayoutList.xml b/modules/layout/queries/getLayoutList.xml
index d71c2db7d..97d8d161a 100644
--- a/modules/layout/queries/getLayoutList.xml
+++ b/modules/layout/queries/getLayoutList.xml
@@ -5,6 +5,9 @@
     <columns>
         <column name="*" />
     </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
+    </conditions>
     <navigation>
         <index var="sort_index" default="layout_srl" order="desc" />
     </navigation>
diff --git a/modules/layout/queries/getLayoutModules.xml b/modules/layout/queries/getLayoutModules.xml
index 2763ec098..aabe6f4a7 100644
--- a/modules/layout/queries/getLayoutModules.xml
+++ b/modules/layout/queries/getLayoutModules.xml
@@ -8,6 +8,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="menu_item.menu_srl" var="menu_srl" notnull="notnull" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" default="0" pipe="and" />
         <condition operation="equal" column="menu_item.url" default="modules.mid" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/layout/queries/insertLayout.xml b/modules/layout/queries/insertLayout.xml
index a191a1923..b4c983a97 100644
--- a/modules/layout/queries/insertLayout.xml
+++ b/modules/layout/queries/insertLayout.xml
@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="layout_srl" var="layout_srl" filter="number" notnull="notnull" />
+        <column name="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
         <column name="layout" var="layout" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" />
         <column name="module_srl" var="module_srl" />
diff --git a/modules/layout/schemas/layouts.xml b/modules/layout/schemas/layouts.xml
index c28425343..3b2ebc12b 100644
--- a/modules/layout/schemas/layouts.xml
+++ b/modules/layout/schemas/layouts.xml
@@ -1,5 +1,6 @@
 <table name="layouts">
     <column name="layout_srl" type="number" size="12" notnull="notnull" primary_key="primary_key" />
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" index="menu_site_srl" />
     <column name="layout" type="varchar" size="250" />
     <column name="title" type="varchar" size="250" />
     <column name="extra_vars" type="text" />
diff --git a/modules/layout/tpl/about_faceoff.html b/modules/layout/tpl/about_faceoff.html
new file mode 100644
index 000000000..1a4cd6532
--- /dev/null
+++ b/modules/layout/tpl/about_faceoff.html
@@ -0,0 +1,9 @@
+<div class="aboutFaceOff">
+    <h3>{$lang->about_faceoff['title']}</h3>
+    <p>{$lang->about_faceoff['description']}</p>
+    <img src="./images/faceoff.gif" border="0" /> 
+    <p>{$lang->about_faceoff['layout']}</p>
+    <p>{$lang->about_faceoff['setting']}</p>
+    <p>{$lang->about_faceoff['hotkey']}</p>
+    <p>{$lang->about_faceoff['attribute']}</p>
+</div>
diff --git a/modules/layout/tpl/css/faceoff_menu.css b/modules/layout/tpl/css/faceoff_menu.css
new file mode 100644
index 000000000..99c058277
--- /dev/null
+++ b/modules/layout/tpl/css/faceoff_menu.css
@@ -0,0 +1,208 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Kim Taegon(gonom9@nhncorp.com) */
+
+/* toolbar */
+#toolbar { position:relative; z-index:1000; background:url(../images/bgMenu.gif) repeat-x 0 0; font-size:12px; height:35px; clear:both; }
+#toolbar *{ margin:0; padding:0;}
+#toolbar h1 { float:left; color:#fff; padding:10px 20px; font-size:12px;}
+#toolbar .tb-btn-active { font-weight:bold; }
+#toolbar .tb-menu-item-hover { color:white; background-color:navy; }
+#toolbar .tb-menu-item-selected { color:white; background-color:green; }
+
+#faceoffSelector { border:2px dotted #ff6600; }
+
+#smartmenu {  position:absolute; top:10px; right:10px; margin:0; padding:0; font-size:12px; color:#fff; white-space:nowrap;}
+#smartmenu li { display:none; list-style:none; font-weight:bold; }
+#smartmenu li.active{ display:block;}
+#smartmenu li dl{ margin:0; padding:0; display:inline;}
+#smartmenu li dt,
+#smartmenu li dd{ display:inline;}
+#smartmenu li dt{ color:#ccc;}
+#smartmenu li dd button{ background-color:#000; border:0; font-size:12px; font-family:Tahoma; font-weight:normal; color:#fff; cursor:pointer; border:1px solid #888; }
+#layout-preview { display:none; width:120px; left:0px; right:0px; }
+
+/* widgetMenu */
+#toolbar .widgetMenu{ height:35px; margin:0; padding:0; font-size:12px; line-height:1.2; background:url(../images/bgMenu.gif) repeat-x 0 0;}
+#toolbar .widgetMenu ul.widgetMenuList{ margin:0; padding:0; height:35px; float:left; }
+#toolbar .widgetMenu ul.widgetMenuList li ul{ display:none; position:absolute; top:40px; left:0; height:auto; padding:10px 15px; background:#595959; border:1px solid #444;}
+#toolbar .widgetMenu ul.widgetMenuList li.active ul{ display:block;}
+#toolbar .widgetMenu ul.widgetMenuList.aCenter{ margin-left:auto; margin-right:auto;}
+#toolbar .widgetMenu ul.widgetMenuList.aLeft{ margin-right:auto;}
+#toolbar .widgetMenu ul.widgetMenuList.aRight{ margin-left:auto;}
+#toolbar .widgetMenu li{ position:relative; padding-right:3px; float:left; list-style:none; background:url(../images/bgMenu.gif) no-repeat right -40px; white-space:nowrap;}
+#toolbar .widgetMenu li button{ position:relative; float:left; height:35px; color:#fff !important; text-decoration:none !important; cursor:pointer; background-color:transparent; border:0; font-weight:bold; font-size:12px; font-family:Tahoma;}
+#toolbar .widgetMenu li button span{ padding:0 15px;}
+#toolbar .widgetMenu li.first button{ background:url(../images/bgMenu.gif) no-repeat left -40px; color:#f00 !important;}
+#toolbar .widgetMenu li.active{ margin-left:-2px; background:url(../images/bgMenu.gif) no-repeat right -80px;}
+#toolbar .widgetMenu li.active button{ font-weight:bold; color:#ff0 !important; background:url(../images/bgMenu.gif) no-repeat left -80px;}
+#toolbar .widgetMenu li.active li{ float:none; background:none;}
+#toolbar .widgetMenu li.active li.active{ margin:0;}
+#toolbar .widgetMenu li li{ background:none; display:block !important; clear:both !important;}
+#toolbar .widgetMenu li li.first{ background:none;}
+#toolbar .widgetMenu li.active li.first{ padding-top:14px; background:url(../images/bgMenu.gif) no-repeat 30px top;}
+#toolbar .widgetMenu li li button{ background:none; height:auto; font-weight:normal; text-align:left; float:none; display:block;}
+#toolbar .widgetMenu li.active li button{ display:block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none; font-weight:normal;}
+#toolbar .widgetMenu li.active li.active button{ color:#ff0 !important;}
+
+/* preference dialog */
+#propertyDialog { position:absolute; border:1px solid silver; background-color:white; padding:15px 20px; z-index:110; -moz-border-radius:5px; -webkit-border-radius:5px; margin:0 auto; display:none; width:250px; left:20px; top:60px;}
+#propertyDialog fieldset{ border:1px dotted #ccc; padding:5px 10px; margin:0 0 10px 0; white-space:nowrap;}
+#propertyDialog legend{ font-weight:bold; background-color:#fff; padding:0 5px; }
+#propertyDialog label{ cursor:default;}
+#propertyDialog .more { display:none;  margin:0; padding:0 0 0 10px; border-left:2px solid #eee;}
+#propertyDialog .visible-more .more { display:block; }
+#propertyDialog .visible-more .inputall { display:none; }
+#propertyDialog .buttonArea{ text-align:center;}
+#propertyDialog button{ cursor:pointer;}
+.overlay { background-color:black; opacity:0.75; position:absolute; z-index:100; display:none; }
+
+/* layout preview */
+
+/* demoXe */
+#demoXe { position:absolute; background:#fff; border:2px solid #ddd; padding:5px; width:100px; display:none; }
+#demoXe * { margin:0; padding:0; font-size:0; line-height:0; }
+
+/* Container + Header + Body + Footer */
+#demoContainer { position:relative; }
+#demoHeader { position:relative; height:10px; *zoom:1;
+background:#ddd; margin-bottom:5px; }
+#demoHeader:after { content:""; display:block; clear:both; }
+#demoBody { position:relative; *zoom:1;
+margin-bottom:5px; }
+#demoBody:after { content:""; display:block; clear:both; }
+#demoContent { position:relative; height:40px; text-align:justify; background:#ddd; }
+#demoFooter { position:relative; height:10px; *zoom:1;
+background:#ddd; }
+#demoFooter address { text-align:center; }
+
+/* Layout Width */
+.demoFixed #demoContainer { width:100px; margin-left:auto; margin-right:auto; }
+.demoLiquid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
+.demoHybrid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
+
+/* Align Layout */
+.demoALeft #demoContainer { margin-left:0; }
+.demoARight #demoContainer { margin-right:0; }
+
+/* Extension */
+.demoExtension,
+.demoSection { position:relative; }
+#demoBody .demoExtension { position:relative; display:none; height:40px; background:#ddd; }
+#demoBody #demoContent { width:100%; height:40px; font-size:small; }
+.demoExtension .demoSection { }
+
+/* Layout Color */
+.demoLiquid #demoHeader,
+.demoLiquid #demoFooter,
+.demoLiquid #demoContent,
+.demoLiquid #demoBody .demoExtension { background:#999; }
+.demoHybrid #demoHeader,
+.demoHybrid #demoFooter,
+.demoHybrid #demoContent { background:#999; }
+
+/* ----- Fixed 2 Column Layout ----- */
+.demoFixed .demoCE #demoBody .demoE1,
+.demoFixed .demoEC #demoBody .demoE1 { width:15px; }
+.demoFixed .demoCE #demoBody #demoContent,
+.demoFixed .demoEC #demoBody #demoContent { width:80px; }
+.demoFixed .demoCE #demoBody #demoContent { float:left; }
+.demoFixed .demoEC #demoBody #demoContent { float:right; }
+.demoFixed .demoCE #demoBody .demoE1,
+.demoFixed .demoEC #demoBody .demoE1 { display:block; }
+.demoFixed .demoCE #demoBody .demoE1 { float:right; clear:right; }
+.demoFixed .demoEC #demoBody .demoE1 { float:left; clear:left; }
+
+/* ----- Liquid 2 Column Layout ----- */
+.demoLiquid .demoCE #demoBody .demoE1,
+.demoLiquid .demoEC #demoBody .demoE1 { width:15%; }
+.demoLiquid .demoCE #demoBody #demoContent,
+.demoLiquid .demoEC #demoBody #demoContent { width:80%; }
+.demoLiquid .demoCE #demoBody #demoContent { float:left; }
+.demoLiquid .demoEC #demoBody #demoContent { float:right; }
+.demoLiquid .demoCE #demoBody .demoE1,
+.demoLiquid .demoEC #demoBody .demoE1 { display:block; }
+.demoLiquid .demoCE #demoBody .demoE1 { float:right; clear:right; }
+.demoLiquid .demoEC #demoBody .demoE1 { float:left; clear:left; }
+
+/* ----- Hybrid 2 Column Layout ----- */
+.demoHybrid .demoCE #demoBody { padding-right:20px; }
+.demoHybrid .demoEC #demoBody { padding-left:20px; }
+.demoHybrid .demoCE #demoBody .demoE1,
+.demoHybrid .demoEC #demoBody .demoE1 { width:15px; }
+.demoHybrid .demoCE #demoBody #demoContent { float:left; }
+.demoHybrid .demoEC #demoBody #demoContent { float:right; }
+.demoHybrid .demoCE #demoBody .demoE1,
+.demoHybrid .demoEC #demoBody .demoE1 { display:block; }
+.demoHybrid .demoCE #demoBody .demoE1 { float:right; clear:right; margin-left:-15px; right:-20px; }
+.demoHybrid .demoEC #demoBody .demoE1 { float:left; clear:left; margin-right:-15px; left:-20px; }
+
+/* ----- Fixed 3 Column Layout ----- */
+.demoFixed .demoCEE #demoBody .demoE1,
+.demoFixed .demoCEE #demoBody .demoE2,
+.demoFixed .demoECE #demoBody .demoE1,
+.demoFixed .demoECE #demoBody .demoE2,
+.demoFixed .demoEEC #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE2 { display:block; width:15px; }
+.demoFixed .demoCEE #demoBody #demoContent,
+.demoFixed .demoECE #demoBody #demoContent,
+.demoFixed .demoEEC #demoBody #demoContent { width:60px; }
+.demoFixed .demoCEE #demoBody #demoContent { float:left; margin-right:5px; }
+.demoFixed .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20px; }
+.demoFixed .demoEEC #demoBody #demoContent { float:right; }
+.demoFixed .demoECE #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE1 { float:left; margin-right:5px; }
+.demoFixed .demoCEE #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE2 { float:left; }
+.demoFixed .demoCEE #demoBody .demoE2,
+.demoFixed .demoECE #demoBody .demoE2 { float:right; }
+
+/* ----- Liquid 3 Column Layout ----- */
+.demoLiquid .demoCEE #demoBody .demoE1,
+.demoLiquid .demoCEE #demoBody .demoE2,
+.demoLiquid .demoECE #demoBody .demoE1,
+.demoLiquid .demoECE #demoBody .demoE2,
+.demoLiquid .demoEEC #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE2 { display:block; width:15%; }
+.demoLiquid .demoCEE #demoBody #demoContent,
+.demoLiquid .demoECE #demoBody #demoContent,
+.demoLiquid .demoEEC #demoBody #demoContent { width:60%; }
+.demoLiquid .demoCEE #demoBody #demoContent { float:left; margin-right:5%; }
+.demoLiquid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20%; }
+.demoLiquid .demoEEC #demoBody #demoContent { float:right; }
+.demoLiquid .demoECE #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE1 { float:left; margin-right:5%; }
+.demoLiquid .demoCEE #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE2 { float:left; }
+.demoLiquid .demoCEE #demoBody .demoE2,
+.demoLiquid .demoECE #demoBody .demoE2 { float:right; }
+
+/* ----- Hybrid 3 Column Layout ----- */
+.demoHybrid .demoCEE #demoBody .demoE1,
+.demoHybrid .demoCEE #demoBody .demoE2,
+.demoHybrid .demoECE #demoBody .demoE1,
+.demoHybrid .demoECE #demoBody .demoE2,
+.demoHybrid .demoEEC #demoBody .demoE1,
+.demoHybrid .demoEEC #demoBody .demoE2 { display:block; width:15px; }
+.demoHybrid .demoCEE #demoBody { padding-right:40px; }
+.demoHybrid .demoECE #demoBody { padding-left:20px; padding-right:20px; }
+.demoHybrid .demoEEC #demoBody { padding-left:40px; }
+.demoHybrid .demoCEE #demoBody #demoContent,
+.demoHybrid .demoECE #demoBody #demoContent,
+.demoHybrid .demoEEC #demoBody #demoContent { width:100%; }
+.demoHybrid .demoCEE #demoBody #demoContent,
+.demoHybrid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; }
+.demoHybrid .demoEEC #demoBody #demoContent { float:right; }
+.demoHybrid .demoECE #demoBody .demoE1,
+.demoHybrid .demoEEC #demoBody .demoE2 { float:left; left:-20px; margin-right:-20px; }
+.demoHybrid .demoEEC #demoBody .demoE1 { float:left; left:-40px; margin-right:-20px; }
+.demoHybrid .demoCEE #demoBody .demoE1,
+.demoHybrid .demoECE #demoBody .demoE2 { float:right; left:20px; margin-left:-15px; }
+.demoHybrid .demoCEE #demoBody .demoE2 { float:right; left:40px; margin-left:-15px; }
+
+.aboutFaceOff { background-color:#EEE; color:#000; padding:20px; }
+.aboutFaceOff h3 { padding:0; margin:0; font-size:14px; font-weight:bold; text-decoration:underline; margin-bottom:10px; }
+.aboutFaceOff p,
+.aboutFaceOff li { color:#666; }
+
+fieldset.hideOption { float:left; border:0; margin:0; padding:0; }
+fieldset.hideOption label { margin:10px 10px 0 10px !important; *margin-top:7px; font-family:tahoma; color:#fff !important; display:block; float:left;}
diff --git a/modules/layout/tpl/css/widget.css b/modules/layout/tpl/css/widget.css
new file mode 100755
index 000000000..cec82e572
--- /dev/null
+++ b/modules/layout/tpl/css/widget.css
@@ -0,0 +1,867 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* common */
+.open{ display:block !important;}
+.floatLeft{ float:left;}
+.floatRight{ float:right;}
+.clearLeft{ clear:left;}
+.clearRight{ clear:right;}
+.widgetXeInputText{ border:1px solid; padding:2px 5px; font-size:12px;}
+.widgetXeInputCheck{ margin:0; width:13px; height:13px; vertical-align:middle;}
+.widgetXeInputSubmit{ padding:0;}
+.widgetXeAddress{ font-style:normal;}
+
+/* widgetContainer */
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+/* widgetDivider */
+dl.widgetDivider{ margin:0;}
+dl.widgetDivider dt{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0;}
+dl.widgetDivider dd{ display:none; margin:0;}
+
+/* widgetTableA */
+.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
+.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
+.widgetTableA td.title{ width:100%; white-space:normal;}
+.widgetTableA td .board{ padding-right:5px;}
+.widgetTableA td .notice{ padding-right:5px;}
+.widgetTableA td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableA td .replyNum a{ font:10px Tahoma;}
+.widgetTableA td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableA td.author{}
+.widgetTableA td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableB */
+.widgetTableB { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableB td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:8px 5px 6px 5px; border-bottom:1px solid;}
+.widgetTableB td.title{ width:100%; white-space:normal;}
+.widgetTableB td .board{ padding-right:5px;}
+.widgetTableB td .notice{ padding-right:5px;}
+.widgetTableB td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableB td .replyNum a{ font:10px Tahoma;}
+.widgetTableB td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableB td.author{}
+.widgetTableB td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableC */
+.widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
+.widgetTableC td.title,
+.widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
+.widgetTableC td.docNum{}
+.widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/white/iconForumNum.gif) no-repeat 0 0;}
+.widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
+.widgetTableC td.title dl{ margin:0;}
+.widgetTableC td.title dd{ margin:0;}
+.widgetTableC td.lastDoc p{ margin:0;}
+.widgetTableC td .author{ margin-right:5px;}
+.widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
+.widgetTableC td .time .date{ margin-right:5px;}
+
+/* widgetUlistA */
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li{ list-style:none;}
+
+/* widgetUlistB */
+.widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetUlistB:after{ content:""; display:block; clear:both;}
+.widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
+.widgetUlistB li .author{ float:left; margin-right:-42px;}
+.widgetUlistB li .author img{ border:1px solid;}
+.widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; _zoom:1;}
+.widgetUlistB li .title a{ text-decoration:underline;}
+.widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco .topLeft{}
+.widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
+.widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetOlistA */
+.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetOlistA li{ margin-left:25px;}
+.widgetOlistA li sup{ font-size:9px; font-family:tahoma; padding-left:10px; }
+
+/* widgetDlistA */
+.widgetDlistA{ margin:0; padding:0; font-size:12px; line-height:1.5; zoom:1;}
+.widgetDlistA:after{ content:""; display:block; clear:both;}
+.widgetDlistA dt{ float:left; clear:left; margin-right:5px; white-space:nowrap;}
+.widgetDlistA dd{ clear:right; white-space:nowrap; font-family:Tahoma;}
+
+/* widgetGalleryA */
+.widgetGalleryA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryA:after{ content:""; display:block; clear:both;}
+.widgetGalleryA li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none;}
+.widgetGalleryA li.clearRight{ margin-right:0;}
+.widgetGalleryA li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryA li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryA li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryA li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .author{ display:block;}
+.widgetGalleryA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .date{ font:11px Tahoma;}
+.widgetGalleryA li .hour{ font:11px Tahoma;}
+
+/* widgetGalleryB */
+.widgetGalleryB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryB:after{ content:""; display:block; clear:both;}
+.widgetGalleryB li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none; border-bottom:1px solid;}
+.widgetGalleryB li.clearRight{ margin-right:0;}
+.widgetGalleryB li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryB li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryB li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryB li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .author{ display:block;}
+.widgetGalleryB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .date{ font:11px Tahoma;}
+.widgetGalleryB li .hour{ font:11px Tahoma;}
+
+/* widgetZineA */
+.widgetZineA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineA:after{ content:""; display:block; clear:both;}
+.widgetZineA li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; overflow:hidden; *zoom:1;}
+.widgetZineA li p{ margin:0;}
+.widgetZineA li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineA li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.titleArea .board{ padding-right:5px;}
+.widgetZineA li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.authorArea{ margin-left:120px;}
+.widgetZineA li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineA li .thumb img{ position:relative; width:100%;}
+.widgetZineA li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineA li .title{ font-weight:bold;}
+.widgetZineA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .author{ margin-right:10px;}
+.widgetZineA li .date{ font:11px Tahoma;}
+.widgetZineA li .hour{ font:11px Tahoma;}
+
+/* widgetZineB */
+.widgetZineB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineB:after{ content:""; display:block; clear:both;}
+.widgetZineB li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; border-bottom:1px solid;}
+.widgetZineB li p{ margin:0;}
+.widgetZineB li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineB li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.titleArea .board{ padding-right:5px;}
+.widgetZineB li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.authorArea{ margin-left:120px;}
+.widgetZineB li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineB li .thumb img{ position:relative; width:100%;}
+.widgetZineB li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineB li .title{ font-weight:bold;}
+.widgetZineB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .author{ margin-right:10px;}
+.widgetZineB li .date{ font:11px Tahoma;}
+.widgetZineB li .hour{ font:11px Tahoma;}
+
+/* WidgetTree */
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -1px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetLogin */
+.widgetLogin{ font-size:12px;}
+.widgetLogin fieldset{ border:0; margin:0; padding:0;}
+.widgetLogin dl{ margin:0;}
+.widgetLogin dt{ display:none;}
+.widgetLogin dd{ margin:0 0 5px 0;}
+.widgetLogin dd .widgetXeInputText{ width:90%; height:16px;}
+.widgetLogin p{ margin:5px 0;}
+.widgetLogin p .widgetXeInputCheck{ margin-right:5px;}
+.widgetLogin .help{ position:relative; width:100%; overflow:hidden; margin:10px 0 0 0; padding:0;}
+.widgetLogin .help li{ position:relative; left:-5px; padding-left:5px; list-style:none; display:inline; letter-spacing:-1px;}
+
+/* widgetLastLogin */
+.widgetLastLogin{ margin:10px 0; font-size:12px;}
+.widgetLastLogin dt,
+.widgetLastLogin dd{ display:inline; margin:0;}
+.widgetLastLogin dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetMyInfo */
+.widgetMyInfo{ margin:0; padding:0; font-size:12px;}
+.widgetMyInfo:after{ content:""; display:block; clear:both; *zoom:1;}
+.widgetMyInfo li{ margin-bottom:5px; padding:0; text-indent:12px; list-style:none;}
+
+/* widgetLevel */
+.widgetLevel{ padding-left:30px; background-repeat:no-repeat; background-position:left 30%;}
+.widgetLevel em{ display:block; width:0; height:0; overflow:hidden; font-size:0; line-height:0; position:absolute;}
+
+/* widgetCounter */
+.widgetCounter{ font-size:12px; margin:0;}
+.widgetCounter dt,
+.widgetCounter dd{ height:18px;}
+.widgetCounter dt{ float:left; clear:left;}
+.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetLanguage */
+.widgetLanguage p{ float:right; margin:0;}
+.widgetLanguage .langList{ display:none; position:absolute; margin:0; padding:0; z-index:999;}
+.widgetLanguage .langList li{ list-style:none;}
+.widgetLanguage .langList li a{ font-size:12px; display:block; padding:2px 5px;}
+
+/* widgetTabA */
+.widgetTabA{ position:relative; margin:0; padding:0; *zoom:1; border-bottom:2px solid;}
+.widgetTabA:after{ content:""; display:block; clear:both;}
+.widgetTabA li{ float:left; margin-right:1px; list-style:none; background-repeat:no-repeat; background-position:0 0;}
+.widgetTabA li.active{ background-position:0 -30px;}
+.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
+.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
+
+/* widgetTabB */
+.widgetTabB{ margin:0; position:absolute; top:1px; right:0; white-space:nowrap; font-size:12px;}
+.widgetTabB li{ display:inline;}
+.widgetTabB li.active a{ font-weight:bold;}
+
+/* widgetTabC */
+.widgetTabC{ margin:0; padding:0; font-size:12px; border-top:1px solid;}
+.widgetTabC li{ list-style:none; border-bottom:1px solid; *zoom:1; margin-bottom:1px;}
+.widgetTabC li a{ display:block; padding:7px 0 6px 10px; text-decoration:none; *zoom:1;}
+
+/* widgetThumb */
+.widgetThumb{ position:relative; margin:0; text-align:center; font-size:12px; line-height:1.5;}
+.widgetThumb .thumb{ display:block; margin-bottom:5px; position:relative; *zoom:1; text-decoration:none;}
+.widgetThumb .thumb img{ display:block; width:100%;}
+.widgetThumb .thumb .imgNone{ display:block; position:relative; width:100%; padding-top:30px; padding-bottom:50px; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetThumb .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetThumb .title{ display:block;}
+.widgetThumb .author{ display:block;}
+.widgetThumb .date{ font-size:11px; font-family:Tahoma;}
+.widgetThumb .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetContainer */
+.widgetContainer{ *zoom:1;}
+.widgetContainer:after{ content:""; display:block; clear:both;}
+
+/* widgetNavigator */
+.widgetNavigator{ margin:0; padding:0; text-align:right; clear:both;}
+.widgetNavigator li{ list-style:none; display:inline;}
+.widgetNavigator li button{ width:16px; height:16px; padding:0; background-color:transparent; background-image:url(../img/white/buttonWidgetNavigation.gif); border:1px solid #999; cursor:pointer;}
+.widgetNavigator li button.prev{ background-position:left center; *background-position:-1px center;}
+.widgetNavigator li button.next{ background-position:right center; *background-position:13px center;}
+.widgetNavigator li button span{ position:absolute; display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+/* widgetTagCloud */
+.widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
+.widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
+.widgetTagCloud li.level1 a{ font-size:11px;}
+.widgetTagCloud li.level2 a{ font-size:12px;}
+.widgetTagCloud li.level3 a{ font-size:14px; font-weight:bold;}
+.widgetTagCloud li.level4 a{ font-size:18px; font-weight:bold;}
+
+/* widgetCalendar */
+.widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
+.widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
+.widgetCalendarNavigation button.prevYear{ left:0;}
+.widgetCalendarNavigation button.prevMonth{ left:25px;}
+.widgetCalendarNavigation button.nextYear{ right:0;}
+.widgetCalendarNavigation button.nextMonth{ right:25px;}
+.widgetCalendar{ position:relative; border:0; width:100%;}
+.widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
+.widgetCalendar th,
+.widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
+.widgetCalendar th{ font-size:10px; font-family:Tahoma; font-weight:normal;}
+.widgetCalendar td,
+.widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
+.widgetCalendar td em{ font-style:normal;}
+
+/* widgetPoint */
+.widgetPoint{ margin:0; *zoom:1; clear:both;}
+.widgetPoint:after{ content:""; display:block; clear:both;}
+.widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
+.widgetPoint dd{ margin:0;}
+.widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
+.widgetPoint dd.graph img{ width:0%;}
+.widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
+.widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
+
+/* widgetMenuA */
+.widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
+.widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
+.widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuA li li.active sup{ color:#ff1a1a;}
+.widgetMenuA li li{ padding:0; border:0;}
+.widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
+.widgetMenuA li.active ul{ display:block;}
+.widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
+.widgetMenuA li.active a{ font-weight:bold;}
+.widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
+.widgetMenuA li li.active a{ color:#ff1a1a;}
+.widgetMenuA li.active li a:hover,
+.widgetMenuA li.active li a:active,
+.widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetMenuB */
+.widgetMenuB{ margin:0; padding:0; font-size:12px; line-height:1.3; border-top:1px solid;}
+.widgetMenuB li{ position:relative; list-style:none; border-bottom:1px solid; white-space:nowrap; *zoom:1;}
+.widgetMenuB li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuB li li{ padding:2px 10px; border:none;}
+.widgetMenuB li li.first{ left:-4px; padding-left:14px; background-repeat:no-repeat; background-position:0 center;}
+.widgetMenuB li li.active sup{ color:#ff1a1a;}
+.widgetMenuB li ul{ position:absolute; display:none; top:-1px; left:100%; margin:0 0 0 5px; padding:5px 0 10px 0; border:1px solid}
+.widgetMenuB li.active{ z-index:100;}
+.widgetMenuB li.active ul{ display:block;}
+.widgetMenuB li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important; *zoom:1;}
+.widgetMenuB li.active a{ font-weight:bold;}
+.widgetMenuB li.active li a{ font-weight:normal; padding:0; background:none !important;}
+.widgetMenuB li li.active a{ color:#ff1a1a;}
+.widgetMenuB li.active li a:hover,
+.widgetMenuB li.active li a:active,
+.widgetMenuB li.active li a:focus{ text-decoration:underline !important;}
+
+.widgetMenuC{ margin:0; padding:0; font-size:12px; line-height:1.2; background-repeat:repeat-x;background-position:0 0;}
+.widgetMenuC ul{ margin:0; padding:0; height:35px;}
+.widgetMenuC ul li ul{ display:none; position:absolute; top:40px; left:20px; height:auto; padding-bottom:7px; background:#35ad06; border:1px solid #027a00;}
+.widgetMenuC ul li.active ul{ display:block;}
+.widgetMenuC ul.aCenter{ margin-left:auto; margin-right:auto;}
+.widgetMenuC ul.aLeft{ margin-right:auto;}
+.widgetMenuC ul.aRight{ margin-left:auto;}
+.widgetMenuC li{ position:relative; padding-right:3px; float:left; list-style:none; background-repeat:no-repeat;background-position:right -40px; white-space:nowrap;}
+.widgetMenuC li a{ position:relative; float:left; padding:12px 22px 0 25px; height:23px; color:#fff !important; text-decoration:none !important;}
+.widgetMenuC li.first a{ background-repeat:no-repeat;background-position:left -40px;}
+.widgetMenuC li.active{ margin-left:-2px; background-repeat:no-repeat;background-position:right -80px;}
+.widgetMenuC li.active a{ font-weight:bold; color:#ff0 !important; background-repeat:no-repeat; background-position:left -80px;}
+.widgetMenuC li.active li{ padding:2px 15px; float:none; background:none;}
+.widgetMenuC li.active li.active{ margin:0;}
+.widgetMenuC li.active li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
+.widgetMenuC li.active li a{ display:block; _display:inline-block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none;}
+.widgetMenuC li.active li.active a{ color:#ff0 !important;}
+.widgetMenuC li.active li a:hover,
+.widgetMenuC li.active li a:active,
+.widgetMenuC li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetSearch */
+.widgetSearch{ position:absolute; bottom:30px; right:0;}
+.widgetSearch fieldset{ border:0; margin:0; padding:0; position:absolute; bottom:0; right:0;}
+.widgetSearch .widgetXeInputText{ width:153px; height:16px; padding:2px 20px 2px 5px; vertical-align:middle; border:1px solid #666; border-top-color:#555; border-left-color:#555; background:#444; color:#fff;}
+.widgetSearch .widgetXeInputText:focus{ background:#494949;}
+.widgetSearch .widgetSearch{ position:absolute; top:3px; right:4px; vertical-align:middle;}
+
+address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
+
+/* white coloset */
+.widgetContainer .widgetXeInputText{ border-color:#ccc; background:#f4f4f4; color:#000;}
+
+/* widgetTableA */
+.widgetContainer .widgetTableA td.title a{ color:#333;}
+.widgetContainer .widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableA td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableA td .author { color:#333;}
+.widgetContainer .widgetTableA td .date{ color:#333;}
+.widgetContainer .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer .widgetTableB,
+.widgetContainer .widgetTableB td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableB td.title a{ color:#333;}
+.widgetContainer .widgetTableB td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableB td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableB td .author { color:#333;}
+.widgetContainer .widgetTableB td .date{ color:#333;}
+.widgetContainer .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer .widgetTableC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td.title a{ color:#333;}
+.widgetContainer .widgetTableC td.title dd{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc p a{ color:#333;}
+.widgetContainer .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer .widgetUlistA li a{ color:#666;}
+
+/* widgetUlistB */
+.widgetContainer .widgetUlistB li .author img{ border-color:#ccc;}
+.widgetContainer .widgetUlistB li .title{ border-color:#eee; color:#333; background:#fff;}
+.widgetContainer .widgetUlistB li .title a{ color:#0066ff;}
+.widgetContainer .widgetUlistB li .title .arrow{ background:url(../img/white/arrowUlistB.gif) no-repeat;}
+.widgetContainer .widgetUlistB li .title .deco{ background:#fff;}
+.widgetContainer .widgetUlistB li .title .date{ color:#333;}
+.widgetContainer .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer .widgetOlistA li,
+.widgetContainer .widgetOlistA li a{ color:#666;}
+.widgetContainer .widgetOlistA li sup{ color:#AAA;}
+
+/* widgetDlistA */
+.widgetContainer .widgetDlistA dt{ color:#333;}
+.widgetContainer .widgetDlistA dd,
+.widgetContainer .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer .widgetGalleryA li .title{ color:#333;}
+.widgetContainer .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryA li .author{ color:#333;}
+.widgetContainer .widgetGalleryA li .date{ color:#333;}
+.widgetContainer .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer .widgetGalleryB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetGalleryB li .title{ color:#333;}
+.widgetContainer .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryB li .author{ color:#333;}
+.widgetContainer .widgetGalleryB li .date{ color:#333;}
+.widgetContainer .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer .widgetZineA li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineA li .title{ color:#666;}
+.widgetContainer .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineA li .author{ color:#333;}
+.widgetContainer .widgetZineA li .date{ color:#333;}
+.widgetContainer .widgetZineA li .hour{ color:#888;}
+.widgetContainer .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer .widgetZineB li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetZineB li .title{ color:#666;}
+.widgetContainer .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineB li .author{ color:#333;}
+.widgetContainer .widgetZineB li .date{ color:#333;}
+.widgetContainer .widgetZineB li .hour{ color:#888;}
+.widgetContainer .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer .widgetLogin label{ color:#333;}
+.widgetContainer .widgetLogin .help a{ color:#333;}
+.widgetContainer .widgetLogin .help li{ background:url(../img/white/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer .widgetLastLogin dt{ color:#333;}
+.widgetContainer .widgetLastLogin dd{ color:#888;}
+.widgetContainer .widgetLastLogin a{ color:#333;}
+.widgetContainer .widgetLastLogin li{ background:url(../img/white/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer .widgetMyInfo li a{ color:#666;}
+.widgetContainer .widgetMyInfo li{ background:url(../img/white/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer .widgetTree{ color:#333;}
+.widgetContainer .widgetTree a{ color:#333;}
+
+/* widgetCounter */
+.widgetContainer .widgetCounter dt{ color:#333;}
+.widgetContainer .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer .widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer .widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer .widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer .widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetLevel */
+.widgetContainer .widgetLevel.num0 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/0.gif);}
+.widgetContainer .widgetLevel.num1 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/1.gif);}
+.widgetContainer .widgetLevel.num2 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/2.gif);}
+.widgetContainer .widgetLevel.num3 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/3.gif);}
+.widgetContainer .widgetLevel.num4 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/4.gif);}
+.widgetContainer .widgetLevel.num5 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/5.gif);}
+.widgetContainer .widgetLevel.num6 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/6.gif);}
+.widgetContainer .widgetLevel.num7 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/7.gif);}
+.widgetContainer .widgetLevel.num8 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/8.gif);}
+.widgetContainer .widgetLevel.num9 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/9.gif);}
+.widgetContainer .widgetLevel.num10 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/10.gif);}
+.widgetContainer .widgetLevel.num11 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/11.gif);}
+.widgetContainer .widgetLevel.num12 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/12.gif);}
+.widgetContainer .widgetLevel.num13 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/13.gif);}
+.widgetContainer .widgetLevel.num14 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/14.gif);}
+.widgetContainer .widgetLevel.num15 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/15.gif);}
+.widgetContainer .widgetLevel.num16 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/16.gif);}
+.widgetContainer .widgetLevel.num17 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/17.gif);}
+.widgetContainer .widgetLevel.num18 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/18.gif);}
+.widgetContainer .widgetLevel.num19 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/19.gif);}
+.widgetContainer .widgetLevel.num20 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/20.gif);}
+.widgetContainer .widgetLevel.num21 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/21.gif);}
+.widgetContainer .widgetLevel.num22 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/22.gif);}
+.widgetContainer .widgetLevel.num23 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/23.gif);}
+.widgetContainer .widgetLevel.num24 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/24.gif);}
+.widgetContainer .widgetLevel.num25 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/25.gif);}
+.widgetContainer .widgetLevel.num26 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/26.gif);}
+.widgetContainer .widgetLevel.num27 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/27.gif);}
+.widgetContainer .widgetLevel.num28 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/28.gif);}
+.widgetContainer .widgetLevel.num29 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/29.gif);}
+.widgetContainer .widgetLevel.num30 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/30.gif);}
+
+/* widgetTabA */
+.widgetContainer .widgetTabA{ border-color:#666;}
+.widgetContainer .widgetTabA li,
+.widgetContainer .widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
+.widgetContainer .widgetTabA li a{ color:#333;}
+
+/* widgetTabB */ 
+.widgetContainer .widgetTabB li a{ color:#333;}
+
+/* widgetTabC */
+.widgetContainer .widgetTabC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTabC li{ border-color:#e5e5e5; background:#f8f8f8;}
+.widgetContainer .widgetTabC li a{ color:#333;}
+.widgetContainer .widgetTabC li a:hover,
+.widgetContainer .widgetTabC li a:active,
+.widgetContainer .widgetTabC li a:focus{ background:#eee;}
+
+/* widgetThumb */
+.widgetContainer .widgetThumb{ color:#333;}
+.widgetContainer .widgetThumb a{ color:#333;}
+.widgetContainer .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer .widgetTagCloud li a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level1 a{ color:#999;}
+.widgetContainer .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level3 a{ color:#333;}
+.widgetContainer .widgetTagCloud li.level4 a{ color:#000;}
+
+/* widgetCalendar */
+.widgetContainer .widgetCalendarNavigation button{ color:#333;}
+.widgetContainer .widgetCalendar caption{ color:#333;}
+.widgetContainer .widgetCalendar th{ background:#eee; color:#333;}
+.widgetContainer .widgetCalendar th.sun,
+.widgetContainer .widgetCalendar td.sun,
+.widgetContainer .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer .widgetCalendar td,
+.widgetContainer .widgetCalendar td a{ color:#666;}
+.widgetContainer .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer .widgetPoint dt{ color:#333;}
+
+/* widgetMenuA */
+.widgetContainer .widgetMenuA{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuA li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer .widgetMenuB{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuB li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+.widgetContainer .widgetMenuB li ul{ border-color:#ddd; background:#fff;}
+.widgetContainer .widgetMenuB li li.first{ background-image:url(../img/white/arrowMenuB.gif);}
+
+/* widgetMenuCgreen */
+.widgetContainer .widgetMenuCgreen{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen ul li ul{ background:#35ad06; border-color:#027a00;}
+.widgetContainer .widgetMenuCgreen li{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.first a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
+
+/* widgetMenuCblue */
+.widgetContainer .widgetMenuCblue{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue ul li ul{ background:#0688ad; border-color:#00557a;}
+.widgetContainer .widgetMenuCblue li{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.first a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
+
+/* widgetMenuCcyan */
+.widgetContainer .widgetMenuCcyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan ul li ul{ background:#06a4ad; border-color:#00717a;}
+.widgetContainer .widgetMenuCcyan li{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.first a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
+
+/* widgetMenuCorange */
+.widgetContainer .widgetMenuCorange{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange ul li ul{ background:#ad9906; border-color:#7a6600;}
+.widgetContainer .widgetMenuCorange li{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.first a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
+
+/* widgetMenuCred */
+.widgetContainer .widgetMenuCred{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred ul li ul{ background:#ad4606; border-color:#7a1300;}
+.widgetContainer .widgetMenuCred li{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.first a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
+
+/* widgetMenuCgray */
+.widgetContainer .widgetMenuCgray{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray ul li ul{ background:#595959; border-color:#7a1300;}
+.widgetContainer .widgetMenuCgray li{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.first a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
+
+.widgetContainer address.period { color:#AAA; }
+
+/* black colorset Class */
+.widgetContainer.black .widgetXeInputText{ border-color:#666; background:#333; color:#ccc;}
+
+/* widgetTableA */
+.widgetContainer.black .widgetTableA td.title a{ color:#999;}
+.widgetContainer.black .widgetTableA td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableA td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableA td .author { color:#999;}
+.widgetContainer.black .widgetTableA td .date{ color:#999;}
+.widgetContainer.black .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer.black .widgetTableB,
+.widgetContainer.black .widgetTableB td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableB td.title a{ color:#999;}
+.widgetContainer.black .widgetTableB td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableB td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableB td .author { color:#999;}
+.widgetContainer.black .widgetTableB td .date{ color:#999;}
+.widgetContainer.black .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer.black .widgetTableC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td.title a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.title dd{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc p a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer.black .widgetUlistA li a{ color:#999;}
+
+/* widgetUlistB */
+.widgetContainer.black .widgetUlistB li .author img{ border-color:#666;}
+.widgetContainer.black .widgetUlistB li .title{ border-color:#333; color:#999; background:#000;}
+.widgetContainer.black .widgetUlistB li .title a{ color:#3399ff;}
+.widgetContainer.black .widgetUlistB li .title .arrow{ background:url(../img/black/arrowUlistB.gif) no-repeat;}
+.widgetContainer.black .widgetUlistB li .title .deco{ background:#000;}
+.widgetContainer.black .widgetUlistB li .title .date{ color:#999;}
+.widgetContainer.black .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer.black .widgetOlistA li,
+.widgetContainer.black .widgetOlistA li a{ color:#999;}
+.widgetContainer.black .widgetOlistA li sup{ color:#666;}
+
+/* widgetDlistA */
+.widgetContainer.black .widgetDlistA dt{ color:#999;}
+.widgetContainer.black .widgetDlistA dd,
+.widgetContainer.black .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer.black .widgetGalleryA li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryA li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer.black .widgetGalleryB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetGalleryB li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryB li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer.black .widgetZineA li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineA li .title{ color:#999;}
+.widgetContainer.black .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineA li .author{ color:#999;}
+.widgetContainer.black .widgetZineA li .date{ color:#999;}
+.widgetContainer.black .widgetZineA li .hour{ color:#888;}
+.widgetContainer.black .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer.black .widgetZineB li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetZineB li .title{ color:#999;}
+.widgetContainer.black .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineB li .author{ color:#999;}
+.widgetContainer.black .widgetZineB li .date{ color:#999;}
+.widgetContainer.black .widgetZineB li .hour{ color:#888;}
+.widgetContainer.black .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer.black .widgetLogin label{ color:#999;}
+.widgetContainer.black .widgetLogin .help a{ color:#ccc;}
+.widgetContainer.black .widgetLogin .help li{ background:url(../img/black/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer.black .widgetLastLogin dt{ color:#999;}
+.widgetContainer.black .widgetLastLogin dd{ color:#888;}
+.widgetContainer.black .widgetLastLogin a{ color:#333;}
+.widgetContainer.black .widgetLastLogin li{ background:url(../img/black/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer.black .widgetMyInfo li a{ color:#999;}
+.widgetContainer.black .widgetMyInfo li{ background:url(../img/black/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a{ color:#999;}
+
+/* widgetCounter */
+.widgetContainer.black .widgetCounter dt{ color:#999;}
+.widgetContainer.black .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer.black .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer.black .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer.black .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetLevel */
+.widgetContainer.black .widgetLevel.num0 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/0.gif);}
+.widgetContainer.black .widgetLevel.num1 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/1.gif);}
+.widgetContainer.black .widgetLevel.num2 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/2.gif);}
+.widgetContainer.black .widgetLevel.num3 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/3.gif);}
+.widgetContainer.black .widgetLevel.num4 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/4.gif);}
+.widgetContainer.black .widgetLevel.num5 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/5.gif);}
+.widgetContainer.black .widgetLevel.num6 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/6.gif);}
+.widgetContainer.black .widgetLevel.num7 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/7.gif);}
+.widgetContainer.black .widgetLevel.num8 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/8.gif);}
+.widgetContainer.black .widgetLevel.num9 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/9.gif);}
+.widgetContainer.black .widgetLevel.num10 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/10.gif);}
+.widgetContainer.black .widgetLevel.num11 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/11.gif);}
+.widgetContainer.black .widgetLevel.num12 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/12.gif);}
+.widgetContainer.black .widgetLevel.num13 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/13.gif);}
+.widgetContainer.black .widgetLevel.num14 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/14.gif);}
+.widgetContainer.black .widgetLevel.num15 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/15.gif);}
+.widgetContainer.black .widgetLevel.num16 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/16.gif);}
+.widgetContainer.black .widgetLevel.num17 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/17.gif);}
+.widgetContainer.black .widgetLevel.num18 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/18.gif);}
+.widgetContainer.black .widgetLevel.num19 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/19.gif);}
+.widgetContainer.black .widgetLevel.num20 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/20.gif);}
+.widgetContainer.black .widgetLevel.num21 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/21.gif);}
+.widgetContainer.black .widgetLevel.num22 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/22.gif);}
+.widgetContainer.black .widgetLevel.num23 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/23.gif);}
+.widgetContainer.black .widgetLevel.num24 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/24.gif);}
+.widgetContainer.black .widgetLevel.num25 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/25.gif);}
+.widgetContainer.black .widgetLevel.num26 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/26.gif);}
+.widgetContainer.black .widgetLevel.num27 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/27.gif);}
+.widgetContainer.black .widgetLevel.num28 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/28.gif);}
+.widgetContainer.black .widgetLevel.num29 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/29.gif);}
+.widgetContainer.black .widgetLevel.num30 { background-image:url(http://www.zeroboard.com/modules/point/icons/default/30.gif);}
+
+/* widgetTabA */
+.widgetContainer.black .widgetTabA{ border-color:#999;}
+.widgetContainer.black .widgetTabA li,
+.widgetContainer.black .widgetTabA li a{ background-image:url(../img/black/buttonWidgetTab.gif);}
+.widgetContainer.black .widgetTabA li a{ color:#999;}
+
+/* widgetTabB */
+.widgetContainer.black .widgetTabB li a{ color:#999;}
+
+/* widgetTabC */
+.widgetContainer.black .widgetTabC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTabC li{ border-color:#7f7f7f; background:#222;}
+.widgetContainer.black .widgetTabC li a{ color:#999;}
+.widgetContainer.black .widgetTabC li a:hover,
+.widgetContainer.black .widgetTabC li a:active,
+.widgetContainer.black .widgetTabC li a:focus{ background:#333;}
+
+/* widgetThumb */
+.widgetContainer.black .widgetThumb{ color:#999;}
+.widgetContainer.black .widgetThumb a{ color:#999;}
+.widgetContainer.black .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer.black .widgetTagCloud li a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level1 a{ color:#333;}
+.widgetContainer.black .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer.black .widgetTagCloud li.level3 a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level4 a{ color:#fff;}
+
+/* widgetCalendar */
+.widgetContainer.black .widgetCalendarNavigation button{ color:#999;}
+.widgetContainer.black .widgetCalendar caption{ color:#999;}
+.widgetContainer.black .widgetCalendar th{ background:#333; color:#fff;}
+.widgetContainer.black .widgetCalendar th.sun,
+.widgetContainer.black .widgetCalendar td.sun,
+.widgetContainer.black .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer.black .widgetCalendar td,
+.widgetContainer.black .widgetCalendar td a{ color:#999;}
+.widgetContainer.black .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer.black .widgetPoint dt{ color:#999;}
+
+/* widgetMenuA */
+.widgetContainer.black .widgetMenuA{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuA li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer.black .widgetMenuB{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuB li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+.widgetContainer.black .widgetMenuB li ul{ border-color:#777; background:#000;}
+.widgetContainer.black .widgetMenuB li li.first{ background-image:url(../img/black/arrowMenuB.gif);}
+
+
+address.period { color:#333; }
diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html
index 766861285..81111cf78 100644
--- a/modules/layout/tpl/downloaded_layout_list.html
+++ b/modules/layout/tpl/downloaded_layout_list.html
@@ -1,7 +1,7 @@
 <!--#include("header.html")-->
 
 <!-- 레이아웃의 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
 <thead>
     <tr>
         <th scope="col" class="halfwide"><div>{$lang->layout_name}</div></th>
@@ -25,16 +25,16 @@
                     ({$val->layout})
                 </div>
             </th>
-            <td class="number center">{$val->version}</td>
-            <td class="center nowrap">
+            <td>{$val->version}</td>
+            <td>
                 <!--@foreach($val->author as $author)-->
                 <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
                 <!--@endforeach-->
             </td>
-            <td class="number center">{$val->menu_count}</td>
-            <td class="date center nowrap">{zdate($val->date, 'Y-m-d')}</td>
-            <td class="nowrap">{$val->path}</td>
-            <td class="center"><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}" class="button"><span>{$lang->cmd_make}</span></a></td>
+            <td>{$val->menu_count}</td>
+            <td>{zdate($val->date, 'Y-m-d')}</td>
+            <td>{$val->path}</td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}" class="button"><span>{$lang->cmd_make}</span></a></td>
         </tr>
         <tr>
             <td colspan="6" class="left">
diff --git a/modules/layout/tpl/faceOff_sample.tar b/modules/layout/tpl/faceOff_sample.tar
new file mode 100755
index 000000000..bdea263f4
Binary files /dev/null and b/modules/layout/tpl/faceOff_sample.tar differ
diff --git a/modules/layout/tpl/faceoff_layout_edit.html b/modules/layout/tpl/faceoff_layout_edit.html
new file mode 100644
index 000000000..8b019caef
--- /dev/null
+++ b/modules/layout/tpl/faceoff_layout_edit.html
@@ -0,0 +1 @@
+{$content}
diff --git a/modules/layout/tpl/faceoff_layout_menu.html b/modules/layout/tpl/faceoff_layout_menu.html
new file mode 100644
index 000000000..b2d5e9c18
--- /dev/null
+++ b/modules/layout/tpl/faceoff_layout_menu.html
@@ -0,0 +1,347 @@
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("ui.colorpicker")-->
+<!--%import("js/ui.hotkey.js",optimized=false)-->
+<!--%import("js/ui.toolbar.js",optimized=false)-->
+<!--%import("js/faceoff.js",optimized=false)-->
+<!--%import("js/layout_image_list.js",optimized=false)-->
+<!--%import("css/faceoff_menu.css",optimized=false)-->
+<!--%import("js/layout_admin.js",optimized=false)-->
+<!--%import("filter/reset_layout_code.xml")-->
+
+<div id="toolbar">
+
+    <form id="fo_layout" action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe">
+    <input type="hidden" name="layout_srl" id="layout_srl" value="{$layout_info->layout_srl}" />
+    <div class="widgetMenu buttons">
+        <ul class="widgetMenuList">
+            <li><button type="button"><span>File</span></button>
+                <ul class="noneToolBar">
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="FaceOff.saveLayoutConfig()">{$lang->layout_manager[1]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="document.location.href=request_uri.setQuery('mid',current_mid)">{$lang->layout_manager[2]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="doResetLayoutCode('{$layout_srl}');return false">{$lang->layout_manager[51]}</button></li>
+                </ul>
+
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[3]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="t,fixed"><button type="button">{$lang->layout_manager[6]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="t,liquid"><button type="button">{$lang->layout_manager[7]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="t,hybrid"><button type="button">{$lang->layout_manager[8]}</button></li>
+                </ul>
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[4]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="c,c"><button type="button">{$lang->layout_manager[9]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,ce"><button type="button">{$lang->layout_manager[10]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,ec"><button type="button">{$lang->layout_manager[11]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,cee"><button type="button">{$lang->layout_manager[12]}</button></li>
+                    <li class="menu" class="menu" tb:type="radio" tb:arg="c,ece"><button type="button">{$lang->layout_manager[13]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,eec"><button type="button">{$lang->layout_manager[14]}</button></li>
+                </ul>
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[5]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="a,aLeft"><button type="button">{$lang->layout_manager[15]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="a,aCenter"><button type="button">{$lang->layout_manager[16]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="a,aRight"><button type="button">{$lang->layout_manager[17]}</button></li>
+                </ul>
+            </li>
+        </ul>
+
+        <fieldset class="hideOption">
+            <label for="useHeader"><input type="checkbox" id="useHeader" /> Header</label>
+            <label for="useFooter"><input type="checkbox" id="useFooter" /> Footer</label>
+        </fieldset>
+    </div>
+
+    <!-- smartmenu start -->
+    <ul id="smartmenu">
+        <li id="for-all" style="display:block">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> 
+                </dd>
+            </dl>
+        </li>
+        <li id="for-extension">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+                <dt>Extension</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[20]}</button>
+                    <button type="button" onclick="FaceOff.popupAddContent()">{$lang->layout_manager[21]}</button>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                </dd>
+            </dl>
+        </li>
+        <li id="for-widget">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+
+                <dt>Widget &gt; </dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.popupAddWidgetStyle()">{$lang->layout_manager[23]}</button>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[24]}</button>
+                    <button type="button" onclick="FaceOff.deleteWidget()">{$lang->layout_manager[25]}</button>
+                </dd>
+            </dl>
+        <li id="for-block">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+
+                <dt>Block</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                </dd>
+            </dl>
+        </li>
+    </ul>
+    <!-- smartmenu end -->
+
+    <!-- preview start -->
+    <div id="demoXe" class="demoFixed">
+        <div id="demoContainer" class="demoC">
+            <div id="demoHeader">
+            </div>
+            <div id="demoBody">
+                <div id="demoContent">
+                </div>
+                <div class="demoExtension demoE1">
+                </div>
+                <div class="demoExtension demoE2">
+                </div>
+            </div>
+            <div id="demoFooter">
+            </div>
+        </div>
+    </div>
+    <!-- preview end -->
+
+    </form>
+
+</div>
+
+<div id="propertyDialog">
+    <form>
+        <fieldset name="float" style="display:none">
+            <legend>{$lang->layout_manager[26]}</legend>
+            <div class="visible-more">
+                <label for="background-color">{$lang->layout_manager[26]} : </label>
+                <select id="float">
+                    <option value=''>{$lang->layout_manager[27]}</option>
+                    <option value='left'>{$lang->layout_manager[28]}</option>
+                    <option value='right'>{$lang->layout_manager[29]}</option>
+                </select>
+            </div>
+        </fieldset>
+        <fieldset name="width" style="display:none">
+            <legend>{$lang->layout_manager[30]}</legend>
+            <div class="visible-more">
+                <label for="width">{$lang->layout_manager[30]} : </label>
+                <input type="text" id="width" size="5" />
+            </div>
+        </fieldset>
+        <!--
+        <fieldset name="height" style="display:none">
+            <legend>{$lang->layout_manager[31]}</legend>
+            <div class="visible-more">
+                <label for="background-color">{$lang->layout_manager[31]} : </label>
+                <input type="text" id="height" size="5" />
+            </div>
+        </fieldset>
+        -->
+        <fieldset name="margin">
+            <legend>{$lang->layout_manager[32]}</legend>
+            <input type="text" id="margin" size="15" class="inputall" title="margin+px">
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="margin-top">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="margin-top" size="3">
+                </div>
+                <div>
+                    <label for="margin-left">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="margin-left" size="3">
+                </div>
+                <div>
+                    <label for="margin-right">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="margin-right" size="3">
+                </div>
+                <div>
+                    <label for="margin-bottom">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="margin-bottom" size="3">
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="padding">
+            <legend>{$lang->layout_manager[33]}</legend>
+            <input type="text" id="padding" size="15" class="inputall" title="padding+px">
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="padding-top">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="padding-top" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-left">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="padding-left" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-right">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="padding-right" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-bottom">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="padding-bottom" size="3">
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="border">
+            <legend>{$lang->layout_manager[38]}</legend>
+            <span class="inputall">
+                <input type="text" id="border-width" size="3" title="border-width+px" />
+                <input type="text" id="border-color" size="7" class="color-indicator" title="border-color" />
+                <select id="border-style" title="border-style">
+                    <option value="none">{$lang->layout_manager[39]}</option>
+                    <option value="hidden">hidden</option>
+                    <option value="dotted">dotted</option>
+                    <option value="dashed">dashed</option>
+                    <option value="solid">solid</option>
+                    <option value="double">double</option>
+                    <option value="groove">groove</option>
+                    <option value="ridge">ridge</option>
+                    <option value="inset">inset</option>
+                    <option value="inset">outset</option>
+                </select>
+            </span>
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="border-top-width">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="border-top-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-top-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-top-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-right-width">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="border-right-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-right-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-right-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-bottom-width">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="border-bottom-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-bottom-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-left-width">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="border-left-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-left-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-left-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="background">
+            <legend>{$lang->layout_manager[40]}</legend>
+            <div class="visible-more">
+                <div>
+                    <label for="background-color">{$lang->layout_manager[41]} : </label>
+                    <input type="text" id="background-color" size="7" class="color-indicator" />
+                </div>
+                <div>
+                    <label for="background-image">{$lang->layout_manager[42]} :</label>
+                    <input type="text" id="background-image" size="14" /><button type="button" onclick="popupLayoutImageList({$layout_info->layout_srl})">{$lang->layout_manager[43]}</button>
+                </div>
+                <div>
+                    <label for="background-repeat">{$lang->layout_manager[44]} : </label>
+                    <select id="background-repeat">
+                        <option value="repeat">{$lang->layout_manager[45]}</option>
+                        <option value="no-repeat">{$lang->layout_manager[46]}</option>
+                        <option value="repeat-x">{$lang->layout_manager[47]}</option>
+                        <option value="repeat-y">{$lang->layout_manager[48]}</option>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="font">
+            <legend>{$lang->layout_manager[52]}</legend>
+            <div class="visible-more">
+                <div>
+                    <label for="font-family">{$lang->layout_manager[53]} :</label>
+                    <input type="text" id="font-family" size="14" />
+                </div>
+                <div>
+                    <label for="color">{$lang->layout_manager[54]} : </label>
+                    <input type="text" id="color" size="7" class="color-indicator" />
+                </div>
+            </div>
+        </fieldset>
+        <div class="buttonArea">
+            <button type="submit">{$lang->layout_manager[49]}</button>
+            <button type="reset">{$lang->layout_manager[50]}</button>
+        </div>
+    </form>
+</div>
diff --git a/modules/layout/tpl/filter/update_layout_code.xml b/modules/layout/tpl/filter/update_layout_code.xml
index 10a7ffae8..10760c81d 100644
--- a/modules/layout/tpl/filter/update_layout_code.xml
+++ b/modules/layout/tpl/filter/update_layout_code.xml
@@ -2,6 +2,7 @@
     <form>
         <node target="layout_srl" required="true" />
         <node target="code" required="true" />
+        <node target="code_css"  />
     </form>
     <response>
         <tag name="error" />
diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html
index 1be97ddcb..a8013c439 100644
--- a/modules/layout/tpl/header.html
+++ b/modules/layout/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/layout_admin.js")-->
 
-<h3>{$lang->layout} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->layout} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_layout)}</div>
 
diff --git a/modules/layout/tpl/images/bgBody.gif b/modules/layout/tpl/images/bgBody.gif
new file mode 100644
index 000000000..45b848dba
Binary files /dev/null and b/modules/layout/tpl/images/bgBody.gif differ
diff --git a/modules/layout/tpl/images/bgContainer.gif b/modules/layout/tpl/images/bgContainer.gif
new file mode 100644
index 000000000..125b7cb9f
Binary files /dev/null and b/modules/layout/tpl/images/bgContainer.gif differ
diff --git a/modules/layout/tpl/images/bgExtension.gif b/modules/layout/tpl/images/bgExtension.gif
new file mode 100644
index 000000000..828276829
Binary files /dev/null and b/modules/layout/tpl/images/bgExtension.gif differ
diff --git a/modules/layout/tpl/images/bgMenu.gif b/modules/layout/tpl/images/bgMenu.gif
new file mode 100644
index 000000000..56981ced0
Binary files /dev/null and b/modules/layout/tpl/images/bgMenu.gif differ
diff --git a/modules/layout/tpl/images/bgSection.gif b/modules/layout/tpl/images/bgSection.gif
new file mode 100644
index 000000000..a9589f567
Binary files /dev/null and b/modules/layout/tpl/images/bgSection.gif differ
diff --git a/modules/layout/tpl/images/bgXe.gif b/modules/layout/tpl/images/bgXe.gif
new file mode 100644
index 000000000..e9f429704
Binary files /dev/null and b/modules/layout/tpl/images/bgXe.gif differ
diff --git a/modules/layout/tpl/images/buttonControler.png b/modules/layout/tpl/images/buttonControler.png
new file mode 100644
index 000000000..e89937ea9
Binary files /dev/null and b/modules/layout/tpl/images/buttonControler.png differ
diff --git a/modules/layout/tpl/images/faceoff.gif b/modules/layout/tpl/images/faceoff.gif
new file mode 100755
index 000000000..07935c5b3
Binary files /dev/null and b/modules/layout/tpl/images/faceoff.gif differ
diff --git a/modules/layout/tpl/img/black/buttonSearch.gif b/modules/layout/tpl/img/black/buttonSearch.gif
new file mode 100755
index 000000000..f8be7f12b
Binary files /dev/null and b/modules/layout/tpl/img/black/buttonSearch.gif differ
diff --git a/modules/layout/tpl/img/black/buttonTreeCollapse.gif b/modules/layout/tpl/img/black/buttonTreeCollapse.gif
new file mode 100755
index 000000000..53a942d58
Binary files /dev/null and b/modules/layout/tpl/img/black/buttonTreeCollapse.gif differ
diff --git a/modules/layout/tpl/img/black/iconMyInfo.gif b/modules/layout/tpl/img/black/iconMyInfo.gif
new file mode 100755
index 000000000..17670aa55
Binary files /dev/null and b/modules/layout/tpl/img/black/iconMyInfo.gif differ
diff --git a/modules/layout/tpl/img/black/iconWidgetList.gif b/modules/layout/tpl/img/black/iconWidgetList.gif
new file mode 100755
index 000000000..f376452ed
Binary files /dev/null and b/modules/layout/tpl/img/black/iconWidgetList.gif differ
diff --git a/modules/layout/tpl/img/black/lineTextDiv.gif b/modules/layout/tpl/img/black/lineTextDiv.gif
new file mode 100755
index 000000000..a573ed164
Binary files /dev/null and b/modules/layout/tpl/img/black/lineTextDiv.gif differ
diff --git a/modules/layout/tpl/img/black/lineTreeHr.gif b/modules/layout/tpl/img/black/lineTreeHr.gif
new file mode 100755
index 000000000..995f620d1
Binary files /dev/null and b/modules/layout/tpl/img/black/lineTreeHr.gif differ
diff --git a/modules/layout/tpl/img/black/lineTreeLastHr.gif b/modules/layout/tpl/img/black/lineTreeLastHr.gif
new file mode 100755
index 000000000..96c8d09ae
Binary files /dev/null and b/modules/layout/tpl/img/black/lineTreeLastHr.gif differ
diff --git a/modules/layout/tpl/img/black/lineTreeVr.gif b/modules/layout/tpl/img/black/lineTreeVr.gif
new file mode 100755
index 000000000..031c4bb42
Binary files /dev/null and b/modules/layout/tpl/img/black/lineTreeVr.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuB.gif b/modules/layout/tpl/img/white/arrowMenuB.gif
new file mode 100755
index 000000000..c5467bb7c
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuB.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCblue.gif b/modules/layout/tpl/img/white/arrowMenuCblue.gif
new file mode 100755
index 000000000..e526ab1bb
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCblue.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCcyan.gif b/modules/layout/tpl/img/white/arrowMenuCcyan.gif
new file mode 100755
index 000000000..d0b527151
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCcyan.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCgray.gif b/modules/layout/tpl/img/white/arrowMenuCgray.gif
new file mode 100755
index 000000000..295acf099
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCgray.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCgreen.gif b/modules/layout/tpl/img/white/arrowMenuCgreen.gif
new file mode 100755
index 000000000..ba70c4046
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCgreen.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCorange.gif b/modules/layout/tpl/img/white/arrowMenuCorange.gif
new file mode 100755
index 000000000..f1d37bbf9
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCorange.gif differ
diff --git a/modules/layout/tpl/img/white/arrowMenuCred.gif b/modules/layout/tpl/img/white/arrowMenuCred.gif
new file mode 100755
index 000000000..e94beeb7e
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowMenuCred.gif differ
diff --git a/modules/layout/tpl/img/white/arrowUlistB.gif b/modules/layout/tpl/img/white/arrowUlistB.gif
new file mode 100755
index 000000000..c5622a7cc
Binary files /dev/null and b/modules/layout/tpl/img/white/arrowUlistB.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCblue.gif b/modules/layout/tpl/img/white/bgMenuCblue.gif
new file mode 100755
index 000000000..218f0b3f7
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCblue.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCcyan.gif b/modules/layout/tpl/img/white/bgMenuCcyan.gif
new file mode 100755
index 000000000..666c8b08c
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCcyan.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCgray.gif b/modules/layout/tpl/img/white/bgMenuCgray.gif
new file mode 100755
index 000000000..56981ced0
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCgray.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCgreen.gif b/modules/layout/tpl/img/white/bgMenuCgreen.gif
new file mode 100755
index 000000000..2c4a20c83
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCgreen.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCorange.gif b/modules/layout/tpl/img/white/bgMenuCorange.gif
new file mode 100755
index 000000000..c3ebf218b
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCorange.gif differ
diff --git a/modules/layout/tpl/img/white/bgMenuCred.gif b/modules/layout/tpl/img/white/bgMenuCred.gif
new file mode 100755
index 000000000..7e382e330
Binary files /dev/null and b/modules/layout/tpl/img/white/bgMenuCred.gif differ
diff --git a/modules/layout/tpl/img/white/buttonSearch.gif b/modules/layout/tpl/img/white/buttonSearch.gif
new file mode 100755
index 000000000..f8be7f12b
Binary files /dev/null and b/modules/layout/tpl/img/white/buttonSearch.gif differ
diff --git a/modules/layout/tpl/img/white/buttonTreeCollapse.gif b/modules/layout/tpl/img/white/buttonTreeCollapse.gif
new file mode 100755
index 000000000..aa5493904
Binary files /dev/null and b/modules/layout/tpl/img/white/buttonTreeCollapse.gif differ
diff --git a/modules/layout/tpl/img/white/buttonWidgetNavigation.gif b/modules/layout/tpl/img/white/buttonWidgetNavigation.gif
new file mode 100755
index 000000000..975e0bd39
Binary files /dev/null and b/modules/layout/tpl/img/white/buttonWidgetNavigation.gif differ
diff --git a/modules/layout/tpl/img/white/buttonWidgetTab.gif b/modules/layout/tpl/img/white/buttonWidgetTab.gif
new file mode 100755
index 000000000..5d686dacc
Binary files /dev/null and b/modules/layout/tpl/img/white/buttonWidgetTab.gif differ
diff --git a/modules/layout/tpl/img/white/iconForumNum.gif b/modules/layout/tpl/img/white/iconForumNum.gif
new file mode 100755
index 000000000..42225782b
Binary files /dev/null and b/modules/layout/tpl/img/white/iconForumNum.gif differ
diff --git a/modules/layout/tpl/img/white/iconMenuAactive.gif b/modules/layout/tpl/img/white/iconMenuAactive.gif
new file mode 100755
index 000000000..67d5914e8
Binary files /dev/null and b/modules/layout/tpl/img/white/iconMenuAactive.gif differ
diff --git a/modules/layout/tpl/img/white/iconMenuAnormal.gif b/modules/layout/tpl/img/white/iconMenuAnormal.gif
new file mode 100755
index 000000000..1a635dcf1
Binary files /dev/null and b/modules/layout/tpl/img/white/iconMenuAnormal.gif differ
diff --git a/modules/layout/tpl/img/white/iconMyInfo.gif b/modules/layout/tpl/img/white/iconMyInfo.gif
new file mode 100755
index 000000000..6f8c1f5bc
Binary files /dev/null and b/modules/layout/tpl/img/white/iconMyInfo.gif differ
diff --git a/modules/layout/tpl/img/white/iconWidgetList.gif b/modules/layout/tpl/img/white/iconWidgetList.gif
new file mode 100755
index 000000000..9d84b6864
Binary files /dev/null and b/modules/layout/tpl/img/white/iconWidgetList.gif differ
diff --git a/modules/layout/tpl/img/white/linePoint.gif b/modules/layout/tpl/img/white/linePoint.gif
new file mode 100755
index 000000000..09958dad7
Binary files /dev/null and b/modules/layout/tpl/img/white/linePoint.gif differ
diff --git a/modules/layout/tpl/img/white/lineTextDiv.gif b/modules/layout/tpl/img/white/lineTextDiv.gif
new file mode 100755
index 000000000..0fa7654cb
Binary files /dev/null and b/modules/layout/tpl/img/white/lineTextDiv.gif differ
diff --git a/modules/layout/tpl/img/white/lineTreeHr.gif b/modules/layout/tpl/img/white/lineTreeHr.gif
new file mode 100755
index 000000000..2af04408c
Binary files /dev/null and b/modules/layout/tpl/img/white/lineTreeHr.gif differ
diff --git a/modules/layout/tpl/img/white/lineTreeLastHr.gif b/modules/layout/tpl/img/white/lineTreeLastHr.gif
new file mode 100755
index 000000000..e099787b2
Binary files /dev/null and b/modules/layout/tpl/img/white/lineTreeLastHr.gif differ
diff --git a/modules/layout/tpl/img/white/lineTreeVr.gif b/modules/layout/tpl/img/white/lineTreeVr.gif
new file mode 100755
index 000000000..3b9d1c444
Binary files /dev/null and b/modules/layout/tpl/img/white/lineTreeVr.gif differ
diff --git a/modules/layout/tpl/index.html b/modules/layout/tpl/index.html
index 5fb04c127..711d95c21 100644
--- a/modules/layout/tpl/index.html
+++ b/modules/layout/tpl/index.html
@@ -8,16 +8,14 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->layout}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->title}</div></th>
+        <th scope="col"><div>{$lang->layout}</div></th>
+        <th scope="col"><div>{$lang->title}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_layout_management}</div></th>
-        <th scope="col"><div>{$lang->cmd_layout_edit}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th scope="col" colspan="3"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
@@ -30,23 +28,23 @@
             (module) 
             <!--@end-->
         </td>
-        <td>{htmlspecialchars($val->title)}</td>
-        <td class="date nowrap center">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="setup center">
+        <td class="wide">{htmlspecialchars($val->title)}</td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <td>
             <!--@if(!$val->module_srl)-->
-                <a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}">{$lang->cmd_layout_management}</a>
+                <a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
             <!--@else-->
                 &nbsp;
             <!--@end-->
         </td>
-        <td class="modify center"><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}">{$lang->cmd_layout_edit}</a></td>
-        <td class="delete center"><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;">{$lang->cmd_delete}</a></td>
+        <td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
+        <td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
     <tr class="row2">
-        <td colspan="7" class="right">
-            <a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
+        <th colspan="7" class="button">
+            <a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </th>
     </tr>
 </tbody>
 </table>
diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html
index 4c31f6a13..2e8097c33 100644
--- a/modules/layout/tpl/insert_layout.html
+++ b/modules/layout/tpl/insert_layout.html
@@ -4,18 +4,23 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_layout)">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->layout_name}</div></th>
         <td>
             <select name="layout">
+                <option value="faceoff">faceoff</option>
+
+                <optgroup label="{$lang->downloaded_list}">
                 <!--@foreach($layout_list as $key => $val)-->
                 <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="selected"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
                 <!--@end-->
+                </optgroup>
+
             </select>
         </td>
     </tr>
-    <tr class="row2">  
+    <tr class="row2">
         <th scope="row"><div>{$lang->title}</div></th>
         <td>
             <input type="text" name="title" value="{$info->title}" class="inputTypeText w400" />
@@ -23,9 +28,9 @@
         </td>
     </tr>
     <tr>
-        <td scope="row" colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_next}" accesskey="s" /></span>
-        </td>
+        <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/layout/tpl/js/faceoff.js b/modules/layout/tpl/js/faceoff.js
new file mode 100644
index 000000000..75e0b729b
--- /dev/null
+++ b/modules/layout/tpl/js/faceoff.js
@@ -0,0 +1,995 @@
+jQuery(function($){
+
+// constants
+var FACEOFF_TYPE   = ['fixed','liquid','hybrid'];
+var FACEOFF_COLUMN = ['ece','c','ec','ce','cee','eec'];
+var FACEOFF_ALIGN  = ['aCenter','aLeft','aRight'];
+
+var FaceOff = {
+    curElement    : null,
+    _widgetParent : null,
+
+    preview  : $('#demoXe'),
+    propDialog : null,
+
+    init : function() {
+        var fo = this;
+
+        // toolbar
+        $('#toolbar').toolbar({
+            fade  : 300,
+            click : function(data) {
+                var args = (data.arg || '').split(',');
+
+                switch(args[0]) {
+                    case 'a': fo.setLayoutAlign(args[1],false); break;
+                    case 'c': fo.setLayoutColumn(args[1],false); break;
+                    case 't': fo.setLayoutType(args[1],false); break;
+                }
+            },
+            hover : function(data) {
+                var item = data.element;
+                if(item.parent().is('.noneToolBar')) return;
+
+                var args = data.arg.split(',');
+                var pos_item = item.offset();
+                var pos_preview = fo.preview.show().css({left:0,top:0}).offset();
+                var type, col, align;
+                type  = 'demo'+capitalize(args[0]=='t'?args[1]:fo.getLayoutType());
+                col   = 'demo'+(args[0]=='c'?args[1]:fo.getLayoutColumn()).toUpperCase();
+                align = 'demo'+capitalize(args[0]=='a'?args[1]:fo.getLayoutAlign());
+
+                fo.preview.dequeue().stop().css({
+                    width: '60px',
+                    left : pos_item.left - pos_preview.left + item.parent().width() + 2,
+                    top  : pos_item.top - pos_preview.top
+                }).attr('class', 'layoutDemo demoBox '+type+' '+align);
+
+                $('#demoContainer').attr('class','').addClass(col);
+
+                (function(){
+                    if (!fo.preview.is(':visible')) return;
+
+                    fo.preview.animate({width:'150'}, 1000).animate({width:'120'}, 1000, 'linear', arguments.callee);
+                })();
+            },
+            hide : function(menu) {
+                fo.preview.dequeue().stop().hide();
+            }
+        });
+
+        if(typeof(faceOffStyle)!='undefined') {
+            for(var i in faceOffStyle) {
+                if(i=="body") {
+                    $("html>body").attr("style",faceOffStyle[i]);
+                } else {
+                    try {
+                        $(i).attr("style",faceOffStyle[i]);
+                    } catch(e) {
+                    }
+                }
+            }
+        }
+
+        $('#xe , #body, #header, #footer, #neck, #knee, div.e1, div.e2, div.neck, div.knee').each( function(i) { $(this).find('a').css('color',$(this).css('color')).css('font-family',$(this).css('font-family')); } );
+
+        if($('#header').css('display')!='none') $('#useHeader').attr('checked',true);
+        else $('#useHeader').attr('checked',false);
+        if($('#footer').css('display')!='none') $('#useFooter').attr('checked',true);
+        else $('#useFooter').attr('checked',false);
+
+        $('#useHeader').click(function(event) {
+            if($('#useHeader').attr('checked')) {
+                $('#header').css('display','block');
+                $('#useHeader').attr('checked', true);
+            } else {
+                $('#header').css('display','none');
+                $('#useHeader').attr('checked', false);
+            }
+        });
+
+        $('#useFooter').click(function(event) {
+            if($('#useFooter').attr('checked')) $('#footer').css('display','block');
+            else $('#footer').css('display','none');
+        });
+
+        // tab to select widget
+        $(document).mousedown(function(event){
+            var filter = '#xe .widgetOutput, #xe .extension, #body, #header, #footer, #toolbar, #propertyDialog, #faceoffSelector, .overlay';
+            var target = $(event.target);
+            var selection = target.parents(filter).add(target);
+
+            if (selection.is('#toolbar, #propertyDialog, #faceoffSelector, .overlay')) return;
+
+            if (selection.is(filter)) {
+                fo.selectElement(selection.filter(filter).eq(0));
+
+                event.stopPropagation();
+                event.preventDefault();
+            } else if(fo.curElement) {
+                fo.selectElement(null);
+            }
+        }).hotkey({
+            'TAB'   : method(this.selectByTAB, this),
+            'Shift+TAB' : method(this.selectByTAB, this),
+            'UP'    : method(this.moveWidget, this),
+            'DOWN'  : method(this.moveWidget, this),
+            'LEFT'  : method(this.moveWidget, this),
+            'RIGHT' : method(this.moveWidget, this),
+            'ESC'   : method(this.selectByESC, this),
+            'ENTER' : method(this.showPreference, this)
+        });
+
+        // select default menus
+        var type  = this.getLayoutType();
+        var col   = this.getLayoutColumn();
+        var align = this.getLayoutAlign();
+
+        $('#toolbar .buttons li.menu').each(function(){
+            var arg = $(this).attr('tb:arg');
+            if (!arg.indexOf('t,'+type) || !arg.indexOf('c,'+col) || !arg.indexOf('a,'+align)) $(this).click();
+        });
+
+        this.propDialog = PropertyDialog.init('#propertyDialog');
+    },
+    getLayoutType : function() {
+        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
+        //sel.css('padding','').css('margin','');
+        return findEnum($('#xe').attr('class'), FACEOFF_TYPE);
+    },
+    // LaytoutType : 'fixed','liquid','hybrid' 을 set
+    // fixed : Use fixed width for all column
+    // liquid : Use flexible width for all column
+    // hybrid : Use flexible width for all column but content column
+    setLayoutType : function(type) {
+        $('#xe').removeClass(FACEOFF_TYPE.join(' ')).addClass(_enum(type, FACEOFF_TYPE));
+    },
+    getLayoutColumn : function() {
+        return findEnum($('#container').attr('class'), FACEOFF_COLUMN);
+    },
+    //'ece','c','ec','ce','cee','eec' 컬럼타입을 set 한다 크기와 관련된 스타일은 초기화 한다
+    setLayoutColumn : function(type,init){
+        $('#container').removeClass(FACEOFF_COLUMN.join(' ')).addClass(_enum(type, FACEOFF_COLUMN));
+        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
+
+        if(init) sel.css('padding','').css('margin','');
+
+        // 칼럼의 변경으로, 현재 선택된 위젯이 보이지 않게 된다면, 위젯 선택을 해제한다.
+        if (this.curElement && !this.curElement.parents('#xe .extension:visible').length) {
+            this.selectElement(null);
+        }
+    },
+    getLayoutAlign  : function() {
+        return findEnum($('#xe').attr('class'), FACEOFF_ALIGN);
+    },
+    setLayoutAlign : function(type) {
+        $('#xe').removeClass(FACEOFF_ALIGN.join(' ')).addClass(_enum(type, FACEOFF_ALIGN));
+    },
+    saveLayoutConfig : function(saveTemp) {
+        $.exec_json('layout.procLayoutAdminUserValueInsert', {
+            'saveTemp':saveTemp || '',
+            mid  : current_mid,
+            type : this.getLayoutType(),
+            column : this.getLayoutColumn(),
+            align  : this.getLayoutAlign(),
+            neck : this.getWidgetContent($('#body .neck:visible')),
+            knee : this.getWidgetContent($('#body .knee:visible')),
+            e1   : this.getWidgetContent($('#body .e1:visible')),
+            e2   : this.getWidgetContent($('#body .e2:visible')),
+            neck : this.getWidgetContent($('#neck:visible')),
+            knee : this.getWidgetContent($('#knee:visible')),
+            css  : this.getFaceoffStyle()
+        },function(data){
+            if(data.saveTemp=='Y'){
+                document.location.href = request_uri.setQuery('mid',current_mid).setQuery('act','dispLayoutAdminLayoutModify');
+            }else{
+                document.location.href = request_uri.setQuery('mid',current_mid);
+            }
+        });
+    },
+    getWidgetContent : function(el) {
+        if (!el.length) return '';
+
+        var text = [];
+
+        el.find('div[widget]').each(function(){
+            var type = $(this).attr('widget');
+
+            switch(type) {
+                case 'widgetContent':
+                    var div  = $('<div>');
+                    var attr = [];
+
+                    $(this.attributes).each(function(){
+                        if (!this.nodeName || !this.nodeValue) return;
+
+                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
+                        if ('.contenteditable.src.widget.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
+
+                        div.text(val);
+                        attr.push(name+'="'+div.html()+'"');
+                    });
+
+                    var content = $(this).children('div.widgetContent');
+                    if (!content.length) return;
+                    return text.push('<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" '+attr.join(' ')+' />');
+                default:
+                    var div  = $('<div>');
+                    var attr = [];
+
+                    $(this.attributes).each(function(){
+                        if (!this.nodeName || !this.nodeValue) return;
+
+                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
+                        if ('.style.contenteditable.src.widget.body.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
+
+                        div.text(val);
+                        attr.push(name+'="'+div.html()+'"');
+                    });
+                    attr.push('style="'+$(this).attr('style')+'"');
+
+//                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" addclass="section" '+attr.join(' ')+' />');
+                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" '+attr.join(' ')+' />');
+            }
+        });
+
+        return text.join('');
+    },
+    getFaceoffStyle : function() {
+        var sty = [];
+        var sel = $('html>body,#container[style],#header[style],#footer[style]')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible'); //div[id^=ex_][style]:visible,
+
+        sel.each(function(){
+            var bgImage = $(this).css("backgroundImage");
+            if(bgImage && bgImage!='none') {
+                bgImage = bgImage.replace(/(.+)images\/([a-z0-9]+)\.(jpg|jpeg|gif|png|swf|flv)\)/i,'url(./images/$2.$3)');
+                $(this).css("background-image",bgImage);
+            }
+            var style = $(this).attr('style');
+            if($(this).is('.neck, .knee, .e1, .e2')) {
+                if (!style) return;
+                if($(this).is('.e1')) sty.push( 'div.e1 { ' + style + ' } ');
+                else if($(this).is('.e2')) sty.push( 'div.e2 { ' + style + ' } ');
+                else if($(this).is('.neck')) sty.push( 'div.neck { ' + style + ' } ');
+                else if($(this).is('.knee')) sty.push( 'div.knee { ' + style + ' } ');
+            }else if($(this).is('html>body')) {
+                style = 'background-color:' + $(this).css('backgroundColor')
+                + ';background-image:' + $(this).css('backgroundImage')
+                + ';background-repeat:' + $(this).css('backgroundRepeat');
+                + ';font-family:'+ $(this).css('fontFamily');
+                + ';color:'+ $(this).css('color');
+                sty.push('body' + ' { ' + style +' }');
+                if($(this).css('fontFamily')) sty.push('body a { font-family:'+$(this).css('fontFamily')+'; }');
+                if($(this).css('color')) sty.push('body a { color:'+$(this).css('color')+'; }');
+            } else {
+                if (!style) return;
+                sty.push('#' + this.id + ' { ' + style +' }');
+                if($(this).css('fontFamily')) sty.push('#'+this.id+' a { font-family:'+$(this).css('fontFamily')+'; }');
+                if($(this).css('color')) sty.push('#'+this.id+' a { color:'+$(this).css('color')+'; }');
+            }
+        });
+
+        return sty.join('\n');
+    },
+    doAddWidgetCode : function(widget_code) {
+
+        var par = this._widgetParent;
+        var obj = $(widget_code);
+        var uniqueId = '', style = '';
+
+        if (!par) return;
+
+
+        if (par.is('.widgetOutput')) {
+            uniqueId = par.attr('id');
+            obj.attr('id', uniqueId).addClass('section');
+            par.replaceWith(obj).attr('style', par.attr('style'));
+            if(!obj.css("float")) obj.css("clear","both");
+            else(obj.css("clear",""));
+        } else {
+            uniqueId = 'ex_'+(new Date()).getTime();
+            obj.attr('id', uniqueId).addClass('section');
+            obj.appendTo(this._widgetParent).attr('style','');
+            obj.css("clear","both");
+        }
+
+        this.selectElement(this._widgetParent);
+        this._widgetParent = null;
+
+        this.saveLayoutConfig('Y');
+    },
+    selectByTAB : function(event, key) {
+        var els   = null;
+        var cur   = this.curElement;
+        var shift = event.shiftKey, els, len, idx;
+
+        if (!cur || cur.hasClass('widgetOutput')) els = $('#xe .extension:visible > .widgetOutput');
+        else if (cur.is('#body, #header, #footer')) els = $('#body, #header, #footer');
+        else if (cur.is('.extension')) els = $('#xe .extension:visible');
+
+        if (!els.length) els = $('#xe .extension:visible');
+
+        if (!(len = els.length)) return;
+        if (cur && (idx = els.index(cur)) < 0) {
+            this.selectElement(null);
+            return this.selectByTAB(event, key);
+        }
+
+        if (cur) {
+            if (shift) this.selectElement( els.eq( idx?idx-1:len-1 ) );
+            else this.selectElement( els.eq( idx==len-1?0:idx+1 ) );
+        } else {
+            this.selectElement( els.eq( shift ? len-1 : 0 ) );
+        }
+    },
+    selectByESC : function(event, key) {
+        var cur = this.curElement, par;
+
+        if (!cur) return this.selectByTAB(event, key);
+
+        if (cur.is('#body, #header, #footer')) {
+            this.selectElement(null);
+        } else if (cur.hasClass('extension')) {
+            par = cur.parent('#body, #header, #footer').add(cur.prev('#header')).add(cur.next('#footer'));
+            par.length?this.selectElement(par.eq(0)):this.selectElement(null);
+        } else if (cur.hasClass('widgetOutput')) {
+            this.selectElement( cur.parent('.extension').eq(0) );
+        }
+    },
+    moveWidget : function(event, key) {
+        var vert = 0, horz = 0;
+        var cur = this.curElement;
+        var selection;
+
+        if (!cur || !cur.hasClass('widgetOutput')) return;
+
+        switch(key) {
+            case 'UP': vert = -1; break;
+            case 'DOWN' : vert = 1; break;
+            case 'LEFT' : horz = -1; break;
+            case 'RIGHT' : horz = 1; break;
+        }
+
+        if (horz && cur.parents('#body').length && this.getLayoutColumn().length > 2) {
+            if (horz > 0 && cur.parents('.e1').length && $('#body > .e2:visible').length) {
+                $('#body > .e2').append(cur);
+            } else if (horz < 0 && cur.parents('.e2').length && $('#body > .e1:visible').length) {
+                $('#body > .e1').append(cur);
+            }
+        } else if (vert < 0) { // up
+            if ((selection = cur.prev('.widgetOutput')).length) {
+                selection.before(cur);
+            } else if (cur.parents('.e1, .e2').length) {
+                $('#neck > .extension').append(cur);
+            } else if (cur.parents('#knee:visible').length) {
+                $('#body > .extension:visible:last').append(cur);
+            }
+        } else if (vert > 0) { // down
+            if ((selection = cur.next('.widgetOutput')).length) {
+                selection.after(cur);
+            } else if (cur.parents('.e1, .e2').length) {
+                $('#knee > .extension').prepend(cur);
+            } else if (cur.parents('#neck:visible').length) {
+                $('#body > .extension:visible:first').prepend(cur);
+            }
+        }
+
+        this.selectElement(cur);
+    },
+    deleteWidget : function(){
+        var cur = this.curElement;
+
+        if (!cur.is('.widgetOutput')) return;
+        cur.remove();
+
+        this.saveLayoutConfig('Y');
+    },
+    popupAddWidgetStyle : function(){
+        var cur = this.curElement;
+        this._widgetParent = this.curElement;
+
+        if (!cur.is('.widgetOutput')) return;
+
+        selectedWidget = cur.get(0);
+        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+cur.attr('widget')+"&widgetstyle="+cur.attr('widgetstyle'),'GenerateCodeInPage');
+    },
+
+    popupAddWidget : function() {
+        var cur = this.curElement;
+        var url = request_uri.replace(/\?.+$/, '')+'?module=widget&type=faceoff';
+        var win = 'GenerateWidgetCode';
+
+        if (!cur.is('.widgetOutput, .extension')) return;
+
+        this._widgetParent = this.curElement;
+
+        if (cur.is('.widgetOutput')) {
+            selectedWidget = cur.get(0);
+            // modify widget
+            if (cur.attr('widget') == 'widgetContent') {
+                // content widget
+                url += '&act=dispWidgetAdminAddContent&module_srl='+$('#layout_srl').val()+'&document_srl='+cur.attr('document_srl');
+                popopen(url, 'addContent');
+            } else {
+                // widget
+                url += '&act=dispWidgetGenerateCodeInPage&selected_widget='+cur.attr('widget');
+                popopen(url, 'GenerateCodeInPage');
+            }
+        } else {
+            // add new widget
+            url += '&act=dispWidgetGenerateCodeInPage';
+            popopen(url, 'GenerateCodeInPage');
+        }
+    },
+    popupAddContent : function() {
+        var url = request_uri.replace(/\?.+$/,'')+'?module=widget&act=dispWidgetAdminAddContent&type=faceoff&mid=current_mid&module_srl='+$('#layout_srl').val();
+
+        this._widgetParent = this.curElement;
+
+        popopen(url, "addContent");
+    },
+    selectElement  : function(element) {
+        var selector = $('#faceoffSelector'), cur, pos_cur, pos_sel;
+        var cur = this.curElement = element || null;
+
+        if (!selector.length) selector = $('<div id="faceoffSelector">');
+
+        // hide selector
+        selector.hide();
+        var sel = $('#neck[style]:visible .extension, #knee[style]:visible .extension,div.e1[style]:visible, div.e2[style]:visible').height('');
+
+        // 위젯을 할당한다. 선택된 위젯이 jQuery 객체가 아니거나 혹은 해당하는 DOM이 없다면 현재 선택된 위젯은 없다.
+        if (cur && ( !cur.jquery || !cur.length )) cur = this.curElement = null;
+
+        $('#smartmenu>li').hide();
+        // effect on select
+        if (cur) {
+            $(cur.get(0).offsetParent).append(selector);
+
+            pos_cur = cur.offset();
+            pos_sel = selector.css({position:'absolute',left:0,top:0}).show().offset();
+
+            if(cur.height() == 0) cur.height(20);
+
+            selector.css({
+                left : pos_cur.left - pos_sel.left,
+                top  : pos_cur.top  - pos_sel.top
+            })
+            .width(cur.attr('offsetWidth'))
+            .height(cur.attr('offsetHeight'));
+
+            if (cur.is('#body, #header, #footer')) {
+                $('#for-block').show();
+                $('>dl>dt:visible','#for-block').html(cur.attr('id')+' &gt; ');
+            } else if (cur.is('.extension')) {
+
+                var selected = 'Extension';
+                if(cur.parent().is('#neck')){
+                    selected = 'Neck';
+                }else if(cur.parent().is('#knee')){
+                    selected = 'Knee';
+                }else if(cur.is('.neck')){
+                    selected = 'Extension Neck';
+                }else if(cur.is('.knee')){
+                    selected = 'Extension Knee';
+                }else if(cur.is('.e1')){
+                    selected = 'Extension 1';
+                }else if(cur.is('.e2')){
+                    selected = 'Extension 2';
+                }
+                $('>dl>dt','#for-extension').html(selected+' &gt; ');
+
+                $('#for-extension').show();
+            } else if (cur.is('.widgetOutput')) {
+                $('#for-widget').show();
+
+            }
+        } else {
+            $('#for-all').show();
+        }
+    },
+    showPreference : function(event,target) {
+        if(target && target=='html>body' || target=='#container'){
+            this.propDialog.open($(target));
+        }else{
+            var cur = this.curElement;
+
+            if (!cur || !cur.length) return this.closePreference();
+
+            this.propDialog.open(this.curElement);
+        }
+    },
+    paint : function() {
+        if (!this.curElement) return;
+
+        // repaint selection size
+
+        if (this.propDialog.visible())
+
+        this.propDialog.paint();
+    }
+};
+
+var PropertyDialog = {
+    element : null,
+    overlay : null,
+    target  : null,
+
+    init : function(element) {
+        this.element = $(element).draggable();
+
+        if (!this.overlay) this.overlay = Overlay.create();
+
+        // more link
+        this.element.find('button.morelink').click( method(this.more, this) );
+
+        // form
+        this.element.find('form')
+            .bind('submit', method(this.save, this))
+            .bind('reset', method(this.cancel, this));
+
+        return this;
+    },
+    open : function(selectedElement) {
+        var sel = selectedElement;
+        var dlg = $('#propertyDialog');
+        var vals = [], i = 0, j = 0;
+        var type = ['margin', 'padding'];
+        var dirs = ['top','right','bottom','left'];
+        var reSame = /^([0-9a-z%\-]+) \1 \1 \1$/;
+        var isWidget = false;
+        var isBody = false;
+        var isLayout = false;
+        dlg.css( { position : 'absolute' } );
+
+        function same_all(arr) {
+            return (arr[0] == arr[1] && arr[1] == arr[2] && arr[2] == arr[3]);
+        }
+
+        // target element
+        this.target = sel;
+
+        // is the target a widget?
+        isWidget = sel.is('.widgetOutput');
+        isBody  = sel.is('html>body');
+        isContainer  = sel.is('#container');
+        isHeader = sel.is('#header');
+
+
+        $('fieldset',dlg).show();
+
+        if(!isWidget){
+            $('fieldset[name=float],fieldset[name=width],fieldset[name=height],fieldset[name=margin],fieldset[name=padding]',dlg).hide();
+        }
+
+        if(isBody){
+            $('fieldset[name!=background]',dlg).hide();
+            $('fieldset[name=font]',dlg).show();
+        }
+
+        if(isHeader){
+            $('fieldset[name=margin]',dlg).show();
+            $('fieldset[name=padding]',dlg).show();
+        }
+
+        // remove visible more
+        this.element.find('.visible-more').removeClass('visible-more');
+
+        // get preferences
+        if($('fieldset[name=float]:visible',dlg).size() > 0){
+            //float
+            $('#float').val(sel.css('float'));
+            $('#width').val(sel.css('width'));
+            //$('#height').val(sel.css('height'));
+        }
+
+        if($('fieldset[name=margin]:visible',dlg).size() > 0){
+            // margins and paddings
+            for(j=0; j < type.length; j++) {
+                for(i=0, vals=[]; i < dirs.length; i++) {
+                    vals[i] = (j&&sel.is('.widgetOutput')?sel.find('div.widgetBorder > div:first'):sel).css(type[j]+'-'+dirs[i]).toLowerCase();
+
+                    if ($.browser.msie && vals[i] == 'auto') vals[i] = '0px';
+                    $('#'+type[j]+'-'+dirs[i]).val(vals[i]);
+                }
+
+                $('#'+type[j]).val( reSame.test(vals.join(' '))?vals[0]:vals.join(' ') );
+            }
+        }
+
+
+        if($('fieldset[name=border]:visible',dlg).size() > 0){
+            // border
+            var style = [], width = [], color = [];
+            for(i=0; i < dirs.length; i++) {
+                style[i] = sel.css('border-'+dirs[i]+'-style').toLowerCase();
+                width[i] = sel.css('border-'+dirs[i]+'-width').toLowerCase();
+                color[i] = this._formatColor(sel.css('border-'+dirs[i]+'-color'));
+            }
+            if ( same_all(style) && same_all(width) && same_all(color) ) {
+                $('#border-style').val(style[0]);
+                $('#border-width').val(width[0]);
+                $('#border-color').val(color[0]);
+            } else {
+                dlg.find('fieldset[name=border]').addClass('visible-more');
+
+                for(i=0; i < dirs.length; i++) {
+                    $('#border-'+dirs[i]+'-style').val( style[i] );
+                    $('#border-'+dirs[i]+'-width').val( width[i] );
+                    $('#border-'+dirs[i]+'-color').val( color[i] );
+                }
+            }
+        }
+
+        if($('fieldset[name=font]:visible',dlg).size() > 0){
+            //font
+            $('#font-family').val(sel.css('font-family'));
+            $('#color').val(sel.css('color'));
+        }
+
+        if($('fieldset[name!=background]',dlg).size() > 0){
+            // background
+
+            dlg.find('fieldset[name=background]').addClass('visible-more');
+            $('#background-color').val(this._formatColor(sel.css('background-color')));
+            if(sel.css('background-image')) $('#background-image').val(sel.css('background-image').replace(/url\(([^\)]*)\)/i,'$1'));
+            $('#background-repeat').val(sel.css('background-repeat'));
+        }
+
+        this.element.show();
+        this.overlay.show(selectedElement);
+
+        // disable hotkey
+        $(document).hotkey('disable');
+
+        // add esc key event
+        $(window).keyup( function(e) { if(e.keyCode == 27) window.FaceOff.propDialog.close(); } );
+    },
+    save : function(event) {
+        var val;
+
+        if (!this.target) return false;
+
+        var dlg = $('#propertyDialog');
+
+        if($('fieldset[name=margin]:visible',dlg).size() > 0){
+            // margins
+            if ($('#margin').is(':visible')) {
+                val = $('#margin').val();
+            } else {
+                val = this._compactValues(
+                    $('#margin-top').val(),
+                    $('#margin-right').val(),
+                    $('#margin-bottom').val(),
+                    $('#margin-left').val()
+                );
+            }
+
+            if (this.target.is('.widgetOutput')) {
+                this.target.css('margin', val);
+
+                val = this._expandValues( $.trim(val).split(' ') );
+                this.target
+                    .attr('widget_margin_top', val[0])
+                    .attr('widget_margin_right', val[1])
+                    .attr('widget_margin_bottom', val[2])
+                    .attr('widget_margin_left', val[3]);
+            } else {
+                this.target.css('margin', val);
+            }
+        }
+
+
+        if($('fieldset[name=padding]:visible',dlg).size() > 0){
+            // paddings
+            if ($('#padding').is(':visible')) {
+                val = $('#padding').val();
+            } else {
+                val = this._compactValues(
+                    $('#padding-top').val(),
+                    $('#padding-right').val(),
+                    $('#padding-bottom').val(),
+                    $('#padding-left').val()
+                );
+            }
+
+            if (this.target.is('.widgetOutput')) {
+                this.target.find('div.widgetBorder > div:first').attr('style','').css('padding', val);
+
+                val = this._expandValues( $.trim(val).split(' ') );
+                this.target
+                    .attr('widget_padding_top', val[0])
+                    .attr('widget_padding_right', val[1])
+                    .attr('widget_padding_bottom', val[2])
+                    .attr('widget_padding_left', val[3]);
+            } else {
+                this.target.css('padding', val);
+            }
+        }
+
+
+        if($('fieldset[name=border]:visible',dlg).size() > 0){
+            // border
+            if (this.element.find('fieldset[name=border] .inputall').is(':visible')) {
+                this.target.css( 'border', $('#border-width').val()+' '+$('#border-style').val()+' '+$('#border-color').val() );
+            } else {
+
+                this.target.css( 'border-top', $('#border-top-width').val()+' '+$('#border-top-style').val()+' '+$('#border-top-color').val() );
+                this.target.css( 'border-right', $('#border-right-width').val()+' '+$('#border-right-style').val()+' '+$('#border-right-color').val() );
+                this.target.css( 'border-bottom', $('#border-bottom-width').val()+' '+$('#border-bottom-style').val()+' '+$('#border-bottom-color').val() );
+                this.target.css( 'border-left', $('#border-left-width').val()+' '+$('#border-left-style').val()+' '+$('#border-left-color').val() );
+            }
+        }
+
+        // background
+        val = $('#background-image').val().trim();
+        if (val == 'none' || val == '') val = '';
+        if (val) val = 'url("'+val+'")';
+
+        this.target.css({
+            'background-color' : $('#background-color').val(),
+            'background-image' : val,
+            'background-repeat' : $('#background-repeat').val()
+        });
+
+
+        // font 
+        this.target.css({
+            'font-family' : $('#font-family').val(),
+            'color' : $('#color').val()
+        });
+
+        this.target.find('a').css({
+            'font-family' : $('#font-family').val(),
+            'color' : $('#color').val()
+        });
+
+
+        if($('fieldset[name=float]:visible',dlg).size() > 0){
+            if(this.target.is('.widgetOutput')){
+                this.target.css({
+                    'float' : $('#float').val(),
+                    'width' : $('#width').val(),
+                    'clear' : ''
+                    //'height' : $('#height').val()
+                });
+            }
+        }
+
+
+        // close this dialog
+        this.close();
+
+        return false;
+    },
+    cancel : function() {
+        // close this dialog
+        this.close();
+
+        return false;
+    },
+    close : function() {
+        this.target = null;
+
+        this.element.hide();
+        this.overlay.hide();
+
+        // enable hotkey
+        $(document).hotkey('enable');
+    },
+    more : function(event) {
+        var block  = $(event.target).parent();
+        var name   = '';
+        var val    = '';
+        var items = ['top', 'right', 'bottom', 'left'];
+        var reUnit = /^(\-?[0-9]+(?:%|px|em|pt)|auto)$/;
+        var i;
+
+        name = block.toggleClass('visible-more').attr('name');
+
+        if (block.is('.visible-more')) {
+            switch(name) {
+                case 'margin':
+                case 'padding':
+                    val = $('#'+name).val();
+                    val = $.trim(val).replace('\s{2,}', ' ').split(' ');
+                    val = this._expandValues(val);
+
+                    for(i=0; i < val.length; i++) {
+                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
+                        $('#'+name+'-'+items[i]).val(val[i]);
+                    }
+
+                    $('#'+name+'-top').focus();
+                    break;
+                case 'border':
+                    val = $('#border-width').val();
+                    if (!val || !reUnit.test(val)) val = '0px';
+
+                    for(i=0; i < items.length; i++) {
+                        $('#border-'+items[i]+'-style').val( $('#border-style').val() );
+                        $('#border-'+items[i]+'-width').val( val );
+                        $('#border-'+items[i]+'-color').val( this._formatColor($('#border-color').val()) );
+                    }
+                    break;
+            }
+        } else {
+            switch(name) {
+                case 'margin':
+                case 'padding':
+                    for(i=0; i < val.length; i++) {
+                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
+                        $('#'+name+'-'+items[i]).val(val[i]);
+                    }
+
+                    val = this._compactValues(
+                        $('#'+name+'-top').val(),
+                        $('#'+name+'-right').val(),
+                        $('#'+name+'-bottom').val(),
+                        $('#'+name+'-left').val()
+                    );
+
+                    $('#'+name).val(val).focus();
+                    break;
+                case 'border':
+                    $('#border-style').val( $('#border-top-style').val() );
+                    $('#border-width').val( $('#border-top-width').val() );
+                    $('#border-color').val( this._formatColor($('#border-top-color').val()) );
+                    break;
+            }
+        }
+    },
+    visible : function() {
+        return this.element.is(':visible');
+    },
+    paint : function(selectedElement) {
+        this.overlay.paint(selectedElement);
+    },
+    _compactValues : function(top,right,bottom,left) {
+        if (top == right && right == left && left == bottom) {
+            return top;
+        } else if (top == bottom && right == left) {
+            return top+' '+left;
+        } else {
+            return top+' '+right+' '+bottom+' '+left;
+        }
+    },
+    _expandValues : function(values) {
+        var v = values;
+
+        if (v.length == 1) return [ v[0], v[0], v[0], v[0] ];
+        if (v.length == 2) return [ v[0], v[1], v[0], v[1] ];
+        if (v.length == 3) v.push(v[1]);
+
+        return v;
+    },
+    _formatColor : function(color) {
+        function hex(s) {
+            s = parseInt(s,10).toString(16);
+            return s.length<2?'0'+s:s;
+        }
+
+        if (/rgb\(([0-9, ]+)\)/i.test(color)) {
+            var rgb = RegExp.$1.replace(/\s+/g, '').split(',');
+
+            return '#'+hex(rgb[0])+hex(rgb[1])+hex(rgb[2]);
+        }
+
+        return color;
+    }
+};
+
+var Overlay = {
+    element : null,
+
+    create : function() {
+        // create overlay
+        this.element = $('<div /><div /><div /><div />').appendTo(document.body).attr('class', 'overlay').css('opacity', 0.75);
+
+        return this;
+    },
+    toggle : function(selectedElement) {
+        if (this.element.is(':visible')) {
+            this.show(selecetedElement);
+        } else {
+            this.hide();
+        }
+    },
+    show : function(selectedElement) {
+        this.paint(selectedElement);
+        this.element.show();
+    },
+    hide : function() {
+        this.element.hide();
+    },
+    paint : function(selectedElement) {
+        var sel = selectedElement;
+        var doc = $(document);
+        var pos = sel.offset();
+        var ovr = this.element;
+
+        // top
+        ovr.eq(0).css({
+            left : 0,
+            top  : 0,
+            width  : '100%',
+            height : pos.top+'px'
+        });
+
+        // left
+        ovr.eq(1).css({
+            left : 0,
+            top  : pos.top+'px',
+            width  : pos.left+'px',
+            height : sel.get(0).offsetHeight+'px'
+        });
+
+        // right
+        ovr.eq(2).css({
+            right : 0,
+            top   : pos.top+'px',
+            width  : doc.width()-pos.left-sel.get(0).offsetWidth+'px',
+            height : sel.get(0).offsetHeight+'px'
+        });
+
+        // bottom
+        ovr.eq(3).css({
+            left   : 0,
+            bottom : 0,
+            width  : '100%',
+            height : doc.height()-pos.top-sel.get(0).offsetHeight+'px'
+        });
+    }
+}
+
+// bind a function as a method
+function method(func, thisObj) {
+    return function() {
+        return func.apply(thisObj,arguments);
+    }
+}
+
+//  특정한 값이 주어진 타입에 해당하는지 확인하고 그렇지 않다면 기본값으로 대체한다.
+function _enum(value, enums, defaultIndex) {
+    if (!$.isArray(enums) || enums.length < 1) return value;
+    if (typeof defaultIndex == "undefined") defaultIndex = 0;
+
+    return $.inArray(value, enums)?value:enums[defaultIndex];
+}
+
+// 클래스 문자열에서 주어진 타입에 해당하는 클래스를 추출
+function findEnum(strClass, enums) {
+    var regex = new RegExp(' (' + enums.join('|') + ') ');
+
+    return regex.test(' ' + strClass + ' ')?RegExp.$1:'';
+}
+
+function capitalize(str) {
+    return str.charAt(0).toUpperCase() + str.substr(1);
+}
+
+// register objects as global
+window.FaceOff = FaceOff;
+window.doAddWidgetCode = function(widget_code){ FaceOff.doAddWidgetCode(widget_code) };
+FaceOff.init();
+
+});
+
+// overriding displayMultiMedia()
+window.displayMultimedia = function(src, width, height, options) {
+    var html = _displayMultimedia(src, width, height, options);
+
+    if (jQuery.isReady) {
+
+    } else {
+        document.write(html);
+    }
+}
+
+var selectedWidget =null;
diff --git a/modules/layout/tpl/js/layout_admin.js b/modules/layout/tpl/js/layout_admin.js
index d15b35c79..6b065b73f 100644
--- a/modules/layout/tpl/js/layout_admin.js
+++ b/modules/layout/tpl/js/layout_admin.js
@@ -1,44 +1,68 @@
+
 /* 레이아웃 신규 생성시 완료 후 요청하는 함수 */
 function completeInsertLayout(ret_obj) {
       var layout_srl = ret_obj['layout_srl'];
       var url = current_url.setQuery('act','dispLayoutAdminModify').setQuery('layout_srl',layout_srl);
       location.href = url;
-} 
+}
 
 /* 레이아웃 삭제 */
 function doDeleteLayout(layout_srl) {
-    var fo_obj = xGetElementById("fo_layout");
-    if(!fo_obj) return;
+    var fo_obj = jQuery('#fo_layout').get(0);
     fo_obj.layout_srl.value = layout_srl;
-
     procFilter(fo_obj, delete_layout);
 }
 
 /* 수정된 레이아웃을 원본으로 돌림 */
 function doResetLayoutCode(layout_srl) {
-    var fo_obj = xGetElementById('fo_layout');
+    var fo_obj = jQuery('#fo_layout').get(0);
     procFilter(fo_obj, reset_layout_code);
     return false;
 }
 
 /* 수정중인 레이아웃 미리보기 */
-function doPreviewLayoutCode() {
-    var fo_obj = xGetElementById('fo_layout');
-    fo_obj.target = "_LayoutPreview";
-    fo_obj.act.value = "dispLayoutAdminPreview";
-    fo_obj.submit();
-    fo_obj.act.value = "";
-    fo_obj.target = "";
+function doPreviewLayoutCode(layout_srl) {
+
+    jQuery('#fo_layout').attr('target', "_LayoutPreview");
+    jQuery('input[name=act]','#fo_layout').val("dispLayoutAdminPreview");
+    jQuery('#fo_layout').submit();
+    jQuery('#fo_layout').removeAttr('target');
+//        .submit().removeAttr('target').find('input[name=act]').val('');
 }
 
 
 /* 메뉴 관리로 이동 */
 function doMenuManagement(menu_id) {
-    var fo_obj = xGetElementById("fo_layout");
-    var sel_obj = fo_obj[menu_id];
-    if(sel_obj.selectedIndex == 0) return;
-    var menu_srl = sel_obj.options[sel_obj.selectedIndex].value;
+    var menu_srl = jQuery('#fo_layout select[name='+menu_id+'] option:selected').val();
+    var url = '';
+    // 선택된 메뉴가 없으면
+    if(menu_srl == 0){
+        url = current_url.setQuery('module','admin').setQuery('act','dispMenuAdminInsert');
+    }else{
+        url = current_url.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl);
+    }
 
-    var url = current_url.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl);
-    winopen(url,'MenuManage','width=850,height=800,resizable=yes,scrollbars=yes,toolbars=no');
+    winopen(url);
+}
+
+
+function checkFile(f){
+    var filename = jQuery('[name=user_layout_image]',f).val();
+    if(/\.(gif|jpg|jpeg|gif|png|swf|flv)$/i.test(filename)){
+        return true;
+    }else{
+        alert('only image and flash file');
+        return false;
+    }
+}
+
+function deleteFile(layout_srl,filename){
+    var params ={
+            "layout_srl":layout_srl
+            ,"filename":filename
+            };
+
+    jQuery.exec_json('layout.procLayoutAdminUserImageDelete', params, function(data){
+        document.location.reload();
+    });
 }
diff --git a/modules/layout/tpl/js/layout_image_list.js b/modules/layout/tpl/js/layout_image_list.js
new file mode 100644
index 000000000..52054a414
--- /dev/null
+++ b/modules/layout/tpl/js/layout_image_list.js
@@ -0,0 +1,13 @@
+var input_image = null;
+
+function popupLayoutImageList(layout_srl){
+    input_image = jQuery('#background-image');
+    if(!layout_srl) return;
+    var url = request_uri.setQuery('module','layout').setQuery('act','dispLayoutAdminLayoutImageList').setQuery('layout_srl',layout_srl);
+    popopen(url, "LayoutImageList");
+}
+
+function selectLayoutImage(url){
+    opener.input_image.val(url);
+    window.close();
+}
diff --git a/modules/layout/tpl/js/ui.hotkey.js b/modules/layout/tpl/js/ui.hotkey.js
new file mode 100644
index 000000000..a56d3d10a
--- /dev/null
+++ b/modules/layout/tpl/js/ui.hotkey.js
@@ -0,0 +1,119 @@
+/*
+ * jQuery Hotkey Plug-in
+ *
+ * @author Kim Taegon(gonom9@nhncorp.com)
+ */
+
+(function($){
+
+// virtual keys
+var VKEY = {
+	'TAB' : 9,
+	'ESC' : 27,
+	'ENTER,RETURN' : 13,
+	'UP' : 38,
+	'DOWN' : 40,
+	'LEFT' : 37,
+	'RIGHT' : 39,
+	'BACKSPACE,BKSP' : 8,
+	'DEL' : 46,
+	'SPACE' : 32
+};
+
+var Hotkey = new Object;
+
+$.fn.hotkey = function(key, func) {
+	if (typeof key == "object" && key.toString() == '[object Object]') {
+		for(var x in key) $(this).hotkey(x, key[x]);
+		return this;
+	}
+	
+	if (!$.isString(key)) return this;
+	if (key == 'disable' || key == 'enable') {
+		this.attr('hotkey_disabled', (key=='disable'));
+		return this;
+	}
+	
+	if (!$.isFunction(func)) return this;
+	if ($.isObject(key)) key = hk2str(key);
+		
+	Hotkey[key] = func;
+	
+	if (!this.attr('assign-hotkey')) {
+		this.attr('assign-hotkey', true);
+		
+		this.keydown(function(evt){
+			if ($(this).attr('hotkey_disabled')) return;
+			
+			var stroke = hk2str(evt).split(',');
+			
+			for(var i=0; i < stroke.length; i++) {
+				if (Hotkey[stroke[i]]) {
+					if ($(evt.target).is(':input') && (evt.ctrlKey||evt.altKey||evt.metaKey)) break;
+					
+					Hotkey[stroke[i]](evt, stroke[i]);
+
+					evt.stopPropagation();
+					evt.preventDefault();
+				}
+			}
+		});
+	}
+	
+	return this;
+};
+
+$.extend({
+	isObject : function(obj) {
+		return (typeof obj == 'object' && obj.toString() == '[object Object]');
+	},
+	isArray : function(arr) {
+		return (Object.prototype.toString.call(arr) == '[object Array]');
+	},
+	isString : function(str) {
+		return (typeof str == 'string');
+	}
+});
+
+// hotkey to string
+function hk2str(key) {
+	var str = [], vkey = false;
+	var _   = null; // do nothing. It is just dummy.
+
+	for(var x in VKEY) {
+		if (VKEY[x] == key.keyCode) {
+			vkey = x;
+			break;
+		}
+	}
+	if (!vkey) {
+		vkey = String.fromCharCode(key.keyCode).toUpperCase();
+		if (vkey.length != 1) return '';
+	}
+	
+	key.altKey?str.push('Alt'):_;
+	key.ctrlKey?str.push('Ctrl'):_;
+	key.shiftKey?str.push('Shift'):_;
+	
+	str.push(vkey);
+	
+	return str.join('+');
+}
+
+// string to hotkey
+function str2hk(str) {
+	var key = {altKey:false,ctrlKey:false,shiftKey:false,keyCode:0};
+	var lastKey = str.match(/\+([A-Z0-9]+)$/)[1];
+	
+	if (!lastKey) return key;
+	
+	str += '+';
+	
+	key.altKey   = str.indexOf('Alt+') > -1;
+	key.ctrlKey  = str.indexOf('Ctrl+') > -1;
+	key.shiftKey = str.indexOf('Shift+') > -1;
+	
+	key.keyCode = VKEY[lastKey] || lastKey.charCodeAt(0);
+}
+	
+})(jQuery);
\ No newline at end of file
diff --git a/modules/layout/tpl/js/ui.toolbar.js b/modules/layout/tpl/js/ui.toolbar.js
new file mode 100644
index 000000000..ccb061912
--- /dev/null
+++ b/modules/layout/tpl/js/ui.toolbar.js
@@ -0,0 +1,139 @@
+/*
+ * jQuery Toolbar Plug-in
+ *
+ * @author Kim Taegon(gonom9@nhncorp.com)
+ */
+
+(function($){
+
+$.fn.toolbar = function(settings) {	
+	settings = $.extend({
+		items : '.buttons button',
+		fade  : false,
+		click   : function(){},
+		hover   : function(){},
+		show    : function(){},
+		hide    : function(){}
+	}, settings);
+	
+	// get elements
+	var items = this.find(settings.items);
+	var menus = items.find('+ ul');
+	var menuitems = menus.find('> li');
+	
+	// hover action - submenu
+	menus.mouseout(
+		function(event) {
+			var el = $(event.relatedTarget).parents().add(event.relatedTarget);
+
+			if ( el.index(this) < 0 && el.index($(this).prev()) < 0 ) hideMenu($(this), settings);
+		}
+	).click(
+		function(event) {
+			var item = $(event.target).parent();
+
+			var data = createData(item);
+			
+			if ( !item.is('li') ) return;
+			
+			// radio button
+			selectItem(data);
+			
+			// callback
+			settings.click(data);
+		}
+	);
+	
+	menuitems.mouseover(
+		function(event){
+			var item = $(this);
+			
+			item.parent().find('> li').removeClass('tb-menu-item-hover');
+			item.addClass('tb-menu-item-hover');
+			
+			// callback
+			settings.hover(createData(item));
+		}
+	);
+	
+	// hover action - button
+	items.hover(
+		function(event) {
+			showMenu($(this).find('+ ul'), settings);
+		},
+		function(event) {
+			var menu = $(this).find('+ ul');
+			var el   = $(event.relatedTarget).parents().add(event.relatedTarget);
+			
+			// hide menu
+			if ( el.index(menu) < 0 && el.index(this) < 0 ) hideMenu(menu, settings);
+		}
+	);
+	
+	return this;
+}
+
+function hideMenu(menu, settings) {
+	menu[settings.fade?'fadeOut':'hide'](settings.fade)
+		.removeClass('tb-menu-active')
+		.find('> li').removeClass('tb-menu-item-hover');
+	
+	menu.prev().removeClass('tb-btn-active');
+	
+	// hidemenu event
+	settings.hide(menu);
+}
+
+function showMenu(menu, settings) {	
+	menu[settings.fade?'fadeIn':'show'](settings.fade)
+		.addClass('tb-menu-active')
+		.css({position:'absolute',left:0,top:0});
+	
+	menu.prev().addClass('tb-btn-active');
+
+	// positioning
+	var btn = menu.prev();
+	var btn_pos = btn.offset();
+	var mnu_pos = menu.offset();
+	
+	menu.css({
+		left : btn_pos.left - mnu_pos.left,
+		top  : btn_pos.top  - mnu_pos.top + btn.height()
+	})
+	
+	// showmenu event
+	settings.show(menu);
+}
+
+function selectItem(data) {
+	var item = data.element;
+	
+	switch(data.type){
+		case 'radio':
+			item.parent().find('> li').removeClass('tb-menu-item-selected');
+			item.addClass('tb-menu-item-selected')
+			data.checked = true;
+			break;
+		case 'checkbox':
+			data.checked = !data.checked;
+			if (data.checked) {
+				item.addClass('tb-menu-item-selected');
+			} else {
+				item.removeClass('tb-menu-item-selected');
+			}
+			break;
+		default:
+			break;
+	};
+}
+
+function createData(item) {
+	return {
+		element : item,
+		type    : item.attr('tb:type'),
+		arg     : item.attr('tb:arg'),
+		checked : item.hasClass('tb-menu-item-selected')
+	};
+}
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/layout/tpl/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html
index aeaeb8e2e..b2b8964fb 100644
--- a/modules/layout/tpl/layout_detail_info.html
+++ b/modules/layout/tpl/layout_detail_info.html
@@ -1,9 +1,9 @@
-<div id="popHeadder">
-    <h3>{$lang->layout_maker}</h3>
+<div id="popHeader">
+    <h3 class="xeAdmin">{$lang->layout_maker}</h3>
 </div>
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$layout_info->title} ver {$layout_info->version}</td>
@@ -46,11 +46,11 @@
 
 <!--@if($layout_info->history)-->
 <div id="popHistoryHeadder">
-    <h3>{$lang->layout_history}</h3>
+    <h3 class="xeAdmin">{$lang->layout_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <!--@foreach($layout_info->history as $history)-->
     <tr class="row{$cycle_idx}">
         <th scope="row"><div>
@@ -81,9 +81,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter">
-    <div class="tCenter gap1">
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
-</div>
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index e69f72671..3dc994467 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -2,41 +2,118 @@
 <!--%import("filter/reset_layout_code.xml")-->
 
 <!--#include("header.html")-->
+<h3 class="xeAdmin">{$selected_layout->layout_title}</h3>
 
-<table cellspacing="0" class="adminTable">
-<caption>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</caption>
-<tbody>
-    <tr>
-        <td>{nl2br($lang->about_layout_code)}</td>
-    </tr>
-</tbody>
-</table>
+<div class="header4">
+    <ul class="localNavigation">
+        <li><a href="{getUrl('act','dispLayoutAdminModify')}">{$lang->cmd_layout_management}</a></li>
+        <li class="on"><a href="#" onclick="return false;">{$lang->cmd_layout_edit}</a></li>
+    </ul>
+</div>
 
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->widget}</caption>
+<h4 class="xeAdmin">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</h4>
+<p class="summary">{nl2br($lang->about_layout_code)}</p>
+
+<h4 class="xeAdmin">{$lang->layout_image_repository}</h4>
+<p class="summary">{nl2br($lang->about_layout_image_repository)}</p>
+<form action="{Context::getRequestUri()}" target="hidden_iframe" method="post" onsubmit="return checkFile(this)" enctype="multipart/form-data">
+    <input type="hidden" name="module" value="layout" />
+    <input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
+    <input type="hidden" name="layout_srl" value="{$layout_srl}" />
+
+    <table cellspacing="0" class="crossTable">
+    <tbody>
+        <tr>
+            <td>
+                <!--@foreach($layout_image_list as $no => $file)-->
+                {@$ext=substr(strrchr($file,'.'),1)}
+                <div class="preview_image" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
+                    <!--@if($ext=='swf'||$ext=='flv')-->
+                    <script type="text/javascript">//<![CDATA[
+                    displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
+                    //]]></script>
+                    <!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->
+                        <img src="{getUrl('')}{$layout_image_path}{$file}" width="100%" height="100%" />
+                    <!--@end-->
+                    <a href="#" onclick="deleteFile({$layout_srl},'{$file}');return false" onmouseover="jQuery('div.imagePath').html('{$layout_image_path}{$file}')" style="position:absolute; left:3px; top:3px;" class="small button red"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <!--@end-->
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+    <tfoot>
+        <tr>
+            <td>
+                <div class="imagePath"></div>
+                <input name="user_layout_image" type="file" />
+                <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
+                {$lang->msg_layout_image_target}
+            </td>
+        </tr>
+    </tfoot>
+    </table>
+</form>
+
+
+<!--@if($selected_layout->type=='faceoff')-->
+<h4 class="xeAdmin">{$lang->layout_migration}</h4>
+<p class="summary">{nl2br($lang->about_layout_migration)}</p>
+<table cellspacing="0" class="rowTable">
 <tr>
+    <th scope="row"><div>{$lang->layout_export}</div></th>
     <td>
-        <!--@foreach($widget_list as $widget)-->
-        <a href="{getUrl('','module','widget','act','dispWidgetGenerateCode','selected_widget',$widget->widget,'module_srl',$module_srl)}" onclick="popopen(this.href,'GenerateCodeInPage');return false;" class="button"><span>{$widget->title}</span></a>
-        <!--@end-->
+        <a href="{getUrl('','act','procLayoutAdminUserLayoutExport','layout_srl',$layout_srl)}" class="button black strong"><span>{$lang->layout_btn_export}</span></a>
+        <p>{$lang->about_layout_export}</p>
+    </td>
+</tr>
+<tr>
+    <th scope="row"><div>{$lang->layout_import}</div></th>
+    <td>
+        <form action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe">
+            <input type="hidden" name="module" value="layout" />
+            <input type="hidden" name="act" value="procLayoutAdminUserLayoutImport" />
+            <input type="hidden" name="layout_srl" value="{$layout_srl}" />
+            <input type="file" name="file" />
+            <span class="button black strong"><button type="submit">{$lang->cmd_submit}</button></span>
+        </form>
+        <p>{$lang->about_layout_import}</p>
     </td>
 </tr>
 </table>
+<!--@end-->
 
-<div class="gap1">
-    <form id="fo_layout" action="./" method="post" onsubmit="return procFilter(this, update_layout_code);">
-        <input type="hidden" name="layout_srl" value="{$layout_srl}" />
-        <input type="hidden" name="module" value="layout" />
-        <input type="hidden" name="act" value="" />
 
-        <div class="layout_editor_box">
-            <textarea name="code" class="layout_editor">{htmlspecialchars($layout_code)}</textarea>
-        </div>
+<form id="fo_layout" action="./" method="post" onsubmit="return procFilter(this, update_layout_code);">
+<input type="hidden" name="layout_srl" value="{$layout_srl}" />
+<input type="hidden" name="act" value="" />
 
-        <div class="tRight gap1">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
+<table cellspacing="0" class="rowTable">
+<tbody>
+    <tr><th class="title">HTML</th></tr>
+    <tr>
+        <td>
+            <textarea name="code" style="width:100%;height:300px;font-size:11px;">{htmlspecialchars($layout_code)}</textarea>
+            <!--@foreach($widget_list as $widget)-->
+            <a href="{getUrl('','module','widget','act','dispWidgetGenerateCode','selected_widget',$widget->widget,'module_srl',$module_srl)}" onclick="popopen(this.href,'GenerateCodeInPage');return false;" class="button"><span>{$widget->title}</span></a>
+            <!--@end-->
+        </td>
+    </tr>
+    <tr><th class="title">CSS</th></tr>
+    <tr>
+        <td>
+            <textarea name="code_css" style="width:100%;height:300px;font-size:11px;">{htmlspecialchars($layout_code_css)}</textarea>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
             <a href="#" onclick="doPreviewLayoutCode();return false"  class="button"><span>{$lang->cmd_preview}</span></a>
-            <a href="#"  onclick="doResetLayoutCode('{$layout_srl}');return false"  class="button"><span>{$lang->cmd_reset}</span></a>
-        </div>
-    </form>
-</div>
+            <a href="#" onclick="doResetLayoutCode('{$layout_srl}');return false"  class="button red"><span>{$lang->cmd_reset}</span></a>
+        </th>
+    </tr>
+</tbody>
+</table>
+</form>
+
+<iframe name="hidden_iframe" style="width:0;height:0;border:0" ></iframe>
diff --git a/modules/layout/tpl/layout_image_list.html b/modules/layout/tpl/layout_image_list.html
new file mode 100644
index 000000000..1286d6e74
--- /dev/null
+++ b/modules/layout/tpl/layout_image_list.html
@@ -0,0 +1,34 @@
+<!--%import("js/layout_image_list.js")-->
+<!--%import("js/layout_admin.js")-->
+<!--%import("../../admin/tpl/css/admin.css")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">레이아웃 이미지 목록</h3>
+</div>
+
+<div id="popBody">
+    <!--@foreach($layout_image_list as $no => $file)-->
+        {@$ext=substr(strrchr($file,'.'),1)}
+        <div class="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
+            <!--@if($ext=='swf'||$ext=='flv')-->
+            <script type="text/javascript">//<![CDATA[
+            displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
+            //]]></script>
+            <!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->
+                <img src="{getUrl('')}{$layout_image_path}{$file}" width="100%" height="100%" />
+            <!--@end-->
+            <span class="small button" style="position:absolute;left:3px; top:3px;"><button type="button" onclick="selectLayoutImage(request_uri+'{$layout_image_path}{$file}');">{$lang->cmd_select}</button></span>
+        </div>
+    <!--@end-->
+
+</div>
+<div id="popFooter">
+    <form action="{Context::getRequestUri()}" target="hidden_iframe" method="post" onsubmit="return checkFile(this)" enctype="multipart/form-data">
+    <input type="hidden" name="module" value="layout" />
+    <input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
+    <input type="hidden" name="layout_srl" value="{$layout_srl}" />
+        <input name="user_layout_image" type="file" />
+        <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
+    </form>
+</div>
+<iframe name="hidden_iframe" style="width:0;height:0;border:0"></iframe>
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index 93805fd06..5c09294f5 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -2,28 +2,14 @@
 
 <!--#include("header.html")-->
 
-<table cellspacing="0" class="adminTable">
-<tr>
-    <th scope="row"><div>{$lang->layout}</div></th>
-    <td>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
-</tr>
-<tr class="row2">  
-    <th scope="row"><div>{$lang->path}</div></th>
-    <td>{$selected_layout->path}</td>
-</tr>
-<!--@if($selected_layout->author->homepage)-->
-<tr>  
-    <th scope="row"><div>{$lang->author}</div></th>
-    <td><a href="{$selected_layout->author->homepage}" onclick="window.open(this.href);return false;" class="blue">{$selected_layout->author->name}</a></td>
-</tr>
-<!--@end-->
-<!--@if($selected_layout->author->description)-->
-<tr class="row2">  
-    <th scope="row"><div>{$lang->description}</div></th>
-    <td>{nl2br(trim($selected_layout->author->description))}</td>
-</tr>
-<!--@end-->
-</table>
+<h3 class="xeAdmin">{$selected_layout->layout_title}</h3>
+
+<div class="header4">
+    <ul class="localNavigation">
+        <li class="on"><a href="#" onclick="return false;">{$lang->cmd_layout_management}</a></li>
+        <li><a href="{getUrl('act','dispLayoutAdminEdit')}">{$lang->cmd_layout_edit}</a></li>
+    </ul>
+</div>
 
 <form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
 <input type="hidden" name="module" value="layout" />
@@ -31,7 +17,34 @@
 <input type="hidden" name="layout_srl" value="{$layout_srl}" />
 <input type="hidden" name="layout" value="{$selected_layout->layout}" />
 
-<table cellspacing="0" class="adminTable">
+
+<table cellspacing="0" class="rowTable">
+<tr>
+    <th scope="row"><div>{$lang->layout}</div></th>
+    <td class="wide">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
+</tr>
+
+<!--@if($selected_layout->path)-->
+<tr class="row2">
+    <th scope="row"><div>{$lang->path}</div></th>
+    <td>{$selected_layout->path}</td>
+</tr>
+<!--@end-->
+
+<!--@if($selected_layout->description)-->
+<tr class="row2">
+    <th scope="row"><div>{$lang->description}</div></th>
+    <td>{nl2br(trim($selected_layout->description))}</td>
+</tr>
+<!--@end-->
+
+<!--@if($selected_layout->author->homepage)-->
+<tr>
+    <th scope="row"><div>{$lang->author}</div></th>
+    <td><a href="{$selected_layout->author->homepage}" onclick="window.open(this.href);return false;" class="blue">{$selected_layout->author->name}</a></td>
+</tr>
+<!--@end-->
+
 <tr>
     <th scope="row"><div>{$lang->header_script}</div></th>
     <td>
@@ -46,20 +59,16 @@
         <p>{$lang->about_title}</p>
     </td>
 </tr>
+
 <!--@foreach($selected_layout->extra_var as $name => $var)-->
 
 <!--@if($var->group && ((!$group) || $group != $var->group))-->
 {@$group = $var->group}
-</table>
-<table cellspacing="0" class="adminTable">
-<col width="150" />
-<col width="*" />
-<caption>{$group}</caption>
+<tr><th colspan="2" class="title">{$group}</th></tr>
 <!--@end-->
 
 <tr>
     <th scope="row"><div>{$var->title}</div></th>
-
     <td>
     <!--@if($var->type == "text")-->
         <input type="text" name="{$name}" value="{htmlspecialchars($var->value)}"  class="inputTypeText w400"/>
@@ -71,7 +80,7 @@
 
       <!--@if($var->value)-->
       <div>
-          <img src="{$var->value}" alt="image" /><br />
+          <img src="../../../{$var->value}" alt="image" /><br />
           <input type="checkbox" name="del_{$name}" value="Y" id="del_{$name}" class="checkbox" />
           <label for="del_{$name}">{$lang->cmd_delete}</label>
       </div>
@@ -115,16 +124,16 @@
         {$lang->about_not_apply_menu}
     </td>
 </tr>
+
 <tr class="row2">
-    <td colspan="2" class="right">
-        <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
+    <th colspan="2" class="button">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
         <!--@if($module=="admin")-->
         <a href="{getUrl('act','dispLayoutAdminContent')}" class="button"><span>{$lang->cmd_list}</span></a>
         <!--@else-->
         <a href="{getUrl('act','')}" class="button"><span>{$lang->cmd_back}</span></a>
         <!--@end-->
-    </td>
+    </th>
 </tr>
 </table>
-
 <iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
diff --git a/modules/ldap/conf/info.xml b/modules/ldap/conf/info.xml
index 638749b5d..62131e057 100644
--- a/modules/ldap/conf/info.xml
+++ b/modules/ldap/conf/info.xml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module version="0.2">
     <title xml:lang="ko">LDAP 인증 연동 모듈</title>
-    <title xml:lang="zh-CN">LDAP认证模块</title>
+    <title xml:lang="es">Módulo de autenticación LDAP obras</title>
+    <title xml:lang="zh-CN">LDAP认证</title>
     <title xml:lang="zh-TW">LDAP認證模組</title>
     <title xml:lang="jp">LDAP認証連動モジュール</title>
     <name xml:lang="ko">zero</name>
+    <name xml:lang="es">zero</name>
     <name xml:lang="zh-CN">zero</name>
     <name xml:lang="zh-TW">zero</name>
     <name xml:lang="jp">zero</name>
     <description xml:lang="ko">
         LDAP 인증 연동하는 모듈입니다.
         적수님(http://ggang.net)님이 매우 큰 도움 주셨습니다.
+    </description>
+	<description xml:lang="es">
+        Autenticación LDAP módulo es el trabajo.
+        Jeoksunim (http://ggang.net) dio una gran ayuda.
     </description>
     <description xml:lang="zh-CN">
         LDAP认证模块。
@@ -18,7 +24,7 @@
     </description>
     <description xml:lang="zh-TW">
         LDAP認證模組。
-        感謝 적수님(http://ggang.net)提供非常大的幫助。
+        感謝적수님(http://ggang.net)提供非常大的幫助。
     </description>
     <description xml:lang="jp">
         LDAP認証連動モジュール
@@ -26,10 +32,11 @@
     </description>
     <version>0.1</version>
     <date>2007-07-28</date>
-    <category>accessory</category>
+    <category>interlock</category>
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
-	<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="es">zero</name>
+		<name xml:lang="zh-CN">zero</name>
         <name xml:lang="zh-TW">zero</name>
         <name xml:lang="jp">zero</name>
     </author>
diff --git a/modules/ldap/conf/module.xml b/modules/ldap/conf/module.xml
index a28ec7dc9..7bc5ff37a 100644
--- a/modules/ldap/conf/module.xml
+++ b/modules/ldap/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispLdapAdminConfig" type="view" admin_index="true" standalone="true" />
         <action name="procLdapAdminInsertConfig" type="controller" standalone="true" />
diff --git a/modules/ldap/lang/en.lang.php b/modules/ldap/lang/en.lang.php
index 9e902a189..79cd2ba6f 100644
--- a/modules/ldap/lang/en.lang.php
+++ b/modules/ldap/lang/en.lang.php
@@ -1,6 +1,6 @@
 <?php
     /**
-     * @file   modules/ldap/lang/ko.lang.php
+     * @file   modules/ldap/lang/en.lang.php
      * @author zero <zero@nzeo.com>
      * @brief  English Language Pack (Basic)
      **/
diff --git a/modules/ldap/lang/es.lang.php b/modules/ldap/lang/es.lang.php
new file mode 100644
index 000000000..7d78e29f9
--- /dev/null
+++ b/modules/ldap/lang/es.lang.php
@@ -0,0 +1,33 @@
+<?php
+    /**
+     * @file   modules/ldap/lang/es.lang.php
+     * @author zero <zero@nzeo.com>
+     * @brief  En español (sólo la básica)
+     **/
+
+    $lang->ldap = 'Autenticación LDAP obras';
+    $lang->use_ldap = 'Autenticación LDAP';
+    $lang->ldap_server = 'Dirección del servidor LDAP';
+    $lang->ldap_port = 'Número de puerto del servidor LDAP';
+    $lang->ldap_userdn_prefix = 'Prefijo usuario';
+    $lang->ldap_userdn_suffix = 'Usuario sufijo';
+    $lang->ldap_basedn = 'base DN';
+
+    $lang->ldap_email_entry = 'Enviar objetivo columna';
+    $lang->ldap_nickname_entry = 'alias objetivo columna';
+    $lang->ldap_username_entry = 'nombre de usuario para la columna';
+    $lang->ldap_group_entry = 'grupo, el objetivo de la columna';
+
+    $lang->about_use_ldap = 'autenticación LDAP para trabajar después de entrar en el servidor y el uso de la información debe ser controlado';
+    $lang->about_ldap_server = 'autenticación y para solicitar información, por favor, introduzca la información en el servidor LDAP'; 
+    $lang->about_ldap_port = 'puerto del servidor LDAP la información de las palabras';
+    $lang->about_ldap_userdn_prefix = 'Introduzca el prefijo para la autenticación de usuarios (por ejemplo: cn =)';
+    $lang->about_ldap_userdn_suffix = 'Introduzca el sufijo para la autenticación de usuarios. (Ejemplo: @ abc.com) ';
+    $lang->about_ldap_basedn = 'Introduzca la base DN del directorio. (Ejemplos: dc = abc, dc = com)';
+
+    $lang->about_ldap_email_entry = 'LDAP jeongbojung Por favor enviar información para su uso como keolreommyeong. (Duplicar la prohibición)';
+    $lang->about_ldap_username_entry = 'LDAP jeongbojung la keolreommyeong Por favor, use su nombre de usuario. (Posiblemente la superposición)';
+    $lang->about_ldap_nickname_entry = 'LDAP keolreommyeong jeongbojung las palabras para ser utilizado como un alias. (Duplicar la prohibición) ';
+    $lang->about_ldap_group_entry = 'LDAP keolreommyeong jeongbojung de las palabras que el usuario se le asignará al grupo';
+
+?>
diff --git a/modules/ldap/lang/jp.lang.php b/modules/ldap/lang/jp.lang.php
index d00152296..5156f7eec 100644
--- a/modules/ldap/lang/jp.lang.php
+++ b/modules/ldap/lang/jp.lang.php
@@ -9,9 +9,9 @@
     $lang->use_ldap = 'LDAP認証連動を使用する';
     $lang->ldap_server = 'LDAPサーバーアドレス';
     $lang->ldap_port = 'LDAPサーバーポート番号';
-    $lang->ldap_userdn_prefix = 'UserDN prefix';
-    $lang->ldap_userdn_suffix = 'ユーザーサフィックス';
-    $lang->ldap_basedn = 'ベースDN（suffix）';
+    $lang->ldap_userdn_prefix = 'ユーザーDNプレフィックス(prefix)';
+    $lang->ldap_userdn_suffix = 'ユーザーDNサフィックス（suffix）';
+    $lang->ldap_basedn = 'ベース(base)DN';
 
     $lang->ldap_email_entry = '会員メールアカウントカラム';
     $lang->ldap_nickname_entry = '会員名カラム';
@@ -21,8 +21,8 @@
     $lang->about_use_ldap = 'LDAP認証連動のためには、下記のサーバー情報とともに上にチェックして下さい。';
     $lang->about_ldap_server = 'LDAPサーバー情報を入力してください。'; 
     $lang->about_ldap_port = 'LDAPサーバーのポート（port）番号情報を入力してください。';
-    $lang->about_ldap_userdn_prefix = 'Please input userdn prefux for authorization. ex) cn=';
-    $lang->about_ldap_userdn_suffix = '認証のためのユーザーサフィックスを入力してください。 (例: @abc.com)';
+    $lang->about_ldap_userdn_prefix = '認証のためのユーザーDNプレフィックス(prefix)を入力して下さい。 (例： cn=)';
+    $lang->about_ldap_userdn_suffix = '認証のためのユーザーDNサフィックス(suffix)を入力してください。 (例: @abc.com)';
     $lang->about_ldap_basedn = 'ディレクトリの ベースDN をログインして下さい。 (例: dc=abc,dc=com)';
 
     $lang->about_ldap_email_entry = 'LDAP情報中、会員のメールアカウント情報として使うカラム名を入力してください。 (重複不可)';
diff --git a/modules/ldap/ldap.class.php b/modules/ldap/ldap.class.php
index 6b041b208..dc89b4184 100644
--- a/modules/ldap/ldap.class.php
+++ b/modules/ldap/ldap.class.php
@@ -13,7 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('ldap', 'view', 'dispLdapAdminConfig');
 
             // 로그인 연동 트리거
             $oModuleController->insertTrigger('member.doLogin', 'ldap', 'controller', 'triggerLdapLogin', 'before');
@@ -26,7 +25,6 @@
          **/
         function checkUpdate() {
             $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getActionForward('dispLdapAdminConfig')) return true;
 
             if(!$oModuleModel->getTrigger('member.doLogin', 'ldap', 'controller', 'triggerLdapLogin', 'before')) return true;
             return false;
@@ -39,9 +37,6 @@
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
 
-            if(!$oModuleModel->getActionForward('dispLdapAdminConfig')) 
-                $oModuleController->insertActionForward('ldap', 'view', 'dispLdapAdminConfig');
-
             if(!$oModuleModel->getTrigger('member.doLogin', 'ldap', 'controller', 'triggerLdapLogin', 'before')) 
                 $oModuleController->insertTrigger('member.doLogin', 'ldap', 'controller', 'triggerLdapLogin', 'before');
 
diff --git a/modules/ldap/tpl/index.html b/modules/ldap/tpl/index.html
index 1e2af02dc..d96f136de 100644
--- a/modules/ldap/tpl/index.html
+++ b/modules/ldap/tpl/index.html
@@ -1,10 +1,10 @@
 <!--%import("filter/insert_config.xml")-->
 
-<h3>{$lang->ldap} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->ldap} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
 
-    <table cellspacing="0" class="adminTable topGap">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="col"><div>{$lang->use_ldap}</div></th>
         <td>
@@ -76,9 +76,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/lifepod/conf/module.xml b/modules/lifepod/conf/module.xml
index 2b56a0e3b..09e69fe60 100644
--- a/modules/lifepod/conf/module.xml
+++ b/modules/lifepod/conf/module.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
-    <grants>
-        <grant name="view" default="guest">
-            <title xml:lang="ko">열람</title>
-			<title xml:lang="es">Opinión</title>
-			<title xml:lang="ru">мнение</title>
-	        <title xml:lang="zh-CN">查看</title>
-            <title xml:lang="jp">閲覧</title>
-            <title xml:lang="en">view</title>
-	        <title xml:lang="zh-TW">檢視</title>
-        </grant>
-    </grants>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispLifepodContent" type="view" index="true" />
 
@@ -23,7 +14,5 @@
 
         <action name="procLifepodAdminInsertLifepod" type="controller" standalone="true" />
         <action name="procLifepodAdminDeleteLifepod" type="controller" standalone="true" />
-        <action name="procLifepodAdminInsertGrant" type="controller" standalone="true" />
-        <action name="procLifepodAdminUpdateSkinInfo" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/lifepod/lang/ko.lang.php b/modules/lifepod/lang/ko.lang.php
index 96b2fc941..d131bd292 100644
--- a/modules/lifepod/lang/ko.lang.php
+++ b/modules/lifepod/lang/ko.lang.php
@@ -5,11 +5,11 @@
      * @brief  라이프팟(lifepod) 모듈의 기본 언어팩
      **/
 
-    $lang->lifepod = "라이프팟";
+    $lang->lifepod = '라이프팟';
 
-    $lang->calendar_address = "캘린더 xml주소";
+    $lang->calendar_address = '캘린더 xml주소';
     $lang->cmd_lifepod_list = '라이프팟 목록';
     $lang->cmd_view_info = '라이프팟 정보';
 
-    $lang->about_lifepod = "라이프팟은 오픈마루에서 제공하는 캘린더서비스입니다.<br />라이프팟 XE모듈은 라이프팟의 특정 캘린더들을 내부문서처럼 열람할 수 있는 모듈입니다.";
+    $lang->about_lifepod = '라이프팟은 오픈마루에서 제공하는 캘린더서비스입니다.<br />라이프팟 XE모듈은 라이프팟의 특정 캘린더들을 내부문서처럼 열람할 수 있는 모듈입니다.';
 ?>
diff --git a/modules/lifepod/lifepod.admin.controller.php b/modules/lifepod/lifepod.admin.controller.php
index 46f55c901..febf4fc1e 100644
--- a/modules/lifepod/lifepod.admin.controller.php
+++ b/modules/lifepod/lifepod.admin.controller.php
@@ -19,67 +19,26 @@
          * lifepod_name은 mid의 값이 되고 나머지 모듈 공통 값을 받아서 저장을 하게 된다.
          **/
         function procLifepodAdminInsertLifepod($args = null) {
-            // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            if(!$args) $args = Context::gets('module_srl','module_category_srl','lifepod_name','layout_srl','skin','browser_title','description','is_default','header_text','footer_text','admin_id','open_rss');
+            // module 모듈의 model/controller 객체 생성
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
 
-            // lifepod모듈임을 명시적으로 지정한다.
+            // 모듈의 정보 설정
+            $args = Context::getRequestVars();
             $args->module = 'lifepod';
-
-            // mid값을 직접 받지 않고 lifepod_name으로 받는 이유는 mid는 특별히 약속된 변수명이라 오동작이 발생할 수 있어서 다른 이름으로 전달을 받은후 다시 바꾸어준다.
             $args->mid = $args->lifepod_name;
             unset($args->lifepod_name);
 
-            // is_default일 경우 별다른 요청이 없는 index페이지의 경우 바로 호출이 되는데 이 값을 설정을 하게 된다.
-            if($args->is_default!='Y') $args->is_default = 'N';
-
-            // 기본 값외의 것들을 정리
-            $extra_var = delObjectVars(Context::getRequestVars(), $args);
-            unset($extra_var->act);
-            unset($extra_var->page);
-            unset($extra_var->lifepod_name);
-
             // module_srl이 넘어오면 원 모듈이 있는지 확인
             if($args->module_srl) {
-                $oModuleModel = &getModel('module');
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-                // 만약 원래 모듈이 없으면 새로 입력하기 위한 처리
                 if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // $extra_var를 serialize
-            $args->extra_vars = serialize($extra_var);
-
-            // module 모듈의 controller 객체 생성
-            $oModuleController = &getController('module');
-
-            // is_default=='Y' 이면
-            if($args->is_default=='Y') $oModuleController->clearDefaultModule();
-
-            /**
-             * module_srl값이 없다면 신규 등록으로 처리를 한다.
-             **/
+            // module_srl의 값에 따라 insert/update
             if(!$args->module_srl) {
-                // module controller를 이용하여 모듈을 생성한다.
                 $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-
-                // 권한의 경우 기본으로 설정을 해주는 것이 좋으며 lifepod 모듈의 경우 manager권한을 관리 그룹으로 설정을 한다.
-                if($output->toBool()) {
-                    // 관리그룹을 member model객체에서 구할 수 있다.
-                    $oMemberModel = &getModel('member');
-                    $admin_group = $oMemberModel->getAdminGroup();
-                    $admin_group_srl = $admin_group->group_srl;
-
-                    $module_srl = $output->get('module_srl');
-                    $grants = serialize(array('manager'=>array($admin_group_srl)));
-
-                    // module controller의 module 권한 설정 method를 이용하여 기본 권한을 적용한다.
-                    $oModuleController->updateModuleGrant($module_srl, $grants);
-                }
-            /**
-             * module_srl이 있다면 모듈의 정보를 수정한다
-             **/
             } else {
                 $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
@@ -114,132 +73,5 @@
             $this->setMessage('success_deleted');
         }
  
-        /**
-         * @brief 권한 설정
-         * 생성된 lifepod에 ./conf/module.xml에 정의된 권한과 관리자가 선택한 그룹의 값을 연동하여 권한을 설정하게 된다.
-         **/
-        function procLifepodAdminInsertGrant() {
-            // 대상 lifepod(모듈)의 고유값인 module_srl을 체크한다.
-            $module_srl = Context::get('module_srl');
-
-            /**
-             * 현 모듈의 권한 목록을 가져옴
-             * xml_info 는 lifepod모듈이 요청되었다고 판단될때 ModuleObject에서 이미 세팅해 놓은 상태이다.
-             **/
-            $grant_list = $this->xml_info->grant;
-
-            /**
-             * 권한의 목록을 loop로 돌면서 권한 설정을 한다.
-             * zbxe의 경우 가능한 간단한 xmlrpc사용을 위해서 배열의 경우 |@|를 pipe로 하여 하나의 string으로 전달한다.
-             * 요청받은 권한의 대상 그룹과 권한을 배열로 한 후 serialize하여 modules테이블에 module_srl을 키로 한 rows에 데이터를 적용한다.
-             **/
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            // 권한 설정은 모듈 공통이라 module 모듈의 controller을 생성하여 저장하도록 한다.
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_srl, $grants);
-
-            // 권한 설정후 돌아갈 페이지를 위하여 module_srl값을 세팅하고 성공 메세지 역시 세팅한다.
-            $this->add('module_srl',Context::get('module_srl'));
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 스킨 정보 업데이트
-         * 스킨 정보는 skin.xml파일의 extra_vars와 입력된 변수값을 조합하여 serialize하여 modules 테이블에 module_srl을 키로 하여 저장을 하게 된다.
-         **/
-        function procLifepodAdminUpdateSkinInfo() {
-            // module_srl에 해당하는 정보들을 가져오기
-            $module_srl = Context::get('module_srl');
-
-            // 어떤 스킨이 사용중인지 확인하기 위해서 module_srl을 이용하여 모듈의 정보를 구하고 스킨을 구한다.
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            $skin = $module_info->skin;
-
-            // 스킨의 정보르 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($module_info->{$vars->name});
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) {
-                        $obj->{$vars->name} = $module_info->{$vars->name};
-                        continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    unset($obj->{$vars->name});
-                    $obj->{$vars->name} = $filename;
-                }
-            }
-
-            // serialize하여 저장
-            $skin_vars = serialize($obj);
-
-            // module controller객체를 생성하여 module_srl을 키로 한 rows에 serialize한 스킨 정보를 적용한다.
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleSkinVars($module_srl, $skin_vars);
-
-            /** 
-             * 스킨 정보는 첨부파일때문에 xml로 전달이 되지 않고 POST로 전송이 되어 왔으므로 템플릿을 이용하여 프레임을 refresh시키도록 한다.
-             * 스킨 정보를 수정할때 숨어 있는 iframe을 target으로 삼기에 기본 레이아웃을 이용하면 되므로 직접 레이아웃 경로와 파일을 기본으로 지정한다.
-             **/
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
     }
 ?>
diff --git a/modules/lifepod/lifepod.admin.view.php b/modules/lifepod/lifepod.admin.view.php
index beba90305..5937652ab 100644
--- a/modules/lifepod/lifepod.admin.view.php
+++ b/modules/lifepod/lifepod.admin.view.php
@@ -138,26 +138,11 @@
          * @brief 스킨 정보 보여줌
          **/
         function dispLifepodAdminSkinInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
 
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $module_info = Context::get('module_info');
-            $skin = $module_info->skin;
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $module_info->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
             $this->setTemplateFile('skin_info');
         }
 
@@ -165,17 +150,10 @@
          * @brief 권한 목록 출력
          **/
         function dispLifepodAdminGrantInfo() {
-            // module_srl을 구함
-            $module_srl = Context::get('module_srl');
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
 
             $this->setTemplateFile('grant_list');
         }
diff --git a/modules/lifepod/lifepod.class.php b/modules/lifepod/lifepod.class.php
index d2461b92f..b6457930e 100644
--- a/modules/lifepod/lifepod.class.php
+++ b/modules/lifepod/lifepod.class.php
@@ -10,19 +10,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodContent');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminContent');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminLifepodInfo');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminInsertLifepod');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminDeleteLifepod');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminGrantInfo');
-            $oModuleController->insertActionForward('lifepod', 'view', 'dispLifepodAdminSkinInfo');
-            $oModuleController->insertActionForward('lifepod', 'controller', 'procLifepodAdminInsertLifepod');
-            $oModuleController->insertActionForward('lifepod', 'controller', 'procLifepodAdminDeleteLifepod');
-            $oModuleController->insertActionForward('lifepod', 'controller', 'procLifepodAdminInsertGrant');
-
             return new Object();
         }
 
@@ -30,9 +17,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getActionForward('dispLifepodContent')) return true;
-
             return false;
         }
 
@@ -40,7 +24,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $this->moduleInstall();
             return new Object(0,'success_updated');
         }
 
diff --git a/modules/lifepod/lifepod.view.php b/modules/lifepod/lifepod.view.php
index 44edd44c6..6edb7e4b0 100644
--- a/modules/lifepod/lifepod.view.php
+++ b/modules/lifepod/lifepod.view.php
@@ -30,59 +30,56 @@
         /**
          * @brief Reformatting date data from Lifepod API into data type compatible to Lifepod UI 
          **/
-	function dateFormatChange($dates, $plus = 0) {
-	    $dates = sprintf("%s-%s-%s %s:%s:%s+0", substr($dates,0,4), substr($dates,4,2), substr($dates,6,2), substr($dates,9,2), substr($dates,11,2), substr($dates,13,2));
-	    $dates = date("Y-m-d H:i:s", strtotime($dates) + $plus + zgap());
-	    return $dates;
-	}
+        function dateFormatChange($dates, $plus = 0) {
+            $dates = sprintf("%s-%s-%s %s:%s:%s+0", substr($dates,0,4), substr($dates,4,2), substr($dates,6,2), substr($dates,9,2), substr($dates,11,2), substr($dates,13,2));
+            $dates = date("Y-m-d H:i:s", strtotime($dates) + $plus + zgap());
+            return $dates;
+        }
 
         /**
          * @brief Displaying Calendar 
          **/
         function dispLifepodContent() {
-            // check permission
-            if(!$this->grant->view) return $this->dispLifepodMessage('msg_not_permitted');
-
             $oLifepodModel = &getModel('lifepod');
-	    $caladdresses = split(", ", $this->module_info->calendar_address);
-	    $cYear = Context::get('year');
-	    $cMonth = Context::get('month');
-	    $cDay = Context::get('day');
+            $caladdresses = split(", ", $this->module_info->calendar_address);
+            $cYear = Context::get('year');
+            $cMonth = Context::get('month');
+            $cDay = Context::get('day');
 
-	    $calendars = array();
-           
-	    foreach($caladdresses as $key=>$val)
-	    {
-		$shouldGetMore = false;
-		$pageNumber = 1;
-		$page = null;
-		do {
-		    $page = $oLifepodModel->getPage($val, $cYear, $pageNumber);
-		    if(!$page) break;
-		    for($j=0;$j<count($page->data);$j++)
-		    {
-			$data = &$page->data[$j];
-			if($data->childNodes["date-start"])
-			{
-			    $data->childNodes["date-start"]->body = $this->dateFormatChange($data->childNodes["date-start"]->body);
-			}
+            $calendars = array();
+               
+            foreach($caladdresses as $key=>$val)
+            {
+            $shouldGetMore = false;
+            $pageNumber = 1;
+            $page = null;
+            do {
+                $page = $oLifepodModel->getPage($val, $cYear, $pageNumber);
+                if(!$page) break;
+                for($j=0;$j<count($page->data);$j++)
+                {
+                $data = &$page->data[$j];
+                if($data->childNodes["date-start"])
+                {
+                    $data->childNodes["date-start"]->body = $this->dateFormatChange($data->childNodes["date-start"]->body);
+                }
 
-			if($data->childNodes["date-end"])
-			{
-			    $plus = 0;
-			    if($data->childNodes["type"]->body == "daylong")
-				$plus = -1;
-			    $data->childNodes["date-end"]->body = $this->dateFormatChange($data->childNodes["date-end"]->body, $plus);
-			}
+                if($data->childNodes["date-end"])
+                {
+                    $plus = 0;
+                    if($data->childNodes["type"]->body == "daylong")
+                    $plus = -1;
+                    $data->childNodes["date-end"]->body = $this->dateFormatChange($data->childNodes["date-end"]->body, $plus);
+                }
 
-			$data->childNodes["description"]->body = str_replace("\n", "<BR />", $data->childNodes["description"]->body);
-			$data->childNodes["description"]->body = str_replace("'", "\'", $data->childNodes["description"]->body);
-			$data->childNodes["title"]->body = str_replace("'", "\'", $data->childNodes["title"]->body);
-		    }
-		    $calendars[] = $page;
-		    $pageNumber++;
-		} while ( $page->start + $page->perpage - 1 < $page->total );
-	    }
+                $data->childNodes["description"]->body = str_replace("\n", "<BR />", $data->childNodes["description"]->body);
+                $data->childNodes["description"]->body = str_replace("'", "\'", $data->childNodes["description"]->body);
+                $data->childNodes["title"]->body = str_replace("'", "\'", $data->childNodes["title"]->body);
+                }
+                $calendars[] = $page;
+                $pageNumber++;
+            } while ( $page->start + $page->perpage - 1 < $page->total );
+            }
 
             Context::set('calendars', $calendars);
 
diff --git a/modules/lifepod/tpl/filter/insert_lifepod.xml b/modules/lifepod/tpl/filter/insert_lifepod.xml
index 0ef7946ad..db15a3dbf 100644
--- a/modules/lifepod/tpl/filter/insert_lifepod.xml
+++ b/modules/lifepod/tpl/filter/insert_lifepod.xml
@@ -18,7 +18,6 @@
         <param name="description" target="description" />
         <param name="header_text" target="header_text" />
         <param name="footer_text" target="footer_text" />
-        <param name="admin_id" target="admin_id" />
         <param name="open_rss" target="open_rss" />
     </parameter>
     <response callback_func="completeInsertLifepod">
diff --git a/modules/lifepod/tpl/grant_list.html b/modules/lifepod/tpl/grant_list.html
index 00fe24e4c..b0d8b0c53 100644
--- a/modules/lifepod/tpl/grant_list.html
+++ b/modules/lifepod/tpl/grant_list.html
@@ -1,33 +1,3 @@
 <!--#include("./header.html")-->
-<!--%import("filter/insert_grant.xml")-->
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-<table cellspacing="0" class="adminTable">
-<caption>{nl2br($lang->about_grant)}</caption>
-
-<tbody>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}<div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true }); return false;">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false }); return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td scope="row" colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </td>
-    </tr>
-</tbody>
-</table>
-
-</form>
+{$grant_content}
diff --git a/modules/lifepod/tpl/header.html b/modules/lifepod/tpl/header.html
index 7b728f638..5d0729af7 100644
--- a/modules/lifepod/tpl/header.html
+++ b/modules/lifepod/tpl/header.html
@@ -1,13 +1,13 @@
 <!--%import("js/lifepod_admin.js")-->
 
-<h3>{$lang->lifepod} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->lifepod} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_lifepod)}</div>
 
 <!--@if($module_info)-->
 <div class="header4">
     <!--@if($module_info->mid)-->
-    <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>
+    <h4 class="xeAdmin">{$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">
diff --git a/modules/lifepod/tpl/index.html b/modules/lifepod/tpl/index.html
index de913bfd9..b19f2f76f 100644
--- a/modules/lifepod/tpl/index.html
+++ b/modules/lifepod/tpl/index.html
@@ -2,20 +2,21 @@
 
 <!-- 정보 -->
 <div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
 </div>
 
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
         <th scope="col">
             <div>
-                <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="w120">
+                    <select name="module_category_srl" class="fullWidth">
                         <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>
@@ -24,7 +25,6 @@
                         <option value="-1">{$lang->cmd_management}</option>
                     </select>
                     <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-                </form>
             </div>
         </th>
         <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
@@ -37,6 +37,7 @@
     <!--@foreach($lifepod_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
                 {$lang->not_exists}
@@ -44,21 +45,29 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispLifepodAdminLifepodInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispLifepodAdminLifepodInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
         <td class="date nowrap center">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view center"><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="delete center"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispLifepodAdminDeleteLifepod','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
+        <td><a href="{getUrl('act','dispLifepodAdminLifepodInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setting}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispLifepodAdminDeleteLifepod','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else-->-<!--@end--></td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="7" class="right">
-            <a href="{getUrl('act','dispLifepodAdminInsertLifepod','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
-    </tr>
 </tbody>
 </table>
 
+<!-- 버튼 -->
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr">
+        <a href="{getUrl('act','dispLifepodAdminInsertLifepod','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
+
+</form>
+
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/lifepod/tpl/js/lifepod_admin.js b/modules/lifepod/tpl/js/lifepod_admin.js
index 64e6e1d93..79e3dc8b9 100644
--- a/modules/lifepod/tpl/js/lifepod_admin.js
+++ b/modules/lifepod/tpl/js/lifepod_admin.js
@@ -53,3 +53,16 @@ function doChangeCategory(fo_obj) {
     }
     return true;
 }
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
diff --git a/modules/lifepod/tpl/js/springnote_admin.js b/modules/lifepod/tpl/js/springnote_admin.js
deleted file mode 100644
index 3eaa3b2cd..000000000
--- a/modules/lifepod/tpl/js/springnote_admin.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file   modules/springnote/js/springnote_admin.js
- * @author zero (zero@nzeo.com)
- * @brief  springnote 모듈의 관리자용 javascript
- **/
-
-/* 모듈 생성 후 */
-function completeInsertSpringnote(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-
-    var url = current_url.setQuery('act','dispSpringnoteAdminSpringnoteInfo');
-    if(module_srl) url = url.setQuery('module_srl',module_srl);
-    if(page) url.setQuery('page',page);
-    location.href = url;
-}
-
-/* 모듈 삭제 후 */
-function completeDeleteSpringnote(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var page = ret_obj['page'];
-    alert(message);
-
-    var url = current_url.setQuery('act','dispSpringnoteAdminContent').setQuery('module_srl','');
-    if(page) url = url.setQuery('page',page);
-    location.href = url;
-}
-function completeInsertGrant(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-
-    location.href = location.href;
-}
-
-/* 카테고리 이동 */
-function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
-    if(module_category_srl==-1) {
-        location.href = current_url.setQuery('act','dispModuleAdminCategory');
-        return false;
-    }
-    return true;
-}
diff --git a/modules/lifepod/tpl/lifepod_delete.html b/modules/lifepod/tpl/lifepod_delete.html
index 78bcac931..440b9fb7c 100644
--- a/modules/lifepod/tpl/lifepod_delete.html
+++ b/modules/lifepod/tpl/lifepod_delete.html
@@ -6,8 +6,8 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$module_info->mid}</td>
@@ -17,10 +17,10 @@
         <td>{$module_info->module}</td>
     </tr>
     <tr>
-        <td scope="row" colspan="2" class="right">
+        <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispLifepodAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/lifepod/tpl/lifepod_info.html b/modules/lifepod/tpl/lifepod_info.html
index acedac406..8bbca5865 100644
--- a/modules/lifepod/tpl/lifepod_info.html
+++ b/modules/lifepod/tpl/lifepod_info.html
@@ -1,6 +1,6 @@
 <!--#include("header.html")-->
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <tr class="row2">
     <th scope="row"><div>{$lang->module_category}</div></th>
     <td class="wide">
@@ -58,16 +58,12 @@
     <th scope="row"><div>{$lang->footer_text}</div></th>
     <td>{htmlspecialchars($module_info->footer_text)}&nbsp;</td>
 </tr>
-<tr>
-    <th scope="row"><div>{$lang->admin_id}</div></th>
-    <td>{implode(",",$module_info->admin_id)}&nbsp;</td>
-</tr>
 <tr class="row2">
-    <td colspan="2" class="right">
-        <a href="{getUrl('act','dispLifepodAdminInsertLifepod')}" class="button"><span>{$lang->cmd_modify}</span></a>
+    <th colspan="2" class="button">
+        <a href="{getUrl('act','dispLifepodAdminInsertLifepod')}" class="button black strong"><span>{$lang->cmd_modify}</span></a>
         <!--@if($module=="admin")-->
         <a href="{getUrl('act','dispLifepodAdminContent','module_srl','')}" class="button"><span>{$lang->cmd_lifepod_list}</span></a>
         <!--@end-->
-    </td>
+    </th>
 </tr>
 </table>
diff --git a/modules/lifepod/tpl/lifepod_insert.html b/modules/lifepod/tpl/lifepod_insert.html
index 75142d744..11feef197 100644
--- a/modules/lifepod/tpl/lifepod_insert.html
+++ b/modules/lifepod/tpl/lifepod_insert.html
@@ -11,7 +11,7 @@
 <!--@end-->
 <input type="hidden" name="use_category" value="N" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->mid}</div></th>
         <td class="wide">
@@ -51,7 +51,8 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td>
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w300" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -81,35 +82,30 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea w400">{htmlspecialchars($module_info->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->description)}</textarea>
             <p>{$lang->about_description}</p>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->header_text}</div></th>
         <td>
-            <textarea name="header_text" class="inputTypeTextArea w400">{htmlspecialchars($module_info->header_text)}</textarea>
+            <textarea name="header_text" class="inputTypeTextArea fullWidth" id="header_text">{htmlspecialchars($module_info->header_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','header_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_header_text}</p>
         </td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->footer_text}</div></th>
         <td>
-            <textarea name="footer_text" class="inputTypeTextArea w400">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <textarea name="footer_text" class="inputTypeTextArea fullWidth" id="footer_text">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','footer_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_footer_text}</p>
         </td>
     </tr>
     <tr class="row2">
-        <th scope="row"><div>{$lang->admin_id}</div></th>
-        <td>
-            <textarea name="admin_id" class="inputTypeTextArea w400"><!--@if($module_info->admin_id)-->{implode(",",$module_info->admin_id)}<!--@end--></textarea>
-            <p>{$lang->about_admin_id}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <td scope="row" colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/lifepod/tpl/skin_info.html b/modules/lifepod/tpl/skin_info.html
index d96d9df17..c4909ffdc 100644
--- a/modules/lifepod/tpl/skin_info.html
+++ b/modules/lifepod/tpl/skin_info.html
@@ -1,147 +1,3 @@
 <!--#include("./header.html")-->
+{$skin_content}
 
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="{$module_info->module}" />
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procLifepodAdminUpdateSkinInfo" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide" >{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-            &nbsp;
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br($skin_info->description)}</td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <col width="150" />
-    <col />
-    <caption>{$lang->extra_vars}</caption>
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td>
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-                <!--@if($val->screenshot)-->
-                    {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-                <!--@else-->
-                    {@ $_width = 200; $_height = 20; $_talign = "left"; }
-                <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-                <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>  
-                <label for="colorset_{$key}">{$val->title}</label>
-                <!--@if($val->screenshot)-->
-                <br />
-                <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-                <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
-    <!--@end-->
-
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
-    </tr>
-    </table>
-
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
diff --git a/modules/member/conf/info.xml b/modules/member/conf/info.xml
index d6832baa2..8bf82ab36 100644
--- a/modules/member/conf/info.xml
+++ b/modules/member/conf/info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
-    <title xml:lang="ko">회원</title>
-    <title xml:lang="zh-CN">会员</title>
-    <title xml:lang="jp">会員</title>
-    <title xml:lang="en">Member</title>
-    <title xml:lang="es">Usuario</title>
-    <title xml:lang="ru">Пользователи</title>
-    <title xml:lang="zh-TW">會員</title>
+    <title xml:lang="ko">회원 관리</title>
+    <title xml:lang="zh-CN">会员管理</title>
+    <title xml:lang="jp">会員 管理</title>
+    <title xml:lang="en">Member Management</title>
+    <title xml:lang="es">Usuario Gestión</title>
+    <title xml:lang="ru">Пользователи Управление</title>
+    <title xml:lang="zh-TW">會員 管理</title>
     <description xml:lang="ko">회원 관리 및 회원 관련 설정등을 하는 모듈입니다.</description>
     <description xml:lang="zh-CN">对会员进行管理及相关设置的模块。</description>
     <description xml:lang="jp">会員管理及び会員関連設定などを行うモジュールです。</description>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">對會員進行管理與相關設置的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>service</category>
+    <category>member</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index 97e757fbd..a777f63a2 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispMemberInfo" type="view" standalone="true" />
         <action name="dispMemberSignUpForm" type="view" standalone="true" />
@@ -33,6 +35,11 @@
         <action name="procMemberLogin" type="controller" standalone="true" />
         <action name="procMemberOpenIDLogin" type="controller" standalone="true" />
         <action name="procMemberOpenIDValidate" type="controller" standalone="true" />
+        <action name="procModuleSiteSignUp" type="controller" standalone="true" />
+        <action name="procModuleSiteLeave" type="controller" standalone="true" />
+        <action name="procMemberAddOpenIDToMember" type="controller" standalone="true" />
+        <action name="procMemberValidateAddOpenIDToMember" type="controller" standalone="true" />
+        <action name="procMemberDeleteOpenIDFromMember" type="controller" standalone="true" />
         <action name="procMemberLogout" type="controller" standalone="true" />
         <action name="procMemberCheckValue" type="controller" standalone="true" />
         <action name="procMemberInsert" type="controller" standalone="true" />
@@ -54,6 +61,7 @@
 
         <action name="procMemberFindAccount" type="controller" standalone="true" />
         <action name="procMemberAuthAccount" type="controller" standalone="true" />
+        <action name="procMemberUpdateAuthMail" type="controller" standalone="true" />
 
         <action name="procMemberAdminInsert" type="controller" standalone="true" />
         <action name="procMemberAdminDelete" type="controller" standalone="true" />
@@ -66,5 +74,6 @@
         <action name="procMemberAdminUpdateJoinForm" type="controller" standalone="true" />
         <action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" />
         <action name="procMemberAdminUpdateDeniedID" type="controller" standalone="true" />
+        <action name="procMemberAdminGroupImageMarkUpdateOrder" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
index 4fbdd9749..103a69643 100644
--- a/modules/member/lang/en.lang.php
+++ b/modules/member/lang/en.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = 'Image Mark';
     $lang->image_mark_max_width = 'Max Width';
     $lang->image_mark_max_height = 'Max Height';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = 'Max Width';
+    $lang->group_image_mark_max_height = 'Max Height';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->signature_max_height = 'Max Signature Height';
     $lang->enable_openid = 'Enable OpenID';
     $lang->enable_join = 'Allow Member Join';
@@ -59,6 +63,7 @@
             'N' => 'Reject All',
     );
     $lang->about_allow_message = 'You may allow or reject messages.';
+    $lang->logged_users = 'Logged Users';
 
     $lang->webmaster_name = "Webmaster's Name";
     $lang->webmaster_email = "Webmaster's Email";
@@ -84,6 +89,7 @@
     $lang->cmd_login = 'Login';
     $lang->cmd_logout = 'Logout';
     $lang->cmd_signup = 'Join';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = 'Modify Member Info';
     $lang->cmd_modify_member_password = 'Modify Password';
     $lang->cmd_view_member_info = 'Member Info';
@@ -141,6 +147,7 @@
     $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered';
     $lang->msg_not_uploaded_image_name = 'Image name could not be registered';
     $lang->msg_not_uploaded_image_mark = 'Image mark could not be registered';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = 'You have to agree the agreement'; 
 
@@ -183,6 +190,7 @@
 
     $lang->about_image_name = "Allow users to use image name instead of text name";
     $lang->about_image_mark = "Allow users to use mark in front of their names";
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = 'Allow users to use profile images';
     $lang->about_accept_agreement = "I have read the agreement and agree"; 
 
@@ -193,4 +201,5 @@
 
     $lang->about_member = "This is a module for creating/modifying/deleting members and managing group or join form.\nYou can manage members by creating new groups, and get additional information by managing join form";
     $lang->about_find_member_account = 'Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />';
+    $lang->add_openid = 'Add OpenID';
 ?>
diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php
index 823337997..ada8103b5 100644
--- a/modules/member/lang/es.lang.php
+++ b/modules/member/lang/es.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = 'Marca de la imagen';
     $lang->image_mark_max_width = 'Ancho Máximo';
     $lang->image_mark_max_height = 'Altura Máxima';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = 'Ancho Máximo';
+    $lang->group_image_mark_max_height = 'Altura Máxima';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->enable_openid = 'Activar OpenID';
     $lang->enable_join = 'Permitir el registro del usuario';
     $lang->enable_confirm = '메일 인증 사용';
@@ -58,6 +62,7 @@
             'N' => '모두 금지',
     );
     $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
+    $lang->logged_users = 'Logged Users';
 
     $lang->webmaster_name = 'Nombre del Webmaster';
     $lang->webmaster_email = 'Correo electrónico Webmaster';
@@ -84,6 +89,7 @@
     $lang->cmd_login = 'Conectar';
     $lang->cmd_logout = 'Desconectar';
     $lang->cmd_signup = 'Registrar';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = 'Modificar nombre del usuario';
     $lang->cmd_modify_member_password = 'Cambiar la contraseña';
     $lang->cmd_view_member_info = 'Información del usuario';
@@ -140,6 +146,7 @@
 
     $lang->msg_not_uploaded_image_name = 'Imagen del nombre no puede ser registrado';
     $lang->msg_not_uploaded_image_mark = 'Imagen de marca no puede ser resistrado';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = 'Usted primero debe aceptar el acuerdo'; 
 
@@ -182,6 +189,7 @@
 
     $lang->about_image_name = "Permitir a los usuarios el uso de imagen del nombre en ves del nombre del usuario";
     $lang->about_image_mark = "Permitir a los usuarios el uso de imagen de marca delante de sus nombres";
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = 'Permitir a los usuarios a utilizar nombre de la imagen en lugar de texto nombre';
     $lang->about_accept_agreement = "Yo he leído todo el acuerdo y acepto"; 
 
diff --git a/modules/member/lang/fr.lang.php b/modules/member/lang/fr.lang.php
index 2ce4d94c4..eeda51118 100644
--- a/modules/member/lang/fr.lang.php
+++ b/modules/member/lang/fr.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = 'Marque en Image';
     $lang->image_mark_max_width = 'Largeur Maximum';
     $lang->image_mark_max_height = 'Hauteur Maximum';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = 'Largeur Maximum';
+    $lang->group_image_mark_max_height = 'Hauteur Maximum';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
 	$lang->signature_max_height = 'Hauteur Maximum de la Signature';
     $lang->enable_openid = 'Permettre OpenID';
     $lang->enable_join = 'Permettre l\'inscription';
@@ -59,6 +63,7 @@
             'N' => '모두 금지',
     );
     $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
+    $lang->logged_users = 'Logged Users';
 
     $lang->webmaster_name = "Nom de Webmestre";
     $lang->webmaster_email = "Mél de Webmestre";
@@ -84,6 +89,7 @@
     $lang->cmd_login = 'Connexion';
     $lang->cmd_logout = 'Déconnexion';
     $lang->cmd_signup = 'Inscription';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = 'Modifier Mon Information';
     $lang->cmd_modify_member_password = 'Modifier le Mot de Passe';
     $lang->cmd_view_member_info = 'Voir Mon Information';
@@ -141,6 +147,7 @@
     $lang->msg_not_uploaded_profile_image = 'L\'image de Profil n\'a pas pu être enrégistré';
     $lang->msg_not_uploaded_image_name = 'Le nom d\'image n\'a pas pu être enrégistré';
     $lang->msg_not_uploaded_image_mark = 'La marque en image n\'a pas pu être enrégistrée';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = 'Vous devez agréer l\'accord'; 
 
@@ -183,6 +190,7 @@
 
     $lang->about_image_name = "Permettre aux utilisateurs d'utiliser une image pour présenter leurs noms au lieu des lettres";
     $lang->about_image_mark = "Permettre aux utilisateurs d'utiliser une marque devent leurs noms";
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = 'Permettre aux utilisateurs d\'utiliser une image de profil';
     $lang->about_accept_agreement = "J'ai lu l'Accord et je suis d'accord."; 
 
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
index 454e7cf62..0c01336ef 100644
--- a/modules/member/lang/jp.lang.php
+++ b/modules/member/lang/jp.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = 'イメージマーク';
     $lang->image_mark_max_width = '横幅制限サイズ';
     $lang->image_mark_max_height = '縦幅制限サイズ';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = '横幅制限サイズ';
+    $lang->group_image_mark_max_height = '縦幅制限サイズ';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->signature_max_height = '署名欄の高さの制限';
     $lang->enable_openid = 'OpenID使用';
     $lang->enable_join = '会員登録を許可する';
@@ -59,6 +63,7 @@
             'N' => '全て禁止',
     );
     $lang->about_allow_message = 'メッセージの許可タイプ及び対象を設定します。';
+    $lang->logged_users = 'Logged Users';
 
     $lang->webmaster_name = 'ウェブマスターのお名前';
     $lang->webmaster_email = 'ウェブマスターのメールアドレス';
@@ -84,6 +89,7 @@
     $lang->cmd_login = 'ログイン';
     $lang->cmd_logout = 'ログアウト';
     $lang->cmd_signup = '会員登録';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = '会員情報修正';
     $lang->cmd_modify_member_password = 'パスワード変更';
     $lang->cmd_view_member_info = '会員情報表示';
@@ -141,6 +147,7 @@
     $lang->msg_not_uploaded_profile_image = 'プロフィールイメージを登録することができません。';
     $lang->msg_not_uploaded_image_name = 'イメージ名を登録することができません。';
     $lang->msg_not_uploaded_image_mark = 'イメージマークを登録することができません。';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = '規約に同意しなければなりません。';
 
@@ -184,6 +191,7 @@
     $lang->about_image_name = 'ユーザの名前を文字の代わりにイメージで表示させることができます。';
     $lang->about_image_mark = '使用者の名前の前にマークを付けることができます。';
     $lang->about_profile_image = 'ユーザのプロフィールイメージが使用できるようにします。';
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_signature_max_height = '署名欄の高さのサイズを制限します。 (0 もしくは空の場合は制限なし。)';
     $lang->about_accept_agreement = '登録規約をすべて読んだ上で同意します。';
 
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 96b5d7dc2..7c8fbdc96 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = '이미지 마크';
     $lang->image_mark_max_width = '가로 제한 크기';
     $lang->image_mark_max_height = '세로 제한 크기';
+    $lang->group_image_mark = '그룹 이미지 마크';
+    $lang->group_image_mark_max_width = '가로 제한 크기';
+    $lang->group_image_mark_max_height = '세로 제한 크기';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->signature_max_height = '서명 높이 제한';
     $lang->enable_openid = 'OpenID 지원';
     $lang->enable_join = '회원 가입 허가';
@@ -59,6 +63,7 @@
             'N' => '모두 금지',
     );
     $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
+    $lang->logged_users = '현재 접속자';
 
     $lang->webmaster_name = '웹마스터 이름';
     $lang->webmaster_email = '웹마스터 메일주소';
@@ -84,6 +89,7 @@
     $lang->cmd_login = '로그인';
     $lang->cmd_logout = '로그아웃';
     $lang->cmd_signup = '회원 가입';
+    $lang->cmd_site_signup = '가입';
     $lang->cmd_modify_member_info = '회원 정보 수정';
     $lang->cmd_modify_member_password = '비밀번호 변경';
     $lang->cmd_view_member_info = '회원 정보 보기';
@@ -108,7 +114,7 @@
     $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다';
 
     $lang->msg_cart_is_null = '대상을 선택해주세요';
-    $lang->msg_checked_file_is_deleted = '%d개의 첨부파일이 삭제되었습니다';
+    $lang->msg_checked_file_is_deleted = "%d개의 첨부파일이 삭제되었습니다";
 
     $lang->msg_find_account_title = '아이디/ 비밀번호 정보입니다';
     $lang->msg_find_account_info = '요청하신 계정 정보는 아래와 같습니다';
@@ -116,8 +122,8 @@
     $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
     $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
     $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
-    $lang->msg_auth_mail_sent = '%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.';
-    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
+    $lang->msg_auth_mail_sent = "%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.";
+    $lang->msg_confirm_mail_sent = "%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.";
     $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요';
     $lang->msg_success_authed = '인증이 정상적으로 되어 로그인 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하시는 비밀번호로 변경하세요.';
     $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
@@ -141,12 +147,13 @@
     $lang->msg_not_uploaded_profile_image = '프로필 이미지를 등록할 수가 없습니다';
     $lang->msg_not_uploaded_image_name = '이미지 이름을 등록할 수가 없습니다';
     $lang->msg_not_uploaded_image_mark = '이미지 마크를 등록할 수가 없습니다';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = '약관에 동의하셔야 합니다'; 
 
     $lang->msg_user_denied = '입력하신 아이디의 사용이 중지되셨습니다';
     $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
-    $lang->msg_user_limited = '입력하신 아이디는 %s 이후부터 사용하실 수 있습니다';
+    $lang->msg_user_limited = "입력하신 아이디는 %s 이후부터 사용하실 수 있습니다";
 
     $lang->about_user_id = '사용자 ID는 3~20자 사이의 영문+숫자로 이루어져야 하며 영문으로 시작되어야 합니다';
     $lang->about_password = '비밀번호는 6~20자로 되어야 합니다';
@@ -183,6 +190,7 @@
 
     $lang->about_image_name = '사용자의 이름을 글자 대신 이미지로 사용할 수 있게 합니다';
     $lang->about_image_mark = '사용자의 이름앞에 마크를 달 수 있습니다';
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = '사용자의 프로필 이미지를 사용할 수 있게 합니다';
     $lang->about_signature_max_height = '서명란의 높이를 제한 할 수 있습니다. (0 또는 비워두면 제한하지 않습니다)';
     $lang->about_accept_agreement = '약관을 모두 읽었으며 동의합니다'; 
@@ -195,4 +203,5 @@
 
     $lang->about_member = "회원을 생성/수정/삭제 할 수 있고 그룹관리나 가입폼 관리등을 할 수 있는 회원 관리 모듈입니다.\n기본으로 생성된 그룹외의 그룹을 생성하여 회원 관리가 가능하고 가입폼관리를 통한 기본 정보외의 추가 정보를 요구받을 수도 있습니다.";
     $lang->about_ssl_port = '기본 포트 이외의 SSL 포트를 사용하는 경우 포트번호를 입력해주세요';
+    $lang->add_openid = '오픈아이디 추가';
 ?>
diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php
index 66ee8a9b8..32a233476 100644
--- a/modules/member/lang/ru.lang.php
+++ b/modules/member/lang/ru.lang.php
@@ -36,6 +36,10 @@
     $lang->image_mark = 'Изображение-марка';
     $lang->image_mark_max_width = 'Макс. ширина';
     $lang->image_mark_max_height = 'Макс. высота';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = 'Макс. ширина';
+    $lang->group_image_mark_max_height = 'Макс. высота';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->enable_openid = 'Включить открытый ID (OpenID)';
     $lang->enable_join = 'Позволить пользователям регистрироваться';
     $lang->enable_confirm = '메일 인증 사용';
@@ -58,6 +62,7 @@
             'N' => '모두 금지',
     );
     $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
+    $lang->logged_users = 'Logged Users';
 
     $lang->webmaster_name = "Имя веб-мастера";
     $lang->webmaster_email = "Email веб-мастера";
@@ -83,6 +88,7 @@
     $lang->cmd_login = 'Войти';
     $lang->cmd_logout = 'Выйти';
     $lang->cmd_signup = 'Регистрация';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = 'Изменить информацию пользователя';
     $lang->cmd_modify_member_password = 'Изменить пароль';
     $lang->cmd_view_member_info = 'Информация пользователя';
@@ -140,6 +146,7 @@
 
     $lang->msg_not_uploaded_image_name = 'Имя изображения не может быть зарегистрировано';
     $lang->msg_not_uploaded_image_mark = 'Марка не может быть зарегистрирована';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = 'Вы должны принять Соглашение'; 
 
@@ -182,6 +189,7 @@
 
     $lang->about_image_name = "Позволить пользователям использовать изображение вместо текста";
     $lang->about_image_mark = "Позволить пользователям использовать марку перед их именами";
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = 'Позволить пользователям использовать изображения профиля';
     $lang->about_accept_agreement = "Я прочитал соглашение полностью и согласен"; 
 
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
index dc2807437..47f14863c 100644
--- a/modules/member/lang/zh-CN.lang.php
+++ b/modules/member/lang/zh-CN.lang.php
@@ -2,11 +2,11 @@
     /**
      * @file   zh-CN.lang.php
      * @author zero (zero@nzeo.com)
-     * @brief  简体中文语言包 (只收录基本内容)
+     * @brief  会员模块简体中文语言包
      **/
 
     $lang->member = '会员';
-    $lang->member_default_info = '基本信息';
+    $lang->member_default_info = '基本资料';
     $lang->member_extend_info = '扩展信息';
     $lang->default_group_1 = "准会员";
     $lang->default_group_2 = "正会员";
@@ -27,7 +27,7 @@
     $lang->group_title = '用户组标题';
     $lang->group_srl = '用户组编号';
     $lang->signature = '签名';
-    $lang->profile_image = '签名图片';
+    $lang->profile_image = '个性头像';
     $lang->profile_image_max_width = '宽度限制';
     $lang->profile_image_max_height = '高度限制';
     $lang->image_name = '昵称图片';
@@ -36,6 +36,10 @@
     $lang->image_mark = '用户图标';
     $lang->image_mark_max_width = '宽度限制';
     $lang->image_mark_max_height = '高度限制';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = '宽度限制';
+    $lang->group_image_mark_max_height = '高度限制';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->signature_max_height = '签名高度限制';
     $lang->enable_openid = '支持OpenID';
     $lang->enable_join = '允许会员注册';
@@ -59,6 +63,7 @@
             'N' => '只允许好友',
     );
     $lang->about_allow_message = '可以指定接收短消息方法及对象。';
+    $lang->logged_users = '在线用户';
 
     $lang->webmaster_name = '管理员名';
     $lang->webmaster_email = '管理员电子邮件';
@@ -78,30 +83,31 @@
         'last_login' => '最后登录',
         'last_login_more' => '最后登录(以上)',
         'last_login_less' => '最后登录시(以下)',
-        'extra_vars' => '扩展变数',
+        'extra_vars' => '扩展信息',
     );
 
 
     $lang->cmd_login = '登录';
     $lang->cmd_logout = '退出';
     $lang->cmd_signup = '新会员注册';
-    $lang->cmd_modify_member_info = '修改会员信息';
+    $lang->cmd_site_signup = '注册';
+    $lang->cmd_modify_member_info = '编辑个人资料';
     $lang->cmd_modify_member_password = '修改密码';
-    $lang->cmd_view_member_info = '查看会员信息';
+    $lang->cmd_view_member_info = '个人资料';
     $lang->cmd_leave = '注销';
     $lang->cmd_find_member_account = '查找用户名/密码';
 
     $lang->cmd_member_list = '会员目录';
-    $lang->cmd_module_config = '基本设置';
-    $lang->cmd_member_group = '用户组管理';
+    $lang->cmd_module_config = '常规选项';
+    $lang->cmd_member_group = '用户组';
     $lang->cmd_send_mail = '发送邮件';
-    $lang->cmd_manage_id = '禁止用户名管理';
-    $lang->cmd_manage_form = '注册表单管理';
-    $lang->cmd_view_own_document = '查看发表主题';
+    $lang->cmd_manage_id = '禁止用户名';
+    $lang->cmd_manage_form = '扩展注册表单';
+    $lang->cmd_view_own_document = '我的话题';
     $lang->cmd_trace_document = '主题追踪';
     $lang->cmd_trace_comment = '评论追踪';
-    $lang->cmd_view_scrapped_document = '查看收藏';
-    $lang->cmd_view_saved_document = '查看临时保存箱';
+    $lang->cmd_view_scrapped_document = '我的收藏';
+    $lang->cmd_view_saved_document = '临时保存箱';
     $lang->cmd_send_email = '发送邮件';
 
     $lang->msg_email_not_exists = "没有找到您输入的Email地址。";
@@ -142,6 +148,7 @@
     $lang->msg_not_uploaded_profile_image = '不能登录签名图像！';
     $lang->msg_not_uploaded_image_name = '不能登录昵称图像！';
     $lang->msg_not_uploaded_image_mark = '不能登录用户图标！';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = '您必须同意条款。'; 
 
@@ -184,6 +191,7 @@
 
     $lang->about_image_name = '用户昵称可以用小图片来替代显示。';
     $lang->about_image_mark = '显示在用户昵称前的小图标。';
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = '可以使用签名图片。';
     $lang->about_signature_max_height = '可以限制签名栏高度(0或留空为不限制)。';
     $lang->about_accept_agreement = '已阅读全部条款并同意。'; 
diff --git a/modules/member/lang/zh-TW.lang.php b/modules/member/lang/zh-TW.lang.php
index ae503ec69..bc9ced735 100644
--- a/modules/member/lang/zh-TW.lang.php
+++ b/modules/member/lang/zh-TW.lang.php
@@ -2,7 +2,7 @@
     /**
      * @file   zh-TW.lang.php
      * @author zero (zero@nzeo.com) 翻譯：royallin
-     * @brief  正體中文語言 (包含基本內容)
+     * @brief  會員(member)模組正體中文語言 (包含基本內容)
      **/
 
     $lang->member = '會員';
@@ -23,9 +23,9 @@
     $lang->allow_mailing = '接收郵件';
     $lang->denied = '禁止使用';
     $lang->is_admin = '最高管理權限';
-    $lang->group = '用戶組';
-    $lang->group_title = '用戶組標題';
-    $lang->group_srl = '用戶組編號';
+    $lang->group = '群組';
+    $lang->group_title = '群組標題';
+    $lang->group_srl = '群組編號';
     $lang->signature = '簽名檔';
     $lang->profile_image = '個人圖片';
     $lang->profile_image_max_width = '寬度限制';
@@ -36,11 +36,15 @@
     $lang->image_mark = '用戶圖示';
     $lang->image_mark_max_width = '寬度限制';
     $lang->image_mark_max_height = '高度限制';
+    $lang->group_image_mark = 'Group Image Mark';
+    $lang->group_image_mark_max_width = '寬度限制';
+    $lang->group_image_mark_max_height = '高度限制';
+    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
     $lang->signature_max_height = '簽名檔高度限制';
-    $lang->enable_openid = '支援 OpenID';
+    $lang->enable_openid = '支援OpenID';
     $lang->enable_join = '允許會員註冊';
     $lang->enable_confirm = '使用郵件認證';
-    $lang->enable_ssl = '使用 SSL 功能';
+    $lang->enable_ssl = '使用SSL功能';
     $lang->security_sign_in = '使用安全登入';
     $lang->limit_day = '認證限制';
     $lang->limit_date = '限制日期';
@@ -59,6 +63,7 @@
             'N' => '全部禁止',
     );
     $lang->about_allow_message = '可選擇是否接收短訊息。';
+    $lang->logged_users = '線上會員';
 
     $lang->webmaster_name = '管理員名稱';
     $lang->webmaster_email = '管理員電子郵件';
@@ -73,17 +78,18 @@
         'nick_name' => '暱稱',
         'email_address' => '電子郵件',
         'regdate' => '註冊日期',
-        'regdate_more' => '註冊日期(更多)',
-        'regdate_less' => '註冊日期(較少)',
+        'regdate_more' => '註冊日期(以上)',
+        'regdate_less' => '註冊日期(以下)',
         'last_login' => '最近登入',
-        'last_login_more' => '最近登入(更多)',
-        'last_login_less' => '最近登入(較少)',
+        'last_login_more' => '最近登入(以上)',
+        'last_login_less' => '最近登入(以下)',
         'extra_vars' => '延伸變數',
     );
 
     $lang->cmd_login = '登入';
     $lang->cmd_logout = '登出';
     $lang->cmd_signup = '會員註冊';
+    $lang->cmd_site_signup = 'Join';
     $lang->cmd_modify_member_info = '修改會員資料';
     $lang->cmd_modify_member_password = '修改密碼';
     $lang->cmd_view_member_info = '檢視會員資料';
@@ -103,7 +109,7 @@
     $lang->cmd_view_saved_document = '檢視臨時儲存箱';
     $lang->cmd_send_email = '發送郵件';
 
-    $lang->msg_email_not_exists = "找不到您輸入的郵件地址。";
+    $lang->msg_email_not_exists = '找不到您輸入的郵件地址。';
 
     $lang->msg_alreay_scrapped = '已收藏的主題！';
 
@@ -124,8 +130,8 @@
 
     $lang->msg_new_member = '會員註冊';
     $lang->msg_update_member = '修改會員資料';
-    $lang->msg_leave_member = '退出會員';
-    $lang->msg_group_is_null = '無用戶組。';
+    $lang->msg_leave_member = '會員退出';
+    $lang->msg_group_is_null = '無群組。';
     $lang->msg_not_delete_default = '無法刪除基本項目';
     $lang->msg_not_exists_member = '不存在的帳號';
     $lang->msg_cannot_delete_admin = '無法解除管理員帳號，請解除管理後再刪除';
@@ -141,6 +147,7 @@
     $lang->msg_not_uploaded_profile_image = '無法登錄個人圖片！';
     $lang->msg_not_uploaded_image_name = '無法登錄暱稱圖片！';
     $lang->msg_not_uploaded_image_mark = '無法登錄用戶圖示！';
+    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 
     $lang->msg_accept_agreement = '您必須同意條款。'; 
 
@@ -160,7 +167,7 @@
     $lang->about_denied = '選擇時不能使用此帳號。';
     $lang->about_is_admin = '選擇時將具有最高管理權限。';
     $lang->about_member_description = '管理員對會員的註記。';
-    $lang->about_group = '一個用戶名稱可擁有多個用戶組。';
+    $lang->about_group = '一個帳號可擁有多個群組。';
 
     $lang->about_column_type = '請選擇要新增的註冊表單格式。';
     $lang->about_column_name = '請輸入在樣板中可以使用的英文名稱。(變數名稱)';
@@ -170,10 +177,10 @@
     $lang->about_form_description = '說明欄裡輸入的內容，在註冊時會顯示。';
     $lang->about_required = '註冊時成為必填項目。';
 
-    $lang->about_enable_openid = '想要網站支援 OpenID 時，請勾選此項。';
+    $lang->about_enable_openid = '想要網站支援OpenID時，請勾選此項。';
     $lang->about_enable_join = '選擇此項後，用戶才可以註冊。';
     $lang->about_enable_confirm = '為確認會員註冊資料，會向會員輸入的郵件地址發送註冊認證郵件。';
-    $lang->about_enable_ssl = '如主機提供 SSL 認證服務，新會員註冊/修改會員資料/登入等資料的傳送將使用 SSL(https) 認證。';
+    $lang->about_enable_ssl = '如主機提供SSL認證服務，新會員註冊/修改會員資料/登入等資料的傳送將使用SSL(https)認證。';
     $lang->about_limit_day = '註冊會員後的認證有效期限。';
     $lang->about_limit_date = '直到指定日期，否則該帳號都無法登入。';
     $lang->about_after_login_url = '可以指定登入後的頁面轉向網址(留空為目前頁面)。';
@@ -183,16 +190,18 @@
 
     $lang->about_image_name = '用戶暱稱可以用圖片替代。';
     $lang->about_image_mark = '顯示在用戶暱稱前的圖示。';
+    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
     $lang->about_profile_image = '可以使用個人圖片。';
     $lang->about_signature_max_height = '可以限制簽名檔高度(0或留空為不限制)。';
     $lang->about_accept_agreement = '已閱讀全部條款並同意。'; 
 
     $lang->about_member_default = '將成為註冊會員時的預設用戶組。';
 
-    $lang->about_openid = '用 OpenID 註冊時，該網站只儲存帳號和郵件等基本資料，密碼和認證處理是在提供 OpenID 服務的網站中得到解決。';
-    $lang->about_openid_leave = '刪除 OpenID 就等於永久刪除站內會員的資料。<br />被刪除後，再重新登錄就等於新會員註冊，因此對以前自己寫的主題將失去其權限。';
+    $lang->about_openid = '用OpenID註冊時，該網站只儲存帳號和郵件等基本資料，密碼和認證處理是在提供OpenID服務的網站中得到解決。';
+    $lang->about_openid_leave = '刪除OpenID就等於永久刪除站內會員的資料。<br />被刪除後，再重新登錄就等於新會員註冊，因此對以前自己寫的主題將失去其權限。';
     $lang->about_find_member_account = '帳號/密碼將發送到您註冊時，所輸入的電子郵件當中。<br />輸入註冊時的電子郵件地址後，請按「查詢帳號/密碼」按鈕。<br />';
 
     $lang->about_member = "可以新增/修改/刪除會員及管理用戶組或註冊表單的會員管理模組。\n此模組不僅可以建立預設用戶組以外的其他用戶組來管理會員，並且通過註冊表單的管理獲得除會員基本資料以外的延伸資料。";
-    $lang->about_ssl_port = '請輸入想要使用預設 SSL 埠口以外的埠口。';
+    $lang->about_ssl_port = '請輸入想要使用預設SSL埠口以外的埠口。';
+    $lang->add_openid = 'Add OpenID';
 ?>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index c70c74636..dbfc1d48e 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -83,7 +83,19 @@
          **/
         function procMemberAdminInsertConfig() {
             // 기본 정보를 받음
-            $args = Context::gets('webmaster_name','webmaster_email','skin','colorset','enable_openid','enable_join','enable_confirm','limit_day','after_login_url','after_logout_url','redirect_url','agreement','profile_image','profile_image_max_width','profile_image_max_height','image_name','image_mark', 'image_name_max_width', 'image_name_max_height','image_mark_max_width','image_mark_max_height','signature_max_height','editor_skin','editor_colorset');
+            $args = Context::gets(
+                'webmaster_name', 'webmaster_email',
+                'skin', 'colorset',
+                'editor_skin', 'editor_colorset',
+                'enable_openid', 'enable_join', 'enable_confirm', 'limit_day',
+                'after_login_url', 'after_logout_url', 'redirect_url', 'agreement',
+                'profile_image', 'profile_image_max_width', 'profile_image_max_height',
+                'image_name', 'image_name_max_width', 'image_name_max_height',
+                'image_mark', 'image_mark_max_width', 'image_mark_max_height',
+                'group_image_mark', 'group_image_mark_max_width', 'group_image_mark_max_height',
+                'signature_max_height'
+            );
+
             if(!$args->skin) $args->skin = "default";
             if(!$args->colorset) $args->colorset = "white";
             if(!$args->editor_skin) $args->editor_skin= "default";
@@ -93,6 +105,7 @@
             if($args->profile_image !='Y') $args->profile_image = 'N';
             if($args->image_name!='Y') $args->image_name = 'N';
             if($args->image_mark!='Y') $args->image_mark = 'N';
+            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
             if(!trim(strip_tags($args->agreement))) $args->agreement = null;
             $args->limit_day = (int)$args->limit_day;
 
@@ -106,7 +119,7 @@
          * @brief 사용자 그룹 추가
          **/
         function procMemberAdminInsertGroup() {
-            $args = Context::gets('title','description','is_default');
+            $args = Context::gets('title','description','is_default','image_mark');
             $output = $this->insertGroup($args);
             if(!$output->toBool()) return $output;
 
@@ -129,7 +142,7 @@
                         $msg_code = 'success_deleted';
                     break;
                 case 'update' :
-                        $args = Context::gets('group_srl','title','description','is_default');
+                        $args = Context::gets('group_srl','title','description','is_default','image_mark');
                         $args->site_srl = 0;
                         $output = $this->updateGroup($args);
                         if(!$output->toBool()) return $output;
@@ -387,6 +400,17 @@
             return executeQuery('member.deleteGroup', $args);
         }
 
+
+        function procMemberAdminGroupImageMarkUpdateOrder() {
+            $oModuleModel = &getModel('module');
+            $oModuleControll = getController('module');
+
+            $config = $oModuleModel->getModuleConfig('member');
+//            $config->group_image_mark_order = Context::get('group_image_mark_order');
+
+            $oModuleControll->insertModuleConfig('member', $config);
+        }
+
         /**
          * @brief 금지아이디 등록
          **/
diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index 5f5f8b14a..9066376d7 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -100,8 +100,6 @@
             $args->page_count = 10;
             $query_id = 'member.getSiteMemberList';
             $output = executeQueryArray($query_id, $args);
-            if(!$output->data) return array();
-
             return $output;
         }
 
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index b07102d57..ece3e6629 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -161,6 +161,12 @@
          * @brief 그룹 목록 출력
          **/
         function dispMemberAdminGroupList() {
+            $oModuleModel = &getModel('module');
+
+            $config = $oModuleModel->getModuleConfig('member');
+            if($config->group_image_mark_order) $config->group_image_mark_order = explode(',', $config->group_image_mark_order);
+            Context::set('config', $config);
+
             $group_srl = Context::get('group_srl');
 
             if($group_srl && $this->group_list[$group_srl]) {
@@ -237,7 +243,7 @@
         }
 
         /**
-         * @brief 회원 일괄 삭제 
+         * @brief 회원 일괄 삭제
          **/
         function dispMemberAdminDeleteMembers() {
             // 선택된 회원 목록을 구함
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index df550b18e..155c6b2d5 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -1,10 +1,9 @@
 <?php
     /**
-     * @class  member 
+     * @class  member
      * @author zero (zero@nzeo.com)
      * @brief  member module의 high class
      **/
-
     class member extends ModuleObject {
 
         /**
@@ -37,35 +36,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberInfo');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberSignUpForm');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberModifyInfo');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberModifyPassword');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberLeave');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberOpenIDLeave');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberLoginForm');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberLogout');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberOwnDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberScrappedDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberSavedDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberFindAccount');
-
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminList');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminConfig');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminInsert');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminDeleteForm');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminGroupList');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminJoinFormList');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminInfo');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminInsertJoinForm');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberAdminDeniedIDList');
-
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberInsertProfileImage');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberInsertImageName');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberInsertImageMark');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteProfileImage');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteImageName');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteImageMark');
 
             $oDB = &DB::getInstance();
             $oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
@@ -86,6 +56,8 @@
             if(!$args->image_mark_max_height) $args->image_mark_max_height = '20';
             if(!$args->profile_image_max_width) $args->profile_image_max_width = '80';
             if(!$args->profile_image_max_height) $args->profile_image_max_height = '80';
+            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
+
             $oModuleController->insertModuleConfig('member',$args);
 
             // 멤버 컨트롤러 객체 생성
@@ -157,38 +129,12 @@
             $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
 
-            // dispMemberOwnDocument act의 여부 체크 (2007. 7. 24 추가)
-            $act = $oModuleModel->getActionForward('dispMemberOwnDocument');
-            if(!$act) return true;
-
-            // dispMemberScrappedDocument act의 여부 체크 (2007. 7. 25 추가)
-            $act = $oModuleModel->getActionForward('dispMemberScrappedDocument');
-            if(!$act) return true;
-
-            // dispMemberOpenIDLeave act의 여부 체크 (2007. 9. 19 추가)
-            $act = $oModuleModel->getActionForward('dispMemberOpenIDLeave');
-            if(!$act) return true;
-
             // member 디렉토리 체크 (2007. 8. 11 추가)
             if(!is_dir("./files/member_extra_info")) return true;
 
-            // dispMemberFindAccount act의 여부 체크 (2007. 10. 15)
-            $act = $oModuleModel->getActionForward('dispMemberFindAccount');
-            if(!$act) return true;
-
             // member 디렉토리 체크 (2007. 10. 22 추가)
             if(!is_dir("./files/member_extra_info/profile_image")) return true;
 
-            // procMemberInsertProfileImage, procMemberDeleteProfileImage act의 여부 체크 (2007. 10. 22)
-            $act = $oModuleModel->getActionForward('procMemberInsertProfileImage');
-            if(!$act) return true;
-            $act = $oModuleModel->getActionForward('procMemberDeleteProfileImage');
-            if(!$act) return true;
-
-            // dispMemberSavedDocument act의 여부 체크 (2007. 10. 29)
-            $act = $oModuleModel->getActionForward('dispMemberSavedDocument');
-            if(!$act) return true;
-
             // member_auth_mail 테이블에 is_register 필드 추가 (2008. 04. 22)
             $act = $oDB->isColumnExists("member_auth_mail", "is_register");
             if(!$act) return true;
@@ -198,6 +144,9 @@
             if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
             if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
 
+            // image_mark 추가 (2009. 02. 14)
+            if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+
             return false;
         }
 
@@ -208,15 +157,6 @@
             $oDB = &DB::getInstance();
             $oModuleController = &getController('module');
 
-            // act 추가
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberOwnDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberScrappedDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberSavedDocument');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberOpenIDLeave');
-            $oModuleController->insertActionForward('member', 'view', 'dispMemberFindAccount');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberInsertProfileImage');
-            $oModuleController->insertActionForward('member', 'controller', 'procMemberDeleteProfileImage');
-
             // member 디렉토리 체크
             FileHandler::makeDir('./files/member_extra_info/image_name');
             FileHandler::makeDir('./files/member_extra_info/image_mark');
@@ -241,6 +181,11 @@
                 $oDB->dropIndex("member_group","uni_member_group_title",true);
             }
 
+            // image_mark 추가 (2009. 02. 14)
+            if(!$oDB->isColumnExists("member_group", "image_mark")) {
+                $oDB->addColumn("member_group", "image_mark", "text");
+            }
+
             return new Object(0, 'success_updated');
         }
 
@@ -250,4 +195,4 @@
         function recompileCache() {
         }
     }
-?>
+?>
\ No newline at end of file
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 5c7ffaddf..7065cc1b0 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -42,7 +42,7 @@
         /**
          * @brief openid로그인
          **/
-        function procMemberOpenIDLogin() {
+        function procMemberOpenIDLogin($validator = "procMemberOpenIDValidate") {
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
             if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
@@ -76,7 +76,7 @@
                     header("location:" . $referer_url);
             } else {
                 $goto = urlencode($referer_url);
-                $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=procMemberOpenIDValidate&goto=" . $goto;
+                $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=" . $validator. "&goto=" . $goto;
                 $openid->SetApprovedURL($ApprovedURL);
                 $url = $openid->GetRedirectURL();
                 $this->add('redirect_url', $url);
@@ -87,18 +87,7 @@
         }
 
         function getLegacyUserIDsFromOpenID($openid_identity) {
-            //  Issue 17515512:
-            //  OpenID Provider가 openid.identity를 
-            //  http://araste.myid.net/ 으로 넘겨주든
-            //  http://araste.myid.net  으로 넘겨주든,
-            //  동일한 제로보드 사용자 이름에 매핑되어야 한다.
-            //  가입되지 않은 경우엔 / 를 뗀 것이 우선이 된다.
-            //  OpenID Provider의 정책의 일시적 변경 때문에 
-            //  / 가 붙은 꼴의 유저아이디로 (예: jangxyz.myid.net/ )
-            //  가입된 사례가 있다. 이 때는
-            //  jangxyz.myid.net 과 jangxyz.myid.net/  둘 모두로 시도해보아야 한다.
-            //  이를 위한 workaround이다.
-
+            //  Issue 17515512: workaround
             $result = array();
             $uri_matches = array();
             preg_match(Auth_OpenID_getURIPattern(), $openid_identity, $uri_matches);
@@ -138,39 +127,61 @@
             return $result;
         }
 
-        /** 
-         * @brief openid 인증 체크
-         **/
-        function procMemberOpenIDValidate() {
-            // use the JanRain php-openid library 
-            ini_set('include_path', ini_get('include_path').':./modules/member/php-openid-1.2.3');
-            require_once('Auth/OpenID/URINorm.php');
+        function doOpenIDValidate($openid) {
+            // use the JanRain php-openid library
+            require_once($this->module_path.'php-openid-1.2.3/Auth/OpenID/URINorm.php');
 
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
             if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
 
-            $openid_identity = Auth_OpenID_urinorm($_GET['openid_identity']);
-
             ob_start();
-            require('./modules/member/openid_lib/class.openid.php');
-            require_once('./modules/member/openid_lib/libcurlemu.inc.php');
+            require($this->module_path.'openid_lib/class.openid.php');
+            require_once($this->module_path.'openid_lib/libcurlemu.inc.php');
 
-            $openid = new SimpleOpenID;
-            $openid->SetIdentity($openid_identity);
-            $openid_validation_result = $openid->ValidateWithServer();
+            $openid_ctx = new SimpleOpenID;
 
+            $openid_ctx->SetIdentity(Auth_OpenID_urinorm($openid));
+            $openid_ctx->validation_result = $openid_ctx->ValidateWithServer();
             ob_clean();
 
+            return $openid_ctx;
+        }
+
+        /** 
+         * @brief openid 인증 체크
+         **/
+        function procMemberOpenIDValidate() {
+            $openid = $this->doOpenIDValidate($_GET['openid_identity']);
+            $openid_identity = $openid->GetIdentity();
+            $openid_validation_result = $openid->validation_result;
+
             // 인증 성공
             if ($openid_validation_result == true) {
+                $oMemberModel = &getModel('member');
 
                 //  이 오픈아이디와 연결된 (또는 연결되어 있을 가능성이 있는) 제로보드 아이디들을 받아온다.
                 $login_success = false;
-                $user_id_candidates = $this->getLegacyUserIDsFromOpenID($openid_identity);
+                $assoc_member_info = null;
 
+                $args->openid = $openid_identity;
+                $output = executeQuery('member.getMemberSrlByOpenID', $args);
+
+                if ($output->toBool() && !is_array($output->data)) {
+                    $member_srl = $output->data->member_srl;
+                    $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+                    if ($member_info) {
+                        $assoc_member_info = $member_info;
+                    }
+                }
+
+                $user_id_candidates = $this->getLegacyUserIDsFromOpenID($openid_identity);
                 $default_user_id = $user_id_candidates[0];
 
+                if ($assoc_member_info != null) {
+                    $user_id_candidates = array_merge(array($assoc_member_info->user_id), $user_id_candidates);
+                }
+
                 foreach($user_id_candidates as $user_id) {
                     $args->user_id = $args->nick_name = $user_id;
                     // 기본 정보들을 받음
@@ -184,6 +195,12 @@
 
 
                     if ($output->toBool()) {
+                        if ($assoc_member_info == null) {
+                            $logged_info = Context::get('logged_info');
+                            $args->member_srl = $logged_info->member_srl;
+                            $args->openid = $openid_identity;
+                            executeQuery('member.addOpenIDToMember', $args);
+                        }
                         $login_success = true;
                         break;
                     }
@@ -193,25 +210,30 @@
                 if(!$login_success) {
                     $args->user_id = $args->nick_name = $default_user_id;
                     $args->password = md5(getmicrotime());
+
                     $output = $this->insertMember($args);
                     if(!$output->toBool()) return $this->stop($output->getMessage());
                     $output = $this->doLogin($args->user_id);
                     if(!$output->toBool()) return $this->stop($output->getMessage());
+
+                    $logged_info = Context::get('logged_info');
+                    $args->member_srl = $logged_info->member_srl;
+                    $args->openid = $openid_identity;
+                    executeQuery('member.addOpenIDToMember', $args);
                 }
 
                 Context::close();
 
                 // 페이지 이동
-                if(Context::get('goto')){
+                if(Context::get('goto')) {
                     $goto = Context::get('goto');
                     header("location:" . $goto);	
-                }else{
+                } else {
                     header("location:./");	
                 }
                 
                 exit();
 
-
             // 인증 실패
             } else if($openid->IsError() == true) {
                 $error = $openid->GetError();
@@ -221,6 +243,82 @@
             }
         }
 
+        /**
+         * @brief 오픈아이디 연결 요청
+         **/
+        function procMemberAddOpenIDToMember() {
+            return $this->procMemberOpenIDLogin("procMemberValidateAddOpenIDToMember");
+        }
+
+        /**
+         * @brief 오픈아이디 연결 요청 마무리
+         **/
+        function procMemberValidateAddOpenIDToMember() {
+            $openid = $this->doOpenIDValidate($_GET['openid_identity']);
+            $openid_identity = $openid->GetIdentity();
+            $openid_validation_result = $openid->validation_result;
+
+            if ($openid_validation_result == true) {
+                $logged_info = Context::get('logged_info');
+                if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
+
+                $member_srl = $logged_info->member_srl;
+
+                $args->member_srl = $member_srl;
+                $args->openid = $openid_identity;
+
+                $output = executeQuery('member.addOpenIDToMember', $args);
+                if (!$output->toBool()) return $output;
+
+                Context::close();
+
+                if(Context::get('goto')){
+                    $goto = Context::get('goto');
+                    header("location:" . $goto);	
+                }else{
+                    header("location:./");	
+                }
+                exit();
+            } else if($openid->IsError() == true) {
+                $error = $openid->GetError();
+                return $this->stop($error['description']);
+            } else {
+                return $this->stop('invalid_authorization');
+            }
+        }
+
+        /**
+         * @brief 오픈아이디 연결 해제
+         **/
+        function procMemberDeleteOpenIDFromMember() {
+            $logged_info = Context::get('logged_info');
+            $openid_identity = Context::get('openid_to_delete');
+            $arg->openid = $openid_identity;
+            $result = executeQuery('member.getMemberSrlByOpenID', $arg);
+
+            if (!Context::get('is_logged')) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_logged');
+                return;
+            } else if (!$result->data || is_array($result->data)) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_founded');
+                return;
+            } else if ($result->data->member_srl != $logged_info->member_srl) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_permitted');
+                return;
+            }
+
+            $arg->openid = $openid_identity;
+
+            $output = executeQuery('member.deleteMemberOpenID', $arg);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_updated');
+        }
+
+
         /**
          * @brief 로그아웃
          **/
@@ -818,6 +916,7 @@
             if(!$email_address) return new Object(-1, 'msg_invalid_request');
 
             $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
 
             // 메일 주소에 해당하는 회원이 있는지 검사
             $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
@@ -846,8 +945,18 @@
             // 메일 내용을 구함
             Context::set('auth_args', $args);
             Context::set('member_info', $member_info);
+            
+            $member_config = $oModuleModel->getModuleConfig('member');
+            if(!$member_config->skin) $this->member_config->skin = "default";
+            if(!$member_config->colorset) $this->member_config->colorset = "white";
+
+            Context::set('member_config', $member_config);
+            
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+            
             $oTemplate = &TemplateHandler::getInstance();
-            $content = $oTemplate->compile($this->module_path.'tpl', 'find_member_account_mail');
+            $content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
 
             // 사이트 웹마스터 정보를 구함
             $oModuleModel = &getModel('module');
@@ -919,6 +1028,101 @@
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('msg_success_authed');
         }
+        
+        /**
+         * @brief 아이디/비밀번호 찾기 기능 실행
+         * 메일에 등록된 링크를 선택시 호출되는 method로 비밀번호를 바꾸고 인증을 시켜버림
+         **/
+        function procMemberUpdateAuthMail() {
+        	$member_srl = Context::get('member_srl');
+        	if(!$member_srl) return new Object(-1, 'msg_invalid_request');
+
+            $oMemberModel = &getModel('member');
+        	
+            // 회원의 정보를 가져옴
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+            
+            // 인증메일 재발송 요청이 가능한 상태의 회원인지 검사
+            if ($member_info->denied != 'Y') 
+                return new Object(-1, 'msg_invalid_request');
+            
+            $chk_args->member_srl = $member_srl;
+            $output = executeQuery('member.chkAuthMail', $chk_args);
+            if ($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+            
+            // 인증 DB에 데이터를 넣음
+            $auth_args->member_srl = $member_srl;
+            $auth_args->auth_key = md5(rand(0, 999999));
+
+            $output = executeQuery('member.updateAuthMail', $auth_args);
+            if (!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            // 메일 내용을 구함
+            Context::set('auth_args', $auth_args);
+            Context::set('member_info', $member_info);
+            
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            if(!$member_config->skin) $this->member_config->skin = "default";
+            if(!$member_config->colorset) $this->member_config->colorset = "white";
+
+            Context::set('member_config', $member_config);
+            
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+            
+            $oTemplate = &TemplateHandler::getInstance();
+            $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
+            
+            // 사이트 웹마스터 정보를 구함
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+
+            // 메일 발송
+            $oMail = new Mail();
+            $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+            $oMail->setContent($content);
+            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+            $oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+            $oMail->send();
+            
+            // 메세지 return
+            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
+            return new Object(-1, $msg);
+        }
+
+        /**
+         * @brief 가상 사이트 가입
+         **/
+        function procModuleSiteSignUp() {
+            $site_module_info = Context::get('site_module_info');
+            $logged_info = Context::get('logged_info');
+            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+
+            $oMemberModel = &getModel('member');
+            $default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl);
+            $this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
+            $groups[$default_group->group_srl] = $default_group->title;
+            $logged_info->group_list = $groups;
+        }
+
+        /**
+         * @brief 가상 사이트 탈퇴
+         **/
+        function procModuleSiteLeave() {
+            $site_module_info = Context::get('site_module_info');
+            $logged_info = Context::get('logged_info');
+            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+
+            $args->site_srl= $site_module_info->site_srl;
+            $args->member_srl = $logged_info->member_srl;
+            $output = executeQuery('member.deleteMembersGroup', $args);
+            if(!$output->toBool()) return $output;
+            $this->setMessage('success_deleted');
+        }
 
         /**
          * @brief 서명을 파일로 저장
@@ -959,10 +1163,15 @@
 
         /**
          * @brief 특정 회원들의 그룹을 일괄 변경
+         * 가상 사이트와 같이 한 회원이 하나의 그룹만 가질 경우 사용할 수 있음
          **/
         function replaceMemberGroup($args) {
             $obj->site_srl = $args->site_srl;
             $obj->member_srl = implode(',',$args->member_srl);
+
+            $output = executeQueryArray('member.getMembersGroup', $obj);
+            if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+
             $output = executeQuery('member.deleteMembersGroup', $obj);
             if(!$output->toBool()) return $output;
 
@@ -975,6 +1184,7 @@
                 $obj->member_srl = $val;
                 $obj->group_srl = $args->group_srl;
                 $obj->site_srl = $args->site_srl;
+                $obj->regdate = $date[$obj->member_srl];
                 $output = executeQuery('member.addMemberToGroup', $obj);
                 if(!$output->toBool()) return $output;
             }
@@ -1108,7 +1318,7 @@
             $_SESSION['is_admin'] = '';
 
             // 비밀번호는 세션에 저장되지 않도록 지워줌;;
-            unset($member_info->password);
+            //unset($member_info->password);
 
             // 사용자 그룹 설정
             /*
@@ -1273,8 +1483,18 @@
                 // 메일 내용을 구함
                 Context::set('auth_args', $auth_args);
                 Context::set('member_info', $args);
-                $oTemplate = &TemplateHandler::getInstance();
-                $content = $oTemplate->compile($this->module_path.'tpl', 'confirm_member_account_mail');
+                
+	            $member_config = $oModuleModel->getModuleConfig('member');
+	            if(!$member_config->skin) $this->member_config->skin = "default";
+	            if(!$member_config->colorset) $this->member_config->colorset = "white";
+	
+	            Context::set('member_config', $member_config);
+	            
+	            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+	            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+	            
+	            $oTemplate = &TemplateHandler::getInstance();
+                $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 
                 // 사이트 웹마스터 정보를 구함
                 $oModuleModel = &getModel('module');
@@ -1445,6 +1665,17 @@
                 return $output;
             }
 
+            //  member_openid에서 해당 항목들 삭제
+            $output = executeQuery('member.deleteMemberOpenIDByMemberSrl', $ags);
+
+            //  TODO: 테이블 업그레이드를 하지 않은 경우에 실패할 수 있다.
+            /*
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            */
+
             // member_group_member에서 해당 항목들 삭제
             $output = executeQuery('member.deleteMemberGroupMember', $args);
             if(!$output->toBool()) {
@@ -1487,6 +1718,8 @@
                 $_SESSION[$key] = '';
             }
             session_destroy();
+            setcookie(session_name(), '', time()-42000, '/');
+            setcookie('sso','',time()-42000, '/');
 
             if($_COOKIE['xeak']) {
                 $args->autologin_key = $_COOKIE['xeak'];
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 8e691295b..3ea6e44de 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -28,7 +28,7 @@
             $logged_info = Context::get('logged_info');
             $act = Context::get('cur_act');
 
-            // 자신의 아이디를 클릭한 경우 
+            // 자신의 아이디를 클릭한 경우
             if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
 
             // 다른 사람의 아이디를 클릭한 경우
@@ -55,7 +55,7 @@
             // 다른 사람의 아이디를 클릭한 경우
             if($member_srl != $logged_info->member_srl) {
 
-                // 메일 보내기 
+                // 메일 보내기
                 if($member_info->email_address) {
                     $url = 'mailto:'.$member_info->email_address;
                     $icon_path = './modules/member/tpl/images/icon_sendmail.gif';
@@ -64,11 +64,11 @@
             }
 
             // 홈페이지 보기
-            if($member_info->homepage) 
+            if($member_info->homepage)
                 $oMemberController->addMemberPopupMenu($member_info->homepage, 'homepage', './modules/member/tpl/images/icon_homepage.gif','blank');
 
             // 블로그 보기
-            if($member_info->blog) 
+            if($member_info->blog)
                 $oMemberController->addMemberPopupMenu($member_info->blog, 'blog', './modules/member/tpl/images/icon_blog.gif','blank');
 
             // trigger 호출 (after)
@@ -121,25 +121,28 @@
 
                 // site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정
                 $site_module_info = Context::get('site_module_info');
-                if($site_module_info) {
+                if($site_module_info->site_srl) {
                     $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
+
+                    // 사이트 관리자이면 로그인 정보에 is_site_admin bool변수를 추가
+                    $oModuleModel = &getModel('module');
+                    if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
+                    else $logged_info->is_site_admin = false;
+                } else {
+                    // 만약 기본 사이트인데 회원 그룹이 존재하지 않으면 등록
                     if(!count($logged_info->group_list)) {
-                        $default_group = $this->getDefaultGroup($site_module_info->site_srl);
+                        $default_group = $this->getDefaultGroup(0);
                         $oMemberController = &getController('member');
-                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
+                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, 0);
                         $groups[$default_group->group_srl] = $default_group->title;
                         $logged_info->group_list = $groups;
                     }
 
-                    $oModuleModel = &getModel('module');
-                    if($oModuleModel->isSiteAdmin()) $logged_info->is_site_admin = true;
-                    else $logged_info->is_site_admin = false;
-                } else {
                     $logged_info->is_site_admin = false;
                 }
 
                 $_SESSION['logged_info'] = $logged_info;
-                
+
                 return $logged_info;
             }
             return NULL;
@@ -153,10 +156,11 @@
 
             $args->user_id = $user_id;
             $output = executeQuery('member.getMemberInfo', $args);
-            if(!$output) return $output;
+            if(!$output->toBool()) return $output;
+            if(!$output->data) return;
 
             $member_info = $this->arrangeMemberInfo($output->data);
-            $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+
             return $member_info;
         }
 
@@ -165,32 +169,49 @@
          **/
         function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) {
             if(!$member_srl) return;
-            $args->member_srl = $member_srl;
-            $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
-            if(!$output) return $output;
 
-            $member_info = $this->arrangeMemberInfo($output->data);
-            $member_info->group_list = $this->getMemberGroups($member_info->member_srl, $site_srl);
-            return $member_info;
+            if(!$GLOBALS['__member_info__'][$member_srl]) {
+                $args->member_srl = $member_srl;
+                $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
+                if(!$output) return $output;
+
+                $this->arrangeMemberInfo($output->data, $site_srl);
+            }
+
+            return $GLOBALS['__member_info__'][$member_srl];
         }
 
         /**
          * @brief 사용자 정보 중 extra_vars와 기타 정보를 알맞게 편집
          **/
-        function arrangeMemberInfo($info) {
-            $info->profile_image = $this->getProfileImage($info->member_srl);
-            $info->image_name = $this->getImageName($info->member_srl);
-            $info->image_mark = $this->getImageMark($info->member_srl);
-            $info->signature = $this->getSignature($info->member_srl);
+        function arrangeMemberInfo($info, $site_srl = 0) {
+            if(!$GLOBALS['__member_info__'][$info->member_srl]) {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
 
-            $extra_vars = unserialize($info->extra_vars);
-            unset($info->extra_vars);
-            if(!$extra_vars) return $info;
-            foreach($extra_vars as $key => $val) {
-                if(preg_match('/\|\@\|/i', $val)) $val = explode('|@|', $val);
-                if(!$info->{$key}) $info->{$key} = $val;
+
+                $info->profile_image = $this->getProfileImage($info->member_srl);
+                $info->image_name = $this->getImageName($info->member_srl);
+                $info->image_mark = $this->getImageMark($info->member_srl);
+                if($config->group_image_mark=='Y'){
+                    $info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+                }
+                $info->signature = $this->getSignature($info->member_srl);
+                $info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
+
+                $extra_vars = unserialize($info->extra_vars);
+                unset($info->extra_vars);
+                if($extra_vars) {
+                    foreach($extra_vars as $key => $val) {
+                        if(preg_match('/\|\@\|/i', $val)) $val = explode('|@|', $val);
+                        if(!$info->{$key}) $info->{$key} = $val;
+                    }
+                }
+
+                $GLOBALS['__member_info__'][$info->member_srl] = $info;
             }
-            return $info;
+
+            return $GLOBALS['__member_info__'][$info->member_srl];
         }
 
         /**
@@ -305,17 +326,21 @@
          * @brief 그룹 목록을 가져옴
          **/
         function getGroups($site_srl = 0) {
-            $args->site_srl = $site_srl;
-            $output = executeQuery('member.getGroups', $args);
-            if(!$output->data) return;
+            if(!$GLOBALS['__group_info__'][$site_srl]) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('member.getGroups', $args);
+                if(!$output->data) return;
 
-            $group_list = $output->data;
-            if(!is_array($group_list)) $group_list = array($group_list);
+                $group_list = $output->data;
+                if(!is_array($group_list)) $group_list = array($group_list);
 
-            foreach($group_list as $val) {
-                $result[$val->group_srl] = $val;
+                foreach($group_list as $val) {
+                    $result[$val->group_srl] = $val;
+                }
+
+                $GLOBALS['__group_info__'][$site_srl] = $result;
             }
-            return $result;
+            return $GLOBALS['__group_info__'][$site_srl];
         }
 
         /**
@@ -481,7 +506,7 @@
         }
 
         /**
-         * @brief 프로필 이미지의 정보를 구함 
+         * @brief 프로필 이미지의 정보를 구함
          **/
         function getProfileImage($member_srl) {
             if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl])) {
@@ -538,9 +563,33 @@
                     $GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
                 } else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
             }
+
             return $GLOBALS['__member_info__']['image_mark'][$member_srl];
         }
 
+
+        /**
+         * @brief group의 이미지마크 정보를 구함
+         **/
+        function getGroupImageMark($member_srl,$site_srl=0) {
+           $member_group = $this->getMemberGroups($member_srl,$site_srl);
+
+           $groups_info = $this->getGroups($site_srl);
+           $image_mark = null;
+           if(count($member_group) > 0 && is_array($member_group)){
+               $group_srl = array_keys($member_group);
+               $image_mark = $groups_info[$group_srl[0]]->image_mark;
+           }
+           if($image_mark){
+                list($width, $height, $type, $attrs) = getimagesize($image_mark);
+                $info->width = $width;
+                $info->height = $height;
+                $info->src = $image_mark;
+                return $info;
+
+           }else return false;
+        }
+
         /**
          * @brief 사용자의 signature를 구함
          **/
@@ -577,5 +626,56 @@
 
             return false;
         }
+
+        /**
+         * @brief 멤버와 연결된 오픈아이디들을 모두 리턴한다.
+         **/
+        function getMemberOpenIDByMemberSrl($member_srl) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+
+            $result = array();
+            if ($config->enable_openid != 'Y') return $result;
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.getMemberOpenIDByMemberSrl', $args);
+
+            if (!$output->data) {
+            }
+            else if (is_array($output->data)) {
+                foreach($output->data as $row) {
+                    $result[] = $row;
+                }
+            }
+            else {
+                $result[] = $output->data;
+            }
+
+            foreach($result as $row) {
+                $openid = $row->openid;
+                $bookmarklet_header = "javascript:var%20U='";
+                $bookmarklet_footer = "';function%20Z(W){var%20X=/(openid|ident)/i;try{var%20F=W.frames;var%20E=W.document.getElementsByTagName('input');for(var%20i=0;i<E.length;i++){var%20A=E[i];if(A.type=='text'&&X.test(A.name)){if(!J)J=E[i]}if(A.name=='submit'){V=A}}for(var%20i=0;i<F.length;i++){Z(F[i]);}}catch(e){}}var%20J,V;Z(window);try{try{V.parentNode.removeChild(V);}catch(z){}J.value=U;J.form.submit();}catch(e){top.document.location.href=((/^https?:\/\//img).test(U)?'':'http://')+U;}";
+                $row->bookmarklet = $bookmarklet_header . $openid . $bookmarklet_footer;
+            }
+
+            return $result;
+        }
+
+        /**
+         * @brief 오픈아이디에 연결된 멤버를 리턴한다.
+         **/
+        function getMemberSrlByOpenID($openid) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+
+            if ($config->enable_openid != 'Y') return $result;
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.getMemberSrlByOpenID', $args);
+
+            if (!$output->data) return null;
+            return $output->data->member_srl;
+        }
+
     }
 ?>
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 775a75205..46669b3b4 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -58,6 +58,8 @@
 
             Context::set('member_info', $member_info);
             Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
+            if ($member_info->member_srl == $logged_info->member_srl)
+                Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
 
             $this->setTemplateFile('member_info');
         }
@@ -101,6 +103,8 @@
             // 추가 가입폼 목록을 받음
             Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
 
+            Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
+
             // 에디터 모듈의 getEditor를 호출하여 서명용으로 세팅
             if($member_info->member_srl) {
                 $oEditorModel = &getModel('editor');
@@ -144,8 +148,7 @@
             $oDocumentAdminView = &getAdminView('document');
             $oDocumentAdminView->dispDocumentAdminList();
 
-            Context::get('module_srl', $module_srl);
-
+            Context::set('module_srl', $module_srl);
             $this->setTemplateFile('document_list');
         }
 
diff --git a/modules/member/php-openid-1.2.3/Auth/OpenID/URINorm.php b/modules/member/php-openid-1.2.3/Auth/OpenID/URINorm.php
index d1c653ebe..aa33f0228 100644
--- a/modules/member/php-openid-1.2.3/Auth/OpenID/URINorm.php
+++ b/modules/member/php-openid-1.2.3/Auth/OpenID/URINorm.php
@@ -8,8 +8,7 @@
  * @copyright 2005 Janrain, Inc.
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
  */
-
-require_once 'Services/Yadis/Misc.php';
+require_once $this->module_path.'php-openid-1.2.3/Services/Yadis/Misc.php';
 
 // from appendix B of rfc 3986 (http://www.ietf.org/rfc/rfc3986.txt)
 function Auth_OpenID_getURIPattern()
diff --git a/modules/member/queries/addMemberToGroup.xml b/modules/member/queries/addMemberToGroup.xml
index 3f8838e93..781916e15 100644
--- a/modules/member/queries/addMemberToGroup.xml
+++ b/modules/member/queries/addMemberToGroup.xml
@@ -6,6 +6,6 @@
         <column name="group_srl" var="group_srl" notnull="notnull" />
         <column name="member_srl" var="member_srl" notnull="notnull" />
         <column name="site_srl" var="site_srl" default="0" />
-        <column name="regdate" default="curdate()" />
+        <column name="regdate" var="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/member/queries/addOpenIDToMember.xml b/modules/member/queries/addOpenIDToMember.xml
new file mode 100644
index 000000000..b1df941a4
--- /dev/null
+++ b/modules/member/queries/addOpenIDToMember.xml
@@ -0,0 +1,10 @@
+<query id="addOpenIDToMember" action="insert">
+    <tables>
+        <table name="member_openid" />
+    </tables>
+    <columns>
+        <column name="openid" var="openid" notnull="notnull" />
+        <column name="member_srl" var="member_srl" notnull="notnull" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/member/queries/deleteMemberOpenID.xml b/modules/member/queries/deleteMemberOpenID.xml
new file mode 100644
index 000000000..6d835b240
--- /dev/null
+++ b/modules/member/queries/deleteMemberOpenID.xml
@@ -0,0 +1,8 @@
+<query id="deleteMemberOpenID" action="delete">
+    <tables>
+        <table name="member_openid" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="openid" var="openid" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/deleteMemberOpenIDByMemberSrl.xml b/modules/member/queries/deleteMemberOpenIDByMemberSrl.xml
new file mode 100644
index 000000000..bc7a0a72d
--- /dev/null
+++ b/modules/member/queries/deleteMemberOpenIDByMemberSrl.xml
@@ -0,0 +1,8 @@
+<query id="deleteMemberOpenIDByMemberSrl" action="delete">
+    <tables>
+        <table name="member_openid" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/getMemberOpenIDByMemberSrl.xml b/modules/member/queries/getMemberOpenIDByMemberSrl.xml
new file mode 100644
index 000000000..b672b194f
--- /dev/null
+++ b/modules/member/queries/getMemberOpenIDByMemberSrl.xml
@@ -0,0 +1,14 @@
+<query id="getMemberOpenIDByMemberSrl" action="select">
+    <tables>
+        <table name="member_openid" />
+    </tables>
+    <columns>
+        <column name="openid" />
+    </columns>
+    <navigation>
+        <index var="sort_index" default="regdate" order="asc" />
+    </navigation>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/getMemberSrlByOpenID.xml b/modules/member/queries/getMemberSrlByOpenID.xml
new file mode 100644
index 000000000..1a88ee38d
--- /dev/null
+++ b/modules/member/queries/getMemberSrlByOpenID.xml
@@ -0,0 +1,11 @@
+<query id="getMemberSrlByOpenID" action="select">
+    <tables>
+        <table name="member_openid" />
+    </tables>
+    <columns>
+        <column name="member_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="openid" var="openid" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/getMembersGroup.xml b/modules/member/queries/getMembersGroup.xml
new file mode 100644
index 000000000..5e61c9c98
--- /dev/null
+++ b/modules/member/queries/getMembersGroup.xml
@@ -0,0 +1,16 @@
+<query id="getMembersGroup" action="select">
+    <tables>
+        <table name="member_group" alias="a"/>
+        <table name="member_group_member" alias="b"/>
+    </tables>
+    <columns>
+        <column name="a.group_srl" alias="group_srl" />
+        <column name="b.member_srl" alias="member_srl" />
+        <column name="b.regdate" alias="regdate" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="b.member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="b.group_srl" default="a.group_srl" pipe="and" />
+        <condition operation="equal" column="a.site_srl" var="site_srl" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/insertGroup.xml b/modules/member/queries/insertGroup.xml
index 03a213862..938dc6e31 100644
--- a/modules/member/queries/insertGroup.xml
+++ b/modules/member/queries/insertGroup.xml
@@ -10,5 +10,6 @@
         <column name="is_admin" var="is_admin" default="N" notnull="notnull" />
         <column name="regdate" default="curdate()" />
         <column name="description" var="description" default="" />
+        <column name="image_mark" var="image_mark" default="" />
     </columns>
 </query>
diff --git a/modules/member/queries/updateAuthMail.xml b/modules/member/queries/updateAuthMail.xml
new file mode 100644
index 000000000..0f39e103d
--- /dev/null
+++ b/modules/member/queries/updateAuthMail.xml
@@ -0,0 +1,13 @@
+<query id="updateAuthMail" action="update">
+    <tables>
+        <table name="member_auth_mail" />
+    </tables>
+    <columns>
+        <column name="member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <column name="auth_key" var="auth_key" notnull="notnull" minlength="1" maxlength="60" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number"/>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/member/queries/updateGroup.xml b/modules/member/queries/updateGroup.xml
index b4a4b7196..d69e1a304 100644
--- a/modules/member/queries/updateGroup.xml
+++ b/modules/member/queries/updateGroup.xml
@@ -6,6 +6,7 @@
         <column name="title" var="title" notnull="notnull" />
         <column name="is_default" var="is_default" default="N" notnull="notnull" />
         <column name="description" var="description" default="" />
+        <column name="image_mark" var="image_mark" default="" />
     </columns>
     <conditions>
         <condition operation="equal" column="group_srl" var="group_srl" notnull="notnull" filter="number" />
diff --git a/modules/member/schemas/member_group.xml b/modules/member/schemas/member_group.xml
index 1f35c7321..bd5d42808 100644
--- a/modules/member/schemas/member_group.xml
+++ b/modules/member/schemas/member_group.xml
@@ -5,5 +5,6 @@
     <column name="regdate" type="date" />
     <column name="is_default" type="char" default="N" />
     <column name="is_admin" type="char" default="N" />
+    <column name="image_mark" type="text" />
     <column name="description" type="text" />
 </table>
diff --git a/modules/member/schemas/member_openid.xml b/modules/member/schemas/member_openid.xml
new file mode 100644
index 000000000..0eef7c59e
--- /dev/null
+++ b/modules/member/schemas/member_openid.xml
@@ -0,0 +1,5 @@
+<table name="member_openid">
+    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
+    <column name="openid" type="varchar" size="80" notnull="notnull" unique="unique_openid" />
+    <column name="regdate" type="date" index="idx_regdate" />
+</table>
diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html
index 9479fa329..cfce1d9ee 100644
--- a/modules/member/skins/default/common_header.html
+++ b/modules/member/skins/default/common_header.html
@@ -1,35 +1,12 @@
 <!--%import("js/member.js")-->
-
-<!--%import("css/common.css")-->
-<!--@if($member_config->colorset=="purple")-->
-    <!--%import("css/purple.css")-->
-<!--@elseif($member_config->colorset=="green")-->
-    <!--%import("css/green.css")-->
-<!--@elseif($member_config->colorset=="red")-->
-    <!--%import("css/red.css")-->
-<!--@elseif($member_config->colorset=="cyan")-->
-    <!--%import("css/cyan.css")-->
-<!--@elseif($member_config->colorset=="black")-->
-    <!--%import("css/black.css")-->
-<!--@else-->
-    <!--%import("css/white.css")-->
-<!--@end-->
+<!--%import("css/default.css")-->
 
 <div id="memberModule">
 
-    <!--@if($member_title)-->
-    <div class="boardHeader">
-        <h3>{$member_title}</h3>
-
-        <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
-        <div class="member_option">
-            <select name="act" id="selected_act">
-                <!--@foreach($logged_info->menu_list as $key => $val)-->
-                <option value="{$key}" <!--@if($key == $act)-->selected="selected"<!--@end-->>{Context::getLang($val)}</option>
-                <!--@end-->
-            </select>
-            <a href="#" onclick="location.href=current_url.setQuery('act', xGetElementById('selected_act').options[xGetElementById('selected_act').selectedIndex].value); return false;"><img src="./images/button_go.gif" border="0" alt="" class="button_go" /></a>
-        </div>
+    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
+    <ul class="localNavigation">
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+        <li <!--@if($key == $act)-->class="on"<!--@end-->><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
         <!--@end-->
-    </div>
-    <!--@end-->
\ No newline at end of file
+    </ul>
+    <!--@end-->
diff --git a/modules/member/tpl/confirm_member_account_mail.html b/modules/member/skins/default/confirm_member_account_mail.html
similarity index 100%
rename from modules/member/tpl/confirm_member_account_mail.html
rename to modules/member/skins/default/confirm_member_account_mail.html
diff --git a/modules/member/skins/default/css/black.css b/modules/member/skins/default/css/black.css
deleted file mode 100644
index 4ce4c6b67..000000000
--- a/modules/member/skins/default/css/black.css
+++ /dev/null
@@ -1,56 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border:none; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-/* button */
-a.button,
-a.button span,
-span.button,
-span.button button,
-span.button input { background-image:url(../../../../../common/tpl/images/buttonBlack.gif); color:#fff;}
-
-.inputTypeText { background-color:transparent !important; color:#AAAAAA !important; }
-.inputTypeText:hover, .inputTypeText:focus { background-color:transparent; color:#AAAAAA; }
-
-/* replace color */
-.memberSmallBox { border:1px solid #888888; }
-.memberSmallBox .header { background:transparent url("../images/black/bgH3.gif") no-repeat left bottom; }
-.memberSmallBox .header h3 { background:transparent url("../images/black/lineH3.gif") no-repeat right bottom; color:#888888; border-bottom:3px solid #888888; }
-.memberSmallBox .openid_user_id { color:#AAAAAA; background:transparent url("../images/black/openid_input_bg.gif") no-repeat left 50% !important; }
-.memberSmallBox .help { background-color:transparent; }
-
-.memberInfoTable { border:1px solid #444; }
-.memberInfoTable tr.first-child th, .memberInfoTable tr.first-child td { background-color:transparent; color:#AAAAAA; }
-.memberInfoTable tr th, .memberInfoTable tr td { border-top:1px solid #444; background-color:transparent; color:#AAAAAA; }
-.memberInfoTable td { border-left:1px solid #444; }
-.memberInfoTable td input { background-color:transparent; color:#AAAAAA; }
-.memberInfoTable caption  { color:#AAAAAA; }
-div.checkValue { color:#BBBBBB !important; }
-
-.boardHeader { border:1px solid #888888; }
-.boardHeader { background:transparent url("../images/black/bgH3.gif") no-repeat left bottom; }
-.boardHeader h3 { border:none; background:transparent url("../images/black/lineH3.gif") no-repeat right bottom; color:#888888; border-bottom:3px solid #888888; }
-
-table.list { border:1px solid #000000 !important; }
-table.list th { background:#282829 url("../images/black/lineBoardListTh.gif") no-repeat left bottom; border:1px solid #444444 !important; color:#AAAAAA; }
-table.list tr { background-color:transparent !important; }
-table.list tr td.title { color:#BBBBBB !important; }
-table.list tr td.title a { color:#BBBBBB !important; }
-table.list tr td { border-top:1px solid #888888 !important; }
-table .list tr td, table.list tr td * { color:#BBBBBB; }
-
-/* Pagination*/
-.pagination a, .pagination strong{ color:#888; }
-.pagination a:hover, .pagination a:active, .pagination a:focus{ background-color:#555 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination.a1 a, .pagination.a1 strong{ background:#000; border-left:1px solid #555; border-right:1px solid #666; color:#888;}
-.pagination.a1 a.prev, .pagination.a1 a.prevEnd, .pagination.a1 a.next, .pagination.a1 a.nextEnd { background:#000; }
-
-.pagination.a2 a, .pagination.a2 strong{ background:#000; border-left:1px solid #555; border-right:1px solid #666; color:#888; }
-.pagination.a2 a.prev, .pagination.a2 a.prevEnd, .pagination.a2 a.next, .pagination.a2 a.nextEnd { background:#000; }
-
-.memberSmallBox .leftHeaderType th { background:transparent; color:#AAAAAA; }
-.memberSmallBox .leftHeaderType td { color:#AAAAAA; }
-
-#popup_content { background-color:#000000; }
diff --git a/modules/member/skins/default/css/common.css b/modules/member/skins/default/css/common.css
deleted file mode 100644
index 15c2e9d22..000000000
--- a/modules/member/skins/default/css/common.css
+++ /dev/null
@@ -1,235 +0,0 @@
-@charset "utf-8";
-
-/* common */
-.memberSmallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
-.memberSmallBox fieldset { border:0; margin:0; }
-
-.memberSmallBox.w400 { width:400px;}
-.memberSmallBox.w500 { width:500px;}
-
-.memberSmallBox.w400pop { width:400px; margin:0; padding:0;}
-.memberSmallBox.w500pop { width:500px; margin:0; padding:0;}
-.memberSmallBox.w600pop { width:600px; margin:0; padding:0;}
-
-.memberSmallBox .header { position:relative; _width:100%; background:#ffffff url(../images/common/bgH3.gif) no-repeat left bottom; overflow:hidden;}
-
-.boardInformation { font:normal 11px Tahoma; width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666; height:28px;}
-.boardInformation strong { font:bold 11px Tahoma; color:#ff6600;}
-
-.boardHeader { position:relative; _width:100%; border-top:1px solid #e1e1dd; border-bottom:none; background:#ffffff url(../images/common/bgH3.gif) no-repeat right bottom; overflow:hidden;}
-.boardHeader .member_option { float:right; position:relative; top:0.5em; right:1em; }
-.boardHeader select { vertical-align:bottom; }
-.boardHeader input { vertical-align:bottom; _padding-bottom:1px;}
-.boardHeader .essential { position:absolute; top:1.5em; right:1em; color:#54564b; font-size:.9em;}
-.boardHeader .essential:first-letter { color:#ff0000;}
-
-/* list */
-.list { width:100%; border:1px solid #e0e1db; }
-
-.list thead tr th { width:10px; padding:8px !important; }
-.list thead tr th div { white-space:nowrap; margin:0;}
-.list thead tr th.wide { width:100%; }
-.list thead tr th.half_wide { width:50%; }
-.list tbody tr td { white-space:normal; padding:5px; }
-.list tbody tr td.nowrap { white-space:nowrap !important; }
-
-.list tr:first-child td, .list tr.first-child td { border-top:1px solid #e0e1db; white-space:nowrap;}
-.list tr.bg1 { background:#ffffff}
-.list tr.bg2 { background:#fbfbfb;}
-.list th { color:#3e3f3e; font-weight:white; border-bottom:1px solid #ffffff;  background:#ffffff url(../images/common/lineBoardListTh.gif) no-repeat left bottom; white-space:nowrap;}
-.list th a { color:#3e3f3e;}
-.list th:first-child, .list th.first-child { background-position:-3px bottom; border-left:1px solid #ffffff;}
-.list th select, .list th input { vertical-align:middle;}
-.list td { border-top:1px solid #eff0ed; }
-.list td.registDate { font:.8em Tahoma; color:#999999; text-align:center;}
-.list td.num { font:.8em Tahoma; color:#999999; text-align:center;}
-.list td.check { text-align:center;}
-.list td.user { color:#333333; font-size:.9em; text-align:left;}
-.list td.user a { color:#333333;}
-.list td.userId { font:.9em Tahoma;}
-.list td.userNick { font-size:.9em; color:#999999;}
-.list td.sendMessage { text-align:center; padding:0;}
-.list td.sendMessage .buttonFixedLeft { float:left; position:relative; margin-left:1em;}
-.list td input { _margin:-3px;}
-.list td.title { text-align:left; }
-.list td.title.bold { font-size:1.2em; font-weight:bold;}
-.list td.title.bold a { position:relative; top:.3em;}
-.list td.title * { vertical-align:middle;} 
-.list td.title, .list td.title a { color:#444444; text-decoration:none;}
-.list td.title a:visited { color:#777777; text-decoration:none;}
-.list td.checkDate { font:.8em Tahoma; color:#333333; text-align:center;}
-.list td.subject { font-size:1em; text-align:left; color:#555555; }
-.list td.subject a { text-decoration:none; color:#555555; }
-.memberSelect { margin-top:2px; }
-
-.saved_content { margin-top:1em; padding-top:1em; border-top:1px dotted #DDDDDD; }
-
-/* login */
-.memberSmallBox .login { border:none; padding:2em 0 1.5em 2em;}
-.memberSmallBox .login legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
-.memberSmallBox .login dl { margin:0; padding:0; overflow:hidden; float:left; margin-right:10px; width:250px;}
-.memberSmallBox .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px;}
-.memberSmallBox .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; }
-.memberSmallBox .login .keep { clear:both; white-space:nowrap; margin-left:100px;}
-.memberSmallBox .login .keep input { vertical-align:middle;}
-.memberSmallBox .login .keep label { margin:0; padding:0; font-size:11px; color:#999999;}
-.memberSmallBox .openid_user_id { background: url(../images/openid_input_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;}
-.memberSmallBox .help { background:#f5f5f3; color:#666666; border-top:1px solid #eaebe7; overflow:hidden; padding:1.1em; }
-
-/* logout */
-.memberSmallBox .text { color:#54564b; text-align:center; padding:4em 2em 5em 2em;}
-.memberSmallBox .text p { margin:0; padding:0; margin-bottom:.5em;}
-
-/* friend */
-.friendNum { float:left; background:url(../images/common/iconFriend.gif) no-repeat .5em .4em; padding:.4em 0 0 2em;}
-.friendNum strong { font:bold 11px Tahoma; color:#ff6600;}
-
-/* message */
-.readMessage { border:1px solid #e0e1db; border-top:none; margin-bottom:2em;}
-.readMessage .messageHeader { padding:1.5em; height:1em; overflow:hidden;}
-.readMessage .messageHeader h4 { margin:0; padding:0; float:left; padding-left:.5em; font-size:1em; background:url(../images/common/iconArrow99.gif) no-repeat left .3em;}
-.readMessage .messageHeader address { float:right; white-space:nowrap;}
-.readMessage .messageHeader address em { font-size:1em; font-style:white; color:#333333; margin-right:.3em; float:left;}
-.readMessage .messageHeader address em a { color:#333333;}
-.readMessage .messageHeader address .date { font:.8em Tahoma; color:#999999; margin-left:10px;}
-.readMessage .messageBody { border:1px solid #e0e1db; margin:0 1.5em 1.5em 1.5em; padding:1em; color:#666666;}
-.readMessage .deleteOrKeep { padding:.5em 0; overflow:hidden; background:#f5f5f3; border-top:1px solid #eaebe7; _width:100%;}
-.messageSetup { float:left; overflow:hidden; }
-.instantMessage { float:right; overflow:hidden;}
-.instantMessage li { float:left; padding:0 .8em 0 .8em; margin-left:-1px; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left center; list-style:none; }
-.instantMessage li a { text-decoration:none; display:block; float:left; height:1em; height:1.1em; overflow:hidden; font-size:1em; white-space:nowrap; color:#666666; padding-left:1.8em; background:url(../images/common/iconInstantMessage.gif) no-repeat left top;}
-.instantMessage li.on a { background-position:left -14px; font-weight:bold;}
-.instantMessage li a strong { color:#ff6600;}
-
-/* member info */
-.memberInfoTable { width:100%; border:1px solid #e0e1db; margin-bottom:10px;}
-.memberInfoTable caption { padding:2em 0 .5em 1.5em; font-weight:bold; text-align:left; background:url(../images/common/iconH3.gif) no-repeat .5em 2em;}
-.memberInfoTable tr.first-child th, .memberInfoTable tr.first-child td { border-top:none;}
-.memberInfoTable th, .memberInfoTable td { border-top:1px solid #eaebe7; padding:.5em;}
-.memberInfoTable th { background:#f5f5f3; text-align:left; padding:.5em 1em;}
-.memberInfoTable td { border-left:1px solid #eaebe7; background:#fff;}
-.memberInfoTable td input { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1em; line-height:1em; background:#fbfbfb; vertical-align:middle; margin-right:.5em; margin-bottom:.5em; color:#666666;}
-.memberInfoTable td input.radio, .memberInfoTable td input.check { border:none; padding:0; margin:0; background:none; margin-top:.4em;}
-.memberInfoTable td input.w4em { width:4em;}
-.memberInfoTable td input.w2em { width:2em;}
-.memberInfoTable td select { margin-right:.5em;}
-.memberInfoTable td checkbox { border:0; }
-.memberInfoTable td .fl { margin-right:.5em;}
-.memberInfoTable td br { clear:both;}
-.memberInfoTable td p { clear:both; margin:0; padding:0; font-size:.9em; color:#999999; padding-top:.5em; margin-right:.5em;}
-.memberInfoTable td label { color:#3f4040; padding-top:.3em; margin-right:.5em;}
-.memberInfoTable td ul { list-style:none; }
-.memberInfoTable td .checkbox { border:none; }
-
-/* 아이디, 이름, 이메일 주소 중복 체크후 중복되면 출력되는 메세지의 className */
-.memberInfoTable td .checkValue { margin-top:5px; font-weight:bold; color:#444444; }
-
-/* modify/ insert member info */
-.memberImage { clear:both; }
-.memberImage .info { margin-bottom:1.5em; float:left; margin-right:1em;}
-.memberImage .form { float:left; }
-.memberImage .form input { height:1.5em; margin:0 .3em 0 0; padding:0;}
-
-.checkbox li {  float:left; margin-right:2em; }
-.checkbox li input {  border:none; } 
-
-.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; }
-
-.krZip .address2 { clear:both; margin-top:10px;}
-
-.extendDesc { clear:both; margin-top:0; font-size:.9em; color:#999999; }
-
-.extendPublic { clear:both; margin-top:5px; padding:0; font-size:.9em; color:#999999; }
-.extendPublic input { padding:0; margin:0; }
-
-.publicItem { display:block; margin-top:5px;}
-.publicItem input { margin:0; padding:0;}
-.publicItem label { font-weight:normal; margin:0; padding:0; color:#666666;}
-span.publicItem { display:inline; margin:0; font-weight:normal; color:#666666; }
-span.privateItem { display:inline; margin:0; font-weight:normal; color:#666666; }
-
-.agreementBox { border:1px solid #AAAAAA; margin:.5em 0 0 0; padding:1em; border-bottom:none; height:200px; overflow-y:scroll;}
-.agreementButton { background-color:#EEEEEE; padding:1em; border:1px solid #AAAAAA; border-top:none;}
-
-/* popup common */
-.memberSmallBox .complex { padding:1.5em 2em 2em 2em;}
-.memberSmallBox .leftHeaderType { border-top:1px solid #e0e1db; border-left:1px solid #e0e1db; width:100%;}
-.memberSmallBox .leftHeaderType th, .memberSmallBox .leftHeaderType td { border-right:1px solid #e0e1db; border-bottom:1px solid #e0e1db; padding:.8em 1em .6em 1em;}
-.memberSmallBox .leftHeaderType th { color:#333333; text-align:left; background:#f5f5f3;}
-.memberSmallBox .leftHeaderType td { color:#444444;}
-.memberSmallBox .group { border:1px solid #e0e1db; border-width:1px 0; overflow:hidden; padding:.5em 0; margin-top:.7em; height:23px;}
-.memberSmallBox .group select { width:11em; margin-top:1px;}
-.memberSmallBox .editor { margin:10px 0 0 0; _height:400px; }
-
-/* password change */
-.memberSmallBox .pwModify { border:none;}
-.memberSmallBox .pwModify legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;}
-.memberSmallBox .pwModify input { width:9em;}
-.memberSmallBox .pwModify br { display:block; margin-bottom:.2em}
-.memberSmallBox .pwModify p { margin:0; padding:0; text-align:center; margin-top:1em; color:#54564b;}
-
-/* Own Document */
-img.button_go { position:relative; bottom:-4px; }
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/common/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/common/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-.pagination.a2 a,
-.pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-.pagination.a2 a.prev{ padding-left:10px; background:#fff url(../images/common/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../images/common/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a2 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
-.pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-.pagination.b1 a,
-.pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-.pagination.b1 a.prev{ padding-left:16px; background:url(../images/common/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b1 a.next{ padding-right:16px; background:url(../images/common/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-.pagination.b2 a,
-.pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-.pagination.b2 a.prev{ padding-left:12px; background:url(../images/common/arrowPrevB1.gif) no-repeat left center; }
-.pagination.b2 a.next{ padding-right:12px; background:url(../images/common/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-.pagination.c1 a,
-.pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-.pagination.c1 a.prev,
-.pagination.c1 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c1 a.prev{ background:url(../images/common/arrowPrevC1.gif) no-repeat center;}
-.pagination.c1 a.next{ background:url(../images/common/arrowNextC1.gif) no-repeat center;}
-.pagination.c1 a.prev span,
-.pagination.c1 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-.pagination.c2 a,
-.pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-.pagination.c2 a.prev,
-.pagination.c2 a.next{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-.pagination.c2 a.prev{ background:url(../images/common/arrowPrevC1.gif) no-repeat center;}
-.pagination.c2 a.next{ background:url(../images/common/arrowNextC1.gif) no-repeat center;}
-.pagination.c2 a.prev span,
-.pagination.c2 a.next span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
diff --git a/modules/member/skins/default/css/cyan.css b/modules/member/skins/default/css/cyan.css
deleted file mode 100644
index b7a0567ae..000000000
--- a/modules/member/skins/default/css/cyan.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #2895c0; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/member/skins/default/css/default.css b/modules/member/skins/default/css/default.css
new file mode 100644
index 000000000..909eac4c7
--- /dev/null
+++ b/modules/member/skins/default/css/default.css
@@ -0,0 +1,121 @@
+@charset "utf-8";
+
+#memberModule h3 {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
+#memberModule h4 {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
+#memberModule h4 span.vr { font-size:11px; color:#AAA; }
+#memberModule h4 a.view { font-size:11px; font-family:vertical; color:#777e86; }
+#memberModule p.summary, 
+#memberModule div.infoText { margin:0 0 15px 0; line-height:1.6;}
+#memberModule p.summary{ color:#888;}
+#memberModule p.summary a { text-decoration:none; color:#888; }
+#memberModule p.summary.red { color:#A54D4D; }
+#memberModule p.summary.red a { text-decoration:none; color:#A54D4D; }
+#memberModule div.infoText { color:#888;}
+
+#memberModule .agreementBox { border:1px solid #CCC; margin:10px 0 0 0; padding:10px; border-bottom:none; height:200px; overflow-y:scroll;}
+#memberModule .agreementButton { background-color:#EFEFEF; padding:10px; border:1px solid #CCC; border-top:none; margin-bottom:10px;}
+
+#memberModule .localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; }
+#memberModule .localNavigation:after {content:""; display:block; clear:both;}
+#memberModule .localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
+#memberModule .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x;}
+#memberModule .localNavigation li a{ text-decoration:none !important; color:#666;}
+#memberModule .localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
+#memberModule .localNavigation li.on { margin-bottom:-1px;}
+#memberModule .localNavigation li.on a{ height:19px; background:none;}
+
+#memberModule .layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
+#memberModule .layer * { margin:0; padding:0; font-size:12px; }
+#memberModule .layer h4 { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
+#memberModule .layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
+#memberModule .layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
+#memberModule .layer .layerBody{ margin:15px;}
+
+#memberModule .crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+#memberModule .crossTable th div { white-space:nowrap; }
+#memberModule .crossTable th,
+#memberModule .crossTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
+#memberModule .crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+#memberModule .crossTable thead th:first-child{ background-image:none;}
+#memberModule .crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
+#memberModule .crossTable td{ border-bottom:1px solid #f0f0f0;}
+
+#memberModule .colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
+#memberModule .colTable th div { white-space:nowrap; }
+#memberModule .colTable th,
+#memberModule .colTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
+#memberModule .colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
+#memberModule .colTable th:first-child{ background-image:none;}
+#memberModule .colTable td{ border-bottom:1px solid #f0f0f0;}
+
+#memberModule .rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
+#memberModule .rowTable th div { white-space:nowrap; }
+#memberModule .rowTable th,
+#memberModule .rowTable td{ border:0; padding:10px 10px; text-align:left; vertical-align:top; font-weight:normal;}
+#memberModule .rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
+#memberModule .rowTable td{ border-bottom:1px solid #e5e5e5;}
+
+#memberModule .rowTable th.button, 
+#memberModule .colTable th.button, 
+#memberModule .crossTable th.button { text-align:right; background:#EAEAEA; }
+
+#memberModule .colTable td a,
+#memberModule .rowTable td a,
+#memberModule .crossTable td a { color:#000; text-decoration:none; }
+
+#memberModule .colTable td.wide, 
+#memberModule .rowTable td.wide, 
+#memberModule .crossTable td.wide { width:100%;}
+
+#memberModule .rowTable th.title,
+#memberModule .crossTable th.title,
+#memberModule .colTable th.title { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
+
+#memberModule p { color:#AAA; margin:3px 0 0 0; padding:0;}
+#dummy_check_nick_name { color:red; margin:3px 0 0 0; padding:0; }
+#memberModule .require { color:red; font-size:10px; font-family:tahoma; font-weight:bold; margin-left:5px; }
+#memberModule .publicItem { margin:5px 0 0 0; padding:0; color:#aaa; }
+#memberModule .publicItem input { padding:0; margin: 0; }
+
+#memberModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
+
+#memberModule td.openids div { float:left; margin-right:10px; margin-bottom:10px; }
+#memberModule td.openids div a { color:#AAA; text-decoration:none;}
+#memberModule .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:200px;}
+#memberModule .insertOpenID { clear:both; margin-top:10px; }
+#memberModule .savedContent { margin-top:10px; border:1px solid #EEE; padding:10px; }
+
+#memberModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
+#memberModule .pagination *{ margin:0; padding:0;}
+#memberModule .pagination img{ border:0;}
+#memberModule .pagination a,
+#memberModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+#memberModule .pagination a:hover,
+#memberModule .pagination a:active,
+#memberModule .pagination a:focus{ background-color:#f4f4f4 !important; }
+#memberModule .pagination strong{ color:#ff6600 !important;}
+#memberModule .pagination a.prev,
+#memberModule .pagination a.prevEnd,
+#memberModule .pagination a.next,
+#memberModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+#memberModule .pagination.a1 a,
+#memberModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+#memberModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
+#memberModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
+#memberModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
+#memberModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
+
+#memberModule .memberSmallBox { border:1px solid #EFEFEF; margin:50px auto 20px auto; padding:0; width:400px;}
+#memberModule .memberSmallBox .header { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
+#memberModule fieldset { position:relative; border:0; margin:0; padding:10px;}
+#memberModule .memberSmallBox .login dl { margin:0; padding:0; overflow:hidden; margin-right:10px; width:250px;}
+#memberModule .memberSmallBox .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px; text-indent:10px;}
+#memberModule .memberSmallBox .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; }
+#memberModule .memberSmallBox .login .keep { clear:both; white-space:nowrap; margin-left:100px;}
+#memberModule .memberSmallBox .login .keep input { vertical-align:middle;}
+#memberModule .memberSmallBox .login .keep label { margin:0; padding:0; font-size:12px; color:#999999;}
+#memberModule .memberSmallBox .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;}
+#memberModule .memberSmallBox .help { background:#f5f5f3; color:#666666; border-top:1px solid #eaebe7; overflow:hidden; padding:1.1em; color:#ccc;}
+#memberModule .memberSmallBox .help a{ color:#666; text-decoration:underline;}
+#memberModule .memberSmallBox .buttonArea{ position:absolute; top:10px; left:260px;}
diff --git a/modules/member/skins/default/css/green.css b/modules/member/skins/default/css/green.css
deleted file mode 100644
index 68325b48a..000000000
--- a/modules/member/skins/default/css/green.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d0dbd1; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #38b549; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/member/skins/default/css/purple.css b/modules/member/skins/default/css/purple.css
deleted file mode 100644
index 79dd2e074..000000000
--- a/modules/member/skins/default/css/purple.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #d1d9db; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #ac19a9; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/member/skins/default/css/red.css b/modules/member/skins/default/css/red.css
deleted file mode 100644
index 12c08b486..000000000
--- a/modules/member/skins/default/css/red.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
diff --git a/modules/member/skins/default/css/white.css b/modules/member/skins/default/css/white.css
deleted file mode 100644
index a78b5fbdc..000000000
--- a/modules/member/skins/default/css/white.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "utf-8";
-.boardHeader h3 { margin:0; padding:0; float:left; clear:both; font-size:1.2em; padding:1em 2em .7em 1.2em; border:none; border-left:1px solid #e1e1dd; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
-.memberSmallBox .header h3 { margin:0; border:none; float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border:none; border-bottom:3px solid #fe3614; background:url(../images/common/lineH3.gif) no-repeat right bottom;}
-
diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html
index 89e2652dd..29f6639aa 100644
--- a/modules/member/skins/default/document_list.html
+++ b/modules/member/skins/default/document_list.html
@@ -1,40 +1,31 @@
-{@ $member_title = $lang->cmd_view_own_document }
 <!--#include("./common_header.html")-->
 
-<!-- 정보 -->
-<div class="boardInformation">
-    Total : <strong>{number_format($total_count)}</strong>, 
-    Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+<h3>{$member_title = $lang->cmd_view_own_document }</h3>
+
+<!-- 모듈 선택 -->
+<div class="fr gap1">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="small button green"><span>{$lang->cmd_find_module}</span></a>
+    <!--@if($selected_module_srl)--><a href="{getUrl('selected_module_srl','')}" class="small button red"><span>{$lang->cmd_cancel}</span></a><!--@end-->
 </div>
 
 <!-- 목록 -->
-<table cellspacing="0" class="list">
+<table cellspacing="0" class="colTable">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="wide">
-            <div>
-                <select name="module_srl" class="mid_list" id="selected_module_srl">
-                    <option value="">{$lang->total}</option>
-                    <!--@foreach($mid_list as $key => $val)-->
-                    <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
-                    <!--@end-->
-                </select><a href="#" onclick="location.href=current_url.setQuery('selected_module_srl',xGetElementById('selected_module_srl').options[xGetElementById('selected_module_srl').selectedIndex].value);return false;"><img src="./images/button_go.gif" border="0" alt="" class="button_go" /></a>
-            </div>
-        </th>
-        <th scope="col"><div>{$lang->readed_count}</div></th>
-        <th scope="col"><div>{$lang->voted_count}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
+        <th class="title"><div>{$lang->no}</div></th>
+        <th class="title" class="wide"><div>{$lang->title}</div></th>
+        <th class="title"><div>{$lang->readed_count}</div></th>
+        <th class="title"><div>{$lang->voted_count}</div></th>
+        <th class="title"><div>{$lang->date}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($document_list as $no => $oDocument)-->
-    <tr class="bg{($no+1)%2+1}">
-        <td class="num">{$no}</td>
-        <td class="title">
-            <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> - 
+    <tr>
+        <td>{$no}</td>
+        <td class="wide">
             <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false;">{$oDocument->getTitleText()}</a>
-
             <!--@if($oDocument->getCommentCount())-->
                 [{$oDocument->getCommentCount()}]
             <!--@end-->
@@ -43,19 +34,19 @@
                 [{$oDocument->getTrackbackCount()}]
             <!--@end-->
         </td>
-        <td class="num">{$oDocument->get('readed_count')}</td>
-        <td class="num">{$oDocument->get('voted_count')}</td>
-        <td class="registDate">{$oDocument->getRegdate("Y-m-d")}</td>
+        <td>{$oDocument->get('readed_count')}</td>
+        <td>{$oDocument->get('voted_count')}</td>
+        <td class="nowrap">{$oDocument->getRegdate("Y-m-d")}</td>
     </tr>
     <!--@end-->
+    <tr>
+        <th class="button" colspan="5">
+            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
 </tbody>
 </table>
 
-<!-- 버튼 -->
-<div class="tRight gap1">
-    <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-</div>
-
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/member/skins/default/filter/add_openid_to_member.xml b/modules/member/skins/default/filter/add_openid_to_member.xml
new file mode 100644
index 000000000..3315012bd
--- /dev/null
+++ b/modules/member/skins/default/filter/add_openid_to_member.xml
@@ -0,0 +1,12 @@
+<filter name="add_openid_to_member" module="member" act="procMemberAddOpenIDToMember">
+    <form>
+        <node target="openid" required="true" minlength="2" maxlength="80"/>
+    </form>
+    <parameter>
+        <param name="openid" target="openid" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/member/skins/default/filter/delete_openid_from_member.xml b/modules/member/skins/default/filter/delete_openid_from_member.xml
new file mode 100644
index 000000000..44338efc5
--- /dev/null
+++ b/modules/member/skins/default/filter/delete_openid_from_member.xml
@@ -0,0 +1,12 @@
+<filter name="delete_openid_from_member" module="member" act="procMemberDeleteOpenIDFromMember">
+    <form>
+        <node target="openid_to_delete" required="true" minlength="2" maxlength="80"/>
+    </form>
+    <parameter>
+        <param name="openid_to_delete" target="openid_to_delete" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html
index 0291df39f..256d29f03 100644
--- a/modules/member/skins/default/find_member_account.html
+++ b/modules/member/skins/default/find_member_account.html
@@ -1,29 +1,25 @@
-{@ $member_title = $lang->cmd_find_member_account}
 <!--#include("./common_header.html")-->
-
 <!--%import("filter/find_member_account.xml")-->
 
-    <form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">
+<h3>{$member_title = $lang->cmd_find_member_account}</h3>
+
+<p class="summary">{$lang->about_find_member_account}</p>
+
+<form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
 
-    <table cellspacing="0" class="memberInfoTable gap1" title="{$lang->email_address}">
-    <col width="140" />
-    <col />
-    <tr class="first-child">
-        <th rowspan="2" scope="row"><label for="cpw">{$lang->email_address}</label></th>
-        <td>
-            <input type="text" name="email_address" class="inputTypeText w400" />
-        </td>
+    <table cellspacing="0" class="rowTable" title="{$lang->email_address}">
+    <tr>
+        <th><div><label for="cpw">{$lang->email_address}</label></div></th>
+        <td class="wide"><input type="text" name="email_address" class="inputTypeText w400" /></td>
     </tr>
     <tr>
-        <td><p>{$lang->about_find_member_account}</p></td>
+        <th class="button" colspan="2"><span class="button black strong"><input type="submit" value="{$lang->cmd_find_member_account}" accesskey="s" /></span></th>
     </tr>
+    </div>
     </table>
 
-    <div class="help tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_find_member_account}" accesskey="s" /></span>
-    </div>
 </form>
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/tpl/find_member_account_mail.html b/modules/member/skins/default/find_member_account_mail.html
similarity index 100%
rename from modules/member/tpl/find_member_account_mail.html
rename to modules/member/skins/default/find_member_account_mail.html
diff --git a/modules/member/skins/default/images/black/bgH3.gif b/modules/member/skins/default/images/black/bgH3.gif
deleted file mode 100755
index 4e85c1b68..000000000
Binary files a/modules/member/skins/default/images/black/bgH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/black/form_buttons.gif b/modules/member/skins/default/images/black/form_buttons.gif
deleted file mode 100755
index 965325573..000000000
Binary files a/modules/member/skins/default/images/black/form_buttons.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/black/form_buttons.png b/modules/member/skins/default/images/black/form_buttons.png
deleted file mode 100755
index ccc6d2f1f..000000000
Binary files a/modules/member/skins/default/images/black/form_buttons.png and /dev/null differ
diff --git a/modules/member/skins/default/images/black/lineBoardListTh.gif b/modules/member/skins/default/images/black/lineBoardListTh.gif
deleted file mode 100755
index 0e78f40a2..000000000
Binary files a/modules/member/skins/default/images/black/lineBoardListTh.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/black/lineH3.gif b/modules/member/skins/default/images/black/lineH3.gif
deleted file mode 100755
index 18d85c0b2..000000000
Binary files a/modules/member/skins/default/images/black/lineH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/black/openid_input_bg.gif b/modules/member/skins/default/images/black/openid_input_bg.gif
deleted file mode 100755
index ae9940666..000000000
Binary files a/modules/member/skins/default/images/black/openid_input_bg.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/blank.gif b/modules/member/skins/default/images/blank.gif
deleted file mode 100644
index 35d42e808..000000000
Binary files a/modules/member/skins/default/images/blank.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/button_go.gif b/modules/member/skins/default/images/button_go.gif
deleted file mode 100755
index 895d1a078..000000000
Binary files a/modules/member/skins/default/images/button_go.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/arrowNextB1.gif b/modules/member/skins/default/images/common/arrowNextB1.gif
deleted file mode 100644
index 7a563a182..000000000
Binary files a/modules/member/skins/default/images/common/arrowNextB1.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/arrowNextC1.gif b/modules/member/skins/default/images/common/arrowNextC1.gif
deleted file mode 100644
index 82deddc7b..000000000
Binary files a/modules/member/skins/default/images/common/arrowNextC1.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/arrowPrevB1.gif b/modules/member/skins/default/images/common/arrowPrevB1.gif
deleted file mode 100644
index a95ce58df..000000000
Binary files a/modules/member/skins/default/images/common/arrowPrevB1.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/arrowPrevC1.gif b/modules/member/skins/default/images/common/arrowPrevC1.gif
deleted file mode 100644
index 0bab510b5..000000000
Binary files a/modules/member/skins/default/images/common/arrowPrevC1.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/bgH3.gif b/modules/member/skins/default/images/common/bgH3.gif
deleted file mode 100644
index 0d07bb456..000000000
Binary files a/modules/member/skins/default/images/common/bgH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/buttonTypeInput24.gif b/modules/member/skins/default/images/common/buttonTypeInput24.gif
deleted file mode 100644
index 0dcfc0e3d..000000000
Binary files a/modules/member/skins/default/images/common/buttonTypeInput24.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconAdd.gif b/modules/member/skins/default/images/common/iconAdd.gif
deleted file mode 100644
index f2bdb7868..000000000
Binary files a/modules/member/skins/default/images/common/iconAdd.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconArrow99.gif b/modules/member/skins/default/images/common/iconArrow99.gif
deleted file mode 100644
index 15c36291e..000000000
Binary files a/modules/member/skins/default/images/common/iconArrow99.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconCheck.gif b/modules/member/skins/default/images/common/iconCheck.gif
deleted file mode 100644
index c4fb37ae0..000000000
Binary files a/modules/member/skins/default/images/common/iconCheck.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconFriend.gif b/modules/member/skins/default/images/common/iconFriend.gif
deleted file mode 100644
index 1daf6c66d..000000000
Binary files a/modules/member/skins/default/images/common/iconFriend.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconH3.gif b/modules/member/skins/default/images/common/iconH3.gif
deleted file mode 100644
index 8ea0cec82..000000000
Binary files a/modules/member/skins/default/images/common/iconH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconInstantMessage.gif b/modules/member/skins/default/images/common/iconInstantMessage.gif
deleted file mode 100644
index d63a69506..000000000
Binary files a/modules/member/skins/default/images/common/iconInstantMessage.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/iconInstantMessage2.gif b/modules/member/skins/default/images/common/iconInstantMessage2.gif
deleted file mode 100644
index 380548e91..000000000
Binary files a/modules/member/skins/default/images/common/iconInstantMessage2.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/lineBoardListTh.gif b/modules/member/skins/default/images/common/lineBoardListTh.gif
deleted file mode 100644
index 6d891d82c..000000000
Binary files a/modules/member/skins/default/images/common/lineBoardListTh.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/lineH3.gif b/modules/member/skins/default/images/common/lineH3.gif
deleted file mode 100644
index fe42fe378..000000000
Binary files a/modules/member/skins/default/images/common/lineH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/line_1x10_e0e0e0.gif b/modules/member/skins/default/images/common/line_1x10_e0e0e0.gif
deleted file mode 100644
index 6a848dd58..000000000
Binary files a/modules/member/skins/default/images/common/line_1x10_e0e0e0.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/openid_input_bg.gif b/modules/member/skins/default/images/openid_input_bg.gif
deleted file mode 100644
index cde836c89..000000000
Binary files a/modules/member/skins/default/images/openid_input_bg.gif and /dev/null differ
diff --git a/modules/member/skins/default/images/common/arrowNextA1.gif b/modules/member/skins/default/img/arrowNextA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/member/skins/default/images/common/arrowNextA1.gif
rename to modules/member/skins/default/img/arrowNextA1.gif
diff --git a/modules/member/skins/default/images/common/arrowNextEndA1.gif b/modules/member/skins/default/img/arrowNextEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/member/skins/default/images/common/arrowNextEndA1.gif
rename to modules/member/skins/default/img/arrowNextEndA1.gif
diff --git a/modules/member/skins/default/images/common/arrowPrevA1.gif b/modules/member/skins/default/img/arrowPrevA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/member/skins/default/images/common/arrowPrevA1.gif
rename to modules/member/skins/default/img/arrowPrevA1.gif
diff --git a/modules/member/skins/default/images/common/arrowPrevEndA1.gif b/modules/member/skins/default/img/arrowPrevEndA1.gif
old mode 100644
new mode 100755
similarity index 100%
rename from modules/member/skins/default/images/common/arrowPrevEndA1.gif
rename to modules/member/skins/default/img/arrowPrevEndA1.gif
diff --git a/modules/member/skins/default/img/bgTab.gif b/modules/member/skins/default/img/bgTab.gif
new file mode 100755
index 000000000..8835361b8
Binary files /dev/null and b/modules/member/skins/default/img/bgTab.gif differ
diff --git a/modules/member/skins/default/img/buttonClose.gif b/modules/member/skins/default/img/buttonClose.gif
new file mode 100755
index 000000000..5bdbbc1ef
Binary files /dev/null and b/modules/member/skins/default/img/buttonClose.gif differ
diff --git a/modules/member/skins/default/img/iconH2.gif b/modules/member/skins/default/img/iconH2.gif
new file mode 100755
index 000000000..457867741
Binary files /dev/null and b/modules/member/skins/default/img/iconH2.gif differ
diff --git a/modules/member/skins/default/img/iconH3.gif b/modules/member/skins/default/img/iconH3.gif
new file mode 100755
index 000000000..889e2818e
Binary files /dev/null and b/modules/member/skins/default/img/iconH3.gif differ
diff --git a/modules/member/skins/default/img/lineVrText.gif b/modules/member/skins/default/img/lineVrText.gif
new file mode 100755
index 000000000..27566578d
Binary files /dev/null and b/modules/member/skins/default/img/lineVrText.gif differ
diff --git a/widgets/login_info/skins/default/images/openid_login_bg.gif b/modules/member/skins/default/img/openid_login_bg.gif
similarity index 100%
rename from widgets/login_info/skins/default/images/openid_login_bg.gif
rename to modules/member/skins/default/img/openid_login_bg.gif
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index db5cbf22a..a1682c032 100644
--- a/modules/member/skins/default/js/member.js
+++ b/modules/member/skins/default/js/member.js
@@ -151,3 +151,21 @@ function doDeleteSavedDocument(document_srl, confirm_message) {
     params['document_srl'] = document_srl;
     exec_xml('member', 'procMemberDeleteSavedDocument', params, function() { location.reload(); });
 }
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    location.href = current_url.setQuery('selected_module_srl',module_srl);
+}
+
+/* 오픈아이디 연결 */
+function doAddOpenIDToMember() {
+    var fo_obj = xGetElementById("fo_insert_member");
+    procFilter(fo_obj, add_openid_to_member);
+}
+
+/* 오픈아이디 연결 해제 */
+function doDeleteOpenIDFromMember(openid) {
+    var fo_obj = xGetElementById("fo_insert_member");
+    fo_obj.openid_to_delete.value = openid;
+    procFilter(fo_obj, delete_openid_from_member);
+}
+
diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html
index 0b087e690..747d1f5d1 100644
--- a/modules/member/skins/default/leave_form.html
+++ b/modules/member/skins/default/leave_form.html
@@ -1,29 +1,28 @@
-{@ $member_title = $lang->msg_leave_member}
 <!--#include("./common_header.html")-->
 
 <!--%import("filter/leave_member.xml")-->
 
+    <h3>{$member_title = $lang->msg_leave_member}</h3>
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, leave_member)">
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
 
-    <table cellspacing="0" class="memberInfoTable gap1" title="{$lang->msg_leave_member}">
-    <col width="140" />
-    <col />
+    <table cellspacing="0" class="rowTable" title="{$lang->msg_leave_member}">
     <tr>
-        <th scope="row">{$lang->user_id}</th>
-        <td>{$member_info->user_id}</td>
+        <th scope="row"><div>{$lang->user_id}</div></th>
+        <td class="wide">{$member_info->user_id}</td>
     </tr>
     <tr>
-        <th scope="row"><label for="cpw">{$lang->password}</label></th>
+        <th scope="row"><div><label for="cpw">{$lang->password}</label></div></th>
         <td><input type="password" name="password" id="cpw" class="inputTypeText" /></td>
     </tr>
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
     </table>
-
-    <div class="help tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
-        <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
 </form>
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index f26dfa61e..66e81101f 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -1,66 +1,65 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/login.xml")-->
-<!--%import("filter/openid_login.xml")-->
-
-<script type="text/javascript">
-    var keep_signed_msg = "{$lang->about_keep_signed}";
-    xAddEventListener(window, "load", function() { doFocusUserId('fo_member_login'); });
-</script>
-
-<!-- XE 로그인 폼 -->
-<div class="memberSmallBox w400">
-
-    <div class="header">
-        <h3>{$lang->cmd_login}</h3>
-    </div>
-
-    <form action="./" method="post" onsubmit="return procFilter(this, login)" id="fo_member_login">
-        <fieldset class="login">
-            <dl>
-                <dt><label for="uid">{$lang->user_id}</label></dt>
-                <dd><input type="text" name="user_id" id="uid" value="" class="inputTypeText w140" /></dd>
-                <dt><label for="upw">{$lang->password}</label></dt>
-                <dd><input type="password" name="password" id="upw" value="" class="inputTypeText w140" /></dd>
-            </dl>
-
-            <span class="button"><input type="submit" value="{$lang->cmd_login}" /></span>
-
-            <p class="keep">
-                <input type="checkbox" name="keep_signed" id="keepid_opt" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
-                <label for="keepid_opt">{$lang->keep_signed}</label>
-            </p>
-        </fieldset>
-    </form>
-
-    <div class="help tCenter">
-        <a href="{getUrl('act','dispMemberFindAccount')}" class="button"><span>{$lang->cmd_find_member_account}</span></a>
-        <a href="{getUrl('act','dispMemberSignUpForm')}" class="button"><span>{$lang->cmd_signup}</span></a>
-    </div>
-</div>
-
-<!--@if($member_config->enable_openid=='Y')-->
-<!-- OpenID 로그인 폼 -->
-<div class="memberSmallBox w400">
-
-    <div class="header">
-        <h3>{$lang->openid}</h3>
-    </div>
-
-    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)">
-        <fieldset class="login">
-            <dl>
-                <dt><label for="open_uid">{$lang->user_id}</label></dt>
-                <dd><input type="text" name="openid" id="open_uid" value="" class="openid_user_id" /></dd>
-            </dl>
-            <span class="button"><input type="submit" value="{$lang->cmd_login}" /></span>
-
-        </fieldset>
-        <input type="hidden" name="referer_url" value="{$referer_url}" />
-    </form>
-
-    <div class="help tLeft">{$lang->about_openid}</div>
-
-</div>
-<!--@end-->
-
-<!--#include("./common_footer.html")-->
+<!--#include("./common_header.html")-->
+<!--%import("filter/login.xml")-->
+<!--%import("filter/openid_login.xml")-->
+
+<script type="text/javascript">
+    var keep_signed_msg = "{$lang->about_keep_signed}";
+    xAddEventListener(window, "load", function() { doFocusUserId('fo_member_login'); });
+</script>
+
+<!-- XE 로그인 폼 -->
+<div class="memberSmallBox">
+
+    <div class="header">{$lang->cmd_login}</div>
+
+    <form action="./" method="post" onsubmit="return procFilter(this, login)" id="fo_member_login">
+        <fieldset class="login">
+            <dl>
+                <dt><label for="uid">{$lang->user_id}</label></dt>
+                <dd><input type="text" name="user_id" id="uid" value="" class="inputTypeText w140" /></dd>
+                <dt><label for="upw">{$lang->password}</label></dt>
+                <dd><input type="password" name="password" id="upw" value="" class="inputTypeText w140" /></dd>
+            </dl>
+
+            <p class="keep">
+                <input type="checkbox" name="keep_signed" id="keepid_opt" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
+                <label for="keepid_opt">{$lang->keep_signed}</label>
+            </p>
+			
+			<div class="buttonArea">
+				<span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
+			</div>
+
+        </fieldset>
+    </form>
+
+    <div class="help tCenter">
+        <a href="{getUrl('act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a> |
+        <a href="{getUrl('act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
+    </div>
+</div>
+
+<!--@if($member_config->enable_openid=='Y')-->
+<!-- OpenID 로그인 폼 -->
+<div class="memberSmallBox">
+
+    <div class="header">{$lang->openid}</div>
+
+    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)">
+        <fieldset class="login">
+            <dl>
+                <dt><label for="open_uid">{$lang->user_id}</label></dt>
+                <dd><input type="text" name="openid" id="open_uid" value="" class="openid_user_id" /></dd>
+            </dl>
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
+
+        </fieldset>
+        <input type="hidden" name="referer_url" value="{$referer_url}" />
+    </form>
+
+    <div class="help tLeft">{$lang->about_openid}</div>
+
+</div>
+<!--@end-->
+
+<!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/logout.html b/modules/member/skins/default/logout.html
index 74982e98a..1c61f37fc 100644
--- a/modules/member/skins/default/logout.html
+++ b/modules/member/skins/default/logout.html
@@ -4,19 +4,19 @@
 <form action="./" method="get" onsubmit="return procFilter(this, logout)">
 <input type="hidden" name="mid" value="{$mid}" />
 
-<div class="memberSmallBox w400">
-    <div class="header">
-        <h3>{$lang->cmd_logout}</h3>
-    </div>
-    <div class="text">
-        <p class="fwB">{$lang->confirm_logout}</p>
-    </div>
+    <h3>{$lang->cmd_logout}</h3>
 
-    <div class="help tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_logout}" /></span>
-        <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
-</div>
+    <table class="crossTable">
+    <tr>
+        <th class="title">{$lang->confirm_logout}</th>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_logout}" /></span>
+            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
 
 </form>
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html
index b7b0ec101..3b8067ca3 100644
--- a/modules/member/skins/default/member_info.html
+++ b/modules/member/skins/default/member_info.html
@@ -1,81 +1,94 @@
-{@ $member_title = $lang->cmd_view_member_info }
 <!--#include("./common_header.html")-->
 
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="140" />
-    <col />
-    <caption>{$lang->member_default_info}</caption>
+    <h3>{$lang->cmd_view_member_info}</h3>
+
+    <table cellspacing="0" class="rowTable">
+    <tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
     <tr>
-        <th scope="row">{$lang->user_name}</th>
-        <td>{htmlspecialchars($member_info->user_name)}</td>
+        <th><div>{$lang->user_name}</div></th>
+        <td class="wide">{htmlspecialchars($member_info->user_name)}</td>
     </tr>
     <tr>
-        <th scope="row">{$lang->nick_name}</th>
+        <th><div>{$lang->nick_name}</div></th>
         <td>{htmlspecialchars($member_info->nick_name)}</td>
     </tr>
     <!--@if($member_info->profile_image->src)-->
     <tr>
-        <th scope="row">{$lang->profile_image}</th>
+        <th><div>{$lang->profile_image}</div></th>
         <td><img src="{$member_info->profile_image->src}" border="0" alt="profile_image" /></td>
     </tr>
     <!--@end-->
     <!--@if($member_info->image_name->src)-->
     <tr>
-        <th scope="row">{$lang->image_name}</th>
+        <th><div>{$lang->image_name}</div></th>
         <td><img src="{$member_info->image_name->src}" border="0" alt="image_name" /></td>
     </tr>
     <!--@end-->
     <!--@if($member_info->image_mark->src)-->
     <tr>
-        <th scope="row">{$lang->image_mark}</th>
+        <th><div>{$lang->image_mark}</div></th>
         <td><img src="{$member_info->image_mark->src}" border="0" alt="image_mark" /></td>
     </tr>
     <!--@end-->
     <tr>
-        <th scope="row">{$lang->homepage}</th>
+        <th><div>{$lang->homepage}</div></th>
         <td><!--@if($member_info->homepage)--><a href="{htmlspecialchars($member_info->homepage)}" onclick="window.open(this.href); return false;">{htmlspecialchars($member_info->homepage)}</a><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->blog}</th>
+        <th><div>{$lang->blog}</div></th>
         <td><!--@if($member_info->blog)--><a href="{htmlspecialchars($member_info->blog)}" onclick="window.open(this.href); return false;">{htmlspecialchars($member_info->blog)}</a><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->birthday}</th>
+        <th><div>{$lang->birthday}</div></th>
         <td><!--@if($member_info->birthday)-->{zdate($member_info->birthday,"Y-m-d")}<!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <!--@if($member_info->signature)-->
     <tr>
-        <th scope="row">{$lang->signature}</th>
+        <th><div>{$lang->signature}</div></th>
         <td>{$member_info->signature}</td>
     </tr>
     <!--@end-->
     <tr>
-        <th scope="row">{$lang->group}</th>
+        <th><div>{$lang->group}</div></th>
         <td><!--@foreach($member_info->group_list as $key => $val)-->{$val} <!--@end--></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->signup_date}</th>
+        <th><div>{$lang->signup_date}</div></th>
         <td>{zdate($member_info->regdate,"Y-m-d H:i")}</td>
     </tr>
 
     <!--@if($member_info->member_srl == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
     <tr>
-        <th scope="row">{$lang->last_login}</th>
+        <th><div>{$lang->last_login}</div></th>
         <td>{zdate($member_info->last_login,"Y-m-d H:i")}</td>
     </tr>
     <!--@end-->
-    </table>
+
+    <!--@if($member_config->enable_openid=="Y")-->
+    <!--@if(sizeof($openids) > 0)-->
+    <tr>
+        <th colspan="2" class="title"><div>{$lang->openid} </div></th>
+    </tr>
+    <!--@foreach($openids as $openid)-->
+    <tr>
+        <th><div>{$lang->openid}</div></th>
+        <td> <a href="{$openid->bookmarklet}">{$openid->openid}</a> </td>
+    </tr>
+    <!--@end-->
+    <!--@end-->
+    <!--@end-->
 
     <!--@if($extend_form_list)-->
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="140" />
-    <col />
-    <caption>{$lang->member_extend_info}</caption>
+    <tr>
+        <th class="title" colspan="2"><div>{$lang->member_extend_info}</div></th>
+    </tr>
     {@ $dummy_chk = 0 }
     <!--@foreach($extend_form_list as $key => $val)-->
     <tr <!--@if($dummy_chk==0)-->class="first-child" {@ $dummy_chk = 1; }<!--@end-->>
         <th>
-            {htmlspecialchars($val->column_title)}
+            <div>
+                {htmlspecialchars($val->column_title)}
+            </div>
         </th>
         <td>
             <!--@if($val->is_private)-->
@@ -100,20 +113,21 @@
         </td>
     </tr>
     <!--@end-->
-    </table>
     <!--@end-->
 
-    <div class="tCenter">
-        <!--@if($member_info->member_srl == $logged_info->member_srl)-->
-        <a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}" class="button"><span>{$lang->cmd_modify_member_info}</span></a>
-            <!--@if($logged_info->is_openid)-->
-                <a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}" class="button"><span>{$lang->cmd_leave}</span></a>
-            <!--@else-->
-                <a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}" class="button"><span>{$lang->cmd_modify_member_password}</span></a>
-                <a href="{getUrl('act','dispMemberLeave','member_srl','')}" class="button"><span>{$lang->cmd_leave}</span></a>
+    <tr>
+        <th colspan="2" class="button">
+            <!--@if($member_info->member_srl == $logged_info->member_srl)-->
+            <a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}" class="button black strong"><span>{$lang->cmd_modify_member_info}</span></a>
+                <!--@if($logged_info->is_openid)-->
+                    <a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}" class="button red"><span>{$lang->cmd_leave}</span></a>
+                <!--@else-->
+                    <a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}" class="button green"><span>{$lang->cmd_modify_member_password}</span></a>
+                    <a href="{getUrl('act','dispMemberLeave','member_srl','')}" class="button red"><span>{$lang->cmd_leave}</span></a>
+                <!--@end-->
             <!--@end-->
-        <!--@end-->
-        <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
+            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+    </tr>
+    </table>
 
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 70668f499..af07c49a7 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -1,4 +1,3 @@
-{@ $member_title = $lang->msg_update_member}
 <!--#include("./common_header.html")-->
 <!--%import("../../tpl/js/signup_check.js")-->
 <!--%import("../../tpl/js/krzip_search.js")-->
@@ -16,9 +15,15 @@
     <!--%import("filter/delete_image_mark.xml")-->
 <!--@end-->
 
+<!--@if($member_config->enable_openid=="Y")-->
+    <!--%import("filter/add_openid_to_member.xml")-->
+    <!--%import("filter/delete_openid_from_member.xml")-->
+<!--@end-->
+
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->
 
+    <h3>{$lang->msg_update_member}</h3>
 
     <form id="fo_insert_member" action="{getUrl()}" method="post" onsubmit="return procFilter(this, modify_info)" <!--@if($member_config->profile_image == 'Y' || $member_config->image_name=='Y' || $member_config->image_mark=='Y')-->enctype="multipart/form-data"<!--@end-->>
     <input type="hidden" name="mid" value="{$mid}" />
@@ -27,30 +32,28 @@
     <input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
     <input type="hidden" name="page" value="{$page}" />
 
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="130" />
-    <col />
-    <caption>{$lang->member_default_info}</caption>
-    <tr class="first-child">
-        <th scope="row">{$lang->user_id}</th>
-        <td>{htmlspecialchars($member_info->user_id)}</td>
+    <table cellspacing="0" class="rowTable">
+    <tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
+    <tr>
+        <th><div>{$lang->user_id}</div></th>
+        <td class="wide">{htmlspecialchars($member_info->user_id)}</td>
     </tr>
     <tr>
-        <th scope="row">{$lang->user_name} *</th>
-        <td><input type="text" name="user_name" value="{htmlspecialchars($member_info->user_name)}" /> <p>{$lang->about_user_name}</p></td>
+        <th><div>{$lang->user_name} <span class="require">*</span></div></th>
+        <td class="wide"><input type="text" name="user_name" value="{htmlspecialchars($member_info->user_name)}" /> <p>{$lang->about_user_name}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->nick_name} *</th>
+        <th><div>{$lang->nick_name} <span class="require">*</span></div></th>
         <td><input type="text" name="nick_name" value="{htmlspecialchars($member_info->nick_name)}" /> <p>{$lang->about_nick_name}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->email_address} *</th>
+        <th><div>{$lang->email_address} <span class="require">*</span></div></th>
         <td><input type="text" name="email_address" value="{htmlspecialchars($member_info->email_address)}" /><p>{$lang->about_email_address}</p></td>
     </tr>
 
     <!--@if($member_config->profile_image == 'Y')-->
     <tr>
-        <th scope="row">{$lang->profile_image}</th>
+        <th><div>{$lang->profile_image}</div></th>
         <td>
             <!--@if($member_info->profile_image->src)-->
             <div class="memberImage">
@@ -69,7 +72,7 @@
     <!--@end-->
     <!--@if($member_config->image_name == 'Y')-->
     <tr>
-        <th scope="row">{$lang->image_name}</th>
+        <th><div>{$lang->image_name}</div></th>
         <td>
             <!--@if($member_info->image_name->src)-->
             <div class="memberImage">
@@ -88,7 +91,7 @@
     <!--@end-->
     <!--@if($member_config->image_mark == 'Y')-->
     <tr>
-        <th scope="row">{$lang->image_mark}</th>
+        <th><div>{$lang->image_mark}</div></th>
         <td>
             <!--@if($member_info->image_mark->src)-->
             <div class="memberImage">
@@ -106,15 +109,15 @@
     </tr>
     <!--@end-->
     <tr>
-        <th scope="row">{$lang->homepage}</th>
+        <th><div>{$lang->homepage}</div></th>
         <td><input type="text" name="homepage" value="{htmlspecialchars($member_info->homepage)}" /> <p>{$lang->about_homepage}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->blog}</th>
+        <th><div>{$lang->blog}</div></th>
         <td><input type="text" name="blog" value="{htmlspecialchars($member_info->blog)}" /> <p>{$lang->about_blog_url}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->birthday}</th>
+        <th><div>{$lang->birthday}</div></th>
         <td>
 
             <input type="hidden" name="birthday" value="{$member_info->birthday}" />
@@ -124,30 +127,22 @@
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->allow_mailing}</th>
+        <th><div>{$lang->allow_mailing}</div></th>
         <td><input type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p>{$lang->about_allow_mailing}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->signature}</th>
+        <th><div>{$lang->signature}</div></th>
         <td>{$editor}</td>
     </tr>
-    </table>
 
     <!--@if($extend_form_list)-->
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="130" />
-    <col />
-    <caption>{$lang->member_extend_info}</caption>
+    <tr><th colspan="2" class="title"><div>{$lang->member_extend_info}</div></th></tr>
     {@ $dummy_chk = 0 }
     <!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
     <tr <!--@if($dummy_chk==0)-->class="first-child" {@ $dummy_chk = 1; }<!--@end-->>
-        <th scope="row">
+        <th>
             {htmlspecialchars($val->column_title)}
-            <!--@if($val->required=='Y')-->*<!--@end-->
-            <div class="publicItem">
-                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" <!--@if($val->is_opened)-->checked="checked"<!--@end--> value="Y" id="open_{$val->column_name}" />
-                <label for="open_{$val->column_name}">{$lang->public}</label>
-            </div>
+            <!--@if($val->required=='Y')--><span class="require">*</span><!--@end-->
         </th>
         <td>
             <!--// 일반 text -->
@@ -227,19 +222,42 @@
 
             <!--@end-->
 
-            <div class="extendDesc">{$val->description}</div>
+            <p>{$val->description}</p>
+            <div class="publicItem">
+                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" <!--@if($val->is_opened)-->checked="checked"<!--@end--> value="Y" id="open_{$val->column_name}" />
+                <label for="open_{$val->column_name}">{$lang->public}</label>
+            </div>
         </td>
     </tr>
     <!--@end--><!--@end-->
-    </table>
     <!--@end-->
 
-    <div class="tRight">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </div>
+    <!--@if($member_config->enable_openid=="Y")-->
+    <tr><th class="title" colspan="2"><div>{$lang->openid}</div></th></tr>
+    <tr>
+        <td colspan="2" class="openids"> 
+            <!--@foreach($openids as $openid)-->
+            <div><a href="{$openid->bookmarklet}">{$openid->openid}</a> <a onclick="doDeleteOpenIDFromMember('{$openid->openid}')" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></div>
+            <!--@end-->
+
+            <div class="insertOpenID">
+                <input name="openid" type="text" class="openid_user_id" />  
+                <input name="openid_to_delete" type="hidden" />
+                <a onclick="doAddOpenIDToMember()" class="button"><span>{$lang->cmd_insert}</span></a> 
+            </div>
+        </td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
+        </th>
+    </tr>
+    </table>
 </form>
 
+
 <script type="text/javascript">
 (function($){
     $(function(){
diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html
index ed15582dd..9e93f70bb 100644
--- a/modules/member/skins/default/modify_password.html
+++ b/modules/member/skins/default/modify_password.html
@@ -1,24 +1,22 @@
-{@ $member_title = $lang->cmd_modify_member_password }
 <!--#include("./common_header.html")-->
 <!--%import("filter/modify_password.xml")-->
+    <h3>{$member_title = $lang->cmd_modify_member_password}</h3>
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, modify_password)">
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
 
-    <table cellspacing="0" class="memberInfoTable gap1" title="{$lang->cmd_modify_member_password}">
-    <col width="140" />
-    <col />
+    <table cellspacing="0" class="rowTable" title="{$lang->cmd_modify_member_password}">
     <tr>
-        <th scope="row">{$lang->user_id}</th>
-        <td>{$member_info->user_id}</td>
+        <th scope="row"><div>{$lang->user_id}</div></th>
+        <td class="wide">{$member_info->user_id}</td>
     </tr>
     <tr>
-        <th scope="row"><label for="cpw">{$lang->current_password}</label></th>
+        <th scope="row"><div><label for="cpw">{$lang->current_password}</label></div></th>
         <td><input type="password" name="current_password" id="cpw" class="inputTypeText" /></td>
     </tr>
     <tr>
-        <th scope="row"><label for="npw1">{$lang->password1}</label></th>
+        <th scope="row"><div><label for="npw1">{$lang->password1}</label></div></th>
         <td>
             <input type="password" name="password1" id="npw1" class="inputTypeText" />
             <br />
@@ -28,13 +26,13 @@
             <p>{$lang->about_password}</p>
         </td>
     </tr>
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
     </table>
 
-
-    <div class="help tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
-
     </form>
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/openid_leave_form.html b/modules/member/skins/default/openid_leave_form.html
index fe22d5388..53451e7ba 100644
--- a/modules/member/skins/default/openid_leave_form.html
+++ b/modules/member/skins/default/openid_leave_form.html
@@ -1,28 +1,28 @@
-{@ $member_title = $lang->msg_leave_member}
 <!--#include("./common_header.html")-->
-
 <!--%import("filter/openid_leave_member.xml")-->
 
-    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
-    <input type="hidden" name="mid" value="{$mid}" />
-    <input type="hidden" name="document_srl" value="{$document_srl}" />
-    <input type="hidden" name="page" value="{$page}" />
+<h3>{$member_title = $lang->msg_leave_member}</h3>
 
-    <table cellspacing="0" class="memberInfoTable gap1" title="$lang->msg_leave_member}">
-    <col width="140" />
-    <col />
-    <tr class="first-child">
-        <th scope="row">{$lang->user_id}</th>
-        <td>
+<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
+<input type="hidden" name="mid" value="{$mid}" />
+<input type="hidden" name="document_srl" value="{$document_srl}" />
+<input type="hidden" name="page" value="{$page}" />
+
+    <table cellspacing="0" class="rowTable" title="$lang->msg_leave_member}">
+    <tr>
+        <th><div>{$lang->user_id}</div></th>
+        <td class="wide">
             {$member_info->user_id}
             <p>{$lang->about_openid_leave}</p>
         </td>
     </tr>
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
     </table>
 
-    <div class="help tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
-        <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </div>
 </form>
 <!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/saved_list.html b/modules/member/skins/default/saved_list.html
index 996f3622f..1f1dc08ce 100644
--- a/modules/member/skins/default/saved_list.html
+++ b/modules/member/skins/default/saved_list.html
@@ -1,40 +1,35 @@
-{@ $member_title = $lang->cmd_view_saved_document }
 <!--#include("./common_header.html")-->
 
-<!-- 정보 -->
-<div class="boardInformation">
-    Total : <strong>{number_format($total_count)}</strong>, 
-    Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
+<h3>{$member_title = $lang->cmd_view_saved_document}</h3>
 
-<!-- 목록 -->
-<table cellspacing="0" class="list">
+<table cellspacing="0" class="colTable">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
-    <tr>
-        <th scope="col"><div>{$lang->date}</th>
-        <th scope="col" class="wide"><div>{$lang->title}</th>
-        <th scope="col"><div>{$lang->cmd_delete}</th>
+    <tr class="title">
+        <th class="title"><div>{$lang->date}</th>
+        <th class="title"><div>{$lang->title}</th>
+        <th class="title"><div>{$lang->cmd_delete}</th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($document_list as $no => $val)-->
-    <tr class="bg{($no+1)%2+1}">
-        <td class="registDate">{$val->getRegdate("Y-m-d H:i:s")}</td>
-        <td class="title">
+    <tr>
+        <td class="nowrap">{$val->getRegdate("Y-m-d H:i:s")}</td>
+        <td class="wide">
             <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); return false;">{$val->getTitle()}</a></div>
-            <div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
+            <div id="saved_document_{$val->document_srl}" class="savedContent" style="display:none;">{$val->getContent(false)}</div>
         </td>
-        <td><a href="#" onclick="doDeleteSavedDocument('{$val->document_srl}','{$lang->confirm_delete}'); return false;" class="button"><span>{$lang->cmd_delete}</span></a></td>
+        <td><a href="#" onclick="doDeleteSavedDocument('{$val->document_srl}','{$lang->confirm_delete}'); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
+    <tr>
+        <th colspan="3" class="button">
+            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
 </tbody>
 </table>
 
-<!-- 버튼 -->
-<div class="tRight gap1">
-    <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-</div>
-
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/member/skins/default/saved_list_popup.html b/modules/member/skins/default/saved_list_popup.html
index 94efb316e..7743f6cd3 100644
--- a/modules/member/skins/default/saved_list_popup.html
+++ b/modules/member/skins/default/saved_list_popup.html
@@ -1,63 +1,49 @@
-<!--#include("./common_header.html")-->
+<!--%import("css/default.css")-->
 
-<div class="memberSmallBox w600pop">
+<div id="memberModule">
 
-    <div class="header">
-        <h3>{$lang->cmd_view_saved_document}</h3>
+    <div id="popHeader" class="wide">
+        <h3 class="xeAdmin">{$lang->cmd_view_saved_document}</h3>
     </div>
 
-    <div class="complex">
-
-        <!-- 정보 -->
-        <div class="boardInformation">
-            Total : <strong>{number_format($total_count)}</strong>, 
-            Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-        </div>
-
-        <!-- 목록 -->
-        <table cellspacing="0" class="list">
-        <col width="120" />
-        <col />
-        <col width="100" />
-        <thead>
-            <tr>
-                <th scope="col">{$lang->date}</th>
-                <th scope="col">{$lang->title}</th>
-                <th scope="col">{$lang->cmd_select}</th>
-            </tr>
-        </thead>
-        <tbody>
-            <!--@foreach($document_list as $no => $val)-->
-            <tr class="bg{($no+1)%2+1}">
-                <td class="registDate">{$val->getRegdate("Y-m-d H:i:s")}</td>
-                <td class="subject">
-                    <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); setFixedPopupSize(); return false;">{$val->getTitle()}</a></div>
-                    <div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
-                </td>
-                <td><a href="#" onclick="doDocumentSelect('{$val->document_srl}'); return false;" class="button"><span>{$lang->cmd_select}</span></a></td>
-            </tr>
-            <!--@end-->
-        </tbody>
-        </table>
-
-        <!-- 페이지 네비게이션 -->
-        <div class="pagination a1">
-            <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong> 
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+    <div id="popBody">
+        <div id="memberModule">
+            <!-- 목록 -->
+            <table cellspacing="0" class="colTable">
+            <caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+            <thead>
+                <tr>
+                    <th class="title"><div>{$lang->date}</div></th>
+                    <th class="title"><div>{$lang->title}</div></th>
+                    <th class="title"><div>{$lang->cmd_select}</div></th>
+                </tr>
+            </thead>
+            <tbody>
+                <!--@foreach($document_list as $no => $val)-->
+                <tr>
+                    <td class="nowrap">{$val->getRegdate("Y-m-d H:i:s")}</td>
+                    <td class="wide">
+                        <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); setFixedPopupSize(); return false;">{$val->getTitle()}</a></div>
+                        <div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
+                    </td>
+                    <td><a href="#" onclick="doDocumentSelect('{$val->document_srl}'); return false;" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a></td>
+                </tr>
                 <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+            </tbody>
+            </table>
+
+            <!-- 페이지 네비게이션 -->
+            <div class="pagination a1">
+                <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+                <!--@while($page_no = $page_navigation->getNextPage())-->
+                    <!--@if($page == $page_no)-->
+                        <strong>{$page_no}</strong> 
+                    <!--@else-->
+                        <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+                    <!--@end-->
+                <!--@end-->
+                <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+            </div>
         </div>
     </div>
-
-    <div class="tCenter help">
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
-
 </div>
-
-<!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/scrapped_list.html b/modules/member/skins/default/scrapped_list.html
index 21ad52534..b20740f10 100644
--- a/modules/member/skins/default/scrapped_list.html
+++ b/modules/member/skins/default/scrapped_list.html
@@ -1,43 +1,37 @@
-{@ $member_title = $lang->cmd_view_scrapped_document }
 <!--#include("./common_header.html")-->
 
-<!-- 정보 -->
-<div class="boardInformation">
-    Total : <strong>{number_format($total_count)}</strong>, 
-    Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
+<h3>{$member_title = $lang->cmd_view_scrapped_document}</h3>
 
 <!-- 목록 -->
-<table cellspacing="0" class="list">
+<table cellspacing="0" class="colTable">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="wide"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->writer}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th class="title"><div>{$lang->no}</div></th>
+        <th class="title" class="wide"><div>{$lang->title}</div></th>
+        <th class="title"><div>{$lang->writer}</div></th>
+        <th class="title"><div>{$lang->date}</div></th>
+        <th class="title"><div>{$lang->cmd_delete}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($document_list as $no => $val)-->
-    <tr class="bg{($no+1)%2+1}">
-        <td class="num">{$no}</td>
-        <td class="title">
-            <a href="{getUrl('','document_srl',$val->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a>
-        </td>
-        <td class="author"><div class="member_{$val->target_member_srl}">{$val->nick_name}</div></td>
-        <td class="registDate">{zdate($val->regdate, "Y-m-d H:i")}</td>
-        <td><a href="#" onclick="doDeleteScrap({$val->document_srl}); return false;" class="button"><span>{$lang->cmd_delete}</span></a></td>
+    <tr>
+        <td>{$no}</td>
+        <td class="wide"><a href="{getUrl('','document_srl',$val->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a></td>
+        <td class="nowrap"><div class="member_{$val->target_member_srl}">{$val->nick_name}</div></td>
+        <td class="nowrap">{zdate($val->regdate, "Y-m-d H:i")}</td>
+        <td><a href="#" onclick="doDeleteScrap({$val->document_srl}); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
+    <tr>
+        <th class="button" colspan="5">
+            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
 </tbody>
 </table>
 
-<!-- 버튼 -->
-<div class="tRight gap1">
-    <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-</div>
-
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/member/skins/default/screenshot/black.gif b/modules/member/skins/default/screenshot/black.gif
deleted file mode 100755
index 06ccb4a32..000000000
Binary files a/modules/member/skins/default/screenshot/black.gif and /dev/null differ
diff --git a/modules/member/skins/default/screenshot/cyan.gif b/modules/member/skins/default/screenshot/cyan.gif
deleted file mode 100644
index bae2fa162..000000000
Binary files a/modules/member/skins/default/screenshot/cyan.gif and /dev/null differ
diff --git a/modules/member/skins/default/screenshot/green.gif b/modules/member/skins/default/screenshot/green.gif
deleted file mode 100644
index 126923f68..000000000
Binary files a/modules/member/skins/default/screenshot/green.gif and /dev/null differ
diff --git a/modules/member/skins/default/screenshot/purple.gif b/modules/member/skins/default/screenshot/purple.gif
deleted file mode 100644
index 1b5e0d717..000000000
Binary files a/modules/member/skins/default/screenshot/purple.gif and /dev/null differ
diff --git a/modules/member/skins/default/screenshot/red.gif b/modules/member/skins/default/screenshot/red.gif
deleted file mode 100644
index c9fd68653..000000000
Binary files a/modules/member/skins/default/screenshot/red.gif and /dev/null differ
diff --git a/modules/member/skins/default/screenshot/white.gif b/modules/member/skins/default/screenshot/white.gif
deleted file mode 100644
index c9fd68653..000000000
Binary files a/modules/member/skins/default/screenshot/white.gif and /dev/null differ
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 086fc5e6b..6e65fc11b 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -7,9 +7,7 @@
 
 <!--#include("./common_header.html")-->
 
-    <div class="boardHeader">
-        <h3>{$lang->cmd_signup}</h3>
-    </div>
+    <h3>{$lang->cmd_signup}</h3>
 
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, signup)">
     <input type="hidden" name="mid" value="{$mid}" />
@@ -26,89 +24,74 @@
     </div>
     <!--@end-->
 
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="20%" />
-    <col width="80%" />
-    <caption>{$lang->member_default_info}</caption>
-    <tr class="first-child">
-        <th scope="row">{$lang->user_id} *</th>
-        <td><input type="text" name="user_id" value="" /> <p>{$lang->about_user_id}</p> </td>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th colspan="2" class="title"><div>{$lang->member_default_info}</div></th>
     </tr>
     <tr>
-        <th scope="row">{$lang->password} *</th>
-        <td><input type="password" name="password1" value="" /><p>{$lang->about_password}</p></td>
+        <th><div>{$lang->user_id} <span class="require">*</span></div></th>
+        <td class="wide"><input type="text" name="user_id" value="" class="inputTypeText"/> <p>{$lang->about_user_id}</p> </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->password2} *</th>
-        <td><input type="password" name="password2" value="" /></td>
+        <th><div>{$lang->password} <span class="require">*</span></div></th>
+        <td><input type="password" name="password1" value="" class="inputTypeText"/><p>{$lang->about_password}</p></td>
     </tr>
     <tr>
-        <th scope="row">{$lang->user_name} *</th>
+        <th><div>{$lang->password2} <span class="require">*</span></div></th>
+        <td><input type="password" name="password2" value="" class="inputTypeText"/></td>
+    </tr>
+    <tr>
+        <th><div>{$lang->user_name} <span class="require">*</span></div></th>
         <td>
-            <input type="text" name="user_name" value="" />
-            <p>{$lang->about_user_name}</p>
+            <input type="text" name="user_name" value="" class="inputTypeText"/><p>{$lang->about_user_name}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->nick_name} *</th>
+        <th><div>{$lang->nick_name} <span class="require">*</span></div></th>
         <td>
-            <input type="text" name="nick_name" value="" />
-            <p>{$lang->about_nick_name}</p>
+            <input type="text" name="nick_name" value="" class="inputTypeText"/><p>{$lang->about_nick_name}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->email_address} *</th>
+        <th><div>{$lang->email_address} <span class="require">*</span></div></th>
         <td>
-            <input type="text" name="email_address" value="" />
-            <p>{$lang->about_email_address}</p>
+            <input type="text" name="email_address" value="" class="inputTypeText"/><p>{$lang->about_email_address}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->homepage}</th>
+        <th><div>{$lang->homepage}</div></th>
         <td>
-            <input type="text" name="homepage" value="" />
-            <p>{$lang->about_homepage}</p>
+            <input type="text" name="homepage" value="" class="inputTypeText"/><p>{$lang->about_homepage}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->blog}</th>
+        <th><div>{$lang->blog}</div></th>
         <td>
-            <input type="text" name="blog" value="" />
-            <p>{$lang->about_blog_url}</p>
+            <input type="text" name="blog" value="" class="inputTypeText"/><p>{$lang->about_blog_url}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->birthday}</th>
+        <th><div>{$lang->birthday}</div></th>
         <td>
             <input type="hidden" name="birthday" id="date_birthday" value="" />
-            <input type="text" class="inputDate" value="" readonly="readonly" />
-
-
-            <p>{$lang->about_birthday}</p>
+            <input type="text" value="" readonly="readonly" class="inputDate inputTypeText" /><p>{$lang->about_birthday}</p>
         </td>
     </tr>
     <tr>
-        <th scope="row">{$lang->allow_mailing}</th>
+        <th><div>{$lang->allow_mailing}</div></th>
         <td><input type="checkbox" class="checkbox" name="allow_mailing" value="Y" checked="checked" /> <p>{$lang->about_allow_mailing}</p></td>
     </tr>
-    </table>
-
     <!--@if($extend_form_list)-->
-    <table cellspacing="0" class="memberInfoTable">
-    <col width="20%" />
-    <col width="80%" />
-    <caption>{$lang->member_extend_info}</caption>
-    {@ $dummy_chk = 0 }
-    <!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
-    <tr <!--@if($dummy_chk==0)-->class="first-child" {@ $dummy_chk = 1; }<!--@end-->>
-        <th scope="row">
-            {htmlspecialchars($val->column_title)}
-            <!--@if($val->required=='Y')-->*<!--@end-->
-            <div class="publicItem">
-                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" value="Y" id="open_{$val->column_name}" />
-                <label for="open_{$val->column_name}">{$lang->public}</label>
-            </div>
-        </th>
+    <tr>
+        <th class="title" colspan="2"><div>{$lang->member_extend_info}</div></th>
+    </tr>
+
+        <!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
+        <tr>
+            <th>
+                {htmlspecialchars($val->column_title)}
+                <!--@if($val->required=='Y')--><span class="require">*</span><!--@end-->
+            </th>
         <td>
             <!--// 일반 text -->
             <!--@if($val->column_type == 'text')-->
@@ -156,7 +139,7 @@
             <!--@elseif($val->column_type == 'kr_zip')-->
                 <div class="krZip">
                     <div id="zone_address_1_{$val->column_name}" style="display:<!--@if($val->value[0])-->inline<!--@else-->none<!--@end-->;">
-                        <input type="text" name="{$val->column_name}" value="{$val->value[0]}" class="w400"/>
+                        <input type="text" name="{$val->column_name}" value="{$val->value[0]}" class="inputTypeText w400"/>
                         <a href="#" onclick="doHideKrZipList('{$val->column_name}'); return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
                     </div>
                     <div id="zone_address_list_{$val->column_name}" style="display:none">
@@ -165,12 +148,12 @@
                         <a href="#" onclick="doHideKrZipList('{$val->column_name}'); return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
                     </div>
                     <div id="zone_address_search_{$val->column_name}" style="display:<!--@if($val->value[0])-->none<!--@else-->inline<!--@end-->;">
-                        <input type="text" name="_tmp_address_search_{$val->column_name}" class="w400" value="" />
+                        <input type="text" name="_tmp_address_search_{$val->column_name}" class="inputTypeText w400" value="" />
                         <a href="#" onclick="doSearchKrZip('{$val->column_name}'); return false;" class="button"><span>{$lang->cmd_search}</span></a>
                     </div>
 
                     <div class="address2">
-                        <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" class="w400" />
+                        <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" class="inputTypeText w400" />
                     </div>
                 </div>
 
@@ -181,25 +164,28 @@
             <!--// 날짜 입력 -->
             <!--@elseif($val->column_type == 'date')-->
                 <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-                <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
+                <input type="text" class="inputDate inputTypeText" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
             <!--@end-->
 
-            <div class="extendDesc">{$val->description}</div>
+            <p>{$val->description}</p>
+
+            <div class="publicItem">
+                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" value="Y" id="open_{$val->column_name}" />
+                <label for="open_{$val->column_name}">{$lang->public}</label>
+            </div>
         </td>
     </tr>
-    <!--@end--><!--@end-->
-    </table>
+        <!--@end--><!--@end-->
     <!--@end-->
-
-    <div class="tCenter">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        <!--@if($popup)-->
-        <a href="#" class="button" onclick="window.close();return false;"><span>{$lang->cmd_close}</span></a>
-        <!--@else-->
-        <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-        <!--@end-->
-    </div>
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
+        </th>
+    </tr>
+    </table>
 </form>
+
 <script type="text/javascript">
 (function($){
     $(function(){
diff --git a/modules/member/skins/default/skin.xml b/modules/member/skins/default/skin.xml
index 76bb436ad..b1ee05781 100644
--- a/modules/member/skins/default/skin.xml
+++ b/modules/member/skins/default/skin.xml
@@ -56,7 +56,7 @@
     </author>
 
     <colorset>
-        <color name="white" src="screenshot/white.gif">
+        <color name="white">
             <title xml:lang="ko">기본</title>
             <title xml:lang="zh-CN">默认</title>
             <title xml:lang="jp">デフォルト</title>
@@ -65,50 +65,5 @@
             <title xml:lang="ru">умолчанию</title>
             <title xml:lang="zh-TW">預設</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>
-            <title xml:lang="es">Cian</title>
-            <title xml:lang="ru">бирюзовый</title>
-            <title xml:lang="zh-TW">青綠色</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>
-            <title xml:lang="es">Verde</title>
-            <title xml:lang="ru">зеленый</title>
-            <title xml:lang="zh-TW">綠色</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>
-            <title xml:lang="es">Roja</title>
-            <title xml:lang="ru">красный</title>
-            <title xml:lang="zh-TW">紅色</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="es">Púrpura</title>
-            <title xml:lang="ru">Лиловый</title>
-            <title xml:lang="zh-TW">紫色</title>
-        </color>
-        <color name="black" src="screenshot/black.gif">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="ru">Черного</title>
-            <title xml:lang="es">Negro</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-        </color>
     </colorset>
 </skin>
diff --git a/modules/member/tpl/colorset_list.html b/modules/member/tpl/colorset_list.html
index ddfc4d0b6..38ad56473 100644
--- a/modules/member/tpl/colorset_list.html
+++ b/modules/member/tpl/colorset_list.html
@@ -9,7 +9,7 @@
     <label for="colorset_{$key}">{$val->title}</label>
     <!--@if($val->screenshot)-->
     <br />
-    <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
+    <img src="../../../{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
     <!--@end-->
 </div>
 <!--@if($key%2==1)--><div class="clear"></div><!--@end-->
diff --git a/modules/member/tpl/css/member_admin.css b/modules/member/tpl/css/member_admin.css
index d58a3fcce..22cc6d357 100644
--- a/modules/member/tpl/css/member_admin.css
+++ b/modules/member/tpl/css/member_admin.css
@@ -6,3 +6,8 @@
 span.publicItem { display:inline; margin:0; font-weight:normal; color:#666666; }
 
 .display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; }
+
+
+.ui-sortable { list-style:none; margin:0; padding:0; }
+.ui-sortable li { display:block; width:100%; border:1px solid #E5E5E5; background:#F6F6F6; padding:5px; margin:3px 0; }
+.ui-sortable li.active { cursor:move; }
diff --git a/modules/member/tpl/delete_form.html b/modules/member/tpl/delete_form.html
index bf132f835..ee030238d 100644
--- a/modules/member/tpl/delete_form.html
+++ b/modules/member/tpl/delete_form.html
@@ -5,8 +5,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, delete_member)" class="gap1">
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->user_id}</div></th>
         <td class="wide">{$member_info->user_id}</td>
@@ -20,10 +20,10 @@
         <td>{$member_info->email_address}</td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </td>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/member/tpl/delete_members.html b/modules/member/tpl/delete_members.html
index e68a5be62..cd2730ebb 100644
--- a/modules/member/tpl/delete_members.html
+++ b/modules/member/tpl/delete_members.html
@@ -1,15 +1,15 @@
 <!--%import("filter/delete_members.xml")-->
 <!--%import("js/member_admin.js")-->
 
-<div id="popHeadder">
-    <h3>{$lang->cmd_delete} ({$lang->target} : {count($member_list)})</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_delete} ({$lang->target} : {count($member_list)})</h3>
 </div>
 
 <form action="./" method="get" id="fo_management" onsubmit="return procFilter(this, delete_members);">
 <input type="hidden" name="target_member_srls" value="{$member_srls}" />
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->nick_name}</div></th>
@@ -25,13 +25,10 @@
     </table>
 </div>
 
+<!--@if(count($member_list))-->
 <div id="popFooter">
-    <div class="tCenter gap1">
-    <!--@if(count($member_list))-->
-        <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-    <!--@end-->
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
 </div>
+<!--@end-->
 
 </form>
diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html
index 8aa264122..2f91e3c6b 100644
--- a/modules/member/tpl/denied_id_list.html
+++ b/modules/member/tpl/denied_id_list.html
@@ -9,24 +9,24 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
         <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th scope="col"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($member_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
+        <td>{$no}</td>
         <td>{$val->user_id}</td>
         <td>{$val->description}&nbsp;</td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="delete"><a href="#" onclick="doUpdateDeniedID('{$val->user_id}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="#" onclick="doUpdateDeniedID('{$val->user_id}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 </tbody>
@@ -50,7 +50,7 @@
 <input type="hidden" name="page" value="{$page}" />
 
 <div>
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->user_id}</div></th>
         <td class="wide"><input type="text" name="user_id" class="inputTypeText w400" /></td>
@@ -60,9 +60,9 @@
         <td class="left"><textarea name="description" class="inputTypeTextArea w400"></textarea></td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </div>
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html
index fbabf20f4..8c81dcde6 100644
--- a/modules/member/tpl/group_list.html
+++ b/modules/member/tpl/group_list.html
@@ -2,6 +2,9 @@
 <!--%import("filter/update_group.xml")-->
 
 <!--#include("header.html")-->
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("filebox")-->
+
 
 <!-- 그룹의 삭제와 관련된 form -->
 <form id="fo_group_info" action="./" method="get">
@@ -10,7 +13,7 @@
 <input type="hidden" name="mode" value="" />
 </form>
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->group_title}</div></th>
@@ -28,14 +31,14 @@
     <!--@end-->
     <!--@foreach($group_list as $group_srl => $group_info)-->
     <tr class="row{$cycle_idx}">
-        <td class="nowrap">{$group_info->title}</td>
+        <td><!--@if($config->group_image_mark=='Y' && $group_info->image_mark)--><img src="{$group_info->image_mark}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
         <td>{nl2br($group_info->description)}&nbsp;</td>
-        <td class="date center nowrap">{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
-        <td class="center number"><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
-        <td class="modify"><a href="{getUrl('group_srl',$group_info->group_srl)}">{$lang->cmd_modify}</a></td>
-        <td class="delete">
+        <td>{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
+        <td><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
+        <td><a href="{getUrl('group_srl',$group_info->group_srl)}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
+        <td>
             <!--@if($group_info->is_default!='Y' && $group_info->is_admin !='Y')-->
-            <a href="#" onclick="doUpdateGroup('{$group_info->group_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a>
+            <a href="#" onclick="doUpdateGroup('{$group_info->group_srl}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
             <!--@else-->
             &nbsp;
             <!--@end-->
@@ -51,7 +54,7 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="group_srl" value="" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->group_title}</div></th>
         <td class="wide"><input type="text" name="title" class="inputTypeText w400" /></td>
@@ -64,12 +67,21 @@
         <th scope="row"><div>{$lang->description}</div></th>
         <td><textarea name="description" class="inputTypeTextArea w400"></textarea></td>
     </tr>
+
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <th scope="row"><div>{$lang->group_image_mark}</div></th>
+        <td class="left">
+            <div id="filebox_preview_image_mark" style="width:100px;height:100px;display:none"></div>
+            <input type="hidden" name="image_mark" value="" />
+            <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
+            <span id="filebox_cancel_image_mark" class="button red" style="display:none"><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
         </td>
     </tr>
+
+    <tr>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
+    </tr>
     </table>
-
-
-</form>
+</form>
\ No newline at end of file
diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html
index daa306b48..85afa4b2c 100644
--- a/modules/member/tpl/group_update_form.html
+++ b/modules/member/tpl/group_update_form.html
@@ -1,5 +1,6 @@
 <!--#include("header.html")-->
 <!--%import("filter/update_group.xml")-->
+<!--%load_js_plugin("filebox")-->
 
 <!-- 그룹 수정 -->
 <!--@if($selected_group)-->
@@ -7,7 +8,7 @@
 <input type="hidden" name="group_srl" value="{$selected_group->group_srl}" />
 <input type="hidden" name="mode" value="update" />
 <!--@if($selected_group->is_default=='Y')--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->group_title}</div></th>
         <td class="left"><input type="text" name="title" class="inputTypeText w400" value="{$selected_group->title}"/></td>
@@ -22,13 +23,23 @@
         <th scope="row"><div>{$lang->description}</div></th>
         <td class="left"><textarea name="description" class="inputTypeTextArea w400">{$selected_group->description}</textarea></td>
     </tr>
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
+    <tr>
+        <th scope="row"><div>{$lang->group_image_mark}</div></th>
+        <td class="left">
+            <div id="filebox_preview_image_mark" style="width:100px;height:100px;<!--@if(!$selected_group->image_mark)-->display:none<!--@endif-->"></div>
+            <input type="hidden" name="image_mark" value="{$selected_group->image_mark}" />
+            <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
+            <span id="filebox_cancel_image_mark" class="button red"<!--@if(!$selected_group->image_mark)--> style="display:none" <!--@endif-->><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
+            <script type="text/javascript">//<![CDATA[
+                XE.filebox.init('image_mark');
+            //]]></script>
         </td>
     </tr>
+    <tr class="row2">
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
+        </th>
+    </tr>
     </table>
-
 </form>
 <!--@end-->
-
diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html
index 09011ba71..16d5193e2 100644
--- a/modules/member/tpl/header.html
+++ b/modules/member/tpl/header.html
@@ -1,18 +1,12 @@
 <!--%import("js/member_admin.js")-->
 <!--%import("js/krzip_search.js")-->
+<!--%import("css/member_admin.css")-->
 
-<h3>{$lang->member} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->member} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_member)}</div>
 
 <div class="header4">
-<!-- 정보 -->
-    <!--@if($total_count)-->
-    <div class="summary">
-        <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-    </div>
-    <!--@end-->
-
     <ul class="localNavigation">
         <li <!--@if($act=='dispMemberAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a></li>
         <li <!--@if($act=='dispMemberAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminConfig')}">{$lang->cmd_module_config}</a></li>
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html
index de0744b00..67b546099 100644
--- a/modules/member/tpl/insert_join_form.html
+++ b/modules/member/tpl/insert_join_form.html
@@ -5,7 +5,7 @@
 <input type="hidden" name="member_join_form_srl" value="{$join_form->member_join_form_srl}" />
 <input type="hidden" name="default_value" value="<!--@if(is_array($join_form->default_value))-->{implode($join_form->default_value,'|@|')}<!--@end-->" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2" id="zone_column_type">
         <th scope="row"><div>{$lang->column_type}</div></th>
         <td>
@@ -77,9 +77,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index 5737711dd..d76c7ffe0 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -4,6 +4,7 @@
 
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->
+<!--%load_js_plugin("filebox")-->
 
 <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, insert)">
     <input type="hidden" name="page" value="{$page}" />
@@ -14,8 +15,8 @@
     <!--@end-->
 
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->member_default_info}</caption>
+    <h4 class="xeAdmin">{$lang->member_default_info}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->user_id}</div></th>
         <td class="wide">
@@ -123,7 +124,7 @@
     <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>
-            <textarea name="description" class="inputTypeTextArea w400">{htmlspecialchars($member_info->description)}</textarea>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($member_info->description)}</textarea>
             <p>{$lang->about_member_description}</p>
         </td>
     </tr>
@@ -141,8 +142,8 @@
 
     <!--@if($extend_form_list)-->
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->member_extend_info}</caption>
+    <h4 class="xeAdmin">{$lang->member_extend_info}</h4>
+    <table cellspacing="0" class="rowTable">
     <!--@foreach($extend_form_list as $key => $val)-->
         <!--@if($val->is_active=='Y')-->
     <tr class="row{$cycle_idx}">
@@ -234,14 +235,20 @@
     </table>
     <!--@end-->
 
-    <div class="tRight">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        <!--@if($member_srl)-->
-        <a href="{getUrl('act','dispMemberAdminInfo')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-        <!--@else-->
-        <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-        <!--@end-->
-    </div>
+    <table cellspacing="0" class="rowTable">
+    <tbody>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <!--@if($member_srl)-->
+            <a href="{getUrl('act','dispMemberAdminInfo')}" class="button"><span>{$lang->cmd_cancel}</span></a>
+            <!--@else-->
+            <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_cancel}</span></a>
+            <!--@end-->
+        </td>
+    </tr>
+    </tbody>
+    </table>
 </form>
 
 
diff --git a/modules/member/tpl/join_form_list.html b/modules/member/tpl/join_form_list.html
index 4818e7614..63888578c 100644
--- a/modules/member/tpl/join_form_list.html
+++ b/modules/member/tpl/join_form_list.html
@@ -8,7 +8,7 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->column_title}</div></th>
@@ -17,7 +17,7 @@
         <th scope="col"><div>{$lang->is_active}</div></th>
         <th scope="col"><div>{$lang->is_required}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="3"><div>&nbsp;</div></th>
+        <th scope="col" colspan="4"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
@@ -25,22 +25,20 @@
     <tr class="row{$cycle_idx}">
         <td>{htmlspecialchars($val->column_title)}</td>
         <td>{$val->column_name}</td>
-        <td class="nowrap">{$lang->column_type_list[$val->column_type]}</td>
-        <td class="number center">{$val->is_active}</td>
-        <td class="number center">{$val->required}</td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="moveupdown">
-            <a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','up');return false;" class="up">{$lang->cmd_move_up}</a>
-            <a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','down');return false;" class="down">{$lang->cmd_move_down}</a>
-        </td>
-        <td class="modify center"><a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}">{$lang->cmd_modify}</a></td>
-        <td class="delete center"><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
+        <td>{$lang->column_type_list[$val->column_type]}</td>
+        <td>{$val->is_active}</td>
+        <td>{$val->required}</td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','up');return false;" title="{$lang->cmd_move_up}" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a></td>
+        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','down');return false;" title="{$lang->cmd_move_down}" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a></td>
+        <td><a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
+        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
     <tr class="row2">
-        <td colspan="9" class="right">
-            <a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
+        <th colspan="10" class="button">
+            <a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </th>
     </tr>
 </tbody>
 </table>
diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js
index dd2cfe88c..3f1a1cb8e 100644
--- a/modules/member/tpl/js/member_admin.js
+++ b/modules/member/tpl/js/member_admin.js
@@ -338,3 +338,28 @@ function completeDeleteMembers(ret_obj) {
     window.close();
 }
 
+
+function doGorupImageMarkUpdateOrder(id) {
+    var sort = jQuery('#'+id).sortable('toArray');
+
+    var params = [];
+    params['group_image_mark_order'] = [];
+    jQuery.each(sort, function(i, val) {
+        params['group_image_mark_order'][params['group_image_mark_order'].length] = val.replace('group_srl_', '');
+    });
+
+    var response_tags = new Array('error','message');
+    exec_xml('member', 'procMemberAdminGroupImageMarkUpdateOrder', params, completeGroupImageMarkUpdateOrder, response_tags);
+}
+
+function completeGroupImageMarkUpdateOrder(ret_obj) {
+    alert(ret_obj['message']);
+}
+
+jQuery(function($) {
+    $("#group_image_mark_order")
+        .sortable({
+            cursor: 'move',
+            cancel: '.inactive'
+        });
+});
diff --git a/modules/member/tpl/manage_member_group.html b/modules/member/tpl/manage_member_group.html
index 5df01101d..cc8aecf23 100644
--- a/modules/member/tpl/manage_member_group.html
+++ b/modules/member/tpl/manage_member_group.html
@@ -1,15 +1,15 @@
 <!--%import("filter/manage_member_group.xml")-->
 <!--%import("js/member_admin.js")-->
 
-<div id="popHeadder">
-    <h3>{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})</h3>
 </div>
 
 <form action="./" method="get" id="fo_management" onsubmit="return procFilter(this, manage_member_group);">
 <input type="hidden" name="member_srl" value="{$member_srls}" />
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <td>
             <!--@foreach($group_list as $key => $val)-->
@@ -21,14 +21,14 @@
     </tr>
     <!--@if(count($member_list))-->
     <tr>
-        <td class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_apply}" /></span>
-        </td>
+        <th class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
+        </th>
     </tr>
     <!--@end-->
     </table>
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="crossTable">
     <thead>
     <tr>
         <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
@@ -46,10 +46,4 @@
     </table>
 </div>
 
-<div id="popFooter">
-    <div class="tCenter gap1">
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
-</div>
-
 </form>
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index 32fbfc544..c94f1d05d 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -7,7 +7,7 @@
 <input type="hidden" name="temp_srl" value="" />
 <input type="hidden" name="agreement" value="{htmlspecialchars($config->agreement)}" />
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <tr class="row2">
     <th scope="row"><div>{$lang->webmaster_name}</div></th>
     <td>
@@ -83,6 +83,15 @@
         {$lang->image_mark_max_height} : <input type="text" name="image_mark_max_height" size="3" value="{$config->image_mark_max_height}" class="inputTypeText"/>px<br />
     </td>
 </tr>
+<tr>
+    <th scope="row"><div>{$lang->group_image_mark}</div></th>
+    <td>
+        <p>
+            <input type="checkbox" name="group_image_mark" value="Y" <!--@if($config->group_image_mark=='Y')-->checked="checked"<!--@end--> class="checkbox"/>
+            {$lang->about_group_image_mark}
+        </p>
+    </td>
+</tr>
 <tr class="row2">
     <th scope="row"><div>{$lang->signature_max_height}</div></th>
     <td>
@@ -148,12 +157,12 @@
     <td><div id="member_colorset"></div></td>
 </tr>
 <tr class="row2">
-    <td colspan="2" class="right">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
+    <th colspan="2" class="button">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
         <!--@if($module=="admin")-->
         <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
         <!--@end-->
-    </td>
+    </th>
 </tr>
 </table>
 
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index b04b7390a..dcbce5e9d 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -8,7 +8,7 @@
     <input type="hidden" name="member_srl" />
 </form>
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <tr class="row2">
     <th scope="row"><div>{$lang->user_id}</div></th>
     <td>{htmlspecialchars($member_info->user_id)}</td>
@@ -173,15 +173,15 @@
     <td>{htmlspecialchars($member_info->description)}&nbsp;</td>
 </tr>
 <tr class="row2">
-    <td colspan="2" class="right">
-        <a href="{getUrl('act','dispMemberAdminInsert')}" class="button"><span>{$lang->cmd_modify}</span></a>
+    <th colspan="2" class="button">
+        <a href="{getUrl('act','dispMemberAdminInsert')}" class="button black strong"><span>{$lang->cmd_modify}</span></a>
         <!--@if($member_info->is_admin!='Y')-->
-        <a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl',$member_info->member_srl)}" class="button"><span>{$lang->cmd_delete}</span></a>
+        <a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl',$member_info->member_srl)}" class="button red"><span>{$lang->cmd_delete}</span></a>
         <!--@end-->
         <!--@if($module=="admin")-->
         <a href="{getUrl('act','dispMemberAdminList','module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
         <!--@end-->
-    </td>
+    </th>
 </tr>
 </table>
 
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index d43317555..f021161e7 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -29,73 +29,74 @@
             <!--@end-->
         </select>
         <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
         <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
     </fieldset>
 </form>
 
 <!-- 목록 -->
 <form method="get" action="./" id="member_fo">
-<table cellspacing="0" class="adminTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;"/></div></th>
-        <th scope="col" class="quarter_wide"><div>{$lang->user_id}</div></th>
-        <th scope="col" class="quarter_wide"><div>{$lang->user_name}</div></th>
-        <th scope="col" class="quarter_wide"><div>{$lang->nick_name}</div></th>
-        <th scope="col" class="quarter_wide"><div>{$lang->email_address}</div></th>
-        <th scope="col" class="quarter_wide"><div>{$lang->signup_date}</div></th>
-        <th scope="col"><div>{$lang->last_login}</div></th>
-        <th scope="col" colspan="2"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($member_list as $no => $val)-->
-    {@ $val->group_list = implode(', ', $val->group_list)}
-    <tr class="row{$cycle_idx}">
-        <td class="center number" rowspan="2">{$no}</td>
-        <td class="center" rowspan="2"><input type="checkbox" name="cart" value="{$val->member_srl}"/></td>
-        <td><a href="{getUrl('act','dispMemberAdminInfo','member_srl',$val->member_srl)}">{htmlspecialchars($val->user_id)}</a></td>
-        <td>{htmlspecialchars($val->user_name)}</td>
-        <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
-        <td>{$val->email_address}</td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-        <td class="date center nowrap">{zdate($val->last_login,"Y-m-d H:i:s")}</td>
-        <td class="nowrap">
-            <!--@if($val->homepage)--><a href="{$val->homepage}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
-            <!--@if($val->blog)--><a href="{$val->blog}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
-        </td>
-        <td class="delete center"><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}">{$lang->cmd_delete}</a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>
-    </tr>
-    <tr>
-        <td colspan="8"><p>{$val->group_list}&nbsp;</p></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<!-- 버튼 -->
-<div class="fl gap1">
-    <a href="#" onclick="doManageMemberGroup(); return false;" class="button"><span>{$lang->cmd_member_group}</span></a>
-    <a href="#" onclick="doDeleteMembers(); return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-</div>
-<div class="fr gap1">
-    <a href="{getUrl('act','dispMemberAdminInsert','member_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-</div>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+    <table cellspacing="0" class="rowTable">
+    <caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+    <thead>
+        <tr>
+            <th scope="col"><div>{$lang->no}</div></th>
+            <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;"/></div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->user_id}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->user_name}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->nick_name}</div></th>
+            <th scope="col" class="quarter_wide"><div>{$lang->signup_date}</div></th>
+            <th scope="col"><div>{$lang->last_login}</div></th>
+            <th scope="col" colspan="2"><div>&nbsp;</div></th>
+        </tr>
+    </thead>
+    <tbody>
+        <!--@foreach($member_list as $no => $val)-->
+        {@ $val->group_list = implode(', ', $val->group_list)}
+        <tr class="row{$cycle_idx}">
+            <td rowspan="2">{$no}</td>
+            <td rowspan="2"><input type="checkbox" name="cart" value="{$val->member_srl}"/></td>
+            <td><a href="{getUrl('act','dispMemberAdminInfo','member_srl',$val->member_srl)}">{htmlspecialchars($val->user_id)}</a></td>
+            <td>{htmlspecialchars($val->user_name)}</td>
+            <td><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
+            <td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
+            <td>{zdate($val->last_login,"Y-m-d H:i:s")}</td>
+            <td class="nowrap">
+                <!--@if($val->homepage)--><a href="{$val->homepage}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
+                <!--@if($val->blog)--><a href="{$val->blog}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
+            </td>
+            <td><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>
+        </tr>
+        <tr>
+            <td colspan="8"><p>{$val->group_list}&nbsp;</p></td>
+        </tr>
         <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+    </tbody>
+    </table>
+
+    <!-- 버튼 -->
+    <div class="clear">
+        <div class="fl">
+            <a href="#" onclick="doManageMemberGroup(); return false;" class="button blue"><span>{$lang->cmd_member_group}</span></a>
+            <a href="#" onclick="doDeleteMembers(); return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+        </div>
+        <div class="fr">
+            <a href="{getUrl('act','dispMemberAdminInsert','member_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </div>
+    </div>
+
+    <!-- 페이지 네비게이션 -->
+    <div class="pagination a1">
+        <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+        <!--@while($page_no = $page_navigation->getNextPage())-->
+            <!--@if($page == $page_no)-->
+                <strong>{$page_no}</strong> 
+            <!--@else-->
+                <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+            <!--@end-->
+        <!--@end-->
+        <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+    </div>
 </form>
 
 <form action="./" method="get" class="adminSearch">
@@ -125,7 +126,7 @@
             <!--@end-->
         </select>
         <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
         <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
     </fieldset>
 </form>
diff --git a/modules/menu/conf/info.xml b/modules/menu/conf/info.xml
index eb22710fe..e865d7e3f 100644
--- a/modules/menu/conf/info.xml
+++ b/modules/menu/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">메뉴</title>
-    <title xml:lang="zh-CN">菜单</title>
+    <title xml:lang="zh-CN">菜单管理</title>
     <title xml:lang="jp">メニュー</title>
     <title xml:lang="en">Menu</title>
     <title xml:lang="es">Menú</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">可建立並管理連結版面和模組的選單。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>manager</category>
+    <category>construction</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml
index 05d662c18..c940f7f52 100644
--- a/modules/menu/conf/module.xml
+++ b/modules/menu/conf/module.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispMenuAdminContent" type="view" admin_index="true" standalone="true" />
         <action name="dispMenuAdminInsert" type="view" standalone="true" />
diff --git a/modules/menu/lang/ko.lang.php b/modules/menu/lang/ko.lang.php
index 3c5f29a5d..5c0020222 100644
--- a/modules/menu/lang/ko.lang.php
+++ b/modules/menu/lang/ko.lang.php
@@ -24,24 +24,24 @@
     $lang->menu_hover_btn = '마우스오버';
     $lang->menu_active_btn = '선택시';
     $lang->menu_group_srls = '그룹 제한';
-    $lang->layout_maker = "레이아웃 제작자";
-    $lang->layout_history = "변경 사항 ";
-    $lang->layout_info = "레이아웃 정보";
+    $lang->layout_maker = '레이아웃 제작자';
+    $lang->layout_history = '변경 사항 ';
+    $lang->layout_info = '레이아웃 정보';
     $lang->layout_list = '레이아웃 목록';
     $lang->downloaded_list = '다운로드 목록';
     $lang->limit_menu_depth = '표시 가능';
 
     $lang->cmd_make_child = '하부 메뉴 추가';
-    $lang->cmd_move_to_installed_list = "생성된 목록 보기";
-    $lang->cmd_enable_move_menu = "메뉴 옮기기 (선택후 위 메뉴를 드래그하세요)";
-    $lang->cmd_search_mid = "mid 찾기";
+    $lang->cmd_move_to_installed_list = '생성된 목록 보기';
+    $lang->cmd_enable_move_menu = '메뉴 옮기기 (선택후 위 메뉴를 드래그하세요)';
+    $lang->cmd_search_mid = 'mid 찾기';
 
     $lang->msg_cannot_delete_for_child = '하부 메뉴가 있는 메뉴는 삭제하실 수 없습니다';
 
     $lang->about_title = '모듈에 연결시 쉽게 구분할 수 있는 제목을 입력해주세요';
     $lang->about_menu_management = "메뉴관리는 선택하신 레이아웃에서 사용하는 메뉴를 구성할 수 있도록 합니다.\n정해진 단계까지 메뉴를 구성 가능하며 입력하신 메뉴를 클릭하시면 상세 정보를 입력할 수 있습니다.\n폴더그림을 클릭하시면 메뉴를 확장하실 수 있습니다.\n간혹 메뉴가 정상적으로 나타나지 않으면 \"캐시파일 재생성\" 버튼을 눌러서 정보를 갱신하세요.\n* 정해진 단계 이상의 메뉴는 제대로 표시되지 않을 수 있습니다.";
     $lang->about_menu_name = '관리 및 이미지 버튼이 아닐경우 메뉴 명으로 나타날 제목입니다';
-    $lang->about_menu_url = "메뉴를 선택시 이동한 URL입니다.<br />다른 모듈을 연결하고자 할 때에는 id값만 입력해주시면 됩니다.<br />내용이 없을시 메뉴를 선택하여도 아무런 동작이 없게 됩니다.";
+    $lang->about_menu_url = '메뉴를 선택시 이동한 URL입니다.<br />다른 모듈을 연결하고자 할 때에는 mid값만 입력해주시면 됩니다.<br />내용이 없을시 메뉴를 선택하여도 아무런 동작이 없게 됩니다.';
     $lang->about_menu_open_window = '메뉴 선택시 새창으로 띄울 것인지를 정할 수 있습니다';
     $lang->about_menu_expand = '트리메뉴(tree_menu.js)를 사용시 늘 펼쳐진 상태로 있게 합니다';
     $lang->about_menu_img_btn = '이미지 버튼을 등록하시면 레이아웃에서 자동으로 이미지 버튼으로 교체되어 표시가 됩니다.';
@@ -49,5 +49,5 @@
 
     $lang->about_menu = "메뉴모듈은 생성된 모듈을 편리한 메뉴관리기를 통해 정리하고 레이아웃과 연결하여 별도의 수작업 없이 완성된 사이트를 구축하도록 도와줍니다..\n메뉴는 사이트를 관리하기 보다는 모듈과 레이아웃을 연결해 주며 레이아웃을 통해서 여러가지 형태의 메뉴를 표시할 수 있도록 하는 정보만 가지고 있습니다.";
 
-    $lang->alert_image_only = "이미지 파일만 등록가능합니다.";
+    $lang->alert_image_only = '이미지 파일만 등록가능합니다.';
 ?>
diff --git a/modules/menu/lang/zh-CN.lang.php b/modules/menu/lang/zh-CN.lang.php
index 8ac54f3cf..8da5153fa 100644
--- a/modules/menu/lang/zh-CN.lang.php
+++ b/modules/menu/lang/zh-CN.lang.php
@@ -39,7 +39,7 @@
     $lang->msg_cannot_delete_for_child = '有下级菜单的菜单不能删除。';
 
     $lang->about_title = '请输入连接模块时容易区分的标题。';
-    $lang->about_menu_management = "菜单管理可以构筑被选布局中使用的菜单。\n不仅可以构筑指定级(层级)菜单，点击输入的菜单项即可对其详细设置。\n点击菜单前置图标可以展开菜单。\n偶尔不能正常显示菜单时，请按\"缓冲文件再生成\"按钮更新信息。\n* 可能不能正常显示指定级(层级)以上的菜单。";
+    $lang->about_menu_management = "在此创建要在布局中使用的菜单。\n点击菜单前的文件夹图标可以展开收缩菜单。\n偶尔不能正常显示菜单时，请按\"更新缓冲\"按钮更新信息。\n* 不能正常显示指定级(层级)以上的菜单，创建菜单项的时候，请确认你要使用的布局究竟支持多少级别的菜单。";
     $lang->about_menu_name = '输入不是图片按钮时显示为菜单名标题。';
     $lang->about_menu_url = "点击菜单时要移动的URL。<br />连接其他模块时只输入id值即可。<br />没有内容时点击菜单也不会有什么动作。";
     $lang->about_menu_open_window = '可以设置点击菜单时是否要在新窗口中打开。';
diff --git a/modules/menu/lang/zh-TW.lang.php b/modules/menu/lang/zh-TW.lang.php
index 28ea5aea8..db527847c 100644
--- a/modules/menu/lang/zh-TW.lang.php
+++ b/modules/menu/lang/zh-TW.lang.php
@@ -41,11 +41,11 @@
     $lang->about_title = '請輸入連接模組時，容易區分的標題。';
     $lang->about_menu_management = "選單管理可以建構所選擇版面中使用的選單。\n不僅可以建構指定級(層級)選單，點擊輸入的選單名稱即可對其進行詳細設置。\n點擊選單前圖標可以展開選單。\n偶爾無法正常顯示選單時，請按\"重新建立暫存檔\"按鈕更新資料。\n* 可能無法正常顯示指定級(層級)以上的選單。";
     $lang->about_menu_name = '輸入不是圖片按鈕時，顯示為選單名標題。';
-    $lang->about_menu_url = "按選單名稱後，要移往的網址。<br />連結其他模組時，只要輸入模組id即可。<br />沒有內容時，點擊選單不會產生任何事情。";
+    $lang->about_menu_url = "按選單名稱後，要移往的網址。<br />連結其他模組時，只要輸入模組mid即可。<br />沒有內容時，點擊選單不會產生任何事情。";
     $lang->about_menu_open_window = '按選單後，是否要以新視窗開啟。';
-    $lang->about_menu_expand = '使用樹型選單（tree_menu.js）時，總是呈現展開狀態。';
+    $lang->about_menu_expand = '使用樹型選單(tree_menu.js)時，總是呈現展開狀態。';
     $lang->about_menu_img_btn = '如果登錄圖片按鈕，在版面中會自動替換顯示為圖片按鈕。';
-    $lang->about_menu_group_srls = '如果選擇用戶組，只有所屬組用戶才能看到此選單。 —（xml檔案中不能隱藏）';
+    $lang->about_menu_group_srls = '如果選擇用戶組，只有所屬組用戶才能看到此選單。(如果可直接連結xml檔案，內容將無法隱藏)';
 
     $lang->about_menu = "選單模組可以透過選單管理器，管理已建立的模組並可和版面相互連結，輕鬆架設一個完整的網站。\n選單模組雖然可連結模組和版面，並透過版面來顯示多種類型的選單，但它不具備管理網站的功能。";
 
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 7769e9f8b..9042ec931 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -18,6 +18,8 @@
          **/
         function procMenuAdminInsert() {
             // 입력할 변수 정리
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
             $args->title = Context::get('title');
             $args->menu_srl = getNextSequence();
             $args->listorder = $args->menu_srl * -1;
@@ -49,7 +51,10 @@
          **/
         function procMenuAdminDelete() {
             $menu_srl = Context::get('menu_srl');
-
+            return $this->deleteMenu($menu_srl);
+        }
+        
+        function deleteMenu($menu_srl) {
             // 캐시 파일 삭제
             $cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
             if(count($cache_list)) {
@@ -73,7 +78,7 @@
             $output = executeQuery("menu.deleteMenu", $args);
             if(!$output->toBool()) return $output;
 
-            $this->setMessage('success_deleted');
+            return new Object(0,'success_deleted');
         }
 
         /**
@@ -89,25 +94,13 @@
             $source_args->group_srls = str_replace('|@|',',',$source_args->group_srls);
             $source_args->parent_srl = (int)$source_args->parent_srl;
 
-            // 메뉴 이름 체크
-            $lang_supported = Context::get('lang_supported');
-            $name_inserted = false;
-            foreach($lang_supported as $key => $val) {
-                $menu_name[$key] = $source_args->{"menu_name_".strtolower($key )};
-                if($menu_name[$key]) $name_inserted = true;
-            }
-            if(!$name_inserted) {
-                global $lang;
-                return new Object(-1, sprintf($lang->filter->isnull, $lang->menu_name));
-            }
-
             // 변수를 다시 정리 (form문의 column과 DB column이 달라서)
             $args->menu_srl = $source_args->menu_srl;
             $args->menu_item_srl = $source_args->menu_item_srl;
             $args->parent_srl = $source_args->parent_srl;
             $args->menu_srl = $source_args->menu_srl;
             $args->menu_id = $source_args->menu_id;
-            $args->name = serialize($menu_name);
+            $args->name = $source_args->menu_name;
             $args->url = trim($source_args->menu_url);
             $args->open_window = $source_args->menu_open_window;
             $args->expand = $source_args->menu_expand;
@@ -209,41 +202,6 @@
         /**
          * @brief 메뉴의 메뉴를 이동
          **/
-/*
-        function procMenuAdminMoveItem() {
-            // 변수 설정
-            $menu_id = Context::get('menu_id');
-            $source_item_srl = str_replace('menu_'.$menu_id.'_','',Context::get('source_item'));
-            $target_item_srl = str_replace('menu_'.$menu_id.'_','',Context::get('target_item'));
-
-            // target_item 의 값을 구함
-            $oMenuModel = &getAdminModel('menu');
-            $target_item = $oMenuModel->getMenuItemInfo($target_item_srl);
-
-            // source_item에 target_item_srl의 parent_srl, listorder 값을 입력
-            $source_args->menu_item_srl = $source_item_srl;
-            $source_args->parent_srl = $target_item->parent_srl;
-            $source_args->listorder = $target_item->listorder;
-            $output = executeQuery('menu.updateMenuItemParent', $source_args);
-            if(!$output->toBool()) return $output;
-
-            // target_item의 listorder값을 +1해 준다
-            $target_args->menu_item_srl = $target_item_srl;
-            $target_args->parent_srl = $target_item->parent_srl;
-            $target_args->listorder = $target_item->listorder -1;
-            $output = executeQuery('menu.updateMenuItemParent', $target_args);
-            if(!$output->toBool()) return $output;
-
-            // xml파일 재생성
-            $xml_file = $this->makeXmlFile($target_item->menu_srl);
-
-            // return 변수 설정
-            $this->add('menu_srl', $target_item->menu_srl);
-            $this->add('xml_file', $xml_file);
-            $this->add('source_item_srl', $source_item_srl);
-        }
-*/
-
         function procMenuAdminMoveItem() {
             $menu_srl = Context::get('menu_srl');
             $mode = Context::get('mode');
@@ -255,8 +213,6 @@
             $this->moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode);
         }
 
-
-
         function moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode){
             // 원본 메뉴들을 구함
             $oMenuAdminModel = &getAdminModel('menu');
@@ -298,10 +254,8 @@
 
             $xml_file = $this->makeXmlFile($menu_srl);
             return $xml_file;
-//            $this->add('xml_file', $xml_file);
         }
 
-
         /**
          * @brief xml 파일을 갱신
          * 관리자페이지에서 메뉴 구성 후 간혹 xml파일이 재생성 안되는 경우가 있는데\n
@@ -377,6 +331,12 @@
             // xml파일 생성시 필요한 정보가 없으면 그냥 return
             if(!$menu_srl) return;
 
+            // 메뉴 정보를 구함
+            $args->menu_srl = $menu_srl;
+            $output = executeQuery('menu.getMenu', $args);
+            if(!$output->toBool() || !$output->data) return $output;
+            $site_srl = $output->data->site_srl;
+
             // DB에서 menu_srl에 해당하는 메뉴 아이템 목록을 listorder순으로 구해옴
             $args->menu_srl = $menu_srl;
             $args->sort_index = 'listorder';
@@ -440,11 +400,11 @@
                 '?>'.
                 '<root>%s</root>',
                 $header_script,
-                $this->getXmlTree($tree[0], $tree)
+                $this->getXmlTree($tree[0], $tree, $site_srl)
             );
 
             // php 캐시 파일 생성
-            $php_output = $this->getPhpCacheCode($tree[0], $tree);
+            $php_output = $this->getPhpCacheCode($tree[0], $tree, $site_srl);
             $php_buff = sprintf(
                 '<?php '.
                 'if(!defined("__ZBXE__")) exit(); '.
@@ -468,7 +428,7 @@
          * 메뉴 xml파일은 node라는 tag가 중첩으로 사용되며 이 xml doc으로 관리자 페이지에서 메뉴를 구성해줌\n
          * (tree_menu.js 에서 xml파일을 바로 읽고 tree menu를 구현)
          **/
-        function getXmlTree($source_node, $tree) {
+        function getXmlTree($source_node, $tree, $site_srl) {
             if(!$source_node) return;
 
             $oMenuAdminModel = &getAdminModel('menu');
@@ -477,10 +437,10 @@
                 $child_buff = "";
 
                 // 자식 노드의 데이터 가져옴
-                if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree);
+                if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl);
 
                 // 변수 정리
-                $names = $oMenuAdminModel->getMenuItemNames($node->name);
+                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
                 foreach($names as $key => $val) {
                     $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val)));
                 }
@@ -551,7 +511,7 @@
          * php로 된 캐시파일을 만들어서 db이용없이 바로 메뉴 정보를 구할 수 있도록 한다
          * 이 캐시는 ModuleHandler::displayContent() 에서 include하여 Context::set() 한다
          **/
-        function getPhpCacheCode($source_node, $tree) {
+        function getPhpCacheCode($source_node, $tree, $site_srl) {
             $output = array("buff"=>"", "url_list"=>array());
             if(!$source_node) return $output;
 
@@ -559,11 +519,11 @@
 
             foreach($source_node as $menu_item_srl => $node) {
                 // 자식 노드가 있으면 자식 노드의 데이터를 먼저 얻어옴
-                if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree);
+                if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl);
                 else $child_output = array("buff"=>"", "url_list"=>array());
 
                 // 변수 정리
-                $names = $oMenuAdminModel->getMenuItemNames($node->name);
+                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
                 foreach($names as $key => $val) {
                     $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val)));
                 }
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 774a5defc..124184722 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -18,7 +18,11 @@
          * @brief 전체 메뉴 목록을 구해옴
          **/
         function getMenuList($obj) {
-
+            if(!$obj->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $obj->site_srl = (int)$site_module_info->site_srl;
+            }
+            $args->site_srl = $obj->site_srl;
             $args->sort_index = $obj->sort_index;
             $args->page = $obj->page?$obj->page:1;
             $args->list_count = $obj->list_count?$obj->list_count:20;
@@ -36,8 +40,13 @@
         /**
          * @brief 등록된 모든 메뉴를 return
          **/
-        function getMenus() {
+        function getMenus($site_srl = 0) {
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
+            }
             // 일단 DB에서 정보를 가져옴
+            $args->site_srl = $site_srl ;
             $args->menu_srl = $menu_srl;
             $output = executeQuery('menu.getMenus', $args);
             if(!$output->data) return;
@@ -74,40 +83,28 @@
             if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
             else $node->group_srls = array();
 
-            $node->name = $this->getMenuItemNames($node->name);
-
+            $tmp_name = unserialize($node->name);
+            if($tmp_name && count($tmp_name) ) {
+                $selected_lang = array();
+                $rand_name = $tmp_name[Context::getLangType()];
+                if(!$rand_name) $rand_name = array_shift($tmp_name);
+                $node->name = $rand_name;
+            }
             return $node;
         }
 
         /**
          * @brief 다국어 지원을 위해 menu의 name을 언어별로 나눠서 return
          */
-        function getMenuItemNames($name) {
-            $lang_supported = Context::get('lang_supported');
-
-            $source_name = $name;
-            $name = unserialize($name);
-
-            // unserialize한 값이 없으면, 즉 beta 0.2.3 이전 버전이라면 정해진 값을 모든 언어에 맞게 처리
-            if(!$name) {
-                $name = array();
-                foreach($lang_supported as $key => $val) {
-                    $name[$key] = $source_name;
-                }
-            // 값이 있다면 혹시나 빠진 부분의 언어가 있는지 체크
-            } else {
-                $values = array_values($name);
-                $title_name = '';
-                for($i=0;$i<count($values);$i++) {
-                    $title_name = trim($values[$i]);
-                    if($title_name) break;;
-                }
-                foreach($lang_supported as $key => $val) {
-                    if(!$name[$key]) $name[$key] = $title_name;
-                }
+        function getMenuItemNames($source_name, $site_srl = null) {
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
             }
 
-            return $name;
+            // 언어코드 구함
+            $oModuleAdminModel = &getAdminModel('module');
+            return $oModuleAdminModel->getLangCode($site_srl, $source_name);
         }
 
         /**
@@ -144,15 +141,12 @@
                     $item_info->menu_item_srl = getNextSequence();
                 }
             }
-
             Context::set('item_info', $item_info);
 
             // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
             $oTemplate = &TemplateHandler::getInstance();
             $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
 
-            // return 할 변수 설정
-
             $this->add('tpl', str_replace("\n"," ",$tpl));
         }
 
diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php
index 50e17715d..fdc7c46e8 100644
--- a/modules/menu/menu.class.php
+++ b/modules/menu/menu.class.php
@@ -11,12 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('menu', 'view', 'dispMenuAdminContent');
-            $oModuleController->insertActionForward('menu', 'view', 'dispMenuAdminInsert');
-            $oModuleController->insertActionForward('menu', 'view', 'dispMenuAdminManagement');
-
             // 메뉴 사용할 디렉토리 생성
             FileHandler::makeDir('./files/cache/menu');
 
@@ -27,6 +21,11 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oDB = &DB::getInstance();
+
+            // 2009. 02. 11 menu 테이블에 site_srl 추가
+            if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+
             return false;
         }
 
@@ -34,7 +33,14 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            return new Object();
+            $oDB = &DB::getInstance();
+
+            // 2009. 02. 11 menu 테이블에 site_srl 추가
+            if(!$oDB->isColumnExists('menu', 'site_srl')) {
+                $oDB->addColumn('menu','site_srl','number',11,0,true);
+            }
+
+            return new Object(0, 'success_updated');
         }
 
         /**
diff --git a/modules/menu/queries/getMenuList.xml b/modules/menu/queries/getMenuList.xml
index cf57379e2..912ff8d4b 100644
--- a/modules/menu/queries/getMenuList.xml
+++ b/modules/menu/queries/getMenuList.xml
@@ -5,6 +5,9 @@
     <columns>
         <column name="*" />
     </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
+    </conditions>
     <navigation>
         <index var="sort_index" default="listorder" order="asc" />
         <list_count var="list_count" default="20" />
diff --git a/modules/menu/queries/getMenus.xml b/modules/menu/queries/getMenus.xml
index 1c2667537..5d33c344e 100644
--- a/modules/menu/queries/getMenus.xml
+++ b/modules/menu/queries/getMenus.xml
@@ -5,6 +5,9 @@
     <columns>
         <column name="*" />
     </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
+    </conditions>
     <navigation>
         <index var="sort_index" default="listorder" order="asc" />
     </navigation>
diff --git a/modules/menu/queries/insertMenu.xml b/modules/menu/queries/insertMenu.xml
index 6f09c6708..06305fb98 100644
--- a/modules/menu/queries/insertMenu.xml
+++ b/modules/menu/queries/insertMenu.xml
@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
+        <column name="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" />
         <column name="listorder" var="listorder" notnull="notnull" />
         <column name="regdate" var="regdate" default="curdate()" />
diff --git a/modules/menu/schemas/menu.xml b/modules/menu/schemas/menu.xml
index c8c6300b9..dcd74b847 100644
--- a/modules/menu/schemas/menu.xml
+++ b/modules/menu/schemas/menu.xml
@@ -1,6 +1,7 @@
 <table name="menu">
     <column name="menu_srl" type="number" size="12" notnull="notnull" primary_key="primary_key" />
+    <column name="site_srl" type="number" size="11" notnull="notnull" default="0" index="menu_site_srl" />
     <column name="title" type="varchar" size="250" />
-    <column name="listorder" type="number" size="11" default="0" inex="idx_listorder" />
+    <column name="listorder" type="number" size="11" default="0" index="idx_listorder" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/menu/schemas/menu_item.xml b/modules/menu/schemas/menu_item.xml
index db87077e3..7b74e02f4 100644
--- a/modules/menu/schemas/menu_item.xml
+++ b/modules/menu/schemas/menu_item.xml
@@ -10,6 +10,6 @@
     <column name="hover_btn" type="varchar" size="255" />
     <column name="active_btn" type="varchar" size="255" />
     <column name="group_srls" type="text" />
-    <column name="listorder" type="number" size="11" default="0" inex="idx_listorder" />
+    <column name="listorder" type="number" size="11" default="0" index="idx_listorder" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/menu/tpl/css/menu.css b/modules/menu/tpl/css/menu.css
index e66ed9512..8b00a2094 100644
--- a/modules/menu/tpl/css/menu.css
+++ b/modules/menu/tpl/css/menu.css
@@ -9,5 +9,4 @@ h3 { margin:0 20px 0 20px; }
 .menuListZone td.category_zone { padding-right:10px; }
 
 #category_list { padding:.5em 0 .5em 0; margin-bottom:2em; width:250px; overflow:hidden; float:left; position:absolute; left:10px;}
-#menu_zone_info { margin-left:10px; width:550px; _width:530px; float:left; position:absolute; right:10px;}
-*:first-child+html #category_info { width:540px; }
+#menu_zone_info { width:560px; position:absolute; margin:0 auto; left:0; right:0; z-index:9999;}
diff --git a/modules/menu/tpl/header.html b/modules/menu/tpl/header.html
index c98cb6ac4..7c81b3321 100644
--- a/modules/menu/tpl/header.html
+++ b/modules/menu/tpl/header.html
@@ -1,5 +1,5 @@
 <!--%import("js/board_admin.js")-->
 
-<h3>{$lang->menu} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->menu} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_menu)}</div>
diff --git a/modules/menu/tpl/index.html b/modules/menu/tpl/index.html
index b7f1216f5..8b2823057 100644
--- a/modules/menu/tpl/index.html
+++ b/modules/menu/tpl/index.html
@@ -3,39 +3,36 @@
 
 <!--#include("header.html")-->
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
-
 <!-- 삭제를 위한 임시 form -->
 <form id="fo_menu" action="./" method="get">
     <input type="hidden" name="menu_srl" value="" />
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col" class="wide"><div>{$lang->title}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th scope="col" colspan="2"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($menu_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$no}</td>
-        <td><a href="{getUrl('act','dispMenuAdminManagement','menu_srl',$val->menu_srl)}">{htmlspecialchars($val->title)}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="delete center"><a href="#" onclick="doDeleteMenu('{$val->menu_srl}');return false;">{$lang->cmd_delete}</a></td>
+        <td class="wide">{htmlspecialchars($val->title)}</td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispMenuAdminManagement','menu_srl',$val->menu_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="#" onclick="doDeleteMenu('{$val->menu_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="4" class="right">
-            <a href="{getUrl('act','dispMenuAdminInsert','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
+        <th colspan="5" class="button">
+            <a href="{getUrl('act','dispMenuAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+        </th>
     </tr>
 </tbody>
 </table>
diff --git a/modules/menu/tpl/js/menu_admin.js b/modules/menu/tpl/js/menu_admin.js
index ba874e686..8afbda965 100644
--- a/modules/menu/tpl/js/menu_admin.js
+++ b/modules/menu/tpl/js/menu_admin.js
@@ -234,4 +234,4 @@ function completeInsertMenu(ret_obj) {
 
     //var url = current_url.setQuery('act','dispMenuAdminManagement').setQuery('menu_srl',menu_srl);
     //window.open(url);
-} 
\ No newline at end of file
+} 
diff --git a/modules/menu/tpl/js/menu_tree.js b/modules/menu/tpl/js/menu_tree.js
index de8ace729..cab534449 100644
--- a/modules/menu/tpl/js/menu_tree.js
+++ b/modules/menu/tpl/js/menu_tree.js
@@ -2,7 +2,7 @@ function Tree(url){
     // clear tree;
     jQuery('#menu > ul > li > ul').remove();
 
-    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
+    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
 
     //ajax get data and transeform ul il
     jQuery.get(url,function(data){
@@ -16,17 +16,17 @@ function Tree(url){
             var node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
 
             // button
-            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){
+            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){
                 addNode(node_srl,e);
                 return false;
             }).appendTo(node);
 
-            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" /></a>').bind("click",function(e){
+            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" alt="'+lang_cmd_modify+'" title="'+lang_cmd_modify+'" /></a>').bind("click",function(e){
                 modifyNode(node_srl,e);
                 return false;
             }).appendTo(node);
 
-            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" /></a>').bind("click",function(e){
+            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" alt="'+lang_cmd_delete+'" title="'+lang_cmd_delete+'" /></a>').bind("click",function(e){
                 deleteNode(node_srl);
                 return false;
             }).appendTo(node);
@@ -128,8 +128,7 @@ function modifyNode(node_srl,e){
             };
 
     jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
-        jQuery('#menu_zone_info').html(data.tpl);
-        jQuery('#menu_zone_info').html(data.tpl).css("margin-top",e.pageY-400);
+        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
     });
 }
 
@@ -144,7 +143,7 @@ function addNode(node_srl,e){
             };
 
     jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
-        jQuery('#menu_zone_info').html(data.tpl).css("margin-top",e.pageY-400);
+        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
     });
 }
 
@@ -168,3 +167,7 @@ function completeInsertMenuItem(ret_obj) {
     jQuery('#menu_zone_info').html('');
     Tree(xml_url);
 }
+
+function doMoveMenuInfo() {
+    xAddEventListener(window,'load', function() { window.document.body.appendChild(xGetElementById('fo_menu')); xGetElementById('menu_zone_info').style.width = '550px'; } );
+}
diff --git a/modules/menu/tpl/menu_insert.html b/modules/menu/tpl/menu_insert.html
index 8c0c3e518..039069102 100644
--- a/modules/menu/tpl/menu_insert.html
+++ b/modules/menu/tpl/menu_insert.html
@@ -4,7 +4,7 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_menu)">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col"><div>{$lang->cmd_menu_insert}</div></th>
         <td>{nl2br($lang->about_menu_management)}</td>
@@ -17,9 +17,9 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_submit}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_submit}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/menu/tpl/menu_item_info.html b/modules/menu/tpl/menu_item_info.html
index ac2f9f496..b796fe603 100644
--- a/modules/menu/tpl/menu_item_info.html
+++ b/modules/menu/tpl/menu_item_info.html
@@ -4,120 +4,113 @@
 <input type="hidden" name="hover_btn" value="{$item_info->hover_btn}" />
 <input type="hidden" name="active_btn" value="{$item_info->active_btn}" />
 
-<table cellspacing="0" class="adminTable">
-<tr>
-    <th scope="row" colspan="3" class="button"><div>
+<div class="layer" style="display:block;">
 
+    <h4 class="xeAdmin">{$lang->menu}</h4>
+    <button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button>
 
-        <span class="button green"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button red"><input type="button" onclick="hideCategoryInfo();return false" value="{$lang->cmd_close}" /></span>
+    <div class="layerBody">
 
-
-    </div></th>
-</tr>
-<!--@if($item_info->parent_menu_name)-->
-<tr class="row{$cycle_idx}">
-    <th scope="row" colspan="2"><div>{$lang->parent_menu_name}</div></th>
-    <td>{$item_info->parent_menu_name[$lang_type]}</td>
-</tr>
-<!--@end-->
-
-{@ $_row = 0;}
-<!--@foreach($lang_supported as $key => $val)-->
-<tr>
-    <!--@if($_row==0)--><th scope="row" rowspan="{count($lang_supported)}"><div>{$lang->menu_name}</div></th><!--@end-->
-    <th><div>{$val}</div></th>
-    <td><input type="checkbox" name="ck_menu_name_{$key}"  /><input type="text" name="menu_name_{$key}" value="{htmlspecialchars($item_info->name[$key])}" class="inputTypeText"/></td>
-    {@ $_row ++ }
-</tr>
-<!--@end-->
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_url}</div></th>
-    <td>
-        <input type="text" name="menu_url" value="{htmlspecialchars($item_info->url)}" class="inputTypeText" />
-        <a href="{getUrl('module','menu','act','dispMenuAdminMidList')}" onclick="popopen(this.href);return false;" class="button"><span>{$lang->cmd_search_mid}</span> </a>
-        <p class="clear">{$lang->about_menu_url}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_open_window}</div></th>
-    <td>
-        <input type="checkbox" name="menu_open_window" value="Y" <!--@if($item_info->open_window=="Y")-->checked="checked"<!--@end--> />
-        <p>{$lang->about_menu_open_window}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_expand}</div></th>
-    <td>
-        <input type="checkbox" name="menu_expand" value="Y" <!--@if($item_info->expand=="Y")-->checked="checked"<!--@end--> />
-        <p>{$lang->about_menu_expand}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_img_btn}</div></th>
-    <td><p>{$lang->about_menu_img_btn}</p></td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_normal_btn}</div></th>
-    <td>
-        <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->>
-            <img src="{$item_info->normal_btn}" alt="" id="menu_normal_btn_img" /><br />
-            <a href="#" onclick="doDeleteButton('menu_normal_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        </div>
-        <input type="file" name="menu_normal_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_hover_btn}</div></th>
-    <td>
-        <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->>
-            <img src="{$item_info->hover_btn}" alt="" id="menu_hover_btn_img" /><br />
-            <a href="#" onclick="doDeleteButton('menu_hover_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        </div>
-        <input type="file" name="menu_hover_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_active_btn}</div></th>
-    <td>
-        <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->>
-            <img src="{$item_info->active_btn}" alt="" id="menu_active_btn_img" /><br />
-            <a href="#" onclick="doDeleteButton('menu_active_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        </div>
-        <input type="file" name="menu_active_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="2"><div>{$lang->menu_group_srls}</div></th>
-    <td>
-        <!--@foreach($group_list as $key=>$val)-->
-        <input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
-        <label for="group_{$key}">{$val->title}</label>
+        <table cellspacing="0" class="rowTable">
+        <!--@if($item_info->parent_menu_name)-->
+        <tr class="row{$cycle_idx}">
+            <th scope="row"><div>{$lang->parent_menu_name}</div></th>
+            <td>{$item_info->parent_menu_name}</td>
+        </tr>
         <!--@end-->
-        <p>{$lang->about_menu_group_srls}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" colspan="3" class="button"><div>
 
+        <tr>
+            <th scope="row"><div>{$lang->menu_name}</div></th>
+            <td>
+                <input type="text" name="menu_name" id="menu_name" value="{htmlspecialchars($item_info->name)}" class="inputTypeText w300"/>
+                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','menu_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_url}</div></th>
+            <td>
+                <input type="text" name="menu_url" value="{htmlspecialchars($item_info->url)}" class="inputTypeText" />
+                <a href="{getUrl('module','menu','act','dispMenuAdminMidList')}" onclick="popopen(this.href);return false;" class="button black"><span>{$lang->cmd_search_mid}</span> </a>
+                <p class="clear">{$lang->about_menu_url}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_open_window}</div></th>
+            <td>
+                <input type="checkbox" name="menu_open_window" value="Y" <!--@if($item_info->open_window=="Y")-->checked="checked"<!--@end--> />
+                <p>{$lang->about_menu_open_window}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_expand}</div></th>
+            <td>
+                <input type="checkbox" name="menu_expand" value="Y" <!--@if($item_info->expand=="Y")-->checked="checked"<!--@end--> />
+                <p>{$lang->about_menu_expand}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_img_btn}</div></th>
+            <td><p>{$lang->about_menu_img_btn}</p></td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_normal_btn}</div></th>
+            <td>
+                <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->>
+                    <img src="{$item_info->normal_btn}" alt="" id="menu_normal_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_normal_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_normal_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_hover_btn}</div></th>
+            <td>
+                <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->>
+                    <img src="{$item_info->hover_btn}" alt="" id="menu_hover_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_hover_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_hover_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_active_btn}</div></th>
+            <td>
+                <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->>
+                    <img src="{$item_info->active_btn}" alt="" id="menu_active_btn_img" /><br />
+                    <a href="#" onclick="doDeleteButton('menu_active_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+                </div>
+                <input type="file" name="menu_active_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->menu_group_srls}</div></th>
+            <td>
+                <!--@foreach($group_list as $key=>$val)-->
+                <input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
+                <label for="group_{$key}">{$val->title}</label>
+                <!--@end-->
+                <p>{$lang->about_menu_group_srls}</p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row" colspan="3" class="button"><div>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
+            </div></th>
+        </tr>
+        </table>
 
-        <span class="button green"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button red"><input type="button" onclick="hideCategoryInfo();return false" value="{$lang->cmd_close}" /></span>
+        <script type="text/javascript">
 
+        (function($){
+        $("[name^=menu_name_]").bind("blur",function(e){
+            if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
+                $("[name^=ck_menu_name_]:checked").each(function(i){
+                    $("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
+                });
+            }
+        });
+        })(jQuery);
+        </script>
 
-    </div></th>
-</tr>
-</table>
-
-<script type="text/javascript">
-
-(function($){
-$("[name^=menu_name_]").bind("blur",function(e){
-	if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
-		$("[name^=ck_menu_name_]:checked").each(function(i){
-			$("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
-		});
-	}
-});
-})(jQuery);
-</script>
\ No newline at end of file
+    </div>
+</div>
diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html
index b7dea35a8..050dbf9a6 100644
--- a/modules/menu/tpl/menu_management.html
+++ b/modules/menu/tpl/menu_management.html
@@ -18,8 +18,8 @@
     <!--@if($module == 'admin')-->
         <form action="./" method="get" onsubmit="return procFilter(this, update_menu_title)">
         <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
-            <table cellspacing="0" class="adminTable">
-            <caption>{$lang->menu} {$lang->cmd_management}</caption>
+            <h4 class="xeAdmin">{$lang->menu} {$lang->cmd_management}</h4>
+            <table cellspacing="0" class="rowTable">
             <tr>
                 <th scope="col"><div>{$lang->title}</div></th>
                 <td>
@@ -41,7 +41,7 @@
         </form>
 
     <!--@else-->
-        <table cellspacing="0" class="adminTable">
+        <table cellspacing="0" class="rowTable">
         <tr>
             <th scope="col"><div>{$lang->title}</div></th>
             <td class="left">
@@ -65,24 +65,30 @@
         <input type="hidden" name="module" value="menu" />
         <input type="hidden" name="act" value="" />
         <input type="hidden" name="target" value="" />
-
-    <div id="menu">
-        <ul class="simpleTree">
-            <li class="root" id='tree_0'><span>{$lang->menu}</span></li>
-        </ul>
-    </div>
-<div id="menu_zone_info" style="position:absolute;top:200px; width:70%; right:20px"></div>
+        <div id="menu_zone_info"></div>
         </form>
+        <div id="menu">
+            <ul class="simpleTree">
+                <li class="root" id='tree_0'><span>{$lang->menu}</span></li>
+            </ul>
+        </div>
     </div>
 </div>
 
 <iframe id='tmp_upload_iframe' name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>
 
 
-<script type="text/javascript">
+<script type="text/javascript">//<![CDATA[
+//언어파일 로드용
+var lang_cmd_insert = "{htmlspecialchars($lang->cmd_insert)}";
+var lang_cmd_delete = "{htmlspecialchars($lang->cmd_delete)}";
+var lang_cmd_modify = "{htmlspecialchars($lang->cmd_modify)}";
+
 var simpleTreeCollection;
 var max_menu_depth = 999;
 var xml_url = "{$menu_info->xml_file}";
 var lang_confirm_delete = "{$lang->confirm_delete}";
+doMoveMenuInfo();
 Tree(xml_url);
+//]]>
 </script>
diff --git a/modules/menu/tpl/mid_list.html b/modules/menu/tpl/mid_list.html
index a2e1b45d2..19905a77f 100644
--- a/modules/menu/tpl/mid_list.html
+++ b/modules/menu/tpl/mid_list.html
@@ -1,9 +1,9 @@
 <!--%import("js/menu_admin.js")-->
-<div id="popHeadder" class="w700">
-    <h3>{$lang->cmd_search_mid}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_search_mid}</h3>
 </div>
 
-<div id="popBody" class="w700">
+<div id="popBody">
     <form action="./" method="get">
     <input type="hidden" name="module" value="{$module}" />
     <input type="hidden" name="act" value="{$act}" />
@@ -21,7 +21,7 @@
         <!--@end-->
     </select>
     <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-    <table cellspacing="0" class="adminTable topGap">
+    <table cellspacing="0" class="rowTable topGap">
     <thead>
       <tr>
           <th scope="row"><div>{$lang->module_category}</div></th>
@@ -50,9 +50,3 @@
 
     </form>
 </div>
-
-<div id="popFooter" class="w700">
-    <div class="tCenter gap1">
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
-</div>
diff --git a/modules/message/conf/info.xml b/modules/message/conf/info.xml
index ed2b3a898..32915fdfc 100644
--- a/modules/message/conf/info.xml
+++ b/modules/message/conf/info.xml
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理錯誤訊息及各種系統訊息的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>base</category>
+    <category>system</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/message/conf/module.xml b/modules/message/conf/module.xml
index 7c34885c1..16565e264 100644
--- a/modules/message/conf/module.xml
+++ b/modules/message/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispMessage" type="view" standalone="true" index="true"/>
         <action name="dispMessageAdminConfig" type="view" standalone="true" admin_index="true"/>
diff --git a/modules/message/lang/ko.lang.php b/modules/message/lang/ko.lang.php
index 451552332..9372be8cd 100644
--- a/modules/message/lang/ko.lang.php
+++ b/modules/message/lang/ko.lang.php
@@ -6,5 +6,5 @@
      **/
 
     $lang->message = '오류 표시';
-    $lang->about_skin = "메세지 출력시 스킨을 지정하실 수 있습니다.";
+    $lang->about_skin = '메세지 출력시 스킨을 지정하실 수 있습니다.';
 ?>
diff --git a/modules/message/lang/zh-CN.lang.php b/modules/message/lang/zh-CN.lang.php
index 1d7e6f49c..6368ee42c 100644
--- a/modules/message/lang/zh-CN.lang.php
+++ b/modules/message/lang/zh-CN.lang.php
@@ -1,10 +1,10 @@
 <?php
     /**
      * @file   modules/message/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  简体中文语言包（只收录基本内容）
+     * @author zero <zero@nzeo.com> 翻译：guny
+     * @brief  错误信息模块简体中文语言包
      **/
 
-    $lang->message = '错误提示';
-    $lang->about_skin = "提示信息时，可以指定皮肤。";
+    $lang->message = '错误信息';
+    $lang->about_skin = "提示信息可以指定皮肤。";
 ?>
\ No newline at end of file
diff --git a/modules/message/message.class.php b/modules/message/message.class.php
index 42f512ea4..fbc83127a 100644
--- a/modules/message/message.class.php
+++ b/modules/message/message.class.php
@@ -11,11 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('message', 'view', 'dispMessage');
-            $oModuleController->insertActionForward('message', 'view', 'dispMessageAdminConfig');
-
             return new Object();
         }
 
@@ -23,9 +18,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getActionForward('dispMessage')) return true;
-            if(!$oModuleModel->getActionForward('dispMessageAdminConfig')) return true;
             return false;
         }
 
@@ -33,12 +25,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-            if(!$oModuleModel->getActionForward('dispMessage')) 
-                $oModuleController->insertActionForward('message', 'view', 'dispMessage');
-            if(!$oModuleModel->getActionForward('dispMessageAdminConfig')) 
-                $oModuleController->insertActionForward('message', 'view', 'dispMessageAdminConfig');
             return new Object();
         }
 
diff --git a/modules/message/message.view.php b/modules/message/message.view.php
index 1919a0e7a..30ebf99b5 100644
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@@ -25,6 +25,18 @@
             // 템플릿 경로를 지정
             $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
 
+            // 회원 관리 정보를 받음
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            Context::set('member_config', $member_config);
+
+            // ssl 사용시 현재 https접속상태인지에 대한 flag및 https url 생성
+            $ssl_mode = false;
+            if($member_config->enable_ssl == 'Y') {
+                if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
+            }
+            Context::set('ssl_mode',$ssl_mode);
+
             Context::set('system_message', $this->getMessage());
 
             $this->setTemplatePath($template_path);
diff --git a/modules/message/skins/default/css/message.css b/modules/message/skins/default/css/message.css
deleted file mode 100644
index b1da19c2a..000000000
--- a/modules/message/skins/default/css/message.css
+++ /dev/null
@@ -1,38 +0,0 @@
-@charset "utf-8";
-
-.system_message_box {
-    position:relative;
-    *zoom:1;
-}
-
-.system_message_box blockquote {
-    text-align:center; 
-    margin:30px 0 20px 0;
-    font-size:1.3em; 
-    font-weight:bold;
-    text-decoration:underline;
-}
-
-.system_message_box ul {
-    padding:0;
-    margin:0;
-    overflow:hidden;
-    *zoom:1;
-    text-align:center;
-}
-
-.system_message_box ul li {
-    padding:0;
-    margin:0 10px 0 0;
-    display:inline;
-    list-style:none;
-}
-
-.system_message a {
-    margin-top:1em;
-}
-
-.loginForm {
-    width:200px;
-    margin:30px auto 0 auto;
-}
diff --git a/modules/message/skins/default/filter/login.xml b/modules/message/skins/default/filter/login.xml
new file mode 100644
index 000000000..60e0379c4
--- /dev/null
+++ b/modules/message/skins/default/filter/login.xml
@@ -0,0 +1,8 @@
+<filter name="message_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id"/>
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response />
+</filter>
diff --git a/widgets/login_info/skins/default/filter/logout.xml b/modules/message/skins/default/filter/logout.xml
similarity index 100%
rename from widgets/login_info/skins/default/filter/logout.xml
rename to modules/message/skins/default/filter/logout.xml
diff --git a/modules/message/skins/default/filter/openid_login.xml b/modules/message/skins/default/filter/openid_login.xml
new file mode 100644
index 000000000..a924c15d8
--- /dev/null
+++ b/modules/message/skins/default/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeMessageOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/communication/skins/default/images/openid_input_bg.gif b/modules/message/skins/default/images/openid_login_bg.gif
similarity index 100%
rename from modules/communication/skins/default/images/openid_input_bg.gif
rename to modules/message/skins/default/images/openid_login_bg.gif
diff --git a/modules/message/skins/default/message.css b/modules/message/skins/default/message.css
new file mode 100644
index 000000000..ec7a46673
--- /dev/null
+++ b/modules/message/skins/default/message.css
@@ -0,0 +1,31 @@
+@charset "utf-8";
+
+.messageLayer { border:2px solid #777; font-size:12px; background:#fff; margin:50px auto; width:370px;}
+.messageLayer * { margin:0; padding:0; font-size:12px; }
+.messageLayer h4 { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
+.messageLayer .messageLayerBody{ margin:0;}
+
+.messageLogin { padding:0; }
+.messageLogin fieldset{ position:relative; border:0; margin:0; padding:20px 10px;}
+
+.openid_login { display:none; }
+.messageLogin .openIDTitle { width:99%; white-space:nowrap; overflow:hidden; background:url("images/openid_login_bg.gif") no-repeat left top; padding:1px 0 0 25px; margin-bottom:8px; color:#888888; font-weight:bold; }
+.messageLogin .openIDTitle input { vertical-align:middle; }
+.messageLogin .openid_login { display:none; clear:both; height:38px; border:3px solid #D5D8DB; background-color:#FFFFFF; margin:0 0 10px 0; }
+.messageLogin .openIDTitle input { margin:0; padding:0; }
+
+.messageLogin .login dl { margin:0; padding:0; overflow:hidden; margin-right:10px; width:250px;}
+.messageLogin .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px; text-indent:10px;}
+.messageLogin .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; }
+.messageLogin .login dl dd .inputText{ border:1px solid; border-color:#A6A6A6 #D8D8D8 #D8D8D8 #A6A6A6; padding:2px 6px; height:16px; width:130px;}
+.messageLogin .login dl dd .inputText:hover,
+.messageLogin .login dl dd .inputText:focus{ background:#f4f4f4;}
+.messageLogin .login .keep { clear:both; white-space:nowrap; margin-left:100px;}
+.messageLogin .login .keep input { vertical-align:middle;}
+.messageLogin .login .keep label { margin:0; padding:0; font-size:12px; color:#999999;}
+.messageLogin .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;}
+.messageLogin .help { background:#f5f5f3; color:#666666; overflow:hidden; padding:10px; color:#ccc; text-align:center;}
+.messageLogin .help a{ color:#666; text-decoration:underline;}
+.messageLogin .buttonArea{ position:absolute; top:20px; left:260px;}
+
+.buttonArea{ text-align:center;}
diff --git a/modules/message/skins/default/message.js b/modules/message/skins/default/message.js
new file mode 100644
index 000000000..9ddfa072a
--- /dev/null
+++ b/modules/message/skins/default/message.js
@@ -0,0 +1,27 @@
+/* 로그인 후 */
+function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeMessageOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+
+/* 오픈 아이디 폼 변환 */
+function toggleLoginForm(obj) {
+    if(xGetElementById('messageLogin').style.display != "none") {
+        xGetElementById('messageLogin').style.display = "none";
+        xGetElementById('messageOpenidLogin').style.display = "block";
+        xGetElementById('messageOpenIDForm').use_open_id_2.checked = true;
+        xGetElementById('messageOpenIDForm').openid.focus();
+    } else {
+        xGetElementById('messageLogin').style.display = "block";
+        xGetElementById('messageOpenidLogin').style.display = "none";
+        xGetElementById('messageLoginForm').use_open_id.checked = false;
+        xGetElementById('messageLoginForm').user_id.focus();
+    }
+}
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index 8b0dd22c5..25320c2d8 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -1,21 +1,65 @@
-<!--%import("css/message.css")-->
-
-<div class="system_message_box">
-    <blockquote>
-        {$system_message}
-    </blockquote>
-
-    <ul>
-        <li><a href="#" onclick="history.back(); return false;" class="button"><span>{$lang->cmd_back}</span></a></li>
-        <!--@if($is_logged)-->
-        <li><a href="{getUrl('act','dispMemberLogout')}" class="button red"><span>{$lang->cmd_logout}</span></a></li>
-        <!--@end-->
-    </ul>
-</div>
-
-<!--@if(!$is_logged)-->
-<div class="loginForm">
-    <img widget="login_info" skin="xe_official" colorset="default" />
-</div>
-<!--@end-->
-
+<!--%import("message.css")-->
+
+<div class="messageLayer">
+	<div class="messageLayerBody">
+		<h4> {$system_message} </h4>
+		<!--@if(!$is_logged)-->
+		<!--%import("./filter/login.xml")-->
+		<!--%import("./filter/openid_login.xml")-->
+		<!--%import("./message.js")-->
+		<script type="text/javascript">
+        var keep_signed_msg = "{$lang->about_keep_signed}";
+        xAddEventListener(window, "load", function(){ xGetElementById("messageLoginForm").user_id.focus(); });
+    </script>
+		<div class="messageLogin" id="messageLogin">
+			<form action="./" method="post" onsubmit="return procFilter(this, message_login)" id="messageLoginForm">
+				<fieldset class="login">
+					<dl>
+						<dt>
+							<label for="uid">{$lang->user_id}</label>
+						</dt>
+						<dd>
+							<input type="text" name="user_id" id="uid" value="" class="inputText" />
+						</dd>
+						<dt>
+							<label for="upw">{$lang->password}</label>
+						</dt>
+						<dd>
+							<input type="password" name="password" id="upw" value="" class="inputText" />
+						</dd>
+					</dl>
+					<p class="keep">
+						<input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
+						<label for="keepid">{$lang->keep_signed}</label>
+						<!--@if($member_config->enable_openid=='Y')-->
+						<input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
+						<label for="use_open_id">Open ID</label>
+						<!--@end-->
+					</p>
+					<div class="buttonArea"> <span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span> </div>
+				</fieldset>
+			</form>
+			<div class="help"> <a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a> | <a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a> </div>
+		</div>
+		<!-- OpenID -->
+		<!--@if($member_config->enable_openid=='Y')-->
+		<div class="messageLogin openid_login" id="messageOpenidLogin">
+			<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="messageOpenIDForm">
+				<div class="openIDTitle"> OpenID
+					<input type="text" name="openid" class="inputTypeText" />
+					<input name="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" checked="checked" />
+					<span class="button black strong">
+					<input type="submit" value="{$lang->cmd_login}" />
+				</span> </div>
+			</form>
+		</div>
+		<!--@end-->
+		<!--@end-->
+	</div>
+</div>
+<div class="buttonArea">
+	<a href="#" onclick="history.back(); return false;" class="button black"><span>{$lang->cmd_back}</span></a>
+	<!--@if($is_logged)-->
+	<a href="{getUrl('act','dispMemberLogout')}" class="button red"><span>{$lang->cmd_logout}</span></a>
+	<!--@end-->
+</div>
diff --git a/modules/message/tpl/config.html b/modules/message/tpl/config.html
index 000ab7a10..0aed54c96 100644
--- a/modules/message/tpl/config.html
+++ b/modules/message/tpl/config.html
@@ -1,24 +1,24 @@
 <!--%import("filter/insert_config.xml")-->
 
-<h3>{$lang->message} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->message} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="adminTable topGap">
+    <p class="summary">{$lang->about_skin}</p>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col"><div>{$lang->skin}</div></th>
-        <td>
+        <td class="wide">
             <select name="skin">
                 <!--@foreach($skin_list as $key => $val)-->
                 <option value="{$key}" <!--@if($key==$config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
                 <!--@end-->
             </select>
-            <p>{$lang->about_skin}</p>
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/module/conf/info.xml b/modules/module/conf/info.xml
index e1b1243e8..c5ba01674 100644
--- a/modules/module/conf/info.xml
+++ b/modules/module/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">모듈</title>
-    <title xml:lang="zh-CN">模块</title>
+    <title xml:lang="zh-CN">模块列表</title>
     <title xml:lang="jp">モジュール</title>
     <title xml:lang="en">Module</title>
     <title xml:lang="es">Módulo</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">用於建立與管理其他模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>base</category>
+    <category>system</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index 03561a901..c41689d70 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -1,19 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions>
+        <permission action="dispModuleSelectList" target="member" />
+    </permissions>
     <actions>
+        <action name="dispModuleSelectList" type="view" standalone="true" />
+        <action name="dispModuleSkinInfo" type="view" standalone="true" />
+
         <action name="dispModuleAdminContent" type="view" standalone="true" admin_index="true" />
         <action name="dispModuleAdminList" type="view" standalone="true" />
         <action name="dispModuleAdminCategory" type="view" standalone="true" />
         <action name="dispModuleAdminInfo" type="view" standalone="true" />
+        <action name="dispModuleAdminModuleSetup" type="view" standalone="true" />
+        <action name="dispModuleAdminModuleAdditionSetup" type="view" standalone="true" />
+        <action name="dispModuleAdminModuleGrantSetup" type="view" standalone="true" />
+        <action name="dispModuleAdminCopyModule" type="view" standalone="true" />
+        <action name="dispModuleAdminLangcode" type="view" standalone="true" />
 
-        <action name="dispModuleSkinInfo" type="view" standalone="true" />
+        <action name="dispModuleFileBox" type="view" standalone="true" />
+        <action name="dispModuleFileBoxAdd" type="view" standalone="true" />
+
+        <action name="procModuleFileBoxAdd" type="controller" standalone="true" />
+        <action name="procModuleFileBoxAdd" type="controller" standalone="true" />
+        <action name="procModuleFileBoxDelete" type="controller" standalone="true" />
 
         <action name="getModuleAdminModuleList" type="model" standalone="true" />
+        <action name="getModuleAdminLangCode" type="model" standalone="true" />
 
-        <action name="dispModuleAdminSelectList" type="view" standalone="true" />
-        <action name="dispModuleAdminCopyModule" type="view" standalone="true" />
         <action name="procModuleAdminInsertCategory" type="controller" standalone="true" />
         <action name="procModuleAdminUpdateCategory" type="controller" standalone="true" />
         <action name="procModuleAdminCopyModule" type="controller" standalone="true" />
+        <action name="procModuleAdminInsertGrant" type="controller" standalone="true" />
+        <action name="procModuleAdminUpdateSkinInfo" type="controller" standalone="true" />
+        <action name="procModuleAdminModuleSetup" type="controller" standalone="true" />
+        <action name="procModuleAdminModuleGrantSetup" type="controller" standalone="true" />
+        <action name="procModuleAdminInsertLang" type="controller" standalone="true" />
+        <action name="procModuleAdminDeleteLang" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/module/lang/en.lang.php b/modules/module/lang/en.lang.php
index 63f45334a..f8c1026cb 100644
--- a/modules/module/lang/en.lang.php
+++ b/modules/module/lang/en.lang.php
@@ -27,10 +27,24 @@
     $lang->skin_history = 'Update history';
     $lang->module_copy = "Duplicate Module";
     $lang->module_selector = "Module Selector";
+    $lang->do_selected = "선택된 것들을...";
+    $lang->bundle_setup = "일괄 기본 설정";
+    $lang->bundle_addition_setup = "일괄 추가 설정";
+    $lang->bundle_grant_setup = "일괄 권한 설정";
+    $lang->lang_code = "언어 코드";
+    $lang->filebox = "파일박스";
 
     $lang->header_script = "Header Script";
     $lang->about_header_script = "You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself.<br />You can use &lt;script, &lt;style or &lt;meta tag";
 
+    $lang->grant_access = "Access";
+    $lang->grant_manager = "Management";
+
+    $lang->grant_to_all = "All users";
+    $lang->grant_to_login_user = "Logged users";
+    $lang->grant_to_site_user = "Joined users";
+    $lang->grant_to_group = "Specification group users";
+
     $lang->cmd_add_shortcut = "Add Shortcut";
     $lang->cmd_install = "Install";
     $lang->cmd_update = "Update";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = 'Manage Permission';
     $lang->cmd_manage_skin = 'Manage Skins';
     $lang->cmd_manage_document = 'Manage Articles';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = 'Find lang code';
 
     $lang->msg_new_module = "Create new module";
     $lang->msg_update_module = "Modify module";
@@ -62,10 +78,13 @@
     $lang->about_list_count = 'You can set the number of limit to show article in a page.(default is 20)';
 	$lang->about_search_list_count = 'You may set the number of articles to be exposed when you use search or category function. (default is 20)';
     $lang->about_page_count = 'You can set the number of page link to move pages in a bottom of page.(default is 10)';
-    $lang->about_admin_id = 'You can grant a manager to have all permissions to the module.\n You can enter multiple IDs using <br />,(comma) \n(but the module manager cannot access the site admin page.)';
+    $lang->about_admin_id = 'You can grant a manager to have all permissions to the module.';
     $lang->about_grant = 'If you disable all permissions for a specific object, members who has not logged in would get permission.'; 
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XE consists of modules except basic library.\n [Module Manage] module will show all installed modules and help you to manage them.";
 
 	$lang->about_extra_vars_default_value = 'If multiple default values are needed,	 you can link them with comma(,).';
     $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/es.lang.php b/modules/module/lang/es.lang.php
index 0fcf24fb1..a4d7f1863 100644
--- a/modules/module/lang/es.lang.php
+++ b/modules/module/lang/es.lang.php
@@ -27,10 +27,24 @@
     $lang->skin_history = 'Historia de actualización';
     $lang->module_copy = "Copy Module";
     $lang->module_selector = "Module Selector";
+    $lang->do_selected = "선택된 것들을...";
+    $lang->bundle_setup = "일괄 기본 설정";
+    $lang->bundle_addition_setup = "일괄 추가 설정";
+    $lang->bundle_grant_setup = "일괄 권한 설정";
+    $lang->lang_code = "언어 코드";
+    $lang->filebox = "파일박스";
 
     $lang->header_script = "헤더 스크립트";
     $lang->about_header_script = "html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다";
 
+    $lang->grant_access = "Access";
+    $lang->grant_manager = "Management";
+
+    $lang->grant_to_all = "All users";
+    $lang->grant_to_login_user = "Logged users";
+    $lang->grant_to_site_user = "Joined users";
+    $lang->grant_to_group = "Specification group users";
+
     $lang->cmd_add_shortcut = "añadir acceso directo";
     $lang->cmd_install = "Instalar";
     $lang->cmd_update = "Actualizar";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = 'Manejo de atribuciones';
     $lang->cmd_manage_skin = 'Manejo de temas';
     $lang->cmd_manage_document = 'Manejo de documentos';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = 'Find lang code';
 
     $lang->msg_new_module = "Crear un nuevo módulo";
     $lang->msg_update_module = "Modificar el módulo";
@@ -61,10 +77,13 @@
     $lang->about_list_count = 'Usted puede definir el número límite de los documentos a mostrar en una página.(Predefinido es 20)';
     $lang->about_search_list_count = 'Usted puede configurar el número de artículos que se exponen cuando se utiliza la función de búsqueda o categoría. (Por defecto es 20)';
     $lang->about_page_count = 'Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 10)';
-    $lang->about_admin_id = 'Usted puede definir el administrador de atribuciones superiores al módulo.\n Usted puede asignar múltiples IDs,<br />utilizando una ","(coma) \n(pero el administrador del módulo no puede acceder al sitio de la pógina del administrador.)';
+    $lang->about_admin_id = 'Usted puede definir el administrador de atribuciones superiores al módulo.\n Usted puede asignar múltiples IDs.';
     $lang->about_grant = 'Si usted desea desactivar a todos los objetos teniendo atribuciones especificas, incluso el usuario no conectado pueden tener atribuciones.';
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XE consiste de módulos excepto la librería básica.\n Módulo del Manejo del Módulo muestra todos los módulos instalados y ayuda el manejo de ellos.";
 
 	$lang->about_extra_vars_default_value = 'Si múltiples valores predefinidos son requeridos, usted puede enlazar con la coma(,).';
     $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/fr.lang.php b/modules/module/lang/fr.lang.php
index f0c3c5d0f..b853dabaa 100644
--- a/modules/module/lang/fr.lang.php
+++ b/modules/module/lang/fr.lang.php
@@ -27,10 +27,24 @@
     $lang->skin_history = 'Histoire des Mises à jour';
     $lang->module_copy = "Copier un Module";
     $lang->module_selector = "Module Selector";
+    $lang->do_selected = "선택된 것들을...";
+    $lang->bundle_setup = "일괄 기본 설정";
+    $lang->bundle_addition_setup = "일괄 추가 설정";
+    $lang->bundle_grant_setup = "일괄 권한 설정";
+    $lang->lang_code = "언어 코드";
+    $lang->filebox = "파일박스";
 
     $lang->header_script = "Script en-tête";
     $lang->about_header_script = "Vous pouvez entrer un script en html par vous-même entre &lt;header&gt; et &lt;/header&gt;.<br />Vous pouvez utiliser &lt;script, &lt;style ou &lt;meta tag";
 
+    $lang->grant_access = "Access";
+    $lang->grant_manager = "Management";
+
+    $lang->grant_to_all = "All users";
+    $lang->grant_to_login_user = "Logged users";
+    $lang->grant_to_site_user = "Joined users";
+    $lang->grant_to_group = "Specification group users";
+
     $lang->cmd_add_shortcut = "Ajouter un raccourci";
     $lang->cmd_install = "Installer";
     $lang->cmd_update = "Mettre à Jour";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = 'Administrer des Permissions';
     $lang->cmd_manage_skin = 'Administrer des Habillages';
     $lang->cmd_manage_document = 'Administrer des Articles';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = 'Find lang code';
 
     $lang->msg_new_module = "Créer un module";
     $lang->msg_update_module = "Modifier un module";
@@ -61,10 +77,13 @@
     $lang->about_list_count = 'Vous pouvez configurer combien d\'articles soient exposés dans une page.(20 par défaut)';
 	$lang->about_search_list_count = 'Vous pouvez configurer combien d\'articles soient exposés quand vous utilisez la fonction de recherche ou de catégorie. (20 par défaut)';
     $lang->about_page_count = 'Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(10 par défaut)';
-    $lang->about_admin_id = 'Vous pouvez désigner un directeur qui aura tous les permissions sur le module.\nVous pouvez entrer plusieurs compte en utilisant <br />,(virgule) \n(mais le directeur ne peut pas encore approcher de la page d\'administrer du site.)';
+    $lang->about_admin_id = 'Vous pouvez désigner un directeur qui aura tous les permissions sur le module.\nVous pouvez entrer plusieurs compte en utilisant.';
     $lang->about_grant = 'Si vous ne donnez pas la permission à aucune personne, même les membres qui n\'a pas ouvert la connexion auront la permission. '; 
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XE se compose des modules sauf la bibliothèque fondamental.\nLe module [Administration des Modules] montera tous les modules installés et vous aidera les administrer.";
 
 	$lang->about_extra_vars_default_value = 'Si plusieurs valeurs sont nécessaires, vous pouvez les connecter avec la virgule(,).';
     $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/jp.lang.php b/modules/module/lang/jp.lang.php
index 62f78802c..d50ce5e2c 100644
--- a/modules/module/lang/jp.lang.php
+++ b/modules/module/lang/jp.lang.php
@@ -27,10 +27,24 @@
     $lang->skin_history = '変更内容';
     $lang->module_copy = "モジュールコピー";
     $lang->module_selector = "Module Selector";
+    $lang->do_selected = "선택된 것들을...";
+    $lang->bundle_setup = "일괄 기본 설정";
+    $lang->bundle_addition_setup = "일괄 추가 설정";
+    $lang->bundle_grant_setup = "일괄 권한 설정";
+    $lang->lang_code = "언어 코드";
+    $lang->filebox = "파일박스";
 
     $lang->header_script = "ヘッダースクリプト";
     $lang->about_header_script = "HTMLの&lt;header&gt;と&lt;/header&gt;の間に入れるコードを直接入力できます。<br />&lt;script、&lt;styleまたは&lt;metaタグなどが利用できます";
 
+    $lang->grant_access = "Access";
+    $lang->grant_manager = "Management";
+
+    $lang->grant_to_all = "All users";
+    $lang->grant_to_login_user = "Logged users";
+    $lang->grant_to_site_user = "Joined users";
+    $lang->grant_to_group = "Specification group users";
+
     $lang->cmd_add_shortcut = "ショットカット追加";
     $lang->cmd_install = "インストール";
     $lang->cmd_update = "アップデート";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = '権限管理';
     $lang->cmd_manage_skin = 'スキン管理';
     $lang->cmd_manage_document = '書き込み管理';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = 'Find lang code';
 
     $lang->msg_new_module = "モジュール作成";
     $lang->msg_update_module = "モジュール修正";
@@ -62,10 +78,13 @@
     $lang->about_list_count = '１ページ当たりに表示される書き込みの数が指定できます（デフォルト20個）。';
     $lang->about_search_list_count = 'お勧めの記事数を設定するにさらされるかのカテゴリ検索機能を使用する場合です。 （デフォルトは20 ）';
     $lang->about_page_count = 'リストの下段に移動できるページのリンク数が指定できます（デフォルト１０個）。';
-    $lang->about_admin_id = '該当するモジュールに対して最高権限を持つ管理者を指定することができます。「,（コンマ）」で区切って多数のＩＤが指定できます（管理者ページへのアクセスはできません）。';
+    $lang->about_admin_id = '該当するモジュールに対して最高権限を持つ管理者を指定することができます。';
     $lang->about_grant = '特定権限の対象をすべて解除するとログインしていない会員ユーザまで権限が与えられます。';
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XEは、基本ライブラリの他は、すべてモジュールで構成されています。モジュール管理用のモジュールはインストールされたすべてを表示し、管理できるようにします。";
 
     $lang->about_extra_vars_default_value = '多重・単一選択などのデフォルト値が、複数必要な場合は、「, （コンマ）」で区切って追加することができます。';
     $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/ko.lang.php b/modules/module/lang/ko.lang.php
index 43d16c9d9..690a3b702 100644
--- a/modules/module/lang/ko.lang.php
+++ b/modules/module/lang/ko.lang.php
@@ -5,17 +5,17 @@
      * @brief  한국어 언어팩 
      **/
 
-    $lang->virtual_site = "가상 사이트";
-    $lang->module_list = "모듈 목록";
-    $lang->module_index = "모듈 목록";
-    $lang->module_category = "모듈 분류";
-    $lang->module_info = "모듈 정보";
-    $lang->add_shortcut = "관리자 메뉴에 추가";
-    $lang->module_action = "동작";
-    $lang->module_maker = "모듈 제작자";
+    $lang->virtual_site = '가상 사이트';
+    $lang->module_list = '모듈 목록';
+    $lang->module_index = '모듈 목록';
+    $lang->module_category = '모듈 분류';
+    $lang->module_info = '모듈 정보';
+    $lang->add_shortcut = '관리자 메뉴에 추가';
+    $lang->module_action = '동작';
+    $lang->module_maker = '모듈 제작자';
     $lang->module_license = '라이선스';
     $lang->module_history = '변경 이력 ';
-    $lang->category_title = "분류 이름";
+    $lang->category_title = '분류 이름';
     $lang->header_text = '상단 내용';
     $lang->footer_text = '하단 내용';
     $lang->use_category = '분류 사용';
@@ -25,33 +25,49 @@
     $lang->skin_author = '스킨 제작자';
     $lang->skin_license = '라이선스';
     $lang->skin_history = '변경 이력';
-    $lang->module_copy = "모듈 복사";
-    $lang->module_selector = "모듈 선택기";
+    $lang->module_copy = '모듈 복사';
+    $lang->module_selector = '모듈 선택기';
+    $lang->do_selected = '선택된 것들을...';
+    $lang->bundle_setup = '일괄 기본 설정';
+    $lang->bundle_addition_setup = '일괄 추가 설정';
+    $lang->bundle_grant_setup = '일괄 권한 설정';
+    $lang->lang_code = '언어 코드';
+    $lang->filebox = '파일박스';
 
-    $lang->header_script = "헤더 스크립트";
-    $lang->about_header_script = "html의 &lt;head&gt;와 &lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다";
+    $lang->header_script = '헤더 스크립트';
+    $lang->about_header_script = 'html의 &lt;head&gt;와 &lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다';
 
-    $lang->cmd_add_shortcut = "바로가기 추가";
-    $lang->cmd_install = "설치";
-    $lang->cmd_update = "업데이트";
+    $lang->grant_access = '접근권한';
+    $lang->grant_manager = '관리권한';
+
+    $lang->grant_to_all = '모든 사용자';
+    $lang->grant_to_login_user = '로그인 사용자';
+    $lang->grant_to_site_user = '가입한 사용자';
+    $lang->grant_to_group = '특정 그룹 사용자';
+
+    $lang->cmd_add_shortcut = '바로가기 추가';
+    $lang->cmd_install = '설치';
+    $lang->cmd_update = '업데이트';
     $lang->cmd_manage_category = '분류관리';
     $lang->cmd_manage_grant = '권한관리';
     $lang->cmd_manage_skin = '스킨관리';
     $lang->cmd_manage_document = '게시글 관리';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = '언어코드 찾기';
 
-    $lang->msg_new_module = "모듈 생성";
-    $lang->msg_update_module = "모듈 수정";
-    $lang->msg_module_name_exists = "이미 존재하는 모듈이름입니다. 다른 이름을 입력해주세요.";
+    $lang->msg_new_module = '모듈 생성';
+    $lang->msg_update_module = '모듈 수정';
+    $lang->msg_module_name_exists = '이미 존재하는 모듈이름입니다. 다른 이름을 입력해주세요.';
     $lang->msg_category_is_null = '등록된 분류가 없습니다';
     $lang->msg_grant_is_null = '등록된 권한 대상이 없습니다';
     $lang->msg_no_checked_document = '선택된 게시물이 없습니다';
     $lang->msg_move_failed = '이동 실패하였습니다';
     $lang->msg_cannot_delete_for_child = '하부 분류가  있는 분류는 삭제하실 수 없습니다';
-    $lang->msg_limit_mid ="모듈이름은 영문+[영문+숫자+_] 만 가능합니다.";
+    $lang->msg_limit_mid ='모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
 
-    $lang->about_browser_title = "브라우저의 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.";
-    $lang->about_mid = "모듈이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. ( 영문+[영문+숫자+_] 만 가능)";
-    $lang->about_default = "선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다";
+    $lang->about_browser_title = '브라우저의 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.';
+    $lang->about_mid = '모듈이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. ( 영문+[영문+숫자+_] 만 가능)';
+    $lang->about_default = '선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다';
     $lang->about_module_category = "분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류의 관리는 <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">모듈관리 > 모듈분류 </a>에서 하실 수 있습니다.";
     $lang->about_description= '관리용으로 사용되는 설명입니다';
     $lang->about_default = '선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다';
@@ -62,9 +78,12 @@
     $lang->about_list_count = '한페이지에 표시될 글의 수를 지정하실 수 있습니다. (기본 20개)';
     $lang->about_search_list_count = '검색 또는 카테고리 선택등을 할 경우 표시될 글의 수를 지정하실 수 있습니다. 기본(20개)';
     $lang->about_page_count = '목록 하단 페이지 이동 하는 링크의 수를 지정하실 수 있습니다. (기본 10개)';
-    $lang->about_admin_id = '해당 모듈에 대해 최고 권한을 가지는 관리자를 지정할 수 있습니다.<br />,(콤마)로 다수 아이디 지정이 가능합니다. (관리자페이지 접근은 불가능)';
+    $lang->about_admin_id = '해당 모듈에 대해 최고 권한을 가지는 관리자를 지정할 수 있습니다.';
     $lang->about_grant = '특정 권한의 대상을 모두 해제하시면 로그인하지 않은 회원까지 권한을 가질 수 있습니다';
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XE는 기본 라이브러리를 제외한 나머지는 모두 모듈로 구성되어 있습니다.\n모듈관리 모듈은 설치된 모든 모듈을 보여주고 관리를 도와줍니다.";
     $lang->about_extra_vars_default_value = '다중/단일 선택등 기본값이 여러개가 필요한 경우 , (콤마)로 연결하시면 됩니다';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_search_virtual_site = '가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)';
+    $lang->about_langcode = '언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요';
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/ru.lang.php b/modules/module/lang/ru.lang.php
index e04148d83..526859703 100644
--- a/modules/module/lang/ru.lang.php
+++ b/modules/module/lang/ru.lang.php
@@ -26,11 +26,26 @@
     $lang->skin_license = 'License';
     $lang->skin_history = 'История обновлений';
     $lang->module_selector = "Module Selector";
+    $lang->do_selected = "선택된 것들을...";
+    $lang->bundle_setup = "일괄 기본 설정";
+    $lang->bundle_addition_setup = "일괄 추가 설정";
+    $lang->bundle_grant_setup = "일괄 권한 설정";
+    $lang->lang_code = "언어 코드";
+    $lang->filebox = "파일박스";
+
     $lang->module_copy = "Копировать модуль";
 
     $lang->header_script = "헤더 스크립트";
     $lang->about_header_script = "html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다";
 
+    $lang->grant_access = "Access";
+    $lang->grant_manager = "Management";
+
+    $lang->grant_to_all = "All users";
+    $lang->grant_to_login_user = "Logged users";
+    $lang->grant_to_site_user = "Joined users";
+    $lang->grant_to_group = "Specification group users";
+
     $lang->cmd_add_shortcut = "Добавить ярлык";
     $lang->cmd_install = "Установить";
     $lang->cmd_update = "Обновить";
@@ -38,6 +53,8 @@
     $lang->cmd_manage_grant = 'Управление правами доступа';
     $lang->cmd_manage_skin = 'Управление скинами';
     $lang->cmd_manage_document = 'Управление статьями';
+    $lang->cmd_find_module = '모듈 찾기';
+    $lang->cmd_find_langcode = 'Find lang code';
 
     $lang->msg_new_module = "Создать новый модуль";
     $lang->msg_update_module = "Изменить модуль";
@@ -61,10 +78,13 @@
     $lang->about_list_count = 'Вы можете установить лимит показа статей на страницу. (по умолчанию: 20)';
     $lang->about_search_list_count = '검색 또는 카테고리 선택등을 할 경우 표시될 글의 수를 지정하실 수 있습니다. 기본(20개)';
     $lang->about_page_count = 'Вы можете установить число страниц внизу. (по умолчанию: 10)';
-    $lang->about_admin_id = 'Вы можете разрешить менеджеру иметь полные права доступа к этому модулю.\nВы можете ввести несколько ID, используя <br />запятую \n(но менеджер модуля не имеет права доступа к странице администрирования сайта.)';
+    $lang->about_admin_id = 'Вы можете разрешить менеджеру иметь полные права доступа к этому модулю.\nВы можете ввести несколько ID, используя ';
     $lang->about_grant = 'Если Вы отключите все права доступа для отдельного объекта, не прошедшие процедуру входа на сайт пользователи получат доступ.'; 
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "XE состоит из модулей, за исключением базовой библиотеки.\n Управление модулем покажет все установленные модули и поможет управлять ими.";
 
 	$lang->about_extra_vars_default_value = 'Если нужно несколько значений по умолчанию, разделите их запятыми(,).';
     $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "%s 파일만 가능합니다.";
 ?>
diff --git a/modules/module/lang/zh-CN.lang.php b/modules/module/lang/zh-CN.lang.php
index 5ffaaffdc..64257a4d5 100644
--- a/modules/module/lang/zh-CN.lang.php
+++ b/modules/module/lang/zh-CN.lang.php
@@ -5,7 +5,7 @@
      * @brief  简体中文语言包
      **/
 
-    $lang->virtual_site = "Virtual Site";
+    $lang->virtual_site = "站点";
     $lang->module_list = "模块目录";
     $lang->module_index = "模块目录";
     $lang->module_category = "模块分类";
@@ -16,21 +16,35 @@
     $lang->module_license = '版权';
     $lang->module_history = "更新事项 ";
     $lang->category_title = "分类名称";
-    $lang->header_text = '上端内容';
-    $lang->footer_text = '下端内容';
+    $lang->header_text = '头部修饰';
+    $lang->footer_text = '尾部修饰';
     $lang->use_category = '使用分类';
     $lang->category_title = '分类名';
-    $lang->checked_count = '被选择的主题数';
+    $lang->checked_count = '所选主题数';
     $lang->skin_default_info = '皮肤默认信息';
     $lang->skin_author = '皮肤作者';
     $lang->skin_license = '版权';
     $lang->skin_history = '更新日志';
-    $lang->module_copy = "Copy Module";
-    $lang->module_selector = "Module Selector";
+    $lang->module_copy = "模块复制";
+    $lang->module_selector = "模块选择器";
+    $lang->do_selected = "把所选模块...";
+    $lang->bundle_setup = "批量设置-常规选项";
+    $lang->bundle_addition_setup = "批量设置-高级选项";
+    $lang->bundle_grant_setup = "批量设置-权限";
+    $lang->lang_code = "语言变量";
+    $lang->filebox = "文件管理";
 
     $lang->header_script = "文件头部脚本";
     $lang->about_header_script = "可以直接输入插入到html中&lt;head&gt;区的代码。<br />可使用&lt;script, &lt;style 或 &lt;meta 等标签。";
 
+    $lang->grant_access = "访问权限";
+    $lang->grant_manager = "管理权限";
+
+    $lang->grant_to_all = "不限制";
+    $lang->grant_to_login_user = "已登录用户";
+    $lang->grant_to_site_user = "子站会员";
+    $lang->grant_to_group = "特定用户组";
+
     $lang->cmd_add_shortcut = "添加到快捷菜单";
     $lang->cmd_install = "安装";
     $lang->cmd_update = "升级";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = '权限管理';
     $lang->cmd_manage_skin = '皮肤管理';
     $lang->cmd_manage_document = '主题管理';
+    $lang->cmd_find_module = '查找模块';
+    $lang->cmd_find_langcode = '选择语言变量';
 
     $lang->msg_new_module = "模块生成";
     $lang->msg_update_module = "模块修改";
@@ -47,6 +63,7 @@
     $lang->msg_no_checked_document = '没有被选择的主题';
     $lang->msg_move_failed = '移动失败！';
     $lang->msg_cannot_delete_for_child = '不能删除有下级分类的分类！';
+    $lang->msg_limit_mid ="模块名称只允许英文字母+[英文字母+数字]。";
 
     $lang->about_browser_title = "显示在浏览器窗口的标题值。 在RSS/Trackback也可以使用。";
     $lang->about_mid = "模块名称只允许使用英文，数字和下划线。";
@@ -54,17 +71,19 @@
     $lang->about_module_category = "可以分类管理模块。 模块分类可以在 <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">模块管理 > 模块分类 </a>中进行管理。";
     $lang->about_description= '管理用使用说明。';
     $lang->about_default = '用没有mid值的网址访问网站时，将会显示默认。';
-    $lang->about_header_text = '显示在模块顶部的内容。(可以使用HTML)';
-    $lang->about_footer_text = '显示在模块底部的内容。(可以使用HTML)';
+    $lang->about_header_text = '模块头部修饰内容。(可以使用HTML)';
+    $lang->about_footer_text = '模块尾部修饰内容。(可以使用HTML)';
     $lang->about_skin = '可以选择模块皮肤。';
     $lang->about_use_category = '选择此项可以使用分类功能。';
     $lang->about_list_count = '可以指定每页显示的主题数。(默认为20个)';
     $lang->about_search_list_count = '可以指定搜索或选择分类时每页要显示的帖子数(默认为20个)。';
     $lang->about_page_count = '可以指定显示在目录下方的页面数(默认为10个)。 ';
-    $lang->about_admin_id = '可以对该模块指定最高管理权限。<br />有多名管理员时，可以用,(逗号)来分隔(不能访问管理页面)。 ';
+    $lang->about_admin_id = '可以对该模块指定拥有最高管理权限的管理员。';
     $lang->about_grant = '全部解除特定权限的对象时，没有登录的会员也将具有相关权限。';
+    $lang->about_grant_deatil = '子站会员是指注册到子站点已在线的用户.';
     $lang->about_module = "除基本library以外XE全部由模块组成。\n模块管理中列出所有已安装的模块，因此易于管理。";
-
     $lang->about_extra_vars_default_value = '复选/单选缺省值需要多个时,用,(逗号)来分隔。';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_search_virtual_site = "请输入子站点域名后再进行搜索。<br/>子站点以外的模块可以留空搜索。(输入时http://除外)。";
+    $lang->about_langcode = "要想实现多国语言切换请点击[选择语言变量]按钮。";
+    $lang->about_file_extension= "只允许%s文件。";
 ?>
diff --git a/modules/module/lang/zh-TW.lang.php b/modules/module/lang/zh-TW.lang.php
index 217d70a78..b392431dd 100644
--- a/modules/module/lang/zh-TW.lang.php
+++ b/modules/module/lang/zh-TW.lang.php
@@ -5,7 +5,7 @@
      * @brief  正體中文語言
      **/
 
-    $lang->virtual_site = "Virtual Site";
+    $lang->virtual_site = "虛擬網站";
     $lang->module_list = "模組列表";
     $lang->module_index = "模組列表";
     $lang->module_category = "模組分類";
@@ -26,11 +26,25 @@
     $lang->skin_license = '版權';
     $lang->skin_history = '更新事項';
     $lang->module_copy = "複製模組";
-    $lang->module_selector = "Module Selector";
+    $lang->module_selector = "模組選擇器";
+    $lang->do_selected = "選擇項目...";
+    $lang->bundle_setup = "整體預設值";
+    $lang->bundle_addition_setup = "新增批次設定";
+    $lang->bundle_grant_setup = "整體權限設定";
+    $lang->lang_code = "語言代碼";
+    $lang->filebox = "Filebox";
 
     $lang->header_script = "Header Script";
     $lang->about_header_script = "可以直接輸入，並插入到 HTML的&lt;head&gt;之間。<br />可使用&lt;script&gt;, &lt;style&gt; 或 &lt;meta&gt; 等標籤。";
 
+    $lang->grant_access = "訪問";
+    $lang->grant_manager = "管理";
+
+    $lang->grant_to_all = "所有使用者";
+    $lang->grant_to_login_user = "已登入用戶";
+    $lang->grant_to_site_user = "網站用戶";
+    $lang->grant_to_group = "特定使用群組";
+
     $lang->cmd_add_shortcut = "新增到快捷選單";
     $lang->cmd_install = "安裝";
     $lang->cmd_update = "升級";
@@ -38,6 +52,8 @@
     $lang->cmd_manage_grant = '權限管理';
     $lang->cmd_manage_skin = '面板管理';
     $lang->cmd_manage_document = '主題管理';
+    $lang->cmd_find_module = '搜尋模組';
+    $lang->cmd_find_langcode = '搜尋語言代碼';
 
     $lang->msg_new_module = "建立模組";
     $lang->msg_update_module = "修改模組";
@@ -49,10 +65,10 @@
     $lang->msg_cannot_delete_for_child = '無法刪除有子分類的分類！';
     $lang->msg_limit_mid ="模組名稱可由英文+[英文+數字+_]等非常多種組合。";
 
-    $lang->about_browser_title = "顯示在瀏覽器視窗的標題。在 RSS/Trackback也可以使用。";
+    $lang->about_browser_title = "顯示在瀏覽器視窗的標題。在RSS/Trackback也可以使用。";
     $lang->about_mid = "模組名稱只允許使用英文，數字和底線。";
     $lang->about_default = "用沒有mid值的網址訪問網站時，將會顯示預設。";
-    $lang->about_module_category = "可以分類管理模組。 模組分類可以在 <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">模組管理 > 模組分類 </a>中進行管理。";
+    $lang->about_module_category = "可以分類管理模組。模組分類可以在<a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">模組管理 > 模組分類 </a>中進行管理。";
     $lang->about_description= '管理使用說明。';
     $lang->about_default = '用沒有mid值的網址訪問網站時，將會顯示預設。';
     $lang->about_header_text = '顯示在模組頂部的內容。(可使用 HTML)';
@@ -62,10 +78,13 @@
     $lang->about_list_count = '可以指定每頁顯示的主題數。(預設為20個)';
     $lang->about_search_list_count = '可以指定搜尋或選擇分類時，每頁要顯示的文章數(預設為20個)。';
     $lang->about_page_count = '可以指定顯示在清單下方的頁面數(預設為10個)。 ';
-    $lang->about_admin_id = '可以對該模組指定最高管理權限。<br />有多名管理員時，可以用 (.) 區隔(無法訪問管理頁面)。 ';
+    $lang->about_admin_id = '可以對該模組指定最高管理權限。';
     $lang->about_grant = '全部解除特定權限的對象時，沒有登錄的會員也將具有相關權限。';
+    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
     $lang->about_module = "除基本函式庫以外XE全部由模組組成。\n模組管理中列出所有已安裝的模組，因此易於管理。";
 
-    $lang->about_extra_vars_default_value = '當復選或單選的預設值需要很多個時，用 (,) 區隔。';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
+    $lang->about_extra_vars_default_value = '當復選或單選的預設值需要很多個時，用逗號(,)區隔。';
+    $lang->about_search_virtual_site = "請輸入想要搜尋的虛擬網站(XE網咖等)的網域名稱。<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 不用輸入)";
+    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
+    $lang->about_file_extension= "只允許%s檔案。";
 ?>
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index a2ec5205d..726837f32 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -84,12 +84,20 @@
             }
             if(!count($clones)) return;
 
-            // 원 모듈의 정보를 직접 구해옴
-            $obj->module_srl = $module_srl;
-            $output = executeQuery("module.getMidInfo", $obj);
-            $module_info = $output->data;
-            unset($module_info->module_srl);
-            unset($module_info->regdate);
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+
+            // 모듈 정보 가져옴
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+
+            // 권한 정보 가져옴
+            $module_args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleGrants', $module_args);
+            $grant = array();
+            if($output->data) {
+                foreach($output->data as $key => $val) $grant[$val->name][] = $val->group_srl;
+            }
+
 
             $oDB = &DB::getInstance();
             $oDB->begin();
@@ -98,16 +106,379 @@
             foreach($clones as $mid => $browser_title) {
                 $clone_args = null;
                 $clone_args = clone($module_info);
-                $clone_args->module_srl = getNextSequence();
+                $clone_args->module_srl = null;
+                $clone_args->content = null;
                 $clone_args->mid = $mid;
                 $clone_args->browser_title = $browser_title;
                 $clone_args->is_default = 'N';
-                $output = executeQuery('module.insertModule', $clone_args);
+
+                // 모듈 생성
+                $output = $oModuleController->insertModule($clone_args);
+                $module_srl = $output->get('module_srl');
+
+                // 권한 정보 등록
+                if(count($grant)) $oModuleController->insertModuleGrants($module_srl, $grant);
             }
 
             $oDB->commit();
             $this->setMessage('success_registed');
         }
 
+        /**
+         * @brief 모듈 권한 저장
+         **/
+        function procModuleAdminInsertGrant() {
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+
+            // 모듈 번호 구함
+            $module_srl = Context::get('module_srl');
+
+            // 해당 모듈의 정보를 구함
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if(!$module_info) return new Object(-1,'msg_invalid_request');
+
+            // 관리자 아이디 등록
+            $oModuleController->deleteAdminId($module_srl);
+            $admin_member = Context::get('admin_member');
+            if($admin_member) {
+                $admin_members = explode(',',$admin_member);
+                for($i=0;$i<count($admin_members);$i++) {
+                    $admin_id = trim($admin_members[$i]);
+                    if(!$admin_id) continue;
+                    $oModuleController->insertAdminId($module_srl, $admin_id);
+
+                }
+            }
+
+            // 권한 정리
+            $xml_info = $oModuleModel->getModuleActionXML($module_info->module);
+
+            $grant_list = $xml_info->grant;
+
+            $grant_list->access->default = 'guest';
+            $grant_list->manager->default = 'manager';
+
+            foreach($grant_list as $grant_name => $grant_info) {
+                // default값을 구함
+                $default = Context::get($grant_name.'_default');
+
+                // -1 = 로그인 사용자만, -2 = 사이트 가입자만, 0 = 모든 사용자
+                if(strlen($default)){
+                    $grant->{$grant_name}[] = $default;
+                    continue;
+
+                // 특정 그룹 사용자
+                } else {
+                    $group_srls = Context::get($grant_name);
+                    if($group_srls) {
+                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
+                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+                        else $group_srls = array($group_srls);
+                        $grant->{$grant_name} = $group_srls;
+                    }
+                    continue;
+                }
+                $grant->{$group_srls} = array();
+            }
+            
+            // DB에 저장
+            $args->module_srl = $module_srl;
+            $output = executeQuery('module.deleteModuleGrants', $args);
+            if(!$output->toBool()) return $output;
+
+            // DB에 권한 저장 
+            foreach($grant as $grant_name => $group_srls) {
+                foreach($group_srls as $key => $val) {
+                    $args = null;
+                    $args->module_srl = $module_srl;
+                    $args->name = $grant_name;
+                    $args->group_srl = $val;
+                    $output = executeQuery('module.insertModuleGrant', $args);
+                    if(!$output->toBool()) return $output;
+                }
+            }
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief 스킨 정보 업데이트
+         **/
+        function procModuleAdminUpdateSkinInfo() {
+            // module_srl에 해당하는 정보들을 가져오기
+            $module_srl = Context::get('module_srl');
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if($module_info->module_srl) {
+                $skin = $module_info->skin;
+
+                // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서)
+                $module_path = './modules/'.$module_info->module;
+                $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
+
+                // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
+                $obj = Context::getRequestVars();
+                unset($obj->act);
+                unset($obj->module_srl);
+                unset($obj->page);
+                unset($obj->mid);
+                unset($obj->module);
+
+                // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
+                if($skin_info->extra_vars) {
+                    foreach($skin_info->extra_vars as $vars) {
+                        if($vars->type!='image') continue;
+
+                        $image_obj = $obj->{$vars->name};
+
+                        // 삭제 요청에 대한 변수를 구함
+                        $del_var = $obj->{"del_".$vars->name};
+                        unset($obj->{"del_".$vars->name});
+                        if($del_var == 'Y') {
+                            FileHandler::removeFile($module_info->{$vars->name});
+                            continue;
+                        }
+
+                        // 업로드 되지 않았다면 이전 데이터를 그대로 사용
+                        if(!$image_obj['tmp_name']) {
+                            $obj->{$vars->name} = $module_info->{$vars->name};
+                            continue;
+                        }
+
+                        // 정상적으로 업로드된 파일이 아니면 무시
+                        if(!is_uploaded_file($image_obj['tmp_name'])) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+
+                        // 이미지 파일이 아니어도 무시
+                        if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+
+                        // 경로를 정해서 업로드
+                        $path = sprintf("./files/attach/images/%s/", $module_srl);
+
+                        // 디렉토리 생성
+                        if(!FileHandler::makeDir($path)) return false;
+
+                        $filename = $path.$image_obj['name'];
+
+                        // 파일 이동
+                        if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+
+                        // 변수를 바꿈
+                        unset($obj->{$vars->name});
+                        $obj->{$vars->name} = $filename;
+                    }
+                }
+
+                // 해당 모듈의 전체 스킨 불러와서 이미지는 제거
+                $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
+
+                if($skin_info->extra_vars) {
+                    foreach($skin_info->extra_vars as $vars) {
+                        if($vars->type!='image') continue;
+                        $value = $skin_vars[$vars->name];
+                        if(file_exists($value)) @unlink($value);
+                    }
+                }
+                $oModuleController = &getController('module');
+                $oModuleController->deleteModuleSkinVars($module_srl);
+
+                // 등록
+                $oModuleController->insertModuleSkinVars($module_srl, $obj);
+            }
+
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('default_layout.html');
+            $this->setTemplatePath('./modules/module/tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+        /**
+         * @brief 모듈 일괄 정리
+         **/
+        function procModuleAdminModuleSetup() {
+            $vars = Context::getRequestVars();
+
+            if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+
+            $module_srls = explode(',',$vars->module_srls);
+            if(!count($module_srls)) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+            $oModuleController= &getController('module');
+            foreach($module_srls as $module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                $module_info->module_category_srl = $vars->module_category_srl;
+                $module_info->layout_srl = $vars->layout_srl;
+                $module_info->skin = $vars->skin;
+                $module_info->description = $vars->description;
+                $module_info->header_text = $vars->header_text;
+                $module_info->footer_text = $vars->footer_text;
+                $oModuleController->updateModule($module_info);
+            }
+
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief 모듈 권한 일괄 정리
+         **/
+        function procModuleAdminModuleGrantSetup() {
+            $module_srls = Context::get('module_srls');
+            if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) return new Object(-1,'msg_invalid_request');
+
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
+            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
+            $grant_list = $xml_info->grant;
+
+            $grant_list->access->default = 'guest';
+            $grant_list->manager->default = 'manager';
+
+            foreach($grant_list as $grant_name => $grant_info) {
+                // default값을 구함
+                $default = Context::get($grant_name.'_default');
+
+                // -1 = 로그인 사용자만, 0 = 모든 사용자
+                if(strlen($default)){
+                    $grant->{$grant_name}[] = $default;
+                    continue;
+
+                // 특정 그룹 사용자
+                } else {
+                    $group_srls = Context::get($grant_name);
+                    if($group_srls) {
+                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
+                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+                        else $group_srls = array($group_srls);
+                        $grant->{$grant_name} = $group_srls;
+                    }
+                    continue;
+                }
+                $grant->{$group_srls} = array();
+            }
+
+            
+            // DB에 저장
+            foreach($modules as $module_srl) {
+                $args = null;
+                $args->module_srl = $module_srl;
+                $output = executeQuery('module.deleteModuleGrants', $args);
+                if(!$output->toBool()) continue;
+
+                // DB에 권한 저장 
+                foreach($grant as $grant_name => $group_srls) {
+                    foreach($group_srls as $key => $val) {
+                        $args = null;
+                        $args->module_srl = $module_srl;
+                        $args->name = $grant_name;
+                        $args->group_srl = $val;
+                        $output = executeQuery('module.insertModuleGrant', $args);
+                        if(!$output->toBool()) return $output;
+                    }
+                }
+            }
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief 언어 추가/ 업데이트
+         **/
+        function procModuleAdminInsertLang() {
+            // 언어코드명 가져옴 
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->name = str_replace(' ','_',Context::get('lang_code'));
+            if(!$args->name) return new Object(-1,'msg_invalid_request');
+
+            // 언어코드가 있는지 조사
+            $output = executeQueryArray('module.getLang', $args);
+            if(!$output->toBool()) return $output;
+
+            // 있으면 업데이트를 위해 기존 값들을 지움
+            if($output->data) $output = executeQuery('module.deleteLang', $args);
+            if(!$output->toBool()) return $output;
+
+            // 입력
+            $lang_supported = Context::get('lang_supported');
+            foreach($lang_supported as $key => $val) {
+                $args->lang_code = $key;
+                $args->value = trim(Context::get($key));
+                if(!$args->value) {
+                    $args->value = Context::get(strtolower($key));
+                    if(!$args->value) $args->value = $args->name;
+                }
+                $output = executeQuery('module.insertLang', $args);
+                if(!$output->toBool()) return $output;
+            }
+            $this->makeCacheDefinedLangCode($args->site_srl);
+
+            $this->add('name', $args->name);
+        }
+
+        /**
+         * @brief 언어 제거
+         **/
+        function procModuleAdminDeleteLang() {
+            // 언어코드명 가져옴 
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->name = str_replace(' ','_',Context::get('name'));
+            if(!$args->name) return new Object(-1,'msg_invalid_request');
+
+            $output = executeQuery('module.deleteLang', $args);
+            if(!$output->toBool()) return $output;
+            $this->makeCacheDefinedLangCode($args->site_srl);
+        }
+
+        /**
+         * @brief 사용자 정이 언어코드 파일 저장
+         **/
+        function makeCacheDefinedLangCode($site_srl = 0) {
+            // 현재 사이트의 언어파일 가져오기
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            } else {
+                $args->site_srl = $site_srl;
+            }
+            $output = executeQueryArray('module.getLang', $args);
+            if(!$output->toBool() || !$output->data) return;
+
+            // 캐시 디렉토리 설정
+            $cache_path = _XE_PATH_.'files/cache/lang_defined/';
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+
+            $lang_supported = Context::get('lang_supported');
+            foreach($lang_supported as $key => $val) {
+                $fp[$key] = fopen( sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $key), 'w' );
+                if(!$fp[$key]) return;
+                fwrite($fp[$key],"<?php if(!defined('__ZBXE__')) exit(); \r\n");
+            }
+
+            foreach($output->data as $key => $val) {
+                if($fp[$val->lang_code]) fwrite($fp[$val->lang_code], sprintf('$lang["%s"] = "%s";'."\r\n", $val->name, str_replace('"','\\"',$val->value)));
+            }
+
+            foreach($lang_supported as $key => $val) {
+                if(!$fp[$key]) continue;
+                fwrite($fp[$key],"?>");
+                fclose($fp[$key]);
+            }
+        }
+
     }
 ?>
diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php
index 3f80d3e99..f4b4bff28 100644
--- a/modules/module/module.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -15,7 +15,8 @@
         }
 
         /**
-         * @brief 위젯의 경로를 구함
+         * @brief module_srl (,콤마로 연결된)로 대상 모듈들의 목록을 return)
+         * 모듈 선택기(ModuleSelector)에서 사용됨
          **/
         function getModuleAdminModuleList() {
             $args->module_srls = Context::get('module_srls');
@@ -33,5 +34,145 @@
             $this->add('id', Context::get('id'));
             $this->add('module_list', $module_list);
         }
+
+        /**
+         * @brief 공통 :: 모듈의 모듈 권한 출력 페이지
+         * 모듈의 모듈 권한 출력은 모든 모듈에서 module instance를 이용할때 사용할 수 있음
+         **/
+        function getModuleGrantHTML($module_srl, $source_grant_list) {
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+
+            // access, manager 권한은 가상 권한으로 설정
+            $grant_list->access->title = Context::getLang('grant_access');
+            $grant_list->access->default = 'guest';
+            if(count($source_grant_list)) {
+                foreach($source_grant_list as $key => $val) {
+                    if(!$val->default) $val->default = 'guest';
+                    if($val->default == 'root') $val->default = 'manager';
+                    $grant_list->{$key} = $val;
+                }
+            }
+            $grant_list->manager->title = Context::getLang('grant_manager');
+            $grant_list->manager->default = 'manager';
+            Context::set('grant_list', $grant_list);
+
+            // 현재 모듈에 설정된 권한 그룹을 가져옴
+            $default_grant = array();
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleGrants', $args);
+            if($output->data) {
+                foreach($output->data as $val) {
+                    if($val->group_srl == 0) $default_grant[$val->name] = 'all';
+                    else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
+                    else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
+                    else {
+                        $selected_group[$val->name][] = $val->group_srl;
+                        $default_grant[$val->name] = 'group';
+                    }
+                }
+            }
+            Context::set('selected_group', $selected_group);
+            Context::set('default_grant', $default_grant);
+
+            // 현재 모듈에 설정된 관리자 아이디를 추출
+            $admin_member = $oModuleModel->getAdminId($module_srl);
+            Context::set('admin_member', $admin_member);
+
+            // 그룹을 가져옴
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
+            Context::set('group_list', $group_list);
+
+            // grant 정보를 추출
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'module_grants');
+        }
+
+        /**
+         * @brief 공통 :: 모듈의 스킨 설정 출력 페이지
+         **/
+        function getModuleSkinHTML($module_srl) {
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if(!$module_info) return;
+
+            $skin = $module_info->skin;
+            $module_path = './modules/'.$module_info->module;
+
+            // 스킨의 XML 정보를 구함
+            $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
+
+            // DB에 설정된 스킨 정보를 구함
+            $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
+
+            if(count($skin_info->extra_vars)) {
+                foreach($skin_info->extra_vars as $key => $val) {
+                    $group = $val->group;
+                    $name = $val->name;
+                    $type = $val->type;
+                    if($skin_vars[$name]) $value = $skin_vars[$name]->value;
+                    else $value = '';
+                    if($type=="checkbox" && !$value) $value = array();
+                    $skin_info->extra_vars[$key]->value= $value;
+                }
+            }
+
+            Context::set('module_info', $module_info);
+            Context::set('mid', $module_info->mid);
+            Context::set('skin_info', $skin_info);
+            Context::set('skin_vars', $skin_vars);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'skin_config');
+        }
+
+        /**
+         * @brief 특정 언어 코드에 대한 값들을 가져오기
+         * lang_code를 직접 기입하면 해당 언어코드에 대해서만 가져오고 값이 없으면 $name을 그대로 return
+         **/
+        function getLangCode($site_srl, $name) {
+            $lang_supported = Context::get('lang_supported');
+
+            if(substr($name,0,12)=='$user_lang->') {
+                $args->site_srl = (int)$site_srl;
+                $args->name = substr($name,12);
+                $output = executeQueryArray('module.getLang', $args);
+                if($output->data) {
+                    foreach($output->data as $key => $val) {
+                        $selected_lang[$val->lang_code] = $val->value;
+                    }
+                }
+            } else {
+                $tmp = unserialize($name);
+                if($tmp) {
+                    $selected_lang = array();
+                    $rand_name = $tmp[Context::getLangType()];
+                    if(!$rand_name) $rand_name = array_shift($tmp);
+                    foreach($lang_supported as $key => $val) {
+                        $selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+                    }
+                }
+            }
+
+            $output = array();
+            foreach($lang_supported as $key => $val) {
+                $output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+            }
+            return $output;
+        }
+
+        /**
+         * @brief 모듈 언어를 ajax로 요청시 return
+         **/
+        function getModuleAdminLangCode() {
+            $name = Context::get('name');
+            if(!$name) return new Object(-1,'msg_invalid_request');
+            $site_module_info = Context::get('site_module_info');
+            $this->add('name', $name);
+            $output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
+            $this->add('langs', $output);
+        }
     }
 ?>
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index 752fc37b2..7b80eec0d 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -98,81 +98,126 @@
         }
 
         /**
-         * @brief 모듈 선택기
+         * @brief 모듈 기본 설정 일괄 적용
          **/
-        function dispModuleAdminSelectList() {
+        function dispModuleAdminModuleSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
             $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
 
-            // virtual site의 개수를 추출
-            $output = executeQuery('module.getSiteCount');
-            $site_count = $output->data->count;
-            Context::set('site_count', $site_count);
+            // 모듈의 스킨 목록을 구함
+            $skin_list = $oModuleModel->getSkins('./modules/'.$module_info->module);
+            Context::set('skin_list',$skin_list);
 
-            // 사이트 검색어 변수 설정
-            $site_keyword = Context::get('site_keyword');
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
 
-            // 사이트 검색어가 없으면 현재 가상 사이트의 정보를 설정
-            $args = null;
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') {
-                $query_id = 'module.getSiteModules';
-                $module_category_exists = false;
-                if(!$site_keyword) {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info && $logged_info->is_admin != 'Y') {
-                        $site_keyword = $site_module_info->domain;
-                        $args->site_srl = (int)$site_module_info->site_srl;
-                        Context::set('site_keyword', $site_keyword);
-                    } else {
-                        $query_id = 'module.getDefaultModules';
-                        $args->site_srl = 0;
-                        $module_category_exists = true;
-                    }
-                // 사이트 검색어가 있으면 해당 사이트(들)의 정보를 추출
-                } else {
-                    $args->site_keyword = $site_keyword;
-                }
-            } else {
-                $query_id = 'module.getSiteModules';
-                $site_module_info = Context::get('site_module_info');
-                $args->site_srl = (int)$site_module_info->site_srl;
-            }
-
-            // 지정된 사이트(혹은 전체)의 module 목록을 구함
-            $output = executeQueryArray($query_id, $args);
-            $category_list = $mid_list = array();
-            if(count($output->data)) {
-                foreach($output->data as $key => $val) {
-                    $module = trim($val->module);
-                    if(!$module) continue;
-
-                    $category = $val->category;
-                    $obj = null;
-                    $obj->module_srl = $val->module_srl;
-                    $obj->browser_title = $val->browser_title;
-                    $mid_list[$module]->list[$category][$val->mid] = $obj;
-                }
-            }
-
-            $selected_module = Context::get('selected_module');
-            if(count($mid_list)) {
-                foreach($mid_list as $module => $val) {
-                    if(!$selected_module) $selected_module = $module;
-                    $xml_info = $oModuleModel->getModuleInfoXml($module);
-                    $mid_list[$module]->title = $xml_info->title;
-                }
-            }
-
-            Context::set('mid_list', $mid_list);
-            Context::set('selected_module', $selected_module);
-            Context::set('selected_mids', $mid_list[$selected_module]->list);
-            Context::set('module_category_exists', $module_category_exists);
+            // 모듈 카테고리 목록을 구함
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
 
             // 레이아웃을 팝업으로 지정
             $this->setLayoutFile('popup_layout');
 
             // 템플릿 파일 지정
-            $this->setTemplateFile('module_selector');
+            $this->setTemplateFile('module_setup');
+        }
+
+        /**
+         * @brief 모듈 추가 설정 일괄 적용
+         **/
+        function dispModuleAdminModuleAdditionSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
+            $content = '';
+
+            // 추가 설정을 위한 트리거 호출 
+            // 게시판 모듈이지만 차후 다른 모듈에서의 사용도 고려하여 trigger 이름을 공용으로 사용할 수 있도록 하였음
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
+            Context::set('setup_content', $content);
+
+            // 레이아웃을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('module_addition_setup');
+        }
+
+        /**
+         * @brief 모듈 권한 설정 일괄 적용
+         **/
+        function dispModuleAdminModuleGrantSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
+            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
+            $source_grant_list = $xml_info->grant;
+
+            // access, manager 권한은 가상 권한으로 설정
+            $grant_list->access->title = Context::getLang('grant_access');
+            $grant_list->access->default = 'guest';
+            if(count($source_grant_list)) {
+                foreach($source_grant_list as $key => $val) {
+                    if(!$val->default) $val->default = 'guest';
+                    if($val->default == 'root') $val->default = 'manager';
+                    $grant_list->{$key} = $val;
+                }
+            }
+            $grant_list->manager->title = Context::getLang('grant_manager');
+            $grant_list->manager->default = 'manager';
+            Context::set('grant_list', $grant_list);
+
+            // 그룹을 가져옴
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
+            Context::set('group_list', $group_list);
+
+            // 레이아웃을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('module_grant_setup');
+        }
+
+        /**
+         * @brief 언어 코드
+         **/
+        function dispModuleAdminLangcode() {
+            // 현재 사이트의 언어파일 가져오기
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->sort_index = 'name';
+            $args->order_type = 'asc';
+            $output = executeQueryArray('module.getLangList', $args);
+            Context::set('lang_list', $output->data);
+
+            // 현재 선택된 언어 가져오기
+            $name = Context::get('name');
+            if($name) {
+                $oModuleAdminModel = &getAdminModel('module');
+                Context::set('selected_lang', $oModuleAdminModel->getLangCode($args->site_srl,'$user_lang->'.$name));
+            }
+
+            // 레이아웃을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('module_langcode');
         }
 
     }
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index 6e00c5360..7c537b90f 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -13,10 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('module', 'view', 'dispModuleAdminContent');
-            $oModuleController->insertActionForward('module', 'view', 'dispModuleAdminList');
-            $oModuleController->insertActionForward('module', 'view', 'dispModuleAdminCategory');
-            $oModuleController->insertActionForward('module', 'view', 'dispModuleAdminInfo');
 
             $oDB = &DB::getInstance();
 
@@ -41,6 +37,17 @@
             // 2008. 11. 13 modules 의 mid를 unique를 없애고 site_srl을 추가 후에 site_srl + mid unique index
             if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
 
+            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
+            if($oDB->isColumnExists('modules', 'grants')) return true;
+
+            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
+            if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+
+            // extra_vars* 컬럼 제거
+            for($i=1;$i<=20;$i++) {
+                if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+            }
+
             return false;
         }
 
@@ -109,25 +116,127 @@
                 $oDB->addColumn('modules','site_srl','number',11,0,true);
                 $oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
             }
+            
+            // document 확장변수의 확장을 위한 처리
+            if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+
+            if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+
+            // 모든 모듈의 권한, 스킨정보, 확장정보, 관리자 아이디를 grants 테이블로 이전시키는 업데이트
+            if($oDB->isColumnExists('modules', 'grants')) {
+                $oModuleController = &getController('module');
+                $oDocumentController = &getController('document');
+
+                // 현재 시스템 언어 코드값을 가져옴
+                $lang_code = Context::getLangType();
+
+                // 모든 모듈의 module_info를 가져옴
+                $output = executeQueryArray('module.getModuleInfos');
+                if(count($output->data)) {
+                    foreach($output->data as $module_info) {
+                        // 모듈들의 권한/ 확장변수(게시글 확장 포함)/ 스킨 변수/ 최고관리권한 정보 분리
+                        $module_srl = trim($module_info->module_srl);
+
+                        // 권한 등록
+                        $grants = unserialize($module_info->grants);
+                        if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+
+                        // 스킨 변수 등록
+                        $skin_vars = unserialize($module_info->skin_vars);
+                        if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+
+                        // 최고 관리자 아이디 등록
+                        $admin_id = trim($module_info->admin_id);
+                        if($admin_id && $admin_id != 'Array') {
+                            $admin_ids = explode(',',$admin_id);
+                            if(count($admin_id)) {
+                                foreach($admin_ids as $admin_id) {
+                                    $oModuleController->insertAdminId($module_srl, $admin_id);
+                                }
+                            }
+                        }
+
+                        // 모듈별 추가 설정 저장 (기본 modules에 없던 컬럼 데이터)
+                        $extra_vars = unserialize($module_info->extra_vars);
+                        $document_extra_keys = null;
+                        if($extra_vars->extra_vars && count($extra_vars->extra_vars)) {
+                            $document_extra_keys = $extra_vars->extra_vars;
+                            unset($extra_vars->extra_vars);
+                        }
+                        if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+
+                        /**
+                         * 게시글 확장변수 이동 (documents모듈에서 해야 하지만 modules 테이블의 추가 변수들이 정리되기에 여기서 함)
+                         **/
+                        // 플래닛모듈의 경우 직접 추가 변수 입력
+                        if($module_info->module == 'planet') {
+                            if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+                            $planet_extra_keys->name = 'postscript';
+                            $planet_extra_keys->type = 'text';
+                            $planet_extra_keys->is_required = 'N';
+                            $planet_extra_keys->search = 'N';
+                            $planet_extra_keys->default = '';
+                            $planet_extra_keys->desc = '';
+                            $document_extra_keys[20] = $planet_extra_keys;
+                        }
+
+                        // 게시글 확장변수 키 등록
+                        if(count($document_extra_keys)) {
+                            foreach($document_extra_keys as $var_idx => $val) {
+                                $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc);
+                            }
+
+                            // 확장변수가 존재하면 확장변수 가져오기
+                            $doc_args = null;
+                            $doc_args->module_srl = $module_srl;
+                            $doc_args->list_count = 100;
+                            $doc_args->sort_index = 'list_order';
+                            $doc_args->order_type = 'asc';
+                            $doc_args->page = 1;
+                            $output = executeQueryArray('document.getDocumentList', $doc_args);
+                            if($output->toBool() && $output->data && count($output->data)) {
+                                foreach($output->data as $document) {
+                                    if(!$document) continue;
+                                    foreach($document as $key => $var) {
+                                        if(strpos($key,'extra_vars')!==0 || !trim($var) || $var== 'N;') continue;
+                                        $var_idx = str_replace('extra_vars','',$key);
+                                        $oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, $lang_code);
+                                    }
+                                }
+                                $doc_args->page++;
+                            }
+                        }
+
+                        // 해당 모듈들의 추가 변수들 제거
+                        $module_info->grant = null;
+                        $module_info->extra_vars = null;
+                        $module_info->skin_vars = null;
+                        $module_info->admin_id = null;
+                        executeQuery('module.updateModule', $module_info);
+                    }
+                }
+
+                // 각종 column drop
+                $oDB->dropColumn('modules','grants');
+                $oDB->dropColumn('modules','admin_id');
+                $oDB->dropColumn('modules','skin_vars');
+                $oDB->dropColumn('modules','extra_vars');
+            }
+
+            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
+            if(!$oDB->isColumnExists('sites', 'default_language')) {
+                $oDB->addColumn('sites','default_language','varchar',255,0,false);
+            }
+
+            // extra_vars* 컬럼 제거
+            for($i=1;$i<=20;$i++) {
+                if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+                $oDB->dropColumn('documents','extra_vars'.$i);
+            }
 
             return new Object(0, 'success_updated');
         }
 
-        /**
-         * @brief Action중 Admin이 들어갔을 경우 권한 체크
-         **/
-        function checkAdminActionGrant() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin=='Y') return true;
-
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isSiteAdmin()) return true;
-
-            return false;
-        }
-
         /**
          * @brief 캐시 파일 재생성
          **/
@@ -142,7 +251,7 @@
             FileHandler::removeFilesInDir("./files/cache/db");
 
             // 기타 캐시 삭제
-            FileHandler::removeFilesInDir("./files/cache/tmp");
+            FileHandler::removeDir("./files/cache/tmp");
         }
     }
 ?>
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 3519951a1..ec726aafa 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -129,11 +129,46 @@
             return executeQuery('module.updateSite', $args);
         }
 
+        /**
+         * @brief 모듈 정보 정리
+         **/
+        function arrangeModuleInfo(&$args, &$extra_vars) {
+            // 불필요한 내용 제거
+            unset($args->body);
+            unset($args->act);
+            unset($args->page);
+
+            // mid값 검사
+            if(!ereg("^[a-zA-Z][a-zA-Z0-9_]+", $args->mid)) return new Object(-1, 'msg_limit_mid');
+
+            // 변수를 검사 (modules의 기본 변수와 그렇지 않은 변수로 분리)
+            $extra_vars = clone($args);
+            unset($extra_vars->module_srl);
+            unset($extra_vars->module);
+            unset($extra_vars->module_category_srl);
+            unset($extra_vars->layout_srl);
+            unset($extra_vars->menu_srl);
+            unset($extra_vars->site_srl);
+            unset($extra_vars->mid);
+            unset($extra_vars->skin);
+            unset($extra_vars->browser_title);
+            unset($extra_vars->description);
+            unset($extra_vars->is_default);
+            unset($extra_vars->content);
+            unset($extra_vars->open_rss);
+            unset($extra_vars->header_text);
+            unset($extra_vars->footer_text);
+            $args = delObjectVars($args, $extra_vars);
+
+            return new Object();
+        }
+
         /**
          * @brief 모듈 입력
          **/
         function insertModule($args) {
-            if(!ereg("^[a-zA-Z][a-zA-Z0-9_]+", $args->mid)) return new Object(-1, 'msg_limit_mid');
+            $output = $this->arrangeModuleInfo($args, $extra_vars);
+            if(!$output->toBool()) return $output;
 
             // begin transaction
             $oDB = &DB::getInstance();
@@ -147,23 +182,32 @@
                 return new Object(-1, 'msg_module_name_exists');
             }
 
-            // module model 객체 생성
-            $oModuleModel = &getModel('module');
+            // is_default 의 값에 따라서 처리
+            if($args->site_srl!=0) $args->is_default = 'N';
+            else {
+                if($args->is_default!='Y') $args->is_default = 'N';
+                else $this->clearDefaultModule();
+            }
 
             // 선택된 스킨정보에서 colorset을 구함
+            $oModuleModel = &getModel('module');
             $module_path = ModuleHandler::getModulePath($args->module);
             $skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin);
             $skin_vars->colorset = $skin_info->colorset[0]->name;
 
             // 변수 정리후 query 실행
             if(!$args->module_srl) $args->module_srl = getNextSequence();
-            $args->skin_vars = serialize($skin_vars);
+
+            // 모듈 등록
             $output = executeQuery('module.insertModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
 
+            // 모듈 추가 변수 등록
+            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
+
             // commit
             $oDB->commit();
 
@@ -175,6 +219,9 @@
          * @brief 모듈의 정보를 수정
          **/
         function updateModule($args) {
+            $output = $this->arrangeModuleInfo($args, $extra_vars);
+            if(!$output->toBool()) return $output;
+
             // begin transaction
             $oDB = &DB::getInstance();
             $oDB->begin();
@@ -182,7 +229,7 @@
             $oModuleModel = &getModel('module');
             $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
 
-            if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
+            $args->site_srl = (int)$module_info->site_srl;
             if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
 
             $output = executeQuery('module.isExistsModuleName', $args);
@@ -191,20 +238,25 @@
                 return new Object(-1, 'msg_module_name_exists');
             }
 
+            // is_default 의 값에 따라서 처리
+            if($args->site_srl!=0) $args->is_default = 'N';
+            else {
+                if($args->is_default!='Y') $args->is_default = 'N';
+                else $this->clearDefaultModule();
+            }
+
             $output = executeQuery('module.updateModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
 
-            $output->add('module_srl',$args->module_srl);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
+            // 모듈 추가 변수 등록
+            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
 
             $oDB->commit();
 
+            $output->add('module_srl',$args->module_srl);
             return $output;
         }
 
@@ -233,6 +285,18 @@
                 return $output;
             }
 
+            // 권한 정보 삭제
+            $this->deleteModuleGrants($module_srl);
+
+            // 스킨 정보 삭제
+            $this->deleteModuleSkinVars($module_srl);
+
+            // 모듈 추가 변수 삭제
+            $this->deleteModuleExtraVars($module_srl);
+
+            // 모듈 관리자 제거
+            $this->deleteAdminId($module_srl);
+
             // trigger 호출 (after)
             if($output->toBool()) {
                 $trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
@@ -261,18 +325,6 @@
             return $output;
         }
 
-        /**
-         * @brief 모듈의 권한 정보 변경
-         **/
-        function updateModuleGrant($module_srl, $grants) {
-            $args->module_srl = $module_srl;
-            $args->grants = $grants;
-            $output = executeQuery('module.updateModuleGrant', $args);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-        }
-
         /**
          * @brief 모든 모듈의 is_default값을 N 으로 세팅 (기본 모듈 해제)
          **/
@@ -284,14 +336,14 @@
         }
 
         /**
-         * @brief 지정된 menu_srl에 속한 mid 의 menu_srl 을 변경 
+         * @brief 지정된 menu_srl에 속한 mid 의 menu_srl 을 변경
          **/
         function updateModuleMenu($args) {
             return executeQuery('module.updateModuleMenu', $args);
         }
 
         /**
-         * @brief 지정된 menu_srl에 속한 mid 의 layout_srl을 변경 
+         * @brief 지정된 menu_srl에 속한 mid 의 layout_srl을 변경
          **/
         function updateModuleLayout($layout_srl, $menu_srl_list) {
             if(!count($menu_srl_list)) return;
@@ -332,5 +384,267 @@
             }
             return new Object();
         }
+
+        /**
+         * @brief 특정 모듈에 관리자 아이디 지정
+         **/
+        function insertAdminId($module_srl, $admin_id) {
+            $oMemberModel = &getModel('member');
+            $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+            if(!$member_info->member_srl) return;
+            $args->module_srl = $module_srl;
+            $args->member_srl = $member_info->member_srl;
+            return executeQuery('module.insertAdminId', $args);
+        }
+
+        /**
+         * @brief 특정 모듈의 관리자 아이디 제거
+         **/
+        function deleteAdminId($module_srl, $admin_id = '') {
+            $args->module_srl = $module_srl;
+
+            if($admin_id) {
+                $oMemberModel = &getModel('member');
+                $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+                if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+            }
+            return executeQuery('module.deleteAdminId', $args);
+        }
+
+        /**
+         * @brief 특정 모듈에 스킨 변수 등록
+         **/
+        function insertModuleSkinVars($module_srl, $obj) {
+            $this->deleteModuleSkinVars($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            $args->module_srl = $module_srl;
+            foreach($obj as $key => $val) {
+                $args->name = trim($key);
+                $args->value = trim($val);
+                if(!$args->name || !$args->value) continue;
+                executeQuery('module.insertModuleSkinVars', $args);
+            }
+        }
+
+        /**
+         * @brief 특정 모듈의 스킨 변수 제거
+         **/
+        function deleteModuleSkinVars($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('module.deleteModuleSkinVars', $args);
+        }
+
+        /**
+         * @brief 특정 모듈에 확장 변수 등록
+         **/
+        function insertModuleExtraVars($module_srl, $obj) {
+            $this->deleteModuleExtraVars($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            foreach($obj as $key => $val) {
+                $args = null;
+                $args->module_srl = $module_srl;
+                $args->name = trim($key);
+                $args->value = trim($val);
+                if(!$args->name || !$args->value) continue;
+                executeQuery('module.insertModuleExtraVars', $args);
+            }
+        }
+
+        /**
+         * @brief 특정 모듈의 확장 변수 제거
+         **/
+        function deleteModuleExtraVars($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('module.deleteModuleExtraVars', $args);
+        }
+
+        /**
+         * @brief 특정 모듈에 권한 등록
+         **/
+        function insertModuleGrants($module_srl, $obj) {
+            $this->deleteModuleGrants($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            foreach($obj as $name => $val) {
+                if(!$val || !count($val)) continue;
+
+                foreach($val as $group_srl) {
+                    $args = null;
+                    $args->module_srl = $module_srl;
+                    $args->name = $name;
+                    $args->group_srl = trim($group_srl);
+                    if(!$args->name || !$args->group_srl) continue;
+                    executeQuery('module.insertModuleGrant', $args);
+
+                }
+            }
+        }
+
+        /**
+         * @brief 특정 모듈의 권한 제거
+         **/
+        function deleteModuleGrants($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('module.deleteModuleGrants', $args);
+        }
+
+        /**
+         * @brief 사용자 정의 언어 변경
+         **/
+        function replaceDefinedLangCode(&$output) {
+            $output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+        }
+        function _replaceLangCode($matches) {
+            static $lang = null;
+            if(is_null($lang)) {
+                $site_module_info = Context::get('site_module_info');
+                $cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
+                if(!file_exists($cache_file)) {
+                    $oModuleAdminController = &getAdminController('module');
+                    $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
+                }
+
+                require_once($cache_file);
+            }
+            if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+
+            return $matches[0];
+        }
+
+
+        /**
+         * @brief 파일박스에 파일 추가 및 업데이트
+         **/
+        function procModuleFileBoxAdd(){
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $vars = Context::gets('comment','addfile','filter');
+            $module_filebox_srl = Context::get('module_filebox_srl');
+
+            $ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+            $vars->ext = $ext;
+            if($vars->filter) $filter = explode(',',$vars->filter);
+            if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+
+            $vars->member_srl = $logged_info->member_srl;
+
+            // update
+            if($module_filebox_srl > 0){
+                $vars->module_filebox_srl = $module_filebox_srl;
+                $output = $this->updateModuleFileBox($vars);
+
+            // insert
+            }else{
+                if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+                $addfile = Context::get('addfile');
+                if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
+                if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+                $output = $this->insertModuleFileBox($vars);
+            }
+
+            $url  = getUrl('','module','module','act','dispModuleFileBox','input',Context::get('input'),'filter',$vars->filter);
+            $url = html_entity_decode($url);
+            $vars = Context::set('url',$url);
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('move_filebox_list');
+        }
+
+
+        /**
+         * @brief 파일박스에 파일 업데이트
+         **/
+        function updateModuleFileBox($vars){
+
+            // have file
+            if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name'])){
+                $oModuleModel = &getModel('module');
+                $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
+                FileHandler::removeFile($output->data->filename);
+
+                $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
+                FileHandler::makeDir($path);
+
+                $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+                $tmp = $vars->addfile['tmp_name'];
+
+                if(!@move_uploaded_file($tmp, $save_filename)) {
+                    return false;
+                }
+
+                $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+                $args->filename = $save_filename;
+                $args->filesize = $vars->addfile['size'];
+
+            }
+
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            $args->comment = $vars->comment;
+
+            return executeQuery('module.updateModuleFileBox', $vars);
+        }
+
+
+        /**
+         * @brief 파일박스에 파일 추가
+         **/
+        function insertModuleFileBox($vars){
+            // set module_filebox_srl
+            $vars->module_filebox_srl = getNextSequence();
+
+            // get file path
+            $oModuleModel = &getModel('module');
+            $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
+            FileHandler::makeDir($path);
+            $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+            $tmp = $vars->addfile['tmp_name'];
+
+            // upload
+            if(!@move_uploaded_file($tmp, $save_filename)) {
+                return false;
+            }
+
+
+            // insert
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            $args->member_srl = $vars->member_srl;
+            $args->comment = $vars->comment;
+            $args->filename = $save_filename;
+            $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+            $args->filesize = $vars->addfile['size'];
+
+            $output = executeQuery('module.insertModuleFileBox', $args);
+            return $output;
+        }
+
+
+        /**
+         * @brief 파일박스에 파일 삭제
+         **/
+
+        function procModuleFileBoxDelete(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $module_filebox_srl = Context::get('module_filebox_srl');
+            if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+            $vars->module_filebox_srl = $module_filebox_srl;
+            $output = $this->deleteModuleFileBox($vars);
+            if(!$output->toBool()) return $output;
+        }
+
+        function deleteModuleFileBox($vars){
+
+            // delete real file
+            $oModuleModel = &getModel('module');
+            $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
+            FileHandler::removeFile($output->data->filename);
+
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            return executeQuery('module.deleteModuleFileBox', $args);
+        }
     }
 ?>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 044fd62ca..1c3374571 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -13,33 +13,6 @@
         function init() {
         }
 
-        /**
-         * @brief document_srl로 모듈의 정보르 구함
-         * 이 경우는 캐시파일을 이용할 수가 없음
-         **/
-        function getModuleInfoByDocumentSrl($document_srl) {
-            $args->document_srl = $document_srl;
-            $output = executeQuery('module.getModuleInfoByDocument', $args);
-
-            return $this->arrangeModuleInfo($output->data);
-        }
-
-        /**
-         * @brief domain에 따른 기본 mid를 구함
-         **/
-        function getDefaultMid() {
-            // domain 으로 등록된 virtual site가 있는지 확인
-            $url_info = parse_url(Context::getRequestUri());
-            $hostname = $url_info['host'];
-            $path = preg_replace('/\/$/','',$url_info['path']);
-            $sites_args->domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
-            $output = executeQuery('module.getSiteDefaultInfo', $sites_args);
-            if(!$output->toBool() || !$output->data) $output = executeQuery('module.getDefaultMidInfo');
-            $module_info = $output->data;
-            if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
-            return $this->arrangeModuleInfo($module_info);
-        }
-
         /**
          * @brief site 정보를 구함
          **/
@@ -55,6 +28,39 @@
             return $output->data;
         }
 
+        /**
+         * @brief document_srl로 모듈의 정보르 구함
+         * 이 경우는 캐시파일을 이용할 수가 없음
+         **/
+        function getModuleInfoByDocumentSrl($document_srl) {
+            $args->document_srl = $document_srl;
+            $output = executeQuery('module.getModuleInfoByDocument', $args);
+            return $this->addModuleExtraVars($output->data);
+        }
+
+        /**
+         * @brief domain에 따른 기본 mid를 구함
+         **/
+        function getDefaultMid() {
+            // domain 으로 등록된 virtual site가 있는지 확인
+            $url_info = parse_url(Context::getRequestUri());
+            $hostname = $url_info['host'];
+            $path = preg_replace('/\/$/','',$url_info['path']);
+            $sites_args->domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
+
+            $output = executeQuery('module.getSiteDefaultInfo', $sites_args);
+
+            // virtual site를 못 찾으면 가장 기본 모듈 추출
+            if(!$output->toBool() || !$output->data) {
+                $args->site_srl = 0;
+                $output = executeQuery('module.getDefaultMidInfo', $args);
+            }
+            $module_info = $output->data;
+            if(!$module_info->module_srl) return;
+            if(is_array($module_info) && $module_info->data[0]) $module_info = $module_info[0];
+            return $this->addModuleExtraVars($module_info);
+        }
+
         /**
          * @brief mid로 모듈의 정보를 구함
          **/
@@ -64,7 +70,7 @@
             $output = executeQuery('module.getMidInfo', $args);
             $module_info = $output->data;
             if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
-            return $this->arrangeModuleInfo($module_info);
+            return $this->addModuleExtraVars($module_info);
         }
 
         /**
@@ -75,8 +81,8 @@
             $args->module_srl = $module_srl;
             $output = executeQuery('module.getMidInfo', $args);
             if(!$output->data) return;
-
-            return $this->arrangeModuleInfo($output->data);
+            $module_info = $this->addModuleExtraVars($output->data);
+            return $module_info;
         }
 
         /**
@@ -91,9 +97,9 @@
 
             $modules = array();
             for($i=0;$i<$count;$i++) {
-                $modules[] = $this->arrangeModuleInfo($output->data[$i]);
+                $modules[] = $output->data[$i];
             }
-            return $modules;
+            return $this->addModuleExtraVars($modules);
         }
 
         /**
@@ -104,7 +110,38 @@
             $args->module_srls = $module_srls;
             $output = executeQueryArray('module.getModulesInfo', $args);
             if(!$output->toBool()) return;
-            return $output->data;
+            return $this->addModuleExtraVars($output->data);
+        }
+
+        /**
+         * @brief 모듈의 기본 정보에 추가 변수 구함
+         **/
+        function addModuleExtraVars($module_info) {
+            // 1개 이상의 모듈정보를 요청받아도 처리 가능하도록
+            if(!is_array($module_info)) $target_module_info = array($module_info);
+            else $target_module_info = $module_info;
+
+            // 모듈 번호를 구함 
+            $module_srls = array();
+            foreach($target_module_info as $key => $val) {
+                $module_srl = $val->module_srl;
+                if(!$module_srl) continue;
+                $module_srls[] = $val->module_srl;
+            }
+
+            // 모듈의 추가정보/ 스킨 정보를 추출
+            $extra_vars = $this->getModuleExtraVars($module_srls);
+            if(!count($module_srls) || !count($extra_vars)) return $module_info;
+
+            foreach($target_module_info as $key => $val) {
+                if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+                foreach($extra_vars[$val->module_srl] as $k => $v) {
+                    if($target_module_info[$key]->{$k}) continue;
+                    $target_module_info[$key]->{$k} = $v;
+                }
+            }
+            if(is_array($module_info)) return $target_module_info;
+            return $target_module_info[0];
         }
 
         /**
@@ -150,47 +187,6 @@
             return $module_srl_list;
         }
 
-        /**
-         * @brief DB에서 가져온 원 모듈 정보에서 grant, extraVar등의 정리
-         **/
-        function arrangeModuleInfo($source_module_info) {
-            if(!$source_module_info || !is_object($source_module_info) ) return;
-
-            // serialize되어 있는 변수들 추출
-            $extra_vars = $source_module_info->extra_vars;
-            $skin_vars = $source_module_info->skin_vars;
-            $grants = $source_module_info->grants;
-            $admin_id = $source_module_info->admin_id;
-
-            unset($source_module_info->extra_vars);
-            unset($source_module_info->skin_vars);
-            unset($source_module_info->grants);
-            unset($source_module_info->admin_id);
-
-            $module_info = clone($source_module_info);
-
-            // extra_vars의 정리
-            if($extra_vars) {
-                $extra_vars = unserialize($extra_vars);
-                if(is_array($extra_vars) || is_object($extra_vars)) foreach($extra_vars as $key => $val) if(!$module_info->{$key}) $module_info->{$key} = $val;
-            }
-
-            // skin_vars의 정리
-            if($skin_vars) {
-                $skin_vars = unserialize($skin_vars);
-                foreach($skin_vars as $key => $val) if(!$module_info->{$key}) $module_info->{$key} = $val;
-            }
-
-            // 권한의 정리
-            if($grants) $module_info->grants = unserialize($grants);
-
-            // 관리자 아이디의 정리
-            if($admin_id) $module_info->admin_id = explode(',',$admin_id);
-            else $module_info->admin_id = array();
-
-            return $module_info;
-        }
-
         /**
          * @brief act 값에 의한 forward 값을 구함
          **/
@@ -223,6 +219,230 @@
             return $output->data;
         }
 
+        /**
+         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
+         **/
+        function getModuleInfoXml($module) {
+            // 요청된 모듈의 경로를 구한다. 없으면 return
+            $module_path = ModuleHandler::getModulePath($module);
+            if(!$module_path) return;
+
+            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
+            $xml_file = sprintf("%s/conf/info.xml", $module_path);
+            if(!file_exists($xml_file)) return;
+
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->module;
+
+            if(!$xml_obj) return;
+
+            // 모듈 정보
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // module format 0.2
+                $module_info->title = $xml_obj->title->body;
+                $module_info->description = $xml_obj->description->body;
+                $module_info->version = $xml_obj->version->body;
+                $module_info->homepage = $xml_obj->link->body;
+                $module_info->category = $xml_obj->category->body;
+                if(!$module_info->category) $module_info->category = 'service';
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->license = $xml_obj->license->body;
+                $module_info->license_link = $xml_obj->license->attrs->link;
+
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                foreach($author_list as $author) {
+                    unset($author_obj);
+                    $author_obj->name = $author->name->body;
+                    $author_obj->email_address = $author->attrs->email_address;
+                    $author_obj->homepage = $author->attrs->link;
+                    $module_info->author[] = $author_obj;
+                }
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
+                    else $history = $xml_obj->history;
+
+                    foreach($history as $item) {
+                        unset($obj);
+
+                        if($item->author) {
+                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
+
+                            foreach($obj->author_list as $author) {
+                                unset($author_obj);
+                                $author_obj->name = $author->name->body;
+                                $author_obj->email_address = $author->attrs->email_address;
+                                $author_obj->homepage = $author->attrs->link;
+                                $obj->author[] = $author_obj;
+                            }
+                        }
+
+                        $obj->name = $item->name->body;
+                        $obj->email_address = $item->attrs->email_address;
+                        $obj->homepage = $item->attrs->link;
+                        $obj->version = $item->attrs->version;
+                        $obj->date = $item->attrs->date;
+                        $obj->description = $item->description->body;
+
+                        if($item->log) {
+                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
+
+                            foreach($obj->log as $log) {
+                                unset($logs_obj);
+                                $logs_obj->text = $log->body;
+                                $logs_obj->link = $log->attrs->link;
+                                $obj->logs[] = $logs_obj;
+                            }
+                        }
+
+                        $module_info->history[] = $obj;
+                    }
+                }
+
+
+            } else {
+                // module format 0.1
+                $module_info->title = $xml_obj->title->body;
+                $module_info->description = $xml_obj->author->description->body;
+                $module_info->version = $xml_obj->attrs->version;
+                $module_info->category = $xml_obj->attrs->category;
+                if(!$module_info->category) $module_info->category = 'service';
+                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $author_obj->name = $xml_obj->author->name->body;
+                $author_obj->email_address = $xml_obj->author->attrs->email_address;
+                $author_obj->homepage = $xml_obj->author->attrs->link;
+                $module_info->author[] = $author_obj;
+            }
+
+            // action 정보를 얻어서 admin_index를 추가
+            $action_info = $this->getModuleActionXml($module);
+            $module_info->admin_index_act = $action_info->admin_index_act;
+
+            return $module_info;
+        }
+
+        /**
+         * @brief module의 conf/module.xml 을 통해 grant(권한) 및 action 데이터를 return
+         * module.xml 파일의 경우 파싱하는데 시간이 걸리기에 캐싱을 한다...
+         * 캐싱을 할때 바로 include 할 수 있도록 역시 코드까지 추가하여 캐싱을 한다.
+         * 이게 퍼포먼스 상으로는 좋은데 어떤 부정적인 결과를 유도할지는 잘 모르겠...
+         **/
+        function getModuleActionXml($module) {
+            // 요청된 모듈의 경로를 구한다. 없으면 return
+            $class_path = ModuleHandler::getModulePath($module);
+            if(!$class_path) return;
+
+            // 해당 경로에 module.xml 파일이 있는지 체크한다. 없으면 return
+            $xml_file = sprintf("%sconf/module.xml", $class_path);
+            if(!file_exists($xml_file)) return;
+
+            // 캐시된 파일이 있는지 확인
+            $cache_file = sprintf("./files/cache/module_info/%s.%s.php", $module, Context::getLangType());
+
+            // 캐시 파일이 없거나 캐시 파일이 xml 파일보다 오래되었으면 내용 다시 갱신
+            if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file)) {
+
+                $buff = ""; ///< 캐시 파일에 쓸 buff 변수 설정
+
+                $xml_obj = XmlParser::loadXmlFile($xml_file); ///< xml 파일을 읽어서 xml object로 변환
+
+                if(!count($xml_obj->module)) return; ///< xml 내용중에 module 태그가 없다면 오류;;
+
+                $grants = $xml_obj->module->grants->grant; ///< 권한 정보 (없는 경우도 있음)
+                $permissions = $xml_obj->module->permissions->permission; ///< 권한 대행 (없는 경우도 있음)
+                $actions = $xml_obj->module->actions->action; ///< action list (필수)
+
+                $default_index = $admin_index = '';
+
+                // 권한 정보의 정리
+                if($grants) {
+                    if(is_array($grants)) $grant_list = $grants;
+                    else $grant_list[] = $grants;
+
+                    foreach($grant_list as $grant) {
+                        $name = $grant->attrs->name;
+                        $default = $grant->attrs->default?$grant->attrs->default:'guest';
+                        $title = $grant->title->body;
+
+                        $info->grant->{$name}->title = $title;
+                        $info->grant->{$name}->default = $default;
+
+                        $buff .= sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
+                        $buff .= sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
+                    }
+                }
+
+                // 권한 허용 정리
+                if($permissions) {
+                    if(is_array($permissions)) $permission_list = $permissions;
+                    else $permission_list[] = $permissions;
+
+                    foreach($permission_list as $permission) {
+                        $action = $permission->attrs->action;
+                        $target = $permission->attrs->target;
+
+                        $info->permission->{$action} = $target;
+
+                        $buff .= sprintf('$info->permission->%s = \'%s\';', $action, $target);
+                    }
+                }
+
+                // actions 정리
+                if($actions) {
+                    if(is_array($actions)) $action_list = $actions;
+                    else $action_list[] = $actions;
+
+                    foreach($action_list as $action) {
+                        $name = $action->attrs->name;
+
+                        $type = $action->attrs->type;
+                        $grant = $action->attrs->grant?$action->attrs->grant:'guest';
+                        $standalone = $action->attrs->standalone=='true'?'true':'false';
+
+                        $index = $action->attrs->index;
+                        $admin_index = $action->attrs->admin_index;
+
+                        $output->action->{$name}->type = $type;
+                        $output->action->{$name}->grant = $grant;
+                        $output->action->{$name}->standalone= $standalone;
+
+                        $info->action->{$name}->type = $type;
+                        $info->action->{$name}->grant = $grant;
+                        $info->action->{$name}->standalone = $standalone=='true'?true:false;
+
+                        $buff .= sprintf('$info->action->%s->type=\'%s\';', $name, $type);
+                        $buff .= sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
+                        $buff .= sprintf('$info->action->%s->standalone=%s;', $name, $standalone);
+
+                        if($index=='true') {
+                            $default_index_act = $name;
+                            $info->default_index_act = $name;
+                        }
+                        if($admin_index=='true') {
+                            $admin_index_act = $name;
+                            $info->admin_index_act = $name;
+                        }
+                    }
+                }
+                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();$info->default_index_act = \'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $admin_index_act, $buff);
+
+                FileHandler::writeFile($cache_file, $buff);
+
+                return $info;
+            }
+
+            @include($cache_file);
+
+            return $info;
+        }
+
+
         /**
          * @brief 주어진 곳의 스킨 목록을 구함
          * 스킨과 skin.xml 파일을 분석 정리한 결과를 return
@@ -243,13 +463,13 @@
             return $skin_list;
         }
 
-
         /**
          * @brief 특정 위치의 특정 스킨의 정보를 구해옴
          **/
         function loadSkinInfo($path, $skin) {
 
             // 모듈의 스킨의 정보 xml 파일을 읽음
+            if(substr($path,-1)!='/') $path .= '/';
             $skin_xml_file = sprintf("%sskins/%s/skin.xml", $path, $skin);
             if(!file_exists($skin_xml_file)) return;
 
@@ -320,8 +540,8 @@
                                     $obj->options[$i]->value = $val->options[$i]->attrs->value;
                                 }
                             } else {
-                                $obj->options[0]->title = $val->options[0]->title->body;
-                                $obj->options[0]->value = $val->options[0]->attrs->value;
+                                $obj->options[0]->title = $val->options->title->body;
+                                $obj->options[0]->value = $val->options->attrs->value;
                             }
 
                             $skin_info->extra_vars[] = $obj;
@@ -487,120 +707,6 @@
             return $skin_info;
         }
 
-        /**
-         * @brief module의 conf/module.xml 을 통해 grant(권한) 및 action 데이터를 return
-         * module.xml 파일의 경우 파싱하는데 시간이 걸리기에 캐싱을 한다...
-         * 캐싱을 할때 바로 include 할 수 있도록 역시 코드까지 추가하여 캐싱을 한다.
-         * 이게 퍼포먼스 상으로는 좋은데 어떤 부정적인 결과를 유도할지는 잘 모르겠...
-         **/
-        function getModuleActionXml($module) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $class_path = ModuleHandler::getModulePath($module);
-            if(!$class_path) return;
-
-            // 해당 경로에 module.xml 파일이 있는지 체크한다. 없으면 return
-            $xml_file = sprintf("%sconf/module.xml", $class_path);
-            if(!file_exists($xml_file)) return;
-
-            // 캐시된 파일이 있는지 확인
-            $cache_file = sprintf("./files/cache/module_info/%s.%s.php", $module, Context::getLangType());
-
-            // 캐시 파일이 없거나 캐시 파일이 xml 파일보다 오래되었으면 내용 다시 갱신
-            if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file)) {
-
-                $buff = ""; ///< 캐시 파일에 쓸 buff 변수 설정
-
-                $xml_obj = XmlParser::loadXmlFile($xml_file); ///< xml 파일을 읽어서 xml object로 변환
-
-                if(!count($xml_obj->module)) return; ///< xml 내용중에 module 태그가 없다면 오류;;
-
-                $grants = $xml_obj->module->grants->grant; ///< 권한 정보 (없는 경우도 있음)
-                $permissions = $xml_obj->module->permissions->permission; ///< 권한 대행 (없는 경우도 있음)
-                $actions = $xml_obj->module->actions->action; ///< action list (필수)
-
-                $default_index = $admin_index = '';
-
-                // 권한 정보의 정리
-                if($grants) {
-                    if(is_array($grants)) $grant_list = $grants;
-                    else $grant_list[] = $grants;
-
-                    foreach($grant_list as $grant) {
-                        $name = $grant->attrs->name;
-                        $default = $grant->attrs->default?$grant->attrs->default:'guest';
-                        $title = $grant->title->body;
-
-                        $info->grant->{$name}->title = $title;
-                        $info->grant->{$name}->default = $default;
-
-                        $buff .= sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
-                        $buff .= sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
-                    }
-                }
-
-                // 권한 허용 정리
-                if($permissions) {
-                    if(is_array($permissions)) $permission_list = $permissions;
-                    else $permission_list[] = $permissions;
-
-                    foreach($permission_list as $permission) {
-                        $action = $permission->attrs->action;
-                        $target = $permission->attrs->target;
-
-                        $info->permission->{$action} = $target;
-
-                        $buff .= sprintf('$info->permission->%s = \'%s\';', $action, $target);
-                    }
-                }
-
-                // actions 정리
-                if($actions) {
-                    if(is_array($actions)) $action_list = $actions;
-                    else $action_list[] = $actions;
-
-                    foreach($action_list as $action) {
-                        $name = $action->attrs->name;
-
-                        $type = $action->attrs->type;
-                        $grant = $action->attrs->grant?$action->attrs->grant:'guest';
-                        $standalone = $action->attrs->standalone=='true'?'true':'false';
-
-                        $index = $action->attrs->index;
-                        $admin_index = $action->attrs->admin_index;
-
-                        $output->action->{$name}->type = $type;
-                        $output->action->{$name}->grant = $grant;
-                        $output->action->{$name}->standalone= $standalone;
-
-                        $info->action->{$name}->type = $type;
-                        $info->action->{$name}->grant = $grant;
-                        $info->action->{$name}->standalone = $standalone=='true'?true:false;
-
-                        $buff .= sprintf('$info->action->%s->type=\'%s\';', $name, $type);
-                        $buff .= sprintf('$info->action->%s->grant=\'%s\';', $name, $grant);
-                        $buff .= sprintf('$info->action->%s->standalone=%s;', $name, $standalone);
-
-                        if($index=='true') {
-                            $default_index_act = $name;
-                            $info->default_index_act = $name;
-                        }
-                        if($admin_index=='true') {
-                            $admin_index_act = $name;
-                            $info->admin_index_act = $name;
-                        }
-                    }
-                }
-                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();$info->default_index_act = \'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $admin_index_act, $buff);
-
-                FileHandler::writeFile($cache_file, $buff);
-
-                return $info;
-            }
-
-            @include($cache_file);
-
-            return $info;
-        }
 
         /**
          * @brief 특정 모듈의 설정 return
@@ -646,114 +752,6 @@
         }
 
 
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         **/
-        function getModuleInfoXml($module) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $module_path = ModuleHandler::getModulePath($module);
-            if(!$module_path) return;
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $xml_file = sprintf("%s/conf/info.xml", $module_path);
-            if(!file_exists($xml_file)) return;
-
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            $xml_obj = $tmp_xml_obj->module;
-
-            if(!$xml_obj) return;
-
-            // 모듈 정보
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // module format 0.2
-                $module_info->title = $xml_obj->title->body;
-                $module_info->description = $xml_obj->description->body;
-                $module_info->version = $xml_obj->version->body;
-                $module_info->homepage = $xml_obj->link->body;
-                $module_info->category = $xml_obj->category->body;
-                if(!$module_info->category) $module_info->category = 'service';
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->license = $xml_obj->license->body;
-                $module_info->license_link = $xml_obj->license->attrs->link;
-
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                foreach($author_list as $author) {
-                    unset($author_obj);
-                    $author_obj->name = $author->name->body;
-                    $author_obj->email_address = $author->attrs->email_address;
-                    $author_obj->homepage = $author->attrs->link;
-                    $module_info->author[] = $author_obj;
-                }
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
-                    else $history = $xml_obj->history;
-
-                    foreach($history as $item) {
-                        unset($obj);
-
-                        if($item->author) {
-                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
-
-                            foreach($obj->author_list as $author) {
-                                unset($author_obj);
-                                $author_obj->name = $author->name->body;
-                                $author_obj->email_address = $author->attrs->email_address;
-                                $author_obj->homepage = $author->attrs->link;
-                                $obj->author[] = $author_obj;
-                            }
-                        }
-
-                        $obj->name = $item->name->body;
-                        $obj->email_address = $item->attrs->email_address;
-                        $obj->homepage = $item->attrs->link;
-                        $obj->version = $item->attrs->version;
-                        $obj->date = $item->attrs->date;
-                        $obj->description = $item->description->body;
-
-                        if($item->log) {
-                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
-
-                            foreach($obj->log as $log) {
-                                unset($logs_obj);
-                                $logs_obj->text = $log->body;
-                                $logs_obj->link = $log->attrs->link;
-                                $obj->logs[] = $logs_obj;
-                            }
-                        }
-
-                        $module_info->history[] = $obj;
-                    }
-                }
-
-
-            } else {
-                // module format 0.1
-                $module_info->title = $xml_obj->title->body;
-                $module_info->description = $xml_obj->author->description->body;
-                $module_info->version = $xml_obj->attrs->version;
-                $module_info->category = $xml_obj->attrs->category;
-                if(!$module_info->category) $module_info->category = 'service';
-                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $author_obj->name = $xml_obj->author->name->body;
-                $author_obj->email_address = $xml_obj->author->attrs->email_address;
-                $author_obj->homepage = $xml_obj->author->attrs->link;
-                $module_info->author[] = $author_obj;
-            }
-
-            // action 정보를 얻어서 admin_index를 추가
-            $action_info = $this->getModuleActionXml($module);
-            $module_info->admin_index_act = $action_info->admin_index_act;
-
-            return $module_info;
-        }
-
         /**
          * @brief 모듈 카테고리의 목록을 구함
          **/
@@ -901,37 +899,17 @@
             }
         }
 
-        /**
-         * @brief 특정 모듈의 정보와 회원의 정보를 받아서 관리 권한 유무를 판단
-         * 회원의 아이디가 해당 모듈의 admin_id에 있으면 true
-         * 회원이 속한 그룹이 해당 모듈의 manager 그룹에 있으면 true
-         * 이 method는 각 모듈.class.php 에서 isAdmin method에서 사용됨
-         **/
-        function isModuleAdmin($module_info, $member_info) {
-           $user_id = $member_info->user_id;
-           $group_list = $member_info->group_list;
-           if(!$group_list || !is_array($group_list) || !count($group_list)) return false;
-
-            // 직접 관리자로 선택하였을 경우 확인
-            if(is_array($module_info->admin_id) && in_array($user_id, $module_info->admin_id)) return true;
-
-            // 관리자 그룹으로 등록되어 있을 경우 확인
-            $manager_group = $module_info->grants['manager'];
-            return count(array_intersect(array_keys($group_list), $manager_group));
-        }
-
         /**
          * @brief site_module_info의 관리자 인지 체크
          **/
-        function isSiteAdmin() {
-            if(!Context::get('is_logged')) return false;
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') return true;
+        function isSiteAdmin($member_info) {
+            if(!$member_info->member_srl) return false;
+            if($member_info->is_admin == 'Y') return true;
 
             $site_module_info = Context::get('site_module_info');
             if(!$site_module_info) return;
             $args->site_srl = $site_module_info->site_srl;
-            $args->member_srl = $logged_info->member_srl;
+            $args->member_srl = $member_info->member_srl;
             $output = executeQuery('module.isSiteAdmin', $args);
             if($output->data->member_srl == $args->member_srl) return true;
             return false;
@@ -947,5 +925,207 @@
             return $output->data;
         }
 
+        /**
+         * @brief 특정 모듈의 관리자 아이디 구함
+         **/
+        function getAdminId($module_srl) {
+            $obj->module_srl = $module_srl;
+            $output = executeQueryArray('module.getAdminID', $obj);
+            if(!$output->toBool() || !$output->data) return;
+
+            return $output->data;
+        }
+
+        /**
+         * @brief 특정 모듈의 추가 변수를 구함 
+         * modules 테이블의 기본 정보 이외의 것
+         **/
+        function getModuleExtraVars($module_srl) {
+            if(is_array($module_srl)) $module_srl = implode(',',$module_srl);
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleExtraVars',$args);
+            if(!$output->toBool() || !$output->data) return;
+
+            $vars = array();
+            foreach($output->data as $key => $val) {
+                if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+                $vars[$val->module_srl]->{$val->name} = $val->value;
+            }
+            return $vars;
+        }
+
+        /**
+         * @brief 특정 모듈의 스킨 정보를 구함
+         **/
+        function getModuleSkinVars($module_srl) {
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleSkinVars',$args);
+            if(!$output->toBool() || !$output->data) return;
+
+            $skin_vars = array();
+            foreach($output->data as $val) $skin_vars[$val->name] = $val;
+            return $skin_vars;
+        }
+
+        /**
+         * @brief 특정 모듈의 스킨 정보를 모듈 정보와 결합
+         **/
+        function syncSkinInfoToModuleInfo(&$module_info) {
+            if(!$module_info->module_srl) return;
+
+            $args->module_srl = $module_info->module_srl;
+            $output = executeQueryArray('module.getModuleSkinVars',$args);
+            if(!$output->toBool() || !$output->data) return;
+
+            foreach($output->data as $val) {
+                if(isset($module_info->{$val->name})) continue;
+                $module_info->{$val->name} = $val->value;
+            }
+        }
+
+        /**
+         * @brief 특정 모듈정보와 XML, 그리고 회원 정보로 권한을 return
+         **/
+        function getGrant($module_info, $member_info, $xml_info = '') {
+            if(!$xml_info) {
+                $module = $module_info->module;
+                $xml_info = $this->getModuleActionXml($module);
+            }
+            // 그룹 권한 설정에 필요한 변수를 세팅
+            $module_srl = $module_info->module_srl;
+            $grant_info = $xml_info->grant;
+            if($member_info->member_srl) {
+                if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
+                else $group_list = array();
+            } else {
+                $group_list = array();
+            }
+
+            // module_srl이 없는 즉 별도의 권한 설정이 안되는 경우
+            if(!$module_srl) {
+                $grant->access = true;
+                if($this->isSiteAdmin($member_info)) $grant->access = $grant->is_admin = $grant->manager = true;
+                else $grant->is_admin = $grant->manager = $member_info->is_admin=='Y'?true:false;
+
+            // module_srl이 있는 경우
+            } else {
+
+                // grant 종류를 구함
+                $grant->access = $grant->is_admin = $grant->manager = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info))?true:false;
+
+                // 관리자가 아니라 로그인 회원일 경우 이 모듈의 관리자인지 확인
+                if(!$grant->manager && $member_info->member_srl) {
+                    $args->module_srl = $module_srl;
+                    $args->member_srl = $member_info->member_srl;
+                    $output = executeQuery('module.getModuleAdmin',$args);
+                    if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = $grant->is_admin = true;
+                }
+
+                // 관리자가 아니면 직접 DB에서 정보를 구해서 권한 설정
+                if(!$grant->manager) {
+                    $args = null;
+                    $args->module_srl = $module_srl;
+                    $output = executeQueryArray('module.getModuleGrants', $args);
+
+                    $grant_exists = $granted = array();
+
+                    if($output->data) {
+                        // 1차적으로 권한 대상 이름과 그룹을 정리
+                        foreach($output->data as $val) {
+                            $grant_exists[$val->name] = true;
+                            if($granted[$val->name]) continue;
+
+                            // 로그인 회원만
+                            if($val->group_srl == -1) {
+                                $granted[$val->name] = true;
+                                if($member_info->member_srl) $grant->{$val->name} = true;
+
+                            // 사이트 가입한 회원만
+                            } elseif($val->group_srl == -2) {
+                                $granted[$val->name] = true;
+                                // 비로그인 회원이면 권한 미부여
+                                if(!$member_info->member_srl) $grant->{$val->name} = false;
+                                // 로그인 회원
+                                else {
+                                    $site_module_info = Context::get('site_module_info');
+                                    // 현재 접속된 사이트 정보가 없으면 권한 부여
+                                    if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+                                    // 현재 접속된 사이트의 그룹 정보가 있 으면 권한 미부여
+                                    elseif(count($group_list)) $grant->{$val->name} = true;
+                                }
+
+                            // 비로그인 회원 모두
+                            } elseif($val->group_srl == 0) {
+                                $granted[$val->name] = true;
+                                $grant->{$val->name} = true;
+                            // 특정 그룹 대상일 경우
+                            } else {
+                                if($group_list && count($group_list) && in_array($val->group_srl, $group_list)) {
+                                    $grant->{$val->name} = true;
+                                    $granted[$val->name] = true;
+                                }
+                            }
+                        }
+                    }
+
+                    // 가상 그룹인 access에 대해서 별도 처리
+                    if(!$grant_exists['access']) $grant->access = true;
+                    if(count($grant_info)) {
+                        foreach($grant_info as  $grant_name => $grant_item) {
+                            if($grant_exists[$grant_name]) continue;
+                            switch($grant_item->default) {
+                                case 'guest' :
+                                        $grant->{$grant_name} = true;
+                                    break;
+                                case 'member' :
+                                        if($member_info->member_srl) $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                                case 'site' :
+                                        $site_module_info = Context::get('site_module_info');
+                                        if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                                case 'manager' :
+                                case 'root' :
+                                        if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                // 관리자일 경우 모든 권한에 대해 true 지정
+                if($grant->manager) {
+                    $grant->access = true;
+                    if(count($grant_info)) {
+                        foreach($grant_info as $key => $val) {
+                            $grant->{$key} = true;
+                        }
+                    }
+                }
+
+            }
+            return $grant;
+        }
+
+
+
+        function getModuleFileBox($module_filebox_srl){
+            $args->module_filebox_srl = $module_filebox_srl;
+            return executeQuery('getModuleFileBox', $args);
+        }
+
+        function getModuleFileBoxList(){
+            $args->page = Context::get('page');
+            $args->list_count = 10;
+            $args->page_count = 10;
+            return executeQuery('module.getModuleFileBoxList', $args);
+        }
+
+        function getModuleFileBoxPath($module_filebox_srl){
+            return sprintf("./files/attach/filebox/%s",getNumberingPath($module_filebox_srl,3));
+        }
     }
 ?>
diff --git a/modules/module/module.view.php b/modules/module/module.view.php
index 049eab8c2..10f0bf29e 100644
--- a/modules/module/module.view.php
+++ b/modules/module/module.view.php
@@ -37,5 +37,125 @@
             $this->setTemplateFile("skin_info");
         }
 
+        /**
+         * @brief 모듈 선택기
+         **/
+        function dispModuleSelectList() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+
+            $oModuleModel = &getModel('module');
+
+            // virtual site의 개수를 추출
+            $output = executeQuery('module.getSiteCount');
+            $site_count = $output->data->count;
+            Context::set('site_count', $site_count);
+
+            // 사이트 검색어 변수 설정
+            $site_keyword = Context::get('site_keyword');
+
+            // 사이트 검색어가 없으면 현재 가상 사이트의 정보를 설정
+            $args = null;
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin == 'Y') {
+                $query_id = 'module.getSiteModules';
+                $module_category_exists = false;
+                if(!$site_keyword) {
+                    $site_module_info = Context::get('site_module_info');
+                    if($site_module_info && $logged_info->is_admin != 'Y') {
+                        $site_keyword = $site_module_info->domain;
+                        $args->site_srl = (int)$site_module_info->site_srl;
+                        Context::set('site_keyword', $site_keyword);
+                    } else {
+                        $query_id = 'module.getDefaultModules';
+                        $args->site_srl = 0;
+                        $module_category_exists = true;
+                    }
+                // 사이트 검색어가 있으면 해당 사이트(들)의 정보를 추출
+                } else {
+                    $args->site_keyword = $site_keyword;
+                }
+            } else {
+                $query_id = 'module.getSiteModules';
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            }
+            //if(is_null($args->site_srl)) $query_id = 'module.getDefaultModules';
+
+            // 지정된 사이트(혹은 전체)의 module 목록을 구함
+            $output = executeQueryArray($query_id, $args);
+            $category_list = $mid_list = array();
+            if(count($output->data)) {
+                foreach($output->data as $key => $val) {
+                    $module = trim($val->module);
+                    if(!$module) continue;
+
+                    $category = $val->category;
+                    $obj = null;
+                    $obj->module_srl = $val->module_srl;
+                    $obj->browser_title = $val->browser_title;
+                    $mid_list[$module]->list[$category][$val->mid] = $obj;
+                }
+            }
+
+            $selected_module = Context::get('selected_module');
+            if(count($mid_list)) {
+                foreach($mid_list as $module => $val) {
+                    if(!$selected_module) $selected_module = $module;
+                    $xml_info = $oModuleModel->getModuleInfoXml($module);
+                    $mid_list[$module]->title = $xml_info->title;
+                }
+            }
+
+            Context::set('mid_list', $mid_list);
+            Context::set('selected_module', $selected_module);
+            Context::set('selected_mids', $mid_list[$selected_module]->list);
+            Context::set('module_category_exists', $module_category_exists);
+
+            // 레이아웃을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('module_selector');
+        }
+
+
+        // 파일 박스 보기
+        function dispModuleFileBox(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $input_name = Context::get('input');
+
+            if(!$input_name) return new Object(-1, 'msg_not_permitted');
+
+
+            $addscript = sprintf('<script type="text/javascript">//<![CDATA[
+                            var selected_filebox_input_name = "%s";
+                          //]]></script>',$input_name);
+            Context::addHtmlHeader($addscript);
+
+            $oModuleModel = &getModel('module');
+            $output = $oModuleModel->getModuleFileBoxList();
+            Context::set('filebox_list', $output->data);
+
+            $filter = Context::get('filter');
+            if($filter) Context::set('arrfilter',explode(',',$filter));
+
+            Context::set('page_navigation', $output->page_navigation);
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('filebox_list');
+        }
+
+        // 파일 박스 등록화면
+        function dispModuleFileBoxAdd(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $filter = Context::get('filter');
+            if($filter) Context::set('arrfilter',explode(',',$filter));
+
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('filebox_add');
+        }
     }
 ?>
diff --git a/modules/module/queries/deleteAdminId.xml b/modules/module/queries/deleteAdminId.xml
new file mode 100644
index 000000000..5ea3d4699
--- /dev/null
+++ b/modules/module/queries/deleteAdminId.xml
@@ -0,0 +1,9 @@
+<query id="deleteAdminId" action="delete">
+    <tables>
+        <table name="module_admins" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and"/>
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteAdminIds.xml b/modules/module/queries/deleteAdminIds.xml
new file mode 100644
index 000000000..473a2e7f4
--- /dev/null
+++ b/modules/module/queries/deleteAdminIds.xml
@@ -0,0 +1,8 @@
+<query id="deleteAdminIds" action="delete">
+    <tables>
+        <table name="module_admins" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteLang.xml b/modules/module/queries/deleteLang.xml
new file mode 100644
index 000000000..dad1eeea5
--- /dev/null
+++ b/modules/module/queries/deleteLang.xml
@@ -0,0 +1,9 @@
+<query id="deleteLang" action="delete">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="name" var="name" notnull="notnull" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteModuleExtraVars.xml b/modules/module/queries/deleteModuleExtraVars.xml
new file mode 100644
index 000000000..6e12fb34d
--- /dev/null
+++ b/modules/module/queries/deleteModuleExtraVars.xml
@@ -0,0 +1,8 @@
+<query id="deleteModuleExtraVars" action="delete">
+    <tables>
+        <table name="module_extra_vars" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteModuleFileBox.xml b/modules/module/queries/deleteModuleFileBox.xml
new file mode 100644
index 000000000..5c9473ce5
--- /dev/null
+++ b/modules/module/queries/deleteModuleFileBox.xml
@@ -0,0 +1,8 @@
+<query id="deleteModuleFileBox" action="delete">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/module/queries/deleteModuleGrants.xml b/modules/module/queries/deleteModuleGrants.xml
new file mode 100644
index 000000000..822674caf
--- /dev/null
+++ b/modules/module/queries/deleteModuleGrants.xml
@@ -0,0 +1,8 @@
+<query id="deleteModuleGrants" action="delete">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteModuleSkinVars.xml b/modules/module/queries/deleteModuleSkinVars.xml
new file mode 100644
index 000000000..1e540121d
--- /dev/null
+++ b/modules/module/queries/deleteModuleSkinVars.xml
@@ -0,0 +1,8 @@
+<query id="deleteModuleSkinVars" action="delete">
+    <tables>
+        <table name="module_skins" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getAdminID.xml b/modules/module/queries/getAdminID.xml
new file mode 100644
index 000000000..c79fd39cd
--- /dev/null
+++ b/modules/module/queries/getAdminID.xml
@@ -0,0 +1,13 @@
+<query id="getAdminID" action="select">
+    <tables>
+        <table name="module_admins" />
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
+        <condition operation="equal" column="member.member_srl" default="module_admins.member_srl" notnull="notnull" pipe="and"/>
+    </conditions>
+</query>
diff --git a/modules/module/queries/getDefaultMidInfo.xml b/modules/module/queries/getDefaultMidInfo.xml
index b3b3f4f83..5bcac8966 100644
--- a/modules/module/queries/getDefaultMidInfo.xml
+++ b/modules/module/queries/getDefaultMidInfo.xml
@@ -6,6 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="is_default" default="Y" />
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" notnull="notnull" />
+        <condition operation="equal" column="is_default" default="Y" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/module/queries/getLang.xml b/modules/module/queries/getLang.xml
new file mode 100644
index 000000000..7633c1cbb
--- /dev/null
+++ b/modules/module/queries/getLang.xml
@@ -0,0 +1,12 @@
+<query id="getLang" action="select">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="name" var="name" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getLangList.xml b/modules/module/queries/getLangList.xml
new file mode 100644
index 000000000..f371db29c
--- /dev/null
+++ b/modules/module/queries/getLangList.xml
@@ -0,0 +1,17 @@
+<query id="getLangList" action="select">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <columns>
+        <column name="name" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="list_order" order="order_type" />
+    </navigation>
+    <groups>
+        <group column="name" />
+    </groups>
+</query>
diff --git a/modules/module/queries/getModuleAdmin.xml b/modules/module/queries/getModuleAdmin.xml
new file mode 100644
index 000000000..3f51b9442
--- /dev/null
+++ b/modules/module/queries/getModuleAdmin.xml
@@ -0,0 +1,9 @@
+<query id="getModuleAdmin" action="select">
+    <tables>
+        <table name="module_admins" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" filter="number" />
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getModuleExtraVars.xml b/modules/module/queries/getModuleExtraVars.xml
new file mode 100644
index 000000000..340b8ec8d
--- /dev/null
+++ b/modules/module/queries/getModuleExtraVars.xml
@@ -0,0 +1,11 @@
+<query id="getModuleExtraVars" action="select">
+    <tables>
+        <table name="module_extra_vars" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getModuleFileBox.xml b/modules/module/queries/getModuleFileBox.xml
new file mode 100644
index 000000000..b8faa2112
--- /dev/null
+++ b/modules/module/queries/getModuleFileBox.xml
@@ -0,0 +1,9 @@
+<query id="getModuleFileBox" action="select">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns />
+    <conditions>
+        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/module/queries/getModuleFileBoxList.xml b/modules/module/queries/getModuleFileBoxList.xml
new file mode 100644
index 000000000..76aa291c0
--- /dev/null
+++ b/modules/module/queries/getModuleFileBoxList.xml
@@ -0,0 +1,15 @@
+<query id="getModuleFileBoxList" action="select">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns />
+    <conditions>
+        <condition operation="in" column="fileextension" var="fileextension" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_filebox_srl" order="desc" />
+        <list_count var="list_count" default="10" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
\ No newline at end of file
diff --git a/modules/module/queries/getModuleGrants.xml b/modules/module/queries/getModuleGrants.xml
new file mode 100644
index 000000000..ae1df62b4
--- /dev/null
+++ b/modules/module/queries/getModuleGrants.xml
@@ -0,0 +1,11 @@
+<query id="getModuleGrants" action="select">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" filter="number" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="group_srl" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/module/queries/getModuleInfos.xml b/modules/module/queries/getModuleInfos.xml
new file mode 100644
index 000000000..44a75af3f
--- /dev/null
+++ b/modules/module/queries/getModuleInfos.xml
@@ -0,0 +1,6 @@
+<query id="getModuleInfos" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <conditions />
+</query>
diff --git a/modules/module/queries/getModuleSkinVars.xml b/modules/module/queries/getModuleSkinVars.xml
new file mode 100644
index 000000000..6319dfcf1
--- /dev/null
+++ b/modules/module/queries/getModuleSkinVars.xml
@@ -0,0 +1,8 @@
+<query id="getModuleSkinVars" action="select">
+    <tables>
+        <table name="module_skins" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srl" notnull="notnull" filter="number" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getSiteDefaultInfo.xml b/modules/module/queries/getSiteDefaultInfo.xml
index f7ed270b2..8dd76137d 100644
--- a/modules/module/queries/getSiteDefaultInfo.xml
+++ b/modules/module/queries/getSiteDefaultInfo.xml
@@ -7,6 +7,7 @@
         <column name="sites.site_srl" alias="site_srl" />
         <column name="sites.domain" alias="domain" />
         <column name="sites.index_module_srl" alias="index_module_srl" />
+        <column name="sites.default_language" alias="default_language" />
         <column name="modules.*" />
     </columns>
     <conditions>
diff --git a/modules/module/queries/getSiteInfo.xml b/modules/module/queries/getSiteInfo.xml
index 5b87afd99..c3d059305 100644
--- a/modules/module/queries/getSiteInfo.xml
+++ b/modules/module/queries/getSiteInfo.xml
@@ -7,6 +7,7 @@
         <column name="sites.site_srl" alias="site_srl" />
         <column name="sites.domain" alias="domain" />
         <column name="sites.index_module_srl" alias="index_module_srl" />
+        <column name="sites.default_language" alias="default_language" />
         <column name="modules.*" />
     </columns>
     <conditions>
diff --git a/modules/module/queries/getSiteInfoByDomain.xml b/modules/module/queries/getSiteInfoByDomain.xml
index b11130fec..9b3a3332e 100644
--- a/modules/module/queries/getSiteInfoByDomain.xml
+++ b/modules/module/queries/getSiteInfoByDomain.xml
@@ -7,6 +7,7 @@
         <column name="sites.site_srl" alias="site_srl" />
         <column name="sites.domain" alias="domain" />
         <column name="sites.index_module_srl" alias="index_module_srl" />
+        <column name="sites.default_language" alias="default_language" />
         <column name="modules.*" />
     </columns>
     <conditions>
diff --git a/modules/module/queries/insertAdminId.xml b/modules/module/queries/insertAdminId.xml
new file mode 100644
index 000000000..60f1ab088
--- /dev/null
+++ b/modules/module/queries/insertAdminId.xml
@@ -0,0 +1,10 @@
+<query id="insertAdminId" action="insert">
+    <tables>
+        <table name="module_admins" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" notnull="notnull" />
+        <column name="member_srl" var="member_srl" notnull="notnull" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertLang.xml b/modules/module/queries/insertLang.xml
new file mode 100644
index 000000000..d16fc6774
--- /dev/null
+++ b/modules/module/queries/insertLang.xml
@@ -0,0 +1,11 @@
+<query id="insertLang" action="insert">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <columns>
+        <column name="site_srl" var="site_srl" notnull="notnull" />
+        <column name="name" var="name" notnull="notnull" />
+        <column name="lang_code" var="lang_code" notnull="notnull" />
+        <column name="value" var="value" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml
index e07df4dbe..1c997d45d 100644
--- a/modules/module/queries/insertModule.xml
+++ b/modules/module/queries/insertModule.xml
@@ -12,13 +12,9 @@
         <column name="layout_srl" var="layout_srl" />
         <column name="description" var="description" />
         <column name="content" var="content" />
-        <column name="grants" var="grants" />
         <column name="module" var="module" notnull="notnull" maxlength="80"/>
         <column name="is_default" var="is_default" default="N" notnull="notnull" />
         <column name="menu_srl" var="menu_srl" filter="number" />
-        <column name="extra_vars" var="extra_vars" />
-        <column name="skin_vars" var="skin_vars" />
-        <column name="admin_id" var="admin_id" maxlength="80" />
         <column name="open_rss" var="open_rss" default="Y" notnull="notnull" />
         <column name="header_text" var="header_text" />
         <column name="footer_text" var="footer_text" />
diff --git a/modules/module/queries/insertModuleExtraVars.xml b/modules/module/queries/insertModuleExtraVars.xml
new file mode 100644
index 000000000..f594bdd6a
--- /dev/null
+++ b/modules/module/queries/insertModuleExtraVars.xml
@@ -0,0 +1,10 @@
+<query id="insertModuleExtraVars" action="insert">
+    <tables>
+        <table name="module_extra_vars" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="name" var="name" notnull="notnull" />
+        <column name="value" var="value" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertModuleFileBox.xml b/modules/module/queries/insertModuleFileBox.xml
new file mode 100644
index 000000000..e9fc56203
--- /dev/null
+++ b/modules/module/queries/insertModuleFileBox.xml
@@ -0,0 +1,14 @@
+<query id="insertModuleFileBox" action="insert">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns>
+        <column name="module_filebox_srl"  var="module_filebox_srl"  notnull="notnull" />
+        <column name="member_srl" var="member_srl" notnull="notnull" />
+        <column name="filename" var="filename" />
+        <column name="fileextension" var="fileextension" />
+        <column name="filesize" var="filesize" />
+        <column name="comment" var="comment" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertModuleGrant.xml b/modules/module/queries/insertModuleGrant.xml
new file mode 100644
index 000000000..e4ecf4eec
--- /dev/null
+++ b/modules/module/queries/insertModuleGrant.xml
@@ -0,0 +1,10 @@
+<query id="insertModuleGrant" action="insert">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="name" var="name" notnull="notnull" />
+        <column name="group_srl" var="group_srl" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertModuleSkinVars.xml b/modules/module/queries/insertModuleSkinVars.xml
new file mode 100644
index 000000000..b5831c1b0
--- /dev/null
+++ b/modules/module/queries/insertModuleSkinVars.xml
@@ -0,0 +1,10 @@
+<query id="insertModuleSkinVars" action="insert">
+    <tables>
+        <table name="module_skins" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <column name="name" var="name" notnull="notnull" />
+        <column name="value" var="value" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/module/queries/insertSite.xml b/modules/module/queries/insertSite.xml
index 3dd1180c8..dbfef8cd1 100644
--- a/modules/module/queries/insertSite.xml
+++ b/modules/module/queries/insertSite.xml
@@ -6,6 +6,7 @@
         <column name="site_srl" var="site_srl" notnull="notnull" />
         <column name="domain" var="domain" notnull="notnull" />
         <column name="index_module_srl" var="index_module_srl" default="0" filter="number" />
+        <column name="default_language" var="default_language" />
         <column name="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/module/queries/updateModule.xml b/modules/module/queries/updateModule.xml
index e9acea656..015bafd21 100644
--- a/modules/module/queries/updateModule.xml
+++ b/modules/module/queries/updateModule.xml
@@ -6,15 +6,13 @@
         <column name="module" var="module" notnull="notnull" maxlength="80"/>
         <column name="module_category_srl" var="module_category_srl" />
         <column name="layout_srl" var="layout_srl" />
+        <column name="skin" var="skin" minlength="0" maxlength="250" />
         <column name="menu_srl" var="menu_srl" filter="number" />
         <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40"/>
-        <column name="skin" var="skin" minlength="1" maxlength="250" />
         <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />
         <column name="description" var="description" />
         <column name="is_default" var="is_default" default="N" notnull="notnull" />
-        <column name="extra_vars" var="extra_vars" />
         <column name="content" var="content" />
-        <column name="admin_id" var="admin_id" maxlength="80" />
         <column name="open_rss" var="open_rss" default="Y" notnull="notnull" />
         <column name="header_text" var="header_text" />
         <column name="footer_text" var="footer_text" />
diff --git a/modules/module/queries/updateModuleFileBox.xml b/modules/module/queries/updateModuleFileBox.xml
new file mode 100644
index 000000000..63d003bf2
--- /dev/null
+++ b/modules/module/queries/updateModuleFileBox.xml
@@ -0,0 +1,15 @@
+<query id="updateModuleFileBox" action="update">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns>
+        <column name="filename" var="filename" />
+        <column name="fileextension" var="fileextension" />
+        <column name="filesize" var="filesize" />
+        <column name="comment" var="comment" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" notnull="notnull"/>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/module/queries/updateModuleGrant.xml b/modules/module/queries/updateModuleGrant.xml
deleted file mode 100644
index 8992e0a35..000000000
--- a/modules/module/queries/updateModuleGrant.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<query id="updateModuleGrant" action="update">
-    <tables>
-        <table name="modules" />
-    </tables>
-    <columns>
-        <column name="grants" var="grants" notnull="notnull" default="" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="module_srl" var="module_srl" filter="number" notnull="notnull"/>
-    </conditions>
-</query>
diff --git a/modules/module/queries/updateSite.xml b/modules/module/queries/updateSite.xml
index 17c6e63a3..48f7aac22 100644
--- a/modules/module/queries/updateSite.xml
+++ b/modules/module/queries/updateSite.xml
@@ -5,6 +5,7 @@
     <columns>
         <column name="index_module_srl" var="index_module_srl" />
         <column name="domain" var="domain" />
+        <column name="default_language" var="default_language" />
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" />
diff --git a/modules/module/schemas/lang.xml b/modules/module/schemas/lang.xml
new file mode 100644
index 000000000..b921f5f3c
--- /dev/null
+++ b/modules/module/schemas/lang.xml
@@ -0,0 +1,6 @@
+<table name="lang">
+    <column name="site_srl" type="number" size="11" notnull="notnull" index="idx_lang" />
+    <column name="name" type="varchar" size="255" notnull="notnull" index="idx_lang" />
+    <column name="lang_code" type="varchar" size="10" notnull="notnull" index="idx_lang" />
+    <column name="value" type="text"  />
+</table>
diff --git a/modules/module/schemas/module_admins.xml b/modules/module/schemas/module_admins.xml
new file mode 100644
index 000000000..7de4e5545
--- /dev/null
+++ b/modules/module/schemas/module_admins.xml
@@ -0,0 +1,5 @@
+<table name="module_admins">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module_admin" />
+    <column name="member_srl" type="number" size="11" notnull="notnull" unique="unique_module_admin" />
+    <column name="regdate" type="date" index="idx_regdate" />
+</table>
diff --git a/modules/module/schemas/module_extra_vars.xml b/modules/module/schemas/module_extra_vars.xml
new file mode 100644
index 000000000..a4af3380d
--- /dev/null
+++ b/modules/module/schemas/module_extra_vars.xml
@@ -0,0 +1,5 @@
+<table name="module_extra_vars">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module_vars" />
+    <column name="name" type="varchar" size="80" notnull="notnull" unique="unique_module_vars" />
+    <column name="value" type="text" />
+</table>
diff --git a/modules/module/schemas/module_filebox.xml b/modules/module/schemas/module_filebox.xml
new file mode 100644
index 000000000..d2b4dfc29
--- /dev/null
+++ b/modules/module/schemas/module_filebox.xml
@@ -0,0 +1,9 @@
+<table name="module_filebox">
+    <column name="module_filebox_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
+    <column name="filename" type="varchar" size="250" notnull="notnull" />
+    <column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
+    <column name="filesize" type="number" size="11" default="0" notnull="notnull" />
+    <column name="comment" type="varchar" size="250" />
+    <column name="regdate" type="date" />
+</table>
\ No newline at end of file
diff --git a/modules/module/schemas/module_grants.xml b/modules/module/schemas/module_grants.xml
new file mode 100644
index 000000000..55e557510
--- /dev/null
+++ b/modules/module/schemas/module_grants.xml
@@ -0,0 +1,5 @@
+<table name="module_grants">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module" />
+    <column name="name" type="varchar" size="20" notnull="notnull" unique="unique_module" />
+    <column name="group_srl" type="number" size="11" notnull="notnull" unique="unique_module" />
+</table>
diff --git a/modules/module/schemas/module_skins.xml b/modules/module/schemas/module_skins.xml
new file mode 100644
index 000000000..3f47d22ee
--- /dev/null
+++ b/modules/module/schemas/module_skins.xml
@@ -0,0 +1,5 @@
+<table name="module_skins">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module_skins" />
+    <column name="name" type="varchar" size="80" notnull="notnull" unique="unique_module_skins" />
+    <column name="value" type="text" />
+</table>
diff --git a/modules/module/schemas/modules.xml b/modules/module/schemas/modules.xml
index 4ab003345..74e823ec3 100644
--- a/modules/module/schemas/modules.xml
+++ b/modules/module/schemas/modules.xml
@@ -10,11 +10,7 @@
     <column name="browser_title" type="varchar" size="250" notnull="notnull"/>
     <column name="description" type="text" />
     <column name="is_default" type="char" size="1" notnull="notnull" default="N" />
-    <column name="extra_vars" type="text" />
-    <column name="skin_vars" type="text" />
     <column name="content" type="bigtext"/>
-    <column name="grants" type="text" />
-    <column name="admin_id" type="text" />
     <column name="open_rss" type="char" size="1" notnull="notnull" default="Y" />
     <column name="header_text" type="text" />
     <column name="footer_text" type="text" />
diff --git a/modules/module/schemas/sites.xml b/modules/module/schemas/sites.xml
index d594b0d48..bb5c63e66 100644
--- a/modules/module/schemas/sites.xml
+++ b/modules/module/schemas/sites.xml
@@ -2,5 +2,6 @@
     <column name="site_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="index_module_srl" type="number" size="11" default="0" />
     <column name="domain" type="varchar" size="255" notnull="notnull" index="idx_domain" />
+    <column name="default_language" type="varchar" size="255" />
     <column name="regdate" type="date" />
 </table>
diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html
index e0a2cf30d..84f4f3fb3 100644
--- a/modules/module/tpl/category_list.html
+++ b/modules/module/tpl/category_list.html
@@ -9,7 +9,7 @@
     <input type="hidden" name="mode" value="" />
 </form>
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <thead>
     <tr>
         <th scope="col" class="wide"><div>{$lang->category_title}</div></th>
@@ -25,10 +25,10 @@
     <!--@end-->
     <!--@foreach($category_list as $key => $val)-->
     <tr>
-        <td>{$val->title}</td>
-        <td class="date nowrap">{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-        <td class="center modify"><a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}</a></td>
-        <td class="center delete"><a href="#" onclick="doUpdateCategory('{$val->module_category_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
+        <td class="wide">{$val->title}</td>
+        <td class="nowrap">{zdate($val->regdate,"Y-m-d H:i:s")}</td>
+        <td><a href="{getUrl('module_category_srl',$val->module_category_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
+        <td><a href="#" onclick="doUpdateCategory('{$val->module_category_srl}','delete','{$lang->confirm_delete}');return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 </tbody>
@@ -40,7 +40,7 @@
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="module_category_srl" value="" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->category_title}</div></th>
         <td>
@@ -48,9 +48,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/module/tpl/category_update_form.html b/modules/module/tpl/category_update_form.html
index 16207c5db..6b2dec122 100644
--- a/modules/module/tpl/category_update_form.html
+++ b/modules/module/tpl/category_update_form.html
@@ -8,15 +8,15 @@
     <input type="hidden" name="module_category_srl" value="{$selected_category->module_category_srl}" />
     <input type="hidden" name="mode" value="update" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->category_title}</div></th>
         <td><input type="text" name="title" value="{$selected_category->title}" class="inputTypeText w300" /></td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/module/tpl/copy_module.html b/modules/module/tpl/copy_module.html
index 9a1e69518..1cb03996d 100644
--- a/modules/module/tpl/copy_module.html
+++ b/modules/module/tpl/copy_module.html
@@ -1,8 +1,8 @@
 <!--%import("js/module_admin.js")-->
 <!--%import("filter/copy_module.xml")-->
 
-<div id="popHeadder">
-    <h3>{$lang->module_copy}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->module_copy}</h3>
 </div>
 
 <form action="./" method="post" onsubmit="return procFilter(this, copy_module)" >
@@ -10,10 +10,10 @@
 
 <div id="popBody">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module}</div></th>
-        <td>{$module_info->module}</td>
+        <td class="wide">{$module_info->module}</td>
     </tr>
     <tr>
         <th scope="row"><div>{$lang->mid}</div></th>
@@ -26,7 +26,7 @@
     </table>
 
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col"><div>{$lang->mid}<div></th>
         <th scope="col"><div>{$lang->browser_title}<div></th>
@@ -75,9 +75,8 @@
 
 </div>
 
-<div id="popFooter" class="tCenter gap1">
-    <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
-    <span class="button"><input type="button" value="{$lang->cmd_close}" onclick="window.close(); return false;"/></span>
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
 </div>
 
 </form>
diff --git a/modules/module/tpl/filebox_add.html b/modules/module/tpl/filebox_add.html
new file mode 100644
index 000000000..7cf6d5a03
--- /dev/null
+++ b/modules/module/tpl/filebox_add.html
@@ -0,0 +1,36 @@
+<!--%import("./js/module_admin.js")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->filebox}</h3>
+</div>
+
+<form action="{getUrl('')}" method="post" enctype="multipart/form-data">
+<input type="hidden" name="module" value="module" />
+<input type="hidden" name="act" value="procModuleFileBoxAdd" />
+<input type="hidden" name="filter" value="{$filter}" />
+<input type="hidden" name="input" value="{$input}" />
+
+<div id="popBody">
+    <table class="rowTable" cellspacing="0">
+    <tbody>
+        <tr>
+            <th>{$lang->description}</th>
+            <td><input type="text" name="comment" /></td>
+        </tr>
+        <tr>
+            <th>{$lang->file}</th>
+            <td><input type="file" name="addfile" />
+                <p>
+<!--@if($arrfilter && is_array($arrfilter))-->
+	{@sprintf($lang->about_file_extension,join(", ",$arrfilter ))}
+<!--@end-->
+                </p>
+            </td>
+        </tr>
+    </tbody>
+    </table>
+</div>
+<div id="popFooter">
+    <span class="button black"><input type="submit" value="{$lang->cmd_submit}" /></span>
+</div>
+</form>
diff --git a/modules/module/tpl/filebox_list.html b/modules/module/tpl/filebox_list.html
new file mode 100644
index 000000000..1d7457510
--- /dev/null
+++ b/modules/module/tpl/filebox_list.html
@@ -0,0 +1,65 @@
+<!--%load_js_plugin("filebox")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->filebox}</h3>
+</div>
+
+<div id="popBody">
+    <table class="rowTable" cellspacing="0">
+    <thead>
+        <tr>
+            <th width="105">{$lang->file}</th>
+            <th>{$lang->description}</th>
+            <th width="105">{$lang->regdate}</th>
+            <th width="100"></th>
+        </tr>
+    </thead>
+    <tbody>
+<!--@foreach($filebox_list as $key=>$val)-->
+    <tr>
+        <td>
+        <div id="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left;">
+            <!--@if($val->fileextension=='swf')-->
+
+            <object height="100%" width="100%" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
+                <param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
+                <param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
+                <param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
+                <param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
+                <embed height="100%" width="100%" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
+            </object>
+
+            <!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
+                <img src="{getUrl('')}{$val->filename}" width="100%" height="100%" />
+            <!--@end-->
+        </div>
+        </td>
+        <td>{$val->comment}</td>
+        <td>{zdate($val->regdate,'Y-m-d H:i')}</td>
+        <td>
+            <!--@if(!$filter || (is_array($arrfilter) && in_array($val->fileextension,$arrfilter)))-->
+            <span class="small button black"><button type="button" onclick="XE.filebox.selectFile('{getUrl('')}{$val->filename}','{$val->module_filebox_srl}');">{$lang->cmd_select}</button></span>
+            <!--@end-->
+            <span class="small button"><button type="button" onclick="XE.filebox.deleteFile('{$val->module_filebox_srl}');">{$lang->cmd_delete}</button></span>
+        </td>
+    </tr>
+<!--@end-->
+    </tbody>
+    </table>
+        <!-- 페이지 네비게이션 -->
+        <div class="pagination a1">
+            <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a>
+            <!--@while($page_no = $page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong>
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+</div>
+
+<div id="popFooter">
+    <a href="{getUrl('','module','module','act','dispModuleFileBoxAdd','filter',$filter,'input',$input)}" class="button black"><span>{$lang->cmd_registration}</span></a>
+</div>
diff --git a/modules/lifepod/tpl/filter/insert_grant.xml b/modules/module/tpl/filter/insert_grant.xml
similarity index 56%
rename from modules/lifepod/tpl/filter/insert_grant.xml
rename to modules/module/tpl/filter/insert_grant.xml
index e4a05108f..6cbbd0b6e 100644
--- a/modules/lifepod/tpl/filter/insert_grant.xml
+++ b/modules/module/tpl/filter/insert_grant.xml
@@ -1,11 +1,9 @@
-<filter name="insert_grant" module="lifepod" act="procLifepodAdminInsertGrant" confirm_msg_code="confirm_submit">
+<filter name="insert_grant" module="module" act="procModuleAdminInsertGrant" confirm_msg_code="confirm_submit">
     <form>
         <node target="module_srl" required="true" filter="number" />
     </form>
     <response callback_func="completeInsertGrant">
         <tag name="error" />
         <tag name="message" />
-        <tag name="page" />
-        <tag name="module_srl" />
     </response>
 </filter>
diff --git a/modules/module/tpl/filter/insert_lang.xml b/modules/module/tpl/filter/insert_lang.xml
new file mode 100644
index 000000000..203b68ece
--- /dev/null
+++ b/modules/module/tpl/filter/insert_lang.xml
@@ -0,0 +1,10 @@
+<filter name="insert_lang" module="module" act="procModuleAdminInsertLang" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="lang_code" required="true" filter="alpha_number"/>
+    </form>
+    <response callback_func="completeInsertLang">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="name" />
+    </response>
+</filter>
diff --git a/modules/module/tpl/filter/insert_module_setup.xml b/modules/module/tpl/filter/insert_module_setup.xml
new file mode 100644
index 000000000..dfbda2686
--- /dev/null
+++ b/modules/module/tpl/filter/insert_module_setup.xml
@@ -0,0 +1,15 @@
+<filter name="insert_module_setup" module="module" act="procModuleAdminModuleSetup">
+    <form>
+        <node target="module_srls" required="true" />
+        <node target="module_category_srl" />
+        <node target="layout_srl" />
+        <node target="skin" required="true" />
+        <node target="description" />
+        <node target="header_text" />
+        <node target="footer_text" />
+    </form>
+    <response callback_func="completeModuleSetup">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/module/tpl/filter/insert_modules_grant.xml b/modules/module/tpl/filter/insert_modules_grant.xml
new file mode 100644
index 000000000..0eb1a508e
--- /dev/null
+++ b/modules/module/tpl/filter/insert_modules_grant.xml
@@ -0,0 +1,9 @@
+<filter name="insert_modules_grant" module="module" act="procModuleAdminModuleGrantSetup" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="module_srls" required="true" />
+    </form>
+    <response callback_func="completeModuleSetup">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index cb6586e42..a904798f4 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/module_admin.js")-->
 
-<h3>{$lang->module} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->module} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!--@if($act == 'dispModuleAdminContent')-->
 <div class="infoText">{nl2br($lang->about_module)}</div>
diff --git a/modules/module/tpl/js/filebox.js b/modules/module/tpl/js/filebox.js
new file mode 100644
index 000000000..1bf65d1d2
--- /dev/null
+++ b/modules/module/tpl/js/filebox.js
@@ -0,0 +1,44 @@
+var selected_filebox = {};
+
+// popup
+function openFileBox(file_obj, filter){
+    selected_filebox[file_obj.name] = file_obj;
+    var url = request_uri.setQuery('module','module').setQuery('act','dispModuleFileBox').setQuery('input',file_obj.name).setQuery('filter',filter);
+    popopen(url, "filebox");
+}
+
+function selectFileBoxFile(file_url, module_filebox_srl){
+    if(!selected_filebox_input_name) return;
+    opener.selected_filebox[selected_filebox_input_name].value = file_url;
+    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).innerHTML = document.getElementById('filebox_preview_' + module_filebox_srl).innerHTML;
+    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).style.display='';
+    opener.document.getElementById('filebox_unselect_'+selected_filebox_input_name).style.display='';
+    window.close();
+}
+
+function deleteFileBoxFile(module_filebox_srl){
+    var params ={
+            "module_filebox_srl":module_filebox_srl
+        };
+
+    jQuery.exec_json('module.procModuleFileBoxDelete', params, function(data){
+        document.location.reload();
+    });
+}
+
+function unselectFileBox(id){
+    jQuery("[name="+id+"]").val('');
+    jQuery('#filebox_preview_'+id).html('').hide();
+    jQuery('#filebox_unselect_'+id).hide();
+}
+
+function initFileBox(id){
+    if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")){
+        var file = opener.selectedWidget.getAttribute(id);
+        if(file){
+            var html = _displayMultimedia(file,"100%","100%");
+            jQuery('#filebox_preview_'+id).html(html).show();
+            jQuery('#filebox_unselect_'+id).show();
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js
index d6731da6c..5b0d26ae0 100644
--- a/modules/module/tpl/js/module_admin.js
+++ b/modules/module/tpl/js/module_admin.js
@@ -71,3 +71,118 @@ function insertModule(id, module_srl, mid, browser_title, multi_select) {
         window.close();
     }
 }
+
+/* 권한 선택용 */
+function doShowGrantZone() {
+    jQuery(".grant_default").each( function() {
+        var id = "#zone_"+this.name.replace(/_default$/,'');
+        if(!jQuery(this).val()) jQuery(id).css("display","block");
+        else jQuery(id).css("display","none");
+    } );
+}
+
+/* 권한 등록 후 알림 메세지 */
+function completeInsertGrant(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+/* 관리자 아이디 등록/ 제거 */
+function doInsertAdmin() {
+    var fo_obj = xGetElementById("fo_obj");
+    var sel_obj = fo_obj._admin_member;
+    var admin_id = fo_obj.admin_id.value;
+    if(!admin_id) return;
+
+    var opt = new Option(admin_id,admin_id,true,true);
+    sel_obj.options[sel_obj.options.length] = opt;
+
+    fo_obj.admin_id.value = '';
+    sel_obj.size = sel_obj.options.length;
+    sel_obj.selectedIndex = -1;
+
+    var members = new Array();
+    for(var i=0;i<sel_obj.options.length;i++) {
+        members[members.length] = sel_obj.options[i].value;
+        
+    }
+    fo_obj.admin_member.value = members.join(',');
+
+    fo_obj.admin_id.focus();
+}
+
+function doDeleteAdmin() {
+    var fo_obj = xGetElementById("fo_obj");
+    var sel_obj = fo_obj._admin_member;
+    sel_obj.remove(sel_obj.selectedIndex);
+
+    sel_obj.size = sel_obj.options.length;
+    sel_obj.selectedIndex = -1;
+
+    var members = new Array();
+    for(var i=0;i<sel_obj.options.length;i++) {
+        members[members.length] = sel_obj.options[i].value;
+        
+    }
+    fo_obj.admin_member.value = members.join(',');
+}
+
+
+function completeModuleSetup(ret_obj) {
+    alert(ret_obj['message']);
+    window.close();
+}
+
+/**
+ * 언어 관련
+ **/
+function doInsertLangCode(name) {
+    var fo_obj = xGetElementById("menu_fo");
+    var target = fo_obj.target.value;
+    if(window.opener && target) {
+        var obj = window.opener.xGetElementById(target);
+        if(obj) obj.value = '$user_lang->'+name;
+    }
+    window.close();
+}
+
+function completeInsertLang(ret_obj) {
+    doInsertLangCode(ret_obj['name']);
+}
+
+function doDeleteLang(name) {
+    var params = new Array();
+    params['name'] = name;
+    var response_args = new Array('error','message');
+    exec_xml('module','procModuleAdminDeleteLang',params, completeDeleteLang);
+}
+
+function completeDeleteLang(ret_obj) {
+    location.href = current_url.setQuery('name','');
+}
+
+function doFillLangName() {
+    var fo_obj = xGetElementById("menu_fo");
+    var target = fo_obj.target.value;
+    if(window.opener && window.opener.xGetElementById(target)) {
+        var value = window.opener.xGetElementById(target).value;
+        if(/^\$user_lang->/.test(value)) {
+            var param = new Array();
+            param['name'] = value.replace(/^\$user_lang->/,'');
+            var response_tags = new Array('error','message','name','langs');
+            exec_xml('module','getModuleAdminLangCode',param,completeFillLangName, response_tags);
+        }
+    }
+}
+
+function completeFillLangName(ret_obj, response_tags) {
+    var name = ret_obj['name'];
+    var langs = ret_obj['langs'];
+    if(typeof(langs)=='undefined') return;
+    var fo_obj = xGetElementById("menu_fo");
+    fo_obj.lang_code.value = name;
+    for(var i in langs) {
+        fo_obj[i].value = langs[i];
+    }
+
+}
diff --git a/modules/module/tpl/module_addition_setup.html b/modules/module/tpl/module_addition_setup.html
new file mode 100644
index 000000000..10efcd3a5
--- /dev/null
+++ b/modules/module/tpl/module_addition_setup.html
@@ -0,0 +1,7 @@
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->bundle_addition_setup}</h3>
+</div>
+
+<div id="popBody">
+    {$setup_content}
+</div>
diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html
new file mode 100644
index 000000000..93c030e3d
--- /dev/null
+++ b/modules/module/tpl/module_grant_setup.html
@@ -0,0 +1,58 @@
+<!--%import("js/module_admin.js")-->
+<!--%import("filter/insert_modules_grant.xml")-->
+
+<script type="text/javascript">
+    jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
+</script>
+
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->bundle_grant_setup}</h3>
+</div>
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert_modules_grant)" id="fo_obj">
+<input type="hidden" name="module_srls" value="{$module_srls}" />
+
+<div id="popBody">
+
+    <h4 class="xeAdmin">{$lang->about_grant}</h4>
+    <p class="summary">{$lang->about_grant_deatil}</p>
+    <table cellspacing="0" class="crossTable">
+    <thead>
+    <tr>
+        <th scope="col"><div>{$lang->grant}</div></th>
+        <th scope="col" colspan="3"><div>{$lang->target}</div></th>
+    </tr>
+    </thead>
+
+    <tbody>
+        <!--@foreach($grant_list as $grant_name => $grant_item)-->
+        <tr class="row{$cycle_idx}">
+            <th scope="row"><div>{$grant_item->title}</div></th>
+            <td class="wide">
+                <select name="{$grant_name}_default" class="grant_default">
+                    <!--@if($grant_item->default == 'guest')--><option value="0">{$lang->grant_to_all}</option><!--@end-->
+                    <!--@if($grant_item->default != 'manager')--><option value="-1">{$lang->grant_to_login_user}</option><!--@end-->
+                    <!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
+                    <option value="">{$lang->grant_to_group}</option>
+                </select>
+                <div id="zone_{$grant_name}" style="display:none">
+                    <!--@foreach($group_list as $group_srl => $group_item)-->
+                    <input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" /> 
+                    <label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
+                    <!--@end-->
+                </div>
+            </td>
+        </tr>
+        <!--@end-->
+    </tbody>
+    </table>
+
+</div>
+
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
+</div>
+
+</form>
+
diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html
new file mode 100644
index 000000000..7e4926ef2
--- /dev/null
+++ b/modules/module/tpl/module_grants.html
@@ -0,0 +1,73 @@
+<!--%import("filter/insert_grant.xml")-->
+<!--%import("js/module_admin.js")-->
+
+<script type="text/javascript">
+    jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
+</script>
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)" id="fo_obj">
+<input type="hidden" name="module_srl" value="{$module_srl}" />
+<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)-->{$val->user_id},<!--@end-->" />
+
+<h4 class="xeAdmin">{$lang->about_admin_id}</h4>
+<table cellspacing="0" class="rowTable">
+<tr>
+    <th scope="row" rowspan="2"><div>{$lang->admin_id}</div></th>
+    <td class="wide">
+        <select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" class="w200">
+        <!--@foreach($admin_member as $key => $val)-->
+            <option value="{$val->user_id}">{$val->nick_name} ({$val->user_id})</option>
+        <!--@end-->
+        </select>
+    </td>
+</tr>
+<tr>
+    <th class="wide">
+        <input type="text" name="admin_id" class="inputTypeText w100" />
+        <span class="button black strong"><button type="button" onclick="doInsertAdmin()">{$lang->cmd_insert}</button></span>
+        <span class="button"><button type="button" onclick="doDeleteAdmin()">{$lang->cmd_delete}</button></span>
+    </th>
+</tr>
+</table>
+
+<h4 class="xeAdmin">{$lang->about_grant}</h4>
+<p class="summary">{$lang->about_grant_deatil}</p>
+<table cellspacing="0" class="crossTable">
+<thead>
+<tr>
+    <th scope="col"><div>{$lang->grant}</div></th>
+    <th scope="col" colspan="3"><div>{$lang->target}</div></th>
+</tr>
+</thead>
+<tbody>
+    <!--@foreach($grant_list as $grant_name => $grant_item)-->
+    <tr class="row{$cycle_idx}">
+        <th scope="row"><div>{$grant_item->title}</div></th>
+        <td class="wide">
+            <select name="{$grant_name}_default" class="grant_default">
+                <!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
+                <!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
+                <!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
+                <option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
+            </select>
+
+            <div id="zone_{$grant_name}" style="display:none">
+                <!--@foreach($group_list as $group_srl => $group_item)-->
+                <input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" <!--@if(is_array($selected_group[$grant_name])&&in_array($group_srl,$selected_group[$grant_name]))-->checked="checked"<!--@end-->/> 
+                <label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
+                <!--@end-->
+            </div>
+
+        </td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th class="button" colspan="2">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
+        </th>
+    </tr>
+</tbody>
+</table>
+
+</form>
diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html
index 34181d1ad..2dd5975f8 100644
--- a/modules/module/tpl/module_info.html
+++ b/modules/module/tpl/module_info.html
@@ -1,10 +1,10 @@
-<div id="popHeadder">
-    <h3>{$lang->module_maker}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->module_maker}</h3>
 </div>
 
 <div id="popBody">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$module_info->title} ver {$module_info->version}</td>
@@ -49,11 +49,11 @@
 
 <!--@if($module_info->history)-->
 <div id="popHistoryHeadder">
-    <h3>{$lang->module_history}</h3>
+    <h3 class="xeAdmin">{$lang->module_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <col width="100" />
     <col />
 
@@ -87,7 +87,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter" class="tCenter gap1">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html
new file mode 100644
index 000000000..6a68085e6
--- /dev/null
+++ b/modules/module/tpl/module_langcode.html
@@ -0,0 +1,64 @@
+<!--%import("./filter/insert_lang.xml")-->
+<!--%import("./js/module_admin.js")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->lang_code}</h3>
+</div>
+
+<div id="popBody" style="width:700px;">
+    <table cellspacing="0" class="colTable" style="width:700px;">
+    <col width="50%"/>
+    <col width="50%"/>
+    <tr>
+        <td>
+            <table cellspacing="0" class="rowTable">
+            <tbody>
+            <!--@foreach($lang_list as $key => $val)-->
+            <tr>
+                <td>
+                    <div class="fl"><a href="#" onclick="doInsertLangCode('{$val->name}','{$target}'); return false;">{$val->name}</a></div>
+                    <div class="fr">
+                        <a href="{getUrl('name',$val->name)}" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a>
+                        <a href="#" onclick="if(confirm('{$lang->confirm_delete}')) doDeleteLang('{$val->name}','{$target}'); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_select}</span></a>
+                    </div>
+                </td>
+            </tr>
+            <!--@end-->
+            </tbody>
+            </table>
+        </td>
+        <td>
+            <form action="./" method="post" onsubmit="return procFilter(this, insert_lang)" id="menu_fo">
+                <input type="hidden" name="target" value="{$target}" />
+                <table cellspacing="0" class="rowTable">
+                <tbody>
+                <tr>
+                    <th scope="row"><div>{$lang->lang_code}</div></th>
+                    <td>
+                        <input type="text" name="lang_code" value="{$name}" class="inputTypeText w200" />
+                    </td>
+                </tr>
+                <!--@foreach($lang_supported as $key => $val)-->
+                <tr>
+                    <th scope="row"><div>{$val}</div></th>
+                    <td>
+                        <textarea name="{$key}" class="inputTypeTextArea" style="height:40px; width:90%;">{$selected_lang[$key]}</textarea>
+                    </td>
+                </tr>
+                <!--@end-->
+                <tr>
+                    <th class="button" colspan="2">
+                        <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"></span>
+                    </th>
+                </tr>
+                </tbody>
+                </table>
+            </form>
+        </td>
+    </tr>
+    </table>
+</div>
+
+<script type="text/javascript">
+    xAddEventListener(window,'load', doFillLangName);
+</script>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index c76b9cef0..5956650d5 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -5,8 +5,8 @@
 <form id="fo_shortcut" action="./" method="get">
     <input type="hidden" name="selected_module" value="" />
 </form>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->module}</caption>
+    <h4 class="xeAdmin">{$lang->module}</h4>
+    <table cellspacing="0" class="rowTable">
     <thead>
         <tr>
             <th class="wide"><div>{$lang->module_name}</div></th>
diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html
index 8f5e459fd..47b3f287e 100644
--- a/modules/module/tpl/module_selector.html
+++ b/modules/module/tpl/module_selector.html
@@ -1,16 +1,16 @@
 <!--%import("./js/module_admin.js")-->
 
-<div id="popHeadder">
-    <h3>{$lang->module_selector}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->module_selector}</h3>
 </div>
 
 <div id="popBody">
     <form action="./" method="post">
         <input type="hidden" name="module" value="module" />
-        <input type="hidden" name="act" value="dispModuleAdminSelectList" />
+        <input type="hidden" name="act" value="dispModuleSelectList" />
         <input type="hidden" name="id" value="{$id}" />
         <input type="hidden" name="type" value="{$type}" />
-        <table class="adminTable" cellspacing="0">
+        <table class="rowTable" cellspacing="0">
         <tbody>
             <!--@if($site_count && $logged_info->is_admin == 'Y')-->
             <tr>
@@ -33,7 +33,7 @@
             </tr>
         </tbody>
         </table>
-        <table class="adminTable" cellspacing="0">
+        <table class="rowTable" cellspacing="0">
         <thead>
             <tr>
                 <!--@if($module_category_exists)--><th><div>{$lang->module_category}</div></th><!--@end-->
@@ -74,7 +74,3 @@
     </form>
 </div>
 
-<div id="popFooter" class="tCenter gap1">
-    <span class="button red"><input type="button" value="{$lang->cmd_close}" onclick="window.close(); return false;"/></span>
-</div>
-
diff --git a/modules/module/tpl/module_setup.html b/modules/module/tpl/module_setup.html
new file mode 100644
index 000000000..72dadf8a2
--- /dev/null
+++ b/modules/module/tpl/module_setup.html
@@ -0,0 +1,78 @@
+<!--%import("./filter/insert_module_setup.xml")-->
+<!--%import("./js/module_admin.js")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->bundle_setup}</h3>
+</div>
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert_module_setup)" enctype="multipart/form-data">
+<input type="hidden" name="module_srls" value="{$module_srls}" />
+<div id="popBody">
+
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th scope="row"><div>{$lang->module_category}</div></th>
+        <td>
+            <select name="module_category_srl">
+                <option value="0">{$lang->notuse}</option>
+                <!--@foreach($module_category as $key => $val)-->
+                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+            <p>{$lang->about_module_category}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->layout}</div></th>
+        <td>
+            <select name="layout_srl">
+            <option value="0">{$lang->notuse}</option>
+            <!--@foreach($layout_list as $key => $val)-->
+            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+            <!--@end-->
+            </select>
+            <p>{$lang->about_layout}</p>
+        </td>
+    </tr>
+    <!--@if(count($skin_list))-->
+    <tr>
+        <th scope="row"><div>{$lang->skin}</div></th>
+        <td>
+            <select name="skin">
+                <!--@foreach($skin_list as $key=>$val)-->
+                <option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+            <p>{$lang->about_skin}</p>
+        </td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th scope="row"><div>{$lang->description}</div></th>
+        <td>
+            <textarea name="description" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->description)}</textarea>
+            <p>{$lang->about_description}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->header_text}</div></th>
+        <td>
+            <textarea name="header_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->header_text)}</textarea>
+            <p>{$lang->about_header_text}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->footer_text}</div></th>
+        <td>
+            <textarea name="footer_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <p>{$lang->about_footer_text}</p>
+        </td>
+    </tr>
+    </table>
+</div>
+
+<div id="popFooter" class="tCenter gap1">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
+</div>
+
+</form>
diff --git a/modules/module/tpl/move_filebox_list.html b/modules/module/tpl/move_filebox_list.html
new file mode 100644
index 000000000..fe25e5d99
--- /dev/null
+++ b/modules/module/tpl/move_filebox_list.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    top.location.href = "{$url}";
+</script>
\ No newline at end of file
diff --git a/modules/homepage/skins/xe_official/board_skin_info.html b/modules/module/tpl/skin_config.html
similarity index 66%
rename from modules/homepage/skins/xe_official/board_skin_info.html
rename to modules/module/tpl/skin_config.html
index 368736d04..bcb3686ed 100644
--- a/modules/homepage/skins/xe_official/board_skin_info.html
+++ b/modules/module/tpl/skin_config.html
@@ -1,33 +1,34 @@
-<!--#include("./board_header.html")-->
-
 <form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="homepage" />
-<input type="hidden" name="act" value="procHomepageUpdateBoardSkin" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
+<input type="hidden" name="module" value="module" />
+<input type="hidden" name="mid" value="{$mid}" />
+<input type="hidden" name="act" value="procModuleAdminUpdateSkinInfo" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 <input type="hidden" name="page" value="{$page}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
+    <h4 class="xeAdmin">{$lang->skin_default_info}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->skin}</div></th>
         <td class="wide" >{$skin_info->title}</td>
     </tr>
-    <tr class="row2">
+    <tr>
         <th scope="row"><div>{$lang->skin_author}</div></th>
         <td>
             <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
+            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
             <!--@endforeach-->
         </td>
     </tr>
+<!--@if($skin_info->homepage)-->
     <tr>
         <th scope="row"><div>{$lang->homepage}</div></th>
         <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
-    </tr>
-    <tr class="row2">
+    </tr><!--@end-->
+    <tr>
         <th scope="row"><div>{$lang->date}</div></th>
         <td>{zdate($skin_info->date, 'Y-m-d')}&nbsp;</td>
     </tr>
+<!--@if($skin_info->license || $skin_info->license_link)-->
     <tr>
         <th scope="row"><div>{$lang->skin_license}</div></th>
         <td>
@@ -35,17 +36,17 @@
         <!--@if($skin_info->license_link)-->
             <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
         <!--@end-->
-            &nbsp;
         </td>
-    </tr>
-    <tr class="row2">
+    </tr><!--@end-->
+<!--@if($skin_info->description)-->
+    <tr>
         <th scope="row"><div>{$lang->description}</div></th>
         <td>{nl2br(trim($skin_info->description))}</td>
-    </tr>
+    </tr><!--@end-->
     </table>
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
+    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
+    <table cellspacing="0" class="rowTable">
 
     <tr valign="top">
         <th scope="row"><div>{$lang->colorset}</div></th>
@@ -57,11 +58,11 @@
             {@ $_width = 200; $_height = 20; $_talign = "left"; }
             <!--@end-->
             <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-            <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>
+            <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($skin_vars['colorset']->value==$val->name)-->checked="checked"<!--@end-->/>
             <label for="colorset_{$key}">{$val->title}</label>
             <!--@if($val->screenshot)-->
             <br />
-            <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
+            <img src="../../../{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
             <!--@end-->
             </div>
             <!--@end-->
@@ -74,18 +75,20 @@
     <!--@if($val->group && ((!$group) || $group != $val->group))-->
     {@$group = $val->group}
     </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
+    <h4 class="xeAdmin">{$group}</h4>
+    <table cellspacing="0" class="rowTable">
     <!--@end-->
 
-    <tr class="row{$cycle_idx}">
+    <tr>
         <th scope="row"><div>{$val->title}</div></th>
         <td class="wide">
             <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
+                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" id="target{$val->name}" class="inputTypeText w400" />
+                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
 
             <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
+                <textarea name="{$val->name}" class="inputTypeTextArea w400" id="target{$val->name}">{htmlspecialchars($val->value)}</textarea>
+                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
 
             <!--@elseif($val->type=="select")-->
                 <select name="{$val->name}">
@@ -131,13 +134,13 @@
 
     <!--@if($group)-->
     </table>
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <!--@end-->
 
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+    <tr>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html
index 9a99722f6..05c403d4e 100644
--- a/modules/module/tpl/skin_info.html
+++ b/modules/module/tpl/skin_info.html
@@ -1,10 +1,10 @@
 <!--%import("../../admin/tpl/css/admin.css")-->
-<div id="popHeadder">
-    <h3>{$skin_info->title}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$skin_info->title}</h3>
 </div>
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <col width="100" />
     <col />
     <tr>
@@ -51,11 +51,11 @@
 
 <!--@if($skin_info->history)-->
 <div id="popHistoryHeadder">
-    <h3>{$lang->skin_history}</h3>
+    <h3 class="xeAdmin">{$lang->skin_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <col width="100" />
     <col />
 
@@ -89,7 +89,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter" class="tCenter">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/board/tpl/top_refresh.html b/modules/module/tpl/top_refresh.html
similarity index 100%
rename from modules/board/tpl/top_refresh.html
rename to modules/module/tpl/top_refresh.html
diff --git a/modules/opage/conf/module.xml b/modules/opage/conf/module.xml
index a22b4dc54..d2f8d0652 100644
--- a/modules/opage/conf/module.xml
+++ b/modules/opage/conf/module.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
-    <grants>
-        <grant name="view" default="guest">
-            <title xml:lang="ko">열람</title>
-			<title xml:lang="zh-CN">查看</title>
-            <title xml:lang="jp">閲覧</title>
-            <title xml:lang="en">view</title>
-			<title xml:lang="zh-TW">檢視</title>
-        </grant>
-    </grants>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispOpageIndex" type="view" index="true" />
         <action name="dispOpageAdminContent" type="view" admin_index="true" standalone="true" />
+        <action name="dispOpageAdminGrantInfo" type="view" standalone="true" />
         <action name="dispOpageAdminModuleConfig" type="view" standalone="true" />
         <action name="dispOpageAdminInfo" type="view" standalone="true" />
         <action name="dispOpageAdminInsert" type="view" standalone="true" />
diff --git a/modules/opage/lang/ko.lang.php b/modules/opage/lang/ko.lang.php
index 9c4ddb24e..f099a6f94 100644
--- a/modules/opage/lang/ko.lang.php
+++ b/modules/opage/lang/ko.lang.php
@@ -5,11 +5,11 @@
      * @brief  외부 페이지(opage) 모듈의 기본 언어팩
      **/
 
-    $lang->opage = "외부 페이지";
-    $lang->opage_path = "외부 문서 위치";
-    $lang->opage_caching_interval = "캐싱 시간 설정";
+    $lang->opage = '외부 페이지';
+    $lang->opage_path = '외부 문서 위치';
+    $lang->opage_caching_interval = '캐싱 시간 설정';
 
-    $lang->about_opage = "XE가 아닌 외부 html 또는 php파일을 XE에서 사용할 수 있도록 하는 모듈입니다.<br />절대경로, 상대경로를 이용할 수 있으며 http:// 로 시작할 경우 서버 외부의 페이지도 표시할 수 있습니다";
-    $lang->about_opage_path= "외부문서의 위치를 입력해주세요.<br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 결과를 받아다가 출력을 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />";
-    $lang->about_opage_caching_interval = "단위는 분이며 정해진 시간동안은 임시 저장한 데이터를 출력하도록 합니다.<br />다른 서버의 정보를 출력하거나 데이터 출력시 많은 자원이 필요하면 원하시는 분 단위로 캐싱하시는 것을 추천해드립니다.<br />0 으로 하시면 캐싱을 하지 않습니다";
+    $lang->about_opage = 'XE가 아닌 외부 html 또는 php파일을 XE에서 사용할 수 있도록 하는 모듈입니다.<br />절대경로, 상대경로를 이용할 수 있으며 http:// 로 시작할 경우 서버 외부의 페이지도 표시할 수 있습니다';
+    $lang->about_opage_path= '외부문서의 위치를 입력해주세요.<br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 결과를 받아다가 출력을 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />';
+    $lang->about_opage_caching_interval = '단위는 분이며 정해진 시간동안은 임시 저장한 데이터를 출력하도록 합니다.<br />다른 서버의 정보를 출력하거나 데이터 출력시 많은 자원이 필요하면 원하시는 분 단위로 캐싱하시는 것을 추천해드립니다.<br />0 으로 하시면 캐싱을 하지 않습니다';
 ?>
diff --git a/modules/opage/lang/zh-TW.lang.php b/modules/opage/lang/zh-TW.lang.php
index d23ff81c5..e0a46fe5b 100644
--- a/modules/opage/lang/zh-TW.lang.php
+++ b/modules/opage/lang/zh-TW.lang.php
@@ -9,7 +9,7 @@
     $lang->opage_path = "外部頁面路徑";
     $lang->opage_caching_interval = "暫存時間設置";
 
-    $lang->about_opage = "此模組可把外部HTML或PHP檔案插入到 XE中的模組。<br />可以使用絕對路徑及相對路徑。而且使用以http://開頭的網址時，可以把外部主機中的頁面插入到XE當中。";
-    $lang->about_opage_path= "請輸入外部檔案路徑。<br />可以使用如同 /path1/path2/sample.php的絕對路徑或如 ../path2/sample.php的相對路徑。<br />如使用http://url/sample.php之類的地址，可以把此頁面的輸出結果顯示到XE內部的指定位置。<br />目前安裝的XE絕對路徑如下:<br />";
-    $lang->about_opage_caching_interval = "單位為分。暫存時間內頁面將輸出臨時儲存的資料。<br />輸出外部主機訊息或資料時，如消耗資源很大，盡量把暫存時間設置大一點。<br />0 表示不暫存。";
+    $lang->about_opage = "此模組可把外部HTML或PHP檔案插入到XE中的模組。<br />可以使用絕對路徑及相對路徑。而且使用以『http://』開頭的網址時，可以把外部主機中的頁面插入到XE當中。";
+    $lang->about_opage_path= "請輸入外部檔案路徑。<br />可以使用像『/path1/path2/sample.php』的絕對路徑或是『../path2/sample.php』的相對路徑。<br />如果是用『http://url/sample.php』之類的網址，會將此頁面的結果顯示到XE內部的指定位置。<br />目前安裝的XE絕對路徑如下:<br />";
+    $lang->about_opage_caching_interval = "單位為分。暫存時間內頁面將輸出臨時儲存的資料。<br />輸出外部主機訊息或資料時，如消耗資源很大，盡量把暫存時間設大一點。<br />『0』表示不暫存。";
 ?>
diff --git a/modules/opage/opage.admin.controller.php b/modules/opage/opage.admin.controller.php
index d809425e0..f756ec285 100644
--- a/modules/opage/opage.admin.controller.php
+++ b/modules/opage/opage.admin.controller.php
@@ -17,64 +17,39 @@
          * @brief 외부페이지 추가
          **/
         function procOpageAdminInsert() {
-            // module 모듈의 controller 객체 생성
+            // module 모듈의 model/controller 객체 생성
             $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
 
-            // 기본 모듈 정보로 등록된 변수 구함
-            $module_args = Context::gets('module_srl','module_category_srl','browser_title','is_default','layout_srl');
-            $module_args->module = 'opage';
-            $module_args->mid = Context::get('opage_name');
-            if($module_args->is_default!='Y') $module_args->is_default = 'N';
-
-            // 외부 문서 위치, 캐싱 시간은 extra_vars에 저장
-            $config_args = Context::gets('path','caching_interval');
-            $module_args->extra_vars = serialize($config_args);
+            // 게시판 모듈의 정보 설정
+            $args = Context::getRequestVars();
+            $args->module = 'opage';
+            $args->mid = $args->opage_name;
+            unset($args->opage_name);
 
             // module_srl이 넘어오면 원 모듈이 있는지 확인
-            if($module_args->module_srl) {
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_args->module_srl);
+            if($args->module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+                if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // is_default=='Y' 이면 기본 모듈을 제거
-            if($module_args->is_default=='Y') $oModuleController->clearDefaultModule();
-
             // module_srl의 값에 따라 insert/update
-            if($module_info->module_srl != $module_args->module_srl) {
-                $output = $oModuleController->insertModule($module_args);
+            if(!$args->module_srl) {
+                $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-                $module_info->module_srl = $output->get('module_srl');
             } else {
-                $output = $oModuleController->updateModule($module_args);
+                $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
+
+                // 캐시 파일 삭제
+                $cache_file = sprintf("./files/cache/opage/%d.cache.php", $module_info->module_srl);
+                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
             }
 
-            // 등록 실패시 에러 반환
             if(!$output->toBool()) return $output;
 
-            /**
-             * 권한 저장
-             **/
-            // 현 모듈의 권한 목록을 가져옴
-            $grant_list = $this->xml_info->grant;
-
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_info->module_srl, $grants);
-
-            // 캐시 파일 삭제
-            $cache_file = sprintf("./files/cache/opage/%d.cache.php", $module_info->module_srl);
-            if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-
             // 등록 성공후 return될 메세지 정리
-            $this->add("module_srl", $module_args->module_srl);
+            $this->add("module_srl", $output->get('module_srl'));
             $this->add("opage", Context::get('opage'));
             $this->setMessage($msg_code);
         }
diff --git a/modules/opage/opage.admin.view.php b/modules/opage/opage.admin.view.php
index 252331b51..04c3da7c0 100644
--- a/modules/opage/opage.admin.view.php
+++ b/modules/opage/opage.admin.view.php
@@ -1,153 +1,153 @@
-<?php
-    /**
-     * @class  opageAdminView
-     * @author zero (zero@nzeo.com)
-     * @brief  opage 모듈의 admin view 클래스
-     **/
-
-    class opageAdminView extends opage {
-
-        var $module_srl = 0;
-        var $list_count = 20;
-        var $page_count = 10;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // module_srl이 있으면 미리 체크하여 존재하는 모듈이면 module_info 세팅
-            $module_srl = Context::get('module_srl');
-
-            // module model 객체 생성 
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록을 구함
-            $module_category = $oModuleModel->getModuleCategories();
-            Context::set('module_category', $module_category);
-
-            // 템플릿 경로 구함 (opage의 경우 tpl에 관리자용 템플릿 모아놓음)
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 외부페이지 관리 목록 보여줌
-         **/
-        function dispOpageAdminContent() {
-            $args->sort_index = "module_srl";
-            $args->page = Context::get('page');
-            $args->list_count = 40;
-            $args->page_count = 10;
-            $args->s_module_category_srl = Context::get('module_category_srl');
-            $output = executeQuery('opage.getOpageList', $args);
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('opage_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('index');
-        }
-
-        /**
-         * @brief 선택된 외부페이지의 정보 출력
-         **/
-        function dispOpageAdminInfo() {
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-
-            // module model 객체 생성 
-            if($module_srl) {
-                $oOpageModel = &getModel('opage');
-                $module_info = $oOpageModel->getOpage($module_srl);
-                if(!$module_info) {
-                    unset($module_info);
-                    unset($module_srl);
-                } else {
-                    Context::set('module_info',$module_info);
-                }
-
-            // module_srl 값이 없다면 그냥 index 외부페이지를 보여줌
-            } else {
-                return $this->dispOpageAdminContent();
-            }
-
-            // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
-            if($module_info->layout_srl) {
-                $oLayoutModel = &getModel('layout');
-                $layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
-                $module_info->layout = $layout_info->layout;
-                $module_info->layout_title = $layout_info->layout_title;
-            }
-
-            // 레이아웃 목록을 구해옴
-            $oLayoutMode = &getModel('layout');
-            $layout_list = $oLayoutMode->getLayoutList();
-            Context::set('layout_list', $layout_list);
-
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('opage_info');
-        }
-
-        /**
-         * @brief 외부페이지 추가 폼 출력
-         **/
-        function dispOpageAdminInsert() {
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-
-            // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅
-            if($module_srl) {
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
-                else {
-                    unset($module_info);
-                    unset($module_srl);
-                }
-            }
-
-            // module_srl이 없으면 sequence값으로 미리 구해 놓음
-            if(!$module_srl) $module_srl = getNextSequence();
-            Context::set('module_srl',$module_srl);
-
-            // 레이아웃 목록을 구해옴
-            $oLayoutMode = &getModel('layout');
-            $layout_list = $oLayoutMode->getLayoutList();
-            Context::set('layout_list', $layout_list);
-
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('opage_insert');
-        }
-
-
-        /**
-         * @brief 외부페이지 삭제 화면 출력
-         **/
-        function dispOpageAdminDelete() {
-            $module_srl = Context::get('module_srl');
-            if(!$module_srl) return $this->dispContent();
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            Context::set('module_info',$module_info);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('opage_delete');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  opageAdminView
+     * @author zero (zero@nzeo.com)
+     * @brief  opage 모듈의 admin view 클래스
+     **/
+
+    class opageAdminView extends opage {
+
+        var $module_srl = 0;
+        var $list_count = 20;
+        var $page_count = 10;
+
+        /**
+         * @brief 초기화
+         **/
+        function init() {
+            // module_srl이 있으면 미리 체크하여 존재하는 모듈이면 module_info 세팅
+            $module_srl = Context::get('module_srl');
+
+            // module model 객체 생성 
+            $oModuleModel = &getModel('module');
+
+            // 모듈 카테고리 목록을 구함
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+
+            // 템플릿 경로 구함 (opage의 경우 tpl에 관리자용 템플릿 모아놓음)
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief 외부페이지 관리 목록 보여줌
+         **/
+        function dispOpageAdminContent() {
+            $args->sort_index = "module_srl";
+            $args->page = Context::get('page');
+            $args->list_count = 40;
+            $args->page_count = 10;
+            $args->s_module_category_srl = Context::get('module_category_srl');
+            $output = executeQuery('opage.getOpageList', $args);
+
+            // 템플릿에 쓰기 위해서 context::set
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('opage_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('index');
+        }
+
+        /**
+         * @brief 선택된 외부페이지의 정보 출력
+         **/
+        function dispOpageAdminInfo() {
+            // GET parameter에서 module_srl을 가져옴
+            $module_srl = Context::get('module_srl');
+
+            // module model 객체 생성 
+            if($module_srl) {
+                $oOpageModel = &getModel('opage');
+                $module_info = $oOpageModel->getOpage($module_srl);
+                if(!$module_info) {
+                    unset($module_info);
+                    unset($module_srl);
+                } else {
+                    Context::set('module_info',$module_info);
+                }
+
+            // module_srl 값이 없다면 그냥 index 외부페이지를 보여줌
+            } else {
+                return $this->dispOpageAdminContent();
+            }
+
+            // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
+            if($module_info->layout_srl) {
+                $oLayoutModel = &getModel('layout');
+                $layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
+                $module_info->layout = $layout_info->layout;
+                $module_info->layout_title = $layout_info->layout_title;
+            }
+
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('opage_info');
+        }
+
+        /**
+         * @brief 외부페이지 추가 폼 출력
+         **/
+        function dispOpageAdminInsert() {
+            // 권한 그룹의 목록을 가져온다
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups();
+            Context::set('group_list', $group_list);
+
+            // module.xml에서 권한 관련 목록을 구해옴
+            $grant_list = $this->xml_info->grant;
+            Context::set('grant_list', $grant_list);
+
+            // GET parameter에서 module_srl을 가져옴
+            $module_srl = Context::get('module_srl');
+
+            // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅
+            if($module_srl) {
+                $oModuleModel = &getModel('module');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
+                else {
+                    unset($module_info);
+                    unset($module_srl);
+                }
+            }
+
+            // module_srl이 없으면 sequence값으로 미리 구해 놓음
+            if(!$module_srl) $module_srl = getNextSequence();
+            Context::set('module_srl',$module_srl);
+
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('opage_insert');
+        }
+
+
+        /**
+         * @brief 외부페이지 삭제 화면 출력
+         **/
+        function dispOpageAdminDelete() {
+            $module_srl = Context::get('module_srl');
+            if(!$module_srl) return $this->dispContent();
+
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            Context::set('module_info',$module_info);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('opage_delete');
+        }
+
+    }
+?>
\ No newline at end of file
diff --git a/modules/opage/opage.class.php b/modules/opage/opage.class.php
index b94d54d8a..dc94762ac 100644
--- a/modules/opage/opage.class.php
+++ b/modules/opage/opage.class.php
@@ -11,13 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('opage', 'view', 'dispOpageIndex');
-            $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminContent');
-            $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminInsert');
-            $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminDelete');
-
             // opage 에서 사용할 cache디렉토리 생성
             FileHandler::makeDir('./files/cache/opage');
 
@@ -28,14 +21,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            // 외부페이지 모듈을 업그레이드로 설치하였을 경우 필요한 action 값의 여부 체크 (2007. 09. 17)
-            if(!$oModuleModel->getActionForward('dispOpageIndex')) return true;
-            if(!$oModuleModel->getActionForward('dispOpageAdminContent')) return true;
-            if(!$oModuleModel->getActionForward('dispOpageAdminInsert')) return true;
-            if(!$oModuleModel->getActionForward('dispOpageAdminDelete')) return true;
-
             // cache 디렉토리가 없으면 바로 디렉토리 생성
             if(!is_dir('./files/cache/opage')) FileHandler::makeDir('./files/cache/opage');
 
@@ -46,23 +31,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 외부페이지 모듈을 업그레이드로 설치하였을 경우 필요한 action 값 등록
-            if(!$oModuleModel->getActionForward('dispOpageIndex')) 
-                $oModuleController->insertActionForward('opage', 'view', 'dispOpageIndex');
-
-            if(!$oModuleModel->getActionForward('dispOpageAdminContent')) 
-                $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminContent');
-
-            if(!$oModuleModel->getActionForward('dispOpageAdminInsert')) 
-                $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminInsert');
-
-            if(!$oModuleModel->getActionForward('dispOpageAdminDelete')) 
-                $oModuleController->insertActionForward('opage', 'view', 'dispOpageAdminDelete');
-
-
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/opage/opage.view.php b/modules/opage/opage.view.php
index 2addbd7bc..16a01b633 100644
--- a/modules/opage/opage.view.php
+++ b/modules/opage/opage.view.php
@@ -19,9 +19,6 @@
          * @brief 일반 요청시 출력
          **/
         function dispOpageIndex() {
-            // 권한 체크
-            if(!$this->grant->view) return $this->stop('msg_not_permitted'); 
-
             // 외부 페이지 모듈의 정보를 구함
             $oOpageModel = &getModel('opage');
             $module_info = $oOpageModel->getOpage($this->module_srl);
diff --git a/modules/opage/tpl/grant_list.html b/modules/opage/tpl/grant_list.html
new file mode 100644
index 000000000..b0d8b0c53
--- /dev/null
+++ b/modules/opage/tpl/grant_list.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$grant_content}
diff --git a/modules/opage/tpl/header.html b/modules/opage/tpl/header.html
index a93b768f3..3042ee8db 100644
--- a/modules/opage/tpl/header.html
+++ b/modules/opage/tpl/header.html
@@ -1,5 +1,5 @@
 <!--%import("js/blog_admin.js")-->
 <!--%import("js/opage_admin.js")-->
-<h3>{$lang->opage} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->opage} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_opage)}</div>
diff --git a/modules/opage/tpl/index.html b/modules/opage/tpl/index.html
index 1ad7370c1..5110435a3 100644
--- a/modules/opage/tpl/index.html
+++ b/modules/opage/tpl/index.html
@@ -2,21 +2,21 @@
 <!--#include("header.html")-->
 
 <!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, page <strong>{number_format($opage)}</strong>/{number_format($total_opage)}
-</div>
+
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, page {number_format($opage)}/{number_format($total_opage)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
         <th scope="col">
             <div>
-            <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="w120">
+                <select name="module_category_srl" class="fullWidth">
                     <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>
@@ -25,7 +25,6 @@
                     <option value="-1">{$lang->cmd_management}</option>
                 </select>
                 <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-            </form>
             </div>
         </th>
         <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
@@ -39,6 +38,7 @@
     <!--@foreach($opage_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
                 {$lang->not_exists}
@@ -46,22 +46,29 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
-        <td class="date nowrap center">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view center"><a href="{getUrl('','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="copy center"><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a></td>
-        <td class="delete center"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispOpageAdminDelete','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getUrl('','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</a></span></td>
+        <td><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispOpageAdminDelete','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@end--></td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="8" class="right">
-            <a href="{getUrl('act','dispOpageAdminInsert','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
-    </tr>
 </tbody>
 </table>
 
+<!-- 버튼 -->
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr ">
+        <a href="{getUrl('act','dispOpageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
+
+</form>
 
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
diff --git a/modules/opage/tpl/js/opage_admin.js b/modules/opage/tpl/js/opage_admin.js
index 4f94966de..dbd5c6e92 100644
--- a/modules/opage/tpl/js/opage_admin.js
+++ b/modules/opage/tpl/js/opage_admin.js
@@ -47,3 +47,16 @@ function doChangeCategory(fo_obj) {
     }
     return true;
 }
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
diff --git a/modules/opage/tpl/opage_delete.html b/modules/opage/tpl/opage_delete.html
index 5f9e2ae5c..f97b6cd0a 100644
--- a/modules/opage/tpl/opage_delete.html
+++ b/modules/opage/tpl/opage_delete.html
@@ -5,8 +5,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, delete_opage)">
 <input type="hidden" name="opage" value="{$opage}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$module_info->mid}</td>
@@ -16,10 +16,10 @@
         <td>{$module_info->module}</td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispOpageAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/opage/tpl/opage_insert.html b/modules/opage/tpl/opage_insert.html
index cf7390ea3..112a49166 100644
--- a/modules/opage/tpl/opage_insert.html
+++ b/modules/opage/tpl/opage_insert.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
         <th scope="row"><div>{$lang->mid}</div></th>
         <td colspan="3">
@@ -40,7 +40,8 @@
     <tr>
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td colspan="3">
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -70,34 +71,16 @@
             <p>{$lang->about_opage_path}<b>{realpath("./")}</b></p>
         </td>
     </tr>
-    <tr>
-        <th scope="col"><div>{$lang->grant}</div></th>
-        <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-    </tr>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true }); return false;" class="blue">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false }); return false;" class="red">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
     <tr class="row2">
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        <th colspan="4" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
             <!--@if($module == 'admin')-->
             <span class="button"><input type="button" value="{$lang->cmd_list}" onclick="location.href='./?module=admin&act=dispOpageAdminContent';return false;" /></span>
             <!--@else-->
             <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('module_srl','').setQuery('act','');return false;" /></span>
             <!--@end-->
-        </td>
+        </th>
     </tr>
     </table>
-    </div>
 
 </form>
diff --git a/modules/page/conf/info.xml b/modules/page/conf/info.xml
index 19680eaa4..cc2f8ff6a 100644
--- a/modules/page/conf/info.xml
+++ b/modules/page/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">페이지</title>
-    <title xml:lang="zh-CN">页面</title>
+    <title xml:lang="zh-CN">页面管理</title>
     <title xml:lang="jp">ページ</title>
     <title xml:lang="en">Page</title>
     <title xml:lang="es">Página</title>
diff --git a/modules/page/conf/module.xml b/modules/page/conf/module.xml
index 214906d25..3e0efc89c 100644
--- a/modules/page/conf/module.xml
+++ b/modules/page/conf/module.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module>
-    <grants>
-        <grant name="view" default="guest">
-            <title xml:lang="ko">열람</title>
-            <title xml:lang="zh-CN">查看</title>
-            <title xml:lang="jp">閲覧</title>
-            <title xml:lang="en">view</title>
-            <title xml:lang="zh-TW">檢視</title>
-        </grant>
-        <grant name="manager" default="root">
-            <title xml:lang="ko">관리</title>
-            <title xml:lang="zh-CN">管理</title>
-            <title xml:lang="jp">管理</title>
-            <title xml:lang="en">manager</title>
-            <title xml:lang="zh-TW">管理</title>
-        </grant>
-    </grants>
+    <grants />
     <permissions>
         <permission action="procPageAdminRemoveWidgetCache" target="manager" />
         <permission action="dispPageAdminContentModify" target="manager" />
@@ -25,6 +10,7 @@
     <actions>
         <action name="dispPageIndex" type="view" index="true" />
         <action name="dispPageAdminContent" type="view" admin_index="true" standalone="true" />
+        <action name="dispPageAdminGrantInfo" type="view" standalone="true" />
         <action name="dispPageAdminInfo" type="view" standalone="true" />
         <action name="dispPageAdminInsert" type="view" standalone="true" />
         <action name="dispPageAdminDelete" type="view" standalone="true" />
diff --git a/modules/page/lang/ko.lang.php b/modules/page/lang/ko.lang.php
index ace6ac1d3..f3bac152f 100644
--- a/modules/page/lang/ko.lang.php
+++ b/modules/page/lang/ko.lang.php
@@ -5,7 +5,7 @@
      * @brief  페이지(page) 모듈의 기본 언어팩
      **/
 
-    $lang->page = "페이지";
+    $lang->page = '페이지';
     $lang->about_page = "하나의 완성된 페이지를 제작할 수 있는 페이지 모듈입니다.\n최근게시물이나 기타 위젯을 이용해서 동적인 페이지 생성이 가능하고 에디터 컴포넌트를 통해서 다양한 모습으로 꾸밀 수 있습니다.\n접속 URL은 다른 모듈처 mid=모듈이름 으로 접속이 가능하며 기본으로 선택하면 접속시 메인 페이지가 됩니다";
-    $lang->cmd_page_modify = "페이지 수정";
+    $lang->cmd_page_modify = '페이지 수정';
 ?>
diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php
index 6bc96dd09..5214d8a88 100644
--- a/modules/page/page.admin.controller.php
+++ b/modules/page/page.admin.controller.php
@@ -17,32 +17,26 @@
          * @brief 페이지 추가
          **/
         function procPageAdminInsert() {
-            // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            $args = Context::gets('module_srl','module_category_srl','page_name','browser_title','is_default','layout_srl','content');
+            // module 모듈의 model/controller 객체 생성
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+
+            // 게시판 모듈의 정보 설정
+            $args = Context::getRequestVars();
             $args->module = 'page';
             $args->mid = $args->page_name;
-            if(!$args->content) $args->content = $content;
-            else unset($args->conetnt);
             unset($args->page_name);
-            if($args->is_default!='Y') $args->is_default = 'N';
 
             // module_srl이 넘어오면 원 모듈이 있는지 확인
             if($args->module_srl) {
-                $oModuleModel = &getModel('module');
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+                if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // module 모듈의 controller 객체 생성
-            $oModuleController = &getController('module');
-
-            // is_default=='Y' 이면
-            if($args->is_default=='Y') $oModuleController->clearDefaultModule();
-
             // module_srl의 값에 따라 insert/update
-            if($module_info->module_srl != $args->module_srl) {
+            if(!$args->module_srl) {
                 $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-                $module_info->module_srl = $output->get('module_srl');
             } else {
                 $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
@@ -50,26 +44,8 @@
 
             if(!$output->toBool()) return $output;
 
-            /**
-             * 권한 저장
-             **/
-            // 현 모듈의 권한 목록을 저장
-            $grant_list = $this->xml_info->grant;
-
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_info->module_srl, $grants);
-
-
-            $this->add("module_srl", $args->module_srl);
             $this->add("page", Context::get('page'));
+            $this->add('module_srl',$output->get('module_srl'));
             $this->setMessage($msg_code);
         }
 
@@ -183,8 +159,6 @@
             // widget controller 의 캐시파일 재생성 실행
             $oWidgetController = &getController('widget');
             $oWidgetController->recompileWidget($content);
-
-            $this->setMessage('success_updated');
         }
 
     }
diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php
index 89b9a81d9..525c0ea65 100644
--- a/modules/page/page.admin.view.php
+++ b/modules/page/page.admin.view.php
@@ -21,6 +21,19 @@
             // module model 객체 생성 
             $oModuleModel = &getModel('module');
 
+            // module_srl이 넘어오면 해당 모듈의 정보를 미리 구해 놓음
+            if($module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if(!$module_info) {
+                    Context::set('module_srl','');
+                    $this->act = 'list';
+                } else {
+                    ModuleModel::syncModuleToSite($module_info);
+                    $this->module_info = $module_info;
+                    Context::set('module_info',$module_info);
+                }
+            }
+
             // 모듈 카테고리 목록을 구함
             $module_category = $oModuleModel->getModuleCategories();
             Context::set('module_category', $module_category);
@@ -28,14 +41,6 @@
             // 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음)
             $this->setTemplatePath($this->module_path.'tpl');
 
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
         }
 
         /**
@@ -122,10 +127,6 @@
                 }
             }
 
-            // module_srl이 없으면 sequence값으로 미리 구해 놓음
-            if(!$module_srl) $module_srl = getNextSequence();
-            Context::set('module_srl',$module_srl);
-
             // 레이아웃 목록을 구해옴
             $oLayoutMode = &getModel('layout');
             $layout_list = $oLayoutMode->getLayoutList();
@@ -177,5 +178,16 @@
             $this->setTemplateFile('page_delete');
         }
 
+        /**
+         * @brief 권한 목록 출력
+         **/
+        function dispPageAdminGrantInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('grant_list');
+        }
     }
 ?>
diff --git a/modules/page/page.class.php b/modules/page/page.class.php
index 4c5b1fe0d..1ca6e6192 100644
--- a/modules/page/page.class.php
+++ b/modules/page/page.class.php
@@ -11,15 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageIndex');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageAdminContent');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageAdminInfo');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageAdminInsert');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageAdminDelete');
-            $oModuleController->insertActionForward('page', 'view', 'dispPageAdminContentModify');
-
             // page 에서 사용할 cache디렉토리 생성
             FileHandler::makeDir('./files/cache/page');
 
@@ -30,9 +21,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getActionForward('dispPageAdminContentModify')) return true;
-            if(!$oModuleModel->getActionForward('dispPageAdminInfo')) return true;
             return false;
         }
 
@@ -40,14 +28,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            if(!$oModuleModel->getActionForward('dispPageAdminContentModify')) 
-                $oModuleController->insertActionForward('page', 'view', 'dispPageAdminContentModify');
-            if(!$oModuleModel->getActionForward('dispPageAdminInfo')) 
-                $oModuleController->insertActionForward('page', 'view', 'dispPageAdminInfo');
-
             return new Object(0,'success_updated');
         }
 
@@ -58,23 +38,5 @@
             // 페이지 캐시 파일 삭제
             FileHandler::removeFilesInDir("./files/cache/page");
         }
-
-        /**
-         * @brief Action중 Admin이 들어갔을 경우 권한 체크
-         **/
-        function checkAdminActionGrant() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin=='Y') return true;
-
-            $actions = array('procPageAdminRemoveWidgetCache','dispPageAdminContentModify','procPageAdminInsertContent');
-            if(!in_array($this->act, $actions)) return false;
-
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isSiteAdmin()) return true;
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index 835f3d48e..3d40f5886 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -23,9 +23,6 @@
          * @brief 일반 요청시 출력
          **/
         function dispPageIndex() {
-            // 권한 체크
-            if(!$this->grant->view) return $this->stop('msg_not_permitted'); 
-
             // 템플릿에서 사용할 변수를 Context::set()
             if($this->module_srl) Context::set('module_srl',$this->module_srl);
 
diff --git a/modules/page/page.wap.php b/modules/page/page.wap.php
index ae3096b90..1662fbd50 100644
--- a/modules/page/page.wap.php
+++ b/modules/page/page.wap.php
@@ -14,7 +14,7 @@
          **/
         function procWAP(&$oMobile) {
             // 권한 체크
-            if(!$this->grant->view) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+            if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
 
             // 위젯의 내용을 추출/ 정리해서 보여줌
             $oMobile->setContent( Context::transContent($this->module_info->content) );
diff --git a/modules/page/tpl/content.html b/modules/page/tpl/content.html
index cba5b6e8d..2a9da79b0 100644
--- a/modules/page/tpl/content.html
+++ b/modules/page/tpl/content.html
@@ -1,12 +1,12 @@
 <div>{$page_content}</div>
 
 <!--@if($grant->manager)-->
-<!--%import("./js/page_admin.js")-->
-<div class="tRight gap1 clear">
-    <a href="#" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;" class="button blue"><span>{$lang->cmd_remake_cache}</span></a>
-    <!--@if($logged_info->is_admin=='Y')-->
-    <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
-    <!--@end-->
-    <a href="{getUrl('act','dispPageAdminContentModify')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
-</div>
+    <!--%import("./js/page_admin.js")-->
+    <div class="tRight gap1 clear">
+        <a href="#" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;" class="button blue"><span>{$lang->cmd_remake_cache}</span></a>
+        <!--@if($logged_info->is_admin=='Y')-->
+        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <!--@end-->
+        <a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
+    </div>
 <!--@end-->
diff --git a/modules/page/tpl/filter/insert_page_content.xml b/modules/page/tpl/filter/insert_page_content.xml
index 05a2c2166..542bbe047 100644
--- a/modules/page/tpl/filter/insert_page_content.xml
+++ b/modules/page/tpl/filter/insert_page_content.xml
@@ -4,6 +4,7 @@
     </form>
     <parameter>
         <param name="module_srl" target="module_srl" />
+        <param name="mid" target="mid" />
         <param name="content" target="content" />
     </parameter>
     <response callback_func="completeInsertPageContent">
diff --git a/modules/page/tpl/grant_list.html b/modules/page/tpl/grant_list.html
new file mode 100644
index 000000000..b0d8b0c53
--- /dev/null
+++ b/modules/page/tpl/grant_list.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$grant_content}
diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html
index 96efb2667..4ebbe5a76 100644
--- a/modules/page/tpl/header.html
+++ b/modules/page/tpl/header.html
@@ -1,11 +1,24 @@
 <!--%import("js/blog_admin.js")-->
 <!--%import("js/page_admin.js")-->
-<h3>{$lang->page} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->page} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_page)}</div>
 
 <!--@if($module_info)-->
-<!--@if($module_info->mid)-->
-<h4>{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
-<!--@end-->
+<div class="header4">
+    <!--@if($module_info->mid)-->
+    <h4 class="xeAdmin">{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
+    <!--@end-->
+
+    <ul class="localNavigation">
+        <!--@if($module=='admin')-->
+        <li><a href="{getUrl('act','dispPageAdminContent','module_srl','')}">{$lang->cmd_list}</a></li>
+        <!--@else-->
+        <li><a href="{getUrl('act','')}">{$lang->cmd_back}</a></li>
+        <!--@end-->
+        <li <!--@if($act=='dispPageAdminInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminInfo')}">{$lang->module_info}</a></li>
+        <li <!--@if($act=='dispPageAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
+    </ul>
+</div>
 <!--@end-->
+
diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html
index 4d8b062e7..8f0fca6cc 100644
--- a/modules/page/tpl/index.html
+++ b/modules/page/tpl/index.html
@@ -2,21 +2,20 @@
 <!--#include("header.html")-->
 
 <!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
         <th scope="col">
             <div>
-                <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="w120">
+                    <select name="module_category_srl" class="fullWidth">
                         <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>
@@ -25,7 +24,6 @@
                         <option value="-1">{$lang->cmd_management}</option>
                     </select>
                     <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-                </form>
             </div>
         </th>
         <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
@@ -39,29 +37,42 @@
     <!--@foreach($page_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
+                <!--@if($val->site_srl)-->
+                {$lang->virtual_site}
+                <!--@else-->
                 {$lang->not_exists}
+                <!--@end-->
             <!--@else-->
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view center"><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="copy center"><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a></td>
-        <td class="delete center"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="8" class="right">
-            <a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
-    </tr>
 </tbody>
 </table>
 
+<!-- 버튼 -->
+<div class="clear gap1">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr">
+        <a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
+
+</form>
+
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js
index 6fef7bd58..f93eadd62 100644
--- a/modules/page/tpl/js/page_admin.js
+++ b/modules/page/tpl/js/page_admin.js
@@ -76,6 +76,18 @@ function doRemoveWidgetCache(module_srl) {
 
 function completeRemoveWidgetCache(ret_obj) {
     var message = ret_obj['message'];
-    alert(message);
     location.reload(); 
 }
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html
index 24d4f0d23..aafd34b5a 100644
--- a/modules/page/tpl/page_content_modify.html
+++ b/modules/page/tpl/page_content_modify.html
@@ -10,6 +10,7 @@
 <div class="clear"></div>
 <div class="adminLayer">
     <form action="./" method="post" id="pageFo" onsubmit="return doSubmitPageContent(this);">
+        <input type="hidden" name="mid" value="{$module_info->mid}" />
         <input type="hidden" name="module" value="page" />
         <input type="hidden" name="act" value="dispPageAdminContentModify" />
         <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
@@ -23,7 +24,7 @@
             <div class="fr">
                 <select name="widget_list">
                     <!--@foreach($widget_list as $widget)-->
-                    <option value="{$widget->widget}">{$widget->title}</option>
+                    <option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
                     <!--@end-->
                 </select>
                 <span class="button blue"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
@@ -31,15 +32,16 @@
             </div>
             <div class="buttonDiv"></div>
             <div class="tRight">
-                <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('mid','{$module_info->mid}').setQuery('act','');return false;"/></span>
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"/></span>
                 <span class="button red"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
-                <span class="button blue"><input type="submit" value="{$lang->cmd_save}"/></span>
+                <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('mid','{$module_info->mid}').setQuery('act','');return false;"/></span>
             </div>
         </div>
     </form>
 </div>
 
 <div id="widgetButton" class="widgetButtons">
+    <div class="widgetStyle"></div>
     <div class="widgetSetup"></div>
     <div class="widgetCopy"></div>
     <div class="widgetSize"></div>
@@ -52,7 +54,7 @@
 
 <script type="text/javascript">
     var confirm_delete_msg = "{$lang->confirm_delete}";
-    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); });
+    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div#xeAdmin').css('background-color','transparent');});
 </script>
 
 <!--#include("../../widget/tpl/widget_layer.html")-->
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html
index bf076a443..5612cc12c 100644
--- a/modules/page/tpl/page_delete.html
+++ b/modules/page/tpl/page_delete.html
@@ -5,8 +5,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, delete_page)">
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$module_info->mid}</td>
@@ -16,10 +16,10 @@
         <td>{$module_info->module}</td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispPageAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html
index 89907bc38..e7e118c8c 100644
--- a/modules/page/tpl/page_info.html
+++ b/modules/page/tpl/page_info.html
@@ -9,7 +9,7 @@
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable topGap">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->mid}</div></th>
         <td colspan="3">
@@ -41,7 +41,8 @@
     <tr>
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td colspan="3">
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -58,33 +59,15 @@
         </td>
     </tr>
     <tr>
-        <th scope="col"><div>{$lang->grant}</div></th>
-        <th scope="col" class="wide" colspan="3"><div>{$lang->target}</div></th>
-    </tr>
-
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr>
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="left">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true }); return false;" class="blue">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false }); return false;" class="red">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;" class="button"><span>{$lang->cmd_page_modify}</span></a>
+        <th colspan="4" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+            <a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;" class="button red"><span>{$lang->cmd_page_modify}</span></a>
             <!--@if($module=="admin")-->
             <a href="{getUrl('act','dispPageAdminContent','module_srl','')}" class="button"><span>{$lang->cmd_list}</span></a>
             <!--@else-->
             <a href="{getUrl('act','')}" class="button"><span>{$lang->cmd_back}</span></a>
             <!--@end-->
-        </td>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html
index 0333544aa..15634e795 100644
--- a/modules/page/tpl/page_insert.html
+++ b/modules/page/tpl/page_insert.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="is_default" value="Y" />
 <!--@end-->
 
-    <table cellspacing="0" class="adminTable topGap">
+    <table cellspacing="0" class="rowTable topGap">
     <tr class="row2">
         <th scope="row"><div>{$lang->mid}</div></th>
         <td colspan="3">
@@ -40,7 +40,8 @@
     <tr>
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td colspan="3">
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -56,27 +57,10 @@
             <p>{$lang->about_layout}</p>
         </td>
     </tr>
-    <tr>
-        <th scope="col"><div>{$lang->grant}</div></th>
-        <td scope="col" colspan="3" >{$lang->target}</td>
-    </tr>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="center selectAll"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true }); return false;">{$lang->cmd_select_all}</a></td>
-        <td class="center deSelectAll"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false }); return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
     <tr class="row2">
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </td>
+        <th colspan="4" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/planet/conf/module.xml b/modules/planet/conf/module.xml
index 09206a690..bee5d4757 100644
--- a/modules/planet/conf/module.xml
+++ b/modules/planet/conf/module.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants>
-        <grant name="access" default="guest">
-            <title xml:lang="ko">접근</title>
-	    <title xml:lang="en">Access</title>
-	    <title xml:lang="zh-CN">访问</title>
-            <title xml:lang="zh-TW">訪問</title>
-            <title xml:lang="jp">アクセス</title>
-        </grant>
         <grant name="create" default="member">
             <title xml:lang="ko">플래닛 생성</title>
-	    <title xml:lang="en">Create a planet</title>
-	    <title xml:lang="zh-CN">生成微博</title>
+            <title xml:lang="en">Create a planet</title>
+            <title xml:lang="zh-CN">生成微博</title>
             <title xml:lang="zh-TW">建立</title>
             <title xml:lang="jp">プラネット作成</title>
         </grant>
@@ -22,13 +15,6 @@
             <title xml:lang="zh-TW">發表</title>
             <title xml:lang="jp">書き込み</title>
         </grant>
-        <grant name="manager" default="root">
-            <title xml:lang="ko">관리</title>
-	    <title xml:lang="en">Manager</title>
-	    <title xml:lang="zh-CN">管理</title>
-            <title xml:lang="zh-TW">管理</title>
-            <title xml:lang="jp">管理</title>
-        </grant>
     </grants>
     <permissions>
         <permission action="dispPlanetCreate" target="member" />
@@ -39,11 +25,11 @@
         <permission action="dispPlanetAdminList" target="manager" />
         <permission action="dispPlanetAdminSkinInfo" target="manager" />
         <permission action="dispPlanetAdminDelete" target="manager" />
+        <permission action="dispPlanetAdminGrantInfo" target="manager" />
 
         <permission action="procPlanetAdminInsertConfig" target="manager" />
         <permission action="procPlanetAdminInsert" target="manager" />
         <permission action="procPlanetAdminDelete" target="manager" />
-        <permission action="procPlanetAdminUpdateSkinInfo" target="manager" />
     </permissions>
     <actions>
         <action name="dispPlanetLogin" type="view" />
@@ -69,6 +55,9 @@
         <action name="getPlanetMemoList" type="model" />
         <action name="getPlanetReplyList" type="model" />
 
+        <action name="procPlanetDeleteDocument" type="controller" />
+        <action name="procPlanetDeleteComment" type="controller" />
+
         <action name="procPlanetCreate" type="controller" />
         <action name="procPlanetColorsetModify" type="controller" />
         <action name="procPlanetPhotoModify" type="controller" />
@@ -94,12 +83,12 @@
         <action name="dispPlanetAdminList" type="view" standalone="true" />
         <action name="dispPlanetAdminInsert" type="view" standalone="true" />
         <action name="dispPlanetAdminDelete" type="view" standalone="true" />
+        <action name="dispPlanetAdminGrantInfo" type="view" standalone="true" />
         <action name="dispPlanetAdminSkinInfo" type="view" standalone="true" />
 
         <action name="procPlanetAdminInsertConfig" type="controller" standalone="true" />
         <action name="procPlanetAdminInsert" type="controller" standalone="true" />
         <action name="procPlanetAdminDelete" type="controller" standalone="true" />
-        <action name="procPlanetAdminUpdateSkinInfo" type="controller" standalone="true" />
 
         <action name="procPlanetInsertSMS" type="controller" />
         <action name="procPlanetSetSMS" type="controller" />
diff --git a/modules/planet/lang/en.lang.php b/modules/planet/lang/en.lang.php
index d810e568c..02cab92f4 100644
--- a/modules/planet/lang/en.lang.php
+++ b/modules/planet/lang/en.lang.php
@@ -12,6 +12,7 @@
     $lang->planet_whos_planet = "%s's planet";
     $lang->planet_whos_favorite = "%s's favorite planets";
     $lang->planet_whos_favorite_list = "%s's favorite planets";
+    $lang->planet_favorite = "Favorites";
 
     $lang->planet_welcome = "Welcome!";
 
@@ -55,7 +56,7 @@
     $lang->cmd_planet_addfavorite = "Add to Favorite";
 
     $lang->planet_hot_tag = "Popular tags";
-    $lang->planet_home = "Home";
+    $lang->planet_home = "Planet Home";
     $lang->cmd_planet_more_tag = "Display more tags";
 
     $lang->planet_memo = "Memo";
diff --git a/modules/planet/lang/jp.lang.php b/modules/planet/lang/jp.lang.php
index d086672b7..1e34f7a66 100644
--- a/modules/planet/lang/jp.lang.php
+++ b/modules/planet/lang/jp.lang.php
@@ -12,6 +12,7 @@
     $lang->planet_whos_planet = "%s さんのプラネット";
     $lang->planet_whos_favorite = "%s さんのお気に入り";
     $lang->planet_whos_favorite_list = "'%s'さんがよく訪れるプラネット";
+    $lang->planet_favorite = "お気に入り";
 
     $lang->planet_welcome = "ようこそ！";
 
@@ -56,7 +57,7 @@
     $lang->cmd_planet_addfavorite = "お気に入り追加";
 
     $lang->planet_hot_tag = "リアルタイム人気タグ";
-    $lang->planet_home = "TOP";
+    $lang->planet_home = "Planet TOP";
     $lang->cmd_planet_more_tag = "タグをもっと見る";
 
     $lang->planet_memo = "メモ";
diff --git a/modules/planet/lang/ko.lang.php b/modules/planet/lang/ko.lang.php
index cc8900617..aa9057889 100644
--- a/modules/planet/lang/ko.lang.php
+++ b/modules/planet/lang/ko.lang.php
@@ -5,121 +5,122 @@
      * @brief  플래닛(planet) 모듈의 기본 언어팩
      **/
 
-    $lang->planet = "플래닛";
-    $lang->planet_title = "플래닛 제목";
-    $lang->planet_url = "플래닛 URL";
-    $lang->planet_myplanet = "내 플래닛";
+    $lang->planet = '플래닛';
+    $lang->planet_title = '플래닛 제목';
+    $lang->planet_url = '플래닛 URL';
+    $lang->planet_myplanet = '내 플래닛';
     $lang->planet_whos_planet = "%s 님의 플래닛";
     $lang->planet_whos_favorite = "%s 님의 즐겨찾기";
     $lang->planet_whos_favorite_list = "'%s'님께서 즐겨찾는 플래닛";
+    $lang->planet_favorite = "즐겨찾기";
 
-    $lang->planet_welcome = "축하합니다";
+    $lang->planet_welcome = '축하합니다';
 
-    $lang->planet_reply_content = "플래닛 댓글 내용";
+    $lang->planet_reply_content = '플래닛 댓글 내용';
 
     $lang->about_planet = 
         "microBlog의 XE 모듈입니다. 회원별로 플래닛을 생성하여 운영할 수 있습니다
         홈페이지 패키지에서 사용되는 도메인으로는 플래닛이 접속이 안될 수도 있습니다.
         플래닛을 초기페이지로 사용하고 싶으시면 접속을 원하시는 도메인을 홈페이지 패키지등에서 사용하지 않으셔야 합니다";
 
-    $lang->planet_mid = "플래닛 접속 주소";
-    $lang->about_planet_mid = "플래닛 접속 주소는 http://XE주소/플래닛주소 와 같이 바로 접속가능할 수 있는 주소를 뜻합니다";
+    $lang->planet_mid = '플래닛 접속 주소';
+    $lang->about_planet_mid = '플래닛 접속 주소는 http://XE주소/플래닛주소 와 같이 바로 접속가능할 수 있는 주소를 뜻합니다';
 
-    $lang->planet_default_skin = "플래닛 기본 스킨";
-    $lang->about_planet_default_skin = "플래닛 메인 페이지 및 생성된 플래닛들의 기본 스킨으로 설정됩니다";
+    $lang->planet_default_skin = '플래닛 기본 스킨';
+    $lang->about_planet_default_skin = '플래닛 메인 페이지 및 생성된 플래닛들의 기본 스킨으로 설정됩니다';
 
-    $lang->planet_comment = "플래닛 한줄 소개";
-    $lang->about_planet_comment = "플래닛 한줄 소개는 플래닛 접속시 브라우저 제목과 플래닛의 한줄 소개란에 표시되는 내용입니다";
+    $lang->planet_comment = '플래닛 한줄 소개';
+    $lang->about_planet_comment = '플래닛 한줄 소개는 플래닛 접속시 브라우저 제목과 플래닛의 한줄 소개란에 표시되는 내용입니다';
 
-    $lang->use_signup = "회원가입 연결";
-    $lang->about_use_signup = "회원가입 연결을 선택하시면 플래닛의 상단메뉴에 회원가입할 수 있는 링크가 나타납니다";
+    $lang->use_signup = '회원가입 연결';
+    $lang->about_use_signup = '회원가입 연결을 선택하시면 플래닛의 상단메뉴에 회원가입할 수 있는 링크가 나타납니다';
 
 
-    $lang->cmd_create_planet = "내 플래닛 만들기";
-    $lang->create_message = "플래닛 생성 안내글";
-    $lang->about_create_message = "플래닛 생성시 나타나는 안내글을 입력하실 수 있습니다";
+    $lang->cmd_create_planet = '내 플래닛 만들기';
+    $lang->create_message = '플래닛 생성 안내글';
+    $lang->about_create_message = '플래닛 생성시 나타나는 안내글을 입력하실 수 있습니다';
 
-    $lang->cmd_planet_setup = "기본 설정";
-    $lang->cmd_planet_list = "플래닛 목록";
+    $lang->cmd_planet_setup = '기본 설정';
+    $lang->cmd_planet_list = '플래닛 목록';
 
-    $lang->msg_not_logged = "로그인 되어 있지 않습니다";
-    $lang->msg_planet_exists = "이미 생성하신 플래닛이 있어서 새로 만드실 수 없습니다";
+    $lang->msg_not_logged = '로그인 되어 있지 않습니다';
+    $lang->msg_planet_exists = '이미 생성하신 플래닛이 있어서 새로 만드실 수 없습니다';
 
-    $lang->planet_userinfo = "개인정보";
-    $lang->planet_change_userinfo = "개인정보변경";
+    $lang->planet_userinfo = '개인정보';
+    $lang->planet_change_userinfo = '개인정보변경';
 
-    $lang->planet_change_photo = "사진바꾸기";
-    $lang->about_planet_change_photo = "이미지 사이즈는 96x96 픽셀(MSN 메신져 사진과 같은 크기)으로 설정 됩니다.";
-    $lang->cmd_planet_image_upload = "이미지올리기";
+    $lang->planet_change_photo = '사진바꾸기';
+    $lang->about_planet_change_photo = '이미지 사이즈는 96x96 픽셀(MSN 메신저 사진과 같은 크기)으로 설정 됩니다.';
+    $lang->cmd_planet_image_upload = '이미지올리기';
 
-    $lang->cmd_planet_good = "원츄";
-    $lang->cmd_planet_addfavorite = "즐겨찾기추가";
+    $lang->cmd_planet_good = '원츄';
+    $lang->cmd_planet_addfavorite = '즐겨찾기추가';
 
-    $lang->planet_hot_tag = "실시간 인기태그";
-    $lang->planet_home = "홈";
-    $lang->cmd_planet_more_tag = "더 많은 태그 보기";
+    $lang->planet_hot_tag = '실시간 인기태그';
+    $lang->planet_home = '플래닛홈';
+    $lang->cmd_planet_more_tag = '더 많은 태그 보기';
 
-    $lang->planet_memo = "메모";
-    $lang->cmd_planet_show_memo_write_form = "메모쓰기";
-    $lang->cmd_planet_delete_memo = "메모삭제";
-    $lang->cmd_planet_memo_write_ok = "입력완료";
+    $lang->planet_memo = '메모';
+    $lang->cmd_planet_show_memo_write_form = '메모쓰기';
+    $lang->cmd_planet_delete_memo = '메모삭제';
+    $lang->cmd_planet_memo_write_ok = '입력완료';
 
-    $lang->planet_interest_tag = "관심태그";
-    $lang->planet_interest_content = "관심글";
-    $lang->cmd_planet_show_interest_tag = "관심태그 보기";
-    $lang->cmd_planet_close_interest_tag = "관심태그 닫기";
-    $lang->msg_planet_already_added_interest_tag = "이미 등록된 관심태그입니다";
+    $lang->planet_interest_tag = '관심태그';
+    $lang->planet_interest_content = '관심글';
+    $lang->cmd_planet_show_interest_tag = '관심태그 보기';
+    $lang->cmd_planet_close_interest_tag = '관심태그 닫기';
+    $lang->msg_planet_already_added_interest_tag = '이미 등록된 관심태그입니다';
 
-    $lang->cmd_planet_edit_subject = "제목편집";
-    $lang->cmd_planet_edit_intro = "한줄소개편집";
-    $lang->cmd_planet_edit_tag = "태그편집";
+    $lang->cmd_planet_edit_subject = '제목편집';
+    $lang->cmd_planet_edit_intro = '한줄소개편집';
+    $lang->cmd_planet_edit_tag = '태그편집';
 
-    $lang->cmd_planet_openclose_memo = "메모 열기/닫기";
-    $lang->cmd_planet_del_tag = "태그삭제";
+    $lang->cmd_planet_openclose_memo = '메모 열기/닫기';
+    $lang->cmd_planet_del_tag = '태그삭제';
 
 
-    $lang->cmd_planet_openclose_recommend_search = "추천 검색어 열기/닫기";
-    $lang->about_planet_input_search_text = "검색어입력";
+    $lang->cmd_planet_openclose_recommend_search = '추천 검색어 열기/닫기';
+    $lang->about_planet_input_search_text = '검색어입력';
 
 
-    $lang->about_planet_make_planet = "내 플래닛을 만들어 보세요. 플래닛 상단에 보여질 나의 정보를 입력해주세요.";
-    $lang->about_planet_make_planet_info = "내 플래닛의 상단에 보여질 나의 정보입니다. 각 항목을 원하는 대로 설정하고 변경해보세요.";
-    $lang->planet_input_personalinfo = "개인정보입력";
-    $lang->planet_photo = "사진";
-    $lang->planet_myintro = "자기소개";
+    $lang->about_planet_make_planet = '내 플래닛을 만들어 보세요. 플래닛 상단에 보여질 나의 정보를 입력해주세요.';
+    $lang->about_planet_make_planet_info = '내 플래닛의 상단에 보여질 나의 정보입니다. 각 항목을 원하는 대로 설정하고 변경해보세요.';
+    $lang->planet_input_personalinfo = '개인정보입력';
+    $lang->planet_photo = '사진';
+    $lang->planet_myintro = '자기소개';
 
-    $lang->about_planet_url = "설정 후 변경할 수 없습니다";
-    $lang->planet_mytag = "인물 태그";
-    $lang->about_planet_mytag = "나를 표현하는 태그로써 여러개의 태그는 쉼표로 구분 합니다.";
+    $lang->about_planet_url = '설정 후 변경할 수 없습니다';
+    $lang->planet_mytag = '인물 태그';
+    $lang->about_planet_mytag = '나를 표현하는 태그로써 여러개의 태그는 쉼표로 구분 합니다.';
 
-    $lang->about_planet_tag = "여러개의 태그는 쉼표로 구분 합니다.";
+    $lang->about_planet_tag = '여러개의 태그는 쉼표로 구분 합니다.';
 
-    $lang->cmd_planet_makeOk_move_myplanet = "확인 : 생성된 내 플래닛으로 이동 합니다";
-    $lang->cmd_planet_ok_move_myplanet = "확인 : 내 플래닛으로 이동 합니다";
+    $lang->cmd_planet_makeOk_move_myplanet = '확인 : 생성된 내 플래닛으로 이동 합니다';
+    $lang->cmd_planet_ok_move_myplanet = '확인 : 내 플래닛으로 이동 합니다';
 
 
-    $lang->about_planet_login = "아이디와 비밀번호를 입력하고 로그인 버튼을 누르세요";
+    $lang->about_planet_login = '아이디와 비밀번호를 입력하고 로그인 버튼을 누르세요';
 
-    $lang->cmd_planet_login = "로그인";
+    $lang->cmd_planet_login = '로그인';
 
 
-    $lang->planet_nowhot_tag = "플래닛 실시간 인기태그";
-    $lang->cmd_planet_close_nowhot_tag = "실시간 인기태그 닫기";
+    $lang->planet_nowhot_tag = '플래닛 실시간 인기태그';
+    $lang->cmd_planet_close_nowhot_tag = '실시간 인기태그 닫기';
 
     $lang->about_planet_whats_textSearch_in_planet = "<strong>%s</strong>님의 플래닛에서 검색한 <strong>'%s'</strong> 에 대한 결과 입니다.";
     $lang->about_planet_whats_textSearch = "<strong>'%s'</strong> 에 대한 전체 검색결과 입니다.";
 
-    $lang->planet_acticle = "글";
-    $lang->planet_persontag = "인물태그";
+    $lang->planet_acticle = '글';
+    $lang->planet_persontag = '인물태그';
 
-    $lang->planet_recent_acticle = "최신 업데이트 글";
+    $lang->planet_recent_acticle = '최신 업데이트 글';
 
 
-    $lang->cmd_planet_add_tag = "관심태그추가";
-    $lang->cmd_planet_add_article = "새글쓰기";
-    $lang->cmd_planet_post_article = "글 올리기";
-    $lang->planet_postscript = "P.S.";
-    $lang->planet_article_preview = "미리보기";
+    $lang->cmd_planet_add_tag = '관심태그추가';
+    $lang->cmd_planet_add_article = '새글쓰기';
+    $lang->cmd_planet_post_article = '글 올리기';
+    $lang->planet_postscript = 'P.S.';
+    $lang->planet_article_preview = '미리보기';
 
 
     $lang->planet_notice_title = "%s님 반갑습니다!<br>%s님의 생각, 의견, 정보, 지식 등을 자유롭고 편안하게 많은 분들과 나눌 수 있는 곳, 플래닛 입니다. 몇 가지 사용법을 안내해 드릴께요.^^";
@@ -131,51 +132,51 @@
         "다른 플래닛이 궁금하시다구요? 실시간 인기태그 또는 검색을 이용해보세요.",
         "기타 궁금하신 점은 '질문' 태그를 검색해 보세요. 다른 분들의 도움을 받을 수 있습니다.",
     );
-    $lang->planet_notice_disable = "이 메시지를 다시 보지 않습니다.";
+    $lang->planet_notice_disable = '이 메시지를 다시 보지 않습니다.';
 
-    $lang->msg_planet_about_postscript = "덧붙이고 싶은 말이 있으면 적으세요";
-    $lang->msg_planet_about_tag = "태그를 적으세요. (쉼표로 구분)";
-    $lang->msg_planet_already_added_favorite = "이미 등록된 즐겨찾기 입니다";
-    $lang->msg_planet_no_memo = "등록된 메모가 없습니다";
+    $lang->msg_planet_about_postscript = '덧붙이고 싶은 말이 있으면 적으세요';
+    $lang->msg_planet_about_tag = '태그를 적으세요. (쉼표로 구분)';
+    $lang->msg_planet_already_added_favorite = '이미 등록된 즐겨찾기 입니다';
+    $lang->msg_planet_no_memo = '등록된 메모가 없습니다';
 
-    $lang->msg_planet_rss_enabled = "RSS 배포 기능을 사용중입니다";
-    $lang->msg_planet_rss_disabled = "RSS 배포 기능을 사용하지 않고 있습니다";
+    $lang->msg_planet_rss_enabled = 'RSS 배포 기능을 사용중입니다';
+    $lang->msg_planet_rss_disabled = 'RSS 배포 기능을 사용하지 않고 있습니다';
 
-    $lang->msg_me2day_sync = "미투데이로 글 보내기";
-    $lang->msg_me2day_sync_q = "미투데이로 내 글을 전송하시겠습니까?";
-    $lang->me2day_id = "미투 주소";
-    $lang->me2day_ukey = "사용자 키";
-    $lang->msg_me2day_activate = "항상 자동으로 전송합니다";
-    $lang->msg_fail_auth_me2day = "Me2day 인증 실패하였습니다";
-    $lang->msg_success_auth_me2day = "Me2day 인증에 성공하였습니다";
+    $lang->msg_me2day_sync = '미투데이로 글 보내기';
+    $lang->msg_me2day_sync_q = '미투데이로 내 글을 전송하시겠습니까?';
+    $lang->me2day_id = '미투 주소';
+    $lang->me2day_ukey = '사용자 키';
+    $lang->msg_me2day_activate = '항상 자동으로 전송합니다';
+    $lang->msg_fail_auth_me2day = 'Me2day 인증 실패하였습니다';
+    $lang->msg_success_auth_me2day = 'Me2day 인증에 성공하였습니다';
 
-    $lang->planet_total_articles = "전부";
-    $lang->planet_wantyou = "원츄";
-    $lang->planet_best = "월척";
-    $lang->planet_catch = "낚은 글";
-    $lang->planet_fish = "낚인 글";
-    $lang->planet_bigfish = "월척";
-    $lang->cmd_send_me2day = "미투발송";
+    $lang->planet_total_articles = '전부';
+    $lang->planet_wantyou = '원츄';
+    $lang->planet_best = '월척';
+    $lang->planet_catch = '낚은 글';
+    $lang->planet_fish = '낚인 글';
+    $lang->planet_bigfish = '월척';
+    $lang->cmd_send_me2day = '미투발송';
 
     $lang->msg_already_have_phone_number = '이미 전화번호가 등록되어 있습니다.';
     $lang->planet_mobile_receive = '모바일 연동';
     $lang->planet_mobile_number = '전화번호';
     $lang->msg_success_set_phone_number = '전화번호가 등록되었습니다.';
 
-    $lang->planet_tagtab = "추가 Tag 탭";
-    $lang->about_planet_tagtab = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, 지정한 Tag는 메인에 탭으로 출력 됩니다.";
-    $lang->planet_tagtab_after = "뒤 추가 Tag 탭";
-    $lang->about_planet_tagtab_after = "기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다";
-    $lang->planet_smstag = "SMS 등록 Tag";
-    $lang->about_planet_smstag = "콤마(,)로 여러개의 Tag를 지정할 수 있으며, SMS로 등록시에 등록 되는 Tag";
+    $lang->planet_tagtab = '추가 Tag 탭';
+    $lang->about_planet_tagtab = '콤마(,)로 여러개의 Tag를 지정할 수 있으며, 지정한 Tag는 메인에 탭으로 출력 됩니다.';
+    $lang->planet_tagtab_after = '뒤 추가 Tag 탭';
+    $lang->about_planet_tagtab_after = '기본 태그탭 이후에 여러개의 Tag 탭을 추가할 수 있습니다. 콤마(,)로 여러개를 지정할 수 있습니다';
+    $lang->planet_smstag = 'SMS 등록 Tag';
+    $lang->about_planet_smstag = '콤마(,)로 여러개의 Tag를 지정할 수 있으며, SMS로 등록시에 등록 되는 Tag';
 
-    $lang->planet_use_mobile = "SMS 연동";
-    $lang->about_use_mobile = "핸드폰 SMS로 글을 작성할 수 있게 합니다.";
-    $lang->planet_use_me2day = "미투데이 연동";
-    $lang->about_use_me2day = "글 작성시 me2day에 보내게 됩니다.";
+    $lang->planet_use_mobile = 'SMS 연동';
+    $lang->about_use_mobile = '핸드폰 SMS로 글을 작성할 수 있게 합니다.';
+    $lang->planet_use_me2day = '미투데이 연동';
+    $lang->about_use_me2day = '글 작성시 me2day에 보내게 됩니다.';
 
 
-    $lang->msg_search_thisplanet = "이 플래닛에서 검색";
+    $lang->msg_search_thisplanet = '이 플래닛에서 검색';
     
 
 ?>
diff --git a/modules/planet/lang/zh-CN.lang.php b/modules/planet/lang/zh-CN.lang.php
index 3c08c0c0f..c8e3629af 100644
--- a/modules/planet/lang/zh-CN.lang.php
+++ b/modules/planet/lang/zh-CN.lang.php
@@ -12,6 +12,7 @@
     $lang->planet_whos_planet = "%s的微博";
     $lang->planet_whos_favorite = "%s的收藏";
     $lang->planet_whos_favorite_list = "'%s'的收藏";
+    $lang->planet_favorite = "的微博";
 
     $lang->planet_welcome = "欢迎您来到个人微博！";
 
@@ -39,7 +40,7 @@
     $lang->create_message = "简单微博介绍";
     $lang->about_create_message = "可以输入简单的关于微博的简介。";
 
-    $lang->cmd_planet_setup = "基本设置";
+    $lang->cmd_planet_setup = "常规选项";
     $lang->cmd_planet_list = "微博列表";
 
     $lang->msg_not_logged = "请登录。";
@@ -56,7 +57,7 @@
     $lang->cmd_planet_addfavorite = "收藏";
 
     $lang->planet_hot_tag = "实时人气标签";
-    $lang->planet_home = "首页";
+    $lang->planet_home = "微博首页";
     $lang->cmd_planet_more_tag = "更多";
 
     $lang->planet_memo = "留言";
diff --git a/modules/planet/lang/zh-TW.lang.php b/modules/planet/lang/zh-TW.lang.php
index fa5aad464..ff22959fc 100644
--- a/modules/planet/lang/zh-TW.lang.php
+++ b/modules/planet/lang/zh-TW.lang.php
@@ -12,6 +12,7 @@
     $lang->planet_whos_planet = "%s 的微型部落格";
     $lang->planet_whos_favorite = "%s 的最愛";
     $lang->planet_whos_favorite_list = "'%s'的微型部落格清單";
+    $lang->planet_favorite = "的最愛";
 
     $lang->planet_welcome = "歡迎光臨！";
 
@@ -55,7 +56,7 @@
     $lang->cmd_planet_addfavorite = "新增至最愛";
 
     $lang->planet_hot_tag = "熱門標籤";
-    $lang->planet_home = "首頁";
+    $lang->planet_home = "微型部落格首頁";
     $lang->cmd_planet_more_tag = "更多";
 
     $lang->planet_memo = "留言";
diff --git a/modules/planet/planet.admin.controller.php b/modules/planet/planet.admin.controller.php
index 41190c14b..ea8c6a126 100644
--- a/modules/planet/planet.admin.controller.php
+++ b/modules/planet/planet.admin.controller.php
@@ -17,24 +17,26 @@
             $oModuleController = &getController('module');
             $oModuleModel = &getModel('module');
             $oPlanetModel = &getModel('planet');
-            $config = $oPlanetModel->getPlanetConfig();
+            $module_info = $oPlanetModel->getPlanetConfig();
 
             // 이미 등록된 플래닛의 유무 체크
-            if($config->mid && $oModuleModel->getModuleInfoByMid($config->mid)) {
+            $_module_info = $oModuleModel->getModuleInfoByMid($module_info->mid);
+            if($module_info->mid && $_module_info) {
+                $module_info->module_srl = $_module_info->module_srl;
                 $is_registed = true;
             } else {
                 $is_registed = false;
             }
 
             // mid, browser_title, is_default 값이 바뀌면 처리
-            $config->mid = $args->mid = Context::get('planet_mid');
+            $module_info->mid = $args->mid = Context::get('planet_mid');
             $args->browser_title = Context::get('browser_title');
             $args->is_default = Context::get('is_default');
             $args->skin = Context::get('planet_default_skin');
             $args->layout_srl = Context::get('layout_srl');
 
             $args->module = 'planet';
-            $args->module_srl = $is_registed?$config->module_srl:getNextSequence();
+            $args->module_srl = $is_registed?$module_info->module_srl:getNextSequence();
 
             if($args->is_default == 'Y') {
                 $output = $oModuleController->clearDefaultModule();
@@ -49,9 +51,9 @@
             if(!$output->toBool()) return $output;
 
             // 그외 정보 처리
-            $config->planet_default_skin = Context::get('planet_default_skin');
-            $config->use_mobile = Context::get('use_mobile');
-            $config->use_me2day = Context::get('use_me2day');
+            $module_info->planet_default_skin = Context::get('planet_default_skin');
+            $module_info->use_mobile = Context::get('use_mobile');
+            $module_info->use_me2day = Context::get('use_me2day');
 
             $tagtab = explode(',',Context::get('planet_tagtab'));
             for($i=0,$c=count($tagtab);$i<$c;$i++){
@@ -59,7 +61,7 @@
                 $tagtab[$i] = trim($tagtab[$i]);
             }
             $tagtab = array_unique($tagtab);
-            $config->tagtab = $tagtab;
+            $module_info->tagtab = $tagtab;
 
             $tagtab_after = explode(',',Context::get('planet_tagtab_after'));
             for($i=0,$c=count($tagtab_after);$i<$c;$i++){
@@ -67,7 +69,7 @@
                 $tagtab_after[$i] = trim($tagtab_after[$i]);
             }
             $tagtab_after = array_unique($tagtab_after);
-            $config->tagtab_after = $tagtab_after;
+            $module_info->tagtab_after = $tagtab_after;
 
 
             $smstag = explode(',',Context::get('planet_smstag'));
@@ -76,25 +78,15 @@
                 $tagtab[$i] = trim($tagtab[$i]);
             }
             $smstag = array_unique($smstag);
-            $config->smstag = $smstag;
+            $module_info->smstag = $smstag;
 
 
-            $config->create_message = Context::get('create_message');
-            $config->use_signup = Context::get('use_signup');
-            if($config->use_signup != 'Y') $config->use_signup = 'N';
-
-            $grant_list = array('access','create','manager','write_document');
-            foreach($grant_list as $key) {
-                $tmp = trim(Context::get($key));
-                if(!$tmp) {
-                    $config->grants[$key] = null;
-                    continue;
-                }
-                $config->grants[$key] = explode('|@|', $tmp);
-            }
+            $module_info->create_message = Context::get('create_message');
+            $module_info->use_signup = Context::get('use_signup');
+            if($module_info->use_signup != 'Y') $module_info->use_signup = 'N';
 
             $oPlanetController = &getController('planet');
-            $oPlanetController->insertPlanetConfig($config);
+            $oPlanetController->insertPlanetConfig($module_info);
 
             $this->setMessage("success_saved");
         }
@@ -142,79 +134,5 @@
             $this->add('page',Context::get('page'));
             $this->setMessage('success_deleted');
         }
-
-        function procPlanetAdminUpdateSkinInfo() {
-            $oPlanetModel = &getModel('planet');
-            $config = $oPlanetModel->getPlanetConfig();
-            $skin = $config->planet_default_skin;
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-            unset($obj->module);
-
-            $config->colorset = $obj->colorset;
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') {
-                        $config->{$vars->name} = $obj->{$vars->name};
-                        continue;
-                    }
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($config->{$vars->name});
-                        $config->{$vars->name} = '';
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) continue;
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) continue;
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) continue;
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/planet/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    $config->{$vars->name} = $filename;
-                }
-            }
-            
-            $oPlanetController = &getController('planet');
-            $oPlanetController->insertPlanetConfig($config);
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-
     }
 ?>
diff --git a/modules/planet/planet.admin.view.php b/modules/planet/planet.admin.view.php
index 0c96a05c8..76b7dea50 100644
--- a/modules/planet/planet.admin.view.php
+++ b/modules/planet/planet.admin.view.php
@@ -12,9 +12,8 @@
          **/
         function init() {
             $oPlanetModel = &getModel('planet');
-            $this->config = $oPlanetModel->getPlanetConfig();
-            Context::set('config',$this->config);
-            $oPlanetModel->isAccessGranted();
+            $this->module_info = $oPlanetModel->getPlanetConfig();
+            Context::set('module_info',$this->module_info);
 
             $this->setTemplatePath($this->module_path."/tpl/");
             $template_path = sprintf("%stpl/",$this->module_path);
@@ -27,15 +26,12 @@
             $skin_list = $oModuleModel->getSkins($this->module_path);
             Context::set('skin_list',$skin_list);
 
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
             $oMemberModel = &getModel('member');
             $group_list = $oMemberModel->getGroups();
             Context::set('group_list', $group_list);
-            if(is_array($this->config->tagtab)) Context::set('tagtab', join(',',$this->config->tagtab));
-            if(is_array($this->config->tagtab_after)) Context::set('tagtab_after', join(',',$this->config->tagtab_after));
-            if(is_array($this->config->smstag)) Context::set('smstag', join(',',$this->config->smstag));
+            if(is_array($this->module_info->tagtab)) Context::set('tagtab', join(',',$this->module_info->tagtab));
+            if(is_array($this->module_info->tagtab_after)) Context::set('tagtab_after', join(',',$this->module_info->tagtab_after));
+            if(is_array($this->module_info->smstag)) Context::set('smstag', join(',',$this->module_info->smstag));
 
             // 레이아웃 목록을 구해옴
             $oLayoutMode = &getModel('layout');
@@ -89,29 +85,27 @@
         }
 
         function dispPlanetAdminSkinInfo() {
-            $oPlanetModel = &getModel('planet');
-            $config = $oPlanetModel->getPlanetConfig();
-            $skin = $config->planet_default_skin;
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
 
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $group = $val->group;
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $config->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
             $this->setTemplateFile('skin_info');
         }
 
+        /**
+         * @brief 권한 목록 출력
+         **/
+        function dispPlanetAdminGrantInfo() {
+            Context::set('module_srl', $this->module_info->module_srl);
+
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('grant_list');
+        }
     }
 
 ?>
diff --git a/modules/planet/planet.api.php b/modules/planet/planet.api.php
index b4fda7a44..8e8dfafee 100644
--- a/modules/planet/planet.api.php
+++ b/modules/planet/planet.api.php
@@ -60,7 +60,8 @@
             if(count($content_list)) {
                 foreach($content_list as $key => $val) {
                     $item = null;
-                    $item = $val->gets('mid','document_srl','nick_name','content','postscript','voted_count','regdate','tag_list','comment_count');
+                    $item = $val->gets('mid','document_srl','nick_name','content','voted_count','regdate','tag_list','comment_count');
+                    $item->postscript = $val->getExtraVars(20);
                     $item->photo = $val->getPlanetPhotoSrc();
                     $output[] = $item;
                 }
@@ -74,7 +75,8 @@
             if(count($planet_list)) {
                 foreach($planet_list as $key => $val) {
                     $item = null;
-                    $item = $val->gets('mid','document_srl','nick_name','content','postscript','voted_count','regdate','tag_list');
+                    $item = $val->gets('mid','document_srl','nick_name','content','voted_count','regdate','tag_list');
+                    $item->postscript = $val->getExtraVars(20);
                     $item->photo = $val->getPhotoSrc();
                     $output[] = $item;
                 }
diff --git a/modules/planet/planet.class.php b/modules/planet/planet.class.php
index d896cb11c..b8121bd99 100644
--- a/modules/planet/planet.class.php
+++ b/modules/planet/planet.class.php
@@ -25,13 +25,13 @@
             $oModuleController = &getController('module');
             $oPlanetController = &getController('planet');
 
-            $config = $oModuleModel->getModuleConfig('planet');
-            if($config->mid) {
-                $_o = executeQuery('module.getMidInfo', $config);
-                if(!$_o->data) unset($config);
+            $module_info = $oModuleModel->getModuleConfig('planet');
+            if($module_info->mid) {
+                $_o = executeQuery('module.getMidInfo', $module_info);
+                if(!$_o->data) unset($module_info);
             }
 
-            if(!$config->mid) {
+            if(!$module_info->mid) {
                 $args->module = 'planet';
                 $args->browser_title = 'planetXE';
                 $args->skin = 'xe_planet';
@@ -44,21 +44,19 @@
                 $oPlanetController->insertPlanetConfig($planet_args);
             }
 
-
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetHome');
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetAdminSetup');
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetAdminList');
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetAdminSkinInfo');
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetAdminDelete');
-            $oModuleController->insertActionForward('planet', 'view', 'dispPlanetAdminInsert');
-            $oModuleController->insertActionForward('planet', 'view', 'favorite');
+            // 2009. 01. 29 아이디 클릭시 나타나는 팝업메뉴에 플래닛 보기 기능 추가
+            $oModuleController->insertTrigger('member.getMemberMenu', 'planet', 'controller', 'triggerMemberMenu', 'after');
         }
 
         /**
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oModuleModel = &getModel('module');
+
+            // 2009. 01. 29 아이디 클릭시 나타나는 팝업메뉴에 플래닛 보기 기능 추가
+            if(!$oModuleModel->getTrigger('member.getMemberMenu', 'planet', 'controller', 'triggerMemberMenu', 'after')) return true;
+
             return false;
         }
 
@@ -66,6 +64,13 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+
+            // 2009. 01. 29 아이디 클릭시 나타나는 팝업메뉴에 플래닛 보기 기능 추가
+            if(!$oModuleModel->getTrigger('member.getMemberMenu', 'planet', 'controller', 'triggerMemberMenu', 'after')) 
+                $oModuleController->insertTrigger('member.getMemberMenu', 'planet', 'controller', 'triggerMemberMenu', 'after');
+
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/planet/planet.controller.php b/modules/planet/planet.controller.php
index 0de007c8a..5eb362b67 100644
--- a/modules/planet/planet.controller.php
+++ b/modules/planet/planet.controller.php
@@ -11,6 +11,50 @@
          * @brief 초기화
          **/
         function init() {
+            $oPlanetModel = &getModel('planet');
+            $oModuleModel = &getModel('module');
+
+            Context::set('module_info',$this->module_info = $oPlanetModel->getPlanetConfig());
+            $this->grant = $oModuleModel->getGrant($this->module_info, Context::get('logged_info'), $this->xml_info);
+            Context::set('grant', $this->grant);
+        }
+
+        /**
+         * @brief 플래닛 글 삭제
+         **/
+        function procPlanetDeleteDocument() {
+            $document_srl = Context::get('document_srl');
+            if(!$document_srl) return new Object(-1,'msg_invalid_request');
+
+            // document module model 객체 생성
+            $oDocumentController = &getController('document');
+
+            // 삭제 시도
+            $output = $oDocumentController->deleteDocument($document_srl);
+            if(!$output->toBool()) return $output;
+
+            // 성공 메세지 등록
+            $this->add('document_srl', $document_srl);
+            $this->setMessage('success_deleted');
+        }
+
+        /**
+         * @brief 코멘트 삭제
+         **/
+        function procPlanetDeleteComment() {
+            // 댓글 번호 확인
+            $comment_srl = Context::get('comment_srl');
+            if(!$comment_srl) return $this->doError('msg_invalid_request');
+
+            // comment 모듈의 controller 객체 생성
+            $oCommentController = &getController('comment');
+
+            $output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
+            if(!$output->toBool()) return $output;
+
+            $this->add('comment_srl', $comment_srl);
+            $this->add('document_srl', $output->get('document_srl'));
+            $this->setMessage('success_deleted');
         }
 
         /**
@@ -34,6 +78,10 @@
             $output = $this->insertPlanet($args);
             if(!$output->toBool()) return $output;
 
+            // planet에서 사용하는 postscript의 경우 확장변수에 추가되기에 확장변수 체크
+            $oDocumentController = &getController('document');
+            $oDocumentController->insertDocumentExtraKey($output->get('module_srl'), 20, 'postscript', 'text', 'N', 'N', '', '');
+
             $this->setError($output->getError());
             $this->setMessage($output->getMessage());
             $this->add('mid', $args->mid);
@@ -53,8 +101,8 @@
             $planet = $oPlanetModel->getMemberPlanet();
             if($planet->isExists()) $url = getUrl('','mid',$planet->getMid());
             else {
-                $config = $oPlanetModel->getPlanetConfig();
-                $url = getUrl('','mid',$config->mid);
+                $module_info = $oPlanetModel->getPlanetConfig();
+                $url = getUrl('','mid',$module_info->mid);
             }
             Context::set('url',$url);
 
@@ -106,7 +154,7 @@
             if(Context::get('me2day_autopush')=='Y') {
                 $content = Context::get('content');
                 $tags = Context::get('tags');
-                $postscript = Context::get('extra_vars20');
+                $postscript = Context::get('postscript');
                 if($postscript) $content .= " (".$postscript.")";
                 if($tags) $tags = str_replace(',',' ',str_replace(' ','',$tags));
                 $this->doPostToMe2day($myplanet->getMe2dayUID(), $myplanet->getMe2dayUKey(), $content, $tags);
@@ -122,7 +170,7 @@
 
 
         function insertContent($obj,$manual_inserted=false){
-
+            // 게시글 등록
             $obj->content = str_replace(array('<','>'),array('&lt;','&gt;'),$obj->content);
             $obj->content = str_replace('...', '…', $obj->content);
             $obj->content = str_replace('--', '—', $obj->content);
@@ -131,6 +179,8 @@
             $oDocumentController = &getController('document');
             $output = $oDocumentController->insertDocument($obj,$manual_inserted);
             if(!$output->toBool()) return $output;
+
+            // 플래닛 최근 업데이트 적용
             $planet_args->latest_document_srl = $output->get('document_srl');
             $planet_args->module_srl = $obj->module_srl;
             $output = executeQuery('planet.updatePlanetLatestDocument', $planet_args);
@@ -556,7 +606,7 @@
 
             if(!$output->toBool()) return $output;
 
-            // notice 남김
+            // 낚은글 로그 남김 (글쓴이에게 알림)
             $logged_info = Context::get('logged_info');
             if($oDocument->get('member_srl') != $logged_info->member_srl) {
                 $h_args->module_srl = $obj->module_srl;
@@ -567,6 +617,23 @@
                 executeQuery('planet.insertCatch', $h_args);
             }
 
+            // 낚인글 로그 남김 (댓글을 쓰는 대상 글의 모든 댓글 사용자들에게 알림)
+            $f_args->document_srl = $obj->document_srl;
+            $f_args->member_srl = $logged_info->member_srl;
+            $output = executeQueryArray('planet.getFishings', $f_args);
+            if($output->toBool() && $output->data) {
+                $list_order = getNextSequence();
+                foreach($output->data as $val) {
+                    $val->module_srl;
+                    $args = null;
+                    $args->module_srl = $val->module_srl;
+                    $args->document_srl = $obj->document_srl;
+                    $args->list_order = -1*getNextSequence();
+                    $args->regdate = date("YmdHis");
+                    executeQuery('planet.insertFishings', $args);
+                }
+            }
+
             $this->setMessage('success_registed');
             $this->add('mid', Context::get('mid'));
             $this->add('document_srl', $obj->document_srl);
@@ -658,8 +725,8 @@
                 $args->email_address = $output->email_address;
                 $args->homepage = $output->homepage;
                
-                $config = $oPlanetModel->getPlanetConfig();
-                $args->tags = join(',',$config->smstag);
+                $module_info = $oPlanetModel->getPlanetConfig();
+                $args->tags = join(',',$module_info->smstag);
 
                 $manual_inserted = true;
                 $output = $this->insertContent($args,$manual_inserted);
@@ -731,8 +798,8 @@
             $oPlanetModel = &getModel('planet');
             $output = $oPlanetModel->getSMSRecv($phone_number);
             if($output->data && is_array($output->data)){
-                $config = $oPlanetModel->getPlanetConfig();
-                $smstag = join(',',$config->smstag);
+                $module_info = $oPlanetModel->getPlanetConfig();
+                $smstag = join(',',$module_info->smstag);
                 for($i=0,$c=count($output->data);$i<$c;$i++){
                     unset($obj);
                     $obj->content = $output->data[$i]->message;
@@ -759,6 +826,30 @@
             return $output;
 
         }
+
+        /**
+         * @brief 아이디 클릭시 나타나는 팝업메뉴에 "플래닛" 메뉴를 추가하는 trigger
+         **/
+        function triggerMemberMenu(&$obj) {
+            $member_srl = Context::get('target_srl');
+            if(!$member_srl) return new Object();
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('planet.getMemberPlanet', $args);
+            if(!$output->toBool() || !$output->data) return new Object();
+
+            $site_module_info = Context::get('site_module_info');
+            $default_url = Context::getDefaultUrl();
+
+            if($site_module_info->site_srl && !$default_url) return new Object();
+
+            $url = getSiteUrl($default_url, '','mid',$output->data->mid);
+            $oMemberController = &getController('member');
+            $oMemberController->addMemberPopupMenu($url, 'planet', './modules/planet/tpl/images/planet.gif');
+
+            return new Object();
+        }
+
     }
 
 ?>
diff --git a/modules/planet/planet.info.php b/modules/planet/planet.info.php
index 81a9f4639..dcde3999e 100644
--- a/modules/planet/planet.info.php
+++ b/modules/planet/planet.info.php
@@ -43,15 +43,15 @@
         }
 
         function isHome() {
-            $config = Context::get('config');
-            if($this->getModuleSrl() == $config->module_srl) return true;
+            $module_info = Context::get('module_info');
+            if($this->getModuleSrl() == $module_info->module_srl) return true;
             return false;
         }
 
         function getColorset() {
             if($this->isHome() || !$this->colorset) {
-                $config = Context::get('config');
-                return $config->colorset;
+                $module_info = Context::get('module_info');
+                return $module_info->colorset;
             }
             return $this->colorset;
 
@@ -187,8 +187,8 @@
             if(!$this->isExists()) return;
             if(is_null($open_rss)) {
                 $oRssModel = &getModel('rss');
-                $config = $oRssModel->getRssModuleConfig($this->getModuleSrl());
-                $open_rss = $config->open_rss;
+                $module_info = $oRssModel->getRssModuleConfig($this->getModuleSrl());
+                $open_rss = $module_info->open_rss;
             }
             return $open_rss=='Y'?true:false;
 
@@ -247,6 +247,27 @@
             return $output;
         }
 
+        /**
+         * @brief 내가 댓글을 단 글에 댓글이 달렸는데 확인을 하지 않은 글
+         **/
+        function getFishingContentList($page=1) {
+            if(!$page) $page = 1;
+
+            $args->module_srl = $this->getModuleSrl();
+            $args->page = $page;
+            $output = executeQueryArray('planet.getFishingContentList', $args);
+            if(!$output->toBool()) return $output;
+            if(count($output->data)) {
+                foreach($output->data as $key => $val) {
+                    unset($oPlanet);
+                    $oPlanet = new PlanetItem();
+                    $oPlanet->setAttribute($val);
+                    $output->data[$key] = $oPlanet;
+                }
+            }
+            return $output;
+        }
+
         /**
          * @brief 관심 태그로 등록된 글 가져오기
          **/
diff --git a/modules/planet/planet.item.php b/modules/planet/planet.item.php
index 5e0950435..3c7bfbdc1 100644
--- a/modules/planet/planet.item.php
+++ b/modules/planet/planet.item.php
@@ -16,63 +16,41 @@
         function _loadFromDB() {
             if(!$this->document_srl) return;
             parent::_loadFromDB();
-
-            $this->add('postscript', $this->get('extra_vars20'));
         }
 
         function setAttribute($attribute) {
             parent::setAttribute($attribute);
-            $this->add('postscript', $attribute->extra_vars20);
         }
 
 
-        function getWriteInfo() {
-            static $planet_info = array();
-            if(!isset($planet_info[$this->get('module_srl')])) {
-                $oPlanetModel = &getModel('planet');
-                $info = $planet_info[$this->get('module_srl')] = $oPlanetModel->getPlanet($this->get('module_srl'));
-                $this->add('planet_title', $info->getBrowserTitle());
-                $this->add('nick_name', $info->getNickName());
-                $this->add('user_name', $info->getUserName());
-                $this->add('user_id', $info->getUserID());
-                $this->add('planet_title', $info->getPlanetTitle());
-                $this->add('mid', $info->getMid());
-            }
-        }
-
         function getPlanetPhotoSrc($width=96,$height=96) {
             $oPlanetModel = &getModel('planet');
             return $oPlanetModel->getPlanetPhotoSrc($this->get('module_srl'), $width, $height);
         }
 
         function getPlanetMid() {
-            $this->getWriteInfo();
             return $this->get('mid');
         }
 
         function getPlanetTitle() {
-            $this->getWriteInfo();
             return $this->get('planet_title');
         }
 
         function getUserID() {
-            $this->getWriteInfo();
             return parent::getUserID();
         }
         
         function getUserName() {
-            $this->getWriteInfo();
             return parent::getUserName();
         }
         
         function getNickName() {
-            $this->getWriteInfo();
             return parent::getNickName();
         }
 
         
         function getPostScript() {
-            return $this->get('postscript');
+            return $this->getExtraValue(20);
         }
         
 		function getContent() {
diff --git a/modules/planet/planet.model.php b/modules/planet/planet.model.php
index 28a2c2a46..e8ce41293 100644
--- a/modules/planet/planet.model.php
+++ b/modules/planet/planet.model.php
@@ -18,79 +18,28 @@
          * @brief 플래닛 기본 설정 return
          **/
         function getPlanetConfig() {
-            static $config = null;
-            if(is_null($config)) {
-                // module config의 값을 구함
+            static $module_info = null;
+            if(is_null($module_info)) {
+                // module module_info의 값을 구함
                 $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('planet');
+                $module_info = $oModuleModel->getModuleConfig('planet');
+
+                $skin_info->module_srl = $module_info->module_srl;
+                $oModuleModel->syncSkinInfoToModuleInfo($skin_info);
 
                 // planet dummy module의 is_default 값을 구함
-                $dummy = $oModuleModel->getModuleInfoByMid($config->mid);
-                $config->is_default = $dummy->is_default;
-                $config->module_srl = $dummy->module_srl;
-                $config->browser_title = $dummy->browser_title;
-                $config->layout_srl = $dummy->layout_srl;
-                if($config->logo_image) $config->logo_image = context::getFixUrl($config->logo_image);
+                $dummy = $oModuleModel->getModuleInfoByMid($module_info->mid);
+                $module_info->is_default = $dummy->is_default;
+                $module_info->module_srl = $dummy->module_srl;
+                $module_info->browser_title = $dummy->browser_title;
+                $module_info->layout_srl = $dummy->layout_srl;
+                if($module_info->logo_image) $module_info->logo_image = context::getFixUrl($module_info->logo_image);
+
+                if(count($skin_info)) foreach($skin_info as $key => $val) $module_info->{$key} = $val;
+
+                unset($module_info->grants);
             }
-            return $config;
-        }
-
-        /**
-         * @brief 회원 - 플래닛 접속 권한 return
-         * 플래닛 서비스 컨텐츠에 대한 접속 권한을 확인
-         **/
-        function isAccessGranted() {
-            $config = $this->getPlanetConfig();
-            $grant = $config->grants['access'];
-            if(!$grant || !count($grant)) return true;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') return true;
-            $group_list = $logged_info->group_list;
-            if(count($group_list)) $group_srls = array_keys($group_list);
-            else return false;
-
-            foreach($grant as $srl) if(in_array($srl, $group_srls)) return true;
-            return false;
-        }
-
-        /**
-         * @brief 회원 - 플래닛 생성 권한 return
-         **/
-        function isCreateGranted() {
-            if(!Context::get('is_logged')) return false;
-
-            $config = $this->getPlanetConfig();
-            $grant = $config->grants['create'];
-            if(!$grant || !count($grant)) return true;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') return true;
-            $group_list = $logged_info->group_list;
-            $group_srls = array_keys($group_list);
-
-            foreach($grant as $srl) if(in_array($srl, $group_srls)) return true;
-            return false;
-        }
-
-        /**
-         * @brief 관리자 - 플래닛 모듈 전체 관리 권한 return
-         **/
-        function isManageGranted() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') return true;
-
-            $config = $this->getPlanetConfig();
-            $grant = $config->grants['manage'];
-            if(!$grant || !count($grant)) return false;
-
-            $group_list = $logged_info->group_list;
-            $group_srls = array_keys($group_list);
-
-            foreach($grant as $srl) if(in_array($srl, $group_srls)) return true;
-            return false;
+            return $module_info;
         }
 
         /**
@@ -459,8 +408,8 @@
             Context::set('planet', $planet);
 
             // 스킨 경로를 구함
-            $config = $this->getPlanetConfig();
-            if(!$this->module_info->skin) $this->module_info->skin = $config->planet_default_skin;
+            $module_info = $this->getPlanetConfig();
+            if(!$this->module_info->skin) $this->module_info->skin = $module_info->planet_default_skin;
             $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
 
             // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
@@ -481,8 +430,8 @@
             Context::set('planet', $planet);
 
             // 스킨 경로를 구함
-            $config = $this->getPlanetConfig();
-            if(!$this->module_info->skin) $this->module_info->skin = $config->planet_default_skin;
+            $module_info = $this->getPlanetConfig();
+            if(!$this->module_info->skin) $this->module_info->skin = $module_info->planet_default_skin;
             $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
 
             // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
@@ -510,8 +459,8 @@
 
             if($width!=96&&$height!=96) {
                 $filename = sprintf('%s%d.%d.%d.jpg', $path, $module_srl, $width, $height); 
-                if(!file_exists($filename) && FileHandler::createImageFile($source_filename, $filename, $width, $height)) {
-		    $source_filename = $filename;
+                if(!file_exists($filename) || filemtime($source_filename)>filemtime($filename)) {
+                    if(FileHandler::createImageFile($source_filename, $filename, $width, $height)) $source_filename = $filename;
                 }
             } else {
                 $filename = $source_filename;
@@ -546,6 +495,9 @@
             // 문서가 존재하지 않으면 return~
             if(!$oDocument->isExists()) return;
 
+            $logged_info = Context::get('logged_info');
+            $is_fished = false;
+
             // 정해진 수에 따라 목록을 구해옴
             $args->document_srl = $document_srl;
             $output = executeQueryArray('planet.getPlanetComments', $args);
@@ -555,16 +507,25 @@
                     $output->data[$key]->content = str_replace('...', '…', $output->data[$key]->content);
                     $output->data[$key]->content = str_replace('--', '—', $output->data[$key]->content);
 
+                    if($logged_info->member_srl && $logged_info->member_srl == $val->member_srl) $is_fished = true;
                 }
             }
 
-            $logged_info = Context::get('logged_info');
             if($oDocument->get('member_srl')==$logged_info->member_srl) {
                 $args->module_srl = $oDocument->get('module_srl');
                 $args->document_srl = $oDocument->get('document_srl');
                 executeQuery('planet.deleteCatch', $args);
             }
 
+            if($is_fished) {
+                $myplanet = $this->getMemberPlanet();
+                if($myplanet) {
+                    $args->module_srl = $myplanet->module_srl;
+                    $args->document_srl = $oDocument->get('document_srl');
+                }
+                executeQuery('planet.deleteFishing', $args);
+            }
+
             // 쿼리 결과에서 오류가 생기면 그냥 return
             if(!$output->toBool()) return;
 
@@ -595,8 +556,8 @@
             Context::set('reply_list', $output->data);
 
             // 스킨 경로를 구함
-            $config = $this->getPlanetConfig();
-            if(!$this->module_info->skin) $this->module_info->skin = $config->planet_default_skin;
+            $module_info = $this->getPlanetConfig();
+            if(!$this->module_info->skin) $this->module_info->skin = $module_info->planet_default_skin;
             $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
 
             // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
diff --git a/modules/planet/planet.view.php b/modules/planet/planet.view.php
index 45a145932..09bac5e5d 100644
--- a/modules/planet/planet.view.php
+++ b/modules/planet/planet.view.php
@@ -11,20 +11,23 @@
          * @brief 초기화
          **/
         function init() {
-
             if(!preg_match('/planet/i', $this->act) && !in_array($this->act, array('favorite','countContentTagSearch','dispReplyList'))) return;
 
             /**
              * @brief 플래닛 모듈의 기본 설정은 view에서는 언제든지 사용하도록 load하여 Context setting
              **/
             $oPlanetModel = &getModel('planet');
-            Context::set('config',$this->config = $oPlanetModel->getPlanetConfig());
-            $this->module_info->layout_srl = $this->config->layout_srl;
+            $oModuleModel = &getModel('module');
+            Context::set('module_info',$this->module_info = $oPlanetModel->getPlanetConfig());
+	    $current_module_info = Context::get('current_module_info');
+	    $current_module_info->layout_srl = $this->module_info->layout_srl = $this->module_info->layout_srl;
+            Context::set('current_module_info', $current_module_info);
+
 
             /**
              * 스킨이 없으면 플래닛 기본 설정의 스킨으로 설정
              **/
-            if(!$this->module_info->skin) $this->module_info->skin = $this->config->planet_default_skin;
+            if(!$this->module_info->skin) $this->module_info->skin = $this->module_info->planet_default_skin;
             $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
             $this->setTemplatePath($template_path);
 
@@ -42,12 +45,9 @@
                 Context::set('act',$this->act = 'dispPlanetHome');
             }
 
-            $this->grant->access = $oPlanetModel->isAccessGranted();
-            $this->grant->create = $oPlanetModel->isCreateGranted();
-
             // 플래닛은 별도 레이아웃 동작하지 않도록 변경
             //Context::set('layout', 'none');
-            if(!Context::get('mid')) Context::set('mid', $this->config->mid, true);
+            if(!Context::get('mid')) Context::set('mid', $this->module_info->mid, true);
         }
 
         /**
@@ -73,8 +73,6 @@
          * @biref 플래닛 메인 페이지
          **/
         function dispPlanetHome() {
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             // 플래닛의 기본 단위인 날짜를 미리 계산 (지정된 일자의 이전/다음날도 미리 계산하여 세팅)
             $last_date = $this->planet->getContentLastDay();
             $date = Context::get('date');
@@ -87,10 +85,10 @@
             // 초기화면에서 tagtab이 나오기 위해 set type 한다  
             $type = Context::get('type');
             if(!$type){
-                if(is_array($this->config->tagtab) && $this->config->tagtab[0]){
+                if(is_array($this->module_info->tagtab) && $this->module_info->tagtab[0]){
                     $type = 'tagtab';
                     Context::set('type',$type);
-                    Context::set('tagtab',$this->config->tagtab[0]);
+                    Context::set('tagtab',$this->module_info->tagtab[0]);
                 }else{
                    $type = 'all';
                    Context::set('type',$type);
@@ -147,9 +145,9 @@
 
 
             // tagtab을 만든다
-            if(is_array($this->config->tagtab) && $this->config->tagtab[0]){
+            if(is_array($this->module_info->tagtab) && $this->module_info->tagtab[0]){
                 $tagtab_list = array();
-                foreach($this->config->tagtab as $key => $val){
+                foreach($this->module_info->tagtab as $key => $val){
                     $args->tag = $val;
                     $output = executeQuery('planet.getTotalTagSearchContents', $args);
                     $tagtab_list[$val] = $output->data->count;
@@ -158,9 +156,9 @@
             }
 
             // tagtab_after을 만든다
-            if(is_array($this->config->tagtab_after) && $this->config->tagtab_after[0]){
+            if(is_array($this->module_info->tagtab_after) && $this->module_info->tagtab_after[0]){
                 $tagtab_after_list = array();
-                foreach($this->config->tagtab_after as $key => $val){
+                foreach($this->module_info->tagtab_after as $key => $val){
                     $args->tag = $val;
                     $output = executeQuery('planet.getTotalTagSearchContents', $args);
                     $tagtab_after_list[$val] = $output->data->count;
@@ -176,8 +174,6 @@
          * @brief 개별 플래닛
          **/
         function dispPlanet(){
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             $oPlanetModel = &getModel('planet');
 
             // 글 고유 링크가 있으면 처리
@@ -206,6 +202,9 @@
                 case 'catch':
                         $output = $this->planet->getCatchContentList($page);
                     break;
+                case 'fishing':
+                        $output = $this->planet->getFishingContentList($page);
+                    break;
                 case 'interest':
                         $output = $this->planet->getInterestTagContentList($date, $page);
                     break;
@@ -231,6 +230,10 @@
             $output = executeQuery('planet.getCatchContentCount', $args);
             Context::set('total_catch', $output->data->count);
 
+            // 낚인 글 수
+            $output = executeQuery('planet.getFishingContentCount', $args);
+            Context::set('total_fishing', $output->data->count);
+
             // 플래닛의 메모 가져오기
             $memo_output = $oPlanetModel->getMemoList($this->module_srl);
             Context::set('memo_list', $memo_output->data);
@@ -251,8 +254,6 @@
          * @brief 즐겨찾기 보기
          **/
         function favorite() {
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             $oPlanetModel = &getModel('planet');
 
             // 개별 플래닛의 정보를 세팅
@@ -297,8 +298,6 @@
         }
 
         function dispPlanetContentTagSearch(){
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             $keyword = urldecode(Context::get('keyword'));
             $page = Context::get('page');
             if(!$this->planet->isHome()) $module_srl = $this->module_srl;
@@ -321,8 +320,6 @@
         }
 
         function dispPlanetContentSearch(){
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             $keyword = urldecode(Context::get('keyword'));
             $page = Context::get('page');
             if(!$this->planet->isHome()) $module_srl = $this->module_srl;
@@ -346,8 +343,6 @@
         }
 
         function dispPlanetTagSearch(){
-            if(!$this->grant->access) return $this->dispPlanetMessage("msg_not_permitted");
-
             $keyword = urldecode(Context::get('keyword'));
             $page = Context::get('page');
             if(!$this->planet->isHome()) $module_srl = $this->module_srl;
diff --git a/modules/planet/queries/deleteCatch.xml b/modules/planet/queries/deleteCatch.xml
index ef6c9bc2c..5c9c8226e 100644
--- a/modules/planet/queries/deleteCatch.xml
+++ b/modules/planet/queries/deleteCatch.xml
@@ -1,6 +1,6 @@
 <query id="deleteCatch" action="delete">
     <tables>
-        <table name="planet_catch" alias="modules" />
+        <table name="planet_catch" />
     </tables>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
diff --git a/modules/planet/queries/deleteFishing.xml b/modules/planet/queries/deleteFishing.xml
new file mode 100644
index 000000000..c65030f48
--- /dev/null
+++ b/modules/planet/queries/deleteFishing.xml
@@ -0,0 +1,9 @@
+<query id="deleteFishing" action="delete">
+    <tables>
+        <table name="planet_fishing" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
+        <condition operation="equal" column="document_srl" var="document_srl" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/planet/queries/getCatchContentCount.xml b/modules/planet/queries/getCatchContentCount.xml
index a630e1892..ea3917914 100644
--- a/modules/planet/queries/getCatchContentCount.xml
+++ b/modules/planet/queries/getCatchContentCount.xml
@@ -1,4 +1,4 @@
-<query id="getTotalContents" action="select">
+<query id="getCatchContentCount" action="select">
     <tables>
         <table name="planet_catch" alias="planet_catch" />
     </tables>
diff --git a/modules/planet/queries/getCatchContentList.xml b/modules/planet/queries/getCatchContentList.xml
index 218ca6084..af2caa8eb 100644
--- a/modules/planet/queries/getCatchContentList.xml
+++ b/modules/planet/queries/getCatchContentList.xml
@@ -14,8 +14,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/modules/planet/queries/getContentList.xml b/modules/planet/queries/getContentList.xml
index 9d4ed9d50..e2592bda0 100644
--- a/modules/planet/queries/getContentList.xml
+++ b/modules/planet/queries/getContentList.xml
@@ -14,8 +14,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/modules/planet/queries/getContentListSearchTag.xml b/modules/planet/queries/getContentListSearchTag.xml
index 81345a822..6a257bdfb 100644
--- a/modules/planet/queries/getContentListSearchTag.xml
+++ b/modules/planet/queries/getContentListSearchTag.xml
@@ -15,8 +15,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
@@ -37,4 +35,4 @@
         <page_count var="page_count" default="10" />
         <page var="page" default="1" />
     </navigation>
-</query>
\ No newline at end of file
+</query>
diff --git a/modules/planet/queries/getContents.xml b/modules/planet/queries/getContents.xml
index 4c1d0c82c..feb966e19 100644
--- a/modules/planet/queries/getContents.xml
+++ b/modules/planet/queries/getContents.xml
@@ -14,8 +14,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/modules/planet/queries/getFavoriteContentList.xml b/modules/planet/queries/getFavoriteContentList.xml
index 9d0fcf920..f2396e0fb 100644
--- a/modules/planet/queries/getFavoriteContentList.xml
+++ b/modules/planet/queries/getFavoriteContentList.xml
@@ -1,16 +1,31 @@
-<query id="getContentList" action="select">
+<query id="getFavoriteContentList" action="select">
     <tables>
         <table name="planet_favorite" alias="planet_favorite" />
         <table name="planet" alias="planet" />
         <table name="documents" alias="documents" />
+        <table name="member" alias="member" />
+        <table name="modules" alias="modules" />
     </tables>
     <columns>
-        <column name="documents.*" />
+        <column name="modules.mid" alias="mid" />
+        <column name="planet.module_srl" alias="module_srl" />
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="member.user_name" alias="user_name" />
+        <column name="member.member_srl" alias="member_srl" />
+        <column name="documents.document_srl" alias="document_srl" />
+        <column name="documents.content" alias="content" />
+        <column name="documents.comment_count" alias="comment_count" />
+        <column name="documents.voted_count" alias="voted_count" />
+        <column name="documents.tags" alias="tags" />
+        <column name="documents.regdate" alias="regdate" />
     </columns>
     <conditions>
         <condition operation="equal" column="planet_favorite.module_srl" var="module_srl" filter="number" />
         <condition operation="equal" column="planet.module_srl" default="planet_favorite.reg_planet_srl" pipe="and" />
         <condition operation="equal" column="documents.document_srl" default="planet.latest_document_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="member.member_srl" default="documents.member_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="documents.list_order" order="asc" />
diff --git a/modules/planet/queries/getFavorites.xml b/modules/planet/queries/getFavorites.xml
deleted file mode 100644
index f2b394e4e..000000000
--- a/modules/planet/queries/getFavorites.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<query id="getPlanetList" action="select">
-    <tables>
-        <table name="planet_favorite" alias="favorite" />
-        <table name="modules" alias="modules" />
-        <table name="planet" alias="planet" />
-        <table name="member" alias="member" />
-    </tables>
-    <columns>
-        <column name="modules.*" />
-        <column name="planet.member_srl" alias="member_srl" />
-        <column name="member.nick_name" />
-        <column name="planet.planet_title" alias="planet_title" />
-        <column name="planet.close_notice" alias="close_notice" />
-        <column name="planet.colorset" alias="colorset" />
-        <column name="member.nick_name" />
-        <column name="member.user_name" />
-        <column name="member.user_id" />
-        <column name="planet.me2day_uid" />
-        <column name="planet.me2day_ukey" />
-        <column name="planet.me2day_autopush" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="favorite.module_srl" var="module_srl" notnull="notnull" filter="number" />
-        <condition operation="equal" column="modules.module_srl" default="favorite.reg_planet_srl" pipe="and" />
-        <condition operation="equal" column="planet.module_srl" default="modules.module_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="member.member_srl" default="planet.member_srl" filter="number" pipe="and" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="favorite.planet_favorite_srl" order="desc" />
-    </navigation>
-</query>
diff --git a/modules/planet/queries/getFishingContentCount.xml b/modules/planet/queries/getFishingContentCount.xml
new file mode 100644
index 000000000..d0d8c24bd
--- /dev/null
+++ b/modules/planet/queries/getFishingContentCount.xml
@@ -0,0 +1,12 @@
+<query id="getFishingContentCount" action="select">
+    <tables>
+        <table name="planet_fishing" alias="planet_fishing" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" />
+    </conditions>
+</query>
+
diff --git a/modules/planet/queries/getFishingContentList.xml b/modules/planet/queries/getFishingContentList.xml
new file mode 100644
index 000000000..4f5062918
--- /dev/null
+++ b/modules/planet/queries/getFishingContentList.xml
@@ -0,0 +1,34 @@
+<query id="getFishingContentList" action="select">
+    <tables>
+        <table name="modules" alias="modules" />
+        <table name="planet_fishing" alias="planet_fishing" />
+        <table name="documents" alias="documents" />
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="modules.mid" alias="mid" />
+        <column name="planet_fishing.module_srl" alias="module_srl" />
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="member.user_name" alias="user_name" />
+        <column name="member.member_srl" alias="member_srl" />
+        <column name="documents.document_srl" alias="document_srl" />
+        <column name="documents.content" alias="content" />
+        <column name="documents.comment_count" alias="comment_count" />
+        <column name="documents.voted_count" alias="voted_count" />
+        <column name="documents.tags" alias="tags" />
+        <column name="documents.regdate" alias="regdate" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="planet_fishing.module_srl" var="module_srl" filter="numbers" />
+        <condition operation="equal" column="planet_fishing.module_srl" default="modules.module_srl" pipe="and" />
+        <condition operation="equal" column="documents.document_srl" default="planet_fishing.document_srl" pipe="and" />
+        <condition operation="equal" column="member.member_srl" default="documents.member_srl" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="planet_fishing.list_order" order="asc" />
+        <list_count var="list_count" default="10" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/planet/queries/getFishings.xml b/modules/planet/queries/getFishings.xml
new file mode 100644
index 000000000..e3765b063
--- /dev/null
+++ b/modules/planet/queries/getFishings.xml
@@ -0,0 +1,17 @@
+<query id="getFishings" action="select">
+    <tables>
+        <table name="comments" alias="comments" />
+        <table name="planet" alias="planet" />
+    </tables>
+    <columns>
+        <column name="planet.module_srl" alias="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="comments.document_srl" var="document_srl" notnull="notnull" />
+        <condition operation="notequal" column="comments.member_srl" var="member_srl" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="planet.member_srl" default="comments.member_srl" notnull="notnull" pipe="and" />
+    </conditions>
+    <groups>
+        <column target="planet.module_srl" />
+    </groups>
+</query>
diff --git a/modules/planet/queries/getInterestTagContentList.xml b/modules/planet/queries/getInterestTagContentList.xml
index 2aedf0b3e..83c103c95 100644
--- a/modules/planet/queries/getInterestTagContentList.xml
+++ b/modules/planet/queries/getInterestTagContentList.xml
@@ -15,8 +15,6 @@
         <column name="documents.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
@@ -28,6 +26,7 @@
         <condition operation="equal" column="documents.document_srl" default="tags.document_srl" pipe="and" />
         <condition operation="like_prefix" column="documents.regdate" var="date" pipe="and" />
         <condition operation="equal" column="member.member_srl" default="documents.member_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="documents.list_order" order="asc" />
diff --git a/modules/planet/queries/getPlanetNewestContentList.xml b/modules/planet/queries/getPlanetNewestContentList.xml
index 56176672e..a0e98881d 100644
--- a/modules/planet/queries/getPlanetNewestContentList.xml
+++ b/modules/planet/queries/getPlanetNewestContentList.xml
@@ -8,10 +8,12 @@
     <columns>
         <column name="modules.mid" alias="mid" />
         <column name="planet.module_srl" alias="module_srl" />
-        <column name="member.nick_name" />
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="member.user_name" alias="user_name" />
+        <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/modules/planet/queries/getPlanetNewestTagSearchContentList.xml b/modules/planet/queries/getPlanetNewestTagSearchContentList.xml
index 0eb464a05..bc87ed031 100644
--- a/modules/planet/queries/getPlanetNewestTagSearchContentList.xml
+++ b/modules/planet/queries/getPlanetNewestTagSearchContentList.xml
@@ -9,10 +9,12 @@
     <columns>
         <column name="modules.mid" alias="mid" />
         <column name="planet.module_srl" alias="module_srl" />
-        <column name="member.nick_name" />
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="member.user_name" alias="user_name" />
+        <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/modules/planet/queries/insertFishings.xml b/modules/planet/queries/insertFishings.xml
new file mode 100644
index 000000000..c84cc4fe2
--- /dev/null
+++ b/modules/planet/queries/insertFishings.xml
@@ -0,0 +1,11 @@
+<query id="insertFishing" action="insert">
+    <tables>
+        <table name="planet_fishing" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" notnull="notnull" />
+        <column name="document_srl" var="document_srl" notnull="notnull" />
+        <column name="list_order" var="list_order" notnull="notnull" />
+        <column name="regdate" default="curdate()" notnull="notnull" />
+    </columns>
+</query>
diff --git a/modules/planet/schemas/planet_catch.xml b/modules/planet/schemas/planet_catch.xml
index 7ab9d8bda..d58330d2f 100644
--- a/modules/planet/schemas/planet_catch.xml
+++ b/modules/planet/schemas/planet_catch.xml
@@ -1,6 +1,6 @@
 <table name="planet_catch">
     <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_key" />
-    <column name="document_srl" type="number" size="11" notnull="notnull" unique_key="unique_key"/>
+    <column name="document_srl" type="number" size="11" notnull="notnull" unique="unique_key"/>
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
     <column name="regdate" type="date" notnull="notnull" />
 </table>
diff --git a/modules/planet/schemas/planet_fishing.xml b/modules/planet/schemas/planet_fishing.xml
new file mode 100644
index 000000000..1e96212c5
--- /dev/null
+++ b/modules/planet/schemas/planet_fishing.xml
@@ -0,0 +1,6 @@
+<table name="planet_fishing">
+    <column name="module_srl" type="number" size="11" notnull="notnull" unique="fishing" />
+    <column name="document_srl" type="number" size="11" notnull="notnull" unique="fishing"/>
+    <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
+    <column name="regdate" type="date" notnull="notnull" />
+</table>
diff --git a/modules/planet/skins/xe_planet/content_list.html b/modules/planet/skins/xe_planet/content_list.html
index 4f0f2b231..b90aa1ded 100644
--- a/modules/planet/skins/xe_planet/content_list.html
+++ b/modules/planet/skins/xe_planet/content_list.html
@@ -1,3 +1,25 @@
+<!--%import("./filter/delete_planet_document.xml")-->
+<!--%import("./filter/delete_planet_comment.xml")-->
+
+<!--@if($date && !($act=='dispPlanetLogin' || $act=='dispPlanetContentTagSearch' || $act=='dispPlanetTagSearch' || $act=='dispPlanetContentSearch') && ( $type != "catch" && $type != "fishing"))-->
+    <div class="timeNav">
+        <!--@if($prev_date)-->
+            <a class="prev" href="{getUrl('date',$prev_date, 'document_srl','')}" title="{$lang->cmd_prev}">&lt;</a>
+        <!--@else-->
+            <span class="prev">&lt;</span>
+        <!--@end-->
+        <strong>{zdate($date,'Y')}</strong>{$lang->unit_year}
+        <strong>{zdate($date,'m')}</strong>{$lang->unit_month}
+        <strong>{zdate($date,'d')}</strong>{$lang->unit_day}
+        (<em>{zdate($date,'l')}</em>)
+        <!--@if($next_date)-->
+            <a class="next" href="{getUrl('date',$next_date, 'document_srl','')}" title="{$lang->cmd_next}">&gt;</a>
+        <!--@else-->
+            <span class="next">&gt;</span>
+        <!--@end-->
+    </div>
+<!--@end-->
+
 <!--@if($page_navigation->total_page>1)-->
     <div class="pagination">
         <!--@if($page_navigation->cur_page<$page_navigation->last_page)-->
@@ -9,106 +31,123 @@
     </div>
 <!--@end-->
 
+<!--@if($act=="dispPlanet" && $type=="interest" && $planet->isMyPlanet())-->
+    <!--%import("./filter/insert_interest_tag.xml")-->
+    <div id="myFavoriteTag">
+        <!--#include("interest_tags.html")-->
+    </div>
+<!--@end-->
 
-<!--@foreach($content_list as $no => $item)-->
-    <a name="document_{$item->document_srl}"></a>
-    <div id="commentBody:{$item->get('document_srl')}" class="commentBody <!--@if($planet->getMid() == $item->getPlanetMid())-->myPlanet<!--@end-->">
-        <!--// Original Text -->
-        <div class="comment">
-            <!--@if($planet->getMid() != $item->getPlanetMid())-->
-            <h3 class="identity"> <a href="{getUrl('','mid',$item->getPlanetMid())}"><img src="{$item->getPlanetPhotoSrc()}" width="96" height="96" alt="{htmlspecialchars($item->nick_name)}" /><em>{htmlspecialchars($item->get('nick_name'))}</em></a> </h3>
-            <!--@end-->
-            <div class="tongue">
-                <div class="post">
-                  {$item->getContent()}
-                </div>
-                <!--@if($item->getPostScript())-->
-                <p class="postScript"><strong>{$lang->planet_postscript}</strong> {htmlspecialchars($item->getPostScript())}</p>
+    <div class="noDocumentList" id="noDocument" <!--@if($content_list && count($content_list))-->style="display:none;"<!--@end--> >
+        {$lang->no_documents}
+    </div>
+
+    <!--@foreach($content_list as $no => $item)-->
+        <a name="document_{$item->document_srl}"></a>
+        <div id="commentBody:{$item->get('document_srl')}" class="commentBody <!--@if($planet->getMid() == $item->getPlanetMid())-->myPlanet<!--@end-->">
+            <!--// Original Text -->
+            <div class="comment">
+                <!--@if($planet->getMid() != $item->getPlanetMid())-->
+                <h3 class="identity"> <a href="{getUrl('','mid',$item->getPlanetMid())}"><img src="{$item->getPlanetPhotoSrc()}" width="96" height="96" alt="{htmlspecialchars($item->nick_name)}" /></a><em><a href="#" class="member_{$item->getMemberSrl()}">{$item->getNickName()}</a></em> </h3>
                 <!--@end-->
-                <div class="postExtra">
-                    <div class="tag">
-                    <!--// class="tag" | class="tag edit" -->
-                        {@ $regdate = $item->get('regdate') }
-                        <p class="time"><a href="{$item->getPermanentUrl()}#document_{$item->get('document_srl')}">{getTimeGap($item->get('regdate'), sprintf('y/m/d a H%s i%s', $lang->unit_hour,$lang->unit_min))}</a></p>
-                        <dl>
-                            <dt>TAG</dt>
-                            <!--@if($item->get('mid')==$myplanet->getMid())-->
-                            <dd class="tagRead">
-                                <!--@for($i=0,$tag=$item->getArrTags(),$c=count($tag);$i<$c;$i++)-->
-                                    <a href="{getUrl('act','dispPlanetContentTagSearch','keyword',urlencode($tag[$i]))}" onmouseover="showBtnDeleteTag($Element(this).next())" onmouseout="closeBtnDeleteTag($Element(this).next())" name="planet_content_tag:{$item->get('document_srl')}">{htmlspecialchars($tag[$i])}</a><button type="button" class="delete" onclick="deletePlanetContentTag({$item->get('document_srl')},{$i});return false;" onmouseover="showBtnDeleteTag(this)" onmouseout="closeBtnDeleteTag(this)"><span>{$lang->cmd_planet_del_tag}</span></button>
-                                <!--@end-->
-
-                                <button type="button" class="modify" onclick="showPlanetContentTagEditForm(this,{$item->get('document_srl')});"><span>{$lang->cmd_planet_edit_tag}</span></button>
-                            </dd>
-                            <dd class="tagModify">
-                                 <form id="form_planet_content_tag:{$item->get('document_srl')}" action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, modify_content_tag)" enctype="multipart/form-data">
-                                    <input type="hidden" name="document_srl" value="{$item->get('document_srl')}" />
-                                    <input type="text" name="planet_content_tag" value="{$item->getTextTags()}" class="inputText" /><button type="submit">{$lang->cmd_save}</button><button type="button" onclick="closePlanetContentTagEditForm(this);return false;">{$lang->cmd_cancel}</button>
-                                </form>
-                            </dd>
-                            <!--@else-->
-                            <dd class="tagRead">
-                                <!--@for($i=0,$tag=$item->getArrTags(),$c=count($tag);$i<$c;$i++)-->
-                                    <a href="{getUrl('act','dispPlanetContentTagSearch','keyword',urlencode($tag[$i]))}" name="planet_content_tag:{$item->get('document_srl')}">{htmlspecialchars($tag[$i])}</a>
-                                <!--@end-->
-
-                            </dd>
-                            <!--@end-->
-                        </dl>
+                <div class="tongue">
+                    <div class="post">
+                      {$item->getContent()}
                     </div>
-                    <div class="sympathy">
-                        <!--@if($myplanet->isExists() && $item->get('mid')!=$myplanet->getMid())--><span class="btnPlus"><span class="button small"><button type="button" onclick="doPlanetVoteContent({$item->get('document_srl')});return false;">{$lang->cmd_planet_good} +</button></span></span> <!--@end-->
-                        <strong class="num" id="content_voted:{$item->get('document_srl')}">{$item->getVotedCount()}</strong>
-                        <a href="#" onclick="showPlanetReply({$item->get('document_srl')});return false;">{$lang->comment}(<span id="reply_count:{$item->get('document_srl')}">{$item->getCommentCount()}</span>)</a>
+                    <!--@if($item->getPostScript())-->
+                    <p class="postScript"><strong>{$lang->planet_postscript}</strong> {htmlspecialchars($item->getPostScript())}</p>
+                    <!--@end-->
+                    <div class="postExtra">
+                        <div class="tag">
+                        <!--// class="tag" | class="tag edit" -->
+                            <!--@if($item->get('member_srl')==$logged_info->member_srl)-->
+                            <form action="./" method="post" onsubmit="return procFilter(this,delete_planet_document);" class="deleteContent">
+                                <input type="hidden" name="document_srl" value="{$item->document_srl}" />
+                                <input type="image" src="./images/buttonDelete.gif" value="{$lang->cmd_delete}" />
+                            </form>
+                            <!--@end-->
+
+                            {@ $regdate = $item->get('regdate') }
+                            <p class="time"><a href="{$item->getPermanentUrl()}#document_{$item->get('document_srl')}">{getTimeGap($item->get('regdate'), sprintf('y/m/d a H%s i%s', $lang->unit_hour,$lang->unit_min))}</a></p>
+                            <dl>
+                                <dt>TAG</dt>
+                                <!--@if($item->get('mid')==$myplanet->getMid())-->
+                                <dd class="tagRead">
+                                    <!--@for($i=0,$tag=$item->getArrTags(),$c=count($tag);$i<$c;$i++)-->
+                                        <a href="{getUrl('act','dispPlanetContentTagSearch','keyword',urlencode($tag[$i]))}" onmouseover="showBtnDeleteTag($Element(this).next())" onmouseout="closeBtnDeleteTag($Element(this).next())" name="planet_content_tag:{$item->get('document_srl')}">{htmlspecialchars($tag[$i])}</a><button type="button" class="delete" onclick="deletePlanetContentTag({$item->get('document_srl')},{$i});return false;" onmouseover="showBtnDeleteTag(this)" onmouseout="closeBtnDeleteTag(this)"><span>{$lang->cmd_planet_del_tag}</span></button>
+                                    <!--@end-->
+
+                                    <button type="button" class="modify" onclick="showPlanetContentTagEditForm(this,{$item->get('document_srl')});"><span>{$lang->cmd_planet_edit_tag}</span></button>
+                                </dd>
+                                <dd class="tagModify">
+                                     <form id="form_planet_content_tag:{$item->get('document_srl')}" action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, modify_content_tag)" enctype="multipart/form-data">
+                                        <input type="hidden" name="document_srl" value="{$item->get('document_srl')}" />
+                                        <input type="text" name="planet_content_tag" value="{$item->getTextTags()}" class="inputText" /><button type="submit">{$lang->cmd_save}</button><button type="button" onclick="closePlanetContentTagEditForm(this);return false;">{$lang->cmd_cancel}</button>
+                                    </form>
+                                </dd>
+                                <!--@else-->
+                                <dd class="tagRead">
+                                    <!--@for($i=0,$tag=$item->getArrTags(),$c=count($tag);$i<$c;$i++)-->
+                                        <a href="{getUrl('act','dispPlanetContentTagSearch','keyword',urlencode($tag[$i]))}" name="planet_content_tag:{$item->get('document_srl')}">{htmlspecialchars($tag[$i])}</a>
+                                    <!--@end-->
+
+                                </dd>
+                                <!--@end-->
+                            </dl>
+                        </div>
+                        <div class="sympathy">
+                            <!--@if($myplanet->isExists() && $item->get('mid')!=$myplanet->getMid())--><span class="btnPlus"><span class="button small"><button type="button" onclick="doPlanetVoteContent({$item->get('document_srl')});return false;">{$lang->cmd_planet_good} +</button></span></span> <!--@end-->
+                            <strong class="num" id="content_voted:{$item->get('document_srl')}">{$item->getVotedCount()}</strong>
+                            <a href="#" onclick="showPlanetReply({$item->get('document_srl')});return false;">{$lang->comment}(<span id="reply_count:{$item->get('document_srl')}">{$item->getCommentCount()}</span>)</a>
+                        </div>
                     </div>
                 </div>
             </div>
+            <!--// //Original Text -->
+            <!--// Reply Text -->
+            <div class="reply" id="reply:{$item->get('document_srl')}">
+
+                <div id="reply_content:{$item->get('document_srl')}"></div>
+
+
+                <!--@if($myplanet->isExists())-->
+                <dl>
+                    <dt>{$logged_info->nick_name}</dt>
+                    <dd>
+                        <form id="writeReply:{$item->get('document_srl')}" action="./" method="post" onsubmit="return procFilter(this, insert_reply)">
+                            <input name="document_srl" type="hidden" value="{$item->get('document_srl')}"/>
+                            <input name="planet_reply_content" type="text" class="inputText" />
+                            <span class="button"><button type="submit">{$lang->cmd_input}</button></span>
+                        </form>
+                    </dd>
+                </dl>
+                <!--@end-->
+            </div>
+            <!--// //Reply Text -->
+            <span class="tl"></span><span class="tr"></span><span class="bl"></span><span class="br"></span>
         </div>
-        <!--// //Original Text -->
-        <!--// Reply Text -->
-        <div class="reply" id="reply:{$item->get('document_srl')}">
-
-            <div id="reply_content:{$item->get('document_srl')}"></div>
+    <!--@end-->
 
 
-            <!--@if($myplanet->isExists())-->
-            <dl>
-                <dt>{$logged_info->nick_name}</dt>
-                <dd>
-                    <form id="writeReply:{$item->get('document_srl')}" action="./" method="post" onsubmit="return procFilter(this, insert_reply)">
-                        <input name="document_srl" type="hidden" value="{$item->get('document_srl')}"/>
-                        <input name="planet_reply_content" type="text" class="inputText" />
-                        <span class="button"><button type="submit">{$lang->cmd_input}</button></span>
-                    </form>
-                </dd>
-            </dl>
+    <!--@if($page_navigation->total_page>1)-->
+        <div class="pagination">
+            <!--@if($page_navigation->cur_page<$page_navigation->last_page)-->
+            <a href="{getUrl('page',$page_navigation->cur_page+1)}" class="prev">{$lang->cmd_prev}</a>
+            <!--@end-->
+            <!--@if($page_navigation->cur_page>1)-->
+            <a href="{getUrl('page',$page_navigation->cur_page-1)}" class="next">{$lang->cmd_next}</a>
             <!--@end-->
         </div>
-        <!--// //Reply Text -->
+    <!--@end-->
         <span class="tl"></span><span class="tr"></span><span class="bl"></span><span class="br"></span>
-    </div>
-<!--@end-->
 
-
-<!--@if($page_navigation->total_page>1)-->
-    <div class="pagination">
-        <!--@if($page_navigation->cur_page<$page_navigation->last_page)-->
-        <a href="{getUrl('page',$page_navigation->cur_page+1)}" class="prev">{$lang->cmd_prev}</a>
-        <!--@end-->
-        <!--@if($page_navigation->cur_page>1)-->
-        <a href="{getUrl('page',$page_navigation->cur_page-1)}" class="next">{$lang->cmd_next}</a>
-        <!--@end-->
-    </div>
-<!--@end-->
-    <span class="tl"></span><span class="tr"></span><span class="bl"></span><span class="br"></span>
-
-<!--@if($document_srl)-->
-<script type="text/javascript">
-jQuery(window).load(function() {
-    try { location.href=location.href.replace(/#(.+)$/,'')+"#document_"+{$document_srl}; } catch(e) { }
-    if(jQuery.effects && jQuery.effects.highlight) {
-        jQuery('#commentBody\\:{$document_srl} .xe_content').effect("highlight", { color:'#FFFF00' }, 2500);
-    }
-});
-</script>
-<!--@end-->
+    <!--@if($document_srl)-->
+    <script type="text/javascript">
+    jQuery(window).load(function() {
+        try { location.href=location.href.replace(/#(.+)$/,'')+"#document_"+{$document_srl}; } catch(e) { }
+        if(jQuery.effects && jQuery.effects.highlight) {
+            jQuery('#commentBody\\:{$document_srl} .xe_content').effect("highlight", { color:'#FFFF00' }, 2500);
+        }
+    });
+    </script>
+    <!--@end-->
diff --git a/modules/planet/skins/xe_planet/css/blue.css b/modules/planet/skins/xe_planet/css/blue.css
index 6496e1837..4cb507a3d 100644
--- a/modules/planet/skins/xe_planet/css/blue.css
+++ b/modules/planet/skins/xe_planet/css/blue.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#aed1e4;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#aed1e4;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/css/cyan.css b/modules/planet/skins/xe_planet/css/cyan.css
index c3d59f4a6..767d0c30e 100644
--- a/modules/planet/skins/xe_planet/css/cyan.css
+++ b/modules/planet/skins/xe_planet/css/cyan.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#bac8c9;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#bac8c9;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/css/default.css b/modules/planet/skins/xe_planet/css/default.css
index 7443c53e7..2675722a9 100644
--- a/modules/planet/skins/xe_planet/css/default.css
+++ b/modules/planet/skins/xe_planet/css/default.css
@@ -21,7 +21,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 /* Layout */
 #planet {font-family:Sans-serif; margin:0; padding:0; }
 #container {}
-#planetHeader{ z-index:30; clear:both; margin:0 0 15px 0; overflow:hidden; *zoom:1;}
+#planetHeader{ z-index:30; clear:both; margin:0 0 5px 0; overflow:hidden; *zoom:1;}
 #planetHeader *{ margin:0; padding:0;}
 #planetHeader li{ list-style:none;}
 #planetBody{ clear:both; z-index:20;}
@@ -30,41 +30,12 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 #planetHeader h1 { white-space:nowrap; margin:0; padding:0;}
 #planetHeader h1 a { font-weight:bold; font-size:26px; color:#000; text-decoration:none !important;}
 
-/* Time Navigation */
-.timeNav{ font:11px Dotum, Tahoma; white-space:nowrap; color:#999; float:left;}
-.timeNav *{ color:#000;}
-.timeNav strong{ font-family:Arial; font-size:18px;}
-.timeNav em{ font-style:normal; font-weight:bold; font-size:18px; font-family:"Malgun Gothic", AppleGothic, Dotum, Tahoma, Sans-serif;}
-.timeNav .prev,
-.timeNav .next { display:inline-block; font-size:18px; font-family:Arial; font-weight:bold; color:#000; padding:0 5px !important; text-decoration:none !important;}
-.timeNav span.prev,
-.timeNav span.next { color:#AAA; }
-
-#navigation{ float:right; z-index:100; }
-#navigation .gnb { clear:both; margin:0;}
-#navigation .gnb ul{ margin:0;}
-#navigation li{ list-style:none;}
 .buttonArea{ text-align:center;}
 
-
-/* Footer */
-#planetFooter{margin:0; clear:both; text-align:center; padding:30px 0;}
-#planetFooter *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;}
-#planetFooter a{text-decoration:none; color:#444;}
-#planetFooter a:visited{text-decoration:none; color:#666;}
-#planetFooter a:hover{text-decoration:underline;}
-#planetFooter address a{font-weight:bold; font-family:Tahoma; color:#00535d;}
-
-/* ---------- Navigation ---------- */
-/* Search */
-#planetHeader .search{ clear:both; padding:0; white-space:nowrap; text-align:right; *zoom:1; margin-right:2px; float:right;}
-#planetHeader .search .inputText{ padding:4px 0 0 4px; height:17px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:12px AppleGothic, Dotum, Gulim, Sans-serif;}
-#planetHeader .search .inputText.focus{padding:3px 0 1px 4px;  border:3px solid #4ba300; height:13px; width:156px;}
-#planetHeader .search .button{ *top:1px;}
-#planetHeader .search .button button{ padding:0 10px 0 8px; font-family:Dotum;}
-
-/* GNB */
-#planetHeader .gnb{ position:relative; float:right; margin-left:20px; margin-bottom:5px; }
+#planetHeader li{ list-style:none;}
+#planetHeader .gnb { float:left; margin:0;}
+#planetHeader .gnb ul{ margin:0;}
+#planetHeader .gnb{ margin-bottom:5px; }
 #planetHeader .gnb ul{ margin:0; padding:0; position:relative; float:left; overflow:hidden;}
 #planetHeader .gnb ul li{ position:relative; float:left;}
 #planetHeader .gnb ul li a{ position:relative; display:block; float:left; background:url(../images/buttonGnb.gif) no-repeat center top; padding:11px 25px 11px 25px; font:12px AppleGothic, Dotum, Gulim, Sans-serif; color:#fff !important; text-decoration:none !important; letter-spacing:-1px; white-space:nowrap;}
@@ -75,6 +46,22 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 #planetHeader .gnb ul li.first a{ background-position:left top;}
 #planetHeader .gnb ul li.last a{ background-position:right top;}
 
+#planetHeader .search{ padding:0; white-space:nowrap; text-align:right; *zoom:1; margin:10px 2px 0 0; }
+#planetHeader .search .inputText{ padding:4px 0 0 4px; height:17px; width:160px; border:1px solid #e7e7e7; vertical-align:top; font:12px AppleGothic, Dotum, Gulim, Sans-serif;}
+#planetHeader .search .inputText.focus{padding:3px 0 1px 4px;  border:3px solid #4ba300; height:13px; width:156px;}
+#planetHeader .search .button{ *top:1px; margin-right:5px; }
+#planetHeader .search .button button{ padding:0 10px 0 8px; *padding:0; font-family:Dotum;}
+#planetHeader .search .button.hotTag { margin-right:0; }
+
+/* Footer */
+#planetFooter{margin:0; clear:both; text-align:center; padding:30px 0;}
+#planetFooter *{margin:0; padding:0; color:#444; list-style:none; font:9px Verdana; line-height:normal;}
+#planetFooter a{text-decoration:none; color:#444;}
+#planetFooter a:visited{text-decoration:none; color:#666;}
+#planetFooter a:hover{text-decoration:underline;}
+#planetFooter address a{font-weight:bold; font-family:Tahoma; color:#00535d;}
+
+
 /* ---------- Content ---------- */
 
 /* Tab */
@@ -89,14 +76,14 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .tab{ *zoom:1;}
 .tab:after{ content:""; display:block; clear:both;}
 
-.myTab{ float:left; margin:0; padding:0 0 0 16px; position:relative; *zoom:1;}
+.myTab{ float:left; margin:0; padding:0 0 0 4px; position:relative; *zoom:1;}
 .myTab:after{ content:""; display:block; clear:both;}
 .myTab *{ margin:0; padding:0; list-style:none;}
 .myTab li{ position:relative; top:2px; float:left; margin-right:6px; text-align:center; background:url(../images/cr3pxLeft.gif) no-repeat left top;}
-.myTab li a{ position:relative; left:3px; display:block; float:left; height:22px; padding:5px 23px 0 20px; font-size:12px; color:#fff; text-decoration:none !important; background:url(../images/cr3pxRight.gif) no-repeat right top;}
+.myTab li a{ position:relative; left:3px; display:block; float:left; height:22px; padding:1px 13px 0 10px; *padding-top:5px; font-size:12px; color:#fff; text-decoration:none !important; background:url(../images/cr3pxRight.gif) no-repeat right top;}
 .myTab li a sup{ font:9px Tahoma, Sans-serif;}
-.myTab li.active{ top:0;}
-.myTab li.active a{ padding:7px 23px 0 20px; font-weight:bold;}
+.myTab li.active{ top:2px;}
+.myTab li.active a{ padding:1px 13px 0 10px; font-weight:bold;*padding-top:5px; }
 
 .exTab{ float:right; margin:0; padding:0; position:relative; *zoom:1;}
 .exTab:after{ content:""; display:block; clear:both;}
@@ -107,22 +94,6 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .exTab li.active{ top:0;}
 .exTab li.active a{ padding:7px 23px 0 20px; font-weight:bold;}
 
-/* Tag */
-.tagRank{ float:right; position:relative; top:2px; padding:0 19px 0 0; z-index:20; margin:0; *zoom:1;}
-.tagRank *{ margin:0; padding:0;}
-.tagRank .buttonTag{ width:197px; display:block; position:relative; background:#848f97 url(../images/cr3pxLeft.gif) no-repeat left top;}
-.tagRank .buttonTag button{ width:197px; display:block; position:relative; left:3px; height:27px; padding:5px 10px 0 10px; background:#848f97 url(../images/cr3pxRight.gif) no-repeat right top; text-align:left; vertical-align:middle;}
-.tagRank .buttonTag button span{ padding:0 15px 0 0; display:block; visibility:visible; width:auto; height:auto; white-space:nowrap; position:relative; font-size:12px; line-height:12px; color:#fff; background:url(../images/arrowTagNavigation.gif) no-repeat right -14px; text-align:center;}
-.tagRank .layer{ display:none; position:absolute; width:200px; top:27px; left:0px; background:#50606b; background:url(../images/boxTagNavigation.gif) no-repeat left bottom;}
-.tagRank .layer a{ font:11px Dotum, Sans-serif; white-space:nowrap; text-decoration:none; line-height:normal;}
-.tagRank .layer ul{ padding:1px 13px 30px 13px; text-align:justify;}
-.tagRank .layer ul *{ line-height:16px;}
-.tagRank .layer ul li{ display:inline; margin-bottom:4px;}
-.tagRank .layer ul li a{ color:#cbd0d3; zoom:1;}
-.tagRank .layer .more{ display:block; padding:5px 13px 7px 10px; _margin:-1px 0; position:absolute; bottom:0; right:0; color:#fff;}
-.tagRank.open .buttonTag button span{ background-position:right 6px;}
-.tagRank.open .layer{ display:block;}
-
 /* Try Planet */
 .tryPlanet{ position:relative; height:90px; background:url(../images/boxTryPlanet.gif) repeat-x 0 0; margin-bottom:15px;}
 .tryPlanet *{ margin:0; padding:0;}
@@ -204,6 +175,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .tagCloud .br{ bottom:-1px; right:-1px; background-position:-4px -4px;}
 
 /* Comment List */
+.noDocumentList { border:1px solid #dedede; *zoom:1; z-index:10; clear:both; background:#fff; padding:10px;}
 .commentList{ position:relative; padding:15px; border:1px solid #dedede; *zoom:1; z-index:10; clear:both; background:#eee;}
 .commentList h3{ position:relative; display:inline-block; *display:inline; margin-right:20px; background:url(../images/boxH2Comment.gif) no-repeat 0 0; vertical-align:middle; *zoom:1; line-height:18px;}
 .commentList h3, x:-moz-any-link { display:inline; padding-top:3px;}
@@ -236,10 +208,11 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .commentBody{ position:relative; margin:10px 0; border:1px solid #d7dfe2; background:#fff; *zoom:1; clear:both;}
 .commentBody .comment{ position:relative; margin:0 15px; padding:15px 0 15px 0; clear:both; *zoom:1;}
 .commentBody .comment:after { content:""; display:block; width:0; height:0; font:0/0 Sans-serif; overflow:hidden; visibility:hidden; clear:both; float:none;}
-.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:12px; background:none; *zoom:1;}
+.commentBody .comment .identity{ position:relative; width:98px; float:left; margin:0 -98px 0 0; font-size:12px; background:none; *zoom:1; white-space:nowrap;}
 .commentBody .comment .identity a{ position:relative; display:block; text-align:center; font-size:12px; color:#fff !important; font-weight:bold;}
 .commentBody .comment .identity a img{ display:block; border:1px solid #ddd;}
-.commentBody .comment .identity a em{ position:absolute; width:96px; text-align:center; left:1px; bottom:1px; display:block; padding:5px 0; font-style:normal; background:#000; opacity:.6; filter:alpha(opacity=60); line-height:normal;}
+.commentBody .comment .identity em{ position:absolute; width:96px; text-align:center; left:1px; bottom:1px; display:block; padding:5px 0; font-style:normal; background:#000; opacity:.6; filter:alpha(opacity=60); line-height:normal;}
+.commentBody .comment .identity em img { border:0; display:inline; }
 .commentBody .comment .tongue{ position:relative; margin-left:113px; *zoom:1;}
 .commentBody .comment .tongue .post{ margin:0 0 7px 0; font:16px/1.6 NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; word-break:break-all; }
 .commentBody .comment .tongue .post a { font:1em NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif; color:#06C;}
@@ -287,7 +260,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .commentBody .reply{ display:none; clear:both; padding:15px; background:#f3f3f3; *zoom:1;}
 .commentBody .reply.open{ display:block;}
 .commentBody .reply dl{ position:relative; clear:both; overflow:hidden; *zoom:1; margin:0 0 5px 0;}
-.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:12px; font-weight:bold; color:#666;}
+.commentBody .reply dt{ float:left; width:83px; padding-left:15px; margin-right:-98px; font-size:12px; font-weight:bold; color:#666; white-space:nowrap;}
 .commentBody .reply dt a{ color:#a5b2c2; }
 .commentBody .reply dd{ margin:0 80px 0 113px; font-size:12px; color:#666; line-height:1.4em;}
 .commentBody .reply dd a{ text-decoration:underline; color:#333;}
@@ -376,14 +349,14 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .authorHeader .tl{ left:0; background-position:left top;}
 .authorHeader .tr{ right:0; background-position:right top;}
 
-.authorHeader .myOption{ position:absolute; top:20px; right:15px;}
+.authorHeader .myOption{ position:absolute; top:20px; right:15px; width:90px;}
 
-.authorHeader .rss{ float:left; margin:0 5px 0 0; position:relative; display:block; width:15px; height:15px; background-repeat:no-repeat; background-position:center; cursor:pointer;}
+.authorHeader .rss{ float:right; margin:0 5px 0 0; position:relative; display:block; width:15px; height:15px; background-repeat:no-repeat; background-position:center; cursor:pointer;}
 .authorHeader .rss.off{ background-image:url(../images/rssOff.png); _behavior:url(./common/js/iePngFix.htc);}
 .authorHeader .rss.on{ background-image:url(../images/rssOn.png); _behavior:url(./common/js/iePngFix.htc);}
 .authorHeader .rss span{ display:block; width:0; height:0; overflow:hidden;}
 
-.authorHeader .color{ float:left; margin:0 5px 0 0; display:block; border:1px solid #ccc; width:16px; height:16px;}
+.authorHeader .color{ float:right; margin:0 5px 0 0; display:block; border:1px solid #ccc; width:16px; height:16px;}
 .authorHeader .colorPreset{ position:absolute; display:none; top:25px; right:0; width:131px;}
 .authorHeader .colorPreset.open{ display:block;}
 .authorHeader .colorPreset.close{ display:none;}
@@ -397,7 +370,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .authorHeader .colorPreset li a{ display:block; width:14px; height:14px;}
 .authorHeader .colorPreset li a span{ display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
 
-.authorHeader .apiMe2day{ position:relative; float:left; width:16px; margin:0 5px 0 0;}
+.authorHeader .apiMe2day{ position:relative; float:right; width:16px; margin:0 5px 0 0;}
 .authorHeader .apiMe2day fieldset{ width:16px;}
 .authorHeader .apiMe2day *{ font-size:12px;}
 .authorHeader .apiMe2day .setupButton{ width:16px; height:16px; background:url(../images/iconMe2day.png) no-repeat center; _behavior:url(./common/js/iePngFix.htc);}
@@ -414,7 +387,7 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .authorHeader .apiMe2day .apiProtocol .autoPush label{}
 .authorHeader .apiMe2day .apiProtocol .buttonArea button{ border:1px solid #ccc; background:#eee; font-size:11px; *margin-right:4px;}
 
-.authorHeader .mobile{ float:left; width:12px; margin:0 5px 0 0; position:relative;}
+.authorHeader .mobile{ float:right; width:12px; margin:0 5px 0 0; position:relative;}
 .authorHeader .mobile fieldset{ width:12px;}
 .authorHeader .mobile .setupButton{ position:relative; top:-3px; width:12px; height:19px; background:url(../images/iconMobile.gif) no-repeat;}
 .authorHeader .mobile .address{ display:none; position:absolute; border:2px solid #eee; background:#fff; padding:10px 15px 10px 20px; position:absolute; top:25px; right:0; white-space:nowrap;}
@@ -503,11 +476,13 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .writePost{ position:relative; margin-bottom:15px; padding:10px 0; *zoom:1;}
 .writePost *{ margin:0; padding:0; color:#fff; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
 .writePost h3{ margin-left:15px; line-height:1em; font-family:NanumGothic,"Malgun Gothic", AppleGothic, Dotum, Gulim, Sans-serif;}
-.writePost .toggle{ display:none; position:absolute; top:5px; right:15px; background:url(../images/arrowTagNavigation.gif) no-repeat;}
+.writePost .toggle{ display:none !important; position:absolute; top:5px; right:15px; background:url(../images/arrowTagNavigation.gif) no-repeat;}
 .writePost.close .toggle{ background-position:left -14px;}
 .writePost.open .toggle{ background-position:left 5px;}
-.writePost.close .toggle.open,
-.writePost.open .toggle.close{ display:block;}
+
+.writePost.open .toggle.close { display:block !important; }
+.writePost.close .toggle.open { display:block !important; }
+
 .writePost .toggle button{ padding-left:8px; position:relative; font:bold 12px AppleGothic, Dotum, Gulim, Sans-serif; letter-spacing:-1px;}
 .writePost.close .writeBody{ display:none;}
 .writePost.open .writeBody{ display:block;}
@@ -541,22 +516,22 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .writePost .br{ bottom:0; _bottom:-1px; right:0; background-position:right -4px;}
 
 /* My Favorite Tag */
-.myFavoriteTag{ display:none; position:relative; background:#7b735d; margin-bottom:10px; *zoom:1; padding:15px 20px 15px 20px;}
+.myFavoriteTag{ position:relative; background:#fff; border:1px solid #DDD; margin-bottom:10px; *zoom:1; padding:15px 20px 15px 20px; clear:both;}
 .myFavoriteTag *{ margin:0; padding:0;}
 .myFavoriteTag.open{ display:block;}
-.myFavoriteTag *{ color:#fff;}
+.myFavoriteTag *{ color:#777;}
 .myFavoriteTag ul{ position:relative; padding:5px 0; overflow:hidden; *zoom:1;}
 .myFavoriteTag li{ position:relative; padding:0 6px 0 10px; left:-11px; display:inline; background:url(../images/lineVccc.gif) no-repeat left center; line-height:18px;}
 .myFavoriteTag li a,
 .myFavoriteTag li strong{ font-size:12px; white-space:nowrap;}
-.myFavoriteTag li strong{ color:#ffba00;}
+.myFavoriteTag li strong{ color:#000;}
 .myFavoriteTag li .delete{ position:relative; top:-7px; left:-6px; display:none; width:12px; height:11px; margin-right:-12px; background:url(../images/buttonX.gif) no-repeat center;}
 .myFavoriteTag li .delete span{ display:inline-block; width:0; height:0; font:0/0 Sans-serif; visibility:hidden;}
 .myFavoriteTag li .delete.hover{ display:inline-block;}
 .myFavoriteTag .addTag{ text-align:right;}
 .myFavoriteTag .addTag .inputText{ border:1px solid #ccc; padding:3px 4px; color:#000; font-size:12px; margin-right:5px;}
 .myFavoriteTag .addTag .addFavorite{ display:inline-block; position:relative; background:url(../images/iconAddFavorite.gif) no-repeat left center;}
-.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#fff; text-align:right; letter-spacing:-1px;}
+.myFavoriteTag .addTag .addFavorite button{ position:relative; *top:2px; width:80px; height:20px; font-size:11px; font-family:AppleGothic, Dotum, Gulim, Sans-serif; color:#777; text-align:right; letter-spacing:-1px;}
 .myFavoriteTag .tl,
 .myFavoriteTag .tr,
 .myFavoriteTag .bl,
@@ -582,17 +557,28 @@ button span{ position:absolute; width:0; height:0; font:0/0 Sans-serif; visibili
 .welcome .bl{ bottom:0; left:0; background-position:left -4px;}
 .welcome .br{ bottom:0; right:0; background-position:right -4px;}
 
+/* Time Navigation */
+.timeNav{ font:11px Dotum, Tahoma; white-space:nowrap; color:#999; float:left; text-align:right; margin-bottom:5px; }
+.timeNav *{ color:#000;}
+.timeNav strong{ font-family:Arial; font-size:12px;}
+.timeNav em{ font-style:normal; font-weight:bold; font-size:12px; font-family:"Malgun Gothic", AppleGothic, Dotum, Tahoma, Sans-serif;}
+.timeNav .prev,
+.timeNav .next { display:inline-block; font-size:12px; font-family:Arial; font-weight:bold; color:#000; padding:0 5px !important; text-decoration:none !important;}
+.timeNav span.prev,
+.timeNav span.next { color:#AAA; }
+
 /* Pagination */
-.pagination{ padding:5px 0; text-align:center;}
+.pagination{ float:right; margin-bottom:5px; }
+text-align:center;}
 .pagination *{ margin:0; padding:0;}
 .pagination a,
-.pagination strong{ _position:relative; font-weight:bold; display:inline-block; padding:5px 5px 3px 5px; color:#313031; text-decoration:none; line-height:normal; font:bold 12px Tahoma, Sans-serif !important;}
+.pagination strong{ _position:relative; font-weight:bold; display:inline-block; padding:0 5px 0 5px; color:#313031; text-decoration:none; line-height:normal; font:bold 12px Tahoma, Sans-serif !important;}
 .pagination strong{ color:#ff8600 !important;}
 .pagination a:hover{ background:#eee; }
-.pagination a.prev{ padding:5px 10px 3px 10px; background:url(../images/paginationPrev.gif) no-repeat left center !important; border:none; font-weight:normal; }
-.pagination a.prevEnd{ padding:5px 10px 3px 10px; background:url(../images/paginationPrevEnd.gif) no-repeat left center !important; border:none; border-right:1px solid #ccc;}
-.pagination a.next{ padding:5px 10px 3px 10px; background:url(../images/paginationNext.gif) no-repeat right center !important; border:none; font-weight:normal; }
-.pagination a.nextEnd{ padding:5px 10px 3px 10px; background:url(../images/paginationNextEnd.gif) no-repeat right center !important; border:none; border-left:1px solid #ccc;}
-
-
+.pagination a.prev{ padding:0 10px 0 10px; background:url(../images/paginationPrev.gif) no-repeat left center !important; border:none; font-weight:normal; }
+.pagination a.prevEnd{ padding:0 10px 0 10px; background:url(../images/paginationPrevEnd.gif) no-repeat left center !important; border:none; border-right:1px solid #ccc;}
+.pagination a.next{ padding:0 10px 0 10px; background:url(../images/paginationNext.gif) no-repeat right center !important; border:none; font-weight:normal; }
+.pagination a.nextEnd{ padding:0 10px 0 10px; background:url(../images/paginationNextEnd.gif) no-repeat right center !important; border:none; border-left:1px solid #ccc;}
 
+form.deleteContent { display:inline; margin-right:5px !important; }
+form.deleteContent input { vertical-align:middle; width:16px !important; height:16px !important; padding:0 !important; border:0 !important;}
diff --git a/modules/planet/skins/xe_planet/css/gray.css b/modules/planet/skins/xe_planet/css/gray.css
index a5cee5b0e..f27da68be 100644
--- a/modules/planet/skins/xe_planet/css/gray.css
+++ b/modules/planet/skins/xe_planet/css/gray.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#b7b7b7;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#b7b7b7;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/css/green.css b/modules/planet/skins/xe_planet/css/green.css
index 93d38abbd..d913a27cc 100644
--- a/modules/planet/skins/xe_planet/css/green.css
+++ b/modules/planet/skins/xe_planet/css/green.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#9ecb9b;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#9ecb9b;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/css/orange.css b/modules/planet/skins/xe_planet/css/orange.css
index 37d3b7d30..f2ae217eb 100644
--- a/modules/planet/skins/xe_planet/css/orange.css
+++ b/modules/planet/skins/xe_planet/css/orange.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#efbd8e;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#efbd8e;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/css/red.css b/modules/planet/skins/xe_planet/css/red.css
index 425e0fd9f..f09451f9f 100644
--- a/modules/planet/skins/xe_planet/css/red.css
+++ b/modules/planet/skins/xe_planet/css/red.css
@@ -11,8 +11,8 @@
 .exTab li,
 .myTab li a,
 .exTab li a,
-.tab .tagRank .buttonTag,
-.tab .tagRank .buttonTag button{ background-color:#dfaa9e;}
+.tagRank .buttonTag,
+.tagRank .buttonTag button{ background-color:#dfaa9e;}
 .myTab li.active,
 .exTab li.active,
 .myTab li.active a,
diff --git a/modules/planet/skins/xe_planet/favorite.html b/modules/planet/skins/xe_planet/favorite.html
index 1b74127f1..a137a755a 100644
--- a/modules/planet/skins/xe_planet/favorite.html
+++ b/modules/planet/skins/xe_planet/favorite.html
@@ -2,13 +2,9 @@
 
 <!--#include("planet_info.include.html")-->
 
+    <!--#include("planet_tab.include.html")-->
 <div class="commentList">
-    <div class="commentHeader">
-        <h3><span>{sprintf($lang->planet_whos_favorite_list, $planet->getNickName())}</span></h3>
-    </div>
-
     <!--#include("content_list.html")-->
-
 </div>
 
 <!--#include("footer.html")-->
diff --git a/modules/board/skins/xe_default/filter/delete_comment.xml b/modules/planet/skins/xe_planet/filter/delete_planet_comment.xml
similarity index 55%
rename from modules/board/skins/xe_default/filter/delete_comment.xml
rename to modules/planet/skins/xe_planet/filter/delete_planet_comment.xml
index 115ea00d9..e1f32bc12 100644
--- a/modules/board/skins/xe_default/filter/delete_comment.xml
+++ b/modules/planet/skins/xe_planet/filter/delete_planet_comment.xml
@@ -1,18 +1,16 @@
-<filter name="delete_comment" module="board" act="procBoardDeleteComment">
+<filter name="delete_planet_comment" module="planet" act="procPlanetDeleteComment" confirm_msg_code="confirm_delete">
   <form>
     <node target="comment_srl" required="true" />
+    <node target="document_srl" required="true" />
   </form>
   <parameter>
-    <param name="mid" target="mid" />
-    <param name="page" target="page" />
-    <param name="document_srl" target="document_srl" />
     <param name="comment_srl" target="comment_srl" />
+    <param name="document_srl" target="document_srl" />
   </parameter>
-  <response callback_func="completeDeleteComment">
+  <response callback_func="completeDeletePlanetComment">
     <tag name="error" />
     <tag name="message" />
-    <tag name="mid" />
+    <tag name="comment_srl" />
     <tag name="document_srl" />
-    <tag name="page" />
   </response>
 </filter>
diff --git a/modules/board/skins/xe_guestbook/filter/vote.xml b/modules/planet/skins/xe_planet/filter/delete_planet_document.xml
similarity index 52%
rename from modules/board/skins/xe_guestbook/filter/vote.xml
rename to modules/planet/skins/xe_planet/filter/delete_planet_document.xml
index 0870a7551..669b4a957 100644
--- a/modules/board/skins/xe_guestbook/filter/vote.xml
+++ b/modules/planet/skins/xe_planet/filter/delete_planet_document.xml
@@ -1,13 +1,13 @@
-<filter name="vote" module="board" act="procBoardVoteDocument" confirm_msg_code="confirm_vote">
+<filter name="delete_planet_document" module="planet" act="procPlanetDeleteDocument" confirm_msg_code="confirm_delete">
   <form>
     <node target="document_srl" required="true" />
   </form>
   <parameter>
-    <param name="mid" target="mid" />
     <param name="document_srl" target="document_srl" />
   </parameter>
-  <response callback_func="completeVote">
+  <response callback_func="completeDeletePlanetDocument">
     <tag name="error" />
     <tag name="message" />
+    <tag name="document_srl" />
   </response>
 </filter>
diff --git a/modules/planet/skins/xe_planet/filter/write_content.xml b/modules/planet/skins/xe_planet/filter/write_content.xml
index e5ea82101..5d25868ea 100644
--- a/modules/planet/skins/xe_planet/filter/write_content.xml
+++ b/modules/planet/skins/xe_planet/filter/write_content.xml
@@ -7,7 +7,7 @@
   </form>
   <parameter>
     <param name="content" target="content" />
-    <param name="extra_vars20" target="postscript" />
+    <param name="postscript" target="postscript" />
     <param name="tags" target="content_tag" />
 	<param name="mid" target="mid" />
 	<param name="me2day_autopush" target="me2day_autopush" />
diff --git a/modules/planet/skins/xe_planet/footer.html b/modules/planet/skins/xe_planet/footer.html
index c52c78da0..58b94c67c 100644
--- a/modules/planet/skins/xe_planet/footer.html
+++ b/modules/planet/skins/xe_planet/footer.html
@@ -1,10 +1,9 @@
             </div>
         </div>
-        <!--@if(!$config->layout_srl)-->
+        <!--@if(!$module_info->layout_srl)-->
         <hr />
         <div id="planetFooter">
             <address>powered by <a href="http://www.zeroboard.com/" target="_blank">XE</a></address>
         </div>
         <!--@end-->
     </div>
-</div>
diff --git a/modules/planet/skins/xe_planet/header.html b/modules/planet/skins/xe_planet/header.html
index 610e29b8c..2db6bd78a 100644
--- a/modules/planet/skins/xe_planet/header.html
+++ b/modules/planet/skins/xe_planet/header.html
@@ -23,75 +23,44 @@
 
     <div id="planet">
         <div id="planetHeader">
-			<!--@if($config->logo_image)-->
-                <h1><a href="{getUrl('','mid',$config->mid)}"><img src="{$config->logo_image}" alt="{$config->logo_title}" /></a></h1>
-			<!--@elseif($config->logo_title)-->
-                <h1><a href="{getUrl('','mid',$config->mid)}">{htmlspecialchars($config->logo_title)}</a></h1>
+			<!--@if($module_info->logo_image)-->
+                <h1><a href="{getUrl('','mid',$module_info->mid)}"><img src="{$module_info->logo_image}" alt="{$module_info->logo_title}" /></a></h1>
+			<!--@elseif($module_info->logo_title)-->
+                <h1><a href="{getUrl('','mid',$module_info->mid)}">{htmlspecialchars($module_info->logo_title)}</a></h1>
 			<!--@end-->
 
-			<!--@if($date && !($act=='dispPlanetLogin' || $act=='dispPlanetContentTagSearch' || $act=='dispPlanetTagSearch' || $act=='dispPlanetContentSearch'))-->
-			<div class="timeNav">
-				<!--@if($prev_date)-->
-                    <a class="prev" href="{getUrl('date',$prev_date, 'document_srl','')}" title="{$lang->cmd_prev}">&lt;</a>
-                <!--@else-->
-                    <span class="prev">&lt;</span>
-                <!--@end-->
-				<strong>{zdate($date,'Y')}</strong>{$lang->unit_year}
-				<strong>{zdate($date,'m')}</strong>{$lang->unit_month}
-				<strong>{zdate($date,'d')}</strong>{$lang->unit_day}
-				(<em>{zdate($date,'l')}</em>)
-				<!--@if($next_date)-->
-                    <a class="next" href="{getUrl('date',$next_date, 'document_srl','')}" title="{$lang->cmd_next}">&gt;</a>
-                <!--@else-->
-                    <span class="next">&gt;</span>
-                <!--@end-->
-			</div>
-			<!--@end-->
+            <!-- GNB -->
+            <!--@if($module_info->display_menu!='N')-->
+            <div class="gnb">
+                <ul>
+                    <li class="first <!--@if($mid==$module_info->mid)-->active<!--@end-->"><a href="{getUrl('','mid',$module_info->mid)}">{$lang->planet_home}</a></li>
+                    <!--@if($myplanet->isExists())-->
+                        <li class="<!--@if($myplanet->isMyPlanet($planet))-->active<!--@end-->"><a href="{getUrl('','mid',$myplanet->getMid())}">{$lang->planet_myplanet}</a></li>
+                    <!--@end-->
+                    <li class="<!--@if($moretags==1)-->active<!--@end--> last"><a href="{getUrl('document_srl','','moretags',1)}">{$lang->planet_hot_tag}</a></li>
+                </ul>
+            </div>
+            <!--@end-->
+            <!-- //GNB -->
 
-			<div id="navigation">
-				<!-- GNB -->
-                <!--@if($config->display_menu!='N')-->
-				<div class="gnb">
-					<ul>
-						<li class="first <!--@if($mid==$config->mid)-->active<!--@end-->"><a href="{getUrl('','mid',$config->mid)}">{$lang->planet_home}</a></li>
-						<!--@if($myplanet->isExists())-->
-							<li <!--@if($myplanet->isMyPlanet($planet))-->class="active"<!--@end-->><a href="{getUrl('','mid',$myplanet->getMid())}">{$lang->planet_myplanet}</a></li>
-						<!--@end-->
-	
-						<!--@if($is_logged)-->
-							<li class="last"><a href="#" onclick="doPlanetLogout()">{$lang->cmd_logout}</a></li>
-						<!--@else-->
-							<!--@if($config->use_signup=='Y')-->
-							<li><a href="{getUrl('','module','member','act','dispMemberSignupForm','popup',1)}" onclick="winopen(this.href, 'PlanetSignUp','width=600px,height=700px,toolbars=no,scrollbars=yes');return false;">{$lang->cmd_signup}</a></li>
-							<!--@end-->
-							<li class="last"><a href="{getUrl('act','dispPlanetLogin')}">{$lang->cmd_login}</a></li>
-						<!--@end-->
-					</ul>
-				</div>
-                <!--@end-->
-				<!-- //GNB -->
-	
-				<!-- 검색 -->
-                <!--@if($config->display_search!='N')-->
-				<form action="{Context::getRequestUri()}" method="get" class="search">
-				<input type="hidden" name="mid" value="{$mid}" />
-				<input type="hidden" name="act" value="dispPlanetContentTagSearch" />
-					<fieldset>
-						<legend>{$lang->cmd_search}</legend>
-	
-	<!--@if(!$planet->isHome() && !$keyword)-->
-						<input name="keyword" type="text" class="inputText" value="{$lang->msg_search_thisplanet}" onfocus="this.className='inputText focus'; if(this.value=='{$lang->msg_search_thisplanet}'){ this.value='';this.style.color='#000000'; }" onblur="this.className='inputText'" accesskey="S" title="{$lang->about_planet_input_search_text}(S)" style="color:#999999"/>
-	<!--@else-->
-						<input name="keyword" type="text" class="inputText" value="{htmlspecialchars(urldecode($keyword))}" onfocus="this.className='inputText focus';" onblur="this.className='inputText'" accesskey="S" title="{$lang->about_planet_input_search_text}(S)" />
-	<!--@end-->
-	
-						<span class="button strong"> <button type="submit">{$lang->cmd_search}</button> </span>
-					</fieldset>
-				</form>
-                <!--@end-->
-				<!--// 검색 -->
-	
-			</div>
+            <!-- 검색 -->
+            <!--@if($module_info->display_search!='N')-->
+            <form action="{Context::getRequestUri()}" method="get" class="search">
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="act" value="dispPlanetContentTagSearch" />
+                <fieldset>
+                    <legend>{$lang->cmd_search}</legend>
+
+<!--@if(!$planet->isHome() && !$keyword)-->
+                    <input name="keyword" type="text" class="inputText" value="{$lang->msg_search_thisplanet}" onfocus="this.className='inputText focus'; if(this.value=='{$lang->msg_search_thisplanet}'){ this.value='';this.style.color='#000000'; }" onblur="this.className='inputText'" accesskey="S" title="{$lang->about_planet_input_search_text}(S)" style="color:#999999"/>
+<!--@else-->
+                    <input name="keyword" type="text" class="inputText" value="{htmlspecialchars(urldecode($keyword))}" onfocus="this.className='inputText focus';" onblur="this.className='inputText'" accesskey="S" title="{$lang->about_planet_input_search_text}(S)" />
+<!--@end-->
+
+                    <span class="button"><button type="submit">{$lang->cmd_search}</button></span>
+                </fieldset>
+            </form>
+            <!--@end-->
         </div>
         
 		<hr />
@@ -100,7 +69,7 @@
             <div id="planetContent">
                 <!--@if(!$myplanet->isExists() && $act == 'dispPlanetHome' && $grant->create)-->
                 <div class="tryPlanet">
-                    <p>{nl2br($config->create_message)}</p>
+                    <p>{nl2br($module_info->create_message)}</p>
                     <a href="{getUrl('','mid',$mid,'act','dispPlanetCreate')}" class="button large strong planetBlue"><span>{$lang->cmd_create_planet}</span></a>
                     <span class="leftCap"></span><span class="rightCap"></span>
                 </div>
@@ -122,9 +91,9 @@
                 <hr />
                 <!--@end-->
 
-                <!--@if($config->notice)-->
+                <!--@if($module_info->notice)-->
                 <div class="searchHeader">
-                    <p>{$config->notice}</p>
+                    <p>{$module_info->notice}</p>
                     <span class="leftCap"></span><span class="rightCap"></span>
                 </div>
                 <!--@end-->
diff --git a/modules/planet/skins/xe_planet/images/buttonDelete.gif b/modules/planet/skins/xe_planet/images/buttonDelete.gif
new file mode 100755
index 000000000..e034c62d3
Binary files /dev/null and b/modules/planet/skins/xe_planet/images/buttonDelete.gif differ
diff --git a/modules/planet/skins/xe_planet/js/planet_func.js b/modules/planet/skins/xe_planet/js/planet_func.js
index 619344521..4b3e854a1 100644
--- a/modules/planet/skins/xe_planet/js/planet_func.js
+++ b/modules/planet/skins/xe_planet/js/planet_func.js
@@ -4,8 +4,6 @@ function toggleWriteFormHelp(obj) {
     obj.nextSibling.focus();
 }
 
-
-
 function toggle(objclass,f,type){
     var obj = $$('.'+objclass)[0];
     return toggleObject(obj,f,type);
@@ -146,7 +144,6 @@ function toggleWritePost(){
             t.attr('style','overflow:hidden');
             t.height(0);
             moveHeight('writeBody',{start:0,end:30,callback:function(){t.attr('style','');}});
-
         }
 
         $Cookie().set('writePost','open',30);
@@ -189,16 +186,9 @@ function togglePreview(){
 }
 
 function toggleTagRank(){
-    var o = $Element($$('.layer')[0]);
-    // do close
-    if($Element($$('.tagRank')[0]).hasClass('open')){
-        o.disappear(0,function(){toggle('tagRank','close');o.attr('style','');})
-
-    // do open
-    }else{
-        o.appear(0,function(){toggle('tagRank','open');})
-    }
-
+    var o = $Element($$('.tagLayer')[0]);
+    if(o.css("display")!="block") o.css("display","block");
+    else o.css("display","none");
 }
 
 
@@ -325,4 +315,19 @@ function setTag(tag){
     }else{
         input_tag.value = tag;
     }
-}
\ No newline at end of file
+}
+
+function completeDeletePlanetDocument(ret_obj,response_tags) {
+    var obj = xGetElementById("commentBody:"+ret_obj['document_srl']);
+    if(!obj) return;
+    obj.parentNode.removeChild(obj);
+    if(xGetElementsByClassName("commentBody").length<1) xGetElementById("noDocument").style.display = "block";
+}
+
+function completeDeletePlanetComment(ret_obj,response_tags) {
+    var obj = xGetElementById("commentBody:"+ret_obj['comment_srl']);
+    if(!obj) return;
+    obj.parentNode.removeChild(obj);
+
+    $('reply_count:'+ ret_obj['document_srl']).innerHTML = parseInt($('reply_count:'+ ret_obj['document_srl']).innerHTML)-1;
+}
diff --git a/modules/planet/skins/xe_planet/main.html b/modules/planet/skins/xe_planet/main.html
index 01871dacc..7685da0b5 100644
--- a/modules/planet/skins/xe_planet/main.html
+++ b/modules/planet/skins/xe_planet/main.html
@@ -1,39 +1,21 @@
 <!--#include("header.html")-->
 
-<ul class="generalTab">
-
-<!--@if(is_array($config->tagtab) && count($config->tagtab)>0)-->
+<ul class="myTab">
+<!--@if(is_array($module_info->tagtab) && count($module_info->tagtab)>0)-->
     <!--@foreach($tagtab_list as $key => $val)-->
     <li <!--@if($tagtab==$key)-->class="active"<!--@end-->><a href="{getUrl('type','tagtab','page','','tagtab',$key)}">{$key}<sup>{number_format($val)}</sup></a></li>
     <!--@end-->
 <!--@end-->
-
     <li <!--@if($type=='all')-->class="active"<!--@end-->><a href="{getUrl('type','all','page','','tagtab')}">{$lang->planet_total_articles}<sup>{number_format($total_content)}</sup></a></li>
     <li <!--@if($type=='wantyou')-->class="active"<!--@end-->><a href="{getUrl('type','wantyou','page','','tagtab')}">{$lang->planet_wantyou}<sup>{number_format($total_wantyou)}</sup></a></li>
     <li <!--@if($type=='best')-->class="active"<!--@end-->><a href="{getUrl('type','best','page','','tagtab')}">{$lang->planet_best}<sup>{number_format($total_best)}</sup></a></li>
-
-<!--@if(is_array($config->tagtab_after) && count($config->tagtab_after)>0)-->
+<!--@if(is_array($module_info->tagtab_after) && count($module_info->tagtab_after)>0)-->
     <!--@foreach($tagtab_after_list as $key => $val)-->
     <li <!--@if($tagtab==$key)-->class="active"<!--@end-->><a href="{getUrl('type','tagtab','page','','tagtab',$key)}">{$key}<sup>{number_format($val)}</sup></a></li>
     <!--@end-->
 <!--@end-->
 </ul>
 
-<!-- 실시간 인기 태그-->
-<div class="tagRank">
-	<!--// class="tagRank" | class="tagRank open" -->
-	<span class="buttonTag"><button type="button" onclick="toggleTagRank()"><span>{$lang->planet_hot_tag}</span></button></span>
-	<div class="layer">
-		<ul>
-			<!--@foreach($planet->getPopularTags(false,10) as $val)-->
-			<li><a href="{getUrl('act','dispPlanetContentTagSearch','keyword',urlencode($val->tag))}">{htmlspecialchars($val->tag)}</a></li>
-			<!--@end-->
-		</ul>
-		<a href="{getUrl('moretags',1)}" class="more">&gt;{$lang->cmd_planet_more_tag}</a>
-	</div>
-</div>
-<!-- //실시간 인기 태그 -->
-
 <div class="commentList">
 
     <!--#include("content_list.html")-->
diff --git a/modules/planet/skins/xe_planet/myPlanet.html b/modules/planet/skins/xe_planet/myPlanet.html
index bd94ff43b..9250632e9 100644
--- a/modules/planet/skins/xe_planet/myPlanet.html
+++ b/modules/planet/skins/xe_planet/myPlanet.html
@@ -6,28 +6,7 @@
 
 <!--#include("planet_info.include.html")-->
 <div id="planet_tab" class="tab">
-    <ul class="myTab" id="planet_myTab">
-        <li <!--@if(!$type)-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','')}">{$lang->planet_total_articles}<sup>{number_format($total_content)}</sup></a></li>
-        <li <!--@if($type=='catch')-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','catch')}">{$lang->planet_catch}<sup>{number_format($total_catch)}</sup></a></li>
-        <li <!--@if($type=='interest')-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','interest')}">{$lang->planet_interest_content}<sup>&nbsp;</sup></a></li>
-        <!--<li <!--@if($type=='fish')-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','fish')}">{$lang->planet_fish}<sup>&nbsp;</sup></a></li>
-        <li <!--@if($type=='bigfish')-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','bigfish')}">{$lang->planet_bigfish}<sup>&nbsp;</sup></a></li>-->
-    </ul>
-
-    <!-- 실시간 인기 태그-->
-    <div class="tagRank">
-        <!--// class="tagRank" | class="tagRank open" -->
-        <span class="buttonTag"><button type="button" onclick="toggleTagRank()"><span>{$lang->planet_hot_tag}</span></button></span>
-        <div class="layer">
-            <ul>
-                <!--@foreach($planet->getPopularTags(false,10) as $val)-->
-                <li><a href="{getUrl('document_srl','', 'act','dispPlanetContentTagSearch', 'keyword',urlencode($val->tag))}">{htmlspecialchars($val->tag)}</a></li>
-                <!--@end-->
-            </ul>
-            <a href="{getUrl('document_srl','', 'moretags',1)}" class="more">&gt;{$lang->cmd_planet_more_tag}</a>
-        </div>
-    </div>
-    <!-- //실시간 인기 태그 -->
+    <!--#include("planet_tab.include.html")-->
 
 </div>
 
diff --git a/modules/planet/skins/xe_planet/planet_info.include.html b/modules/planet/skins/xe_planet/planet_info.include.html
index ff89d561f..47a416379 100644
--- a/modules/planet/skins/xe_planet/planet_info.include.html
+++ b/modules/planet/skins/xe_planet/planet_info.include.html
@@ -82,7 +82,7 @@
 					<li class="orange"><a href="#" onclick="doUpdateColorset(this);return false;" title="Orange"><span>Orange</span></a></li>
 				</ul>
 
-			<!--@if($config->use_me2day=='Y')-->
+			<!--@if($module_info->use_me2day=='Y')-->
 				<!--%import("filter/me2day_api.xml")-->
 				<form action="./" method="post" class="apiMe2day" onsubmit="return procFilter(this,me2day_api);">
 					<fieldset>
@@ -108,7 +108,7 @@
 				</form>
 			<!--@end-->
 	
-			<!--@if($config->use_mobile=='Y')-->
+			<!--@if($module_info->use_mobile=='Y')-->
 			{@$phone_number=$myplanet->getPhoneNumber()}
 			<form method="post" class="mobile" onsubmit="setPhoneNumber(this);return false;" action="">
 				<fieldset>
@@ -149,18 +149,9 @@
         </div>
     </div>
     <!--@end-->
-    <ul class="nav">
-        <li><a href="{getUrl('act','favorite')}">{sprintf($lang->planet_whos_favorite,$planet->getNickName())}</a></li>
-        <li><button type="button" onclick="this.innerHTML=toggle('myFavoriteTag')=='open'?'{$lang->cmd_planet_close_interest_tag}':'{$lang->cmd_planet_show_interest_tag}'">{$lang->cmd_planet_show_interest_tag}</button></li>
-    </ul>
     <span class="tl"></span><span class="tr"></span>
 </div>
 
-<!--%import("./filter/insert_interest_tag.xml")-->
-<div id="myFavoriteTag">
-    <!--#include("interest_tags.html")-->
-</div>
-
 <!--@if($planet->isMyPlanet())-->
 <iframe name="photo_iframe" style="visibility:hidden;width:1px;height:1px;"></iframe>
 <!--@end-->
@@ -180,7 +171,7 @@
 <!--@end-->
 
 <!--@if($planet->isMyPlanet())-->
-<div id="writePost" class="writePost close">
+<div id="writePost" class="writePost <!--@if($_COOKIE['writePost']=='close')-->close<!--@else-->open<!--@end-->">
     <!--// class="writePost close" | class="writePost open"-->
     <div class="writeHeader">
         <h3>{$lang->cmd_planet_add_article}</h3>
@@ -209,7 +200,7 @@
                 </dl>
                 <div class="writeOptions">
                     <p><input id="btn_preview" name="" onclick="togglePreview()" type="checkbox" value="" checked="checked" /><label for="btn_preview">{$lang->planet_article_preview}</label></p>
-                    <!--@if($config->use_me2day =='Y' && $myplanet->getMe2dayUID())-->
+                    <!--@if($module_info->use_me2day =='Y' && $myplanet->getMe2dayUID())-->
                     <p><input name="me2day_autopush" type="checkbox" value="Y" <!--@if($myplanet->getMe2dayAuthPush())-->checked="checked"<!--@end--> id="me2day_autopush" /><label for="me2day_autopush">{$lang->cmd_send_me2day}</label></p>
                     <!--@end-->
                 </div>
diff --git a/modules/planet/skins/xe_planet/planet_tab.include.html b/modules/planet/skins/xe_planet/planet_tab.include.html
new file mode 100644
index 000000000..91076acb5
--- /dev/null
+++ b/modules/planet/skins/xe_planet/planet_tab.include.html
@@ -0,0 +1,8 @@
+    <ul class="myTab" id="planet_myTab">
+        <li <!--@if(!$type&&(!$act||$act=="dispPlanet"))-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','','act','dispPlanet')}">{$lang->planet_total_articles}<sup>{number_format($total_content)}</sup></a></li>
+        <li <!--@if($type=='catch'&&$act=="dispPlanet")-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','catch','act','dispPlanet')}">{$lang->planet_catch}<sup>{number_format($total_catch)}</sup></a></li>
+        <li <!--@if($type=='fishing'&&$act=="dispPlanet")-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','fishing','act','dispPlanet')}">{$lang->planet_fish}<sup>{number_format($total_fishing)}</sup></a></li>
+        <li <!--@if($type=='interest'&&$act=="dispPlanet")-->class="active"<!--@end-->><a href="{getUrl('document_srl','', 'type','interest','act','dispPlanet')}">{$lang->planet_interest_content}<sup>&nbsp;</sup></a></li>
+        <li <!--@if($act=="favorite")-->class="active"<!--@end-->><a href="{getUrl('act','favorite')}">{$lang->planet_favorite}<sup>&nbsp;</sup></a></li>
+    </ul>
+
diff --git a/modules/planet/skins/xe_planet/reply_list.html b/modules/planet/skins/xe_planet/reply_list.html
index 067f1edf2..bc1cb0d5d 100644
--- a/modules/planet/skins/xe_planet/reply_list.html
+++ b/modules/planet/skins/xe_planet/reply_list.html
@@ -1,8 +1,18 @@
 <!--@if($reply_list)-->
 	<!--@foreach($reply_list as $key => $reply)-->
-	<dl>
-	    <dt><a href="{getUrl('','mid',$reply->mid)}">{$reply->nick_name}</a></dt>
-	    <dd>{$reply->content} <span class="time">{getTimeGap($reply->regdate, 'Y/m/d')}</span></dd>
+	<dl id="commentBody:{$reply->comment_srl}">
+	    <dt><a href="#" class="member_{$reply->member_srl}">{$reply->nick_name}</a></dt>
+	    <dd>
+            {$reply->content} 
+            <span class="time">{getTimeGap($reply->regdate, 'Y/m/d')}</span>
+            <!--@if($reply->member_srl==$logged_info->member_srl)-->
+            <form action="./" method="post" onsubmit="return procFilter(this,delete_planet_comment);" class="deleteContent">
+                <input type="hidden" name="document_srl" value="{$reply->document_srl}" />
+                <input type="hidden" name="comment_srl" value="{$reply->comment_srl}" />
+                <input type="image" src="./images/buttonDelete.gif" value="{$lang->cmd_delete}" />
+            </form>
+            <!--@end-->
+        </dd>
 	</dl>
 	<!--@end-->
 <!--@end-->
diff --git a/modules/planet/skins/xe_planet/skin.xml b/modules/planet/skins/xe_planet/skin.xml
index baff4de63..3188e75cf 100644
--- a/modules/planet/skins/xe_planet/skin.xml
+++ b/modules/planet/skins/xe_planet/skin.xml
@@ -86,7 +86,7 @@
         </var>
         <var name="display_search" type="select">
             <title xml:lang="ko">플래닛 검색 출력</title>
-            <title xml:lang="zh-CN">플래닛 검색 출력</title>
+            <title xml:lang="zh-CN">微博搜索</title>
             <title xml:lang="zh-TW">플래닛 검색 출력</title>
             <title xml:lang="jp">플래닛 검색 출력</title>
             <options value="Y">
@@ -108,7 +108,7 @@
         </var>
         <var name="display_menu" type="select">
             <title xml:lang="ko">플래닛 메뉴 출력</title>
-            <title xml:lang="zh-CN">플래닛 메뉴 출력</title>
+            <title xml:lang="zh-CN">微博菜单</title>
             <title xml:lang="zh-TW">플래닛 메뉴 출력</title>
             <title xml:lang="jp">플래닛 메뉴 출력</title>
             <options value="Y">
diff --git a/modules/planet/tpl/grant_list.html b/modules/planet/tpl/grant_list.html
new file mode 100644
index 000000000..b0d8b0c53
--- /dev/null
+++ b/modules/planet/tpl/grant_list.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$grant_content}
diff --git a/modules/planet/tpl/header.html b/modules/planet/tpl/header.html
index 4096ad3f6..f8db8aa76 100644
--- a/modules/planet/tpl/header.html
+++ b/modules/planet/tpl/header.html
@@ -1,17 +1,18 @@
 <!--%import("js/planet.js")-->
 
-<h3>{$lang->planet} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->planet} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_planet)}</div>
 
 <div class="header4">
     <!--@if($module_info->mid)-->
-    <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>
+    <h4 class="xeAdmin">{$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">
         <li <!--@if($act=='dispPlanetAdminSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispPlanetAdminSetup','module_srl','')}">{$lang->cmd_planet_setup}</a></li>
         <li <!--@if($act=='dispPlanetAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispPlanetAdminList','module_srl','')}">{$lang->cmd_planet_list}</a></li>
+        <li <!--@if($act=='dispPlanetAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPlanetAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
         <li <!--@if($act=='dispPlanetAdminSkinInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPlanetAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>
     </ul>
 </div>
diff --git a/modules/planet/tpl/images/planet.gif b/modules/planet/tpl/images/planet.gif
new file mode 100755
index 000000000..3aae25976
Binary files /dev/null and b/modules/planet/tpl/images/planet.gif differ
diff --git a/modules/planet/tpl/insert.html b/modules/planet/tpl/insert.html
index 5571344c7..e78ef2725 100644
--- a/modules/planet/tpl/insert.html
+++ b/modules/planet/tpl/insert.html
@@ -7,7 +7,7 @@
 <input type="hidden" name="act" value="procPlanetAdminInsert" />
 <input type="hidden" name="module_srl" value="{$planet?$planet->getModuleSrl():0}" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->planet_mid}</div></th>
         <td>
@@ -31,10 +31,10 @@
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
             <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
-        </td>
+        </th>
     </table>
 
 </form>
diff --git a/modules/planet/tpl/list.html b/modules/planet/tpl/list.html
index fd6e8da3f..99ba3464a 100644
--- a/modules/planet/tpl/list.html
+++ b/modules/planet/tpl/list.html
@@ -1,10 +1,7 @@
 <!--#include("./header.html")-->
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($page_navigation->total_count)}</em>, Page <strong>{number_format($page_navigation->cur_page)}</strong>/{number_format($page_navigation->total_page)}
-</div>
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($page_navigation->total_count)}, Page {number_format($page_navigation->cur_page)}/{number_format($page_navigation->total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -18,13 +15,13 @@
 <tbody>
     <!--@foreach($planet_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
-        <td class="nowrap"><span class="member_{$val->getMemberSrl()}">{$val->getNickName()}</span></td>
-        <td><a href="{getUrl('module_srl',$val->getModuleSrl(),'act','dispPlanetAdminInsert')}">{$val->getMid()}</a></td>
-        <td><a href="{getUrl('module_srl',$val->getModuleSrl(),'act','dispPlanetAdminInsert')}">{$val->getBrowserTitle()}</a></td>
-        <td class="date center nowrap">{zdate($val->get('regdate'),"Y-m-d")}</td>
-        <td class="center view"><a href="{getUrl('','mid',$val->getMid())}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="center delete"><a href="{getUrl('act','dispPlanetAdminDelete','module_srl',$val->getModuleSrl())}">{$lang->cmd_delete}</a></td>
+        <td>{$no}</td>
+        <td><span class="member_{$val->getMemberSrl()}">{$val->getNickName()}</span></td>
+        <td>{$val->getMid()}</td>
+        <td><a href="{getUrl('','mid',$val->getMid())}" onclick="window.open(this.href); return false;" title="{htmlspecialchars($lang->cmd_view)}">{$val->getBrowserTitle()}</a></td>
+        <td>{zdate($val->get('regdate'),"Y-m-d")}</td>
+        <td><a href="{getUrl('module_srl',$val->getModuleSrl(),'act','dispPlanetAdminInsert')}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="{getUrl('act','dispPlanetAdminDelete','module_srl',$val->getModuleSrl())}" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 </tbody>
diff --git a/modules/planet/tpl/planet_delete.html b/modules/planet/tpl/planet_delete.html
index 5d7169d72..122af0684 100644
--- a/modules/planet/tpl/planet_delete.html
+++ b/modules/planet/tpl/planet_delete.html
@@ -4,27 +4,19 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_planet)">
 <input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$planet_info->module_srl}" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->confirm_delete}</caption>
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->module_name}</div></th>
         <td class="wide">{$planet_info->mid}</td>
     </tr>
     <tr>
-        <th scope="row"><div>{$lang->module}</div></th>
-        <td>{$planet_info->module}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->document_count}</div></th>
-        <td>{$planet_info->document_count}</td>
-    </tr>
-    <tr>
-        <td colspan="2" class="right">
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispPlanetAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
-        </td>
+        </th>
     </table>
 
 </form>
diff --git a/modules/planet/tpl/setup.html b/modules/planet/tpl/setup.html
index 977e3d7f7..6e315eb44 100644
--- a/modules/planet/tpl/setup.html
+++ b/modules/planet/tpl/setup.html
@@ -2,26 +2,26 @@
 <!--%import("filter/insert_config.xml")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->mid}</div></th>
         <td colspan="3">
-            <input type="text" name="mid" value="{htmlspecialchars($config->mid)}"  class="inputTypeText w400" />
-            <p>{$lang->mid}</p>
+            <input type="text" name="mid" value="{htmlspecialchars($module_info->mid)}"  class="inputTypeText w400" />
+            <p>{$lang->about_mid}</p>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->is_default}</div></th>
         <td colspan="3">
-            <input type="checkbox" name="is_default" value="Y" <!--@if($config->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default"  class="checkbox" />
+            <input type="checkbox" name="is_default" value="Y" <!--@if($module_info->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default"  class="checkbox" />
             <label for="fld_for_default">{$lang->about_default}</label>
         </td>
     </tr>
     <tr class="row2">
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td colspan="3">
-            <input type="text" name="browser_title" value="{htmlspecialchars($config->browser_title)}"  class="inputTypeText w400" />
-            <p>{$lang->browser_title}</p>
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" />
+            <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
     <tr class="row">
@@ -30,7 +30,7 @@
             <select name="layout_srl">
             <option value="0">{$lang->notuse}</option>
             <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($config->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
             <!--@end-->
             </select>
             <p>{$lang->about_layout}</p>
@@ -41,7 +41,7 @@
         <td colspan="3">
             <select name="planet_default_skin">
                 <!--@foreach($skin_list as $key=>$val)-->
-                <option value="{$key}" <!--@if($config->planet_default_skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <option value="{$key}" <!--@if($module_info->planet_default_skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
                 <!--@end-->
             </select>
             <p>{$lang->about_planet_default_skin}</p>
@@ -50,7 +50,7 @@
     <tr>
         <th scope="row"><div>{$lang->create_message}</div></th>
         <td colspan="3">
-            <textarea name="create_message" class="inputTypeTextArea w400">{htmlspecialchars($config->create_message)}</textarea>
+            <textarea name="create_message" class="inputTypeTextArea w400">{htmlspecialchars($module_info->create_message)}</textarea>
             <p>{$lang->about_create_message}</p>
         </td>
     </tr>
@@ -78,7 +78,7 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->use_signup}</div></th>
         <td colspan="3">
-            <input type="checkbox" name="use_signup" value="Y" <!--@if($config->use_signup=='Y')-->checked="checked"<!--@end--> id="fld_for_signup"  class="checkbox" />
+            <input type="checkbox" name="use_signup" value="Y" <!--@if($module_info->use_signup=='Y')-->checked="checked"<!--@end--> id="fld_for_signup"  class="checkbox" />
             <label for="fld_for_signup">{$lang->about_use_signup}</label>
         </td>
     </tr>
@@ -87,7 +87,7 @@
     <tr>
         <th scope="row"><div>{$lang->planet_use_mobile}</div></th>
         <td colspan="3">
-            <input type="checkbox" name="use_mobile" value="Y" <!--@if($config->use_mobile=='Y')-->checked="checked"<!--@end--> id="fld_for_use_mobile"  class="checkbox" />
+            <input type="checkbox" name="use_mobile" value="Y" <!--@if($module_info->use_mobile=='Y')-->checked="checked"<!--@end--> id="fld_for_use_mobile"  class="checkbox" />
             <label for="fld_for_use_mobile">{$lang->about_use_mobile}</label>
         </td>
     </tr>
@@ -95,32 +95,14 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->planet_use_me2day}</div></th>
         <td colspan="3">
-            <input type="checkbox" name="use_me2day" value="Y" <!--@if($config->use_me2day=='Y')-->checked="checked"<!--@end--> id="fld_for_use_me2day"  class="checkbox" />
+            <input type="checkbox" name="use_me2day" value="Y" <!--@if($module_info->use_me2day=='Y')-->checked="checked"<!--@end--> id="fld_for_use_me2day"  class="checkbox" />
             <label for="fld_for_use_me2day">{$lang->about_use_me2day}</label>
         </td>
     </tr>
-
     <tr>
-        <th scope="row" colspan="4"><div>{$lang->cmd_manage_grant}</div></th>
-    </tr>
-
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@foreach($group_list as $k => $v)-->
-                <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($config->grants[$key])&&in_array($v->group_srl,$config->grants[$key]))-->checked="checked"<!--@end-->/>
-                <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="selectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true });return false;">{$lang->cmd_select_all}</a></td>
-        <td class="deSelectAll center"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false });return false;">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td class="right" colspan="4">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th class="button" colspan="4">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
diff --git a/modules/planet/tpl/skin_info.html b/modules/planet/tpl/skin_info.html
index a822ba89a..0ad67b69f 100644
--- a/modules/planet/tpl/skin_info.html
+++ b/modules/planet/tpl/skin_info.html
@@ -1,142 +1,3 @@
 <!--#include("./header.html")-->
 
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="planet" />
-<input type="hidden" name="act" value="procPlanetAdminUpdateSkinInfo" />
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide">{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-            &nbsp;
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br(trim($skin_info->description))}</td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td>
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-                <!--@if($val->screenshot)-->
-                    {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-                <!--@else-->
-                    {@ $_width = 200; $_height = 20; $_talign = "left"; }
-                <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-                <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($config->colorset==$val->name)-->checked="checked"<!--@end-->/>  
-                <label for="colorset_{$key}">{$val->title}</label>
-                <!--@if($val->screenshot)-->
-                <br />
-                <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-                <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
-    <!--@end-->
-
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td>
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr class="row2">
-        <td scope="row" colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
-    </tr>
-    </table>
-
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+{$skin_content}
diff --git a/modules/planet/tpl/top_refresh.html b/modules/planet/tpl/top_refresh.html
deleted file mode 100644
index 2f4983d1d..000000000
--- a/modules/planet/tpl/top_refresh.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript">
-    top.location.href = top.location.href;
-</script>
diff --git a/modules/point/conf/info.xml b/modules/point/conf/info.xml
index 369371cbf..e28c27e4a 100644
--- a/modules/point/conf/info.xml
+++ b/modules/point/conf/info.xml
@@ -44,7 +44,7 @@
     </description>
     <version>0.1</version>
     <date>2007-07-26</date>
-    <category>accessory</category>
+    <category>member</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/point/conf/module.xml b/modules/point/conf/module.xml
index 8eb00cc77..f5d176d93 100644
--- a/modules/point/conf/module.xml
+++ b/modules/point/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispPointAdminConfig" type="view" admin_index="true" standalone="true" />
         <action name="dispPointAdminModuleConfig" type="view" standalone="true" />
diff --git a/modules/point/icons/default/0.gif b/modules/point/icons/default/0.gif
index efaa21145..9fdbf26a7 100755
Binary files a/modules/point/icons/default/0.gif and b/modules/point/icons/default/0.gif differ
diff --git a/modules/point/icons/default/1.gif b/modules/point/icons/default/1.gif
index 6ad33d739..14b24afb5 100755
Binary files a/modules/point/icons/default/1.gif and b/modules/point/icons/default/1.gif differ
diff --git a/modules/point/icons/default/10.gif b/modules/point/icons/default/10.gif
index 0f9fb0271..b8ce2fdea 100755
Binary files a/modules/point/icons/default/10.gif and b/modules/point/icons/default/10.gif differ
diff --git a/modules/point/icons/default/11.gif b/modules/point/icons/default/11.gif
index 007bf5872..795def313 100755
Binary files a/modules/point/icons/default/11.gif and b/modules/point/icons/default/11.gif differ
diff --git a/modules/point/icons/default/12.gif b/modules/point/icons/default/12.gif
index 182a42785..21099e54e 100755
Binary files a/modules/point/icons/default/12.gif and b/modules/point/icons/default/12.gif differ
diff --git a/modules/point/icons/default/13.gif b/modules/point/icons/default/13.gif
index f0fe7f6d0..93e956e77 100755
Binary files a/modules/point/icons/default/13.gif and b/modules/point/icons/default/13.gif differ
diff --git a/modules/point/icons/default/14.gif b/modules/point/icons/default/14.gif
index 8e0061d2b..04e294bbd 100755
Binary files a/modules/point/icons/default/14.gif and b/modules/point/icons/default/14.gif differ
diff --git a/modules/point/icons/default/15.gif b/modules/point/icons/default/15.gif
index db8837344..c687defbd 100755
Binary files a/modules/point/icons/default/15.gif and b/modules/point/icons/default/15.gif differ
diff --git a/modules/point/icons/default/16.gif b/modules/point/icons/default/16.gif
index e014dfd47..e927be162 100755
Binary files a/modules/point/icons/default/16.gif and b/modules/point/icons/default/16.gif differ
diff --git a/modules/point/icons/default/17.gif b/modules/point/icons/default/17.gif
index 6492fd21c..822cbd62a 100755
Binary files a/modules/point/icons/default/17.gif and b/modules/point/icons/default/17.gif differ
diff --git a/modules/point/icons/default/18.gif b/modules/point/icons/default/18.gif
index a01cf8984..4b36c4a9b 100755
Binary files a/modules/point/icons/default/18.gif and b/modules/point/icons/default/18.gif differ
diff --git a/modules/point/icons/default/19.gif b/modules/point/icons/default/19.gif
index b8bcd4228..dd076afa2 100755
Binary files a/modules/point/icons/default/19.gif and b/modules/point/icons/default/19.gif differ
diff --git a/modules/point/icons/default/2.gif b/modules/point/icons/default/2.gif
index 713e5b64b..1863417b0 100755
Binary files a/modules/point/icons/default/2.gif and b/modules/point/icons/default/2.gif differ
diff --git a/modules/point/icons/default/20.gif b/modules/point/icons/default/20.gif
index c1efbb8d2..6ee91be2f 100755
Binary files a/modules/point/icons/default/20.gif and b/modules/point/icons/default/20.gif differ
diff --git a/modules/point/icons/default/21.gif b/modules/point/icons/default/21.gif
index 3a5828fba..dbda98786 100755
Binary files a/modules/point/icons/default/21.gif and b/modules/point/icons/default/21.gif differ
diff --git a/modules/point/icons/default/22.gif b/modules/point/icons/default/22.gif
index e184dcc33..bbf1ce7f4 100755
Binary files a/modules/point/icons/default/22.gif and b/modules/point/icons/default/22.gif differ
diff --git a/modules/point/icons/default/23.gif b/modules/point/icons/default/23.gif
index 0787ca8b1..791a2bcea 100755
Binary files a/modules/point/icons/default/23.gif and b/modules/point/icons/default/23.gif differ
diff --git a/modules/point/icons/default/24.gif b/modules/point/icons/default/24.gif
index c61d5a3bc..5fa028161 100755
Binary files a/modules/point/icons/default/24.gif and b/modules/point/icons/default/24.gif differ
diff --git a/modules/point/icons/default/25.gif b/modules/point/icons/default/25.gif
index 9de0ffb8a..f4f9e0036 100755
Binary files a/modules/point/icons/default/25.gif and b/modules/point/icons/default/25.gif differ
diff --git a/modules/point/icons/default/26.gif b/modules/point/icons/default/26.gif
index c188cf0c3..6dc6db6cd 100755
Binary files a/modules/point/icons/default/26.gif and b/modules/point/icons/default/26.gif differ
diff --git a/modules/point/icons/default/27.gif b/modules/point/icons/default/27.gif
index 96947cee7..f637f7b44 100755
Binary files a/modules/point/icons/default/27.gif and b/modules/point/icons/default/27.gif differ
diff --git a/modules/point/icons/default/28.gif b/modules/point/icons/default/28.gif
index 988588b5d..3f58933d6 100755
Binary files a/modules/point/icons/default/28.gif and b/modules/point/icons/default/28.gif differ
diff --git a/modules/point/icons/default/29.gif b/modules/point/icons/default/29.gif
index 9ccb0ca18..425f5ddb0 100755
Binary files a/modules/point/icons/default/29.gif and b/modules/point/icons/default/29.gif differ
diff --git a/modules/point/icons/default/3.gif b/modules/point/icons/default/3.gif
index 82bc3171c..bab6835da 100755
Binary files a/modules/point/icons/default/3.gif and b/modules/point/icons/default/3.gif differ
diff --git a/modules/point/icons/default/30.gif b/modules/point/icons/default/30.gif
index 49695680e..216791f19 100755
Binary files a/modules/point/icons/default/30.gif and b/modules/point/icons/default/30.gif differ
diff --git a/modules/point/icons/default/4.gif b/modules/point/icons/default/4.gif
index 554bef415..3b3924d0d 100755
Binary files a/modules/point/icons/default/4.gif and b/modules/point/icons/default/4.gif differ
diff --git a/modules/point/icons/default/5.gif b/modules/point/icons/default/5.gif
index 9df6ad65d..4adae8ee4 100755
Binary files a/modules/point/icons/default/5.gif and b/modules/point/icons/default/5.gif differ
diff --git a/modules/point/icons/default/6.gif b/modules/point/icons/default/6.gif
index 6970c7ae5..c124321d2 100755
Binary files a/modules/point/icons/default/6.gif and b/modules/point/icons/default/6.gif differ
diff --git a/modules/point/icons/default/7.gif b/modules/point/icons/default/7.gif
index 728943e9a..cb99dbdb2 100755
Binary files a/modules/point/icons/default/7.gif and b/modules/point/icons/default/7.gif differ
diff --git a/modules/point/icons/default/8.gif b/modules/point/icons/default/8.gif
index 27a1db3e7..de35d3082 100755
Binary files a/modules/point/icons/default/8.gif and b/modules/point/icons/default/8.gif differ
diff --git a/modules/point/icons/default/9.gif b/modules/point/icons/default/9.gif
index ed2d11574..b4f0a1b0c 100755
Binary files a/modules/point/icons/default/9.gif and b/modules/point/icons/default/9.gif differ
diff --git a/modules/point/lang/ko.lang.php b/modules/point/lang/ko.lang.php
index 15eb8d59b..d1c199b67 100644
--- a/modules/point/lang/ko.lang.php
+++ b/modules/point/lang/ko.lang.php
@@ -5,11 +5,11 @@
      * @brief  포인트 (point) 모듈의 기본 언어팩
      **/
 
-    $lang->point = "포인트"; 
-    $lang->level = "레벨"; 
+    $lang->point = '포인트'; 
+    $lang->level = '레벨'; 
 
-    $lang->about_point_module = "포인트 모듈은 글작성/댓글작성/업로드/다운로드등의 행동을 할때 포인트를 부여할 수 있습니다.<br />단 포인트 모듈에서는 설정만 할 뿐이고 포인트 애드온을 활성화 시켜야 포인트가 누적이 됩니다";
-    $lang->about_act_config = "게시판,블로그등의 모듈마다 글작성/삭제/댓글작성/삭제등의 action이 있습니다.<br />게시판/블로그외의 모듈에 포인트 기능 연동을 하고 싶을때는 각 기능에 맞는 act값을 추가해주시면 됩니다.<br />연결은 ,(콤마)로 해주시면 됩니다.";
+    $lang->about_point_module = '포인트 모듈은 글작성/댓글작성/업로드/다운로드등의 행동을 할때 포인트를 부여할 수 있습니다.<br />단 포인트 모듈에서는 설정만 할 뿐이고 포인트 애드온을 활성화 시켜야 포인트가 누적이 됩니다';
+    $lang->about_act_config = '게시판,블로그등의 모듈마다 글작성/삭제/댓글작성/삭제등의 action이 있습니다.<br />게시판/블로그외의 모듈에 포인트 기능 연동을 하고 싶을때는 각 기능에 맞는 act값을 추가해주시면 됩니다.<br />연결은 ,(콤마)로 해주시면 됩니다.';
 
     $lang->max_level = '최고 레벨';
     $lang->about_max_level = '최고레벨을 지정하실 수 있습니다. 레벨 아이콘을 염두에 두셔야 하고 최고 레벨은 1000이 한계입니다';
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
index ed145000d..a9414178f 100644
--- a/modules/point/lang/zh-CN.lang.php
+++ b/modules/point/lang/zh-CN.lang.php
@@ -51,8 +51,7 @@
     $lang->point_voted = '推荐';
     $lang->point_blamed = '反对';
 
-
-    $lang->cmd_point_config = '基本设置';
+    $lang->cmd_point_config = '常规选项';
     $lang->cmd_point_module_config = '对象模块设置';
     $lang->cmd_point_act_config = '功能act设置';
     $lang->cmd_point_member_list = '会员积分目录';
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index c9d90bd8d..bb7c01e6f 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -140,11 +140,12 @@
          * @brief 회원 포인트 변경
          **/
         function procPointAdminUpdatePoint() {
+            $action = Context::get('action');
             $member_srl = Context::get('member_srl');
-            $point = Context::get('point');
+            $point = Context::get('point');		
 
             $oPointController = &getController('point');
-            return $oPointController->setPoint($member_srl, (int)$point);
+            return $oPointController->setPoint($member_srl, (int)$point, $action);
         }
 
         /**
diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index 2331104e8..09ee52dc8 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -13,10 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminModuleConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminActConfig');
-            $oModuleController->insertActionForward('point', 'view', 'dispPointAdminPointList');
 
             // 포인트 정보를 기록할 디렉토리 생성
             FileHandler::makeDir('./files/member_extra_info/point');
@@ -187,39 +183,5 @@
             $oPointAdminController->cacheActList();
 
         }
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procPointAdminInsertPointModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index f2e31b937..c4c7e60e2 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -446,11 +446,12 @@
             return new Object();
         }
 
-        /**
+		/**
          * @brief 포인트 설정
          **/
         function setPoint($member_srl, $point, $mode = null) {
-            if($point < 0) $point = 0;
+            $mode_arr = array('add', 'minus', 'update', 'signup');
+            if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
 
             // 설정 정보 가져오기
             $oMemberModel = &getModel('member');
@@ -464,7 +465,18 @@
 
             // 포인트 변경
             $args->member_srl = $member_srl;
-            $args->point = $point;
+            $args->point = $prev_point;
+
+            if($mode == 'add') {
+                $args->point += $point;
+            } elseif($mode == 'minus') {
+                $args->point -= $point;
+                if($args->point < 0) $args->point = 0;
+            } elseif($mode == 'update') {
+                $args->point = $point;
+                if($args->point < 0) $args->point = 0;
+            }
+
 
             // 포인트가 있는지 체크
             $oPointModel = &getModel('point');
diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html
index ffc9bfe03..0091ce1b6 100644
--- a/modules/point/tpl/config.html
+++ b/modules/point/tpl/config.html
@@ -5,66 +5,74 @@
 
 <div class="adminLeftContent">
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_setup}</caption>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->max_level}</div></th>
-        <td colspan="3">
+    <h4 class="xeAdmin">{$lang->max_level}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td colspan="2">
             <input type="text" class="inputTypeText w80" value="{$config->max_level}" name="max_level" />
             <p>{$lang->about_max_level}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->point_name}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->point_name}</div></th>
-        <td colspan="3">
+        <td colspan="2">
             <input type="text" class="inputTypeText w80" value="{$config->point_name}" name="point_name" />
             <p>{$lang->about_point_name}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->is_default}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr class="row2">
-        <th scope="col" rowspan="9"><div>{$lang->is_default}</div></th>
-        <th colspan="2"><div>{$lang->point_signup}</div></th>
+        <td><div>{$lang->point_signup}</div></td>
         <td>
             <input type="text" class="inputTypeText w80" value="{$config->signup_point}" name="signup_point" /> {$config->point_name}
             <p>{$lang->about_point_signup}</p>
         </td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->cmd_login}</div></th>
+        <td><div>{$lang->cmd_login}</div></td>
         <td><input type="text" class="inputTypeText w80" value="{$config->login_point}" name="login_point" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_insert_document}</div></th>
+        <td><div>{$lang->point_insert_document}</div></td>
         <td><input type="text" name="insert_document" value="{$config->insert_document}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_insert_comment}</div></th>
+        <td><div>{$lang->point_insert_comment}</div></td>
         <td><input type="text" name="insert_comment" value="{$config->insert_comment}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_upload_file}</div></th>
+        <td><div>{$lang->point_upload_file}</div></td>
         <td><input type="text" name="upload_file" value="{$config->upload_file}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_download_file}</div></th>
+        <td><div>{$lang->point_download_file}</div></td>
         <td><input type="text" name="download_file" value="{$config->download_file}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_read_document}</div></th>
+        <td><div>{$lang->point_read_document}</div></td>
         <td><input type="text" name="read_document" value="{$config->read_document}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr>
-        <th colspan="2"><div>{$lang->point_voted}</div></th>
+        <td><div>{$lang->point_voted}</div></td>
         <td><input type="text" name="voted" value="{$config->voted}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
     <tr class="row2">
-        <th colspan="2"><div>{$lang->point_blamed}</div></th>
+        <td><div>{$lang->point_blamed}</div></td>
         <td><input type="text" name="blamed" value="{$config->blamed}" class="inputTypeText w80" /> {$config->point_name}</td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->level_icon}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->level_icon}</div></th>
-        <td colspan="3">
-            <select name="level_icon">
+        <td colspan="2">
+            <select name="level_icon" class="fullWidth">
             <!--@foreach($level_icon_list as $key => $val)-->
                 <option value="{$val}" <!--@if($config->level_icon == $val)-->selected="selected"<!--@end-->>{$val}</option>
             <!--@end-->
@@ -72,22 +80,28 @@
             <p>{$lang->about_level_icon}</p>
         </td>
     </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->disable_download}</div></th>
-        <td colspan="3">
+    </table>
+
+    <h4 class="xeAdmin">{$lang->disable_download}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td colspan="2">
             <input type="checkbox" name="disable_download" value="Y" <!--@if($config->disable_download=='Y')-->checked="checked"<!--@end--> />
             <p>{$lang->about_disable_download}</p>
         </td>
     </tr>
+    </table>
+
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->point_link_group}</caption>
+    <h4 class="xeAdmin">{$lang->point_link_group}</h4>
+    <table cellspacing="0" class="rowTable">
     <thead>
     <tr>
         <th class="half_wide"><div>{$lang->group}<div></th>
@@ -105,34 +119,26 @@
         <td colspan="3"><p>{$lang->about_point_link_group}</p></td>
     </tr>
     <tr>
-        <td colspan="3" class="right">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="3" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
     </tr>
     </tbody>
     </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->cmd_point_recal}</caption>
-    <tr>
-        <td>
-            <p>{$lang->about_cmd_point_recal}</p>
-            <p id="pointReCal"></p>
-            <span class="button"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
-        </td>
-    </tr>
-    </table>
 </div>
 
 <div class="adminRightExtra">
-    <table cellspacing="0" class="adminTable">
+    <h4 class="xeAdmin">{$lang->level_point_calc}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col"><div>{$lang->level_point_calc}</div></th>
-        <td colspan="3"><input name="expression" value="{$config->expression}" size="4"/> <input type="button" onclick="exp_calc(this.form)" value="{$lang->cmd_exp_calc}" /> <input type="button" onclick="exp_calc(this.form, true)" value="{$lang->cmd_exp_reset}" /><p>{$lang->expression}</p>
+        <td><input name="expression" value="{$config->expression}" size="4" class="inputTypeText w100"/> <input type="button" onclick="exp_calc(this.form)" value="{$lang->cmd_exp_calc}" /> <input type="button" onclick="exp_calc(this.form, true)" value="{$lang->cmd_exp_reset}" /><p>{$lang->expression}</p>
         </td>
     </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->level_point}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="col" rowspan="{$config->max_level}"><div>{$lang->level_point}</div></th>
         <td>1</td>
         <td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
         <td><input type="text" name="level_step_1" value="{$config->level_step[1]}" class="inputTypeText w80" /> {$config->point_name}</td>
@@ -145,8 +151,23 @@
     </tr>
     <!--@end-->
     <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        <th colspan="4" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
+        </th>
+    </tr>
+    </table>
+
+    <h4 class="xeAdmin">{$lang->cmd_point_recal}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <td>
+            <p>{$lang->about_cmd_point_recal}</p>
+            <p id="pointReCal"></p>
+        </td>
+    </tr>
+    <tr>
+        <th class="button">
+            <span class="button black strong"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
         </td>
     </tr>
     </table>
diff --git a/modules/point/tpl/header.html b/modules/point/tpl/header.html
index 8d8badc43..d158e7d5a 100644
--- a/modules/point/tpl/header.html
+++ b/modules/point/tpl/header.html
@@ -1,5 +1,5 @@
 <!--%import("js/point_admin.js")-->
-<h3>{$lang->point} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->point} <span class="gray">{$lang->cmd_management}</span></h3>
 <!--@if($act=="dispPointAdminModuleConfig")-->
 <div class="infoText">{$lang->about_module_point}</div>
 <!--@else-->
diff --git a/modules/point/tpl/js/point_admin.js b/modules/point/tpl/js/point_admin.js
index a74acafb0..df916d43b 100644
--- a/modules/point/tpl/js/point_admin.js
+++ b/modules/point/tpl/js/point_admin.js
@@ -49,3 +49,14 @@ function completePointRecal(ret_obj) {
         exec_xml('point','procPointAdminApplyPoint',params, completePointRecal, response_tags);
     }
 }
+
+function updatePoint(member_srl, action)
+{
+    var pointEl = jQuery("#point_"+member_srl);
+    var e = jQuery("#update_member_srl").val(member_srl);
+    e = jQuery("#update_action").val(action);
+    e = jQuery("#update_point").val(pointEl.attr("value"));
+    var hF = jQuery("#updateForm").get(0);
+    procFilter(hF, update_point);
+}
+
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 7e06e72c6..14bdbdfbd 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -1,11 +1,9 @@
 <!--%import("filter/update_point.xml")-->
+<!--%import("js/point_admin.js")-->
 <!--#include("header.html")-->
 
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <em>{number_format($page)}/{number_format($total_page)}</em>
-</div>
-
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -24,10 +22,13 @@
         <td class="nowrap">{htmlspecialchars($val->user_name)}</td>
         <td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
         <td class="nowrap">
-            <form action="./" method="get" onsubmit="return procFilter(this, update_point);">
+            <form action="./" method="get">
                 <input type="hidden" name="member_srl" value="{$val->member_srl}" />
-                <input type="text" name="point" value="{$val->point}" class="inputTypeText w80" />
-                <span class="button"><input type="submit" value="{$lang->cmd_save}" /></span>
+                <input type="text" name="orgpoint" value="{$val->point}" class="inputTypeText w80" readonly />
+                <input type="text" id="point_{$val->member_srl}" name="point" class="inputTypeText w80" />
+                <span class="button"><input type="button" value="+" onclick="updatePoint({$val->member_srl}, 'add')"/></span>
+                <span class="button"><input type="button" value="-" onclick="updatePoint({$val->member_srl}, 'minus')"/></span>
+                <span class="button"><input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl}, 'update')" /></span>
             </form>
         </td>
         <td class="number center">{$val->level}</td>
@@ -36,6 +37,13 @@
 </tbody>
 </table>
 
+<form id="updateForm" action="./" method="POST">
+    <input type="hidden" id="update_action" name="action" value="" />
+    <input type="hidden" id="update_member_srl" name="member_srl" value="" />
+    <input type="hidden" id="update_point" name="point" class="inputTypeText w80" />
+</form>
+
+
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
@@ -77,7 +85,7 @@
             <!--@end-->
         </select>
         <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
         <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
     </fieldset>
 </form>
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html
index f235d5de1..ae1f28408 100644
--- a/modules/point/tpl/module_config.html
+++ b/modules/point/tpl/module_config.html
@@ -3,14 +3,7 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_module_config);" id="fo_point">
 
-    <table cellspacing="0" class="adminTable">
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
-    <col width="14%" />
+    <table cellspacing="0" class="crossTable">
     <thead>
         <tr>
             <th><div>{$lang->point_insert_document}</div></th>
@@ -40,9 +33,9 @@
     <!--@end-->
     <!--@end-->
     <tr>
-        <td colspan="7" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="7" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </tbody>
     </table>
diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html
index fad1b56f2..63a6bcb23 100644
--- a/modules/point/tpl/point_module_config.html
+++ b/modules/point/tpl/point_module_config.html
@@ -3,8 +3,8 @@
 <form action="./" method="get" onsubmit="return procFilter(this, insert_point_module_config);" id="fo_point">
 <input type="hidden" name="target_module_srl" value="{$module_config['module_srl']?$module_config['module_srl']:$module_srls}" />
 
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->point}</caption>
+<h4 class="xeAdmin">{$lang->point}</h4>
+<table cellspacing="0" class="rowTable">
 <tr>
     <th><div>{$lang->point_insert_document}</div></th>
     <td class="wide"><input type="text" name="insert_document" value="{$module_config['insert_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
@@ -26,7 +26,7 @@
     <td><input type="text" name="read_document" value="{$module_config['read_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
 </tr>
 <tr>
-    <td colspan="2" class="right"><span class="button"><input type="submit" value="{$lang->cmd_save}" /></span></td>
+    <th colspan="2" class="button"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span></th>
 </tr>
 </table>
 
diff --git a/modules/poll/conf/info.xml b/modules/poll/conf/info.xml
index 0465861ab..eec1e0a71 100644
--- a/modules/poll/conf/info.xml
+++ b/modules/poll/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">설문조사</title>
-    <title xml:lang="zh-CN">投票调查</title>
+    <title xml:lang="zh-CN">投票系统</title>
     <title xml:lang="jp">アンケート</title>
     <title xml:lang="en">Poll</title>
     <title xml:lang="es">Encuesta</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理投票調查的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>accessory</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/poll/conf/module.xml b/modules/poll/conf/module.xml
index 2a10c6d73..780305b12 100644
--- a/modules/poll/conf/module.xml
+++ b/modules/poll/conf/module.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispPollAdminList" type="view" admin_index="true" standalone="true" />
         <action name="dispPollAdminResult" type="view" standalone="true" />
 
-        <action name="dispPollAdminConfig" type="controller" standalone="true" />
+        <action name="dispPollAdminConfig" type="view" standalone="true" />
 
         <action name="getPollGetColorsetList" type="model" standalone="true" />
 
diff --git a/modules/poll/lang/ko.lang.php b/modules/poll/lang/ko.lang.php
index fd579635c..6bb938196 100644
--- a/modules/poll/lang/ko.lang.php
+++ b/modules/poll/lang/ko.lang.php
@@ -5,10 +5,10 @@
      * @brief  설문조사 (poll) 모듈의 기본 언어팩
      **/
 
-    $lang->poll = "설문조사"; 
-    $lang->poll_stop_date = "설문조사 종료일";
-    $lang->poll_join_count = "참가자";
-    $lang->poll_checkcount = "필수 선택 항목수";
+    $lang->poll = '설문조사'; 
+    $lang->poll_stop_date = '설문조사 종료일';
+    $lang->poll_join_count = '참가자';
+    $lang->poll_checkcount = '필수 선택 항목수';
 
     $lang->cmd_poll_list = '설문조사 목록 보기';
     $lang->cmd_delete_checked_poll = '선택항목 삭제';
@@ -28,7 +28,7 @@
 
     $lang->cmd_null_item = "설문조사로 등록할 값이 없습니다.\n다시 설정해주세요";
 
-    $lang->confirm_poll_submit = "설문조사에 응하시겠습니까?";
+    $lang->confirm_poll_submit = '설문조사에 응하시겠습니까?';
 
     $lang->search_target_list = array(
         'title' => '제목',
diff --git a/modules/poll/lang/zh-CN.lang.php b/modules/poll/lang/zh-CN.lang.php
index fe29922cf..fef3ad4c9 100644
--- a/modules/poll/lang/zh-CN.lang.php
+++ b/modules/poll/lang/zh-CN.lang.php
@@ -2,10 +2,10 @@
     /**
      * @file   modules/poll/lang/zh-CN.lang.php
      * @author zero <zero@nzeo.com>
-     * @brief  投票调查 (poll) 模块的基本语言包
+     * @brief  投票系统 (poll) 模块简体中文语言包
      **/
 
-    $lang->poll = "投票调查";
+    $lang->poll = "投票系统";
     $lang->poll_stop_date = "投票调查结束日期";
     $lang->poll_join_count = "投票者";
     $lang->poll_checkcount = "必选项目数";
diff --git a/modules/poll/poll.class.php b/modules/poll/poll.class.php
index c92de0974..b2b2586ab 100644
--- a/modules/poll/poll.class.php
+++ b/modules/poll/poll.class.php
@@ -13,8 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('poll', 'view', 'dispPollAdminList');
-            $oModuleController->insertActionForward('poll', 'view', 'dispPollAdminConfig');
 
             // 기본 스킨 설정
             $oModuleController = &getController('module');
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 4745392e7..c7f04c7ae 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -30,6 +30,12 @@
 
                 $poll_index = $tmp_arr[1];
 
+                if(Context::get('is_logged')) {
+                    $logged_info = Context::get('logged_info');
+                    // 세션에서 최고 관리자가 아니면 태그 제거
+                    if($logged_info->is_admin != 'Y') $val = htmlspecialchars($val);
+                }
+
                 if($tmp_arr[0]=='title') $tmp_args[$poll_index]->title = $val;
                 else if($tmp_arr[0]=='checkcount') $tmp_args[$poll_index]->checkcount = $val;
                 else if($tmp_arr[0]=='item') $tmp_args[$poll_index]->item[] = $val;
diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html
index f645f8e90..6cbd2b56c 100644
--- a/modules/poll/tpl/config.html
+++ b/modules/poll/tpl/config.html
@@ -4,15 +4,9 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config);" id="fo_poll">
 
-    <table cellspacing="0" class="adminTable">
-    <thead>
-        <tr>
-            <th scope="col" class="half_wide"><div>{$lang->skin}</div></th>
-            <th scope="col" class="half_wide"><div>{$lang->colorset}</div></th>
-        </tr>
-    </thead>
-    <tbody>
+    <table cellspacing="0" class="rowTable">
     <tr>
+        <th scope="col" class="half_wide"><div>{$lang->skin}</div></th>
         <td class="center">
             <select name="skin" onchange="doDisplaySkinColorset(this);return false;">
             <!--@foreach($skin_list as $key => $val)-->
@@ -20,6 +14,9 @@
             <!--@end-->
             </select>
         </td>
+    </tr>
+    <tr>
+        <th scope="col" class="half_wide"><div>{$lang->colorset}</div></th>
         <td class="center">
             <select name="colorset" id="poll_colorset">
             <!--@foreach($colorset_list as $key => $val)-->
@@ -29,9 +26,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td scope="row" colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </tbody>
     </table>
diff --git a/modules/poll/tpl/header.html b/modules/poll/tpl/header.html
index 21d9aecf3..943504cfe 100644
--- a/modules/poll/tpl/header.html
+++ b/modules/poll/tpl/header.html
@@ -1,4 +1,4 @@
-<h3>{$lang->poll} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->poll} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4">
     <ul class="localNavigation">
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html
index 7de2f5c50..5b44bd6bc 100644
--- a/modules/poll/tpl/poll_list.html
+++ b/modules/poll/tpl/poll_list.html
@@ -3,16 +3,12 @@
 
 <!--#include("./header.html")-->
 
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <em>{number_format($page)}/{number_format($total_page)}</em>
-</div>
-
-
 <form action="./" method="get" onsubmit="return procFilter(this, delete_checked)" id="fo_list">
 <input type="hidden" name="page" value="{$page}" />
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
@@ -33,17 +29,21 @@
         <td class="number center">{$val->checkcount}</td>
         <td class="number center">{$val->poll_count}</td>
         <td class="date nowrap center">{zdate($val->regdate,"Y-m-d H:i")}</td>
-        <td class="center nowrap view"><a href="{getUrl('','module','poll','act','dispPollAdminResult','poll_srl',$val->poll_srl,'poll_index_srl',$val->poll_index_srl)}" onclick="popopen(this.href); return false;">{$lang->cmd_view}</a></td>
+        <td class="center nowrap view"><a href="{getUrl('','module','poll','act','dispPollAdminResult','poll_srl',$val->poll_srl,'poll_index_srl',$val->poll_index_srl)}" onclick="popopen(this.href); return false;" title="{htmlspecialchars($lang->cmd_view)}">{$lang->cmd_view}</a></td>
     </tr>
     <!--@end-->
 </tbody>
 </table>
 
 <!-- 버튼 -->
-<div class="fr gap1">
-    <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
-    <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-    <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_poll}" /></span>
+<div class="clear">
+    <div class="fl">
+        <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
+        <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
+    </div>
+    <div class="fr">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_delete_checked_poll}" /></span>
+    </div>
 </div>
 
 </form>
diff --git a/modules/poll/tpl/result.html b/modules/poll/tpl/result.html
index 6009c45d2..e2bb66900 100644
--- a/modules/poll/tpl/result.html
+++ b/modules/poll/tpl/result.html
@@ -1,15 +1,8 @@
 <!--%import("css/poll.css")-->
-
-<div class="poll_box">
-
-    <div class="poll_title_box">
-        <div class="poll_join_count">
-            {$lang->poll_join_count} : {number_format($poll->poll_count)}
-        </div>
-        <div class="poll_stop_date">
-            {$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")}
-        </div>
-    </div>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")} {$lang->poll_join_count} : {number_format($poll->poll_count)}</h3>
+</div>
+<div class="popBody">
         <!--@foreach($poll->poll as $poll_srl_index => $val)-->
         <div class="poll_detail_box">
             <div class="title">{$val->title} ({$val->poll_count})</div>
@@ -29,7 +22,5 @@
             <!--@end-->
 
         </div>
-
         <!--@end-->
-
 </div>
diff --git a/modules/referer/conf/info.xml b/modules/referer/conf/info.xml
index 49e5ab841..935671c32 100644
--- a/modules/referer/conf/info.xml
+++ b/modules/referer/conf/info.xml
@@ -2,7 +2,7 @@
 <module version="0.2">
     <title xml:lang="ko">리퍼러 통계</title>
     <title xml:lang="jp">リファラー統計</title>
-    <title xml:lang="zh-CN">反向链接统计</title>
+    <title xml:lang="zh-CN">反向链接</title>
     <title xml:lang="en">Referer Statistics</title>
     <title xml:lang="ru">Статистика рефералов</title>
     <title xml:lang="zh-TW">反向連結統計</title>
@@ -14,7 +14,7 @@
     <description xml:lang="zh-TW">反向連結統計模組。</description>
     <version>0.15</version>
     <date>2007-11-29</date>
-    <category>accessory</category>
+    <category>statistics</category>
 
     <author email_address="haneul0318@gmail.com" link="http://seungyeop.kr">
         <name xml:lang="ko">haneul</name>
diff --git a/modules/referer/conf/module.xml b/modules/referer/conf/module.xml
index c5e8458ae..49457afbc 100644
--- a/modules/referer/conf/module.xml
+++ b/modules/referer/conf/module.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
-	<action name="procRefererExecute" type="controller" standalone="true" />
+        <action name="procRefererExecute" type="controller" standalone="true" />
         <action name="dispRefererAdminIndex" type="view" standalone="true" admin_index="true" />
         <action name="dispRefererAdminDeleteStat" type="view" standalone="true" />
-	<action name="procRefererAdminDeleteStat" type="controller" standalone="true" />
+        <action name="procRefererAdminDeleteStat" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/referer/lang/ko.lang.php b/modules/referer/lang/ko.lang.php
index db3690b07..27e64e755 100644
--- a/modules/referer/lang/ko.lang.php
+++ b/modules/referer/lang/ko.lang.php
@@ -5,6 +5,6 @@
      * @brief Korean language pack
      */
 
-    $lang->referer = "레퍼러";
-    $lang->ranking = "순위";
+    $lang->referer = '레퍼러';
+    $lang->ranking = '순위';
 ?>
diff --git a/modules/referer/referer.class.php b/modules/referer/referer.class.php
index 4a1bc03e1..f4e5c5659 100644
--- a/modules/referer/referer.class.php
+++ b/modules/referer/referer.class.php
@@ -11,13 +11,6 @@
          * @brief Install referer module 
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('referer', 'view', 'dispRefererAdminIndex');
-
-	    // 2008. 04. 06 To remove referer spams
-	    $oModuleController->insertActionForward('referer', 'view', 'dispRefererAdminDeleteStat');
-	
             return new Object();
         }
 
@@ -25,9 +18,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            if(!$oModuleModel->getActionForward('dispRefererAdminDeleteStat')) return true;
             return false;
         }
 
@@ -35,12 +25,6 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            if(!$oModuleModel->getActionForward('dispRefererAdminDeleteStat')) 
-		$oModuleController->insertActionForward('referer', 'view', 'dispRefererAdminDeleteStat');
-
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/referer/tpl/delete_stat.html b/modules/referer/tpl/delete_stat.html
index 59a2fd84e..ab18e065f 100644
--- a/modules/referer/tpl/delete_stat.html
+++ b/modules/referer/tpl/delete_stat.html
@@ -2,7 +2,7 @@
 <!--%import("js/referer_admin.js")-->
 <!--%import("css/referer.css")-->
 
-<h3>{$lang->referer} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->referer} <span class="gray">{$lang->cmd_management}</span></h3>
 <form action="./" method="get" onsubmit="return procFilter(this, delete_stat)">
 <input type="hidden" name="host" value="{$host}" />
 
diff --git a/modules/referer/tpl/referer_list.html b/modules/referer/tpl/referer_list.html
index b4be4f9ab..bd4269d35 100644
--- a/modules/referer/tpl/referer_list.html
+++ b/modules/referer/tpl/referer_list.html
@@ -1,49 +1,45 @@
 <!--%import("css/referer.css")-->
 
-<h3>{$lang->referer} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->referer} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<div class="adminLeftContent topGap">
-    <table cellspacing="0" class="adminTable ">
-    <caption>Total <strong>{number_format($total_count)}</strong>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}</caption>
-    <tbody>
-        <!--@foreach($referer_list as $no => $val)-->
-        <tr class="row{$cycle_idx}">
-            <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
-            <td class="tahoma">{$val->host}</td>
-            <td class="tahoma refererUrl"><a href="{$val->url}">{$val->url}</a></td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
+<table cellspacing="0" class="rowTable ">
+<caption>Total {number_format($total_count)} Page {number_format($page)}/{number_format($total_page)}</caption>
+<tbody>
+    <!--@foreach($referer_list as $no => $val)-->
+    <tr class="row{$cycle_idx}">
+        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
+        <td class="tahoma">{$val->host}</td>
+        <td class="tahoma refererUrl"><a href="{$val->url}">{$val->url}</a></td>
+    </tr>
+    <!--@end-->
+</tbody>
+</table>
 
-    <!-- 페이지 네비게이션 -->
-    <div class="pagination a1">
-        <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-        <!--@while($page_no = $page_navigation->getNextPage())-->
-            <!--@if($page == $page_no)-->
-                <strong>{$page_no}</strong> 
-            <!--@else-->
-                <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-            <!--@end-->
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
         <!--@end-->
-        <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-    </div>
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
 
-<div class="adminRightExtra topGap">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->ranking}</caption>
-    <tbody>
-	<!--{$rank = 1}-->
-        <!--@foreach($referer_status as $no => $val)-->
+<h4 class="xeAdmin">{$lang->ranking}</h4>
+<table cellspacing="0" class="rowTable">
+<tbody>
+<!--{$rank = 1}-->
+    <!--@foreach($referer_status as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$rank} </td>
-        <td>{$val->host}</td>
+        <td class="wide">{$val->host}</td>
         <td class="number center">{$val->count}</td>
-        <td class="delete center"><a href="{getUrl('act','dispRefererAdminDeleteStat','host',$val->host)}">{$lang->cmd_delete}</a></td>
-    </td>
-	<!--{$rank += 1} -->
-        <!--@end-->
-    </tbody>
+        <td class="delete center"><a href="{getUrl('act','dispRefererAdminDeleteStat','host',$val->host)}" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+    </tr>
+<!--{$rank += 1} -->
+    <!--@end-->
+</tbody>
     </table>
-</div>
diff --git a/modules/rss/conf/info.xml b/modules/rss/conf/info.xml
index 11b3fbe2b..85b818366 100644
--- a/modules/rss/conf/info.xml
+++ b/modules/rss/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">RSS</title>
-    <title xml:lang="zh-CN">RSS</title>
+    <title xml:lang="zh-CN">整站RSS</title>
     <title xml:lang="jp">RSS</title>
     <title xml:lang="en">RSS</title>
     <title xml:lang="es">RSS</title>
diff --git a/modules/rss/conf/module.xml b/modules/rss/conf/module.xml
index 14c53cb61..ad3b2c720 100644
--- a/modules/rss/conf/module.xml
+++ b/modules/rss/conf/module.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
+        <action name="dispRssAdminIndex" type="view" index="true" standalone="true" admin_index="true" />
         <action name="rss" type="view" standalone="true" />
+        <action name="procRssAdminInsertConfig" type="controller" standalone="true" />
         <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/rss/lang/en.lang.php b/modules/rss/lang/en.lang.php
index bb6326d96..53b2a13f4 100644
--- a/modules/rss/lang/en.lang.php
+++ b/modules/rss/lang/en.lang.php
@@ -1,25 +1,25 @@
-<?php
-    /**
-     * @file   modules/rss/lang/en.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  English language pack (basic)
-     **/
-
-    // general words
-    $lang->rss_disable = "Disable RSS";
-    $lang->rss_type = "RSS feed type";
-    $lang->open_rss = 'Open RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Open all',
-        'H' => 'Open summary',
-        'N' => 'Not open',
-    );
-
-    // for description
-    $lang->about_rss_disable = "If checked, RSS will be disabled.";
-    $lang->about_rss_type = "You can assign RSS feed type.";
-    $lang->about_open_rss = 'You can select RSS on the current module to be open to the public.\nNo matter the view permission of article , RSS will be open to the public by its option.';
-
-    // for error message
-    $lang->msg_rss_is_disabled = "RSS function is disabled.";
-?>
+<?php
+    /**
+     * @file   modules/rss/lang/en.lang.php
+     * @author zero <zero@nzeo.com>
+     * @brief  English language pack (basic)
+     **/
+
+    // general words
+    $lang->rss_disable = "Disable RSS";
+    $lang->rss_type = "RSS feed type";
+    $lang->open_rss = 'Open RSS';
+    $lang->open_rss_types = array(
+        'Y' => 'Open all',
+        'H' => 'Open summary',
+        'N' => 'Not open',
+    );
+
+    // for description
+    $lang->about_rss_disable = "If checked, RSS will be disabled.";
+    $lang->about_rss_type = "You can assign RSS feed type.";
+    $lang->about_open_rss = 'You can select RSS on the current module to be open to the public.\nNo matter the view permission of article , RSS will be open to the public by its option.';
+
+    // for error message
+    $lang->msg_rss_is_disabled = "RSS function is disabled.";
+?>
diff --git a/modules/rss/lang/ko.lang.php b/modules/rss/lang/ko.lang.php
index 756851aa6..1e345388e 100644
--- a/modules/rss/lang/ko.lang.php
+++ b/modules/rss/lang/ko.lang.php
@@ -6,20 +6,31 @@
      **/
 
     // 일반 단어들
-    $lang->rss_disable = "RSS 끄기";
-    $lang->rss_type = "출력할 RSS 형식";
-    $lang->open_rss = 'RSS 공개';
+    $lang->feed = '피드(Feed) 발행';
+    $lang->total_feed = '통합 피드';
+    $lang->rss_disable = '피드(Feed) 끄기';
+    $lang->feed_copyright = '저작권';
+    $lang->feed_document_count = '한 페이지당 글 수';
+    $lang->feed_image = '피드 이미지';
+    $lang->rss_type = '출력할 피드(Feed) 형식';
+    $lang->open_rss = '피드(Feed) 공개';
     $lang->open_rss_types = array(
         'Y' => '전문 공개 ',
         'H' => '요약 공개',
         'N' => '공개하지 않음',
     );
+    $lang->open_feed_to_total = '통합 피드에 포함';
 
     // 설명문
-    $lang->about_rss_disable = "체크하시면 RSS 출력을 하지 않습니다";
-    $lang->about_rss_type = "출력하실 RSS 형식을 지정하실 수 있습니다";
-    $lang->about_open_rss = '현재 모듈에 대한 RSS 공개를 선택하실 수 있습니다. 글 보는 권한과 상관없이 옵션에 따라 RSS가 공개됩니다';
+    $lang->about_rss_disable = '체크하시면 피드(Feed) 출력을 하지 않습니다.';
+    $lang->about_rss_type = '출력하실 피드(Feed) 형식을 지정하실 수 있습니다.';
+    $lang->about_open_rss = '현재 모듈에 대한 피드(Feed) 공개를 선택하실 수 있습니다. 글 보는 권한과 상관없이 옵션에 따라 RSS가 공개됩니다.';
+    $lang->about_feed_description = '발행될 피드에 대한 설명을 입력하실 수 있습니다. 설명을 입력하지 않으실 경우, 해당 모듈에 설정된 관리용 설명이 포함됩니다.';
+    $lang->about_feed_copyright = '발행될 피드의 글에 대한 저작권 정보입니다.';
+    $lang->about_part_feed_copyright = '입력하지 않으면 전체 피드 저작권 설정과 동일하게 적용됩니다.';
+    $lang->about_feed_document_count = '피드 한페이지에 공개되는 글의 수. (기본값 : 15)';
 
     // 에러 메세지들
-    $lang->msg_rss_is_disabled = "RSS 기능이 잠겨 있습니다";
+    $lang->msg_rss_is_disabled = '피드(Feed) 기능이 잠겨 있습니다';
+    $lang->msg_rss_invalid_image_format = '이미지의 형식이 잘못되었습니다.\nJPEG, GIF, PNG 파일만 지원합니다.';
 ?>
diff --git a/modules/rss/lang/zh-CN.lang.php b/modules/rss/lang/zh-CN.lang.php
index b1398dce9..040040d00 100644
--- a/modules/rss/lang/zh-CN.lang.php
+++ b/modules/rss/lang/zh-CN.lang.php
@@ -1,25 +1,36 @@
 <?php
     /**
      * @file   modules/rss/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  简体中文语言包 (只收录基本内容)
+     * @author zero <zero@nzeo.com>　翻译：guny
+     * @brief  RSS模块简体中文语言包
      **/
 
     // 一般单词
+    $lang->feed = 'RSS发布';
+    $lang->total_feed = '整站RSS';
     $lang->rss_disable = "关闭RSS";
+    $lang->feed_copyright = '版权';
+    $lang->feed_document_count = '每页主题数';
+    $lang->feed_image = 'RSS图片';
     $lang->rss_type = "将显示的RSS形式";
-    $lang->open_rss = '公开RSS';
+    $lang->open_rss = 'RSS公开';
     $lang->open_rss_types = array(
         'Y' => '公开全文',
         'H' => '公开摘要',
         'N' => '不公开',
     );
-
-    // 说明文
+    $lang->open_feed_to_total = '包含到整站RSS';
+    
+    // 说明
     $lang->about_rss_disable = "选此项不显示RSS。";
     $lang->about_rss_type = "可以指定要显示的RSS形式。";
-    $lang->about_open_rss = '可以选择对该模块的RSS公开程度。RSS公开将不受查看内容权限的限制，随公开RSS的选项公开RSS。';
+    $lang->about_open_rss = '可以指定RSS公开程度,RSS公开不受查看内容权限的限制。';
+    $lang->about_feed_description = '可以输入简单说明,留空输出该模块的说明。';
+    $lang->about_feed_copyright = 'RSS Feed版权信息。';
+    $lang->about_part_feed_copyright = '留空版权信息参照整站RSS的版权信息。';
+    $lang->about_feed_document_count = '每页要显示的主题数(默认: 15)。';
 
     // 错误提示
     $lang->msg_rss_is_disabled = "RSS功能处于锁定状态。";
+    $lang->msg_rss_invalid_image_format = '上传的文件格式错误！\n只允许上传JPEG, GIF, PNG图片文件。';
 ?>
diff --git a/modules/rss/lang/zh-TW.lang.php b/modules/rss/lang/zh-TW.lang.php
index 05363f05f..018cb9106 100644
--- a/modules/rss/lang/zh-TW.lang.php
+++ b/modules/rss/lang/zh-TW.lang.php
@@ -6,20 +6,31 @@
      **/
 
     // 一般語言
-    $lang->rss_disable = "關閉 RSS";
-    $lang->rss_type = "RSS形式";
-    $lang->open_rss = '公開 RSS';
+    $lang->feed = '發佈RSS Feed';
+    $lang->total_feed = '所有RSS';
+    $lang->rss_disable = "關閉RSS Feed";
+    $lang->feed_copyright = '版權';
+    $lang->feed_document_count = '每頁主題數';
+    $lang->feed_image = 'RSS圖片';
+    $lang->rss_type = "RSS Feed類型";
+    $lang->open_rss = '公開RSS Feed';
     $lang->open_rss_types = array(
-        'Y' => '公開全文',
+        'Y' => '全部公開',
         'H' => '公開摘要',
         'N' => '不公開',
     );
+    $lang->open_feed_to_total = '包含所有RSS Feed';
 
     // 說明
-    $lang->about_rss_disable = "不顯示 RSS。";
-    $lang->about_rss_type = "指定要顯示的 RSS形式。";
-    $lang->about_open_rss = '選擇該模組的 RSS公開程度。公開 RSS將不受檢視內容權限的限制，隨公開 RSS的選項公開 RSS。';
+    $lang->about_rss_disable = "不顯示RSS Feed。";
+    $lang->about_rss_type = "指定要顯示的RSS Feed類型。";
+    $lang->about_open_rss = '選擇該模組的RSS Feed公開程度。公開RSS Feed將不受檢視內容權限的限制，隨公開RSS Feed的選項公開RSS Feed。';
+    $lang->about_feed_description = '현재 모듈에 대한 간단한 설명을 쓸 수 있습니다. 설명을 입력하지 않으실 경우, 해당 모듈에 설정된 관리용 설명이 포함됩니다.';
+    $lang->about_feed_copyright = '현재 모듈에서 Feed로 발행되는 글에 대한 저작권 정보입니다.';
+    $lang->about_part_feed_copyright = '입력하지 않으면 전체 피드 저작권 설정과 동일하게 적용됩니다.';
+    $lang->about_feed_document_count = '每頁要顯示的主題數。(預設: 15)';
 
     // 錯誤提示
-    $lang->msg_rss_is_disabled = "RSS功能處於鎖定狀態。";
+    $lang->msg_rss_is_disabled = "RSS Feed功能未開啟。";
+    $lang->msg_rss_invalid_image_format = '錯誤的檔案格式，無法上傳。\n只允許上傳JPEG, GIF, PNG等檔案格式。';
 ?>
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index bdd4d98be..364710c06 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -16,6 +16,69 @@
         function init() {
         }
 
+        /**
+         * @brief RSS 전체피드 설정
+         **/
+        function procRssAdminInsertConfig() {
+            $oModuleModel = &getModel('module');
+            $total_config = $oModuleModel->getModuleConfig('rss');
+
+            $config_vars = Context::getRequestVars();
+
+            $config_vars->feed_document_count = (int)$config_vars->feed_document_count;
+
+            if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
+            if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+
+            if($config_vars->image || $config_vars->del_image) {
+                $image_obj = $config_vars->image;
+                $config_vars->image = $total_config->image;
+
+                // 삭제 요청에 대한 변수를 구함
+                if($config_vars->del_image == 'Y' || $image_obj) {
+                    FileHandler::removeFile($config_vars->image);
+                    $config_vars->image = '';
+                    $total_config->image = '';
+                }
+
+                // 정상적으로 업로드된 파일이 아니면 무시
+                if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name'])) {
+                    // 이미지 파일이 아니어도 무시 (swf는 패스~)
+                    $image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
+
+                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
+                    else {
+                        // 경로를 정해서 업로드
+                        $path = './files/attach/images/rss/';
+                        // 디렉토리 생성
+                        if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
+                        else{
+                            $filename = $path.$image_obj['name'];
+                            // 파일 이동
+                            if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
+                            else {
+                                $config_vars->image = $filename;
+                            }
+                        }
+                    }
+                }
+            }
+            if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+
+            $output = $this->setFeedConfig($config_vars);
+
+            if(!$alt_message) $alt_message = 'success_updated';
+
+            $alt_message = Context::getLang($alt_message);
+            Context::set('msg', $alt_message);
+
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('default_layout.html');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+
         /**
          * @brief RSS 모듈별 설정
          **/
@@ -26,8 +89,15 @@
             // 여러개의 모듈 일괄 설정일 경우
             if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
             else $module_srl = array($module_srl);
-           
-            $open_rss = Context::get('open_rss');
+            if(!is_array($module_srl)) $module_srl[0] = $module_srl;
+
+            $config_vars = Context::getRequestVars();
+
+            $open_rss = $config_vars->open_rss;
+            $open_total_feed = $config_vars->open_total_feed;
+            $feed_description = trim($config_vars->feed_description);
+            $feed_copyright = trim($config_vars->feed_copyright);
+
             if(!$module_srl || !$open_rss) return new Object(-1, 'msg_invalid_request');
 
             if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
@@ -36,19 +106,33 @@
             for($i=0;$i<count($module_srl);$i++) {
                 $srl = trim($module_srl[$i]);
                 if(!$srl) continue;
-                $output = $this->setRssModuleConfig($srl, $open_rss);
+                $output = $this->setRssModuleConfig($srl, $open_rss, $open_total_feed, $feed_description, $feed_copyright);
             }
 
             $this->setError(-1);
             $this->setMessage('success_updated');
         }
 
+
+        /**
+         * @brief RSS모듈의 전체 Feed 설정용 함수
+         **/
+        function setFeedConfig($config) {
+            $oModuleController = &getController('module');
+            $oModuleController->insertModuleConfig('rss',$config);
+            return new Object();
+        }
+
+
         /**
          * @brief RSS 모듈별 설정 함수
          **/
-        function setRssModuleConfig($module_srl, $open_rss) {
+        function setRssModuleConfig($module_srl, $open_rss, $open_total_feed = 'N', $feed_description = 'N', $feed_copyright = 'N') {
             $oModuleController = &getController('module');
             $config->open_rss = $open_rss;
+            $config->open_total_feed = $open_total_feed;
+            if($feed_description != 'N') { $config->feed_description = $feed_description; }
+            if($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
             $oModuleController->insertModulePartConfig('rss',$module_srl,$config);
             return new Object();
         }
diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php
new file mode 100644
index 000000000..4f4c68985
--- /dev/null
+++ b/modules/rss/rss.admin.view.php
@@ -0,0 +1,43 @@
+<?php
+    /**
+     * @class  rssAdminView
+     * @author misol (misol221@paran.com)
+     * @brief  rss ����� admin view class
+     **/
+
+    class rssAdminView extends rss {
+        /**
+         * @brief �ʱ�ȭ
+         **/
+        function init() {
+            // ���ø� ��� ���� 
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+
+        /**
+         * @brief ������ ������ �ʱ�ȭ��
+         **/
+        function dispRssAdminIndex() {
+            $oModuleModel = &getModel('module');
+            $rss_config = $oModuleModel->getModulePartConfigs('rss');
+            $total_config = $oModuleModel->getModuleConfig('rss');
+
+            if($rss_config) {
+                foreach($rss_config as $module_srl => $config) {
+                    if($config) {
+                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                        $feed_config[$module_srl]['mid'] = $module_info->mid;
+                        $feed_config[$module_srl]['open_feed'] = $config->open_rss;
+                        $feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
+                    }
+                }
+            }
+
+            Context::set('feed_config', $feed_config);
+            Context::set('total_config', $total_config);
+           	$this->setTemplatePath($this->module_path.'tpl');
+		        $this->setTemplateFile('rss_admin_index');
+        }
+    }
+?>
\ No newline at end of file
diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php
index a9d80267a..2230f8ac9 100644
--- a/modules/rss/rss.class.php
+++ b/modules/rss/rss.class.php
@@ -72,38 +72,5 @@
         function recompileCache() {
         }
 
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procRssAdminInsertModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php
index 5d27bafd7..b7c186dcd 100644
--- a/modules/rss/rss.controller.php
+++ b/modules/rss/rss.controller.php
@@ -4,7 +4,7 @@
      * @author zero (zero@nzeo.com)
      * @brief  rss module의 controller class
      *
-     * RSS 2.0형식으로 문서 출력
+     * Feed 로 문서 출력
      *
      **/
 
diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php
index 7aae17b61..b89e4e323 100644
--- a/modules/rss/rss.model.php
+++ b/modules/rss/rss.model.php
@@ -4,7 +4,7 @@
      * @author zero (zero@nzeo.com)
      * @brief  rss module의 model class
      *
-     * RSS 2.0형식으로 문서 출력
+     * Feed 문서 출력
      *
      **/
 
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index c7f99e5d5..3c1302205 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -17,11 +17,11 @@
         }
 
         /**
-         * @brief RSS 출력
+         * @brief 피드 출력
          **/
         function rss() {
             /**
-             * RSS 출력을 위한 변수 설정
+             * 피드 출력을 위한 변수 설정
              **/
             $mid = Context::get('mid'); ///< 대상 모듈 id, 없으면 전체로
             $start_date = (int)Context::get('start_date');
@@ -31,6 +31,8 @@
 
             $module_srls = array();
             $rss_config = array();
+            $total_config = '';
+            $total_config = $oModuleModel->getModuleConfig('rss');
 
             // 하나의 mid가 지정되어 있으면 그 mid에 대한 것만 추출
             if($mid) {
@@ -38,17 +40,19 @@
                 $config = $oModuleModel->getModulePartConfig('rss', $module_srl);
                 if($config->open_rss && $config->open_rss != 'N') {
                    $module_srls[] = $module_srl; 
-                   $rss_config[$module_srl] = $config->open_rss;
+                   $open_rss_config[$module_srl] = $config->open_rss;
                 }
 
             // mid 가 선택되어 있지 않으면 전체
             } else {
-                $rss_config = $oModuleModel->getModulePartConfigs('rss');
-                if($rss_config) {
-                    foreach($rss_config as $module_srl => $config) {
-                        if($config && $config->open_rss != 'N') {
-                            $module_srls[] = $module_srl;
-                            $rss_config[$module_srl] = $config->open_rss;
+                if($total_config->use_total_feed != 'N') {
+                    $rss_config = $oModuleModel->getModulePartConfigs('rss');
+                    if($rss_config) {
+                        foreach($rss_config as $module_srl => $config) {
+                            if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N') {
+                                $module_srls[] = $module_srl;
+                                $open_rss_config[$module_srl] = $config->open_rss;
+                            }
                         }
                     }
                 }
@@ -63,6 +67,7 @@
             $args->search_keyword = 'N';
             $args->page = (int)Context::get('page');
             $args->list_count = 15;
+            if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
             if(!$args->page || $args->page < 1) $args->page = 1;
             if($start_date || $start_date != 0) $args->start_date = $start_date;
             if($end_date || $end_date != 0) $args->end_date = $end_date;
@@ -77,18 +82,33 @@
             $output = $oDocumentModel->getDocumentList($args);
             $document_list = $output->data;
 
-            // rss 제목 및 정보등을 추출 Context::getBrowserTitle 
+            // 피드 제목 및 정보등을 추출 Context::getBrowserTitle 
             if($mid) {
                 $info->title = Context::getBrowserTitle();
                 $info->title = str_replace('\'', '&apos;',$info->title);
-                $info->description = $this->module_info->description;
+                if($config->feed_description) {
+                    $info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description));
+                }
+                else {
+                    $info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description));
+                }
                 $info->link = getUrl('','mid',$mid);
+                $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($feed_config->feed_copyright));
+                if(!$info->feed_copyright) {
+                    $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
+                }
             } else {
-                $site_module_info = Context::get('site_module_info');
-                $info->title = $site_module_info->browser_title;
+                if($total_config->feed_title) $info->title = $total_config->feed_title;
+                else {
+                    $site_module_info = Context::get('site_module_info');
+                    $info->title = $site_module_info->browser_title;
+                }
                 $info->title = str_replace('\'', '&apos;', htmlspecialchars($info->title));
+                $info->description = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_description));
                 $info->link = Context::getRequestUri();
+                $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
             }
+            if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image));
             $info->total_count = $output->total_count;
             $info->total_page = $output->total_page;
             switch (Context::get('format')) {
@@ -108,7 +128,8 @@
 
             // RSS 출력물에서 사용될 변수 세팅
             Context::set('info', $info);
-            Context::set('rss_config', $rss_config);
+            Context::set('feed_config', $config);
+            Context::set('open_rss_config', $open_rss_config);
             Context::set('document_list', $document_list);
 
             // 결과 출력을 XMLRPC로 강제 지정
diff --git a/modules/rss/tpl/atom10.html b/modules/rss/tpl/atom10.html
index 9d7146b22..f7907fec0 100644
--- a/modules/rss/tpl/atom10.html
+++ b/modules/rss/tpl/atom10.html
@@ -9,20 +9,21 @@
    <id>{$info->id}</id>
    <link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
    <link rel="self" type="application/atom+xml" href="{$info->id}"/>
-   <generator uri="http://www.zeroboard.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
+   <generator uri="http://www.xpressengine.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
 <!--@foreach($document_list as $oDocument)-->   <entry>
       <title>{str_replace('\'', '&apos;',$oDocument->getTitle())}</title>
       <id>{$oDocument->getPermanentUrl()}</id>
       <published>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</published>
       <updated>{zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')}</updated>
-      <link href="{$oDocument->getPermanentUrl()}"/>
+      <link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
+      <link rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
       <author>
          <name>{str_replace('\'', '&apos;',$oDocument->getNickName())}</name>
          <!--@if($oDocument->isExistsHomepage())-->
          <uri>{$oDocument->getHomepageUrl()}</uri>
          <!--@end-->
       </author>
-      <!--@if($rss_config[$oDocument->get('module_srl')]=='Y')-->
+      <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
       <content type="html">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true)))}</content>
       <!--@else-->
       <summary type="text">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100)))}</summary>
@@ -30,6 +31,7 @@
       <!--@foreach($oDocument->get('tag_list') as $tag)-->
       <category term="{str_replace('\'', '&apos;', htmlspecialchars($tag))}"/>
       <!--@end-->
+      
    </entry>
 <!--@end-->
 </feed> 
diff --git a/modules/rss/tpl/filter/insert_rss_config.xml b/modules/rss/tpl/filter/insert_rss_config.xml
new file mode 100644
index 000000000..b48a6dcc9
--- /dev/null
+++ b/modules/rss/tpl/filter/insert_rss_config.xml
@@ -0,0 +1,7 @@
+<filter name="insert_rss_config" module="rss" act="procRssAdminInsertConfig" confirm_msg_code="confirm_submit">
+    <form />
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/rss/tpl/rss20.html b/modules/rss/tpl/rss20.html
index 7db88f52b..06ddaf025 100644
--- a/modules/rss/tpl/rss20.html
+++ b/modules/rss/tpl/rss20.html
@@ -4,10 +4,21 @@
     <channel>
         <title>{$info->title}</title>
         <link>{$info->link}</link>
-        <description>{str_replace('\'', '&apos;', htmlspecialchars($info->description))}</description>
+        <description>{$info->description}</description>
         <language>{$info->language}</language>
         <pubDate>{$info->date}</pubDate>
+        <lastBuildDate>{$info->date}</lastBuildDate>
         <generator>XpressEngine {__ZBXE_VERSION__}</generator>
+        <!--@if($info->feed_copyright)-->
+        <copyright>{$info->feed_copyright}</copyright>
+        <!--@end-->
+        <!--@if($info->image)-->
+        <image>
+            <url>{$info->image}</url>
+            <title>{$info->title}</title>
+            <link>{$info->link}</link>
+        </image>
+        <!--@end-->
         <!--@foreach($document_list as $oDocument)-->
         <item>
             <title>{str_replace('\'', '&apos;',$oDocument->getTitle())}</title>
@@ -17,7 +28,7 @@
             <!--@if($oDocument->allowComment()) -->
             <comments>{$oDocument->getPermanentUrl()}#comment</comments>
             <!--@end-->
-            <!--@if($rss_config[$oDocument->get('module_srl')]=='Y')-->
+            <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
             <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true)))}</description>
             <!--@else-->
             <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100)))}</description>
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
new file mode 100644
index 000000000..326469b49
--- /dev/null
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -0,0 +1,82 @@
+<h3 class="xeAdmin">{$lang->total_feed} <span class="gray">{$lang->cmd_management}</span></h3>
+
+<!--%import("filter/insert_rss_config.xml")-->
+<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
+    <input type="hidden" name="module" value="rss" />
+    <input type="hidden" name="act" value="procRssAdminInsertConfig" />
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th scope="row"><div>{$lang->total_feed}</div></th>
+        <td class="wide">
+            <select name="use_total_feed" class="w200">
+                <option value="Y" <!--@if(!$total_config->use_total_feed || $total_config->use_total_feed == 'Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
+                <option value="N" <!--@if($total_config->use_total_feed == 'N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->title}</div></th>
+        <td class="wide">
+            <input type="text" class="inputTypeText" name="feed_title" value="{htmlspecialchars($total_config->feed_title)}" />
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->description}</div></th>
+        <td class="wide">
+            <textarea name="feed_description" class="inputTypeTextArea">{$total_config->feed_description}</textarea>
+        </td>
+    </tr>
+    <tr>
+    <th scope="row"><div>{$lang->feed_image}</div></th>
+        <td class="wide">
+            <!--@if($total_config->image)-->
+            <div>
+                <img src="../../../{$total_config->image}" alt="image" /><br />
+                <input type="checkbox" name="del_image" value="Y" id="del_image" class="checkbox" />
+                <label for="del_image">{$lang->cmd_delete}</label>
+            </div>
+            <!--@end-->
+            <input type="file" name="image" value="" />
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->feed_copyright}</div></th>
+        <td class="wide">
+            <input type="text" class="inputTypeText" name="feed_copyright" value="{htmlspecialchars($total_config->feed_copyright)}" />
+            <p>{$lang->about_feed_copyright}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->feed_document_count}</div></th>
+        <td class="wide">
+            <input type="text" class="inputTypeText" name="feed_document_count" value="{$total_config->feed_document_count}" />
+            <p>{$lang->about_feed_document_count}</p>
+        </td>
+    </tr>
+    <tr class="row2">
+        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
+    </tr>
+    </table>
+</form>
+
+<h3 class="xeAdmin">{$lang->feed} <span class="gray">{$lang->cmd_management}</span></h3>
+<table cellspacing="0" class="crossTable">
+    <thead>
+	      <tr>
+		        <th scope="col">{$lang->mid}</td>
+		        <th scope="col">{$lang->open_rss}</td>
+		        <th scope="col">{$lang->open_feed_to_total}</td>
+	      </tr>
+	  </thead>
+	  <tbody>
+	  <!--@foreach($feed_config as $config)-->
+	      <tr>
+		        <th>{$config['mid']}</th>
+		        <td>{$lang->open_rss_types[$config['open_feed']]}</td>
+		        <td><!--@if($config['open_total_feed'] == 'T_N')-->{$lang->notuse}<!--@else-->{$lang->use}<!--@end--></td>
+	      </tr>
+    <!--@end-->
+    </tbody>
+</table>
+
+<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
\ No newline at end of file
diff --git a/modules/rss/tpl/rss_module_config.html b/modules/rss/tpl/rss_module_config.html
index 0d634a014..e5bca1891 100644
--- a/modules/rss/tpl/rss_module_config.html
+++ b/modules/rss/tpl/rss_module_config.html
@@ -3,21 +3,44 @@
 <form action="./" method="post" onsubmit="return procFilter(this, insert_rss_module_config)">
 <input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->open_rss}</caption>    
+    <h4 class="xeAdmin">{$lang->open_rss}</h4>
+    <p class="summary">{$lang->about_open_rss}</p>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->open_rss}</div></th>
         <td class="wide">
-            <select name="open_rss" class="w400">
+            <select name="open_rss" class="w200">
                 <!--@foreach($lang->open_rss_types as $key=>$val)-->
                 <option value="{$key}" <!--@if(!$rss_config->open_rss && $key=='N')-->selected="selected"<!--@elseif($rss_config->open_rss==$key)-->selected="selected"<!--@end-->>{$val}</option>
                 <!--@end-->
             </select>
-            <p>{$lang->about_open_rss}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->open_feed_to_total}</div></th>
+        <td class="wide">
+            <select name="open_total_feed" class="w200">
+                <option value="N" <!--@if(!$rss_config->open_total_feed || $rss_config->open_total_feed == 'N')-->selected="selected"<!--@end-->>{$lang->use}</option>
+                <option value="T_N" <!--@if($rss_config->open_total_feed == 'T_N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->description}</div></th>
+        <td class="wide">
+            <textarea name="feed_description" class="inputTypeTextArea">{$rss_config->feed_description}</textarea>
+            <p>{$lang->about_feed_description}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->feed_copyright}</div></th>
+        <td class="wide">
+            <input type="text" class="inputTypeText" name="feed_copyright" value="{htmlspecialchars($rss_config->feed_copyright)}" />
+            <p>{$lang->about_feed_copyright}<br />{$lang->about_part_feed_copyright}</p>
         </td>
     </tr>
     <tr class="row2">
-        <td class="right" colspan="2"><span class="button"><input type="submit" value="{$lang->cmd_save}"/></span></td>
+        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
     </tr>
     </table>
 
diff --git a/modules/rss/tpl/top_refresh.html b/modules/rss/tpl/top_refresh.html
new file mode 100644
index 000000000..b0c389886
--- /dev/null
+++ b/modules/rss/tpl/top_refresh.html
@@ -0,0 +1,4 @@
+<script type="text/javascript">//<![CDATA[
+    alert('{$msg}');
+    top.location.href = top.location.href;
+//]]></script>
diff --git a/modules/rss/tpl/xe_rss.html b/modules/rss/tpl/xe_rss.html
index f613fa8e5..33f33c831 100644
--- a/modules/rss/tpl/xe_rss.html
+++ b/modules/rss/tpl/xe_rss.html
@@ -14,7 +14,7 @@
             <title>{str_replace('\'', '&apos;',$oDocument->getTitle())}</title>
             <author>{str_replace('\'', '&apos;',$oDocument->getNickName())}</author>
             <link>{$oDocument->getPermanentUrl()}</link>
-            <!--@if($rss_config[$oDocument->get('module_srl')]=='Y')-->
+            <!--@if($open_rss_config[$oDocument->get('module_srl')]->open_rss=='Y')-->
             <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true)))}</description>
             <!--@else-->
             <description>{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100)))}</description>
diff --git a/modules/session/conf/info.xml b/modules/session/conf/info.xml
index 550eee4b9..3121fadf6 100644
--- a/modules/session/conf/info.xml
+++ b/modules/session/conf/info.xml
@@ -27,7 +27,7 @@
     </description>
     <version>0.1</version>
     <date>2008-06-18</date>
-    <category>base</category>
+    <category>system</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/session/lang/ko.lang.php b/modules/session/lang/ko.lang.php
index f125d39b1..eb02d89eb 100644
--- a/modules/session/lang/ko.lang.php
+++ b/modules/session/lang/ko.lang.php
@@ -6,7 +6,7 @@
      **/
 
     $lang->session = '세션';
-    $lang->about_session = "세션 관리를 하는 모듈입니다\n틈틈히 세션 정리를 하시면 사이트 운영시 보다 좋은 효과를 낼 수 있습니다.";
+    $lang->about_session = "세션 관리를 하는 모듈입니다\n틈틈이 세션 정리를 하시면 사이트 운영시 보다 좋은 효과를 낼 수 있습니다.";
 
     $lang->cmd_clear_session = '세션 정리';
     $lang->session_cleared = '쓸모 없는 세션 정보가 정리되었습니다';
diff --git a/modules/session/lang/zh-CN.lang.php b/modules/session/lang/zh-CN.lang.php
index 20b0045a1..99c639ea3 100644
--- a/modules/session/lang/zh-CN.lang.php
+++ b/modules/session/lang/zh-CN.lang.php
@@ -1,8 +1,8 @@
 <?php
     /**
      * @file   modules/session/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  中文语言包
+     * @author zero <zero@nzeo.com>　翻译：guny
+     * @brief  会话模块简体中文语言包
      **/
 
     $lang->session = '会话';
diff --git a/modules/session/queries/getLoggedMembers.xml b/modules/session/queries/getLoggedMembers.xml
index da3a72f24..620a0823d 100644
--- a/modules/session/queries/getLoggedMembers.xml
+++ b/modules/session/queries/getLoggedMembers.xml
@@ -1,11 +1,14 @@
 <query id="getLoggedMembers" action="select">
     <tables>
         <table name="session" />
+        <table name="modules" />
     </tables>
     <columns>
         <column name="member_srl" />
     </columns>
     <conditions>
+        <condition operation="equal" column="session.cur_mid" default="modules.mid" pipe="and" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" default="0" pipe="and" />
         <condition operation="more" column="member_srl" default="1" pipe="and" />
         <condition operation="more" column="last_update" var="last_update" notnull="notnull" pipe="and" />
         <condition operation="equal" column="cur_mid" var="mid" pipe="and" />
diff --git a/modules/session/session.class.php b/modules/session/session.class.php
index 5296bfd8a..30f4d29a0 100644
--- a/modules/session/session.class.php
+++ b/modules/session/session.class.php
@@ -21,10 +21,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('session', 'view', 'dispSessionAdminIndex');
-
             $oDB = &DB::getInstance();
             $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
 
@@ -36,16 +32,9 @@
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            if(!$oModuleModel->getActionForward('dispSessionAdminIndex')) return true;
-
             if(!$oDB->isTableExists('session')) return true;
-
             if(!$oDB->isColumnExists("session","cur_mid")) return true;
-
             if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
-
             return false;
         }
 
@@ -55,20 +44,12 @@
         function moduleUpdate() {
             $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
             
             if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
 
-            if(!$oModuleModel->getActionForward('dispSessionAdminIndex')) 
-                $oModuleController->insertActionForward('session', 'view', 'dispSessionAdminIndex');
-
-            if(!$oDB->isColumnExists("session","cur_mid")) {
-                $oDB->addColumn('session',"cur_mid","varchar",128);
-            }
-
-            if(!$oDB->isIndexExists("session","idx_session_update_mid")) 
-                $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+            if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
 
+            if(!$oDB->isIndexExists("session","idx_session_update_mid")) $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
         }
 
         /**
diff --git a/modules/session/session.model.php b/modules/session/session.model.php
index df303ae3d..9f5c663c4 100644
--- a/modules/session/session.model.php
+++ b/modules/session/session.model.php
@@ -49,6 +49,10 @@
          * mid : 특정 mid에 속한 사용자
          **/
         function getLoggedMembers($args) {
+            if(!$args->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            }
             if(!$args->list_count) $args->list_count = 20;
             if(!$args->page) $args->page = 1;
             if(!$args->period_time) $args->period_time = 3;
diff --git a/modules/session/tpl/index.html b/modules/session/tpl/index.html
index 24b4c7179..631d1f8b5 100644
--- a/modules/session/tpl/index.html
+++ b/modules/session/tpl/index.html
@@ -1,8 +1,8 @@
 <!--%import("js/session.js",optimized=false)-->
 
-<h3>{$lang->session} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->session} <span class="gray">{$lang->cmd_management}</span></h3>
 <div class="infoText">{nl2br($lang->about_session)}</div>
 
 <form action="./" method="post" onsubmit="return false;">
-<div class="fr"><span class="button"><input type="button" value="{$lang->cmd_clear_session}" onclick="doClearSession(); return false; "/></span></div>
+<div class="fr"><span class="button black strong"><input type="button" value="{$lang->cmd_clear_session}" onclick="doClearSession(); return false; "/></span></div>
 </form>
diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml
index e16baa44e..b7988e2a2 100644
--- a/modules/spamfilter/conf/module.xml
+++ b/modules/spamfilter/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispSpamfilterAdminConfig" type="view" admin_index="true" standalone="true" />
         <action name="dispSpamfilterAdminDeniedIPList" type="view" standalone="true" />
diff --git a/modules/spamfilter/lang/en.lang.php b/modules/spamfilter/lang/en.lang.php
index 2c7ad559a..8e688209a 100644
--- a/modules/spamfilter/lang/en.lang.php
+++ b/modules/spamfilter/lang/en.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "No. of posting limitation";
     $lang->check_trackback = "Check trackbacks";
     $lang->word = "Word";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // for description word
     $lang->about_interval = "All articles attempted for posting within the assigned time will be blocked.";
@@ -27,6 +29,6 @@
     // to post a message
     $lang->msg_alert_limited_by_config = 'Posting an article within %s second is not allowed.\n If you keep trying, your IP address may be blacklisted.';
     $lang->msg_alert_denied_word = 'The word "%s" is not allowed to be posted.';
-    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator.'; 
+    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator.';
     $lang->msg_alert_trackback_denied = 'Only one trackback per an article is allowed.';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/es.lang.php b/modules/spamfilter/lang/es.lang.php
index e5e2bde9a..c5c9b8f43 100644
--- a/modules/spamfilter/lang/es.lang.php
+++ b/modules/spamfilter/lang/es.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "Número limite";
     $lang->check_trackback = "Chequear trackback";
     $lang->word = "Palabra";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // para las palabras de descripcion
     $lang->about_interval = "Se bloquea el posteo de todo tipo de documentos durante el tiempo asignado.";
@@ -27,6 +29,6 @@
     // para registrar un documento
     $lang->msg_alert_limited_by_config = 'Se prohibe poestear antes de %s segundos.\n Si Usted trata varias veces, su dirección IP puede ser agregada en la lista negra.';
     $lang->msg_alert_denied_word = 'La palabra "%s" no esta permitido para ser posteado.';
-    $lang->msg_alert_registered_denied_ip = 'Su dirección IP fue agregaa en la lista negra,\n por lo cual Usted puede tener limitaciones en su uso normal de este sitio.\n Si Usted tiene alguna inquietud sobre el tema, por favor contactese con el administrador del sitio.'; 
+    $lang->msg_alert_registered_denied_ip = 'Su dirección IP fue agregaa en la lista negra,\n por lo cual Usted puede tener limitaciones en su uso normal de este sitio.\n Si Usted tiene alguna inquietud sobre el tema, por favor contactese con el administrador del sitio.';
     $lang->msg_alert_trackback_denied = 'Sólo un trackback por documento está permitido.';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/fr.lang.php b/modules/spamfilter/lang/fr.lang.php
index 7fdf47549..4faa7f00a 100644
--- a/modules/spamfilter/lang/fr.lang.php
+++ b/modules/spamfilter/lang/fr.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "Limite d'affichage";
     $lang->check_trackback = "Vérifier les Rétroliens";
     $lang->word = "Mot";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // descriptions
     $lang->about_interval = "L'affichage sera bloqué pendant le temps designé.";
@@ -27,6 +29,6 @@
     // messages
     $lang->msg_alert_limited_by_config = 'L\'Affichage d\'un article en %s secondes n\'est pas permis.\n Si vous essayez encore, votre adresse IP peut être enrégistré dans la liste noire.';
     $lang->msg_alert_denied_word = 'Le mot "%s" n\'est pas permis d\'afficher.';
-    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator. Votre adresse IP est dans la liste noire, \nvous pouvez donc avoir limitation d\'activité dans ce site. Si vous avez quelque question sur ce fait, contactez l\'administrateur du site, S.V.P.'; 
+    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator. Votre adresse IP est dans la liste noire, \nvous pouvez donc avoir limitation d\'activité dans ce site. Si vous avez quelque question sur ce fait, contactez l\'administrateur du site, S.V.P.';
     $lang->msg_alert_trackback_denied = 'Un seul rétrolien par article est permis.';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/jp.lang.php b/modules/spamfilter/lang/jp.lang.php
index af2be1356..53945ad8e 100644
--- a/modules/spamfilter/lang/jp.lang.php
+++ b/modules/spamfilter/lang/jp.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "制限数";
     $lang->check_trackback = "トラックバック検査";
     $lang->word = "ワード";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // 説明文
     $lang->about_interval = "指定された時間内の書き込みが行えないようにします。";
@@ -27,6 +29,6 @@
     // メッセージ出力用
     $lang->msg_alert_limited_by_config = '%s秒以内の書き込みは禁止されます。続けて行うとスパムとして認識され、禁止ＩＰに登録されます。';
     $lang->msg_alert_denied_word = '"%s"は使用が禁止されたワードです。';
-    $lang->msg_alert_registered_denied_ip = '禁止IPに登録され、サイト内で正常な活動が制限されています。管理者にお問い合わせください。'; 
+    $lang->msg_alert_registered_denied_ip = '禁止IPに登録され、サイト内で正常な活動が制限されています。管理者にお問い合わせください。';
     $lang->msg_alert_trackback_denied = '一つの書き込みには、１つのトラックバックしか受け取れません。';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/ko.lang.php b/modules/spamfilter/lang/ko.lang.php
index 8b3260037..a19962588 100644
--- a/modules/spamfilter/lang/ko.lang.php
+++ b/modules/spamfilter/lang/ko.lang.php
@@ -6,27 +6,29 @@
      **/
 
     // action 관련
-    $lang->cmd_denied_ip = "금지IP 목록";
-    $lang->cmd_denied_word = "금지단어 목록";
+    $lang->cmd_denied_ip = '금지IP 목록';
+    $lang->cmd_denied_word = '금지단어 목록';
 
     // 일반 단어
-    $lang->spamfilter = "스팸필터";
-    $lang->denied_ip = "금지 IP";
-    $lang->interval = "스팸 처리 간격";
-    $lang->limit_count = "제한수";
-    $lang->check_trackback = "트랙백 검사";
-    $lang->word = "단어";
+    $lang->spamfilter = '스팸필터';
+    $lang->denied_ip = '금지 IP';
+    $lang->interval = '스팸 처리 간격';
+    $lang->limit_count = '제한수';
+    $lang->check_trackback = '트랙백 검사';
+    $lang->word = '단어';
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // 설명문
-    $lang->about_interval = "지정된 시간내에 글을 등록하지 못하게 합니다";
-    $lang->about_limit_count = "지정된 시간내에 제한수를 넘겨서 글 작성을 시도하면 스팸으로 인식, IP를 금지 시킵니다";
-    $lang->about_denied_ip = "127.0.0.* 와 같이 * 로 정해진 패턴의 IP 대역을 모두 금지 시킬 수 있습니다";
-    $lang->about_denied_word = "금지 단어로 등록되면 해당 단어가 있는 글은 등록을 금지 시킬 수 있습니다";
-    $lang->about_check_trackback = "한 글에 한 IP에만 트랙백을 허용할 수 있습니다";
+    $lang->about_interval = '지정된 시간내에 글을 등록하지 못하게 합니다';
+    $lang->about_limit_count = '지정된 시간내에 제한수를 넘겨서 글 작성을 시도하면 스팸으로 인식, IP를 금지 시킵니다';
+    $lang->about_denied_ip = '127.0.0.* 와 같이 * 로 정해진 패턴의 IP 대역을 모두 금지 시킬 수 있습니다';
+    $lang->about_denied_word = '금지 단어로 등록되면 해당 단어가 있는 글은 등록을 금지 시킬 수 있습니다';
+    $lang->about_check_trackback = '한 글에 한 IP에만 트랙백을 허용할 수 있습니다';
 
     // 메세지 출력용
     $lang->msg_alert_limited_by_config = '%s 초 이내에 글 작성은 금지 됩니다. 계속 시도하시면 금지 IP에 등록되실 수 있습니다';
     $lang->msg_alert_denied_word = '"%s"는 사용 금지된 단어입니다';
-    $lang->msg_alert_registered_denied_ip = '금지 IP에 등록되셔서 정상적인 활동에 제한을 받게 되셨습니다. 문의는 사이트 관리자에게 해주시기 바랍니다'; 
+    $lang->msg_alert_registered_denied_ip = '금지 IP에 등록되셔서 정상적인 활동에 제한을 받게 되셨습니다. 문의는 사이트 관리자에게 해주시기 바랍니다';
     $lang->msg_alert_trackback_denied = '한 글에는 하나의 트랙백만 허용이 됩니다';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/ru.lang.php b/modules/spamfilter/lang/ru.lang.php
index 99678c421..8b90dcff6 100644
--- a/modules/spamfilter/lang/ru.lang.php
+++ b/modules/spamfilter/lang/ru.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "Лимит публикаций";
     $lang->check_trackback = "Проверять трекбек";
     $lang->word = "Слово";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // описание
     $lang->about_interval = "Все попытки разместить статьи в установленное время будут заблокированы.";
@@ -27,6 +29,6 @@
     // для отправки сообщений
     $lang->msg_alert_limited_by_config = 'Размещение статьи с интервалом в %s секунд не разрешено.\n Если Вы будете многократно пытаться это сделать, Ваш IP-адрес может быть добавлен в черный список.';
     $lang->msg_alert_denied_word = 'Слово "%s" запрещено для публикации.';
-    $lang->msg_alert_registered_denied_ip = 'Ваш IP-адрес занесен в черный список,\n поэтому Вы можете иметь ограничения на полноценное использование этого сайта.\n Если у Вас есть вопросы насчет этого, пожалуйста, сообщите администратору сайта.'; 
+    $lang->msg_alert_registered_denied_ip = 'Ваш IP-адрес занесен в черный список,\n поэтому Вы можете иметь ограничения на полноценное использование этого сайта.\n Если у Вас есть вопросы насчет этого, пожалуйста, сообщите администратору сайта.';
     $lang->msg_alert_trackback_denied = 'Разрешен только один трекбек на статью.';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/zh-CN.lang.php b/modules/spamfilter/lang/zh-CN.lang.php
index b9138a59b..7d64fc102 100644
--- a/modules/spamfilter/lang/zh-CN.lang.php
+++ b/modules/spamfilter/lang/zh-CN.lang.php
@@ -1,8 +1,8 @@
 <?php
     /**
      * @file   modules/spamfilter/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  简体中文语言包（只收录基本内容）
+     * @author zero <zero@nzeo.com>　翻译：guny
+     * @brief  垃圾过滤简体中文语言包
      **/
 
     // action 相关
@@ -16,6 +16,8 @@
     $lang->limit_count = "限制数";
     $lang->check_trackback = "检查引用";
     $lang->word = "单词";
+    $lang->hit = '点击';
+    $lang->latest_hit = '最后点击';
 
     // 说明文
     $lang->about_interval = "指定的时间内禁止发表新主题。";
@@ -29,4 +31,4 @@
     $lang->msg_alert_denied_word = '"%s"是敏感词！';
     $lang->msg_alert_registered_denied_ip = '您的IP已被禁止，详情请联系网站管理员。';
     $lang->msg_alert_trackback_denied = '一个主题只允许一个引用。';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/zh-TW.lang.php b/modules/spamfilter/lang/zh-TW.lang.php
index cb3c14361..627949f6b 100644
--- a/modules/spamfilter/lang/zh-TW.lang.php
+++ b/modules/spamfilter/lang/zh-TW.lang.php
@@ -16,6 +16,8 @@
     $lang->limit_count = "限制數";
     $lang->check_trackback = "檢查引用";
     $lang->word = "單字";
+    $lang->hit = '히트';
+    $lang->latest_hit = '최근 히트';
 
     // 說明
     $lang->about_interval = "指定的時間內禁止發表新主題。";
@@ -29,4 +31,4 @@
     $lang->msg_alert_denied_word = '"%s"是敏感詞！';
     $lang->msg_alert_registered_denied_ip = '您的IP已被禁止，詳情請聯繫網站管理員。';
     $lang->msg_alert_trackback_denied = '一個主題只允許一個引用。';
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/queries/updateDeniedWordHit.xml b/modules/spamfilter/queries/updateDeniedWordHit.xml
new file mode 100644
index 000000000..7931c9bec
--- /dev/null
+++ b/modules/spamfilter/queries/updateDeniedWordHit.xml
@@ -0,0 +1,14 @@
+<query id="updateDeniedWordHit" action="update">
+    <tables>
+        <table name="spamfilter_denied_word" />
+    </tables>
+
+    <columns>
+        <column name="hit" default="plus(1)" />
+        <column name="latest_hit" default="curdate()" />
+    </columns>
+
+    <conditions>
+        <condition operation="equal" column="word" var="word" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/spamfilter/schemas/spamfilter_denied_word.xml b/modules/spamfilter/schemas/spamfilter_denied_word.xml
index da9b8d9a3..7ecb6a5be 100644
--- a/modules/spamfilter/schemas/spamfilter_denied_word.xml
+++ b/modules/spamfilter/schemas/spamfilter_denied_word.xml
@@ -1,4 +1,6 @@
 <table name="spamfilter_denied_word">
     <column name="word" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+    <column name="hit" type="number" notnull="notnull" default="0" index="idx_hit" />
+    <column name="latest_hit" type="date" index="idx_latest_hit" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php
index 5b47fc27b..c82be8e55 100644
--- a/modules/spamfilter/spamfilter.class.php
+++ b/modules/spamfilter/spamfilter.class.php
@@ -13,9 +13,6 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminConfig');
-            $oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminDeniedIPList');
-            $oModuleController->insertActionForward('spamfilter', 'view', 'dispSpamfilterAdminDeniedWordList');
 
             // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
             $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
@@ -35,6 +32,7 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
 
             // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
@@ -45,6 +43,13 @@
             //2008-12-17 글 수정시 스펨필터 추가
             if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
             if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+
+            /**
+             * 히트 카운트 필드(hit) 추가
+             **/
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
+
             return false;
         }
 
@@ -52,15 +57,16 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
+            $oDB = &DB::getInstance();
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
 
             // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) 
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
                 $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) 
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
                 $oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) 
+            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
                 $oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
 
             //2008-12-17 글 수정시 스펨필터 추가
@@ -71,6 +77,19 @@
             if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')){
                 $oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
             }
+
+            /**
+             * 히트 카운트 필드(hit) 추가
+             **/
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) {
+                $oDB->addColumn('spamfilter_denied_word','hit','number',12,0,true);
+                $oDB->addIndex('spamfilter_denied_word','idx_hit', 'hit');
+            }
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) {
+                $oDB->addColumn('spamfilter_denied_word','latest_hit','date');
+                $oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit');
+            }
+
             return new Object(0,'success_updated');
         }
 
@@ -80,4 +99,4 @@
         function recompileCache() {
         }
     }
-?>
+?>
\ No newline at end of file
diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index 49db60dab..70648d6ee 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -61,7 +61,7 @@
          * @brief 등록된 금지 Word 의 목록을 return
          **/
         function getDeniedWordList() {
-            $args->sort_index = "regdate";
+            $args->sort_index = "hit";
             $output = executeQuery('spamfilter.getDeniedWordList', $args);
             if(!$output->data) return;
             if(!is_array($output->data)) return array($output->data);
@@ -78,7 +78,11 @@
             $count = count($word_list);
             for($i=0;$i<$count;$i++) {
                 $word = $word_list[$i]->word;
-                if(preg_match('/'.preg_quote($word,'/').'/is', $text)) return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
+                if(preg_match('/'.preg_quote($word,'/').'/is', $text)) {
+                    $args->word = $word;
+                    $output = executeQuery('spamfilter.updateDeniedWordHit', $args);
+                    return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
+                }
             }
 
             return new Object();
diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html
index c38c311e6..7df4ea4c2 100644
--- a/modules/spamfilter/tpl/denied_ip_list.html
+++ b/modules/spamfilter/tpl/denied_ip_list.html
@@ -3,11 +3,6 @@
 
 <!--#include("header.html")-->
 
-<!-- 스패머 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{count($ip_list)}</em>
-</div>
-
 <!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
 <form id="fo_denied_ip" action="./" method="get">
 <input type="hidden" name="ipaddress" value="" />
@@ -15,7 +10,7 @@
 
 <!-- 수동 추가 -->
 <form action="./" method="get" onsubmit="return procFilter(this, insert_denied_ip)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->denied_ip}</div></th>
         <td>
@@ -24,19 +19,20 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total{count($ip_list)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="wide"><div>{$lang->ipaddress}</div></th>
+        <th scope="col"><div>{$lang->ipaddress}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
         <th scope="col"><div>{$lang->cmd_delete}</div></th>
     </tr>
@@ -44,10 +40,10 @@
 <tbody>
     <!--@foreach($ip_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td class="center number">{count($ip_list)-$no}</td>
-        <td class="number">{$val->ipaddress}</td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="delete center"><a href="#" onclick="doDeleteDeniedIP('{$val->ipaddress}');return false;">{$lang->cmd_delete}</a></td>
+        <td>{count($ip_list)-$no}</td>
+        <td class="wide">{$val->ipaddress}</td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="#" onclick="doDeleteDeniedIP('{$val->ipaddress}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 </tbody>
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html
index 3fe5fd555..64e99e6b3 100644
--- a/modules/spamfilter/tpl/denied_word_list.html
+++ b/modules/spamfilter/tpl/denied_word_list.html
@@ -3,11 +3,6 @@
 <!--%import("filter/insert_denied_word.xml")-->
 <!--%import("filter/delete_denied_word.xml")-->
 
-<!-- 스패머 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($word_list)}</em>
-</div>
-
 <!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
 <form id="fo_denied_word" action="./" method="get">
 <input type="hidden" name="word" value="" />
@@ -15,7 +10,7 @@
 
 <!-- 수동 추가 -->
 <form action="./" method="get" onsubmit="return procFilter(this, insert_denied_word)">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->word}</div></th>
         <td>
@@ -24,19 +19,22 @@
         </td>
     </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black stron"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($word_list)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="wide"><div>{$lang->word}</div></th>
+        <th scope="col"><div>{$lang->word}</div></th>
+        <th scope="col"><div>{$lang->hit}</div></th>
+        <th scope="col"><div>{$lang->latest_hit}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
         <th scope="col"><div>{$lang->cmd_delete}</div></th>
     </tr>
@@ -44,11 +42,13 @@
 <tbody>
     <!--@foreach($word_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
-        <td class="number center">{count($word_list)-$no}</td>
-        <td>{$val->word}</td>
-        <td class="number date nowrap">{zdate($val->regdate,"Y-m-d")}</td>
+        <td>{count($word_list)-$no}</td>
+        <td class="wide">{$val->word}</td>
+        <td>{$val->hit}</td>
+        <td><span title="{zdate($val->latest_hit, 'Y-m-d H:i:s')}">{zdate($val->latest_hit, 'Y-m-d')}</span></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
         {@ $val->word = base64_encode($val->word);}
-        <td class="delete center"><a href="#" onclick="doDeleteDeniedWord('{$val->word}');return false;">{$lang->cmd_delete}</a></td>
+        <td><a href="#" onclick="doDeleteDeniedWord('{$val->word}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 </tbody>
diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html
index 1cdca5d80..197d8fe09 100644
--- a/modules/spamfilter/tpl/header.html
+++ b/modules/spamfilter/tpl/header.html
@@ -1,6 +1,6 @@
 <!--%import("js/spamfilter_admin.js")-->
 
-<h3>{$lang->spamfilter} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->spamfilter} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="header4 gap1">
     <ul class="localNavigation">
diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html
index b02afe938..c5c7d684a 100644
--- a/modules/spamfilter/tpl/index.html
+++ b/modules/spamfilter/tpl/index.html
@@ -4,7 +4,7 @@
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="col"><div>{$lang->interval}</div></th>
         <td>
@@ -27,9 +27,9 @@
         </td>
     </tr>
     <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/springnote/conf/module.xml b/modules/springnote/conf/module.xml
index 1df502fb9..15017099a 100644
--- a/modules/springnote/conf/module.xml
+++ b/modules/springnote/conf/module.xml
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants>
-        <grant name="list" default="guest">
-            <title xml:lang="ko">목록</title>
-			<title xml:lang="es">Lista</title>
-			<title xml:lang="ru">список</title>
-			<title xml:lang="zh-CN">目录</title>
-            <title xml:lang="jp">リスト</title>
-            <title xml:lang="en">list</title>
-			<title xml:lang="zh-TW">列表</title>
-        </grant>
         <grant name="view" default="guest">
             <title xml:lang="ko">열람</title>
-			<title xml:lang="es">Opinión</title>
-			<title xml:lang="ru">мнение</title>
-			<title xml:lang="zh-CN">查看</title>
+            <title xml:lang="es">Opinión</title>
+            <title xml:lang="ru">мнение</title>
+            <title xml:lang="zh-CN">查看</title>
             <title xml:lang="jp">閲覧</title>
             <title xml:lang="en">view</title>
-			<title xml:lang="zh-TW">檢視</title>
+            <title xml:lang="zh-TW">檢視</title>
         </grant>
     </grants>
     <actions>
@@ -33,6 +24,5 @@
         <action name="procSpringnoteAdminInsertSpringnote" type="controller" standalone="true" />
         <action name="procSpringnoteAdminDeleteSpringnote" type="controller" standalone="true" />
         <action name="procSpringnoteAdminInsertGrant" type="controller" standalone="true" />
-        <action name="procSpringnoteAdminUpdateSkinInfo" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/springnote/lang/ko.lang.php b/modules/springnote/lang/ko.lang.php
index 112ccd606..35a3cdf57 100644
--- a/modules/springnote/lang/ko.lang.php
+++ b/modules/springnote/lang/ko.lang.php
@@ -5,24 +5,24 @@
      * @brief  스프링노트(springnote) 모듈의 기본 언어팩
      **/
 
-    $lang->springnote = "스프링노트";
-    $lang->springnote_openid = "오픈아이디";
-    $lang->springnote_userkey = "사용자 Key";
-    $lang->springnote_pageid = "페이지 번호";
+    $lang->springnote = '스프링노트';
+    $lang->springnote_openid = '오픈아이디';
+    $lang->springnote_userkey = '사용자 Key';
+    $lang->springnote_pageid = '페이지 번호';
     $lang->springnote_pageid_setup = '페이지 번호 설정';
     $lang->springnote_pageid_option_only = '지정된 페이지만 보여주기 (목록 보이지 않음)';
     $lang->springnote_pageid_option_list = '지정된 페이지부터 보이기 (목록 보임)';
-    $lang->springnote_domain = "도메인 지정";
+    $lang->springnote_domain = '도메인 지정';
 
-    $lang->page_url = "원본 URL";
-    $lang->page_modified = "최종 수정";
-    $lang->page_modifier = "최종 수정자";
+    $lang->page_url = '원본 URL';
+    $lang->page_modified = '최종 수정';
+    $lang->page_modifier = '최종 수정자';
 
     $lang->cmd_springnote_list = '스프링노트 목록';
     $lang->cmd_view_info = '스프링노트 정보';
 
-    $lang->about_springnote = "스프링노트는 오픈마루에서 제공하는 위키서비스입니다.<br />스프링노트 XE모듈은 스프링노트의 특정 페이지들을 내부문서처럼 열람할 수 있는 모듈입니다.";
-    $lang->about_springnote_openid = "스프링노트에서 페이지를 제작한 오픈아이디를 입력해주세요";
+    $lang->about_springnote = '스프링노트는 오픈마루에서 제공하는 위키서비스입니다.<br />스프링노트 XE모듈은 스프링노트의 특정 페이지들을 내부문서처럼 열람할 수 있는 모듈입니다.';
+    $lang->about_springnote_openid = '스프링노트에서 페이지를 제작한 오픈아이디를 입력해주세요';
     $lang->about_springnote_userkey = '스프링노트 연동을 위한 사용자 Key값을 입력해주셔야 합니다.<br />[<a href="https://api.openmaru.com/delegate_key/springnote?app_id=www.zeroboard.com&openid=" onclick="window.open(this.href);return false;">사용자 키 받기</a>] 를 클릭하셔서 오픈아이디를 입력하시고 생성되는 키값을 입력해주세요.';
     $lang->about_springnote_pageid = '사용하시려는 스프링노트 중 특정 페이지를 먼저 출력하고자 하실때 pageid값을 입력해주세요';
     $lang->about_springnote_pageid_setup = '페이지 번호 지정시 해당 페이지만 보이기(목록 비포함), 해당 페이지부터 보이기(목록 포함)등을 지정할 수 있습니다';
diff --git a/modules/springnote/lang/zh-CN.lang.php b/modules/springnote/lang/zh-CN.lang.php
index 86dbff89d..81b340652 100644
--- a/modules/springnote/lang/zh-CN.lang.php
+++ b/modules/springnote/lang/zh-CN.lang.php
@@ -1,8 +1,8 @@
 <?php
     /**
      * @file   zh-CN.lang.php
-     * @author zero (zero@nzeo.com)
-     * @brief  Springnote模块语言包
+     * @author zero (zero@nzeo.com)　翻译：guny
+     * @brief  Springnote模块简体中文语言包
      **/
 
     $lang->springnote = "Springnote";
diff --git a/modules/springnote/springnote.admin.controller.php b/modules/springnote/springnote.admin.controller.php
index 4c6c9fb1e..fb18d65e9 100644
--- a/modules/springnote/springnote.admin.controller.php
+++ b/modules/springnote/springnote.admin.controller.php
@@ -19,67 +19,27 @@
          * springnote_name은 mid의 값이 되고 나머지 모듈 공통 값을 받아서 저장을 하게 된다.
          **/
         function procSpringnoteAdminInsertSpringnote($args = null) {
-            // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            if(!$args) $args = Context::gets('module_srl','module_category_srl','springnote_name','layout_srl','skin','browser_title','description','is_default','header_text','footer_text','admin_id','open_rss');
+            // module 모듈의 model/controller 객체 생성
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
 
-            // springnote모듈임을 명시적으로 지정한다.
+            // 게시판 모듈의 정보 설정
+            $args = Context::getRequestVars();
             $args->module = 'springnote';
-
-            // mid값을 직접 받지 않고 springnote_name으로 받는 이유는 mid는 특별히 약속된 변수명이라 오동작이 발생할 수 있어서 다른 이름으로 전달을 받은후 다시 바꾸어준다.
             $args->mid = $args->springnote_name;
             unset($args->springnote_name);
 
-            // is_default일 경우 별다른 요청이 없는 index페이지의 경우 바로 호출이 되는데 이 값을 설정을 하게 된다.
-            if($args->is_default!='Y') $args->is_default = 'N';
-
-            // 기본 값외의 것들을 정리
-            $extra_var = delObjectVars(Context::getRequestVars(), $args);
-            unset($extra_var->act);
-            unset($extra_var->page);
-            unset($extra_var->springnote_name);
-
             // module_srl이 넘어오면 원 모듈이 있는지 확인
             if($args->module_srl) {
-                $oModuleModel = &getModel('module');
                 $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-                // 만약 원래 모듈이 없으면 새로 입력하기 위한 처리
                 if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
             }
 
-            // $extra_var를 serialize
-            $args->extra_vars = serialize($extra_var);
-
-            // module 모듈의 controller 객체 생성
-            $oModuleController = &getController('module');
-
-            // is_default=='Y' 이면
-            if($args->is_default=='Y') $oModuleController->clearDefaultModule();
-
-            /**
-             * module_srl값이 없다면 신규 등록으로 처리를 한다.
-             **/
+            // module_srl의 값에 따라 insert/update
             if(!$args->module_srl) {
                 // module controller를 이용하여 모듈을 생성한다.
                 $output = $oModuleController->insertModule($args);
                 $msg_code = 'success_registed';
-
-                // 권한의 경우 기본으로 설정을 해주는 것이 좋으며 방명록 모듈의 경우 manager권한을 관리 그룹으로 설정을 한다.
-                if($output->toBool()) {
-                    // 관리그룹을 member model객체에서 구할 수 있다.
-                    $oMemberModel = &getModel('member');
-                    $admin_group = $oMemberModel->getAdminGroup();
-                    $admin_group_srl = $admin_group->group_srl;
-
-                    $module_srl = $output->get('module_srl');
-                    $grants = serialize(array('manager'=>array($admin_group_srl)));
-
-                    // module controller의 module 권한 설정 method를 이용하여 기본 권한을 적용한다.
-                    $oModuleController->updateModuleGrant($module_srl, $grants);
-                }
-            /**
-             * module_srl이 있다면 모듈의 정보를 수정한다
-             **/
             } else {
                 $output = $oModuleController->updateModule($args);
                 $msg_code = 'success_updated';
@@ -114,132 +74,6 @@
             $this->setMessage('success_deleted');
         }
  
-        /**
-         * @brief 권한 설정
-         * 생성된 방명록에 ./conf/module.xml에 정의된 권한과 관리자가 선택한 그룹의 값을 연동하여 권한을 설정하게 된다.
-         **/
-        function procSpringnoteAdminInsertGrant() {
-            // 대상 방명록(모듈)의 고유값인 module_srl을 체크한다.
-            $module_srl = Context::get('module_srl');
 
-            /**
-             * 현 모듈의 권한 목록을 가져옴
-             * xml_info 는 springnote모듈이 요청되었다고 판단될때 ModuleObject에서 이미 세팅해 놓은 상태이다.
-             **/
-            $grant_list = $this->xml_info->grant;
-
-            /**
-             * 권한의 목록을 loop로 돌면서 권한 설정을 한다.
-             * zbxe의 경우 가능한 간단한 xmlrpc사용을 위해서 배열의 경우 |@|를 pipe로 하여 하나의 string으로 전달한다.
-             * 요청받은 권한의 대상 그룹과 권한을 배열로 한 후 serialize하여 modules테이블에 module_srl을 키로 한 rows에 데이터를 적용한다.
-             **/
-            if(count($grant_list)) {
-                foreach($grant_list as $key => $val) {
-                    $group_srls = Context::get($key);
-                    if($group_srls) $arr_grant[$key] = explode('|@|',$group_srls);
-                }
-                $grants = serialize($arr_grant);
-            }
-
-            // 권한 설정은 모듈 공통이라 module 모듈의 controller을 생성하여 저장하도록 한다.
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleGrant($module_srl, $grants);
-
-            // 권한 설정후 돌아갈 페이지를 위하여 module_srl값을 세팅하고 성공 메세지 역시 세팅한다.
-            $this->add('module_srl',Context::get('module_srl'));
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 스킨 정보 업데이트
-         * 스킨 정보는 skin.xml파일의 extra_vars와 입력된 변수값을 조합하여 serialize하여 modules 테이블에 module_srl을 키로 하여 저장을 하게 된다.
-         **/
-        function procSpringnoteAdminUpdateSkinInfo() {
-            // module_srl에 해당하는 정보들을 가져오기
-            $module_srl = Context::get('module_srl');
-
-            // 어떤 스킨이 사용중인지 확인하기 위해서 module_srl을 이용하여 모듈의 정보를 구하고 스킨을 구한다.
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            $skin = $module_info->skin;
-
-            // 스킨의 정보르 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($module_info->{$vars->name});
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) {
-                        $obj->{$vars->name} = $module_info->{$vars->name};
-                        continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    unset($obj->{$vars->name});
-                    $obj->{$vars->name} = $filename;
-                }
-            }
-
-            // serialize하여 저장
-            $skin_vars = serialize($obj);
-
-            // module controller객체를 생성하여 module_srl을 키로 한 rows에 serialize한 스킨 정보를 적용한다.
-            $oModuleController = &getController('module');
-            $oModuleController->updateModuleSkinVars($module_srl, $skin_vars);
-
-            /** 
-             * 스킨 정보는 첨부파일때문에 xml로 전달이 되지 않고 POST로 전송이 되어 왔으므로 템플릿을 이용하여 프레임을 refresh시키도록 한다.
-             * 스킨 정보를 수정할때 숨어 있는 iframe을 target으로 삼기에 기본 레이아웃을 이용하면 되므로 직접 레이아웃 경로와 파일을 기본으로 지정한다.
-             **/
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
     }
 ?>
diff --git a/modules/springnote/springnote.admin.view.php b/modules/springnote/springnote.admin.view.php
index c903b5632..35e09d645 100644
--- a/modules/springnote/springnote.admin.view.php
+++ b/modules/springnote/springnote.admin.view.php
@@ -139,26 +139,11 @@
          * @brief 스킨 정보 보여줌
          **/
         function dispSpringnoteAdminSkinInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
 
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $module_info = Context::get('module_info');
-            $skin = $module_info->skin;
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $module_info->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('skin_info', $skin_info);
             $this->setTemplateFile('skin_info');
         }
 
@@ -166,17 +151,10 @@
          * @brief 권한 목록 출력
          **/
         function dispSpringnoteAdminGrantInfo() {
-            // module_srl을 구함
-            $module_srl = Context::get('module_srl');
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
 
             $this->setTemplateFile('grant_list');
         }
diff --git a/modules/springnote/springnote.class.php b/modules/springnote/springnote.class.php
index 4513d2855..95d43a48d 100644
--- a/modules/springnote/springnote.class.php
+++ b/modules/springnote/springnote.class.php
@@ -10,19 +10,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteContent');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminContent');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminSpringnoteInfo');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminInsertSpringnote');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminDeleteSpringnote');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminGrantInfo');
-            $oModuleController->insertActionForward('springnote', 'view', 'dispSpringnoteAdminSkinInfo');
-            $oModuleController->insertActionForward('springnote', 'controller', 'procSpringnoteAdminInsertSpringnote');
-            $oModuleController->insertActionForward('springnote', 'controller', 'procSpringnoteAdminDeleteSpringnote');
-            $oModuleController->insertActionForward('springnote', 'controller', 'procSpringnoteAdminInsertGrant');
-
             return new Object();
         }
 
@@ -30,9 +17,6 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getActionForward('dispSpringnoteContent')) return true;
-
             return false;
         }
 
diff --git a/modules/springnote/springnote.model.php b/modules/springnote/springnote.model.php
index 4dd0a3a24..ae7b81451 100644
--- a/modules/springnote/springnote.model.php
+++ b/modules/springnote/springnote.model.php
@@ -1,214 +1,215 @@
-<?php
-    /**
-     * @class  springnoteModel 
-     * @author zero (zero@nzeo.com)
-     * @brief  springnote모듈의 model 클래스
-     **/
-
-    set_include_path("./libs/PEAR");
-    require_once('PEAR.php');
-    require_once('HTTP/Request.php');
-
-    class springnoteModel extends springnote {
-
-        var $userid = '';
-        var $userkey = '';
-        var $appkey = '82dee99105c92c166bb8586415d47283b9a54cd2';
-        var $server = 'api.springnote.com';
-        var $port = 80;
-        var $domain = '';
-
-        /**
-         * @brief 초기화
-         **/
-        function init() { 
-        }
-
-        /**
-         * @brief 스프링노트 페이지를 가져오기 위한 기본 값 설정
-         **/
-        function setInfo($userid, $userkey, $domain = '') {
-            $this->userid = $userid;
-            $this->userkey = $userkey;
-            $this->domain = $domain;
-        }
-
-        /**
-         * @brief url 생성
-         **/
-        function getUrl($pageid = null) {
-            return sprintf('http://%s:%s/pages%s.xml%s', $this->server, $this->port, $pageid?'/'.$pageid:'', $this->domain?'?domain='.$this->domain:'');
-        }
-
-        /**
-         * @brief userid 생성
-         **/
-        function getUserID() {
-            return htmlentities($this->userid, ENT_QUOTES, 'UTF-8');
-        }
-
-        /**
-         * @brief password 생성
-         **/
-        function getPassword() {
-            return $this->userkey.'.'.$this->appkey;
-        }
-
-        /**
-         * @brief HTTP request 객체 생성
-         **/
-        function getRequest($url) {
-            $oReqeust = new HTTP_Request($url);
-            $oReqeust->addHeader('Content-Type', 'application/xml');
-            $oReqeust->setMethod('GET');
-            $oReqeust->setBasicAuth($this->getUserID(), $this->getPassword());
-            return $oReqeust;
-        }
-
-        /**
-         * @brief springnote 페이지 정보 가져오기
-         **/
-        function getPage($pageid) {
-            $url = $this->getUrl($pageid);
-            $oReqeust = $this->getRequest($url);
-            $oResponse = $oReqeust->sendRequest();
-
-            if (PEAR::isError($oResponse)) return null;
-
-            $body = $oReqeust->getResponseBody();
-
-            $oXmlParser = new XmlParser();
-            $xmldoc = $oXmlParser->parse($body);
-
-            $page->identifier = $xmldoc->page->identifier->body;
-            $page->title = $xmldoc->page->title->body;
-            $page->relation_is_part_of = $xmldoc->page->relation_is_part_of->body;
-            $page->date_modified = $xmldoc->page->date_modified->body;
-            $page->uri = $xmldoc->page->uri->body;
-            $page->date_created = $xmldoc->page->date_created->body;
-            $page->rights = $xmldoc->page->rights->body;
-            $page->creator = $xmldoc->page->creator->body;
-            $page->contributor_modified = $xmldoc->page->contributor_modified->body;
-            $page->version = $xmldoc->page->version->body;
-            $page->tags = $xmldoc->page->tags->body;
-            $page->body = trim($xmldoc->page->body);
-            $page->source = trim($xmldoc->page->source->body);
-
-            // source에서 /pages/숫자로 되어 있는 url의 수정
-            $page->source = preg_replace('/="\/pages\/([0-9]+)(#[^"]+)?"/is','="./?mid='.Context::get('mid').'&pageid=\\1\\2"', $page->source);
-
-            // 첨부파일의 경로를 변경
-            $page->source = preg_replace('/="\/pages\/([0-9]+)\/attachments\/([0-9]+)"/is','="'.$page->uri.'/attachments/\\2"', $page->source);
-
-	    // Change path of the template images
-            $page->source = preg_replace('/="\/images\/template\/([^"]+)"/is','="http://zbxe.springnote.com/images/template/\\1"', $page->source);
-
-            $uri = preg_replace('/pages(.*)$/i','',$page->uri);
-            $page->css_files = array(
-                    sprintf('%sstylesheets/xhtmlContent.css?%d', $uri, time()),
-                    sprintf('%sstylesheets/template.css?%d', $uri, time()),
-            );
-            return $page;
-        }
-
-        /**
-         * @brief springnote 페이지 목록 가져오기
-         **/
-        function getPages($query = null, $fulltext = true, $p_pageid = 0) {
-
-            if($query) {
-                if($this->domain) $url = sprintf('%s&q=%s&fulltext=%d', $this->getUrl(), urlencode($query), $fulltext?1:0);
-                else $url = sprintf('%s?q=%s&fulltext=%d', $this->getUrl(), urlencode($query), $fulltext?1:0);
-            } else {
-                $url = $this->getUrl();
-            }
-
-            $oReqeust = $this->getRequest($url);
-            $oResponse = $oReqeust->sendRequest();
-
-            if (PEAR::isError($oResponse)) return array();
-
-            $body = $oReqeust->getResponseBody();
-
-            $oXmlParser = new XmlParser();
-            $xmldoc = $oXmlParser->parse($body);
-
-            // 페이지 목록 정리
-            $output = array();
-            $pages = array();
-            $root = null;
-            if(count($xmldoc->pages->page)) {
-                // 일단 서버에서 보내주는 대로 목록을 받음
-                foreach($xmldoc->pages->page as $val) {
-                    $obj = null;
-                    $obj->pageid = $val->identifier->body;
-                    $obj->title = $val->title->body;
-                    $obj->relation_is_part_of = $val->relation_is_part_of->body;
-                    $obj->date_modified = $val->date_modified->body;
-                    $obj->uri = $val->uri->body;
-                    $obj->source = trim($val->source->body);
-                    if($query && !$obj->source) continue;
-                    $pages[$obj->pageid] = $obj;
-                }
-
-                // parent/chlid관계로 묶음
-                foreach($pages as $pageid => $page) {
-                    if($page->relation_is_part_of) $pages[$page->relation_is_part_of]->child[] = &$pages[$pageid];
-                    else $root->child[] = &$pages[$pageid];
-                }
-
-                if($p_pageid) $this->getNodes($root->child, $p_pageid, $root);
-
-                $pages = array();
-                $prev_pageid = 0;
-                $this->arrangePages($pages, $root->child, 0, $prev_pageid);
-
-            }
-
-            return $pages;
-        }
-
-        /**
-         * @brief 특정 노드아래만 검색을 하기 위할때 해당 노드의 page_id를 받아서 해당 노드tree만 리턴
-         **/
-        function getNodes($list, $p_pageid, &$root) {
-            if(!count($list)) return;
-            foreach($list as $key => $val) {
-                if($val->pageid == $p_pageid) {
-                    $root = $val;
-                    return;
-                }
-
-                if($val->child) $this->getNodes($val->child, $p_pageid, $root);
-            }
-        }
-
-        /**
-         * @brief 스프링노트 서버에서 보내준 페이지를 정렬
-         **/
-        function arrangePages(&$pages, $list, $depth, &$prev_pageid) {
-            if(!count($list)) return;
-
-            foreach($list as $key => $val) {
-
-                $child = $val->child;
-                unset($val->child);
-
-                $val->depth = $depth;
-                $pages[$val->pageid] = $val;
-
-                if($prev_pageid) {
-                    $pages[$prev_pageid]->next->pageid = $pages[$val->pageid]->pageid;
-                    $pages[$prev_pageid]->next->title = $pages[$val->pageid]->title;
-                    $pages[$val->pageid]->prev->pageid = $pages[$prev_pageid]->pageid;
-                    $pages[$val->pageid]->prev->title = $pages[$prev_pageid]->title;
-                }
-
-                $prev_pageid = $val->pageid;
-
-                if($child) $this->arrangePages($pages, $child,$depth+1, $prev_pageid);
-            }
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  springnoteModel 
+     * @author zero (zero@nzeo.com)
+     * @brief  springnote모듈의 model 클래스
+     **/
+
+    set_include_path("./libs/PEAR");
+    require_once('PEAR.php');
+    require_once('HTTP/Request.php');
+
+    class springnoteModel extends springnote {
+
+        var $userid = '';
+        var $userkey = '';
+        var $appkey = '82dee99105c92c166bb8586415d47283b9a54cd2';
+        var $server = 'api.springnote.com';
+        var $port = 80;
+        var $domain = '';
+
+        /**
+         * @brief 초기화
+         **/
+        function init() { 
+        }
+
+        /**
+         * @brief 스프링노트 페이지를 가져오기 위한 기본 값 설정
+         **/
+        function setInfo($userid, $userkey, $domain = '') {
+            $this->userid = $userid;
+            $this->userkey = $userkey;
+            $this->domain = $domain;
+        }
+
+        /**
+         * @brief url 생성
+         **/
+        function getUrl($pageid = null) {
+            return sprintf('http://%s:%s/pages%s.xml%s', $this->server, $this->port, $pageid?'/'.$pageid:'', $this->domain?'?domain='.$this->domain:'');
+        }
+
+        /**
+         * @brief userid 생성
+         **/
+        function getUserID() {
+            return htmlentities($this->userid, ENT_QUOTES, 'UTF-8');
+        }
+
+        /**
+         * @brief password 생성
+         **/
+        function getPassword() {
+            return $this->userkey.'.'.$this->appkey;
+        }
+
+        /**
+         * @brief HTTP request 객체 생성
+         **/
+        function getRequest($url) {
+            $oReqeust = new HTTP_Request($url);
+            $oReqeust->addHeader('Content-Type', 'application/xml');
+            $oReqeust->setMethod('GET');
+            $oReqeust->setBasicAuth($this->getUserID(), $this->getPassword());
+            return $oReqeust;
+        }
+
+        /**
+         * @brief springnote 페이지 정보 가져오기
+         **/
+        function getPage($pageid) {
+            $url = $this->getUrl($pageid);
+            $oReqeust = $this->getRequest($url);
+            $oResponse = $oReqeust->sendRequest();
+
+            if (PEAR::isError($oResponse)) return null;
+
+            $body = $oReqeust->getResponseBody();
+
+            $oXmlParser = new XmlParser();
+            $xmldoc = $oXmlParser->parse($body);
+
+            $page->identifier = $xmldoc->page->identifier->body;
+            $page->title = $xmldoc->page->title->body;
+            $page->relation_is_part_of = $xmldoc->page->relation_is_part_of->body;
+            $page->date_modified = $xmldoc->page->date_modified->body;
+            $page->uri = $xmldoc->page->uri->body;
+            $page->date_created = $xmldoc->page->date_created->body;
+            $page->rights = $xmldoc->page->rights->body;
+            $page->creator = $xmldoc->page->creator->body;
+            $page->contributor_modified = $xmldoc->page->contributor_modified->body;
+            $page->version = $xmldoc->page->version->body;
+            $page->tags = $xmldoc->page->tags->body;
+            $page->body = trim($xmldoc->page->body);
+            $page->source = trim($xmldoc->page->source->body);
+
+            // source에서 /pages/숫자로 되어 있는 url의 수정
+            $page->source = preg_replace('/="\/pages\/([0-9]+)(#[^"]+)?"/is','="./?mid='.Context::get('mid').'&pageid=\\1\\2"', $page->source);
+
+            // 첨부파일의 경로를 변경
+            $page->source = preg_replace('/="\/pages\/([0-9]+)\/attachments\/([0-9]+)"/is','="'.$page->uri.'/attachments/\\2"', $page->source);
+
+	    // Change path of the template images
+            $page->source = preg_replace('/="\/images\/template\/([^"]+)"/is','="http://zbxe.springnote.com/images/template/\\1"', $page->source);
+
+            $uri = preg_replace('/pages(.*)$/i','',$page->uri);
+            $page->css_files = array(
+                    sprintf('%sstylesheets/xhtmlContent.css?%d', $uri, time()),
+                    sprintf('%sstylesheets/template.css?%d', $uri, time()),
+					"http://static2.springnote.com/stylesheets/readonly_30102.css"
+            );
+            return $page;
+        }
+
+        /**
+         * @brief springnote 페이지 목록 가져오기
+         **/
+        function getPages($query = null, $fulltext = true, $p_pageid = 0) {
+
+            if($query) {
+                if($this->domain) $url = sprintf('%s&q=%s&fulltext=%d', $this->getUrl(), urlencode($query), $fulltext?1:0);
+                else $url = sprintf('%s?q=%s&fulltext=%d', $this->getUrl(), urlencode($query), $fulltext?1:0);
+            } else {
+                $url = $this->getUrl();
+            }
+
+            $oReqeust = $this->getRequest($url);
+            $oResponse = $oReqeust->sendRequest();
+
+            if (PEAR::isError($oResponse)) return array();
+
+            $body = $oReqeust->getResponseBody();
+
+            $oXmlParser = new XmlParser();
+            $xmldoc = $oXmlParser->parse($body);
+
+            // 페이지 목록 정리
+            $output = array();
+            $pages = array();
+            $root = null;
+            if(count($xmldoc->pages->page)) {
+                // 일단 서버에서 보내주는 대로 목록을 받음
+                foreach($xmldoc->pages->page as $val) {
+                    $obj = null;
+                    $obj->pageid = $val->identifier->body;
+                    $obj->title = $val->title->body;
+                    $obj->relation_is_part_of = $val->relation_is_part_of->body;
+                    $obj->date_modified = $val->date_modified->body;
+                    $obj->uri = $val->uri->body;
+                    $obj->source = trim($val->source->body);
+                    if($query && !$obj->source) continue;
+                    $pages[$obj->pageid] = $obj;
+                }
+
+                // parent/chlid관계로 묶음
+                foreach($pages as $pageid => $page) {
+                    if($page->relation_is_part_of) $pages[$page->relation_is_part_of]->child[] = &$pages[$pageid];
+                    else $root->child[] = &$pages[$pageid];
+                }
+
+                if($p_pageid) $this->getNodes($root->child, $p_pageid, $root);
+
+                $pages = array();
+                $prev_pageid = 0;
+                $this->arrangePages($pages, $root->child, 0, $prev_pageid);
+
+            }
+
+            return $pages;
+        }
+
+        /**
+         * @brief 특정 노드아래만 검색을 하기 위할때 해당 노드의 page_id를 받아서 해당 노드tree만 리턴
+         **/
+        function getNodes($list, $p_pageid, &$root) {
+            if(!count($list)) return;
+            foreach($list as $key => $val) {
+                if($val->pageid == $p_pageid) {
+                    $root = $val;
+                    return;
+                }
+
+                if($val->child) $this->getNodes($val->child, $p_pageid, $root);
+            }
+        }
+
+        /**
+         * @brief 스프링노트 서버에서 보내준 페이지를 정렬
+         **/
+        function arrangePages(&$pages, $list, $depth, &$prev_pageid) {
+            if(!count($list)) return;
+
+            foreach($list as $key => $val) {
+
+                $child = $val->child;
+                unset($val->child);
+
+                $val->depth = $depth;
+                $pages[$val->pageid] = $val;
+
+                if($prev_pageid) {
+                    $pages[$prev_pageid]->next->pageid = $pages[$val->pageid]->pageid;
+                    $pages[$prev_pageid]->next->title = $pages[$val->pageid]->title;
+                    $pages[$val->pageid]->prev->pageid = $pages[$prev_pageid]->pageid;
+                    $pages[$val->pageid]->prev->title = $pages[$prev_pageid]->title;
+                }
+
+                $prev_pageid = $val->pageid;
+
+                if($child) $this->arrangePages($pages, $child,$depth+1, $prev_pageid);
+            }
+        }
+
+    }
+?>
diff --git a/modules/springnote/springnote.view.php b/modules/springnote/springnote.view.php
index ec94a8986..9eb31a541 100644
--- a/modules/springnote/springnote.view.php
+++ b/modules/springnote/springnote.view.php
@@ -35,7 +35,7 @@
          **/
         function dispSpringnoteContent() {
             // 권한 체크
-            if(!$this->grant->list) return $this->dispSpringnoteMessage('msg_not_permitted');
+            if(!$this->grant->access) return $this->dispSpringnoteMessage('msg_not_permitted');
 
             $pageid = (int)Context::get('pageid');
             if($this->module_info->pageid && $this->module_info->pageid_option != 'list') $pageid = $this->module_info->pageid;
diff --git a/modules/springnote/tpl/filter/insert_grant.xml b/modules/springnote/tpl/filter/insert_grant.xml
deleted file mode 100644
index bc80a71d9..000000000
--- a/modules/springnote/tpl/filter/insert_grant.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<filter name="insert_grant" module="springnote" act="procSpringnoteAdminInsertGrant" confirm_msg_code="confirm_submit">
-    <form>
-        <node target="module_srl" required="true" filter="number" />
-    </form>
-    <response callback_func="completeInsertGrant">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="page" />
-        <tag name="module_srl" />
-    </response>
-</filter>
diff --git a/modules/springnote/tpl/filter/insert_springnote.xml b/modules/springnote/tpl/filter/insert_springnote.xml
index fb4ddd5df..9f516d2ad 100644
--- a/modules/springnote/tpl/filter/insert_springnote.xml
+++ b/modules/springnote/tpl/filter/insert_springnote.xml
@@ -25,7 +25,6 @@
         <param name="description" target="description" />
         <param name="header_text" target="header_text" />
         <param name="footer_text" target="footer_text" />
-        <param name="admin_id" target="admin_id" />
         <param name="open_rss" target="open_rss" />
     </parameter>
     <response callback_func="completeInsertSpringnote">
diff --git a/modules/springnote/tpl/grant_list.html b/modules/springnote/tpl/grant_list.html
index 8ac945af0..b0d8b0c53 100644
--- a/modules/springnote/tpl/grant_list.html
+++ b/modules/springnote/tpl/grant_list.html
@@ -1,39 +1,3 @@
 <!--#include("./header.html")-->
-<!--%import("filter/insert_grant.xml")-->
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-<table cellspacing="0" class="adminTable">
-<caption>{$lang->about_grant}</caption>
-<thead>
-    <tr>
-        <th><div>{$lang->target}</div></th>
-        <th class="wide"><div>{$lang->group}</div></th>
-        <th colspan="2"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($grant_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="center">{$val->title}</td>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="{$key}" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(is_array($module_info->grants[$key])&&in_array($v->group_srl,$module_info->grants[$key]))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            <!--@end-->
-        </td>
-        <td class="center selectAll"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:true }); return false;" class="blue">{$lang->cmd_select_all}</a></td>
-        <td class="center deSelectAll"><a href="#" onclick="XE.checkboxToggleAll('{$key}', { checked:false }); return false;" class="red">{$lang->cmd_unselect_all}</a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <td colspan="4" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </td>
-    </tr>
-</tbody>
-</table>
-
-</form>
+{$grant_content}
diff --git a/modules/springnote/tpl/header.html b/modules/springnote/tpl/header.html
index c4b968ad9..fbdc5e14c 100644
--- a/modules/springnote/tpl/header.html
+++ b/modules/springnote/tpl/header.html
@@ -1,12 +1,12 @@
 <!--%import("js/springnote_admin.js")-->
 
-<h3>{$lang->springnote} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->springnote} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <div class="infoText">{nl2br($lang->about_springnote)}</div>
 
 <!--@if($module_info)-->
 <!--@if($module_info->mid)-->
-<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>
+<h4 class="xeAdmin">{$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">
diff --git a/modules/springnote/tpl/index.html b/modules/springnote/tpl/index.html
index f3f9c6833..c8237f7fb 100644
--- a/modules/springnote/tpl/index.html
+++ b/modules/springnote/tpl/index.html
@@ -1,18 +1,16 @@
 <!--#include("header.html")-->
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
         <th scope="col">
             <div>
-                <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="w120">
@@ -24,20 +22,19 @@
                         <option value="-1">{$lang->cmd_management}</option>
                     </select>
                     <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-                </form>
             </div>
         </th>
         <th scope="col" class="half_wide"><div>{$lang->mid}</div>
         <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
         <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_view}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
+        <th scope="col" colspan="2"><div>&nbsp;</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($springnote_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td class="number center">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
         <td>
             <!--@if(!$val->module_category_srl)-->
                 {$lang->not_exists}
@@ -45,21 +42,29 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispSpringnoteAdminSpringnoteInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->mid)}</a></td>
-        <td><a href="{getUrl('act','dispSpringnoteAdminSpringnoteInfo','module_srl',$val->module_srl)}">{htmlspecialchars($val->browser_title)}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="view center"><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="delete center"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispSpringnoteAdminDeleteSpringnote','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispSpringnoteAdminSpringnoteInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispSpringnoteAdminDeleteSpringnote','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="7" class="right">
-            <a href="{getUrl('act','dispSpringnoteAdminInsertSpringnote','module_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-        </td>
-    </tr>
 </tbody>
 </table>
 
+<!-- 버튼 -->
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr">
+        <a href="{getUrl('act','dispSpringnoteAdminInsertSpringnote','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
+
+</form>
+
 <!-- 페이지 네비게이션 -->
 <div class="pagination a1">
     <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
diff --git a/modules/springnote/tpl/js/springnote_admin.js b/modules/springnote/tpl/js/springnote_admin.js
index 0ff6adf4a..d31eb4fb6 100644
--- a/modules/springnote/tpl/js/springnote_admin.js
+++ b/modules/springnote/tpl/js/springnote_admin.js
@@ -53,3 +53,16 @@ function doChangeCategory(fo_obj) {
     }
     return true;
 }
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
diff --git a/modules/springnote/tpl/skin_info.html b/modules/springnote/tpl/skin_info.html
index 0f91f50bb..0ad67b69f 100644
--- a/modules/springnote/tpl/skin_info.html
+++ b/modules/springnote/tpl/skin_info.html
@@ -1,147 +1,3 @@
 <!--#include("./header.html")-->
 
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="{$module_info->module}" />
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procSpringnoteAdminUpdateSkinInfo" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->skin_default_info}</caption>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td>{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-            &nbsp;
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br($skin_info->description)}</td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->extra_vars}</caption>
-    <tr class="row2">valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td>
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-                <!--@if($val->screenshot)-->
-                    {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-                <!--@else-->
-                    {@ $_width = 200; $_height = 20; $_talign = "left"; }
-                <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-                <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>  
-                <label for="colorset_{$key}">{$val->title}</label>
-                <!--@if($val->screenshot)-->
-                <br />
-                <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-                <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <col width="150" />
-    <col />
-    <caption>{$group}</caption>
-    <!--@end-->
-
-    <tr>
-        <th scope="row"><div>{$val->title}</div></th>
-        <td>
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{htmlspecialchars($val->value)}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr class="row2">
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
-    </tr>
-    </table>
-
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+{$skin_content}
diff --git a/modules/springnote/tpl/springnote_delete.html b/modules/springnote/tpl/springnote_delete.html
index c7599f478..a3963d6c4 100644
--- a/modules/springnote/tpl/springnote_delete.html
+++ b/modules/springnote/tpl/springnote_delete.html
@@ -6,24 +6,20 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table cellspacing="0" class="adminTable">
-    <col width="150" />
-    <col />
+    <h3 class="xeAdmin">{$lang->confirm_delete}</h3>
+    <table cellspacing="0" class="rowTable">
     <tr>
-        <th scope="row" colspan="2">{$lang->confirm_delete}</th>
+        <th scope="row"><div>{$lang->module_name}</div></th>
+        <td class="wide">{$module_info->mid}</td>
     </tr>
     <tr>
-        <th scope="row">{$lang->module_name}</th>
-        <td>{$module_info->mid}</td>
-    </tr>
-    <tr>
-        <th scope="row">{$lang->module}</th>
+        <th scope="row"><div>{$lang->module}</div></th>
         <td>{$module_info->module}</td>
     </tr>
     <tr>
         <th scope="row" colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
             <a href="{getUrl('act','dispSpringnoteAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete}" /></span>
         </th>
     </tr>
     </table>
diff --git a/modules/springnote/tpl/springnote_info.html b/modules/springnote/tpl/springnote_info.html
index 435dd9bd9..258c0f615 100644
--- a/modules/springnote/tpl/springnote_info.html
+++ b/modules/springnote/tpl/springnote_info.html
@@ -1,9 +1,9 @@
 <!--#include("header.html")-->
 
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
 <tr>
     <th scope="row"><div>{$lang->module_category}</div></th>
-    <td>
+    <td class="wide">
         <!--@if(!$module_info->module_category_srl)-->
             {$lang->not_exists}
         <!--@else-->
@@ -74,16 +74,12 @@
     <th scope="row"><div>{$lang->footer_text}</div></th>
     <td>{htmlspecialchars($module_info->footer_text)}&nbsp;</td>
 </tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->admin_id}</div></th>
-    <td>{implode(",",$module_info->admin_id)}&nbsp;</td>
-</tr>
 <tr>
-    <td colspan="2" class="right">
-        <a href="{getUrl('act','dispSpringnoteAdminInsertSpringnote')}" class="button"><span>{$lang->cmd_modify}</span></a>
+    <th colspan="2" class="button">
+        <a href="{getUrl('act','dispSpringnoteAdminInsertSpringnote')}" class="button black strong"><span>{$lang->cmd_modify}</span></a>
         <!--@if($module=="admin")-->
         <a href="{getUrl('act','dispSpringnoteAdminContent','module_srl','')}" class="button"><span>{$lang->cmd_springnote_list}</span></a>
         <!--@end-->
-    </td>
+    </th>
 </tr>
 </table>
diff --git a/modules/springnote/tpl/springnote_insert.html b/modules/springnote/tpl/springnote_insert.html
index 11ce18dcd..8e178c2d4 100644
--- a/modules/springnote/tpl/springnote_insert.html
+++ b/modules/springnote/tpl/springnote_insert.html
@@ -11,11 +11,11 @@
 <!--@end-->
 <input type="hidden" name="use_category" value="N" />
 
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
 
     <tr class="row2">
         <th scope="row"><div>{$lang->mid}</div></th>
-        <td>
+        <td class="wide">
             <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
             <p>{$lang->about_mid}</p>
         </td>
@@ -82,7 +82,8 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->browser_title}</div></th>
         <td>
-            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w300" />
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
             <p>{$lang->about_browser_title}</p>
         </td>
     </tr>
@@ -130,17 +131,10 @@
             <p>{$lang->about_footer_text}</p>
         </td>
     </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->admin_id}</div></th>
-        <td>
-            <textarea name="admin_id" class="inputTypeTextArea w400"><!--@if($module_info->admin_id)-->{implode(",",$module_info->admin_id)}<!--@end--></textarea>
-            <p>{$lang->about_admin_id}</p>
-        </td>
-    </tr>
     <tr>
-        <td colspan="2" class="right">
-            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </td>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
     </tr>
     </table>
 
diff --git a/modules/tag/conf/info.xml b/modules/tag/conf/info.xml
index 5061ffe64..12881a06d 100644
--- a/modules/tag/conf/info.xml
+++ b/modules/tag/conf/info.xml
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">標籤管理模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>utility</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/tccommentnotify/conf/info.xml b/modules/tccommentnotify/conf/info.xml
index d0a15ae73..891fee417 100644
--- a/modules/tccommentnotify/conf/info.xml
+++ b/modules/tccommentnotify/conf/info.xml
@@ -12,7 +12,7 @@
     <description xml:lang="zh-TW">當有新評論時，此模組會告知。</description>
     <version>0.2.1</version>
     <date>2008-07-31</date>
-    <category>accessory</category>
+    <category>interlock</category>
 
     <author email_address="haneul0318@gmail.com" link="http://seungyeop.kr">
         <name xml:lang="ko">haneul</name>
diff --git a/modules/tccommentnotify/conf/module.xml b/modules/tccommentnotify/conf/module.xml
index ddc60d5af..70c967428 100644
--- a/modules/tccommentnotify/conf/module.xml
+++ b/modules/tccommentnotify/conf/module.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
-    <action name="dispCommentNotifyAdminIndex" type="view" standalone="true" admin_index="true" />
-    <action name="procCommentNotifyAdminDeleteChild" type="controller" standalone="true" />
-    <action name="procCommentNotifyAdminDeleteParent" type="controller" standalone="true" />
-    <action name="procCommentNotifyAdminDeleteChecked" type="controller" standalone="true" />
-    <action name="procDoNotify" type="controller" standalone="true" />
+        <action name="dispCommentNotifyAdminIndex" type="view" standalone="true" admin_index="true" />
+        <action name="procCommentNotifyAdminDeleteChild" type="controller" standalone="true" />
+        <action name="procCommentNotifyAdminDeleteParent" type="controller" standalone="true" />
+        <action name="procCommentNotifyAdminDeleteChecked" type="controller" standalone="true" />
+        <action name="procDoNotify" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/tccommentnotify/lang/zh-CN.lang.php b/modules/tccommentnotify/lang/zh-CN.lang.php
index 4eee57119..5f7e83ed2 100644
--- a/modules/tccommentnotify/lang/zh-CN.lang.php
+++ b/modules/tccommentnotify/lang/zh-CN.lang.php
@@ -1,4 +1,9 @@
 <?php
+    /**
+     * @file   modules/tccommentnotify/lang/zh-CN.lang.php
+     * @author haneul <haneul0318@gmail.com>　翻译：guny
+     * @brief  评论通告模块简体中文语言包
+     **/
     $lang->commentnotify = '评论通告';
     $lang->msg_checked_comment_is_deleted = '已删除%d个通告。';
     $lang->cmd_delete_checked_comment = '删除所选';
diff --git a/modules/tccommentnotify/tccommentnotify.class.php b/modules/tccommentnotify/tccommentnotify.class.php
index dba1bb393..05139d93e 100644
--- a/modules/tccommentnotify/tccommentnotify.class.php
+++ b/modules/tccommentnotify/tccommentnotify.class.php
@@ -17,10 +17,10 @@
         function moduleInstall() {
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('tccommentnotify', 'view', 'dispCommentNotifyAdminIndex');
 
             // notify를 위한 트리거 추가
             $oModuleController->insertTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after');
+            $oModuleController->insertActionForward('tccommentnotify', 'view', 'dispCommentNotifyAdminIndex');
 
             return new Object();
         }
@@ -30,10 +30,9 @@
          **/
         function checkUpdate() {
             $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after'))
-            {
-                return true;
-            }
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after')) return true;
+            if(!$oModuleModel->getActionForward('dispCommentNotifyAdminIndex')) return true;
+
 
             return false;
         }
@@ -44,10 +43,10 @@
         function moduleUpdate() {
             $oModuleModel = &getModel('module');
             $oModuleController = &getController('module');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after'))
-            {
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after')) 
                 $oModuleController->insertTrigger('comment.insertComment', 'tccommentnotify', 'controller', 'triggerInsertComment', 'after');
-            }
+            if(!$oModuleModel->getActionForward('dispCommentNotifyAdminIndex')) 
+                $oModuleController->insertActionForward('tccommentnotify', 'view', 'dispCommentNotifyAdminIndex');
 
             return new Object(0, 'success_updated');
         }
diff --git a/modules/tccommentnotify/tccommentnotify.controller.php b/modules/tccommentnotify/tccommentnotify.controller.php
index 582380839..d8c32a7a7 100644
--- a/modules/tccommentnotify/tccommentnotify.controller.php
+++ b/modules/tccommentnotify/tccommentnotify.controller.php
@@ -97,10 +97,8 @@
             {
                 foreach($output->data as $data)
                 {
-                    debugPrint("start");
                     $this->deleteFromQueue($data->comment_srl);
                     $this->sendCommentNotify($data->comment_srl);
-                    debugPrint("end");
                 }
             }
             FileHandler::removeFile($lockFilePath);
@@ -139,11 +137,6 @@
             return executeQuery("tccommentnotify.insertQueue", $args);
         }
 
-        function procTestSendComment()
-        {
-            $this->sendCommentNotify(16775);
-        }
-
         function sendCommentNotify($comment_srl)
         {
             set_include_path("./libs/PEAR");
@@ -262,11 +255,8 @@
 
             $oReq->addPostData('r2_body', strip_tags($oChild->get('content')));
 
-            debugPrint($target);
             $oReq->sendRequest(false);
-            debugPrint("ok");
             $code = $oReq->getResponseCode();
-            debugPrint($code);
             return $code;
         }
 
diff --git a/modules/tccommentnotify/tpl/commentnotify_list.html b/modules/tccommentnotify/tpl/commentnotify_list.html
index 7602fa8e2..e5b9928cf 100644
--- a/modules/tccommentnotify/tpl/commentnotify_list.html
+++ b/modules/tccommentnotify/tpl/commentnotify_list.html
@@ -4,16 +4,12 @@
 <!--%import("filter/delete_parent.xml")-->
 <!--%import("filter/delete_checked.xml")-->
 
-<!-- 정보 -->
-<div class="summary topGap">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
-</div>
-
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
@@ -32,8 +28,8 @@
         <td class="nowrap date center">{zdate($parent->written, "Y/m/d")}</td>
         <td class="nowrap"><a href="{$parent->siteurl}" onclick="window.open(this.href);return false;">{$parent->title?$parent->title:"[No title]"}</a></td>
         <td class="nowrap">{$parent->name}</td>
-        <td><a href="{$parent->entryurl}" onclick="window.open(this.href);return false;">{$parent->entrytitle}</a> <a href="{$parent->commenturl}" onclick="window.open(this.href);return false;">{$parent->comment}</a></td>
-        <td class="delete"><a href="#" onclick="deleteParent('{$parent->notified_srl}');">{$lang->cmd_delete}</a></td>
+        <td class="content"><a href="{$parent->entryurl}" onclick="window.open(this.href);return false;">{$parent->entrytitle}</a> <a href="{$parent->commenturl}" onclick="window.open(this.href);return false;">{$parent->comment}</a></td>
+        <td><a href="#" onclick="deleteParent('{$parent->notified_srl}');" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@foreach($val->children as $child)-->
     <tr>
@@ -42,7 +38,7 @@
         <td class="nowrap"><a href="{$parent->siteurl}" onclick="window.open(this.href);return false;">{$parent->title?$parent->title:"[No title]"}</a></td>
         <td class="nowrap">{$child->name}</td>
         <td><img src="images/iconReplyArrow.gif" /> <a href="{$child->url}" onclick="window.open(this.href);return false;">{$child->comment}</a></td>
-        <td class="delete"><a href="#" onclick="deleteChild('{$child->notified_srl}');">{$lang->cmd_delete}</a></td>
+        <td><a href="#" onclick="deleteChild('{$child->notified_srl}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
     </tr>
     <!--@end-->
 
diff --git a/modules/tccommentnotify/tpl/header.html b/modules/tccommentnotify/tpl/header.html
index 32c6f081f..f544d394f 100644
--- a/modules/tccommentnotify/tpl/header.html
+++ b/modules/tccommentnotify/tpl/header.html
@@ -1,3 +1,3 @@
 <!--%import("css/commentnotify.css")-->
-<h3>{$lang->commentnotify} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->commentnotify} <span class="gray">{$lang->cmd_management}</span></h3>
 
diff --git a/modules/trackback/conf/info.xml b/modules/trackback/conf/info.xml
index 2f228079b..e82b9ee3b 100644
--- a/modules/trackback/conf/info.xml
+++ b/modules/trackback/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">엮인글</title>
-    <title xml:lang="zh-CN">引用</title>
+    <title xml:lang="zh-CN">引用管理</title>
     <title xml:lang="jp">トラックバック</title>
     <title xml:lang="en">Trackback</title>
     <title xml:lang="es">Trackback</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">管理引用的模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>utility</category>
+    <category>content</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/trackback/conf/module.xml b/modules/trackback/conf/module.xml
index 0b5e61905..ed6f063ab 100644
--- a/modules/trackback/conf/module.xml
+++ b/modules/trackback/conf/module.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions />
     <actions>
         <action name="dispTrackbackSend" type="view" standalone="true" />
         <action name="dispTrackbackAdminList" type="view" admin_index="true" standalone="true" />
diff --git a/modules/trackback/lang/ko.lang.php b/modules/trackback/lang/ko.lang.php
index b6e58ec30..d8bab935d 100644
--- a/modules/trackback/lang/ko.lang.php
+++ b/modules/trackback/lang/ko.lang.php
@@ -23,6 +23,6 @@
         'ipaddress' => 'IP 주소',
     );
 
-    $lang->enable_trackback = "엮인글 사용";
-    $lang->about_enable_trackback = "체크를 해제하시면 사이트내에 모든 글의 엮인글 접수를 중지합니다";
+    $lang->enable_trackback = '엮인글 사용';
+    $lang->about_enable_trackback = '체크를 해제하시면 사이트내에 모든 글의 엮인글 접수를 중지합니다';
 ?>
diff --git a/modules/trackback/lang/zh-CN.lang.php b/modules/trackback/lang/zh-CN.lang.php
index 9b305afb8..05eca626f 100644
--- a/modules/trackback/lang/zh-CN.lang.php
+++ b/modules/trackback/lang/zh-CN.lang.php
@@ -1,7 +1,7 @@
 <?php
     /**
      * @file   modules/trackback/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
+     * @author zero <zero@nzeo.com> 翻译：guny
      * @brief  引用(trackback) 模块的基本语言包
      **/
     $lang->cmd_toggle_checked_trackback = '反选';
diff --git a/modules/trackback/queries/getNewestTrackbackList.xml b/modules/trackback/queries/getNewestTrackbackList.xml
index d5c058a11..9d0860a0f 100644
--- a/modules/trackback/queries/getNewestTrackbackList.xml
+++ b/modules/trackback/queries/getNewestTrackbackList.xml
@@ -1,15 +1,18 @@
 <query id="getNewestTrackbackList" action="select">
     <tables>
         <table name="trackbacks" />
+        <table name="modules" />
     </tables>
     <columns>
-        <column name="*" />
+        <column name="trackbacks.*" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="module_srl" filter="number" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" filter="number" pipe="and" />
+        <condition operation="in" column="modules.module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="trackbacks.module_srl" default="modules.module_srl" filter="number" pipe="and" />
     </conditions>
     <navigation>
-        <index var="sort_index" default="list_order" order="asc" />
+        <index var="sort_index" default="trackbacks.list_order" order="asc" />
         <list_count var="list_count" default="20" />
     </navigation>
 </query>
diff --git a/modules/trackback/queries/getTotalTrackbackList.xml b/modules/trackback/queries/getTotalTrackbackList.xml
index 6fb61e06f..340457044 100644
--- a/modules/trackback/queries/getTotalTrackbackList.xml
+++ b/modules/trackback/queries/getTotalTrackbackList.xml
@@ -6,7 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="module_srl" var="s_module_srl" />
+        <condition operation="in" column="module_srl" var="s_module_srl" />
         <group pipe="and">
             <condition operation="like" column="url" var="s_url" />
             <condition operation="like" column="blog_name" var="s_blog_name" pipe="or" />
diff --git a/modules/trackback/tpl/js/trackback_admin.js b/modules/trackback/tpl/js/trackback_admin.js
index de3f22c2b..223352e4f 100644
--- a/modules/trackback/tpl/js/trackback_admin.js
+++ b/modules/trackback/tpl/js/trackback_admin.js
@@ -6,4 +6,8 @@ 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
+}
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    location.href = current_url.setQuery('module_srl',module_srl);
+}
diff --git a/modules/trackback/tpl/send_trackback_form.html b/modules/trackback/tpl/send_trackback_form.html
index 62be291b0..47367fad5 100644
--- a/modules/trackback/tpl/send_trackback_form.html
+++ b/modules/trackback/tpl/send_trackback_form.html
@@ -1,14 +1,14 @@
 <!--%import("filter/send_trackback.xml")-->
 
-<div id="popHeadder">
-    <h3>{$lang->cmd_send_trackback}</h3>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_send_trackback}</h3>
 </div>
 
 <form action="./" method="get" onsubmit="return procFilter(this, send_trackback)">
 <input type="hidden" name="target_srl" value="{$oDocument->document_srl}" />
 
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div><label>{$lang->title}</label></div></th>
         <td>{$oDocument->getTitleText()}</td>
@@ -36,10 +36,7 @@
 </div>
 
 <div id="popFooter">
-    <div class="tCenter gap1">
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-        <span class="button"><input type="submit" value="{$lang->cmd_send_trackback}" /></span>
-    </div>
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_send_trackback}" /></span>
 </div>
 
 </form>
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html
index fe6bad7c8..5e5bb4f7c 100644
--- a/modules/trackback/tpl/trackback_list.html
+++ b/modules/trackback/tpl/trackback_list.html
@@ -2,10 +2,10 @@
 <!--%import("filter/insert_config.xml")-->
 <!--%import("js/trackback_admin.js")-->
 
-<h3>{$lang->trackback} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->trackback} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<table cellspacing="0" class="adminTable topGap">
+<table cellspacing="0" class="rowTable topGap">
 <tr class="row2">
     <th scope="col"><div>{$lang->enable_trackback}</div></th>
 </tr>
@@ -16,68 +16,71 @@
     </td>
 </tr>
 <tr class="row2">
-    <td class="right"><span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></td>
+    <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></th>
 </tr>
 </table>
 </form>
 
-<!-- 정보 -->
-<div class="summary">
-    <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+<!-- 검색 -->
+<div class="fl">
+    <form action="./" method="get" class="adminSearch">
+    <input type="hidden" name="module" value="{$module}" />
+    <input type="hidden" name="act" value="{$act}" />
+    <input type="hidden" name="module_srl" value="{$module_srl}" />
+
+        <fieldset>
+            <select name="search_target">
+                <option value="">{$lang->search_target}</option>
+                <!--@foreach($lang->search_target_list as $key => $val)-->
+                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
+            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
+        </fieldset>
+    </form>
 </div>
 
 <form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
 <input type="hidden" name="page" value="{$page}" />
 
+<!-- 모듈 선택 -->
+<div class="fr">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
+    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_trackback}" /></span>
+</div>
+
+
 <!-- 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="rowTable clear">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 <thead>
     <tr>
         <th scope="col"><div>{$lang->no}</div></th>
         <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col">
-            <div>
-                <select name="module_srl" id="module_srl" class="w120">
-                    <option value="">{$lang->module}</option>
-                    <!--@foreach($mid_list as $key => $val)-->
-                    <option value="{$val->module_srl}" <!--@if($module_srl == $val->module_srl)-->selected="selected"<!--@end-->>{$val->browser_title}</option>
-                    <!--@end-->
-                </select>
-                <input type="button" name="go_button" id="go_button" value="GO" class="buttonTypeGo" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;"/>
-            </div>
-        </th>
         <th scope="col"><div>{$lang->blog_name}</div></th>
         <th scope="col" class="wide"><div>{$lang->title}</div></th>
         <th scope="col"><div>{$lang->date}</div></th>
         <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->cmd_move}</div></th>
     </tr>
 </thead>
 <tbody>
     <!--@foreach($trackback_list as $no => $val)-->
     <tr class="row{$cycle_idx}">
         <td rowspan="2" class="center number" scope="col">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
-        <td><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><a href="{$val->url}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->blog_name)}</a></td>
-        <td>{htmlspecialchars($val->title)}</td>
+        <td rowspan="2" class="center"><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
+        <td rowspan="2"><div class="w200"><a href="{$val->url}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->blog_name)}</a></div></td>
+        <td ><a href="{getUrl('','document_srl',$val->document_srl)}#trackback_{$val->trackback_srl}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a></td>
         <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="center number">{$val->ipaddress}</td>
-        <td class="view"><a href="{getUrl('','document_srl',$val->document_srl)}#trackback_{$val->trackback_srl}" onclick="window.open(this.href);return false;">{$lang->cmd_move}</a></td>
+        <td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
     </tr>
     <tr>
-        <td colspan="7">
+        <td colspan="3">
             {$val->excerpt}
         </td>
     </tr>
     <!--@end-->
-    <tr>
-        <td colspan="8" class="right">
-            <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
-            <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_trackback}" /></span>
-        </td>
-    </tr>
 </tbody>
 </table>
 </form>
@@ -95,22 +98,3 @@
     <!--@end-->
     <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
 </div>
-
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <fieldset>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="{getUrl('','module',$module,'act',$act)}" onclick="window.open(this.href);return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
diff --git a/modules/trackback/tpl/trackback_module_config.html b/modules/trackback/tpl/trackback_module_config.html
index a7e5ff646..409cefe4c 100644
--- a/modules/trackback/tpl/trackback_module_config.html
+++ b/modules/trackback/tpl/trackback_module_config.html
@@ -3,14 +3,14 @@
 <form action="./" method="post" onsubmit="return procFilter(this, insert_trackback_module_config)">
 <input type="hidden" name="target_module_srl" value="{$trackback_config->module_srl?$trackback_config->module_srl:$module_srls}" />
 
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->trackback}</caption> 
+    <h4 class="xeAdmin">{$lang->trackback}</h4> 
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th><div>{$lang->enable_trackback}</div></th>
         <td class="wide"><input type="checkbox" name="enable_trackback" value="Y" <!--@if($trackback_config->enable_trackback == "Y")-->checked="checked"<!--@end--> /></td>
     </tr>
     <tr class="row2">
-        <td class="right" colspan="2"><span class="button"><input type="submit" value="{$lang->cmd_save}"/></span></td>
+        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
     </tr>
     </table>
 </form>
diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php
index 9724e042f..5e6594566 100644
--- a/modules/trackback/trackback.admin.model.php
+++ b/modules/trackback/trackback.admin.model.php
@@ -18,8 +18,8 @@
          **/
         function getTotalTrackbackList($obj) {
             // 검색 옵션 정리
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
 
             if($search_target && $search_keyword) {
                 switch($search_target) {
diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php
index 4e186e285..482b286d1 100644
--- a/modules/trackback/trackback.admin.view.php
+++ b/modules/trackback/trackback.admin.view.php
@@ -24,47 +24,22 @@
 
             // 목록을 구하기 위한 옵션
             $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
+            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
             $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             $args->sort_index = 'list_order'; ///< 소팅 값
             $args->module_srl = Context::get('module_srl');
 
-            // mid목록을 구함
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
-
             // 목록 구함
             $oTrackbackAdminModel = &getAdminModel('trackback');
             $output = $oTrackbackAdminModel->getTotalTrackbackList($args);
 
-            // 목록의 loop를 돌면서 mid를 구하기 위한 module_srl값을 구함
-            $trackback_count = count($output->data);
-            if($trackback_count) {
-                $module_srl_list = array();
-                foreach($output->data as $key => $val) {
-                    $module_srl = $val->module_srl;
-                    if(!in_array($module_srl, $module_srl_list)) $module_srl_list[] = $module_srl;
-                }
-                if(count($module_srl_list)) {
-                    $args->module_srls = implode(',',$module_srl_list);
-                    $mid_output = executeQuery('module.getModuleInfoByModuleSrl', $args);
-                    if($mid_output->data && !is_array($mid_output->data)) $mid_output->data = array($mid_output->data);
-                    for($i=0;$i<count($mid_output->data);$i++) {
-                        $mid_info = $mid_output->data[$i];
-                        $module_list[$mid_info->module_srl] = $mid_info;
-                    }
-                }
-            }
-
             // 템플릿에 쓰기 위해서 변수 설정
             Context::set('total_count', $output->total_count);
             Context::set('total_page', $output->total_page);
             Context::set('page', $output->page);
             Context::set('trackback_list', $output->data);
             Context::set('page_navigation', $output->page_navigation);
-            Context::set('module_list', $module_list);
 
             // 템플릿 지정
             $this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php
index a421ebb50..9393c6bb5 100644
--- a/modules/trackback/trackback.class.php
+++ b/modules/trackback/trackback.class.php
@@ -14,7 +14,6 @@
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
             $oModuleController->insertActionForward('trackback', 'controller', 'trackback');
-            $oModuleController->insertActionForward('trackback', 'view', 'dispTrackbackAdminList');
 
             // 2007. 10. 17 게시글이 삭제될때 엮인글도 삭제되도록 trigger 등록
             $oModuleController->insertTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after');
@@ -84,38 +83,5 @@
         function recompileCache() {
         }
 
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'procTrackbackAdminInsertModuleConfig' :
-                        if(!$args->target_module_srl) return false;
-
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->target_module_srl);
-                        if(!$module_info) return false;
-
-                        if($oModuleModel->isModuleAdmin($module_info, $logged_info)) return true; 
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php
index 67496500c..73276efce 100644
--- a/modules/trackback/trackback.controller.php
+++ b/modules/trackback/trackback.controller.php
@@ -229,7 +229,7 @@
         function sendTrackback($oDocument, $trackback_url, $charset) {
             // 발송할 정보를 정리
             $http = parse_url($trackback_url);
-            $obj->blog_name = Context::getBrowserTitle();
+            $obj->blog_name = str_replace(array('&lt;','&gt;','&amp;','&quot;'), array('<','>','&','"'), Context::getBrowserTitle());
             $obj->title = $oDocument->getTitleText();
             $obj->excerpt = $oDocument->getSummary(200);
             $obj->url = getUrl('','document_srl',$oDocument->document_srl);
diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php
index 332bf49bb..9e146f4e3 100644
--- a/modules/trackback/trackback.model.php
+++ b/modules/trackback/trackback.model.php
@@ -76,6 +76,9 @@
             if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
             else $args->module_srl = $obj->module_srl;
             $args->list_count = $obj->list_count;
+            $args->site_srl = (int)$obj->site_srl;
+            $args->sort_index = 'trackbacks.list_order';
+            $args->order = 'asc';
 
             $output = executeQueryArray('trackback.getNewestTrackbackList', $args);
 
diff --git a/modules/widget/conf/info.xml b/modules/widget/conf/info.xml
index 125a23919..70e837c3f 100644
--- a/modules/widget/conf/info.xml
+++ b/modules/widget/conf/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="0.2">
     <title xml:lang="ko">위젯</title>
-    <title xml:lang="zh-CN">控件</title>
+    <title xml:lang="zh-CN">控件管理</title>
     <title xml:lang="jp">ウィジェット</title>
     <title xml:lang="en">Widget</title>
     <title xml:lang="es">Widget</title>
@@ -16,7 +16,7 @@
     <description xml:lang="zh-TW">控件管理模組。</description>
     <version>0.1</version>
     <date>2007-02-28</date>
-    <category>manager</category>
+    <category>construction</category>
 
     <author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
         <name xml:lang="ko">zero</name>
diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml
index c19c308aa..f66c49875 100644
--- a/modules/widget/conf/module.xml
+++ b/modules/widget/conf/module.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
+    <grants />
+    <permissions />
     <actions>
         <action name="dispWidgetInfo" type="view" standalone="true" />
         <action name="dispWidgetGenerateCode" type="view" standalone="true" />
         <action name="dispWidgetGenerateCodeInPage" type="view" standalone="true" />
-
+        <action name="dispWidgetStyleGenerateCodeInPage" type="view" standalone="true" />
         <action name="dispWidgetAdminDownloadedList" type="view" standalone="true" admin_index="true" />
         <action name="dispWidgetAdminAddContent" type="view" standalone="true" />
-
         <action name="procWidgetGenerateCode" type="controller" standalone="true" />
+        <action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />
+        <action name="procWidgetStyleGenerateCodeInPage" type="controller" standalone="true" />
         <action name="procWidgetAddContent" type="controller" standalone="true" />
         <action name="procWidgetInsertDocument" type="controller" standalone="true" />
         <action name="procWidgetCopyDocument" type="controller" standalone="true" />
@@ -16,5 +19,8 @@
         <action name="procWidgetGenerateCodeInPage" type="controller" standalone="true" />
         <action name="procWidgetGetColorsetList" type="controller" standalone="true" />
         <action name="procWidgetRemoveContents" type="controller" standalone="true" />
+
+        <action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />
+        <action name="procWidgetStyleGenerateCodeInPage" type="controller" standalone="true" />
     </actions>
-</module>
+</module>
\ No newline at end of file
diff --git a/modules/widget/lang/en.lang.php b/modules/widget/lang/en.lang.php
index 22a2dc1ee..a6829e9d7 100644
--- a/modules/widget/lang/en.lang.php
+++ b/modules/widget/lang/en.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = 'Cached data can be used during the time you have set.';
 
     $lang->generated_code = 'Generated Code';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = "'%s' does not exist.";
     $lang->msg_widget_object_is_null = "Object of '%s' could not be created.";
diff --git a/modules/widget/lang/es.lang.php b/modules/widget/lang/es.lang.php
index a7fc3bab1..7eeb61087 100644
--- a/modules/widget/lang/es.lang.php
+++ b/modules/widget/lang/es.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = 'Se puede usar datos de caché creado durante el tiempo asignado.';
 
     $lang->generated_code = 'Generar códigos';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = 'No existe widget %s .';
     $lang->msg_widget_object_is_null = 'No puede ser creado el objeto de widget %s.';
diff --git a/modules/widget/lang/fr.lang.php b/modules/widget/lang/fr.lang.php
index 873851022..dd0b184a4 100644
--- a/modules/widget/lang/fr.lang.php
+++ b/modules/widget/lang/fr.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = 'Les données d\'antémémoire peuvent être utilisées pendant le temps que vous désignez.';
 
     $lang->generated_code = 'Code généré';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = "Le Gadget de(d') '%s' n'existe pas.";
     $lang->msg_widget_object_is_null = "L'Objet de '%s' n'a pas pu être créé.";
diff --git a/modules/widget/lang/jp.lang.php b/modules/widget/lang/jp.lang.php
index c014bcc24..557f7e61c 100644
--- a/modules/widget/lang/jp.lang.php
+++ b/modules/widget/lang/jp.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = '指定された時間内にキャッシュされたデータが利用できます。';
 
     $lang->generated_code = '生成コード';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = '%s ウィジェットが見つかりません。';
     $lang->msg_widget_object_is_null = '%s ウィジェットのオブジェクトが生成できません。';
diff --git a/modules/widget/lang/ko.lang.php b/modules/widget/lang/ko.lang.php
index ec4132c62..e4266fbdc 100644
--- a/modules/widget/lang/ko.lang.php
+++ b/modules/widget/lang/ko.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = '지정된 시간동안 캐시된 데이터를 이용할 수 있습니다.';
 
     $lang->generated_code = '생성된 코드';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = '%s 위젯을 찾을 수 없습니다';
     $lang->msg_widget_object_is_null = '%s 위젯의 객체 생성을 할 수가 없습니다';
@@ -43,25 +44,25 @@
     $lang->about_widget_code_in_page = '아래 필요한 값들을 입력하신 후 추가 버튼을 누르시면 페이지 내에 위젯이 삽입이 됩니다';
     $lang->about_widget = "위젯은 레이아웃이나 페이지 모듈에서 사용되는 작은 구성요소입니다.\n내부 모듈 또는 외부 open api와 연동될 수도 있고 설정을 통해서 다양한 응용이 가능합니다.\nXE의 페이지 모듈이나 레이아웃 모듈을 사용하지 않더라도 [코드생성] 기능을 통해 직접 위젯 추가도 할 수 있습니다";
 
-    $lang->cmd_content_insert = "내용 직접 추가";
-    $lang->cmd_box_widget_insert = "상자 위젯 추가";
-    $lang->cmd_remove_all_widgets  = "내용 모두 지우기";
+    $lang->cmd_content_insert = '내용 직접 추가';
+    $lang->cmd_box_widget_insert = '상자 위젯 추가';
+    $lang->cmd_remove_all_widgets  = '내용 모두 지우기';
 
-    $lang->cmd_widget_size = "위젯 크기";
-    $lang->cmd_widget_align = "위젯 정렬";
-    $lang->cmd_widget_align_left = "왼쪽";
-    $lang->cmd_widget_align_right = "오른쪽";
-    $lang->cmd_widget_margin = "외부 여백";
-    $lang->cmd_widget_padding = "내부 여백";
-    $lang->cmd_widget_border = "위젯 테두리";
-    $lang->cmd_widget_border_solid = "실선";
-    $lang->cmd_widget_border_dotted = "점선";
-    $lang->cmd_widget_background_color = "배경색";
-    $lang->cmd_widget_background_image_url = "배경 이미지";
-    $lang->cmd_widget_background_image_repeat = "반복";
-    $lang->cmd_widget_background_image_no_repeat = "고정";
-    $lang->cmd_widget_background_image_x_repeat = "가로 반복";
-    $lang->cmd_widget_background_image_y_repeat = "세로 반복";
-    $lang->cmd_widget_background_image_x = "가로 위치";
-    $lang->cmd_widget_background_image_y = "세로 위치";
+    $lang->cmd_widget_size = '위젯 크기';
+    $lang->cmd_widget_align = '위젯 정렬';
+    $lang->cmd_widget_align_left = '왼쪽';
+    $lang->cmd_widget_align_right = '오른쪽';
+    $lang->cmd_widget_margin = '외부 여백';
+    $lang->cmd_widget_padding = '내부 여백';
+    $lang->cmd_widget_border = '위젯 테두리';
+    $lang->cmd_widget_border_solid = '실선';
+    $lang->cmd_widget_border_dotted = '점선';
+    $lang->cmd_widget_background_color = '배경색';
+    $lang->cmd_widget_background_image_url = '배경 이미지';
+    $lang->cmd_widget_background_image_repeat = '반복';
+    $lang->cmd_widget_background_image_no_repeat = '고정';
+    $lang->cmd_widget_background_image_x_repeat = '가로 반복';
+    $lang->cmd_widget_background_image_y_repeat = '세로 반복';
+    $lang->cmd_widget_background_image_x = '가로 위치';
+    $lang->cmd_widget_background_image_y = '세로 위치';
 ?>
diff --git a/modules/widget/lang/ru.lang.php b/modules/widget/lang/ru.lang.php
index 04bf6ac0f..24004d72a 100644
--- a/modules/widget/lang/ru.lang.php
+++ b/modules/widget/lang/ru.lang.php
@@ -33,6 +33,7 @@
     $lang->about_widget_cache = 'Кешированные данные будут использоваться на указанный срок.';
 
     $lang->generated_code = 'Сгенерированный код';
+    $lang->widgetstyle= '위젯스타일';
 
     $lang->msg_widget_is_not_exists = '%s виджет не существует.';
     $lang->msg_widget_object_is_null = '%s объектов виджета не могут быть созданы.';
diff --git a/modules/widget/lang/zh-CN.lang.php b/modules/widget/lang/zh-CN.lang.php
index 631a52dee..63546d502 100644
--- a/modules/widget/lang/zh-CN.lang.php
+++ b/modules/widget/lang/zh-CN.lang.php
@@ -1,8 +1,8 @@
 <?php
     /**
      * @file   modules/widget/lang/zh-CN.lang.php
-     * @author zero <zero@nzeo.com>
-     * @brief  控件(widget) 模块语言包
+     * @author zero <zero@nzeo.com> 翻译：guny
+     * @brief  控件(widget)模块简体中文语言包
      **/
 
     $lang->cmd_generate_code = '生成代码';
@@ -33,13 +33,14 @@
     $lang->about_widget_cache = '指定的时间内可以利用已缓冲的数据。';
 
     $lang->generated_code = '已生成的代码';
+    $lang->widgetstyle= '控件样式';
 
     $lang->msg_widget_is_not_exists = '找不到%s控件！';
     $lang->msg_widget_object_is_null = '无法生成%s控件对象！';
     $lang->msg_widget_proc_is_null = '不能执行%s控件的 proc()！';
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다';
+    $lang->msg_widget_skin_is_null = '请选择控件皮肤！';
 
-    $lang->about_widget_code = '输入被选控件所需要的下列各项后，按『代码生成』按钮，即可在页面下方获得可以用在布局模版代码片断。';
+    $lang->about_widget_code = '输入所选控件所需要的下列各项后，按『代码生成』按钮，即可在页面下方获得可以用在布局模版代码片断。';
     $lang->about_widget_code_in_page = '输入下列各项必要值后，按『生成代码』按钮，即可把控件插入到页面当中。';
     $lang->about_widget = "控件是在布局或页面模块中使用的一种小部件。\n不仅可以关联内部模块或外部open api，而且通过设置可以用在多种用途。\n即使不使用XE的页面模块或布局模块，也可以通过『代码生成』功能直接可以添加相应控件。";
 
diff --git a/modules/widget/lang/zh-TW.lang.php b/modules/widget/lang/zh-TW.lang.php
index 8679057f0..dc611d59a 100644
--- a/modules/widget/lang/zh-TW.lang.php
+++ b/modules/widget/lang/zh-TW.lang.php
@@ -33,11 +33,12 @@
     $lang->about_widget_cache = '指定的時間內可以利用已暫存的資料。';
 
     $lang->generated_code = '已建立的原始碼';
+    $lang->widgetstyle= '控件樣式';
 
     $lang->msg_widget_is_not_exists = '找不到%s控件！';
     $lang->msg_widget_object_is_null = '無法建立%s控件目標！';
     $lang->msg_widget_proc_is_null = '無法執行%s控件的 proc()！';
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다';
+    $lang->msg_widget_skin_is_null = '請選擇一個可正常使用的控件面板';
 
     $lang->about_widget_code = '輸入所選控件所需要的各項資料後，按『建立原始碼』按鈕，即可在頁面下方獲得運用在版面設計中的部分原始碼。';
     $lang->about_widget_code_in_page = '輸入下列各項必要資料後，按『建立原始碼』按鈕，即可把控件插入到頁面當中。';
diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html
index 618b9bdda..f2f273a76 100644
--- a/modules/widget/tpl/add_content_widget.html
+++ b/modules/widget/tpl/add_content_widget.html
@@ -1,7 +1,10 @@
 <!--%import("js/widget.js")-->
 <!--%import("css/widget.css")-->
 
-<div class="pageAddContent"></div>
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_content_insert}</h3>
+</div>
+
 <form action="./" method="get" onsubmit="return addContentWidget(this); return false;" id="content_fo">
 <input type="hidden" name="content" value="{$oDocument->getContentText()}" />
 <input type="hidden" name="mid" value="{$module_info->mid}" />
@@ -13,17 +16,20 @@
 <input type="hidden" name="widget_padding_top" value="" />
 <input type="hidden" name="widget_padding_bottom" value="" />
 
-    <div class="editor">
-        {$editor}
-    </div>
+<div id="popBody">
+    <div class="pageAddContent"></div>
 
-    <div class="tCenter help">
-        <span class="button"><input type="submit" value="{$lang->cmd_insert}" class="editor_button" accesskey="s" /></span>
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
+        <div class="editor">
+            {$editor}
+        </div>
+
+    <script type="text/javascript">
+        xAddEventListener(window, 'load', doSyncPageContent);
+    </script>
+</div>
+
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" class="editor_button" accesskey="s" /></span>
+</div>
 
 </form>
-
-<script type="text/javascript">
-    xAddEventListener(window, 'load', doSyncPageContent);
-</script>
diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css
index 130537c33..b28774fb4 100644
--- a/modules/widget/tpl/css/widget.css
+++ b/modules/widget/tpl/css/widget.css
@@ -26,6 +26,7 @@
 #widgetButton { background-color:#C7DBE9;left:0; top:0;}
 #widgetBoxButton { background-color:#D2E9C7; right:0; top:0;}
 .widgetButtons div { float:left; }
+.widgetButtons .widgetStyle { background:transparent url("../images/widgetstyle_setup.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
 .widgetButtons .widgetSetup { background:transparent url("../images/widget_setup.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
 .widgetButtons .widgetCopy { background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
 .widgetButtons .widgetSize { background:transparent url("../images/widget_size.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
@@ -55,3 +56,7 @@ div.editor { width:700px; }
 ul.midCommand { float:left; margin:0 0 0 10px;; padding:0; *zoom:1; }
 ul.midCommand li { display:block; margin-bottom:5px; list-style:none;}
 
+a.widgetStyle { float:left; margin-right:10px; border:1px solid #CCC; overflow:hidden; *zoom:1; }
+a.widgetStyle:hover { border:1px solid #444; }
+a.widgetStyle.selected { border:1px solid #000; }
+a.widgetStyle img {width:96px; height:96px; margin:1px; }
diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html
index f5299f00c..780ff550e 100644
--- a/modules/widget/tpl/downloaded_widget_list.html
+++ b/modules/widget/tpl/downloaded_widget_list.html
@@ -1,10 +1,10 @@
-<h3>{$lang->widget} <span class="gray">{$lang->cmd_management}</span></h3>
+<h3 class="xeAdmin">{$lang->widget} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!-- 설명 -->
 <div class="infoText">{nl2br($lang->about_widget)}</div>
 
 <!-- 위젯의 목록 -->
-<table cellspacing="0" class="adminTable">
+<table cellspacing="0" class="crossTable">
 <thead>
     <tr>
         <th scope="col"><div>{$lang->widget_name}<div></th>
diff --git a/modules/widget/tpl/filter/style_generate_code_in_page.xml b/modules/widget/tpl/filter/style_generate_code_in_page.xml
new file mode 100644
index 000000000..bf81033a5
--- /dev/null
+++ b/modules/widget/tpl/filter/style_generate_code_in_page.xml
@@ -0,0 +1,9 @@
+<filter name="style_generate_code_in_page" module="widget" act="procWidgetGenerateCodeInPage">
+    <response callback_func="completeGenerateCodeInPage">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="widget_code" />
+        <tag name="tpl" />
+        <tag name="css_header" />
+    </response>
+</filter>
\ No newline at end of file
diff --git a/modules/widget/tpl/images/widgetstyle_none.gif b/modules/widget/tpl/images/widgetstyle_none.gif
new file mode 100644
index 000000000..b1ba97fc8
Binary files /dev/null and b/modules/widget/tpl/images/widgetstyle_none.gif differ
diff --git a/modules/widget/tpl/images/widgetstyle_setup.gif b/modules/widget/tpl/images/widgetstyle_setup.gif
new file mode 100644
index 000000000..19200f722
Binary files /dev/null and b/modules/widget/tpl/images/widgetstyle_setup.gif differ
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index f63bf2a67..126d33f21 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -6,19 +6,19 @@
 
 /* document.write(ln)의 경우 ajax로 처리시 가로채기 위한 함수 */
 document.write = document.writeln = function(str){
-	if ( str.match(/^<\//) ) return;
-	if ( !window.opera ) str = str.replace(/&(?![#a-z0-9]+;)/g, "&");
+    if ( str.match(/^<\//) ) return;
+    if ( !window.opera ) str = str.replace(/&(?![#a-z0-9]+;)/g, "&");
     str = str.replace(/(<[a-z]+)/g, "$1 xmlns='http://www.w3.org/1999/xhtml'");
     var div = null;
     if(document.createElementNS) div = document.createElementNS("http://www.w3.org/1999/xhtml","div");
     else div = xCreateElement('div');
     xInnerHtml(div, str);
-	var pos;
+    var pos;
     pos = document.getElementsByTagName("*");
     pos = pos[pos.length - 1];
-	var nodes = div.childNodes;
-	while ( nodes.length ) {
-		pos.parentNode.appendChild( nodes[0] );
+    var nodes = div.childNodes;
+    while ( nodes.length ) {
+        pos.parentNode.appendChild( nodes[0] );
     }
 };
 
@@ -61,7 +61,9 @@ function doStartPageModify(zoneID, module_srl) {
     var dummy = xCreateElement("div");
     xInnerHtml(dummy, xInnerHtml(obj));
     dummy.id="pageSizeLayer";
+    dummy.className=obj.className;
     dummy.style.visibility = "hidden";
+    dummy.style.display = "block";
     dummy.style.position = "absolute";
     dummy.style.left = 0;
     dummy.style.top = 0;
@@ -115,21 +117,54 @@ function getWidgetContent(obj) {
         }
         childObj = childObj.nextSibling;
     }
-
     return html;
 }
 
 // 컨텐츠 위젯 코드 구함
 function getContentWidgetCode(childObj, widget) {
     var cobj = childObj.firstChild;
-    while(cobj) {
-        if(cobj.nodeName == "DIV" && cobj.className == "widgetContent") {
-            var body = xInnerHtml(cobj);
-            var document_srl = childObj.getAttribute('document_srl');
-            if(document_srl>0) body = '';
-            return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" />';
+
+    var widgetContent = jQuery('div.widgetContent',childObj);
+    var body = '';
+    var document_srl = 0;
+    var attrs ='';
+
+    if(widgetContent.size() > 0){
+        document_srl = jQuery(childObj).attr('document_srl');
+        if(document_srl>0){
+            body = '';
+        }else{
+            body = widgetContent.html();
         }
-        cobj = cobj.nextSibling;
+
+
+        for(var i=0;i<childObj.attributes.length;i++) {
+            if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue) continue;
+            var name = childObj.attributes[i].nodeName.toLowerCase();
+            if(name == "contenteditable"
+                || name == "id"
+                || name=="style"
+                || name=="src"
+                || name=="widget"
+                || name == "body"
+                || name == "class"
+                || name == "widget_width"
+                || name == "widget_width_type"
+                || name == "xdpx"
+                || name == "xdpy"
+                || name == "height"
+                || name == "document_srl"
+                || name == "widget_padding_left"
+                || name == "widget_padding_right"
+                || name == "widget_padding_top"
+                || name == "widget_padding_bottom") continue;
+            var value = childObj.attributes[i].nodeValue;
+            if(!value) continue;
+            attrs += name+'="'+escape(value)+'" ';
+        }
+        return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />';
+    }else{
+        return '';
     }
 }
 
@@ -173,13 +208,14 @@ function getWidgetCode(childObj, widget) {
  **/
 // 팝업 띄움
 function doAddContent(mid) {
-    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetAdminAddContent').setQuery('module_srl',zoneModuleSrl).setQuery('mid',mid);
+    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetAdminAddContent').setQuery('module_srl',zoneModuleSrl);
     popopen(url, "addContent");
 }
 
 // 직접 내용을 입력하기 위한 에디터 활성화 작업 및 form 데이터 입력
 function doSyncPageContent() {
     if(opener && opener.selectedWidget) {
+
         var fo_obj = xGetElementById("content_fo");
         var sel_obj = opener.selectedWidget;
         fo_obj.style.value = getStyle(opener.selectedWidget);
@@ -211,7 +247,6 @@ function addContentWidget(fo_obj) {
     var module_srl = fo_obj.module_srl.value;
     var document_srl = fo_obj.document_srl.value;
     var content = editorGetContent(editor_sequence);
-
     var response_tags = new Array('error','message','document_srl');
     var params = new Array();
     params['editor_sequence'] = editor_sequence;
@@ -219,12 +254,19 @@ function addContentWidget(fo_obj) {
     params['module_srl'] = module_srl;
     params['document_srl'] = document_srl;
     exec_xml('widget',"procWidgetInsertDocument",params,completeAddContent,response_tags,params,fo_obj);
-
     return false;
+
 }
 
 function completeAddContent(ret_obj, response_tags, params, fo_obj) {
     var document_srl = ret_obj['document_srl'];
+
+    var contentWidget = opener.jQuery('div.widgetOutput[widget=widgetContent][document_srl='+document_srl+']');
+    var attr = null;
+    if(contentWidget.size()>0) {
+        attr = contentWidget.get(0).attributes;
+    }
+
     var tpl = ''+
         '<div class="widgetOutput" style="'+fo_obj.style.value+'" widget_padding_left="'+fo_obj.widget_padding_left.value+'" widget_padding_right="'+fo_obj.widget_padding_right.value+'" widget_padding_top="'+fo_obj.widget_padding_top.value+'" widget_padding_bottom="'+fo_obj.widget_padding_bottom.value+'" document_srl="'+document_srl+'" widget="widgetContent">'+
         '<div class="widgetResize"></div>'+
@@ -235,6 +277,17 @@ function completeAddContent(ret_obj, response_tags, params, fo_obj) {
         '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;"></div>'+
         '</div>';
 
+    var oTpl = jQuery(tpl);
+    if(attr) {
+        jQuery.each(attr,function(i){
+            if(!oTpl.attr(attr[i].name)){
+                oTpl.attr(attr[i].name,attr[i].value);
+            }
+        });
+    }
+
+    oTpl = jQuery('<div>').append(oTpl);
+    tpl = oTpl.html();
     opener.doAddWidgetCode(tpl);
     window.close();
 }
@@ -262,7 +315,7 @@ function doAddWidget(fo) {
     var val = sel.options[idx].value;
     var module_srl = fo.module_srl.value;
 
-    var url = current_url.setQuery('module','widget').setQuery('act','dispWidgetGenerateCodeInPage').setQuery('selected_widget', val).setQuery('module_srl', module_srl);
+    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetGenerateCodeInPage').setQuery('selected_widget', val).setQuery('module_srl', module_srl);
     popopen(url,'GenerateWidgetCode');
 }
 
@@ -320,7 +373,7 @@ function doAddWidgetCode(widget_code) {
 
     var fo_obj = xGetElementById('pageFo');
     fo_obj.content.value = tpl;
-
+    fo_obj.mid.value = current_mid;
     fo_obj.submit();
 }
 
@@ -345,7 +398,17 @@ function doCheckWidget(e) {
         if(!widget) return;
         selectedWidget = p_obj;
         if(widget == 'widgetContent') popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl"), "addContent");
-        else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget,'GenerateCodeInPage');
+        else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
+        return;
+
+    // 위젯 스타일
+    } else if(obj.className == 'widgetStyle') {
+        var p_obj = obj.parentNode.parentNode;
+        var widget = p_obj.getAttribute("widget");
+        var widgetstyle = p_obj.getAttribute("widgetstyle");
+        if(!widget) return;
+        selectedWidget = p_obj;
+        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
         return;
 
     // 위젯 복사
@@ -471,7 +534,7 @@ function doCheckWidgetDrag(e) {
 
     doHideWidgetSizeSetup();
 
-    if(obj.className == 'widgetSetup' || obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy' || obj.className == 'widgetSize' || obj.className == 'widgetBoxSize' || obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') return;
+    if(obj.className == 'widgetSetup' || obj.className == 'widgetStyle' || obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy' || obj.className == 'widgetSize' || obj.className == 'widgetBoxSize' || obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') return;
 
     p_obj = obj;
     while(p_obj) {
@@ -733,20 +796,15 @@ function showWidgetButton(name, obj) {
     var widgetButton = xGetElementById(name);
     if(!widgetButton) return;
     widgetButton.style.visibility = 'visible';
-
+    obj.insertBefore(widgetButton, obj.firstChild);
+    /*
     var cobj = obj.firstChild;
     while(cobj) {
-        if(cobj.nodeName == "DIV" && cobj.className == "widgetBorder") {
-            if(/embed/i.test(xInnerHtml(cobj))) {
-                hideElements[hideElements.length] = cobj;
-                cobj.style.paddingTop = '20px';
-            }
-        }
         cobj = cobj.nextSibling;
     }
 
     obj.appendChild(widgetButton);
-
+    */
 }
 
 function widgetSetup(evt) {
diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js
index 6dad1bfda..5a9ff73f4 100644
--- a/modules/widget/tpl/js/widget_admin.js
+++ b/modules/widget/tpl/js/widget_admin.js
@@ -7,7 +7,8 @@
 /* 생성된 코드를 textarea에 출력 */
 function completeGenerateCode(ret_obj) {
     var widget_code = ret_obj["widget_code"];
-
+        widget_code = widget_code.replace(/&/g, "&amp;");
+        widget_code = widget_code.replace(/\'/g, "&apos;");
     var zone = xGetElementById("widget_code");
     zone.value = widget_code;
 }
@@ -21,7 +22,6 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     }
 
     opener.doAddWidgetCode(widget_code);
-
     window.close();
 }
 
@@ -68,9 +68,30 @@ function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
     setFixedPopupSize();
 }
 
-/* 페이지 모듈에서 내용의 위젯을 더블클릭하여 수정하려고 할 경우 */
+
 var selected_node = null;
+/* 페이지 모듈에서 위젯스타일 수정하려고 할 경우 */
+function getWidgetVars() {
+    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
+    selected_node = opener.selectedWidget;
+
+    var fo_widget = jQuery('#fo_widget');
+    var attrs = selected_node.attributes;
+    for (i=0; i< attrs.length ; i++){
+        var input = jQuery("[name='"+attrs[i].name+"']" ,'#fo_widget');
+        if( input.size() == 0 && attrs[i].name != 'style'){
+            fo_widget.prepend('<input type="hidden" name="'+attrs[i].name+'" value="'+attrs[i].value+'" />');
+        }else{
+            if(!input.val() && attrs[i].value ){
+                input.val(attrs[i].value);
+            }
+        }
+    }
+}
+
+/* 페이지 모듈에서 내용의 위젯을 더블클릭하여 수정하려고 할 경우 */
 function doFillWidgetVars() {
+
     if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
 
     selected_node = opener.selectedWidget;
@@ -80,15 +101,31 @@ function doFillWidgetVars() {
     var colorset = selected_node.getAttribute("colorset");
     var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10);
 
+    var fo_widget = jQuery("#fo_widget");
     var fo_obj = xGetElementById("fo_widget");
+    jQuery('#widget_skin').val(skin);
 
+    // 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
+    var attrs = selected_node.attributes;
+    for (i=0; i< attrs.length ; i++){
+        var name = attrs[i].name;
+        var value = jQuery(selected_node).attr(name);
+        if(value=='Array') continue;
+        if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value || name == 'style') continue;
+
+        var dummy = jQuery('<input type="hidden" name="'+name+'" >').val(value).appendTo("#fo_widget").get(0);
+    }
+
+    // 위젯의 속성 설정
     var obj_list = new Array();
-    jQuery('form input, form select, form textarea').each( function() {
+    jQuery('input,select,textarea','#fo_widget').each( function() {
             obj_list.push(this);
     });
+
     for(var j=0;j<obj_list.length;j++) {
         var node = obj_list[j];
         if(node.name.indexOf('_')==0) continue;
+
         var length = node.length;
         var type = node.type;
         if((typeof(type)=='undefined'||!type) && typeof(length)!='undefined' && typeof(node[0])!='undefined' && length>0) type = node[0].type;
@@ -111,8 +148,8 @@ function doFillWidgetVars() {
                         if(fo_obj[name].length) {
                             for(var i=0;i<fo_obj[name].length;i++) {
                                 var v = fo_obj[name][i].value;
-                                for(var j=0;j<val.length;j++) {
-                                    if(v == val[j]) {
+                                for(var k=0;k<val.length;k++) {
+                                    if(v == val[k]) {
                                         fo_obj[name][i].checked=true;
                                         break;
                                     }
@@ -327,3 +364,126 @@ function selectWidget(val){
     var url =current_url.setQuery('selected_widget', val);
     document.location.href = url;
 }
+
+function widgetstyle_extra_image_upload(f){
+    f.act.value='procWidgetStyleExtraImageUpload';
+    f.submit();
+}
+
+
+
+
+function MultiOrderSet(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+
+    var value = [];
+    for(i=0;i<selectedObj.options.length;i++){
+        value.push(selectedObj.options[i].value);
+    }
+    jQuery("[name='"+id+"']").val(value.join(','));
+}
+
+
+function MultiOrderAdd(id){
+    var showObj = jQuery("[name='show_"+id+"']").get(0);
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
+
+    if(showObj.selectedIndex<0) return;
+    var idx = showObj.selectedIndex;
+    var svalue = showObj.options[idx].value;
+
+
+    for(i=0;i<selectedObj.options.length;i++){
+        if(selectedObj.options[i].value == svalue) return;
+    }
+    selectedObj.options.add(new Option(svalue, svalue, false, false));
+
+    MultiOrderSet(id);
+}
+
+
+function MultiOrderDelete(id){
+    var showObj = jQuery("[name='show_"+id+"']").get(0);
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
+
+    var idx = selectedObj.selectedIndex;
+    if(idx<0) return;
+    for(i=0;i<defaultObj.length;i++){
+        if(jQuery.inArray(selectedObj.options[idx].value, defaultObj) > -1) return;
+    }
+
+    selectedObj.remove(idx);
+    idx = idx-1;
+    if(idx < 0) idx = 0;
+    if(selectedObj.options.length) selectedObj.selectedIndex = idx;
+
+    MultiOrderSet(id);
+}
+
+function MultiOrderUp(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    if(selectedObj.selectedIndex<0) return;
+    var idx = selectedObj.selectedIndex;
+
+    if(idx < 1) return;
+
+    var s_obj = selectedObj.options[idx];
+    var t_obj = selectedObj.options[idx-1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    selectedObj.selectedIndex = idx-1;
+
+    MultiOrderSet(id);
+}
+
+
+function MultiOrderDown(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    if(selectedObj.selectedIndex<0) return;
+    var idx = selectedObj.selectedIndex;
+
+    if(idx == selectedObj.options.length-1) return;
+
+    var s_obj = selectedObj.options[idx];
+    var t_obj = selectedObj.options[idx+1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    selectedObj.selectedIndex = idx+1;
+
+    MultiOrderSet(id);
+}
+
+function initMultiOrder(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var init_value = jQuery("[name='init_"+id+"']").val();
+    var save_value = jQuery("[name='"+id+"']").val();
+    if(save_value){
+        var arr_save_value = save_value.split(',');
+        for(i=0;i<arr_save_value.length;i++){
+            if(arr_save_value[i].length>0){
+                var opt = new Option(arr_save_value[i], arr_save_value[i]);
+                selectedObj.options.add(opt);
+            }
+        }
+    }else{
+        var arr_init_value = init_value.split(',');
+        for(i=0;i<arr_init_value.length;i++){
+            if(arr_init_value[i].length>0){
+                var opt = new Option(arr_init_value[i], arr_init_value[i]);
+                selectedObj.options.add(opt);
+            }
+        }
+
+    }
+    MultiOrderSet(id);
+}
diff --git a/modules/widget/tpl/skin_info.html b/modules/widget/tpl/skin_info.html
new file mode 100644
index 000000000..05c403d4e
--- /dev/null
+++ b/modules/widget/tpl/skin_info.html
@@ -0,0 +1,91 @@
+<!--%import("../../admin/tpl/css/admin.css")-->
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$skin_info->title}</h3>
+</div>
+
+<div id="popBody">
+    <table cellspacing="0" class="rowTable">
+    <col width="100" />
+    <col />
+    <tr>
+        <th scope="row"><label for="textfield1">{$lang->title}</label></th>
+        <td>{$skin_info->title}</td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="textfield2">{$lang->author}</label></th>
+        <td class="blue">
+            <!--@foreach($skin_info->author as $author)-->
+            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
+            <!--@endforeach-->
+        </td>
+    </tr>
+    <!--@if($skin_info->homepage)-->
+    <tr>
+        <th scope="row"><label for="textfield2">{$lang->homepage}</label></th>
+        <td class="blue"><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
+    </tr>
+    <!--@endif-->
+    <tr>
+        <th scope="row"><label for="textfield2">{$lang->regdate}</label></th>
+        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
+    </tr>
+    <!--@if($skin_info->license || $skin_info->license_link)-->
+    <tr>
+        <th scope="row">{$lang->skin_license}</th>
+        <td>
+            {nl2br(trim($skin_info->license))}
+        <!--@if($skin_info->license_link)-->
+            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
+        <!--@end-->
+        </td>
+    </tr>
+    <!--@end-->
+    <!--@if($skin_info->description)-->
+    <tr>
+        <th scope="row" class="borderBottomNone">{$lang->description}</th>
+        <td class="borderBottomNone">{nl2br(trim($skin_info->description))}</td>
+    </tr>
+    <!--@end-->
+    </table>
+</div>
+
+<!--@if($skin_info->history)-->
+<div id="popHistoryHeadder">
+    <h3 class="xeAdmin">{$lang->skin_history}</h3>
+</div>
+
+<div id="popHistoryBody">
+    <table cellspacing="0" class="rowTable">
+    <col width="100" />
+    <col />
+
+    <!--@foreach($skin_info->history as $history)-->
+    <tr>
+        <th scope="row">
+            {$history->version}<br />
+            {$history->date}
+        </th>
+        <td>
+            <!--@foreach($history->author as $author)-->
+            <p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
+            <!--@endforeach-->
+            <!--@if($history->description)-->
+            <p>{nl2br(trim($history->description))}</p>
+            <!--@endif-->
+            <!--@if($history->logs)-->
+            <ul>
+                <!--@foreach($history->logs as $log)-->
+                <!--@if($log->link)-->
+                <li><a href="{$log->link}">{$log->text}</a></li>
+                <!--@else-->
+                <li>{$log->text}</li>
+                <!--@endif-->
+                <!--@endforeach-->
+            </ul>
+            <!--@endif-->
+        </td>
+    </tr>
+    <!--@endforeach-->
+    </table>
+</div>
+<!--@endif-->
diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html
index 7279d3538..eb1b25c94 100644
--- a/modules/widget/tpl/widget_detail_info.html
+++ b/modules/widget/tpl/widget_detail_info.html
@@ -1,9 +1,13 @@
 <!--%import("css/widget.css")-->
 <!--%import("../../admin/tpl/css/admin.css")-->
 
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->widget}</h3>
+</div>
+
 <div id="popBody">
-    <table cellspacing="0" class="adminTable">
-    <caption>{$lang->widget_maker}</caption>
+    <h4 class="xeAdmin">{$lang->widget_maker}</h4>
+    <table cellspacing="0" class="rowTable">
     <tr>
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$widget_info->title} ver {$widget_info->version}</td>
@@ -45,12 +49,12 @@
 </div>
 
 <!--@if($widget_info->history)-->
-<div id="popHistoryHeadder">
-    <h3>{$lang->widget_history}</h3>
+<div id="popHistoryHeader">
+    <h3 class="xeAdmin">{$lang->widget_history}</h3>
 </div>
 
 <div id="popHistoryBody">
-    <table cellspacing="0" class="adminTable">
+    <table cellspacing="0" class="rowTable">
     <!--@foreach($widget_info->history as $history)-->
     <tr>
         <th scope="row"><div>
@@ -79,7 +83,3 @@
     </table>
 </div>
 <!--@endif-->
-
-<div id="popFooter" class="tCenter gap1">
-    <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-</div>
diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index 5a34fc206..7767ee40a 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -4,28 +4,23 @@
 <!--%import("../../admin/tpl/css/admin.css")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, generate_code);" id="fo_widget">
-
-
-    <div id="popHeadder">
-        <h3>{$lang->cmd_generate_code}</h3>
+    <div id="popHeader" class="wide">
+        <h3 class="xeAdmin">{$lang->cmd_generate_code}</h3>
     </div>
 
     <div id="popBody">
         {@ $_caption = $lang->about_widget_code}
         <!--#include("widget_generate_code.include.html")-->
-        <table cellspacing="0" class="adminTable">
-        <col width="100" />
-        <col width="*" />
+        <h3 class="xeAdmin">{$lang->widget_code}</h3>
+        <table cellspacing="0" class="rowTable">
         <tr>
-            <th><div>{$lang->widget_code}</div></th>
-            <td><textarea readonly="true" id="widget_code" class="inputTypeTextArea w400"></textarea></td>
+            <td class="wide"><textarea readonly="true" id="widget_code" class="inputTypeTextArea fullWidth"></textarea></td>
         </tr>
         </table>
     </div>
 
-    <div id="popFooter" class="tCenter gap1">
-        <span class="button green"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
-        <a href="#" onclick="window.close(); return false;" class="button red"><span>{$lang->cmd_close}</span></a>
+    <div id="popFooter">
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
     </div>
 
 </form>
diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html
index ba5ed005d..cff0d480b 100644
--- a/modules/widget/tpl/widget_generate_code.include.html
+++ b/modules/widget/tpl/widget_generate_code.include.html
@@ -1,123 +1,187 @@
-        <table cellspacing="0" class="adminTable">
-        <caption>{nl2br($_caption)}</caption>
-        <tr>
-            <th scope="row"><div>{$lang->widget}</div></th>
-            <td>
-<select name="selected_widget">
-    <!--@foreach($widget_list as $widget)-->
-    <option value="{$widget->widget}" <!--@if($widget_info->widget == $widget->widget)--> selected="selected" <!--@end-->>{$widget->title} ver {$widget_info->version}</option>
-    <!--@end-->
-</select>
-<a href="#" class="button small" onclick="selectWidget(jQuery('select[name=selected_widget]').val())"><span>{$lang->cmd_select}</span></a>
-
-
-                <!--@if($widget_info->author->description)-->
-                <div class="widget_description">{nl2br(trim($widget_info->author->description))}</div>
-                <!--@end-->
-            </td>
-        </tr>
-        <!--@if(count($skin_list))-->
-        <tr>
-            <th scope="row"><div>{$lang->skin}</div></th>
-            <td>
-                <select name="skin" id="widget_skin">
-                    <option value="">&nbsp;</option>
-                <!--@foreach($skin_list as $key => $val)-->
-                    <option value="{$key}">{$val->title} ({$key})</option>
-                <!--@end-->
-                </select>
+<!--%load_js_plugin("ui.colorpicker")-->
+<p class="summary">{nl2br($_caption)}</p>
+<table cellspacing="0" class="rowTable">
+<tr>
+    <th scope="row"><div>{$lang->widget}</div></th>
+    <td>
+        <select name="selected_widget" class="fullWidth">
+        <!--@foreach($widget_list as $widget)-->
+        <option value="{$widget->widget}" <!--@if($widget_info->widget == $widget->widget)--> selected="selected" <!--@end-->>{$widget->title} ver {$widget_info->version}</option>
+        <!--@end-->
+        </select>
+        <a href="#" class="button small" onclick="selectWidget(jQuery('select[name=selected_widget]').val())"><span>{$lang->cmd_select}</span></a>
+        <!--@if($widget_info->author->description)-->
+        <div class="widget_description">{nl2br(trim($widget_info->author->description))}</div>
+        <!--@end-->
+    </td>
+</tr>
+<!--@if(count($skin_list))-->
+<tr>
+    <th scope="row"><div>{$lang->skin}</div></th>
+    <td>
+        <select name="skin" id="widget_skin" class="fullWidth">
+            <option value="">&nbsp;</option>
+        <!--@foreach($skin_list as $key => $val)-->
+            <option value="{$key}">{$val->title} ({$key})</option>
+        <!--@end-->
+        </select>
 <a href="#" class="button small" onclick="doDisplaySkinColorset(jQuery('#widget_skin').get(0))"><span>{$lang->cmd_select}</span></a>
-                <div id="colorset_area" style="display:none">
-                    <div class="header">{$lang->colorset}</div>
-                    <div class="footer">
-                        <select name="colorset" id="widget_colorset">
-                        </select>
-                    </div>
-                </div>
-            </td>
-        </tr>
-        <!--@end-->
-        <tr>
-            <th scope="row"><div>{$lang->widget_cache}</div></th>
-            <td>
-                <input type="text" name="widget_cache" value="0" class="inputTypeText" size="2" />{$lang->unit_min}
-                <p>{$lang->about_widget_cache}</p>
-            </td>
-        </tr>
-        <!--@foreach($widget_info->extra_var as $id => $var)-->
-
-        <!--@if($var->group && ((!$group) || $group != $var->group))-->
-        {@$group = $var->group}
-        </table>
-        <table cellspacing="0" class="adminTable">
-        <caption>{$group}</caption>
-        <!--@end-->
-
-        <tr class="row{$cycle_idx}">
-            <th scope="row">
-                <div>
-                    {$var->name}
-                    <!--@if($var->type == "mid_list")-->
-                        <input type="checkbox" onclick="XE.checkboxToggleAll('{$id}'); return false;" />
-                    <!--@end-->
-                </div>
-            </th>
-            <td>
-                <!--@if($var->type == "text")-->
-                <input type="text" name="{$id}" value="" class="inputTypeText w400" />
-
-                <!--@elseif($var->type == "textarea")-->
-                <textarea name="{$id}" class="inputTypeTextArea w400"></textarea>
-
-                <!--@elseif($var->type == "select")-->
-                <select name="{$id}">
-                    <!--@foreach($var->options as $key => $val)-->
-                    <option value="{$key}">{$val}</option>
-                    <!--@end-->
+        <div id="colorset_area" style="display:none">
+            <div class="header">{$lang->colorset}</div>
+            <div class="footer">
+                <select name="colorset" id="widget_colorset">
                 </select>
+            </div>
+        </div>
+    </td>
+</tr>
+<!--@end-->
+<tr>
+    <th scope="row"><div>{$lang->widget_cache}</div></th>
+    <td>
+        <input type="text" name="widget_cache" value="0" class="inputTypeText" size="2" />{$lang->unit_min}
+        <p>{$lang->about_widget_cache}</p>
+    </td>
+</tr>
+<!--@foreach($widget_info->extra_var as $id => $var)-->
 
-                <!--@elseif($var->type == "mid_list")-->
+<!--@if($var->group && ((!$group) || $group != $var->group))-->
+{@$group = $var->group}
+</table>
 
-                    <!--@foreach($mid_list as $module_category_srl => $modules)-->
-                        <!--@if($modules->title)-->
-                            <div class="widget_title">{$modules->title}</div>
-                        <!--@else-->
-                            <div class="widget_title">{$lang->none_category}</div>
-                        <!--@end-->
 
-                        <!--@foreach($modules->list as $key => $val)-->
-                            <div class="widget_mid_list">
-                                <input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" />
-                                <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
-                            </div>
-                        <!--@end-->
-                    <!--@end-->
+<h3 class="xeAdmin">{$group}</h3>
+<table cellspacing="0" class="rowTable">
+<!--@end-->
+<tr class="row{$cycle_idx}">
+    <th scope="row">
+        <div>
+            {$var->name}
+            <!--@if($var->type == "mid_list")-->
+                <input type="checkbox" onclick="XE.checkboxToggleAll('{$id}'); return false;" />
+            <!--@end-->
+        </div>
+    </th>
+    <td>
+        <!--@if($var->type == "text")-->
+        <input type="text" name="{$id}" value="" class="inputTypeText fullWidth" />
 
-                <!--@elseif($var->type == "module_srl_list")-->
-                    <input type="hidden" name="{$id}" id="{$id}" value="" />
-                    <select name="_{$id}" id="_{$id}" size="8" class="w300 fl"></select>
-                    <ul class="midCommand">
-                        <li><a href="{getUrl('','module','module','act','dispModuleAdminSelectList','id',$id)}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a></li>
-                        <li><a href="#" onclick="midMoveUp('{$id}');return false;" class="button black"><span>{$lang->cmd_move_up}</span></a></li>
-                        <li><a href="#" onclick="midMoveDown('{$id}');return false;" class="button black"><span>{$lang->cmd_move_down}</span></a></li>
-                        <li><a href="#" onclick="midRemove('{$id}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a></li>
-                    </ul>
-                    <script type="text/javascript">
-                        if(typeof(getModuleSrlList)!=='undefined') {
-                            doAddWindowLoadEventLoader( function() { getModuleSrlList('{$id}'); } );
-                        }
-                    </script>
-                <!--@elseif($var->type == "mid")-->
-                    <input type="hidden" name="{$id}" id="{$id}" value="" />
-                    <input type="text" name="_{$id}" id="_{$id}" value="" class="inputTypeText w300" readonly="readonly"/><a href="{getUrl('','module','module','act','dispModuleAdminSelectList','id',$id,'type','single')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_select}</span></a>
-                    <script type="text/javascript">
-                        if(typeof(getModuleSrlList)!=='undefined') {
-                            doAddWindowLoadEventLoader( function() { getModuleSrl('{$id}'); });
-                        }
-                    </script>
+        <!--@elseif($var->type == "color")-->
+        <input type="text" name="{$id}" value="" class="inputTypeText color-indicator" />
+
+        <!--@elseif($var->type == "textarea")-->
+        <textarea name="{$id}" class="inputTypeTextArea fullWidth"></textarea>
+
+        <!--@elseif($var->type == "select")-->
+        <select name="{$id}">
+            <!--@foreach($var->options as $key => $val)-->
+            <option value="{$key}">{$val}</option>
+            <!--@end-->
+        </select>
+
+
+
+        <!--@elseif($var->type == "select-multi-order")-->
+        <input type="hidden" name="{$id}" value="" />
+        <input type="hidden" name="default_{$id}" value="" />
+        <input type="hidden" name="init_{$id}" value="" />
+
+        <div style="float:left;margin-left:30px;">
+            <select name="show_{$id}" size="8" class="w100">
+                <!--@foreach($var->options as $key => $val)-->
+                <option value="{$key}">{$key}</option>
                 <!--@end-->
-                <p class="clear">{nl2br($var->description)}</p>
-            </td>
-        </tr>
+            </select>
+        </div>
+        <div style="float:left;margin-left:30px;">
+            <a class="buttonSet buttonRight" onclick="MultiOrderAdd('{$id}'); return false;" href="#"></a>
+            <br/><br/>
+            <a class="buttonSet buttonLeft" onclick="MultiOrderDelete('{$id}'); return false;" href="#"></a>
+            <br/><br/>
+            <a class="buttonSet buttonUp" onclick="MultiOrderUp('{$id}'); return false;" href="#"></a>
+            <br/><br/>
+            <a class="buttonSet buttonDown" onclick="MultiOrderDown('{$id}'); return false;" href="#"></a>
+        </div>
+
+
+        <div style="float:left;margin-left:30px;">
+            <select name="selected_{$id}" name="selected_{$id}" size="8" class="w100">
+            </select>
+        </div>
+
+
+        <script type="text/javascript">
+            <!--@foreach($var->options as $key => $val)-->
+                <!--@if($var->default_options[$key] == true)-->
+                    jQuery("[name='default_{$id}']").get(0).value += '{$key},';
+                <!--@end-->
+
+                <!--@if($var->init_options[$key] == true)-->
+                    jQuery("[name='init_{$id}']").get(0).value += ','+'{$key}';
+                <!--@end-->
+
+            <!--@end-->
+
+            if(typeof(initMultiOrder)!=='undefined') {
+                doAddWindowLoadEventLoader( function() { initMultiOrder('{$id}'); } );
+            }
+//            MultiOrderSet('{$id}');
+        </script>
+        <!--@elseif($var->type == "mid_list")-->
+
+            <!--@foreach($mid_list as $module_category_srl => $modules)-->
+                <!--@if($modules->title)-->
+                    <div class="widget_title">{$modules->title}</div>
+                <!--@else-->
+                    <div class="widget_title">{$lang->none_category}</div>
+                <!--@end-->
+
+                <!--@foreach($modules->list as $key => $val)-->
+                    <div class="widget_mid_list">
+                        <input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" />
+                        <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+                    </div>
+                <!--@end-->
+            <!--@end-->
+        <!--@elseif($var->type == "member_group")-->
+
+            <!--@foreach($group_list as $key => $val)-->
+                <input type="checkbox" value="{$key}" name="{$id}" id="chk_member_gruop_{$id}_{$key}" />
+                <label for="chk_member_gruop_{$id}_{$key}">{$val->title}</label>
+            <!--@end-->
+
+        <!--@elseif($var->type == "module_srl_list")-->
+            <input type="hidden" name="{$id}" id="{$id}" value="" />
+            <select name="_{$id}" id="_{$id}" size="8" class="w300 fl"></select>
+            <ul class="midCommand">
+                <li><a href="{getUrl('','module','module','act','dispModuleSelectList','id',$id)}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a></li>
+                <li><a href="#" onclick="midMoveUp('{$id}');return false;" class="button black"><span>{$lang->cmd_move_up}</span></a></li>
+                <li><a href="#" onclick="midMoveDown('{$id}');return false;" class="button black"><span>{$lang->cmd_move_down}</span></a></li>
+                <li><a href="#" onclick="midRemove('{$id}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a></li>
+            </ul>
+            <script type="text/javascript">
+                if(typeof(getModuleSrlList)!=='undefined') {
+                    doAddWindowLoadEventLoader( function() { getModuleSrlList('{$id}'); } );
+                }
+            </script>
+        <!--@elseif($var->type == "mid")-->
+            <input type="hidden" name="{$id}" id="{$id}" value="" />
+            <input type="text" name="_{$id}" id="_{$id}" value="" class="inputTypeText w300" readonly="readonly"/><a href="{getUrl('','module','module','act','dispModuleSelectList','id',$id,'type','single')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_select}</span></a>
+            <script type="text/javascript">
+                if(typeof(getModuleSrlList)!=='undefined') {
+                    doAddWindowLoadEventLoader( function() { getModuleSrl('{$id}'); });
+                }
+            </script>
+        <!--@elseif($var->type == "menu")-->
+            <select name="{$id}" class="w300 fl">
+                <option value="">-</option>
+                <!--@foreach($menu_list as $key => $val)-->
+                <option value="{$val->menu_srl}">{$val->title}</option>
+                <!--@end-->
+            </select>
         <!--@end-->
-        </table>
+        <p class="clear">{nl2br($var->description)}</p>
+    </td>
+</tr>
+<!--@end-->
+</table>
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index acfd57cc2..3a0e5ca42 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -16,8 +16,8 @@
 <input type="hidden" name="widget_padding_top" value="" />
 <input type="hidden" name="widget_padding_bottom" value="" />
 
-    <div id="popHeadder">
-        <h3>{$lang->cmd_generate_code}</h3>
+    <div id="popHeader" class="wide">
+        <h3 class="xeAdmin">{$lang->cmd_generate_code}</h3>
     </div>
 
     <div id="popBody">
@@ -27,7 +27,6 @@
 
     </div>
     <div id="popFooter" class="tCenter gap1">
-        <span class="button green"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
-        <a href="#" onclick="window.close(); return false;" class="button red"><span>{$lang->cmd_close}</span></a>
+        <span class="button black strong"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
     </div>
 </form>
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 7e5d913b5..0e2dd2473 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -1,6 +1,10 @@
-<div id="tmpPageSizeLayer" style="visibility:hidden;">
-    <form action="./" onsubmit="doApplyWidgetSize(this); return false;">
-        <table cellspacing="0">
+<div id="tmpPageSizeLayer" class="layer boxModelController">
+<form action="./" onsubmit="doApplyWidgetSize(this); return false;">
+    <h4 class="xeAdmin">&nbsp;</h4>
+    <!--button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button-->
+
+    <div class="layerBody">
+        <table cellspacing="0" class="adminTable">
         <col width="140" />
         <col />
         <col />
@@ -103,10 +107,11 @@
             </td>
         </tr>
         <tr>
-            <td colspan="3" class="buttonBox">
-                <input type="submit" value="{$lang->cmd_save}" class="submit"/>
-            </td>
+            <th colspan="3">
+                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" class="submit"/></span>
+            </th>
         </tr>
         </table>
-    </form>
+    </div>
+</form>
 </div>
diff --git a/modules/widget/tpl/widget_style_generate_code_in_page.html b/modules/widget/tpl/widget_style_generate_code_in_page.html
new file mode 100644
index 000000000..8bf065170
--- /dev/null
+++ b/modules/widget/tpl/widget_style_generate_code_in_page.html
@@ -0,0 +1,109 @@
+<!--%import("filter/style_generate_code_in_page.xml")-->
+<!--%import("js/widget_admin.js")-->
+<!--%import("css/widget.css")-->
+<!--%import("../../admin/tpl/css/admin.css")-->
+<!--%load_js_plugin("filebox")-->
+<!--%load_js_plugin("ui.colorpicker")-->
+
+<script type="text/javascript">
+    doAddWindowLoadEventLoader(getWidgetVars);
+</script>
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->widgetstyle}</h3>
+</div>
+
+<form action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe" onsubmit="return procFilter(this, style_generate_code_in_page);" id="fo_widget">
+<input type="hidden" name="module" value="widget" />
+<input type="hidden" name="act" value="" />
+<input type="hidden" name="module_srl" value="{$module_srl}" />
+<input type="hidden" name="widgetstyle" value="{$widgetstyle}" />
+<input type="hidden" name="widget_sequence" value="" />
+<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
+<input type="hidden" name="selected_widget" value="{$selected_widget}" />
+
+
+
+<div id="popBody">
+
+    <a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a>
+    <!--@foreach($widgetStyle_list as $key => $widgetStyle)-->
+        <!--@if($widgetStyle->preview)-->
+    <a href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /></a>
+        <!--@end-->
+    <!--@end-->
+    <div class="clear"></div>
+
+
+<!--@if($widgetstyle_info)-->
+    <h4 class="xeAdmin">{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h4>
+    <table cellspacing="0" class="rowTable">
+        <tr>
+            <th scope="row"><div>{$lang->description}</div></th>
+            <td>{$widgetstyle_info->description}</td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->author}</div></th>
+            <td>
+            <!--@foreach($widgetstyle_info->author as $k => $author)-->
+                {$author->name} ({$author->homepage})
+            <!--@end-->
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><div>{$lang->regdate}</div></th>
+            <td>{zdate($widgetstyle_info->date,'Y-m-d')}</td>
+        </tr>
+        </table>
+
+        <h4 class="xeAdmin">{$lang->cmd_setup}</h4>
+        <table cellspacing="0" class="rowTable">
+        <!--@foreach($widgetstyle_info->extra_var as $id => $var)-->
+        <tr>
+            <th scope="row">
+                <div>
+                    {$var->name}
+                </div>
+            </th>
+            <td>
+                <!--@if($var->type == "text")-->
+                <input type="text" name="{$id}" value="" class="inputTypeText w400" />
+
+                <!--@elseif($var->type == "color")-->
+
+                <input type="text" name="{$id}" value="" class="inputTypeText color-indicator" />
+
+                <!--@elseif($var->type == "textarea")-->
+                <textarea name="{$id}" class="inputTypeTextArea w400"></textarea>
+
+                <!--@elseif($var->type == "select")-->
+                <select name="{$id}">
+                    <!--@foreach($var->options as $key => $val)-->
+                    <option value="{$key}">{$val}</option>
+                    <!--@end-->
+                </select>
+                <!--@elseif($var->type == "filebox")-->
+                    <div id="filebox_preview_{$id}" style="width:100px;height:100px;display:none" ></div>
+                    <input type="hidden" name="{$id}" value="" />
+                    <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name={$id}]', '#fo_widget').get(0), '{$var->filter}')">{$lang->cmd_select}</button></span>
+                    <span id="filebox_cancel_{$id}" class="button red" style="display:none" ><button type="button" onclick="XE.filebox.cancel('{$id}')">{$lang->cmd_delete}</button></span>
+                    <script type="text/javascript">//<![CDATA[
+                        XE.filebox.init('{$id}');
+                    //]]></script>
+
+
+                <!--@end-->
+                <p class="clear">{nl2br($var->description)}</p>
+            </td>
+        </tr>
+        <!--@end-->
+        </table>
+<!--@end-->
+
+</div>
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_setup}"  /></span>
+</div>
+</form>
+
+<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php
index d4d935481..79364df22 100644
--- a/modules/widget/widget.admin.view.php
+++ b/modules/widget/widget.admin.view.php
@@ -53,11 +53,14 @@
             $option->enable_default_component = true;
             $option->enable_component = true;
             $option->resizable = false;
-            $option->height = 300;
+            $option->height = 200;
             $editor = $oEditorModel->getEditor($module_srl, $option);
             Context::set('editor', $editor);
 
+
+
             $this->setTemplateFile('add_content_widget');
         }
+
     }
 ?>
diff --git a/modules/widget/widget.class.php b/modules/widget/widget.class.php
index 71f052820..f0cc403e7 100644
--- a/modules/widget/widget.class.php
+++ b/modules/widget/widget.class.php
@@ -11,13 +11,6 @@
          * @brief 설치시 추가 작업이 필요할시 구현
          **/
         function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('widget', 'view', 'dispWidgetInfo');
-            $oModuleController->insertActionForward('widget', 'view', 'dispWidgetGenerateCode');
-            $oModuleController->insertActionForward('widget', 'view', 'dispWidgetGenerateCodePage');
-            $oModuleController->insertActionForward('widget', 'view', 'dispWidgetAdminDownloadedList');
-
             // widget 에서 사용할 cache디렉토리 생성
             FileHandler::makeDir('./files/cache/widget');
 			FileHandler::makeDir('./files/cache/widget_cache');
@@ -50,57 +43,5 @@
             FileHandler::removeFilesInDir("./files/cache/widget_cache");
         }
 
-        /**
-         * @brief Action중 Admin이 들어갔을 경우 권한 체크
-         **/
-        function checkAdminActionGrant() {
-            if(!Context::get('is_logged')) return false;
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin=='Y') return true;
-
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isSiteAdmin()) return true;
-
-            return false;
-        }
-
-
-        /**
-         * @brief 권한 체크를 실행하는 method
-         * 모듈 객체가 생성된 경우는 직접 권한을 체크하지만 기능성 모듈등 스스로 객체를 생성하지 않는 모듈들의 경우에는
-         * ModuleObject에서 직접 method를 호출하여 권한을 확인함
-         *
-         * isAdminGrant는 관리권한 이양시에만 사용되도록 하고 기본은 false로 return 되도록 하여 잘못된 권한 취약점이 생기지 않도록 주의하여야 함
-         **/
-        function isAdmin() {
-            // 로그인이 되어 있지 않으면 무조건 return false
-            $is_logged = Context::get('is_logged');
-            if(!$is_logged) return false;
-
-            // 사용자 아이디를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 모듈 요청에 사용된 변수들을 가져옴
-            $args = Context::getRequestVars();
-
-            // act의 값에 따라서 관리 권한 체크
-            switch($args->act) {
-                case 'dispWidgetAdminAddContent' :
-                        // 레이아웃 정보에 할당된 srl이 없으면 패스
-                        if(!$args->module_srl) return false;
-
-                        // 모듈중 레이아웃이 해당 srl에 연결될 것이 있는지 확인
-                        $oModuleModel = &getModel('module');
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-                        if($oModuleModel->isModuleAdmin($module_info,$logged_info)) $is_granted = true;
-                        else $is_granted = false;
-                        return $is_granted;
-                    break;
-            }
-
-            return false;
-        }
     }
 ?>
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 05620c7d8..dc76b1514 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -21,6 +21,8 @@
             $widget_info = $oWidgetModel->getWidgetInfo($widget);
 
             $widget = $vars->selected_widget;
+            $vars->widgetstyle = $request_vars->widgetstyle;
+
             $vars->skin = trim($request_vars->skin);
             $vars->colorset = trim($request_vars->colorset);
             $vars->widget_sequence = (int)($request_vars->widget_sequence);
@@ -30,12 +32,29 @@
             $vars->widget_padding_right = trim($request_vars->widget_padding_right);
             $vars->widget_padding_top = trim($request_vars->widget_padding_top);
             $vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
+            $vars->document_srl= trim($request_vars->document_srl);
+
+
             if(count($widget_info->extra_var)) {
                 foreach($widget_info->extra_var as $key=>$val) {
-                    $vars->{$key} = trim($request_vars->{$key}); 
+                    $vars->{$key} = trim($request_vars->{$key});
                 }
             }
 
+            // 위젯 스타일이 있는 경우
+            if($request_vars->widgetstyle){
+                $widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
+                if(count($widgetStyle_info->extra_var)) {
+                    foreach($widgetStyle_info->extra_var as $key=>$val) {
+                        if($val->type =='text' || $val->type =='select' || $val->type =='filebox'){
+                            $vars->{$key} = trim($request_vars->{$key});
+                        }
+                    }
+                }
+            }
+
+
+
             if($vars->widget_sequence) {
                 $cache_path = './files/cache/widget_cache/';
                 $cache_file = sprintf('%s%d.%s.cache', $cache_path, $vars->widget_sequence, Context::getLangType());
@@ -51,8 +70,8 @@
                     continue;
                 }
                 if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
-                $vars->{$key} = htmlspecialchars($val);
-                $attribute[] = sprintf('%s="%s"', $key, $val);
+                $vars->{$key} = htmlspecialchars(Context::convertEncodingStr($val));
+                $attribute[] = sprintf('%s="%s"', $key, Context::convertEncodingStr($val));
             }
 
             return $attribute;
@@ -80,8 +99,7 @@
         function procWidgetGenerateCodeInPage() {
             $widget = Context::get('selected_widget');
             if(!$widget) return new Object(-1,'msg_invalid_request');
-            if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
-
+//            if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
             $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
             // 결과물을 구함
@@ -91,6 +109,17 @@
             $this->add('widget_code', $widget_code);
         }
 
+        function procWidgetStyleExtraImageUpload(){
+            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
+
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('default_layout.html');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+
+
         /**
          * @brief 선택된 위젯 - 스킨의 컬러셋을 return
          **/
@@ -115,7 +144,11 @@
          * @breif 특정 content의 위젯 태그들을 변환하여 return
          **/
         function transWidgetCode($content, $include_info = false) {
+            // 사용자 정의 언어 변경
+            $oModuleController = &getController('module');
+            $oModuleController->replaceDefinedLangCode($content);
 
+            // 편집 정보 포함 여부 체크
             $this->include_info = $include_info;
 
             // 내용중 위젯을 또다시 구함 (기존 버전에서 페이지 수정해 놓은것과의 호환을 위해서)
@@ -214,16 +247,24 @@
          * @brief 컨텐츠 위젯 추가
          **/
         function procWidgetInsertDocument() {
+
             // 변수 구함
             $module_srl = Context::get('module_srl');
             $document_srl = Context::get('document_srl');
             $content = Context::get('content');
             $editor_sequence = Context::get('editor_sequence');
 
+            $err = 0;
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($module_srl);
+            if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+
             // 대상 페이지 모듈 정보 구함
             $oModuleModel = &getModel('module');
             $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+            if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+            
+            if($err > 1) return new Object(-1,'msg_invalid_request');
 
             // 권한 체크
             $is_logged = Context::get('is_logged');
@@ -235,14 +276,14 @@
                 foreach($user_group as $group_srl => $group_info) {
                     if(in_array($group_srl, $manager_group)) $is_admin = true;
                 }
-            } 
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin() && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
 
 
             // 글 입력
             $oDocumentModel = &getModel('document');
             $oDocumentController = &getController('document');
-           
+
             $obj->module_srl = $module_srl;
             $obj->content = $content;
             $obj->document_srl = $document_srl;
@@ -292,8 +333,8 @@
                 foreach($user_group as $group_srl => $group_info) {
                     if(in_array($group_srl, $manager_group)) $is_admin = true;
                 }
-            } 
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin() && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
 
             $output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
             if(!$output->toBool()) return $output;
@@ -332,8 +373,8 @@
                 foreach($user_group as $group_srl => $group_info) {
                     if(in_array($group_srl, $manager_group)) $is_admin = true;
                 }
-            } 
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin() && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
 
             $output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
             if(!$output->toBool()) return $output;
@@ -361,8 +402,8 @@
                 foreach($user_group as $group_srl => $group_info) {
                     if(in_array($group_srl, $manager_group)) $is_admin = true;
                 }
-            } 
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin() && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
 
             // 등록된 글 목록 구함
             $oDocumentModel = &getModel('document');
@@ -376,5 +417,8 @@
             }
             return new Object();
         }
+
+
+
     }
 ?>
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index d92cf1151..fbe485fb6 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -24,6 +24,26 @@
             return "";
         }
 
+
+        /**
+         * @brief 위젯 스타일의 경로를 구함
+         **/
+        function getWidgetStylePath($widgetStyle_name) {
+            $path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
+            if(is_dir($path)) return $path;
+
+            return "";
+        }
+
+        /**
+         * @brief 위젯 스타일의 경로를 구함
+         **/
+        function getWidgetStyleTpl($widgetStyle_name) {
+            $path = $this->getWidgetStylePath($widgetStyle_name);
+            $tpl = sprintf('%swidgetstyle.html', $path);
+            return $tpl;
+        }
+
         /**
          * @brief 위젯의 종류와 정보를 구함
          * 다운로드되어 있는 위젯의 종류 (생성과 다른 의미)
@@ -48,6 +68,31 @@
             return $list;
         }
 
+        /**
+         * @brief 위젯의 종류와 정보를 구함
+         * 다운로드되어 있는 위젯의 종류 (생성과 다른 의미)
+         **/
+        function getDownloadedWidgetStyleList() {
+            // 다운받은 위젯과 설치된 위젯의 목록을 구함
+            $searched_list = FileHandler::readDir('./widgetstyles');
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+            sort($searched_list);
+
+            // 찾아진 위젯 목록을 loop돌면서 필요한 정보를 간추려 return
+            for($i=0;$i<$searched_count;$i++) {
+                // 위젯의 이름
+                $widgetStyle = $searched_list[$i];
+
+                // 해당 위젯의 정보를 구함
+                $widgetStyle_info = $this->getWidgetStyleInfo($widgetStyle);
+
+                $list[] = $widgetStyle_info;
+            }
+            return $list;
+        }
+
+
         /**
          * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
          * 이것 역시 캐싱을 통해서 xml parsing 시간을 줄인다..
@@ -192,6 +237,14 @@
                         $options_count = count($options);
                         for($j=0;$j<$options_count;$j++) {
                             $buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+
+                            if($options[$j]->attrs->default && $options[$j]->attrs->default=='true'){
+                                $buff .= sprintf('$widget_info->extra_var->%s->default_options["%s"] = true;', $id, $options[$j]->value->body);
+                            }
+
+                            if($options[$j]->attrs->init && $options[$j]->attrs->init=='true'){
+                                $buff .= sprintf('$widget_info->extra_var->%s->init_options["%s"] = true;', $id, $options[$j]->value->body);
+                            }
                         }
 
                     }
@@ -205,5 +258,145 @@
             return $widget_info;
         }
 
+
+
+        /**
+         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
+         * 이것 역시 캐싱을 통해서 xml parsing 시간을 줄인다..
+         **/
+        function getWidgetStyleInfo($widgetStyle) {
+
+            $widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
+            if(!$widgetStyle_path) return;
+            $xml_file = sprintf("%sskin.xml", $widgetStyle_path);
+            if(!file_exists($xml_file)) return;
+
+            // cache 파일을 비교하여 문제 없으면 include하고 $widgetStyle_info 변수를 return
+            $cache_file = sprintf('./files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
+
+            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
+                @include($cache_file);
+                return $widgetStyle_info;
+            }
+
+            // cache 파일이 없으면 xml parsing하고 변수화 한 후에 캐시 파일에 쓰고 변수 바로 return
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->widgetstyle;
+            if(!$xml_obj) return;
+
+            $buff = '';
+
+            // 위젯의 제목, 버전
+            $buff .= sprintf('$widgetStyle_info->widgetStyle = "%s";', $widgetStyle);
+            $buff .= sprintf('$widgetStyle_info->path = "%s";', $widgetStyle_path);
+            $buff .= sprintf('$widgetStyle_info->title = "%s";', $xml_obj->title->body);
+            $buff .= sprintf('$widgetStyle_info->description = "%s";', $xml_obj->description->body);
+            $buff .= sprintf('$widgetStyle_info->version = "%s";', $xml_obj->version->body);
+            sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+            $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+            $buff .= sprintf('$widgetStyle_info->date = "%s";', $date);
+            $buff .= sprintf('$widgetStyle_info->homepage = "%s";', $xml_obj->link->body);
+            $buff .= sprintf('$widgetStyle_info->license = "%s";', $xml_obj->license->body);
+            $buff .= sprintf('$widgetStyle_info->license_link = "%s";', $xml_obj->license->attrs->link);
+
+            // preview
+            if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+            $preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
+            if(file_exists($preview_file)) $buff .= sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
+
+            // 작성자 정보
+            if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+            else $author_list = $xml_obj->author;
+
+            for($i=0; $i < count($author_list); $i++) {
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+            }
+
+            // history
+            if($xml_obj->history) {
+                if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
+                else $history_list = $xml_obj->history;
+
+                for($i=0; $i < count($history_list); $i++) {
+                    sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                    $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->date = "%s";', $date);
+
+                    if($history_list[$i]->author) {
+                        (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+                        for($j=0; $j < count($obj->author_list); $j++) {
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+                        }
+                    }
+
+                    if($history_list[$i]->log) {
+                        (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+                        for($j=0; $j < count($obj->log_list); $j++) {
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+                        }
+                    }
+                }
+            }
+
+
+            // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
+                    $extra_var_count = count($extra_vars);
+
+                    $buff .= sprintf('$widgetStyle_info->extra_var_count = "%s";', $extra_var_count);
+                    for($i=0;$i<$extra_var_count;$i++) {
+                        unset($var);
+                        unset($options);
+                        $var = $extra_vars[$i];
+
+                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
+                        $name = $var->name->body?$var->name->body:$var->title->body;
+                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
+
+
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->group = "%s";', $id, $group->title->body);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->name = "%s";', $id, $name);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->type = "%s";', $id, $type);
+                        if($type =='filebox') $buff .= sprintf('$widgetStyle_info->extra_var->%s->filter = "%s";', $id, $var->attrs->filter);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+
+                        $options = $var->options;
+                        if(!$options) continue;
+
+                        if(!is_array($options)) $options = array($options);
+                        $options_count = count($options);
+                        for($j=0;$j<$options_count;$j++) {
+                            $buff .= sprintf('$widgetStyle_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+                        }
+
+                    }
+                }
+            }
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
+            FileHandler::writeFile($cache_file, $buff);
+
+            if(file_exists($cache_file)) @include($cache_file);
+            return $widgetStyle_info;
+        }
+
     }
-?>
\ No newline at end of file
+?>
diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php
index f4104c290..b3955a01a 100644
--- a/modules/widget/widget.view.php
+++ b/modules/widget/widget.view.php
@@ -18,6 +18,9 @@
          * @brief 위젯의 상세 정보(conf/info.xml)를 팝업 출력
          **/
         function dispWidgetInfo() {
+            // 위젯 스킨명이 있을 경우 위젯 스킨 상세 정보 함수로 출력
+            if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+
             // 선택된 위젯 정보를 구함
             $oWidgetModel = &getModel('widget');
             $widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
@@ -30,6 +33,28 @@
             $this->setTemplateFile('widget_detail_info');
         }
 
+        /**
+         * @brief 위젯 스킨의 상세 정보(skin.xml)를 팝업 출력
+         **/
+        function dispWidgetSkinInfo() {
+            $widget = Context::get('selected_widget');
+            $skin = Context::get('skin');
+
+            $path = sprintf('./widgets/%s/', $widget);
+
+            // 선택된 위젯 정보를 구함
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
+
+            Context::set('skin_info',$skin_info);
+
+            // 위젯을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('skin_info');
+        }
+
         /**
          * @brief 위젯의 코드 생성기
          **/
@@ -37,7 +62,6 @@
             // 선택된 위젯 정보를 구함
             $oWidgetModel = &getModel('widget');
 
-            $oWidgetModel = &getModel('widget');
             $widget_list = $oWidgetModel->getDownloadedWidgetList();
             $selected_widget = Context::get('selected_widget');
             if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
@@ -57,6 +81,11 @@
             $args->site_srl = $site_module_info->site_srl;
             $mid_list = $oModuleModel->getMidList($args);
 
+            // 그룹 목록을 가져옴
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
+            Context::set('group_list', $group_list);
+
             // module_category와 module의 조합
             if($module_categories) {
                 foreach($mid_list as $module_srl => $module) {
@@ -68,6 +97,11 @@
 
             Context::set('mid_list',$module_categories);
 
+            // 메뉴 목록을 구함
+            $output = executeQueryArray('menu.getMenus');
+            Context::set('menu_list',$output->data);
+
+
             // 스킨의 정보를 구함
             $skin_list = $oModuleModel->getSkins($widget_info->path);
             Context::set('skin_list', $skin_list);
@@ -95,5 +129,26 @@
             $this->setTemplateFile('widget_generate_code_in_page');
         }
 
+        /**
+         * @brief 페이지 관리에서 사용될 위젯 스타일 코드 생성 팝업
+         **/
+        function dispWidgetStyleGenerateCodeInPage() {
+
+            // 위젯 스타일 목록
+            $oWidgetModel = &getModel('widget');
+            $widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
+            Context::set('widgetStyle_list',$widgetStyle_list);
+
+            // 선택된 위젯 스타일 목록
+            $widgetstyle = Context::get('widgetstyle');
+            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);
+            if($widgetstyle && $widgetstyle_info){
+                Context::set('widgetstyle_info',$widgetstyle_info);
+            }
+            
+            $this->dispWidgetGenerateCode();
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('widget_style_generate_code_in_page');
+        }
     }
 ?>
diff --git a/modules/wiki/conf/info.xml b/modules/wiki/conf/info.xml
new file mode 100644
index 000000000..4a10b8f47
--- /dev/null
+++ b/modules/wiki/conf/info.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">위키</title>
+    <title xml:lang="en">wiki</title>
+    <title xml:lang="zh-CN">维基系统</title>
+    <title xml:lang="zh-TW">維基</title>
+    <title xml:lang="jp">wiki</title>
+    <description xml:lang="ko">위키모듈.</description>
+    <description xml:lang="en">wiki module.</description>
+    <description xml:lang="zh-CN">维基模块。</description>
+    <description xml:lang="zh-TW">維基百科模組。</description>
+    <description xml:lang="jp">wikiモジュール</description>
+    <version>0.1</version>
+    <date>2009-01-31</date>
+    <category>service</category>
+
+    <author email_address="haneul0318@gmail.com" link="http://seungyeop.kr">
+        <name xml:lang="ko">haneul</name>
+        <name xml:lang="en">haneul</name>
+		<name xml:lang="zh-CN">haneul</name>
+        <name xml:lang="zh-TW">haneul</name>
+        <name xml:lang="jp">haneul</name>
+    </author>
+</module>
diff --git a/modules/wiki/conf/module.xml b/modules/wiki/conf/module.xml
new file mode 100644
index 000000000..43e7cd00d
--- /dev/null
+++ b/modules/wiki/conf/module.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<module>
+    <grants>
+        <grant name="write_document" default="guest">
+            <title xml:lang="ko">글 작성</title>
+            <title xml:lang="zh-CN">发表新主题</title>
+            <title xml:lang="jp">書き込み作成</title>
+            <title xml:lang="en">write document</title>
+            <title xml:lang="es">Escribir el documento</title>
+            <title xml:lang="zh-TW">發表主題</title>
+        </grant>
+        <grant name="write_comment" default="guest">
+            <title xml:lang="ko">댓글 작성</title>
+            <title xml:lang="zh-CN">发表评论</title>
+            <title xml:lang="jp">コメント作成</title>
+            <title xml:lang="en">write comment</title>
+            <title xml:lang="es">Escribir comentario</title>
+            <title xml:lang="zh-TW">發表評論</title>
+        </grant>
+    </grants>
+    <permissions>
+    </permissions>
+    <actions>
+        <action name="dispWikiContent" type="view" index="true" />
+        <action name="dispWikiEditPage" type="view" />
+        <action name="dispWikiTitleIndex" type="view" />
+        <action name="dispWikiReplyComment" type="view" />
+        <action name="dispWikiModifyComment" type="view" />
+        <action name="dispWikiAdminContent" type="view" standalone="true" admin_index="true" />
+        <action name="dispWikiAdminInsertWiki" type="view" standalone="true" />
+        <action name="dispWikiAdminGrantInfo" type="view" standalone="true" />
+        <action name="dispWikiAdminSkinInfo" type="view" standalone="true" />
+        <action name="dispWikiAdminWikiAdditionSetup" type="view" standalone="true" />
+        <action name="procWikiAdminInsertWiki" type="controller" standalone="true" />
+        <action name="dispWikiAdminDeleteWiki" type="view" standalone="true" />
+        <action name="procWikiAdminDeleteWiki" type="controller" standalone="true" />
+        <action name="procWikiInsertDocument" type="controller" standalone="true" />
+        <action name="procWikiInsertComment" type="controller" standalone="true" />
+        <action name="procWikiDeleteComment" type="controller" standalone="true" />
+    </actions>
+</module>
diff --git a/modules/wiki/lang/en.lang.php b/modules/wiki/lang/en.lang.php
new file mode 100644
index 000000000..1e21cfc50
--- /dev/null
+++ b/modules/wiki/lang/en.lang.php
@@ -0,0 +1,15 @@
+<?php
+    /**
+     * @file   en.lang.php
+     * @author haneul (haneul0318@gmail.com)
+     * @brief  English Language Pack for wiki module
+     **/
+
+    $lang->wiki = 'Wiki';
+    $lang->not_exist = 'There is no such document. If you have proper permission, you can create the document';
+    $lang->cmd_create = 'Create document';
+    $lang->cmd_wiki_list = 'List';
+    $lang->cmd_view_info = 'Wiki information';
+    $lang->use_comment = 'Use comment';
+    $lang->about_use_comment = 'You may configure to enable comments.';
+?>
diff --git a/modules/wiki/lang/jp.lang.php b/modules/wiki/lang/jp.lang.php
new file mode 100644
index 000000000..f064104fd
--- /dev/null
+++ b/modules/wiki/lang/jp.lang.php
@@ -0,0 +1,15 @@
+<?php
+    /**
+     * @file   modules/wiki/lang/jp.lang.php
+     * @author haneul (haneul0318@gmail.com) 翻訳：ミニミ
+     * @brief  wikiモジュール基本言語パッケージ
+     **/
+
+    $lang->wiki = 'wiki';
+    $lang->not_exist = '存在しないドキュメントです。作成権限により、ドキュメント作成が出来ます。サイト管理者にお問い合わせ下さい。';
+    $lang->cmd_create = '新規作成';
+    $lang->cmd_wiki_list = 'リスト';
+    $lang->cmd_view_info = 'wiki情報';
+    $lang->use_comment = 'Use comment';
+    $lang->about_use_comment = 'You may configure to enable comments.';
+?>
diff --git a/modules/wiki/lang/ko.lang.php b/modules/wiki/lang/ko.lang.php
new file mode 100644
index 000000000..58ffa183d
--- /dev/null
+++ b/modules/wiki/lang/ko.lang.php
@@ -0,0 +1,15 @@
+<?php
+    /**
+     * @file   ko.lang.php
+     * @author haneul (haneul0318@gmail.com)
+     * @brief  위키(wiki) 모듈의 기본 언어팩
+     **/
+
+    $lang->wiki = '위키';
+    $lang->not_exist = '존재하지 않는 문서입니다. 권한이 있으시면, 문서를 만들 수 있습니다.';
+    $lang->cmd_create = '문서 생성';
+    $lang->cmd_wiki_list = '목록';
+    $lang->cmd_view_info = '위키 정보';
+    $lang->use_comment = '댓글 사용';
+    $lang->about_use_comment = '댓글을 활성화하거나 비활성화할 수 있습니다';
+?>
diff --git a/modules/wiki/lang/zh-TW.lang.php b/modules/wiki/lang/zh-TW.lang.php
new file mode 100644
index 000000000..c8ff706fc
--- /dev/null
+++ b/modules/wiki/lang/zh-TW.lang.php
@@ -0,0 +1,15 @@
+<?php
+    /**
+     * @file   zh-TW.lang.php
+     * @author haneul (haneul0318@gmail.com) 翻譯：royallin
+     * @brief  維基(wiki)模組基本語言
+     **/
+
+    $lang->wiki = '維基';
+    $lang->not_exist = '不存在的檔案。如果你擁有權限，可以建立新檔案。';
+    $lang->cmd_create = '檔案建立';
+    $lang->cmd_wiki_list = '列表';
+    $lang->cmd_view_info = '維基資訊';
+    $lang->use_comment = 'Use comment';
+    $lang->about_use_comment = 'You may configure to enable comments.';
+?>
diff --git a/modules/wiki/queries/getWikiList.xml b/modules/wiki/queries/getWikiList.xml
new file mode 100644
index 000000000..8389a3341
--- /dev/null
+++ b/modules/wiki/queries/getWikiList.xml
@@ -0,0 +1,24 @@
+<query id="getWikiList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="wiki" />
+        <group pipe="and">
+            <condition operation="like" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/wiki/skins/xe_wiki/comment.html b/modules/wiki/skins/xe_wiki/comment.html
new file mode 100644
index 000000000..b1063213e
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/comment.html
@@ -0,0 +1,105 @@
+<!--@if($oDocument->getCommentCount())-->
+<div class="replyBox">
+
+    {@ $_comment_list = $oDocument->getComments() }
+    {@ debugPrint($oDocument) }
+    <!--@foreach($_comment_list as $key => $comment)-->
+
+        <div class="replyItem <!--@if($comment->get('depth'))-->reply<!--@end-->">
+            <!--@if($comment->get('depth'))-->
+            <div style="margin-left:{($comment->get('depth')-1)*20}px" class="replyIndent">
+            <!--@end-->
+
+            <a name="comment_{$comment->comment_srl}"></a>
+
+            <div class="replyOption">
+                <!--@if($comment->isGranted() || !$comment->get('member_srl'))-->
+                    <a href="{getUrl('act','dispWikiDeleteComment','comment_srl',$comment->comment_srl)}"><img src="./images/common/buttonDeleteX.gif" alt="{$lang->cmd_delete}" width="12" height="13" /></a>
+                    <a href="{getUrl('act','dispWikiModifyComment','comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="17" /></a> 
+                <!--@end-->
+                    <a href="{getUrl('act','dispWikiReplyComment','comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonReply.gif" alt="{$lang->cmd_reply}" width="20" height="17" /></a> 
+            </div>
+
+            <div class="date">
+
+                <strong>{$comment->getRegdate('Y.m.d')}</strong> {$comment->getRegdate('H:i:s')}
+                <!--@if($grant->manager|| $module_info->display_ip_address!='N')-->({$comment->getIpaddress()})<!--@end-->
+            </div>
+
+            <div class="author">
+            <!--@if(!$comment->member_srl)-->
+                <!--@if($comment->homepage)-->
+                    <a href="{$comment->homepage}" onclick="window.open(this.href);return false;">{$comment->getNickName()}</a>
+                <!--@else-->
+                    {$comment->getNickName()}
+                <!--@end-->
+            <!--@else-->
+                <div class="member_{$comment->member_srl}">{$comment->getNickName()}</div>
+            <!--@end-->
+            </div>
+
+            <!--@if($comment->get('voted_count')!=0 || $comment->get('blamed_count') != 0)-->
+            <div class="voted">
+                ({$lang->voted_count}:
+                <strong>{$comment->get('voted_count')?$comment->get('voted_count'):0}</strong> / <strong>{$comment->get('blamed_count')?$comment->get('blamed_count'):0}</strong>)
+            </div>
+            <!--@end-->
+
+            <div class="clear"></div>
+
+            <div class="replyContent">
+                <!--@if(!$comment->isAccessible())-->
+                    <div class="secretContent">
+                        <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
+                        <input type="hidden" name="mid" value="{$mid}" />
+                        <input type="hidden" name="page" value="{$page}" />
+                        <input type="hidden" name="document_srl" value="{$comment->get('document_srl')}" />
+                        <input type="hidden" name="comment_srl" value="{$comment->get('comment_srl')}" />
+                            <div class="title">{$lang->msg_is_secret}</div>
+                            <div class="content"><input type="password" name="password" class="inputTypeText" /><span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_input}" accesskey="s" /></span></div>
+                        </form>
+                    </div>
+                <!--@else-->
+                    <!--@if($comment->getProfileImage())-->
+                    <img src="{$comment->getProfileImage()}" alt="profile" class="commentProfileImage" />
+                    <!--@end-->
+                    {$comment->getContent(true)}
+                <!--@end-->
+                <div class="clear"></div>
+            </div>
+
+            <!--@if($comment->hasUploadedFIles())-->
+                <div class="fileAttached">
+                    <ul>
+                        {@ $_uploaded_files = $comment->getUploadedFiles() }
+                        <!--@foreach($_uploaded_files as $key => $file)-->
+                        <li><a href="{getUrl('')}{$file->download_url}">{$file->source_filename} ({FileHandler::filesize($file->file_size)})({number_format($file->download_count)})</a></li>
+                        <!--@end-->
+                    </ul>
+                    <div class="clear"></div>
+                </div>
+            <!--@end-->
+
+            <!--@if($comment->get('depth'))-->
+            </div>
+            <!--@end-->
+        </div>
+    <!--@end-->
+
+    <!-- 댓글 페이지 네비게이션 -->
+    <!--@if($oDocument->comment_page_navigation)-->
+    <div class="pagination a1">
+        <a href="{getUrl('cpage',1)}#comment" class="prevEnd">{$lang->first_page}</a> 
+        <!--@while($page_no = $oDocument->comment_page_navigation->getNextPage())-->
+            <!--@if($cpage == $page_no)-->
+                <strong>{$page_no}</strong> 
+            <!--@else-->
+                <a href="{getUrl('cpage',$page_no)}#comment">{$page_no}</a>
+            <!--@end-->
+        <!--@end-->
+        <a href="{getUrl('cpage',$oDocument->comment_page_navigation->last_page)}#comment" class="nextEnd">{$lang->last_page}</a>
+    </div>
+    <!--@end-->
+
+</div>
+<!--@end-->
diff --git a/modules/wiki/skins/xe_wiki/comment_form.html b/modules/wiki/skins/xe_wiki/comment_form.html
new file mode 100644
index 000000000..6fb227b7f
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/comment_form.html
@@ -0,0 +1,66 @@
+<!--#include("header.html")-->
+
+<!--// 만약 댓글의 답을 다는 것이라면 원문 보여줌 -->
+<!--@if($oSourceComment->isExists())-->
+<div class="replyBox">
+    <div class="replyItem">
+        <div class="author"><div class="member_{$oSourceComment->getMemberSrl()}">{$oSourceComment->getNickName()}</div></div>
+        <div class="date">
+            {$oSourceComment->getRegdate("Y.m.d H:i")}
+            <!--@if($grant->manager)-->
+                ({$oSourceComment->get('ipaddress')})
+            <!--@end-->
+        </div>
+        <div class="clear"></div>
+
+        <div class="replyContent gap1">
+            {$oSourceComment->getContent(false)}
+        </div>
+    </div>
+</div>
+<!--@end-->
+
+<!-- 글쓰기 폼 -->
+<form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
+<input type="hidden" name="mid" value="{$mid}" />
+<input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
+<input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
+<input type="hidden" name="content" value="{htmlspecialchars($oComment->get('content'))}" />
+<input type="hidden" name="parent_srl" value="{$oComment->get('parent_srl')}" />
+
+<div class="boardWrite commentEditor">
+
+    <div class="userNameAndPw">
+        <!--@if(!$is_logged)-->
+        <label for="userName">{$lang->writer}</label>
+        <input type="text" name="nick_name" value="{$oComment->get('nick_name')}" class="userName inputTypeText" id="userName"/>
+
+        <label for="userPw">{$lang->password}</label>
+        <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
+
+        <label for="emailAddress">{$lang->email_address}</label>
+        <input type="text" name="email_address" value="{htmlspecialchars($oComment->get('email_address'))}" id="emailAddress" class="emailAddress inputTypeText"/>
+
+        <label for="homePage">{$lang->homepage}</label>
+        <input type="text" name="homepage" value="{htmlspecialchars($oComment->get('homepage'))}" id="homePage" class="homePage inputTypeText"/>
+        <!--@else-->
+        <input type="checkbox" name="notify_message" value="Y" <!--@if($oComment->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
+        <label for="notify_message">{$lang->notify}</label>
+        <!--@end-->
+        <!--@if($module_info->secret=="Y")-->
+        <input type="checkbox" name="is_secret" value="Y" <!--@if($oComment->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
+        <label for="is_secret">{$lang->secret}</label>
+        <!--@end-->
+    </div>
+
+    <div class="editor">{$oComment->getEditor()}</div>
+</div>
+
+<div class="commentButton tRight">
+    <span class="button {$btn_class}"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'"/></span>
+    <span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_comment_registration}" accesskey="s" /></span>
+</div>
+
+</form>
+
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/create_document.html b/modules/wiki/skins/xe_wiki/create_document.html
new file mode 100644
index 000000000..90a65ab4a
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/create_document.html
@@ -0,0 +1,11 @@
+<!--#include("header.html")-->
+<div class="boardRead">
+	<div class="readBody">
+	{$lang->not_exist}
+	</div>
+</div>
+<div class="clear" ></div>
+<div class="createButtons">
+    <a href="{getUrl('act','dispWikiEditPage','entry',$entry)}" class="button {$btn_class}"><span>{$lang->cmd_create}</span></a>
+</div>
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/css/wiki.css b/modules/wiki/skins/xe_wiki/css/wiki.css
new file mode 100644
index 000000000..5c06e57e2
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/css/wiki.css
@@ -0,0 +1,346 @@
+@charset "utf-8";
+
+/*
+NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/)
+Jeong, Chan Myeong 070601~070630
+*/
+
+/**
+ * Header
+ **/
+
+/* board Title */
+.boardHeader { border:1px solid #e1e1dd; border-bottom:0; background:#ffffff url(../images/common/bgH3.gif) repeat-x left bottom; overflow:hidden;}
+.boardHeader .boardHeaderBorder { width:100%;}
+.boardHeader h3 { margin:0; float:left; padding:15px 15px 12px 15px; font-size:1.2em; background:#ffffff url(../images/common/lineH3.gif) no-repeat right bottom;}
+
+/* board Description */
+.boardDescription { color:#AEAEAE; border:1px solid #DDDDDD; overflow:hidden; padding:10px; margin: 5px 0; background-color:#FFFFFF;}
+
+/* board Information */
+.boardInformation { width:100%; clear:both; margin:5px 0 2px 0; overflow:hidden; color:#666666;}
+.articleNum { float:left; padding:0 0 0 15px; }
+
+/* account Navigation */
+.accountNavigation { margin:0; padding:0; float:right; }
+.accountNavigation li { float:left; margin-left:7px; list-style:none; }
+.accountNavigation li a { white-space:nowrap; color:#666666; text-decoration:none;}
+.accountNavigation li.setup a { background:url(../images/common/iconSetup.gif) no-repeat left top; padding-left:14px; }
+.accountNavigation li.admin a { background:url(../images/common/iconAdmin.gif) no-repeat left top; padding-left:12px; }
+.accountNavigation li.listType { margin-left:5px; }
+.accountNavigation li.loginAndLogout a { background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left 2px; padding-left:8px; }
+
+/* secret Content */
+.secretContent { margin:20px auto; text-align:center; border:1px solid #EFEFEF; width:240px; }
+.secretContent .title { padding:10px 0 10px 0; background-color:#EFEFEF; display:block; font-weight:bold; }
+.secretContent .content { padding:10px 0 10px 0; background-color:#FFFFFF; display:block; }
+
+/* blog Style Notice */
+.blogNotice { margin-bottom:10px; padding:5px; border:1px solid #e0e1db;}
+.blogNotice .item { background:url("../images/common/notice.gif") no-repeat -2px 3px; padding:3px 0 3px 18px; }
+.blogNotice .item .date { font-family:verdana; font-size:.9em;color:#AAAAAA; }
+.blogNotice .item a { text-decoration:none; color:#444444; }
+.blogNotice .item a:hover { text-decoration:underline}
+.blogNotice .item .replyAndTrackback { color:#AAAAAA; font-size:.9em; }
+
+/* boardRead */
+.viewDocument { border-bottom:2px solid #AAAAAA; margin-bottom:20px; }
+.boardRead { }
+
+.boardRead .titleAndUser { overflow:hidden; border-bottom:1px solid #e0e1db; }
+
+
+.boardRead .dateAndCount { clear:both; white-space:nowrap; color:#444444; margin:5px 0 0 0; font-size:.9em; font-family:tahoma; line-height:17px; padding-bottom:10px; }
+
+.boardRead .dateAndCount .uri { float:left; }
+.boardRead .dateAndCount .uri a { text-decoration:none; margin-left:4px; color:#BBBBBB; }
+
+.boardRead .dateAndCount .date { float:right; background:url("../images/common/calendar.gif") no-repeat left top; padding-left:18px; margin-left:10px; }
+.boardRead .dateAndCount .readedCount { float:right; color:#AAAAAA; margin-left:10px; background:url("../images/common/read.gif") no-repeat left top; padding-left:18px; color:#4A3FD7;}
+.boardRead .dateAndCount .votedCount { float:right; color:#AAAAAA;  margin-left:10px; background:url("../images/common/vote.gif") no-repeat left top; padding-left:18px; color:#D76A3F;}
+.boardRead .dateAndCount .replyAndTrackback { float:right; }
+.boardRead .dateAndCount .replyAndTrackback .replyCount { margin-left:10px; float:left; background:#FFFFFF url(../images/common/iconReply.gif) no-repeat left 1px; padding-left:15px; }
+.boardRead .dateAndCount .replyAndTrackback .trackbackCount { margin-left:10px; float:left; background:#FFFFFF url(../images/common/iconTrackback.gif) no-repeat left 1px; padding-left:15px; }
+.boardRead .dateAndCount .replyAndTrackback a { color:#333333; white-space:nowrap; text-decoration:none; }
+.boardRead .dateAndCount .replyAndTrackback a:hover { text-decoration:underline; }
+.boardRead .dateAndCount .category { float:left; margin-right:10px; }
+.boardRead .dateAndCount .category a { color:#555555; text-decoration:none; background:url("../images/common/category.gif") no-repeat left -1px; padding-left:18px; font-weight:bold;}
+.boardRead .dateAndCount .category a:hover { text-decoration:underline; }
+
+/* extraVars list */
+.boardRead .extraVarsList { width:100%; border:1px solid #e0e1db; border-bottom:none; margin:0 0 30px 0; table-layout:fixed;}
+.boardRead .extraVarsList th { font-weight:normal; color:#555555; text-align:left; padding:4px 0 4px 10px; border-bottom:1px solid #e0e1db; border-right:1px solid #e0e1db;}
+.boardRead .extraVarsList td { color:#555555; border-bottom:1px solid #e0e1db; padding:4px 0 4px 10px; }
+.boardRead .extraVarsList td a { color:#555555; }
+
+.boardRead .readBody { color:#555555; margin-top:20px; }
+
+
+.boardRead .tag { background:#FFFFFF url(../images/common/iconTag.gif) no-repeat 3px 2px; padding-left:25px; margin:10px 0 0 0; }
+.boardRead .tag ul { margin:0; padding:0; }
+.boardRead .tag li { display:inline; list-style:none; }
+.boardRead .tag li a { color:#444444;}
+
+.boardRead .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px; overflow:hidden;}
+.boardRead .fileAttached h5 { font-weight:normal; color:#999999; font-size:1em; line-height:22px; }
+.boardRead .fileAttached ul { padding:0; margin:0; }
+.boardRead .fileAttached li { padding-left:15px; display:block; float:left; white-space:nowrap; list-style:none; margin:0 10px 5px 0; }
+.boardRead .fileAttached li a { text-decoration:none; font-size:.9em; white-space:nowrap; color:#444444; }
+.boardRead .fileAttached li a:visited { color:#777777;}
+
+.boardRead .contentButton { text-align:right;margin:10px 0 5px 0; border-top:1px solid #DDDDDD; padding-top:10px;}
+
+
+.trackbackBox { padding:.6em .6em; color:#666666; border:1px solid #e0e1db;;margin-top:.5em; }
+.trackbackBox .trackbackUrl { color:#1F3DAE; font-size:.9em; background:url("../images/common/iconTrackback.gif") no-repeat left top; padding-left:18px; margin:0; }
+.trackbackBox .trackbackItem { background-color:#F3F3F3; padding:.6em .8em .6em .6em; line-height:1.25em; border-top:1px dotted #EEEEEE; list-style:none;}
+.trackbackBox p { display:inline; margin-bottom:1em;}
+.trackbackBox a { color:#666666; text-decoration:none;}
+.trackbackBox div  { clear:both; }
+.trackbackBox address { display:block; padding:0 .3em 0 0; }
+.trackbackBox address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;}
+.trackbackBox address .date { font:.8em Tahoma; color:#cccccc; float:right;}
+
+.replyBox { padding:10px; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
+.replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
+.replyBox p { display:inline; margin-bottom:1em;}
+.replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
+.replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
+.replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;}
+.replyBox .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
+
+.replyBox .replyOption { height:20px; float:right; white-space:nowrap; margin-left:.2em;}
+.replyBox .replyOption img { vertical-align:middle;}
+
+.replyBox .replyContent { clear:left; }
+.replyBox .replyContent p { display:block; }
+.replyBox .reply { background-color:#F4F4F4; border-bottom:1px dotted #DDDDDD;}
+.replyBox .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
+
+.replyBox .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px; overflow:hidden;}
+.replyBox .fileAttached ul { border:0; margin:0; padding:0;}
+.replyBox .fileAttached h5 { font-weight:normal; color:#999999; float:left; font-size:1em; }
+.replyBox .fileAttached li { padding-left:15px; display:block; float:left; white-space:nowrap; list-style:none; margin:0px 10px 5px 0; }
+.replyBox .fileAttached li a { text-decoration:none; font-size:.9em; white-space:nowrap; color:#444444; }
+.replyBox .fileAttached li a:visited { color:#777777;}
+
+.commentButton { margin-top:.5em; }
+
+/* gallery sub menu */
+.boardSubMenu { margin:0 0 .5em 0; padding:1em 0 .5em .5em; border-bottom:1px solid #e0e1db;}
+.boardSubMenu a { text-decoration:none; color:#666666; vertical-align:bottom; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 5px; padding-left:10px; padding-right:10px; _padding-top:5px; position:relative; top:5px; }
+.boardSubMenu img.sort { vertical-align:middle; }
+
+/* list */
+.boardList { width:100%; border:1px solid #e0e1db; border-top:none; overflow:hidden; }
+
+.boardList thead tr th div { white-space:nowrap; margin:0 5px; }
+.boardList thead tr th.title , .boardList thead tr th.category, .boardList thead tr th.topic { width:100%; }
+.boardList tbody td { white-space:nowrap; }
+.boardList tbody td.title { white-space:normal; }
+.boardList tbody td.webzineTitle { white-space:normal; }
+.boardList tbody td.wrap { white-space:normal; }
+
+.boardListNoTopBorder { border:none; }
+.boardList th { color:#3e3f3e; font-weight:normal; border-top:1px solid #e0e1db; border-bottom:1px solid #ffffff; white-space:nowrap; padding-top:5px; height:28px; overflow:hidden;}
+html:not([lang*=""]) .boardList th { height:33px; }
+.boardList th.no_line { background-position:-3px bottom; }
+.boardList th a { color:#3e3f3e; text-decoration:none; }
+.boardList th.num { border-left:1px solid #ffffff; }
+.boardList th.checkbox { text-align:center; }
+.boardList th.title { text-align:center; padding-left:1em; }
+.boardList th.topic { text-align:left; padding-left:1em; }
+.boardList th.category { text-align:left; padding-left:1em; }
+.boardList th.category select { vertical-align:middle; width:200px; height:20px;}
+.boardList th.reading, th.recommend , th.date { white-space:nowrap;}
+.boardList th .sort { padding:0 .2em; vertical-align:middle;}
+
+.boardList tr.notice { background:#f8f8f8; }
+.boardList tr.notice .num { font-weight:bold;}
+.boardList tr.bg1 { background:#ffffff}
+.boardList tr.bg2 { background:#fbfbfb;}
+.boardList td { border-top:1px solid #eff0ed; padding:.5em;}
+.boardList td.num { font:.8em tahoma; color:#999999; padding:.5em 1em; text-align:center;}
+.boardList td.checkbox { font:.8em tahoma; color:#999999; text-align:center;}
+.boardList tr.notice td.num { padding:.5em; white-space:nowrap;}
+.boardList tr.notice td.notice { font-size:.9em; color:#999999; font-weight:bold; text-align:center;}
+.boardList td.thumb { }
+.boardList td.thumb img { border:1px solid #E0E1DB; padding:3px; margin:none; }
+
+.boardList td.title {padding-left:1em; }
+.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;}
+.boardList td.title * { vertical-align:middle;}
+.boardList td.title,
+.boardList td.title a { color:#444444; text-decoration:none;}
+.boardList td.title a:visited { color:#777777;}
+
+.boardList td.topic { padding-left:1em; color:#888888; }
+.boardList td.topic strong a { font-size:1em; font-weight:normal; text-decoration:none; color:#222222; }
+.boardList td.topic strong a:visited { color:#777777; }
+.boardList td.topic .category { background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat left 3px; padding-left:.5em; margin-left:.5em; color:#AAAAAA; }
+.boardList td.topic div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; }
+.boardList td.topic div.author strong { font-size:1.2em; font-weight:normal; color:#666666; }
+.boardList td.commentCount { font:bold .8em Tahoma; color:#888888; text-align:center; }
+
+.boardList td.latestPost { color:#888888; }
+.boardList td.latestPost div.author { margin-top:.5em; color:#BBBBBB; font-size:0.8em; }
+.boardList td.latestPost div.author strong { font-size:1.2em; font-weight:normal; color:#666666; }
+.boardList td.latestPost div.date { font-size:0.8em; margin-top:.5em; }
+.boardList td.latestPost div.date strong { font-family:Tahoma; font-weight:normal; color:#666666; }
+
+.boardListNoTopBorder td { border-top:none; border-bottom:1px solid #eff0ed; padding:.5em;}
+
+.boardList td.webzineTitle { padding-left:1em; color:#777777; height:1.2em; width:100%;}
+.boardList td.webzineTitle 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.webzineTitle.bold { font-size:1.2em; font-weight:bold;}
+.boardList td.webzineTitle * { vertical-align:middle;}
+.boardList td.webzineTitle,
+.boardList td.webzineTitle a { color:#444444; text-decoration:none;}
+.boardList td.webzineTitle a:visited { color:#777777;}
+
+.boardList td.summary { border-top:none; vertical-align:top; color:#666666; line-height:1.25em; padding-left:1em; white-space:normal; }
+.boardList td.summary a { color:#666666; text-decoration:none; line-height:inherit;}
+.boardList td.summary a:visited { color:#999999;}
+
+.boardList td .replyAndTrackback img.trackback { margin-bottom:-.1em;}
+.boardList td .replyAndTrackback strong { font:bold 1em Tahoma;}
+.boardList td .replyAndTrackback { font:.8em Tahoma; }
+.boardList td.author { color:#333333; font-size:.95em; padding-left:1em;}
+.boardList td.author a { font-size:1em; color:#333333;}
+.boardList td.reading { font:.8em Tahoma; color:#999999; text-align:center;}
+.boardList td.recommend { font:bold .8em Tahoma; text-align:center;}
+.boardList td.date { font:.8em Tahoma; color:#999999; text-align:center; white-space:nowrap;}
+.boardList td input { _margin:-3px;}
+
+.buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; _position:relative; _top:3px; font:.75em Tahoma; text-align:center;}
+*:first-child+html .buttonTypeGo { position:relative; top:3px; }
+
+.thumbnailBox { margin-top:1em; clear:both; overflow:hidden; border-bottom:1px solid #e0e1db; }
+.thumbnailBox div.cell { display:block; float:left; overflow:hidden; margin-bottom:1em; margin-right: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;}
+
+/* board Bottom */
+.boardBottom { margin-top:10px; }
+
+/* list button */
+.leftButtonBox { float: left; }
+.rightButtonBox { float: right; }
+
+/* Search Form */
+.boardSearch { margin-top:30px; margin-left:auto; margin-right:auto; clear:both; text-align:center;}
+.boardSearch select { height:20px; }
+.boardSearch input { height:18px; }
+
+/* boardWrite */
+.boardEditor { margin-bottom:10px; }
+.commentEditor { margin-top:10px; }
+.boardWrite { border:1px solid #e0e1db; padding-bottom:10px;}
+.boardWrite fieldset { border:none; }
+.boardWrite .userNameAndPw { margin:10px 10px 0 10px; }
+.boardWrite .userNameAndPw .userName {width:60px; margin-right:10px; }
+.boardWrite .userNameAndPw .userPw {width:60px; margin-right:10px; }
+.boardWrite .userNameAndPw .emailAddress {width:60px; margin-right:10px; }
+.boardWrite .userNameAndPw .homePage {width:60px; margin-right:10px; }
+
+.boardWrite .title { margin-top:5px; }
+.boardWrite .title .category { margin-left:10px; }
+.boardWrite .title label.title { margin:0 10px 0 10px; }
+.boardWrite .title input.title { width:60%;}
+
+.boardWrite dl { padding:0; margin:0; }
+.boardWrite dl dd { padding:0; margin:0; }
+.boardWrite dl.option { margin:10px 0 3px 10px; padding:0;}
+.boardWrite dl.option dd { display:inline; margin-right:5px; }
+.boardWrite dl.option dd * { vertical-align:middle;}
+.boardWrite dl.option dd select { width:8em; font-size:.95em; }
+
+.boardWrite .tag { margin-top:10px; margin-left:10px; }
+.boardWrite .tag .inputTypeText { width:90%; background:#FFFFFF url(../images/common/iconTag.gif) no-repeat 5px 5px; padding-left:30px;}
+.boardWrite .tag .help { vertical-align:middle;}
+.boardWrite .tag .info { font-size:.9em; color:#999999; background:url(../images/common/iconArrowD8.gif) no-repeat 0% 40%; margin-top:5px; padding-left:5px;}
+
+.boardWrite .extraVarsList { width:100%; border-top:1px solid #e0e1db; border-bottom:none; margin:10px 0 10px 0; table-layout:fixed;}
+.boardWrite .extraVarsList th { font-weight:normal; color:#555555; text-align:left; padding:4px 0 4px 10px; border-bottom:1px solid #e0e1db; border-right:1px solid #e0e1db;}
+.boardWrite .extraVarsList td { color:#555555; border-bottom:1px solid #e0e1db; padding:4px 0 4px 10px; }
+.boardWrite .extraVarsList td a { color:#555555; }
+
+.boardWrite .extraVarsList p { margin:5px 0 0 0; padding:0; }
+.boardWrite .extraVarsList ul { margin:0; padding:0; }
+
+
+/* 게시물의 팝업 메뉴 */
+.comment_popup_menu, .document_popup_menu { text-align:right; background:none; background:url(../images/common/document_menu.gif) no-repeat right top; padding:0 15px 0 0; height:18px;  clear:both;}
+.comment_popup_menu a, .document_popup_menu a { cursor:pointer; display:inline; color:#555555; text-decoration:none; }
+
+/* tag list */
+.tagsBox { border:1px solid #EEEEEE; padding:10px; overflow:hidden;}
+.tagsBox h5 { margin:0; padding:2px; }
+.tags { width:100%; }
+.tags div { float:left; padding:2px; margin-right:10px; overflow:hidden; white-space:nowrap; height:15px;}
+.tags div a { text-decoration:none; color:#555555; line-height:150%;}
+.tags div a:hover { background-color:#888888; color:#FFFFFF;}
+.tags .tagTypeA a { color:#fe3614; font-weight:bold; font-size:12pt; background-color:#EFEFEF; margin:0;}
+.tags .tagTypeB a { color:#fe3614; font-size:11pt; margin:0;}
+.tags .tagTypeC a { font-weight:bold; font-size:11pt; margin:0; background-color:#EFEFEF;}
+.tags .tagTypeD a { font-weight:bold; margin:0; background-color:#EFEFEF;}
+.tags .tagTypeE a { font-weight:normal; margin:0;}
+
+
+/* 회원 서명 및 프로필 이미지 출력 */
+.memberSignature { border:1px solid #e0e1db; padding:10px; margin-top:20px; clear:both;}
+.memberSignature .profile { float:left; margin-right:20px; }
+.commentProfileImage { margin:0 10px 10px 0; float:left; }
+.replyBox .xe_content { display:inline; }
+
+.display_date {  cursor:pointer; width:80px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px;  margin-right:10px;}
+
+.wikimain .header .title { float:left; }
+.wikimain .header .title h1.pageTitle { overflow:hidden; color:#32576B; font-size:24px; font-weight:bold; line-height: 1em; padding:0; margin:0; } 
+.wikimain .header .edit { float:left; margin-left: 10px; }
+.wikimain .header .go { float:right; }
+.wikimain .pageHistory { 
+border-bottom:1px solid #DDEEDD; 
+border-top:1px solid #DDEEDD; 
+color:#666666; font-size:11px; font-weight:normal; margin-top:5px; padding-top:5px; padding-bottom:5px; }
+.wikimain .pageHistory .userInfo { white-space:nowrap; }
+.wikimain .pageHistory .userInfo .author { float:left; color:#3074a5; }
+.wikimain .pageHistory .userInfo .author a { color:#3074a5; text-decoration:none; }
+.wikimain .pageHistory .userInfo .date { float:left; margin-left:5px; }
+.wikimain .pageHistory .links { float:right; }
+.wikimain .pageHistory .history { float:right; margin-left:3px; }
+
+/* Pagination Reset */
+.pagination{ padding:15px 0; margin:0; text-align:center;}
+.pagination *{ margin:0; padding:0;}
+.pagination img{ border:0;}
+.pagination a,
+.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+.pagination a:hover,
+.pagination a:active,
+.pagination a:focus{ background-color:#f4f4f4 !important; }
+.pagination strong{ color:#ff6600 !important;}
+.pagination a.prev,
+.pagination a.prevEnd,
+.pagination a.next,
+.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+/* Pagination A1 */
+.pagination.a1 a,
+.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+.pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/common/arrowPrevA1.gif) no-repeat left center; }
+.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/common/arrowPrevEndA1.gif) no-repeat left center; }
+.pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
+.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
diff --git a/modules/wiki/skins/xe_wiki/delete_comment_form.html b/modules/wiki/skins/xe_wiki/delete_comment_form.html
new file mode 100644
index 000000000..04c371f45
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/delete_comment_form.html
@@ -0,0 +1,23 @@
+<!--#include("header.html")-->
+
+<div class="smallBox w268">
+
+    <div class="header">
+        <h3>{$lang->confirm_delete}</h3>
+    </div>
+
+    <form action="./" method="get" onsubmit="return procFilter(this, delete_comment)">
+    <input type="hidden" name="mid" value="{$mid}" />
+    <input type="hidden" name="page" value="{$page}" />
+    <input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
+    <input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
+
+        <div class="inputPassword tCenter">
+            <span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_delete}" accesskey="s" /></span>
+            <a href="{getUrl('act','','comment_srl','')}" class="button {$btn_class}"><span>{$lang->cmd_cancel}</span></a>
+        </div>
+
+    </form>
+</div>
+
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/footer.html b/modules/wiki/skins/xe_wiki/footer.html
new file mode 100644
index 000000000..04f5b8449
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/footer.html
@@ -0,0 +1 @@
+</div>
diff --git a/modules/wiki/skins/xe_wiki/header.html b/modules/wiki/skins/xe_wiki/header.html
new file mode 100644
index 000000000..08c768356
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/header.html
@@ -0,0 +1,60 @@
+<!--%import("css/wiki.css")-->
+    <!--@if(!$module_info->colorset)-->
+        {@$module_info->colorset = "white"}
+    <!--@end-->
+<div class="wikimain">
+<div class="header">
+    <!--@if($oDocument)-->
+    <div class="title"><H1 class="pageTitle">{$entry}</H1></div> 
+    <div class="edit"><!--@if($oDocument->isExists())--><a href="{getUrl('act','dispWikiEditPage','entry',$entry)}">Edit</a><!--@end--></div>
+    <!--@end-->
+    <div class="go">
+        <form action="{getUrl()}" method="get">
+            <input type="hidden" name="mid" value="{$module_info->mid}" />
+            <input type="text" class="inputTypeText w100" name="entry" />
+            <span class="button"><input type="submit" value="Go" /></span>
+        </form>
+    </div>
+</div>
+<div class="clear"></div>
+        <div class="readHeader">
+            <div class="pageHistory">
+                <!--@if($oDocument)-->
+                <div class="userInfo">
+                    <!--@if(!$oDocument->getMemberSrl())-->
+                        <div class="author">
+                    last edited by 
+                        <!--@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">
+                    last edited by 
+                        <span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></div>
+                    <!--@end-->
+                <div class="date" title="{$lang->regdate}">
+                    <strong>{$oDocument->getUpdate('Y.m.d')}</strong> {$oDocument->getUpdate('H:i:s')} 
+                </div>
+                </div>
+                <!--@if($use_history != 'N')-->
+                <div class="history">
+                    <a href="{getUrl('act','dispWikiHistory','document_srl',$oDocument->document_srl)}">View History</a>
+                </div>
+                <!--@end-->
+                <!--@end-->
+                <div class="links">
+                <a href="{getUrl('act','dispWikiContent','entry','')}">Front Page</a> 
+                <a href="{getUrl('act','dispWikiTitleIndex','entry','','document_srl','')}">Title Index</a>
+                </div>
+
+                <div class="clear"></div>
+            </div>
+
+            <div class="clear"></div>
+        </div>
+        <div class="clear"></div>
+
+
diff --git a/modules/wiki/skins/xe_wiki/histories.html b/modules/wiki/skins/xe_wiki/histories.html
new file mode 100644
index 000000000..3eb14b5c2
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/histories.html
@@ -0,0 +1,29 @@
+<!--#include("header.html")-->
+<div class="readBody">
+<table>
+<tr>
+<td>
+    {$oDocument->getUpdate()}
+</td>
+<td>
+    by {$oDocument->getNickName()}
+</td>
+<td>
+    (current revision)
+</td>
+</tr>
+<!--@foreach($histories as $val)-->
+<tr>
+<td>
+    {zdate($val->regdate, 'Y.m.d H:i:s')}
+</td>
+<td>
+    by {$val->nick_name}
+</td>
+<td>
+</td>
+</tr>
+<!--@end-->
+</table>
+</div>
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/images/common/iconTag.gif b/modules/wiki/skins/xe_wiki/images/common/iconTag.gif
new file mode 100644
index 000000000..ecfdb5585
Binary files /dev/null and b/modules/wiki/skins/xe_wiki/images/common/iconTag.gif differ
diff --git a/modules/wiki/skins/xe_wiki/images/white/buttonModifyE.gif b/modules/wiki/skins/xe_wiki/images/white/buttonModifyE.gif
new file mode 100644
index 000000000..1cde1b60f
Binary files /dev/null and b/modules/wiki/skins/xe_wiki/images/white/buttonModifyE.gif differ
diff --git a/modules/wiki/skins/xe_wiki/images/white/buttonReply.gif b/modules/wiki/skins/xe_wiki/images/white/buttonReply.gif
new file mode 100644
index 000000000..600534865
Binary files /dev/null and b/modules/wiki/skins/xe_wiki/images/white/buttonReply.gif differ
diff --git a/modules/wiki/skins/xe_wiki/message.html b/modules/wiki/skins/xe_wiki/message.html
new file mode 100644
index 000000000..79f207573
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/message.html
@@ -0,0 +1,16 @@
+<!--#include("header.html")-->
+
+<div class="smallBox w268">
+
+    <div class="tCenter messageBox">{$message}</div>
+
+    <div class="gap1 tCenter">
+        <!--@if(!$is_logged)-->
+        <a href="{getUrl('act','dispMemberLoginForm')}" class="button {$btn_class}"><span>{$lang->cmd_login}</span></a>
+        <!--@end-->
+        <a href="#" onclick="history.back(); return false;" class="button {$btn_class}"><span>{$lang->cmd_back}</span></a>
+    </div>
+
+</div>
+
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/skin.xml b/modules/wiki/skins/xe_wiki/skin.xml
new file mode 100644
index 000000000..d8f27792c
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/skin.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE Default Skin</title>
+    <title xml:lang="zh-CN">XE维基默认皮肤</title>
+    <title xml:lang="zh-TW">XE維基預設面板</title>
+    <title xml:lang="jp">XE Default Skin</title>
+    <description xml:lang="ko">
+        XE Default Skin
+    </description>
+    <description xml:lang="zh-CN">
+        XE维基默认皮肤。
+    </description>
+    <description xml:lang="zh-TW">
+        XE維基預設面板
+    </description>
+    <description xml:lang="jp">
+        XE基本スキン
+    </description>
+    <version>0.1</version>
+    <date>2009-01-31</date>
+
+    <author email_address="haneul0318@gmail.com" link="http://seungyeop.kr">
+        <name xml:lang="ko">haneul</name>
+		<name xml:lang="zh-CN">haneul</name>
+        <name xml:lang="zh-TW">haneul</name>
+        <name xml:lang="jp">haneul</name>
+    </author>
+
+    <license>GPL</license>
+
+    <extra_vars>
+    </extra_vars>
+</skin>
+
diff --git a/modules/wiki/skins/xe_wiki/title_index.html b/modules/wiki/skins/xe_wiki/title_index.html
new file mode 100644
index 000000000..742e7c58b
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/title_index.html
@@ -0,0 +1,31 @@
+<!--#include("header.html")-->
+<div class="readBody">
+    <!--@if(!$document_list)-->
+    <div>
+            {$lang->no_documents}
+    </div>
+    <!--@else-->
+    <table>
+    <!--@foreach($document_list as $val)-->
+    <tr>
+    <td>
+        <a href="{getUrl('','mid',$module_info->mid,'entry',$val->get('title'))}">{$val->get('title')}</a>
+    </td>
+    </tr>
+    <!--@end-->
+    </table>
+    <!--@end-->
+</div>
+
+        <div class="pagination a1">
+            <a href="{getUrl('page','','document_srl','','division',$division,'last_division',$last_division,'entry','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no,'document_srl','','division',$division,'last_division',$last_division,'entry','')}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','','division',$division,'last_division',$last_division,'entry','')}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/trackback.html b/modules/wiki/skins/xe_wiki/trackback.html
new file mode 100644
index 000000000..766e149c4
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/trackback.html
@@ -0,0 +1,26 @@
+<!-- 엮인글 목록 -->
+
+<div class="trackbackBox">
+
+    <div class="trackbackUrl"><a name="trackback" href="{$oDocument->getTrackbackUrl()}" onclick="return false;">{$lang->trackback_url} : {$oDocument->getTrackbackUrl()}</a><div class="clear"></div></div>
+
+    <!--@if($oDocument->getTrackbackCount())-->
+        <!--@foreach($oDocument->getTrackbacks() as $key => $val)-->
+        <div class="trackbackItem">
+            <a name="trackback_{$val->trackback_srl}"></a>
+            <address>
+                <a href="{$val->url}" onclick="winopen(this.href);return false;">{htmlspecialchars($val->title)} - {htmlspecialchars($val->blog_name)}</a>
+                <a href="{getUrl('act','dispBoardDeleteTrackback','trackback_srl',$val->trackback_srl)}"><img src="./images/common/buttonDeleteX.gif" border="0" alt="delete" width="12" height="13" /></a>
+                <span class="date">
+                    {zdate($val->regdate, "Y.m.d H:i")}
+                    ({$val->ipaddress})
+                </span>
+            </address>
+            <div>
+                <a href="{$val->url}" onclick="winopen(this.href);return false;">{$val->excerpt}</a> 
+            </div>
+        </div>
+        <!--@end-->
+    <!--@end-->
+
+</div>
diff --git a/modules/wiki/skins/xe_wiki/view_document.html b/modules/wiki/skins/xe_wiki/view_document.html
new file mode 100644
index 000000000..ba9de53df
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/view_document.html
@@ -0,0 +1,107 @@
+<!--#include("header.html")-->
+<!-- 글 내용 보여주기 -->
+<div class="boardRead">
+    <div class="originalContent">
+        <div class="readBody">
+            <div class="contentBody">
+
+                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                    <div class="secretContent">
+                        <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
+                        <input type="hidden" name="mid" value="{$mid}" />
+                        <input type="hidden" name="page" value="{$page}" />
+                        <input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
+
+                            <div class="title">{$lang->msg_is_secret}</div>
+                            <div class="content"><input type="password" name="password" id="cpw" class="inputTypeText" /><span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_input}" accesskey="s" /></span></div>
+
+                        </form>
+                    </div>
+                <!--@else-->
+                    {$oDocument->getContent(false)}
+                <!--@end-->
+            </div>
+        </div>
+
+        {@ $tag_list = $oDocument->get('tag_list') }
+        <!--@if(count($tag_list))-->
+        <div class="tag">
+            <ul>
+                <!--@for($i=0;$i<count($tag_list);$i++)-->
+                    {@ $tag = $tag_list[$i]; }
+                    <li><a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" rel="tag">{htmlspecialchars($tag)}</a><!--@if($i<count($tag_list)-1)-->,&nbsp;<!--@end--></li>
+                <!--@end-->
+            </ul>
+        </div>
+        <!--@end-->
+
+        <!--@if($oDocument->hasUploadedFiles())-->
+        <div class="fileAttached">
+            {@ $uploaded_list = $oDocument->getUploadedFiles() }
+            <ul>
+                <!--@foreach($uploaded_list as $key => $file)-->
+                <li><a href="{getUrl('')}{$file->download_url}">{$file->source_filename} ({FileHandler::filesize($file->file_size)})({number_format($file->download_count)})</a></li>
+                <!--@end-->
+            </ul>
+            <div class="clear"></div>
+        </div>
+        <!--@end-->
+    </div>
+
+    <!-- 목록, 수정/삭제 버튼 -->
+    <div class="contentButton">
+    </div>
+
+</div>
+
+<!-- 엮인글 -->
+<!--@if($oDocument->allowTrackback())-->
+    <!--#include("./trackback.html")-->
+<!--@end-->
+
+
+<!--@if($module_info->use_comment != 'N')-->
+<!-- 댓글 -->
+<a name="comment"></a>
+<!--#include("./comment.html")-->
+<!-- 댓글 입력 폼 -->
+<!--@if($grant->write_comment && $oDocument->isEnableComment() )-->
+    <form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="boardEditor" >
+    <input type="hidden" name="mid" value="{$mid}" />
+    <input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
+    <input type="hidden" name="comment_srl" value="" />
+    <input type="hidden" name="content" value="" />
+        <div class="boardWrite commentEditor">
+            <div class="userNameAndPw">
+                <!--@if(!$is_logged)-->
+                <label for="userName">{$lang->writer}</label>
+                <input type="text" name="nick_name" value="" class="userName inputTypeText" id="userName"/>
+
+                <label for="userPw">{$lang->password}</label>
+                <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
+
+                <label for="emailAddress">{$lang->email_address}</label>
+                <input type="text" name="email_address" value="" id="emailAddress" class="emailAddress inputTypeText"/>
+
+                <label for="homePage">{$lang->homepage}</label>
+                <input type="text" name="homepage" value="" id="homePage" class="homePage inputTypeText"/>
+                <!--@else-->
+                <input type="checkbox" name="notify_message" value="Y" id="notify_message" />
+                <label for="notify_message">{$lang->notify}</label>
+                <!--@end-->
+                <!--@if($module_info->secret=="Y")-->
+                <input type="checkbox" name="is_secret" value="Y" id="is_secret" />
+                <label for="is_secret">{$lang->secret}</label>
+                <!--@end-->
+            </div>
+
+            <div class="editor">{$oDocument->getCommentEditor()}</div>
+        </div>
+
+        <div class="commentButton tRight">
+            <span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_comment_registration}" accesskey="s" /></span>
+        </div>
+    </form>
+<!--@end-->
+<!--@end-->
+<!--#include("footer.html")-->
diff --git a/modules/wiki/skins/xe_wiki/write_form.html b/modules/wiki/skins/xe_wiki/write_form.html
new file mode 100644
index 000000000..119f4f454
--- /dev/null
+++ b/modules/wiki/skins/xe_wiki/write_form.html
@@ -0,0 +1,34 @@
+<!--#include("header.html")-->
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert)" id="fo_write">
+<input type="hidden" name="mid" value="{$mid}" />
+<input type="hidden" name="content" value="{$oDocument->getContentText()}" />
+<input type="hidden" name="document_srl" value="{$document_srl}" />
+<input type="hidden" name="title" value="{$entry}" />
+
+<div class="boardWrite">
+
+    <div class="editor">{$oDocument->getEditor()}</div>
+
+    <div class="tag">
+        <input type="text" name="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="inputTypeText" />
+        <p class="info">{$lang->about_tag}</p>
+    </div>
+</div>
+
+        <div class="fl gap1">
+            <!--@if($is_logged)-->
+            <span class="button {$btn_class}"><input type="button" value="{$lang->cmd_temp_save}"  onclick="doDocumentSave(this); return false;" /></span>
+            <span class="button {$btn_class}"><input type="button" value="{$lang->cmd_load}"  onclick="doDocumentLoad(this); return false;" /></span>
+            <span class="button {$btn_class}"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'" /></span>
+            <!--@end-->
+        </div>
+
+        <div class="fr gap1">
+            <span class="button {$btn_class}"><input type="button" value="{$lang->cmd_preview}" onclick="doDocumentPreview(this); return false;" /></span>
+            <span class="button {$btn_class}"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </div>
+
+        <div class="clear"></div>
+    </form>
+<!--#include("footer.html")-->
diff --git a/modules/wiki/tpl/addition_setup.html b/modules/wiki/tpl/addition_setup.html
new file mode 100644
index 000000000..944e5adb1
--- /dev/null
+++ b/modules/wiki/tpl/addition_setup.html
@@ -0,0 +1,3 @@
+<!--#include("header.html")-->
+
+{$setup_content}
diff --git a/modules/board/skins/xe_guestbook/filter/delete_comment.xml b/modules/wiki/tpl/filter/delete_comment.xml
similarity index 86%
rename from modules/board/skins/xe_guestbook/filter/delete_comment.xml
rename to modules/wiki/tpl/filter/delete_comment.xml
index 115ea00d9..faee3b3b1 100644
--- a/modules/board/skins/xe_guestbook/filter/delete_comment.xml
+++ b/modules/wiki/tpl/filter/delete_comment.xml
@@ -1,4 +1,4 @@
-<filter name="delete_comment" module="board" act="procBoardDeleteComment">
+<filter name="delete_comment" module="wiki" act="procWikiDeleteComment">
   <form>
     <node target="comment_srl" required="true" />
   </form>
diff --git a/modules/wiki/tpl/filter/delete_wiki.xml b/modules/wiki/tpl/filter/delete_wiki.xml
new file mode 100644
index 000000000..ff4ae9f05
--- /dev/null
+++ b/modules/wiki/tpl/filter/delete_wiki.xml
@@ -0,0 +1,10 @@
+<filter name="delete_wiki" module="wiki" act="procWikiAdminDeleteWiki">
+    <form>
+        <node target="module_srl" required="true" />
+    </form>
+    <response callback_func="completeDeleteWiki">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="page" />
+    </response>
+</filter>
diff --git a/modules/wiki/tpl/filter/insert.xml b/modules/wiki/tpl/filter/insert.xml
new file mode 100644
index 000000000..991eb134e
--- /dev/null
+++ b/modules/wiki/tpl/filter/insert.xml
@@ -0,0 +1,12 @@
+<filter name="insert" module="wiki" act="procWikiInsertDocument" confirm_msg_code="confirm_submit">
+  <form>
+    <node target="title" required="true" minlength="1" maxlength="250" />
+    <node target="content" required="true" />
+  </form>
+  <response callback_func="completeDocumentInserted">
+    <tag name="error" />
+    <tag name="message" />
+    <tag name="mid" />
+    <tag name="document_srl" />
+  </response>
+</filter>
diff --git a/modules/board/skins/xe_default/filter/insert_comment.xml b/modules/wiki/tpl/filter/insert_comment.xml
similarity index 91%
rename from modules/board/skins/xe_default/filter/insert_comment.xml
rename to modules/wiki/tpl/filter/insert_comment.xml
index 7bbdc3610..dcb6f1d69 100644
--- a/modules/board/skins/xe_default/filter/insert_comment.xml
+++ b/modules/wiki/tpl/filter/insert_comment.xml
@@ -1,4 +1,4 @@
-<filter name="insert_comment" module="board" act="procBoardInsertComment" confirm_msg_code="confirm_submit">
+<filter name="insert_comment" module="wiki" act="procWikiInsertComment" confirm_msg_code="confirm_submit">
   <form>
     <node target="document_srl" required="true" />
     <node target="nick_name" required="true" />
diff --git a/modules/wiki/tpl/filter/insert_wiki.xml b/modules/wiki/tpl/filter/insert_wiki.xml
new file mode 100644
index 000000000..f1304d220
--- /dev/null
+++ b/modules/wiki/tpl/filter/insert_wiki.xml
@@ -0,0 +1,28 @@
+<filter name="insert_wiki" module="wiki" act="procWikiAdminInsertWiki" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="mid" required="true" filter="alpha_number" />
+        <node target="browser_title" required="true" maxlength="250" />
+    </form>
+    <parameter>
+        <param name="wiki_name" target="mid" />
+        <param name="module_srl" target="module_srl" />
+        <param name="module_category_srl" target="module_category_srl" />
+        <param name="layout_srl" target="layout_srl" />
+        <param name="skin" target="skin" />
+        <param name="browser_title" target="browser_title" />
+        <param name="admin_mail" target="admin_mail" />
+        <param name="is_default" target="is_default" />
+        <param name="description" target="description" />
+        <param name="header_text" target="header_text" />
+        <param name="footer_text" target="footer_text" />
+        <param name="use_comment" target="use_comment" />
+    </parameter>
+    <response callback_func="completeInsertWiki">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="module" />
+        <tag name="act" />
+        <tag name="page" />
+        <tag name="module_srl" />
+    </response>
+</filter>
diff --git a/modules/wiki/tpl/grant_list.html b/modules/wiki/tpl/grant_list.html
new file mode 100644
index 000000000..b0d8b0c53
--- /dev/null
+++ b/modules/wiki/tpl/grant_list.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$grant_content}
diff --git a/modules/wiki/tpl/header.html b/modules/wiki/tpl/header.html
new file mode 100644
index 000000000..ee3632e54
--- /dev/null
+++ b/modules/wiki/tpl/header.html
@@ -0,0 +1,26 @@
+<!--%import("js/wiki_admin.js")-->
+
+<h3 class="xeAdmin">{$lang->wiki} <span class="gray">{$lang->cmd_management}</span></h3>
+
+<div class="infoText">{nl2br($lang->about_wiki)}</div>
+
+<!--@if($module_info)-->
+<div class="header4">
+    <!--@if($module_info->mid)-->
+    <h4 class="xeAdmin">{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
+    <!--@end-->
+
+    <ul class="localNavigation">
+        <!--@if($module=='admin')-->
+        <li <!--@if($act=='dispWikiAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispWikiAdminContent','module_srl','')}">{$lang->cmd_wiki_list}</a></li>
+        <!--@else-->
+        <li><a href="{getUrl('act','')}">{$lang->cmd_back}</a></li>
+        <!--@end-->
+        <li <!--@if($act=='dispWikiAdminWikiInfo'||$act=='dispWikiAdminInsertWiki')-->class="on"<!--@end-->><a href="{getUrl('act','dispWikiAdminInsertWiki')}">{$lang->cmd_view_info}</a></li>
+        <li <!--@if($act=='dispWikiAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispWikiAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
+        <li <!--@if($act=='dispWikiAdminWikiAdditionSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispWikiAdminWikiAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
+        <li <!--@if($act=='dispWikiAdminSkinInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispWikiAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>
+    </ul>
+</div>
+<!--@end-->
+
diff --git a/modules/wiki/tpl/index.html b/modules/wiki/tpl/index.html
new file mode 100644
index 000000000..bb8f45155
--- /dev/null
+++ b/modules/wiki/tpl/index.html
@@ -0,0 +1,84 @@
+<!--#include("./header.html")-->
+
+
+<!-- 목록 -->
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
+<table cellspacing="0" class="rowTable">
+<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+<thead>
+    <tr>
+        <th scope="col"><div>{$lang->no}</div></th>
+        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
+        <th scope="col">
+            <div>
+                <input type="hidden" name="module" value="{$module}" />
+                <input type="hidden" name="act" value="{$act}" />
+                <select name="module_category_srl" class="fullWidth">
+                    <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>
+                    <!--@end-->
+                    <option value="">---------</option>
+                    <option value="-1">{$lang->cmd_management}</option>
+                </select>
+                <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
+            </div>
+        </th>
+        <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
+        <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
+        <th scope="col"><div>{$lang->regdate}</div></th>
+        <th scope="col" colspan="3"><div>&nbsp;</div></th>
+    </tr>
+</thead>
+<tbody>
+    <!--@foreach($wiki_list as $no => $val)-->
+    <tr>
+        <td class="center number">{$no}</td>
+        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
+        <td>
+            <!--@if(!$val->module_category_srl)-->
+                <!--@if($val->site_srl)-->
+                {$lang->virtual_site}
+                <!--@else-->
+                {$lang->not_exists}
+                <!--@end-->
+            <!--@else-->
+                {$module_category[$val->module_category_srl]->title}
+            <!--@end-->
+        </td>
+        <td>{htmlspecialchars($val->mid)}</td>
+        <td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" onclick="window.open(this.href); return false;">{htmlspecialchars($val->browser_title)}</a></td>
+        <td>{zdate($val->regdate,"Y-m-d")}</td>
+        <td><a href="{getUrl('act','dispWikiAdminInsertWiki','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
+        <td><a href="./?module=module&amp;act=dispModuleAdminCopyModule&amp;module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
+        <td><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispWikiAdminDeleteWiki','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else-->&nbsp;<!--@end--></td>
+    </tr>
+    <!--@end-->
+</tbody>
+</table>
+</form>
+
+<!-- 버튼 -->
+<div class="clear">
+    <div class="fl">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleAdditionSetup')}" onclick="doCartSetup(this.href); return false;" class="button red"><span>{$lang->cmd_addition_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+    <div class="fr">
+        <a href="{getUrl('act','dispWikiAdminInsertWiki','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+    </div>
+</div>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+</div>
diff --git a/modules/board/skins/xe_default/js/board.js b/modules/wiki/tpl/js/wiki.js
similarity index 85%
rename from modules/board/skins/xe_default/js/board.js
rename to modules/wiki/tpl/js/wiki.js
index afade30cd..31084a251 100644
--- a/modules/board/skins/xe_default/js/board.js
+++ b/modules/wiki/tpl/js/wiki.js
@@ -1,7 +1,7 @@
 /**
- * @file   modules/board/js/board.js
+ * @file   modules/wiki/js/wiki.js
  * @author zero (zero@nzeo.com)
- * @brief  board 모듈의 javascript
+ * @brief  wiki 모듈의 javascript
  **/
 
 /* 글쓰기 작성후 */
@@ -10,12 +10,18 @@ function completeDocumentInserted(ret_obj) {
     var message = ret_obj['message'];
     var mid = ret_obj['mid'];
     var document_srl = ret_obj['document_srl'];
-    var category_srl = ret_obj['category_srl'];
 
     //alert(message);
 
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
-    if(category_srl) url = url.setQuery('category',category_srl);
+    var url;
+    if(!document_srl)
+    {
+        url = current_url.setQuery('mid',mid).setQuery('act','');
+    }
+    else
+    {
+        url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
+    }
     location.href = url;
 }
 
@@ -102,11 +108,6 @@ function completeDeleteTrackback(ret_obj) {
     location.href = url;
 }
 
-/* 카테고리 이동 */
-function doChangeCategory() {
-    var category_srl = jQuery('#board_category option:selected').val();
-    location.href = decodeURI(current_url).setQuery('category',category_srl);
-}
 
 /* 스크랩 */
 function doScrap(document_srl) {
diff --git a/modules/wiki/tpl/js/wiki_admin.js b/modules/wiki/tpl/js/wiki_admin.js
new file mode 100644
index 000000000..becf3a9ec
--- /dev/null
+++ b/modules/wiki/tpl/js/wiki_admin.js
@@ -0,0 +1,49 @@
+/**
+ * @file   modules/wiki/js/wiki_admin.js
+ * @author zero (zero@nzeo.com)
+ * @brief  wiki 모듈의 관리자용 javascript
+ **/
+
+
+/* 모듈 생성 후 */
+function completeInsertWiki(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+
+    alert(message);
+
+    var url = current_url.setQuery('act','dispWikiAdminInsertWiki');
+    if(module_srl) url = url.setQuery('module_srl',module_srl);
+    if(page) url.setQuery('page',page);
+    location.href = url;
+}
+
+/* 모듈 삭제 후 */
+function completeDeleteWiki(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+    var page = ret_obj['page'];
+    alert(message);
+
+    var url = current_url.setQuery('act','dispWikiAdminContent').setQuery('module_srl','');
+    if(page) url = url.setQuery('page',page);
+    location.href = url;
+}
+
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
+
diff --git a/modules/wiki/tpl/skin_info.html b/modules/wiki/tpl/skin_info.html
new file mode 100644
index 000000000..0ad67b69f
--- /dev/null
+++ b/modules/wiki/tpl/skin_info.html
@@ -0,0 +1,3 @@
+<!--#include("./header.html")-->
+
+{$skin_content}
diff --git a/modules/wiki/tpl/wiki_delete.html b/modules/wiki/tpl/wiki_delete.html
new file mode 100644
index 000000000..bc8abd544
--- /dev/null
+++ b/modules/wiki/tpl/wiki_delete.html
@@ -0,0 +1,32 @@
+<!--%import("filter/delete_wiki.xml")-->
+<!--%import("js/wiki_admin.js")-->
+<!--#include("header.html")-->
+
+<form action="./" method="get" onsubmit="return procFilter(this, delete_wiki)">
+<input type="hidden" name="page" value="{$page}" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+
+    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th scope="row"><div>{$lang->module_name}</div></th>
+        <td class="wide">{$module_info->mid}</td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->module}</div></th>
+        <td>{$module_info->module}</td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->document_count}</div></th>
+        <td>{$module_info->document_count}</td>
+    </tr>
+    <tr>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
+            <a href="{getUrl('act','dispWikiAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
+
+
+</form>
diff --git a/modules/wiki/tpl/wiki_insert.html b/modules/wiki/tpl/wiki_insert.html
new file mode 100644
index 000000000..63f9f7d94
--- /dev/null
+++ b/modules/wiki/tpl/wiki_insert.html
@@ -0,0 +1,113 @@
+<!--%import("filter/insert_wiki.xml")-->
+<!--%import("js/wiki_admin.js")-->
+<!--#include("header.html")-->
+
+<form action="./" method="post" onsubmit="return procFilter(this, insert_wiki)" enctype="multipart/form-data">
+<input type="hidden" name="page" value="{$page}" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+<!--@if($module_info->is_default=='Y')-->
+<input type="hidden" name="is_default" value="Y" />
+<!--@end-->
+
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th scope="row"><div>{$lang->mid}</div></th>
+        <td>
+            <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
+            <p>{$lang->about_mid}</p>
+        </td>
+    </tr>
+    <!--@if($module_info->is_default!='Y')-->
+    <tr>
+        <th scope="row"><div>{$lang->is_default}</div></th>
+        <td>
+            <input type="checkbox" name="is_default" value="Y" <!--@if($module_info->is_default=='Y')-->checked="checked"<!--@end--> id="fld_for_default"  class="checkbox" />
+            <label for="fld_for_default">{$lang->about_default}</label>
+        </td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th scope="row"><div>{$lang->module_category}</div></th>
+        <td>
+            <select name="module_category_srl">
+                <option value="0">{$lang->notuse}</option>
+                <!--@foreach($module_category as $key => $val)-->
+                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+            <p>{$lang->about_module_category}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->use_comment}</div></th>
+        <td>
+            <select name="use_comment">
+                <option value="N" <!--@if($module_info->use_comment=='N')-->selected="selected"<!--@end--> >{$lang->notuse}</option>
+                <option value="Y" <!--@if($module_info->use_comment!='N')-->selected="selected"<!--@end--> >{$lang->use}</option>
+            </select>
+            <p>{$lang->about_use_comment}</p>
+        </td>
+    </tr>
+
+    <tr>
+        <th scope="row"><div>{$lang->browser_title}</div></th>
+        <td>
+            <input type="text" name="browser_title" value="{htmlspecialchars($module_info->browser_title)}"  class="inputTypeText w400" id="browser_title"/>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            <p>{$lang->about_browser_title}</p>
+        </td>
+    </tr>
+
+    <tr>
+        <th scope="row"><div>{$lang->layout}</div></th>
+        <td>
+            <select name="layout_srl">
+            <option value="0">{$lang->notuse}</option>
+            <!--@foreach($layout_list as $key => $val)-->
+            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+            <!--@end-->
+            </select>
+            <p>{$lang->about_layout}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->skin}</div></th>
+        <td>
+            <select name="skin">
+                <!--@foreach($skin_list as $key=>$val)-->
+                <option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_wiki'))-->selected="selected"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+            <p>{$lang->about_skin}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->description}</div></th>
+        <td>
+            <textarea name="description" class="inputTypeTextArea fullWidth">{htmlspecialchars($module_info->description)}</textarea>
+            <p>{$lang->about_description}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->header_text}</div></th>
+        <td>
+            <textarea name="header_text" class="inputTypeTextArea fullWidth" id="header_text">{htmlspecialchars($module_info->header_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','header_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            <p>{$lang->about_header_text}</p>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><div>{$lang->footer_text}</div></th>
+        <td>
+            <textarea name="footer_text" class="inputTypeTextArea fullWidth" id="footer_text">{htmlspecialchars($module_info->footer_text)}</textarea>
+            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','footer_text')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+            <p>{$lang->about_footer_text}</p>
+        </td>
+    </tr>
+    <tr>
+        <th colspan="2" class="button">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
+        </th>
+    </table>
+</form>
diff --git a/modules/wiki/wiki.admin.controller.php b/modules/wiki/wiki.admin.controller.php
new file mode 100644
index 000000000..ef732014c
--- /dev/null
+++ b/modules/wiki/wiki.admin.controller.php
@@ -0,0 +1,60 @@
+<?php
+    /**
+     * @class  wikiAdminController
+     * @author zero (zero@nzeo.com)
+     * @brief  wiki 모듈의 admin controller class
+     **/
+
+    class wikiAdminController extends wiki {
+        /**
+         * @brief 초기화
+         **/
+        function init() {
+        }
+
+        function procWikiAdminInsertWiki($args = null) {
+            // module 모듈의 model/controller 객체 생성
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+
+            $args = Context::getRequestVars();
+            $args->module = 'wiki';
+            $args->mid = $args->wiki_name;
+            if($args->use_comment!='N') $args->use_comment = 'Y';
+
+            unset($args->wiki_name);
+            if($args->module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+                if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
+            }
+
+            if(!$args->module_srl) {
+                $output = $oModuleController->insertModule($args);
+                $msg_code = 'success_registed';
+            } else {
+                $output = $oModuleController->updateModule($args);
+                $msg_code = 'success_updated';
+            }
+
+            if(!$output->toBool()) return $output;
+
+            $this->add('page',Context::get('page'));
+            $this->add('module_srl',$output->get('module_srl'));
+            $this->setMessage($msg_code);
+        }
+
+        function procWikiAdminDeleteWiki() {
+            $module_srl = Context::get('module_srl');
+
+            // 원본을 구해온다
+            $oModuleController = &getController('module');
+            $output = $oModuleController->deleteModule($module_srl);
+            if(!$output->toBool()) return $output;
+
+            $this->add('module','wiki');
+            $this->add('page',Context::get('page'));
+            $this->setMessage('success_deleted');
+        }
+
+    }
+?>
diff --git a/modules/wiki/wiki.admin.view.php b/modules/wiki/wiki.admin.view.php
new file mode 100644
index 000000000..a15217f1a
--- /dev/null
+++ b/modules/wiki/wiki.admin.view.php
@@ -0,0 +1,126 @@
+<?php
+    /**
+     * @class  wikiAdminView
+     * @brief  wiki 모듈의 admin view class
+     **/
+
+    class wikiAdminView extends wiki {
+        function init() {
+            // module_srl이 있으면 미리 체크하여 존재하는 모듈이면 module_info 세팅
+            $module_srl = Context::get('module_srl');
+            if(!$module_srl && $this->module_srl) {
+                $module_srl = $this->module_srl;
+                Context::set('module_srl', $module_srl);
+            }
+
+            // module model 객체 생성 
+            $oModuleModel = &getModel('module');
+
+            // module_srl이 넘어오면 해당 모듈의 정보를 미리 구해 놓음
+            if($module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if(!$module_info) {
+                    Context::set('module_srl','');
+                    $this->act = 'list';
+                } else {
+                    ModuleModel::syncModuleToSite($module_info);
+                    $this->module_info = $module_info;
+                    Context::set('module_info',$module_info);
+                }
+            }
+
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+
+            // 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
+            $template_path = sprintf("%stpl/",$this->module_path);
+            $this->setTemplatePath($template_path);
+        }
+
+        function dispWikiAdminContent() {
+            $args->sort_index = "module_srl";
+            $args->page = Context::get('page');
+            $args->list_count = 20;
+            $args->page_count = 10;
+            $args->s_module_category_srl = Context::get('module_category_srl');
+            $output = executeQueryArray('wiki.getWikiList', $args);
+            ModuleModel::syncModuleToSite($output->data);
+
+            // 템플릿에 쓰기 위해서 context::set
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('wiki_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('index');
+        }
+
+        function dispWikiAdminInsertWiki() {
+            if(!in_array($this->module_info->module, array('admin', 'wiki'))) {
+                return $this->alertMessage('msg_invalid_request');
+            }
+
+            // 스킨 목록을 구해옴
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getSkins($this->module_path);
+            Context::set('skin_list',$skin_list);
+
+            // 레이아웃 목록을 구해옴
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('wiki_insert');
+        }
+
+        function dispWikiAdminDeleteWiki() {
+            if(!Context::get('module_srl')) return $this->dispWikiAdminContent();
+            if(!in_array($this->module_info->module, array('admin', 'wiki'))) {
+                return $this->alertMessage('msg_invalid_request');
+            }
+            $module_info = Context::get('module_info');
+
+            $oDocumentModel = &getModel('document');
+            $document_count = $oDocumentModel->getDocumentCount($module_info->module_srl);
+            $module_info->document_count = $document_count;
+
+            Context::set('module_info',$module_info);
+            $this->setTemplateFile('wiki_delete');
+        }
+
+        function dispWikiAdminWikiAdditionSetup() {
+            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
+            $content = '';
+
+            // 추가 설정을 위한 트리거 호출 
+            // 게시판 모듈이지만 차후 다른 모듈에서의 사용도 고려하여 trigger 이름을 공용으로 사용할 수 있도록 하였음
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
+            Context::set('setup_content', $content);
+
+            // 템플릿 파일 지정
+            $this->setTemplateFile('addition_setup');
+        }
+
+        function dispWikiAdminGrantInfo() {
+            // 공통 모듈 권한 설정 페이지 호출
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('grant_list');
+        }
+
+        function dispWikiAdminSkinInfo() {
+            // Call the common page for managing skin information
+            $oModuleAdminModel = &getAdminModel('module');
+            $skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
+            Context::set('skin_content', $skin_content);
+
+            $this->setTemplateFile('skin_info');
+        }
+    }
+?>
diff --git a/modules/wiki/wiki.class.php b/modules/wiki/wiki.class.php
new file mode 100644
index 000000000..4b0b94e7a
--- /dev/null
+++ b/modules/wiki/wiki.class.php
@@ -0,0 +1,30 @@
+<?php
+    /**
+     * @class wiki
+     * @author haneul (haneul0318@gmail.com)
+     * @brief  wiki 모듈의 high class
+     **/
+
+    class wiki extends ModuleObject {
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief 설치가 이상이 없는지 체크하는 method
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        function moduleUpdate() {
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief 캐시 파일 재생성
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/wiki/wiki.controller.php b/modules/wiki/wiki.controller.php
new file mode 100644
index 000000000..2d9709c72
--- /dev/null
+++ b/modules/wiki/wiki.controller.php
@@ -0,0 +1,159 @@
+<?php
+    
+    class wikiController extends wiki {
+
+        function init() {
+        }
+
+        function procWikiInsertDocument() {
+            // 권한 체크
+            if(!$this->grant->write_document) return new Object(-1, 'msg_not_permitted');
+            $entry = Context::get('entry');
+
+            // 글작성시 필요한 변수를 세팅
+            $obj = Context::getRequestVars();
+            $obj->module_srl = $this->module_srl;
+            if($this->module_info->use_comment != 'N')
+            {
+                $obj->allow_comment = 'Y';
+            }
+            else
+            {
+                $obj->allow_comment = 'N';
+            }
+
+            if(!$obj->nick_name) $obj->nick_name = "anonymous";
+            if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+
+            settype($obj->title, "string");
+            if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+            //그래도 없으면 Untitled
+            if($obj->title == '') $obj->title = 'Untitled';
+
+            // document module의 model 객체 생성
+            $oDocumentModel = &getModel('document');
+
+            // document module의 controller 객체 생성
+            $oDocumentController = &getController('document');
+
+            // 이미 존재하는 글인지 체크
+            $oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
+
+            // 이미 존재하는 경우 수정
+            if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
+                $output = $oDocumentController->updateDocument($oDocument, $obj);
+                $msg_code = 'success_updated';
+
+            // 그렇지 않으면 신규 등록
+            } else {
+                $output = $oDocumentController->insertDocument($obj);
+                $msg_code = 'success_registed';
+                $obj->document_srl = $output->get('document_srl');
+                $oDocumentController->insertAlias($obj->module_srl, $obj->document_srl, $obj->title);
+            }
+
+            // 오류 발생시 멈춤
+            if(!$output->toBool()) return $output;
+
+            // 결과를 리턴
+            $this->add('mid', Context::get('mid'));
+            $this->add('document_srl', $output->get('document_srl'));
+
+            // 성공 메세지 등록
+            $this->setMessage($msg_code);
+        }
+
+        function procWikiInsertComment() {
+            // 권한 체크
+            if(!$this->grant->write_comment) return new Object(-1, 'msg_not_permitted');
+
+            // 댓글 입력에 필요한 데이터 추출
+            $obj = Context::gets('document_srl','comment_srl','parent_srl','content','password','nick_name','nick_name','member_srl','email_address','homepage','is_secret','notify_message');
+            $obj->module_srl = $this->module_srl;
+
+            // 원글이 존재하는지 체크
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($obj->document_srl);
+            if(!$oDocument->isExists()) return new Object(-1,'msg_not_permitted');
+
+            // comment 모듈의 model 객체 생성
+            $oCommentModel = &getModel('comment');
+
+            // comment 모듈의 controller 객체 생성
+            $oCommentController = &getController('comment');
+
+            // comment_srl이 존재하는지 체크
+			      // 만일 comment_srl이 n/a라면 getNextSequence()로 값을 얻어온다.
+			      if(!$obj->comment_srl) {
+                $obj->comment_srl = getNextSequence();
+            } else {
+                $comment = $oCommentModel->getComment($obj->comment_srl, $this->grant->manager);
+            }
+
+            // comment_srl이 없을 경우 신규 입력
+            if($comment->comment_srl != $obj->comment_srl) {
+
+                // parent_srl이 있으면 답변으로
+                if($obj->parent_srl) {
+                    $parent_comment = $oCommentModel->getComment($obj->parent_srl);
+                    if(!$parent_comment->comment_srl) return new Object(-1, 'msg_invalid_request');
+
+                    $output = $oCommentController->insertComment($obj);
+
+                // 없으면 신규
+                } else {
+                    $output = $oCommentController->insertComment($obj);
+                }
+
+                // 문제가 없고 모듈 설정에 관리자 메일이 등록되어 있으면 메일 발송
+                if($output->toBool() && $this->module_info->admin_mail) {
+                    $oMail = new Mail();
+                    $oMail->setTitle($oDocument->getTitleText());
+                    $oMail->setContent( sprintf("From : <a href=\"%s#comment_%d\">%s#comment_%d</a><br/>\r\n%s", $oDocument->getPermanentUrl(), $obj->comment_srl, $oDocument->getPermanentUrl(), $obj->comment_srl, $obj->content));
+                    $oMail->setSender($obj->user_name, $obj->email_address);
+
+                    $target_mail = explode(',',$this->module_info->admin_mail);
+                    for($i=0;$i<count($target_mail);$i++) {
+                        $email_address = trim($target_mail[$i]);
+                        if(!$email_address) continue;
+                        $oMail->setReceiptor($email_address, $email_address);
+                        $oMail->send();
+                    }
+                }
+
+            // comment_srl이 있으면 수정으로
+            } else {
+                $obj->parent_srl = $comment->parent_srl;
+                $output = $oCommentController->updateComment($obj, $this->grant->manager);
+                $comment_srl = $obj->comment_srl;
+            }
+
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_registed');
+            $this->add('mid', Context::get('mid'));
+            $this->add('document_srl', $obj->document_srl);
+            $this->add('comment_srl', $obj->comment_srl);
+        }
+
+        function procWikiDeleteComment() {
+            // check the comment's sequence number 
+            debugPrint('here');
+            $comment_srl = Context::get('comment_srl');
+            if(!$comment_srl) return $this->doError('msg_invalid_request');
+
+            // create controller object of comment module 
+            $oCommentController = &getController('comment');
+
+            $output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
+            debugPrint($output);
+            if(!$output->toBool()) return $output;
+
+            $this->add('mid', Context::get('mid'));
+            $this->add('page', Context::get('page'));
+            $this->add('document_srl', $output->get('document_srl'));
+            $this->setMessage('success_deleted');
+        }
+    }
+
+?>
diff --git a/modules/wiki/wiki.view.php b/modules/wiki/wiki.view.php
new file mode 100644
index 000000000..9eecaeb78
--- /dev/null
+++ b/modules/wiki/wiki.view.php
@@ -0,0 +1,283 @@
+<?php
+    /**
+     * @class  wikiView
+     * @author haneul (haneul0318@gmail.com)
+     * @brief  wiki 모듈의 View class
+     **/
+
+    class wikiView extends wiki {
+
+        /**
+         * @brief 초기화
+         * wiki 모듈은 일반 사용과 관리자용으로 나누어진다.\n
+         **/
+        function init() {
+            /**
+             * 스킨 경로를 미리 template_path 라는 변수로 설정함
+             * 스킨이 존재하지 않는다면 xe_wiki로 변경
+             **/
+            $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
+            if(!is_dir($template_path)) {
+                $this->module_info->skin = 'xe_wiki';
+                $template_path = sprintf("%sskins/%s/",$this->module_path, $this->module_info->skin);
+            }
+            $this->setTemplatePath($template_path);
+
+            $oModuleModel = &getModel('module');
+
+            $document_config = $oModuleModel->getModulePartConfig('document', $this->module_info->module_srl);
+            if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+            Context::set('use_history', $document_config->use_history);
+
+            Context::addJsFile($this->module_path.'tpl/js/wiki.js');
+        }
+
+        /**
+         * @brief 선택된 글 출력
+         **/
+        function dispWikiContent() {
+            $output = $this->dispWikiContentView();
+            if(!$output->toBool()) return;
+        }
+
+        function dispWikiHistory() {
+            $oDocumentModel = &getModel('document');
+            $document_srl = Context::get('document_srl');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return $this->stop('msg_invalid_request');
+            $entry = $oDocument->getTitleText();
+            Context::set('entry',$entry);
+            $histories = $oDocumentModel->getHistories($document_srl);
+            if(!$histories) $histories = array();
+            Context::set('histories',$histories);
+            Context::set('oDocument', $oDocument);
+            $this->setTemplateFile('histories');
+        }
+
+        function dispWikiEditPage() {
+            if(!$this->grant->write_document) return $this->dispWikiMessage('msg_not_permitted');
+
+            $oDocumentModel = &getModel('document');
+            $document_srl = Context::get('document_srl');
+            $oDocument = $oDocumentModel->getDocument(0, $this->grant->manager);
+            $oDocument->setDocument($document_srl);
+            $oDocument->add('module_srl', $this->module_srl);
+            Context::set('document_srl',$document_srl);
+            Context::set('oDocument', $oDocument);
+
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert.xml');
+
+            $this->setTemplateFile('write_form');
+        }
+
+        /**
+         * @brief Displaying Message 
+         **/
+        function dispWikiMessage($msg_code) {
+            $msg = Context::getLang($msg_code);
+            if(!$msg) $msg = $msg_code;
+            Context::set('message', $msg);
+            $this->setTemplateFile('message');
+        }
+
+        function dispWikiTitleIndex() {
+            $page = Context::get('page');
+            $oDocumentModel = &getModel('document');
+            $obj->module_srl = $this->module_info->module_srl;
+            $obj->sort_index = "title";
+            $obj->page = $page;
+            $obj->list_count = 50;
+            $output = $oDocumentModel->getDocumentList($obj);
+
+            Context::set('document_list', $output->data);
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('page_navigation', $output->page_navigation);
+            $this->setTemplateFile('title_index');
+        }
+
+        function dispWikiContentView() {
+            // 요청된 변수 값들을 정리
+            $document_srl = Context::get('document_srl');
+            $entry = Context::get('entry');
+            $oDocumentModel = &getModel('document');
+            if(!$document_srl && !$entry) {
+                $entry = "Front Page";
+                Context::set('entry', $entry);
+                $document_srl = $oDocumentModel->getDocumentSrlByAlias($this->module_info->mid, $entry);
+            }
+
+
+            // document model 객체 생성 
+
+            /**
+             * 요청된 문서 번호가 있다면 문서를 구함
+             **/
+            if($document_srl) {
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+
+                // 해당 문서가 존재할 경우 필요한 처리를 함
+                if($oDocument->isExists()) {
+
+                    // 글과 요청된 모듈이 다르다면 오류 표시
+                    if($oDocument->get('module_srl')!=$this->module_info->module_srl ) return $this->stop('msg_invalid_request');
+
+                    // 관리 권한이 있다면 권한을 부여
+                    if($this->grant->manager) $oDocument->setGrant();
+
+                    if(!Context::get('entry')) Context::set('entry', $oDocument->getTitleText());
+
+                    // 상담기능이 사용되고 공지사항이 아니고 사용자의 글도 아니면 무시
+
+                // 요청된 문서번호의 문서가 없으면 document_srl null 처리 및 경고 메세지 출력
+                } else {
+                    Context::set('document_srl','',true);
+                    $this->alertMessage('msg_not_founded');
+                }
+
+            /**
+             * 요청된 문서 번호가 아예 없다면 빈 문서 객체 생성
+             **/
+            } else {
+                $oDocument = $oDocumentModel->getDocument(0);
+            }
+
+            /**
+             * 글 보기 권한을 체크해서 권한이 없으면 오류 메세지 출력하도록 처리
+             **/
+            if($oDocument->isExists()) {
+                // 브라우저 타이틀에 글의 제목을 추가
+                Context::addBrowserTitle($oDocument->getTitleText());
+
+                // 조회수 증가 (비밀글일 경우 권한 체크)
+                if(!$oDocument->isSecret() || $oDocument->isGranted()) $oDocument->updateReadedCount();
+
+                // 비밀글일때 컨텐츠를 보여주지 말자.
+                if($oDocument->isSecret() && !$oDocument->isGranted()) $oDocument->add('content',Context::getLang('thisissecret'));
+                $this->setTemplateFile('view_document');
+            }
+            else
+            {
+                $this->setTemplateFile('create_document');
+            }
+
+            // 스킨에서 사용할 oDocument 변수 세팅
+            Context::set('oDocument', $oDocument);
+
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+        
+            return new Object();
+        }
+
+        /**
+         * @brief 댓글의 답글 화면 출력
+         **/
+        function dispWikiReplyComment() {
+            // 권한 체크
+            if(!$this->grant->write_comment) return $this->dispWikiMessage('msg_not_permitted');
+
+            // 목록 구현에 필요한 변수들을 가져온다
+            $parent_srl = Context::get('comment_srl');
+
+            // 지정된 원 댓글이 없다면 오류
+            if(!$parent_srl) return new Object(-1, 'msg_invalid_request');
+
+            // 해당 댓글를 찾아본다
+            $oCommentModel = &getModel('comment');
+            $oSourceComment = $oCommentModel->getComment($parent_srl, $this->grant->manager);
+
+            // 댓글이 없다면 오류
+            if(!$oSourceComment->isExists()) return $this->dispWikiMessage('msg_invalid_request');
+            if(Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl')) return $this->dispWikiMessage('msg_invalid_request');
+
+            // 대상 댓글을 생성
+            $oComment = $oCommentModel->getComment();
+            $oComment->add('parent_srl', $parent_srl);
+            $oComment->add('document_srl', $oSourceComment->get('document_srl'));
+
+            // 필요한 정보들 세팅
+            Context::set('oSourceComment',$oSourceComment);
+            Context::set('oComment',$oComment);
+
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+
+            $this->setTemplateFile('comment_form');
+        }
+
+        /**
+         * @brief 댓글 수정 폼 출력
+         **/
+        function dispWikiModifyComment() {
+            // 권한 체크
+            if(!$this->grant->write_comment) return $this->dispWikiMessage('msg_not_permitted');
+
+            // 목록 구현에 필요한 변수들을 가져온다
+            $document_srl = Context::get('document_srl');
+            $comment_srl = Context::get('comment_srl');
+
+            // 지정된 댓글이 없다면 오류
+            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
+
+            // 해당 댓글를 찾아본다
+            $oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
+
+            // 댓글이 없다면 오류
+            if(!$oComment->isExists()) return $this->dispWikiMessage('msg_invalid_request');
+
+            // 글을 수정하려고 할 경우 권한이 없는 경우 비밀번호 입력화면으로
+            if(!$oComment->isGranted()) return $this->setTemplateFile('input_password_form');
+
+            // 필요한 정보들 세팅
+            Context::set('oSourceComment', $oCommentModel->getComment());
+            Context::set('oComment', $oComment);
+
+            /** 
+             * 사용되는 javascript 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_comment.xml');
+
+            $this->setTemplateFile('comment_form');
+        }
+
+        /**
+         * @brief 댓글 삭제 화면 출력
+         **/
+        function dispWikiDeleteComment() {
+            // 권한 체크
+            if(!$this->grant->write_comment) return $this->dispWikiMessage('msg_not_permitted');
+
+            // 삭제할 댓글번호를 가져온다
+            $comment_srl = Context::get('comment_srl');
+
+            // 삭제하려는 댓글이 있는지 확인
+            if($comment_srl) {
+                $oCommentModel = &getModel('comment');
+                $oComment = $oCommentModel->getComment($comment_srl, $this->grant->manager);
+            }
+
+            // 삭제하려는 글이 없으면 에러
+            if(!$oComment->isExists() ) return $this->dispWikiContent();
+
+            // 권한이 없는 경우 비밀번호 입력화면으로
+            if(!$oComment->isGranted()) return $this->setTemplateFile('input_password_form');
+
+            Context::set('oComment',$oComment);
+
+            /** 
+             * 필요한 필터 추가
+             **/
+            Context::addJsFilter($this->module_path.'tpl/filter', 'delete_comment.xml');
+
+            $this->setTemplateFile('delete_comment_form');
+        }
+
+    }
+?>
diff --git a/widgets/archive_list/archive_list.class.php b/widgets/archive_list/archive_list.class.php
index 7849c626b..87847fcb5 100644
--- a/widgets/archive_list/archive_list.class.php
+++ b/widgets/archive_list/archive_list.class.php
@@ -17,24 +17,16 @@
         function proc($args) {
             $oModuleModel = &getModel('module');
 
-            // 기존에 mid_list, mid를 쓸 때의 코드를 위하여 하위 호환 유지 코드
+            // 대상 모듈 추출
             if($args->mid_list) {
                 $tmp_mid = explode(",",$args->mid_list);
-                $mid = $tmp_mid[0];
-            } elseif($args->mid) {
-                $mid = $args->mid;
-            }
-            if($mid) {
-                $module_srl = $oModuleModel->getModuleSrlByMid($mid);
-            }
-
-            if($args->srl) $module_srl = $args->srl;
-
-            // DocumentModel::getMonthlyArchivedList()를 이용하기 위한 변수 정리
-            $obj->module_srl = $module_srl;
+                $args->mid = $tmp_mid[0];
+            } 
+            if($args->mid) $args->srl = $oModuleModel->getModuleSrlByMid($args->mid);
 
             // 선택된 모듈이 없으면 실행 취소
-            if(!$obj->module_srl) return;
+            $obj->module_srl = $args->srl;
+            if(!$obj->module_srl) return Context::getLang('msg_not_founded');
 
             // 모듈의 정보를 구함
             $module_info = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
@@ -44,8 +36,16 @@
             $output = $oDocumentModel->getMonthlyArchivedList($obj);
 
             // 템플릿 파일에서 사용할 변수들을 세팅
-            $widget_info->mid = $widget_info->module_name = $module_info->mid;
-            $widget_info->title = $args->title;
+            if($module_info->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                if($site_module_info->site_srl == $module_info->site_srl) $widget_info->domain = $site_module_info->domain;
+                else {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    $widget_info->domain = $site_info->domain;
+                }
+            } else $widget_info->domain = Context::getDefaultUrl();
+            $widget_info->module_info = $module_info;
+            $widget_info->mid = $module_info->mid;
             $widget_info->archive_list = $output->data;
 
             Context::set('widget_info', $widget_info);
diff --git a/widgets/archive_list/conf/info.xml b/widgets/archive_list/conf/info.xml
index 848478edc..f98c05b56 100644
--- a/widgets/archive_list/conf/info.xml
+++ b/widgets/archive_list/conf/info.xml
@@ -49,23 +49,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="ru">Заголовок</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">보관 현황 제목으로 출력됩니다.</description>
-            <description xml:lang="zh-CN">将显示为存档标题。</description>
-            <description xml:lang="jp">バックアップリストのタイトルとして出力されます。</description>
-            <description xml:lang="en">It will be the title of the report.</description>
-            <description xml:lang="es">Este será el título del reporte.</description>
-            <description xml:lang="en">Это будет заголовком отчета.</description>
-            <description xml:lang="zh-TW">顯示封存標題。</description>
-        </var>
         <var id="srl">
             <type>mid</type>
             <name xml:lang="ko">대상 모듈</name>
@@ -76,7 +59,7 @@
             <name xml:lang="ru">Модуль назначения</name>
             <name xml:lang="zh-TW">目標模組</name>
             <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-            <description xml:lang="zh-CN">把被选模块作为统计对象。</description>
+            <description xml:lang="zh-CN">把所选模块作为统计对象。</description>
             <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
             <description xml:lang="en">The target articles will be the ones submitted in the selected module.</description>
             <description xml:lang="es">Los documentos ingresados en el módulo seleccionado serán el objetivo.</description>
diff --git a/widgets/archive_list/skins/blog_archive_list/archive_list.html b/widgets/archive_list/skins/blog_archive_list/archive_list.html
index 633ab68a9..9d64bcc82 100644
--- a/widgets/archive_list/skins/blog_archive_list/archive_list.html
+++ b/widgets/archive_list/skins/blog_archive_list/archive_list.html
@@ -26,11 +26,7 @@
 
       <ul class="items">
           <!--@foreach($widget_info->archive_list as $val)-->
-            <!--@if($layout_info->mid)-->
-              <li><a href="{getUrl('','mid',$layout_info->mid,'search_target','regdate','search_keyword',$val->month)}">{zdate($val->month,'Y. m')}</a> ({$val->count})</li>
-            <!--@else-->
-              <li><a href="{getUrl('','mid',$widget_info->mid,'search_target','regdate','search_keyword',$val->month)}">{zdate($val->month,'Y. m')}</a> ({$val->count})</li>
-            <!--@end-->
+          <li><a href="{getSiteUrl($widget_info->domain,'mid',$widget_info->module_info->mid,'search_target','regdate','search_keyword',$val->month)}">{zdate($val->month,'Y. m')}</a> ({$val->count})</li>
           <!--@end-->
       </ul>
   </div>
diff --git a/widgets/archive_list/skins/default/archive_list.html b/widgets/archive_list/skins/default/archive_list.html
new file mode 100644
index 000000000..c4d9d4835
--- /dev/null
+++ b/widgets/archive_list/skins/default/archive_list.html
@@ -0,0 +1,11 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetUlistA">
+        <!--@foreach($widget_info->archive_list as $val)-->
+            <li><a href="{getSiteUrl($widget_info->domain,'mid',$widget_info->module_info->mid,'search_target','regdate','search_keyword',$val->month)}">{zdate($val->month,'Y. m')}</a> ({number_format($val->count)})</li>
+        <!--@end-->
+    </ul>
+</div>
diff --git a/widgets/archive_list/skins/default/css/widget.css b/widgets/archive_list/skins/default/css/widget.css
new file mode 100644
index 000000000..4e0cac401
--- /dev/null
+++ b/widgets/archive_list/skins/default/css/widget.css
@@ -0,0 +1,8 @@
+@charset "utf-8";
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li { list-style:none; font-family:tahoma; font-size:9px; }
+.widgetUlistA li a{ color:#666; font-size:12px;}
+
+.widgetContainer.black .widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetContainer.black .widgetUlistA li{ list-style:none; font-family:tahoma; font-size:9px;}
+.widgetContainer.black .widgetUlistA li a { color:#999; font-size:12px;}
diff --git a/widgets/archive_list/skins/default/skin.xml b/widgets/archive_list/skins/default/skin.xml
new file mode 100644
index 000000000..4a039829d
--- /dev/null
+++ b/widgets/archive_list/skins/default/skin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+	<title xml:lang="ko">기본 월별 보관 현황 목록 출력</title>
+	<title xml:lang="jp">Default 月別のアーカイブリスト表示</title>
+	<title xml:lang="zh-CN">存档列表默认皮肤</title>
+	<title xml:lang="en">Default Monthly Custody Status</title>
+	<title xml:lang="zh-TW">封存預設面板</title>
+	<description xml:lang="ko">월별 보관 현황 목록을 출력합니다.</description>
+	<description xml:lang="jp">月別のアーカイブリストを表示します。</description>
+	<description xml:lang="zh-CN">显示存档列表。</description>
+	<description xml:lang="en">It displays monthly custody status.</description>
+	<description xml:lang="zh-TW">顯示封存列表。</description>
+	<version>0.1</version>
+	<date>2009-02-18</date>
+	<link>http://www.zeroboard.com</link>
+
+	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+		<name xml:lang="ko">제로</name>
+		<name xml:lang="jp">Zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="en">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+	</author>
+
+	<colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+	</colorset>
+</skin>
diff --git a/widgets/calendar/calendar.class.php b/widgets/calendar/calendar.class.php
index b0eaf035a..6c76fdbcd 100644
--- a/widgets/calendar/calendar.class.php
+++ b/widgets/calendar/calendar.class.php
@@ -15,18 +15,23 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            $oModuleModel = &getModel('module');
+
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
             if($args->mid_list) {
                 $tmp_mid = explode(",",$args->mid_list);
-                $mid = $tmp_mid[0];
-            } else {
-                $mid = $args->mid;
-            }
+                $args->mid = $tmp_mid[0];
+            } 
 
-            // 위젯 자체적으로 설정한 변수들을 체크
-            $title = $args->title;
+            if($args->mid) $args->srl = $oModuleModel->getModuleSrlByMid($args->mid);
 
-            // DocumentModel::getDailyArchivedList()를 이용하기 위한 변수 정리
-            $obj->mid = $mid;
+            $obj->module_srl = $args->srl;
+
+            // 선택된 모듈이 없으면 실행 취소
+            if(!$obj->module_srl) return Context::getLang('msg_not_founded');
+
+            // 모듈의 정보를 구함
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 
             if(Context::get('search_target')=='regdate') {
                 $regdate = Context::get('search_keyword');
@@ -38,6 +43,9 @@
             $oDocumentModel = &getModel('document');
             $output = $oDocumentModel->getDailyArchivedList($obj);
 
+            // 위젯 자체적으로 설정한 변수들을 체크
+            $title = $args->title;
+
             // 템플릿 파일에서 사용할 변수들을 세팅
             $widget_info->cur_date = $obj->regdate;
             $widget_info->today_str = sprintf('%4d%s %2d%s',zdate($obj->regdate, 'Y'), Context::getLang('unit_year'), zdate($obj->regdate,'m'), Context::getLang('unit_month'));
@@ -45,15 +53,26 @@
             $widget_info->start_week= date('w', ztime($obj->regdate));
 
             $widget_info->prev_month = date('Ym', mktime(1,0,0,zdate($obj->regdate,'m'),1,zdate($obj->regdate,'Y'))-60*60*24);
+            $widget_info->prev_year = date('Y', mktime(1,0,0,1,1,zdate($obj->regdate,'Y'))-60*60*24);
             $widget_info->next_month = date('Ym', mktime(1,0,0,zdate($obj->regdate,'m'),$widget_info->last_day,zdate($obj->regdate,'Y'))+60*60*24);
+            $widget_info->next_year = date('Y', mktime(1,0,0,12,$widget_info->last_day,zdate($obj->regdate,'Y'))+60*60*24);
 
-            $widget_info->mid = $widget_info->module_name = $mid;
             $widget_info->title = $title;
 
             if(count($output->data)) {
                 foreach($output->data as $key => $val) $widget_info->calendar[$val->month] = $val->count;
             }
 
+            if($module_info->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                if($site_module_info->site_srl == $module_info->site_srl) $widget_info->domain = $site_module_info->domain;
+                else {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    $widget_info->domain = $site_info->domain;
+                }
+            } else $widget_info->domain = Context::getDefaultUrl();
+            $widget_info->module_info = $module_info;
+            $widget_info->mid = $module_info->mid;
             Context::set('widget_info', $widget_info);
 
             // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
diff --git a/widgets/calendar/conf/info.xml b/widgets/calendar/conf/info.xml
index ec9253fc1..4a498877d 100644
--- a/widgets/calendar/conf/info.xml
+++ b/widgets/calendar/conf/info.xml
@@ -28,7 +28,7 @@
 	</author>
 
 	<extra_vars>
-		<var id="mid">
+		<var id="srl">
 			<type>mid</type>
 			<name xml:lang="ko">대상 모듈</name>
 			<name xml:lang="zh-CN">模块对象</name>
@@ -38,7 +38,7 @@
 			<name xml:lang="zh-TW">目標模組</name>
 			<name xml:lang="ru">Модуль назначения</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-			<description xml:lang="zh-CN">将把被选模块作为关联对象。</description>
+			<description xml:lang="zh-CN">将把所选模块作为关联对象。</description>
 			<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
 			<description xml:lang="en">The target articles will be the ones submitted in the selected module.</description>
 			<description xml:lang="es">Los documentos del módulo seleccionado serán objetivos.</description>
@@ -46,4 +46,4 @@
 			<description xml:lang="zh-TW">將所選擇的模組當做連結目標。</description>
 		</var>
 	</extra_vars>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/widgets/calendar/skins/blog_calendar_list/calendar.html b/widgets/calendar/skins/blog_calendar_list/calendar.html
index eade8adbf..f5a455e0c 100644
--- a/widgets/calendar/skins/blog_calendar_list/calendar.html
+++ b/widgets/calendar/skins/blog_calendar_list/calendar.html
@@ -7,7 +7,6 @@
 
 <div class="widget_calendar">
     <table cellspacing="0">
-
     <caption>
         <a href="{getUrl('search_target','regdate','search_keyword',$widget_info->prev_month)}" class="back"><img src="./images/blank.gif" alt="" /></a>{zdate($widget_info->cur_date,"Y")}.<span class="mm">{zdate($widget_info->cur_date,"m")}</span><a href="{getUrl('search_target','regdate','search_keyword',$widget_info->next_month)}" class="next"><img src="./images/blank.gif" alt="next" /></a>
     </caption>
@@ -35,11 +34,7 @@
 
                 <!--@if($widget_info->calendar[$cur_date])-->
                     {@ $item_class_name = "posted"}
-                    <!--@if($layout_info->mid)-->
-                      {@ $day_link = getUrl('','mid',$widget_info->module_name?$widget_info->module_name:$layout_info->mid,'search_target','regdate','search_keyword',$cur_date) }
-                    <!--@else-->
-                      {@ $day_link = getUrl('','mid',$widget_info->module_name?$widget_info->module_name:$mid,'search_target','regdate','search_keyword',$cur_date) }
-                    <!--@end-->
+                      {@ $day_link = getSiteUrl($widget_info->domain,'mid',$widget_info->module_info->mid,'search_target','regdate','search_keyword',$cur_date) }
                 <!--@else-->
                     {@ $item_class_name = ""}
                     {@ $day_link = ''}
diff --git a/widgets/calendar/skins/blog_calendar_list/skin.xml b/widgets/calendar/skins/blog_calendar_list/skin.xml
index 5d7d623a0..e907dc947 100644
--- a/widgets/calendar/skins/blog_calendar_list/skin.xml
+++ b/widgets/calendar/skins/blog_calendar_list/skin.xml
@@ -38,4 +38,4 @@
 			<title xml:lang="zh-TW">隨版面</title>
 		</color>
 	</colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/calendar/skins/default/calendar.html b/widgets/calendar/skins/default/calendar.html
new file mode 100644
index 000000000..c622c32ec
--- /dev/null
+++ b/widgets/calendar/skins/default/calendar.html
@@ -0,0 +1,66 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetCalendarNavigation">
+        <button type="button" class="prevYear" onclick="location.href='{getUrl('search_target','regdate','search_keyword',$widget_info->prev_year)}'">&lt;&lt;</button> <button type="button" class="prevMonth" onclick="location.href='{getUrl('search_target','regdate','search_keyword',$widget_info->prev_month)}'">&lt;</button>
+        <button type="button" class="nextMonth" onclick="location.href='{getUrl('search_target','regdate','search_keyword',$widget_info->next_month)}'">&gt;</button> <button type="button" class="nextYear" onclick="location.href='{getUrl('search_target','regdate','search_keyword',$widget_info->next_year)}'">&gt;&gt;</button>
+    </div>
+    <table border="1" cellspacing="0" class="widgetCalendar">
+        <caption>{zdate($widget_info->cur_date,"Y.m")}</caption>
+        <thead>
+            <tr>
+                <th scope="col" class="sun">{$lang->unit_week['Sunday']}</th>
+                <th scope="col">{$lang->unit_week['Monday']}</th>
+                <th scope="col">{$lang->unit_week['Tuesday']}</th>
+                <th scope="col">{$lang->unit_week['Wednesday']}</th>
+                <th scope="col">{$lang->unit_week['Thursday']}</th>
+                <th scope="col">{$lang->unit_week['Friday']}</th>
+                <th scope="col">{$lang->unit_week['Saturday']}</th>
+            </tr>
+        </thead>
+        <tbody>
+            <!--@for($i=0;$i<6;$i++)-->
+                <!--@if($day < $widget_info->last_day)-->
+                <tr>
+                    <!--@for($j=0;$j<7;$j++)-->
+
+                        {@ $num = $i*7 + $j}
+                        <!--@if(!$started && $num >= $widget_info->start_week)-->
+                            {@ $started = true}
+                            {@ $day = 1}
+                            {@ $cur_date = $widget_info->cur_date.sprintf('%02d',$day) }
+                        <!--@elseif($started)-->
+                            {@ $day++}
+                            {@ $cur_date = $widget_info->cur_date.sprintf('%02d',$day) }
+                        <!--@end-->
+
+                        <!--@if($cur_date == date("Ymd"))-->{@ $today_class = "today"}<!--@else-->{@ $today_class = ""}<!--@end-->
+
+                        <!--@if($widget_info->calendar[$cur_date])-->
+                            {@ $item_class_name = "posted"}
+                              {@ $day_link = getSiteUrl($widget_info->domain,'mid',$widget_info->module_info->mid,'search_target','regdate','search_keyword',$cur_date) }
+                        <!--@else-->
+                            {@ $item_class_name = ""}
+                            {@ $day_link = ''}
+                        <!--@end-->
+
+                        <td class="<!--@if($j==0)-->sun<!--@end-->{$today_class} {$cell_class_name} {$item_class_name}">
+                            <!--@if($day <= $widget_info->last_day)-->
+                                <!--@if($day_link)-->
+                                    <a href="{$day_link}"><strong>{$day}</strong></a>
+                                <!--@else-->
+                                    {$day}
+                                <!--@end-->
+                            <!--@else-->
+                                &nbsp;
+                            <!--@end-->
+                        </td>
+                    <!--@end-->
+                </tr>
+                <!--@end-->
+            <!--@end-->
+        </tbody>
+    </table>
+</div>
diff --git a/widgets/calendar/skins/default/css/widget.css b/widgets/calendar/skins/default/css/widget.css
new file mode 100644
index 000000000..45d882fa7
--- /dev/null
+++ b/widgets/calendar/skins/default/css/widget.css
@@ -0,0 +1,63 @@
+@charset "utf-8";
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}                                                                                                                            .widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
+.widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
+.widgetCalendarNavigation button.prevYear{ left:0;}
+.widgetCalendarNavigation button.prevMonth{ left:25px;}
+.widgetCalendarNavigation button.nextYear{ right:0;}
+.widgetCalendarNavigation button.nextMonth{ right:25px;}
+.widgetCalendar{ position:relative; border:0; width:100%;}
+.widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
+.widgetCalendar th,
+.widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
+.widgetCalendar th{ font-size:12px; font-family:Tahoma; font-weight:normal;}
+.widgetCalendar td,
+.widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
+.widgetCalendar td em{ font-style:normal;}
+.widgetCalendarNavigation button{ color:#333;}
+.widgetCalendar caption{ color:#333;}
+.widgetCalendar th{ background:#eee; color:#333;}
+.widgetCalendar th.sun,
+.widgetCalendar td.sun,
+.widgetCalendar td em{ color:#ff1a1a;}
+.widgetCalendar td,
+.widgetCalendar td a{ color:#666;}
+.widgetCalendar td.sun a{ color:#ff1a1a;}
+
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}                                                                                                                            .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetContainer.black .widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
+.widgetContainer.black .widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
+.widgetContainer.black .widgetCalendarNavigation button.prevYear{ left:0;}
+.widgetContainer.black .widgetCalendarNavigation button.prevMonth{ left:25px;}
+.widgetContainer.black .widgetCalendarNavigation button.nextYear{ right:0;}
+.widgetContainer.black .widgetCalendarNavigation button.nextMonth{ right:25px;}
+.widgetContainer.black .widgetCalendar{ position:relative; border:0; width:100%;}
+.widgetContainer.black .widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
+.widgetContainer.black .widgetCalendar th,
+.widgetContainer.black .widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
+.widgetContainer.black .widgetCalendar th{ font-size:12px; font-family:Tahoma; font-weight:normal;}
+.widgetContainer.black .widgetCalendar td,
+.widgetContainer.black .widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
+.widgetContainer.black .widgetCalendar td em{ font-style:normal;}
+.widgetContainer.black .widgetCalendarNavigation button{ color:#999;}
+.widgetContainer.black .widgetCalendar caption{ color:#999;}
+.widgetContainer.black .widgetCalendar th{ background:#333; color:#fff;}
+.widgetContainer.black .widgetCalendar th.sun,
+.widgetContainer.black .widgetCalendar td.sun,
+.widgetContainer.black .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer.black .widgetCalendar td,
+.widgetContainer.black .widgetCalendar td a{ color:#999;}
+.widgetContainer.black .widgetCalendar td.sun a{ color:#ff1a1a;}
+
diff --git a/widgets/calendar/skins/default/skin.xml b/widgets/calendar/skins/default/skin.xml
new file mode 100644
index 000000000..cb7725963
--- /dev/null
+++ b/widgets/calendar/skins/default/skin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+	<title xml:lang="ko">기본 달력 및 글 현황 표시</title>
+	<title xml:lang="jp">Default カレンダーと書き込みリンク表示</title>
+	<title xml:lang="zh-CN">模块联动日历默认皮肤</title>
+	<title xml:lang="en">Default Display Calendar and Article Status</title>
+	<title xml:lang="zh-TW">Default 日曆預設面板</title>
+	<description xml:lang="ko">calendar위젯의 블로그에 어울리는 기본 스킨입니다.</description>
+	<description xml:lang="jp">カレンダー（calendar）ウィジェットのブログに適したデフォルトスキンです。</description>
+	<description xml:lang="zh-CN">适用于博客的日历默认皮肤。</description>
+	<description xml:lang="en">It is a default skin which matches with calendar widget's blog well.</description>
+	<description xml:lang="zh-TW">適用於部落格的日曆預設面板。</description>
+	<version>0.1</version>
+	<date>2009-02-17</date>
+	<link>http://www.zeroboard.com</link>
+
+	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+		<name xml:lang="ko">제로</name>
+		<name xml:lang="jp">Zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="en">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+	</author>
+
+	<colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+	</colorset>
+</skin>
diff --git a/widgets/category/category.class.php b/widgets/category/category.class.php
index 671d0f5ee..33062035f 100644
--- a/widgets/category/category.class.php
+++ b/widgets/category/category.class.php
@@ -17,26 +17,18 @@
         function proc($args) {
             $oModuleModel = &getModel('module');
 
-            // 기존에 mid_list, mid를 쓸 때의 코드를 위하여 하위 호환 유지 코드
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
             if($args->mid_list) {
                 $tmp_mid = explode(",",$args->mid_list);
-                $mid = $tmp_mid[0];
-            } elseif($args->mid) {
-                $mid = $args->mid;
-            }
-            if($mid) {
-                $module_srl = $oModuleModel->getModuleSrlByMid($mid);
-            }
+                $args->mid = $tmp_mid[0];
+            } 
 
-            if($args->srl) $module_srl = $args->srl;
+            if($args->mid) $args->srl = $oModuleModel->getModuleSrlByMid($args->mid);
 
-            if(is_array($module_srl)) $module_srl = $module_srl[0];
-
-            // DocumentModel::getMonthlyArchivedList()를 이용하기 위한 변수 정리
-            $obj->module_srl = $module_srl;
+            $obj->module_srl = $args->srl;
 
             // 선택된 모듈이 없으면 실행 취소
-            if(!$obj->module_srl) return;
+            if(!$obj->module_srl) return Context::getLang('msg_not_founded');
 
             // 모듈의 정보를 구함
             $module_info = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
@@ -45,15 +37,22 @@
             $oDocumentModel = &getModel('document');
             $category_list = $oDocumentModel->getCategoryList($obj->module_srl);
 
-            // 모듈의 정보를 구함
+            // 전체 개수를 구함
+            $widget_info->total_document_count = $oDocumentModel->getDocumentCount($obj->module_srl);
+
             $widget_info->module_info = $module_info;
             $widget_info->mid = $module_info->mid;
             $widget_info->document_category = $document_category;
             $widget_info->category_list = $category_list;
 
-            // 전체 개수를 구함
-            $total_count = $oDocumentModel->getDocumentCount($obj->module_srl);
-            $widget_info->total_document_count = $total_count;
+            if($module_info->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                if($site_module_info->site_srl == $module_info->site_srl) $widget_info->domain = $site_module_info->domain;
+                else {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    $widget_info->domain = $site_info->domain;
+                }
+            } else $widget_info->domain = Context::getDefaultUrl();
 
             Context::set('widget_info', $widget_info);
 
diff --git a/widgets/category/conf/info.xml b/widgets/category/conf/info.xml
index 1b5cf5099..9f919d832 100644
--- a/widgets/category/conf/info.xml
+++ b/widgets/category/conf/info.xml
@@ -42,7 +42,7 @@
             <description xml:lang="es">선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요.</description>
             <description xml:lang="ru">선택하신 모듈을 대상으로 합니다. 꼭 한개의 모듈만 선택해 주세요.</description>
             <description xml:lang="jp">選択されたモジュールを対象とします。必ず一つのモジュールのみ選択してください。</description>
-            <description xml:lang="zh-CN">将把被选模块当中的主题作为对象。只能选一个模块。</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。只能选一个模块。</description>
             <description xml:lang="zh-TW">將所選擇的模組作為目標。只能選擇一個模組。</description>
         </var>
     </extra_vars>
diff --git a/widgets/category/skins/default/category.html b/widgets/category/skins/default/category.html
index 61890d0ac..cca3e1326 100644
--- a/widgets/category/skins/default/category.html
+++ b/widgets/category/skins/default/category.html
@@ -1,58 +1,41 @@
-<!--%import("css/category.css")-->
 <!--%import("js/category.js")-->
+{@ $_pDepth = 0;}
 
-<div class="categoryWidget">
-
-    <div class="top <!--@if($mid == $widget_info->mid && !$category)-->selected<!--@end-->"><a href="{getUrl('','mid',$widget_info->mid)}">{$widget_info->module_info->browser_title}</a> <strong>[{$widget_info->total_document_count}]</strong></div>
-
-    {@ $prev_depth = 0}
-    {@ $prev_last = false}
-    {@ $prev_srl = 0}
-    {@ $prev_expand = false}
-
-<!--@foreach($widget_info->category_list as $key => $val)-->
-
-    <!--@if($val->last)-->
-        <!--@if($val->child_count)-->
-            <!--@if(!$val->expand)-->{@ $class = "plusBottom" }<!--@else-->{@ $class = "minusBottom" }<!--@end-->
-        <!--@else-->
-            {@ $class = "joinBottom" }
-        <!--@end-->
-    <!--@elseif($val->first)-->
-        <!--@if($val->child_count)-->
-            <!--@if(!$val->expand)-->{@ $class = "plus" }<!--@else-->{@ $class = "minus" }<!--@end-->
-        <!--@else-->
-            {@ $class = "join" }
-        <!--@end-->
-    <!--@else-->
-        <!--@if($val->child_count)-->
-            <!--@if(!$val->expand)-->{@ $class = "plus" }<!--@else-->{@ $class = "minus" }<!--@end-->
-        <!--@else-->
-            {@ $class = "join" }
-        <!--@end-->
-    <!--@end-->
-
-    <!--@if($prev_depth < $val->depth)-->
-        {@ $prev_depth = $val->depth }
-        <div class="<!--@if(!$prev_last)-->child<!--@else-->childBottom<!--@end-->" id="category_{$prev_srl}" <!--@if(!$prev_expand)-->style="display:none;"<!--@end-->>
-    <!--@elseif($prev_depth > $val->depth)-->
-        <!--@for($i=$val->depth;$i<$prev_depth;$i++)--></div><!--@end-->
-        {@ $prev_depth = $val->depth }
-    <!--@end-->
-
-    <div class="{$class}" id="category_parent_{$val->category_srl}">
-        <div class="item <!--@if($val->selected)-->selected<!--@end-->">
-            <a href="{getUrl('','mid',$widget_info->mid, 'category',$val->category_srl)}">{$val->text}</a> 
-            <!--@if($val->document_count)--><strong>[{$val->document_count}]</strong><!--@end-->
-        </div>
-    </div>
-
-    {@ $prev_last = $val->last}
-    {@ $prev_srl = $val->category_srl}
-    {@ $prev_expand = $val->expand}
-
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
 <!--@end-->
 
-    <!--@for($i=0;$i<$prev_depth;$i++)--></div><!--@end-->
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetTree">
+        <a href="{getSiteUrl($widget_info->domain,'','mid',$widget_info->module_info->mid)}" class="title">{$widget_info->module_info->browser_title}</a> <span>({$widget_info->total_document_count})</span>
+        <ul>
+    <!--@foreach($widget_info->category_list as $key => $val)-->
+        <!--@if($_pDepth > $val->depth)-->
+            <!--@for($i=$val->depth; $i<$_pDepth; $i++)-->
+            </li>
+        </ul>
+            <!--@end-->
+            {@ $_pDepth = $val->depth}
+        <!--@end-->
 
+            <li class="<!--@if($val->last)-->nav_tree_last<!--@end--> <!--@if($val->expand)-->nav_tree_on<!--@else-->nav_tree_off<!--@end-->" id="category_parent_{$val->category_srl}">
+                <!--@if($val->child_count)-->
+                    <!--@if($val->expand)-->
+                        <button type="button" class="category_{$val->category_srl}">+</button>
+                    <!--@else-->
+                        <button type="button" class="category_{$val->category_srl}">-</button>
+                    <!--@end-->
+                <!--@end-->
+                <a href="{getSiteUrl($widget_info->domain, '','mid',$widget_info->module_info->mid, 'category',$val->category_srl)}" class="nav_tree_label <!--@if($val->selected)-->selected<!--@end-->">{$val->text}</a> 
+                <!--@if($val->document_count)--><span>({$val->document_count})</span><!--@end-->
+
+            <!--@if($val->child_count)-->
+                {@$_pDepth++}
+                <ul>
+            <!--@else-->
+            </li>
+            <!--@end-->
+    <!--@end-->
+        </ul>
+    </div>
 </div>
diff --git a/widgets/category/skins/default/css/category.css b/widgets/category/skins/default/css/category.css
deleted file mode 100644
index 2884cfa39..000000000
--- a/widgets/category/skins/default/css/category.css
+++ /dev/null
@@ -1,78 +0,0 @@
-@charset "utf-8";
-
-.categoryWidget .top {
-    background:url("../images/top.gif") no-repeat left -1px; 
-    padding-left:19px; 
-    height:18px;
-}
-
-.categoryWidget a {
-    text-decoration:none;
-    color:#555555;
-    padding:0 2px 0 2px; 
-}
-
-.categoryWidget a:hover {
-    text-decoration:underline;
-}
-
-.categoryWidget strong {
-    font-weight:normal; 
-    color:#DF7901;
-    font-size:7pt; 
-    font-family:tahoma;
-}
-
-.categoryWidget .selected a {
-    font-weight:bold;
-}
-
-.categoryWidget .item {
-    margin-left:5px; 
-    height:18px;
-}
-
-
-.categoryWidget .child { 
-    background:url("../images/line.gif") repeat-y left top;
-    padding-left:16px; 
-}
-
-.categoryWidget .childBottom { 
-    background:none;
-    padding-left:16px; 
-}
-
-.categoryWidget .plus { 
-    background:url("../images/plus.gif") no-repeat left top; 
-    padding-left:16px; 
-    cursor:pointer;
-}
-
-.categoryWidget .plusBottom { 
-    background:url("../images/plusbottom.gif") no-repeat left top; 
-    padding-left:16px; 
-    cursor:pointer;
-}
-
-.categoryWidget .minus { 
-    background:url("../images/minus.gif") no-repeat left top; 
-    padding-left:16px; 
-    cursor:pointer;
-}
-
-.categoryWidget .minusBottom { 
-    background:url("../images/minusbottom.gif") no-repeat left top; 
-    padding-left:16px; 
-    cursor:pointer;
-}
-
-.categoryWidget .joinBottom { 
-    background:url("../images/joinbottom.gif") no-repeat left top; 
-    padding-left:16px; 
-}
-
-.categoryWidget .join{ 
-    background:url("../images/join.gif") no-repeat left top; 
-    padding-left:16px; 
-}
diff --git a/widgets/category/skins/default/css/widget.css b/widgets/category/skins/default/css/widget.css
new file mode 100644
index 000000000..67fd0a391
--- /dev/null
+++ b/widgets/category/skins/default/css/widget.css
@@ -0,0 +1,69 @@
+@charset "utf-8";
+
+/* Widget Tree */
+.widgetTree { margin-top:10px;}
+.widgetTree a.title { background:url(../img/white/folder.gif) no-repeat left top; padding-left:20px;}
+.widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#999;}
+.widgetTree ul span { margin-left:15px; }
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a {text-decoration:none; }
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetTree{ color:#333;}
+.widgetTree a{ color:#333; text-decoration:none;}
+
+/* Widget Tree */
+.widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+.widgetContainer.black .widgetTree { margin-top:10px;}
+.widgetContainer.black .widgetTree a.title { background:url(../img/black/folder.gif) no-repeat left top; padding-left:20px;}
+.widgetContainer.black .widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#333;}
+.widgetContainer.black .widgetTree ul span { margin-left:15px; }
+.widgetContainer.black .widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetContainer.black .widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
+.widgetContainer.black .widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetContainer.black .widgetTree ul li a,
+.widgetContainer.black .widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetContainer.black .widgetTree ul li a {text-decoration:none; }
+.widgetContainer.black .widgetTree ul li a.selected {font-weight:bold;}
+.widgetContainer.black .widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetContainer.black .widgetTree ul li ul li{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetContainer.black .widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a { color:#999; text-decoration:none;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
diff --git a/widgets/category/skins/default/img/black/buttonTreeCollapse.gif b/widgets/category/skins/default/img/black/buttonTreeCollapse.gif
new file mode 100755
index 000000000..53a942d58
Binary files /dev/null and b/widgets/category/skins/default/img/black/buttonTreeCollapse.gif differ
diff --git a/widgets/category/skins/default/img/black/folder.gif b/widgets/category/skins/default/img/black/folder.gif
new file mode 100755
index 000000000..c779c9ddc
Binary files /dev/null and b/widgets/category/skins/default/img/black/folder.gif differ
diff --git a/widgets/category/skins/default/img/black/lineTreeHr.gif b/widgets/category/skins/default/img/black/lineTreeHr.gif
new file mode 100755
index 000000000..995f620d1
Binary files /dev/null and b/widgets/category/skins/default/img/black/lineTreeHr.gif differ
diff --git a/widgets/category/skins/default/img/black/lineTreeLastHr.gif b/widgets/category/skins/default/img/black/lineTreeLastHr.gif
new file mode 100755
index 000000000..96c8d09ae
Binary files /dev/null and b/widgets/category/skins/default/img/black/lineTreeLastHr.gif differ
diff --git a/widgets/category/skins/default/img/black/lineTreeVr.gif b/widgets/category/skins/default/img/black/lineTreeVr.gif
new file mode 100755
index 000000000..031c4bb42
Binary files /dev/null and b/widgets/category/skins/default/img/black/lineTreeVr.gif differ
diff --git a/widgets/category/skins/default/img/white/buttonTreeCollapse.gif b/widgets/category/skins/default/img/white/buttonTreeCollapse.gif
new file mode 100755
index 000000000..aa5493904
Binary files /dev/null and b/widgets/category/skins/default/img/white/buttonTreeCollapse.gif differ
diff --git a/widgets/category/skins/default/img/white/folder.gif b/widgets/category/skins/default/img/white/folder.gif
new file mode 100755
index 000000000..9c058b110
Binary files /dev/null and b/widgets/category/skins/default/img/white/folder.gif differ
diff --git a/widgets/category/skins/default/img/white/lineTreeHr.gif b/widgets/category/skins/default/img/white/lineTreeHr.gif
new file mode 100755
index 000000000..2af04408c
Binary files /dev/null and b/widgets/category/skins/default/img/white/lineTreeHr.gif differ
diff --git a/widgets/category/skins/default/img/white/lineTreeLastHr.gif b/widgets/category/skins/default/img/white/lineTreeLastHr.gif
new file mode 100755
index 000000000..e099787b2
Binary files /dev/null and b/widgets/category/skins/default/img/white/lineTreeLastHr.gif differ
diff --git a/widgets/category/skins/default/img/white/lineTreeVr.gif b/widgets/category/skins/default/img/white/lineTreeVr.gif
new file mode 100755
index 000000000..3b9d1c444
Binary files /dev/null and b/widgets/category/skins/default/img/white/lineTreeVr.gif differ
diff --git a/widgets/category/skins/default/js/category.js b/widgets/category/skins/default/js/category.js
index dbec70e54..a36821182 100644
--- a/widgets/category/skins/default/js/category.js
+++ b/widgets/category/skins/default/js/category.js
@@ -1,31 +1,21 @@
 function toggleCategory(evt) {
     var e = new xEvent(evt);
     var obj = e.target;
-    var srl = null;
-    if(obj.nodeName != 'DIV') return;
+    if(obj.nodeName != 'BUTTON') return;
 
-    if(obj.id && /^category_parent_/.test(obj.id)) {
-        srl = obj.id.replace(/^category_parent_/,'');
-    } else if(obj.id && /^category_/.test(obj.id)) {
-        srl = obj.id.replace(/^category_parent_/,'');
-    } else if(obj.className && /item/.test(obj.className)) {
-        var pObj = obj.parentNode;
-        srl = pObj.id.replace(/^category_parent_/,'');
-    }
+    var node_srl = obj.className.replace(/^category_/,'');
+    if(!node_srl) return;
 
-    if(!srl) return;
-    var obj = xGetElementById("category_"+srl);
-    if(!obj) return;
+    var li_obj = xGetElementById("category_parent_"+node_srl);
+    if(!li_obj) return;
+    var className = li_obj.className;
 
-    var selObj = xGetElementById("category_parent_"+srl);
-    if(!selObj) return;
-
-    if(!obj.style.display || obj.style.display == 'block') {
-        obj.style.display = 'none';
-        selObj.className = selObj.className.replace('minus','plus');
+    if(/nav_tree_off/.test(className)) {
+        xInnerHtml(obj,'-');
+        li_obj.className = className.replace(/nav_tree_off/,'nav_tree_on');
     } else {
-        obj.style.display = 'block';
-        selObj.className = selObj.className.replace('plus','minus');
+        xInnerHtml(obj,'+');
+        li_obj.className = className.replace(/nav_tree_on/,'nav_tree_off');
     }
 }
 
diff --git a/widgets/category/skins/default/skin.xml b/widgets/category/skins/default/skin.xml
index 8c6408373..8adfa29b7 100644
--- a/widgets/category/skins/default/skin.xml
+++ b/widgets/category/skins/default/skin.xml
@@ -23,12 +23,26 @@
     </author>
 
     <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본 컬러</title>
-            <title xml:lang="jp">デフォルトカラー</title>
-            <title xml:lang="en">Default Color</title>
-            <title xml:lang="zh-CN">默认颜色</title>
-            <title xml:lang="zh-TW">預設顏色</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/content/conf/info.xml b/widgets/content/conf/info.xml
new file mode 100644
index 000000000..ecff6929a
--- /dev/null
+++ b/widgets/content/conf/info.xml
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">Content 위젯</title>
+    <title xml:lang="en">Content widget</title>
+    <title xml:lang="zh-CN">全局内容控件</title>
+    <title xml:lang="zh-TW">內容組件</title>
+    <description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
+    <description xml:lang="en">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
+    <description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
+    <description xml:lang="zh-TW">是種可輸出討論板、評論，附加檔案等內容的控件。</description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="ru">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var id="content_type">
+            <type>select</type>
+            <name xml:lang="ko">추출대상</name>
+            <name xml:lang="en">추출대상</name>
+            <name xml:lang="zh-CN">对象</name>
+            <name xml:lang="zh-tw">目標</name>
+            <options>
+                <value>document</value>
+                <name xml:lang="ko">게시물</name>
+                <name xml:lang="eno">게시물</name>
+                <name xml:lang="zh-CN">主题</name>
+            </options>
+            <options>
+                <value>comment</value>
+                <name xml:lang="ko">댓글</name>
+                <name xml:lang="en">댓글</name>
+                <name xml:lang="zh-CN">评论</name>
+            </options>
+            <options>
+                <value>image</value>
+                <name xml:lang="ko">첨부이미지</name>
+                <name xml:lang="en">첨부이미지</name>
+                <name xml:lang="zh-CN">图片</name>
+            </options>
+            <options>
+                <value>trackback</value>
+                <name xml:lang="ko">트랙백</name>
+                <name xml:lang="en">트랙백</name>
+                <name xml:lang="zh-CN">引用</name>
+            </options>
+            <options>
+                <value>rss</value>
+                <name xml:lang="ko">RSS</name>
+                <name xml:lang="en">RSS</name>
+                <name xml:lang="zh-CN">RSS</name>
+            </options>
+        </var>
+        <var id="list_type">
+            <type>select</type>
+            <name xml:lang="ko">내용형태</name>
+            <name xml:lang="en">내용형태</name>
+            <name xml:lang="zh-CN">内容样式</name>
+            <options>
+                <value>normal</value>
+                <name xml:lang="ko">제목</name>
+                <name xml:lang="en">제목</name>
+                <name xml:lang="zh-CN">标题</name>
+            </options>
+            <options>
+                <value>image_title</value>
+                <name xml:lang="ko">이미지+제목</name>
+                <name xml:lang="enko">이미지+제목</name>
+                <name xml:lang="zh-CN">图片+标题</name>
+            </options>
+            <options>
+                <value>gallery</value>
+                <name xml:lang="ko">겔러리</name>
+                <name xml:lang="en">겔러리</name>
+                <name xml:lang="zh-CN">相册</name>
+            </options>
+            <options>
+                <value>image_title_content</value>
+                <name xml:lang="ko">이미지+제목+내용</name>
+                <name xml:lang="en">이미지+제목+내용</name>
+                <name xml:lang="zh-CN">图片+标题+内容</name>
+            </options>
+        </var>
+        <var id="tab_type">
+            <type>select</type>
+            <name xml:lang="ko">탭형태</name>
+            <name xml:lang="en">탭형태</name>
+            <name xml:lang="zh-CN">选项卡样式</name>
+            <options>
+                <value>none</value>
+                <name xml:lang="ko">없음</name>
+                <name xml:lang="en">없음</name>
+                <name xml:lang="zh-CN">无</name>
+            </options>
+            <options>
+                <value>tab_top</value>
+                <name xml:lang="ko">상단 탭형</name>
+                <name xml:lang="en">상단 탭형</name>
+                <name xml:lang="zh-CN">顶端选项卡</name>
+            </options>
+            <options>
+                <value>tab_left</value>
+                <name xml:lang="ko">왼쪽 탭형</name>
+                <name xml:lang="en">왼쪽 탭형</name>
+                <name xml:lang="zh-CN">左侧选项卡</name>
+            </options>
+        </var>
+
+        <var id="option_view">
+            <type>select-multi-order</type>
+            <name xml:lang="ko">표시항목 및 순서</name>
+            <name xml:lang="en">표시항목 및 순서</name>
+            <name xml:lang="zh-CN">显示项及顺序</name>
+            <options default="false" init="true">
+                <value>title</value>
+                <name xml:lang="ko">제목</name>
+                <name xml:lang="en">제목</name>
+                <name xml:lang="zh-CN">标题</name>
+            </options>
+            <options>
+                <value>thumbnail</value>
+                <name xml:lang="ko">섬네일</name>
+                <name xml:lang="en">섬네일</name>
+                <name xml:lang="zh-CN">缩略图</name>
+            </options>
+            <options init="true">
+                <value>regdate</value>
+                <name xml:lang="ko">등록일</name>
+                <name xml:lang="en">등록일</name>
+                <name xml:lang="zh-CN">发布日期</name>
+            </options>
+            <options init="true">
+                <value>nickname</value>
+                <name xml:lang="ko">글쓴이</name>
+                <name xml:lang="en">글쓴이</name>
+                <name xml:lang="zh-CN">发布者</name>
+            </options>
+            <options>
+                <value>content</value>
+                <name xml:lang="ko">내용</name>
+                <name xml:lang="en">내용</name>
+                <name xml:lang="zh-CN">内容</name>
+            </options>
+        </var>
+
+        <var id="show_browser_title">
+            <type>select</type>
+            <name xml:lang="ko">게시판 이름 표시</name>
+            <name xml:lang="en">게시판 이름 표시</name>
+            <name xml:lang="zh-CN">显示版面名称</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">출력</name>
+                <name xml:lang="zh-CN">显示</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">출력하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+            </options>
+        </var>
+
+        <var id="show_comment_count">
+            <type>select</type>
+            <name xml:lang="ko">댓글수 표시</name>
+            <name xml:lang="en">댓글수 표시</name>
+            <name xml:lang="zh-CN">显示评论数</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">출력</name>
+                <name xml:lang="zh-CN">显示</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">출력하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+            </options>
+        </var>
+
+        <var id="show_trackback_count">
+            <type>select</type>
+            <name xml:lang="ko">엮인글수 표시</name>
+            <name xml:lang="en">엮인글수 표시</name>
+            <name xml:lang="zh-CN">显示引用数</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">출력</name>
+                <name xml:lang="zh-CN">显示</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">출력하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+            </options>
+        </var>
+        <var id="show_category">
+            <type>select</type>
+            <name xml:lang="ko">분류 표시</name>
+            <name xml:lang="en">분류 표시</name>
+            <name xml:lang="zh-CN">显示分类</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">출력</name>
+                <name xml:lang="zh-CN">显示</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">출력하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+            </options>
+        </var>
+        <var id="show_icon">
+            <type>select</type>
+            <name xml:lang="ko">아이콘 표시</name>
+            <name xml:lang="en">아이콘 표시</name>
+            <name xml:lang="zh-CN">显示图标</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">출력</name>
+                <name xml:lang="zh-CN">显示</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">출력하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+            </options>
+        </var>
+
+
+
+        <var id="order_target">
+            <type>select</type>
+            <name xml:lang="ko">정렬 대상</name>
+            <name xml:lang="zh-CN">排序对象</name>
+            <name xml:lang="jp">ソート対象</name>
+            <name xml:lang="en">Target to be sorted</name>
+            <name xml:lang="es">Objetivo para ser ordenados</name>
+            <name xml:lang="ru">Назначение для сортировки</name>
+            <name xml:lang="zh-TW">排列順序</name>
+            <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
+            <description xml:lang="zh-CN">可以按照指定的顺序进行排序。</description>
+            <description xml:lang="jp">登録順、変更順にソートできます。</description>
+            <description xml:lang="en">The list of newewst articles may be sorted by submitted order or modified order.</description>
+            <description xml:lang="es">La lista de los documentos recientes pueden ser ordenados en el orden del agregado o en el de modificados.</description>
+            <description xml:lang="ru">Список последних статей может быть отсортирован по дате размещения или изменения.</description>
+            <description xml:lang="zh-TW">按照指定的順序進行排列。</description>
+            <options>
+                <value>list_order</value>
+                <name xml:lang="ko">최신 등록순</name>
+                <name xml:lang="zh-CN">最新发表顺</name>
+                <name xml:lang="jp">最新登録順</name>
+                <name xml:lang="en">Newest Submitted Order</name>
+                <name xml:lang="es">Orden de agregados recientemente</name>
+                <name xml:lang="ru">Порядок размещенных статей</name>
+                <name xml:lang="zh-TW">最新發表</name>
+            </options>
+            <options>
+                <value>update_order</value>
+                <name xml:lang="ko">최근 변경순</name>
+                <name xml:lang="zh-CN">最新修改顺</name>
+                <name xml:lang="jp">最新変更順</name>
+                <name xml:lang="en">Newest Modified Order</name>
+                <name xml:lang="es">Orden de modificados recientemente</name>
+                <name xml:lang="ru">Порядок измененных статей</name>
+                <name xml:lang="zh-TW">最新修改</name>
+            </options>
+        </var>
+        <var id="order_type">
+            <type>select</type>
+            <name xml:lang="ko">정렬 방법</name>
+            <name xml:lang="zh-CN">排序方式</name>
+            <name xml:lang="jp">ソートタイプ</name>
+            <name xml:lang="en">Sorting Type</name>
+            <name xml:lang="es">Tipo de ordenamiento</name>
+            <name xml:lang="ru">Тип сортировки</name>
+            <name xml:lang="zh-TW">排列方式</name>
+            <description xml:lang="ko">정렬대상을 내림차순 또는 올림차순으로 정렬할 수 있습니다.</description>
+            <description xml:lang="zh-CN">对其排序对象可进行升序/降序方式排序。</description>
+            <description xml:lang="jp">ソートタイプを、降順、昇順にソートできます。</description>
+            <description xml:lang="en">You can sort target articles by asending or desending order.</description>
+            <description xml:lang="es">Usted puede ordenar los documentos en orden acendente o en orden descendente.</description>
+            <description xml:lang="ru">Вы можете сортировать статьи в порядке возрастания или убывания.</description>
+            <description xml:lang="zh-TW">可選擇升冪/降冪的方式對所選目標進行排列。</description>
+            <options>
+                <value>desc</value>
+                <name xml:lang="ko">내림차순</name>
+                <name xml:lang="zh-CN">降序</name>
+                <name xml:lang="jp">降順</name>
+                <name xml:lang="en">Desending order</name>
+                <name xml:lang="es">Orden Descendente</name>
+                <name xml:lang="ru">По убыванию</name>
+                <name xml:lang="zh-TW">降冪</name>
+            </options>
+            <options>
+                <value>asc</value>
+                <name xml:lang="ko">올림차순</name>
+                <name xml:lang="zh-CN">升序</name>
+                <name xml:lang="jp">昇順</name>
+                <name xml:lang="en">Asending order</name>
+                <name xml:lang="es">Orden Acendente</name>
+                <name xml:lang="ru">По возрастанию</name>
+                <name xml:lang="zh-TW">升冪</name>
+            </options>
+        </var>
+
+        <var id="thumbnail_type">
+            <type>select</type>
+            <name xml:lang="ko">썸네일 생성 방법</name>
+            <name xml:lang="jp">生成方法</name>
+            <name xml:lang="zh-CN">缩略图生成方式</name>
+            <name xml:lang="en">Thumbnail Type</name>
+            <name xml:lang="ru">Тип миниатюры</name>
+            <name xml:lang="zh-TW">縮圖建立方式</name>
+            <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
+            <description xml:lang="jp">サムネールの生成方法を選択します(Crop : 刈り込み, Ratio : 比率)。</description>
+            <description xml:lang="zh-CN">可以选择缩略图生成方式。 (crop : 裁减, ratio : 比例)</description>
+            <description xml:lang="en">Thumbnail Type may be set here.</description>
+            <description xml:lang="ru">Тип миниатюры может быть установлен здесь.</description>
+            <description xml:lang="zh-TW">可選擇縮圖建立方式。(crop : 裁減, ratio : 比例)</description>
+            <options>
+                <value>crop</value>
+                <name xml:lang="ko">Crop (채우기)</name>
+                <name xml:lang="jp">Crop (刈り込み)</name>
+                <name xml:lang="zh-CN">Crop (裁减)</name>
+                <name xml:lang="en">Crop</name>
+                <name xml:lang="ru">Crop (Обрезание)</name>
+                <name xml:lang="zh-TW">Crop (裁減)</name>
+            </options>
+            <options>
+                <value>ratio</value>
+                <name xml:lang="ko">Ratio (비율 맞추기)</name>
+                <name xml:lang="jp">Ratio (比率)</name>
+                <name xml:lang="zh-CN">Ratio (比例)</name>
+                <name xml:lang="en">Ratio</name>
+                <name xml:lang="ru">Ratio (Отношение)</name>
+                <name xml:lang="zh-TW">Ratio (比例)</name>
+            </options>
+        </var>
+        <var id="thumbnail_width">
+            <type>text</type>
+            <name xml:lang="ko">이미지 가로크기</name>
+            <name xml:lang="jp">イメージ横幅</name>
+            <name xml:lang="zh-CN">宽度</name>
+            <name xml:lang="en">Width of Image</name>
+            <name xml:lang="es">Ancho de la imagen</name>
+            <name xml:lang="ru">Ширина изображения</name>
+            <name xml:lang="zh-TW">圖片寬度</name>
+            <description xml:lang="ko">출력될 이미지의 가로크기를 정하실 수 있습니다. (기본 100)</description>
+            <description xml:lang="jp">表示されるイメージの横幅のサイズを指定することができます（デフォルト100）。</description>
+            <description xml:lang="zh-CN">可以指定要显示的图片宽度。(默认为100)</description>
+            <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:100px)</description>
+            <description xml:lang="ru">Вы можете установить ширину изображения. (стандарт: 100px)</description>
+            <description xml:lang="zh-TW">指定顯示的圖片寬度。(預設是100)</description>
+        </var>
+        <var id="thumbnail_height">
+            <type>text</type>
+            <name xml:lang="ko">이미지 세로크기</name>
+            <name xml:lang="jp">イメージ縦幅</name>
+            <name xml:lang="zh-CN">高度</name>
+            <name xml:lang="en">Height of Image</name>
+            <name xml:lang="ru">Высота изображения</name>
+            <name xml:lang="zh-TW">圖片高度</name>
+            <description xml:lang="ko">이미지의 세로 크기를 지정할 수 있습니다. (기본 75)</description>
+            <description xml:lang="jp">イメージの縦幅サイズを指定します（デフォルト 75px）</description>
+            <description xml:lang="zh-CN">可以指定图片高度。(默认为75px)</description>
+            <description xml:lang="en">You can set the height of image. (75 as default)</description>
+            <description xml:lang="ru">Вы можете установить вытсоту изображения. (стандарт: 75px)</description>
+            <description xml:lang="zh-TW">指定圖片高度。(預設是75px)</description>
+        </var>
+        <var id="cols_list_count">
+            <type>text</type>
+            <name xml:lang="ko">가로 이미지 수</name>
+            <name xml:lang="jp">横並びイメージ数</name>
+            <name xml:lang="zh-CN">横向图片数</name>
+            <name xml:lang="en">Number of Images</name>
+            <name xml:lang="es">Número de imágenes</name>
+            <name xml:lang="ru">Число изображений (колонка)</name>
+            <name xml:lang="zh-TW">橫向圖片數</name>
+            <description xml:lang="ko">출력될 가로 이미지의 수를 정하실 수 있습니다. (기본 5개)</description>
+            <description xml:lang="jp">表示する横並びのイメージ数を指定します（デフォルト5個）。</description>
+            <description xml:lang="zh-CN">可以指定要显示的横向图片个数。(默认为5个)</description>
+            <description xml:lang="en">You can set the number of images to display. (5 as default)</description>
+            <description xml:lang="es">Usted puede definir el múmero de imágenes a mostrar. (predefinido: 5)</description>
+            <description xml:lang="ru">Вы можете установить число изображений для показа. (стандарт: 5)</description>
+            <description xml:lang="zh-TW">指定要顯示的橫向圖片數。(預設是5個)</description>
+        </var>
+
+        <var id="list_count">
+            <type>text</type>
+            <name xml:lang="ko">목록수</name>
+            <name xml:lang="zh-CN">目录数</name>
+            <name xml:lang="jp">リスト数</name>
+            <name xml:lang="en">The number of list</name>
+            <name xml:lang="es">Número de la lista</name>
+            <name xml:lang="ru">Число списка</name>
+            <name xml:lang="zh-TW">目錄數</name>
+            <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
+            <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
+            <description xml:lang="jp">出力されるリストの数を指定することができます。（デフォルト５個）</description>
+            <description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
+            <description xml:lang="es">Usted puede definir el número de los documentos a mostrar. (predefinido: 5)</description>
+            <description xml:lang="ru">Вы можете выбрать число списка статей для отображения. (стандарт: 5)</description>
+            <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
+        </var>
+        <var id="page_count">
+            <type>select</type>
+            <name xml:lang="ko">페이지수</name>
+        <name xml:lang="zh-CN">分页</name>
+            <options>
+                <value>1</value>
+                <name xml:lang="ko">1</name>
+        <name xml:lang="zh-CN">1</name>
+            </options>
+            <options>
+                <value>2</value>
+                <name xml:lang="ko">2</name>
+        <name xml:lang="zh-CN">2</name>
+            </options>
+            <options>
+                <value>3</value>
+                <name xml:lang="ko">3</name>
+        <name xml:lang="zh-CN">3</name>
+            </options>
+            <description xml:lang="ko">페이지수 2이상일 경우 이전/다음 버튼이 나타납니다.</description>
+        <description xml:lang="zh-CN">分页数在2以上时，将会出现上一页/下一页按钮。</description>
+        </var>
+        <var id="duration_new">
+            <type>text</type>
+            <name xml:lang="ko">new 표시 시간 (hours)</name>
+            <name xml:lang="zh-CN">new图标显示时间(hours)</name>
+            <name xml:lang="jp">Newの表示時間 (Hours)</name>
+            <name xml:lang="en">Duration of indication for new item</name>
+            <name xml:lang="ru">Длительность индикации для новых объектов</name>
+            <name xml:lang="zh-TW">new圖案顯示時間(hours)</name>
+            <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. (시간 단위)</description>
+            <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
+            <description xml:lang="jp">新しく登録された書き込みに対して「New」の表示時間を指定します（時間単位）。</description>
+            <description xml:lang="en">You may set the duration of indication for fresh item. (unit is hour)</description>
+            <description xml:lang="ru">Вы можете установить длительность индикации для нового объекта. (единица - час)</description>
+            <description xml:lang="zh-TW">可設置最新更新主題的new圖案顯示時間。</description>
+        </var>
+        <var id="subject_cut_size">
+            <type>text</type>
+            <name xml:lang="ko">제목 글자수</name>
+            <name xml:lang="jp">タイトルの文字数</name>
+            <name xml:lang="zh-CN">标题字数</name>
+            <name xml:lang="en">Length of Subject</name>
+            <name xml:lang="es">Número de letras del título</name>
+            <name xml:lang="ru">Длина темы</name>
+            <name xml:lang="zh-TW">標題字數</name>
+            <description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
+            <description xml:lang="jp">タイトルの文字数が指定できます（「0」または空欄の場合は、文字数を制限しません）。</description>
+            <description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
+            <description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
+            <description xml:lang="es">El largo del título puede ser asignado. (valor 0 o en blanco no restringe el largo)</description>
+            <description xml:lang="ru">Длина темы может быть присвоена. (0 или пустое значение не будут ограничивать длину)</description>
+            <description xml:lang="zh-TW">可設置標題的字數。(0或留白為不限制)</description>
+        </var>
+        <var id="content_cut_size">
+            <type>text</type>
+            <name xml:lang="ko">내용 글자수</name>
+        <name xml:lang="zh-CN">内容摘要字数</name>
+        </var>
+        <var id="module_srls">
+            <type>module_srl_list</type>
+            <name xml:lang="ko">대상 모듈</name>
+            <name xml:lang="zh-CN">对象模块</name>
+            <name xml:lang="jp">モジュール</name>
+            <name xml:lang="en">Target Module</name>
+            <name xml:lang="es">Módulo Objetivo</name>
+            <name xml:lang="ru">Модуль назначения</name>
+            <name xml:lang="zh-TW">目標模組</name>
+            <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
+            <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
+            <description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
+            <description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
+            <description xml:lang="ru">Статьи назначения для сортировки будут теми, что были размещены в выбранном модуле.</description>
+            <description xml:lang="zh-TW">把所選擇的模組作為目標。</description>
+        </var>
+        <var id="rss_url0">
+            <type>text</type>
+            <name xml:lang="ko">RSS URL</name>
+            <name xml:lang="jp">RSS URL</name>
+            <name xml:lang="zh-CN">RSS URL</name>
+            <name xml:lang="en">RSS URL</name>
+            <name xml:lang="ru">RSS URL</name>
+            <name xml:lang="zh-TW">RSS URL</name>
+            <description xml:lang="ko">RSS URL은 타입이 RSS일 경우 등록되어야 합니다.</description>
+        </var>
+        <var id="rss_url1">
+            <type>text</type>
+            <name xml:lang="ko">RSS URL</name>
+            <name xml:lang="jp">RSS URL</name>
+            <name xml:lang="zh-CN">RSS URL</name>
+            <name xml:lang="en">RSS URL</name>
+            <name xml:lang="ru">RSS URL</name>
+            <name xml:lang="zh-TW">RSS URL</name>
+        </var>
+        <var id="rss_url2">
+            <type>text</type>
+            <name xml:lang="ko">RSS URL</name>
+            <name xml:lang="jp">RSS URL</name>
+            <name xml:lang="zh-CN">RSS URL</name>
+            <name xml:lang="en">RSS URL</name>
+            <name xml:lang="ru">RSS URL</name>
+            <name xml:lang="zh-TW">RSS URL</name>
+        </var>
+        <var id="rss_url3">
+            <type>text</type>
+            <name xml:lang="ko">RSS URL</name>
+            <name xml:lang="jp">RSS URL</name>
+            <name xml:lang="zh-CN">RSS URL</name>
+            <name xml:lang="en">RSS URL</name>
+            <name xml:lang="ru">RSS URL</name>
+            <name xml:lang="zh-TW">RSS URL</name>
+        </var>
+        <var id="rss_url4">
+            <type>text</type>
+            <name xml:lang="ko">RSS URL</name>
+            <name xml:lang="jp">RSS URL</name>
+            <name xml:lang="zh-CN">RSS URL</name>
+            <name xml:lang="en">RSS URL</name>
+            <name xml:lang="ru">RSS URL</name>
+            <name xml:lang="zh-TW">RSS URL</name>
+        </var>
+
+
+
+
+    </extra_vars>
+</widget>
diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php
new file mode 100644
index 000000000..709045a3b
--- /dev/null
+++ b/widgets/content/content.class.php
@@ -0,0 +1,698 @@
+<?php
+    /**
+     * @class content
+     * @author sol (sol@ngleader.com)
+     * @brief content를 출력하는 위젯
+     * @version 0.1
+     **/
+
+    class content extends WidgetHandler {
+
+        /**
+         * @brief 위젯의 실행 부분
+         *
+         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
+         * 결과를 만든후 print가 아니라 return 해주어야 한다
+         **/
+
+        function proc($args) {
+            // 정렬 대상
+            if(!in_array($args->order_target, array('list_order','update_order'))) $args->order_target = 'list_order';
+
+            // 정렬 순서
+            if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
+
+            // 페이지 수
+            $args->page_count = (int)$args->page_count;
+            if(!$args->page_count) $args->page_count = 1;
+
+            // 출력된 목록 수
+            $args->list_count = (int)$args->list_count;
+            if(!$args->list_count) $args->list_count = 5;
+
+            // 썸네일 컬럼 수
+            $args->cols_list_count = (int)$args->cols_list_count;
+            if(!$args->cols_list_count) $args->cols_list_count = 5;
+
+            // 제목 길이 자르기
+            if(!$args->subject_cut_size) $args->subject_cut_size = 0;
+
+            // 내용 길이 자르기
+            if(!$args->content_cut_size) $args->content_cut_size = 100;
+
+            // 최근 글 표시 시간
+            if(!$args->duration_new) $args->duration_new = 12;
+
+            // 썸네일 생성 방법
+            if(!$args->thumbnail_type) $args->thumbnail_type = 'crop';
+
+            // 썸네일 가로 크기
+            if(!$args->thumbnail_width) $args->thumbnail_width = 100;
+
+            // 썸네일 세로 크기
+            if(!$args->thumbnail_height) $args->thumbnail_height = 75;
+            
+            // 보기 옵션
+            $args->option_view_arr = explode(',',$args->option_view);
+
+            // 내부적으로 쓰이는 변수 설정
+            $oModuleModel = &getModel('module');
+            $module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
+            $site_module_info = Context::get('site_module_info');
+
+            // rss 인 경우 URL정리
+            if($args->content_type == 'rss'){
+                $args->rss_urls = array();
+                $rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
+                for($i=0,$c=count($rss_urls);$i<$c;$i++) {
+                    if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
+                }
+
+            // rss가 아닌 XE모듈일 경우 모듈 번호 정리 후 모듈 정보 구함
+            } else {
+
+                // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+                if(!$args->module_srls){
+                    unset($obj);
+                    $obj->site_srl = (int)$site_module_info->site_srl;
+                    $output = executeQueryArray('widgets.content.getMids', $obj);
+                    if($output->data) {
+                        foreach($output->data as $key => $val) {
+                            $args->modules_info[$val->mid] = $val;
+                            $args->module_srls_info[$val->module_srl] = $val;
+                            $args->mid_lists[$val->module_srl] = $val->mid;
+                            $module_srls[] = $val->module_srl;
+                        }
+                    }
+
+                    $args->modules_info = $oModuleModel->getMidList($obj);
+                // 대상 모듈이 선택되어 있으면 해당 모듈만 추출
+                } else {
+                    $obj->module_srls = $args->module_srls;
+                    $output = executeQueryArray('widgets.content.getMids', $obj);
+                    if($output->data) {
+                        foreach($output->data as $key => $val) {
+                            $args->modules_info[$val->mid] = $val;
+                            $args->module_srls_info[$val->module_srl] = $val;
+                            $module_srls[] = $val->module_srl;
+                        }
+                        $idx = explode(',',$args->module_srls);
+                        for($i=0,$c=count($idx);$i<$c;$i++) {
+                            $srl = $idx[$i];
+                            if(!$args->module_srls_info[$srl]) continue;
+                            $args->mid_lists[$srl] = $args->module_srls_info[$srl]->mid;
+                        }
+                    }
+                }
+
+                // 아무런 모듈도 검색되지 않았다면 종료
+                if(!count($args->modules_info)) return Context::get('msg_not_founded');
+                $args->module_srl = implode(',',$module_srls);
+            }
+
+            /**
+             * 컨텐츠 추출, 게시글/댓글/엮인글/RSS등 다양한 요소가 있어서 각 method를 따로 만듬
+             **/
+            // tab 형태
+            if($args->tab_type == 'none' || $args->tab_type == '') {
+                switch($args->content_type){
+                    case 'comment':
+                            $content_items = $this->_getCommentItems($args);
+                        break;
+                    case 'image':
+                            $content_items = $this->_getImageItems($args);
+                        break;
+                    case 'rss':
+                            $content_items = $this->getRssItems($args);
+                        break;
+                    case 'trackback':
+                            $content_items = $this->_getTrackbackItems($args);
+                        break;
+                    default:
+                            $content_items = $this->_getDocumentItems($args);
+                        break;
+                }
+            // tab 형태가 아닐 경우
+            } else {
+                $content_items = array();
+
+                switch($args->content_type){
+                    case 'comment':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getCommentItems($args);
+                            }
+                        break;
+                    case 'image':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getImageItems($args);
+                            }
+                        break;
+                    case 'rss':
+                            $content_items = $this->getRssItems($args);
+                        break;
+                    case 'trackback':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getTrackbackItems($args);
+                            }
+                        break;
+                    default:
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getDocumentItems($args);
+                            }
+                        break;
+                }
+            }
+
+            $output = $this->_compile($args,$content_items);
+            return $output;
+        }
+
+        /**
+         * @brief 댓글 목록을 추출하여 contentItem으로 return
+         **/
+        function _getCommentItems($args) {
+            // CommentModel::getCommentList()를 이용하기 위한 변수 정리
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->list_count = $args->list_count * $args->page_count;
+
+            // comment 모듈의 model 객체를 받아서 getCommentList() method를 실행
+            $oCommentModel = &getModel('comment');
+            $output = $oCommentModel->getNewestCommentList($obj);
+
+            $content_items = array();
+
+            if(!count($output)) return;
+
+            foreach($output as $key => $oComment) {
+                $attribute = $oComment->getObjectVars();
+                $title = $oComment->getSummary($args->content_cut_size);
+                $thumbnail = $oComment->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
+                $url = sprintf("%s#comment_%s",getUrl('','document_srl',$oComment->get('document_srl')),$oComment->get('comment_srl'));
+
+                $attribute->mid = $args->mid_lists[$attribute->module_srl];
+                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
+                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
+
+                $content_item = new contentItem($browser_title);
+                $content_item->adds($attribute);
+                $content_item->setTitle($title);
+                $content_item->setThumbnail($thumbnail);
+                $content_item->setLink($url);
+                $content_item->setDomain($domain);
+                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
+                $content_items[] = $content_item;
+            }
+            return $content_items;
+        }
+
+        function _getDocumentItems($args){
+            // document 모듈의 model 객체를 받아서 결과를 객체화 시킴
+            $oDocumentModel = &getModel('document');
+
+            // 분류 구함
+            $obj->module_srl = $args->module_srl;
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+
+            // 글 목록을 구함
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->order_type = $args->order_type=="desc"?"asc":"desc";
+            $obj->list_count = $args->list_count * $args->page_count;
+            $output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
+            if(!$output->toBool() || !$output->data) return;
+
+            // 결과가 있으면 각 문서 객체화를 시킴
+            $content_items = array();
+            $first_thumbnail_idx = -1;
+            if(count($output->data)) {
+                foreach($output->data as $key => $attribute) {
+                    $oDocument = new documentItem();
+                    $oDocument->setAttribute($attribute, false);
+                    $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
+                    $document_srls[] = $oDocument->document_srl;
+                }
+                $oDocumentModel->setToAllDocumentExtraVars();
+
+                for($i=0,$c=count($document_srls);$i<$c;$i++) {
+                    $oDocument = $GLOBALS['XE_DOCUMENT_LIST'][$document_srls[$i]];
+                    $document_srl = $oDocument->document_srl;
+                    $module_srl = $oDocument->get('module_srl');
+                    $category_srl = $oDocument->get('category_srl');
+                    $thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
+
+                    $content_item = new contentItem( $args->module_srls_info[$module_srl]->browser_title );
+                    $content_item->adds($oDocument->getObjectVars());
+                    $content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
+                    $content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
+                    $content_item->setContent($oDocument->getSummary($args->content_cut_size));
+                    $content_item->setLink( getSiteUrl($domain,'','document_srl',$document_srl) );
+                    $content_item->setThumbnail($thumbnail);
+                    $content_item->setExtraImages($oDocument->printExtraImages($args->duration_new));
+                    $content_item->add('mid', $args->mid_lists[$module_srl]);
+                    if($first_thumbnail_idx==-1 && $thumbnail) $first_thumbnail_idx = $key;
+
+                    $content_items[] = $content_item;
+                }
+
+                $content_items[0]->setFirstThumbnailIdx($first_thumbnail_idx);
+            }
+            return $content_items;
+        }
+
+        function _getImageItems($args) {
+            $oDocumentModel = &getModel('document');
+
+            $obj->module_srls = $obj->module_srl = $args->module_srl;
+            $obj->direct_download = 'Y';
+            $obj->isvalid = 'Y';
+
+            // 분류 구함
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+
+            // 정해진 모듈에서 문서별 파일 목록을 구함
+            $obj->list_count = $args->list_count * $args->page_count;
+            $files_output = executeQueryArray("file.getOneFileInDocument", $obj);
+            $files_count = count($files_output->data);
+            if(!$files_count) return;
+
+            $content_items = array();
+
+            for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
+
+            $tmp_document_list = $oDocumentModel->getDocuments($document_srl_list);
+
+            if(!count($tmp_document_list)) return;
+
+            foreach($tmp_document_list as $oDocument){
+                $attribute = $oDocument->getObjectVars();
+                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
+                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
+                $category = $category_lists[$attribute->module_srl]->text;
+                $attribute = $oDocument->getObjectVars();
+                $content = $oDocument->getSummary($args->content_cut_size);
+                $url = sprintf("%s#%s",$oDocument->getPermanentUrl() ,$oDocument->getCommentCount());
+                $thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
+                $extra_images = $oDocument->printExtraImages($args->duration_new);
+
+                $content_item = new contentItem($browser_title);
+                $content_item->adds($attribute);
+                $content_item->setCategory($category);
+                $content_item->setContent($content);
+                $content_item->setLink($url);
+                $content_item->setThumbnail($thumbnail);
+                $content_item->setExtraImages($extra_images);
+                $content_item->setDomain($domain);
+                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
+                $content_items[] = $content_item;
+            }
+
+            return $content_items;
+        }
+
+        function getRssItems($args){
+            set_include_path("./libs/PEAR");
+            require_once('PEAR.php');
+            require_once('HTTP/Request.php');
+
+            $content_items = array();
+            $args->mid_lists = array();
+
+            foreach($args->rss_urls as $key => $rss){
+                $args->rss_url = $rss;
+                $content_item = $this->_getRssItems($args);
+                if(count($content_item) > 0){
+                    $browser_title = $content_item[0]->getBrowserTitle();
+                    $args->mid_lists[] = $browser_title;
+                    $content_items[] = $content_item;
+                }
+            }
+
+            // 탭 형태가 아닐 경우
+            if($args->tab_type == 'none' || $args->tab_type == ''){
+                $items = array();
+                foreach($content_items as $key => $val){
+                    foreach($val as $k => $v){
+                        $date = $v->get('regdate');
+                        $i=0;
+                        while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
+                        $items[sprintf('%s%02d',$date,$i)] = $v;
+                    }
+                }
+                if($args->order_type =='asc') ksort($items);
+                else krsort($items);
+                $content_items = array_slice(array_values($items),0,$args->list_count*$args->page_count);
+
+            // 탭 형태
+            } else {
+                foreach($content_items as $key=> $content_item_list){
+                    $items = array();
+                    foreach($content_item_list as $k => $content_item){
+                        $date = $content_item->get('regdate');
+                        $i=0;
+                        while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
+                        $items[sprintf('%s%02d',$date,$i)] = $content_item;
+                    }
+                    if($args->order_type =='asc') ksort($items);
+                    else krsort($items);
+
+                    $content_items[$key] = array_values($items);
+                }
+            }
+            return $content_items;
+        }
+
+        function _getRssBody($value) {
+            if(!$value || is_string($value)) return $value;
+            if(is_object($value)) $value = get_object_vars($value);
+            $body = null;
+            if(!count($value)) return;
+            foreach($value as $key => $val) {
+                if($key == 'body') {
+                    $body = $val;
+                    continue;
+                }
+                if(is_object($val)||is_array($val)) $body = $this->_getRssBody($val);
+                if($body !== null) return $body;
+            }
+            return $body;
+        }
+
+
+       /**
+         * @brief rss 주소로 부터 내용을 받아오는 함수
+         * tistory 의 경우 원본 주소가 location 헤더를 뿜는다. (내용은 없음)이를 해결하기 위한 수정 - rss_reader 위젯과 방식 동일
+         **/
+        function requestRssContents($rss_url) {
+            // request rss
+            $rss_url = Context::convertEncodingStr($rss_url);
+            $URL_parsed = parse_url($rss_url);
+            if(strpos($URL_parsed["host"],'naver.com')) $rss_url = iconv('UTF-8', 'euc-kr', $rss_url);
+            $rss_url = str_replace(array('%2F','%3F','%3A','%3D','%3B','%26'),array('/','?',':','=',';','&'),urlencode($rss_url));
+
+            $URL_parsed = parse_url($rss_url);
+
+            $host = $URL_parsed["host"];
+            $port = $URL_parsed["port"];
+
+            if ($port == 0) $port = 80;
+
+            $path = $URL_parsed["path"];
+
+            if ($URL_parsed["query"] != '') $path .= "?".$URL_parsed["query"];
+
+            $oReqeust = new HTTP_Request($rss_url);
+            $oReqeust->addHeader('Content-Type', 'application/xml');
+            $oReqeust->setMethod('GET');
+
+            $user = $URL_parsed["user"];
+            $pass = $URL_parsed["pass"];
+
+            if($user) $oReqeust->setBasicAuth($user, $pass);
+
+            $oResponse = $oReqeust->sendRequest();
+            if (PEAR::isError($oResponse)) {
+                return new Object(-1, 'msg_fail_to_request_open');
+            }
+            $header = $oReqeust->getResponseHeader();
+            if($header['location']) {   
+                return $this->requestRssContents(trim($header['location']));
+            }
+            else {
+                return $oReqeust->getResponseBody();
+            }
+        }
+
+        function _getRssItems($args){
+            // 날짜 형태
+            $DATE_FORMAT = $args->date_format ? $args->date_format : "Y-m-d H:i:s";
+
+            $buff = $this->requestRssContents($args->rss_url);
+
+            $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
+            if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = trim(iconv($matches[1]=="ks_c_5601-1987"?"EUC-KR":$matches[1], "UTF-8", $buff));
+
+            $buff = preg_replace("/<\?xml.*\?>/i", "", $buff);
+
+            $oXmlParser = new XmlParser();
+            $xml_doc = $oXmlParser->parse($buff);
+            $rss->title = $xml_doc->rss->channel->title->body;
+            $rss->link = $xml_doc->rss->channel->link->body;
+
+            $items = $xml_doc->rss->channel->item;
+
+            if(!$items) return;
+            if($items && !is_array($items)) $items = array($items);
+
+            $content_items = array();
+
+            foreach ($items as $key => $value) {
+                if($key >= $args->list_count * $args->page_count) break;
+                unset($item);
+
+                foreach($value as $key2 => $value2) {
+                    if(is_array($value2)) $value2 = array_shift($value2);
+                    $item->{$key2} = $this->_getRssBody($value2);
+                }
+
+                $content_item = new contentItem($rss->title);
+                $content_item->setContentsLink($rss->link);
+                $content_item->setTitle($item->title);
+                $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+                //$content_item->setCategory($item->category);
+                $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
+                $content_item->setContent($item->description);
+                $content_item->setLink($item->link);
+                $date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
+                $content_item->setRegdate($date);
+
+                $content_items[] = $content_item;
+            }
+            return $content_items;
+        }
+
+        function _getTrackbackItems($args){
+            // 분류 구함
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->list_count = $args->list_count * $args->page_count;
+
+            // trackback 모듈의 model 객체를 받아서 getTrackbackList() method를 실행
+            $oTrackbackModel = &getModel('trackback');
+            $output = $oTrackbackModel->getNewestTrackbackList($obj);
+
+            // 오류가 생기면 그냥 무시
+            if(!$output->toBool() || !$output->data) return;
+
+            // 결과가 있으면 각 문서 객체화를 시킴
+            $content_items = array();
+            foreach($output->data as $key => $item) {
+                $domain = $args->module_srls_info[$item->module_srl]->domain;
+                $category = $category_lists[$item->module_srl]->text;
+                $url = getSiteUrl($domain,'','document_srl',$item->document_srl);
+                $browser_title = $args->module_srls_info[$item->module_srl]->browser_title;
+
+                $content_item = new contentItem($browser_title);
+                $content_item->adds($item);
+                $content_item->setTitle($item->title);
+                $content_item->setCategory($category);
+                $content_item->setNickName($item->blog_name);
+                $content_item->setContent($item->excerpt);  ///<<
+                $content_item->setDomain($domain);  ///<<
+                $content_item->setLink($url);
+                $content_item->add('mid', $args->mid_lists[$item->module_srl]);
+                $content_item->setRegdate($item->regdate);
+                $content_items[] = $content_item;
+            }
+            return $content_items;
+        }
+
+        function _compile($args,$content_items){
+            $oTemplate = &TemplateHandler::getInstance();
+
+            // 위젯에 넘기기 위한 변수 설정
+            $widget_info->modules_info = $args->modules_info;
+            $widget_info->option_view_arr = $args->option_view_arr;
+            $widget_info->list_count = $args->list_count;
+            $widget_info->page_count = $args->page_count;
+            $widget_info->subject_cut_size = $args->subject_cut_size;
+            $widget_info->content_cut_size = $args->content_cut_size;
+
+            $widget_info->duration_new = $duration_new * 60*60;
+            $widget_info->thumbnail_type = $args->thumbnail_type;
+            $widget_info->thumbnail_width = $args->thumbnail_width;
+            $widget_info->thumbnail_height = $args->thumbnail_height;
+            $widget_info->cols_list_count = $args->cols_list_count;
+            $widget_info->mid_lists = $args->mid_lists;
+
+            $widget_info->show_browser_title = $args->show_browser_title;
+            $widget_info->show_category = $args->show_category;
+            $widget_info->show_comment_count = $args->show_comment_count;
+            $widget_info->show_trackback_count = $args->show_trackback_count;
+            $widget_info->show_icon = $args->show_icon;
+
+            $widget_info->list_type = $args->list_type;
+            $widget_info->tab_type = $args->tab_type;
+
+            // 탭형태일경우 탭에 대한 정보를 정리하고 module_srl로 되어 있는 key값을 index로 변경
+            if($args->tab_type != 'none' && $args->tab_type) {
+                $tab = array();
+                foreach($args->mid_lists as $module_srl => $mid){
+                    if(!is_array($content_items[$module_srl]) || !count($content_items[$module_srl])) continue;
+
+                    unset($tab_item);
+                    $tab_item->title = $content_items[$module_srl][0]->getBrowserTitle();
+                    $tab_item->content_items = $content_items[$module_srl];
+                    $tab_item->domain = $content_items[$module_srl][0]->getDomain();
+                    $tab_item->url = $content_items[$module_srl][0]->getContentsLink();
+                    if(!$tab_item->url) $tab_item->url = getSiteUrl($tab_item->domain, '','mid',$mid);
+                    $tab[] = $tab_item;
+                }
+                $widget_info->tab = $tab;
+            } else {
+                $widget_info->content_items = $content_items;
+            }
+            unset($args->option_view_arr);
+            unset($args->modules_info);
+
+            Context::set('colorset', $args->colorset);
+            Context::set('widget_info', $widget_info);
+
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            return $oTemplate->compile($tpl_path, "content");
+        }
+    }
+
+    class contentItem extends Object {
+
+        var $browser_title = null;
+        var $has_first_thumbnail_idx = false;
+        var $first_thumbnail_idx = null;
+        var $contents_link = null;
+        var $domain = null;
+
+        function contentItem($browser_title=''){
+            $this->browser_title = $browser_title;
+        }
+        function setContentsLink($link){
+            $this->contents_link = $link;
+        }
+        function setFirstThumbnailIdx($first_thumbnail_idx){
+            if(is_null($this->first_thumbnail) && $first_thumbnail_idx>-1) {
+                $this->has_first_thumbnail_idx = true;
+                $this->first_thumbnail_idx= $first_thumbnail_idx;
+            }
+        }
+        function setExtraImages($extra_images){
+            $this->add('extra_images',$extra_images);
+        }
+        function setDomain($domain) {
+            static $default_domain = null;
+            if(!$domain) {
+                if(is_null($default_domain)) $default_domain = Context::getDefaultUrl();
+                $domain = $default_domain;
+            }
+            $this->domain = $domain;
+        }
+        function setLink($url){
+            $this->add('url',$url);
+        }
+        function setTitle($title){
+            $this->add('title',$title);
+        }
+
+        function setThumbnail($thumbnail){
+            $this->add('thumbnail',$thumbnail);
+        }
+        function setContent($content){
+            $this->add('content',$content);
+        }
+        function setRegdate($regdate){
+            $this->add('regdate',$regdate);
+        }
+        function setNickName($nick_name){
+            $this->add('nick_name',$nick_name);
+        }
+        function setCategory($category){
+            $this->add('category',$category);
+        }
+        function getBrowserTitle(){
+            return $this->browser_title;
+        }
+        function getDomain() {
+            return $this->domain;
+        }
+        function getContentsLink(){
+            return $this->contents_link;
+        }
+
+        function getFirstThumbnailIdx(){
+            return $this->first_thumbnail_idx;
+        }
+
+        function getLink(){
+            return $this->get('url');
+        }
+        function getModuleSrl(){
+            return $this->get('module_srl');
+        }
+        function getTitle($cut_size = 0, $tail='...'){
+            if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
+            else $title = $this->get('title');
+            return $title;
+        }
+        function getContent(){
+            return $this->get('content');
+        }
+        function getCategory(){
+            return $this->get('category');
+        }
+        function getNickName(){
+            return $this->get('nick_name');
+        }
+        function getCommentCount(){
+            $comment_count = $this->get('comment_count');
+            return $comment_count>0 ? $comment_count : '';
+        }
+        function getTrackbackCount(){
+            $trackback_count = $this->get('trackback_count');
+            return $trackback_count>0 ? $trackback_count : '';
+        }
+        function getRegdate($format = 'Y.m.d H:i:s') {
+            return zdate($this->get('regdate'), $format);
+        }
+        function printExtraImages() {
+            return $this->get('extra_images');
+        }
+        function haveFirstThumbnail() {
+            return $this->has_first_thumbnail_idx;
+        }
+        function getThumbnail(){
+            return $this->get('thumbnail');
+        }
+        function getMemberSrl() {
+            return $this->get('member_srl');
+        }
+    }
+?>
diff --git a/widgets/content/queries/getCategories.xml b/widgets/content/queries/getCategories.xml
new file mode 100644
index 000000000..f70412d1a
--- /dev/null
+++ b/widgets/content/queries/getCategories.xml
@@ -0,0 +1,13 @@
+<query id="getCategories" action="select">
+    <tables>
+        <table name="document_categories" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+        <column name="category_srl" />
+        <column name="title" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/widgets/content/queries/getMids.xml b/widgets/content/queries/getMids.xml
new file mode 100644
index 000000000..dfd983c53
--- /dev/null
+++ b/widgets/content/queries/getMids.xml
@@ -0,0 +1,21 @@
+<query id="getMids" action="select">
+    <tables>
+        <table name="modules" alias="modules" />
+        <table name="sites" alias="sites" type="left join">
+            <conditions>
+                <condition operation="equal" column="sites.site_srl" default="modules.site_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="modules.site_srl" />
+        <column name="modules.module_srl" />
+        <column name="modules.mid" />
+        <column name="modules.browser_title" />
+        <column name="sites.domain" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="in" column="modules.module_srl" var="module_srls" pipe="and" />
+    </conditions>
+</query>
diff --git a/widgets/content/queries/getNewestDocuments.xml b/widgets/content/queries/getNewestDocuments.xml
new file mode 100644
index 000000000..f4d3ae62f
--- /dev/null
+++ b/widgets/content/queries/getNewestDocuments.xml
@@ -0,0 +1,15 @@
+<query id="getNewestDocuments" action="select">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" notnull="notnull" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="documents.list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+    </navigation>
+</query>
diff --git a/widgets/content/skins/default/_tab_left.html b/widgets/content/skins/default/_tab_left.html
new file mode 100644
index 000000000..9e9b03569
--- /dev/null
+++ b/widgets/content/skins/default/_tab_left.html
@@ -0,0 +1,19 @@
+<ul class="widgetTabC floatLeft widgetTab" style="width:18%">
+{@$i=0}
+<!--@foreach($widget_info->tab as $module_srl => $tab)-->
+    <li<!--@if($i==0)--> class="active"<!--@end-->><a href="{$tab->url}" onmouseover="content_widget_tab_show(jQuery(this),jQuery(this).parents('ul.widgetTabC').next('dl.widgetDivider'),{$i})">{$tab->title}</a></li>
+{@$i++}
+<!--@end-->
+</ul>
+
+<dl class="widgetDivider floatRight" style="width:80%">
+{@$i=0}
+<!--@foreach($widget_info->tab as $module_srl => $tab)-->
+    <dt>{$tab->title}</dt>
+    <dd<!--@if($i==0)--> class="open"<!--@end-->>
+        {@$widget_info->content_items = $tab->content_items}
+        <!--#include("_tab_none.html")-->
+    </dd>
+{@$i++}
+<!--@end-->
+</dl>
diff --git a/widgets/content/skins/default/_tab_none.html b/widgets/content/skins/default/_tab_none.html
new file mode 100644
index 000000000..81eb7160a
--- /dev/null
+++ b/widgets/content/skins/default/_tab_none.html
@@ -0,0 +1,9 @@
+<!--@if($widget_info->list_type == "gallery")-->
+    <!--#include("./gallery.html")-->
+<!--@elseif($widget_info->list_type == "image_title")-->
+    <!--#include("./image_title.html")-->
+<!--@elseif($widget_info->list_type == "image_title_content")-->
+    <!--#include("./image_title_content.html")-->
+<!--@else-->
+    <!--#include("./normal.html")-->
+<!--@end-->
diff --git a/widgets/content/skins/default/_tab_top.html b/widgets/content/skins/default/_tab_top.html
new file mode 100644
index 000000000..04a2359da
--- /dev/null
+++ b/widgets/content/skins/default/_tab_top.html
@@ -0,0 +1,19 @@
+<ul class="widgetTabA widgetTab">
+{@$i=0}
+<!--@foreach($widget_info->tab as $module_srl => $tab)-->
+    <li<!--@if($i==0)--> class="active"<!--@end-->><a href="{$tab->url}" onmouseover="content_widget_tab_show(jQuery(this),jQuery(this).parents('ul.widgetTabA').next('dl.widgetDivider'),{$i})">{$tab->title}</a></li>
+{@$i++}
+<!--@end-->
+</ul>
+
+<dl class="widgetDivider">
+{@$i=0}
+<!--@foreach($widget_info->tab as $module_srl => $tab)-->
+    <dt>{$tab->title}</dt>
+    <dd<!--@if($i==0)--> class="open"<!--@end-->>
+        {@$widget_info->content_items = $tab->content_items}
+        <!--#include("_tab_none.html")-->
+    </dd>
+{@$i++}
+<!--@end-->
+</dl>
diff --git a/widgets/content/skins/default/content.html b/widgets/content/skins/default/content.html
new file mode 100644
index 000000000..2e992e61a
--- /dev/null
+++ b/widgets/content/skins/default/content.html
@@ -0,0 +1,15 @@
+<!--%import("./js/content_widget.js")-->
+
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <!--@if($widget_info->tab_type  == "tab_left")-->
+        <!--#include("./_tab_left.html")-->
+    <!--@elseif($widget_info->tab_type == "tab_top")-->
+        <!--#include("./_tab_top.html")-->
+    <!--@else-->
+        <!--#include("./_tab_none.html")-->
+    <!--@end-->
+</div>
diff --git a/widgets/content/skins/default/css/widget.css b/widgets/content/skins/default/css/widget.css
new file mode 100644
index 000000000..cd9dce8f6
--- /dev/null
+++ b/widgets/content/skins/default/css/widget.css
@@ -0,0 +1,182 @@
+@charset "utf-8";
+
+.open{ display:block !important;} 
+.floatLeft{ float:left;}
+.floatRight{ float:right;}
+.clearLeft{ clear:left;}
+.clearRight{ clear:right;}
+
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetTabA{ position:relative; margin:0 0 10px 0; padding:0; *zoom:1; border-bottom:2px solid;}
+.widgetTabA:after{ content:""; display:block; clear:both;} 
+.widgetTabA li{ float:left; margin-right:1px; list-style:none; background-repeat:no-repeat; background-position:0 0;}
+.widgetTabA li.active{ background-position:0 -30px;} 
+.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
+.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
+
+.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
+.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
+.widgetTableA td.title{ width:100%; white-space:normal;}
+.widgetTableA td .board{ padding-right:5px;} 
+.widgetTableA td .notice{ padding-right:5px;}
+.widgetTableA td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableA td .replyNum a{ font:10px Tahoma;}
+.widgetTableA td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableA td.author{}
+.widgetTableA td.time{ font-size:11px; font-family:Tahoma;} 
+
+
+.widgetTabC{ margin:0; padding:0; font-size:12px; border-top:1px solid;}
+.widgetTabC li{ list-style:none; border-bottom:1px solid; *zoom:1; margin-bottom:1px;}
+.widgetTabC li a{ display:block; padding:7px 0 6px 10px; text-decoration:none; *zoom:1;}
+
+dl.widgetDivider{ margin:0;}
+dl.widgetDivider dt{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0;}
+dl.widgetDivider dd{ display:none; margin:0;} 
+
+.widgetNavigator{ margin:0; padding:0; text-align:right; clear:both;}
+.widgetNavigator li{ list-style:none; display:inline;}
+.widgetNavigator li button{ width:16px; height:16px; padding:0; background-color:transparent; background-image:url(../img/white/buttonWidgetNavigation.gif); border:1px solid #999; cursor:pointer;}
+.widgetNavigator li button.prev{ background-position:left center; *background-position:-1px center;}
+.widgetNavigator li button.next{ background-position:right center; *background-position:13px center;}
+.widgetNavigator li button span{ position:absolute; display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+.widgetGalleryA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryA:after{ content:""; display:block; clear:both;}
+.widgetGalleryA li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none;}
+.widgetGalleryA li.clearRight{ margin-right:0;}
+.widgetGalleryA li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryA li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryA li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryA li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .author{ display:block;}
+.widgetGalleryA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .date{ font:11px Tahoma;}
+.widgetGalleryA li .hour{ font:11px Tahoma;}
+
+/* widgetThumb */
+.widgetThumb{ position:relative; margin:0; text-align:center; font-size:12px; line-height:1.5;}
+.widgetThumb .thumb{ display:block; margin-bottom:5px; position:relative; *zoom:1; text-decoration:none;}
+.widgetThumb .thumb img{ display:block; width:100%;}
+.widgetThumb .thumb .imgNone{ display:block; position:relative; width:100%; padding-top:30px; padding-bottom:50px; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetThumb .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetThumb .title{ display:block;}
+.widgetThumb .author{ display:block;}
+.widgetThumb .date{ font-size:11px; font-family:Tahoma;}
+.widgetThumb .hour{ font-size:11px; font-family:Tahoma;}
+
+.widgetZineA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineA:after{ content:""; display:block; clear:both;}
+.widgetZineA li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; *zoom:1; overflow:hidden; }
+.widgetZineA li p{ margin:0; padding:0;}
+.widgetZineA li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineA li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.titleArea .board{ padding-right:5px;}
+.widgetZineA li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.authorArea{ margin-left:120px;}
+.widgetZineA li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineA li .thumb img{ position:relative; width:100%;}
+.widgetZineA li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineA li .category{ padding-right:5px; font-weight:normal;}
+.widgetZineA li .title{ font-weight:bold;}
+.widgetZineA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .author{ margin-right:10px;}
+.widgetZineA li .date{ font:11px Tahoma;}
+.widgetZineA li .hour{ font:11px Tahoma;}
+
+.widgetTabC{ border-color:#e5e5e5;}
+.widgetTabC li{ border-color:#e5e5e5; background:#f8f8f8;}
+.widgetTabC li a{ color:#333;}
+.widgetTabC li a:hover, 
+.widgetTabC li a:active,
+.widgetTabC li a:focus{ background:#eee;}
+.widgetTabA{ border-color:#666;}
+.widgetTabA li,
+.widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
+.widgetTabA li a{ color:#333;}
+
+.widgetTableA td.title a{ color:#333;}
+.widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetTableA td .category{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetTableA td .replyNum a{ color:#ff1a1a;}
+.widgetTableA td .trackbackNum a{ color:#66c;}
+.widgetTableA td .author { color:#333;}
+.widgetTableA td .date{ color:#333;}
+.widgetTableA td .hour{ color:#888;}
+
+.widgetGalleryA li .title{ color:#333;}
+.widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetGalleryA li .author{ color:#333;}
+.widgetGalleryA li .date{ color:#333;}
+.widgetGalleryA li .hour{ color:#888;}
+
+.widgetThumb{ color:#333;}
+.widgetThumb a{ color:#333;}
+.widgetThumb .hour{ color:#888;}
+
+.widgetZineA li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetZineA li .title{ color:#666;}
+.widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetZineA li .author{ color:#333;}
+.widgetZineA li .category{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetZineA li .date{ color:#333;}
+.widgetZineA li .hour{ color:#888;}
+.widgetZineA li .text{ color:#888;}
+
+.widgetContainer.black .widgetTabC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTabC li{ border-color:#7f7f7f; background:#222;}
+.widgetContainer.black .widgetTabC li a{ color:#999;}
+.widgetContainer.black .widgetTabC li a:hover,
+.widgetContainer.black .widgetTabC li a:active,
+.widgetContainer.black .widgetTabC li a:focus{ background:#333;}
+.widgetContainer.black .widgetTabA{ border-color:#999;}
+.widgetContainer.black .widgetTabA li, 
+.widgetContainer.black .widgetTabA li a{ background-image:url(../img/black/buttonWidgetTab.gif);}
+.widgetContainer.black .widgetTabA li a{ color:#999;}
+
+.widgetContainer.black .widgetTableA td.title a{ color:#999;}
+.widgetContainer.black .widgetTableA td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .category{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableA td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableA td .author { color:#999;}
+.widgetContainer.black .widgetTableA td .date{ color:#999;}
+.widgetContainer.black .widgetTableA td .hour{ color:#888;}
+
+.widgetContainer.black .widgetGalleryA li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryA li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .hour{ color:#888;}
+
+.widgetContainer.black .widgetThumb{ color:#999;}
+.widgetContainer.black .widgetThumb a{ color:#999;}
+.widgetContainer.black .widgetThumb .hour{ color:#888;}
+
+.widgetContainer.black .widgetZineA li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineA li .title{ color:#999;}
+.widgetContainer.black .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineA li .author{ color:#999;}
+.widgetContainer.black .widgetZineA li .category{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineA li .date{ color:#999;}
+.widgetContainer.black .widgetZineA li .hour{ color:#888;}
+.widgetContainer.black .widgetZineA li .text{ color:#888;}
+
diff --git a/widgets/content/skins/default/gallery.html b/widgets/content/skins/default/gallery.html
new file mode 100644
index 000000000..5f3f0ee9c
--- /dev/null
+++ b/widgets/content/skins/default/gallery.html
@@ -0,0 +1,51 @@
+<ul class="widgetGalleryA" style="width:{$widget_info->cols_list_count*($widget_info->thumbnail_width+28)}px;">
+{@$_idx=0}
+    <!--@foreach($widget_info->content_items as $key => $item)-->
+    <li<!--@if($_idx>0 && $_idx % $widget_info->cols_list_count==0)--> class="clearLeft"<!--@end--> style="<!--@if($_idx >= $widget_info->list_count)-->display:none<!--@end-->;width:{$widget_info->thumbnail_width}px;">
+        <!--@foreach($widget_info->option_view_arr as $k => $v)-->
+            <!--@if($v=='thumbnail')-->
+                <a href="{$item->getLink()}" class="thumb" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px">
+                    <!--@if($item->getThumbnail())-->
+                        <img src="{$item->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"/>
+                    <!--@else-->
+                        <span class="imgNone">{$lang->none_image}</span>
+                    <!--@end-->
+                <!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+                    <strong class="board">{$item->getBrowserTitle()}</strong>
+                <!--@end-->
+                <!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+                    <strong class="category">{$item->getCategory()}</strong>
+                <!--@end-->
+                </a>
+
+            <!--@else if($v=='title')-->
+                <a href="{$item->getLink()}" class="title">{$item->getTitle($widget_info->subject_cut_size)}</a>
+                <!--@if($widget_info->show_trackback_count=='Y' && $item->getCommentCount())-->
+                    <sup class="replyNum"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></sup>
+                <!--@end-->
+
+                <!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+                    <sup class="trackbackNum"><a href="{$item->getLink()}#trackback">{$item->getTrackbackCount()}</a></sup>
+                <!--@end-->
+
+                <!--@if($widget_info->show_icon=='Y')-->
+                    <span class="icon">{$item->printExtraImages()}<span>
+                <!--@end-->
+
+        <!--@else if($v=='nickname')-->
+            <a href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}">{$item->getNickName()}</a>
+        <!--@else if($v=='regdate')-->
+            <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
+        <!--@end-->
+    <!--@end-->
+    </li>
+    {@$_idx++}
+    <!--@end-->
+</ul>
+
+<!--@if($widget_info->page_count > 1 && $widget_info->list_count<$_idx)-->
+<ul class="widgetNavigator">
+    <li><button type="button" class="prev" title="{$lang->cmd_prev}" onclick="content_widget_prev(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetGalleryA'),{$widget_info->list_count})"><span>{$lang->cmd_prev}</span></button></li>
+    <li><button type="button" class="next" title="{$lang->cmd_next}" onclick="content_widget_next(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetGalleryA'),{$widget_info->list_count})"><span>{$lang->cmd_next}</span></button></li>
+</ul>
+<!--@end-->
diff --git a/widgets/content/skins/default/image_title.html b/widgets/content/skins/default/image_title.html
new file mode 100644
index 000000000..63b01ab5f
--- /dev/null
+++ b/widgets/content/skins/default/image_title.html
@@ -0,0 +1,60 @@
+{@$have_first_thumbnail=false}
+<!--@if(count($widget_info->content_items) && $widget_info->content_items[0]->haveFirstThumbnail())-->
+    {@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
+    {@$have_first_thumbnail=true}
+    <p class="widgetThumb floatLeft" style="margin-right:-{$widget_info->thumbnail_width}px">
+        <a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
+    </p>
+<!--@end-->
+
+<div<!--@if($have_first_thumbnail)--> style="padding-left:{$widget_info->thumbnail_width+10}px"<!--@end-->>
+    <table class="widgetTableA" border="1" cellspacing="0">
+        <tbody>
+{@$_idx=0}
+<!--@foreach($widget_info->content_items as $key => $item)-->
+        <tr<!--@if($_idx >= $widget_info->list_count)--> style="display:none"<!--@end-->>
+<!--@foreach($widget_info->option_view_arr as $k => $v)-->
+    <!--@if($v=='title')-->
+        <td class="title">
+
+            <!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+                <a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}"><strong class="board">{$item->getBrowserTitle()}</strong></a>
+            <!--@end-->
+
+            <!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+                <a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}"><strong class="category">{$item->getCategory()}</strong></a>
+            <!--@end-->
+
+            <a href="{$item->getLink()}">{$item->getTitle($widget_info->subject_cut_size)}</a>
+
+            <!--@if($widget_info->show_trackback_count=='Y' && $item->getCommentCount())-->
+                <sup class="replyNum"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></sup>
+            <!--@end-->
+
+            <!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+                <sup class="trackbackNum"><a href="{$item->getLink()}#trackback">{$item->getTrackbackCount()}</a></sup>
+            <!--@end-->
+
+            <!--@if($widget_info->show_icon=='Y')-->
+                <span class="icon">{$item->printExtraImages()}<span></td>
+            <!--@end-->
+
+    <!--@else if($v=='nickname')-->
+        <td><a href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}">{$item->getNickName()}</a></td>
+    <!--@else if($v=='regdate')-->
+        <td class="time"><span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span></td>
+    <!--@end-->
+<!--@end-->
+        </tr>
+{@$_idx++}
+<!--@end-->
+        </tbody>
+    </table>
+</div>
+
+<!--@if($widget_info->page_count > 1 && $widget_info->list_count<$_idx)-->
+    <ul class="widgetNavigator">
+        <li><button type="button" class="prev" title="{$lang->cmd_prev}" onclick="content_widget_prev(jQuery(this).parents('ul.widgetNavigator').prev('div').children('table.widgetTableA'),{$widget_info->list_count})"><span>{$lang->cmd_prev}</span></button></li>
+        <li><button type="button" class="next" title="{$lang->cmd_next}" onclick="content_widget_next(jQuery(this).parents('ul.widgetNavigator').prev('div').children('table.widgetTableA'),{$widget_info->list_count})"><span>{$lang->cmd_next}</span></button></li>
+    </ul>
+<!--@end-->
diff --git a/widgets/content/skins/default/image_title_content.html b/widgets/content/skins/default/image_title_content.html
new file mode 100644
index 000000000..fe8c88a02
--- /dev/null
+++ b/widgets/content/skins/default/image_title_content.html
@@ -0,0 +1,80 @@
+<ul class="widgetZineA">
+{@$_idx=0}
+<!--@foreach($widget_info->content_items as $key => $item)-->
+    <li<!--@if($_idx >= $widget_info->list_count)--> style="display:none"<!--@end-->>
+
+        <p class="thumbArea" style="width:{$widget_info->thumbnail_width}px;margin-right:-{$widget_info->thumbnail_width}px;">
+            <a href="{$item->getLink()}" class="thumb" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px">
+                <!--@if($item->getThumbnail())-->
+                    <img src="{$item->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" />
+                <!--@else-->
+                    <span class="imgNone">{$lang->none_image}</span>
+                <!--@end-->
+
+                <!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+                    <strong class="category">{$item->getCategory()}</strong>
+                <!--@end-->
+            </a>
+        </p>
+
+    <!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
+
+        <!--@if($widget_info->option_view_arr[$j]=='title')-->
+        <p class="titleArea" style="margin-left:{$widget_info->thumbnail_width+20}px;">
+
+            <!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+                <a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}"><strong class="board">{$item->getBrowserTitle()}</strong></a>
+            <!--@end-->
+
+            <!--@if($widget_info->show_category=='Y' && $item->get('category_srl') )-->
+                <a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}"><strong class="category">{$item->getCategory()}</strong></a>
+            <!--@end-->
+
+            <a href="{$item->getLink()}" class="title">{$item->getTitle($widget_info->subject_cut_size)}</a>
+
+            <!--@if($widget_info->show_trackback_count=='Y' && $item->getCommentCount())-->
+                <sup class="replyNum"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></sup>
+            <!--@end-->
+
+            <!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+                <sup class="trackbackNum"><a href="{$item->getLink()}#trackback">{$item->getTrackbackCount()}</a></sup>
+            <!--@end-->
+
+            <!--@if($widget_info->show_icon=='Y')-->
+                <span class="icon">{$item->printExtraImages()}<span></td>
+            <!--@end-->
+
+            <!--@if($widget_info->option_view_arr[$j+1]=='regdate')-->
+                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
+            <!--@end-->
+        </p>
+
+        <!--@else if($widget_info->option_view_arr[$j]=='content')-->
+        <p class="text" style="margin-left:{$widget_info->thumbnail_width+20}px;">
+            {$item->getContent()}
+            <!--@if($widget_info->option_view_arr[$j+1]=='regdate')-->
+                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
+            <!--@end-->
+        </p>
+
+        <!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
+        <p class="authorArea" style="margin-left:{$widget_info->thumbnail_width+20}px;">
+                <a href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}">{$item->getNickName()}</a>
+            <!--@if($widget_info->option_view_arr[$j+1]=='regdate')-->
+                <span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span>
+            <!--@end-->
+        </p>
+        <!--@end-->
+
+    <!--@end-->
+    </li>
+{@$_idx++}
+<!--@end-->
+</ul>
+
+<!--@if($widget_info->page_count > 1 && $widget_info->list_count<$_idx)-->
+    <ul class="widgetNavigator">
+        <li><button type="button" class="prev" title="{$lang->cmd_prev}" onclick="content_widget_prev(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetZineA'),{$widget_info->list_count})"><span>{$lang->cmd_prev}</span></button></li>
+        <li><button type="button" class="next" title="{$lang->cmd_next}" onclick="content_widget_next(jQuery(this).parents('ul.widgetNavigator').prev('ul.widgetZineA'),{$widget_info->list_count})"><span>{$lang->cmd_next}</span></button></li>
+    </ul>
+<!--@end-->
diff --git a/widgets/content/skins/default/img/black/buttonWidgetTab.gif b/widgets/content/skins/default/img/black/buttonWidgetTab.gif
new file mode 100644
index 000000000..53f0e3e97
Binary files /dev/null and b/widgets/content/skins/default/img/black/buttonWidgetTab.gif differ
diff --git a/widgets/content/skins/default/img/black/lineTextDiv.gif b/widgets/content/skins/default/img/black/lineTextDiv.gif
new file mode 100644
index 000000000..a573ed164
Binary files /dev/null and b/widgets/content/skins/default/img/black/lineTextDiv.gif differ
diff --git a/widgets/content/skins/default/img/white/buttonWidgetNavigation.gif b/widgets/content/skins/default/img/white/buttonWidgetNavigation.gif
new file mode 100644
index 000000000..975e0bd39
Binary files /dev/null and b/widgets/content/skins/default/img/white/buttonWidgetNavigation.gif differ
diff --git a/widgets/content/skins/default/img/white/buttonWidgetTab.gif b/widgets/content/skins/default/img/white/buttonWidgetTab.gif
new file mode 100644
index 000000000..5d686dacc
Binary files /dev/null and b/widgets/content/skins/default/img/white/buttonWidgetTab.gif differ
diff --git a/widgets/content/skins/default/img/white/lineTextDiv.gif b/widgets/content/skins/default/img/white/lineTextDiv.gif
new file mode 100755
index 000000000..0fa7654cb
Binary files /dev/null and b/widgets/content/skins/default/img/white/lineTextDiv.gif differ
diff --git a/widgets/content/skins/default/js/content_widget.js b/widgets/content/skins/default/js/content_widget.js
new file mode 100644
index 000000000..7ee235764
--- /dev/null
+++ b/widgets/content/skins/default/js/content_widget.js
@@ -0,0 +1,59 @@
+function content_widget_next(obj,list_per_page){
+    var page = 1;
+    if(obj.is('table')) {
+        var list = jQuery('>tbody>tr',obj);
+    } else if(obj.is('ul')) {
+        var list = jQuery('>li',obj);
+    }
+
+    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
+    list.each(function(i){
+        if(jQuery(this).css('display') !='none'){
+            page = parseInt((i+1)/list_per_page,10)+1;
+            return false;
+        }
+    });
+    if(total_page <= page) return;
+    list.each(function(i){
+        if( (page* list_per_page) <= i && ((page+1) * list_per_page) > i){
+            jQuery(this).show();
+        }else{
+            jQuery(this).hide();
+        }
+    });
+}
+
+function content_widget_prev(obj,list_per_page){
+    var page = 1;
+    if(obj.is('table')){
+        var list = jQuery('>tbody>tr',obj);
+    }else if(obj.is('ul')){
+        var list = jQuery('>li',obj);
+    }
+
+    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
+    list.each(function(i){
+        if(jQuery(this).css('display') !='none'){
+            page = parseInt((i+1)/list_per_page,10)+1;
+            return false;
+        }
+    });
+
+    if(page <= 1) return;
+    list.each(function(i){
+        if( ((page-2)* list_per_page)<= i && ((page-1) * list_per_page) > i){
+            jQuery(this).show();
+        }else{
+            jQuery(this).hide();
+        }
+    });
+}
+
+function content_widget_tab_show(tab,list,i){
+    tab.parents('ul.widgetTab').children('li.active').removeClass('active');
+    tab.parent('li').addClass('active');
+    jQuery('>dd',list).each(function(j){
+            if(j==i) jQuery(this).addClass('open');
+            else jQuery(this).removeClass('open');
+            });
+}
diff --git a/widgets/content/skins/default/normal.html b/widgets/content/skins/default/normal.html
new file mode 100644
index 000000000..615cd0ab7
--- /dev/null
+++ b/widgets/content/skins/default/normal.html
@@ -0,0 +1,49 @@
+<table class="widgetTableA" border="1" cellspacing="0">
+    <tbody>
+{@$_idx=0}
+<!--@foreach($widget_info->content_items as $key => $item)-->
+    <tr<!--@if($_idx >= $widget_info->list_count)--> style="display:none"<!--@end-->>
+<!--@foreach($widget_info->option_view_arr as $k => $v)-->
+<!--@if($v=='title')-->
+    <td class="title">
+
+        <!--@if($widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+            <a href="{getSiteUrl($item->domain, '', 'mid', $item->get('mid'))}"><strong class="board">{$item->getBrowserTitle()}</strong></a>
+        <!--@end-->
+        <!--@if($widget_info->show_category=='Y' && $item->get('category_srl') )-->
+            <a href="{getSiteUrl($item->domain,'','mid',$item->get('mid'),'category',$item->get('category_srl'))}"><strong class="category">{$item->getCategory()}</strong></a>
+        <!--@end-->
+
+        <a href="{$item->getLink()}">{$item->getTitle($widget_info->subject_cut_size)}</a>
+
+        <!--@if($widget_info->show_trackback_count=='Y' && $item->getCommentCount())-->
+            <sup class="replyNum"><a href="{$item->getLink()}#comment">{$item->getCommentCount()}</a></sup>
+        <!--@end-->
+
+        <!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+            <sup class="trackbackNum"><a href="{$item->getLink()}#trackback">{$item->getTrackbackCount()}</a></sup>
+        <!--@end-->
+
+        <!--@if($widget_info->show_icon=='Y')-->
+            <span class="icon">{$item->printExtraImages()}<span></td>
+        <!--@end-->
+    </td>
+<!--@else if($v=='nickname')-->
+    <td><a href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}">{$item->getNickName()}</a></td>
+<!--@else if($v=='regdate')-->
+    <td class="time"><span class="date">{$item->getRegdate("Y-m-d")}</span> <span class="hour">{$item->getRegdate("H:i")}</span></td>
+<!--@end-->
+<!--@end-->
+    </tr>
+{@$_idx++}
+<!--@end-->
+    </tbody>
+</table>
+
+
+<!--@if($widget_info->page_count > 1 && $widget_info->list_count<$_idx)-->
+<ul class="widgetNavigator">
+    <li><button type="button" class="prev" title="{$lang->cmd_prev}" onclick="content_widget_prev(jQuery(this).parents('ul.widgetNavigator').prev('table.widgetTableA'),{$widget_info->list_count})"><span>{$lang->cmd_prev}</span></button></li>
+    <li><button type="button" class="next" title="{$lang->cmd_next}" onclick="content_widget_next(jQuery(this).parents('ul.widgetNavigator').prev('table.widgetTableA'),{$widget_info->list_count})"><span>{$lang->cmd_next}</span></button></li>
+</ul>
+<!--@end-->
diff --git a/widgets/content/skins/default/skin.xml b/widgets/content/skins/default/skin.xml
new file mode 100644
index 000000000..58fd98cbc
--- /dev/null
+++ b/widgets/content/skins/default/skin.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">Content 위젯 기본 스킨</title>
+    <title xml:lang="zh-CN">全局内容控件默认皮肤</title>
+    <title xml:lang="zh-TW">全局内容控件預設面板</title>
+    <description xml:lang="ko">Content 위젯 기본 스킨 입니다.
+    Html/Publish: 정찬명
+    Design : mada
+    Programming : SOL
+    </description>
+    <description xml:lang="zh-CN">全局内容控件默认皮肤。
+    Html/Publish: Chan-Myung Jeong
+    Design : mada
+    Programming : SOL
+    </description>
+    <description xml:lang="zh-TW">全局内容控件預設面板。
+    Html/Publish: Chan-Myung Jeong
+    Design : mada
+    Programming : SOL
+    </description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+    <link>http://www.ngleader.com</link>
+
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <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>
+            <title xml:lang="zh-TW">白色背景</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>
+            <title xml:lang="zh-TW">暗色背景</title>
+        </color>
+    </colorset>
+</skin>
\ No newline at end of file
diff --git a/widgets/counter_status/conf/info.xml b/widgets/counter_status/conf/info.xml
index 8e2e9455b..3dd6ed6a3 100644
--- a/widgets/counter_status/conf/info.xml
+++ b/widgets/counter_status/conf/info.xml
@@ -36,7 +36,7 @@
     </description>
     <description xml:lang="zh-TW">
         利用訪問統計模組顯示總訪問量與昨天、今日的訪問統計量。
-        想要使用此組件，必須先安裝訪問統計模組並啟動插件。
+        想要使用此組件，必須先安裝訪問統計模組並啟動元件。
     </description>
     <version>0.1</version>
     <date>2007-02-28</date>
diff --git a/widgets/counter_status/counter_status.class.php b/widgets/counter_status/counter_status.class.php
index 9e64645ff..c12b648df 100644
--- a/widgets/counter_status/counter_status.class.php
+++ b/widgets/counter_status/counter_status.class.php
@@ -17,7 +17,8 @@
             // 전체, 어제, 오늘 접속 현황을 가져옴
             $oCounterModel = &getModel('counter');
 
-            $output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')));
+            $site_module_info = Context::get('site_module_info');
+            $output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')), $site_module_info->site_srl);
             foreach($output as $key => $val) {
                 if(!$key) Context::set('total_counter', $val);
                 elseif($key == date("Ymd")) Context::set('today_counter', $val);
diff --git a/widgets/counter_status/skins/default/counter_status.html b/widgets/counter_status/skins/default/counter_status.html
index 989bc54b4..585dad454 100644
--- a/widgets/counter_status/skins/default/counter_status.html
+++ b/widgets/counter_status/skins/default/counter_status.html
@@ -1,21 +1,14 @@
-<!--@if($colorset == "normal")-->
-    <!--%import("normal/style.css")-->
-<!--@end-->
-
-<div class="counter_widget">
-
-    <ul>
-      <!--@if($total_counter)-->
-      <li><strong>Total</strong> : {$total_counter->unique_visitor}</li>
-      <!--@end-->
-
-      <!--@if($today_counter)-->
-      <li><strong>Today</strong> : {$today_counter->unique_visitor}</li>
-      <!--@end-->
-
-      <!--@if($yesterday_counter)-->
-      <li><strong>Yesterday</strong> : {$yesterday_counter->unique_visitor}</li>
-      <!--@end-->
-    </ul>
-
-</div>
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <dl class="widgetCounter">
+        <dt>{$lang->today} :</dt>
+        <dd>{number_format($today_counter->unique_visitor)}</dd>
+        <dt>{$lang->yesterday} :</dt>
+        <dd>{number_format($yesterday_counter->unique_visitor)}</dd>
+        <dt>{$lang->total} :</dt>
+        <dd>{number_format($total_counter->unique_visitor)}</dd>
+    </dl>
+</div>
diff --git a/widgets/counter_status/skins/default/css/widget.css b/widgets/counter_status/skins/default/css/widget.css
new file mode 100644
index 000000000..b3dcaf6ba
--- /dev/null
+++ b/widgets/counter_status/skins/default/css/widget.css
@@ -0,0 +1,18 @@
+@charset "utf-8";
+
+/* widgetCounter */
+.widgetCounter{ font-size:12px; margin:0;}
+.widgetCounter dt,
+.widgetCounter dd{ height:18px;}
+.widgetCounter dt{ float:left; clear:left;}
+.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
+.widgetCounter dt{ color:#333;}
+.widgetCounter dd{ color:#888;}
+
+.widgetContainer.black .widgetCounter{ font-size:12px; margin:0;}
+.widgetContainer.black .widgetCounter dt,
+.widgetContainer.black .widgetCounter dd{ height:18px;}
+.widgetContainer.black .widgetCounter dt{ float:left; clear:left;}
+.widgetContainer.black .widgetCounter dd{ font-size:11px; font-family:Tahoma;}
+.widgetContainer.black .widgetCounter dt{ color:#999;}
+.widgetContainer.black .widgetCounter dd{ color:#888;}
diff --git a/widgets/counter_status/skins/default/normal/style.css b/widgets/counter_status/skins/default/normal/style.css
deleted file mode 100644
index be4280c45..000000000
--- a/widgets/counter_status/skins/default/normal/style.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.counter_widget {
-    border:3px solid #DDDDDD;
-    padding:6px;
-    margin-bottom:10px;
-    color:#999999;
-    font-family:tahoma;
-    font-size:8pt;
-}
-
-.counter_widget ul { margin:0; padding:0; list-style:none; }
diff --git a/widgets/counter_status/skins/default/skin.xml b/widgets/counter_status/skins/default/skin.xml
index c8c5233cd..796410a30 100644
--- a/widgets/counter_status/skins/default/skin.xml
+++ b/widgets/counter_status/skins/default/skin.xml
@@ -23,12 +23,26 @@
     </author>
 
     <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="zh-TW">預設</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/forum/conf/info.xml b/widgets/forum/conf/info.xml
index 63d83a502..d9c0add5b 100644
--- a/widgets/forum/conf/info.xml
+++ b/widgets/forum/conf/info.xml
@@ -46,16 +46,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-		</var>
 		<var id="duration_new">
 			<type>text</type>
 			<name xml:lang="ko">new 표시 시간 (hours)</name>
@@ -100,7 +90,7 @@
 			<name xml:lang="ru">Модуль назначения</name>
 			<name xml:lang="zh-TW">目標模組</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-			<description xml:lang="zh-CN">将把被选模块当中的主题作为对象。</description>
+			<description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
 			<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
 			<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
 			<description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
diff --git a/widgets/forum/forum.class.php b/widgets/forum/forum.class.php
index 5f3884164..8ce01576a 100644
--- a/widgets/forum/forum.class.php
+++ b/widgets/forum/forum.class.php
@@ -15,6 +15,20 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
+            // 선택된 모듈이 없으면 실행 취소
+            if(!$args->module_srls) return Context::getLang('msg_not_founded');
+
             // 제목
             $title = $args->title;
 
@@ -26,31 +40,16 @@
             $subject_cut_size = $args->subject_cut_size;
             if(!$subject_cut_size) $subject_cut_size = 0;
 
-            $oModuleModel = &getModel('module');
-
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
-            if(!is_array($module_srl)) $module_srl = array($module_srl);
-            for($i=0;$i<count($module_srl);$i++) $modules[$module_srl[$i]] = null;
-
-            // 대상 모듈의 정보를 구함
-            $module_list = $oModuleModel->getModulesInfo($module_srl);
+            // 대상 모듈 목록을 구함
+            $module_list = $oModuleModel->getModulesInfo($args->module_srls);
+            if(!count($module_list)) return Context::getLang('msg_not_founded');
 
             // 각 모듈별로 먼저 정리 시작
+            $site_domain = array(0 => Context::getDefaultUrl());
+            $site_module_info = Context::get('site_module_info');
+            if($site_module_info) $site_domain[$site_module_info->site_srl] = $site_module_info->domain;
+
+            $module_srls = array();
             foreach($module_list as $module) {
                 $modules[$module->module_srl]->title = $module->browser_title;
                 $modules[$module->module_srl]->mid = $module->mid;
@@ -58,19 +57,32 @@
                 $modules[$module->module_srl]->document_count = 0;
                 $modules[$module->module_srl]->comment_count = 0;
 
+                if(!$site_domain[$module->site_srl]) {
+                    $site_info = $oModuleModel->getSiteInfo($module->site_srl);
+                    $site_domain[$site_info->site_srl] = $site_info->domain;
+                }
+                $modules[$module->module_srl]->domain = $site_domain[$module->site_srl];
+
+
                 // 최근 등록된 댓글의 정보
                 $last_comment = null;
                 $last_args = null;
                 $last_args->module_srl = $module->module_srl;
                 $output = executeQuery('widgets.forum.getLatestComments', $last_args);
-                if($output->data && is_array($output->data)) $last_comment = array_pop($output->data);
+                if($output->data && is_array($output->data)) {
+                    $last_comment = array_pop($output->data);
+                    $last_comment->content_type = 'comment';
+                }
 
                 // 최근 등록된 글의 정보
                 $last_document = null;
                 $last_args = null;
                 $last_args->module_srl = $module->module_srl;
                 $output = executeQuery('widgets.forum.getLatestDocuments', $last_args);
-                if($output->data && is_array($output->data)) $last_document = array_pop($output->data);
+                if($output->data && is_array($output->data)) {
+                    $last_document = array_pop($output->data);
+                    $last_document->content_type = 'document';
+                }
 
                 $last_item = null;
                 if($last_comment && $last_document) {
@@ -84,10 +96,11 @@
                 $modules[$module->module_srl]->last_item = $last_item;
 
                 if($last_item && $last_item->regdate > date("YmdHis",time()-$duration_new*60*60)) $modules[$module->module_srl]->is_new = true;
+                $module_srls[] = $module->module_srl;
             }
 
             // 각 모듈별 전체글을 구함
-            if($module_srl) $total_documents_args->module_srls = implode(',',$module_srl);
+            if($module_srls) $total_documents_args->module_srls = implode(',',$module_srls);
             $total_documents_output = executeQueryArray('widgets.forum.getTotalDocuments',$total_documents_args);
             if($total_documents_output->data) {
                 foreach($total_documents_output->data as $val) {
@@ -96,7 +109,7 @@
             }
 
             // 각 모듈별 댓글 수를 구함
-            $total_comments_args->module_srls = implode(',',$module_srl);
+            $total_comments_args->module_srls = implode(',',$module_srls);
 
             $total_comments_output = executeQueryArray('widgets.forum.getTotalComments',$total_comments_args);
             if($total_comments_output->data) {
diff --git a/widgets/forum/skins/default/css/common.css b/widgets/forum/skins/default/css/common.css
deleted file mode 100644
index b25e09364..000000000
--- a/widgets/forum/skins/default/css/common.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.xeForum { background:url("../images/back.gif") repeat-x left top; padding:0; }
-
-.xeForum div.forumTable { padding:0 6px 0 6px; }
-.xeForum table { width:100%; border:0; table-layout:fixed; }
-
-.xeForum table tr.top { height:22px; }
-.xeForum table th { vertical-align:bottom; color:#ffffff; font-weight:normal; padding-bottom:5px; }
-.xeForum table th.title { font-weight:normal; text-align:left; padding-left:10px; }
-.xeForum table th.last_post { text-align:left; padding-left:15px; }
-
-.xeForum table tr.content { background:#EFEFEF; height:55px; }
-
-.xeForum table td.topic, .xeForum td.icon, .xeForum td.title, .xeForum td.topic, .xeForum td.replies , .xeForum td.last_post{ padding:5px 0 5px 0; border-top:1px solid #FFFFFF; }
-.xeForum table td.topic, .xeForum td.icon, .xeForum td.title, .xeForum td.topic, .xeForum td.replies , .xeForum td.last_post{ padding:5px 0 5px 0; border-bottom:1px solid #6E6E6E; }
-.xeForum table td.icon { text-align:center; }
-
-.xeForum table td.title a { text-decoration:none; color:#3A3947; font-size:9pt;}
-.xeForum table td.title p { margin-top:5px; font-weight:normal; text-decoration:none; color:#838383; font-size:9pt;}
-.xeForum table td.title p a { font-weight:normal; text-decoration:underline; color:#838383; font-size:9pt;}
-
-.xeForum table td.topic, .xeForum td.replies, .xeForum td.last_post { background:#EFEFEF url("../images/div.gif") no-repeat left 3px; }
-
-.xeForum table td.topic, .xeForum td.replies { text-align:center; color:#3A3947; font-family:tahoma; font-size:8pt; }
-
-.xeForum table td.last_post { text-align:left; color:#3A3947; font-family:tahoma; font-size:8pt; padding-left:15px; }
-.xeForum table td.last_post div.author img { vertical-align:middle; }
-.xeForum table td.last_post div.date { margin-top:5px; text-align:left; color:#3A3947; font-family:tahoma; font-size:8pt; }
-
diff --git a/widgets/forum/skins/default/css/widget.css b/widgets/forum/skins/default/css/widget.css
new file mode 100644
index 000000000..fa1af44a7
--- /dev/null
+++ b/widgets/forum/skins/default/css/widget.css
@@ -0,0 +1,64 @@
+@charset "utf-8";
+
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
+.widgetTableC td.title,
+.widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
+.widgetTableC td.docNum{}
+.widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/iconForumNum.gif) no-repeat 0 0;}
+.widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
+.widgetTableC td.title dl{ margin:0;}
+.widgetTableC td.title dd{ margin:0;}
+.widgetTableC td.lastDoc p{ margin:0;}
+.widgetTableC td .author{ margin-right:5px;}
+.widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
+.widgetTableC td .time .date{ margin-right:5px;}
+
+/* widgetTableC */
+.widgetTableC{ border-color:#e5e5e5;}
+.widgetTableC td{ border-color:#e5e5e5;}
+.widgetTableC td.title a{ color:#333;}
+.widgetTableC td.title dd{ color:#888;}
+.widgetTableC td.lastDoc p a{ color:#333;}
+.widgetTableC td.lastDoc .author{ color:#888;}
+.widgetTableC td.lastDoc .time{ color:#888;}
+
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer.black .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetContainer.black .widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetContainer.black .widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
+.widgetContainer.black .widgetTableC td.title,
+.widgetContainer.black .widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
+.widgetContainer.black .widgetTableC td.docNum{}
+.widgetContainer.black .widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/iconForumNum.gif) no-repeat 0 0;}
+.widgetContainer.black .widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
+.widgetContainer.black .widgetTableC td.title dl{ margin:0;}
+.widgetContainer.black .widgetTableC td.title dd{ margin:0;}
+.widgetContainer.black .widgetTableC td.lastDoc p{ margin:0;}
+.widgetContainer.black .widgetTableC td .author{ margin-right:5px;}
+.widgetContainer.black .widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
+.widgetContainer.black .widgetTableC td .time .date{ margin-right:5px;}
+
+.widgetContainer.black .widgetTableC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td.title a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.title dd{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc p a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc .time{ color:#888;}
diff --git a/widgets/forum/skins/default/images/back.gif b/widgets/forum/skins/default/images/back.gif
deleted file mode 100644
index 8120d20ef..000000000
Binary files a/widgets/forum/skins/default/images/back.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/div.gif b/widgets/forum/skins/default/images/div.gif
deleted file mode 100644
index 22948e423..000000000
Binary files a/widgets/forum/skins/default/images/div.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/icon.gif b/widgets/forum/skins/default/images/icon.gif
deleted file mode 100644
index f9a69477f..000000000
Binary files a/widgets/forum/skins/default/images/icon.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/icon_new.gif b/widgets/forum/skins/default/images/icon_new.gif
deleted file mode 100644
index 454fad1fe..000000000
Binary files a/widgets/forum/skins/default/images/icon_new.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/lb.gif b/widgets/forum/skins/default/images/lb.gif
deleted file mode 100644
index 993f47c8d..000000000
Binary files a/widgets/forum/skins/default/images/lb.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/lt.gif b/widgets/forum/skins/default/images/lt.gif
deleted file mode 100644
index 02fbc3c4c..000000000
Binary files a/widgets/forum/skins/default/images/lt.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/rb.gif b/widgets/forum/skins/default/images/rb.gif
deleted file mode 100644
index 2e41a85d9..000000000
Binary files a/widgets/forum/skins/default/images/rb.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/replies.gif b/widgets/forum/skins/default/images/replies.gif
deleted file mode 100644
index 78ba5d8d8..000000000
Binary files a/widgets/forum/skins/default/images/replies.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/rt.gif b/widgets/forum/skins/default/images/rt.gif
deleted file mode 100644
index 6c1ad7fa9..000000000
Binary files a/widgets/forum/skins/default/images/rt.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/images/top_bg.gif b/widgets/forum/skins/default/images/top_bg.gif
deleted file mode 100644
index 65e69d535..000000000
Binary files a/widgets/forum/skins/default/images/top_bg.gif and /dev/null differ
diff --git a/widgets/forum/skins/default/img/iconForumNum.gif b/widgets/forum/skins/default/img/iconForumNum.gif
new file mode 100755
index 000000000..42225782b
Binary files /dev/null and b/widgets/forum/skins/default/img/iconForumNum.gif differ
diff --git a/widgets/forum/skins/default/img/new.gif b/widgets/forum/skins/default/img/new.gif
new file mode 100644
index 000000000..d4f90a9c8
Binary files /dev/null and b/widgets/forum/skins/default/img/new.gif differ
diff --git a/widgets/forum/skins/default/list.html b/widgets/forum/skins/default/list.html
index b0d8d642c..2df06f8d7 100644
--- a/widgets/forum/skins/default/list.html
+++ b/widgets/forum/skins/default/list.html
@@ -1,47 +1,40 @@
-<!--%import("css/common.css")-->
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
 
-<div class="xeForum">
-    <img src="./images/lt.gif" alt="" class="fl" />
-    <img src="./images/rt.gif" alt="" class="fr" />
-
-    <div class="forumTable">
-        <table cellspacing="0" class="xeForum clear">
-        <col width="60" />
-        <col />
-        <col width="70" />
-        <col width="70" />
-        <col width="160" />
-        <tr class="top">
-            <th colspan="2" class="title"><!--@if($widget_info->title)-->{$widget_info->title}<!--@else-->&nbsp;<!--@end--></th>
-            <th class="topic">{$lang->topic}</th>
-            <th class="replies">{$lang->replies}</th>
-            <th class="last_post">{$lang->last_post}</th>
-        </tr>
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <table class="widgetTableC" border="1" cellspacing="0">
+    <tbody>
         <!--@foreach($widget_info->modules as $val)-->
-        <tr class="content">
-            <td class="icon"><img src="./images/icon<!--@if($val->is_new)-->_new<!--@end-->.gif" alt="icon" /></td>
-            <td class="title">
-                <strong><a href="{getUrl('','mid',$val->mid)}">{$val->title}</a></strong>
-                <p>{$val->description}</p>
+        <tr>
+            <td class="docNum">
+                <em>{number_format($val->document_count)}</em>
             </td>
-            <td class="topic">{number_format($val->document_count)}</td>
-            <td class="replies">{number_format($val->comment_count)}</td>
-            <td class="last_post">
+            <td class="title">
+                <dl>
+                    <dt><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}">{$val->title}</a></dt>
+                    <dd>{$val->description}</dd>
+                </dl>
+            </td>
+            <td class="lastDoc">
                 <!--@if($val->last_item)-->
-                    <div class="author">
-                        <span class="member_{$val->last_item->member_srl}">{$val->last_item->nick_name}</span>
-                        <a href="{getUrl('','document_srl',$val->last_item->document_srl)}<!--@if($val->last_item->comment_srl)-->#comment_{$val->last_item->comment_srl}<!--@end-->"><img src="./images/replies.gif" alt="go" /></a>
-                    </div>
-                    <div class="date">{zdate($val->last_item->regdate,"Y-m-d H:i")}</div>
+                    <p>
+                    <!--@if($val->last_item->content_type == 'comment')-->
+                    <a href="{getSiteUrl($val->domain,'','document_srl',$val->last_item->document_srl)}#comment_{$val->last_item->comment_srl}">{cut_str(strip_tags($val->last_item->content),26,'...')}</a>
+                    <!--@else-->
+                    <a href="{getSiteUrl($val->domain,'','document_srl',$val->last_item->document_srl)}">{cut_str(strip_tags($val->last_item->title),26,'...')}</a>
+                    <!--@end-->
+
+                    <!--@if($val->is_new)--><img src="./img/new.gif" alt="New" width="9" height="9" /><!--@end--></p>
+                    <a href="#" class="author member_{$val->last_item->member_srl}">{$val->last_item->nick_name}</a> <span class="time"><span class="date">{zdate($val->last_item->regdate,"Y-m-d")}</span> <span class="hour">{zdate($val->last_item->regdate,"H:i")}</span></span>
                 <!--@else-->
                     &nbsp;
                 <!--@end-->
             </td>
         </tr>
         <!--@end-->
-        </table>
-    </div>
-    <img src="./images/lb.gif" alt="" class="fl" />
-    <img src="./images/rb.gif" alt="" class="fr" />
-    <div class="clear"></div>
+    </tbody>
+    </table>
 </div>
+
+
diff --git a/widgets/forum/skins/default/skin.xml b/widgets/forum/skins/default/skin.xml
index cf569a9d5..dabbc8e58 100644
--- a/widgets/forum/skins/default/skin.xml
+++ b/widgets/forum/skins/default/skin.xml
@@ -23,12 +23,26 @@
     </author>
 
     <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
         <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>
-            <title xml:lang="zh-TW">白色背景</title>
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/image_counter/image_counter.class.php b/widgets/image_counter/image_counter.class.php
index 0994c5cc3..17b200dc3 100644
--- a/widgets/image_counter/image_counter.class.php
+++ b/widgets/image_counter/image_counter.class.php
@@ -41,7 +41,15 @@
             // 현재부터 지난 $day_range동안의 카운터 로그를 가져옴
             $obj->e_regdate = date("Ymd"); 
             $obj->s_regdate = date("Ymd", ztime(date("YmdHis"))-$day_range*60*60*24+1); 
-            $output = executeQuery('widgets.image_counter.getCounterStatus', $obj);
+
+            $site_module_info = Context::get('site_module_info');
+            if($site_module_info->site_srl) {
+                $obj->site_srl = $site_module_info->site_srl;
+                $output = executeQuery('widgets.image_counter.getCounterSiteStatus', $obj);
+            } else {
+                $output = executeQuery('widgets.image_counter.getCounterStatus', $obj);
+            }
+            $site_srl = (int)($site_module_info->site_srl);
 
             // 결과가 있다면 loop를 돌면서 최고/최저값을 구하고 그래프를 그릴 준비
             $max_unique_visitor = 0;
@@ -56,7 +64,7 @@
 
             // 이미지를 그림 (이미지 위치는 ./files/cache/widget_cache/couter_graph.gif로 고정)
             if(!is_dir(_XE_PATH_.'files/cache/widget_cache/')) FileHandler::makeDir(_XE_PATH_.'files/cache/widget_cache/');
-            $image_src = "files/cache/widget_cache/couter_graph.gif";
+            $image_src = "files/cache/widget_cache/couter_graph.".$site_srl.".gif";
 
             // 이미지 생성
             $image = imagecreate($graph_width, $graph_height);
diff --git a/widgets/image_counter/queries/getCounterSiteStatus.xml b/widgets/image_counter/queries/getCounterSiteStatus.xml
new file mode 100644
index 000000000..dc19eee9e
--- /dev/null
+++ b/widgets/image_counter/queries/getCounterSiteStatus.xml
@@ -0,0 +1,13 @@
+<query id="getCounterSiteStatus" action="select">
+    <tables>
+        <table name="counter_site_status" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+        <condition operation="excess" column="regdate" var="s_regdate" notnull="notnull" pipe="and" />
+        <condition operation="less" column="regdate" var="e_regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/widgets/language_select/skins/default/css/widget.css b/widgets/language_select/skins/default/css/widget.css
new file mode 100644
index 000000000..29a894fce
--- /dev/null
+++ b/widgets/language_select/skins/default/css/widget.css
@@ -0,0 +1,18 @@
+@charset "utf-8";
+
+/* widgetLanguage */
+.widgetLanguage p{ float:right; margin:0;}
+.widgetLanguage .langList { display:none; position:absolute; margin:0; padding:0; z-index:999;}
+.widgetLanguage .langList  li{ list-style:none;}
+.widgetLanguage .langList  li a{ font-size:12px; display:block; padding:2px 5px;}
+.widgetLanguage p a{ color:#b3b3b3;}
+.widgetLanguage .langList { background:#fff; border:1px solid #ccc;}
+.widgetLanguage .langList  a{ color:#333;}
+
+.widgetContainer.black .widgetLanguage p{ float:right; margin:0;}
+.widgetContainer.black .widgetLanguage .langList { display:none; position:absolute; margin:0; padding:0; z-index:999;}
+.widgetContainer.black .widgetLanguage .langList  li{ list-style:none;}
+.widgetContainer.black .widgetLanguage .langList  li a{ font-size:12px; display:block; padding:2px 5px;}
+.widgetContainer.black .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer.black .widgetLanguage .langList { background:#fff; border:1px solid #ccc;}
+.widgetContainer.black .widgetLanguage .langList  a{ color:#333;}
diff --git a/widgets/language_select/skins/default/js/language_select.js b/widgets/language_select/skins/default/js/language_select.js
new file mode 100644
index 000000000..93ef94d98
--- /dev/null
+++ b/widgets/language_select/skins/default/js/language_select.js
@@ -0,0 +1,18 @@
+jQuery(function(){
+    jQuery('.language_selector','div.widgetLanguage').click(function(){
+        var c = jQuery(this).parent();
+        var langList = c.next('ul.langList');
+        langList.toggle();
+
+        jQuery(this).parents('[id^=ex_]:first').css('overflow','').css('position','relative').css('zoom','1');
+
+        if(langList.css('top')){
+            if(jQuery('body').height() <= c.offset().top + langList.height()) {
+                langList.css('top',-(langList.height()+17));
+            }else{
+                langList.css('top','26px');
+            }
+        }
+        return false;
+    });
+});
\ No newline at end of file
diff --git a/widgets/language_select/skins/default/language_select.html b/widgets/language_select/skins/default/language_select.html
index 556591a45..9b66c6db0 100644
--- a/widgets/language_select/skins/default/language_select.html
+++ b/widgets/language_select/skins/default/language_select.html
@@ -1,10 +1,18 @@
-<div class="tCenter">
-    <select name="lang_type" onchange="doChangeLangType(this)">
-        <option value="{$lang_type}">{$lang_supported[$lang_type]}</option>
-        <!--@foreach($lang_supported as $key => $val)-->
-        <!--@if($key != $lang_type)-->
-        <option value="{$key}">{$val}</option>
-        <!--@end-->
-        <!--@end-->
-    </select>
-</div>
+<!--%import("./js/language_select.js")-->
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetLanguage">
+        <p><a href="#" class="cafeXeA language_selector">Language:{$lang_supported[$lang_type]}</a></p>
+        <ul class="langList" class="" style="right: 3px;">
+            <!-- class="" | class="open" -->
+            <!--@foreach($lang_supported as $key => $val)-->
+            <!--@if($key != $lang_type)-->
+            <li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
+            <!--@end-->
+            <!--@end-->
+        </ul>
+    </div>
+</div>
diff --git a/widgets/language_select/skins/default/skin.xml b/widgets/language_select/skins/default/skin.xml
index fc8b2568c..d61911dd0 100644
--- a/widgets/language_select/skins/default/skin.xml
+++ b/widgets/language_select/skins/default/skin.xml
@@ -23,12 +23,26 @@
     </author>
 
     <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="zh-TW">預設</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/logged_members/conf/info.xml b/widgets/logged_members/conf/info.xml
index 3a004fb15..35b860ee3 100644
--- a/widgets/logged_members/conf/info.xml
+++ b/widgets/logged_members/conf/info.xml
@@ -3,12 +3,14 @@
     <title xml:lang="ko">로그인 사용자 출력 위젯</title>
     <title xml:lang="jp">ログイン会員出力</title>
     <title xml:lang="en">Display On-Line Members</title>
+    <title xml:lang="es">Mostrar Miembros On-Line</title>
     <title xml:lang="zh-CN">在线会员列表</title>
     <title xml:lang="zh-TW">顯示線上會員</title>
     <description xml:lang="ko">로그인 사용자를 출력하는 위젯입니다.</description>
     <description xml:lang="jp">ログイン中の会員のリストを出力するウィジェットです。</description>
     <description xml:lang="en">This widget displays on-line members.</description>
     <description xml:lang="zh-CN">显示在线会员列表的控件。</description>
+    <description xml:lang="es">Este widget muestra en línea de los miembros.</description>
     <description xml:lang="zh-TW">顯示線上會員的控件。</description>
     <version>0.1</version>
     <date>2008-06-18</date>
@@ -17,6 +19,7 @@
         <name xml:lang="ko">zero</name>
         <name xml:lang="jp">zero</name>
         <name xml:lang="en">zero</name>
+		<name xml:lang="es">zero</name>
         <name xml:lang="zh-CN">zero</name>
         <name xml:lang="zh-TW">zero</name>
     </author>
@@ -27,11 +30,13 @@
             <name xml:lang="ko">목록수</name>
             <name xml:lang="jp">リストへの表示数</name>
             <name xml:lang="en">List Count</name>
+			<name xml:lang="en">Lista Conde</name>
             <name xml:lang="zh-CN">目录数</name>
             <name xml:lang="zh-TW">列表數</name>
             <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
             <description xml:lang="jp">リストに表示する数の設定です。 (デフォルト5個)</description>
             <description xml:lang="en">You may set number of list to be displayed. (default 5)</description>
+			<description xml:lang="es">Usted puede configurar el número de lista que se muestra. (por defecto 5)</description>
             <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
             <description xml:lang="zh-TW">可設置要顯示的列表數。 (預設是5個)</description>
         </var>
@@ -40,11 +45,13 @@
             <name xml:lang="ko">대상 지정</name>
             <name xml:lang="jp">対象指定</name>
             <name xml:lang="en">Target</name>
+			<name xml:lang="es">Meta</name>
             <name xml:lang="zh-CN">模块对象</name>
             <name xml:lang="zh-TW">目標模組</name>
             <description xml:lang="ko">대상을 전체로 하면 홈페이지 접속자 모두가 출력되고 Mid 구분으로 하게 되면 접속한 Mid에 같이 접속한 회원만 출력이 됩니다.</description>
             <description xml:lang="jp">「全体」に指定するとサイトにログインした全ての会員が表示され、「Mid区分」にすると該当Midにアクセスしている会員のみ表示されます。</description>
             <description xml:lang="en">All on-line members will be displayed when you set target as 'All', or members in same Mid will be displayed when target is 'By Mid'.</description>
+			<description xml:lang="es">Todos los miembros en línea se mostrará cuando establece como objetivo «todos», o de los miembros en el mismo medio se visualizará cuando el objetivo es "a mediados".</description>
             <description xml:lang="zh-CN">选择“全部”将显示全部在线会员，“区分Mid”为显示各模块中的在线会员。</description>
             <description xml:lang="zh-TW">選擇“全部”會顯示全部線上會員，“以 Mid”是顯示各模組中的線上會員。</description>
             <options>
@@ -52,6 +59,7 @@
                 <name xml:lang="ko">전체</name>
                 <name xml:lang="jp">全体</name>
                 <name xml:lang="en">All</name>
+				<name xml:lang="es">Todo</name>
                 <name xml:lang="zh-CN">全部</name>
                 <name xml:lang="zh-TW">全部</name>
             </options>
@@ -60,9 +68,10 @@
                 <name xml:lang="ko">Mid 구분</name>
                 <name xml:lang="jp">Mid区分</name>
                 <name xml:lang="en">By Mid</name>
+				<name xml:lang="es">Por Mid</name>
                 <name xml:lang="zh-CN">区分Mid</name>
                 <name xml:lang="zh-TW">以 Mid</name>
             </options>
         </var>
     </extra_vars>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/widgets/logged_members/skins/default/css/normal.css b/widgets/logged_members/skins/default/css/normal.css
deleted file mode 100644
index 04b6f56b3..000000000
--- a/widgets/logged_members/skins/default/css/normal.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.logged_members { overflow:hidden; }
-.logged_members ul { margin:0; padding:0; overflow:hidden; width:100%;}
-.logged_members ul li { white-space:nowrap; padding:2px; overflow:hidden; color:#54564b;}
diff --git a/widgets/logged_members/skins/default/css/widget.css b/widgets/logged_members/skins/default/css/widget.css
new file mode 100644
index 000000000..31cab6104
--- /dev/null
+++ b/widgets/logged_members/skins/default/css/widget.css
@@ -0,0 +1,12 @@
+@charset "utf-8";
+
+/* widgetUlistA */
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li{ list-style:none;}
+.widgetUlistA li a { text-decoration:none; }
+.widgetUlistA li a{ color:#666;}
+
+.widgetContainer.black .widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetContainer.black .widgetUlistA li{ list-style:none;}
+.widgetContainer.black .widgetUlistA li a { text-decoration:none; }
+.widgetContainer.black .widgetUlistA li a{ color:#999;}
diff --git a/widgets/logged_members/skins/default/images/normal/lineNotice.gif b/widgets/logged_members/skins/default/images/normal/lineNotice.gif
deleted file mode 100644
index dbf2c8220..000000000
Binary files a/widgets/logged_members/skins/default/images/normal/lineNotice.gif and /dev/null differ
diff --git a/widgets/logged_members/skins/default/list.html b/widgets/logged_members/skins/default/list.html
index 9b28f4479..f2a4f9ac5 100644
--- a/widgets/logged_members/skins/default/list.html
+++ b/widgets/logged_members/skins/default/list.html
@@ -1,16 +1,11 @@
-<!--// 설정된 컬러셋의 종류에 따라서 css파일을 import 합니다 -->
-
-<!--@if($colorset=="normal"||!$colorset)-->
-    <!--%import("css/normal.css")-->
-<!--@end-->
-
-<div class="logged_members">
-
-    <ul>
-    <!--@foreach($widget_info->member_list as $key => $val)-->
-        <li>
-            <div class="nick_name member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
-        </li>
-    <!--@end-->
-    </ul>
-</div>
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetUlistA">
+        <!--@foreach($widget_info->member_list as $key => $val)-->
+        <li><a href="#" class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</a></li>
+        <!--@end-->
+    </ul>
+</div>
diff --git a/widgets/logged_members/skins/default/skin.xml b/widgets/logged_members/skins/default/skin.xml
index ddbce85b8..00942fc6a 100644
--- a/widgets/logged_members/skins/default/skin.xml
+++ b/widgets/logged_members/skins/default/skin.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <skin version="0.2">
-    <title xml:lang="ko">그룹회원 출력 위젯 기본 스킨</title>
-    <title xml:lang="jp">グループ会員表示ウィジェットのデフォルトスキン</title>
-    <title xml:lang="en">Basic Skin of Group Member Display Widget</title>
-    <title xml:lang="zh-CN">会员列表默认皮肤</title>
-    <title xml:lang="zh-TW">會員群組預設面板</title>
-    <description xml:lang="ko">그룹회원 출력 위젯의 기본 스킨</description>
-    <description xml:lang="jp">グループ会員表示ウィジェットのデフォルトスキン</description>
-    <description xml:lang="en">Basic skin of group member display widget</description>
-    <description xml:lang="zh-CN">显示特定用户组会员列表的默认皮肤。</description>
-    <description xml:lang="zh-TW">顯示會員群組的預設面板。</description>
+    <title xml:lang="ko">로그인 회원 출력</title>
+    <title xml:lang="jp">로그인 회원 출력</title>
+    <title xml:lang="en">로그인 회원 출력</title>
+    <title xml:lang="es">로그인 회원 출력</title>
+    <title xml:lang="zh-CN">登录会员列表皮肤</title>
+    <title xml:lang="zh-TW">顯示線上會員</title>
+    <description xml:lang="ko">로그인 되어 있는 회원의 목록을 출력하는 위젯입니다.</description>
+    <description xml:lang="jp">로그인 되어 있는 회원의 목록을 출력하는 위젯입니다.</description>
+    <description xml:lang="en">로그인 되어 있는 회원의 목록을 출력하는 위젯입니다.</description>
+	<description xml:lang="es">로그인 되어 있는 회원의 목록을 출력하는 위젯입니다.</description>
+    <description xml:lang="zh-CN">显示已登录会员列表的默认皮肤。</description>
+    <description xml:lang="zh-TW">可顯示並輸出線上會員的控件。</description>
     <version>0.1</version>
     <date>2007-07-30</date>
     <link>http://www.zeroboard.com</link>
@@ -18,17 +20,32 @@
         <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="zh-CN">Zero</name>
         <name xml:lang="zh-TW">Zero</name>
     </author>
 
     <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본 컬러</title>
-            <title xml:lang="jp">デフォルトカラー</title>
-            <title xml:lang="en">Default Color</title>
-            <title xml:lang="zh-CN">默认颜色</title>
-            <title xml:lang="zh-TW">預設顏色</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/login_info/skins/default/css/default.css b/widgets/login_info/skins/default/css/default.css
deleted file mode 100644
index 3879a64e6..000000000
--- a/widgets/login_info/skins/default/css/default.css
+++ /dev/null
@@ -1,57 +0,0 @@
-.default_login { color:#797771;}
-.openid_login { display:none; }
-
-/* login form */
-.default_login form { position:relative; }
-.default_login .form_field { padding:5px 60px 5px 5px; white-space:nowrap; overflow:hidden; height:45px; }
-
-.default_login .form_field .openIDTitle { width:99%; white-space:nowrap; overflow:hidden; background:url("../images/openid_login_bg.gif") no-repeat left top; padding:1px 0 0 18px; margin-bottom:8px; color:#888888; font-weight:bold; }
-.default_login .form_field .openIDTitle input { margin:0; padding:0; height:14px; }
-.default_login .form_field input.input { display:block; width:99%;  background-color: #ffffff;  border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;  padding:2px; height:14px; color:#666666;  margin:2px 0 2px 0;}
-
-.default_login input.submit { width:45px; height:45px; background:url(../images/default/login_btn_submit.gif) no-repeat; border:none; margin:0; cursor:pointer; position:absolute; right:5px; top:5px; }
-
-.default_login form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 4px 7px; }
-.default_login form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
-.default_login form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
-.default_login form p.noneSSL a { color:#BF6801; text-decoration:none; }
-.default_login form p.SSL a { color:#9CAC74; text-decoration:none; }
-
-.default_login p { padding:0; margin:0 0 0 5px; }
-
-.default_login .checkbox  { width:15px; height:15px; margin:-1px 0px 0px -1px; margin-right:2px; }
-.default_login .clear { clear:both; }
-
-.default_login ul.extra_option { margin:5px 0 0 0; padding:0; clear:both; height:40px; }
-.default_login ul.extra_option li { background:url(../images/default/bul_01.gif) no-repeat 7px 3px; padding-left:20px; margin-left:5px; margin-bottom:3px;}
-.default_login ul.extra_option li a {text-decoration:none; color:#666666;}
-
-
-.default_openid_login { display:none; clear:both; height:38px; border:3px solid #D5D8DB; background-color:#FFFFFF; margin:0 0 10px 0; }
-.default_openid_login .openid_user_id { width:110px; _width:100px; background: url(../images/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:16px; line-height:1em; vertical-align:middle; margin-bottom:.5em; color:#666666;}
-
-.default_openid_login .wButtonTypeA { display:block; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;}
-.default_openid_login .wButtonTypeA:hover { text-decoration:none;}
-.default_openid_login .wButtonTypeA img { vertical-align:middle;}
-.default_openid_login .wButtonTypeA input { border:none; cursor:pointer; background:url(../images/default/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px;  vertical-align:middle; }
-.default_openid_login .wButtonTypeA .leftCap { width:2px; height:24px; background:url(../images/default/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0;  position:relative; left:-1px;}
-.default_openid_login .wButtonTypeA .rightCap { width:2px; height:24px; background:url(../images/default/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;}
-.default_openid_login .wButtonTypeA .icon { margin:0 .2em;}
-.default_openid_login .wButtonWrite ul { text-align:center; clear:both; display:block; margin:0; padding:0; }
-.default_openid_login .wButtonWrite li { margin-top:.5em; float:left; margin-left:.3em; list-style:none;}
-
-
-/* logged  info */
-.default_login .loginUser { position:relative; padding:5px; }
-.default_login .loginUser .userNickName { margin-right:50px; white-space:nowrap; overflow:hidden; }
-.default_login .loginUser .logoutButton { position:absolute; right:5px; top:5px; }
-
-.default_login .hr_dot_01 { background:url(../images/default/hr_dot_01.gif) repeat-x; height:2px; overflow:hidden; clear:both; margin:6px; }
-
-.default_login .item { float:left; background:url(../images/default/bul_01.gif) no-repeat 5px 5px; height:16px; padding:3px 0px 0px 20px; margin-left:5px; margin-top:2px; }
-.default_login .item a { color:#666666; text-decoration:none; }
-.default_login .item { font-size:11px; letter-spacing:-1px; margin-right:10px; padding:3px 0px 0px 20px; white-space:nowrap; }
-.default_login .administrative { background:url(../images/default/icon_key.gif) no-repeat left; margin-right:0px; }
-.default_login .administrative a { color:#D80D0F; }
-.default_login .lastlogin { clear:both; padding:5px; white-space:wrap; font-size:8pt; }
-
diff --git a/widgets/login_info/skins/default/css/widget.css b/widgets/login_info/skins/default/css/widget.css
new file mode 100644
index 000000000..b2e03d488
--- /dev/null
+++ b/widgets/login_info/skins/default/css/widget.css
@@ -0,0 +1,55 @@
+@charset "utf-8";
+
+/* widgetLogin */
+.widgetLogin{ font-size:12px;}
+.widgetLogin fieldset{ border:0; margin:0; padding:0;}
+.widgetLogin dl{ margin:0;}
+.widgetLogin dt{ display:none;}
+.widgetLogin dd{ margin:0 0 5px 0;}
+.widgetLogin dd .widgetXeInputText{ width:90%; height:16px;}
+.widgetLogin p{ margin:5px 0;}
+.widgetLogin p .widgetXeInputCheck{ margin-right:5px;}
+.widgetLogin .help{ position:relative; width:100%; overflow:hidden; margin:10px 0 0 0; padding:0;}
+.widgetLogin .help li{ position:relative; left:-5px; padding-left:5px; list-style:none; display:inline; letter-spacing:-1px;}
+
+/* widgetLastLogin */
+.widgetLastLogin{ margin:10px 0; font-size:12px;}
+.widgetLastLogin dt,
+.widgetLastLogin dd{ display:inline; margin:0;}
+.widgetLastLogin dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetMyInfo */
+.widgetMyInfo{ margin:0; padding:0; font-size:12px;}
+.widgetMyInfo:after{ content:""; display:block; clear:both; *zoom:1;}
+.widgetMyInfo li{ margin-bottom:5px; padding:0; text-indent:12px; list-style:none;}
+
+/* widgetLogin */
+.widgetLogin label{ color:#333;}
+.widgetLogin .help a{ color:#333;}
+.widgetLogin .help li{ background:url(../img/white/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetLastLogin dt{ color:#333;}
+.widgetLastLogin dd{ color:#888;}
+.widgetLastLogin a{ color:#333;}
+.widgetLastLogin li{ background:url(../img/white/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetMyInfo li a{ color:#666;}
+.widgetMyInfo li{ background:url(../img/white/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetLogin */
+.widgetContainer.black .widgetLogin label{ color:#999;}
+.widgetContainer.black .widgetLogin .help a{ color:#ccc;}
+.widgetContainer.black .widgetLogin .help li{ background:url(../img/black/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer.black .widgetLastLogin dt{ color:#999;}
+.widgetContainer.black .widgetLastLogin dd{ color:#888;}
+.widgetContainer.black .widgetLastLogin a{ color:#333;}
+.widgetContainer.black .widgetLastLogin li{ background:url(../img/black/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer.black .widgetMyInfo li a{ color:#999;}
+.widgetContainer.black .widgetMyInfo li{ background:url(../img/black/iconMyInfo.gif) no-repeat left 1px;}
+
diff --git a/widgets/login_info/skins/default/filter/login.xml b/widgets/login_info/skins/default/filter/login.xml
index 9ac01dbee..189116eb8 100644
--- a/widgets/login_info/skins/default/filter/login.xml
+++ b/widgets/login_info/skins/default/filter/login.xml
@@ -4,8 +4,5 @@
     <node target="password" required="true" />
   </form>
   <parameter />
-  <response callback_func="completeLogin">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
+  <response />
 </filter>
diff --git a/widgets/login_info/skins/default/filter/openid_login.xml b/widgets/login_info/skins/default/filter/openid_login.xml
index bf0ce028c..9b99b0dc3 100644
--- a/widgets/login_info/skins/default/filter/openid_login.xml
+++ b/widgets/login_info/skins/default/filter/openid_login.xml
@@ -3,8 +3,5 @@
         <node target="openid" required="true" />
     </form>
     <parameter />
-    <response callback_func="completeOpenIDLogin">
-        <tag name="error" />
-        <tag name="message" />
-    </response>
+    <response />
 </filter>
diff --git a/widgets/login_info/skins/default/images/blank.gif b/widgets/login_info/skins/default/images/blank.gif
deleted file mode 100644
index 35d42e808..000000000
Binary files a/widgets/login_info/skins/default/images/blank.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/bul_01.gif b/widgets/login_info/skins/default/images/default/bul_01.gif
deleted file mode 100755
index 8482c5daf..000000000
Binary files a/widgets/login_info/skins/default/images/default/bul_01.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/buttonTypeACenter.gif b/widgets/login_info/skins/default/images/default/buttonTypeACenter.gif
deleted file mode 100644
index 56127ea2e..000000000
Binary files a/widgets/login_info/skins/default/images/default/buttonTypeACenter.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/buttonTypeALeft.gif b/widgets/login_info/skins/default/images/default/buttonTypeALeft.gif
deleted file mode 100644
index 12839fe05..000000000
Binary files a/widgets/login_info/skins/default/images/default/buttonTypeALeft.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/buttonTypeARight.gif b/widgets/login_info/skins/default/images/default/buttonTypeARight.gif
deleted file mode 100644
index 1dd5aac05..000000000
Binary files a/widgets/login_info/skins/default/images/default/buttonTypeARight.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/hr_dot_01.gif b/widgets/login_info/skins/default/images/default/hr_dot_01.gif
deleted file mode 100755
index b0eb453c5..000000000
Binary files a/widgets/login_info/skins/default/images/default/hr_dot_01.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/icon_key.gif b/widgets/login_info/skins/default/images/default/icon_key.gif
deleted file mode 100644
index 8a4cfc342..000000000
Binary files a/widgets/login_info/skins/default/images/default/icon_key.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/icon_last_login.gif b/widgets/login_info/skins/default/images/default/icon_last_login.gif
deleted file mode 100644
index ab9e0a709..000000000
Binary files a/widgets/login_info/skins/default/images/default/icon_last_login.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/login_btn_submit.gif b/widgets/login_info/skins/default/images/default/login_btn_submit.gif
deleted file mode 100755
index 2fcbf2815..000000000
Binary files a/widgets/login_info/skins/default/images/default/login_btn_submit.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/default/logout_btn.gif b/widgets/login_info/skins/default/images/default/logout_btn.gif
deleted file mode 100644
index fb0365084..000000000
Binary files a/widgets/login_info/skins/default/images/default/logout_btn.gif and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/none_ssl.png b/widgets/login_info/skins/default/images/none_ssl.png
deleted file mode 100644
index b7561bfc4..000000000
Binary files a/widgets/login_info/skins/default/images/none_ssl.png and /dev/null differ
diff --git a/widgets/login_info/skins/default/images/ssl.png b/widgets/login_info/skins/default/images/ssl.png
deleted file mode 100644
index 330eb4e67..000000000
Binary files a/widgets/login_info/skins/default/images/ssl.png and /dev/null differ
diff --git a/widgets/login_info/skins/default/img/black/iconMyInfo.gif b/widgets/login_info/skins/default/img/black/iconMyInfo.gif
new file mode 100755
index 000000000..17670aa55
Binary files /dev/null and b/widgets/login_info/skins/default/img/black/iconMyInfo.gif differ
diff --git a/widgets/login_info/skins/default/img/black/lineTextDiv.gif b/widgets/login_info/skins/default/img/black/lineTextDiv.gif
new file mode 100755
index 000000000..a573ed164
Binary files /dev/null and b/widgets/login_info/skins/default/img/black/lineTextDiv.gif differ
diff --git a/widgets/login_info/skins/default/img/white/iconMyInfo.gif b/widgets/login_info/skins/default/img/white/iconMyInfo.gif
new file mode 100755
index 000000000..6f8c1f5bc
Binary files /dev/null and b/widgets/login_info/skins/default/img/white/iconMyInfo.gif differ
diff --git a/widgets/login_info/skins/default/img/white/lineTextDiv.gif b/widgets/login_info/skins/default/img/white/lineTextDiv.gif
new file mode 100755
index 000000000..0fa7654cb
Binary files /dev/null and b/widgets/login_info/skins/default/img/white/lineTextDiv.gif differ
diff --git a/widgets/login_info/skins/default/js/login.js b/widgets/login_info/skins/default/js/login.js
deleted file mode 100644
index 07fd10c65..000000000
--- a/widgets/login_info/skins/default/js/login.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 로그인 영역에 포커스 */
-function doFocusUserId(fo_id) {
-    if(xScrollTop()) return;
-    var fo_obj = xGetElementById(fo_id);
-    if(fo_obj.user_id) {
-        try{
-            fo_obj.user_id.focus();
-        } catch(e) {};
-    }
-}
-
-/* 로그인 후 */
-function completeLogin(ret_obj, response_tags, params, fo_obj) {
-    var url =  current_url.setQuery('act','');
-    location.href = url;
-}
-
-/* 오픈아이디 로그인 후 */
-function completeOpenIDLogin(ret_obj, response_tags) {
-    var redirect_url =  ret_obj['redirect_url'];
-    location.href = redirect_url;
-}
-
-
-/* 오픈 아이디 폼 변환 */
-function toggleLoginForm(obj) {
-    if(xGetElementById('login').style.display != "none") {
-        xGetElementById('login').style.display = "none";
-        xGetElementById('openid_login').style.display = "block";
-        xGetElementById('use_open_id_2').checked = true;
-        xGetElementById('fo_openid_login_widget').user_id.focus();
-    } else {
-        xGetElementById('openid_login').style.display = "none";
-        xGetElementById('login').style.display = "block";
-        xGetElementById('use_open_id').checked = false;
-        xGetElementById('use_open_id_2').checked = false;
-        xGetElementById('fo_login_widget').user_id.focus();
-    }
-}
diff --git a/widgets/login_info/skins/default/login_form.html b/widgets/login_info/skins/default/login_form.html
index b55bbca3e..c0e05a831 100644
--- a/widgets/login_info/skins/default/login_form.html
+++ b/widgets/login_info/skins/default/login_form.html
@@ -1,63 +1,46 @@
-<!--// colorset의 값에 따라 css 파일을 import 한다 -->
-<!--@if($colorset=="default"||!$colorset)-->
-    <!--%import("css/default.css")-->
-<!--@end-->
-
 <!--%import("./filter/login.xml")-->
 <!--%import("./filter/openid_login.xml")-->
-<!--%import("./js/login.js")-->
+
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
 
 <script type="text/javascript">
     var keep_signed_msg = "{$lang->about_keep_signed}";
-    xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+    xAddEventListener(window, "load", function(){ xGetElementById("formLogin").user_id.focus(); });
 </script>
 
-<div class="default_login" id="login">
-    <form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
-
-        <div class="form_field">
-            <input name="user_id" type="text" class="input" id="login_form_user_id" />
-            <input name="password" type="password" class="input" />
-        </div>
-        <input type="submit" value=" " class="submit" />
-
-        <!--@if($member_config->enable_ssl=='Y')-->
-        <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
-            <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
-        </p>
-        <!--@end-->
-
-        <p>
-            <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
-            <label for="keepid">{$lang->keep_signed}</label>
-        </p>
-
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <!--// XE Login -->
+    <form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="formLogin" class="widgetLogin">
+    <fieldset>
+        <dl>
+            <dt><label for="uid">{$lang->user_id} :</label></dt>
+            <dd><input name="user_id" type="text" id="uid" class="widgetXeInputText" title="{$lang->user_id}" /></dd>
+            <dt><label for="upw">{$lang->password} :</label></dt>
+            <dd><input name="password" type="password" id="upw" class="widgetXeInputText" title="{$lang->password}" /></dd>
+        </dl>
+        <p><input name="keep_signed" id="keepid" type="checkbox" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" class="widgetXeInputCheck" /><label for="keepid">{$lang->keep_signed}</label></p>
         <!--@if($member_config->enable_openid=='Y')-->
-        <p>
-            <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
-            <label for="use_open_id">Open ID</label>
-        </p>
+        <p><input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="xGetElementById('formLogin').style.display = 'none';xGetElementById('formOpenID').style.display='block';xGetElementById('formOpenID').openid.focus();return false;" class="inputCheck" /><label for="use_open_id">Open ID</label></p>
         <!--@end-->
-
-        <ul class="extra_option">
+        <span class="button green login"><input name="" type="submit" value="{$lang->cmd_login}" /></span>
+        <ul class="help">
             <li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
             <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
         </ul>
+    </fieldset>
     </form>
-    <div class="clear"></div>
-</div>
 
-<!-- OpenID -->
-<!--@if($member_config->enable_openid=='Y')-->
-<div class="default_login openid_login" id="openid_login">
-    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="fo_openid_login_widget">
-        <div class="form_field">
-            <div class="openIDTitle">
-                OpenID <input name="use_open_id_2" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" checked="checked" />
-            </div>
-            <input type="text" name="openid" class="input" />
-        </div>
-        <input type="submit" value=" " class="submit" />
-  </form>
+    <!--// OpenID Login -->
+    <!--@if($member_config->enable_openid=='Y')-->
+    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="formOpenID" style="display:none;" class="widgetLogin">
+    <dl>
+        <dt><label for="OpenID">OpenID :</label></dt>
+        <dd><input name="openid" type="text" class="inputText" title="openid" /></dd>
+    </dl>
+    <p><input name="use_open_id" id="uopenid" type="checkbox" checked="checked" value="Y" onclick="xGetElementById('formLogin').style.display = 'block';xGetElementById('formOpenID').style.display='none';xGetElementById('formLogin').user_id.focus();return false;" class="inputCheck" /><label for="uopenid">Open ID</label></p>
+    <span class="button green login"><input name="" type="submit" value="{$lang->cmd_login}" /></span>
+    </form>
+    <!--@end-->
 </div>
-<!--@end-->
diff --git a/widgets/login_info/skins/default/login_info.html b/widgets/login_info/skins/default/login_info.html
index d55435861..b34c586a1 100644
--- a/widgets/login_info/skins/default/login_info.html
+++ b/widgets/login_info/skins/default/login_info.html
@@ -1,28 +1,18 @@
-<!--// colorset의 값에 따라 css 파일을 import 한다 -->
-<!--@if(!$colorset)-->
-    {@ $colorset = "default"}
-<!--@end-->
-
-<!--@if($colorset=="default")-->
-    <!--%import("css/default.css")-->
-<!--@end-->
-
-<!--%import("./filter/logout.xml")-->
-<div class="default_login">
-    <div class="loginUser">
-        <div class="userNickName"><div class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</div></div>
-        <a href="{getUrl('act','dispMemberLogout')}" class="logoutButton"><img src="./images/{$colorset}/logout_btn.gif" alt="{$lang->cmd_logout}" /></a>
-    </div>
-
-    <div class="hr_dot_01"></div>
-
-    <!--@foreach($logged_info->menu_list as $key => $val)-->
-    <div class="item"><a href="{getUrl('act',$key,'member_srl','')}">{Context::getLang($val)}</a></div>
-    <!--@end-->
-    <!--@if($logged_info->is_admin=="Y")-->
-    <div class="item administrative"><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></div>
-    <!--@elseif($logged_info->is_site_admin)-->
-    <div class="item administrative"><a href="{getUrl('','module','homepage')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></div>
-    <!--@end-->
-    <div class="lastlogin">{$lang->last_login}<br/>{zDate($logged_info->last_login, "Y-m-d H:i")}</div>
-</div>
+<!--%import("./filter/logout.xml")-->
+
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <dl class="widgetLastLogin">
+        <dt>{$lang->last_login}:</dt>
+        <dd>{zDate($logged_info->last_login, "Y-m-d H:i")}</dd>
+    </dl>
+    <ul class="widgetMyInfo">
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+        <li><a href="{getUrl('act',$key,'member_srl','')}">{Context::getLang($val)}</a></li>
+        <!--@end-->
+    </ul>
+    <span class="button green login"><input type="button" onclick="location.href='{getUrl('act','dispMemberLogout')}';return false;" value="{$lang->cmd_logout}" /></span>
+</div>
diff --git a/widgets/login_info/skins/default/skin.xml b/widgets/login_info/skins/default/skin.xml
index 5d5aae497..85ddd8c9b 100644
--- a/widgets/login_info/skins/default/skin.xml
+++ b/widgets/login_info/skins/default/skin.xml
@@ -23,12 +23,26 @@
     </author>
 
     <colorset>
-        <color name="default">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="zh-TW">預設</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/login_info/skins/xe_official/login_info.html b/widgets/login_info/skins/xe_official/login_info.html
index 3a129ff0d..67eb0ee26 100644
--- a/widgets/login_info/skins/xe_official/login_info.html
+++ b/widgets/login_info/skins/xe_official/login_info.html
@@ -22,13 +22,8 @@
         <li><a href="{getUrl('act',$key,'member_srl','')}">{Context::getLang($val)}</a></li>
         <!--@end-->
 
-        <!--@if($logged_info->is_admin=="Y")-->
+        <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
         <li><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
-        <!--@if($layout_info->layout_srl)-->
-        <li><a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$layout_info->layout_srl)}">{$lang->cmd_layout_management}</a> / <a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$layout_info->layout_srl)}">{$lang->cmd_edit}</a></li>
-        <!--@end-->
-        <!--@elseif($logged_info->is_site_admin)-->
-        <li><a href="{getUrl('','module','homepage')}">{$lang->cmd_management}</a></li>
         <!--@end-->
     </ul>
     <p class="latestLogin">{$lang->last_login}<br /><span>{zDate($logged_info->last_login, "Y-m-d H:i")}</span></p>
diff --git a/widgets/member_group/conf/info.xml b/widgets/member_group/conf/info.xml
index a1fa8d122..9327e6c14 100644
--- a/widgets/member_group/conf/info.xml
+++ b/widgets/member_group/conf/info.xml
@@ -6,7 +6,7 @@
 	<title xml:lang="es">Muestra el grupo de usuario específico</title>
 	<title xml:lang="zh-CN">会员列表</title>
 	<title xml:lang="ru">Отображение членов определенной группы</title>
-	<title xml:lang="zh-TW">會員列表</title>
+	<title xml:lang="zh-TW">特定會員列表</title>
 	<description xml:lang="ko">
 		특정 그룹에 속한 회원의 목록을 출력하는 위젯입니다.
 		아직 테스트용 위젯이며 해당 그룹에 지정된 수 이상의 회원이 있을 경우 최근 가입순서대로 출력이 됩니다.
@@ -56,21 +56,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">최근 게시물의 제목으로 출력됩니다.</description>
-			<description xml:lang="jp">最新コンテンツのタイトルとして表示されます。</description>
-			<description xml:lang="en">It will be displayed as title of newest article.</description>
-			<description xml:lang="es">Esto será mostrado com el título de los documentos recientes.</description>
-			<description xml:lang="zh-CN">显示为会员列表的标题。</description>
-			<description xml:lang="zh-TW">顯示會員列表的標題。</description>
-		</var>
 		<var id="list_count">
 			<type>text</type>
 			<name xml:lang="ko">목록수</name>
@@ -89,7 +74,7 @@
 			<description xml:lang="zh-TW">可設置要顯示的列表數。 (預設是5個)</description>
 		</var>
 		<var id="target_group">
-			<type>text</type>
+			<type>member_group</type>
 			<name xml:lang="ko">대상 회원 그룹</name>
 			<name xml:lang="jp">対象会員グループ</name>
 			<name xml:lang="en">Target Member Group</name>
@@ -106,4 +91,4 @@
 			<description xml:lang="zh-TW">要顯示的目標模組名稱以，(逗號)做區隔。</description>
 		</var>
 	</extra_vars>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/widgets/member_group/member_group.class.php b/widgets/member_group/member_group.class.php
index ec925ab1b..c1ae2cfb0 100644
--- a/widgets/member_group/member_group.class.php
+++ b/widgets/member_group/member_group.class.php
@@ -15,7 +15,6 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
-
             // 위젯 자체적으로 설정한 변수들을 체크
             $title = $args->title;
             $list_count = (int)$args->list_count;
@@ -27,29 +26,21 @@
                 $group_name = trim($tmp_groups[$i]);
                 if(!$group_name) continue;
                 $target_group[] = $group_name;
-
             }
 
-            if(count($target_group)) {
-
-                // 그룹 목록을 구해옴
+            if(!count($target_group)) {
+                $site_module_info = Context::get('site_module_info');
                 $oMemberModel = &getModel('member');
-                $group_list = $oMemberModel->getGroups();
-
-                foreach($group_list as $group_srl => $val) {
-                    if(!in_array($val->title, $target_group)) continue;
-                    $target_group_srl_list[] = $group_srl;
-                }
-
-                // 해당 그룹의 멤버를 구해옴
-                if(count($target_group_srl_list)) {
-                    $obj->selected_group_srl = implode(',',$target_group_srl_list);
-                    $obj->list_count = $list_count;
-                    $output = executeQuery('member.getMemberListWithinGroup', $obj);
-                    $widget_info->member_list = $output->data;
-                }
+                $group_list = $oMemberModel->getGroups((int)$site_module_info->site_srl);
+                if(!$group_list) return;
+                $target_group = array_keys($group_list);
             }
 
+            $obj->selected_group_srl = implode(',',$target_group);
+            $obj->list_count = $list_count;
+            $output = executeQuery('member.getMemberListWithinGroup', $obj);
+            $widget_info->member_list = $output->data;
+
             $widget_info->title = $title;
             Context::set('widget_info', $widget_info);
 
diff --git a/widgets/member_group/skins/default/css/normal.css b/widgets/member_group/skins/default/css/normal.css
deleted file mode 100644
index 5e5f3d3c0..000000000
--- a/widgets/member_group/skins/default/css/normal.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.mg { padding-bottom:15px; overflow:hidden; position:relative;}
-.mg h2 { font-size:1em; display:block; height:21px; padding:9px 0 0 9px; margin-bottom:4px; color:#000000; background:url(../images/normal/lineNotice.gif) no-repeat left bottom;}
-.mg ul { margin:0; padding:0; overflow:hidden; width:100%;}
-.mg ul li { white-space:nowrap; padding:3px 0 3px 10px; overflow:hidden; border-bottom:1px dashed #EEEEEE; color:#54564b;}
diff --git a/widgets/member_group/skins/default/css/widget.css b/widgets/member_group/skins/default/css/widget.css
new file mode 100644
index 000000000..fcb8e2737
--- /dev/null
+++ b/widgets/member_group/skins/default/css/widget.css
@@ -0,0 +1,10 @@
+@charset "utf-8";
+
+/* widgetUlistA */
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li{ list-style:none;}
+.widgetUlistA li a{ color:#666; text-decoration:none;}
+
+.widgetContainer.black .widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetContainer.black .widgetUlistA li{ list-style:none;}
+.widgetContainer.black .widgetUlistA li a{ color:#999; text-decoration:none;}
diff --git a/widgets/member_group/skins/default/images/normal/bulletD0.gif b/widgets/member_group/skins/default/images/normal/bulletD0.gif
deleted file mode 100644
index e8e17d4c6..000000000
Binary files a/widgets/member_group/skins/default/images/normal/bulletD0.gif and /dev/null differ
diff --git a/widgets/member_group/skins/default/images/normal/lineNotice.gif b/widgets/member_group/skins/default/images/normal/lineNotice.gif
deleted file mode 100644
index dbf2c8220..000000000
Binary files a/widgets/member_group/skins/default/images/normal/lineNotice.gif and /dev/null differ
diff --git a/widgets/member_group/skins/default/list.html b/widgets/member_group/skins/default/list.html
index 03b2a38b5..132f40378 100644
--- a/widgets/member_group/skins/default/list.html
+++ b/widgets/member_group/skins/default/list.html
@@ -1,20 +1,12 @@
-<!--// 설정된 컬러셋의 종류에 따라서 css파일을 import 합니다 -->
-
-<!--@if($colorset=="normal"||!$colorset)-->
-    <!--%import("css/normal.css")-->
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
 <!--@end-->
 
-<div class="mg">
-
-    <!--@if($widget_info->title)-->
-    <h2>{$widget_info->title}</h2>
-    <!--@end-->
-
-    <ul>
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetUlistA">
     <!--@foreach($widget_info->member_list as $key => $val)-->
-        <li>
-            <div class="nick_name member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
-        </li>
+        <li><a href="#" onclick="return false;" class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</a></li>
     <!--@end-->
     </ul>
+
 </div>
diff --git a/widgets/member_group/skins/default/skin.xml b/widgets/member_group/skins/default/skin.xml
index 59f425742..b890bb72a 100644
--- a/widgets/member_group/skins/default/skin.xml
+++ b/widgets/member_group/skins/default/skin.xml
@@ -10,8 +10,8 @@
     <description xml:lang="en">Basic skin of group member display widget</description>
     <description xml:lang="zh-CN">显示特定用户组会员列表的默认皮肤。</description>
     <description xml:lang="zh-TW">顯示特定用戶組會員列表的預設面板。</description>
-    <version>0.1</version>
-    <date>2007-07-30</date>
+    <version>0.2</version>
+    <date>2009-02-18</date>
     <link>http://www.zeroboard.com</link>
 
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
@@ -21,14 +21,27 @@
         <name xml:lang="zh-CN">Zero</name>
         <name xml:lang="zh-TW">Zero</name>
     </author>
-
     <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본 컬러</title>
-            <title xml:lang="jp">デフォルトカラー</title>
-            <title xml:lang="en">Default Color</title>
-            <title xml:lang="zh-CN">默认颜色</title>
-            <title xml:lang="zh-TW">預設顏色</title>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/navigator/conf/info.xml b/widgets/navigator/conf/info.xml
new file mode 100644
index 000000000..753cbf6bf
--- /dev/null
+++ b/widgets/navigator/conf/info.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">메뉴 출력기</title>
+    <title xml:lang="zh-CN">菜单显示器</title>
+    <title xml:lang="zh-TW">導覽列</title>
+    <description xml:lang="ko">메뉴 모듈에서 생성된 메뉴를 출력하는 위젯입니다.</description>
+    <description xml:lang="zh-CN">此控件可以在任意位置显示菜单模块中的菜单。</description>
+    <description xml:lang="zh-TW">메뉴 모듈에서 생성된 메뉴를 출력하는 위젯입니다.</description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+        <name xml:lang="zh-CN">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <extra_vars>
+        <var id="menu_srl">
+            <type>menu</type>
+            <name xml:lang="ko">메뉴</name>
+            <name xml:lang="zh-CN">菜单</name>
+            <name xml:lang="zh-TW">選單</name>
+            <description xml:lang="ko">선택하신 메뉴를 출력합니다. 선택하지 않으면 호출된 레이아웃의 첫번째 메뉴를 자동으로 지정합니다.</description>
+            <description xml:lang="zh-CN">请选择要显示的菜单。</description>
+            <description xml:lang="zh-TW">선택하신 메뉴를 출력합니다. 선택하지 않으면 호출된 레이아웃의 첫번째 메뉴를 자동으로 지정합니다.</description>
+        </var>
+        <var id="start_depth">
+            <type>select</type>
+            <name xml:lang="ko">시작 깊이</name>
+            <name xml:lang="zh-CN">开始深度</name>
+            <name xml:lang="zh-TW">階層數</name>
+            <description xml:lang="ko">출력될 메뉴의 시작 깊이(depth)를 지정할 수 있습니다. 1이 최상단이고 2부터는 선택된 상위 메뉴가 있으면 출력하게 됩니다</description>
+            <options>
+                <value>1</value>
+                <name xml:lang="ko">1 depth</name>
+                <name xml:lang="zh-CN">1 depth</name>
+                <name xml:lang="zh-TW">1 depth</name>
+            </options>
+            <options>
+                <value>2</value>
+                <name xml:lang="ko">2 depth</name>
+                <name xml:lang="zh-CN">2 depth</name>
+                <name xml:lang="zh-TW">2 depth</name>
+            </options>
+
+        </var>
+    </extra_vars>
+</widget>
diff --git a/widgets/navigator/navigator.class.php b/widgets/navigator/navigator.class.php
new file mode 100644
index 000000000..08e6cd859
--- /dev/null
+++ b/widgets/navigator/navigator.class.php
@@ -0,0 +1,139 @@
+<?php
+    /**
+     * @class navigator 
+     * @author zero (zero@nzeo.com)
+     * @brief 메뉴 출력기
+     * @version 0.1
+     **/
+
+    class navigator extends WidgetHandler {
+
+        /**
+         * @brief 위젯의 실행 부분
+         *
+         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
+         * 결과를 만든후 print가 아니라 return 해주어야 한다
+         **/
+        function proc($args) {
+            $oModuleModel = &getModel('module');
+
+            // $args->menu_srl이 지정되어 있으면 해당 메뉴로, 그렇지 않다면 현재 레이아웃의 메뉴를 구함
+            if(!$args->menu_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $args->layout_srl = $current_module_info->layout_srl;
+
+                $oLayoutModel = &getModel('layout');
+                $layout_info = $oLayoutModel->getLayout($current_module_info->layout_srl);
+                if(!$layout_info) return;
+
+                if($layout_info->extra_var_count) {
+                    foreach($layout_info->extra_var as $var_id => $val) {
+                        $layout_info->{$var_id} = $val->value;
+                    }
+                    if(!$layout_info->menu_count) return;
+
+                    // 레이아웃 정보중 menu를 Context::set
+                    foreach($layout_info->menu as $menu_id => $menu) {
+                        if(file_exists($menu->php_file)) {
+                            $args->menu_srl = $menu->menu_srl;
+                            @include($menu->php_file);
+                        }
+                        break;
+                    }
+                } else return;
+            } else {
+                $php_file = sprintf('%sfiles/cache/menu/%d.php', _XE_PATH_, $args->menu_srl);
+                @include($php_file);
+            }
+            if(!$menu) return;
+
+            // 시작 depth가 2이상, 즉 상위 메뉴 선택 이후 하위 메뉴 출력시 처리
+            if($args->start_depth == 2 && count($menu->list)) {
+                $t_menu = null;
+                foreach($menu->list as $key => $val) {
+                    if($val['selected']) {
+                        $t_menu->list = $val['list'];
+                        break;
+                    }
+                }
+                $menu = $t_menu;
+            }
+
+            $widget_info->menu = $menu->list;
+
+            $this->_arrangeMenu($arranged_list, $menu->list, 0);
+            $widget_info->arranged_menu = $arranged_list;
+
+            // men XML 파일
+            $widget_info->xml_file = sprintf('%sfiles/cache/menu/%d.xml.php',getUrl(''), $args->menu_srl);
+            $widget_info->menu_srl = $args->menu_srl;
+
+            if($this->selected_node_srl) $widget_info->selected_node_srl = $this->selected_node_srl;
+            Context::set('widget_info', $widget_info);
+
+            // 템플릿 컴파일
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            $tpl_file = 'navigator';
+
+            Context::set('colorset', $args->colorset);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief 메뉴를 1차원 배열로 변경
+         **/
+        function _arrangeMenu(&$menu, $list, $depth) {
+            if(!count($list)) return;
+            $idx = 0;
+            $list_order = array();
+            foreach($list as $key => $val) {
+                if(!$val['text']) continue;
+                $obj = null;
+                $obj->href = $val['href'];
+                $obj->url = $val['url'];
+                $obj->node_srl = $val['node_srl'];
+                $obj->parent_srl = $val['parent_srl'];
+                $obj->title = $obj->text = $val['text'];
+                $obj->expand = $val['expand']=='Y'?true:false;
+                $obj->depth = $depth;
+                $obj->selected = $val['selected'];
+                $obj->child_count = 0;
+                $obj->childs = array();
+
+                if(Context::get('mid') == $obj->url){
+                    $selected = true;
+                    $this->selected_node_srl = $obj->node_srl;
+                    $obj->selected = true;
+                }else{
+                    $selected = false;
+                }
+
+                $list_order[$idx++] = $obj->node_srl;
+
+                // 부모 카테고리가 있으면 자식노드들의 데이터를 적용
+                if($obj->parent_srl) {
+
+                    $parent_srl = $obj->parent_srl;
+                    $expand = $obj->expand;
+                    if($selected) $expand = true;
+
+                    while($parent_srl) {
+                        $menu[$parent_srl]->childs[] = $obj->node_srl;
+                        $menu[$parent_srl]->child_count = count($menu[$parent_srl]->childs);
+                        if($expand) $menu[$parent_srl]->expand = $expand;
+
+                        $parent_srl = $menu[$parent_srl]->parent_srl;
+                    }
+                }
+
+                $menu[$key] = $obj;
+
+                if(count($val['list'])) $this->_arrangeMenu($menu, $val['list'], $depth+1);
+            }
+            $menu[$list_order[0]]->first = true;
+            $menu[$list_order[count($list_order)-1]]->last = true;
+        }
+    }
+?>
diff --git a/widgets/navigator/skins/horiNavigator/css/widget.css b/widgets/navigator/skins/horiNavigator/css/widget.css
new file mode 100755
index 000000000..16ad21c87
--- /dev/null
+++ b/widgets/navigator/skins/horiNavigator/css/widget.css
@@ -0,0 +1,102 @@
+.widgetNavC{ margin:0; padding:0; font-size:12px; line-height:1.2; background-repeat:repeat-x;background-position:0 0;}
+.widgetNavC ul{ margin:0; padding:0; height:35px;}
+.widgetNavC ul li ul{ display:none; position:absolute; top:40px; left:20px; height:auto; padding-bottom:7px; background:#35ad06; border:1px solid #027a00;}
+.widgetNavC ul li { margin:0 !important; }
+.widgetNavC ul li.active ul{ display:block;}
+.widgetNavC ul.aCenter{ margin-left:auto; margin-right:auto;}
+.widgetNavC ul.aLeft{ margin-right:auto;}
+.widgetNavC ul.aRight{ margin-left:auto;}
+.widgetNavC li{ position:relative; padding-right:3px; float:left; list-style:none; background-repeat:no-repeat;background-position:right -40px; white-space:nowrap;}
+.widgetNavC li a{ position:relative; float:left; padding:12px 22px 0 25px; height:23px; color:#fff !important; text-decoration:none !important;}
+.widgetNavC li.first a{ background-repeat:no-repeat;background-position:left -40px;}
+.widgetNavC li.active{ margin-left:-2px; background-repeat:no-repeat;background-position:right -80px;}
+.widgetNavC li.active a{ font-weight:bold; color:#ff0 !important; background-repeat:no-repeat; background-position:left -80px;}
+.widgetNavC li.active li{ padding:2px 15px; float:none; background:none;}
+.widgetNavC li.active li.active{ margin:0;}
+.widgetNavC li.active li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
+.widgetNavC li.active li a{ display:block; _display:inline-block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none;}
+.widgetNavC li.active li.active a{ color:#ff0 !important;}
+.widgetNavC li.active li a:hover,
+.widgetNavC li.active li a:active,
+.widgetNavC li.active li a:focus{ text-decoration:underline !important;}
+
+ul.widgetNavSub { display:block; height:auto; border:1px solid; padding-bottom:7px; background:#35ad06; background-image:none !important; padding:0; margin:0;}
+ul.widgetNavSub li { list-style:none; }
+ul.widgetNavSub li a{ display:block; padding:5px 10px 5px 10px; color:#fff; text-decoration:none !important; white-space:nowrap;}
+ul.widgetNavSub li a:hover,
+ul.widgetNavSub li a:active,
+ul.widgetNavSub li a:focus{ text-decoration:underline !important;}
+ul.widgetNavSub li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
+
+/* widgetNavCgreen */
+.widgetNavCgreen{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetNavCgreen ul li ul{ background:#35ad06; border-color:#027a00;}
+.widgetNavCgreen li{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetNavCgreen li.first a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetNavCgreen li.active{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetNavCgreen li.active a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetNavCgreen li.active li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
+ul.widgetNavSub.green { background:#35ad06; border-color:#027a00;}
+ul.widgetNavSub.green { background-image:url(../img/white/bgMenuCgreen.gif);}
+ul.widgetNavSub.green li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
+
+/* widgetNavCblue */
+.widgetNavCblue{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetNavCblue ul li ul{ background:#0688ad; border-color:#00557a;}
+.widgetNavCblue li{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetNavCblue li.first a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetNavCblue li.active{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetNavCblue li.active a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetNavCblue li.active li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
+ul.widgetNavSub.blue { background:#0688ad; border-color:#00557a;}
+ul.widgetNavSub.blue { background-image:url(../img/white/bgMenuCblue.gif);}
+ul.widgetNavSub.blue li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
+
+/* widgetNavCcyan */
+.widgetNavCcyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetNavCcyan ul li ul{ background:#06a4ad; border-color:#00717a;}
+.widgetNavCcyan li{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetNavCcyan li.first a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetNavCcyan li.active{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetNavCcyan li.active a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetNavCcyan li.active li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
+ul.widgetNavSub.cyan { background:#06a4ad; border-color:#00717a;}
+ul.widgetNavSub.cyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
+ul.widgetNavSub.cyan li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
+
+/* widgetNavCorange */
+.widgetNavCorange{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetNavCorange ul li ul{ background:#ad9906; border-color:#7a6600;}
+.widgetNavCorange li{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetNavCorange li.first a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetNavCorange li.active{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetNavCorange li.active a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetNavCorange li.active li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
+ul.widgetNavSub.orange { background:#ad9906;  border-color:#7a6600;}
+ul.widgetNavSub.orange{ background-image:url(../img/white/bgMenuCorange.gif);}
+ul.widgetNavSub.orange li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
+
+/* widgetNavCred */
+.widgetNavCred{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetNavCred ul li ul{ background:#ad4606; border-color:#7a1300;}
+.widgetNavCred li{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetNavCred li.first a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetNavCred li.active{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetNavCred li.active a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetNavCred li.active li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
+ul.widgetNavSub.red { background:#ad4606; border-color:#7a1300;}
+ul.widgetNavSub.red {background-image:url(../img/white/bgMenuCred.gif);}
+ul.widgetNavSub.red li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
+
+/* widgetNavCgray */
+.widgetNavCgray{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetNavCgray ul li ul{ background:#595959; border-color:#7a1300;}
+.widgetNavCgray li{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetNavCgray li.first a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetNavCgray li.active{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetNavCgray li.active a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetNavCgray li.active li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
+ul.widgetNavSub.gray { background:#595959; border-color:#555;}
+ul.widgetNavSub.gray{ background-image:url(../img/white/bgMenuCgray.gif);}
+ul.widgetNavSub.gray li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
+
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuB.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuB.gif
new file mode 100755
index 000000000..c5467bb7c
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuB.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCblue.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCblue.gif
new file mode 100755
index 000000000..e526ab1bb
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCblue.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCcyan.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCcyan.gif
new file mode 100755
index 000000000..d0b527151
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCcyan.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgray.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgray.gif
new file mode 100755
index 000000000..295acf099
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgray.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgreen.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgreen.gif
new file mode 100755
index 000000000..ba70c4046
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCgreen.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCorange.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCorange.gif
new file mode 100755
index 000000000..f1d37bbf9
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCorange.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCred.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCred.gif
new file mode 100755
index 000000000..e94beeb7e
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowMenuCred.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/arrowUlistB.gif b/widgets/navigator/skins/horiNavigator/img/white/arrowUlistB.gif
new file mode 100755
index 000000000..c5622a7cc
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/arrowUlistB.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCblue.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCblue.gif
new file mode 100755
index 000000000..218f0b3f7
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCblue.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCcyan.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCcyan.gif
new file mode 100755
index 000000000..666c8b08c
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCcyan.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgray.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgray.gif
new file mode 100755
index 000000000..56981ced0
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgray.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgreen.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgreen.gif
new file mode 100755
index 000000000..2c4a20c83
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCgreen.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCorange.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCorange.gif
new file mode 100755
index 000000000..c3ebf218b
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCorange.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/img/white/bgMenuCred.gif b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCred.gif
new file mode 100755
index 000000000..7e382e330
Binary files /dev/null and b/widgets/navigator/skins/horiNavigator/img/white/bgMenuCred.gif differ
diff --git a/widgets/navigator/skins/horiNavigator/js/navigator.js b/widgets/navigator/skins/horiNavigator/js/navigator.js
new file mode 100755
index 000000000..11e6da542
--- /dev/null
+++ b/widgets/navigator/skins/horiNavigator/js/navigator.js
@@ -0,0 +1,150 @@
+function WidgetNavigator(menu_srl){
+    var self = this;
+    self.menu_srl = menu_srl;
+
+    // 1depth 메뉴를 먼저
+    jQuery(function(){
+        jQuery('ul.widget_navigator_'+menu_srl+' > li')
+            .mouseover(
+                function(e){
+                    jQuery(this).parent().children('li').removeClass('active');
+                    jQuery(this).addClass('active');
+
+                    var node_srl = jQuery(this).attr('node_srl');
+                    if(self.menu_srl && node_srl && widget_navigator && widget_navigator[self.menu_srl]){
+
+                        jQuery('ul[node_srl='+node_srl+']').remove();
+                        var wn = widget_navigator[self.menu_srl].drawMenu(node_srl);
+                        if(wn) wn.appendTo(jQuery('html>body'));
+
+                    }
+                }
+            ).mouseout(
+                function(e){
+                    var node_srl = jQuery(this).attr('node_srl');
+
+                    if(jQuery(e.relatedTarget).is("ul[node_srl='"+node_srl+"']") || jQuery(e.relatedTarget).parents("ul[node_srl='"+node_srl+"']").size()>0){
+                        return false;
+                    }
+                    jQuery('ul[node_srl='+node_srl+']').hide();
+                    jQuery(this).parent().children('li.active').removeClass('active');
+                    jQuery(this).parent().children('li._active').addClass('active');
+
+                }
+        );
+
+    });
+}
+
+
+WidgetNavigator.prototype.drawMenu = function(parent_srl){
+    var self = this;
+    var c = this.getMenu(parent_srl);
+
+    // 하위메뉴가 없다
+    if(c.size()==0) return '';
+
+    var depth = this.getDepth(parent_srl);
+
+    // 하위 메뉴를 만든다
+    var h = jQuery('<ul class="widgetNavSub '+hrMenuColorset+'" node_srl="'+parent_srl+'">')
+
+            .css({ position:'absolute' })
+
+            .mouseover(function(){
+
+                jQuery('li.[node_srl='+parent_srl+']').parent().show();
+                jQuery(this).show();
+
+            })
+            .mouseout(function(){
+//                jQuery(this).hide();
+            });
+
+    // 1차메뉴
+    if(depth <1){
+        var parent_offset = jQuery('li.node_'+parent_srl).offset();
+        h.css({
+                top : parent_offset.top + jQuery('li.node_'+parent_srl).height()-2,
+                left : parent_offset.left
+             })
+
+    // 2차메뉴
+    }else{
+        h.css({
+                left: 40
+             });
+    }
+
+    h.mouseout(function(e){
+        var node_srl = jQuery(this).attr('node_srl');
+        if(jQuery(e.relatedTarget).is("ul[node_srl='"+node_srl+"']") || jQuery(e.relatedTarget).parents("ul[node_srl='"+node_srl+"']").size()>0){
+            return false;
+        }else{
+            jQuery(this).hide();
+        }
+    });
+
+
+    c.each(function(i){
+        var t = jQuery(this);
+
+        var m = t.attr('text');
+        if(m){
+            var u ='#';
+            if(t.attr('url')){
+                if(/^http\:\/\//.test(t.attr('url'))){
+                    u = t.attr('url');
+                }else{
+                    u = request_uri.setQuery('mid',t.attr('url'));
+                }
+            }
+            m = '<a href="' + u + '"'+(t.attr('open_window')=='Y'?' target="blank"':'')+'>'+m+'</a>';
+
+
+            jQuery('<li class="node_'+ t.attr('node_srl') +( i==0?'  ':'')+'" node_srl="'+ t.attr('node_srl')+'">')
+                .html(m)
+                .mouseover(function(){
+                    jQuery(this).toggleClass('active','');
+                    var node_srl = jQuery(this).attr('node_srl');
+
+                    if(self.menu_srl && node_srl && widget_navigator && widget_navigator[self.menu_srl]){
+                        if(jQuery('ul[node_srl='+node_srl+']').size() ==0){
+                            var wn = widget_navigator[self.menu_srl].drawMenu(node_srl);
+    //                        if(wn) wn.appendTo(jQuery('li[node_srl='+node_srl+']'));
+                        }else{
+                            jQuery('ul[node_srl='+node_srl+']').show();
+                        }
+                    }
+                })
+                .mouseout(function(){
+                    var node_srl = jQuery(this).attr('node_srl');
+                    jQuery('ul[node_srl='+node_srl+']').hide();
+                })
+                .appendTo(h);
+        }
+    });
+
+
+    return h;
+}
+
+
+WidgetNavigator.prototype.load = function(xml){
+    this.xml = xml;
+    var self = this;
+    jQuery.get(xml,{},function(data){
+        // for ie
+        self.data = jQuery(data.replace(/\<(\/|)node/g,'<$1span').replace(/\<(\/|)root/g,'<$1div'));
+    },'text');
+}
+
+WidgetNavigator.prototype.getMenu = function(parent_srl){
+    var m = this.data;
+    return m.find("[parent_srl="+parent_srl+"]");
+}
+
+WidgetNavigator.prototype.getDepth = function(node_srl){
+    var m = this.data.find('span[node_srl='+node_srl+']');
+    return m.parents("span").size();
+}
\ No newline at end of file
diff --git a/widgets/navigator/skins/horiNavigator/navigator.html b/widgets/navigator/skins/horiNavigator/navigator.html
new file mode 100755
index 000000000..c37e5c129
--- /dev/null
+++ b/widgets/navigator/skins/horiNavigator/navigator.html
@@ -0,0 +1,22 @@
+<!--%import("./js/navigator.js")-->
+<!--%import("./css/widget.css")-->
+
+<script type="text/javascript">
+if(typeof(widget_navigator) != 'Object') var widget_navigator={};
+var hrMenuColorset = "{$colorset}";
+widget_navigator[{$widget_info->menu_srl}] = new WidgetNavigator({$widget_info->menu_srl});
+widget_navigator[{$widget_info->menu_srl}].load('{$widget_info->xml_file}');
+</script>
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetNavC widgetNavC{$colorset}">
+        <ul class="widget_navigator_{$widget_info->menu_srl} navigator"  menu_srl='{$widget_info->menu_srl}'>
+        <!--@foreach($widget_info->arranged_menu as $key => $val)-->
+            <!--@if($val->text && $val->depth == 0)-->
+            <li class="node_{$val->node_srl} <!--@if($val->first)-->first<!--@end--> {$_first} <!--@if($val->selected)-->active<!--@end-->" node_srl='{$val->node_srl}' ><a href="{$val->href}"<!--@if($val->open_window=='Y')--> target="_black"<!--@end-->>{$val->text}</a>
+            </li>
+            <!--@end-->
+        <!--@end-->
+        </ul>
+    </div>
+</div>
diff --git a/widgets/navigator/skins/horiNavigator/skin.xml b/widgets/navigator/skins/horiNavigator/skin.xml
new file mode 100755
index 000000000..4d027c54f
--- /dev/null
+++ b/widgets/navigator/skins/horiNavigator/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">가로 메뉴 출력</title>
+    <description xml:lang="ko">
+        지정된 메뉴 정보를 가로 출력하는 기본 위젯입니다.
+        DHTML 기능을 사용으로 하시면 메뉴에 마우스 오버시 하부 메뉴가 나타나게 됩니다.
+    </description>
+    <version>0.1</version>
+    <date>2009-02-19</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+    </author>
+
+    <colorset>
+        <color name="gray">
+            <title xml:lang="ko">회색</title>
+        </color>
+        <color name="green">
+            <title xml:lang="ko">초록색</title>
+        </color>
+        <color name="blue">
+            <title xml:lang="ko">파란색</title>
+        </color>
+        <color name="cyan">
+            <title xml:lang="ko">청록색</title>
+        </color>
+        <color name="orange">
+            <title xml:lang="ko">오렌지색</title>
+        </color>
+        <color name="red">
+            <title xml:lang="ko">빨간색</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/navigator/skins/tree/css/widget.css b/widgets/navigator/skins/tree/css/widget.css
new file mode 100644
index 000000000..73892282f
--- /dev/null
+++ b/widgets/navigator/skins/tree/css/widget.css
@@ -0,0 +1,64 @@
+@charset "utf-8";
+
+/* Widget Tree */
+.widgetTree { margin-top:10px;}
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a {text-decoration:none; }
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetTree{ color:#333;}
+.widgetTree a{ color:#333;}
+
+/* Widget Tree */
+.widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree { margin-top:10px;}
+.widgetContainer.black .widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetContainer.black .widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
+.widgetContainer.black .widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetContainer.black .widgetTree ul li a,
+.widgetContainer.black .widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetContainer.black .widgetTree ul li a {text-decoration:none; }
+.widgetContainer.black .widgetTree ul li a.selected {font-weight:bold;}
+.widgetContainer.black .widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetContainer.black .widgetTree ul li ul li{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetContainer.black .widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a { color:#999;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
diff --git a/widgets/navigator/skins/tree/img/black/buttonTreeCollapse.gif b/widgets/navigator/skins/tree/img/black/buttonTreeCollapse.gif
new file mode 100755
index 000000000..aa5493904
Binary files /dev/null and b/widgets/navigator/skins/tree/img/black/buttonTreeCollapse.gif differ
diff --git a/widgets/navigator/skins/tree/img/black/lineTreeHr.gif b/widgets/navigator/skins/tree/img/black/lineTreeHr.gif
new file mode 100755
index 000000000..995f620d1
Binary files /dev/null and b/widgets/navigator/skins/tree/img/black/lineTreeHr.gif differ
diff --git a/widgets/navigator/skins/tree/img/black/lineTreeLastHr.gif b/widgets/navigator/skins/tree/img/black/lineTreeLastHr.gif
new file mode 100755
index 000000000..96c8d09ae
Binary files /dev/null and b/widgets/navigator/skins/tree/img/black/lineTreeLastHr.gif differ
diff --git a/widgets/navigator/skins/tree/img/black/lineTreeVr.gif b/widgets/navigator/skins/tree/img/black/lineTreeVr.gif
new file mode 100755
index 000000000..031c4bb42
Binary files /dev/null and b/widgets/navigator/skins/tree/img/black/lineTreeVr.gif differ
diff --git a/widgets/navigator/skins/tree/img/white/buttonTreeCollapse.gif b/widgets/navigator/skins/tree/img/white/buttonTreeCollapse.gif
new file mode 100755
index 000000000..aa5493904
Binary files /dev/null and b/widgets/navigator/skins/tree/img/white/buttonTreeCollapse.gif differ
diff --git a/widgets/navigator/skins/tree/img/white/lineTreeHr.gif b/widgets/navigator/skins/tree/img/white/lineTreeHr.gif
new file mode 100755
index 000000000..2af04408c
Binary files /dev/null and b/widgets/navigator/skins/tree/img/white/lineTreeHr.gif differ
diff --git a/widgets/navigator/skins/tree/img/white/lineTreeLastHr.gif b/widgets/navigator/skins/tree/img/white/lineTreeLastHr.gif
new file mode 100755
index 000000000..e099787b2
Binary files /dev/null and b/widgets/navigator/skins/tree/img/white/lineTreeLastHr.gif differ
diff --git a/widgets/navigator/skins/tree/img/white/lineTreeVr.gif b/widgets/navigator/skins/tree/img/white/lineTreeVr.gif
new file mode 100755
index 000000000..3b9d1c444
Binary files /dev/null and b/widgets/navigator/skins/tree/img/white/lineTreeVr.gif differ
diff --git a/widgets/navigator/skins/tree/js/navigator.js b/widgets/navigator/skins/tree/js/navigator.js
new file mode 100644
index 000000000..56a611276
--- /dev/null
+++ b/widgets/navigator/skins/tree/js/navigator.js
@@ -0,0 +1,22 @@
+function toggleMenu(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+    if(obj.nodeName != 'BUTTON') return;
+
+    var node_srl = obj.className.replace(/^menu_/,'');
+    if(!node_srl) return;
+
+    var li_obj = xGetElementById("menu_parent_"+node_srl);
+    if(!li_obj) return;
+    var className = li_obj.className;
+
+    if(/nav_tree_off/.test(className)) {
+        xInnerHtml(obj,'-');
+        li_obj.className = className.replace(/nav_tree_off/,'nav_tree_on');
+    } else {
+        xInnerHtml(obj,'+');
+        li_obj.className = className.replace(/nav_tree_on/,'nav_tree_off');
+    }
+}
+
+xAddEventListener(document, 'click', toggleMenu);
diff --git a/widgets/navigator/skins/tree/navigator.html b/widgets/navigator/skins/tree/navigator.html
new file mode 100644
index 000000000..94ddb745b
--- /dev/null
+++ b/widgets/navigator/skins/tree/navigator.html
@@ -0,0 +1,43 @@
+<!--%import("./js/navigator.js")-->
+
+{@ $_pDepth = 0;}
+
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetTree">
+        <ul>
+    <!--@foreach($widget_info->arranged_menu as $key => $val)-->
+        <!--@if($val->text)-->
+
+            <!--@if($_pDepth > $val->depth)-->
+                <!--@for($i=$val->depth; $i<$_pDepth; $i++)-->
+                </li>
+            </ul>
+                <!--@end-->
+                {@ $_pDepth = $val->depth}
+            <!--@end-->
+
+                <li class="<!--@if($val->last)-->nav_tree_last<!--@end--> <!--@if($val->expand)-->nav_tree_on<!--@else-->nav_tree_off<!--@end-->" id="menu_parent_{$val->node_srl}">
+                    <!--@if($val->child_count)-->
+                        <!--@if($val->expand)-->
+                            <button type="button" class="menu_{$val->node_srl}">+</button>
+                        <!--@else-->
+                            <button type="button" class="menu_{$val->node_srl}">-</button>
+                        <!--@end-->
+                    <!--@end-->
+                    <a href="{$val->href}" class="nav_tree_label <!--@if($val->selected)-->selected<!--@end-->">{$val->text}</a> 
+
+                <!--@if($val->child_count)-->
+                    {@$_pDepth++}
+                    <ul>
+                <!--@else-->
+                </li>
+                <!--@end-->
+        <!--@end-->
+    <!--@end-->
+        </ul>
+    </div>
+</div>
diff --git a/widgets/navigator/skins/tree/skin.xml b/widgets/navigator/skins/tree/skin.xml
new file mode 100644
index 000000000..d80bc7d57
--- /dev/null
+++ b/widgets/navigator/skins/tree/skin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">메뉴 트리 출력 스킨</title>
+    <title xml:lang="zh-CN">树形菜单皮肤</title>
+    <title xml:lang="zh-TW">樹狀選單面板</title>
+    <description xml:lang="ko">메뉴를 트리구조로 출력합니다.</description>
+    <description xml:lang="zh-CN">树形菜单皮肤</description>
+    <description xml:lang="zh-TW">以樹狀結構顯示選單。</description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/navigator/skins/vertNavigator/css/widget.css b/widgets/navigator/skins/vertNavigator/css/widget.css
new file mode 100644
index 000000000..44abdb6d0
--- /dev/null
+++ b/widgets/navigator/skins/vertNavigator/css/widget.css
@@ -0,0 +1,39 @@
+@charset "utf-8";
+.widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
+.widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
+.widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuA li li.active sup{ color:#ff1a1a;}
+.widgetMenuA li li{ padding:0; border:0;}
+.widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
+.widgetMenuA li.active ul{ display:block;}
+.widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
+.widgetMenuA li.active a{ font-weight:bold;}
+.widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
+.widgetMenuA li li.active a{ color:#ff1a1a;}
+.widgetMenuA li.active li a:hover,
+.widgetMenuA li.active li a:active,
+.widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
+
+.widgetMenuA{ border-color:#e5e5e5;}
+.widgetMenuA li{ border-color:#e5e5e5;}
+.widgetMenuA li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetMenuA li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+.widgetContainer.black .widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
+.widgetContainer.black .widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
+.widgetContainer.black .widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetContainer.black .widgetMenuA li li.active sup{ color:#ff1a1a;}
+.widgetContainer.black .widgetMenuA li li{ padding:0; border:0;}
+.widgetContainer.black .widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
+.widgetContainer.black .widgetMenuA li.active ul{ display:block;}
+.widgetContainer.black .widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
+.widgetContainer.black .widgetMenuA li.active a{ font-weight:bold;}
+.widgetContainer.black .widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
+.widgetContainer.black .widgetMenuA li li.active a{ color:#ff1a1a;}
+.widgetContainer.black .widgetMenuA li.active li a:hover,
+.widgetContainer.black .widgetMenuA li.active li a:active,
+.widgetContainer.black .widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
+
+.widgetContainer.black .widgetMenuA{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuA li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
diff --git a/widgets/navigator/skins/vertNavigator/img/black/iconMenuAactive.gif b/widgets/navigator/skins/vertNavigator/img/black/iconMenuAactive.gif
new file mode 100755
index 000000000..1a635dcf1
Binary files /dev/null and b/widgets/navigator/skins/vertNavigator/img/black/iconMenuAactive.gif differ
diff --git a/widgets/navigator/skins/vertNavigator/img/black/iconMenuAnormal.gif b/widgets/navigator/skins/vertNavigator/img/black/iconMenuAnormal.gif
new file mode 100755
index 000000000..67d5914e8
Binary files /dev/null and b/widgets/navigator/skins/vertNavigator/img/black/iconMenuAnormal.gif differ
diff --git a/widgets/navigator/skins/vertNavigator/img/white/iconMenuAactive.gif b/widgets/navigator/skins/vertNavigator/img/white/iconMenuAactive.gif
new file mode 100755
index 000000000..67d5914e8
Binary files /dev/null and b/widgets/navigator/skins/vertNavigator/img/white/iconMenuAactive.gif differ
diff --git a/widgets/navigator/skins/vertNavigator/img/white/iconMenuAnormal.gif b/widgets/navigator/skins/vertNavigator/img/white/iconMenuAnormal.gif
new file mode 100755
index 000000000..1a635dcf1
Binary files /dev/null and b/widgets/navigator/skins/vertNavigator/img/white/iconMenuAnormal.gif differ
diff --git a/widgets/navigator/skins/vertNavigator/js/navigator.js b/widgets/navigator/skins/vertNavigator/js/navigator.js
new file mode 100755
index 000000000..bd0bd63bb
--- /dev/null
+++ b/widgets/navigator/skins/vertNavigator/js/navigator.js
@@ -0,0 +1,9 @@
+jQuery(function(){
+    jQuery('ul.widgetMenuA.dhtml').find('li')
+        .hover(function(){
+                jQuery('>ul',this).show();
+            }
+            ,function(){
+                jQuery('>ul',this).hide();
+            });
+});
diff --git a/widgets/navigator/skins/vertNavigator/navigator.html b/widgets/navigator/skins/vertNavigator/navigator.html
new file mode 100755
index 000000000..1a11956c7
--- /dev/null
+++ b/widgets/navigator/skins/vertNavigator/navigator.html
@@ -0,0 +1,30 @@
+{@ $_pDepth = 0;}
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetMenuA dhtml">
+        <!--@foreach($widget_info->arranged_menu as $key => $val)-->
+            <!--@if($val->text)-->
+
+                <!--@if($_pDepth > $val->depth)-->
+                    <!--@for($i=$val->depth; $i<$_pDepth; $i++)-->
+                    </li>
+                </ul>
+                    <!--@end-->
+                    {@ $_pDepth = $val->depth}
+                <!--@end-->
+                    <li class="menu_{$val->node_srl}<!--@if($val->selected)--> active<!--@end-->">
+                        <a href="{$val->href}"<!--@if($val->open_window=='Y')--> target="_black"<!--@end-->>{$val->text}</a>
+
+                    <!--@if($val->child_count)-->
+                        {@$_pDepth++}
+                        <ul style="display:<!--@if(!$val->selected)-->none<!--@else-->block<!--@end-->">
+                    <!--@else-->
+                    </li>
+                    <!--@end-->
+            <!--@end-->
+        <!--@end-->
+    </ul>
+</div>
diff --git a/widgets/navigator/skins/vertNavigator/skin.xml b/widgets/navigator/skins/vertNavigator/skin.xml
new file mode 100755
index 000000000..5bd9f40a7
--- /dev/null
+++ b/widgets/navigator/skins/vertNavigator/skin.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">세로 메뉴 출력 스킨</title>
+    <description xml:lang="ko">
+        지정된 메뉴 정보를 세로 출력하는 기본 위젯입니다.
+        DHTML기능을 사용으로 하시면 하위메뉴가 마우스 오버시에 레이어로 뜨게 되고 사용으로 하지 않으시면 바로 출력이 됩니다
+    </description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+	<name xml:lang="zh-CN">zero</name>
+        <name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/newest_comment/conf/info.xml b/widgets/newest_comment/conf/info.xml
index 30045720a..1170f1657 100644
--- a/widgets/newest_comment/conf/info.xml
+++ b/widgets/newest_comment/conf/info.xml
@@ -29,23 +29,6 @@
 
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="ru">Заголовок</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">최근 댓글의 제목으로 출력됩니다.</description>
-            <description xml:lang="zh-CN">显示为最新评论列表的输入的标题。</description>
-            <description xml:lang="jp">最新のコメント書き込みのタイトルとして表示されます。</description>
-            <description xml:lang="en">This will be the title of newest comments.</description>
-            <description xml:lang="es">Este será el título de los comentarios recientes.</description>
-            <description xml:lang="ru">Это будет заголовком последних комментариев.</description>
-            <description xml:lang="zh-TW">顯示最新回覆的標題。</description>
-        </var>
         <var id="list_count">
             <type>text</type>
             <name xml:lang="ko">목록수</name>
@@ -118,7 +101,7 @@
             <name xml:lang="ru">Модуль назначения</name>
             <name xml:lang="zh-TW">目標模組</name>
             <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-            <description xml:lang="zh-CN">将把被选模块当中的主题作为对象。</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
             <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
             <description xml:lang="en">The target articles for the newest comments will be the ones submitted in the selected module.</description>
             <description xml:lang="es">El objetivo de los comentarios recientes serán los comentarios agragados en el módulo selccionado.</description>
diff --git a/widgets/newest_comment/newest_comment.class.php b/widgets/newest_comment/newest_comment.class.php
index feb5048d9..8a73eb55b 100644
--- a/widgets/newest_comment/newest_comment.class.php
+++ b/widgets/newest_comment/newest_comment.class.php
@@ -15,6 +15,17 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
             // 제목
             $title = $args->title;
 
@@ -32,27 +43,11 @@
             $subject_cut_size = $args->subject_cut_size;
             if(!$subject_cut_size) $subject_cut_size = 0;
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
+            // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+            $site_module_info = Context::get('site_module_info');
+            if($args->module_srls) $obj->module_srl = $args->module_srls;
+            else if($site_module_info) $obj->site_srl = (int)$site_module_info->site_srl;
 
-            // CommentModel::getCommentList()를 이용하기 위한 변수 정리
-            if(is_array($module_srl)) $obj->module_srl = implode(',',$module_srl);
-            else $obj->module_srl = $module_srl;
             $obj->sort_index = $order_target;
             $obj->list_count = $list_count;
 
@@ -62,6 +57,22 @@
 
             // 템플릿 파일에서 사용할 변수들을 세팅
             if(count($mid_list)==1) $widget_info->module_name = $mid_list[0];
+
+            // 모듈이 하나만 선택되었을 경우 대상 모듈 이름과 링크를 생성
+            $module_srl = explode(',',$args->module_srls);
+            if(count($module_srl)==1) {
+                $oModuleModel = &getModel('module');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl[0]);
+                if($module_info->site_srl) {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    if($site_info->domain) {
+                        $widget_info->more_link = getSiteUrl('http://'.$site_info->domain, '','mid', $module_info->mid);
+                    }
+                } else {
+                    $widget_info->more_link = getUrl('','mid',$module_info->mid);
+                }
+                $widget_info->module_name = $module_info->mid;
+            }
             
             $widget_info->title = $title;
             $widget_info->comment_list = $output;
diff --git a/widgets/newest_comment/skins/blog_newest_comment/skin.xml b/widgets/newest_comment/skins/blog_newest_comment/skin.xml
index a645ed0e9..d4cbfe132 100644
--- a/widgets/newest_comment/skins/blog_newest_comment/skin.xml
+++ b/widgets/newest_comment/skins/blog_newest_comment/skin.xml
@@ -11,25 +11,18 @@
     <description xml:lang="en">It displays newest comments with blog style.</description>
     <description xml:lang="zh-TW">部落格式最新評論。</description>
     <version>0.1</version>
-    <date>2007-02-28</date>
-    <link>http://www.zeroboard.com</link>
+    <date>2008-12-30</date>
+    <link>http://ngleader.com</link>
 
-    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
-        <name xml:lang="ko">제로</name>
-        <name xml:lang="jp">Zero</name>
-        <name xml:lang="zh-CN">zero</name>
-        <name xml:lang="en">zero</name>
-        <name xml:lang="zh-TW">zero</name>
+    <author email_address="sol@ngleader.com" link="http://ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="zh-TW">sol</name>
     </author>
 
     <colorset>
-        <color name="layout">
-            <title xml:lang="ko">레이아웃에 맞춤</title>
-            <title xml:lang="jp">レイアウトに合わせる</title>
-            <title xml:lang="zh-CN">随布局</title>
-            <title xml:lang="en">레이아웃에 맞춤</title>
-            <title xml:lang="zh-TW">隨版面</title>
-        </color>
         <color name="normal">
             <title xml:lang="ko">기본 컬러</title>
             <title xml:lang="jp">デフォルトカラー</title>
@@ -44,26 +37,5 @@
             <title xml:lang="en">Cyan</title>
             <title xml:lang="zh-TW">青綠色</title>
         </color>
-        <color name="green">
-            <title xml:lang="ko">초록색</title>
-            <title xml:lang="jp">緑</title>
-            <title xml:lang="zh-CN">绿色</title>
-            <title xml:lang="en">Green</title>
-            <title xml:lang="zh-TW">綠色</title>
-        </color>
-        <color name="red">
-            <title xml:lang="ko">빨간색</title>
-            <title xml:lang="jp">赤</title>
-            <title xml:lang="zh-CN">红色</title>
-            <title xml:lang="en">Red</title>
-            <title xml:lang="zh-TW">紅色</title>
-        </color>
-        <color name="purple">
-            <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="zh-TW">紫色</title>
-        </color>
     </colorset>
 </skin>
\ No newline at end of file
diff --git a/widgets/newest_comment/skins/xe_official/list.html b/widgets/newest_comment/skins/xe_official/list.html
index a9abff741..10d3afe30 100644
--- a/widgets/newest_comment/skins/xe_official/list.html
+++ b/widgets/newest_comment/skins/xe_official/list.html
@@ -22,7 +22,7 @@
         </li>
         <!--@end-->
     </ul>
-    <!--@if($widget_info->title && $widget_info->module_name)-->
-    <a href="{getUrl('','mid',$widget_info->module_name)}" class="more">more</a>
+    <!--@if($widget_info->title && $widget_info->more_link)-->
+    <a href="{$widget_info->more_link}" class="more">more</a>
     <!--@end-->
 </div>
diff --git a/widgets/newest_comment/skins/xe_official/skin.xml b/widgets/newest_comment/skins/xe_official/skin.xml
index 4e9d6abe4..8eca3e929 100644
--- a/widgets/newest_comment/skins/xe_official/skin.xml
+++ b/widgets/newest_comment/skins/xe_official/skin.xml
@@ -2,12 +2,12 @@
 <skin version="0.2">
     <title xml:lang="ko">XE 공식 레이아웃용 최신 댓글 스킨</title>
     <title xml:lang="jp">XE 공식 레이아웃용 최신 댓글 스킨</title>
-    <title xml:lang="zh-CN">XE 공식 레이아웃용 최신 댓글 스킨</title>
+    <title xml:lang="zh-CN">XE官方网站最新评论列表皮肤</title>
     <title xml:lang="en">XE 공식 레이아웃용 최신 댓글 스킨</title>
     <title xml:lang="zh-TW">XE 공식 레이아웃용 최신 댓글 스킨</title>
     <description xml:lang="ko">댓글을 출력합니다</description>
     <description xml:lang="jp">댓글을 출력합니다</description>
-    <description xml:lang="zh-CN">댓글을 출력합니다</description>
+    <description xml:lang="zh-CN">显示评论列表。</description>
     <description xml:lang="en">댓글을 출력합니다</description>
     <description xml:lang="zh-TW">댓글을 출력합니다</description>
     <version>0.1</version>
diff --git a/widgets/newest_document/conf/info.xml b/widgets/newest_document/conf/info.xml
index b79d07927..f288fa5f7 100644
--- a/widgets/newest_document/conf/info.xml
+++ b/widgets/newest_document/conf/info.xml
@@ -28,23 +28,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">최근 게시물의 제목으로 출력됩니다.</description>
-			<description xml:lang="zh-CN">显示为最新主题列表的标题。</description>
-			<description xml:lang="jp">最新の書き込みのタイトルとして表示されます。</description>
-			<description xml:lang="en">It will be the title of the newest articles.</description>
-			<description xml:lang="es">Este será el título de los documentos recientes.</description>
-			<description xml:lang="ru">Это будет заголовком последних статей.</description>
-			<description xml:lang="zh-TW">顯示最新主題列表的標題。</description>
-		</var>
 		<var id="order_target">
 			<type>select</type>
 			<name xml:lang="ko">정렬 대상</name>
@@ -206,7 +189,7 @@
 			<name xml:lang="ru">Модуль назначения</name>
 			<name xml:lang="zh-TW">目標模組</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-			<description xml:lang="zh-CN">将把被选模块当中的主题作为对象。</description>
+			<description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
 			<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
 			<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
 			<description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
diff --git a/widgets/newest_document/newest_document.class.php b/widgets/newest_document/newest_document.class.php
index ed645c677..a11f657e9 100644
--- a/widgets/newest_document/newest_document.class.php
+++ b/widgets/newest_document/newest_document.class.php
@@ -15,6 +15,17 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
             // 제목
             $title = $args->title;
 
@@ -38,28 +49,13 @@
             $duration_new = $args->duration_new;
             if(!$duration_new) $duration_new = 12;
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
+            // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+            $site_module_info = Context::get('site_module_info');
+            if($args->module_srls) $obj->module_srl = $args->module_srls;
+            else if($site_module_info) $obj->site_srl = (int)$site_module_info->site_srl;
 
             // newest_document 위젯에서 정의한 query문을 직접 사용
-            if(is_array($module_srl)) $obj->module_srl = implode(',',$module_srl);
-            else $obj->module_srl = $module_srl;
-            $obj->sort_index = $order_target;
+            $obj->sort_index = 'documents.'.$order_target;
             $obj->order_type = $order_type=="desc"?"asc":"desc";
             $obj->list_count = $list_count;
             $output = executeQueryArray('widgets.newest_document.getNewestDocuments', $obj);
@@ -71,25 +67,45 @@
             if(!$output->toBool()) return;
 
             // 결과가 있으면 각 문서 객체화를 시킴
+            $modules = array();
             if(count($output->data)) {
                 foreach($output->data as $key => $attribute) {
+                    $modules[$attribute->module_srl]->mid = $attribute->mid;
+                    $modules[$attribute->module_srl]->site_srl = $attribute->site_srl;
+
                     $document_srl = $attribute->document_srl;
 
                     $oDocument = null;
                     $oDocument = new documentItem();
-                    $oDocument->setAttribute($attribute);
+                    $oDocument->setAttribute($attribute, false);
+                    $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
 
                     $document_list[$key] = $oDocument;
                 }
+                $oDocumentModel->setToAllDocumentExtraVars();
             } else {
 
                 $document_list = array();
                 
             }
 
-            // 템플릿 파일에서 사용할 변수들을 세팅
-            if(count($mid_list)==1) $widget_info->module_name = $mid_list[0];
-            
+            // 모듈이 하나만 선택되었을 경우 대상 모듈 이름과 링크를 생성
+            if(count($modules)==1) {
+                $info = array_shift($modules);
+                if($info) {
+                    $widget_info->mid = $info->mid;
+                    if($info->site_srl) {
+                        $site_info = $oModuleModel->getSiteInfo($info->site_srl);
+                        if($site_info->domain) {
+                            $widget_info->more_link = getSiteUrl('http://'.$site_info->domain, '','mid', $widget_info->mid);
+                        }
+                    } else {
+                        $widget_info->more_link = getUrl('','mid',$info->mid);
+                        $widget_info->module_name = $info->mid;
+                    }
+                }
+            }
+
             $widget_info->title = $title;
             $widget_info->document_list = $document_list;
             $widget_info->subject_cut_size = $subject_cut_size;
diff --git a/widgets/newest_document/queries/getNewestDocuments.xml b/widgets/newest_document/queries/getNewestDocuments.xml
index c060eb0b2..5e054ffae 100644
--- a/widgets/newest_document/queries/getNewestDocuments.xml
+++ b/widgets/newest_document/queries/getNewestDocuments.xml
@@ -1,16 +1,20 @@
 <query id="getNewestDocuments" action="select">
     <tables>
+        <table name="modules" />
         <table name="documents" />
     </tables>
     <columns>
-        <column name="*" />
+        <column name="modules.site_srl" alias="site_srl"/>
+        <column name="modules.mid" alias="mid"/>
+        <column name="documents.*" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="module_srl" filter="number" />
-        <condition operation="equal" column="category_srl" var="category_srl" pipe="and" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" />
+        <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" filter="number" pipe="and" />
     </conditions>
     <navigation>
-        <index var="sort_index" default="list_order" order="order_type" />
+        <index var="sort_index" default="documents.list_order" order="order_type" />
         <list_count var="list_count" default="20" />
     </navigation>
 </query>
diff --git a/widgets/newest_document/skins/blog_newest_document/skin.xml b/widgets/newest_document/skins/blog_newest_document/skin.xml
index d55b40ba8..b95d80dde 100644
--- a/widgets/newest_document/skins/blog_newest_document/skin.xml
+++ b/widgets/newest_document/skins/blog_newest_document/skin.xml
@@ -66,4 +66,4 @@
             <title xml:lang="zh-TW">紫色</title>
         </color>
     </colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/newest_document/skins/default/list.html b/widgets/newest_document/skins/default/list.html
index 912568cd5..d98d2bb62 100644
--- a/widgets/newest_document/skins/default/list.html
+++ b/widgets/newest_document/skins/default/list.html
@@ -12,8 +12,8 @@
     <div class="newest_document_default_box">
         <div class="title_box">
             <div class="title">{$widget_info->title}</div>
-            <!--@if($widget_info->module_name)-->
-            <div class="more"><a href="{getUrl('','mid',$widget_info->module_name)}">more</a></div>
+            <!--@if($widget_info->title && $widget_info->more_link)-->
+            <div class="more"><a href="{$widget_info->more_link">more</a></div>
             <!--@end-->
         </div>
 
diff --git a/widgets/newest_document/skins/xe_official/list.html b/widgets/newest_document/skins/xe_official/list.html
index 7ab25d6f7..1e93b4ce0 100644
--- a/widgets/newest_document/skins/xe_official/list.html
+++ b/widgets/newest_document/skins/xe_official/list.html
@@ -26,7 +26,7 @@
         </li>
         <!--@end-->
     </ul>
-    <!--@if($widget_info->title && $widget_info->module_name)-->
-    <a href="{getUrl('','mid',$widget_info->module_name)}" class="more">more</a>
+    <!--@if($widget_info->title && $widget_info->more_link)-->
+    <a href="{$widget_info->more_link}" class="more">more</a>
     <!--@end-->
 </div>
diff --git a/widgets/newest_images/conf/info.xml b/widgets/newest_images/conf/info.xml
index 61ed5ceb0..0169d079a 100644
--- a/widgets/newest_images/conf/info.xml
+++ b/widgets/newest_images/conf/info.xml
@@ -28,23 +28,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">최근 게시물의 제목으로 출력됩니다.</description>
-			<description xml:lang="zh-CN">显示为最新主题列表的标题。</description>
-			<description xml:lang="jp">最新の書き込みのタイトルとして表示されます。</description>
-			<description xml:lang="en">It will be the title of the newest articles.</description>
-			<description xml:lang="es">Este será el título de los documentos recientes.</description>
-			<description xml:lang="ru">Это будет заголовком последних статей.</description>
-			<description xml:lang="zh-TW">顯示最新主題列表的標題。</description>
-		</var>
 		<var id="title_length">
 			<type>text</type>
 			<name xml:lang="ko">글 제목 길이</name>
@@ -296,7 +279,7 @@
 			<name xml:lang="zh-TW">目標模組</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
 			<description xml:lang="jp">チェックされたコンテンツを対象とします。</description>
-			<description xml:lang="zh-CN">把被选模块中的主题作为对象。</description>
+			<description xml:lang="zh-CN">把所选模块中的主题作为对象。</description>
 			<description xml:lang="en">Articles on chosen module will be the target.</description>
 			<description xml:lang="es">Objetivo de los documentos será los del módulo seleccionado.</description>
 			<description xml:lang="ru">Статьи на выбранных модулях будут назначением.</description>
diff --git a/widgets/newest_images/newest_images.class.php b/widgets/newest_images/newest_images.class.php
index ddc33523d..e8ecbac19 100644
--- a/widgets/newest_images/newest_images.class.php
+++ b/widgets/newest_images/newest_images.class.php
@@ -15,6 +15,17 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
             // 글자 제목 길이
             $widget_info->title_length = (int)$args->title_length;
             if(!$widget_info->title_length) $widget_info->title_length = 10;
@@ -54,28 +65,13 @@
 
             $oModuleModel = &getModel('module');
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
+            // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+            $site_module_info = Context::get('site_module_info');
+            if($args->module_srls) $obj->module_srls = $args->module_srls;
+            else if($site_module_info) $obj->site_srl = (int)$site_module_info->site_srl;
 
-            $obj->module_srls = implode(",",$module_srl);
             $obj->direct_download = 'Y';
             $obj->isvalid = 'Y';
-            $oDocumentModel = &getModel('document');
 
             // 정해진 모듈에서 문서별 파일 목록을 구함
             $obj->list_count = $widget_info->rows_list_count*$widget_info->cols_list_count;
@@ -85,6 +81,7 @@
             $document_srl_list = array();
             $document_list = array();
 
+            $oDocumentModel = &getModel('document');
             if($files_count>0) {
                 for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
 
@@ -99,6 +96,22 @@
             for($i=$document_count;$i<$total_count;$i++) $document_list[] = new DocumentItem();
             $widget_info->document_list = $document_list;
 
+            // 모듈이 하나만 선택되었을 경우 대상 모듈 이름과 링크를 생성
+            $module_srl = explode(',',$args->module_srls);
+            if(count($module_srl)==1) {
+                $oModuleModel = &getModel('module');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl[0]);
+                if($module_info->site_srl) {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    if($site_info->domain) {
+                        $widget_info->more_link = getSiteUrl('http://'.$site_info->domain, '','mid', $module_info->mid);
+                    }
+                } else {
+                    $widget_info->more_link = getUrl('','mid',$module_info->mid);
+                }
+                $widget_info->module_name = $module_info->mid;
+            }
+
             Context::set('widget_info', $widget_info);
 
             // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
diff --git a/widgets/newest_images/skins/default/css/normal.css b/widgets/newest_images/skins/default/css/normal.css
index 5e22c84aa..0f7a081a0 100644
--- a/widgets/newest_images/skins/default/css/normal.css
+++ b/widgets/newest_images/skins/default/css/normal.css
@@ -11,8 +11,8 @@
 .ni_box .thumbnail_box a:visited { color:#AAAAAA; text-decoration:none; }
 
 .ni_box .thumbnail_box td div { text-align:center; }
-.ni_box .thumbnail_box td.bottomBorder { border-bottom:1px dashed #EEEEEE; padding-bottom:5px; }
-.ni_box .thumbnail_box div strong { font-weight:normal; font-size:0.9em; color:#ed2a32; }
+.ni_box .thumbnail_box td.bottomBorder { padding-bottom:5px; }
+.ni_box .thumbnail_box div strong { font-weight:normal; color:#FE6700; font:.9em Tahoma; }
 .ni_box .thumbnail_box div.author { color:#AAAAAA; }
 .ni_box .thumbnail_box div.author a { color:#AAAAAA; }
 .ni_box .thumbnail_box div.regdate { font-size:0.75em; color:#CCCCCC; margin-top:2px;}
diff --git a/widgets/newest_images/skins/default/list.html b/widgets/newest_images/skins/default/list.html
index 4a4e445c2..2018eab10 100644
--- a/widgets/newest_images/skins/default/list.html
+++ b/widgets/newest_images/skins/default/list.html
@@ -8,8 +8,8 @@
     <!--@if($widget_info->title)-->
     <div class="title_box">
         <div class="title">{$widget_info->title}</div>
-        <!--@if($widget_info->module_name)-->
-        <div class="more"><a href="{getUrl('','mid',$widget_info->module_name)}">more</a></div>
+        <!--@if($widget_info->more_link)-->
+        <div class="more"><a href="{$widget_info->more_link}">more</a></div>
         <!--@end-->
     </div>
     <!--@end-->
diff --git a/widgets/newest_images/skins/xe_official/css/normal.css b/widgets/newest_images/skins/xe_official/css/normal.css
index 0c233d690..fa3d2f62e 100644
--- a/widgets/newest_images/skins/xe_official/css/normal.css
+++ b/widgets/newest_images/skins/xe_official/css/normal.css
@@ -16,7 +16,7 @@
 .ni_box .thumbnail_box a:visited { color:#54564b; text-decoration:none; }
 
 .ni_box .thumbnail_box td.bottomBorder { border-bottom:1px dashed #EEEEEE; padding-bottom:5px; }
-.ni_box .thumbnail_box div strong { font-weight:normal; font-size:0.9em; color:#ed2a32; }
+.ni_box .thumbnail_box div strong { font-weight:normal; color:#FE6700; font:.9em Tahoma; }
 .ni_box .thumbnail_box div.author { color:#54564b; text-align:center;}
 .ni_box .thumbnail_box div.author span, .ni_box .thumbnail_box div.author div { color:#54564b; }
 .ni_box .thumbnail_box div.regdate { font-size:0.9em; color:#AAAAAA; margin-top:2px;text-align:center;}
diff --git a/widgets/newest_images/skins/xe_official/list.html b/widgets/newest_images/skins/xe_official/list.html
index 9e76f8fcd..15b602405 100644
--- a/widgets/newest_images/skins/xe_official/list.html
+++ b/widgets/newest_images/skins/xe_official/list.html
@@ -61,7 +61,7 @@
     <!--@end-->
     </div>
 
-    <!--@if($widget_info->module_name && $widget_info->title)-->
-        <a href="{getUrl('','mid',$widget_info->module_name)}" class="more">more</a>
+    <!--@if($widget_info->module_name && $widget_info->more_link)-->
+        <a href="{$widget_info->more_link}" class="more">more</a>
     <!--@end-->
 </div>
diff --git a/widgets/newest_images/widgetstyle.html b/widgets/newest_images/widgetstyle.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/widgets/newest_trackback/conf/info.xml b/widgets/newest_trackback/conf/info.xml
index 3029fe83a..6fc2c91e1 100644
--- a/widgets/newest_trackback/conf/info.xml
+++ b/widgets/newest_trackback/conf/info.xml
@@ -28,23 +28,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="ru">Заголовок</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">최근 엮인글 제목으로 출력됩니다.</description>
-            <description xml:lang="zh-CN">显示为最新引用列表的标题。</description>
-            <description xml:lang="jp">最新のトラックバックタイトルとして表示されます。</description>
-            <description xml:lang="en">This will be the title of the Newest Trackbacks to be displayed.</description>
-            <description xml:lang="es">Este será el título de los trackbacks recientes.</description>
-            <description xml:lang="ru">Это будет заголовком последних трекбеков.</description>
-            <description xml:lang="zh-TW">顯示最新引用的標題。</description>
-        </var>
         <var id="list_count">
             <type>text</type>
             <name xml:lang="ko">목록수</name>
@@ -72,7 +55,7 @@
             <name xml:lang="ru">Модуль назначения</name>
             <name xml:lang="zh-TW">目標模組</name>
             <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-            <description xml:lang="zh-CN">将把被选模块当中的主题作为对象。</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
             <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
             <description xml:lang="en">The target articles for the newest trackbacks will be the ones submitted in the selected module.</description>
             <description xml:lang="es">Objetivo de los documentos agregados serán los del módulo seleccionado.</description>
diff --git a/widgets/newest_trackback/newest_trackback.class.php b/widgets/newest_trackback/newest_trackback.class.php
index 548ba8d4a..3cd270e24 100644
--- a/widgets/newest_trackback/newest_trackback.class.php
+++ b/widgets/newest_trackback/newest_trackback.class.php
@@ -15,6 +15,17 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
             // 제목
             $title = $args->title;
 
@@ -30,26 +41,10 @@
             $list_count = (int)$args->list_count;
             if(!$list_count) $list_count = 5;
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
-
-            // TrackbackModel::getTrackbackList()를 이용하기 위한 변수 정리
-            $obj->module_srl = $module_srl;
+            // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+            $site_module_info = Context::get('site_module_info');
+            if($args->module_srls) $obj->module_srl = $args->module_srls;
+            else if($site_module_info) $obj->site_srl = (int)$site_module_info->site_srl;
             $obj->sort_index = $order_target;
             $obj->list_count = $list_count;
 
diff --git a/widgets/planet_document/conf/info.xml b/widgets/planet_document/conf/info.xml
index 1405ba0aa..b113a3de4 100644
--- a/widgets/planet_document/conf/info.xml
+++ b/widgets/planet_document/conf/info.xml
@@ -1,35 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <widget version="0.2">
 	<title xml:lang="ko">플래닛 최근 글 출력</title>
+	<title xml:lang="zh-CN">微博主题列表</title>
 	<title xml:lang="zh-TW">微型部落格主題輸出</title>
 	<description xml:lang="ko">플래닛의 글들만 출력하는 위젯입니다 .</description>
+	<description xml:lang="zh-CN">列出微博主题列表。</description>
 	<description xml:lang="zh-TW">微型部落格主題輸出控件。</description>
 	<version>0.1</version>
 	<date>2008-12-24</date>
 
 	<author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
 		<name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
 		<name xml:lang="zh-TW">zero</name>
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">최근 게시물의 제목으로 출력됩니다.</description>
-			<description xml:lang="zh-CN">显示为最新主题列表的标题。</description>
-			<description xml:lang="jp">最新の書き込みのタイトルとして表示されます。</description>
-			<description xml:lang="en">It will be the title of the newest articles.</description>
-			<description xml:lang="es">Este será el título de los documentos recientes.</description>
-			<description xml:lang="ru">Это будет заголовком последних статей.</description>
-			<description xml:lang="zh-TW">顯示最新主題列表的標題。</description>
-		</var>
 		<var id="list_count">
 			<type>text</type>
 			<name xml:lang="ko">목록수</name>
@@ -83,33 +69,33 @@
 			<type>select</type>
 			<name xml:lang="ko">중복 허용</name>
 			<name xml:lang="jp">중복 허용</name>
-			<name xml:lang="zh-CN">중복 허용</name>
+			<name xml:lang="zh-CN">重复与否</name>
 			<name xml:lang="en">중복 허용</name>
 			<name xml:lang="ru">중복 허용</name>
-			<name xml:lang="zh-TW">중복 허용</name>
+			<name xml:lang="zh-TW">是否重複</name>
 			<description xml:lang="ko">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
 			<description xml:lang="jp">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
-			<description xml:lang="zh-CN">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
+			<description xml:lang="zh-CN">允许重复：不管你发布了多少个主题，按时间顺列出；不重复：只列出每个用户的最近一个主题。</description>
 			<description xml:lang="en">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
 			<description xml:lang="ru">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
-			<description xml:lang="zh-TW">Y로 하시면 플래닛 멤버들의 중복을 검사하지 않고 무조건 최신순으로 글을 추출하여 출력합니다</description>
+			<description xml:lang="zh-TW">可重複：按照時間順序排列顯示主題；不重複：只會顯示用戶最近發表的主題。</description>
 			<options>
 				<value>N</value>
 				<name xml:lang="ko">중복하지 않음</name>
 				<name xml:lang="en">중복하지 않음</name>
 				<name xml:lang="jp">중복하지 않음</name>
-				<name xml:lang="zh-CN">중복하지 않음</name>
+				<name xml:lang="zh-CN">不重复</name>
 				<name xml:lang="es">중복하지 않음</name>
-				<name xml:lang="zh-TW">중복하지 않음</name>
+				<name xml:lang="zh-TW">不重複</name>
 			</options>
 			<options>
 				<value>Y</value>
 				<name xml:lang="ko">중복 허용</name>
 				<name xml:lang="en">중복 허용</name>
 				<name xml:lang="jp">중복 허용</name>
-				<name xml:lang="zh-CN">중복 허용</name>
+				<name xml:lang="zh-CN">允许重复</name>
 				<name xml:lang="es">중복 허용</name>
-				<name xml:lang="zh-TW">중복 허용</name>
+				<name xml:lang="zh-TW">可重複</name>
 			</options>
 		</var>
 	</extra_vars>
diff --git a/widgets/planet_document/planet_document.class.php b/widgets/planet_document/planet_document.class.php
index 305336d2f..c61cafb68 100644
--- a/widgets/planet_document/planet_document.class.php
+++ b/widgets/planet_document/planet_document.class.php
@@ -54,6 +54,7 @@
             if(!$args->thumbnail_height) $args->thumbnail_height = 50;
             $widget_info->thumbnail_width = $args->thumbnail_width;
             $widget_info->thumbnail_height = $args->thumbnail_height;
+            $widget_info->domain = Context::getDefaultUrl();
             Context::set('widget_info', $widget_info);
 
             // 템플릿 컴파일
diff --git a/widgets/planet_document/queries/getNewestDocuments.xml b/widgets/planet_document/queries/getNewestDocuments.xml
index 8a18737b4..d11f83f61 100644
--- a/widgets/planet_document/queries/getNewestDocuments.xml
+++ b/widgets/planet_document/queries/getNewestDocuments.xml
@@ -14,8 +14,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/widgets/planet_document/queries/getUniqueNewestDocuments.xml b/widgets/planet_document/queries/getUniqueNewestDocuments.xml
index 324ee36c7..e9646f8f7 100644
--- a/widgets/planet_document/queries/getUniqueNewestDocuments.xml
+++ b/widgets/planet_document/queries/getUniqueNewestDocuments.xml
@@ -14,8 +14,6 @@
         <column name="member.member_srl" alias="member_srl" />
         <column name="documents.document_srl" alias="document_srl" />
         <column name="documents.content" alias="content" />
-        <column name="documents.extra_vars20" alias="extra_vars20" />
-        <column name="documents.extra_vars20" alias="postscript" />
         <column name="documents.comment_count" alias="comment_count" />
         <column name="documents.voted_count" alias="voted_count" />
         <column name="documents.tags" alias="tags" />
diff --git a/widgets/planet_document/skins/default/css/widget.css b/widgets/planet_document/skins/default/css/widget.css
new file mode 100644
index 000000000..22adec8e8
--- /dev/null
+++ b/widgets/planet_document/skins/default/css/widget.css
@@ -0,0 +1,53 @@
+@charset "utf-8";
+
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetUlistB:after{ content:""; display:block; clear:both;}
+.widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
+.widgetUlistB li .author{ float:left; margin-right:-42px;}
+.widgetUlistB li .author img{ border:1px solid;}
+.widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; *zoom:1;}
+.widgetUlistB li .title div { display:inline; }
+.widgetUlistB li .title a{ text-decoration:underline;}
+.widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco .topLeft{}
+.widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
+.widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
+
+.widgetUlistB li .author img{ border-color:#ccc;}
+.widgetUlistB li .title{ border-color:#eee; color:#333; background:#fff;}
+.widgetUlistB li .title a{ color:#0066ff;}
+.widgetUlistB li .title .arrow{ background:url(../img/white/arrowUlistB.gif) no-repeat;}
+.widgetUlistB li .title .deco{ background:#fff;}
+.widgetUlistB li .title .date{ color:#333;}
+.widgetUlistB li .title .hour{ color:#888;}
+
+.widgetContainer.black .widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetContainer.black .widgetUlistB:after{ content:""; display:block; clear:both;}
+.widgetContainer.black .widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
+.widgetContainer.black .widgetUlistB li .author{ float:left; margin-right:-42px;}
+.widgetContainer.black .widgetUlistB li .author img{ border:1px solid;}
+.widgetContainer.black .widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; *zoom:1;}
+.widgetContainer.black .widgetUlistB li .title a{ text-decoration:underline;}
+.widgetContainer.black .widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
+.widgetContainer.black .widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
+.widgetContainer.black .widgetUlistB li .title .deco .topLeft{}
+.widgetContainer.black .widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
+.widgetContainer.black .widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
+
+.widgetContainer.black .widgetUlistB li .author img{ border-color:#666;}
+.widgetContainer.black .widgetUlistB li .title{ border-color:#333; color:#999; background:#000;}
+.widgetContainer.black .widgetUlistB li .title a{ color:#3399ff;}
+.widgetContainer.black .widgetUlistB li .title .arrow{ background:url(../img/black/arrowUlistB.gif) no-repeat;}
+.widgetContainer.black .widgetUlistB li .title .deco{ background:#000;}
+.widgetContainer.black .widgetUlistB li .title .date{ color:#999;}
+.widgetContainer.black .widgetUlistB li .title .hour{ color:#888;}
diff --git a/widgets/planet_document/skins/default/img/black/arrowUlistB.gif b/widgets/planet_document/skins/default/img/black/arrowUlistB.gif
new file mode 100755
index 000000000..cc264ff3f
Binary files /dev/null and b/widgets/planet_document/skins/default/img/black/arrowUlistB.gif differ
diff --git a/widgets/planet_document/skins/default/img/white/arrowUlistB.gif b/widgets/planet_document/skins/default/img/white/arrowUlistB.gif
new file mode 100755
index 000000000..c5622a7cc
Binary files /dev/null and b/widgets/planet_document/skins/default/img/white/arrowUlistB.gif differ
diff --git a/widgets/planet_document/skins/default/list.html b/widgets/planet_document/skins/default/list.html
new file mode 100644
index 000000000..1f5d0b0ac
--- /dev/null
+++ b/widgets/planet_document/skins/default/list.html
@@ -0,0 +1,18 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetUlistB">
+        <!--@foreach($planet_list as $no => $item)-->
+        <li>
+            <a href="{getSiteUrl($widget_info->domain,'','mid',$item->getPlanetMid(),'date',$item->getRegdate())}" class="author" title="{htmlspecialchars($item->nick_name)}"><img src="{$item->getPlanetPhotoSrc($widget_info->thumbnail_width,$widget_info->thumbnail_height)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_height}" alt="{htmlspecialchars($item->nick_name)}" /></a>
+            <div class="title">
+                {$item->getContent()}
+                <span class="date">{zdate($item->get('regdate'),"y.m.d",false)}</span> <span class="hour">{zdate($item->get('regdate'),"H:i",false)}</span>
+                <span class="arrow"></span><span class="deco topLeft"></span><span class="deco topRight"></span><span class="deco bottomLeft"></span><span class="deco bottomRight"></span>
+            </div>
+        </li>
+        <!--@end-->
+    </ul>
+</div>
diff --git a/widgets/planet_document/skins/default/skin.xml b/widgets/planet_document/skins/default/skin.xml
new file mode 100644
index 000000000..f08e127a6
--- /dev/null
+++ b/widgets/planet_document/skins/default/skin.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+	<title xml:lang="ko">기본 플래닛 글 스킨</title>
+	<title xml:lang="zh-CN">微博最新主题列表皮肤</title>
+	<title xml:lang="zh-TW">微型部落格最新主題列表面板</title>
+	<description xml:lang="ko">
+		플래닛 글들을 출력하는 기본 위젯 스킨입니다.
+	</description>
+	<description xml:lang="zh-CN">
+		微博最新主题列表皮肤。
+	</description>
+	<description xml:lang="zh-TW">
+		微型部落格最新主題列表面板。
+	</description>
+	<version>0.1</version>
+	<date>2009-02-17</date>
+	<link>http://www.zeroboard.com</link>
+
+	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+		<name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+	</author>
+	<colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+	</colorset>
+</skin>
diff --git a/widgets/planet_document/skins/xe_official/list.html b/widgets/planet_document/skins/xe_official/list.html
index f3774e496..c4299013f 100644
--- a/widgets/planet_document/skins/xe_official/list.html
+++ b/widgets/planet_document/skins/xe_official/list.html
@@ -3,7 +3,7 @@
 <!--@foreach($planet_list as $no => $item)-->
     <div class="planetDocument <!--@if($colorset=='black')-->black<!--@end-->">
 	    <!--@if($planet->getMid() != $item->getPlanetMid())-->
-	    <h3 class="identity"><a href="{getUrl('','mid',$item->getPlanetMid(),'date',$item->getRegdate())}"><img src="{$item->getPlanetPhotoSrc($widget_info->thumbnail_width,$widget_info->thumbnail_height)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_height}" alt="{htmlspecialchars($item->nick_name)}" /></a></h3>
+	    <h3 class="identity"><a href="{getSiteUrl($widget_info->domain,'','mid',$item->getPlanetMid(),'date',$item->getRegdate())}"><img src="{$item->getPlanetPhotoSrc($widget_info->thumbnail_width,$widget_info->thumbnail_height)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_height}" alt="{htmlspecialchars($item->nick_name)}" /></a></h3>
 	    <!--@end-->
 	    <div class="article">
             <span class="tooltipLT"></span>
diff --git a/widgets/planet_document/skins/xe_official/skin.xml b/widgets/planet_document/skins/xe_official/skin.xml
index 7093c9129..e4b30a121 100644
--- a/widgets/planet_document/skins/xe_official/skin.xml
+++ b/widgets/planet_document/skins/xe_official/skin.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <skin version="0.2">
 	<title xml:lang="ko">XE 공식 레이아웃용 플래닛 글 스킨</title>
-	<title xml:lang="zh-TW">XE 微型部落格版面</title>
+	<title xml:lang="zh-CN">XE官方网站微博主题列表皮肤</title>
+	<title xml:lang="zh-TW">XE 官方網站微型部落格版面</title>
 	<description xml:lang="ko">
 		플래닛 글들을 출력하는 위젯 스킨입니다.
 	</description>
+	<description xml:lang="zh-CN">
+		微博主题列表皮肤。
+	</description>
 	<description xml:lang="zh-TW">
 		微型部落格主題輸出面板。
 	</description>
@@ -14,6 +18,7 @@
 
 	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
 		<name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
 		<name xml:lang="zh-TW">zero</name>
 	</author>
 	<colorset>
diff --git a/widgets/point_status/skins/default/css/widget.css b/widgets/point_status/skins/default/css/widget.css
new file mode 100644
index 000000000..0ee45d0c6
--- /dev/null
+++ b/widgets/point_status/skins/default/css/widget.css
@@ -0,0 +1,40 @@
+@charset "utf-8";
+
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetPoint{ margin:0; *zoom:1; clear:both;}
+.widgetPoint:after{ content:""; display:block; clear:both;}
+.widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
+.widgetPoint dd{ margin:0;}
+.widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
+.widgetPoint dd.graph img{ width:0%;}
+.widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
+.widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
+.widgetPoint dt{ color:#333;}
+
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer.black .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+.widgetContainer.black .widgetPoint{ margin:0; *zoom:1; clear:both;}
+.widgetContainer.black .widgetPoint:after{ content:""; display:block; clear:both;}
+.widgetContainer.black .widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
+.widgetContainer.black .widgetPoint dd{ margin:0;}
+.widgetContainer.black .widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
+.widgetContainer.black .widgetPoint dd.graph img{ width:0%;}
+.widgetContainer.black .widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
+.widgetContainer.black .widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
+.widgetContainer.black .widgetPoint dt{ color:#999;}
+
diff --git a/widgets/point_status/skins/default/img/black/linePoint.gif b/widgets/point_status/skins/default/img/black/linePoint.gif
new file mode 100755
index 000000000..09958dad7
Binary files /dev/null and b/widgets/point_status/skins/default/img/black/linePoint.gif differ
diff --git a/widgets/point_status/skins/default/img/white/linePoint.gif b/widgets/point_status/skins/default/img/white/linePoint.gif
new file mode 100755
index 000000000..09958dad7
Binary files /dev/null and b/widgets/point_status/skins/default/img/white/linePoint.gif differ
diff --git a/widgets/point_status/skins/default/skin.xml b/widgets/point_status/skins/default/skin.xml
index cb3980c82..31ed74438 100644
--- a/widgets/point_status/skins/default/skin.xml
+++ b/widgets/point_status/skins/default/skin.xml
@@ -8,8 +8,8 @@
 	<description xml:lang="jp">ポイント状況出力ウィジェットのデフォルトスキンです。</description>
 	<description xml:lang="zh-CN">显示在线会员积分现况的默认皮肤。</description>
 	<description xml:lang="zh-TW">顯示線上會員積分狀況的預設面板。</description>
-	<version>0.1</version>
-	<date>2008-04-23</date>
+	<version>0.2</version>
+	<date>2009-02-17</date>
 	<link>http://www.zeroboard.com</link>
 
 	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
@@ -20,12 +20,26 @@
 	</author>
 
 	<colorset>
-		<color name="normal">
-			<title xml:lang="ko">기본 컬러</title>
-			<title xml:lang="jp">デフォルトカラー</title>
-			<title xml:lang="zh-CN">默认颜色</title>
-			<title xml:lang="en">Default color</title>
-			<title xml:lang="zh-TW">預設顏色</title>
-		</color>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
 	</colorset>
-</skin>
\ No newline at end of file
+</skin>
diff --git a/widgets/point_status/skins/default/status.css b/widgets/point_status/skins/default/status.css
deleted file mode 100644
index c8c2d2a15..000000000
--- a/widgets/point_status/skins/default/status.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.point_status_white .level { font-size:7pt; font-family:tahoma; float:left; color:#333333; }
-.point_status_white .next { font-size:7pt; font-family:tahoma; float:right; color:#979797; }
-.point_status_white .bar_box { background-color:#D9DAF8; height:8px; border:1px solid #2E35D3;  white-space:nowrap; overflow:hidden; margin:3px 0 3px 0;}
-.point_status_white .bar { height:8px; background-color:#6A70E5; border-right:1px solid #2E35D3; white-space:nowrap; overflow:hidden;}
-.point_status_white .point { font-family:tahoma; font-size:8pt; color:#333333; }
-
-.point_status_black .level { font-size:7pt; font-family:tahoma; float:left; color:#BBBBBB; }
-.point_status_black .next { font-size:7pt; font-family:tahoma; float:right; color:#979797; }
-.point_status_black .bar_box { background-color:#D9DAF8; height:8px; border:1px solid #2E35D3;  white-space:nowrap; overflow:hidden; margin:3px 0 3px 0;}
-.point_status_black .bar { height:8px; background-color:#6A70E5; border-right:1px solid #2E35D3; white-space:nowrap; overflow:hidden;}
-.point_status_black .point { font-family:tahoma; font-size:8pt; color:#BBBBBB; }
diff --git a/widgets/point_status/skins/default/status.html b/widgets/point_status/skins/default/status.html
index 24f63f0b9..1265a3cec 100644
--- a/widgets/point_status/skins/default/status.html
+++ b/widgets/point_status/skins/default/status.html
@@ -1,27 +1,12 @@
-<!--@if($colorset=="black")-->
-    {@ $colorset="black"}
-<!--@else-->
-    {@ $colorset="white"}
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
 <!--@end-->
-<!--%import("status.css")-->
-
-<div class="point_status_{$colorset}">
-    <div class="level">
-        Lv.<strong>{$widget_info->level}</strong>
-    </div>
-    <div class="next">
-        <strong>{$widget_info->per}%</strong>
-        <span class="next_point">(-{$widget_info->next_point-$widget_info->point})</span>
-    </div>
-
-    <div class="clear"></div>
-
-    <div class="bar_box">
-        <div style="width:{$widget_info->per}%;" class="bar"></div>
-    </div>
-
-    <div class="point">
-        {number_format($widget_info->point)}{$widget_info->point_unit} 
-    </div>
 
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <dl class="widgetPoint">
+        <dt>Level. {$widget_info->level}</dt>
+        <dd class="graph"><img src="./img/white/linePoint.gif" width="1" height="5" alt="{$widget_info->per}%" style="width:{$widget_info->per}%" /></dd>
+        <dd class="point">{number_format($widget_info->point)}/{number_format($widget_info->next_point)} {$widget_info->point_unit}</dd>
+        <dd class="percentage">{$widget_info->per}%</dd>
+    </dl>
 </div>
diff --git a/widgets/rank_count/conf/info.xml b/widgets/rank_count/conf/info.xml
index 4039d7169..de39951ec 100644
--- a/widgets/rank_count/conf/info.xml
+++ b/widgets/rank_count/conf/info.xml
@@ -14,8 +14,8 @@
     <description xml:lang="zh-CN">按发表主题/评论/附件/推荐/查看数显示会员排行的控件。</description>
     <description xml:lang="ru">Этот виджет отображает рейтинг статей и комментариев.</description>
     <description xml:lang="zh-TW">顯示會員主題數與回覆數的排行榜。</description>
-    <version>1.0</version>
-    <date>2007-10-07</date>
+    <version>1.5</version>
+    <date>2009-02-23</date>
 
     <author email_address="simulz@simulz.com" link="http://www.simulz.com">
         <name xml:lang="ko">Simulz</name>
@@ -28,23 +28,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="ru">Заголовок</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">위젯의 제목으로 출력됩니다.</description>
-            <description xml:lang="jp">ウィジェットのタイトルとして出力されます。</description>
-            <description xml:lang="zh-CN">显示为控件的栏目名。</description>
-            <description xml:lang="en">It will be the title.</description>
-            <description xml:lang="es">Será el título.</description>
-            <description xml:lang="ru">Это будет заголовком.</description>
-            <description xml:lang="zh-TW">控件的標題。</description>
-        </var>
         <var id="list_count">
             <type>text</type>
             <name xml:lang="ko">목록수</name>
@@ -129,45 +112,8 @@
                 <name xml:lang="zh-TW">點閱</name>
             </options>
         </var>
-        <var id="without_admin">
-            <type>select</type>
-            <name xml:lang="ko">관리자</name>
-            <name xml:lang="jp">管理者</name>
-            <name xml:lang="zh-CN">显示管理员</name>
-            <name xml:lang="en">Without Admin</name>
-            <name xml:lang="es">Sin Admin</name>
-            <name xml:lang="ru">Без админа</name>
-            <name xml:lang="zh-TW">管理員</name>
-            <description xml:lang="ko">순위에 관리자를 포함합니다.</description>
-            <description xml:lang="jp">順位に管理者を含みます。</description>
-            <description xml:lang="zh-CN">选择排行榜是否要显示管理员。</description>
-            <description xml:lang="en">Disables admins' ranking</description>
-            <description xml:lang="es">Desactiva admins' ranking</description>
-            <description xml:lang="ru">Отключает учет рейтинга админов</description>
-            <description xml:lang="zh-TW">排行榜中是否顯示管理員。</description>
-            <options>
-                <value>false</value>
-                <name xml:lang="ko">포함</name>
-                <name xml:lang="jp">含む</name>
-                <name xml:lang="zh-CN">显示</name>
-                <name xml:lang="en">False</name>
-                <name xml:lang="es">Falso</name>
-                <name xml:lang="ru">Нет</name>
-                <name xml:lang="zh-TW">顯示</name>
-            </options>
-            <options>
-                <value>true</value>
-                <name xml:lang="ko">미포함</name>
-                <name xml:lang="jp">含まない</name>
-                <name xml:lang="zh-CN">不显示</name>
-                <name xml:lang="en">True</name>
-                <name xml:lang="es">Verdadero</name>
-                <name xml:lang="ru">Да</name>
-                <name xml:lang="zh-TW">隱藏</name>
-            </options>
-        </var>
         <var id="with_group">
-            <type>text</type>
+            <type>member_group</type>
             <name xml:lang="ko">그룹 포함</name>
             <name xml:lang="jp">グループを含む</name>
             <name xml:lang="zh-CN">用户组</name>
@@ -175,32 +121,15 @@
             <name xml:lang="es">Con Grupo</name>
             <name xml:lang="ru">С группой</name>
             <name xml:lang="zh-TW">用戶組</name>
-            <description xml:lang="ko">출력할 회원 그룹명을 입력하세요. 예)준회원,정회원</description>
-            <description xml:lang="jp">出力する会員グループ名を入力してください（例：準会員、正会員）。</description>
-            <description xml:lang="zh-CN">请输入要显示的会员组。例)准会员,正会员</description>
-            <description xml:lang="en">Enables group's ranking</description>
-            <description xml:lang="es">Permite grupo de la clasificación</description>
-            <description xml:lang="ru">Включает учет рейтинга группы</description>
-            <description xml:lang="zh-TW">請輸入要顯示的會員組。例)準會員，正式會員</description>
+            <description xml:lang="ko">출력할 회원 그룹명을 입력하세요. 예)준회원,정회원, (선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="jp">出力する会員グループ名を入力してください（例：準会員、正会員）。(선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="zh-CN">请输入要显示的会员组。例)准会员,正会员 (선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="en">Enables group's ranking (선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="es">Permite grupo de la clasificación (선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="ru">Включает учет рейтинга группы (선택이 되지 않으면 출력이 되지 않습니다.)</description>
+            <description xml:lang="zh-TW">請輸入要顯示的會員組。例)準會員，正式會員 (선택이 되지 않으면 출력이 되지 않습니다.)</description>
         </var>
-        <var id="without_group">
-            <type>text</type>
-            <name xml:lang="ko">그룹 제외</name>
-            <name xml:lang="jp">グループ除外</name>
-            <name xml:lang="zh-CN">豁免用户组</name>
-            <name xml:lang="en">Without Group</name>
-            <name xml:lang="es">Sin Grupo</name>
-            <name xml:lang="ru">Без группы</name>
-            <name xml:lang="zh-TW">排除用戶組</name>
-            <description xml:lang="ko">제외할 회원 그룹명을 입력하세요. 예)관리그룹</description>
-            <description xml:lang="jp">除外するグループ名を入力してください（例：管理グループ）</description>
-            <description xml:lang="zh-CN">请输入豁免用户组名。例)管理组</description>
-            <description xml:lang="en">Disables group's ranking</description>
-            <description xml:lang="es">Desactiva grupo de la clasificación</description>
-            <description xml:lang="ru">Выключает учет рейтинга группы</description>
-            <description xml:lang="zh-TW">請輸入要排除的用戶組名。例)管理組</description>
-        </var>
-        <var id="regdate">
+        <var id="period">
             <type>text</type>
             <name xml:lang="ko">기간(일)</name>
             <name xml:lang="jp">期間（日）</name>
@@ -218,4 +147,4 @@
             <description xml:lang="zh-TW">顯示設置期間內的會員排行。</description>
         </var>
     </extra_vars>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/widgets/rank_count/queries/getRankCommentCount.xml b/widgets/rank_count/queries/getRankCommentCount.xml
index 255defc7a..adf7a6fc9 100644
--- a/widgets/rank_count/queries/getRankCommentCount.xml
+++ b/widgets/rank_count/queries/getRankCommentCount.xml
@@ -1,25 +1,29 @@
 <query id="getRankCommentCount" action="select">
     <tables>
         <table name="comments" alias="comments" />
+        <table name="modules" alias="modules" />
         <table name="member" alias="member" />
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns>
         <column name="member.*" />
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="excess" column="comments.member_srl" default="0" />
-        <condition operation="equal" column="comments.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="comments.regdate" var="regdate" pipe="or" />
-        </group>
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="comments.module_srl" pipe="and" />
+        <condition operation="equal" column="comments.member_srl" default="member.member_srl" pipe="and" />
+        <condition operation="more" column="comments.regdate" var="regdate" pipe="and" />
+        <condition operation="equal" column="member_group.member_srl" default="member.member_srl" pipe="and" />
+        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" pipe="and" />
+
     </conditions>
     <groups>
         <group column="comments.member_srl" />
     </groups>
     <navigation>
         <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
+        <list_count var="list_count" default="5" />
     </navigation>
-</query>
\ No newline at end of file
+</query>
diff --git a/widgets/rank_count/queries/getRankCommentCountWithinGroup.xml b/widgets/rank_count/queries/getRankCommentCountWithinGroup.xml
deleted file mode 100644
index e17f51f70..000000000
--- a/widgets/rank_count/queries/getRankCommentCountWithinGroup.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<query id="getRankCommentCount" action="select">
-    <tables>
-        <table name="comments" alias="comments" />
-        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
-    </tables>
-    <columns>
-        <column name="member.*" />
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" />
-        <condition operation="notequal" column="member_group.group_srl" var="selected_group_without_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
-        <condition operation="excess" column="comments.member_srl" default="0" pipe="and" />
-        <condition operation="equal" column="comments.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="comments.regdate" var="regdate" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="comments.member_srl" />
-    </groups>
-    <navigation>
-        <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
-    </navigation>
-</query>
\ No newline at end of file
diff --git a/widgets/rank_count/queries/getRankDocumentCount.xml b/widgets/rank_count/queries/getRankDocumentCount.xml
index bed4d0a34..1dce0b36c 100644
--- a/widgets/rank_count/queries/getRankDocumentCount.xml
+++ b/widgets/rank_count/queries/getRankDocumentCount.xml
@@ -1,25 +1,29 @@
 <query id="getRankDocumentCount" action="select">
     <tables>
         <table name="documents" alias="documents" />
+        <table name="modules" alias="modules" />
         <table name="member" alias="member" />
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns>
         <column name="member.*" />
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="excess" column="documents.member_srl" default="0" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="documents.member_srl" default="member.member_srl" pipe="and" />
+        <condition operation="more" column="documents.regdate" var="regdate" pipe="and" />
+        <condition operation="equal" column="member_group.member_srl" default="member.member_srl" pipe="and" />
+        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" pipe="and" />
+
     </conditions>
     <groups>
         <group column="documents.member_srl" />
     </groups>
     <navigation>
         <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
+        <list_count var="list_count" default="5" />
     </navigation>
 </query>
diff --git a/widgets/rank_count/queries/getRankDocumentCountWithinGroup.xml b/widgets/rank_count/queries/getRankDocumentCountWithinGroup.xml
deleted file mode 100644
index 43f4c2860..000000000
--- a/widgets/rank_count/queries/getRankDocumentCountWithinGroup.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<query id="getRankDocumentCount" action="select">
-    <tables>
-        <table name="documents" alias="documents" />
-        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
-    </tables>
-    <columns>
-        <column name="member.*" />
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" />
-        <condition operation="notequal" column="member_group.group_srl" var="selected_group_without_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
-        <condition operation="excess" column="documents.member_srl" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="documents.member_srl" />
-    </groups>
-    <navigation>
-        <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
-    </navigation>
-</query>
diff --git a/widgets/rank_count/queries/getRankReadedCount.xml b/widgets/rank_count/queries/getRankReadedCount.xml
index 42bed8369..c1255ac95 100644
--- a/widgets/rank_count/queries/getRankReadedCount.xml
+++ b/widgets/rank_count/queries/getRankReadedCount.xml
@@ -1,26 +1,29 @@
-<query id="getRankReadedCount" action="select">
+<query id="getRankRadedCount" action="select">
     <tables>
         <table name="documents" alias="documents" />
+        <table name="modules" alias="modules" />
         <table name="member" alias="member" />
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns>
         <column name="member.*" />
-        <column name="sum(readed_count)" alias="count" />
+        <column name="sum(documents.readed_count)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="excess" column="documents.member_srl" default="0" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="documents.member_srl" default="member.member_srl" pipe="and" />
         <condition operation="excess" column="documents.readed_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
+        <condition operation="more" column="documents.regdate" var="regdate" pipe="and" />
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0"  pipe="and"/>
+        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" pipe="and" />
+        <condition operation="equal" column="member_group.member_srl" default="member.member_srl" pipe="and" />
     </conditions>
     <groups>
         <group column="documents.member_srl" />
     </groups>
     <navigation>
         <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
+        <list_count var="list_count" default="5" />
     </navigation>
 </query>
diff --git a/widgets/rank_count/queries/getRankReadedCountWithinGroup.xml b/widgets/rank_count/queries/getRankReadedCountWithinGroup.xml
deleted file mode 100644
index 7107106dc..000000000
--- a/widgets/rank_count/queries/getRankReadedCountWithinGroup.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<query id="getRankReadedCountWithinGroup" action="select">
-    <tables>
-        <table name="documents" alias="documents" />
-        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
-    </tables>
-    <columns>
-        <column name="member.*" />
-        <column name="sum(readed_count)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" />
-        <condition operation="notequal" column="member_group.group_srl" var="selected_group_without_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
-        <condition operation="excess" column="documents.member_srl" default="0" pipe="and" />
-        <condition operation="excess" column="documents.readed_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="documents.member_srl" />
-    </groups>
-    <navigation>
-        <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
-    </navigation>
-</query>
diff --git a/widgets/rank_count/queries/getRankUploadedCount.xml b/widgets/rank_count/queries/getRankUploadedCount.xml
index c14a1bc27..81f5a90e8 100644
--- a/widgets/rank_count/queries/getRankUploadedCount.xml
+++ b/widgets/rank_count/queries/getRankUploadedCount.xml
@@ -1,26 +1,30 @@
 <query id="getRankUploadedCount" action="select">
     <tables>
-        <table name="documents" alias="documents" />
+        <table name="files" alias="files" />
+        <table name="modules" alias="modules" />
         <table name="member" alias="member" />
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns>
         <column name="member.*" />
-        <column name="sum(uploaded_count)" alias="count" />
+        <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="excess" column="documents.member_srl" default="0" />
-        <condition operation="excess" column="documents.uploaded_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="files.module_srl" pipe="and" />
+        <condition operation="equal" column="files.member_srl" default="member.member_srl" pipe="and" />
+        <condition operation="more" column="files.regdate" var="regdate" pipe="and" />
+
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0"  pipe="and" />
+        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" pipe="and" />
+        <condition operation="equal" column="member_group.member_srl" default="member.member_srl" pipe="and" />
+
     </conditions>
     <groups>
-        <group column="documents.member_srl" />
+        <group column="files.member_srl" />
     </groups>
     <navigation>
         <index var="sort_index" default="count" order="desc" />
         <list_count var="list_count" default="20" />
     </navigation>
-</query>
+</query>
\ No newline at end of file
diff --git a/widgets/rank_count/queries/getRankUploadedCountWithinGroup.xml b/widgets/rank_count/queries/getRankUploadedCountWithinGroup.xml
deleted file mode 100644
index 24613ed2b..000000000
--- a/widgets/rank_count/queries/getRankUploadedCountWithinGroup.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<query id="getRankUploadedCountWithinGroup" action="select">
-    <tables>
-        <table name="documents" alias="documents" />
-        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
-    </tables>
-    <columns>
-        <column name="member.*" />
-        <column name="sum(uploaded_count)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" />
-        <condition operation="notequal" column="member_group.group_srl" var="selected_group_without_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
-        <condition operation="excess" column="documents.member_srl" default="0" pipe="and" />
-        <condition operation="excess" column="documents.uploaded_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="documents.member_srl" />
-    </groups>
-    <navigation>
-        <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
-    </navigation>
-</query>
diff --git a/widgets/rank_count/queries/getRankVotedCount.xml b/widgets/rank_count/queries/getRankVotedCount.xml
index 74335b7af..cac0f2adf 100644
--- a/widgets/rank_count/queries/getRankVotedCount.xml
+++ b/widgets/rank_count/queries/getRankVotedCount.xml
@@ -1,26 +1,29 @@
 <query id="getRankVotedCount" action="select">
     <tables>
         <table name="documents" alias="documents" />
+        <table name="modules" alias="modules" />
         <table name="member" alias="member" />
+        <table name="member_group_member" alias="member_group" />
     </tables>
     <columns>
         <column name="member.*" />
-        <column name="sum(voted_count)" alias="count" />
+        <column name="sum(documents.voted_count)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="excess" column="documents.member_srl" default="0" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" pipe="and" />
+        <condition operation="equal" column="documents.member_srl" default="member.member_srl" pipe="and" />
         <condition operation="excess" column="documents.voted_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
+        <condition operation="more" column="documents.regdate" var="regdate" pipe="and" />
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0" pipe="and" />
+        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" pipe="and" />
+        <condition operation="equal" column="member_group.member_srl" default="member.member_srl" pipe="and" />
     </conditions>
     <groups>
         <group column="documents.member_srl" />
     </groups>
     <navigation>
         <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
+        <list_count var="list_count" default="5" />
     </navigation>
 </query>
diff --git a/widgets/rank_count/queries/getRankVotedCountWithinGroup.xml b/widgets/rank_count/queries/getRankVotedCountWithinGroup.xml
deleted file mode 100644
index e10fb585d..000000000
--- a/widgets/rank_count/queries/getRankVotedCountWithinGroup.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<query id="getRankVotedCountWithinGroup" action="select">
-    <tables>
-        <table name="documents" alias="documents" />
-        <table name="member" alias="member" />
-        <table name="member_group_member" alias="member_group"/>
-    </tables>
-    <columns>
-        <column name="member.*" />
-        <column name="sum(voted_count)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="member_group.group_srl" var="selected_group_srl" />
-        <condition operation="notequal" column="member_group.group_srl" var="selected_group_without_srl" pipe="and" />
-        <condition operation="equal" column="member.member_srl" var="member_group.member_srl" pipe="and" notnull="notnull" />
-        <condition operation="excess" column="documents.member_srl" default="0" pipe="and" />
-        <condition operation="excess" column="documents.voted_count" default="0" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member.member_srl" pipe="and" />
-        <condition operation="equal" column="member.is_admin" var="is_admin" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="documents.regdate" var="regdate" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="documents.member_srl" />
-    </groups>
-    <navigation>
-        <index var="sort_index" default="count" order="desc" />
-        <list_count var="list_count" default="20" />
-    </navigation>
-</query>
diff --git a/widgets/rank_count/rank_count.class.php b/widgets/rank_count/rank_count.class.php
index ee06ac83e..5494c5a7b 100644
--- a/widgets/rank_count/rank_count.class.php
+++ b/widgets/rank_count/rank_count.class.php
@@ -14,101 +14,53 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
-            // 위젯 자체적으로 설정한 변수들을 체크
-            $title = $args->title;
-            $rankby = $args->rankby;
-            $period = (int)$args->regdate;
-            $list_count = (int)$args->list_count;
-            if(!$list_count) $list_count = 5;
-            $mid_list = explode(",",$args->mid_list);
-            $subject_cut_size = $args->subject_cut_size;
-            if(!$subject_cut_size) $subject_cut_size = 0;
+            // 그룹이 선택되지 않으면 출력이 되지 않는다.
+            if(!$args->with_group) return '';
 
-            //그룹 정보를 구해옴 (그룹 포함)
-            $tmp_groups = explode(",",$args->with_group);
-            $count = count($tmp_groups);
-            for($i = 0; $i < $count; $i++) {
-                $group_name = trim($tmp_groups[$i]);
-                if(!$group_name) continue;
-                $target_group[$i] = $group_name;
-            }
+            $site_module_info = Context::get('site_module_info');
+            $obj->site_srl = (int)$site_module_info->site_srl;
+            $obj->list_count = $args->list_count?$args->list_count:5;
+            $obj->selected_group_srl = $args->with_group;
 
-            //그룹 정보를 구해옴 (그룹 제외)
-            $tmp_groups = explode(",",$args->without_group);
-            $count = count($tmp_groups);
-            for($i = 0; $i < $count; $i++) {
-                $group_name = trim($tmp_groups[$i]);
-                if(!$group_name) continue;
-                $target_group_without[$i] = $group_name;
-            }
+            //if($args->without_group) $obj->selected_group_without_srl = $args->without_group;
 
-            if($period) {
+            if($args->period) {
                 $before_month_month_day = $this->convertDatetoDay( date("n") == 1 ? date("Y") - 1 : date("Y"),  date("n") == 1 ? 12 :  date("n") - 1);
-
                 $m = date("n");
                 $y = date("Y");
-
-                if(date("j") < $period) {
-                    $day = $before_month_month_day + date("j") - $period + 1;
+                if(date("j") < $args->period) {
+                    $day = $before_month_month_day + date("j") - $args->period + 1;
                     $m = $m - 1;
                     if($m < 1) {
                         $m = 12;
                         $y = $y - 1;
                     }
                 } else {
-                    $day = date("j") - $period + 1;
+                    $day = date("j") - $args->period + 1;
                 }
-
                 $widget_info->date_from = $y."-".sprintf("%02d", $m)."-".sprintf("%02d", $day);
-                $widget_info->period = $period;
+                $widget_info->period = $args->period;
                 $obj->regdate = $y.sprintf("%02d", $m).sprintf("%02d", $day).date("His");
             }
 
-            $oMemberModel = &getModel('member');
-            $this->oPointModel = &getModel('point');
-
-            $obj->list_count = $list_count;
-            $obj->is_admin = $args->without_admin == "true" ? "N" : "";
-
-            if(count($target_group) || count($target_group_without)) {
-                // 그룹 목록을 구해옴
-                $group_list = $oMemberModel->getGroups();
-
-                if(count($target_group)) {
-                    foreach($group_list as $group_srl => $val) {
-                        if(!in_array($val->title, $target_group)) continue;
-                        $target_group_srl_list[] = $group_srl;
-                    }
-                } else {
-                    foreach($group_list as $group_srl => $val) {
-                        if(!in_array($val->title, $target_group_without)) continue;
-                        $target_group_without_srl_list[] = $group_srl;
-                    }
-                }
-
-                // 해당 그룹의 멤버를 구해옴
-                if(count($target_group_srl_list) || count($target_group_without_srl_list)) {
-                    if(count($target_group_srl_list)) $obj->selected_group_srl = implode(',',$target_group_srl_list);
-                    else $obj->selected_group_without_srl = implode(',',$target_group_without_srl_list);
-                    
-                    if($rankby == "document") $output = executeQueryArray('widgets.rank_count.getRankDocumentCountWithinGroup', $obj);
-                    elseif($rankby == "comment") $output = executeQueryArray('widgets.rank_count.getRankCommentCountWithinGroup', $obj);
-                    elseif($rankby == "attach") $output = executeQueryArray('widgets.rank_count.getRankUploadedCountWithinGroup', $obj);
-                    elseif($rankby == "vote") $output = executeQueryArray('widgets.rank_count.getRankVotedCountWithinGroup', $obj);
-                    elseif($rankby == "read") $output = executeQueryArray('widgets.rank_count.getRankReadedCountWithinGroup', $obj);
-                }
+            //전체 목록을 구해옴
+            switch($args->rankby) {
+                case "read" :
+                        $output = executeQueryArray('widgets.rank_count.getRankReadedCount', $obj);
+                    break;
+                case "vote" :
+                        $output = executeQueryArray('widgets.rank_count.getRankVotedCount', $obj);
+                    break;
+                case "attach" :
+                        $output = executeQueryArray('widgets.rank_count.getRankUploadedCount', $obj);
+                    break;
+                case "comment" :
+                        $output = executeQueryArray('widgets.rank_count.getRankCommentCount', $obj);
+                    break;
+                default :
+                        $output = executeQueryArray('widgets.rank_count.getRankDocumentCount', $obj);
+                    break;
             }
-            else {
-                //전체 목록을 구해옴
-                if($rankby == "document") $output = executeQueryArray('widgets.rank_count.getRankDocumentCount', $obj);
-                elseif($rankby == "comment") $output = executeQueryArray('widgets.rank_count.getRankCommentCount', $obj);
-                elseif($rankby == "attach") $output = executeQueryArray('widgets.rank_count.getRankUploadedCount', $obj);
-                elseif($rankby == "vote") $output = executeQueryArray('widgets.rank_count.getRankVotedCount', $obj);
-                elseif($rankby == "read") $output = executeQueryArray('widgets.rank_count.getRankReadedCount', $obj);
-            }
-
-            // 오류가 생기면 그냥 무시
-            //if(!$output->toBool()) return;
 
             // 결과가 있으면 각 문서 객체화를 시킴
             if(count($output->data)) {
@@ -119,14 +71,9 @@
                 $rank_list = array();
             }
             
-            // 템플릿 파일에서 사용할 변수들을 세팅
-            if(count($mid_list)==1) $widget_info->module_name = $mid_list[0];
-
-            $widget_info->title = $title;
             $widget_info->list_count = $list_count;
             $widget_info->data = $rank_list;
             $widget_info->rankby = $rankby;
-
             Context::set('widget_info', $widget_info);
 
             // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
@@ -142,32 +89,6 @@
             return $output;
         }
 
-        /**
-         * @brief 포인트 정보 표시
-         **/
-        function point_info($member_srl) {
-                $oModuleModel = &getModel('module');
-                $this->config = $oModuleModel->getModuleConfig('point');
-
-            $point = $this->oPointModel->getPoint($member_srl);
-            $level = $this->oPointModel->getLevel($point, $this->config->level_step);
-
-            $src = sprintf("modules/point/icons/%s/%d.gif", $this->config->level_icon, $level);
-                $info = getimagesize($src);
-                $this->icon_width = $info[0];
-                $this->icon_height = $info[1];
-
-            if($level < $this->config->max_level) {
-                $next_point = $this->config->level_step[$level+1];
-                if($next_point > 0) {
-                    $per = (int)($point / $next_point*100);
-                }
-            }
-
-            $code = sprintf('title="%s:%s%s %s, %s:%s/%s" style="background:url(%s) no-repeat left;padding-left:%dpx; height:%dpx"', Context::getLang('point'), $point, $this->config->point_name, $per?"(".$per."%)":"", Context::getLang('level'), $level, $this->config->max_level, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height);
-            return $code;
-        }
-
         /**
          * @brief 날짜 수 계산
          **/
diff --git a/widgets/rank_count/skins/default/css/widget.css b/widgets/rank_count/skins/default/css/widget.css
new file mode 100644
index 000000000..e3add91fb
--- /dev/null
+++ b/widgets/rank_count/skins/default/css/widget.css
@@ -0,0 +1,34 @@
+@charset "utf-8";
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetOlistA li{ margin-left:25px;}
+.widgetOlistA li,
+.widgetOlistA li a{ color:#666;}
+.widgetOlistA li sup{ color:#AAA; font-size:10px; font-family:tahoma;}
+
+address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
+address.period { color:#AAA; }
+
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer.black .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetContainer.black .widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetContainer.black .widgetOlistA li{ margin-left:25px;}
+.widgetContainer.black .widgetOlistA li,
+.widgetContainer.black .widgetOlistA li a{ color:#999;}
+.widgetContainer.black .widgetOlistA li sup{ color:#666; font-size:10px; font-family:tahoma;}
+
+.widgetContainer.black address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
+.widgetContainer.black address.period { color:#666; }
diff --git a/widgets/rank_count/skins/default/list.html b/widgets/rank_count/skins/default/list.html
new file mode 100644
index 000000000..59bf7d3a0
--- /dev/null
+++ b/widgets/rank_count/skins/default/list.html
@@ -0,0 +1,17 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ol class="widgetOlistA">
+        {@ $no = 1}
+        <!--@foreach($widget_info->data as $val)-->
+        <li><a href="#" class="member_{$val->member_srl}" onclick="return false;">{$val->nick_name}</a> <sup>{number_format($val->count)}</sup></li>
+        {@ $no++}
+        <!--@end-->
+    </ol>
+    <!--@if($widget_info->period)-->
+    <address class="period">{$widget_info->date_from} ~ {date("Y-m-d")}</address>
+    <!--@end-->
+</div>
+
diff --git a/widgets/rank_count/skins/default/skin.xml b/widgets/rank_count/skins/default/skin.xml
new file mode 100644
index 000000000..e4715b1d4
--- /dev/null
+++ b/widgets/rank_count/skins/default/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">기본 회원 랭킹 스킨</title>
+    <description xml:lang="ko">글/댓글/파일업로드 추천/조회수로 회원 랭킹을 출력하는 기본 스킨입니다</description>
+    <version>0.1</version>
+    <date>2009-02-23</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/rank_count/skins/sz_xe/list.html b/widgets/rank_count/skins/sz_xe/list.html
index 7aa3bbfcd..8d44a6a26 100644
--- a/widgets/rank_count/skins/sz_xe/list.html
+++ b/widgets/rank_count/skins/sz_xe/list.html
@@ -4,9 +4,11 @@
 
 <div class="szrank_count">
     <div class="sz_{$colorset}">
+
         <!--@if($widget_info->title)-->
         <h2>{$widget_info->title} Top {$widget_info->list_count}</h2>
         <!--@end-->
+
         <!--@if($widget_info->period)-->
         <h5>(기간: {$widget_info->period}일, {$widget_info->date_from}~)</h5>
         <!--@end-->
diff --git a/widgets/rank_download/conf/info.xml b/widgets/rank_download/conf/info.xml
index a8df8157a..784f30fbe 100644
--- a/widgets/rank_download/conf/info.xml
+++ b/widgets/rank_download/conf/info.xml
@@ -14,8 +14,8 @@
     <description xml:lang="zh-CN">显示附件下载排行的控件。</description>
     <description xml:lang="ru">Этот виджет отображает рейтинг закачек.</description>
     <description xml:lang="zh-TW">顯示附件的下載排行榜。</description>
-    <version>0.1</version>
-    <date>2007-08-29</date>
+    <version>1.5</version>
+    <date>2009-02-23</date>
 
     <author email_address="k10206@naver.com" link="http://php.simulz.com">
         <name xml:lang="ko">Simulz</name>
@@ -28,23 +28,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="ru">Залоговок</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">위젯의 제목으로 출력됩니다.</description>
-            <description xml:lang="jp">ウィジェットのタイトルとして出力されます。</description>
-            <description xml:lang="en">It will be displayed as widget's title.</description>
-            <description xml:lang="es">Que se mostrarán en forma de widget de título.</description>
-            <description xml:lang="zh-CN">显示为控件的栏目名。</description>
-            <description xml:lang="ru">Это будет заголовком виджета.</description>
-            <description xml:lang="zh-TW">顯示控件的標題。</description>
-        </var>
         <var id="list_count">
             <type>text</type>
             <name xml:lang="ko">목록수</name>
@@ -159,7 +142,7 @@
             <description xml:lang="jp">選択したモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
             <description xml:lang="en">Articles in selected module will be target.</description>
             <description xml:lang="es">Los artículos seleccionados en el módulo se meta.</description>
-            <description xml:lang="zh-CN">将把被选模块中的主题作为对象。</description>
+            <description xml:lang="zh-CN">将把所选模块中的主题作为对象。</description>
             <description xml:lang="ru">Статьи в выбранном модуле будут назначением.</description>
             <description xml:lang="zh-TW">將所選擇的模組當作目標。</description>
         </var>
diff --git a/widgets/rank_download/queries/getFileList.xml b/widgets/rank_download/queries/getFileList.xml
index 51914e104..c332a7f66 100644
--- a/widgets/rank_download/queries/getFileList.xml
+++ b/widgets/rank_download/queries/getFileList.xml
@@ -1,18 +1,21 @@
 <query id="getFileList" action="select">
     <tables>
         <table name="files" />
+        <table name="modules" />
     </tables>
     <columns>
-        <column name="*" />
+        <column name="files.*" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="s_module_srl" />
-        <condition operation="equal" column="isvalid" var="isvalid" pipe="and" />
-        <condition operation="more" column="download_count" var="s_download_count" pipe="and" />
-        <condition operation="equal" column="direct_download" var="direct_download" pipe="and" />
+        <condition operation="equal" column="modules.site_srl" var="site_srl" />
+        <condition operation="in" column="modules.module_srl" var="module_srl" pipe="and" />
+        <condition operation="equal" column="files.module_srl" default="modules.module_srl" pipe="and" />
+        <condition operation="equal" column="files.isvalid" default="Y" pipe="and" />
+        <condition operation="more" column="files.download_count" var="download_count" pipe="and" />
+        <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
     </conditions>
     <navigation>
-        <index var="sort_index" default="download_count" order="desc" />
+        <index var="sort_index" default="files.download_count" order="desc" />
         <list_count var="list_count" default="20" />
     </navigation>
 </query>
diff --git a/widgets/rank_download/rank_download.class.php b/widgets/rank_download/rank_download.class.php
index 8a5a73e1f..71d6d21c6 100644
--- a/widgets/rank_download/rank_download.class.php
+++ b/widgets/rank_download/rank_download.class.php
@@ -14,6 +14,17 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
             // 제목
             $title = $args->title;
 
@@ -28,26 +39,12 @@
             $list_count = (int)$args->list_count;
             if(!$list_count) $list_count = 5;
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            } else $module_srl = explode(',',$args->module_srls);
+            // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+            $site_module_info = Context::get('site_module_info');
+            if($args->module_srls) $obj->module_srl = $args->module_srls;
+            else if($site_module_info) $obj->site_srl = (int)$site_module_info->site_srl;
 
             // FileModel::getFileList()를 이용하기 위한 변수 정리
-            $obj->s_module_srl = implode(',',$module_srl);
             $obj->direct_download = ($args->attach_type == "noimage") ? "N": (($args->attach_type == "image") ? "Y" : "");
 
             if($args->without_image == "true") $obj->direct_download = "N";
@@ -56,7 +53,7 @@
             $obj->order_type = $args->order_type;
 
             // 다운로드 횟수 1이상만 검색
-            $obj->s_download_count = 1;
+            $obj->download_count = 1;
 
             $output = executeQueryArray('widgets.rank_download.getFileList', $obj);
 
diff --git a/widgets/rank_point/conf/info.xml b/widgets/rank_point/conf/info.xml
index 6e3b06526..71919d168 100644
--- a/widgets/rank_point/conf/info.xml
+++ b/widgets/rank_point/conf/info.xml
@@ -28,23 +28,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="es">Título</name>
-            <name xml:lang="ru">Название</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">위젯의 제목으로 출력됩니다.</description>
-            <description xml:lang="jp">ウィジェットのタイトルとして出力します。</description>
-            <description xml:lang="en">It will be displayed as widget's title.</description>
-            <description xml:lang="es">Que se mostrarán en forma de widget de título.</description>
-            <description xml:lang="zh-CN">显示为控件的栏目名。</description>
-            <description xml:lang="ru">Это будет заголовком виджета.</description>
-            <description xml:lang="zh-TW">顯示控件的標題。</description>
-        </var>
         <var id="list_count">
             <type>text</type>
             <name xml:lang="ko">목록수</name>
@@ -100,7 +83,7 @@
             </options>
         </var>
         <var id="with_group">
-            <type>text</type>
+            <type>member_group</type>
             <name xml:lang="ko">그룹 포함</name>
             <name xml:lang="jp">グループを含む</name>
             <name xml:lang="en">Include Group</name>
@@ -117,7 +100,7 @@
             <description xml:lang="zh-TW">請輸入要顯示的會員組。例)準會員，正會員</description>
         </var>
         <var id="without_group">
-            <type>text</type>
+            <type>member_group</type>
             <name xml:lang="ko">그룹 제외</name>
             <name xml:lang="jp">グループ除外</name>
             <name xml:lang="en">Exclude Group</name>
@@ -134,4 +117,4 @@
             <description xml:lang="zh-TW">請輸入排除用戶組。例)管理組</description>
         </var>
     </extra_vars>
-</widget>
\ No newline at end of file
+</widget>
diff --git a/widgets/rank_point/rank_point.class.php b/widgets/rank_point/rank_point.class.php
index 4b609926e..89a62d713 100644
--- a/widgets/rank_point/rank_point.class.php
+++ b/widgets/rank_point/rank_point.class.php
@@ -21,24 +21,6 @@
             $subject_cut_size = $args->subject_cut_size;
             if(!$subject_cut_size) $subject_cut_size = 0;
 
-            //그룹 정보를 구해옴 (그룹 포함)
-            $tmp_groups = explode(",",$args->with_group);
-            $count = count($tmp_groups);
-            for($i = 0; $i < $count; $i++) {
-                $group_name = trim($tmp_groups[$i]);
-                if(!$group_name) continue;
-                $target_group[$i] = $group_name;
-            }
-
-            //그룹 정보를 구해옴 (그룹 제외)
-            $tmp_groups = explode(",",$args->without_group);
-            $count = count($tmp_groups);
-            for($i = 0; $i < $count; $i++) {
-                $group_name = trim($tmp_groups[$i]);
-                if(!$group_name) continue;
-                $target_group_without[$i] = $group_name;
-            }
-
             $oMemberModel = &getModel('member');
             $this->oPointModel = &getModel('point');
 
@@ -47,28 +29,10 @@
 
             $output = new Object();
 
-            if(count($target_group) || count($target_group_without)) {
-                // 그룹 목록을 구해옴
-                $group_list = $oMemberModel->getGroups();
-
-                if(count($target_group)) {
-                    foreach($group_list as $group_srl => $val) {
-                        if(!in_array($val->title, $target_group)) continue;
-                        $target_group_srl_list[] = $group_srl;
-                    }
-                } else {
-                    foreach($group_list as $group_srl => $val) {
-                        if(!in_array($val->title, $target_group_without)) continue;
-                        $target_group_without_srl_list[] = $group_srl;
-                    }
-                }
-
-                // 해당 그룹의 멤버를 구해옴
-                if(count($target_group_srl_list) || count($target_group_without_srl_list)) {
-                    if(count($target_group_srl_list)) $obj->selected_group_srl = implode(',',$target_group_srl_list);
-                    else $obj->selected_group_without_srl = implode(',',$target_group_without_srl_list);
-                    $output = executeQuery('widgets.rank_point.getMemberListWithinGroup', $obj);
-                }
+            if($args->with_group || $args->without->group) {
+                if($args->with_group) $obj->selected_group_srl = $args->with_group;
+                else $obj->selected_group_without_srl = $args->without_group;
+                $output = executeQuery('widgets.rank_point.getMemberListWithinGroup', $obj);
             }
             else {
               //전체 포인트 목록을 구해옴
diff --git a/widgets/rank_point/skins/default/css/widget.css b/widgets/rank_point/skins/default/css/widget.css
new file mode 100644
index 000000000..b7ab864f9
--- /dev/null
+++ b/widgets/rank_point/skins/default/css/widget.css
@@ -0,0 +1,27 @@
+@charset "utf-8";
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetOlistA li{ margin-left:25px;}
+.widgetOlistA li,
+.widgetOlistA li a{ color:#666;}
+.widgetOlistA li sup{ color:#AAA; font-size:10px; font-family:tahoma; padding-left:10px;}
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer.black .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetContainer.black .widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetContainer.black .widgetOlistA li{ margin-left:25px;}
+.widgetContainer.black .widgetOlistA li,
+.widgetContainer.black .widgetOlistA li a{ color:#999;}
+.widgetContainer.black .widgetOlistA li sup{ color:#666; font-size:10px; font-family:tahoma; padding-left:10px;}
diff --git a/widgets/rank_point/skins/default/list.html b/widgets/rank_point/skins/default/list.html
new file mode 100644
index 000000000..e9e8f3d2b
--- /dev/null
+++ b/widgets/rank_point/skins/default/list.html
@@ -0,0 +1,17 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ol class="widgetOlistA">
+        {@ $no = 1}
+        <!--@foreach($widget_info->point_list as $val)-->
+        <li><a href="#" class="member_{$val->member_srl}" onclick="return false;">{$val->nick_name}</a> <sup>{number_format($val->point)}</sup></li>
+        {@ $no++}
+        <!--@end-->
+    </ol>
+    <!--@if($widget_info->period)-->
+    <address class="period">{$widget_info->date_from} ~ {date("Y-m-d")}</address>
+    <!--@end-->
+</div>
+
diff --git a/widgets/rank_point/skins/default/skin.xml b/widgets/rank_point/skins/default/skin.xml
new file mode 100644
index 000000000..da837a8b3
--- /dev/null
+++ b/widgets/rank_point/skins/default/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">기본 회원 포인트 랭킹 스킨</title>
+    <description xml:lang="ko">회원의 포인트 랭킹 출력 위젯 기본 스킨</description>
+    <version>0.1</version>
+    <date>2009-02-23</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/rss_reader/conf/info.xml b/widgets/rss_reader/conf/info.xml
index bb48dcbec..c083786de 100644
--- a/widgets/rss_reader/conf/info.xml
+++ b/widgets/rss_reader/conf/info.xml
@@ -25,20 +25,6 @@
     </author>
 
     <extra_vars>
-        <var id="title">
-            <type>text</type>
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="en">Title</name>
-            <name xml:lang="zh-TW">標題</name>
-            <description xml:lang="ko">위젯의 제목으로 출력됩니다.</description>
-            <description xml:lang="jp">ウィジェットのタイトルとして表示されます。</description>
-            <description xml:lang="en">It will be displayed as widget's title.</description>
-            <description xml:lang="zh-CN">显示为栏目名。</description>
-            <description xml:lang="ru">Это будет заголовком виджета.</description>
-            <description xml:lang="zh-TW">顯示標題名稱。</description>
-        </var>
 	<var id="subject_cut_size">
 		<type>text</type>
 		<name xml:lang="ko">제목 글자수</name>
diff --git a/widgets/rss_reader/rss_reader.class.php b/widgets/rss_reader/rss_reader.class.php
index 539e49d59..bdd8f025f 100644
--- a/widgets/rss_reader/rss_reader.class.php
+++ b/widgets/rss_reader/rss_reader.class.php
@@ -10,6 +10,53 @@
     require_once('HTTP/Request.php');
 
     class rss_reader extends WidgetHandler {
+
+       /**
+         * @brief rss 주소로 부터 내용을 받아오는 함수
+         *
+         * tistory 의 경우 원본 주소가 location 헤더를 뿜는다.(내용은 없음) 이를 해결하기 위한 수정
+         **/
+        function rss_request($rss_url) {
+            // request rss
+            $rss_url = Context::convertEncodingStr($rss_url);
+            $URL_parsed = parse_url($rss_url);
+            if(strpos($URL_parsed["host"],'naver.com')) $rss_url = iconv('UTF-8', 'euc-kr', $rss_url);
+            $rss_url = str_replace(array('%2F','%3F','%3A','%3D','%3B','%26'),array('/','?',':','=',';','&'),urlencode($rss_url));
+
+            $URL_parsed = parse_url($rss_url);
+
+            $host = $URL_parsed["host"];
+            $port = $URL_parsed["port"];
+
+            if ($port == 0) $port = 80;
+
+            $path = $URL_parsed["path"];
+
+            if ($URL_parsed["query"] != '') $path .= "?".$URL_parsed["query"];
+
+            $oReqeust = new HTTP_Request($rss_url);
+            $oReqeust->addHeader('Content-Type', 'application/xml');
+            $oReqeust->setMethod('GET');
+
+            $user = $URL_parsed["user"];
+            $pass = $URL_parsed["pass"];
+
+            if($user) $oReqeust->setBasicAuth($user, $pass);
+
+            $oResponse = $oReqeust->sendRequest();
+            if (PEAR::isError($oResponse)) {
+                return new Object(-1, 'msg_fail_to_request_open');
+            }
+            $header = $oReqeust->getResponseHeader();
+            if($header['location']) {   
+                return $this->rss_request(trim($header['location']));
+            }
+            else {
+                return $oReqeust->getResponseBody();
+            }
+        }
+
+
         /**
          * @brief 위젯의 실행 부분
          *
@@ -24,31 +71,10 @@
             // 날짜 형태
             $DATE_FORMAT = $args->date_format ? $args->date_format : "Y-m-d H:i:s";
 
-            $URL_parsed = parse_url($args->rss_url); 
+            $buff = $this->rss_request($args->rss_url);
 
-            $host = $URL_parsed["host"]; 
-            $port = $URL_parsed["port"]; 
+            if(!$buff) return new Object(-1, 'msg_fail_to_request_open');
 
-            if ($port == 0) $port = 80; 
-
-            $path = $URL_parsed["path"]; 
-
-            if ($URL_parsed["query"] != "") $path .= "?".$URL_parsed["query"]; 
-
-            $oReqeust = new HTTP_Request($args->rss_url);
-            $oReqeust->addHeader('Content-Type', 'application/xml');
-            $oReqeust->setMethod('GET');
-
-            $user = $URL_parsed["user"];
-            $pass = $URL_parsed["pass"];
-
-            if($user) $oReqeust->setBasicAuth($user, $pass);
-
-            $oResponse = $oReqeust->sendRequest();
-            if (PEAR::isError($oResponse)) {
-                return new Object(-1, 'msg_fail_to_request_open');
-            }
-            $buff = $oReqeust->getResponseBody();
             $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
             if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = trim(iconv($matches[1]=="ks_c_5601-1987"?"EUC-KR":$matches[1], "UTF-8", $buff));
 
@@ -56,11 +82,11 @@
 
             $oXmlParser = new XmlParser();
             $xml_doc = $oXmlParser->parse($buff);
-
             $rss->title = $xml_doc->rss->channel->title->body;
             $rss->link = $xml_doc->rss->channel->link->body;
 
             $items = $xml_doc->rss->channel->item;
+            
             if(!$items) return; 
             if($items && !is_array($items)) $items = array($items);
 
@@ -103,5 +129,6 @@
             $output = $oTemplate->compile($tpl_path, 'list');
             return $output;
         }
+
     }
 ?>
diff --git a/widgets/site_info/conf/info.xml b/widgets/site_info/conf/info.xml
new file mode 100644
index 000000000..7cd5c9021
--- /dev/null
+++ b/widgets/site_info/conf/info.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">가상 사이트 현황</title>
+    <title xml:lang="zh-CN">站点信息</title>
+    <title xml:lang="zh-TW">虛擬網站狀態</title>
+    <description xml:lang="ko">cafeXE와 같은 분양형 가상 사이트의 정보를 출력하는 위젯입니다.</description>
+    <description xml:lang="zh-CN">显示子站点信息的控件。</description>
+    <description xml:lang="zh-TW">可輸出顯示cafeXE資訊的控件。</description>
+    <version>0.1</version>
+    <date>2009-02-16</date>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <extra_vars />
+</widget>
diff --git a/widgets/site_info/queries/getCreatedDate.xml b/widgets/site_info/queries/getCreatedDate.xml
new file mode 100644
index 000000000..bcba6e81e
--- /dev/null
+++ b/widgets/site_info/queries/getCreatedDate.xml
@@ -0,0 +1,11 @@
+<query id="getCreatedDate" action="select">
+    <tables>
+        <table name="sites" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" default="0" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/widgets/site_info/queries/getMemberCount.xml b/widgets/site_info/queries/getMemberCount.xml
new file mode 100644
index 000000000..4df02e820
--- /dev/null
+++ b/widgets/site_info/queries/getMemberCount.xml
@@ -0,0 +1,13 @@
+<query id="getMemberCount" action="select">
+    <tables>
+        <table name="member_group" />
+        <table name="member_group_member" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="cnt" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0" notnull="notnull" />
+        <condition operation="equal" column="member_group_member.group_srl" default="member_group.group_srl" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/widgets/site_info/queries/getNewDocument.xml b/widgets/site_info/queries/getNewDocument.xml
new file mode 100644
index 000000000..f1981f7f2
--- /dev/null
+++ b/widgets/site_info/queries/getNewDocument.xml
@@ -0,0 +1,14 @@
+<query id="getNewDocument" action="select">
+    <tables>
+        <table name="documents" />
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="cnt" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="modules.site_srl" var="site_srl" default="0" notnull="notnull" />
+        <condition operation="equal" column="documents.module_srl" default="modules.module_srl" notnull="notnull" pipe="and" />
+        <condition operation="more" column="documents.regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/widgets/site_info/site_info.class.php b/widgets/site_info/site_info.class.php
new file mode 100644
index 000000000..67a848670
--- /dev/null
+++ b/widgets/site_info/site_info.class.php
@@ -0,0 +1,55 @@
+<?php
+    /**
+     * @class site_info 
+     * @author zero (zero@nzeo.com)
+     * @brief 분양형 가상 사이트 현황 출력
+     * @version 0.1
+     **/
+
+    class site_info extends WidgetHandler {
+
+        /**
+         * @brief 위젯의 실행 부분
+         *
+         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
+         * 결과를 만든후 print가 아니라 return 해주어야 한다
+         **/
+        function proc($args) {
+            $oDocument = &getClass('document');
+
+            $site_module_info = Context::get('site_module_info');
+            Context::set('widget_info', $widget_info);
+
+            $args->site_srl = (int)$site_module_info->site_srl;
+
+            // 회원수 추출
+            $output = executeQuery('widgets.site_info.getMemberCount', $args);
+            $widget_info->member_count = $output->data->cnt;
+
+            // 새글 추출
+            $args->regdate = date("YmdHis", time()-24*60*60);
+            $output = executeQuery('widgets.site_info.getNewDocument', $args);
+            $widget_info->new_documents = $output->data->cnt;
+
+            // 개설일
+            $output = executeQuery('widgets.site_info.getCreatedDate', $args);
+            $widget_info->created = $output->data->regdate;
+
+            // 가입 여부
+            $logged_info = Context::get('logged_info');
+            if(count($logged_info->group_list)) $widget_info->joined = true;
+            else $widget_info->joined = false;
+
+            Context::set('widget_info', $widget_info);
+            Context::set('colorset', $args->colorset);
+
+            // 템플릿 컴파일
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            $tpl_file = 'site_info';
+
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+    }
+?>
diff --git a/widgets/site_info/skins/default/css/widget.css b/widgets/site_info/skins/default/css/widget.css
new file mode 100644
index 000000000..3dcd4ec4f
--- /dev/null
+++ b/widgets/site_info/skins/default/css/widget.css
@@ -0,0 +1,15 @@
+@charset "utf-8";
+
+/* widgetDlistA */
+.widgetDlistA{ margin:0; padding:0; font-size:12px; line-height:1.5; zoom:1;}
+.widgetDlistA:after{ content:""; display:block; clear:both;}
+.widgetDlistA dt{ float:left; clear:left; margin-right:5px; white-space:nowrap;}
+.widgetDlistA dd{ clear:right; white-space:nowrap; font-family:Tahoma;}
+
+.widgetDlistA dt{ color:#333;}
+.widgetDlistA dd,
+.widgetDlistA  dd a{ color:#888;}
+
+.widgetContainer.black .widgetDlistA dt{ color:#999;}
+.widgetContainer.black .widgetDlistA dd,
+.widgetContainer.black .widgetDlistA  dd a{ color:#888;}
diff --git a/widgets/site_info/skins/default/js/site_info.js b/widgets/site_info/skins/default/js/site_info.js
new file mode 100644
index 000000000..63911f3be
--- /dev/null
+++ b/widgets/site_info/skins/default/js/site_info.js
@@ -0,0 +1,8 @@
+function doSiteSignUp() {
+    exec_xml('member','procModuleSiteSignUp', new Array(), function() { location.reload(); } );
+}
+
+function doSiteLeave(leave_msg) {
+    if(!confirm(leave_msg)) return;
+    exec_xml('member','procModuleSiteLeave', new Array(), function() { location.reload(); } );
+}
diff --git a/widgets/site_info/skins/default/site_info.html b/widgets/site_info/skins/default/site_info.html
new file mode 100644
index 000000000..9c4d06fc9
--- /dev/null
+++ b/widgets/site_info/skins/default/site_info.html
@@ -0,0 +1,24 @@
+<!--%import("./js/site_info.js")-->
+
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <dl class="widgetDlistA">
+        <dt>{$lang->member}:</dt>
+        <dd>{number_format($widget_info->member_count)}</dd>
+        <dt class="div">{$lang->new_document_count}:</dt>
+        <dd>{number_format($widget_info->new_documents)}</dd>
+        <dt>{$lang->regdate}:</dt>
+        <dd>{zdate($widget_info->created, "Y.m.d")}</dd>
+    </dl>
+
+    <!--@if($is_logged)-->
+        <!--@if(!$widget_info->joined)-->
+        <a href="#" onclick="doSiteSignUp(); return false;" class="button green strong"><span>{$lang->cmd_site_signup}</span></a>
+        <!--@else-->
+        <a href="#" onclick="doSiteLeave('{$lang->confirm_leave}'); return false;" class="button"><span>{$lang->cmd_leave}</span></a>
+        <!--@end-->
+    <!--@end-->
+</div>
diff --git a/widgets/site_info/skins/default/skin.xml b/widgets/site_info/skins/default/skin.xml
new file mode 100644
index 000000000..5a32711d5
--- /dev/null
+++ b/widgets/site_info/skins/default/skin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">가상 사이트 현황 기본 스킨 </title>
+    <title xml:lang="zh-CN">站点信息默认皮肤</title>
+    <title xml:lang="zh-TW">虛擬網站預設面板</title>
+    <description xml:lang="ko">가상 사이트의 현황을 출력하는 기본 스킨입니다</description>
+    <description xml:lang="zh-CN">站点信息默认皮肤。</description>
+    <description xml:lang="zh-TW">虛擬網站預設面板。</description>
+    <version>0.1</version>
+    <date>2009-02-16</date>
+    <link>http://www.zeroboard.com</link>
+
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+        <name xml:lang="ko">zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/tab_newest_document/conf/info.xml b/widgets/tab_newest_document/conf/info.xml
index f5a9a4892..9a472ed1c 100644
--- a/widgets/tab_newest_document/conf/info.xml
+++ b/widgets/tab_newest_document/conf/info.xml
@@ -332,7 +332,7 @@
 			<name xml:lang="ru">Модуль назначения</name>
 			<name xml:lang="zh-TW">目標模組</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-			<description xml:lang="zh-CN">将把被选模块中的最新主题作为显示对象。</description>
+			<description xml:lang="zh-CN">将把所选模块中的最新主题作为显示对象。</description>
 			<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
 			<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
 			<description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
diff --git a/widgets/tab_newest_document/skins/xe_official/list.html b/widgets/tab_newest_document/skins/xe_official/list.html
index 23cd7a947..dc12c5a34 100644
--- a/widgets/tab_newest_document/skins/xe_official/list.html
+++ b/widgets/tab_newest_document/skins/xe_official/list.html
@@ -11,7 +11,7 @@
 <div class="tabWidget">
     <div class="tabBox">
     <!--@foreach($tab_list as $key => $val)-->
-        <div class="tab <!--@if(!$_checked)-->on{@ $_checked = true;}<!--@end-->" id="tab_{$_id_prefix}_{$key}" onmouseover="overTab(this);"><div><a href="{getUrl('','mid',$val->mid)}">{htmlspecialchars($val->browser_title)}</a></div></div>
+        <div class="tab <!--@if(!$_checked)-->on{@ $_checked = true;}<!--@end-->" id="tab_{$_id_prefix}_{$key}" onmouseover="overTab(this);"><div><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}">{$val->browser_title}</a></div></div>
     <!--@end-->
         <div class="clear"></div>
     </div>
@@ -25,7 +25,7 @@
             <!--@foreach($val->document_list as $k => $v)-->
                 <!--@if(!$_thumbnail_checked && $v->thumbnailExists($widget_info->thumbnail_width, $widget_info->thumbnail_height))-->
                     <td class="thumbnail" width="{$widget_info->thumbnail_width+12}">
-                        <a href="{getUrl('','document_srl',$v->document_srl)}"><img src="{$v->getThumbnail($widget_info->thumbnail_width,$widget_info->thumbnail_height,$widget_info->thumbnail_type)}" border="0" alt="" /></a>
+                        <a href="{getSiteUrl($val->domain,'','document_srl',$v->document_srl)}"><img src="{$v->getThumbnail($widget_info->thumbnail_width,$widget_info->thumbnail_height,$widget_info->thumbnail_type)}" border="0" alt="" /></a>
                     </td>
                     {@ $_thumbnail_checked = true; }
                 <!--@end-->
diff --git a/widgets/tab_newest_document/skins/xe_official/skin.xml b/widgets/tab_newest_document/skins/xe_official/skin.xml
index bea7164c5..9ca95e597 100644
--- a/widgets/tab_newest_document/skins/xe_official/skin.xml
+++ b/widgets/tab_newest_document/skins/xe_official/skin.xml
@@ -2,12 +2,12 @@
 <skin version="0.2">
 	<title xml:lang="ko">웹진형 최근글 출력 기본 스킨</title>
 	<title xml:lang="jp">ウェブジンスタイルの最新コンテンツ出力デフォルトスキン</title>
-	<title xml:lang="zh-CN">网络杂志型最新主题列表默认皮肤</title>
+	<title xml:lang="zh-CN">新闻型最新主题列表默认皮肤</title>
 	<title xml:lang="en">Display newest documents like webzine style</title>
 	<title xml:lang="zh-TW">最新主題式雜誌型預設面板</title>
 	<description xml:lang="ko">글 목록과 이미지가 같이 출력되는 웹진형 스킨입니다. 이미지가 있는 글들만 노출이 됩니다.</description>
 	<description xml:lang="jp">コンテンツリストとイメージが一緒に出力されるウェブジンスタイルのスキンです。イメージが含まれているコンテンツのみ表示されます。</description>
-	<description xml:lang="zh-CN">可以同时显示最新主题列表及缩略图的网络杂志型默认皮肤。只显示有图片的最新主题。</description>
+	<description xml:lang="zh-CN">图文并貌新闻型最新主题列表默认皮肤。只显示有图片的最新主题。</description>
 	<description xml:lang="en">글 목록과 이미지가 같이 출력되는 웹진형 스킨입니다. 이미지가 있는 글들만 노출이 됩니다.</description>
 	<description xml:lang="zh-TW">可顯示最新主題列表與圖片的網路雜誌型預設面板。只顯示有圖片的最新主題。</description>
 	<version>0.1</version>
diff --git a/widgets/tab_newest_document/tab_newest_document.class.php b/widgets/tab_newest_document/tab_newest_document.class.php
index 296762533..470b6cc8f 100644
--- a/widgets/tab_newest_document/tab_newest_document.class.php
+++ b/widgets/tab_newest_document/tab_newest_document.class.php
@@ -15,6 +15,20 @@
          * 결과를 만든후 print가 아니라 return 해주어야 한다
          **/
         function proc($args) {
+            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srls로 위젯에서 변경)
+            $oModuleModel = &getModel('module');
+            if($args->mid_list) {
+                $mid_list = explode(",",$args->mid_list);
+                if(count($mid_list)) {
+                    $module_srls = $oModuleModel->getModuleSrlByMid($mid_list);
+                    if(count($module_srls)) $args->module_srls = implode(',',$module_srls);
+                    else $args->module_srls = null;
+                } 
+            }
+
+            // 선택된 모듈이 없으면 실행 취소
+            if(!$args->module_srls) return Context::getLang('msg_not_founded');
+
             // 정렬 대상
             $widget_info->order_target = $args->order_target;
             if(!in_array($widget_info->order_target, array('list_order','update_order'))) $widget_info->order_target = 'list_order';
@@ -56,36 +70,28 @@
             $widget_info->duration_new = (int)$args->duration_new * 60 * 60;
             if(!$widget_info->duration_new) $widget_info->duration_new = 12 * 60 * 60;
 
-
             $oModuleModel = &getModel('module');
             $oDocumentModel = &getModel('document');
 
-            // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
-            if($args->mid_list) {
-                $mid_list = explode(",",$args->mid_list);
-                $oModuleModel = &getModel('module');
-                if(count($mid_list)) {
-                    $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                } else {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info) {
-                        $margs->site_srl = $site_module_info->site_srl;
-                        $oModuleModel = &getModel('module');
-                        $output = $oModuleModel->getMidList($margs);
-                        if(count($output)) $mid_list = array_keys($output);
-                        $module_srl = $oModuleModel->getModuleSrlByMid($mid_list);
-                    }
-                }
-            }
-            else $module_srl = explode(',' ,$args->module_srls);
-
-            if(is_array($module_srl)) $obj->module_srls = implode(',' ,$module_srl);
-
             // 모듈 목록을 구함
-            $module_list = $oModuleModel->getMidList($obj);
-            if(!$module_list || !count($module_list)) return;
-            foreach($module_list as $key => $val) $mid_module_list[$val->module_srl] = $key;
+            $module_list = $oModuleModel->getModulesInfo($args->module_srls);
+            if(!count($module_list)) return Context::getLang('msg_not_founded');
 
+            // 각 모듈별로 먼저 정리 시작
+            $site_domain = array(0 => Context::getDefaultUrl());
+            $site_module_info = Context::get('site_module_info');
+            if($site_module_info) $site_domain[$site_module_info->site_srl] = $site_module_info->domain;
+
+            foreach($module_list as $key => $val) {
+                if(!$site_domain[$val->site_srl]) {
+                    $site_info = $oModuleModel->getSiteInfo($val->site_srl);
+                    $site_domain[$site_info->site_srl] = $site_info->domain;
+                }
+                $module_list[$key]->domain = $site_domain[$val->site_srl];
+                $mid_module_list[$val->module_srl] = $key;
+            }
+
+            $module_srl = explode(',',$args->module_srls);
             for($i=0;$i<count($module_srl);$i++) $tab_list[$mid_module_list[$module_srl[$i]]] = $module_list[$mid_module_list[$module_srl[$i]]];
 
             // 각 모듈에 해당하는 문서들을 구함
@@ -103,9 +109,11 @@
                     foreach($output->data as $k => $v) {
                             $oDocument = null;
                             $oDocument = $oDocumentModel->getDocument();
-                            $oDocument->setAttribute($v);
+                            $oDocument->setAttribute($v, false);
+                            $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
                             $tab_list[$mid]->document_list[] = $oDocument;
                         }
+                        $oDocumentModel->setToAllDocumentExtraVars();
                     } else {
                         $tab_list[$mid]->document_list = array();
                     }
diff --git a/widgets/tag_list/conf/info.xml b/widgets/tag_list/conf/info.xml
index 6f65b1383..0e1cf33b2 100644
--- a/widgets/tag_list/conf/info.xml
+++ b/widgets/tag_list/conf/info.xml
@@ -8,7 +8,7 @@
 	<title xml:lang="ru">Отображение списка тегов</title>
 	<title xml:lang="zh-TW">標籤</title>
 	<description xml:lang="ko">선택된 모듈의 꼬리표 목록을 정해진 순위만큼 노출하여 줍니다</description>
-	<description xml:lang="zh-CN">显示被选模块指定个数的标签目录。</description>
+	<description xml:lang="zh-CN">此控件将显示所选模块指定个数的标签云。</description>
 	<description xml:lang="jp">選択されたモジュールのタグリストを指定された順位まで表示します。</description>
 	<description xml:lang="en">This widget displays configured number of tags from target module.</description>
 	<description xml:lang="es">Este widget muestra la liste de etiqueta según el orden definido en el módulo seleccionado.</description>
@@ -28,23 +28,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">꼬리표 출력시 제목으로 출력됩니다.</description>
-			<description xml:lang="zh-CN">显示为标签目录的标题。</description>
-			<description xml:lang="jp">タグ出力の際、タイトルとして表示されます。</description>
-			<description xml:lang="en">This will be shown as a title with tag list.</description>
-			<description xml:lang="es">Este será el título al ser mostrada la etiqueta.</description>
-			<description xml:lang="ru">Это будет показано как заголовок со списком тегов.</description>
-			<description xml:lang="zh-TW">顯示標籤列表的標題。</description>
-		</var>
 		<var id="list_count">
 			<type>text</type>
 			<name xml:lang="ko">목록수</name>
@@ -72,7 +55,7 @@
             <name xml:lang="ru">Модуль назначения</name>
             <name xml:lang="zh-TW">目標模組</name>
             <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-            <description xml:lang="zh-CN">将把被选模块当中的主题作为对象。</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
             <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
             <description xml:lang="en">The target articles for the newest comments will be the ones submitted in the selected module.</description>
             <description xml:lang="es">El objetivo de los comentarios recientes serán los comentarios agragados en el módulo selccionado.</description>
diff --git a/widgets/tag_list/skins/blog_tag_list/skin.xml b/widgets/tag_list/skins/blog_tag_list/skin.xml
index 4c6a75e3c..4e4e34f16 100644
--- a/widgets/tag_list/skins/blog_tag_list/skin.xml
+++ b/widgets/tag_list/skins/blog_tag_list/skin.xml
@@ -23,21 +23,21 @@
 	</author>
 
 	<colorset>
-		<color name="layout">
-			<title xml:lang="ko">레이아웃에 맞춤</title>
-			<title xml:lang="jp">レイアウトに合わせる</title>
-			<title xml:lang="zh-CN">随布局</title>
-			<title xml:lang="en">레이아웃에 맞춤</title>
-			<title xml:lang="zh-TW">隨版面</title>
-		</color>
+	<color name="layout">
+		<title xml:lang="ko">레이아웃에 맞춤</title>
+		<title xml:lang="jp">レイアウトに合わせる</title>
+		<title xml:lang="zh-CN">随布局</title>
+		<title xml:lang="en">레이아웃에 맞춤</title>
+		<title xml:lang="zh-TW">隨版面</title>
+	</color>
         <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="ru">Черного</title>
-            <title xml:lang="es">Negro</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
+		<title xml:lang="ko">검은색</title>
+		<title xml:lang="jp">黒</title>
+		<title xml:lang="en">Black</title>
+		<title xml:lang="ru">Черного</title>
+		<title xml:lang="es">Negro</title>
+		<title xml:lang="zh-CN">黑色</title>
+		<title xml:lang="zh-TW">黑色</title>
         </color>
 	</colorset>
 </skin>
diff --git a/widgets/tag_list/skins/blog_tag_list/tags.html b/widgets/tag_list/skins/blog_tag_list/tags.html
index e5ecb9f92..610f551ff 100644
--- a/widgets/tag_list/skins/blog_tag_list/tags.html
+++ b/widgets/tag_list/skins/blog_tag_list/tags.html
@@ -25,7 +25,7 @@
                     <!--@if($layout_info->mid)-->
                         <a href="{getUrl('','mid',$layout_info->mid,'search_target','tag','search_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
                     <!--@else-->
-                        <a href="{getUrl('act','IS','search_target','tag','is_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
+                        <a href="{getUrl('act','IS','where','document','search_target','tag','is_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
                     <!--@end-->
                 <!--@end-->
             </span>
diff --git a/widgets/tag_list/skins/default/css/widget.css b/widgets/tag_list/skins/default/css/widget.css
new file mode 100644
index 000000000..b7d02718f
--- /dev/null
+++ b/widgets/tag_list/skins/default/css/widget.css
@@ -0,0 +1,41 @@
+@charset "utf-8";
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
+.widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
+.widgetTagCloud li.level4 a{ font-size:11px;}
+.widgetTagCloud li.level3 a{ font-size:12px;}
+.widgetTagCloud li.level2 a{ font-size:14px; font-weight:bold;}
+.widgetTagCloud li.level1 a{ font-size:18px; font-weight:bold;}
+.widgetTagCloud li a{ color:#666;}
+.widgetTagCloud li.level4 a{ color:#999;}
+.widgetTagCloud li.level3 a{ color:#666;}
+.widgetTagCloud li.level2 a{ color:#333;}
+.widgetTagCloud li.level1 a{ color:#000;}
+
+.widgetContainer.black .widgetContainer a{ text-decoration:none;}
+.widgetContainer.black .widgetContainer a:hover,
+.widgetContainer.black .widgetContainer a:active,
+.widgetContainer.black .widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer.black .widgetContainer img{ border:0;}
+.widgetContainer.black .widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer.black .widgetContainer form{ margin:0; padding:0;}
+.widgetContainer.black .widgetContainer fieldset{ border:0; margin:0; padding:0;}
+.widgetContainer.black .widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
+.widgetContainer.black .widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
+.widgetContainer.black .widgetTagCloud li.level4 a{ font-size:11px;}
+.widgetContainer.black .widgetTagCloud li.level3 a{ font-size:12px;}
+.widgetContainer.black .widgetTagCloud li.level2 a{ font-size:14px; font-weight:bold;}
+.widgetContainer.black .widgetTagCloud li.level1 a{ font-size:18px; font-weight:bold;}
+.widgetContainer.black .widgetTagCloud li a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level4 a{ color:#333;}
+.widgetContainer.black .widgetTagCloud li.level3 a{ color:#666;}
+.widgetContainer.black .widgetTagCloud li.level2 a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level1 a{ color:#fff;}
+
diff --git a/widgets/tag_list/skins/default/skin.xml b/widgets/tag_list/skins/default/skin.xml
new file mode 100644
index 000000000..53c8698b1
--- /dev/null
+++ b/widgets/tag_list/skins/default/skin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+	<title xml:lang="ko">기본 꼬리표 목록 출력</title>
+	<title xml:lang="jp">Default タグリスト表示</title>
+	<title xml:lang="zh-CN">标签云默认皮肤</title>
+	<title xml:lang="en">Default Display Tag List</title>
+	<title xml:lang="zh-TW">Default 標籤列表面板</title>
+	<description xml:lang="ko">꼬리표 목록을 출력합니다.</description>
+	<description xml:lang="jp">タグリストを表示します。</description>
+	<description xml:lang="zh-CN">标签云默认皮肤。</description>
+	<description xml:lang="en">It displays tag list.</description>
+	<description xml:lang="zh-TW">顯示標籤列表。</description>
+	<version>0.1</version>
+	<date>2009-02-17</date>
+	<link>http://www.zeroboard.com</link>
+
+	<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com">
+		<name xml:lang="ko">제로</name>
+		<name xml:lang="jp">Zero</name>
+		<name xml:lang="zh-CN">zero</name>
+		<name xml:lang="en">zero</name>
+		<name xml:lang="zh-TW">zero</name>
+	</author>
+
+	<colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+	</colorset>
+</skin>
diff --git a/widgets/tag_list/skins/default/tags.html b/widgets/tag_list/skins/default/tags.html
new file mode 100644
index 000000000..bc588537f
--- /dev/null
+++ b/widgets/tag_list/skins/default/tags.html
@@ -0,0 +1,17 @@
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <ul class="widgetTagCloud">
+        <!--@foreach($widget_info->tag_list as $val)-->
+        <li class="level{$val->rank}">
+            <!--@if($widget_info->mid)-->
+                <a href="{getUrl('','mid',$widget_info->mid,'search_target','tag','search_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
+            <!--@else-->
+                <a href="{getUrl('act','IS','where','document','search_target','tag','is_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
+            <!--@end-->
+        </li>
+        <!--@end-->
+    </ul>
+</div>
diff --git a/widgets/tag_list/tag_list.class.php b/widgets/tag_list/tag_list.class.php
index de0a33399..92137a5ae 100644
--- a/widgets/tag_list/tag_list.class.php
+++ b/widgets/tag_list/tag_list.class.php
@@ -20,7 +20,8 @@
 
             // 출력된 목록 수
             $list_count = (int)$args->list_count;
-            if(!$list_count) $list_count = 5;
+            if(!$list_count) $list_count = 20;
+            $list_count ++;
 
             // 대상 모듈 (mid_list는 기존 위젯의 호환을 위해서 처리하는 루틴을 유지. module_srl로 위젯에서 변경)
             $oModuleModel = &getModel('module');
@@ -41,7 +42,7 @@
             } else $module_srl = explode(',',$args->module_srls);
 
             // TagModel::getTagList()를 이용하기 위한 변수 정리
-            $obj->module_srl = $args->module_srl;
+            $obj->module_srl = $module_srl;
             $obj->list_count = $list_count;
 
             // tag 모듈의 model 객체를 받아서 getTagList() method를 실행
@@ -67,6 +68,7 @@
                     if($max < $count) $max = $count;
                     if($min > $count) $min = $count;
                     $tags[] = $val;
+                    if(count($tags)>=20) continue;
                 }
 
                 $mid2 = $min+(int)(($max-$min)/2);
diff --git a/widgets/webzine/conf/info.xml b/widgets/webzine/conf/info.xml
index 2283812a2..c17a24bfd 100644
--- a/widgets/webzine/conf/info.xml
+++ b/widgets/webzine/conf/info.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget version="0.2">
 	<title xml:lang="ko">웹진 형태 최근 문서 출력</title>
-	<title xml:lang="zh-CN">网络杂志型主题列表</title>
+	<title xml:lang="zh-CN">主题列表(新闻型)</title>
 	<title xml:lang="jp">ウェブジンスタイル最新コンテンツ出力</title>
 	<title xml:lang="en">Newest Articles in Webzine Style</title>
 	<title xml:lang="es">Mostrar más nuevos artículos con el estilo Webzine</title>
 	<title xml:lang="ru">Отображение последних статей в стиле webzine</title>
 	<title xml:lang="zh-TW">最新主題網路雜誌樣式</title>
 	<description xml:lang="ko">최근 문서를 웹진형태로 출력하는 위젯입니다.</description>
-	<description xml:lang="zh-CN">把最新主题显示为网络杂志类型的控件。</description>
+	<description xml:lang="zh-CN">把最新主题显示为新闻类型的控件。</description>
 	<description xml:lang="jp">最新コンテンツをウェブジンスタイルで出力するウィジェットです。</description>
 	<description xml:lang="en">This widget displays newest articles with webzine style.</description>
 	<description xml:lang="es">Este widget muestra más reciente de artículos con webzine estilo.</description>
@@ -27,23 +27,6 @@
 	</author>
 
 	<extra_vars>
-		<var id="title">
-			<type>text</type>
-			<name xml:lang="ko">제목</name>
-			<name xml:lang="zh-CN">栏目名</name>
-			<name xml:lang="jp">タイトル</name>
-			<name xml:lang="en">Title</name>
-			<name xml:lang="es">Título</name>
-			<name xml:lang="ru">Заголовок</name>
-			<name xml:lang="zh-TW">標題</name>
-			<description xml:lang="ko">최근 게시물의 제목으로 출력됩니다.</description>
-			<description xml:lang="zh-CN">显示为最新主题列表的栏目名。</description>
-			<description xml:lang="jp">最近の書き込みのタイトルとして表示されます。</description>
-			<description xml:lang="en">It will be the title of the newest articles.</description>
-			<description xml:lang="es">Este será el título de los documentos recientes.</description>
-			<description xml:lang="ru">Это будет заголовком последних статей.</description>
-			<description xml:lang="zh-TW">顯示最新主題的標題。</description>
-		</var>
 		<var id="order_target">
 			<type>select</type>
 			<name xml:lang="ko">정렬 대상</name>
@@ -408,7 +391,7 @@
 			<name xml:lang="ru">Модуль назначения</name>
 			<name xml:lang="zh-TW">目標模組</name>
 			<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-			<description xml:lang="zh-CN">将把被选模块中的主题作为显示对象。</description>
+			<description xml:lang="zh-CN">将把所选模块中的主题作为显示对象。</description>
 			<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
 			<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
 			<description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
diff --git a/widgets/webzine/skins/notice_style/skin.xml b/widgets/webzine/skins/notice_style/skin.xml
index 31d3218e6..14bdaaf79 100644
--- a/widgets/webzine/skins/notice_style/skin.xml
+++ b/widgets/webzine/skins/notice_style/skin.xml
@@ -2,12 +2,12 @@
 <skin version="0.2">
 	<title xml:lang="ko">공지사항 형태의 출력</title>
 	<title xml:lang="jp">お知らせスタイル</title>
-	<title xml:lang="zh-CN">公告列表皮肤</title>
+	<title xml:lang="zh-CN">公告样式皮肤</title>
 	<title xml:lang="en">Output Result of Notice type</title>
 	<title xml:lang="zh-TW">公告樣式面板</title>
 	<description xml:lang="ko">글 목록과 이미지가 같이 출력되는 웹진형 스킨입니다. 이미지가 있는 글들만 노출이 됩니다.</description>
 	<description xml:lang="jp">コンテンツリストとイメージが一緒に出力されるウェブジンスタイルスキンです。イメージを含むコンテンツのみ表示されます。</description>
-	<description xml:lang="zh-CN">可同时显示内容及缩略图的网络杂志型默认皮肤。只显示有图片的最新主题。</description>
+	<description xml:lang="zh-CN">图文并貌新闻型最新主题列表默认皮肤。只显示有图片的最新主题。</description>
 	<description xml:lang="en">This is a webzine style skin that displays article list and images. Articles with images will be exposed only.</description>
 	<description xml:lang="zh-TW">可顯示主題列表和圖片的網路雜誌型面板。只顯示有圖片的最新主題。</description>
     <version>0.1</version>
diff --git a/widgets/webzine/skins/xe_official/skin.xml b/widgets/webzine/skins/xe_official/skin.xml
index 223f915c7..c3b899bb3 100644
--- a/widgets/webzine/skins/xe_official/skin.xml
+++ b/widgets/webzine/skins/xe_official/skin.xml
@@ -2,12 +2,12 @@
 <skin version="0.2">
     <title xml:lang="ko">웹진형 최근글 출력 기본 스킨</title>
     <title xml:lang="jp">ウェブジンスタイルの最新コンテンツ出力デフォルトスキン</title>
-    <title xml:lang="zh-CN">网络杂志型主题列表默认皮肤</title>
+    <title xml:lang="zh-CN">新闻型主题列表默认皮肤</title>
     <title xml:lang="en">Default Skin of Webzine Style Newest Articles</title>
     <title xml:lang="zh-TW">官方最新主題雜誌型預設面板</title>
     <description xml:lang="ko">글 목록과 이미지가 같이 출력되는 웹진형 스킨입니다. 이미지가 있는 글들만 노출이 됩니다.</description>
     <description xml:lang="jp">コンテンツリストとイメージが一緒に出力されるウェブジンスタイルスキンです。イメージを含むコンテンツのみ表示されます。</description>
-    <description xml:lang="zh-CN">可以同时显示最新主题列表及缩略图的网络杂志型默认皮肤。只显示有图片的最新主题。</description>
+    <description xml:lang="zh-CN">图文并貌新闻型最新主题列表默认皮肤。只显示有图片的最新主题。</description>
     <description xml:lang="en">This is a webzine style skin that displays article list and images. Articles with images will be exposed only.</description>
     <description xml:lang="zh-TW">可顯示最新主題列表和圖片的網路雜誌型預設面板。只顯示有圖片的最新主題。</description>
     <version>0.1</version>
diff --git a/widgets/webzine/webzine.class.php b/widgets/webzine/webzine.class.php
index 98e3477a5..b6a21d4c6 100644
--- a/widgets/webzine/webzine.class.php
+++ b/widgets/webzine/webzine.class.php
@@ -103,10 +103,12 @@
 
                     $oDocument = null;
                     $oDocument = new documentItem();
-                    $oDocument->setAttribute($attribute);
+                    $oDocument->setAttribute($attribute, false);
+                    $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
 
                     $document_list[$key] = $oDocument;
                 }
+                $oDocumentModel->setToAllDocumentExtraVars();
             } else {
 
                 $document_list = array();
diff --git a/widgetstyles/box/css/default.css b/widgetstyles/box/css/default.css
new file mode 100644
index 000000000..83539f63c
--- /dev/null
+++ b/widgetstyles/box/css/default.css
@@ -0,0 +1,21 @@
+.shadow_box_type01 {position:relative;overflow:hidden;padding:0 3px 3px 0;}
+.shadow_box_type01 .shadow_level_01 {position:relative;top:3px;left:3px;padding:0 1px 1px 0;background-color:#ebebeb;} /* 그림자전체(옅은회색) */
+.shadow_box_type01 .shadow_level_02 {position:relative;top:-1px;left:-1px;background-color:#bcbcbc;} /* 컨텐츠와그림자사이(진한회색) */
+.shadow_box_type01 .box_contents {position:relative;top:-2px;left:-2px;background:#fff;border:2px solid #777;}
+* html .shadow_box_type01 .box_contents {height:1%;}
+*:first-child+html .shadow_box_type01 .box_contents {height:1%;}
+
+.box_contents *{ line-height:normal;}
+.box_contents img, .box_contents fieldset{ border:none;}
+.box_contents .layer_content{ border:2px solid #777777; background:#ffffff; position:relative; z-index:2;}
+.box_contents .layer_header{ padding:8px 0 7px 11px; margin:0 0 5px 0; color:#000000; font:bold 13px "굴림", Gulim, "돋움", Dotum, AppleGothic, Sans-serif; background:#E0E0E0;}
+.box_contents .layer_body{ padding:15px 0 4px 0; margin:0 20px;}
+.box_contents .layer_body *{ font-size:12px; font-family:"돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#444444;}
+.box_contents .layer_body dt{ margin:0 0 9px 0;}
+.box_contents .layer_body dd{ margin:0 0 6px 0;}
+.box_contents .layer_body .input_radio{ vertical-align:middle; _margin:-3px;}
+.box_contents .layer_footer{ border-top:1px solid #e8e8e8; margin:0 20px; padding:10px 0 15px 0; text-align:center;}
+.box_contents .layer_footer *{ vertical-align:top;}
+.box_contents .layer_footer input,
+.box_contents .layer_footer a{ margin:0 1px 0 0;}
+.box_contents .close_layer{ position:absolute; top:9px; right:9px;}
\ No newline at end of file
diff --git a/modules/communication/skins/default/images/common/arrowNextB1.gif b/widgetstyles/box/images/arrowNextB1.gif
similarity index 100%
rename from modules/communication/skins/default/images/common/arrowNextB1.gif
rename to widgetstyles/box/images/arrowNextB1.gif
diff --git a/widgetstyles/box/preview.jpg b/widgetstyles/box/preview.jpg
new file mode 100644
index 000000000..ba1ddf2da
Binary files /dev/null and b/widgetstyles/box/preview.jpg differ
diff --git a/widgetstyles/box/skin.xml b/widgetstyles/box/skin.xml
new file mode 100644
index 000000000..96649cc1d
--- /dev/null
+++ b/widgetstyles/box/skin.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">박스 위젯스타일</title>
+    <title xml:lang="zh-CN">盒状控件样式</title>
+    <title xml:lang="zh-TW">盒狀控件樣式</title>
+    <description xml:lang="ko">박스 위젯스타일</description>
+    <description xml:lang="zh-CN">可指定控件盒的样式。</description>
+    <description xml:lang="zh-TW">可指定盒狀控件樣式。</description>
+    <version>0.1</version>
+    <date>2009-02-03</date>
+
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_title_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">제목</name>
+	    	<name xml:lang="zh-CN">栏目图片</name>
+	    	<name xml:lang="zh-TW">標題圖片</name>
+            <description xml:lang="ko">제목 이미지를 등록합니다.</description>
+			<description xml:lang="zh-CN">栏目名可以使用图片。</description>
+			<description xml:lang="zh-TW">可使用圖片取代標題。</description>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+	    	<name xml:lang="zh-CN">栏目名</name>
+	    	<name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+			<description xml:lang="zh-CN">输入文本形式的栏目名。</description>
+			<description xml:lang="zh-TW">請輸入標題文字。</description>
+        </var>
+        <var name="ws_title_color" type="text">
+            <name xml:lang="ko">제목 글자색</name>
+	    	<name xml:lang="zh-CN">栏目字体色</name>
+	    	<name xml:lang="zh-TW">標題顏色</name>
+        </var>
+        <var name="ws_title_bgcolor" type="text">
+            <name xml:lang="ko">제목 배경색</name>
+	    	<name xml:lang="zh-CN">栏目背景色</name>
+	    	<name xml:lang="zh-TW">標題背景顏色</name>
+        </var>
+        <var name="ws_title_icon" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">아이콘 이미지</name>
+	    	<name xml:lang="zh-CN">栏目图标</name>
+	    	<name xml:lang="zh-TW">標題圖示</name>
+            <description xml:lang="ko">제목 앞 아이콘 이미지를 등록합니다.</description>
+	    	<description xml:lang="zh-CN">可以给栏目名指定个性图标。</description>
+	    	<description xml:lang="zh-TW">可指定標題前方的圖示。</description>
+        </var>
+
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+	    	<name xml:lang="zh-CN">查看更多(链接)</name>
+	    	<name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 제외한 URL를 등록합니다.</description>
+			<description xml:lang="zh-CN">请输入除http://以外的URL地址。</description>
+			<description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+        </var>
+        <var name="ws_more_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">더보기 이미지</name>
+	    	<name xml:lang="zh-CN">查看更多(图片)</name>
+	    	<name xml:lang="zh-TW">more Image</name>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+	    	<name xml:lang="zh-CN">查看更多(文本)</name>
+	    	<name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+	    	<description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+	    	<description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+
+        <var name="ws_border_color" type="text">
+            <name xml:lang="ko">보더색</name>
+	    	<name xml:lang="zh-CN">边框色</name>
+	    	<name xml:lang="zh-CN">邊框顏色</name>
+        </var>
+    </extra_vars>
+</widgetstyle>
\ No newline at end of file
diff --git a/widgetstyles/box/widgetstyle.html b/widgetstyles/box/widgetstyle.html
new file mode 100644
index 000000000..3bdb1308a
--- /dev/null
+++ b/widgetstyles/box/widgetstyle.html
@@ -0,0 +1,40 @@
+<!--%import("css/default.css")-->
+<div class="shadow_box_type01">
+    <div class="shadow_level_01">
+    <div class="shadow_level_02">
+    <div class="box_contents" <!--@if($widgetstyle_extar_var->ws_border_color)-->style="border:2px solid {$widgetstyle_extar_var->ws_border_color}"<!--@end-->>
+
+
+        <!--@if($widgetstyle_extar_var->ws_title_image || $widgetstyle_extar_var->ws_title)-->
+            <h3 class="layer_header" style="<!--@if($widgetstyle_extar_var->ws_title_bgcolor)-->background-color:{$widgetstyle_extar_var->ws_title_bgcolor};<!--@end-->"<!--@if($widgetstyle_extar_var->ws_title_color)-->color:{$widgetstyle_extar_var->ws_title_color};<!--@end-->">
+            <!--@if($widgetstyle_extar_var->ws_title_icon)-->
+                <img src="{$widgetstyle_extar_var->ws_title_icon}" />
+            <!--@end-->
+
+            <!--@if($widgetstyle_extar_var->ws_title_image)-->
+                    <img src="{$widgetstyle_extar_var->ws_title_image}" />
+            <!--@else-->
+                <!--@if($widgetstyle_extar_var->ws_title)-->
+                    {$widgetstyle_extar_var->ws_title}
+                <!--@end-->
+            <!--@end-->
+            </h3>
+        <!--@end-->
+        {$widget_content}
+
+
+        <!--@if($widgetstyle_extar_var->ws_more_url)-->
+            <a href="http://{$widgetstyle_extar_var->ws_more_url}" style="position:absolute;right:15px;top:10px;">
+            <!--@if($widgetstyle_extar_var->ws_more_image)-->
+                <img src="{$widgetstyle_extar_var->ws_more_image}" />
+            <!--@else if($widgetstyle_extar_var->ws_more_text)-->
+                {$widgetstyle_extar_var->ws_more_text}
+            <!--@else-->
+                more
+            <!--@end-->
+            </a>
+        <!--@end-->
+    </div>
+    </div>
+    </div>
+</div>
diff --git a/widgetstyles/colorbox/css/widgetBoxStyle.css b/widgetstyles/colorbox/css/widgetBoxStyle.css
new file mode 100644
index 000000000..d6ce0ff17
--- /dev/null
+++ b/widgetstyles/colorbox/css/widgetBoxStyle.css
@@ -0,0 +1,30 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+.widgetBoxContainer{ position:relative;}
+
+.widgetBox{ position:relative;}
+.widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;}
+.widgetBox .widgetContainer{ position:relative; z-index:10;}
+.widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;}
+.widgetBox .widgetMore img{ border:0;}
+.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1;}
+.widgetBox .rcTop{ position:absolute;}
+.widgetBox .rcBottom{ position:relative;}
+.widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;}
+.widgetBox .rcTop .tl{ top:0;}
+.widgetBox .rcTop .tr{ top:0;}
+.widgetBox .rcBottom .bl{ top:0;}
+.widgetBox .rcBottom .br{ top:0;}
+
+.widgetBoxFred .widgetBox{ background:#fff; border:1px solid #ffcccc; border-top-width:5px; border-bottom-width:5px;}
+.widgetBoxFred .widgetBoxHeader{ position:relative; padding:4px 0; text-indent:15px; repeat-x 0 center; border-bottom:1px solid #ffcccc; color:#ff3333;}
+.widgetBoxFred .widgetMore{ top:7px; right:15px; color:#888;}
+
+.widgetBoxFgreen .widgetBox{ position:relative; background:#fff; border:1px solid #d9efb9; border-top-width:5px; border-bottom-width:5px;}
+.widgetBoxFgreen .widgetBoxHeader{ padding:4px 0; text-indent:15px; repeat-x 0 center; border-bottom:1px solid #d9efb9; color:#ff3333;}
+.widgetBoxFgreen .widgetMore{ top:7px; right:15px; color:#888;}
+
+.widgetBoxFblue .widgetBox{ background:#fff; border:1px solid #d8e6e7; border-top-width:5px; border-bottom-width:5px;}
+.widgetBoxFblue .widgetBoxHeader{ position:relative; padding:4px 0; text-indent:15px; repeat-x 0 center; border-bottom:1px solid #d8e6e7; color:#55ccdd;}
+.widgetBoxFblue .widgetMore{ top:7px; right:15px; color:#888;}
\ No newline at end of file
diff --git a/widgetstyles/colorbox/preview.gif b/widgetstyles/colorbox/preview.gif
new file mode 100644
index 000000000..c23846d11
Binary files /dev/null and b/widgetstyles/colorbox/preview.gif differ
diff --git a/widgetstyles/colorbox/skin.xml b/widgetstyles/colorbox/skin.xml
new file mode 100644
index 000000000..f31c352b2
--- /dev/null
+++ b/widgetstyles/colorbox/skin.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">칼라박스 위젯스타일</title>
+    <description xml:lang="ko">색상이 있는 박스로 꾸며진 위젯스타일 입니다.</description>
+    <version>0.1</version>
+    <date>2009-03-10</date>
+    <preview>preview.gif</preview>
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_style" type="select">
+            <name xml:lang="ko">스타일</name>
+            <options>
+                <value>widgetBoxFblue</value>
+                <name xml:lang="ko">파랑색</name>
+            </options>
+            <options>
+                <value>widgetBoxFgreen</value>
+                <name xml:lang="ko">녹색</name>
+            </options>
+            <options>
+                <value>widgetBoxFred</value>
+                <name xml:lang="ko">빨강색</name>
+            </options>
+        </var>
+        <var name="ws_title_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目图片</name>
+            <name xml:lang="zh-TW">標題圖片</name>
+            <description xml:lang="ko">제목 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">栏目名可以使用图片。</description>
+            <description xml:lang="zh-TW">可使用圖片取代標題。</description>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="zh-CN">输入文本形式的栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題文字。</description>
+        </var>
+        <var name="ws_title_color" type="color">
+            <name xml:lang="ko">제목 글자색</name>
+            <name xml:lang="zh-CN">栏目字体色</name>
+            <name xml:lang="zh-TW">標題顏色</name>
+        </var>
+        <var name="ws_title_icon" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">아이콘 이미지</name>
+            <name xml:lang="zh-CN">栏目图标</name>
+            <name xml:lang="zh-TW">標題圖示</name>
+            <description xml:lang="ko">제목 앞 아이콘 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">可以给栏目名指定个性图标。</description>
+            <description xml:lang="zh-TW">可指定標題前方的圖示。</description>
+        </var>
+
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 제외한 URL를 등록합니다.</description>
+            <description xml:lang="zh-CN">请输入除http://以外的URL地址。</description>
+            <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+        </var>
+        <var name="ws_more_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">더보기 이미지</name>
+            <name xml:lang="zh-CN">查看更多(图片)</name>
+            <name xml:lang="zh-TW">more Image</name>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
\ No newline at end of file
diff --git a/widgetstyles/colorbox/widgetstyle.html b/widgetstyles/colorbox/widgetstyle.html
new file mode 100644
index 000000000..9d46d9519
--- /dev/null
+++ b/widgetstyles/colorbox/widgetstyle.html
@@ -0,0 +1,46 @@
+<!--%import("css/widgetBoxStyle.css")-->
+<div class="widgetBoxContainer {$widgetstyle_extar_var->ws_style}">
+    <div class="widgetBox">
+
+
+        <!--@if($widgetstyle_extar_var->ws_title_image || $widgetstyle_extar_var->ws_title)-->
+            <h3 class="widgetBoxHeader" <!--@if($widgetstyle_extar_var->ws_title_color)-->style="color:{$widgetstyle_extar_var->ws_title_color};"<!--@end-->>
+            <!--@if($widgetstyle_extar_var->ws_title_icon)-->
+                <img src="{$widgetstyle_extar_var->ws_title_icon}" />
+            <!--@end-->
+
+            <!--@if($widgetstyle_extar_var->ws_title_image)-->
+                    <img src="{$widgetstyle_extar_var->ws_title_image}" />
+            <!--@else-->
+                <!--@if($widgetstyle_extar_var->ws_title)-->
+                    {$widgetstyle_extar_var->ws_title}
+                <!--@end-->
+            <!--@end-->
+            </h3>
+        <!--@end-->
+
+        <div class="widgetContainer">
+        {$widget_content}
+        </div>
+
+        <!--@if($widgetstyle_extar_var->ws_more_url)-->
+            <a href="http://{$widgetstyle_extar_var->ws_more_url}" class="widgetMore">
+            <!--@if($widgetstyle_extar_var->ws_more_image)-->
+                <img src="{$widgetstyle_extar_var->ws_more_image}" />
+            <!--@else if($widgetstyle_extar_var->ws_more_text)-->
+                {$widgetstyle_extar_var->ws_more_text}
+            <!--@else-->
+                more
+            <!--@end-->
+            </a>
+        <!--@end-->
+        <span class="rcContainer rcTop">
+            <span class="rc tl"></span>
+            <span class="rc tr"></span>
+        </span>
+        <span class="rcContainer rcBottom">
+            <span class="rc bl"></span>
+            <span class="rc br"></span>
+        </span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/widgetstyles/line/css/widgetBoxStyle.css b/widgetstyles/line/css/widgetBoxStyle.css
new file mode 100644
index 000000000..7af61022d
--- /dev/null
+++ b/widgetstyles/line/css/widgetBoxStyle.css
@@ -0,0 +1,53 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+.widgetBoxContainer{ position:relative;}
+
+.widgetBox{ position:relative;}
+.widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;}
+.widgetBox .widgetContainer{ position:relative; z-index:10;}
+.widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;}
+.widgetBox .widgetMore img{ border:0;}
+.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1;}
+.widgetBox .rcTop{ position:absolute;}
+.widgetBox .rcBottom{ position:relative;}
+.widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;}
+.widgetBox .rcTop .tl{ top:0;}
+.widgetBox .rcTop .tr{ top:0;}
+.widgetBox .rcBottom .bl{ top:0;}
+.widgetBox .rcBottom .br{ top:0;}
+
+.widgetBoxA .widgetBox{ background:#fff;}
+.widgetBoxA .widgetBoxHeader{ position:relative; padding:4px 0; margin:1px; border-bottom:1px solid #ccc;}
+.widgetBoxA .widgetMore{ top:10px; right:0; color:#888;}
+.widgetBoxA .rcContainer{ display:none;}
+
+.widgetBoxB .widgetBox{ background:#fff;}
+.widgetBoxB .widgetBox{ border:1px solid #ccc;}
+.widgetBoxB .widgetBoxHeader{ position:relative; padding:4px 0; margin:1px; text-indent:15px; border-bottom:1px solid #ddd; background:url(../img/headerBgB.gif) repeat-x;}
+.widgetBoxB .widgetMore{ top:7px; right:15px;}
+.widgetBoxB .rcContainer{ display:none;}
+
+.widgetBoxC{ padding:3px 0; background:#fff;}
+.widgetBoxC .widgetBox{ border-left:1px solid #ccc; border-right:1px solid #ccc;}
+.widgetBoxC .widgetBoxHeader{ position:relative; padding:4px 0; margin:1px; text-indent:15px; border-bottom:1px solid #ddd; background:url(../img/headerBgC.gif) repeat-x;}
+.widgetBoxC .widgetMore{ top:5px; right:15px;}
+.widgetBoxC .rcTop,
+.widgetBoxC .rcBottom{ height:3px;} 
+.widgetBoxC .rcTop{ top:-3px;}
+.widgetBoxC .rcBottom{ bottom:-3px;}
+.widgetBoxC .rc { width:50%; height:3px; background-image:url(../img/roundedCornerC.gif); background-repeat:no-repeat;}
+.widgetBoxC .rcTop .tl{ background-position:0 0; left:0px;}
+.widgetBoxC .rcTop .tr{ background-position:right 0; left:50%;}
+.widgetBoxC .rcBottom .bl{ background-position:0 bottom; left:0px;}
+.widgetBoxC .rcBottom .br{ background-position:right bottom; left:50%;}
+
+.widgetBoxG .widgetBox{ background:#fff;}
+.widgetBoxG .widgetBoxHeader{ position:relative; border:1px solid #ccc; padding:4px 0; text-indent:15px; background:url(../img/headerBgG.gif) repeat-x 0 center;}
+.widgetBoxG .widgetMore{ top:7px; right:15px;}
+
+.widgetBoxJ .widgetBox{ background:#efefed; padding-bottom:5px; background-image:url(../img/widgetBgJ.gif); background-repeat:repeat-x;}
+.widgetBoxJ .widgetBoxHeader{ position:relative; padding:7px 0; text-indent:15px; border-bottom:1px solid #fff;}
+.widgetBoxJ .widgetMore{ top:10px; right:15px;}
+.widgetBoxJ .rcTop,
+.widgetBoxJ .rcBottom{ display:none;} 
diff --git a/widgetstyles/line/img/buttonMoreB.gif b/widgetstyles/line/img/buttonMoreB.gif
new file mode 100644
index 000000000..18d0c6825
Binary files /dev/null and b/widgetstyles/line/img/buttonMoreB.gif differ
diff --git a/widgetstyles/line/img/buttonMoreC.gif b/widgetstyles/line/img/buttonMoreC.gif
new file mode 100644
index 000000000..18d0c6825
Binary files /dev/null and b/widgetstyles/line/img/buttonMoreC.gif differ
diff --git a/widgetstyles/line/img/headerBgB.gif b/widgetstyles/line/img/headerBgB.gif
new file mode 100644
index 000000000..b19b88742
Binary files /dev/null and b/widgetstyles/line/img/headerBgB.gif differ
diff --git a/widgetstyles/line/img/headerBgC.gif b/widgetstyles/line/img/headerBgC.gif
new file mode 100644
index 000000000..b19b88742
Binary files /dev/null and b/widgetstyles/line/img/headerBgC.gif differ
diff --git a/widgetstyles/line/img/headerBgG.gif b/widgetstyles/line/img/headerBgG.gif
new file mode 100644
index 000000000..b84832727
Binary files /dev/null and b/widgetstyles/line/img/headerBgG.gif differ
diff --git a/widgetstyles/line/img/moreBgDblue.gif b/widgetstyles/line/img/moreBgDblue.gif
new file mode 100644
index 000000000..a644b4a92
Binary files /dev/null and b/widgetstyles/line/img/moreBgDblue.gif differ
diff --git a/widgetstyles/line/img/moreBgDgreen.gif b/widgetstyles/line/img/moreBgDgreen.gif
new file mode 100644
index 000000000..535efbde4
Binary files /dev/null and b/widgetstyles/line/img/moreBgDgreen.gif differ
diff --git a/widgetstyles/line/img/moreBgDred.gif b/widgetstyles/line/img/moreBgDred.gif
new file mode 100644
index 000000000..96a8f03e9
Binary files /dev/null and b/widgetstyles/line/img/moreBgDred.gif differ
diff --git a/widgetstyles/line/img/moreBgEblue.gif b/widgetstyles/line/img/moreBgEblue.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/line/img/moreBgEblue.gif differ
diff --git a/widgetstyles/line/img/moreBgEgreen.gif b/widgetstyles/line/img/moreBgEgreen.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/line/img/moreBgEgreen.gif differ
diff --git a/widgetstyles/line/img/moreBgEred.gif b/widgetstyles/line/img/moreBgEred.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/line/img/moreBgEred.gif differ
diff --git a/widgetstyles/line/img/moreBgG.gif b/widgetstyles/line/img/moreBgG.gif
new file mode 100644
index 000000000..bb2a384a2
Binary files /dev/null and b/widgetstyles/line/img/moreBgG.gif differ
diff --git a/widgetstyles/line/img/widgetBgJ.gif b/widgetstyles/line/img/widgetBgJ.gif
new file mode 100644
index 000000000..c0d1e5879
Binary files /dev/null and b/widgetstyles/line/img/widgetBgJ.gif differ
diff --git a/widgetstyles/line/preview.gif b/widgetstyles/line/preview.gif
new file mode 100644
index 000000000..8acff7249
Binary files /dev/null and b/widgetstyles/line/preview.gif differ
diff --git a/widgetstyles/line/skin.xml b/widgetstyles/line/skin.xml
new file mode 100644
index 000000000..e75ebfb39
--- /dev/null
+++ b/widgetstyles/line/skin.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">라인 위젯스타일</title>
+    <description xml:lang="ko">선으로 꾸며진 위젯스타일 입니다.</description>
+    <version>0.1</version>
+    <date>2009-03-10</date>
+    <preview>preview.gif</preview>
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_style" type="select">
+            <name xml:lang="ko">스타일</name>
+            <options>
+                <value>widgetBoxA</value>
+                <name xml:lang="ko">구분선</name>
+            </options>
+            <options>
+                <value>widgetBoxB</value>
+                <name xml:lang="ko">박스</name>
+            </options>
+            <options>
+                <value>widgetBoxC</value>
+                <name xml:lang="ko">라운드 박스</name>
+            </options>
+            <options>
+                <value>widgetBoxG</value>
+                <name xml:lang="ko">제목 박스</name>
+            </options>
+            <options>
+                <value>widgetBoxJ</value>
+                <name xml:lang="ko">색상 박스</name>
+            </options>
+        </var>
+        <var name="ws_title_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目图片</name>
+            <name xml:lang="zh-TW">標題圖片</name>
+            <description xml:lang="ko">제목 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">栏目名可以使用图片。</description>
+            <description xml:lang="zh-TW">可使用圖片取代標題。</description>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="zh-CN">输入文本形式的栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題文字。</description>
+        </var>
+        <var name="ws_title_color" type="color">
+            <name xml:lang="ko">제목 글자색</name>
+            <name xml:lang="zh-CN">栏目字体色</name>
+            <name xml:lang="zh-TW">標題顏色</name>
+        </var>
+        <var name="ws_title_icon" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">아이콘 이미지</name>
+            <name xml:lang="zh-CN">栏目图标</name>
+            <name xml:lang="zh-TW">標題圖示</name>
+            <description xml:lang="ko">제목 앞 아이콘 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">可以给栏目名指定个性图标。</description>
+            <description xml:lang="zh-TW">可指定標題前方的圖示。</description>
+        </var>
+
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 제외한 URL를 등록합니다.</description>
+            <description xml:lang="zh-CN">请输入除http://以外的URL地址。</description>
+            <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+        </var>
+        <var name="ws_more_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">더보기 이미지</name>
+            <name xml:lang="zh-CN">查看更多(图片)</name>
+            <name xml:lang="zh-TW">more Image</name>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
\ No newline at end of file
diff --git a/widgetstyles/line/widgetstyle.html b/widgetstyles/line/widgetstyle.html
new file mode 100644
index 000000000..9d46d9519
--- /dev/null
+++ b/widgetstyles/line/widgetstyle.html
@@ -0,0 +1,46 @@
+<!--%import("css/widgetBoxStyle.css")-->
+<div class="widgetBoxContainer {$widgetstyle_extar_var->ws_style}">
+    <div class="widgetBox">
+
+
+        <!--@if($widgetstyle_extar_var->ws_title_image || $widgetstyle_extar_var->ws_title)-->
+            <h3 class="widgetBoxHeader" <!--@if($widgetstyle_extar_var->ws_title_color)-->style="color:{$widgetstyle_extar_var->ws_title_color};"<!--@end-->>
+            <!--@if($widgetstyle_extar_var->ws_title_icon)-->
+                <img src="{$widgetstyle_extar_var->ws_title_icon}" />
+            <!--@end-->
+
+            <!--@if($widgetstyle_extar_var->ws_title_image)-->
+                    <img src="{$widgetstyle_extar_var->ws_title_image}" />
+            <!--@else-->
+                <!--@if($widgetstyle_extar_var->ws_title)-->
+                    {$widgetstyle_extar_var->ws_title}
+                <!--@end-->
+            <!--@end-->
+            </h3>
+        <!--@end-->
+
+        <div class="widgetContainer">
+        {$widget_content}
+        </div>
+
+        <!--@if($widgetstyle_extar_var->ws_more_url)-->
+            <a href="http://{$widgetstyle_extar_var->ws_more_url}" class="widgetMore">
+            <!--@if($widgetstyle_extar_var->ws_more_image)-->
+                <img src="{$widgetstyle_extar_var->ws_more_image}" />
+            <!--@else if($widgetstyle_extar_var->ws_more_text)-->
+                {$widgetstyle_extar_var->ws_more_text}
+            <!--@else-->
+                more
+            <!--@end-->
+            </a>
+        <!--@end-->
+        <span class="rcContainer rcTop">
+            <span class="rc tl"></span>
+            <span class="rc tr"></span>
+        </span>
+        <span class="rcContainer rcBottom">
+            <span class="rc bl"></span>
+            <span class="rc br"></span>
+        </span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/widgetstyles/memo/css/widgetBoxStyle.css b/widgetstyles/memo/css/widgetBoxStyle.css
new file mode 100644
index 000000000..878303c32
--- /dev/null
+++ b/widgetstyles/memo/css/widgetBoxStyle.css
@@ -0,0 +1,43 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+.widgetBoxContainer{ position:relative;}
+
+.widgetBox{ position:relative;}
+.widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;}
+.widgetBox .widgetContainer{ position:relative; z-index:10;}
+.widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;}
+.widgetBox .widgetMore img{ border:0;}
+.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1;}
+.widgetBox .rcTop{ position:absolute;}
+.widgetBox .rcBottom{ position:relative;}
+.widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;}
+.widgetBox .rcTop .tl{ top:0;}
+.widgetBox .rcTop .tr{ top:0;}
+.widgetBox .rcBottom .bl{ top:0;}
+.widgetBox .rcBottom .br{ top:0;}
+
+.widgetBoxH{ padding:50px 0 4px 0;}
+.widgetBoxH .widgetBox{ background:#fff; border-left:1px solid #e9e9e9; border-right:1px solid #e9e9e9;}
+.widgetBoxH .widgetBoxHeader{ position:absolute; width:100%; left:0; top:-40px; padding:3px 0; text-indent:15px;}
+.widgetBoxH .widgetMore{ top:-32px; right:50px;}
+.widgetBoxH .rcTop{ top:-50px; height:50px;}
+.widgetBoxH .rcBottom{ bottom:-4px; height:4px;} 
+.widgetBoxH .rc { width:50%; background-image:url(../img/widgetBoxH.png); _background-image:url(../img/widgetBoxH.gif); background-repeat:no-repeat;}
+.widgetBoxH .rcTop .rc{ height:50px;}
+.widgetBoxH .rcBottom .rc{ height:4px;}
+.widgetBoxH .rcTop .tl{ background-position:0 0; left:-1px !important; padding-right:1px;}
+.widgetBoxH .rcTop .tr{ background-position:right 0; left:50%; *left:auto; _left:50%; right:auto; *right:-1px; _right:auto; padding-left:1px;}
+.widgetBoxH .rcBottom .bl{ background-position:0 bottom; left:-1px; padding-right:1px;}
+.widgetBoxH .rcBottom .br{ background-position:right bottom; left:50%; *left:auto; right:auto; *right:-1px; _right:auto; _left:50%; padding-left:1px;}
+
+.widgetBoxI{ padding-top:50px;}
+.widgetBoxI .widgetBox{ background:#fdf59b; padding-bottom:5px;}
+.widgetBoxI .widgetBoxHeader{ position:absolute; width:100%; left:0; top:-40px; padding:3px 0; text-indent:15px;}
+.widgetBoxI .widgetMore{ top:-32px; right:50px;}
+.widgetBoxI .rcTop{ top:-50px; height:50px;}
+.widgetBoxI .rcBottom{ display:none;} 
+.widgetBoxI .rc { width:50%; background-image:url(../img/widgetBoxI.png); _background-image:url(../img/widgetBoxI.gif); background-repeat:no-repeat;}
+.widgetBoxI .rcTop .rc{ height:50px;}
+.widgetBoxI .rcTop .tl{ background-position:0 0;}
+.widgetBoxI .rcTop .tr{ background-position:right 0; left:50%; *left:auto; _left:50%; right:auto; *right:0; _right:auto;}
diff --git a/widgetstyles/memo/img/widgetBoxH.gif b/widgetstyles/memo/img/widgetBoxH.gif
new file mode 100644
index 000000000..e588bc950
Binary files /dev/null and b/widgetstyles/memo/img/widgetBoxH.gif differ
diff --git a/widgetstyles/memo/img/widgetBoxH.png b/widgetstyles/memo/img/widgetBoxH.png
new file mode 100644
index 000000000..e76248af7
Binary files /dev/null and b/widgetstyles/memo/img/widgetBoxH.png differ
diff --git a/widgetstyles/memo/img/widgetBoxI.gif b/widgetstyles/memo/img/widgetBoxI.gif
new file mode 100644
index 000000000..e3770f3d1
Binary files /dev/null and b/widgetstyles/memo/img/widgetBoxI.gif differ
diff --git a/widgetstyles/memo/img/widgetBoxI.png b/widgetstyles/memo/img/widgetBoxI.png
new file mode 100644
index 000000000..834d5d698
Binary files /dev/null and b/widgetstyles/memo/img/widgetBoxI.png differ
diff --git a/widgetstyles/memo/preview.gif b/widgetstyles/memo/preview.gif
new file mode 100644
index 000000000..e727aabfe
Binary files /dev/null and b/widgetstyles/memo/preview.gif differ
diff --git a/widgetstyles/memo/skin.xml b/widgetstyles/memo/skin.xml
new file mode 100644
index 000000000..81de2aec1
--- /dev/null
+++ b/widgetstyles/memo/skin.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">메모 위젯스타일</title>
+    <description xml:lang="ko">메모지 처럼 꾸며진 위젯스타일 입니다.</description>
+    <version>0.1</version>
+    <date>2009-03-10</date>
+    <preview>preview.gif</preview>
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_style" type="select">
+            <name xml:lang="ko">스타일</name>
+            <options>
+                <value>widgetBoxH</value>
+                <name xml:lang="ko">흰색</name>
+            </options>
+            <options>
+                <value>widgetBoxI</value>
+                <name xml:lang="ko">노랑</name>
+            </options>
+        </var>
+        <var name="ws_title_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目图片</name>
+            <name xml:lang="zh-TW">標題圖片</name>
+            <description xml:lang="ko">제목 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">栏目名可以使用图片。</description>
+            <description xml:lang="zh-TW">可使用圖片取代標題。</description>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="zh-CN">输入文本形式的栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題文字。</description>
+        </var>
+        <var name="ws_title_color" type="color">
+            <name xml:lang="ko">제목 글자색</name>
+            <name xml:lang="zh-CN">栏目字体色</name>
+            <name xml:lang="zh-TW">標題顏色</name>
+        </var>
+        <var name="ws_title_icon" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">아이콘 이미지</name>
+            <name xml:lang="zh-CN">栏目图标</name>
+            <name xml:lang="zh-TW">標題圖示</name>
+            <description xml:lang="ko">제목 앞 아이콘 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">可以给栏目名指定个性图标。</description>
+            <description xml:lang="zh-TW">可指定標題前方的圖示。</description>
+        </var>
+
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 제외한 URL를 등록합니다.</description>
+            <description xml:lang="zh-CN">请输入除http://以外的URL地址。</description>
+            <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+        </var>
+        <var name="ws_more_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">더보기 이미지</name>
+            <name xml:lang="zh-CN">查看更多(图片)</name>
+            <name xml:lang="zh-TW">more Image</name>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
\ No newline at end of file
diff --git a/widgetstyles/memo/widgetstyle.html b/widgetstyles/memo/widgetstyle.html
new file mode 100644
index 000000000..9d46d9519
--- /dev/null
+++ b/widgetstyles/memo/widgetstyle.html
@@ -0,0 +1,46 @@
+<!--%import("css/widgetBoxStyle.css")-->
+<div class="widgetBoxContainer {$widgetstyle_extar_var->ws_style}">
+    <div class="widgetBox">
+
+
+        <!--@if($widgetstyle_extar_var->ws_title_image || $widgetstyle_extar_var->ws_title)-->
+            <h3 class="widgetBoxHeader" <!--@if($widgetstyle_extar_var->ws_title_color)-->style="color:{$widgetstyle_extar_var->ws_title_color};"<!--@end-->>
+            <!--@if($widgetstyle_extar_var->ws_title_icon)-->
+                <img src="{$widgetstyle_extar_var->ws_title_icon}" />
+            <!--@end-->
+
+            <!--@if($widgetstyle_extar_var->ws_title_image)-->
+                    <img src="{$widgetstyle_extar_var->ws_title_image}" />
+            <!--@else-->
+                <!--@if($widgetstyle_extar_var->ws_title)-->
+                    {$widgetstyle_extar_var->ws_title}
+                <!--@end-->
+            <!--@end-->
+            </h3>
+        <!--@end-->
+
+        <div class="widgetContainer">
+        {$widget_content}
+        </div>
+
+        <!--@if($widgetstyle_extar_var->ws_more_url)-->
+            <a href="http://{$widgetstyle_extar_var->ws_more_url}" class="widgetMore">
+            <!--@if($widgetstyle_extar_var->ws_more_image)-->
+                <img src="{$widgetstyle_extar_var->ws_more_image}" />
+            <!--@else if($widgetstyle_extar_var->ws_more_text)-->
+                {$widgetstyle_extar_var->ws_more_text}
+            <!--@else-->
+                more
+            <!--@end-->
+            </a>
+        <!--@end-->
+        <span class="rcContainer rcTop">
+            <span class="rc tl"></span>
+            <span class="rc tr"></span>
+        </span>
+        <span class="rcContainer rcBottom">
+            <span class="rc bl"></span>
+            <span class="rc br"></span>
+        </span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/widgetstyles/round/css/widgetBoxStyle.css b/widgetstyles/round/css/widgetBoxStyle.css
new file mode 100644
index 000000000..f5d54a07a
--- /dev/null
+++ b/widgetstyles/round/css/widgetBoxStyle.css
@@ -0,0 +1,108 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+.widgetBoxContainer{ position:relative;}
+
+.widgetBox{ position:relative; *zoom:1}
+.widgetBox .widgetBoxHeader{ font-size:16px; font-family:Tahoma; margin:0; z-index:10;}
+.widgetBox .widgetContainer{ position:relative; z-index:10;}
+.widgetBox .widgetMore{ position:absolute; display:block; text-decoration:none; font-size:11px !important; white-space:nowrap; font-family:Tahoma; color:#000; text-align:center; z-index:20;}
+.widgetBox .widgetMore img{ border:0;}
+.widgetBox .rcContainer{ display:block; width:100%; font-size:0; line-height:0; z-index:1;}
+.widgetBox .rcTop{ position:absolute;}
+.widgetBox .rcBottom{ position:relative;}
+.widgetBox .rc{ position:absolute; display:block; font-size:0; line-height:0; overflow:hidden;}
+.widgetBox .rcTop .tl{ top:0;}
+.widgetBox .rcTop .tr{ top:0;}
+.widgetBox .rcBottom .bl{ top:0;}
+.widgetBox .rcBottom .br{ top:0;}
+
+.widgetBoxDred{ padding:8px 0;}
+.widgetBoxDred .widgetBox{ background:#fff; border-left:5px solid #ffcccc; border-right:5px solid #ffcccc;}
+.widgetBoxDred .widgetBoxHeader{ position:relative; padding:3px 0; text-indent:15px; color:#ff3333;}
+.widgetBoxDred .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDred.gif) no-repeat; color:#fff !important;}
+.widgetBoxDred .rcTop,
+.widgetBoxDred .rcBottom{ height:8px;} 
+.widgetBoxDred .rcTop{ top:-8px;}
+.widgetBoxDred .rcBottom{ bottom:-8px;}
+.widgetBoxDred .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDred.png); _background-image:url(../img/roundedCornerDred.gif); background-repeat:no-repeat;}
+.widgetBoxDred .rcTop .tl{ background-position:0 0; left:-5px;}
+.widgetBoxDred .rcTop .tr{ background-position:right 0; left:5px;}
+.widgetBoxDred .rcBottom .bl{ background-position:0 bottom; left:-5px;}
+.widgetBoxDred .rcBottom .br{ background-position:right bottom; left:5px;}
+
+.widgetBoxDgreen{ padding:8px 0;}
+.widgetBoxDgreen .widgetBox{ background:#fff; border-left:5px solid #d9efb9; border-right:5px solid #d9efb9;}
+.widgetBoxDgreen .widgetBoxHeader{ position:relative; padding:3px 0; text-indent:15px; color:#90d133;}
+.widgetBoxDgreen .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDgreen.gif) no-repeat; color:#fff !important;}
+.widgetBoxDgreen .rcTop,
+.widgetBoxDgreen .rcBottom{ height:8px;} 
+.widgetBoxDgreen .rcTop{ top:-8px;}
+.widgetBoxDgreen .rcBottom{ bottom:-8px;}
+.widgetBoxDgreen .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDgreen.png); _background-image:url(../img/roundedCornerDgreen.gif); background-repeat:no-repeat;}
+.widgetBoxDgreen .rcTop .tl{ background-position:0 0; left:-5px;}
+.widgetBoxDgreen .rcTop .tr{ background-position:right 0; left:5px;}
+.widgetBoxDgreen .rcBottom .bl{ background-position:0 bottom; left:-5px;}
+.widgetBoxDgreen .rcBottom .br{ background-position:right bottom; left:5px;}
+
+.widgetBoxDblue{ padding:8px 0;}
+.widgetBoxDblue .widgetBox{ background:#fff; border-left:5px solid #d8e6e7; border-right:5px solid #d8e6e7;}
+.widgetBoxDblue .widgetBoxHeader{ position:relative; padding:3px 0; text-indent:15px; color:#55ccdd;}
+.widgetBoxDblue .widgetMore{ top:5px; right:15px; width:35px; background:url(../img/moreBgDblue.gif) no-repeat; color:#fff !important;}
+.widgetBoxDblue .rcTop,
+.widgetBoxDblue .rcBottom{ height:8px;} 
+.widgetBoxDblue .rcTop{ top:-8px;}
+.widgetBoxDblue .rcBottom{ bottom:-8px;}
+.widgetBoxDblue .rc { width:100%; height:8px; background-image:url(../img/roundedCornerDblue.png); _background-image:url(../img/roundedCornerDblue.gif); background-repeat:no-repeat;}
+.widgetBoxDblue .rcTop .tl{ background-position:0 0; left:-5px;}
+.widgetBoxDblue .rcTop .tr{ background-position:right 0; left:5px;}
+.widgetBoxDblue .rcBottom .bl{ background-position:0 bottom; left:-5px;}
+.widgetBoxDblue .rcBottom .br{ background-position:right bottom; left:5px;}
+
+.widgetBoxEred{ padding:3px 0;}
+.widgetBoxEred .widgetBox{ background:#ff3333;}
+.widgetBoxEred .widgetBoxHeader{ position:relative; padding:5px 0; text-indent:15px; color:#fff;}
+.widgetBoxEred .widgetContainer,
+.widgetBoxEred .widgetContainer a{ color:#fff;}
+.widgetBoxEred .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEred.gif) no-repeat; color:#ff3333;}
+.widgetBoxEred .rcTop,
+.widgetBoxEred .rcBottom{ height:3px;} 
+.widgetBoxEred .rcTop{ top:-3px;}
+.widgetBoxEred .rcBottom{ bottom:-3px;}
+.widgetBoxEred .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEred.gif); background-repeat:no-repeat;}
+.widgetBoxEred .rcTop .tl{ background-position:0 0;}
+.widgetBoxEred .rcTop .tr{ background-position:right 0; left:50%;}
+.widgetBoxEred .rcBottom .bl{ background-position:0 bottom;}
+.widgetBoxEred .rcBottom .br{ background-position:right bottom; left:50%;}
+
+.widgetBoxEgreen{ padding:3px 0;}
+.widgetBoxEgreen .widgetBox{ background:#90d133;}
+.widgetBoxEgreen .widgetBoxHeader{ position:relative; padding:5px 0; text-indent:15px; color:#fff;}
+.widgetBoxEgreen .widgetContainer,
+.widgetBoxEgreen .widgetContainer a{ color:#fff;}
+.widgetBoxEgreen .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEgreen.gif) no-repeat; color:#90d133;}
+.widgetBoxEgreen .rcTop,
+.widgetBoxEgreen .rcBottom{ height:3px;} 
+.widgetBoxEgreen .rcTop{ top:-3px;}
+.widgetBoxEgreen .rcBottom{ bottom:-3px;}
+.widgetBoxEgreen .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEgreen.gif); background-repeat:no-repeat;}
+.widgetBoxEgreen .rcTop .tl{ background-position:0 0;}
+.widgetBoxEgreen .rcTop .tr{ background-position:right 0; left:50%;}
+.widgetBoxEgreen .rcBottom .bl{ background-position:0 bottom;}
+.widgetBoxEgreen .rcBottom .br{ background-position:right bottom; left:50%;}
+
+.widgetBoxEblue{ padding:3px 0;}
+.widgetBoxEblue .widgetBox{ background:#55ccdd;}
+.widgetBoxEblue .widgetBoxHeader{ position:relative; padding:5px 0; text-indent:15px; color:#fff;}
+.widgetBoxEblue .widgetContainer,
+.widgetBoxEblue .widgetContainer a{ color:#fff;}
+.widgetBoxEblue .widgetMore{ top:10px; right:15px; width:35px; background:url(../img/moreBgEblue.gif) no-repeat; color:#55ccdd;}
+.widgetBoxEblue .rcTop,
+.widgetBoxEblue .rcBottom{ height:3px;} 
+.widgetBoxEblue .rcTop{ top:-3px;}
+.widgetBoxEblue .rcBottom{ bottom:-3px;}
+.widgetBoxEblue .rc { width:50%; height:3px; background-image:url(../img/roundedCornerEblue.gif); background-repeat:no-repeat;}
+.widgetBoxEblue .rcTop .tl{ background-position:0 0;}
+.widgetBoxEblue .rcTop .tr{ background-position:right 0; left:50%;}
+.widgetBoxEblue .rcBottom .bl{ background-position:0 bottom;}
+.widgetBoxEblue .rcBottom .br{ background-position:right bottom; left:50%;}
\ No newline at end of file
diff --git a/widgetstyles/round/img/moreBgDblue.gif b/widgetstyles/round/img/moreBgDblue.gif
new file mode 100644
index 000000000..a644b4a92
Binary files /dev/null and b/widgetstyles/round/img/moreBgDblue.gif differ
diff --git a/widgetstyles/round/img/moreBgDgreen.gif b/widgetstyles/round/img/moreBgDgreen.gif
new file mode 100644
index 000000000..535efbde4
Binary files /dev/null and b/widgetstyles/round/img/moreBgDgreen.gif differ
diff --git a/widgetstyles/round/img/moreBgDred.gif b/widgetstyles/round/img/moreBgDred.gif
new file mode 100644
index 000000000..96a8f03e9
Binary files /dev/null and b/widgetstyles/round/img/moreBgDred.gif differ
diff --git a/widgetstyles/round/img/moreBgEblue.gif b/widgetstyles/round/img/moreBgEblue.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/round/img/moreBgEblue.gif differ
diff --git a/widgetstyles/round/img/moreBgEgreen.gif b/widgetstyles/round/img/moreBgEgreen.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/round/img/moreBgEgreen.gif differ
diff --git a/widgetstyles/round/img/moreBgEred.gif b/widgetstyles/round/img/moreBgEred.gif
new file mode 100644
index 000000000..af421e56b
Binary files /dev/null and b/widgetstyles/round/img/moreBgEred.gif differ
diff --git a/widgetstyles/round/img/roundedCornerDblue.gif b/widgetstyles/round/img/roundedCornerDblue.gif
new file mode 100644
index 000000000..1d62ad42b
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDblue.gif differ
diff --git a/widgetstyles/round/img/roundedCornerDblue.png b/widgetstyles/round/img/roundedCornerDblue.png
new file mode 100644
index 000000000..77d6d704c
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDblue.png differ
diff --git a/widgetstyles/round/img/roundedCornerDgreen.gif b/widgetstyles/round/img/roundedCornerDgreen.gif
new file mode 100644
index 000000000..ff0a8afae
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDgreen.gif differ
diff --git a/widgetstyles/round/img/roundedCornerDgreen.png b/widgetstyles/round/img/roundedCornerDgreen.png
new file mode 100644
index 000000000..8044afd39
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDgreen.png differ
diff --git a/widgetstyles/round/img/roundedCornerDred.gif b/widgetstyles/round/img/roundedCornerDred.gif
new file mode 100644
index 000000000..9c34590ee
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDred.gif differ
diff --git a/widgetstyles/round/img/roundedCornerDred.png b/widgetstyles/round/img/roundedCornerDred.png
new file mode 100644
index 000000000..cfa008924
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerDred.png differ
diff --git a/widgetstyles/round/img/roundedCornerEblue.gif b/widgetstyles/round/img/roundedCornerEblue.gif
new file mode 100644
index 000000000..b7e875a84
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerEblue.gif differ
diff --git a/widgetstyles/round/img/roundedCornerEgreen.gif b/widgetstyles/round/img/roundedCornerEgreen.gif
new file mode 100644
index 000000000..1f9d7a0be
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerEgreen.gif differ
diff --git a/widgetstyles/round/img/roundedCornerEred.gif b/widgetstyles/round/img/roundedCornerEred.gif
new file mode 100644
index 000000000..291c27146
Binary files /dev/null and b/widgetstyles/round/img/roundedCornerEred.gif differ
diff --git a/widgetstyles/round/preview.gif b/widgetstyles/round/preview.gif
new file mode 100644
index 000000000..906991f4a
Binary files /dev/null and b/widgetstyles/round/preview.gif differ
diff --git a/widgetstyles/round/skin.xml b/widgetstyles/round/skin.xml
new file mode 100644
index 000000000..306acabc8
--- /dev/null
+++ b/widgetstyles/round/skin.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">라운드 위젯스타일</title>
+    <description xml:lang="ko">외각이 라운드로 꾸며진 위젯스타일 입니다.</description>
+    <version>0.1</version>
+    <date>2009-03-10</date>
+    <preview>preview.gif</preview>
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="jp">sol</name>
+        <name xml:lang="en">sol</name>
+        <name xml:lang="es">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_style" type="select">
+            <name xml:lang="ko">스타일</name>
+            <options>
+                <value>widgetBoxDred</value>
+                <name xml:lang="ko">빨강색 선</name>
+            </options>
+            <options>
+                <value>widgetBoxDgreen</value>
+                <name xml:lang="ko">녹색 선</name>
+            </options>
+            <options>
+                <value>widgetBoxDblue</value>
+                <name xml:lang="ko">파랑색 선</name>
+            </options>
+            <options>
+                <value>widgetBoxEred</value>
+                <name xml:lang="ko">빨강색</name>
+            </options>
+            <options>
+                <value>widgetBoxEgreen</value>
+                <name xml:lang="ko">녹색</name>
+            </options>
+            <options>
+                <value>widgetBoxEblue</value>
+                <name xml:lang="ko">파랑색</name>
+            </options>
+        </var>
+        <var name="ws_title_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目图片</name>
+            <name xml:lang="zh-TW">標題圖片</name>
+            <description xml:lang="ko">제목 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">栏目名可以使用图片。</description>
+            <description xml:lang="zh-TW">可使用圖片取代標題。</description>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="zh-CN">输入文本形式的栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題文字。</description>
+        </var>
+        <var name="ws_title_color" type="color">
+            <name xml:lang="ko">제목 글자색</name>
+            <name xml:lang="zh-CN">栏目字体色</name>
+            <name xml:lang="zh-TW">標題顏色</name>
+        </var>
+        <var name="ws_title_icon" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">아이콘 이미지</name>
+            <name xml:lang="zh-CN">栏目图标</name>
+            <name xml:lang="zh-TW">標題圖示</name>
+            <description xml:lang="ko">제목 앞 아이콘 이미지를 등록합니다.</description>
+            <description xml:lang="zh-CN">可以给栏目名指定个性图标。</description>
+            <description xml:lang="zh-TW">可指定標題前方的圖示。</description>
+        </var>
+
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 제외한 URL를 등록합니다.</description>
+            <description xml:lang="zh-CN">请输入除http://以外的URL地址。</description>
+            <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+        </var>
+        <var name="ws_more_image" type="filebox" filter="jpg,jpeg,gif,png">
+            <name xml:lang="ko">더보기 이미지</name>
+            <name xml:lang="zh-CN">查看更多(图片)</name>
+            <name xml:lang="zh-TW">more Image</name>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
\ No newline at end of file
diff --git a/widgetstyles/round/widgetstyle.html b/widgetstyles/round/widgetstyle.html
new file mode 100644
index 000000000..9d46d9519
--- /dev/null
+++ b/widgetstyles/round/widgetstyle.html
@@ -0,0 +1,46 @@
+<!--%import("css/widgetBoxStyle.css")-->
+<div class="widgetBoxContainer {$widgetstyle_extar_var->ws_style}">
+    <div class="widgetBox">
+
+
+        <!--@if($widgetstyle_extar_var->ws_title_image || $widgetstyle_extar_var->ws_title)-->
+            <h3 class="widgetBoxHeader" <!--@if($widgetstyle_extar_var->ws_title_color)-->style="color:{$widgetstyle_extar_var->ws_title_color};"<!--@end-->>
+            <!--@if($widgetstyle_extar_var->ws_title_icon)-->
+                <img src="{$widgetstyle_extar_var->ws_title_icon}" />
+            <!--@end-->
+
+            <!--@if($widgetstyle_extar_var->ws_title_image)-->
+                    <img src="{$widgetstyle_extar_var->ws_title_image}" />
+            <!--@else-->
+                <!--@if($widgetstyle_extar_var->ws_title)-->
+                    {$widgetstyle_extar_var->ws_title}
+                <!--@end-->
+            <!--@end-->
+            </h3>
+        <!--@end-->
+
+        <div class="widgetContainer">
+        {$widget_content}
+        </div>
+
+        <!--@if($widgetstyle_extar_var->ws_more_url)-->
+            <a href="http://{$widgetstyle_extar_var->ws_more_url}" class="widgetMore">
+            <!--@if($widgetstyle_extar_var->ws_more_image)-->
+                <img src="{$widgetstyle_extar_var->ws_more_image}" />
+            <!--@else if($widgetstyle_extar_var->ws_more_text)-->
+                {$widgetstyle_extar_var->ws_more_text}
+            <!--@else-->
+                more
+            <!--@end-->
+            </a>
+        <!--@end-->
+        <span class="rcContainer rcTop">
+            <span class="rc tl"></span>
+            <span class="rc tr"></span>
+        </span>
+        <span class="rcContainer rcBottom">
+            <span class="rc bl"></span>
+            <span class="rc br"></span>
+        </span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/widgetstyles/simple/preview.jpg b/widgetstyles/simple/preview.jpg
new file mode 100755
index 000000000..b6042cffe
Binary files /dev/null and b/widgetstyles/simple/preview.jpg differ
diff --git a/widgetstyles/simple/skin.xml b/widgetstyles/simple/skin.xml
new file mode 100644
index 000000000..cf659a1e9
--- /dev/null
+++ b/widgetstyles/simple/skin.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">제목, more버튼 위젯스타일</title>
+    <title xml:lang="zh-CN">简易控件样式</title>
+    <title xml:lang="zh-TW">標題、more按紐控件樣式</title>
+    <description xml:lang="ko">제목과 more버튼만 있는 간단한 위젯 스타일</description>
+    <description xml:lang="zh-CN">只有栏目名和查看更多(more)选项的简易控件样式。</description>
+    <description xml:lang="zh-TW">標題與more按紐的簡單控件樣式。</description>
+    <version>0.1</version>
+    <date>2009-02-03</date>
+
+    <author email_address="sol@ngleader.com" link="http://www.ngleader.com">
+        <name xml:lang="ko">sol</name>
+        <name xml:lang="zh-CN">sol</name>
+        <name xml:lang="zh-TW">sol</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_colorset" type="select">
+            <title xml:lang="ko">컬러셋</title>
+            <title xml:lang="zh-CN">颜色</title>
+            <title xml:lang="zh-TW">顏色</title>
+            <description xml:lang="ko">컬러셋을 지정해주세요</description>
+            <description xml:lang="zh-CN">请指定适当的颜色。</description>
+            <description xml:lang="zh-TW">請選擇顏色。</description>
+            <options>
+                <name xml:lang="ko">하얀색</name>
+                <name xml:lang="zh-CN">白色</name>
+                <name xml:lang="zh-TW">白色</name>
+                <value>white</value>
+            </options>
+            <options>
+                <name xml:lang="ko">검은색</name>
+                <name xml:lang="zh-CN">黑色</name>
+                <name xml:lang="zh-TW">黑色</name>
+                <value>black</value>
+            </options>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="zh-CN">请输入栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題。</description>
+        </var>
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <description xml:lang="ko">http:// 포함한 URL를 등록합니다.</description>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="zh-CN">文本形式的"查看更多"。</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
diff --git a/widgetstyles/simple/style.css b/widgetstyles/simple/style.css
new file mode 100644
index 000000000..3266bcee5
--- /dev/null
+++ b/widgetstyles/simple/style.css
@@ -0,0 +1,5 @@
+div.simpleWidgetStyle { position:relative;margin-bottom:20px; overflow:hidden; *zoom:1;}
+div.simpleWidgetStyle h2 { margin:0 0 10px 0; padding:0 0 5px 0; font:bold 16px "Malgun Gothic", AppleGothic, Dotum, Sans-serif; border-bottom:2px solid #434343;}
+div.simpleWidgetStyle a.widgetMoreLink { position:absolute; top:8px; right:0; font:11px Dotum; text-decoration:none;  color:#888;}
+div.simpleWidgetStyle.black h2 { color:#333; }
+div.simpleWidgetStyle.black h2 { color:#999; }
diff --git a/widgetstyles/simple/widgetstyle.html b/widgetstyles/simple/widgetstyle.html
new file mode 100644
index 000000000..09bbfbe2d
--- /dev/null
+++ b/widgetstyles/simple/widgetstyle.html
@@ -0,0 +1,15 @@
+<!--@if($widgetstyle_extar_var->ws_colorset == "black")-->
+    {@ $_wsClassName = "black"}
+<!--@elseif($widgetstyle_extar_var->ws_colorset == "white")-->
+    {@ $_wsClassName = "white"}
+<!--@else-->
+    {@ $_wsClassName = $layout_info->colorset}
+<!--@end-->
+
+<!--%import("style.css")-->
+
+<div class="simpleWidgetStyle {$_wsClassName}">
+    <h2>{$widgetstyle_extar_var->ws_title}</h2>
+    <!--@if($widgetstyle_extar_var->ws_more_url)--><a href="{$widgetstyle_extar_var->ws_more_url}" class="widgetMoreLink">{$widgetstyle_extar_var->ws_more_text}</a><!--@end-->
+    {$widget_content}
+</div>