merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -46,12 +46,14 @@ $('form.siteMap')
{
var menuItem = obj.menu_item;
menuUrl = menuItem.url;
var successReturnUrl = editForm.find('input[name=success_return_url]').val() + menuItem.menu_srl;
editForm.find('.h2').text(xe.lang.edit_menu);
editForm.find('input[name=menu_srl]').val(menuItem.menu_srl);
editForm.find('input[name=menu_item_srl]').val(menuItem.menu_item_srl);
editForm.find('input[name=parent_srl]').val(menuItem.parent_srl);
editForm.find('input[name=menu_name_key]').val(menuItem.name_key);
editForm.find('input[name=menu_name]').val(menuItem.name);
editForm.find('input[name=success_return_url]').val(successReturnUrl);
var moduleType = menuItem.moduleType;
if(menuItem.pageType) moduleType = menuItem.pageType;
@ -76,6 +78,11 @@ $('form.siteMap')
if(openWindow == 'Y') openWindowForm[1].checked = true;
else openWindowForm[0].checked = true;
var expand = menuItem.expand;
var expandForm = editForm.find('input=[name=menu_expand]');
if(expand == 'Y') expandForm[0].checked = true;
else expandForm[0].checked = false;
// button image
if(menuItem.normal_btn) $('#normal_btn_preview').html('<img src="'+menuItem.normal_btn+'" /><input type="checkbox" name="isNormalDelete" value="Y"> Delete');
if(menuItem.hover_btn) $('#hover_btn_preview').html('<img src="'+menuItem.hover_btn+'" /><input type="checkbox" name="isHoverDelete" value="Y"> Delete');
@ -217,7 +224,12 @@ $('form.siteMap')
selectModuleLayer.find('select').html(htmlBuffer);
}
function tgMapBtn(){
$('.x .siteMap>ul:visible').next('.btnArea').slideDown(50);
$('.x .siteMap>ul:hidden').next('.btnArea').slideUp(50);
}
tgMapBtn();
$('a.tgMap').click(function() {
var $this = $(this);
var curToggleStatus = getCookie('sitemap_toggle_'+$this.attr('href'));
@ -226,7 +238,8 @@ $('form.siteMap')
$($this.attr('href')).slideToggle('fast');
$this.closest('.siteMap').toggleClass('fold');
setCookie('sitemap_toggle_'+$this.attr('href'), toggleStatus);
setTimeout(function(){ tgMapBtn(); }, 250);
return false;
});
});