fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 14:49:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

17
modules/menu/tpl/js/sitemap.js
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;
});
});

1
modules/menu/tpl/mid_list.html
View file

@ -1,5 +1,4 @@
<!--%import("js/menu_admin.js")-->
<!--%import("../../common/css/popup.css")-->
<h1 class="h1">{$lang->cmd_search_mid}</h1>
<form action="./" method="get">
<input type="hidden" name="module" value="{$module}" />

18
modules/menu/tpl/sitemap.html
View file

@ -9,17 +9,16 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">{$lang->menu_gnb_sub['siteMap']}</h1>
<block loop="$menu_list=>$key,$value">
{@$menuSrl = $value->menuSrl}
<form class="portlet siteMap" id="menu_{$menuSrl}" method="post">
<form class="portlet siteMap" id="menu_{$menuSrl}" method="post" action="#menu_{$menuSrl}">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="procMenuAdminArrangeItem" />
<input type="hidden" name="menu_srl" value="{$menuSrl}" />
<input type="hidden" name="menu_item_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_{$menuSrl}" />
<h2 class="h2"><input name="title" value="{$value->title}" /></h2>
<h2 class="h2" id="menuTop_{$menuSrl}"><input name="title" value="{$value->title}" /></h2>
<a href="#nav_{$key}" class="tgMap">{$lang->collapsing}/{$lang->expanding}</a>
<ul class="lined" id="nav_{$key}" cond="count($value->menuItems->list > 0)" <!--@if($_COOKIE['sitemap_toggle_#nav_'.$key])-->style="display:none;"<!--@end-->>
<block loop="$value->menuItems->list=>$key2,$value2">
@ -28,7 +27,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
</block>
</ul>
<p class="btnArea">
<span class="btn"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}</a></span>
<span class="btn"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}...</a></span>
<span class="btn"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span>
<span class="etc">
<span class="btn"><button value="procMenuAdminDelete" name="act" type="submit" onclick="return confirmDelete();">{$lang->cmd_delete}</button></span>
@ -55,6 +54,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<input type="hidden" name="menu_srl" value="" />
<input type="hidden" name="menu_item_srl" value="{$menu_info->menu_srl}" />
<input type="hidden" name="parent_srl" value="{$menu_info->menu_srl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
<h2 class="h2"><span>{$lang->add_menu}</span><span>{$lang->edit_menu}</span></h2>
<ul>
<li>
@ -66,7 +66,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<div id="langEdit" class="langEdit tgContent">
<ul class="langList"></ul>
<div class="langInput">
<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}...</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<ul>
{@
/* move current language to the top */
@ -154,6 +154,12 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<block loop="$group_list=>$key,$value"><input type="checkbox" name="group_srls[]" id="group_srls_{$value->group_srl}" value="{$value->group_srl}" /> <label for="group_srls_{$value->group_srl}">{$value->title}</label></block>
</p>
</li>
<li>
<p class="q">{$lang->expand}</p>
<p class="a" id="expand">
<input type="checkbox" name="menu_expand" value="Y" /> {$lang->about_expand}
</p>
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>