From 17b757f4e2eaf2225d5abcd264fdcd27e4ade0f9 Mon Sep 17 00:00:00 2001
From: taggon <gonom9@gmail.com>
Date: Tue, 5 Jan 2010 07:56:57 +0000
Subject: [PATCH] =?UTF-8?q?#18591864=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EB=AF=B8=EB=A6=AC?=
 =?UTF-8?q?=EB=B3=B4=EA=B8=B0=EA=B0=80=20=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7120 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/layout/tpl/js/layout_admin.js | 37 ++++++++++++++-------------
 modules/layout/tpl/layout_edit.html   | 11 ++++----
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/modules/layout/tpl/js/layout_admin.js b/modules/layout/tpl/js/layout_admin.js
index 4be783f87..207f4356f 100644
--- a/modules/layout/tpl/js/layout_admin.js
+++ b/modules/layout/tpl/js/layout_admin.js
@@ -13,26 +13,9 @@ function doDeleteLayout(layout_srl) {
     procFilter(fo_obj, delete_layout);
 }
 
-/* 수정된 레이아웃을 원본으로 돌림 */
-function doResetLayoutCode(layout_srl) {
-    var fo_obj = jQuery('#fo_layout').get(0);
-    procFilter(fo_obj, reset_layout_code);
-    return false;
-}
-
-/* 수정중인 레이아웃 미리보기 */
-function doPreviewLayoutCode(layout_srl) {
-
-    jQuery('#fo_layout').attr('target', "_LayoutPreview");
-    jQuery('input[name=act]','#fo_layout').val("dispLayoutAdminPreview");
-    jQuery('#fo_layout').submit();
-    jQuery('#fo_layout').removeAttr('target');
-}
-
-
 /* 메뉴 관리로 이동 */
 function doMenuManagement(menu_id) {
-    var menu_srl = jQuery('#fo_layout select[name='+menu_id+'] option:selected').val();
+    var menu_srl = jQuery('#fo_layout select[name='+menu_id+']').val();
     var url = '';
     // 선택된 메뉴가 없으면
     if(menu_srl == 0){
@@ -65,3 +48,21 @@ function deleteFile(layout_srl,filename){
         document.location.reload();
     });
 }
+
+(function($){
+
+/* preview layout */
+function doPreviewLayoutCode(layout_srl) {
+	var act = $('input[name=act]','#fo_layout').val();
+	$('#fo_layout').attr('target', "_LayoutPreview").find('input[name=act]').val('dispLayoutAdminPreview');
+	$('#fo_layout').submit().removeAttr('target').find('input[name=act]').val(act);
+}
+window.doPreviewLayoutCode = doPreviewLayoutCode;
+
+/* restore layout code */
+function doResetLayoutCode(layout_srl) {
+    procFilter($('#fo_layout')[0], reset_layout_code);
+}
+window.doResetLayoutCode = doResetLayoutCode;
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index 3dc994467..475ff825c 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -84,9 +84,10 @@
 <!--@end-->
 
 
-<form id="fo_layout" action="./" method="post" onsubmit="return procFilter(this, update_layout_code);">
+<form id="fo_layout" action="./" method="post">
 <input type="hidden" name="layout_srl" value="{$layout_srl}" />
-<input type="hidden" name="act" value="" />
+<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
+<input type="hidden" name="_filter" value="update_layout_code" />
 
 <table cellspacing="0" class="rowTable">
 <tbody>
@@ -107,9 +108,9 @@
     </tr>
     <tr>
         <th class="button">
-            <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
-            <a href="#" onclick="doPreviewLayoutCode();return false"  class="button"><span>{$lang->cmd_preview}</span></a>
-            <a href="#" onclick="doResetLayoutCode('{$layout_srl}');return false"  class="button red"><span>{$lang->cmd_reset}</span></a>
+			<span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
+			<span class="button"><button type="button" onclick="doPreviewLayoutCode();">{$lang->cmd_preview}</button></span>
+			<span class="button red"><button type="reset" onclick="doResetLayoutCode('{$layout_srl}')">{$lang->cmd_reset}</button></span>
         </th>
     </tr>
 </tbody>