From 401123654c27e3610a6783a28d1997d465fb017c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 27 Sep 2018 14:39:29 +0800 Subject: [PATCH] * finish task #4911. --- .../block/view/productstatisticblock.html.php | 18 ++++++------- .../block/view/projectstatisticblock.html.php | 26 +++++++++---------- module/block/view/qastatisticblock.html.php | 22 ++++++++-------- module/productplan/lang/en.php | 1 + module/productplan/lang/zh-cn.php | 1 + www/theme/default/style.css | 4 +-- 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index a1a07a1b10..b32a129b19 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -41,7 +41,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, .block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px;} .block-statistic.block-sm .panel-body > .table-row, @@ -142,12 +142,12 @@ $(function()
- - + + - - + +
productplan->featureBar['browse']['unexpired'];?> :productplan->all;?> :
story->planAB;?> :productplan->featureBar['browse']['unexpired'];?> :
@@ -176,12 +176,12 @@ $(function()
- - + + - - + +
project->statusList['doing'];?> :project->allProjects;?> :
projectCommon;?> :project->statusList['doing'];?> :
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 71b9570172..901fe8b855 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -28,7 +28,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, .block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px;} .block-statistic.block-sm .panel-body > .table-row, @@ -121,14 +121,14 @@ $(function()
- - - - + + + +
task->noFinished;?> :undoneTasks;?>
task->allTasks;?> : totalTasks;?>
task->noFinished;?> :undoneTasks;?>
@@ -141,14 +141,14 @@ $(function()
- - - - + + + +
story->unclosed;?> :unclosedStories;?>
story->total;?> : totalStories;?>
story->unclosed;?> :unclosedStories;?>
@@ -163,12 +163,12 @@ $(function()
- - + + - - + +
bug->unResolved;?> :activeBugs;?>bug->allBugs . ' Bug';?> :totalBugs;?>
bug->allBugs;?> :totalBugs;?>bug->unResolved;?> :activeBugs;?>
diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php index 75d50aa01e..84014989da 100644 --- a/module/block/view/qastatisticblock.html.php +++ b/module/block/view/qastatisticblock.html.php @@ -77,6 +77,17 @@ $(function()
+
+ +
@@ -157,16 +168,5 @@ $(function()
-
- -
diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 491aa09b94..49e31e6c8f 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -34,6 +34,7 @@ $lang->productplan->batchUnlinkBug = "Batch Unlink Bug"; $lang->productplan->linkedBugs = 'Linked Bug'; $lang->productplan->unlinkedBugs = 'Unlinked'; $lang->productplan->unexpired = 'Unexpired Plan'; +$lang->productplan->all = 'All Plan'; $lang->productplan->confirmDelete = "Do you want to delete this Plan?"; $lang->productplan->confirmUnlinkStory = "Do you want to unlink this Story?"; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 561bf5dd28..37f4c71a20 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -34,6 +34,7 @@ $lang->productplan->batchUnlinkBug = "批量移除Bug"; $lang->productplan->linkedBugs = 'Bug'; $lang->productplan->unlinkedBugs = '未关联Bug'; $lang->productplan->unexpired = '未过期计划'; +$lang->productplan->all = '所有计划'; $lang->productplan->confirmDelete = "您确认删除该计划吗？"; $lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？"; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 62eaf9b8e1..2565fbfe50 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -9,8 +9,8 @@ * @link http://www.zentao.net */ -.c-assignedTo.has-btn .icon-hand-right{font-size:14px;width:20px;height:20px;line-height:25px;} -.c-assignedTo.has-btn .btn-icon-left.btn-sm {padding-left: 20px;} +.c-assignedTo.has-btn .icon-hand-right{font-size:14px;width:20px;height:20px;line-height:21px;} +.c-assignedTo.has-btn .btn-icon-left.btn-sm {padding-left: 20px;line-height:16px;} .table thead>tr>th.c-assign, .table thead>tr>th.c-assignedTo {padding-left: 27px;} /* 取消历史记录的缩进,与标题对齐*/