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

ui bug fixes

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2012-11-09 11:55:20 +00:00
parent ae38e3d49b
commit 197458a745
1 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,9 @@
<h1><a class="_title"></a></h1> <h1><a class="_title"></a></h1>
<div class="cnt"> <div class="cnt">
<ul> <ul>
<li>
<span class="_description">Description</span> <a class='_link'>[link]</a>
</li>
<li> <li>
<div class="multilingual x_input-append"> <div class="multilingual x_input-append">
<label for="lang_menuName2">{$lang->menu_name}</label> <label for="lang_menuName2">{$lang->menu_name}</label>
@ -345,7 +348,7 @@
<div class="cnt"> <div class="cnt">
<label> <label>
<input type="checkbox" class="_chkUseDefaultLayout" title="{$lang->use_site_default_layout}"> {$lang->use_site_default_layout} <input type="checkbox" class="_chkUseDefaultLayout" title="{$lang->use_site_default_layout}"> {$lang->use_site_default_layout}
<a href="#siteDefaultDesign" class="x_icon-cog">{$lang->site_default_layout_settings}</a> <a href="?module=admin&act=dispMenuAdminSiteDesign" class="x_icon-cog">{$lang->site_default_layout_settings}</a>
</label> </label>
<div class="list"> <div class="list">
<ul class="_layout_list"> <ul class="_layout_list">
@ -441,7 +444,7 @@
<div class="cnt"> <div class="cnt">
<label> <label>
<input type="checkbox" class="_chkUseDefault" title="{$lang->use_site_default_skin}"> {$lang->use_site_default_skin} <input type="checkbox" class="_chkUseDefault" title="{$lang->use_site_default_skin}"> {$lang->use_site_default_skin}
<a href="#siteDefaultDesign" class="x_icon-cog">{$lang->site_default_skin_settings}</a> <a href="?module=admin&act=dispMenuAdminSiteDesign" class="x_icon-cog">{$lang->site_default_skin_settings}</a>
</label> </label>
<div class="list"> <div class="list">
<ul class="_list"> <ul class="_list">
@ -694,11 +697,13 @@ function onSiteMapReceived(htData){
if(sRenameId){ if(sRenameId){
//console.log('renaming', sRenameId); //console.log('renaming', sRenameId);
$("#siteMapTree").jstree("rename", $("#menu"+sRenameId)); $("#siteMapTree").jstree("rename", $("#menu"+sRenameId));
$("#menu"+sRenameId)[0].scrollIntoView(true);
} }
if(sSelectOnload){ if(sSelectOnload){
//console.log('selecting', sSelectOnload); //console.log('selecting', sSelectOnload);
$("#siteMapTree").jstree("select_node", $("#menu"+sSelectOnload)); $("#siteMapTree").jstree("select_node", $("#menu"+sSelectOnload));
$("#menu"+sSelectOnload)[0].scrollIntoView(true);
} }
}) })
@ -729,6 +734,7 @@ function onSiteMapReceived(htData){
return; return;
} }
$._xeAdminVar.sSelectOnload = $._xeAdminVar.sSelectedMenuSrl;
loadSiteMap(); loadSiteMap();
return; return;
}); });
@ -1010,6 +1016,7 @@ function createTreeMarkup(aNode, sParentSrl, sMenuTree, sMenuTreeNode){
htNodeInfo[sNodeSrl].nNodeType = nNodeType; htNodeInfo[sNodeSrl].nNodeType = nNodeType;
htNodeInfo[sNodeSrl].sNodeSrl = sNodeSrl; htNodeInfo[sNodeSrl].sNodeSrl = sNodeSrl;
htNodeInfo[sNodeSrl].sText = sText; htNodeInfo[sNodeSrl].sText = sText;
htNodeInfo[sNodeSrl].sMenuNameKey = htNodeInfo[sNodeSrl].menu_name_key;
htNodeInfo[sNodeSrl].sModuleType = sModuleType; htNodeInfo[sNodeSrl].sModuleType = sModuleType;
@ -1589,16 +1596,26 @@ jQuery(function($){
$._xeAdminVar.sSelectedModuleName = $._htMarkupActionParam.moduleName; $._xeAdminVar.sSelectedModuleName = $._htMarkupActionParam.moduleName;
$._xeAdminVar.sSelectedModuleTitle = $._htMarkupActionParam.moduleTitle; $._xeAdminVar.sSelectedModuleTitle = $._htMarkupActionParam.moduleTitle;
var $description = $(this).find('._description');
var $title = $(this).find("._title"); var $title = $(this).find("._title");
$title.html($._xeAdminVar.sSelectedModuleTitle); $title.html($._xeAdminVar.sSelectedModuleTitle);
var htItemType = $._xeAdminVar.htItemTypes[$._xeAdminVar.sSelectedModuleName]; var htItemType = $._xeAdminVar.htItemTypes[$._xeAdminVar.sSelectedModuleName];
var $link = $(this).find("._link");
$description.html(htItemType.description);
if(htItemType.package_srl && htItemType.url){ if(htItemType.package_srl && htItemType.url){
$title.attr('target', '_blank'); console.log($link);
$title.attr('href', htItemType.url); $link.show();
$link.attr('target', '_blank');
$link.attr('href', htItemType.url);
}else{ }else{
$title.removeAttr('target'); $link.hide();
$title.removeAttr('href'); $link.removeAttr('target');
$link.removeAttr('href');
} }
if($._xeAdminVar.sSelectedModuleName === "_SHORTCUT"){ if($._xeAdminVar.sSelectedModuleName === "_SHORTCUT"){
$(this).removeClass("page"); $(this).removeClass("page");
@ -1612,8 +1629,6 @@ jQuery(function($){
$(this).find('.lang_code').trigger('reload-multilingual'); $(this).find('.lang_code').trigger('reload-multilingual');
//./console.log('');
showMenuSelector($(this).find('._menuSelector_menuTreeContainer')); showMenuSelector($(this).find('._menuSelector_menuTreeContainer'));
}); });
$('#add_menu').bind("hide", function(ev){ $('#add_menu').bind("hide", function(ev){
@ -1719,7 +1734,10 @@ jQuery(function($){
$(this).addClass('page'); $(this).addClass('page');
} }
$(this).find('#menuName').val(htInfo.sText); //$(this).find('#menuName').val(htInfo.sText);
$(this).find('#menuName').val(htInfo.sMenuNameKey);
//menu_name_key
$(this).find('#mid2').val(htInfo.url); $(this).find('#mid2').val(htInfo.url);
//console.log(htInfo); //console.log(htInfo);
@ -3282,6 +3300,12 @@ jQuery(function($){
$._xeAdminVar.msgBox.bVisible = true; $._xeAdminVar.msgBox.bVisible = true;
showFoggy(); showFoggy();
$._xeAdminVar.msgBox.fnOnShow(); $._xeAdminVar.msgBox.fnOnShow();
if($msgBox.find('input').length > 0){
setTimeout(function(){
$msgBox.find('input').focus()
}, 0);
}
}); });
$msgBox.bind("hide", function(){ $msgBox.bind("hide", function(){
$._xeAdminVar.msgBox.bVisible = false; $._xeAdminVar.msgBox.bVisible = false;
@ -3386,7 +3410,7 @@ jQuery(function($){
sText : xe.lang.go_to_ftp_setup, sText : xe.lang.go_to_ftp_setup,
bSmall : true, bSmall : true,
fnOnOK : function(){ fnOnOK : function(){
window.location.href="./?module=admin&act=dispAdminConfigFtp&success_return_url="+escape(window.location.href+"&continue_install_package="+sPackageSrl+"&continue_install_package_type="+sPackageType); window.location.href="./?module=admin&act=dispAdminConfigFtp&success_return_url="+Base64.encode(window.location.href+"&continue_install_package="+sPackageSrl+"&continue_install_package_type="+sPackageType);
} }
} }
); );