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

merge from 1.5.3 (~r10943)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions
Download patch file Download diff file Expand all files Collapse all files

84
modules/menu/tpl/js/sitemap.js
View file

@ -29,6 +29,10 @@ $('form.siteMap')
$('a._edit').click(function(){
resetEditForm();
var itemKey = $(this).parent().prevAll('._item_key').val();
var itemLayoutKey = $(this).parent().prevAll('._item_layout_key').val();
var moduleSrl = $(this).parent().prevAll('input._module_srl_key').val();
editForm.find('input[name=module_srl]').val(moduleSrl);
menuSrl = $(this).parents().prevAll('input[name=menu_srl]').val();
menuForm = $('#menu_'+menuSrl);
var menuItemSrl = null;
@ -69,6 +73,7 @@ $('form.siteMap')
inputCType[1].checked = true;
editForm.find('select[name=module_type]').val(moduleType);
editForm.find('select[name=select_menu_url]').val(menuItem.url);
editForm.find('select[name=layout_srl]').val(menuItem.layoutSrl);
}
typeCheck();
getModuleList();
@ -122,8 +127,9 @@ $('form.siteMap')
var kindModuleLayer = $('#kindModule');
var createModuleLayer = $('#createModule');
var selectModuleLayer = $('#selectModule');
var selectModuleLayer = $('#sModule_id');
var insertUrlLayer = $('#insertUrl');
var selectLayoutLayer = $('#selectLayout');
function resetEditForm()
{
@ -131,13 +137,14 @@ $('form.siteMap')
createModuleLayer.hide()
selectModuleLayer.hide()
insertUrlLayer.hide()
selectLayoutLayer.hide()
editForm.find('input[name=menu_item_srl]').val('');
editForm.find('input[name=parent_srl]').val(0);
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('input[name=select_menu_url]').val('');
editForm.find('select[name=layout_srl]')[0].options[0].selected = true;
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);
@ -149,18 +156,18 @@ $('form.siteMap')
var $this = $(this);
resetEditForm();
editForm.find('.h2').text(xe.lang.add_menu);
editForm.find('input[name=menu_srl]').val($this.closest('form').find('input[name=menu_srl]:first').val());
editForm.find('input[name=parent_srl]').val($this.parent().prevAll('input._item_key').val());
});
$('input._typeCheck').click(typeCheck);
var checkedValue = null;
function typeCheck()
{
var inputTypeCheck = $('input._typeCheck');
var checkedValue = null;
for(var i=0; i<3; i++)
{
if(inputTypeCheck[i].checked)
@ -173,16 +180,20 @@ $('form.siteMap')
if(checkedValue == 'CREATE')
{
kindModuleLayer.show();
createModuleLayer.show()
selectModuleLayer.hide()
insertUrlLayer.hide()
createModuleLayer.show();
selectModuleLayer.hide();
insertUrlLayer.hide();
selectLayoutLayer.show();
changeLayoutList();
}
else if(checkedValue == 'SELECT')
{
kindModuleLayer.show();
createModuleLayer.hide()
selectModuleLayer.show()
insertUrlLayer.hide()
createModuleLayer.hide();
selectModuleLayer.show();
insertUrlLayer.hide();
selectLayoutLayer.show();
changeLayoutList();
}
// type is URL
else
@ -191,6 +202,7 @@ $('form.siteMap')
createModuleLayer.hide()
selectModuleLayer.hide()
insertUrlLayer.show()
selectLayoutLayer.hide()
}
}
@ -203,6 +215,8 @@ $('form.siteMap')
exec_xml('module','procModuleAdminGetList',params, completeGetModuleList, response_tags);
}
var layoutList = new Array();
var moduleList = new Array();
function completeGetModuleList(ret_obj)
{
var module = $('#kModule').val();
@ -212,19 +226,59 @@ $('form.siteMap')
if(ret_obj.module_list[module] != undefined)
{
var midList = ret_obj.module_list[module].list;
var midListByCategory = new Object();
for(x in midList)
{
if(!midList.hasOwnProperty(x)){
continue;
}
var midObject = midList[x];
htmlBuffer += '<option value="'+midObject.mid+'"';
if(menuUrl == midObject.mid) htmlBuffer += ' selected ';
htmlBuffer += '>'+midObject.mid+'('+midObject.browser_title+')</option>';
if(!midListByCategory[midObject.module_category_srl])
{
midListByCategory[midObject.module_category_srl] = new Array();
}
midListByCategory[midObject.module_category_srl].push(midObject);
}
for(x in midListByCategory)
{
var midGroup = midListByCategory[x];
htmlBuffer += '<optgroup label="'+x+'">'
for(y in midGroup)
{
var midObject = midGroup[y];
htmlBuffer += '<option value="'+midObject.mid+'"';
if(menuUrl == midObject.mid) htmlBuffer += ' selected ';
htmlBuffer += '>'+midObject.mid+'('+midObject.browser_title+')</option>';
layoutList[midObject.mid] = midObject.layout_srl;
moduleList[midObject.mid] = midObject.module_srl;
}
htmlBuffer += '</optgroup>'
}
}
else htmlBuffer = '';
selectModuleLayer.find('select').html(htmlBuffer);
selectModuleLayer.html(htmlBuffer);
changeLayoutList();
}
$('#sModule_id').change(changeLayoutList).change();
function changeLayoutList()
{
if(checkedValue == 'SELECT')
{
var mid = $('#sModule_id').val();
$('#layoutSrl').val(layoutList[mid]);
editForm.find('input[name=module_srl]').val(moduleList[mid]);
}
else if(checkedValue == 'CREATE')
{
$('#layoutSrl').val('0');
}
}
function tgMapBtn(){
$('.x .siteMap>ul:visible').next('.btnArea').slideDown(50);
$('.x .siteMap>ul:hidden').next('.btnArea').slideUp(50);

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

@ -54,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="module_srl" value="" />
<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>
@ -109,6 +110,8 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<option value="{$key}" cond="$key!='page'">{$value->title}</option>
</block>
</select>
<select style="width:290px" id="sModule_id" name="select_menu_url">
</select>
</p>
</li>
<li id="createModule">
@ -117,19 +120,21 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<input type="text" id="cModule_id" name="create_menu_url" />
</div>
</li>
<li id="selectModule">
<p class="q"><label for="sModule_id">{$lang->select_mid_in_menu} <em>*</em></label></p>
<p class="a">
<select style="width:290px" id="sModule_id" name="select_menu_url">
</select>
</p>
</li>
<li id="insertUrl">
<p class="q"><label for="link_url">{$lang->menu_url} <em>*</em></label></p>
<div class="a">
<input type="text" id="link_url" name="menu_url" value="http://" />
</div>
</li>
<li id="selectLayout">
<p class="q"><label for="layout_list">{$lang->layout} <em>*</em></label></p>
<div class="a">
<select name="layout_srl" id="layoutSrl">
<option value="0">{$lang->notuse}</option>
<option loop="$layout_list => $key, $val" value="{$val->layout_srl}">{$val->title} ({$val->layout})</option>
</select>
</div>
</li>
<li>
<p class="q">{$lang->about_menu_open_window} <em>*</em></p>
<p class="a">

9
modules/menu/tpl/sitemap.item.html
View file

@ -1,11 +1,14 @@
<li>
<input type="hidden" name="parent_key[]" value="{$item['parent_srl']}" class="_parent_key" />
<input type="hidden" name="item_key[]" value="{$item['node_srl']}" class="_item_key" />
<input type="hidden" name="module_srl[]" value="{$item['module_srl']}" class="_module_srl_key" />
<input type="hidden" name="item_layout_key[]" value="{$item['node_srl']}" class="_item_layout_key" />
<!--@if($item['href'])--><a href="{$item['href']}" class="ms" target="_blank">{$item['text']}</a><!--@else-->{$item['text']}<!--@end-->
<span class="side">
<block cond="$item['setup_index_act']"><a href="{getUrl('', 'module', 'admin', 'act', $item['setup_index_act'], 'module_srl', $item['module_srl'])}">{$lang->cmd_setup}</a> |</block>
<a href="#editMenu" class="modalAnchor _edit">{$lang->cmd_edit}</a> |
<a href="#delete" class="_delete">{$lang->cmd_delete}</a> |
<block cond="$item['layout_srl']"><a href="{getUrl('act', 'dispLayoutAdminModify', 'layout_srl', $item['layout_srl'])}">{$lang->cmd_layout_management}</a> | </block>
<block cond="$item['setup_index_act']"><a href="{getUrl('', 'module', 'admin', 'act', $item['setup_index_act'], 'module_srl', $item['module_srl'])}">{$lang->cmd_module_manangement}</a> | </block>
<a href="#editMenu" class="modalAnchor _edit">{$lang->cmd_menu_management}</a> |
<a href="#delete" class="_delete">{$lang->cmd_delete}</a> |
<a href="#editMenu" class="modalAnchor _add _child">{$lang->add}</a>
</span>
<ul cond="count($item['list']>0)">