Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #5330.

Browse Source
This commit is contained in:
chenfei
2019-03-19 17:23:35 +08:00
parent 48bb8fea4e
commit b66c5ec7fa
12 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/productblock.html.php
+2 -2
View File
@@ -26,8 +26,8 @@
<?php endif;?>
<th class='c-num'><?php echo $lang->product->plans;?></th>
<th class='c-num'><?php echo $lang->product->releases;?></th>
<th class='c-num'><?php echo $lang->story->statusList['active'] . $lang->story->common;?></th>
<th class='c-num w-90px'><?php echo $lang->bug->unResolved . $lang->bug->common;?></th>
<th class='c-num w-100px'><?php echo $lang->story->statusList['active'] . $lang->story->common;?></th>
<th class='c-num w-120px'><?php echo $lang->bug->unResolved . $lang->bug->common;?></th>
</tr>
</thead>
<tbody>
module/block/view/projectblock.html.php
+2 -1
View File
@@ -20,8 +20,9 @@
<th class='c-name text-left'><?php echo $lang->project->name;?></th>
<th class="c-date"><?php echo $lang->project->end;?></th>
<?php if($longBlock):?>
<?php $thClass = (isset($config->isINT) and $config->isINT) ? 'w-85px' : 'c-hours';?>
<th class="c-status"><?php echo $lang->statusAB;?></th>
<th class="c-hours"><?php echo $lang->project->totalEstimate;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->project->totalEstimate;?></th>
<th class="c-hours"><?php echo $lang->project->totalConsumed;?></th>
<th class="c-hours"><?php echo $lang->project->totalLeft;?></th>
<?php endif;?>
module/block/view/projectstatisticblock.html.php
+1 -1
View File
@@ -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;}
module/my/view/changepassword.html.php
+2 -1
View File
@@ -22,8 +22,9 @@
</div>
<form method='post' target='hiddenwin'>
<table align='center' class='table table-form w-320px'>
<?php $thWidth = (isset($config->isINT) and $config->isINT) ? 'w-130px' : 'w-90px';?>
<tr>
<th class='rowhead w-90px'><?php echo $lang->user->account;?></th>
<th class='rowhead <?php echo $thWidth?>'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account . html::hidden('account',$user->account);?></td>
</tr>
<tr>
module/product/css/view.css
+1 -1
View File
@@ -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;}
module/product/view/view.html.php
+1 -1
View File
@@ -134,7 +134,7 @@
<table class="table table-data">
<tbody>
<tr>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<th class='w-100px'><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<td><em><?php echo zget($users, $product->PO);?></em></td>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->qa;?></th>
<td><em><?php echo zget($users, $product->QD);?></em></td>
module/project/css/view.css
+1
View File
@@ -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;}
module/task/lang/en.php
+6 -6
View File
@@ -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';
module/task/lang/zh-cn.php
+3 -3
View File
@@ -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 = '取消时间';
module/user/css/common.css
+1
View File
@@ -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;}
module/user/view/create.html.php
+2 -1
View File
@@ -23,8 +23,9 @@
</div>
<form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
<table align='center' class="table table-form">
<?php $thClass = (isset($config->isINT) and $config->isINT) ? 'w-enVerifyPassword' : 'w-verifyPassword';?>
<tr>
<th class='w-verifyPassword'><?php echo $lang->user->dept;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->user->dept;?></th>
<td class='w-p40'><?php echo html::select('dept', $depts, $deptID, "class='form-control chosen'");?></td>
</tr>
<tr>
module/user/view/edit.html.php
+4 -2
View File
@@ -48,10 +48,11 @@
</table>
<table align='center' class='table table-form'>
<caption class='text-left text-muted'><?php echo $lang->user->accountInfo;?></caption>
<?php $thClass = (isset($config->isINT) and $config->isINT) ? 'w-130px' : 'w-90px';?>
<tr>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<td class='w-p40'><?php echo html::input('account', $user->account, "class='form-control'");?></td>
<th class='w-90px'><?php echo $lang->user->email;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->user->email;?></th>
<td>
<?php echo html::input('email', $user->email, "class='form-control'");?>
<input type='text' style="display:none"> <!-- Disable input account by browser automatically. -->
@@ -93,8 +94,9 @@
</table>
<table align='center' class='table table-form'>
<caption class='text-left text-muted'><?php echo $lang->user->verify;?></caption>
<?php $thClass = (isset($config->isINT) and $config->isINT) ? 'w-enVerifyPassword' : 'w-verifyPassword';?>
<tr>
<th class='w-verifyPassword'><?php echo $lang->user->verifyPassword;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->user->verifyPassword;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('verifyPassword', '', "class='form-control disabled-ie-placeholder' placeholder='{$lang->user->placeholder->verify}'");?>