diff --git a/module/custom/css/menu.css b/module/custom/css/menu.css index eeef639254..2439f7b8df 100644 --- a/module/custom/css/menu.css +++ b/module/custom/css/menu.css @@ -7,6 +7,7 @@ #mainmenu {padding-left: 10px; padding-right: 10px;} #featurebar {border-top: 1px solid #ddd} #featurebar > .nav {width: 100%} +#menuEditor .nav > li > a {cursor: move} #menuEditor .nav > li > a .item-hidden-icon {display: none} #menuEditor .nav > li.menu-hidden > a .item-hidden-icon {display: inline-block; margin-left: 5px;} #menuEditor .nav > li.menu-hidden {opacity: 0.5;} diff --git a/module/custom/js/menu.js b/module/custom/js/menu.js index 202f59e35d..a7f4500f1a 100644 --- a/module/custom/js/menu.js +++ b/module/custom/js/menu.js @@ -62,9 +62,9 @@ $(function() currentModule = moduleName; currentMethod = methodName; $mainMenu.find('li.active').removeClass('active'); - $mainMenu.find('li[data-id="' + moduleName + '"]').addClass('active'); + $mainMenu.find('li[data-id="' + moduleName + '"]:not(.right)').addClass('active'); $moduleMenu.find('li.active').removeClass('active'); - $moduleMenu.find('li[data-id="' + methodName + '"]').addClass('active'); + $moduleMenu.find('li[data-id="' + methodName + '"]:not(.right)').addClass('active'); }; var loadData = function(moduleName, methodName, type, callback) diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 57a69c16c4..038c2919af 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -81,5 +81,5 @@ $lang->custom->productproject->relation['1_1'] = '项目 - 迭代'; $lang->custom->productproject->notice = '请根据实际情况选择适合自己团队的概念。'; -$lang->custom->menuTip = '点击导航项目来切换显示或隐藏,拖动导航项目来更改显示顺序。'; +$lang->custom->menuTip = '点击显示或隐藏导航条目,拖拽来更改显示顺序。'; $lang->custom->saveFail = '保存失败!'; diff --git a/module/custom/view/menu.html.php b/module/custom/view/menu.html.php index 71fd5a1420..f5883f70d7 100644 --- a/module/custom/view/menu.html.php +++ b/module/custom/view/menu.html.php @@ -18,7 +18,7 @@