From 31be172d7fb928b2e9028f2d61fc02e190f3137b Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 23 Aug 2012 04:07:28 +0000
Subject: [PATCH] rollback 11071

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11072 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/tpl/_spFooter.html           |  2 +-
 modules/admin/tpl/_spLnb.content.html      |  2 +-
 modules/admin/tpl/admin_setup.html         |  2 +-
 modules/admin/tpl/config_ftp.html          |  8 +++----
 modules/admin/tpl/config_general.html      | 26 ++++++++++-----------
 modules/admin/tpl/js/admin.js              | 11 +--------
 modules/admin/tpl/js/admin.min.js          |  4 ++--
 modules/comment/lang/lang.xml              | 15 +-----------
 modules/comment/tpl/comment_list.html      | 10 ++++----
 modules/comment/tpl/declared_list.html     |  6 ++---
 modules/document/tpl/declared_list.html    | 12 +++++-----
 modules/document/tpl/document_list.html    | 12 +++++-----
 modules/file/tpl/adminConfig.html          | 27 ++++++++++++----------
 modules/layout/layout.admin.controller.php | 10 +-------
 modules/layout/layout.admin.view.php       |  4 ++--
 modules/layout/layout.model.php            | 10 --------
 modules/layout/tpl/layout_modify.html      |  9 +++-----
 modules/menu/menu.admin.controller.php     |  4 ++--
 modules/module/tpl/adminFileBox.html       | 10 ++++----
 modules/module/tpl/filebox_list.html       |  2 +-
 modules/page/page.admin.view.php           |  4 ++--
 21 files changed, 75 insertions(+), 115 deletions(-)

diff --git a/modules/admin/tpl/_spFooter.html b/modules/admin/tpl/_spFooter.html
index 2ddd9857f..c97d6c9eb 100644
--- a/modules/admin/tpl/_spFooter.html
+++ b/modules/admin/tpl/_spFooter.html
@@ -3,7 +3,7 @@
 		<p class="power">
 			Powered by <strong><a href="{_XE_LOCATION_SITE_}" target="_blank">XE</a></strong>. <span class="vr">|</span>  
 			<strong>Your version</strong>: {__XE_VERSION__} <span class="vr">|</span> 
-			<!--@if(isset($latestVersion))--><strong>Latest version</strong>: <a href="{htmlspecialchars(html_entity_decode($latestVersion->url))}" target="_blank" title="{zdate($latestVersion->date, 'Y-m-d')}">{$latestVersion->title}</a><!--@end-->
+			<!--@if(isset($latestVersion))--><strong>Latest version</strong>: <a href="{$latestVersion->url}" target="_blank" title="{zdate($latestVersion->date, 'Y-m-d')}">{$latestVersion->title}</a><!--@end-->
 		</p>
 		<p class="cache">
 			<button type="button" class="text" onclick="doResetAdminMenu();">{$lang->cmd_admin_menu_reset}</button> <span class="vr">|</span>  
diff --git a/modules/admin/tpl/_spLnb.content.html b/modules/admin/tpl/_spLnb.content.html
index 7f202d72b..986f7427d 100644
--- a/modules/admin/tpl/_spLnb.content.html
+++ b/modules/admin/tpl/_spLnb.content.html
@@ -3,7 +3,7 @@
 	<ul>
 		<!--@if(count($gnbUrlList[$parentSrl]['list']) > 0)-->
 		<!--@foreach($gnbUrlList[$parentSrl]['list'] AS $key=>$value)-->
-		<li <!--@if($value['text'] == $subMenuTitle)-->class="active"<!--@end-->><a href="{htmlspecialchars(html_entity_decode($value['href']))}">{$value['text']}</a></li>
+		<li <!--@if($value['text'] == $subMenuTitle)-->class="active"<!--@end-->><a href="{html_entity_decode($value['href'])}">{$value['text']}</a></li>
 		<!--@end-->
 		<!--@end-->
 	</ul>
diff --git a/modules/admin/tpl/admin_setup.html b/modules/admin/tpl/admin_setup.html
index f23484d42..927bb5e2d 100644
--- a/modules/admin/tpl/admin_setup.html
+++ b/modules/admin/tpl/admin_setup.html
@@ -70,7 +70,7 @@
 			<h2 class="h2">{$lang->admin_menu_add}</h2>
 			<ul>
 				<li>
-					<p class="q"><label for="menuNameList">{$lang->module}</label></p>
+					<p class="q"><label for="name">{$lang->module}</label></p>
 					<div class="a">
 						<select name="menu_name" id="menuNameList">
 						</select>
diff --git a/modules/admin/tpl/config_ftp.html b/modules/admin/tpl/config_ftp.html
index 0b8f3bf79..724498772 100644
--- a/modules/admin/tpl/config_ftp.html
+++ b/modules/admin/tpl/config_ftp.html
@@ -30,21 +30,21 @@
 				<p class="a"><input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port}" /><span class="desc">Default : 21</span></p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->about_use_ftp_passive_mode}</label></p>
+				<p class="q"><label for="ftp_passive">{$lang->about_use_ftp_passive_mode}</label></p>
 				<p class="a">
 					<input type="radio" name="ftp_pasv" id="ftp_passive_y" value="Y" <!--@if($ftp_info->ftp_pasv == 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_y">{$lang->cmd_yes}</label>
 					<input type="radio" name="ftp_pasv" id="ftp_passive_n" value="N" <!--@if($ftp_info->ftp_pasv != 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_n">{$lang->cmd_no}</label>
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->about_use_sftp_support}</label><span cond="!$sftp_support"><label> ({$lang->disable_sftp_support})</label></span></p>
+				<p class="q"><label for="sftp">{$lang->about_use_sftp_support}</label><span cond="!$sftp_support"><label for="sftp"> ({$lang->disable_sftp_support})</label></span></p>
 				<p class="a">
-					<input type="radio" name="sftp" id="sftp_y" value="Y" <!--@if($ftp_info->sftp == 'Y')-->checked="checked" <!--@end--><!--@if(!$sftp_support)-->disabled <!--@end-->/> <label for="sftp_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="sftp" id="sftp_y" value="Y" <!--@if($ftp_info->sftp == 'Y')-->checked="checked" <!--@end--> <!--@if(!$sftp_support)-->disabled<!--@end-->/> <label for="sftp_y">{$lang->cmd_yes}</label>
 					<input type="radio" name="sftp" id="sftp_n" value="N" <!--@if($ftp_info->sftp != 'Y')-->checked="checked" <!--@end-->/> <label for="sftp_n">{$lang->cmd_no}</label>
 				</p>
 			</li>
 			<li>
-				<p class="q"><label for="ftp_root_path">{$lang->msg_ftp_installed_ftp_realpath}</label></p>
+				<p class="q"><label for="ftp_path">{$lang->msg_ftp_installed_ftp_realpath}</label></p>
 				<p class="a">
 					<input type="text" name="ftp_root_path" id="ftp_root_path" value="{$ftp_info->ftp_root_path}" />
 					<a href="#ftpSuggestion" onclick="getFTPList(); return false;" class="tgAnchor">{$lang->ftp_get_list}</a>
diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html
index 9213f80c7..651a0a76c 100644
--- a/modules/admin/tpl/config_general.html
+++ b/modules/admin/tpl/config_general.html
@@ -28,7 +28,7 @@ jQuery(function($){
 	});
 });
 </script>
-<form action="./" method="post" id="ftp_form" class="form" enctype="multipart/form-data">
+<form action="" method="post" id="ftp_form" class="form" enctype="multipart/form-data">
 	<input type="hidden" name="module" value="install" />
 	<input type="hidden" name="act" value="procInstallAdminConfig" />
 	<h1 class="h1">{$lang->menu_gnb_sub['adminConfigurationGeneral']}</h1>
@@ -88,13 +88,13 @@ jQuery(function($){
 				</p>
 			</li>
 			<li>
-				<p class="q"><label for="change_lang_type">{$lang->about_default_lang}</label></p>
+				<p class="q"><label for="">{$lang->about_default_lang}</label></p>
 				<p class="a">
-					<select name="change_lang_type" id="change_lang_type">
+					<select name="change_lang_type">
 						<!--@foreach($lang_supported as $key => $val)-->
 						<option value="{$key}" <!--@if($key==$selected_lang)-->selected="selected"<!--@end-->>{$val}</option>
 						<!--@endforeach-->
-					</select>
+					</select>						
 				</p>
 			</li>
 			<li>
@@ -156,7 +156,7 @@ jQuery(function($){
 		<h2 class="h2">{$lang->subtitle_advanced}</h2>
 		<ul>
 			<li>
-				<p class="q"><label for="admin_ip_list">{$lang->about_admin_ip_limit}</label>[<a href="#helpAdminip" class="tgAnchor">?</a>]</p>
+				<p class="q"><label for="admin_ip">{$lang->about_admin_ip_limit}</label>[<a href="#helpAdminip" class="tgAnchor">?</a>]</p>
 				<div class="tgContent layer" id="helpAdminip">
 					<p>{$lang->detail_about_admin_ip_limit}</p>
 				</div>
@@ -172,7 +172,7 @@ jQuery(function($){
 				<p class="a"><input type="text" name="default_url" id="default_url" value="{$default_url}"/></p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->use_ssl}</label>[<a href="#helpUsessl" class="tgAnchor">?</a>]</p>
+				<p class="q"><label for="use_ssl">{$lang->use_ssl}</label>[<a href="#helpUsessl" class="tgAnchor">?</a>]</p>
 				<div class="tgContent layer" id="helpUsessl">
 					<p>{$lang->about_use_ssl}</p>
 				</div>
@@ -183,11 +183,11 @@ jQuery(function($){
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->server_ports}</label></p>
+				<p class="q">{$lang->server_ports}</p>
 				<p class="a">
-					<label for="http_port">HTTP:</label> <input type="text" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:40px" />
+					<label for="">HTTP:</label> <input type="text" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:40px" />
 					&nbsp;&nbsp;
-					<label for="https_port">HTTPS:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:40px" />
+					<label for="">HTTPS:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:40px" />
 				</p>
 			</li>
 			<li cond="__XE_CDN_VERSION__!='%__XE_CDN_VERSION__%'">
@@ -198,14 +198,14 @@ jQuery(function($){
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->about_use_rewrite}</label></p>
+				<p class="q"><label for="">{$lang->about_use_rewrite}</label></p>
 				<p class="a">
 					<input type="radio" name="use_rewrite" id="use_rewrite_y" value="Y" <!--@if($use_rewrite == 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_y">{$lang->cmd_yes}</label>
 					<input type="radio" name="use_rewrite" id="use_rewrite_n" value="N" <!--@if($use_rewrite != 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_n">{$lang->cmd_no}</label>
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->about_use_sso}</label>[<a href="#helpUsesso" class="tgAnchor">?</a>]</p>
+				<p class="q"><label for="use_sso">{$lang->about_use_sso}</label>[<a href="#helpUsesso" class="tgAnchor">?</a>]</p>
 				<div class="tgContent layer" id="helpUsesso">
 					<p>{$lang->about_sso}</p>
 				</div>
@@ -215,7 +215,7 @@ jQuery(function($){
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->use_db_session}</label>[<a href="#helpUsedbSession" class="tgAnchor">?</a>]</p>
+				<p class="q"><label for="">{$lang->use_db_session}</label>[<a href="#helpUsedbSession" class="tgAnchor">?</a>]</p>
 				<div class="tgContent layer" id="helpUsedbSession">
 					<p>{$lang->about_db_session}</p>
 				</div>
@@ -225,7 +225,7 @@ jQuery(function($){
 				</p>
 			</li>
 			<li>
-				<p class="q"><label>{$lang->qmail_compatibility}</label>[<a href="#helpQmail" class="tgAnchor">?</a>]</p>
+				<p class="q"><label for="">{$lang->qmail_compatibility}</label>[<a href="#helpQmail" class="tgAnchor">?</a>]</p>
 				<div class="tgContent layer" id="helpQmail">
 					<p>{$lang->about_qmail_compatibility}</p>
 				</div>
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 3b818febb..ad0f4abb5 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -1099,17 +1099,8 @@ $('.multiLangEdit')
 					var $li = $('<li />').appendTo($langlist);
 
 					var anchor_id = $layer.data('layer_index');
-
-					var lang_text = this[xe.current_lang];
-					if(!lang_text) {
-						for(lang_code in this) {
-							lang_text = this[lang_code];
-							break;
-						}
-					}
-
 					$('<a href="#langInput_'+anchor_id+'" class="langItem" />')
-						.text(lang_text)
+						.text(this[xe.current_lang])
 						.data('multilang-name', key)
 						.appendTo($li);
 				});
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
index a20a47156..1df6b7de8 100644
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
@@ -36,8 +36,8 @@ d=b.closest(".multiLangEdit").find("input.vLang,textarea.vLang");b=d.eq(0).val()
 e.find("li."+k).find(">input:text,>textarea").data("multilang-value",d[k]).val(d[k]).prev("label").css("visibility","hidden");w=g();s=0;r.val(u[s]);p=1;j();return!1}}).data("layer_index",n).find(".langInput").attr("id","langInput_"+n++),z=f.find("h2 strong").text(),t=f.find("h2 a").text(),v=f.find("input:text,textarea").change(function(){var a=g()==w?0:1;a!=s&&r.val(u[s=a])}),r=f.find("input[type=submit]").click(function(){function b(){f.hide().closest(".multiLangEdit").find(".vLang").eq(0).val("$user_lang->"+
 d).end().eq(1).val(f.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val()).end()}function e(a){a&&(!a.error&&a.name)&&(d=a.name,b())}var d=f.data("multilang-current-name");if(g()==w)b();else{var h={};d&&1==p&&(h.lang_name=d);v.each(function(){var b=a(this);h[b.parent("li").attr("class")]=b.val()});a.exec_json("module.procModuleAdminInsertLang",h,e)}return!1}),u=r.val().split("|"),r.val(u[0]));e.trigger("multilang-reset").removeClass("showChild").find(".langList").empty().end();
 e.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val(d).prev("label").css("visibility","hidden");k.trigger("hide");/^\$user_lang->(.+)$/.test(b)?(b="module.getModuleAdminLangListByName",d={lang_name:RegExp.$1}):(b="module.getModuleAdminLangListByValue",d={value:d});show_waiting_message=!1;a.exec_json(b,d,function(b){var d=b.lang_list,f;if(!b.error&&d){var b=d,g,h={},j,d=0;for(g=b.length;d<g;d++){j=b[d];h[j.name]||(h[j.name]={});h[j.name][j.lang_code]=j.value}d=h;e.data("multilang-list",
-d);f=e.find(".langList");a.each(d,function(b){var d=a("<li />").appendTo(f),g=e.data("layer_index"),h=this[xe.current_lang];if(!h)for(lang_code in this){h=this[lang_code];break}a('<a href="#langInput_'+g+'" class="langItem" />').text(h).data("multilang-name",b).appendTo(d)});var b=d,d=0,k;for(k in b)b.hasOwnProperty(k)&&d++;d>1&&e.addClass("showChild");e.find(".langList>li>a:first").click()}});show_waiting_message=!0}}).delegate("button._btnLang",{click:function(){var b=a(this);g=!0;k.trigger("hide");
-b.closest(".multiLangEdit").find("input.vLang,textarea.vLang").eq(0).val(b.data("langkey")).end().eq(1).val(b.text()).end();return!1},mousedown:function(){f=!0},focus:function(){a(this).mouseover()},mouseover:function(){a(this).closest("ul").find("button.active").removeClass("active")}});k=a('<div class="suggestion"><ul></ul></div>').bind("show",function(){a(this).show()}).bind("hide",function(){a(this).hide()});var n=0});
+d);f=e.find(".langList");a.each(d,function(b){var d=a("<li />").appendTo(f),g=e.data("layer_index");a('<a href="#langInput_'+g+'" class="langItem" />').text(this[xe.current_lang]).data("multilang-name",b).appendTo(d)});var b=d,d=0,k;for(k in b)b.hasOwnProperty(k)&&d++;d>1&&e.addClass("showChild");e.find(".langList>li>a:first").click()}});show_waiting_message=!0}}).delegate("button._btnLang",{click:function(){var b=a(this);g=!0;k.trigger("hide");b.closest(".multiLangEdit").find("input.vLang,textarea.vLang").eq(0).val(b.data("langkey")).end().eq(1).val(b.text()).end();
+return!1},mousedown:function(){f=!0},focus:function(){a(this).mouseover()},mouseover:function(){a(this).closest("ul").find("button.active").removeClass("active")}});k=a('<div class="suggestion"><ul></ul></div>').bind("show",function(){a(this).show()}).bind("hide",function(){a(this).hide()});var n=0});
 jQuery(function(a){a(".filebox").bind("before-open.mw",function(){function d(g){e.html(g.html);e.find(".lined .select").bind("click",function(){var d=a("input.select_checkbox:checked");0==d.length?(d=a(this).parent().find("img.filebox_item").attr("src"))?(b.trigger("filebox.selected",[d]),b.trigger("close.mw")):alert("None selected!"):(b.trigger("filebox.selected",[d]),b.trigger("close.mw"));return!1});e.find(".pagination").find("a").filter(function(){return a(this).hasClass("tgAnchor")?!1:!0}).bind("click",
 function(){var b=a(this).attr("page");a.exec_json("module.getFileBoxListHtml",{page:b},d);a(window).scrollTop(a(j).find(".modalClose").offset().top);return!1});a("#FileBoxGoTo").find("button").bind("click",function(){var b=a(this).prev("input").val();a.exec_json("module.getFileBoxListHtml",{page:b},d);a(window).scrollTop(a(j).find(".modalClose").offset().top);return!1})}var b,e,j;b=a(this);j=b.attr("href");e=a(j).find(".filebox_list");a.exec_json("module.getFileBoxListHtml",{page:"1"},d)})});
 function showWaitingFogLayer(){var a=jQuery('<span class="bg"></span>');a.height(jQuery(window).height());jQuery(".wfsr").wrap('<div class="wfsr_fog" />').before(a)}function hideWaitingFogLayer(){jQuery(".wfsr").prev("span").remove();jQuery(".wfsr").unwrap()}function doInstallModule(a){var d=[];d.module_name=a;exec_xml("install","procInstallAdminInstall",d,completeInstallModule);showWaitingFogLayer()}
diff --git a/modules/comment/lang/lang.xml b/modules/comment/lang/lang.xml
index 299af6cbf..34126b3de 100644
--- a/modules/comment/lang/lang.xml
+++ b/modules/comment/lang/lang.xml
@@ -251,11 +251,9 @@
 	<item name="published_name_list" type="array">
 		<item name="Y">
 			<value xml:lang="en"><![CDATA[Published]]></value>
-			<value xml:lang="ko"><![CDATA[공개 발행]]></value>
 		</item>
 		<item name="N">
 			<value xml:lang="en"><![CDATA[Unpublished]]></value>
-			<value xml:lang="ko"><![CDATA[발행 대기]]></value>
 		</item>
 	</item>
 	<item name="comment_manager">
@@ -268,7 +266,7 @@
 		<value xml:lang="ko"><![CDATA[선택한 댓글]]></value>
 		<value xml:lang="en"><![CDATA[Selected Comment]]></value>
 		<value xml:lang="jp"><![CDATA[選択したコメント]]></value>
-		<value xml:lang="zh-TW"><![CDATA[已選回覆]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已選回覆]]></value>		
 	</item>
 	<item name="cmd_comment_validation">
 		<value xml:lang="en"><![CDATA[Use comment validation]]></value>
@@ -278,22 +276,11 @@
 	</item>
 	<item name="published">
 		<value xml:lang="en"><![CDATA[Publish status]]></value>
-		<value xml:lang="ko"><![CDATA[발행 상태]]></value>
 	</item>
 	<item name="cmd_publish">
 		<value xml:lang="en"><![CDATA[Publish]]></value>
-		<value xml:lang="ko"><![CDATA[발행]]></value>
 	</item>
 	<item name="cmd_unpublish">
 		<value xml:lang="en"><![CDATA[Unpublish]]></value>
-		<value xml:lang="ko"><![CDATA[발행 중지]]></value>
-	</item>
-	<item name="select_module">
-		<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
-		<value xml:lang="en"><![CDATA[Select Module]]></value>
-	</item>
-	<item name="page">
-		<value xml:lang="ko"><![CDATA[페이지]]></value>
-		<value xml:lang="en"><![CDATA[Page]]></value>
 	</item>
 </lang>
\ No newline at end of file
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index a19c5c3d3..48b8584f6 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -18,8 +18,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 			| <a href="{getUrl('search_target','is_published','search_keyword', 'Y')}" <!--@if($search_target == 'is_published' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$lang->published_name_list['Y']}</a>
 
 			<block cond="$modules_list">
-			| <label for="comment_modules" <!--@if($search_target == 'module')-->class="active"<!--@end-->>{$lang->select_module}:
-			<select id="comment_modules" name="comment_modules" onchange="location.href='{getUrl('search_target','module','search_keyword','')}&amp;search_keyword='+this.value">
+			| <label for="comment_modules" <!--@if($search_target == 'module')-->class="active"<!--@end-->>Select Module:
+			<select id="comment_modules" name="comment_modules" onchange="location.href='{getUrl('search_target','module','search_keyword','')}&search_keyword='+this.value">
 				<option></option>
 				<!--@foreach($modules_list as $key => $node)-->
 				<option value="{$key}"<!--@if($key==$search_keyword)-->selected<!--@end-->>{$node}</option>
@@ -136,14 +136,14 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	</form>
 </div>
 <div class="search">
-<form action="./" class="pagination">
+<form action="" class="pagination">
 	<input type="hidden" name="error_return_url" value="" />
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
   	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
   	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 
-	<a href="{getUrl('page', '')}" class="direction">&laquo; {$lang->first_page}</a>
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
 	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<a href="{getUrl('page', '')}">1</a>
@@ -159,7 +159,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
 		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
 	</block>
-	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">{$lang->last_page} &raquo;</a>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
 	<span cond="$isGoTo" id="goTo" class="tgContent">
 		<input name="page" title="{$lang->cmd_go_to_page}" />
 		<button type="submit">Go</button>
diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html
index ec3140a01..36fc0d5d4 100644
--- a/modules/comment/tpl/declared_list.html
+++ b/modules/comment/tpl/declared_list.html
@@ -13,7 +13,7 @@
 	<!-- 목록 -->
 	<div class="table">
 		<table width="100%" border="1" cellspacing="0">
-		<caption>{$lang->all} {number_format($total_count)}, {$lang->page} {number_format($page)}/{number_format($total_page)}</caption>
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
 		<thead>
 			<tr>
 				<th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></th>
@@ -49,7 +49,7 @@
 
 <!-- 페이지 네비게이션 -->
 <div class="pagination">
-    <a href="{getUrl('page','','module_srl','')}" class="direction">&laquo; {$lang->first_page}</a> 
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
     <!--@while($page_no = $page_navigation->getNextPage())-->
         <!--@if($page == $page_no)-->
             <strong>{$page_no}</strong> 
@@ -57,5 +57,5 @@
             <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
         <!--@end-->
     <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &raquo;</a>
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
 </div>
diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html
index 5a6347564..eb0c99f6e 100644
--- a/modules/document/tpl/declared_list.html
+++ b/modules/document/tpl/declared_list.html
@@ -48,7 +48,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 					</tr>
 				</tfoot>
 				<tbody>
-					<!--@foreach($document_list as $no => $oDocument)-->
+    				<!--@foreach($document_list as $no => $oDocument)-->
 					<tr>
 						<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
 						<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
@@ -122,14 +122,14 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	</div>
 	<div class="search">
 
-<form action="./" class="pagination">
+<form action="" class="pagination">
 	<input type="hidden" name="error_return_url" value="" />
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
-	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
-	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 
-	<a href="{getUrl('page', '')}" class="direction">&laquo; {$lang->first_page}</a>
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
 	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<a href="{getUrl('page', '')}">1</a>
@@ -145,7 +145,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
 		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
 	</block>
-	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">{$lang->last_page} &raquo;</a>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
 	<span cond="$isGoTo" id="goTo" class="tgContent">
 		<input name="page" title="{$lang->cmd_go_to_page}" />
 		<button type="submit">Go</button>
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index d632cabc3..2c67e1f86 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -59,7 +59,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 					</tr>
 				</tfoot>
 				<tbody>
-					<!--@foreach($document_list as $no => $oDocument)-->
+    				<!--@foreach($document_list as $no => $oDocument)-->
 					<tr>
 						<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitle()))-->{$oDocument->getTitle()}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a></td>
 						<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
@@ -133,14 +133,14 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	</div>
 	<div class="search">
 
-<form action="./" class="pagination">
+<form action="" class="pagination">
 	<input type="hidden" name="error_return_url" value="" />
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
-	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
-	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 
-	<a href="{getUrl('page', '')}" class="direction">&laquo; {$lang->first_page}</a>
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
 	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<a href="{getUrl('page', '')}">1</a>
@@ -156,7 +156,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
 		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
 	</block>
-	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">{$lang->last_page} &raquo;</a>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
 	<span cond="$isGoTo" id="goTo" class="tgContent">
 		<input name="page" title="{$lang->cmd_go_to_page}" />
 		<button type="submit">Go</button>
diff --git a/modules/file/tpl/adminConfig.html b/modules/file/tpl/adminConfig.html
index f1e07ac0a..17d6cbb26 100644
--- a/modules/file/tpl/adminConfig.html
+++ b/modules/file/tpl/adminConfig.html
@@ -8,23 +8,25 @@
 	<h1 class="h1">File Upload</h1>
 	<ul>
 		<li>
-			<p class="q"><label>{$lang->allow_outlink}</label></p>
+			<p class="q">{$lang->allow_outlink}</p>
 			<p class="a">
 				<input type="radio" name="allow_outlink" value="Y" id="allow_outlink_y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> <label for="allow_outlink_y">{$lang->cmd_yes}</label>
 				<input type="radio" name="allow_outlink" value="N" id="allow_outlink_n" checked="checked"|cond="$config->allow_outlink == 'N'" /> <label for="allow_outlink_n">{$lang->cmd_no}</label>
 			</p>
 		</li>
 		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
-			<p class="q"><label for="allow_outlink_format">{$lang->allow_outlink_format}</label></p>
-			<p class="a"><input type="text" name="allow_outlink_format" id="allow_outlink_format" value="{$config->allow_outlink_format}" /></p>
-			<p class="desc">{$lang->about_allow_outlink_format}</p>
-			
+			<p class="q">{$lang->allow_outlink_format}</p>
+			<p class="a">
+				<input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}" />
+				<p>{$lang->about_allow_outlink_format}</p>
+			</p>
 		</li>
 		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
-			<p class="q"><label for="allow_outlink_site">{$lang->allow_outlink_site}</label></p>
-			<p class="a"><textarea name="allow_outlink_site" id="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea></p>
-			<p class="desc">{$lang->about_allow_outlink_site}</p>
-			
+			<p class="q">{$lang->allow_outlink_site}</p>
+			<p class="a">
+				<textarea type="text" name="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
+				<p>{$lang->about_allow_outlink_site}</p>
+			</p>
 		</li>
 		<li>
 			<p class="q"><label for="filesize">{$lang->about_allowed_filesize}</label></p>
@@ -36,11 +38,12 @@
 		</li>
 		<li>
 			<p class="q"><label for="allowedFiletypes">{$lang->allowed_filetypes}</label></p>
-			<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" /></p>
-			<p class="desc">{$lang->about_allowed_filetypes}</p>
+			<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" />
+				<p>{$lang->about_allowed_filetypes}</p>
+			</p>
 		</li>
 	</ul>
 	<div class="btnArea">
 		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index f20319bd6..217779797 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -630,12 +630,6 @@
 			$oLayoutModel = &getModel('layout');
 			$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
 
-			$args->extra_vars = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
-			$extra_vars = unserialize($args->extra_vars);
-
-			$oModuleController = &getController('module');
-			$layout_config->header_script = $extra_vars->header_script;
-
             // Get information to create a layout
             $args->site_srl = (int)$layout->site_srl;
             $args->layout = $layout->layout;
@@ -657,9 +651,6 @@
 					$args->layout_srl = getNextSequence();
 					$args->title = $value;
 
-					// for header script
-					$oModuleController->insertModulePartConfig('layout', $args->layout_srl, $layout_config);
-
 					// Insert into the DB
 					$output = $this->insertLayout($args);
 					if(!$output->toBool())
@@ -672,6 +663,7 @@
 					$this->initLayout($args->layout_srl, $args->layout);
 
 					// update layout info
+					$args->extra_vars = $layout->extra_var;
 					$output = $this->updateLayout($args);
 					if (!$output->toBool())
 					{
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 75472f2aa..5b1acccdd 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -149,7 +149,7 @@
 			
 			//Security
 			$security = new Security();
-			$security->encodeHTML('layout_list..layout','layout_list..title');
+			$security->encodeHTML('layout_list..layout','layout_list..title');						
 
 			// Get layout info
 			$layout = Context::get('layout');
@@ -179,7 +179,7 @@
 			Context::set('selected_layout', $layout_info);
 
 			$this->setTemplateFile('layout_modify');
-		}
+        }
 
 		/**
          * Insert Layout details
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 2f26a0350..aff35a78f 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -97,16 +97,6 @@
         	return $layout_info;
         }
 
-		function getLayoutRawData($layout_srl, $columnList = array())
-		{
-			$args->layout_srl = $layout_srl;
-			$output = executeQuery('layout.getLayout', $args, $columnList);
-			if(!$output->toBool())
-				return;
-
-			return $output->data->extra_vars;
-		}
-
         /**
          * Get a layout path
 		 * @param string $layout_name
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index 04b6e4230..ea12e5938 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -78,7 +78,7 @@
 				<block cond="$var->type == 'image'">
 					<input type="hidden" name="{$name}" id="file_{$name}" value="{$var->value}" />
 					<div id="preview_{$name}" style="display:none;"|cond="!$var->value">
-						<img src="../../../{$var->value}" cond="$var->value" alt="" style="max-width: 250px" />
+						<img src="../../../{$var->value}"|cond="$var->value" alt="" style="max-width: 250px"/>
 						<input type="button" value="{$lang->cmd_delete}" onclick="deleteImage('{$name}')" />
 					</div>
 					<form action="./" enctype="multipart/form-data" method="post" target="hiddenIframe" class="imageUpload">
@@ -134,7 +134,8 @@
 			<p class="desc">{$var->description}</p>
 		</li>
 	</block>
-	<block cond="$act == 'dispLayoutAdminModify'"></ul></block>
+	</ul>
+
 
 	<h3 class="h3" cond="$selected_layout->menu">{$lang->menu}</h3>
 	<ul cond="$selected_layout->menu">
@@ -163,10 +164,6 @@
 	</ul>
 
 	<div class="btnArea">
-		<span class="etc">
-			<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList')}">{$lang->instance_layout}&nbsp;{$lang->cmd_list}</a></span>
-			<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout)}">{$selected_layout->title} ver {$selected_layout->version}({$selected_layout->layout})&nbsp;{$lang->cmd_list}</a></span>
-		</span>
 		<span class="btn medium">
 			<input type="submit" value="{$lang->cmd_insert}"|cond="$act == 'dispLayoutAdminInsert'" value="{$lang->cmd_save}"|cond="$act == 'dispLayoutAdminModify'" onclick="doSubmitConfig()"/>
 		</span>
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 3f569393c..223c6e987 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -815,7 +815,7 @@
                     $link = '<?php print $_names[$lang_type]; ?>';
                 }
                 // If the value of node->group_srls exists
-                if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls === -1?1:0);
+                if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls === -1?'TRUE':'FALSE');
                 else $group_check_code = "true";
                 $attribute = sprintf(
                     'node_srl="%s" parent_srl="%s" text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?"%s":"")?>" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
@@ -874,7 +874,7 @@
                 if($node->url) $child_output['url_list'][] = $node->url;
                 $output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
                 // If node->group_srls value exists
-                if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls === -1?1:0);
+                if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls === -1?'TRUE':'FALSE');
                 else $group_check_code = "true";
                 // List variables
                 $href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
diff --git a/modules/module/tpl/adminFileBox.html b/modules/module/tpl/adminFileBox.html
index a6fe35f44..7e68aaf15 100644
--- a/modules/module/tpl/adminFileBox.html
+++ b/modules/module/tpl/adminFileBox.html
@@ -4,7 +4,7 @@
 </div>
 		<h1 class="h1">{$lang->menu_gnb_sub['filebox']}</h1>
 		<div class="fileBox">
-			<form action="./" class="portlet form" method="post" enctype="multipart/form-data">
+			<form action="" class="portlet form" method="post" enctype="multipart/form-data">
 				<input type="hidden" name="module" value="module" />
 				<input type="hidden" name="act" value="procModuleFileBoxAdd" />
 				<input type="hidden" name="vid" value="{$vid}" />
@@ -28,7 +28,7 @@
 					</div>
 				</div>
 			</form>
-			<form action="./" class="form">
+			<form action="" class="form">
 				<ul>
 					<li loop="$filebox_list=>$key,$val">
 						<!--@foreach($val->attributes as $key => $value)-->
@@ -54,7 +54,7 @@
 				</ul>
 			</form>
 		</div>
-		<form action="./" class="pagination" method="post">
+		<form action="" class="pagination" method="post">
 			<input type="hidden" name="error_return_url" value="" />
 			<input type="hidden" name="module" value="{$module}" />
 			<input type="hidden" name="act" value="{$act}" />
@@ -64,7 +64,7 @@
 			<input cond="$childrenList" type="hidden" name="childrenList" value="{$childrenList}" />
 			<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
 
-			<a href="{getUrl('page', '')}" class="direction">&laquo; {$lang->first_page}</a>
+			<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
 
 			<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
 				{@$isGoTo = true}
@@ -84,7 +84,7 @@
 				<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
 			</block>
 
-			<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">{$lang->last_page} &raquo;</a>
+			<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
 
 			<span cond="$isGoTo" id="goTo" class="tgContent">
 				<input name="page" title="{$lang->cmd_go_to_page}" />
diff --git a/modules/module/tpl/filebox_list.html b/modules/module/tpl/filebox_list.html
index f0283f01f..26011baed 100644
--- a/modules/module/tpl/filebox_list.html
+++ b/modules/module/tpl/filebox_list.html
@@ -56,5 +56,5 @@
 	<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
 </div>
 <div class="btnArea">
-	<span class="btn"><a href="{getUrl('','module','module','act','dispModuleFileBoxAdd','filter',$filter,'input',$input)}">{$lang->cmd_registration}</a></span>
+    <span class="btn"><a href="{getUrl('','module','module','act','dispModuleFileBoxAdd','filter',$filter,'input',$input)}">{$lang->cmd_registration}</a></span>
 </div>
diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php
index 569fa7549..1ebaecc15 100644
--- a/modules/page/page.admin.view.php
+++ b/modules/page/page.admin.view.php
@@ -254,8 +254,8 @@
             Context::set('content', $content);
             // Convert them to teach the widget
             $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($content, true, true);
-			// $content = str_replace('$', '&#36;', $content);
+            $content = $oWidgetController->transWidgetCode($content, true, false);
+			$content = str_replace('$', '&#36;', $content);
             Context::set('page_content', $content);
             // Set widget list
             $oWidgetModel = &getModel('widget');