From b66c5ec7fa6330ee6a10fd9870a59ce6f0c43755 Mon Sep 17 00:00:00 2001 From: chenfei Date: Tue, 19 Mar 2019 17:23:35 +0800 Subject: [PATCH] * Finish task #5330. --- module/block/view/productblock.html.php | 4 ++-- module/block/view/projectblock.html.php | 3 ++- module/block/view/projectstatisticblock.html.php | 2 +- module/my/view/changepassword.html.php | 3 ++- module/product/css/view.css | 2 +- module/product/view/view.html.php | 2 +- module/project/css/view.css | 1 + module/task/lang/en.php | 12 ++++++------ module/task/lang/zh-cn.php | 6 +++--- module/user/css/common.css | 1 + module/user/view/create.html.php | 3 ++- module/user/view/edit.html.php | 6 ++++-- 12 files changed, 26 insertions(+), 19 deletions(-) diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index d5a78aae97..6ce0ddb0c1 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -26,8 +26,8 @@ product->plans;?> product->releases;?> - story->statusList['active'] . $lang->story->common;?> - bug->unResolved . $lang->bug->common;?> + story->statusList['active'] . $lang->story->common;?> + bug->unResolved . $lang->bug->common;?> diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 7fabb89df7..bb1fbfdac5 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -20,8 +20,9 @@ project->name;?> project->end;?> + isINT) and $config->isINT) ? 'w-85px' : 'c-hours';?> statusAB;?> - project->totalEstimate;?> + project->totalEstimate;?> project->totalConsumed;?> project->totalLeft;?> diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 12e641f075..964229cf31 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -9,7 +9,7 @@ .types-line > li > div > span {display: block; color: #CBD0DB; font-size: 16px;} .product-info {position: relative; height: 65px;} .product-info + .product-info {margin-top: 10px;} -.product-info .progress {position: absolute; left: 10px; top: 35px; right: 90px;} +.product-info .progress {position: absolute; left: 10px; top: 35px; right: 100px;} .product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;} .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;} html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 130px;} diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index 826237c017..e1d63097a1 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -22,8 +22,9 @@
+ isINT) and $config->isINT) ? 'w-130px' : 'w-90px';?> - + diff --git a/module/product/css/view.css b/module/product/css/view.css index b318347e90..c4ae1ded18 100644 --- a/module/product/css/view.css +++ b/module/product/css/view.css @@ -1,6 +1,6 @@ .branch-list {padding-left: 0; margin: 0;} .branch-list > li {float: left; list-style: none; width: 50%; margin: 5px 0;} -.data-basic.table-data tbody > tr > th {width: 80px;} +.data-basic.table-data tbody > tr > th {width: 100px;} .block-release .panel-body, .block-dynamic .panel-body {height: 240px; overflow-x: hidden; overflow-y: auto; position: relative;} .block-release .panel-body {padding-bottom: 50px;} .block-release .panel-body > .btn.pull-right {position: absolute; right: 20px; bottom: 20px;} diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 6cfa0493e1..980eb64ea0 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -134,7 +134,7 @@
user->account;?>user->account;?> account . html::hidden('account',$user->account);?>
- + diff --git a/module/project/css/view.css b/module/project/css/view.css index 771b0e9847..d89617d1cc 100644 --- a/module/project/css/view.css +++ b/module/project/css/view.css @@ -8,3 +8,4 @@ #burnLegend > div.line-real:before {background: #006AF1;} .block-dynamic .panel-body {height: 230px; overflow: auto; position: relative;} +.block-team div.col-xs-6{white-space: nowrap; overflow: hidden;} diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 634c99fd49..4f9f5a52d0 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -68,8 +68,8 @@ $lang->task->datePlan = 'Plan'; $lang->task->estStarted = 'Plan Start'; $lang->task->realStarted = 'Actual Start'; $lang->task->date = 'Date'; -$lang->task->deadline = 'Deadline'; -$lang->task->deadlineAB = 'Deadline'; +$lang->task->deadline = 'Plan End'; +$lang->task->deadlineAB = 'Plan End'; $lang->task->status = 'Status'; $lang->task->desc = 'Description'; $lang->task->assign = 'Assign'; @@ -81,10 +81,10 @@ $lang->task->assignedDate = 'Assigned'; $lang->task->openedBy = 'Created by'; $lang->task->openedDate = 'Created'; $lang->task->openedDateAB = 'Add'; -$lang->task->finishedBy = 'Finished by'; -$lang->task->finishedByAB = 'Finisher'; -$lang->task->finishedDate = 'Finished'; -$lang->task->finishedDateAB = 'Finished'; +$lang->task->finishedBy = 'End By'; +$lang->task->finishedByAB = 'End By'; +$lang->task->finishedDate = 'Actual End'; +$lang->task->finishedDateAB = 'Actual End'; $lang->task->finishedList = 'FinishedBy list'; $lang->task->canceledBy = 'Cancelled by'; $lang->task->canceledDate = 'Cancelled'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 11efa96048..2945efd2ff 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -68,7 +68,7 @@ $lang->task->datePlan = '日程规划'; $lang->task->estStarted = '预计开始'; $lang->task->realStarted = '实际开始'; $lang->task->date = '日期'; -$lang->task->deadline = '截止日期'; +$lang->task->deadline = '计划完成'; $lang->task->deadlineAB = '截止'; $lang->task->status = '任务状态'; $lang->task->desc = '任务描述'; @@ -83,8 +83,8 @@ $lang->task->openedDate = '创建日期'; $lang->task->openedDateAB = '创建'; $lang->task->finishedBy = '由谁完成'; $lang->task->finishedByAB = '完成者'; -$lang->task->finishedDate = '完成时间'; -$lang->task->finishedDateAB = '完成时间'; +$lang->task->finishedDate = '实际完成'; +$lang->task->finishedDateAB = '实际完成'; $lang->task->finishedList = '完成者列表'; $lang->task->canceledBy = '由谁取消'; $lang->task->canceledDate = '取消时间'; diff --git a/module/user/css/common.css b/module/user/css/common.css index bde3aa6ce5..06906f0413 100644 --- a/module/user/css/common.css +++ b/module/user/css/common.css @@ -2,3 +2,4 @@ #featurebar ul.nav li .chosen-container .chosen-drop {min-width: 200px;!important} #dept_chosen.chosen-container .chosen-drop {min-width: 400px;!important} .w-verifyPassword {width: 120px !important;} +.w-enVerifyPassword {width: 150px !important;} diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 9d9bca6ffd..dbf7057cce 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -23,8 +23,9 @@
productCommon;?> productCommon;?> PO);?> product->qa;?> QD);?>
+ isINT) and $config->isINT) ? 'w-enVerifyPassword' : 'w-verifyPassword';?> - + diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 23f5bb8b7d..e6e354c740 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -48,10 +48,11 @@
user->dept;?>user->dept;?>
+ isINT) and $config->isINT) ? 'w-130px' : 'w-90px';?> - +
user->accountInfo;?>
user->account;?> account, "class='form-control'");?>user->email;?>user->email;?> email, "class='form-control'");?> @@ -93,8 +94,9 @@
+ isINT) and $config->isINT) ? 'w-enVerifyPassword' : 'w-verifyPassword';?> - +
user->verify;?>
user->verifyPassword;?>user->verifyPassword;?>
user->placeholder->verify}'");?>