From fd95328b4dbb13417e5871e5f9aabdba4ac91233 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 21 Feb 2019 08:54:34 +0800
Subject: [PATCH 1/5] * Fix task #5272.

---
 module/story/css/view.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/story/css/view.css b/module/story/css/view.css
index 2d6a840ec0..56744c4ded 100644
--- a/module/story/css/view.css
+++ b/module/story/css/view.css
@@ -1,2 +1,3 @@
 .side-col .cell{padding:0px;}
 .side-col #legendProjectAndTask .list-unstyled{padding:10px; border-top:0px; margin:0px;}
+.col-4 .cell .tab-content .text-top{padding-top: 0px}

From 97dce2aa93fcb5a3073b0add6f7c1a6186ac1fc6 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 21 Feb 2019 09:12:53 +0800
Subject: [PATCH 2/5] * Finish task #5273.

---
 module/story/css/view.css                | 2 +-
 module/task/view/recordestimate.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/css/view.css b/module/story/css/view.css
index 56744c4ded..09f389c1f7 100644
--- a/module/story/css/view.css
+++ b/module/story/css/view.css
@@ -1,3 +1,3 @@
 .side-col .cell{padding:0px;}
 .side-col #legendProjectAndTask .list-unstyled{padding:10px; border-top:0px; margin:0px;}
-.col-4 .cell .tab-content .text-top{padding-top: 0px}
+.col-4 .cell .tab-content .text-top{padding-top: 1px}
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index a263215371..5d28aab526 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -55,7 +55,7 @@
             <td><?php echo $estimate->date;?></td>
             <td><?php echo $estimate->consumed;?></td>
             <td><?php echo $estimate->left;?></td>
-            <td class="text-left"><?php echo $estimate->work;?></td>
+            <td class="text-left" title="<?php echo $estimate->work;?>"><?php echo $estimate->work;?></td>
             <?php if(empty($task->team) or $task->assignedTo == $this->app->user->account):?>
             <td align='center' class='c-actions'>
               <?php

From 22759f3c567abd4d79df75b19d63f3dedec1f31b Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 21 Feb 2019 09:30:59 +0800
Subject: [PATCH 3/5] * Finish task #5280.

---
 module/release/view/browse.html.php | 4 ++--
 module/release/view/view.html.php   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index b8bfd9d52a..a53b283365 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -55,8 +55,8 @@
         <td><?php echo html::a(helper::createLink('release', 'view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td>
           <?php 
-          $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt'></icon> " : '';
-          echo $flagIcon . html::a(inlink('view', "release=$release->id"), $release->name);
+          $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
+          echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
           ?>
         </td>
         <td title='<?php echo $release->buildName?>'><?php echo html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?></td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index c2e019edfe..1f1a711610 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -21,8 +21,9 @@
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $release->id;?></span>
-      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt'></icon> " : '';?>
-      <span class='text' title='<?php echo $release->name;?>'><?php echo $flagIcon . $release->name;?></span>
+      <span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
+      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
+      <?php echo $flagIcon;?>
       <?php if($release->deleted):?>
       <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
       <?php endif; ?>

From fce2b3241bc8af3cadffd5b74b641e6867200f24 Mon Sep 17 00:00:00 2001
From: reneeteng <crystaltoffee@hotmail.com>
Date: Thu, 21 Feb 2019 09:42:41 +0800
Subject: [PATCH 4/5]  * Lang changed.

---
 module/build/lang/en.php    | 2 +-
 module/project/lang/en.php  | 2 +-
 module/testtask/lang/en.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 95ebb2b4b8..5e58d6dbd8 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -37,7 +37,7 @@ $lang->build->builder       = 'Builder';
 $lang->build->scmPath       = 'SCM Path';
 $lang->build->filePath      = 'File Path';
 $lang->build->desc          = 'Description';
-$lang->build->files         = 'Upload Files';
+$lang->build->files         = 'Files';
 $lang->build->last          = 'Last Build';
 $lang->build->packageType   = 'Package Type';
 $lang->build->unlinkStory   = 'Unlink Story';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 7b5dd6e108..2907270007 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -49,7 +49,7 @@ $lang->project->createStory   = "Create Story";
 $lang->project->all           = 'All';
 $lang->project->undone        = 'Unfinished';
 $lang->project->unclosed      = 'Unclosed';
-$lang->project->typeDesc      = 'No story, bug, build, test task or burndown is allowed in OPS';
+$lang->project->typeDesc      = 'No story, bug, build, test or burndown is allowed in OPS';
 $lang->project->mine          = 'Mine: ';
 $lang->project->other         = 'Other:';
 $lang->project->deleted       = 'Deleted';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index da77a08b75..3a4097bcdb 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -143,7 +143,7 @@ $lang->testtask->report->create = 'Generate';
 $lang->testtask->report->charts['testTaskPerRunResult'] = 'Result Report';
 $lang->testtask->report->charts['testTaskPerType']      = 'Type Report';
 $lang->testtask->report->charts['testTaskPerModule']    = 'Module Report';
-$lang->testtask->report->charts['testTaskPerRunner']    = 'Run By Report';
+$lang->testtask->report->charts['testTaskPerRunner']    = 'RunBy Report';
 $lang->testtask->report->charts['bugSeverityGroups']    = 'Bug Severity Distribution';
 $lang->testtask->report->charts['bugStatusGroups']      = 'Bug Status Distribution';
 $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug CreateBy Distribution';

From 79ad5af58ca2f4a355b2eb5e7c732e6828da7412 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 21 Feb 2019 09:58:08 +0800
Subject: [PATCH 5/5] * Finish task #5283.

---
 module/user/css/task.css | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 module/user/css/task.css

diff --git a/module/user/css/task.css b/module/user/css/task.css
new file mode 100644
index 0000000000..8b66169867
--- /dev/null
+++ b/module/user/css/task.css
@@ -0,0 +1 @@
+td.delayed{color:#fff; background: #e84e0f!important;}