diff --git a/module/build/lang/de.php b/module/build/lang/de.php index 6824f36f71..0d168ba3ef 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -34,7 +34,8 @@ $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; $lang->build->integrated = 'Integrated'; -$lang->build->builds = 'Included Builds'; +$lang->build->singled = 'Singled'; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Name'; $lang->build->date = 'Datum'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 3226572594..7d237e7e84 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -34,7 +34,8 @@ $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; $lang->build->integrated = 'Integrated'; -$lang->build->builds = 'Included Builds'; +$lang->build->singled = 'Singled'; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Name'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index 337100021f..430399b34f 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -34,7 +34,8 @@ $lang->build->branch = 'Plateforme/Branche'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; $lang->build->integrated = 'Integrated'; -$lang->build->builds = 'Included Builds'; +$lang->build->singled = 'Singled'; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Nom'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index f30f0e799e..a0676bb343 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -34,7 +34,8 @@ $lang->build->branch = '平台/分支'; $lang->build->branchName = '所属%s'; $lang->build->execution = '所属' . $lang->executionCommon; $lang->build->integrated = '集成版本'; -$lang->build->builds = '包含版本'; +$lang->build->singled = '单一版本'; +$lang->build->builds = '关联版本'; $lang->build->name = '名称编号'; $lang->build->date = '打包日期'; $lang->build->builder = '构建者'; diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 9808ff7235..d35af0abcc 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -74,7 +74,7 @@ model == 'scrum' ? 'sprint' : $project->model; - echo html::a($this->createLink('project', 'index', 'project=' . $project->id), " " . $project->name, '', "title='{$project->name} ({$lang->project->{$project->model}})'"); + echo html::a($this->createLink('project', 'index', 'project=' . $project->id), " " . $project->name, '', "title='$project->name'"); ?> diff --git a/module/project/lang/de.php b/module/project/lang/de.php index a182ebdc32..e09b2f5b08 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); -$lang->project->projectTypeList[1] = 'Has Product'; -$lang->project->projectTypeList[0] = 'No Product'; +$lang->project->projectTypeList[1] = 'Product-based'; +$lang->project->projectTypeList[0] = 'Non-product-based'; /* Project Kanban. */ $lang->project->typeList = array(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 5cd6e93171..bd8aea81c6 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); -$lang->project->projectTypeList[1] = 'Has Product'; -$lang->project->projectTypeList[0] = 'No Product'; +$lang->project->projectTypeList[1] = 'Product-based'; +$lang->project->projectTypeList[0] = 'Non-product-based'; /* Project Kanban. */ $lang->project->typeList = array(); diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 3d38aae8b8..2ee664d94a 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); -$lang->project->projectTypeList[1] = 'Has Product'; -$lang->project->projectTypeList[0] = 'No Product'; +$lang->project->projectTypeList[1] = 'Product-based'; +$lang->project->projectTypeList[0] = 'Non-product-based'; /* Project Kanban. */ $lang->project->typeList = array(); diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php index fc890c98cb..e6b35cab56 100644 --- a/module/project/lang/vi.php +++ b/module/project/lang/vi.php @@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban'; /* Project Kanban. */ $lang->project->projectTypeList = array(); -$lang->project->projectTypeList[1] = 'Has Product'; -$lang->project->projectTypeList[0] = 'No Product'; +$lang->project->projectTypeList[1] = 'Product-based'; +$lang->project->projectTypeList[0] = 'Non-product-based'; /* Project Kanban. */ $lang->project->typeList = array(); diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 817fbd1a37..59a4bef32c 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -71,6 +71,7 @@ id"), sprintf('%03d', $build->id), '', "data-app='project'");?> + execution ? $lang->build->singled : $lang->build->integrated;?> branchName) echo "{$build->branchName}"?> createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");?> diff --git a/module/testcase/control.php b/module/testcase/control.php index 749640f8c0..ecc80170e9 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -321,7 +321,6 @@ class testcase extends control if($this->app->tab == 'project') { $this->loadModel('project')->setMenu($this->session->project); - $this->app->rawModule = 'qa'; $products = $this->product->getProducts($this->session->project, 'all', '', false); $productID = $this->product->saveState($productID, $products); $this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID); diff --git a/module/testcase/js/zerocase.js b/module/testcase/js/zerocase.js index 618b5d612c..249058dd35 100644 --- a/module/testcase/js/zerocase.js +++ b/module/testcase/js/zerocase.js @@ -1,4 +1,5 @@ $(document).ready(function() { $('#zerocaseTab').addClass('btn-active-text'); + $('.pager').attr('data-app', tab); }); diff --git a/module/testcase/view/zerocase.html.php b/module/testcase/view/zerocase.html.php index 18279dadad..58c552e04f 100644 --- a/module/testcase/view/zerocase.html.php +++ b/module/testcase/view/zerocase.html.php @@ -13,6 +13,7 @@ +tab);?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 3688826f8f..b845dd1cdc 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -189,7 +189,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;} .label-pri, .label-selector > .label {color: #9EA3B0; border-color: #9EA3B0;} -.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FF4912; border-color: #FF4912;} +.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FB2B2B; border-color: #FB2B2B;} .label-pri-2, .label-selector > .label-pri[data-value="2"] {color: #F38F19; border-color: #F38F19;} .label-pri-3, .label-selector > .label-pri[data-value="3"] {color: #37B2FE; border-color: #37B2FE;} .label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}