Merge pull request #7 from xpressengine/develop

Develop
2026-01-20 19:59:54 +09:00 · 2015-04-23 09:19:10 +09:00 · 2015-04-23 09:19:10 +09:00 · 9d34b73210
commit 9d34b73210
parent fcdb7b959c 6c908629d0
325 changed files with 13992 additions and 9659 deletions
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@ -24,6 +24,21 @@ class adminAdminView extends admin
 	 */
 	var $easyinstallCheckFile = './files/env/easyinstall_last';

+	function __construct()
+	{
+		$db_info = Context::getDBInfo();
+
+		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		{
+			$xe_default_url = Context::decodeIdna($db_info->default_url);
+		}
+		else
+		{
+			$xe_default_url = $db_info->default_url;
+		}
+		Context::set('xe_default_url', $xe_default_url);
+	}
+
 	/**
 	 * Initilization
 	 * @return void
@ -68,16 +83,6 @@ class adminAdminView extends admin
 			Context::set('https_port', $db_info->https_port);
 		}

-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
-		{
-			$xe_default_url = Context::decodeIdna($db_info->default_url);
-		}
-		else 
-		{
-			$xe_default_url = $db_info->default_url;
-		}
-		Context::set('xe_default_url', $xe_default_url);
-
 		$this->showSendEnv();
 		$this->checkEasyinstall();
 	}
@ -156,7 +161,7 @@ class adminAdminView extends admin
 		$moduleActionInfo = $oModuleModel->getModuleActionXml($module);
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
-		
+
 		foreach((array) $moduleActionInfo->menu as $key => $value)
 		{
 			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
@ -437,7 +442,7 @@ class adminAdminView extends admin
 		Context::set('use_sitelock', $db_info->use_sitelock);
 		Context::set('sitelock_title', $db_info->sitelock_title);
 		Context::set('sitelock_message', htmlspecialchars($db_info->sitelock_message, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-		
+
 		$whitelist = implode("\r\n", $db_info->sitelock_whitelist);
 		Context::set('sitelock_whitelist', $whitelist);

@ -582,7 +587,7 @@ class adminAdminView extends admin
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
-				$mInfo = array();	
+				$mInfo = array();
 				foreach($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
@ -592,7 +597,7 @@ class adminAdminView extends admin
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
-				$mInfo = array();	
+				$mInfo = array();
 				foreach($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
@ -602,7 +607,7 @@ class adminAdminView extends admin
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
-				$mInfo = array();	
+				$mInfo = array();
 				foreach($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
@ -612,7 +617,7 @@ class adminAdminView extends admin
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
-				$mInfo = array();	
+				$mInfo = array();
 				foreach($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
@ -623,7 +628,7 @@ class adminAdminView extends admin
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
-				$mInfo = array();	
+				$mInfo = array();
 				foreach($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@ -260,8 +260,8 @@ class boardAdminView extends board {
 	 * @brief display extra variables
 	 **/
 	function dispBoardAdminExtraVars() {
-		$oDocumentAdminModel = getModel('document');
-		$extra_vars_content = $oDocumentAdminModel->getExtraVarsHTML($this->module_info->module_srl);
+		$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');
--- a/modules/board/skins/xedition/_comment.html
+++ b/modules/board/skins/xedition/_comment.html
@ -0,0 +1,83 @@
+<!-- COMMENT -->
+<div class="feedback" id="comment">
+	<div class="fbHeader">
+		<h2><i class="xi-comment"></i> {$lang->comment} <em>{$oDocument->getCommentcount()}</em></h2>
+	</div>
+	<ul cond="$oDocument->getCommentcount()" class="fbList">
+		<li loop="$oDocument->getComments()=>$key,$comment" class="fbItem"|cond="!$comment->get('depth')" class="fbItem indent indent{($comment->get('depth'))}"|cond="$comment->get('depth')" id="comment_{$comment->comment_srl}">
+			<div class="fbMeta">
+				<img cond="$comment->getProfileImage()" src="{$comment->getProfileImage()}" alt="Profile" class="profile" />
+				<span cond="!$comment->getProfileImage()" class="profile"></span>
+				<h3 class="author">
+					<a cond="!$comment->member_srl && $comment->homepage" href="{$comment->getHomepageUrl()}">{$comment->getNickName()}</a>
+					<strong cond="!$comment->member_srl && !$comment->homepage">{$comment->getNickName()}</strong>
+					<a cond="$comment->member_srl" href="#popup_menu_area" class="member_{$comment->member_srl}" onclick="return false">{$comment->getNickName()}</a>
+				</h3>
+				<p class="time">{$comment->getRegdate('Y.m.d H:i')}</p>
+			</div>
+			<!--@if(!$comment->isAccessible())-->
+			<form action="./" method="get" class="xe_content secretForm" onsubmit="return procFilter(this, input_password)">
+				<p><label for="cpw_{$comment->comment_srl}">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
+				<p><input type="password" name="password" id="cpw_{$comment->comment_srl}" class="iText" /><input type="submit" class="btn" value="{$lang->cmd_input}" /></p>
+				<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')}" />
+			</form>
+			<!--@else-->
+			{$comment->getContent(false)}
+			<!--@end-->
+			<div cond="$comment->hasUploadedFiles()" class="fileList">
+				<button type="button" class="toggleFile" onclick="jQuery(this).next('ul.files').toggle();"><i class="xi-diskette"></i> {$lang->uploaded_file} [<strong>{$comment->get('uploaded_count')}</strong>]</button>
+				<ul class="files">
+					<li loop="$comment->getUploadedFiles()=>$key,$file"><a href="{getUrl('')}{$file->download_url}">{$file->source_filename} <span class="fileSize">[File Size:{FileHandler::filesize($file->file_size)}/Download:{number_format($file->download_count)}]</span></a></li>
+				</ul>
+			</div>
+			<p class="action">
+				<span class="vote" cond="$comment->get('voted_count')!=0">{$lang->cmd_vote}:{$comment->get('voted_count')?$comment->get('voted_count'):0}</span>
+				<a cond="$oDocument->allowComment()" href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}" class="reply"><i class="xi-reply"></i> {$lang->cmd_reply}</a>
+				<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardModifyComment','comment_srl',$comment->comment_srl)}" class="modify"><i class="xi-eraser"></i> {$lang->cmd_modify}</a>
+				<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->cmd_delete}</a>
+				<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#popup_menu_area" onclick="return false">{$lang->cmd_comment_do}</a>
+			</p>
+		</li>
+	</ul>
+    <div cond="$oDocument->comment_page_navigation" class="pagination">
+        <a href="{getUrl('cpage',1)}#comment" class="direction prev"><span></span><span></span> {$lang->first_page}</a> 
+        <block loop="$page_no=$oDocument->comment_page_navigation->getNextPage()">
+			<strong cond="$cpage==$page_no">{$page_no}</strong> 
+			<a cond="$cpage!=$page_no" href="{getUrl('cpage',$page_no)}#comment">{$page_no}</a>
+        </block>
+        <a href="{getUrl('cpage',$oDocument->comment_page_navigation->last_page)}#comment" class="direction next">{$lang->last_page} <span></span><span></span></a>
+    </div>
+	<form cond="$grant->write_comment && $oDocument->isEnableComment()" action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="write_comment" id="write_comment">
+		<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="" />
+        {$oDocument->getCommentEditor()}
+        
+		<div class="write_author">
+			<span class="item" cond="!$is_logged">
+				<label for="userName" class="iLabel">{$lang->writer}</label>
+				<input type="text" name="nick_name" id="userName" class="iText userName" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="userPw" class="iLabel">{$lang->password}</label>
+				<input type="password" name="password" id="userPw" class="iText userPw" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="homePage" class="iLabel">{$lang->homepage}</label>
+				<input type="text" name="homepage" id="homePage" class="iText homePage" />&nbsp;
+			</span>
+			<input cond="$is_logged" type="checkbox" name="notify_message" value="Y" id="notify_message" class="iCheck" />
+			<label cond="$is_logged" for="notify_message">{$lang->notify}</label>
+			<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" class="iCheck" />
+			<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
+		</div>
+		<div style="float:right">
+			<button type="submit" class="btn_insert"><i class="xi-message"></i> {$lang->cmd_comment_registration}</button>
+		</div>
+	</form>
+</div>
+<!-- /COMMENT -->
--- a/modules/board/skins/xedition/_footer.html
+++ b/modules/board/skins/xedition/_footer.html
@ -0,0 +1,2 @@
+	{$module_info->footer_text}
+</div>
--- a/modules/board/skins/xedition/_header.html
+++ b/modules/board/skins/xedition/_header.html
@ -0,0 +1,25 @@
+<load target="board.default.css" />
+<load target="board.default.js" type="body" />
+<load target="../../../../common/xeicon/xeicon.min.css" />
+
+<!--@if($order_type == "desc")-->
+    {@ $order_type = "asc"; }
+<!--@else-->
+    {@ $order_type = "desc"; }
+<!--@end-->
+<block cond="!$module_info->duration_new = (int)$module_info->duration_new">{@ $module_info->duration_new = 12 }</block>
+{@ $cate_list = array(); $current_key = null; }
+<!--@foreach($category_list as $key=>$val)-->
+	<!--@if(!$val->depth)-->
+		{@
+			$cate_list[$key] = $val;
+			$cate_list[$key]->children = array();
+			$current_key = $key;
+		}
+	<!--@elseif($current_key)-->
+		{@ $cate_list[$current_key]->children[] = $val }
+	<!--@end-->
+<!--@end-->
+<div class="board">
+	{$module_info->header_text}
+
--- a/modules/board/skins/xedition/_read.html
+++ b/modules/board/skins/xedition/_read.html
@ -0,0 +1,118 @@
+<div class="board_read">
+	<!-- READ HEADER -->
+	<div class="read_header">
+		<h1>
+			<a href="{getUrl('category',$oDocument->get('category_srl'), 'document_srl', '')}" class="category" cond="$module_info->use_category=='Y' && $oDocument->get('category_srl')">{$category_list[$oDocument->get('category_srl')]->title}</a>
+			<a href="{$oDocument->getPermanentUrl()}">{$oDocument->getTitle()}</a>
+		</h1>
+		<p class="meta">
+			<span class="author">
+				<i class="xi-user"></i><a cond="$module_info->display_author!='N' && !$oDocument->getMemberSrl() && $oDocument->isExistsHomepage()" href="{$oDocument->getHomepageUrl()}" onclick="window.open(this.href);return false;" class="author">{$oDocument->getNickName()}</a>
+				<block cond="$module_info->display_author!='N' && !$oDocument->getMemberSrl() && !$oDocument->isExistsHomepage()">{$oDocument->getNickName()}</block>
+				<a cond="$module_info->display_author!='N' && $oDocument->getMemberSrl()" href="#popup_menu_area" class="member_{$oDocument->get('member_srl')} author" onclick="return false">{$oDocument->getNickName()}</a>
+			</span>
+			<span class="time">
+				<i class="xi-time"></i> {$oDocument->getRegdate('Y.m.d H:i')}
+			</span>
+			<span class="read_count">
+				<i class="xi-eye"></i> {$lang->readed_count} : {$oDocument->get('readed_count')}
+			</span>
+			<span class="vote_count" cond="$oDocument->get('voted_count')!=0">
+				<i class="xi-thumbs-up"></i>{$lang->cmd_vote}:{$oDocument->get('voted_count')}
+			</span>
+		</p>
+	</div>
+	<!-- /READ HEADER -->
+	<!-- Extra Output -->
+	<div class="exOut" cond="$oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted())">
+		<table border="1" cellspacing="0" summary="Extra Form Output">
+			<tr loop="$oDocument->getExtraVars() => $key,$val">
+				<th scope="row">{$val->name}</th>
+				<td>{$val->getValueHTML()}&nbsp;</td>
+			</tr>
+		</table>
+	</div>
+	<!-- /Extra Output -->
+	<!-- READ BODY -->
+	<div class="read_body">
+		<!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+		<form action="./" method="get" onsubmit="return procFilter(this, input_password)" class="secretForm">
+			<input type="hidden" name="mid" value="{$mid}" />
+			<input type="hidden" name="page" value="{$page}" />
+			<input type="hidden" name="document_srl" value="{$oDocument->document_srl}" />
+			<p><label for="cpw">{$lang->msg_is_secret} {$lang->msg_input_password}</label></p>
+			<p><input type="password" name="password" id="cpw" class="iText" /><input type="submit" value="{$lang->cmd_input}" class="btn" />
+			</p>
+		</form>
+		<!--@else-->
+		{$oDocument->getContent(false)}
+		<!--@end-->
+	</div>
+	<!-- /READ BODY -->
+	<!-- READ FOOTER -->
+	<div class="read_footer">
+		<div class="sns">
+		    <ul>
+		    <li>
+		        <a href="http://facebook.com/" class="facebook tooltip"><i class="xi-facebook"></i></a>
+		    </li>
+		    <li>
+		        <a href="#" class="google"><i class="xi-google-plus"></i></a>
+		    </li>
+		    <li>
+		        <a href="http://twitter.com/" class="twitter"> <i class="xi-twitter"></i></a>
+		    </li>
+		    </ul>
+			<script>
+				var sTitle = '{str_ireplace(array('<script', '</script'), array("<scr'+'ipt", "</scr'+'ipt"), addslashes($oDocument->getTitleText()))}';
+				jQuery(function($){
+					$('.twitter').snspost({
+						type : 'twitter',
+						content : sTitle + ' {$oDocument->getPermanentUrl()}'
+					});
+					$('.facebook').snspost({
+						type : 'facebook',
+						content : sTitle
+					});
+					$('.google').snspost({
+						type : 'google',
+						content : sTitle
+					});
+				});
+			</script>		    
+		</div>
+		<div cond="$oDocument->hasUploadedFiles()" class="fileList">
+			<button type="button" class="toggleFile" onclick="jQuery(this).next('ul.files').toggle();"><i class="xi-diskette"></i> {$lang->uploaded_file} [<strong>{$oDocument->get('uploaded_count')}</strong>]</button>
+			<ul class="files">
+				<li loop="$oDocument->getUploadedFiles()=>$key,$file"><a href="{getUrl('')}{$file->download_url}">{$file->source_filename} <span class="fileSize">[File Size:{FileHandler::filesize($file->file_size)}/Download:{number_format($file->download_count)}]</span></a></li>
+			</ul>
+		</div>
+		<div class="tns">
+			{@ $tag_list = $oDocument->get('tag_list') }
+			<span class="tags" cond="count($tag_list)">
+				<i class="xi-tags"></i>
+				<!--@for($i=0;$i<count($tag_list);$i++)-->
+					{@ $tag = $tag_list[$i]; }
+					<a href="{getUrl('search_target','tag','search_keyword',$tag,'document_srl','')}" class="tag" rel="tag">{htmlspecialchars($tag)}</a><span>,</span>
+				<!--@end-->
+			</span>
+			<a class="document_{$oDocument->document_srl} action" href="#popup_menu_area" onclick="return false">{$lang->cmd_document_do}</a>
+		</div>
+		<div class="sign" cond="$module_info->display_sign!='N'&&($oDocument->getProfileImage()||$oDocument->getSignature())">
+			<img cond="$oDocument->getProfileImage()" src="{$oDocument->getProfileImage()}" alt="Profile" class="pf" />
+			<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
+		</div>
+		<div class="btnArea"> 
+			<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
+			<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>
+			<span class="etc">
+				<a href="{getUrl('document_srl','')}" class="btn"><i class="xi-list-ul-l"></i>{$lang->cmd_list}</a>
+			</span>
+		</div>
+	</div>
+	<!-- /READ FOOTER -->
+</div>
+<block cond="$oDocument->allowTrackback()">
+	<include target="_trackback.html" />
+</block>
+<include target="_comment.html" />
--- a/modules/board/skins/xedition/_trackback.html
+++ b/modules/board/skins/xedition/_trackback.html
@ -0,0 +1,18 @@
+<!-- TRACKBACK -->
+<div class="feedback" id="trackback">
+	<div class="fbHeader">
+		<h2>{$lang->trackback} <em>{$oDocument->getTrackbackCount()}</em></h2>
+		<p class="trackbackURL"><a href="{$oDocument->getTrackbackUrl()}" onclick="return false;">{$oDocument->getTrackbackUrl()}</a></p>
+	</div>
+	<ul cond="$oDocument->getTrackbackCount()" class="fbList">
+		<li class="fbItem" loop="$oDocument->getTrackbacks()=>$key,$val" id="trackback_{$val->trackback_srl}">
+			<div class="fbMeta">
+				<h3 class="author"><a href="{$val->url}" title="{htmlspecialchars($val->blog_name)}">{htmlspecialchars($val->blog_name)}</a></h3>
+				<p class="time">{zdate($val->regdate, "Y.m.d H:i")}</p>
+			</div>
+			<p class="xe_content"><strong>{htmlspecialchars($val->title)}</strong> {$val->excerpt}</p>
+			<p class="action" cond="$grant->manager"><a href="{getUrl('act','dispBoardDeleteTrackback','trackback_srl',$val->trackback_srl)}" class="delete">{$lang->cmd_delete}</a></p>
+		</li>
+	</ul>
+</div>
+<!-- /TRACKBACK -->
--- a/modules/board/skins/xedition/board.default.css
+++ b/modules/board/skins/xedition/board.default.css
--- a/modules/board/skins/xedition/board.default.js
+++ b/modules/board/skins/xedition/board.default.js
@ -0,0 +1,64 @@
+jQuery(function($) {
+	"use strict";
+	// hide last tag
+	$('.read_footer .tags span:last-child').hide();
+	// user input text blur/focus/change
+	var iText = $('.item .iLabel').next('.iText');
+	$('.item .iLabel').css('position','absolute');
+	iText
+		.focus(function() {
+			$(this).prev('.iLabel').css('visibility','hidden');
+		})
+		.blur(function() {
+			if(!$(this).val()) {
+				$(this).prev('.iLabel').css('visibility','visible');
+			} else {
+				$(this).prev('.iLabel').css('visibility','hidden');
+			}
+		})
+		.change(function() {
+			if(!$(this).val()) {
+				$(this).prev('.iLabel').css('visibility','visible');
+			} else {
+				$(this).prev('.iLabel').css('visibility','hidden');
+			}
+		})
+		.blur();
+	// add class to the parent category 
+	$('.cTab>li>ul>li.on_').parents('li:first').addClass('on');
+	// delete the margin-top for the first child of the ccomments
+	$('.feedback .xe_content>*:first-child').css('margin-top','0');
+});
+
+// SNS post
+(function($) {
+	"use strict";
+	$.fn.snspost = function(opts) {
+		var loc = '';
+		opts = $.extend({}, {type:'twitter', event:'click', content:''}, opts);
+		opts.content = encodeURIComponent(opts.content);
+		switch(opts.type) {
+			case 'facebook':
+				loc = 'http://www.facebook.com/share.php?t='+opts.content+'&u='+encodeURIComponent(opts.url||location.href);
+				break;
+			case 'delicious':
+				loc = 'http://www.delicious.com/save?v=5&noui&jump=close&url='+encodeURIComponent(opts.url||location.href)+'&title='+opts.content;
+				break;
+			case 'twitter':
+				loc = 'http://twitter.com/home?status='+opts.content;
+				break;
+			case 'google' :
+				loc = 'http://plus.google.com/share?url='+encodeURIComponent(opts.url||location.href)+'?l=ko='+opts.content;
+				break;
+		}
+		this.bind(opts.event, function() {
+			window.open(loc);
+			return false;
+		});
+	};
+	$.snspost = function(selectors, action) {
+		$.each(selectors, function(key,val) {
+			$(val).snspost( $.extend({}, action, {type:key}) );
+		});
+	};
+})(jQuery);
--- a/modules/board/skins/xedition/board.default.min.css
+++ b/modules/board/skins/xedition/board.default.min.css
--- a/modules/board/skins/xedition/board.default.min.js
+++ b/modules/board/skins/xedition/board.default.min.js
@ -0,0 +1 @@
+jQuery(function(a){"use strict";a(".read_footer .tags span:last-child").hide();var b=a(".item .iLabel").next(".iText");a(".item .iLabel").css("position","absolute"),b.focus(function(){a(this).prev(".iLabel").css("visibility","hidden")}).blur(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).change(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).blur(),a(".cTab>li>ul>li.on_").parents("li:first").addClass("on"),a(".feedback .xe_content>*:first-child").css("margin-top","0")}),function(a){"use strict";a.fn.snspost=function(b){var c="";switch(b=a.extend({},{type:"twitter",event:"click",content:""},b),b.content=encodeURIComponent(b.content),b.type){case"facebook":c="http://www.facebook.com/share.php?t="+b.content+"&u="+encodeURIComponent(b.url||location.href);break;case"delicious":c="http://www.delicious.com/save?v=5&noui&jump=close&url="+encodeURIComponent(b.url||location.href)+"&title="+b.content;break;case"twitter":c="http://twitter.com/home?status="+b.content;break;case"google":c="http://plus.google.com/share?url="+encodeURIComponent(b.url||location.href)+"?l=ko="+b.content}this.bind(b.event,function(){return window.open(c),!1})},a.snspost=function(b,c){a.each(b,function(b,d){a(d).snspost(a.extend({},c,{type:b}))})}}(jQuery);
--- a/modules/board/skins/xedition/comment_form.html
+++ b/modules/board/skins/xedition/comment_form.html
@ -0,0 +1,40 @@
+<include target="_header.html" />
+<div cond="$oSourceComment->isExists()" class="context_data">
+	<h3 class="author">
+		<a cond="$oSourceComment->homepage" href="{$oSourceComment->homepage}">{$oSourceComment->getNickName()}</a>
+		<strong cond="!$oSourceComment->homepage">{$oSourceComment->getNickName()}</strong>
+	</h3>
+	{$oSourceComment->getContent(false)}
+</div>
+<div class="feedback">
+	<form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" class="write_comment">
+		<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="parent_srl" value="{$oComment->get('parent_srl')}" />
+        <input type="hidden" name="content" value="{htmlspecialchars($oComment->get('content'))}" />
+        {$oComment->getEditor()}
+		<div class="write_author">
+			<span class="item" cond="!$is_logged">
+				<label for="userName" class="iLabel">{$lang->writer}</label>
+				<input type="text" name="nick_name" id="userName" class="iText userName" value="{$oComment->getNickName()}" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="userPw" class="iLabel">{$lang->password}</label>
+				<input type="password" name="password" id="userPw" class="iText userPw" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="homePage" class="iLabel">{$lang->homepage}</label>
+				<input type="text" name="homepage" id="homePage" class="iText homePage" value="{htmlspecialchars($oComment->get('homepage'))}" />&nbsp;
+			</span>
+			<input cond="$is_logged" type="checkbox" name="notify_message" value="Y" checked="checked"|cond="$oComment->get('notify_message')=='Y'" id="notify_message" class="iCheck" />
+			<label cond="$is_logged" for="notify_message">{$lang->notify}</label>
+			<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" value="Y" id="is_secret" checked="checked"|cond="$oComment->get('is_secret')=='Y'" class="iCheck" />
+			<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
+		</div>
+		<div style="float:right">
+			<button type="submit" class="btn_insert"><i class="xi-message"></i> {$lang->cmd_comment_registration}</button>
+		</div>
+	</form>
+</div>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/delete_comment_form.html
+++ b/modules/board/skins/xedition/delete_comment_form.html
@ -0,0 +1,20 @@
+<include target="_header.html" />
+<div cond="$oComment->isExists()" class="context_data">
+	<h3 class="author">
+		<a cond="$oComment->homepage" href="{$oComment->homepage}">{$oComment->getNickName()}</a>
+		<strong cond="!$oComment->homepage">{$oComment->getNickName()}</strong>
+	</h3>
+	{$oComment->getContent(false)}
+</div>
+<form action="./" method="get" onsubmit="return procFilter(this, delete_comment)" class="context_message">
+	<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')}" />
+	<h1>{$lang->cmd_comment_do} {$lang->confirm_delete}</h1>
+	<div class="btnArea">
+		<input type="submit" class="btn" value="{$lang->cmd_delete}" />
+		<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
+	</div>
+</form>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/delete_form.html
+++ b/modules/board/skins/xedition/delete_form.html
@ -0,0 +1,18 @@
+<include target="_header.html" />
+<div cond="$oDocument->isExists()" class="context_data">
+	<h3 class="title">{$oDocument->getTitle()}</h3>
+	<p class="author">
+		<strong>{$oDocument->getNickName()}</strong>
+	</p>
+</div>
+<form action="./" method="get" onsubmit="return procFilter(this, delete_document)" class="context_message">
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<h1>{$lang->cmd_document_do} {$lang->confirm_delete}</h1>
+	<div class="btnArea">
+		<input type="submit" class="btn" value="{$lang->cmd_delete}" />
+		<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
+	</div>
+</form>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/delete_trackback_form.html
+++ b/modules/board/skins/xedition/delete_trackback_form.html
@ -0,0 +1,13 @@
+<include target="_header.html" />
+<form action="./" method="get" onsubmit="return procFilter(this, delete_trackback)" class="context_message">
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="document_srl" value="{document_srl}" />
+	<input type="hidden" name="trackback_srl" value="{$trackback_srl}" />
+	<h1>{$lang->confirm_delete}</h1>
+	<div class="btnArea">
+		<input type="submit" class="btn" value="{$lang->cmd_delete}" />
+		<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
+	</div>
+</form>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/icoIndent.gif
+++ b/modules/board/skins/xedition/icoIndent.gif
--- a/modules/board/skins/xedition/icoSet.gif
+++ b/modules/board/skins/xedition/icoSet.gif
--- a/modules/board/skins/xedition/input_password_form.html
+++ b/modules/board/skins/xedition/input_password_form.html
@ -0,0 +1,11 @@
+<include target="_header.html" />
+<form action="./" method="get" onsubmit="return procFilter(this, input_password)" class="context_message">
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<input type="hidden" name="comment_srl" value="{$comment_srl}" />
+	<h1>{$lang->msg_input_password}</h1>
+	<input type="password" name="password" title="{$lang->password}" class="iText" />
+	<input type="submit" class="btn" value="{$lang->cmd_input}" />
+</form>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/list.html
+++ b/modules/board/skins/xedition/list.html
@ -0,0 +1,160 @@
+<include target="_header.html" />
+<include cond="$oDocument->isExists()" target="_read.html" />
+<ul class="cTab" cond="$module_info->use_category=='Y'">
+	<li class="on"|cond="!$category"><a href="{getUrl('category','','page','')}">{$lang->total}</a></li>
+	<li loop="$cate_list=>$key,$val" class="on"|cond="$category==$val->category_srl"><a href="{getUrl(category,$val->category_srl,'document_srl','', 'page', '')}">{$val->title}<!--<em cond="$val->document_count">[{$val->document_count}]</em>--></a>
+		<ul cond="count($val->children)">
+			<li loop="$val->children=>$idx,$item" class="on_"|cond="$category==$item->category_srl"><a href="{getUrl(category,$item->category_srl,'document_srl','', 'page', '')}">{$item->title}<!--<em cond="$val->document_count">[{$item->document_count}]</em>--></a></li>
+		</ul>
+	</li>
+</ul>
+<div class="board_list" id="board_list">
+	<table width="100%" border="1" cellspacing="0" summary="List of Articles">
+		<thead>
+			<!-- LIST HEADER -->
+			<tr>
+				<block loop="$list_config=>$key,$val">
+				<th scope="col" cond="$val->type=='no' && $val->idx==-1"><span>{$lang->no}</span></th>
+				<th scope="col" class="title" cond="$val->type=='title' && $val->idx==-1"><span>{$lang->title}</span></th>
+				<th scope="col" cond="$val->type=='nick_name' && $val->idx==-1"><span>{$lang->writer}</span></th>
+				<th scope="col" cond="$val->type=='user_id' && $val->idx==-1"><span>{$lang->user_id}</span></th>
+				<th scope="col" cond="$val->type=='user_name' && $val->idx==-1"><span>{$lang->user_name}</span></th>
+				<th scope="col" cond="$val->type=='regdate' && $val->idx==-1"><span><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}</a></span></th>
+				<th scope="col" cond="$val->type=='last_update' && $val->idx==-1"><span><a href="{getUrl('sort_index','update_order','order_type',$order_type)}">{$lang->last_update}</a></span></th>
+				<th scope="col" cond="$val->type=='last_post' && $val->idx==-1"><span><a href="{getUrl('sort_index','update_order','order_type',$order_type)}">{$lang->last_post}</a></span></th>
+				<th scope="col" cond="$val->type=='readed_count' && $val->idx==-1"><span><a href="{getUrl('sort_index','readed_count','order_type',$order_type)}">{$lang->readed_count}</a></span></th>
+				<th scope="col" cond="$val->type=='voted_count' && $val->idx==-1"><span><a href="{getUrl('sort_index','voted_count','order_type',$order_type)}">{$lang->voted_count}</a></span></th>
+				<th scope="col" cond="$val->type=='blamed_count' && $val->idx==-1"><span><a href="{getUrl('sort_index','blamed_count','order_type',$order_type)}">{$lang->blamed_count}</a></span></th>
+				<th scope="col" cond="$val->idx!=-1"><span><a href="{getUrl('sort_index', $val->eid, 'order_type', $order_type)}">{$val->name}</a></span></th>
+				</block>
+				<th scope="col" cond="$grant->manager" style="width:44px"><span><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true });" class="iCheck" title="Check All" /></span></th>
+			</tr>
+			<!-- /LIST HEADER -->
+		</thead>
+		<tbody cond="!$document_list && !$notice_list">
+			<tr class="no_article">
+				<td colspan="{count($list_config)}"|cond="!$grant->manager" colspan="{count($list_config)+1}"|cond="$grant->manager">
+					<p style="text-align:center">{$lang->no_documents}</p>
+				</td>
+			</tr>
+		</tbody>
+		<tbody cond="$document_list || $notice_list">
+			<!-- NOTICE -->
+			<tr class="notice" loop="$notice_list=>$no,$document">
+				<block loop="$list_config=>$key,$val">
+				<td class="notice" cond="$val->type=='no' && $val->idx==-1">
+					<block cond="$document_srl==$document->document_srl">&raquo;</block>
+					<block cond="$document_srl!=$document->document_srl">{$lang->notice}</block>
+				</td>
+				<td class="title" cond="$val->type=='title' && $val->idx==-1">
+					<a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">
+						{$document->getTitle()}
+					</a>
+					<a cond="$document->getCommentCount()" href="{getUrl('document_srl', $document->document_srl)}#comment" class="replyNum" title="Replies">
+						[{$document->getCommentCount()}]
+					</a>
+					<a cond="$document->getTrackbackCount()" href="{getUrl('document_srl', $document->document_srl)}#trackback" class="trackbackNum" title="Trackbacks">
+						[{$document->getTrackbackCount()}]
+					</a>
+				</td>
+				<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
+				<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
+				<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
+				<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
+				<td class="time" cond="$val->type=='last_update' && $val->idx==-1">{zdate($document->get('last_update'),'Y.m.d')}</td>
+				<td class="lastReply" cond="$val->type=='last_post' && $val->idx==-1">
+					<block cond="(int)($document->get('comment_count'))>0">
+						<a href="{$document->getPermanentUrl()}#comment" title="Last Reply">
+							{zdate($document->get('last_update'),'Y.m.d')}
+						</a>
+						<span cond="$document->getLastUpdater()">
+							<sub>by</sub>
+							{$document->getLastUpdater()}
+						</span>
+					</block>
+					<block cond="(int)($document->get('comment_count'))==0">&nbsp;</block>
+				</td>
+				<td class="readNum" cond="$val->type=='readed_count' && $val->idx==-1">{$document->get('readed_count')>0?$document->get('readed_count'):'0'}</td>
+				<td class="voteNum" cond="$val->type=='voted_count' && $val->idx==-1">{$document->get('voted_count')!=0?$document->get('voted_count'):'0'}</td>
+				<td class="voteNum" cond="$val->type=='blamed_count' && $val->idx==-1">{$document->get('blamed_count')!=0?$document->get('blamed_count'):'0'}</td>
+				<td cond="$val->idx!=-1">{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+				</block>
+				<td cond="$grant->manager" class="check"><input type="checkbox" name="cart" value="{$document->document_srl}" class="iCheck" title="Check This Article" onclick="doAddDocumentCart(this)" checked="checked"|cond="$document->isCarted()" /></td>
+			</tr>
+			<!-- /NOTICE -->
+			<!-- LIST -->
+			<tr loop="$document_list=>$no,$document">
+				<block loop="$list_config=>$key,$val">
+				<td class="no" cond="$val->type=='no' && $val->idx==-1">
+					<block cond="$document_srl==$document->document_srl">&raquo;</block>
+					<block cond="$document_srl!=$document->document_srl">{$no}</block>
+				</td>
+				<td class="title" cond="$val->type=='title' && $val->idx==-1">
+					<a href="{getUrl('document_srl',$document->document_srl, 'listStyle', $listStyle, 'cpage','')}">{$document->getTitle()}</a>
+					<a cond="$document->getCommentCount()" href="{getUrl('document_srl', $document->document_srl)}#comment" class="replyNum" title="Replies">[{$document->getCommentCount()}]</a>
+					<a cond="$document->getTrackbackCount()" href="{getUrl('document_srl', $document->document_srl)}#trackback" class="trackbackNum" title="Trackbacks">[{$document->getTrackbackCount()}]</a>
+					{$document->printExtraImages(60*60*$module_info->duration_new)}
+				</td>
+				<td class="author" cond="$val->type=='nick_name' && $val->idx==-1"><a href="#popup_menu_area" class="member_{$document->get('member_srl')}" onclick="return false">{$document->getNickName()}</a></td>
+				<td class="author" cond="$val->type=='user_id' && $val->idx==-1">{$document->getUserID()}</td>
+				<td class="author" cond="$val->type=='user_name' && $val->idx==-1">{$document->getUserName()}</td>
+				<td class="time" cond="$val->type=='regdate' && $val->idx==-1">{$document->getRegdate('Y.m.d')}</td>
+				<td class="time" cond="$val->type=='last_update' && $val->idx==-1">{zdate($document->get('last_update'),'Y.m.d')}</td>
+				<td class="lastReply" cond="$val->type=='last_post' && $val->idx==-1">
+					<block cond="(int)($document->get('comment_count'))>0">
+						<a href="{$document->getPermanentUrl()}#comment" title="Last Reply">
+							{zdate($document->get('last_update'),'Y.m.d')}
+						</a>
+						<span cond="$document->getLastUpdater()">
+							<sub>by</sub>
+							{$document->getLastUpdater()}
+						</span>
+					</block>
+					<block cond="(int)($document->get('comment_count'))==0">&nbsp;</block>
+				</td>
+				<td class="readNum" cond="$val->type=='readed_count' && $val->idx==-1">{$document->get('readed_count')>0?$document->get('readed_count'):'0'}</td>
+				<td class="voteNum" cond="$val->type=='voted_count' && $val->idx==-1">{$document->get('voted_count')!=0?$document->get('voted_count'):'0'}</td>
+				<td class="voteNum" cond="$val->type=='blamed_count' && $val->idx==-1">{$document->get('blamed_count')!=0?$document->get('blamed_count'):'0'}</td>
+				<td cond="$val->idx!=-1">{$document->getExtraValueHTML($val->idx)}&nbsp;</td>
+				</block>
+				<td cond="$grant->manager" class="check"><input type="checkbox" name="cart" value="{$document->document_srl}" class="iCheck" title="Check This Article" onclick="doAddDocumentCart(this)" checked="checked"|cond="$document->isCarted()" /></td>
+			</tr>
+			<!-- /LIST -->
+		</tbody>
+	</table>
+</div>
+<div class="list_footer">
+
+	<div class="btnArea">
+		<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="btn"><i class="xi-pen"></i> {$lang->cmd_write}</a>
+		<a href="{getUrl('act','dispBoardTagList')}" class="btn" title="{$lang->tag}"><i class="xi-tag"></i> {$lang->tag}</a>
+		<a cond="$grant->manager" class="btn" href="{getUrl('act','dispBoardAdminBoardInfo')}" title="{$lang->cmd_setup}"><i class="xi-cog"></i> {$lang->cmd_setup}</a>			
+		<a cond="$grant->manager" href="{getUrl('','module','document','act','dispDocumentManageDocument')}" class="btn" onclick="popopen(this.href,'manageDocument'); return false;">{$lang->cmd_manage_document}</a>
+	</div>
+
+	<form cond="$grant->view" action="{getUrl()}" method="get" onsubmit="return procFilter(this, search)" id="board_search" class="board_search" no-error-return-url="true">
+		<input type="hidden" name="vid" value="{$vid}" />
+		<input type="hidden" name="mid" value="{$mid}" />
+		<input type="hidden" name="category" value="{$category}" />
+		<select name="search_target">
+			<option loop="$search_option=>$key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
+		</select>
+		<div class="search_input">
+			<i class="xi-magnifier"></i>
+			<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" class="iText" />
+		</div>
+		<button type="submit" class="btn" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
+        <a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="btn">{$lang->cmd_search_next}</a>
+	</form>
+
+	<div class="pagination" cond="$document_list || $notice_list">
+		<a href="{getUrl('page','','document_srl','','division',$division,'last_division',$last_division)}" class="direction prev"><i class="xi-angle-left"></i>&nbsp;{$lang->first_page}</a> 
+		<block loop="$page_no=$page_navigation->getNextPage()">
+			<strong cond="$page==$page_no">{$page_no}</strong> 
+			<a cond="$page!=$page_no" href="{getUrl('page',$page_no,'document_srl','','division',$division,'last_division',$last_division)}">{$page_no}</a>
+		</block>
+		<a href="{getUrl('page',$page_navigation->last_page,'document_srl','','division',$division,'last_division',$last_division)}" class="direction next">{$lang->last_page}&nbsp;<i class="xi-angle-right"></i></a>
+	</div>
+
+</div>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/message.html
+++ b/modules/board/skins/xedition/message.html
@ -0,0 +1,9 @@
+<include target="_header.html" />
+<div class="context_message">
+    <h1>{$message}</h1>
+    <div class="btnArea">
+        <a cond="!$is_logged" class="btn" href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a>
+        <button type="button" class="btn" onclick="history.back()">{$lang->cmd_back}</button>
+    </div>
+</div>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/profile.gif
+++ b/modules/board/skins/xedition/profile.gif
--- a/modules/board/skins/xedition/skin.xml
+++ b/modules/board/skins/xedition/skin.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XEDITION</title>
+    <version>1.0</version>
+    <date>2015-04-08</date>
+    <author email_address="developers@xpressengine.com" link="https://www.xpressengine.com/">
+        <name xml:lang="ko">NAVER</name>
+    </author>
+    <license>LGPL v2</license>
+    <extra_vars>
+    </extra_vars>
+</skin>
+
--- a/modules/board/skins/xedition/tag_list.html
+++ b/modules/board/skins/xedition/tag_list.html
@ -0,0 +1,27 @@
+<include target="_header.html" />
+<div class="tagList">
+	<!--@foreach($tag_list as $val)-->
+		<!--@if($val->count>5)-->
+			{@ $tag_class = "rank1" }
+		<!--@elseif($val->count>3)-->
+			{@ $tag_class = "rank2" }
+		<!--@elseif($val->count>2)-->
+			{@ $tag_class = "rank3" }
+		<!--@elseif($val->count>1)-->
+			{@ $tag_class = "rank4" }
+		<!--@else-->
+			{@ $tag_class = "rank5" }
+		<!--@end-->
+
+		<!--@if($layout_info->mid)-->
+			<a class="{$tag_class}"|cond="$tag_class" href="{getUrl('','mid',$layout_info->mid,'search_target','tag','search_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
+		<!--@else-->
+			<a class="{$tag_class}"|cond="$tag_class" href="{getUrl('','mid',$mid,'search_target','tag','search_keyword',$val->tag)}">{htmlspecialchars($val->tag)}</a>
+		<!--@end-->
+
+	<!--@end-->
+</div>
+<div class="tagFooter">
+    <a href="{getUrl('act','')}" class="btn">{$lang->cmd_back}</a>
+</div>
+<include target="_footer.html" />
--- a/modules/board/skins/xedition/thumbnail.png
+++ b/modules/board/skins/xedition/thumbnail.png
--- a/modules/board/skins/xedition/write_form.html
+++ b/modules/board/skins/xedition/write_form.html
@ -0,0 +1,80 @@
+<include target="_header.html" />
+<form action="./" method="post" onsubmit="return procFilter(this, window.insert)" class="board_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}" />
+	<div class="write_header">
+		<select name="category_srl" cond="$module_info->use_category=='Y'">
+			<option value="">{$lang->category}</option>
+			<option loop="$category_list => $val" disabled="disabled"|cond="!$val->grant" value="{$val->category_srl}" selected="selected"|cond="$val->grant&&$val->selected||$val->category_srl==$oDocument->get('category_srl')">
+				{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} ({$val->document_count})
+			</option>
+		</select>
+		<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{htmlspecialchars($oDocument->getTitleText())}" />
+		<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
+		<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
+		<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>
+	</div>
+    <div class="exForm" cond="count($extra_keys)">
+		<table cond="count($extra_keys)" border="1" cellspacing="0" summary="Extra Form">
+			<caption><em>*</em> : {$lang->is_required}</caption>
+			<tr loop="$extra_keys=>$key,$val">
+				<th scope="row"><em cond="$val->is_required=='Y'">*</em> {$val->name}</th>
+				<td>{$val->getFormHTML()}</td>
+			</tr>
+		</table>
+	</div>
+    <div class="write_editor">
+		{$oDocument->getEditor()}
+	</div>
+	<div class="write_footer">
+		<div class="write_option">
+			<block cond="$grant->manager">
+				<input type="checkbox" name="title_bold" id="title_bold" class="iCheck" value="Y" checked="checked"|cond="$oDocument->get('title_bold')=='Y'" />
+				<label for="title_bold">{$lang->title_bold}</label>
+			</block>
+			<input cond="$module_info->secret=='Y'" type="checkbox" name="is_secret" class="iCheck" value="Y" checked="checked"|cond="$oDocument->isSecret()" id="is_secret" />
+			<label cond="$module_info->secret=='Y'" for="is_secret">{$lang->secret}</label>
+            <input type="checkbox" name="comment_status" class="iCheck" value="ALLOW" checked="checked"|cond="$oDocument->allowComment()" id="comment_status" />
+            <label for="comment_status">{$lang->allow_comment}</label>
+            <input type="checkbox" name="allow_trackback" class="iCheck" value="Y" checked="checked"|cond="$oDocument->allowTrackback()" id="allow_trackback" />
+            <label for="allow_trackback">{$lang->allow_trackback}</label>
+			<block cond="$is_logged">
+				<input type="checkbox" name="notify_message" class="iCheck" value="Y" checked="checked"|cond="$oDocument->useNotify()" id="notify_message" />
+				<label for="notify_message">{$lang->notify}</label>
+			</block>
+			<!--@if(is_array($status_list))-->
+				<!--@foreach($status_list AS $key=>$value)-->
+				<input type="radio" name="status" value="{$key}" id="{$key}" <!--@if($oDocument->get('status') == $key || ($key == 'PUBLIC' && !$document_srl))-->checked="checked"<!--@end--> /> 
+				<label for="{$key}">{$value}</label>
+				<!--@end-->
+			<!--@end-->
+		</div>
+		<div class="write_author">
+			<span class="item" cond="!$is_logged">
+				<label for="userName" class="iLabel">{$lang->writer}</label>
+				<input type="text" name="nick_name" id="userName" class="iText userName" style="width:80px" value="{htmlspecialchars($oDocument->get('nick_name'))}" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="userPw" class="iLabel">{$lang->password}</label>
+				<input type="password" name="password" id="userPw" class="iText userPw" style="width:80px" />
+			</span>
+			<span class="item" cond="!$is_logged">
+				<label for="homePage" class="iLabel">{$lang->homepage}</label>
+				<input type="text" name="homepage" id="homePage" class="iText homePage"  style="width:140px"value="{htmlspecialchars($oDocument->get('homepage'))}" />
+			</span>
+			<span class="item">
+				<label for="tags" class="iLabel">{$lang->tag}: {$lang->about_tag}</label>
+				<input type="text" name="tags" id="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="iText" style="width:300px" title="Tag" />
+			</span>		
+		</div>
+		<div class="btnArea">
+			<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">
+			<button cond="$is_logged" class="btn" type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button>
+			<button cond="$is_logged" class="btn" type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button>
+			</block>
+			<button type="submit" class="btn_insert"><i class="xi-pen"></i> {$lang->cmd_registration}</button>
+		</div>
+	</div>
+</form>
+<include target="_footer.html" />
--- a/modules/document/tpl/icons/file.gif
+++ b/modules/document/tpl/icons/file.gif
--- a/modules/document/tpl/icons/image.gif
+++ b/modules/document/tpl/icons/image.gif
--- a/modules/document/tpl/icons/movie.gif
+++ b/modules/document/tpl/icons/movie.gif
--- a/modules/document/tpl/icons/new.gif
+++ b/modules/document/tpl/icons/new.gif
--- a/modules/document/tpl/icons/secret.gif
+++ b/modules/document/tpl/icons/secret.gif
--- a/modules/document/tpl/icons/update.gif
+++ b/modules/document/tpl/icons/update.gif
--- a/modules/editor/components/emoticon/component_icon.gif
+++ b/modules/editor/components/emoticon/component_icon.gif
--- a/modules/editor/components/image_gallery/component_icon.gif
+++ b/modules/editor/components/image_gallery/component_icon.gif
--- a/modules/editor/components/image_link/component_icon.gif
+++ b/modules/editor/components/image_link/component_icon.gif
--- a/modules/editor/components/poll_maker/component_icon.gif
+++ b/modules/editor/components/poll_maker/component_icon.gif
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@ -74,7 +74,7 @@ class editorAdminView extends editor
 		{
 			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
 		}
-		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"12");
+		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");

 		//editor preview
 		$config = $oEditorModel->getEditorConfig();
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@ -34,39 +34,46 @@

 	// editor
 	$(function(){
-		var ckconfig = {
-			height: '{$editor_height}',
-			skin: '{$colorset}',
-			contentsCss: '{$content_style_path}/editor.css',
-			xe_editor_sequence: {$editor_sequence}
+		var settings = {
+			ckeconfig: {
+				height: '{$editor_height}',
+				skin: '{$colorset}',
+				contentsCss: '{$content_style_path}/editor.css',
+				xe_editor_sequence: {$editor_sequence},
+				toolbarCanCollapse: true
+			},
+			loadXeComponent: true,
+			enableToolbar: true,
+			content_field: jQuery('[name={$editor_content_key_name}]')
 		};
-		<!--@if($enable_component)-->
-			ckconfig.extraPlugins = 'xe_component';

+		<!--@if($enable_component)-->
 			{@ $xe_component = array(); }
 			<!--@foreach($component_list as $component_name => $component)-->
-				{@ $xe_component[] = $component_name . ":'" . htmlentities($component->title, ENT_QUOTES) . "'"; }
+				{@ $xe_component[] = $component_name . ":'" . htmlentities($component->title, ENT_QUOTES, 'UTF-8') . "'"; }
 			<!--@endforeach-->
 			{@ $xe_component = implode(',', $xe_component); }

-			ckconfig.xe_component_arrays = {{$xe_component}};
+			settings.ckeconfig.xe_component_arrays = {{$xe_component}};
 		<!--@endif-->

 		<!--@if(!$enable_default_component)-->
-			ckconfig.toolbar = [];
-			ckconfig.toolbarCanCollapse = false;
+			settings.enableToolbar = false;
+			settings.ckeconfig.toolbarCanCollapse = false;
+		<!--@endif-->
+
+		<!--@if(!$enable_component)-->
+			settings.loadXeComponent = false;
 		<!--@endif-->

 		<!--@if($module_type === 'comment')-->
-			ckconfig.toolbarStartupExpanded = false;
+			settings.ckeconfig.toolbarStartupExpanded = false;
 		<!--@endif-->

 		<!--@if($css_content)-->CKEDITOR.addCss('{$css_content}');<!--@end-->

-		$('#ckeditor_instance_{$editor_sequence}').XeCkEditor({
-			ckeconfig : ckconfig,
-			content_field: jQuery('[name={$editor_content_key_name}]')
-		});
+		var ckeApp = $('#ckeditor_instance_{$editor_sequence}').XeCkEditor(settings);
+
 	});
 })(jQuery);
 </script>
--- a/modules/editor/skins/ckeditor/file_upload.html
+++ b/modules/editor/skins/ckeditor/file_upload.html
@ -55,7 +55,12 @@
 			limitMultiFileUploadSize: {$file_config->allowed_filesize}
 		};
 		var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting);
-		// console.log(uploader);
+		window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
+		window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
+		window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
+		window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
+		window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
+		window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
 		<!--@endif-->
 	});
 </script>
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@ -410,7 +410,7 @@
                    <div class="layer extension2 xpress_xeditor_extension_layer" id="editorExtension_{$editor_sequence}">
                        <ul id="editor_component_{$editor_sequence}" class="editorComponent">
                            <!--@foreach($component_list as $component_name => $component)-->
-                                <li><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}">{$component->title}</a></li>
+                                <li><img src="../../components/{$component_name}/component_icon.gif" style="width:13px !important;height:12px !important;padding-right:5px;" alt="" onError="this.onerror=null;this.src='./common/img/blank.gif';" /><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}" style="vertical-align: top;">{$component->title}</a></li>
                            <!--@end-->
                        </ul>
                    </div>
--- a/modules/editor/tpl/js/editor.app.js
+++ b/modules/editor/tpl/js/editor.app.js
@ -1,6 +1,6 @@
 (function($){
 	"use strict";
-	var settings = {
+	var default_ckeconfig = {
 		bodyClass: 'xe_content editable',
 		toolbarCanCollapse: true,
 		toolbarGroups: [
@ -21,13 +21,22 @@
 		],
 		allowedContent: true,
 		removePlugins: 'stylescombo,language,bidi,flash,pagebreak',
-		removeButtons: 'Save,Preview,Print,Cut,Copy,Paste'
+		removeButtons: 'Save,Preview,Print,Cut,Copy,Paste',
+		uiColor: '#EFF0F0'
 	};

+	function arrayUnique(data) {
+		return $.grep(data, function(v, k){
+			return (v.length && $.inArray(v, data) === k);
+		});
+	}
+
 	var XeCkEditor = xe.createApp('XeCkEditor', {
+		ckeconfig: {},
 		editor_sequence: null,
 		init : function() {
 			var self = this;
+
 			CKEDITOR.on('instanceCreated', function(evt){
 				self.cast('CKEDITOR_CREATED');
 			});
@ -44,8 +53,6 @@
 				self.cast('CKEDITOR_LOADED');
 			});
 		},
-		API_ONREADY : function() {
-		},
 		editorInit : function(containerEl, opts) {
 			var self = this;
 			var $containerEl = containerEl;
@ -53,21 +60,46 @@
 			var $contentField = opts.content_field;
 			var data = $containerEl.data();
 			var editor_sequence = $containerEl.data().editorSequence;
-			var ckeconfig = $.extend({}, settings, opts.ckeconfig || {});
+
+			this.ckeconfig = $.extend({}, default_ckeconfig, opts.ckeconfig || {});

 			this.editor_sequence = data.editorSequence;
-
 			$form.attr('editor_sequence', data.editorSequence);
+			
+			if(CKEDITOR.env.mobile) CKEDITOR.env.isCompatible = true;

-			var insance = CKEDITOR.appendTo($containerEl[0], ckeconfig, $contentField.val());
-			$containerEl.data('cke_instance', insance);
+			var instance = CKEDITOR.appendTo($containerEl[0], {}, $contentField.val());

-			insance.on('change', function(e){
-				if($contentField.length){
-					$contentField.val(e.editor.getData());
+			instance.on('customConfigLoaded', function(e) {
+				instance.config = $.extend({}, e.editor.config, self.ckeconfig);
+
+				if($.isFunction(CKEDITOR.editorConfig)) {
+					var customConfig = {};
+					CKEDITOR.editorConfig(customConfig);
+
+					$.each(customConfig, function(key, val) {
+						instance.config[key] = val;
+					});
 				}
+
+				var bodyClass = e.editor.config.bodyClass.split(' ');
+				bodyClass.push(default_ckeconfig.bodyClass);
+				bodyClass = arrayUnique(bodyClass);
+				instance.config.bodyClass = bodyClass.join(' ');
+
+				if(opts.loadXeComponent) {
+					var extraPlugins = e.editor.config.extraPlugins.split(',');
+
+					extraPlugins.push('xe_component');
+					extraPlugins = arrayUnique(extraPlugins);
+					instance.config.extraPlugins = extraPlugins.join(',');
+				}
+
+				if(!opts.enableToolbar) instance.config.toolbar = [];
 			});

+			$containerEl.data('cke_instance', instance);
+
 			window.editorRelKeys[data.editorSequence] = {};
 			window.editorRelKeys[data.editorSequence].primary   = $form.find('[name='+data.editorPrimaryKeyName+']')[0];
 			window.editorRelKeys[data.editorSequence].content   = $form.find('[name='+data.editorContentKeyName+']')[0];
@ -75,7 +107,7 @@
 				return self.getContent.call(self, seq);
 			};
 			window.editorRelKeys[data.editorSequence].pasteHTML = function(text){
-				insance.insertHtml(text, 'html');
+				instance.insertHtml(text, 'html');
 			};
 		},
 		getContent : function(seq) {
--- a/modules/editor/tpl/js/editor.app.min.js
+++ b/modules/editor/tpl/js/editor.app.min.js
@ -1 +1 @@
-!function(a){"use strict";var b={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste"},c=xe.createApp("XeCkEditor",{editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(){a.cast("CKEDITOR_LOADED")})},API_ONREADY:function(){},editorInit:function(c,d){var e=this,f=c,g=f.closest("form"),h=d.content_field,i=f.data(),j=(f.data().editorSequence,a.extend({},b,d.ckeconfig||{}));this.editor_sequence=i.editorSequence,g.attr("editor_sequence",i.editorSequence);var k=CKEDITOR.appendTo(f[0],j,h.val());f.data("cke_instance",k),k.on("change",function(a){h.length&&h.val(a.editor.getData())}),window.editorRelKeys[i.editorSequence]={},window.editorRelKeys[i.editorSequence].primary=g.find("[name="+i.editorPrimaryKeyName+"]")[0],window.editorRelKeys[i.editorSequence].content=g.find("[name="+i.editorContentKeyName+"]")[0],window.editorRelKeys[i.editorSequence].func=function(a){return e.getContent.call(e,a)},window.editorRelKeys[i.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new c(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new c;return a}}(jQuery);
+!function(a){"use strict";function b(b){return a.grep(b,function(c,d){return c.length&&a.inArray(c,b)===d})}var c={bodyClass:"xe_content editable",toolbarCanCollapse:!0,toolbarGroups:[{name:"clipboard",groups:["undo","clipboard"]},{name:"editing",groups:["find","selection"]},{name:"links"},{name:"insert"},{name:"tools"},{name:"document",groups:["mode"]},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},"/",{name:"styles"},{name:"colors"},{name:"xecomponent"},{name:"others"}],allowedContent:!0,removePlugins:"stylescombo,language,bidi,flash,pagebreak",removeButtons:"Save,Preview,Print,Cut,Copy,Paste",uiColor:"#EFF0F0"},d=xe.createApp("XeCkEditor",{ckeconfig:{},editor_sequence:null,init:function(){var a=this;CKEDITOR.on("instanceCreated",function(){a.cast("CKEDITOR_CREATED")}),CKEDITOR.on("ready",function(){a.cast("CKEDITOR_READY")}),CKEDITOR.on("instanceReady",function(){a.cast("CKEDITOR_INSTANCE_READY")}),CKEDITOR.on("instanceLoaded",function(){a.cast("CKEDITOR_LOADED")})},editorInit:function(d,e){{var f=this,g=d,h=g.closest("form"),i=e.content_field,j=g.data();g.data().editorSequence}this.ckeconfig=a.extend({},c,e.ckeconfig||{}),this.editor_sequence=j.editorSequence,h.attr("editor_sequence",j.editorSequence),CKEDITOR.env.mobile&&(CKEDITOR.env.isCompatible=!0);var k=CKEDITOR.appendTo(g[0],{},i.val());k.on("customConfigLoaded",function(d){if(k.config=a.extend({},d.editor.config,f.ckeconfig),a.isFunction(CKEDITOR.editorConfig)){var g={};CKEDITOR.editorConfig(g),a.each(g,function(a,b){k.config[a]=b})}var h=d.editor.config.bodyClass.split(" ");if(h.push(c.bodyClass),h=b(h),k.config.bodyClass=h.join(" "),e.loadXeComponent){var i=d.editor.config.extraPlugins.split(",");i.push("xe_component"),i=b(i),k.config.extraPlugins=i.join(",")}e.enableToolbar||(k.config.toolbar=[])}),g.data("cke_instance",k),window.editorRelKeys[j.editorSequence]={},window.editorRelKeys[j.editorSequence].primary=h.find("[name="+j.editorPrimaryKeyName+"]")[0],window.editorRelKeys[j.editorSequence].content=h.find("[name="+j.editorContentKeyName+"]")[0],window.editorRelKeys[j.editorSequence].func=function(a){return f.getContent.call(f,a)},window.editorRelKeys[j.editorSequence].pasteHTML=function(a){k.insertHtml(a,"html")}},getContent:function(a){var b=this,c=_getCkeInstance(a).getData();return b.cast("GET_CONTENT",[c]),c},getInstance:function(a){return CKEDITOR.instances[a]},API_EDITOR_CREATED:function(){}});a.fn.XeCkEditor=function(a){var b=new d(this.eq(0),a);return b&&(xe.registerApp(b),b.editorInit(this.eq(0),a)),b},window.xe.XeCkEditor=function(){var a=new d;return a}}(jQuery);
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@ -403,7 +403,7 @@ class installController extends install

 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
-			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispInstallCheckEnv');
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
 		}
 	}
@ -447,7 +447,7 @@ class installController extends install
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
 		$requestConfig['ssl_verify_peer'] = false;
-		$buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'GET', null, array(), array(), array(), $requestConfig);
+		$buff = FileHandler::getRemoteResource($requestUrl, null, 3, 'GET', null, array(), array(), array(), $requestConfig);

 		FileHandler::removeFile(_XE_PATH_.$checkFilePath);

--- a/modules/install/script/ko.install.php
+++ b/modules/install/script/ko.install.php
@ -4,56 +4,196 @@
 $lang = Context::getLangType();
 $logged_info = Context::get('logged_info');

-// insertMenu
-$oMenuAdminController = getAdminController('menu'); /* @var $oMenuAdminController menuAdminController */
-$output = $oMenuAdminController->addMenu('Welcome menu');
-if(!$output->toBool())
+$oMenuAdminController = getAdminController('menu');
+
+// sitemap
+$sitemap = array(
+	'GNB' => array(
+		'title' => 'Main menu',
+		'list' => array(
+			array(
+				'menu_name' => 'Welcome Page',
+				'module_type' => 'WIDGET',
+				'module_id' => 'index',
+			),
+			array(
+				'menu_name' => 'Board',
+				'module_type' => 'board',
+				'module_id' => 'board',
+				'list' => array(
+					array(
+						'menu_name' => 'SAMPLE 1',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#',
+						'list' => array(
+							array(
+								'menu_name' => 'SAMPLE 1-1',
+								'is_shortcut' => 'Y',
+								'shortcut_target' => '#'
+							),
+						)
+					),
+					array(
+						'menu_name' => 'SAMPLE 2',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+					array(
+						'menu_name' => 'SAMPLE 3',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+				)
+			),
+			array(
+				'menu_name' => 'XEIcon',
+				'module_type' => 'WIDGET',
+				'module_id' => 'xeicon',
+			),
+		)
+	),
+	'UNB' => array(
+		'title' => 'Utility menu',
+		'list' => array(
+			array(
+				'menu_name' => 'XE Official Site',
+				'is_shortcut' => 'Y',
+				'open_window' => 'Y',
+				'shortcut_target' => 'http://www.xpressengine.com'
+			),
+			array(
+				'menu_name' => 'GitHub',
+				'is_shortcut' => 'Y',
+				'open_window' => 'Y',
+				'shortcut_target' => 'https://github.com/xpressengine'
+			),
+		)
+	),
+	'FNB' => array(
+		'title' => 'Footer Menu',
+		'list' => array(
+			array(
+				'menu_name' => 'Welcome Page',
+				'is_shortcut' => 'Y',
+				'shortcut_target' => 'index',
+				'list' => array(
+					array(
+						'menu_name' => 'SAMPLE 1',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+					array(
+						'menu_name' => 'SAMPLE 2',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+					array(
+						'menu_name' => 'SAMPLE 3',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					)
+				),
+			),
+			array(
+				'menu_name' => 'Board',
+				'is_shortcut' => 'Y',
+				'shortcut_target' => 'board',
+				'list' => array(
+					array(
+						'menu_name' => 'SAMPLE 1',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+					array(
+						'menu_name' => 'SAMPLE 2',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					)
+				)
+			),
+			array(
+				'menu_name' => 'XEIcon',
+				'is_shortcut' => 'Y',
+				'shortcut_target' => 'xeicon',
+				'list' => array(
+					array(
+						'menu_name' => 'SAMPLE 1',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					)
+				)
+			),
+		),
+	),
+);
+
+function __makeMenu(&$list, $parent_srl)
 {
-	return $output;
+	$oMenuAdminController = getAdminController('menu');
+	foreach($list as $idx => &$item)
+	{
+		Context::set('parent_srl', $parent_srl, TRUE);
+		Context::set('menu_name', $item['menu_name'], TRUE);
+		Context::set('module_type', $item['module_type'], TRUE);
+		Context::set('module_id', $item['module_id'], TRUE);
+		if($item['is_shortcut'] === 'Y')
+		{
+			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
+			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
+		}
+		else
+		{
+			Context::set('is_shortcut', 'N', TRUE);
+			Context::set('shortcut_target', null, TRUE);
+		}
+
+		$output = $oMenuAdminController->procMenuAdminInsertItem();
+		if($output instanceof Object && !$output->toBool())
+		{
+			return $output;
+		}
+		$menu_srl = $oMenuAdminController->get('menu_item_srl');
+		$item['menu_srl'] = $menu_srl;
+
+		if($item['list']) __makeMenu($item['list'], $menu_srl);
+	}
 }
-$menuSrl = $output->get('menuSrl');

-// make home menu cache
-$oMenuAdminController->makeHomemenuCacheFile($menuSrl);

-// insertMenuItem
-// create 1depth menuitem
-
-// adhoc...
-Context::set('parent_srl', $menuSrl, TRUE);
-Context::set('menu_name', 'Welcome Page', TRUE);
-Context::set('module_type', 'WIDGET', TRUE);
-$output = $oMenuAdminController->procMenuAdminInsertItem();
-if($output instanceof Object && !$output->toBool())
+// 사이트맵 생성
+foreach($sitemap as $id => &$val)
 {
-	return $output;
-}
-$menuItemSrl = $oMenuAdminController->get('menu_item_srl');
+	$output = $oMenuAdminController->addMenu($val['title']);
+	if(!$output->toBool())
+	{
+		return $output;
+	}
+	$val['menu_srl'] = $output->get('menuSrl');

-// create menu cache
-$oMenuAdminController->makeXmlFile($menuSrl);
+	__makeMenu($val['list'], $val['menu_srl']);
+
+	$oMenuAdminController->makeHomemenuCacheFile($val['menu_srl']);
+}

 // create Layout
 //extra_vars init
-$extra_vars = new stdClass;
-$extra_vars->GNB = $menuSrl;
-$extra_vars->LAYOUT_TYPE = 'MAIN_PAGE';
-$extra_vars->VISUAL_USE = 'YES';
-$extra_vars->menu_name_list = array();
-$extra_vars->menu_name_list[$menuSrl] = 'Welcome menu';
+$extra_vars = new stdClass();
+$extra_vars->GNB = $sitemap['GNB']['menu_srl'];
+$extra_vars->UNB = $sitemap['UNB']['menu_srl'];
+$extra_vars->FNB = $sitemap['FNB']['menu_srl'];

-$args = new stdClass;
-$args->site_srl = 0;
+$args = new stdClass();
 $layout_srl = $args->layout_srl = getNextSequence();
-$args->layout = 'default';
-$args->title = 'default';
+$args->site_srl = 0;
+$args->layout = 'xedition';
+$args->title = 'XEDITION';
 $args->layout_type = 'P';

-$oLayoutAdminController = getAdminController('layout'); /* @var $oLayoutAdminController layoutAdminController */
+$oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
 if(!$output->toBool()) return $output;

-// update Layout
+// update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
 if(!$output->toBool()) return $output;
@ -63,23 +203,26 @@ $mlayout_srl = $args->layout_srl = getNextSequence();
 $args->layout = 'default';
 $args->title = 'welcome_mobile_layout';
 $args->layout_type = 'M';
+$extra_vars->main_menu = $sitemap['GNB']['menu_srl'];

 $output = $oLayoutAdminController->insertLayout($args);
 if(!$output->toBool()) return $output;

-// update Layout
+// update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
 if(!$output->toBool()) return $output;

+
 $siteDesignPath = _XE_PATH_.'files/site_design/';
 FileHandler::makeDir($siteDesignPath);

+
 $designInfo = new stdClass();
 $designInfo->layout_srl = $layout_srl;
 $designInfo->mlayout_srl = $mlayout_srl;

-$moduleList = array('page');
+$moduleList = array('page', 'board', 'editor');
 $moutput = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
 if($moutput->toBool())
 {
@ -96,16 +239,18 @@ foreach($skinTypes as $key => $dir)
 	$skinType = $key == 'skin' ? 'P' : 'M';
 	foreach($moduleList as $moduleName)
 	{
-		$designInfo->module->{$moduleName} = new stdClass;
+		$designInfo->module->{$moduleName} = new stdClass();
 		$designInfo->module->{$moduleName}->{$key} = $oModuleModel->getModuleDefaultSkin($moduleName, $skinType, 0, false);
 	}
 }
+$designInfo->module->board->skin = 'xedition';
+$designInfo->module->editor->skin = 'ckeditor';

 $oAdminController = getAdminController('admin'); /* @var $oAdminController adminAdminController */
 $oAdminController->makeDefaultDesignFile($designInfo, 0);

 // create page content
-$moduleInfo = $oModuleModel->getModuleInfoByMenuItemSrl($menuItemSrl);
+$moduleInfo = $oModuleModel->getModuleInfoByMenuItemSrl($sitemap['GNB']['list'][0]['menu_srl']);
 $module_srl = $moduleInfo->module_srl;

 // insert PageContents - widget
@ -114,7 +259,7 @@ $oTemplateHandler = TemplateHandler::getInstance();
 $oDocumentModel = getModel('document'); /* @var $oDocumentModel documentModel */
 $oDocumentController = getController('document'); /* @var $oDocumentController documentController */

-$obj = new stdClass;
+$obj = new stdClass();

 $obj->member_srl = $logged_info->member_srl;
 $obj->user_id = htmlspecialchars_decode($logged_info->user_id);
@ -148,10 +293,38 @@ $output = $oModuleController->updateModule($module_info);
 if(!$output->toBool()) return $output;

 // insertFirstModule
-$site_args = new stdClass;
+$site_args = new stdClass();
 $site_args->site_srl = 0;
 $site_args->index_module_srl = $module_srl;
 $oModuleController->updateSite($site_args);

+
+// XEIcon page
+$moduleInfo = $oModuleModel->getModuleInfoByMenuItemSrl($sitemap['GNB']['list'][2]['menu_srl']);
+$xeicon_module_srl = $moduleInfo->module_srl;
+
+$xeicon_document_srl = array();
+for($i = 1; $i <=4; $i++)
+{
+	unset($obj->document_srl);
+	$obj->title = "XEIcon ({$i})";
+	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
+
+	$output = $oDocumentController->insertDocument($obj, true);
+	if(!$output->toBool()) return $output;
+
+	$xeicon_document_srl[$i] = $output->get('document_srl');
+}
+
+// save PageWidget
+$oModuleController = getController('module'); /* @var $oModuleController moduleController */
+$module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
+$module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
+$output = $oModuleController->updateModule($module_info);
+if(!$output->toBool()) return $output;
+
+
+// create menu cache
+$oMenuAdminController->makeXmlFile($menuSrl);
+
 /* End of file ko.install.php */
-/* Location: ./modules/install/script/ko.install.php */
--- a/modules/install/script/welcome_content/welcome_content_de.html
+++ b/modules/install/script/welcome_content/welcome_content_de.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_en.html
+++ b/modules/install/script/welcome_content/welcome_content_en.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_es.html
+++ b/modules/install/script/welcome_content/welcome_content_es.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_fr.html
+++ b/modules/install/script/welcome_content/welcome_content_fr.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_jp.html
+++ b/modules/install/script/welcome_content/welcome_content_jp.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' 設置を歓迎します！</h1>
-	<section class="i1">
-		<h1>サイトタイトル変更</h1>
-		<p>管理者でログイン後、'<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">管理 &gt; 設定 &gt; 一般 &gt; 基本</a>'で 'サイトタイトル'を変更できます。</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">設定変更</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>メニュー構造変更</h1>
-		<p>管理者でログイン後、'<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">管理 &gt; サイト制作・編集 &gt; サイトマップ</a>'で 'メニュー構造'を変更できます。</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">設定変更</a>
-	</section>
-	<section class="i3">
-		<h1>レイアウトデザイン変更</h1>
-		<p>管理者でログイン後、'<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">管理 &gt; サイト制作・編集 &gt; サイトデザイン</a>'で 'レイアウトデザイン'を変更できます。</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">設定変更</a>
-	</section>
-	<section class="i4">
-		<h1>初期画面変更</h1>
-		<p>管理者でログイン後、'<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">管理 &gt; サイト制作・編集 &gt; サイトデザイン</a>'で '初期画面'を変更できます。</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">設定変更</a>
-	</section>
-	<section class="i5">
-		<h1>初期画面飾り付け</h1>
-		<p>管理者でログイン後、'<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">ページ修正</a>' ブタンを押して '初期画面'を飾り付けできます。</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">設定変更</a>
-	</section>
-	<section class="i6">
-		<h1>モジュール設定</h1>
-		<p>管理者でログイン後、'<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">管理 &gt; 上級 &gt; 簡単設置</a>'で 'モジュール'を設置できます。</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">設定変更</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_ko.html
+++ b/modules/install/script/welcome_content/welcome_content_ko.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' 설치를 환영합니다!</h1>
-	<section class="i1">
-		<h1>사이트 제목 바꾸기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">관리 &gt; 설정 &gt; 일반 &gt; 기본</a>'에서 '사이트 제목'을 변경할 수 있습니다.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">설정변경</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>메뉴 구조 바꾸기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">관리 &gt; 사이트 제작/편집 &gt; 사이트 메뉴 편집</a>'에서 '메뉴 구조'를 변경할 수 있습니다.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">설정변경</a>
-	</section>
-	<section class="i3">
-		<h1>레이아웃 디자인 바꾸기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">관리 &gt; 사이트 제작/편집 &gt; 사이트 디자인 설정</a>'에서 '레이아웃 디자인'을 변경할 수 있습니다.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">설정변경</a>
-	</section>
-	<section class="i4">
-		<h1>초기화면 바꾸기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">관리 &gt; 사이트 제작/편집 &gt; 사이트 메뉴 편집</a>'에서 '초기화면'을 바꿀 수 있습니다.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">설정변경</a>
-	</section>
-	<section class="i5">
-		<h1>초기화면 꾸미기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">페이지 수정</a>' 버튼을 눌러 '초기화면'을 꾸밀 수 있습니다.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">설정변경</a>
-	</section>
-	<section class="i6">
-		<h1>모듈 설치하기</h1>
-		<p>관리자로 로그인 한 다음 '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">관리 &gt; 고급 &gt; 쉬운 설치</a>'에서 '모듈'을 설치할 수 있습니다.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">설정변경</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_mn.html
+++ b/modules/install/script/welcome_content/welcome_content_mn.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_ru.html
+++ b/modules/install/script/welcome_content/welcome_content_ru.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_tr.html
+++ b/modules/install/script/welcome_content/welcome_content_tr.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_vi.html
+++ b/modules/install/script/welcome_content/welcome_content_vi.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_zh-CN.html
+++ b/modules/install/script/welcome_content/welcome_content_zh-CN.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/welcome_content/welcome_content_zh-TW.html
+++ b/modules/install/script/welcome_content/welcome_content_zh-TW.html
@ -1,34 +1,9 @@
-<link rel="stylesheet" href="./modules/install/script/welcome_content/welcome.css" />
-<article class="welcomeXE">
-	<h1>XE core '{$version}' has been successfully installed!</h1>
-	<section class="i1">
-		<h1>Change the site title</h1>
-		<p>After login as administrator, you can change the 'site title' as '<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Admin &gt; Settings &gt; General &gt; Primary...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAdminConfigGeneral')}">Settings</a>
+<link rel="stylesheet" href="./layouts/xedition/css/welcome.css" />
+<div class="welcomeXE">
+	<section class="intro">
+		<span class="noti">WELCOME TO</span>
+		<h1 class="tit">WELCOME TO XPRESSENGINE</h1>
+		<P class="cont">XpressEngine은 자유로운 웹 콘텐츠 발행을 돕는 CMS입니다.<br />간편한 설치와 다양한 추가 프로그램을 활용하여<br /> 자신만의 웹페이지를 쉽고 빠르게 만들 수 있습니다.</P>
+		<a href="{getUrl('', 'module', 'admin')}" target="_blank" class="btn_start">XE 시작하기</a>
 	</section>
-	<section class="i2">
-		<h1>Change the menu structure</h1>
-		<p>After login as administrator, you can change the 'menu structure' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i3">
-		<h1>Change the layout design</h1>
-		<p>After login as administrator, you can change the 'layout design' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Admin &gt; Menu &gt; Site Design...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteDesign')}">Settings</a>
-	</section>
-	<section class="i4">
-		<h1>Main page replacement</h1>
-		<p>After login as administrator, you can change the 'main page' as '<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Admin &gt; Menu &gt; Menu Editor...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispMenuAdminSiteMap')}">Settings</a>
-	</section>
-	<section class="i5">
-		<h1>Main page decoration</h1>
-		<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
-		<a href="{geturl('', 'mid', $mid, 'act','dispPageAdminContentModify')}">Settings</a>
-	</section>
-	<section class="i6">
-		<h1>Module installation</h1>
-		<p>After login as administrator, you can install the 'module' as '<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Admin &gt; Advanced &gt; Easy install...</a>' progress.</p>
-		<a href="{geturl('','module','admin','act','dispAutoinstallAdminIndex')}">Settings</a>
-	</section>
-</article>
+</div>
--- a/modules/install/script/xeicon_content/xeicon_content_ko_1.html
+++ b/modules/install/script/xeicon_content/xeicon_content_ko_1.html
@ -0,0 +1,8 @@
+<section class="main_title fixedwidth">
+	<h1>Beautiful iconic font &amp; CSS toolkit</h1>
+	<p>
+		XEIcon은 웹사이트 제작에 최적화된 백터 그래픽 아이콘 툴킷입니다.<br />
+		한국 웹서비스 문화에 적합한 디자인과 카테고리를 고려하여 제작되었습니다.<br />
+		XEIcon으로 아름답고 직관적인 웹페이지를 만들어보세요!<br />
+	</p>
+</section>
--- a/modules/install/script/xeicon_content/xeicon_content_ko_2.html
+++ b/modules/install/script/xeicon_content/xeicon_content_ko_2.html
@ -0,0 +1,35 @@
+<section class="feature fixedwidth">
+	<div class="tit"><h1>FEATURE</h1></div>
+	<ul>
+	<li>
+		<div class="ico"><i class="xi-cube"></i></div>
+		<h2>한개의 폰트, 680개의 아이콘</h2>
+		<p>웹 콘텐츠의 목적에 맞는 아이콘을 다양한 구성에서 찾아볼 수 있습니다.<br /><a href="https://xpressengine.github.io/XEIcon/library_common.html" target="_blank">라이브러리</a>에서 필요한 아이콘을 찾아보세요!</p>
+	</li>
+	<li>
+		<div class="ico"><i class="xi-sitemap"></i></div>
+		<h2>호환성</h2>
+		<p>XEIcon은 자바스크립트 없이 구현됩니다. <br />또한 다양한 브라우저에서도 동일한 뷰로 웹 페이지를 노출합니다.</p>
+	</li>
+	<li>
+		<div class="ico"><i class="xi-layout-top-left"></i></div>
+		<h2>최적화</h2>
+		<p>XpressEngine 뿐 아니라, 다양한 프레임워크에서 동일하게 구현됩니다. 여러 환경에서 자유롭게 이용해보세요!</p>
+	</li>
+	<li>
+		<div class="ico"><i class="xi-arrows-alt"></i></div>
+		<h2>확장성</h2>
+		<p>백터 아이콘으로 만들어진 XEIcon은 어떤 크기로도 확장이 가능하며 높은 해상도의 화면에서도 선명한 형태를 유지합니다.</p>
+	</li>
+	<li>
+		<div class="ico"><i class="xi-pen"></i></div>
+		<h2>자유로운 변형</h2>
+		<p>CSS를 통해 아이콘의 색상, 크기 등을 손쉽게 변형할 수 있습니다. <a href="https://xpressengine.github.io/XEIcon/examples.html" target="_blank">LESS SASS</a>로 더 넓어진 활용 범위를 확인하세요!</p>
+	</li>
+	<li>
+		<div class="ico"><i class="xi-present"></i></div>
+		<h2>오픈소스</h2>
+		<p>XEIcon은 OFL 라이선스를 따르는 오픈소스로 모든 사용자에게 무료로 제공됩니다. <a href="https://xpressengine.github.io/XEIcon/license.html" target="_blank">라이선스</a>를 확인해 보세요!</p>
+	</li>
+	</ul>
+</section>
--- a/modules/install/script/xeicon_content/xeicon_content_ko_3.html
+++ b/modules/install/script/xeicon_content/xeicon_content_ko_3.html
@ -0,0 +1,28 @@
+<section class="get_started">
+	<div class="fixedwidth">
+		<div class="tit"><h1>GET STARTED</h1></div>
+		<p class="cont">XEIcon 사용과 설치 방법은 매우 간단합니다. 자세한 사용방법을 <a href="#">XEIcon 공식사이트</a>에서 확인해보세요!</p>
+		<ul>
+			<li>
+				<h2>최신버전 다운로드</h2>
+				<p>가장 최신버전 구성을 압축파일로<br />다운로드 받아볼 수 있습니다.</p>
+				<a href="https://github.com/xpressengine/XEIcon/archive/master.zip"><i class="xeicon xi-download"></i> Download</a>
+			</li>
+			<li>
+				<h2>Git 저장소 복제</h2>
+				<p>Github에서 로컬 저장소로 복제하여 사용할 수 있습니다.</p>
+				<a href="https://xpressengine.github.io/XEIcon/started.html#installation" target="_blank"><i class="xeicon xi-arrow-right"></i> check out</a>
+			</li>
+			<li>
+				<h2>CDN by jsDelivr</h2>
+				<p>한줄의 코드만 작성하면 다운로드 없이 XEIcon을 사용할 수 있습니다.</p>
+				<a href="https://xpressengine.github.io/XEIcon/started.html#cdn" target="_blank"><i class="xeicon xi-arrow-right"></i> check out</a>
+			</li>
+			<li>
+				<h2>Install with Bower</h2>
+				<p>Bower 서비스에서 XEIcon 패키지를 바로 설치할 수 있습니다.</p>
+				<a href="https://xpressengine.github.io/XEIcon/started.html#bower"><i class="xeicon xi-arrow-right"></i> check out</a>
+			</li>
+		</ul>
+	</div>
+</section>
--- a/modules/install/script/xeicon_content/xeicon_content_ko_4.html
+++ b/modules/install/script/xeicon_content/xeicon_content_ko_4.html
@ -0,0 +1,5 @@
+<section class="contribution fixedwidth">
+	<div class="tit"><h1>CONTRIBUTION</h1></div>
+	<p class="cont">새로운 아이콘 요청이나 XEICON에 대한 제안이 있다면 자유롭게 이야기해주세요!<br />앞으로의 이야기들을 함께 만들어갈 third party 참여 또한 환영합니다.</p>
+	<a href="https://github.com/xpressengine/XEIcon" target="_blank" class="btn_github">github</a>
+</section>
--- a/modules/member/queries/chkAuthMail.xml
+++ b/modules/member/queries/chkAuthMail.xml
@ -1,4 +1,4 @@
-<query id="getAuthMail" action="select">
+<query id="chkAuthMail" action="select">
    <tables>
        <table name="member_auth_mail" />
    </tables>
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@ -606,8 +606,7 @@ class menuAdminController extends menu
 		$cmArgs->is_skin_fix = 'N';
 		$cmArgs->is_mskin_fix = 'N';

-		$db_info = Context::getDBInfo();
-		if($db_info->use_mobile_view == 'Y')
+		if(Mobile::isMobileEnabled() === true)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@ -27,10 +27,10 @@ class messageView extends message
 		{
 			$config = new stdClass();
 		}
-		
+
 		if(!$config->skin)
 		{
-			$config->skin = 'default';
+			$config->skin = 'xedition';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
 		}
 		else
@ -52,7 +52,7 @@ class messageView extends message
 		// Get the member configuration
 		$member_config = $oModuleModel->getModuleConfig('member');
 		Context::set('member_config', $member_config);
-		// Set a flag to check if the https connection is made when using SSL and create https url 
+		// Set a flag to check if the https connection is made when using SSL and create https url
 		$ssl_mode = false;
 		if($member_config->enable_ssl == 'Y')
 		{
--- a/modules/message/skins/xedition/css/message.css
+++ b/modules/message/skins/xedition/css/message.css
@ -0,0 +1,49 @@
+@charset "utf-8";
+
+@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')}
+body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:13px}
+@media all and (max-width:980px){
+body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
+}
+#access{width:400px;margin:30px auto;background-color:#ffffff;border:1px solid #999;border-radius:6px;box-shadow:0 3px 7px #ccc;box-sizing:border-box}
+#access>.login-header{padding:9px 15px;border-bottom:1px solid #eee}
+#access>.login-header>h1{margin:0;font-size:16px;line-height:1.4;font-weight:600;color:#666}
+#access>.login-header>h1>i{opacity:.5;filter:alpha(opacity=50);margin:2px 0 0 0}
+#access>.login-body{max-height:400px;padding:15px}
+#access>.login-body>*:first-child{margin-top:0}
+#access>.login-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff; color:#ccc}
+#access .control-group{position:relative;padding:0 14px 0 0;margin:0;clear:both}
+#access .control-group:before{content:"";display:block;clear:both}
+#access form{margin:0}
+#access fieldset{margin:0}
+#access label{cursor:pointer;display:inline-block}
+#access input[type="text"],
+#access input[type="email"],
+#access input[type="password"]{width:100%}
+#access input[type="checkbox"]{margin:0}
+#access .btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;height:auto;padding:3px 9px;text-decoration:none}
+#access .submit{position:absolute;top:0;right:0}
+#access p{margin:10px 0}
+#access #warning{margin-right:-14px}
+#access a{color: #0088cc;text-decoration: none;}
+
+/* Message customize */
+#access{width:380px;background-color:#f9f9f9;border:1px solid #d8d8d8;border-radius:0;box-shadow:none;box-sizing:initial;font-family:'나눔바른고딕',NanumBarunGothic,ng,'맑은 고딕','Malgun Gothic','돋움',Dotum,'애플 SD 산돌고딕 Neo','Apple SD Gothic Neo',AppleGothic,Helvetica,sans-serif;-webkit-font-smoothing:antialiased;box-shadow: 0 2px 3px #eee}
+#access>.login-header{padding:30px 30px 24px;border-bottom:0}
+#access>.login-header p{margin:0 0 50px;font-size:40px;font-weight:normal;color:#444;line-height:50px;font-family:Raleway,'나눔바른고딕',NanumBarunGothic,ng,AppleGothic,Helvetica,sans-serif}
+#access>.login-header h1{margin:10px 0;font-size:16px;line-height:20px;color:#f44336;font-weight:normal}
+#access>.login-body{padding:20px 30px 0}
+#access>.login-body a{display:block;height:54px;background-color:#444;font-size:16px;line-height:54px;text-align:center;color:#eee}
+#access>.login-body a:hover,
+#access>.login-body a:focus,
+#access>.login-body a:active{background-color:#333}
+#access>.login-footer{padding:13px 0 42px;margin:30px 30px 0;text-align:center;border-top:0;border-radius:0;box-shadow:none;background:none;color:#888}
+#access>.login-footer>a{text-decoration:none;font-size:13px;color:#aaa}
+#access>.login-footer>a:hover,
+#access>.login-footer>a:active,
+#access>.login-footer>a:focus{text-decoration:underline}
+#access>.login-footer>.bar{display:inline-block;margin:0 8px;color:#aaa}
+
+@media all and (max-width:480px){
+    #access{position:static;margin:0;width:100%}
+}
--- a/modules/message/skins/xedition/http_status_code.html
+++ b/modules/message/skins/xedition/http_status_code.html
@ -0,0 +1,36 @@
+<!--// META -->
+{Context::addHtmlHeader('<meta name="viewport" content="width=1240">')}
+<!--// CSS -->
+<style>
+.xedition-error {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	padding: 80px 0 0;
+	background-color:#EFEFEF;
+	font-family: "Open Sans", sans-serif;
+	text-align: center;
+}
+.xedition-error h1 {
+	margin: 0 0 19px;
+	font-size: 40px;
+	font-weight: normal;
+	color: #E02B2B;
+	line-height: 40px;
+}
+.xedition-error p {
+	margin: 0 0 57px;
+	font-size: 16px;
+	color:#444;
+	line-height: 23px;
+}
+</style>
+
+<!--// BODY -->
+<section class="xedition-error">
+	<h1>404</h1>
+	<p>Oops, Sorry.<br>Page is not found!</p>
+	<img src="./img/error.png" width="340" height="400" />
+</section>
--- a/modules/message/skins/xedition/img/error.png
+++ b/modules/message/skins/xedition/img/error.png
--- a/modules/message/skins/xedition/system_message.html
+++ b/modules/message/skins/xedition/system_message.html
@ -0,0 +1,20 @@
+<!--// META -->
+{Context::addHtmlHeader('<meta name="viewport" content="width=1240">')}
+<!--// CSS -->
+<load target="./css/message.css" />
+
+<!--// BODY -->
+<div id="access">
+	<div class="login-header">
+		<p>OOPS!</p>
+		<h1>{$system_message}</h1>
+	</div>
+	<div class="login-body">
+		<p><a href="{getUrl('', 'act', 'dispMemberLoginForm')}">{$lang->cmd_login}</a></p>
+	</div>
+	<div class="login-footer">
+		<a href="{getUrl('', 'act', 'dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
+		<span class="bar">|</span>
+		<a href="{getUrl('', 'act', 'dispMemberSignUpForm')}">{$lang->cmd_signup}</a>
+	</div>
+</div>
				`@ -0,0 +1 @@`
				jQuery(function(a){"use strict";a(".read_footer .tags span:last-child").hide();var b=a(".item .iLabel").next(".iText");a(".item .iLabel").css("position","absolute"),b.focus(function(){a(this).prev(".iLabel").css("visibility","hidden")}).blur(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).change(function(){a(this).val()?a(this).prev(".iLabel").css("visibility","hidden"):a(this).prev(".iLabel").css("visibility","visible")}).blur(),a(".cTab>li>ul>li.on_").parents("li:first").addClass("on"),a(".feedback .xe_content>*:first-child").css("margin-top","0")}),function(a){"use strict";a.fn.snspost=function(b){var c="";switch(b=a.extend({},{type:"twitter",event:"click",content:""},b),b.content=encodeURIComponent(b.content),b.type){case"facebook":c="http://www.facebook.com/share.php?t="+b.content+"&u="+encodeURIComponent(b.url\|\|location.href);break;case"delicious":c="http://www.delicious.com/save?v=5&noui&jump=close&url="+encodeURIComponent(b.url\|\|location.href)+"&title="+b.content;break;case"twitter":c="http://twitter.com/home?status="+b.content;break;case"google":c="http://plus.google.com/share?url="+encodeURIComponent(b.url\|\|location.href)+"?l=ko="+b.content}this.bind(b.event,function(){return window.open(c),!1})},a.snspost=function(b,c){a.each(b,function(b,d){a(d).snspost(a.extend({},c,{type:b}))})}}(jQuery);