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

* Finish task #4488

Browse Source
This commit is contained in:
liugang
2018-06-21 17:39:31 +08:00
parent b9fb4fae18
commit a054614d58
87 changed files with 556 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->action->original = 'Original Format';
$lang->action->confirmHideAll = 'Do you want to hide all the records?';
$lang->action->needEdit = '%s that you want to restore exists. Please edit it.';
$lang->action->historyEdit = 'The history editor cannot be empty.';
$lang->action->noDynamic = 'No dynamic.';
$lang->action->noDynamic = 'No dynamics. ';
$lang->action->history = new stdclass();
$lang->action->history->action = 'Link';
module/action/lang/zh-cn.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->action->original = '原始格式';
$lang->action->confirmHideAll = '您确定要全部隐藏这些记录吗？';
$lang->action->needEdit = '要还原%s的名称或代号已经存在，请编辑更改。';
$lang->action->historyEdit = '历史记录编辑不能为空。';
$lang->action->noDynamic = '暂无动态';
$lang->action->noDynamic = '暂时没有动态。';
$lang->action->history = new stdclass();
$lang->action->history->action = '关联日志';
module/action/lang/zh-tw.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->action->original = '原始格式';
$lang->action->confirmHideAll = '您確定要全部隱藏這些記錄嗎？';
$lang->action->needEdit = '要還原%s的名稱或代號已經存在，請編輯更改。';
$lang->action->historyEdit = '歷史記錄編輯不能為空。';
$lang->action->noDynamic = '暫無動態';
$lang->action->noDynamic = '暫時沒有動態。';
$lang->action->history = new stdclass();
$lang->action->history->action = '關聯日誌';
module/bug/lang/en.php
+1 -1
View File
@@ -131,7 +131,7 @@ $lang->bug->resolvedByMeAB = 'Resolved By Me';
$lang->bug->ditto = 'Ditto';
$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
$lang->bug->noAssigned = 'Assign';
$lang->bug->noBug = 'No bugs. You could ';
$lang->bug->noBug = 'No bugs. ';
$lang->bug->noModule = '<div>You have no modules</div><div>Manage now</div>';
/* 页面标签。*/
module/bug/lang/zh-cn.php
+1 -1
View File
@@ -131,7 +131,7 @@ $lang->bug->resolvedByMeAB = '由我解决';
$lang->bug->ditto = '同上';
$lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！';
$lang->bug->noAssigned = '未指派';
$lang->bug->noBug = '暂时没有Bug，您现在可以';
$lang->bug->noBug = '暂时没有Bug。';
$lang->bug->noModule = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
/* 页面标签。*/
module/bug/lang/zh-tw.php
+1 -1
View File
@@ -131,7 +131,7 @@ $lang->bug->resolvedByMeAB = '由我解決';
$lang->bug->ditto = '同上';
$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
$lang->bug->noAssigned = '未指派';
$lang->bug->noBug = '暫時沒有Bug，您現在可以';
$lang->bug->noBug = '暫時沒有Bug。';
$lang->bug->noModule = '<div>您現在還沒有模組信息</div><div>請維護測試模組</div>';
/* 頁面標籤。*/
module/bug/view/browse.html.php
+12 -6
View File
@@ -161,6 +161,17 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</div>
<div class="main-col">
<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
<?php if(empty($bugs)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->bug->noBug;?></span>
<?php if(common::hasPriv('bug', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table table-bug' data-ride='table' method='post' id='bugForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -200,7 +211,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</tbody>
</table>
</div>
<?php if(!empty($bugs)):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
@@ -350,12 +360,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php elseif(common::hasPriv('bug', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<script>
module/build/lang/en.php
+1 -1
View File
@@ -46,7 +46,7 @@ $lang->build->stories = 'Finished Story';
$lang->build->bugs = 'Resolved Bug';
$lang->build->generatedBugs = 'Left Bug';
$lang->build->noProduct = " <span style='color:red'>This {$lang->projectCommon} has not linked to {$lang->productCommon}, so Build cannot be created. Please first <a href='%s'> link {$lang->productCommon}</a></span>";
$lang->build->noData = 'No data';
$lang->build->noBuild = 'No builds. ';
$lang->build->finishStories = ' %s Story(ies) have been finished.';
$lang->build->resolvedBugs = ' %s Bug(s) have been resolved.';
module/build/lang/zh-cn.php
+1 -1
View File
@@ -46,7 +46,7 @@ $lang->build->stories = '完成的需求';
$lang->build->bugs = '解决的Bug';
$lang->build->generatedBugs = '产生的Bug';
$lang->build->noProduct = " <span style='color:red'>该{$lang->projectCommon}没有关联{$lang->productCommon}，无法创建版本，请先<a href='%s'>关联{$lang->productCommon}</a></span>";
$lang->build->noData = '暂无';
$lang->build->noBuild = '暂时没有版本。';
$lang->build->finishStories = ' 本次共完成 %s 个需求';
$lang->build->resolvedBugs = ' 本次共解决 %s 个Bug';
module/build/lang/zh-tw.php
+1 -1
View File
@@ -46,7 +46,7 @@ $lang->build->stories = '完成的需求';
$lang->build->bugs = '解決的Bug';
$lang->build->generatedBugs = '產生的Bug';
$lang->build->noProduct = " <span style='color:red'>該{$lang->projectCommon}沒有關聯{$lang->productCommon}，無法創建版本，請先<a href='%s'>關聯{$lang->productCommon}</a></span>";
$lang->build->noData = '暫無';
$lang->build->noBuild = '暫時沒有版本。';
$lang->build->finishStories = ' 本次共完成 %s 個需求';
$lang->build->resolvedBugs = ' 本次共解決 %s 個Bug';
module/build/view/create.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<table class='table table-form'>
<tr>
<th><?php echo $lang->build->product;?></th>
<?php if($products):?>
<?php if(!empty($products)):?>
<td>
<div class='input-group'>
<?php echo html::select('product', $products, $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required");?>
module/build/view/view.html.php
+1 -1
View File
@@ -321,7 +321,7 @@ tbody tr td:first-child input{display:none;}
<?php if($build->desc):?>
<?php echo $build->desc;?>
<?php else:?>
<?php echo $lang->build->noData;?>
<?php echo $lang->noData;?>
<?php endif;?>
</td>
</tr>
module/common/lang/en.php
+1
View File
@@ -86,6 +86,7 @@ $lang->customMenu = 'Custom Menu';
$lang->customField = 'Custom Field';
$lang->lineNumber = 'Line No.';
$lang->tutorialConfirm = 'You are using tutorial. Do you want to exit right now？';
$lang->youCould = 'You could ';
$lang->preShortcutKey = '[Shortcut:←]';
$lang->nextShortcutKey = '[Shortcut:→]';
module/common/lang/zh-cn.php
+1
View File
@@ -86,6 +86,7 @@ $lang->customMenu = '自定义导航';
$lang->customField = '自定义表单项';
$lang->lineNumber = '行号';
$lang->tutorialConfirm = '检测到你尚未退出新手教程模式，是否现在退出？';
$lang->youCould = '您现在可以 ';
$lang->preShortcutKey = '[快捷键:←]';
$lang->nextShortcutKey = '[快捷键:→]';
module/common/lang/zh-tw.php
+1
View File
@@ -86,6 +86,7 @@ $lang->customMenu = '自定義導航';
$lang->customField = '自定義表單項';
$lang->lineNumber = '行號';
$lang->tutorialConfirm = '檢測到你尚未退出新手教程模式，是否現在退出？';
$lang->youCould = '您現在可以 ';
$lang->preShortcutKey = '[快捷鍵:←]';
$lang->nextShortcutKey = '[快捷鍵:→]';
module/doc/lang/en.php
+1 -1
View File
@@ -142,7 +142,7 @@ $lang->doc->errorEmptyProject = "No {$lang->projectCommon}. It cannot be create
$lang->doc->errorMainSysLib = "This library cannot be deleted.";
$lang->doc->accessDenied = "Access denied!";
$lang->doc->versionNotFount = 'It does not exist in this build.';
$lang->doc->noDoc = 'It does not exist. You could ';
$lang->doc->noDoc = 'No docs. ';
$lang->doc->noSearchedDoc = 'Nothing searched.';
$lang->doc->noEditedDoc = 'You have not edited any doc.';
$lang->doc->noOpenedDoc = 'You have not created any doc.';
module/doc/lang/zh-cn.php
+1 -1
View File
@@ -142,7 +142,7 @@ $lang->doc->errorEmptyProject = "没有{$lang->projectCommon}，无法创建文
$lang->doc->errorMainSysLib = "该系统文档库不能删除！";
$lang->doc->accessDenied = "您没有权限访问！";
$lang->doc->versionNotFount = '该版本文档不存在';
$lang->doc->noDoc = '文档不存在，您现在可以';
$lang->doc->noDoc = '暂时没有文档。';
$lang->doc->noSearchedDoc = '没有搜索到任何文档。';
$lang->doc->noEditedDoc = '您还没有编辑任何文档。';
$lang->doc->noOpenedDoc = '您还没有创建任何文档。';
module/doc/lang/zh-tw.php
+1 -1
View File
@@ -142,7 +142,7 @@ $lang->doc->errorEmptyProject = "沒有{$lang->projectCommon}，無法創建文
$lang->doc->errorMainSysLib = "該系統文檔庫不能刪除！";
$lang->doc->accessDenied = "您沒有權限訪問！";
$lang->doc->versionNotFount = '該版本文檔不存在';
$lang->doc->noDoc = '文檔不存在，您現在可以';
$lang->doc->noDoc = '暫時沒有文檔。';
$lang->doc->noSearchedDoc = '沒有搜索到任何文檔。';
$lang->doc->noEditedDoc = '您還沒有編輯任何文檔。';
$lang->doc->noOpenedDoc = '您還沒有創建任何文檔。';
module/doc/view/browse.html.php
+5 -1
View File
@@ -49,7 +49,11 @@ var browseType = '<?php echo $browseType;?>';
<div class="table-empty-tip">
<p>
<?php if($libID):?>
<span class="text-muted"><?php echo $lang->doc->noDoc;?></span> <?php common::printLink('doc', 'create', "libID={$libID}", "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
<span class="text-muted"><?php echo $lang->doc->noDoc;?></span>
<?php if(common::hasPriv('doc', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('doc', 'create', "libID={$libID}"), "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?>
<?php endif;?>
<?php elseif($browseType == 'fastsearch'):?>
<span class="text-muted"><?php echo $lang->doc->noSearchedDoc;?></span>
<?php elseif($browseType == 'byediteddate'):?>
module/my/lang/en.php
+1
View File
@@ -22,6 +22,7 @@ $lang->my->shareContacts = 'Share the list';
$lang->my->limited = 'Restricted operation (editing only content related to itself)';
$lang->my->score = 'My Score';
$lang->my->scoreRule = 'Score Rule';
$lang->my->noTodo = 'No todos. ';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = 'AssignedToMe';
module/my/lang/zh-cn.php
+53 -52
View File
@@ -1,52 +1,53 @@
<?php
$lang->my->common = '我的地盘';
/* 方法列表。*/
$lang->my->index = '首页';
$lang->my->todo = '我的待办';
$lang->my->calendar = '日程';
$lang->my->task = '我的任务';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = '我的需求';
$lang->my->myProject = "我的{$lang->projectCommon}";
$lang->my->profile = '我的档案';
$lang->my->dynamic = '我的动态';
$lang->my->editProfile = '修改档案';
$lang->my->changePassword = '修改密码';
$lang->my->unbind = '解除然之绑定';
$lang->my->manageContacts = '维护联系人';
$lang->my->deleteContacts = '删除联系人';
$lang->my->shareContacts = '共享联系人列表';
$lang->my->limited = '受限操作(只能编辑与自己相关的内容)';
$lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派给我';
$lang->my->taskMenu->openedByMe = '由我创建';
$lang->my->taskMenu->finishedByMe = '由我完成';
$lang->my->taskMenu->closedByMe = '由我关闭';
$lang->my->taskMenu->canceledByMe = '由我取消';
$lang->my->storyMenu = new stdclass();
$lang->my->storyMenu->assignedToMe = '指派给我';
$lang->my->storyMenu->openedByMe = '由我创建';
$lang->my->storyMenu->reviewedByMe = '由我评审';
$lang->my->storyMenu->closedByMe = '由我关闭';
$lang->my->home = new stdclass();
$lang->my->home->latest = '最新动态';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
$lang->my->home->createProject = "创建一个{$lang->projectCommon}";
$lang->my->home->createProduct = "创建一个{$lang->productCommon}";
$lang->my->home->help = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
$lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。";
$lang->my->form = new stdclass();
$lang->my->form->lblBasic = '基本信息';
$lang->my->form->lblContact = '联系信息';
$lang->my->form->lblAccount = '帐号信息';
<?php
$lang->my->common = '我的地盘';
/* 方法列表。*/
$lang->my->index = '首页';
$lang->my->todo = '我的待办';
$lang->my->calendar = '日程';
$lang->my->task = '我的任务';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = '我的需求';
$lang->my->myProject = "我的{$lang->projectCommon}";
$lang->my->profile = '我的档案';
$lang->my->dynamic = '我的动态';
$lang->my->editProfile = '修改档案';
$lang->my->changePassword = '修改密码';
$lang->my->unbind = '解除然之绑定';
$lang->my->manageContacts = '维护联系人';
$lang->my->deleteContacts = '删除联系人';
$lang->my->shareContacts = '共享联系人列表';
$lang->my->limited = '受限操作(只能编辑与自己相关的内容)';
$lang->my->score = '我的积分';
$lang->my->scoreRule = '积分规则';
$lang->my->noTodo = '暂时没有待办。';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派给我';
$lang->my->taskMenu->openedByMe = '由我创建';
$lang->my->taskMenu->finishedByMe = '由我完成';
$lang->my->taskMenu->closedByMe = '由我关闭';
$lang->my->taskMenu->canceledByMe = '由我取消';
$lang->my->storyMenu = new stdclass();
$lang->my->storyMenu->assignedToMe = '指派给我';
$lang->my->storyMenu->openedByMe = '由我创建';
$lang->my->storyMenu->reviewedByMe = '由我评审';
$lang->my->storyMenu->closedByMe = '由我关闭';
$lang->my->home = new stdclass();
$lang->my->home->latest = '最新动态';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
$lang->my->home->createProject = "创建一个{$lang->projectCommon}";
$lang->my->home->createProduct = "创建一个{$lang->productCommon}";
$lang->my->home->help = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
$lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。";
$lang->my->form = new stdclass();
$lang->my->form->lblBasic = '基本信息';
$lang->my->form->lblContact = '联系信息';
$lang->my->form->lblAccount = '帐号信息';
module/my/lang/zh-tw.php
+53 -52
View File
@@ -1,52 +1,53 @@
<?php
$lang->my->common = '我的地盤';
/* 方法列表。*/
$lang->my->index = '首頁';
$lang->my->todo = '我的待辦';
$lang->my->calendar = '日程';
$lang->my->task = '我的任務';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = '我的需求';
$lang->my->myProject = "我的{$lang->projectCommon}";
$lang->my->profile = '我的檔案';
$lang->my->dynamic = '我的動態';
$lang->my->editProfile = '修改檔案';
$lang->my->changePassword = '修改密碼';
$lang->my->unbind = '解除然之綁定';
$lang->my->manageContacts = '維護聯繫人';
$lang->my->deleteContacts = '刪除聯繫人';
$lang->my->shareContacts = '共享聯繫人列表';
$lang->my->limited = '受限操作(只能編輯與自己相關的內容)';
$lang->my->score = '我的積分';
$lang->my->scoreRule = '積分規則';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派給我';
$lang->my->taskMenu->openedByMe = '由我創建';
$lang->my->taskMenu->finishedByMe = '由我完成';
$lang->my->taskMenu->closedByMe = '由我關閉';
$lang->my->taskMenu->canceledByMe = '由我取消';
$lang->my->storyMenu = new stdclass();
$lang->my->storyMenu->assignedToMe = '指派給我';
$lang->my->storyMenu->openedByMe = '由我創建';
$lang->my->storyMenu->reviewedByMe = '由我評審';
$lang->my->storyMenu->closedByMe = '由我關閉';
$lang->my->home = new stdclass();
$lang->my->home->latest = '最新動態';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
$lang->my->home->createProject = "創建一個{$lang->projectCommon}";
$lang->my->home->createProduct = "創建一個{$lang->productCommon}";
$lang->my->home->help = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
$lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。";
$lang->my->form = new stdclass();
$lang->my->form->lblBasic = '基本信息';
$lang->my->form->lblContact = '聯繫信息';
$lang->my->form->lblAccount = '帳號信息';
<?php
$lang->my->common = '我的地盤';
/* 方法列表。*/
$lang->my->index = '首頁';
$lang->my->todo = '我的待辦';
$lang->my->calendar = '日程';
$lang->my->task = '我的任務';
$lang->my->bug = '我的Bug';
$lang->my->testTask = '我的版本';
$lang->my->testCase = '我的用例';
$lang->my->story = '我的需求';
$lang->my->myProject = "我的{$lang->projectCommon}";
$lang->my->profile = '我的檔案';
$lang->my->dynamic = '我的動態';
$lang->my->editProfile = '修改檔案';
$lang->my->changePassword = '修改密碼';
$lang->my->unbind = '解除然之綁定';
$lang->my->manageContacts = '維護聯繫人';
$lang->my->deleteContacts = '刪除聯繫人';
$lang->my->shareContacts = '共享聯繫人列表';
$lang->my->limited = '受限操作(只能編輯與自己相關的內容)';
$lang->my->score = '我的積分';
$lang->my->scoreRule = '積分規則';
$lang->my->noTodo = '暫時沒有待辦。';
$lang->my->taskMenu = new stdclass();
$lang->my->taskMenu->assignedToMe = '指派給我';
$lang->my->taskMenu->openedByMe = '由我創建';
$lang->my->taskMenu->finishedByMe = '由我完成';
$lang->my->taskMenu->closedByMe = '由我關閉';
$lang->my->taskMenu->canceledByMe = '由我取消';
$lang->my->storyMenu = new stdclass();
$lang->my->storyMenu->assignedToMe = '指派給我';
$lang->my->storyMenu->openedByMe = '由我創建';
$lang->my->storyMenu->reviewedByMe = '由我評審';
$lang->my->storyMenu->closedByMe = '由我關閉';
$lang->my->home = new stdclass();
$lang->my->home->latest = '最新動態';
$lang->my->home->action = "%s, %s <em>%s</em> %s <a href='%s'>%s</a>。";
$lang->my->home->projects = $lang->projectCommon;
$lang->my->home->products = $lang->productCommon;
$lang->my->home->createProject = "創建一個{$lang->projectCommon}";
$lang->my->home->createProduct = "創建一個{$lang->productCommon}";
$lang->my->home->help = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
$lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。";
$lang->my->form = new stdclass();
$lang->my->form->lblBasic = '基本信息';
$lang->my->form->lblContact = '聯繫信息';
$lang->my->form->lblAccount = '帳號信息';
module/my/view/bug.html.php
+6 -2
View File
@@ -23,6 +23,11 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($bugs)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span></p>
</div>
<?php else:?>
<form class="main-table table-bug" data-ride="table" method="post" action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
<?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
<table class="table has-sort-head table-fixed". id='bugList'>
@@ -89,7 +94,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($bugs):?>
<div class="table-footer">
<?php if($canBatchEdit):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -146,8 +150,8 @@
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php js::set('listName', 'bugList')?>
<?php include '../../common/view/footer.html.php';?>
module/my/view/dynamic.html.php
+5 -5
View File
@@ -29,7 +29,11 @@
</div>
<div id="mainContent" class="main-content">
<div id="dynamics">
<?php if(!empty($dateGroups)):?>
<?php if(empty($dateGroups)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->action->noDynamic;?></span></p>
</div>
<?php else:?>
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php $isToday = date(DT_DATE4) == $date;?>
@@ -60,10 +64,6 @@
</ul>
</div>
<?php endforeach;?>
<?php else:?>
<div class="text-center text-muted">
<?php echo $lang->action->noDynamic;?>
</div>
<?php endif;?>
</div>
</div>
module/my/view/project.html.php
+12
View File
@@ -20,6 +20,17 @@
</div>
</div>
<div id="mainContent" class='main-table'>
<?php if(empty($projects)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->project->noProject;?></span>
<?php if(common::hasPriv('project', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('project', 'create'), "<i class='icon icon-plus'></i> " . $lang->my->home->createProject, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table has-sort-head table-fixed" id='projectList'>
<thead>
<tr>
@@ -55,5 +66,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/story.html.php
+6 -2
View File
@@ -23,6 +23,11 @@
</div>
</div>
<div id="mainContent">
<?php if(!$stories):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->story->noStory;?></span></p>
</div>
<?php else:?>
<form id='myStoryForm' class="main-table table-story" data-ride="table" method="post">
<table class="table has-sort-head table-fixed">
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
@@ -86,7 +91,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($stories):?>
<div class="table-footer">
<?php if($canBatchEdit or $canBatchClose):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -174,7 +178,7 @@
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/my/view/task.html.php
+6 -2
View File
@@ -24,6 +24,11 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->task->noTask;?></span></p>
</div>
<?php else:?>
<form id='myTaskForm' class="main-table table-task" data-ride="table" method="post">
<?php $canBatchEdit = common::hasPriv('task', 'batchEdit');?>
<?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
@@ -117,7 +122,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class="table-footer">
<?php if($canBatchEdit or $canBatchClose):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -139,8 +143,8 @@
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php js::set('listName', 'tasktable')?>
<?php include '../../common/view/footer.html.php';?>
module/my/view/testcase.html.php
+6 -2
View File
@@ -27,6 +27,11 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($cases)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span></p>
</div>
<?php else:?>
<form id='myCaseForm' class="main-table table-case" data-ride="table" method="post">
<table class="table has-sort-head" id='caseList'>
<?php
@@ -93,7 +98,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($cases):?>
<div class="table-footer">
<?php if($canBatchEdit or $canBatchRun):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -114,8 +118,8 @@
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php js::set('listName', 'caseList')?>
<?php include '../../common/view/footer.html.php';?>
module/my/view/testtask.html.php
+5 -1
View File
@@ -24,6 +24,11 @@
</div>
</div>
<div id="mainContent" class='main-table'>
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span></p>
</div>
<?php else:?>
<table class="table has-sort-head table-fixed" id='taskList'>
<?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
@@ -66,7 +71,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
module/my/view/todo.html.php
+12 -2
View File
@@ -41,6 +41,17 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($todos)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->my->noTodo;?></span>
<?php if(common::hasPriv('todo', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class="main-table table-todo" data-ride="table" method="post">
<table class="table has-sort-head" id='todoList'>
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
@@ -103,7 +114,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($todos):?>
<div class="table-footer">
<?php if($type != 'cycle'):?>
<?php if(common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture)):?>
@@ -135,8 +145,8 @@
<?php endif;?>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php include '../../todo/view/assignto.html.php';?>
<?php js::set('listName', 'todoList')?>
module/product/lang/en.php
+1 -2
View File
@@ -119,8 +119,7 @@ $lang->product->aclList['custom'] = 'Custom (Team members and Whitelist members
$lang->product->storySummary = " <strong>%s</strong> Story(ies), <strong>%s</strong> hour(s) estimated, case coverage is <strong>%s</strong> on this page.";
$lang->product->checkedSummary = " <strong>%total%</strong> Checked, <strong>%estimate%</strong> hour(s) estimated, case coverage is <strong>%rate%</strong>.";
$lang->product->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->product->noProduct = 'No product. You could ';
$lang->product->noStory = 'No story. You could ';
$lang->product->noProduct = 'No product. ';
$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon;
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
module/product/lang/zh-cn.php
+1 -2
View File
@@ -119,8 +119,7 @@ $lang->product->aclList['custom'] = '自定义白名单(团队成员和白名
$lang->product->storySummary = "本页共 <strong>%s</strong> 个需求，预计 <strong>%s</strong> 个工时，用例覆盖率<strong>%s</strong>。";
$lang->product->checkedSummary = "选中 <strong>%total%</strong> 个需求，预计 <strong>%estimate%</strong> 个工时，用例覆盖率<strong>%rate%</strong>。";
$lang->product->noModule = '<div>您现在还没有模块信息</div><div>请维护产品模块</div>';
$lang->product->noProduct = '暂时没有产品，您现在可以';
$lang->product->noStory = '暂时没有需求，您现在可以';
$lang->product->noProduct = '暂时没有产品。';
$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon;
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
module/product/lang/zh-tw.php
+1 -2
View File
@@ -119,8 +119,7 @@ $lang->product->aclList['custom'] = '自定義白名單(團隊成員和白名
$lang->product->storySummary = "本頁共 <strong>%s</strong> 個需求，預計 <strong>%s</strong> 個工時，用例覆蓋率<strong>%s</strong>。";
$lang->product->checkedSummary = "選中 <strong>%total%</strong> 個需求，預計 <strong>%estimate%</strong> 個工時，用例覆蓋率<strong>%rate%</strong>。";
$lang->product->noModule = '<div>您現在還沒有模組信息</div><div>請維護產品模組</div>';
$lang->product->noProduct = '暫時沒有產品，您現在可以';
$lang->product->noStory = '暫時沒有需求，您現在可以';
$lang->product->noProduct = '暫時沒有產品。';
$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon;
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
module/product/view/browse.html.php
+12 -6
View File
@@ -138,6 +138,17 @@
</div>
<div class="main-col">
<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
<?php if(empty($stories)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->story->noStory;?></span>
<?php if(common::hasPriv('story', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}"), "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class="main-table table-story skip-iframe-modal" method="post" id='productStoryForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -177,7 +188,6 @@
</tbody>
</table>
</div>
<?php if($stories):?>
<div class="table-footer">
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
@@ -359,12 +369,8 @@
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php elseif(common::hasPriv('story', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->product->noStory;?></span> <?php common::printLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<script>
module/product/view/build.html.php
+12
View File
@@ -21,6 +21,17 @@
</div>
<?php endif;?>
<div id='mainContent' class='main-table'>
<?php if(empty($builds)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->build->noBuild;?></span>
<?php if(common::hasPriv('build', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('build', 'create', "productID=$product->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class='table' id='buildList'>
<thead>
<tr class='text-center'>
@@ -57,5 +68,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/product/view/dynamic.html.php
+5 -5
View File
@@ -32,7 +32,11 @@
</div>
<div id="mainContent" class="main-content">
<div id="dynamics">
<?php if(!empty($dateGroups)):?>
<?php if(empty($dateGroups)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->action->noDynamic;?></span></p>
</div>
<?php else:?>
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php $isToday = date(DT_DATE4) == $date;?>
@@ -63,10 +67,6 @@
</ul>
</div>
<?php endforeach;?>
<?php else:?>
<div class="text-center text-muted">
<?php echo $lang->action->noDynamic;?>
</div>
<?php endif;?>
</div>
</div>
module/product/view/project.html.php
+12
View File
@@ -16,6 +16,17 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($projectStats)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->project->noProject;?></span>
<?php if(common::hasPriv('project', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('project', 'create'), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table table-project'>
<table class="table table-fixed">
<thead>
@@ -69,5 +80,6 @@
</tbody>
</table>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/product/view/roadmap.html.php
+23
View File
@@ -26,6 +26,28 @@
<div class="tab-content">
<?php foreach($branches as $branchKey => $branchName):?>
<div class="tab-pane fade release-paths <?php if($branchKey == 0) echo 'active in';?>" id="tabContent<?php echo $branchKey;?>">
<?php
$hasRoadmaps = false;
foreach($roadmaps as $year => $yearRoadmaps)
{
if(isset($yearRoadmaps[$branchKey]))
{
$hasRoadmaps = true;
break;
}
}
?>
<?php if(!$hasRoadmaps):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->release->noRelease;?></span>
<?php if(common::hasPriv('release', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branchKey"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<?php foreach($roadmaps as $year => $yearRoadmaps):?>
<?php if(!isset($yearRoadmaps[$branchKey])) continue;?>
<?php $groupRoadmaps = zget($yearRoadmaps, $branchKey, array());?>
@@ -55,6 +77,7 @@
<?php endforeach;?>
</div>
<?php endforeach;?>
<?php endif;?>
</div>
<?php endforeach;?>
</div>
module/productplan/lang/en.php
+1
View File
@@ -37,6 +37,7 @@ $lang->productplan->unlinkedBugs = 'Unlinked';
$lang->productplan->confirmDelete = "Do you want to delete this Plan?";
$lang->productplan->confirmUnlinkStory = "Do you want to unlink this Story?";
$lang->productplan->confirmUnlinkBug = "Do you want to unlink this Bug?";
$lang->productplan->noPlan = 'No plans. ';
$lang->productplan->id = 'ID';
$lang->productplan->product = $lang->productCommon;
module/productplan/lang/zh-cn.php
+1
View File
@@ -37,6 +37,7 @@ $lang->productplan->unlinkedBugs = '未关联Bug';
$lang->productplan->confirmDelete = "您确认删除该计划吗？";
$lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？";
$lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->productplan->noPlan = '暂时没有计划。';
$lang->productplan->id = '编号';
$lang->productplan->product = $lang->productCommon;
module/productplan/lang/zh-tw.php
+1
View File
@@ -37,6 +37,7 @@ $lang->productplan->unlinkedBugs = '未關聯Bug';
$lang->productplan->confirmDelete = "您確認刪除該計劃嗎？";
$lang->productplan->confirmUnlinkStory = "您確認移除該需求嗎？";
$lang->productplan->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->productplan->noPlan = '暫時沒有計劃。';
$lang->productplan->id = '編號';
$lang->productplan->product = $lang->productCommon;
module/productplan/view/browse.html.php
+12 -2
View File
@@ -28,6 +28,17 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($plans)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->productplan->noPlan;?></span>
<?php if(common::hasPriv('productplan', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('productplan', 'create', "productID=$product->id&branch=$branch"), "<i class='icon icon-plus'></i> " . $lang->productplan->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table table-productplan' data-ride='table' method='post' id='productplanForm' action='<?php echo inlink('batchEdit', "productID=$product->id&branch=$branch")?>'>
<table class='table has-sort-head' id="productplanList">
<thead>
@@ -96,7 +107,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($plans):?>
<div class="table-footer">
<?php if(common::hasPriv('productplan', 'batchEdit')):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -106,7 +116,7 @@
<?php endif;?>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/lang/en.php
+2 -1
View File
@@ -220,7 +220,8 @@ $lang->project->copyFromProject = "Copy from {$lang->projectCommon} <strong>%s</
$lang->project->cancelCopy = 'Cancel Copy';
$lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = 'No project. You could ';
$lang->project->noProject = 'No projects. ';
$lang->project->noMembers = 'No members. ';
/* 交互提示。*/
$lang->project->confirmDelete = "Do you want to delete {$lang->projectCommon}[%s]?";
module/project/lang/zh-cn.php
+2 -1
View File
@@ -220,7 +220,8 @@ $lang->project->copyFromProject = "复制自{$lang->projectCommon} <strong>%s</s
$lang->project->cancelCopy = '取消复制';
$lang->project->byPeriod = '按时间段';
$lang->project->byUser = '按用户';
$lang->project->noProject = '暂时没有项目，您现在可以';
$lang->project->noProject = '暂时没有项目。';
$lang->project->noMembers = '暂时没有团队成员。';
/* 交互提示。*/
$lang->project->confirmDelete = "您确定删除{$lang->projectCommon}[%s]吗？";
module/project/lang/zh-tw.php
+2 -1
View File
@@ -220,7 +220,8 @@ $lang->project->copyFromProject = "複製自{$lang->projectCommon} <strong>%s</s
$lang->project->cancelCopy = '取消複製';
$lang->project->byPeriod = '按時間段';
$lang->project->byUser = '按用戶';
$lang->project->noProject = '暫時沒有項目，您現在可以';
$lang->project->noProject = '暫時沒有項目。';
$lang->project->noMembers = '暫時沒有團隊成員。';
/* 交互提示。*/
$lang->project->confirmDelete = "您確定刪除{$lang->projectCommon}[%s]嗎？";
module/project/view/bug.html.php
+12 -2
View File
@@ -27,6 +27,17 @@
</div>
<div id="mainContent">
<div class="cell" id="queryBox"></div>
<?php if(empty($bugs)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->bug->noBug;?></span>
<?php if(common::hasPriv('bug', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id"), "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table' method='post' id='projectBugForm' data-ride="table">
<table class='table has-sort-head' id='bugList'>
<?php $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');?>
@@ -90,7 +101,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($bugs):?>
<div class='table-footer'>
<?php if($canBatchAssignTo):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -123,8 +133,8 @@
<?php endif;?>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php js::set('replaceID', 'bugList');?>
<?php js::set('browseType', $type);?>
module/project/view/build.html.php
+14
View File
@@ -14,10 +14,12 @@
<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
<div id="mainMenu" class="clearfix table-row">
<div class="btn-toolbar pull-left">
<?php if(!empty($projectBuilds)):?>
<div class="pull-left table-group-btns">
<button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-fold-all"> </i></button>
<button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-unfold-all"> </i></button>
</div>
<?php endif;?>
<span class='btn btn-link btn-active-text'>
<span class='text'><?php echo $lang->project->build;?></span>
<span class='label label-light label-badge'><?php echo $buildsTotal;?></span>
@@ -28,6 +30,17 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($projectBuilds)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->build->noBuild;?></span>
<?php if(common::hasPriv('build', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('build', 'create', "project=$project->id"), "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<div class='main-table' data-ride="table" data-checkable="false" data-group="true">
<table class="table table-grouped text-center" id='buildList'>
<thead>
@@ -99,5 +112,6 @@
</tbody>
</table>
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/dynamic.html.php
+6 -6
View File
@@ -32,8 +32,12 @@
</div>
<div id="mainContent" class="main-content">
<?php if(empty($dateGroups)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->action->noDynamic;?></span></p>
</div>
<?php else:?>
<div id="dynamics">
<?php if(!empty($dateGroups)):?>
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php $isToday = date(DT_DATE4) == $date;?>
@@ -64,12 +68,8 @@
</ul>
</div>
<?php endforeach;?>
<?php else:?>
<div class="text-center text-muted">
<?php echo $lang->action->noDynamic;?>
</div>
<?php endif;?>
</div>
<?php endif;?>
</div>
<?php if(!empty($firstAction)):?>
<?php
module/project/view/grouptask.html.php
+14
View File
@@ -13,10 +13,12 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix table-row">
<div class="btn-toolbar pull-left">
<?php if(!empty($tasks)):?>
<div class="pull-left table-group-btns">
<button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->project->treeLevel['root'];?> <i class="icon-fold-all"></i></button>
<button type="button" class="btn btn-link group-expand-all"><?php echo $lang->project->treeLevel['all'];?> <i class="icon-unfold-all"></i></button>
</div>
<?php endif;?>
<?php if(isset($lang->project->groupFilter[$groupBy])):?>
<?php foreach($lang->project->groupFilter[$groupBy] as $filterKey => $name):?>
<?php
@@ -71,6 +73,17 @@
</div>
</div>
<div id='tasksTable' class='main-table' data-ride='table' data-checkable='false' data-group='true' data-hot='true'>
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->task->noTask;?></span>
<?php if(common::hasPriv('task', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table table-grouped text-center">
<thead>
<tr class="<?php if($allCount) echo 'divider';?>">
@@ -198,5 +211,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/kanban.html.php
+23
View File
@@ -52,6 +52,28 @@ if($allCols) $taskCols = array('wait', 'doing', 'pause', 'done', 'cancel', 'clos
$account = $this->app->user->account;
?>
<div id="kanban" class="main-table" data-ride="table" data-checkable="false" data-group="true">
<?php
$hasTask = false;
foreach($kanbanGroup as $group)
{
if(count(get_object_vars($group)) > 0)
{
$hasTask = true;
break;
}
}
?>
<?php if(!$hasTask):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->task->noTask;?></span>
<?php if(common::hasPriv('task', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table table-grouped text-center">
<thead>
<tr>
@@ -151,6 +173,7 @@ $account = $this->app->user->account;
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php echo js::set('projectID', $projectID);?>
<?php include '../../common/view/footer.html.php';?>
module/project/view/story.html.php
+12 -6
View File
@@ -78,6 +78,17 @@
</div>
<div class="main-col">
<div class="cell" id="queryBox"></div>
<?php if(empty($stories)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->story->noStory;?></span>
<?php if(common::hasPriv('project', 'linkStory')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('project', 'linkStory', "project=$project->id"), "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table table-story skip-iframe-modal' method='post' id='projectStoryForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -197,11 +208,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if(!$stories):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->product->noStory;?></span> <?php common::printLink('project', 'linkStory', "project=$project->id", "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<div class='table-footer'>
<?php if($canBatchEdit or $canBatchClose):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -245,8 +251,8 @@
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
module/project/view/storykanban.html.php
+12
View File
@@ -44,6 +44,17 @@ $cols = array('projected', 'developing', 'developed', 'testing', 'tested', 'v
$account = $this->app->user->account;
?>
<div id="kanban" class="main-table" data-ride="table" data-checkable="false" data-group="true">
<?php if(empty($stories)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->story->noStory;?></span>
<?php if(common::hasPriv('project', 'linkStory')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('project', 'linkStory', "project=$project->id"), "<i class='icon icon-link'></i> " . $lang->project->linkStory, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table table-grouped text-center">
<thead>
<tr>
@@ -82,6 +93,7 @@ $account = $this->app->user->account;
</tr>
</tbody>
</table>
<?php endif;?>
</div>
<?php js::set('projectID', $projectID);?>
<?php include '../../common/view/footer.html.php';?>
module/project/view/task.html.php
+12 -2
View File
@@ -165,6 +165,17 @@ js::set('browseType', $browseType);
</div>
<div class="main-col">
<div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->task->noTask;?></span>
<?php if(common::hasPriv('task', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class="main-table table-task skip-iframe-modal" method="post" id='projectTaskForm'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -219,7 +230,6 @@ js::set('browseType', $browseType);
</tbody>
</table>
</div>
<?php if($tasks):?>
<div class="table-footer">
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
@@ -306,8 +316,8 @@ js::set('browseType', $browseType);
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<?php js::set('replaceID', 'taskList')?>
module/project/view/team.html.php
+14 -2
View File
@@ -21,16 +21,27 @@
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("projectID=$project->id");
echo html::a($this->createLink('tutorial', 'wizard', "module=project&method=managemembers&params=$wizardParams"), $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
echo html::a($this->createLink('tutorial', 'wizard', "module=project&method=manageMembers&params=$wizardParams"), "<i class='icon icon-persons'></i> " . $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
}
else
{
if(!empty($app->user->admin) or empty($app->user->rights['rights']['my']['limited'])) common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
if(!empty($app->user->admin) or empty($app->user->rights['rights']['my']['limited'])) common::printLink('project', 'manageMembers', "projectID=$project->id", "<i class='icon icon-persons'></i> " . $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'");
}
?>
</div>
</div>
<div id='mainContent'>
<?php if(empty($teamMembers)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->project->noMembers;?></span>
<?php if((!empty($app->user->admin) or empty($app->user->rights['rights']['my']['limited'])) && common::hasPriv('project', 'manageMembers')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('project', 'manageMembers', "projectID=$project->id"), "<i class='icon icon-persons'></i> " . $lang->project->manageMembers, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table'>
<table class='table' id='memberList'>
<thead>
@@ -79,5 +90,6 @@
<div class='table-statistic'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours{$lang->project->workHour}</strong>";?></div>
</div>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/testtask.html.php
+14 -2
View File
@@ -14,10 +14,12 @@
<?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php if(!empty($tasks)):?>
<div class="pull-left table-group-btns">
<button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->testtask->collapseAll;?> <i class="icon-fold-all muted"></i></button>
<button type="button" class="btn btn-link group-expand-all"><?php echo $lang->testtask->expandAll;?> <i class="icon-unfold-all muted"></i></button>
</div>
<?php endif;?>
<?php $total = 0;?>
<?php foreach($tasks as $productTasks) $total += count($productTasks);?>
<a href='' class='btn btn-link btn-active-text'>
@@ -31,6 +33,17 @@
</div>
</div>
<div id="mainContent">
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
<?php if(common::hasPriv('testtask', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('testtask', 'create', "product=0&project=$projectID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class="main-table table-testtask" data-ride="table" data-group="true" method="post" target='hiddenwin' id='testtaskForm'>
<table class="table table-grouped has-sort-head" id='taskList'>
<thead>
@@ -116,7 +129,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class="table-footer">
<?php if($canTestReport):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -130,7 +142,7 @@
<?php endif;?>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/tree.html.php
+12
View File
@@ -57,6 +57,17 @@
</div>
<div id="mainContent" class="main-row hide-side">
<?php if(empty($tree)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->task->noTask;?></span>
<?php if(common::hasPriv('task', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<div class="main-col">
<div class="cell">
<ul class="tree" id="taskTree">
@@ -69,5 +80,6 @@
<div id="itemContent" class="load-indicator loading"></div>
</div>
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/treetask.html.php
+4 -4
View File
@@ -40,7 +40,7 @@
<div class="detail" open>
<div class="detail-title"><?php echo $lang->task->legendDesc;?></div>
<div class="detail-content article-content">
<?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php if($project->type != 'ops'):?>
@@ -48,21 +48,21 @@
<div class="detail" open>
<div class="detail-title"><?php echo $lang->bug->steps;?></div>
<div class="detail-content article-content">
<?php echo !empty($task->bugSteps) ? $task->bugSteps : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->bugSteps) ? $task->bugSteps : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php elseif($task->story):?>
<div class="detail" open>
<div class='detail-title'><?php echo $lang->task->storySpec;?></div>
<div class='detail-content article-content'>
<?php echo (!empty($task->storySpec) || !empty($task->storyFiles)) ? $task->storySpec : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo (!empty($task->storySpec) || !empty($task->storyFiles)) ? $task->storySpec : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $task->storyFiles, 'fieldset' => 'false'));?>
</div>
<div class='detail' open>
<div class='detail-title'><?php echo $lang->task->storyVerify;?></div>
<div class='detail-content article-content'>
<?php echo !empty($task->storyVerify) ? $task->storyVerify : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->storyVerify) ? $task->storyVerify : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php endif;?>
module/release/lang/en.php
+1
View File
@@ -27,6 +27,7 @@ $lang->release->confirmDelete = "Do you want to delete this Release?";
$lang->release->confirmUnlinkStory = "Do you want to remove this Story?";
$lang->release->confirmUnlinkBug = "Do you want to remove this Bug?";
$lang->release->existBuild = '『Build』『%s』existed. You could change『name』or choose a『build』.';
$lang->release->noRelease = 'No releases. ';
$lang->release->basicInfo = 'Basic Info';
module/release/lang/zh-cn.php
+1
View File
@@ -27,6 +27,7 @@ $lang->release->confirmDelete = "您确认删除该发布吗？";
$lang->release->confirmUnlinkStory = "您确认移除该需求吗？";
$lang->release->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->release->existBuild = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
$lang->release->noRelease = '暂时没有发布。';
$lang->release->basicInfo = '基本信息';
module/release/lang/zh-tw.php
+1
View File
@@ -27,6 +27,7 @@ $lang->release->confirmDelete = "您確認刪除該發佈嗎？";
$lang->release->confirmUnlinkStory = "您確認移除該需求嗎？";
$lang->release->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->release->existBuild = '『版本』已經有『%s』這條記錄了。您可以更改『發佈名稱』或者選擇一個『版本』。';
$lang->release->noRelease = '暫時沒有發佈。';
$lang->release->basicInfo = '基本信息';
module/release/view/browse.html.php
+12
View File
@@ -24,6 +24,17 @@
</div>
</div>
<div id="mainContent" class='main-table'>
<?php if(empty($releases)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->release->noRelease;?></span>
<?php if(common::hasPriv('release', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branch"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table" id='releaseList'>
<thead>
<tr>
@@ -75,5 +86,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/story/lang/en.php
+1
View File
@@ -194,6 +194,7 @@ $lang->story->confirmDelete = "Do you want to delete this Story?";
$lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.';
$lang->story->mustChooseResult = 'Select a result.';
$lang->story->mustChoosePreVersion = 'Select a Version to revert to.';
$lang->story->noStory = 'No stories. ';
$lang->story->form = new stdclass();
$lang->story->form->area = 'Story Scope';
module/story/lang/zh-cn.php
+1
View File
@@ -194,6 +194,7 @@ $lang->story->confirmDelete = "您确认删除该需求吗?";
$lang->story->errorEmptyChildStory = '『细分需求』不能为空。';
$lang->story->mustChooseResult = '必须选择评审结果';
$lang->story->mustChoosePreVersion = '必须选择回溯的版本';
$lang->story->noStory = '暂时没有需求。';
$lang->story->form = new stdclass();
$lang->story->form->area = '该需求所属范围';
module/story/lang/zh-tw.php
+1
View File
@@ -194,6 +194,7 @@ $lang->story->confirmDelete = "您確認刪除該需求嗎?";
$lang->story->errorEmptyChildStory = '『細分需求』不能為空。';
$lang->story->mustChooseResult = '必須選擇評審結果';
$lang->story->mustChoosePreVersion = '必須選擇回溯的版本';
$lang->story->noStory = '暫時沒有需求。';
$lang->story->form = new stdclass();
$lang->story->form->area = '該需求所屬範圍';
module/story/view/zerocase.html.php
+6 -2
View File
@@ -13,6 +13,11 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../testcase/view/caseheader.html.php';?>
<div id='mainContent' class='main-control'>
<?php if(empty($stories)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->story->noStory;?></span></p>
</div>
<?php else:?>
<form method='post' id='productStoryForm' class='main-table table-story' data-ride='table'>
<table class='table has-sort-head table-fixed' id='storyList'>
<thead>
@@ -73,7 +78,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($stories):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
@@ -136,7 +140,7 @@
?>
</div>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/task/lang/en.php
+1 -1
View File
@@ -171,8 +171,8 @@ $lang->task->confirmTransfer = '"Left Hour" is 0，Do you want to transfer
$lang->task->noticeLinkStory = "No story has been linked. You can %s for this project, then %s.";
$lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it first.';
$lang->task->commentActions = '%s. %s, commented by <strong>%s</strong>.';
$lang->task->noData = 'No Data.';
$lang->task->deniedNotice = 'Only the %s can %s the task.';
$lang->task->noTask = 'No tasks. ';
$lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"Consumed" must be numbers.';
module/task/lang/zh-cn.php
+1 -1
View File
@@ -171,8 +171,8 @@ $lang->task->confirmTransfer = '"当前剩余"为0，任务将被转交，
$lang->task->noticeLinkStory = "没有可关联的相关需求，您可以为当前项目%s，然后%s";
$lang->task->noticeSaveRecord = '您有尚未保存的工时记录，请先将其保存。';
$lang->task->commentActions = '%s. %s, 由 <strong>%s</strong> 添加备注。';
$lang->task->noData = '暂无';
$lang->task->deniedNotice = '当前任务只有%s才可以%s。';
$lang->task->noTask = '暂时没有任务。';
$lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"已经消耗"必须为数字';
module/task/lang/zh-tw.php
+1 -1
View File
@@ -171,8 +171,8 @@ $lang->task->confirmTransfer = '"當前剩餘"為0，任務將被轉交，
$lang->task->noticeLinkStory = "沒有可關聯的相關需求，您可以為當前項目%s，然後%s";
$lang->task->noticeSaveRecord = '您有尚未保存的工時記錄，請先將其保存。';
$lang->task->commentActions = '%s. %s, 由 <strong>%s</strong> 添加備註。';
$lang->task->noData = '暫無';
$lang->task->deniedNotice = '當前任務只有%s才可以%s。';
$lang->task->noTask = '暫時沒有任務。';
$lang->task->error = new stdclass();
$lang->task->error->consumedNumber = '"已經消耗"必須為數字';
module/task/view/view.html.php
+14 -14
View File
@@ -41,7 +41,7 @@
<div class="detail">
<div class="detail-title"><?php echo $lang->task->legendDesc;?></div>
<div class="detail-content article-content">
<?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php if($project->type != 'ops'):?>
@@ -49,21 +49,21 @@
<div class="detail">
<div class="detail-title"><?php echo $lang->bug->steps;?></div>
<div class="detail-content article-content">
<?php echo !empty($task->bugSteps) ? $task->bugSteps : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->bugSteps) ? $task->bugSteps : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php elseif($task->story):?>
<div class="detail">
<div class='detail-title'><?php echo $lang->task->storySpec;?></div>
<div class='detail-content article-content'>
<?php echo (!empty($task->storySpec) || !empty($task->storyFiles)) ? $task->storySpec : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo (!empty($task->storySpec) || !empty($task->storyFiles)) ? $task->storySpec : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $task->storyFiles, 'fieldset' => 'false'));?>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->task->storyVerify;?></div>
<div class='detail-content article-content'>
<?php echo !empty($task->storyVerify) ? $task->storyVerify : "<div class='text-center text-muted'>" . $lang->task->noData . '</div>';?>
<?php echo !empty($task->storyVerify) ? $task->storyVerify : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
</div>
</div>
<?php endif;?>
@@ -184,7 +184,7 @@
<th><?php echo $lang->task->story;?></th>
<td>
<?php
if(!$task->storyTitle) echo $lang->task->noData;
if(!$task->storyTitle) echo $lang->noData;
if($task->storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle, '', "class='iframe' data-width='80%'", true, true)) echo $task->storyTitle;
if($task->needConfirm)
{
@@ -203,7 +203,7 @@
<?php endif;?>
<tr>
<th><?php echo empty($task->team) ? $lang->task->assignTo : $lang->task->transferTo;?></th>
<td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->task->noData;?></td>
<td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->type;?></th>
@@ -215,7 +215,7 @@
</tr>
<tr>
<th><?php echo $lang->task->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo $task->pri == '0' ? $lang->task->noData : zget($lang->task->priList, $task->pri)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo $task->pri == '0' ? $lang->noData : zget($lang->task->priList, $task->pri)?></span></td>
</tr>
<tr>
<th><?php echo $lang->task->mailto;?></th>
@@ -224,7 +224,7 @@
$mailto = explode(',', str_replace(' ', '', $task->mailto));
if(empty($mainto))
{
echo $lang->task->noData;
echo $lang->noData;
}
else
{
@@ -310,27 +310,27 @@
<table class='table table-data'>
<tr>
<th><?php echo $lang->task->openedBy;?></th>
<td><?php echo $task->openedBy ? zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate : $lang->task->noData;?></td>
<td><?php echo $task->openedBy ? zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->finishedBy;?></th>
<td><?php echo ($task->finishedBy) ? zget($users, $task->finishedBy, $task->finishedBy) . $lang->at . $task->finishedDate : $lang->task->noData;?></td>
<td><?php echo ($task->finishedBy) ? zget($users, $task->finishedBy, $task->finishedBy) . $lang->at . $task->finishedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->canceledBy;?></th>
<td><?php echo $task->canceledBy ? zget($users, $task->canceledBy, $task->canceledBy) . $lang->at . $task->canceledDate : $lang->task->noData;?></td>
<td><?php echo $task->canceledBy ? zget($users, $task->canceledBy, $task->canceledBy) . $lang->at . $task->canceledDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->closedBy;?></th>
<td><?php echo $task->closedBy ? zget($users, $task->closedBy, $task->closedBy) . $lang->at . $task->closedDate : $lang->task->noData;?></td>
<td><?php echo $task->closedBy ? zget($users, $task->closedBy, $task->closedBy) . $lang->at . $task->closedDate : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->closedReason;?></th>
<td><?php echo $task->closedReason ? $lang->task->reasonList[$task->closedReason] : $lang->task->noData;?></td>
<td><?php echo $task->closedReason ? $lang->task->reasonList[$task->closedReason] : $lang->noData;?></td>
</tr>
<tr>
<th><?php echo $lang->task->lastEdited;?></th>
<td><?php echo $task->lastEditedBy ? zget($users, $task->lastEditedBy, $task->lastEditedBy) . $lang->at . $task->lastEditedDate : $lang->task->noData;?></td>
<td><?php echo $task->lastEditedBy ? zget($users, $task->lastEditedBy, $task->lastEditedBy) . $lang->at . $task->lastEditedDate : $lang->noData;?></td>
</tr>
</table>
</div>
module/testcase/lang/en.php
+1 -1
View File
@@ -191,7 +191,7 @@ $lang->testcase->noRequire = "Row %s has“%s”which is a required field
$lang->testcase->noLibrary = "No library exists. Please create one first.";
$lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->testcase->noCase = 'No Case. You could ';
$lang->testcase->noCase = 'No cases. ';
$lang->testcase->searchStories = 'Enter to searcu Story';
$lang->testcase->selectLib = 'Select Library';
module/testcase/lang/zh-cn.php
+1 -1
View File
@@ -191,7 +191,7 @@ $lang->testcase->noRequire = "%s行的“%s”是必填字段，不能为
$lang->testcase->noLibrary = "现在还没有公共库，请先创建！";
$lang->testcase->mustChooseResult = '必须选择评审结果';
$lang->testcase->noModule = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
$lang->testcase->noCase = '暂时没有用例，您现在可以';
$lang->testcase->noCase = '暂时没有用例。';
$lang->testcase->searchStories = '键入来搜索需求';
$lang->testcase->selectLib = '请选择库';
module/testcase/lang/zh-tw.php
+1 -1
View File
@@ -191,7 +191,7 @@ $lang->testcase->noRequire = "%s行的“%s”是必填欄位，不能為
$lang->testcase->noLibrary = "現在還沒有公共庫，請先創建！";
$lang->testcase->mustChooseResult = '必須選擇評審結果';
$lang->testcase->noModule = '<div>您現在還沒有模組信息</div><div>請維護測試模組</div>';
$lang->testcase->noCase = '暫時沒有用例，您現在可以';
$lang->testcase->noCase = '暫時沒有用例。';
$lang->testcase->searchStories = '鍵入來搜索需求';
$lang->testcase->selectLib = '請選擇庫';
module/testcase/view/browse.html.php
+13 -6
View File
@@ -41,6 +41,18 @@ js::set('branch', $branch);
</div>
<div class='main-col'>
<div id='queryBox' class='cell<?php if($browseType == 'bysearch') echo ' show';?>'></div>
<?php if(empty($cases)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
<?php if(common::hasPriv('testcase', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
<?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class='main-table table-case' data-ride='table' id='batchForm' method='post'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -81,7 +93,6 @@ js::set('branch', $branch);
</tbody>
</table>
</div>
<?php if($cases):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class='table-actions btn-toolbar'>
@@ -198,12 +209,8 @@ js::set('branch', $branch);
<div class="table-statistic"><?php echo $summary;?></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php elseif(common::hasPriv('testcase', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testcase', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<script>
module/testcase/view/groupcase.html.php
+12
View File
@@ -15,6 +15,17 @@
<?php include './caseheader.html.php';?>
<?php js::set('browseType', $browseType);?>
<div class="main-table" data-ride="table" data-checkable="false" data-group="true">
<?php if(empty($cases)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
<?php if(common::hasPriv('testcase', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class="table table-grouped text-center">
<thead>
<tr class="divider">
@@ -97,5 +108,6 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/testreport/view/browse.html.php
+5 -1
View File
@@ -22,6 +22,11 @@
</div>
<?php endif;?>
<div id='mainContent' class='main-table'>
<?php if(empty($reports)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testreport->noReport;?></span></p>
</div>
<?php else:?>
<table class='table has-sort-head table-fixed' id='reportList'>
<?php $vars = "objectID=$objectID&objectType=$objectType&extra=$extra&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
<thead>
@@ -63,7 +68,6 @@
<tbody><tr><td colspan='7'><?php echo $lang->testreport->noReport;?></td></tr></tbody>
<?php endif;?>
</table>
<?php if($reports):?>
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
module/testsuite/lang/en.php
+1 -1
View File
@@ -44,7 +44,7 @@ $lang->testsuite->libraryDelete = 'Do you want to delete this library？';
$lang->testsuite->confirmUnlinkCase = 'Do you want to unlink this Case?';
$lang->testsuite->noticeNone = 'You have not created a suite yet.';
$lang->testsuite->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->testsuite->noTestsuite = 'No testsuite. You could ';
$lang->testsuite->noTestsuite = 'No suites. ';
$lang->testsuite->lblCases = 'Cases';
$lang->testsuite->lblUnlinkCase = 'Unlink Case';
module/testsuite/lang/zh-cn.php
+1 -1
View File
@@ -44,7 +44,7 @@ $lang->testsuite->libraryDelete = '您确认要删除该用例库吗？';
$lang->testsuite->confirmUnlinkCase = '您确认要移除该用例吗？';
$lang->testsuite->noticeNone = '您还没有创建套件';
$lang->testsuite->noModule = '<div>您现在还没有模块信息</div><div>请维护用例库模块</div>';
$lang->testsuite->noTestsuite = '暂时没有套件，您现在可以';
$lang->testsuite->noTestsuite = '暂时没有套件。';
$lang->testsuite->lblCases = '用例列表';
$lang->testsuite->lblUnlinkCase = '移除用例';
module/testsuite/lang/zh-tw.php
+1 -1
View File
@@ -44,7 +44,7 @@ $lang->testsuite->libraryDelete = '您確認要刪除該用例庫嗎？';
$lang->testsuite->confirmUnlinkCase = '您確認要移除該用例嗎？';
$lang->testsuite->noticeNone = '您還沒有創建套件';
$lang->testsuite->noModule = '<div>您現在還沒有模組信息</div><div>請維護用例庫模組</div>';
$lang->testsuite->noTestsuite = '暫時沒有套件，您現在可以';
$lang->testsuite->noTestsuite = '暫時沒有套件。';
$lang->testsuite->lblCases = '用例列表';
$lang->testsuite->lblUnlinkCase = '移除用例';
module/testsuite/model.php
+3 -3
View File
@@ -123,7 +123,7 @@ class testsuiteModel extends model
$dropMenuLink = helper::createLink('testsuite', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
$selectHtml = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem'>{$currentLibName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$selectHtml .= "</div></div>";
$selectHtml .= "</div></div></div>";
}
}
@@ -137,7 +137,7 @@ class testsuiteModel extends model
$dropMenuLink = helper::createLink('tree', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
$selectHtml .= "<div class='btn-group'><button id='currentModule' data-toggle='dropdown' type='button' class='btn btn-limit'>{$moduleName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$selectHtml .= "</div></div></div>";
$selectHtml .= "</div></div>";
}
else
{
@@ -153,7 +153,7 @@ class testsuiteModel extends model
if($isMobile)
{
$this->app->loadLang('qa');
$pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
$pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
}
else
{
module/testsuite/view/browse.html.php
+11 -7
View File
@@ -26,12 +26,18 @@
</div>
</div>
<?php endif;?>
<?php if(empty($suites)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testsuite->noTestsuite;?></span> <?php common::printLink('testsuite', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<div id='mainContent' class='main-table'>
<?php if(empty($suites)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testsuite->noTestsuite;?></span>
<?php if(common::hasPriv('testsuite', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('testsuite', 'create', "product=$productID"), "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class='table has-sort-head' id='suiteList'>
<thead>
<?php $vars = "productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -72,9 +78,7 @@
<?php endforeach;?>
</tbody>
</table>
<?php if($suites):?>
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<?php endif;?>
<?php include '../../common/view/footer.html.php';?>
module/testsuite/view/library.html.php
+13 -5
View File
@@ -19,7 +19,7 @@ js::set('confirmDelete', $lang->testsuite->confirmDelete);
js::set('batchDelete', $lang->testcase->confirmBatchDelete);
js::set('flow', $config->global->flow);
?>
<?php if($config->global->flow == 'full'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<div id='mainMenu' class='clearfix'>
<div id="sidebarHeader">
<div class="title">
@@ -75,6 +75,17 @@ js::set('flow', $config->global->flow);
</div>
<div class="main-col">
<div id='queryBox' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
<?php if(empty($cases)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
<?php if(common::hasPriv('testsuite', 'createCase')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('testsuite', 'createCase', "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0)), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<form class="main-table table-testcase" data-ride="table" method="post" id='testcaseForm'>
<?php $canBatchEdit = common::hasPriv('testcase', 'batchEdit');?>
<?php $canBatchDelete = common::hasPriv('testcase', 'batchDelete');?>
@@ -103,7 +114,6 @@ js::set('flow', $config->global->flow);
</tr>
</thead>
<tbody>
<?php if($cases):?>
<?php foreach($cases as $case):?>
<tr>
<td class='c-id'>
@@ -135,11 +145,9 @@ js::set('flow', $config->global->flow);
</td>
</tr>
<?php endforeach;?>
<?php endif;?>
</tbody>
</table>
</div>
<?php if($cases):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
@@ -195,8 +203,8 @@ js::set('flow', $config->global->flow);
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<script>
module/testtask/lang/en.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->testtask->showFail = 'Failed <span class="text-danger">%s</span> tim
$lang->testtask->confirmDelete = 'Do you want to delete this test build?';
$lang->testtask->confirmUnlinkCase = 'Do you want to unlink this Case?';
$lang->testtask->noticeNoOther = 'There are no other test task for this product';
$lang->testtask->noTesttask = 'No test task. You could';
$lang->testtask->noTesttask = 'No test tasks. ';
$lang->testtask->assignedToMe = 'My';
$lang->testtask->allCases = 'AllCases';
module/testtask/lang/zh-cn.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->testtask->showFail = '失败<span class="text-danger">%s</span>次';
$lang->testtask->confirmDelete = '您确认要删除该版本吗？';
$lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？';
$lang->testtask->noticeNoOther = '该产品还没有其他测试版本';
$lang->testtask->noTesttask = '暂时没有测试版本，您现在可以';
$lang->testtask->noTesttask = '暂时没有测试版本。';
$lang->testtask->assignedToMe = '指派给我';
$lang->testtask->allCases = '所有用例';
module/testtask/lang/zh-tw.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->testtask->showFail = '失敗<span class="text-danger">%s</span>次';
$lang->testtask->confirmDelete = '您確認要刪除該版本嗎？';
$lang->testtask->confirmUnlinkCase = '您確認要移除該用例嗎？';
$lang->testtask->noticeNoOther = '該產品還沒有其他測試版本';
$lang->testtask->noTesttask = '暫時沒有測試版本，您現在可以';
$lang->testtask->noTesttask = '暫時沒有測試版本。';
$lang->testtask->assignedToMe = '指派給我';
$lang->testtask->allCases = '所有用例';
module/testtask/view/browse.html.php
+11 -7
View File
@@ -48,12 +48,18 @@ $status = $this->session->testTaskVersionStatus;
<div class="btn-toolbar pull-right"><?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?></div>
</div>
<?php endif;?>
<?php if($scope == 'local' && $status == 'totalStatus' && empty($tasks)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span> <?php common::printLink('testtask', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<div id='mainContent' class='main-table'>
<?php if(empty($tasks)):?>
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
<?php if(common::hasPriv('testtask', 'create')):?>
<span class="text-muted"><?php echo $lang->youCould;?></span>
<?php echo html::a($this->createLink('testtask', 'create', "product=$productID"), "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
<?php else:?>
<table class='table has-sort-head' id='taskList'>
<thead>
<?php $vars = "productID=$productID&branch=$branch&type=$scope,$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -109,10 +115,8 @@ $status = $this->session->testTaskVersionStatus;
<?php endforeach;?>
</tbody>
</table>
<?php if($tasks):?>
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<?php endif;?>
<script>$(function(){$('#<?php echo $status?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>
<?php include '../../common/view/footer.html.php';?>
module/todo/lang/zh-cn.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->todo->common = '待办';
$lang->todo->index = "待办一览";
$lang->todo->create = "新增";
$lang->todo->create = "添加待办";
$lang->todo->createCycle = "创建周期待办";
$lang->todo->assignTo = "指派给";
$lang->todo->activate = "激活";
module/todo/lang/zh-tw.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
$lang->todo->common = '待辦';
$lang->todo->index = "待辦一覽";
$lang->todo->create = "新增";
$lang->todo->create = "添加待辦";
$lang->todo->createCycle = "創建周期待辦";
$lang->todo->assignTo = "指派給";
$lang->todo->activate = "激活";