From c383da7a8c695d7b2beaba9aca8af75774ceb3a6 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Mon, 15 Jul 2019 17:07:26 +0800
Subject: [PATCH] * finish task #6097,#6103,#6108,#6100

---
 module/admin/lang/en.php          | 2 +-
 module/bug/view/report.html.php   | 2 +-
 module/story/view/report.html.php | 2 +-
 module/task/lang/en.php           | 2 +-
 module/task/view/report.html.php  | 2 +-
 module/testcase/config.php        | 2 +-
 module/testcase/model.php         | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index da52a328d2..f14dd5fb21 100644
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -78,5 +78,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as DOB';
 $lang->admin->safe->modifyPasswordList[1] = 'Yes';
 $lang->admin->safe->modifyPasswordList[0] = 'No';
 
-$lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added and edited.';
+$lang->admin->safe->noticeMode   = 'Password will be checked when a user logs in, or a user is added or edited.';
 $lang->admin->safe->noticeStrong = '';
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 986ef3513f..3091214018 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -46,7 +46,7 @@
         <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type} muted'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
       </div>
-      <div class='text-muted'><?php echo str_replace('%tab%', $lang->bug->unclosed . $lang->bug->common, $lang->report->notice->help);?></div>
+      <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->bug->unclosed . $lang->bug->common, $lang->report->notice->help);?></div>
       <?php foreach($charts as $chartType => $chartOption):?>
       <div class='table-row chart-row'>
         <div class='main-col'>
diff --git a/module/story/view/report.html.php b/module/story/view/report.html.php
index 7216187a9d..5ff6b7e69c 100644
--- a/module/story/view/report.html.php
+++ b/module/story/view/report.html.php
@@ -47,7 +47,7 @@
         <?php echo html::a("javascript:changeChartType(\"$type\")", "<i class='icon icon-chart-{$type} muted'> </i>" . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
       </div>
-      <div class='text-muted'><?php echo str_replace('%tab%', $lang->product->unclosed . $lang->story->common, $lang->report->notice->help);?></div>
+      <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->product->unclosed . $lang->story->common, $lang->report->notice->help);?></div>
       <?php foreach($charts as $chartType => $chartOption):?>
       <div class='table-row chart-row'>
         <div class='main-col'>
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index c49af1ab61..85edb74a29 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -113,7 +113,7 @@ $lang->task->deleteEstimate    = 'Delete Estimates';
 $lang->task->colorTag          = 'Color';
 $lang->task->files             = 'Files';
 $lang->task->hasConsumed       = 'Already Cost';
-$lang->task->multiple          = 'Multiple User Task';
+$lang->task->multiple          = 'Multiple Users';
 $lang->task->multipleAB        = 'M';
 $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php
index 9fecc6d21d..a7e82fb174 100644
--- a/module/task/view/report.html.php
+++ b/module/task/view/report.html.php
@@ -46,7 +46,7 @@
         <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type} muted'></i> ") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
       </div>
-      <div class='text-muted'><?php echo str_replace('%tab%', $lang->project->unclosed . $lang->task->common, $lang->report->notice->help);?></div>
+      <div class='text-muted' style='padding-top:5px'><?php echo str_replace('%tab%', $lang->project->unclosed . $lang->task->common, $lang->report->notice->help);?></div>
       <?php foreach($charts as $chartType => $chartOption):?>
       <div class='table-row chart-row'>
         <div class='main-col'>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 5a2462e0f6..6476099a22 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -158,7 +158,7 @@ $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['status']['title']    = 'statusAB';
 $config->testcase->datatable->fieldList['status']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['status']['width']    = '70';
+$config->testcase->datatable->fieldList['status']['width']    = '90';
 $config->testcase->datatable->fieldList['status']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index ef809d029f..14a4786891 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1397,11 +1397,11 @@ class testcaseModel extends model
             case 'status':
                 if($case->needconfirm) 
                 {
-                    print("<span class='status-story status-changed' title='{$this->lang->testcase->fromTesttask}'>{$this->lang->story->changed}</span>");
+                    print("<span class='status-story status-changed' title='{$this->lang->story->changed}'>{$this->lang->story->changed}</span>");
                 }
                 elseif(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and !$case->needconfirm)
                 {
-                    print("<span class='status-story status-changed' title='{$this->lang->testcase->fromCaselib}'>{$this->lang->testcase->changed}</span>");
+                    print("<span class='status-story status-changed' title='{$this->lang->testcase->changed}'>{$this->lang->testcase->changed}</span>");
                 }
                 else
                 {