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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
滔哥
2018-05-23 14:20:51 +08:00
parent f4d2556759 004d879698
commit e2a77d6b3b
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/en.php
+1 -1
View File
@@ -19,7 +19,7 @@ $lang->group->manageView = 'View';
$lang->group->managePriv = 'Batch Assign Privileges';
$lang->group->managePrivByGroup = 'Privilege';
$lang->group->managePrivByModule = 'Module Privileges';
$lang->group->byModuleTips = '<span class="tips">(Press shift/control to multi-select)</span>';
$lang->group->byModuleTips = '<span class="tips">(Press Shift/Control to Multi-select)</span>';
$lang->group->manageMember = 'Member';
$lang->group->confirmDelete = 'Do you want to delete this User Group?';
$lang->group->successSaved = 'Saved!';
module/group/lang/zh-cn.php
+1 -1
View File
@@ -19,7 +19,7 @@ $lang->group->manageView = '视图维护';
$lang->group->managePriv = '权限维护';
$lang->group->managePrivByGroup = '权限维护';
$lang->group->managePrivByModule = '按模块分配权限';
$lang->group->byModuleTips = '<span class="tips">（可以按住shift或者control键进行多选）</span>';
$lang->group->byModuleTips = '<span class="tips">（可以按住Shift或者Control键进行多选）</span>';
$lang->group->manageMember = '成员维护';
$lang->group->confirmDelete = '您确定删除该用户分组吗？';
$lang->group->successSaved = '成功保存';
module/group/lang/zh-tw.php
+1 -1
View File
@@ -19,7 +19,7 @@ $lang->group->manageView = '視圖維護';
$lang->group->managePriv = '權限維護';
$lang->group->managePrivByGroup = '權限維護';
$lang->group->managePrivByModule = '按模組分配權限';
$lang->group->byModuleTips = '<span class="tips">（可以按住shift或者control鍵進行多選）</span>';
$lang->group->byModuleTips = '<span class="tips">（可以按住Shift或者Control鍵進行多選）</span>';
$lang->group->manageMember = '成員維護';
$lang->group->confirmDelete = '您確定刪除該用戶分組嗎？';
$lang->group->successSaved = '成功保存';
module/user/view/bug.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
</nav>
<div class='main-table'>
<table class='table has-sort-head table-lg'>
<table class='table has-sort-head'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
module/user/view/story.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
</nav>
<div class='main-table'>
<table class='table has-sort-head table-lg'>
<table class='table has-sort-head'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php echo $lang->idAB;?></th>
module/user/view/task.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
</nav>
<div class='main-table'>
<table class='table has-sort-head table-lg' id='tasktable'>
<table class='table has-sort-head' id='tasktable'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
module/user/view/testcase.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</nav>
<div class='main-table'>
<table class='table has-sort-head table-lg'>
<table class='table has-sort-head'>
<?php
$vars = "account=$account&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$this->app->loadLang('testtask');
module/user/view/testtask.html.php
+5 -5
View File
@@ -24,7 +24,7 @@
</nav>
<div class='main-table'>
<table class='table has-sort-head table-lg'>
<table class='table has-sort-head'>
<?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr class='colhead'>
@@ -32,14 +32,14 @@
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-80px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-50px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr class='text-center'>
<tr>
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='nobr'><?php echo $task->projectName?></td>