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

* finish task #5078.

Browse Source
This commit is contained in:
wangyidong
2018-11-13 09:51:17 +08:00
parent 470c97a7cd
commit 3f5f48fd50
19 changed files with 152 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/view/trash.html.php
+1 -3
View File
@@ -12,9 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo html::icon($lang->icons['trash']);?> <?php echo $lang->action->trash;?></span></span>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('data');?></div>
<div class='btn-toolbar pull-right'>
<?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"), $lang->goback, '', "class='btn'");?>
<?php if($type == 'all') echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
module/admin/view/sso.html.php
+3
View File
@@ -11,6 +11,9 @@
*/
?>
<?php include '../../common/view/header.html.php'; ?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('sso');?></div>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
module/backup/view/index.html.php
+1 -3
View File
@@ -18,9 +18,7 @@
<?php endif;?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->backup->common;?></span></span>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('data');?></div>
<div class='btn-toolbar pull-right'>
<?php common::printIcon('backup', 'setting', '', '', 'button', '', '', 'iframe', '', "data-width=400px");?>
<?php common::printIcon('backup', 'backup', 'reload=yes', '', 'button', 'cloud', 'hiddenwin', 'backup');?>
module/common/lang/en.php
+33 -9
View File
@@ -193,7 +193,9 @@ $lang->my->menu->changePassword = 'Password|my|changepassword';
$lang->my->menu->manageContacts = 'Contact|my|managecontacts';
$lang->my->menu->score = 'Point|my|score';
$lang->todo = new stdclass();
$lang->my->dividerMenu = ',task,myProject,profile,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
$lang->score = new stdclass();
@@ -214,6 +216,8 @@ $lang->product->menu->branch = '@branch@|branch|manage|productID=%s';
$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story';
$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit');
$lang->product->dividerMenu = ',plan,project,doc,';
$lang->story = new stdclass();
$lang->productplan = new stdclass();
$lang->release = new stdclass();
@@ -365,16 +369,36 @@ $lang->user->menu = $lang->company->menu;
$lang->admin = new stdclass();
$lang->admin->menu = new stdclass();
$lang->admin->menu->index = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
$lang->admin->menu->message = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
$lang->admin->menu->custom = array('link' => 'Custom|custom|set', 'subModule' => 'custom');
$lang->admin->menu->sso = array('link' => 'Integrate|admin|sso');
$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
$lang->admin->menu->data = array('link' => 'Data|backup|index', 'subModule' => 'backup,action');
$lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' => 'checkweak');
$lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action');
$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
$lang->admin->menu->entry = array('link' => 'Entry|entry|browse', 'subModule' => 'entry');
$lang->admin->menu->sso = 'Zdoo|admin|sso';
$lang->admin->menu->system = array('link' => 'System|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu = new stdclass();
$lang->admin->subMenu->message = new stdclass();
$lang->admin->subMenu->message->mail = array('link' => 'Mail|mail|index', 'subModule' => 'mail');
$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
$lang->admin->subMenu->message->setting = array('link' => 'Setting|message|setting', 'subModule' => 'message');
$lang->admin->subMenu->sso = new stdclass();
$lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
$lang->admin->subMenu->dev->db = array('link' => 'Database|dev|db');
$lang->admin->subMenu->dev->editor = array('link' => 'Editor|editor|index', 'subModule' => 'editor');
$lang->admin->subMenu->dev->entry = array('link' => 'Entry|entry|browse', 'subModule' => 'entry');
$lang->admin->subMenu->data = new stdclass();
$lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'subModule' => 'backup');
$lang->admin->subMenu->data->trash = 'Recycle|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => 'Timed task|cron|index', 'subModule' => 'cron');
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/lang/menuOrder.php
+24 -16
View File
@@ -31,10 +31,10 @@ $lang->todo->menuOrder = $lang->my->menuOrder;
$lang->product->menuOrder[5] = 'story';
$lang->product->menuOrder[10] = 'plan';
$lang->product->menuOrder[15] = 'release';
$lang->product->menuOrder[20] = 'project';
$lang->product->menuOrder[25] = 'doc';
$lang->product->menuOrder[20] = 'roadmap';
$lang->product->menuOrder[25] = 'project';
$lang->product->menuOrder[30] = 'dynamic';
$lang->product->menuOrder[35] = 'roadmap';
$lang->product->menuOrder[35] = 'doc';
$lang->product->menuOrder[40] = 'branch';
$lang->product->menuOrder[45] = 'module';
$lang->product->menuOrder[50] = 'view';
@@ -103,20 +103,28 @@ $lang->user->menuOrder = $lang->company->menuOrder;
/* admin menu order. */
$lang->admin->menuOrder[5] = 'index';
$lang->admin->menuOrder[10] = 'extension';
$lang->admin->menuOrder[10] = 'message';
$lang->admin->menuOrder[15] = 'custom';
$lang->admin->menuOrder[19] = 'message';
$lang->admin->menuOrder[20] = 'mail';
$lang->admin->menuOrder[25] = 'custom';
$lang->admin->menuOrder[30] = 'convert';
$lang->admin->menuOrder[35] = 'cron';
$lang->admin->menuOrder[40] = 'backup';
$lang->admin->menuOrder[45] = 'dev';
$lang->admin->menuOrder[50] = 'safe';
$lang->admin->menuOrder[53] = 'api';
$lang->admin->menuOrder[55] = 'sso';
$lang->admin->menuOrder[57] = 'entry';
$lang->admin->menuOrder[60] = 'trashes';
$lang->admin->menuOrder[20] = 'sso';
$lang->admin->menuOrder[25] = 'extension';
$lang->admin->menuOrder[30] = 'dev';
$lang->admin->menuOrder[35] = 'data';
$lang->admin->menuOrder[40] = 'safe';
$lang->admin->menuOrder[45] = 'system';
$lang->admin->subMenuOrder = new stdclass();
$lang->admin->subMenuOrder->message[5] = 'mail';
$lang->admin->subMenuOrder->message[10] = 'webhook';
$lang->admin->subMenuOrder->message[15] = 'setting';
$lang->admin->subMenuOrder->sso[5] = 'ranzhi';
$lang->admin->subMenuOrder->dev[5] = 'api';
$lang->admin->subMenuOrder->dev[10] = 'db';
$lang->admin->subMenuOrder->dev[15] = 'editor';
$lang->admin->subMenuOrder->dev[20] = 'entry';
$lang->admin->subMenuOrder->data[5] = 'backup';
$lang->admin->subMenuOrder->data[10] = 'trash';
$lang->admin->subMenuOrder->system[5] = 'cron';
$lang->convert->menuOrder = $lang->admin->menuOrder;
$lang->upgrade->menuOrder = $lang->admin->menuOrder;
$lang->action->menuOrder = $lang->admin->menuOrder;
module/common/lang/zh-cn.php
+35 -11
View File
@@ -193,6 +193,8 @@ $lang->my->menu->changePassword = '密码|my|changepassword';
$lang->my->menu->manageContacts = '联系人|my|managecontacts';
$lang->my->menu->score = '积分|my|score';
$lang->my->dividerMenu = ',task,myProject,profile,';
$lang->todo = new stdclass();
$lang->todo->menu = $lang->my->menu;
@@ -206,14 +208,16 @@ $lang->product->menu = new stdclass();
$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan');
$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s';
$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s';
$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s";
$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s';
$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
$lang->product->menu->branch = '@branch@|branch|manage|productID=%s';
$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story';
$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit');
$lang->product->dividerMenu = ',plan,project,doc,';
$lang->story = new stdclass();
$lang->productplan = new stdclass();
$lang->release = new stdclass();
@@ -365,16 +369,36 @@ $lang->user->menu = $lang->company->menu;
$lang->admin = new stdclass();
$lang->admin->menu = new stdclass();
$lang->admin->menu->index = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->custom = array('link' => '自定义|custom|set', 'subModule' => 'custom');
$lang->admin->menu->message = array('link' => '消息|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->backup = array('link' => '备份|backup|index', 'subModule' => 'backup');
$lang->admin->menu->sso = array('link' => '集成|admin|sso');
$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
$lang->admin->menu->dev = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
$lang->admin->menu->data = array('link' => '数据|backup|index', 'subModule' => 'backup,action');
$lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' => 'checkweak');
$lang->admin->menu->cron = array('link' => '计划任务|cron|index', 'subModule' => 'cron');
$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action');
$lang->admin->menu->dev = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
$lang->admin->menu->entry = array('link' => '应用|entry|browse', 'subModule' => 'entry');
$lang->admin->menu->sso = '然之集成|admin|sso';
$lang->admin->menu->system = array('link' => '系统|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu = new stdclass();
$lang->admin->subMenu->message = new stdclass();
$lang->admin->subMenu->message->mail = array('link' => '邮件|mail|index', 'subModule' => 'mail');
$lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting', 'subModule' => 'message');
$lang->admin->subMenu->sso = new stdclass();
$lang->admin->subMenu->sso->ranzhi = '然之协同|admin|sso';
$lang->admin->subMenu->dev = new stdclass();
$lang->admin->subMenu->dev->api = array('link' => 'API|dev|api');
$lang->admin->subMenu->dev->db = array('link' => '数据库|dev|db');
$lang->admin->subMenu->dev->editor = array('link' => '编辑器|editor|index', 'subModule' => 'editor');
$lang->admin->subMenu->dev->entry = array('link' => '应用|entry|browse', 'subModule' => 'entry');
$lang->admin->subMenu->data = new stdclass();
$lang->admin->subMenu->data->backup = array('link' => '备份|backup|index', 'subModule' => 'backup');
$lang->admin->subMenu->data->trash = '回收站|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => '定时|cron|index', 'subModule' => 'cron');
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/model.php
+41
View File
@@ -391,6 +391,47 @@ class commonModel extends model
return $subMenu;
}
/**
* Print admin subMenu.
*
* @param string $subMenu
* @static
* @access public
* @return void
*/
public static function printAdminSubMenu($subMenu)
{
global $app, $lang;
$moduleName = $app->getModuleName();
$methodName = $app->getMethodName();
if(isset($lang->admin->subMenuOrder->$subMenu))
{
ksort($lang->admin->subMenuOrder->$subMenu);
foreach($lang->admin->subMenuOrder->$subMenu as $type)
{
if(isset($lang->admin->subMenu->$subMenu->$type))
{
$subModule = '';
$alias = '';
$link = $lang->admin->subMenu->$subMenu->$type;
if(is_array($lang->admin->subMenu->$subMenu->$type))
{
if(isset($lang->admin->subMenu->$subMenu->$type['subModule'])) $subModule = $lang->admin->subMenu->$subMenu->$type['subModule'];
if(isset($lang->admin->subMenu->$subMenu->$type['alias'])) $alias = $lang->admin->subMenu->$subMenu->$type['alias'];
$link = $lang->admin->subMenu->$subMenu->$type['link'];
}
list($text, $currentModule, $currentMethod)= explode('|', $link);
if(!common::hasPriv($currentModule, $currentMethod)) continue;
$active = ($moduleName == $currentModule and $methodName == $currentMethod) ? 'btn-active-text' : '';
if($subModule and strpos(",{$subModule}," , ",{$moduleName},") !== false) $active = 'btn-active-text';
if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'btn-active-text';
echo html::a(helper::createLink($currentModule, $currentMethod), "<span class='text'>$text</span>", '', "class='btn btn-link {$active}' id='{$type}Tab'");
}
}
}
}
/**
* Print the main menu.
*
module/cron/view/create.html.php
+3
View File
@@ -11,6 +11,9 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
module/cron/view/edit.html.php
+3
View File
@@ -11,6 +11,9 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
module/cron/view/index.html.php
+1 -3
View File
@@ -12,9 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->cron->common;?></span></span>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
<div class='btn-toolbar pull-right'>
<?php if(common::hasPriv('cron', 'openProcess') and !empty($config->global->cron)) echo html::a(inlink('openProcess'), $lang->cron->openProcess, 'hiddenwin', "class='btn'")?>
<?php if(common::hasPriv('cron', 'turnon') and !empty($config->global->cron)) echo html::a(inlink('turnon'), $lang->cron->turnonList[0], 'hiddenwin', "class='btn'");?>
module/dev/view/header.html.php
+1 -7
View File
@@ -1,11 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php
common::printLink('dev', 'api', "", "<span class='text'>{$lang->dev->api}</span>", '', "id='api' class='btn btn-link'");
common::printLink('dev', 'db', "", "<span class='text'>{$lang->dev->db}</span>", '', "id='db' class='btn btn-link'");
common::printLink('editor', 'index', 'type=editor', "<span class='text'>{$lang->dev->editor}</span>", '', "id='editor' class='btn btn-link'");
?>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('dev');?></div>
</div>
<script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
module/entry/view/create.html.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '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'>
module/entry/view/edit.html.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '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'>
module/entry/view/header.html.php
+1 -3
View File
@@ -12,9 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php common::printLink('entry', 'browse', '', "<span class='text'>{$lang->entry->common}</span>", '', "class='btn btn-link btn-active-text'");?>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('dev');?></div>
<div class='btn-toolbar pull-right'>
<?php echo html::a($this->createLink('entry', 'create'), "<i class='icon icon-plus'></i> {$lang->entry->create}", '', "class='btn btn-primary'"); ?>
</div>
module/entry/view/log.html.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include 'header.html.php';?>
<div id="mainMenu" class='clearfix'>
<div class="btn-toolbar pull-left">
<?php common::printLink('entry', 'browse', '', "<span class='text'>{$lang->entry->common}</span>", '', "class='btn btn-link btn-active-text'");?>
module/mail/js/common.js
-1
View File
@@ -1 +0,0 @@
$(function(){$('#mainMenu #mailTab').addClass('btn-active-text');})
module/message/view/header.html.php
+1 -10
View File
@@ -1,13 +1,4 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php foreach($lang->message->typeList as $type => $typeName):?>
<?php if(isset($config->message->typeLink[$type])):?>
<?php list($moduleName, $methodName) = explode('|', $config->message->typeLink[$type]);?>
<?php if(!common::hasPriv($moduleName, $methodName)) continue;?>
<?php echo html::a($this->createLink($moduleName, $methodName), "<span class='text'>$typeName</span>", '', "class='btn btn-link' id='{$type}Tab'")?>
<?php endif;?>
<?php endforeach;?>
<?php if(common::hasPriv('message', 'setting')) echo html::a($this->createLink('message', 'setting'), "<span class='text'>{$lang->message->setting}</span>", '', "class='btn btn-link' id='settingTab'")?>
</div>
<div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('message');?></div>
</div>
module/message/view/setting.html.php
-3
View File
@@ -76,7 +76,4 @@
</table>
</form>
</div>
<script>
$(function(){$('#mainMenu #settingTab').addClass('btn-active-text');})
</script>
<?php include '../../common/view/footer.html.php';?>
module/webhook/view/header.html.php
+1 -10
View File
@@ -12,16 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php foreach($lang->message->typeList as $type => $typeName):?>
<?php if(isset($config->message->typeLink[$type])):?>
<?php list($moduleName, $methodName) = explode('|', $config->message->typeLink[$type]);?>
<?php if(!common::hasPriv($moduleName, $methodName)) continue;?>
<?php echo html::a($this->createLink($moduleName, $methodName), "<span class='text'>{$typeName}</span>", '', "class='btn btn-link " . ($type == 'webhook' ? 'btn-active-text' : '') . "' id='{$type}Tab'")?>
<?php endif;?>
<?php endforeach;?>
<?php echo html::a($this->createLink('message', 'setting'), "<span class='text'>{$lang->message->setting}</span>", '', "class='btn btn-link' id='settingTab'")?>
</div>
<div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('message');?></div>
<div class='btn-toolbar pull-right'>
<div class='btn-group'>
<div class='btn-group' id='createActionMenu'>