Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation

Browse Source
This commit is contained in:
tianshujie
2023-02-10 10:55:21 +08:00
parent 1c61123375 f578ab069b
commit 0e76cbe2d0
9 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/lang/menu.php
+1 -1
View File
@@ -76,7 +76,7 @@ $lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang
$lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule';
$lang->admin->menuList->model['subMenu']['common'] = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom');
$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|");
$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl');
$lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage');
$lang->admin->menuList->model['menuOrder']['5'] = 'common';
module/admin/model.php
+5 -4
View File
@@ -273,20 +273,21 @@ class adminModel extends model
{
$moduleName = $this->app->rawModule;
$methodName = $this->app->rawMethod;
$paramName = $this->app->rawParams ? reset($this->app->rawParams) : '';
$firstParam = $this->app->rawParams ? reset($this->app->rawParams) : '';
foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu)
{
$subModule = '';
if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
{
if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom';
if($paramName == $subMenuKey) $subModule = 'custom';
if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$firstParam,") !== false) $subModule = 'custom';
if($firstParam == $subMenuKey) $subModule = 'custom';
}
if(!empty($subModule)) $subMenu['subModule'] = $subModule;
if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]))
{
if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule;
if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$firstParam]['subModule'] = $subModule;
$subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey];
}
module/custom/css/common.css
+2
View File
@@ -1,3 +1,5 @@
.alert-block {border-top: 1px solid #ddd;}
.btn-toolbar.pull-left .divider {margin-left: 0px; border-color: rgba(0,0,0,.2);}
.main-content .main-header {padding: 10px 20px;}
#subNavbar .nav>li>a { padding: 4px 12px;}
#subHeader.admin-tab-menu {margin-bottom: -25px;}
module/entry/view/create.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/form.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px center-block-sm'>
<div class='mw-800px center-block-sm'>
<div class="main-header">
<h2>
<?php echo $lang->entry->common;?>
module/mail/view/detect.html.php
+1 -7
View File
@@ -12,13 +12,7 @@
?>
<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-700px'>
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->detect;?></small>
</h2>
</div>
<div class='mw-700px'>
<form class='pdt-20' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control'");?></td><td><?php echo html::submitButton($lang->mail->nextStep, '', 'btn btn-primary');?></td></tr>
module/mail/view/edit.html.php
+1 -7
View File
@@ -12,13 +12,7 @@
?>
<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px'>
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->edit;?></small>
</h2>
</div>
<div class=' mw-800px'>
<form method='post' action='<?php echo inlink('save');?>' id='dataform'>
<table class='table table-form'>
<tr>
xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php
+1 -1
View File
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
global $config;
if($config->vision != 'lite')
{
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
$lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
$lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|');
xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php
+1 -1
View File
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
global $config;
if($config->vision != 'lite')
{
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
$lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
$lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|');
xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php
+1 -1
View File
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
global $config;
if($config->vision != 'lite')
{
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
$lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
$lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
$lang->admin->menuList->system['tabMenu']['xuanxuan']['index'] = array('link' => 'Home|admin|xuanxuan|');