diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php
index 4140ecb4d..e9306ad58 100644
--- a/modules/menu/menu.admin.view.php
+++ b/modules/menu/menu.admin.view.php
@@ -183,6 +183,20 @@
$layoutList = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layoutList);
+ // choice theme file
+ $theme_file = _XE_PATH_.'files/theme/theme_info.php';
+ if(is_readable($theme_file))
+ {
+ @include($theme_file);
+ Context::set('current_layout', $theme_info->layout);
+ }
+ else
+ {
+ $oModuleModel = &getModel('module');
+ $default_mid = $oModuleModel->getDefaultMid();
+ Context::set('current_layout', $default_mid->layout_srl);
+ }
+
// get default group list
$oMemberModel = &getModel('member');
$output = $oMemberModel->getGroups();
diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js
index f727ef88e..48b9c7d20 100644
--- a/modules/menu/tpl/js/sitemap.js
+++ b/modules/menu/tpl/js/sitemap.js
@@ -161,7 +161,7 @@ $('form.siteMap')
editForm.find('input[name=menu_name]').val('');
editForm.find('input[name=cType]').attr('checked', false);
editForm.find('input[name=create_menu_url]').val('');
- editForm.find('select[name=layout_srl]')[0].options[0].selected = true;
+ editForm.find('select[name=layout_srl]').val(xe.current_layout);
editForm.find('input[name=menu_url]').val('');
editForm.find('input[name=menu_open_window]')[0].checked = true;
editForm.find('input[name=group_srls\\[\\]]').attr('checked', false);
@@ -292,7 +292,7 @@ $('form.siteMap')
}
else if(checkedValue == 'CREATE')
{
- $('#layoutSrl').val('0');
+ $('#layoutSrl').val(xe.current_layout);
}
}
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index c5bc0cb41..baace0090 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -1,5 +1,6 @@