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

* adjust for xuanxuan.

Browse Source
This commit is contained in:
wangyidong
2019-05-08 14:32:33 +08:00
parent 610a19d880
commit f8bf771562
14 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+18 -5
View File
@@ -204,7 +204,9 @@ $lang->action->label->linked2bug = "linked ";
$lang->action->label->linkchildtask = "linked a child task";
$lang->action->label->unlinkchildrentask = "unlinked a child task";
$lang->action->label->linkparenttask = "linked a parent task";
$lang->action->label->unlinkparenttask = "unlink from parent task";
$lang->action->label->batchcreate = "batch created tasks";
$lang->action->label->createchildren = "create children task";
$lang->action->label->managed = "managed";
/* 动态信息按照对象分组 */
@@ -282,6 +284,8 @@ $lang->action->dynamicAction->task['linkparenttask'] = 'Link Parent Task';
$lang->action->dynamicAction->task['linkchildtask'] = 'Link Child Task';
$lang->action->dynamicAction->task['undeleted'] = 'Restore Task';
$lang->action->dynamicAction->task['hidden'] = 'Hide Task';
$lang->action->dynamicAction->task['svncommited'] = 'SVN Commit';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT Commit';
$lang->action->dynamicAction->build['opened'] = 'Create Build';
$lang->action->dynamicAction->build['edited'] = 'Edit Build';
@@ -311,11 +315,17 @@ $lang->action->dynamicAction->testtask['closed'] = 'Close Case';
$lang->action->dynamicAction->testtask['blocked'] = 'Blocked Case';
$lang->action->dynamicAction->case['opened'] = 'Create Case';
$lang->action->dynamicAction->case['edited'] = 'Edit Case';
$lang->action->dynamicAction->case['deleted'] = 'Delete Case';
$lang->action->dynamicAction->case['undeleted'] = 'Restore Case';
$lang->action->dynamicAction->case['hidden'] = 'Hide Case';
$lang->action->dynamicAction->case['reviewed'] = 'Add Review Result';
$lang->action->dynamicAction->case['confirmed'] = 'Confirm Case';
$lang->action->dynamicAction->case['fromlib'] = 'Import from Case Lib';
$lang->action->dynamicAction->testreport['opened'] = 'Create Test Report';
$lang->action->dynamicAction->testreport['edited'] = 'Edit Test Report';
$lang->action->dynamicAction->testreport['deleted'] = 'Delete Test Report';
$lang->action->dynamicAction->testreport['undeleted'] = 'Restore Test Report';
$lang->action->dynamicAction->testreport['hidden'] = 'Hide Test Report';
$lang->action->dynamicAction->testsuite['opened'] = 'Create Test Suite';
$lang->action->dynamicAction->testsuite['edited'] = 'Edit Test Suite';
$lang->action->dynamicAction->testsuite['deleted'] = 'Deleted Test Suite';
@@ -323,15 +333,18 @@ $lang->action->dynamicAction->testsuite['undeleted'] = 'Undeleted Test Sui
$lang->action->dynamicAction->testsuite['hidden'] = 'Hidden Test Suite';
$lang->action->dynamicAction->caselib['opened'] = 'Create Case Lib';
$lang->action->dynamicAction->caselib['edited'] = 'Edit Case Lib';
$lang->action->dynamicAction->caseLib['deleted'] = 'Deleted Case Lib';
$lang->action->dynamicAction->caseLib['undeleted'] = 'Undeleted Case Lib';
$lang->action->dynamicAction->caseLib['hidden'] = 'Hidden Case Lib';
$lang->action->dynamicAction->caselib['deleted'] = 'Deleted Case Lib';
$lang->action->dynamicAction->caselib['undeleted'] = 'Undeleted Case Lib';
$lang->action->dynamicAction->caselib['hidden'] = 'Hidden Case Lib';
$lang->action->dynamicAction->docLib['created'] = 'Create Doc Lib';
$lang->action->dynamicAction->docLib['edited'] = 'Edit Doc Lib';
$lang->action->dynamicAction->doclib['created'] = 'Create Doc Lib';
$lang->action->dynamicAction->doclib['edited'] = 'Edit Doc Lib';
$lang->action->dynamicAction->doc['created'] = 'Create Doc';
$lang->action->dynamicAction->doc['edited'] = 'Edit Doc';
$lang->action->dynamicAction->doc['commented'] = 'Comment Doc';
$lang->action->dynamicAction->doc['deleted'] = 'Delete Doc';
$lang->action->dynamicAction->doc['undeleted'] = 'Restore Doc';
$lang->action->dynamicAction->doc['hidden'] = 'Hide Doc';
$lang->action->dynamicAction->user['created'] = 'Create User';
$lang->action->dynamicAction->user['edited'] = 'Edit User';
module/action/lang/zh-cn.php
+2 -2
View File
@@ -241,7 +241,6 @@ $lang->action->dynamicAction->story['activated'] = '激活需求';
$lang->action->dynamicAction->story['reviewed'] = '评审需求';
$lang->action->dynamicAction->story['closed'] = '关闭需求';
$lang->action->dynamicAction->story['assigned'] = '指派需求';
$lang->action->dynamicAction->story['closed'] = '关闭需求';
$lang->action->dynamicAction->story['changed'] = '变更需求';
$lang->action->dynamicAction->story['linked2plan'] = '需求关联计划';
$lang->action->dynamicAction->story['unlinkedfromplan'] = '计划移除需求';
@@ -285,7 +284,8 @@ $lang->action->dynamicAction->task['linkparenttask'] = '关联到父任务
$lang->action->dynamicAction->task['linkchildtask'] = '关联子任务';
$lang->action->dynamicAction->task['undeleted'] = '还原任务';
$lang->action->dynamicAction->task['hidden'] = '隐藏任务';
$lang->action->dynamicAction->task['svncommited'] = 'svn提交';
$lang->action->dynamicAction->task['svncommited'] = 'SVN提交';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT提交';
$lang->action->dynamicAction->build['opened'] = '创建版本';
$lang->action->dynamicAction->build['edited'] = '编辑版本';
module/common/lang/en.php
+3
View File
@@ -447,10 +447,13 @@ $lang->menugroup->user = 'company';
$lang->menugroup->group = 'company';
$lang->menugroup->bug = 'qa';
$lang->menugroup->testcase = 'qa';
$lang->menugroup->case = 'qa';
$lang->menugroup->caselib = 'qa';
$lang->menugroup->testtask = 'qa';
$lang->menugroup->testsuite = 'qa';
$lang->menugroup->caselib = 'qa';
$lang->menugroup->testreport = 'qa';
$lang->menugroup->doclib = 'doc';
$lang->menugroup->people = 'company';
$lang->menugroup->dept = 'company';
$lang->menugroup->todo = 'my';
xuanxuan/module/admin/ext/control/xuanxuan.php
+3 -1
View File
@@ -38,7 +38,9 @@ class admin extends control
if(isset($block->params)) $query['param'] = base64_encode(json_encode($block->params));
}
$this->view->title = $this->lang->chat->common;
$this->view->title = $this->lang->chat->common;
$this->view->position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
$this->view->blocks = $blocks;
$this->display();
}
xuanxuan/module/admin/ext/lang/en/en.php
-3
View File
@@ -1,3 +0,0 @@
<?php
$lang->admin->xuanxuan = 'Client';
$lang->admin->downloadXXD = 'Download XXD';
xuanxuan/module/admin/ext/lang/en/xuanxuan.php
+23
View File
@@ -0,0 +1,23 @@
<?php
$lang->admin->xuanxuan = 'Clien Index';
$lang->admin->blockStatus = '状态监控';
$lang->admin->blockStatistics = '系统统计';
$lang->admin->xuanxuanSetting = 'Setting';
$lang->admin->fileSize = 'File Size';
$lang->admin->countUsers = 'Online';
$lang->admin->setServer = 'Set';
$lang->admin->totalUsers = 'Users';
$lang->admin->totalGroups = 'Groups';
$lang->admin->totalMessages = 'Messages';
$lang->admin->xxdStartDate = 'XXD Last Start Time';
$lang->admin->message = array();
$lang->admin->message['total'] = 'Total';
$lang->admin->message['hour'] = 'An Hour';
$lang->admin->message['day'] = 'An Day';
$lang->admin->sizeType = array();
$lang->admin->sizeType['K'] = 1024;
$lang->admin->sizeType['M'] = 1024 * 1024;
$lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
xuanxuan/module/admin/ext/lang/zh-cn/zh-cn.php → xuanxuan/module/admin/ext/lang/zh-cn/xuanxuan.php
+1
View File
@@ -2,6 +2,7 @@
$lang->admin->xuanxuan = '客户端首页';
$lang->admin->blockStatus = '状态监控';
$lang->admin->blockStatistics = '系统统计';
$lang->admin->xuanxuanSetting = '参数设置';
$lang->admin->fileSize = '附件大小';
$lang->admin->countUsers = '当前在线用户数';
xuanxuan/module/admin/ext/model/class/xuanxuan.class.php
+1 -1
View File
@@ -6,7 +6,7 @@ class xuanxuanAdmin extends adminModel
if(empty($block)) return false;
$userList = count($this->loadModel('chat')->getUserList('online'));
$xxdStartDate = $this->getXxdStart();
$setServerBtn = html::a(helper::createLink('setting', 'xuanxuan', 'type=edit'), $this->lang->admin->setServer, '', 'class="btn"');
$setServerBtn = html::a(helper::createLink('setting', 'xuanxuan', 'type=edit'), $this->lang->admin->xuanxuanSetting, '', 'class="btn"');
if(empty($xxdStartDate)) $xxdStartDate = $this->lang->noData;
$html = '<div class="table-row statusBlock">';
xuanxuan/module/client/ext/view/browse.html.php
+3
View File
@@ -9,6 +9,9 @@
* @version $Id$
* @link http://xuan.im
*/
$this->app->loadLang('chat');
$position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
$position[] = $this->lang->client->browse;
?>
<?php include '../../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
xuanxuan/module/client/ext/view/checkupgrade.xuanxuan.html.hook.php
+13
View File
@@ -0,0 +1,13 @@
<?php
$this->app->loadLang('chat');
$html = '';
$html .= '<li>' . html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common) . '</li>';
$html .= '<li>' . html::a($this->createLink('client', 'browse'), $this->lang->client->browse) . '</li>';
$html .= '<li>' . $this->lang->client->checkUpgrade . '</li>';
?>
<script>
$(function()
{
$('#footer .breadcrumb').append(<?php echo json_encode($html);?>);
})
</script>
xuanxuan/module/common/ext/lang/en/xuanxuan.php
+5 -3
View File
@@ -4,10 +4,12 @@ $lang->admin->menu->xuanxuan = array('link' => 'ZT Client|admin|xuanxuan', 'subM
$lang->admin->menuOrder[6] = 'xuanxuan';
$lang->admin->subMenu->xuanxuan = new stdclass();
$lang->admin->subMenu->xuanxuan->setting = array('link' => 'Parameter|admin|xuanxuan');
$lang->admin->subMenu->xuanxuan->index = array('link' => 'Index|admin|xuanxuan');
$lang->admin->subMenu->xuanxuan->setting = array('link' => 'Parameter|setting|xuanxuan');
$lang->admin->subMenu->xuanxuan->update = array('link' => 'Update|client|browse', 'subModule' => 'client');
$lang->admin->subMenuOrder->xuanxuan[0] = 'setting';
$lang->admin->subMenuOrder->xuanxuan[5] = 'update';
$lang->admin->subMenuOrder->xuanxuan[0] = 'index';
$lang->admin->subMenuOrder->xuanxuan[5] = 'setting';
$lang->admin->subMenuOrder->xuanxuan[10] = 'update';
$lang->menugroup->client = 'admin';
xuanxuan/module/misc/ext/lang/zh-cn/xuanxuan.php
-1
View File
@@ -20,4 +20,3 @@ $lang->misc->client->errorInfo->configError = '配置用户信息失败';
$lang->misc->client->errorInfo->manualOpt = '请从 %s 手动获取安装包。';
$lang->misc->client->errorInfo->dirNotExist = '客户端下载存储路径 <span class="code text-red">%s</span> 不存在，请创建该目录。';
$lang->misc->client->errorInfo->dirNotWritable = '客户端下载存储路径 <span class="code text-red">%s</span> 不可写 <br />linux下面请执行命令：<span class="code text-red">sudo chmod 777 %s</span>来修正';
xuanxuan/module/setting/ext/control/xuanxuan.php
+5 -1
View File
@@ -38,7 +38,11 @@ class setting extends control
$os = 'win';
if(strpos(strtolower(PHP_OS), 'win') !== 0) $os = strtolower(PHP_OS);
$this->view->title = $this->lang->chat->common;
$this->lang->menugroup->setting = 'admin';
$this->view->title = $this->lang->chat->common;
$this->view->position[] = html::a($this->createLink('admin', 'xuanxuan'), $this->lang->chat->common);
$this->view->position[] = $this->lang->setting->common;
$this->view->adminList = $this->loadModel('user')->getPairs('admin');
$this->view->os = $os . '_' . php_uname('m');
$this->view->type = $type;
xuanxuan/module/setting/ext/js/xuanxuan/xuanxuan.js
+1 -1
View File
@@ -35,7 +35,7 @@ $(function()
$('#os').change(function()
{
os = $(this).val();
$('.download-package').attr('href', createLink('admin', 'downloadxxd', "type=package&os=" + os));
$('.download-package').attr('href', createLink('setting', 'downloadxxd', "type=package&os=" + os));
});
$('#os').change();
});