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

* Code for task #41764.

Browse Source
This commit is contained in:
liyuchun
2021-08-26 17:59:58 +08:00
parent 89f25d447d
commit d392f0e44c
18 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/view/trash.html.php
+5 -5
View File
@@ -34,12 +34,12 @@
<?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr class='colhead'>
<th class='w-130px'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
<th class='w-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
<th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
<th><?php echo $lang->action->objectName;?></th>
<th class='w-100px'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
<th class='w-150px'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
<th class='w-100px'><?php echo $lang->actions;?></th>
<th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
<th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
<th class='c-actions'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/admin/view/bind.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<tr>
<th><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password', '', "class='form-control'");?></td>
</tr>
</tr>
<tr>
<td colspan='2' class="text-center">
<?php
module/admin/view/checkweak.html.php
+4 -4
View File
@@ -27,11 +27,11 @@
<table class='table table-condensed table-hover table-striped table-fixed'>
<thead>
<th class='c-id-sm text-center'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->user->realname;?></th>
<th class='c-user'><?php echo $lang->user->realname;?></th>
<th><?php echo $lang->user->account;?></th>
<th class='w-150px'><?php echo $lang->user->phone;?></th>
<th class='w-150px'><?php echo $lang->user->mobile;?></th>
<th class='w-200px'><?php echo $lang->admin->safe->reason;?></th>
<th class='c-mobile'><?php echo $lang->user->phone;?></th>
<th class='c-mobile'><?php echo $lang->user->mobile;?></th>
<th class='c-text'><?php echo $lang->admin->safe->reason;?></th>
<th class='c-actions-2'><?php echo $lang->actions;?></th>
</thead>
<tbody>
module/api/css/debug.css
+1
View File
@@ -1,2 +1,3 @@
body {padding-bottom: 0px; background-color: #fff;}
#api p {margin: 5px 0 2px 0;}
.c-name {width: 80px;}
module/api/view/debug.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<table class='table table-form'>
<?php foreach($method->parameters as $param):?>
<tr>
<th class='w-80px'><?php echo $param->name?></th>
<th class='c-name'><?php echo $param->name?></th>
<td><?php echo html::input("$param->name", $param->isOptional() ? $param->getDefaultValue() : '', "class='form-control'")?></td>
</tr>
<?php endforeach;?>
module/block/view/buildblock.html.php
+2 -2
View File
@@ -17,12 +17,12 @@
<table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-builds'>
<thead>
<tr>
<th class='w-id text-center'><?php echo $lang->idAB?></th>
<th class='c-id text-center'><?php echo $lang->idAB?></th>
<?php if($longBlock):?>
<th><?php echo $lang->build->product;?></th>
<?php endif;?>
<th><?php echo $lang->build->name;?></th>
<th class='w-date'><?php echo $lang->build->date;?></th>
<th class='c-date'><?php echo $lang->build->date;?></th>
</tr>
</thead>
<tbody>
module/block/view/executionblock.html.php
+2 -1
View File
@@ -12,6 +12,7 @@
?>
<style>
.table .c-progress {width: 60px;}
.table .c-estimate {width: 85px;}
.c-hours {text-align: right !important;}
</style>
<?php if(empty($executionStats)): ?>
@@ -24,7 +25,7 @@
<th class='c-name text-left'><?php echo $lang->execution->execName;?></th>
<th class="c-date"><?php echo $lang->execution->end;?></th>
<?php if($longBlock):?>
<?php $thClass = common::checkNotCN() ? 'w-85px' : 'c-hours';?>
<?php $thClass = common::checkNotCN() ? 'c-estimate' : 'c-hours';?>
<th class="c-status"><?php echo $lang->statusAB;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->execution->totalEstimate;?></th>
<th class="c-hours"><?php echo $lang->execution->totalConsumed;?></th>
module/block/view/projectblock.html.php
+10 -10
View File
@@ -3,22 +3,22 @@
<?php else:?>
<style>
.block-programs .c-pri {width: 45px;text-align: center;}
.block-programs .c-status {width: 80px;}
.block-programs .c-status, .block-programs .c-user {width: 80px;}
</style>
<div class='panel-body has-table scrollbar-hover'>
<table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-programs <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
<tr>
<th class='c-name w-100px'><?php echo $lang->project->name;?></th>
<th class='w-80px'><?php echo $lang->project->PM;?></th>
<th class='w-60px'><?php echo $lang->project->status;?></th>
<th class='c-name'><?php echo $lang->project->name;?></th>
<th class='c-user'><?php echo $lang->project->PM;?></th>
<th class='c-status'><?php echo $lang->project->status;?></th>
<?php if($longBlock):?>
<th class='w-60px'><?php echo $lang->project->teamCount;?></th>
<th class='w-90px text-right'><?php echo $lang->task->consumed;?></th>
<th class='w-80px text-right'><?php echo $lang->project->budget;?></th>
<th class='w-80px'><?php echo $lang->project->leftStories;?></th>
<th class='w-80px'><?php echo $lang->project->leftTasks;?></th>
<th class='w-80px'><?php echo $lang->project->leftBugs;?></th>
<th class='c-number'><?php echo $lang->project->teamCount;?></th>
<th class='c-number text-right'><?php echo $lang->task->consumed;?></th>
<th class='c-budget text-right'><?php echo $lang->project->budget;?></th>
<th class='c-number'><?php echo $lang->project->leftStories;?></th>
<th class='c-number'><?php echo $lang->project->leftTasks;?></th>
<th class='c-number'><?php echo $lang->project->leftBugs;?></th>
<?php endif;?>
</tr>
</thead>
module/block/view/scrumlistblock.html.php
+5 -2
View File
@@ -10,7 +10,10 @@
* @link http://www.zentao.net
*/
?>
<style>.table .c-progress {width: 60px;}</style>
<style>
.table .c-progress {width: 60px;}
.table .c-estimate {width: 85px;}
</style>
<?php if(empty($executionStats)): ?>
<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
<?php else:?>
@@ -21,7 +24,7 @@
<th class='c-name text-left'><?php echo $lang->execution->name;?></th>
<th class="c-date"><?php echo $lang->execution->end;?></th>
<?php if($longBlock):?>
<?php $thClass = common::checkNotCN() ? 'w-85px' : 'c-hours';?>
<?php $thClass = common::checkNotCN() ? 'c-estimate' : 'c-hours';?>
<th class="c-status"><?php echo $lang->statusAB;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->execution->totalEstimate;?></th>
<th class="c-hours"><?php echo $lang->execution->totalConsumed;?></th>
module/block/view/testtaskblock.html.php
+3 -3
View File
@@ -18,15 +18,15 @@
<thead>
<tr class='text-center'>
<?php if($longBlock):?>
<th class='w-id'><?php echo $lang->idAB?></th>
<th class='c-id'><?php echo $lang->idAB?></th>
<th class='text-left'><?php echo $lang->testtask->product;?></th>
<?php endif;?>
<th class='text-left'><?php echo $lang->testtask->name;?></th>
<?php if($longBlock):?>
<th class='text-left'><?php echo $lang->testtask->execution . '/' . $lang->testtask->build;?></th>
<?php endif;?>
<th class='w-date'><?php echo $lang->testtask->begin;?></th>
<th class='w-date'><?php echo $lang->testtask->end;?></th>
<th class='c-date'><?php echo $lang->testtask->begin;?></th>
<th class='c-date'><?php echo $lang->testtask->end;?></th>
</tr>
</thead>
<tbody>
module/block/view/waterfallissueblock.html.php
+6 -9
View File
@@ -3,9 +3,6 @@
<?php else:?>
<style>
.block-issues .c-id {width: 55px;}
.block-issues .c-pri {width: 45px; text-align: center;}
.block-issues .c-estimate {width: 60px; text-align: right;}
.block-issues .c-deadline {width: 95px;}
.block-issues .c-status {width: 80px;}
.block-issues.block-sm .c-status {text-align: center;}
</style>
@@ -14,15 +11,15 @@
<thead>
<tr>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='w-100px'><?php echo $lang->issue->type;?></th>
<th class='c-status'><?php echo $lang->issue->type;?></th>
<th class='c-name'> <?php echo $lang->issue->title;?></th>
<?php if($longBlock):?>
<th class='w-80px'><?php echo $lang->issue->severity;?></th>
<th class='w-80px'><?php echo $lang->issue->pri;?></th>
<th class='w-80px'><?php echo $lang->issue->owner;?></th>
<th class='w-80px'><?php echo $lang->issue->assignedTo;?></th>
<th class='c-status'><?php echo $lang->issue->severity;?></th>
<th class='c-number'><?php echo $lang->issue->pri;?></th>
<th class='c-user'><?php echo $lang->issue->owner;?></th>
<th class='c-user'><?php echo $lang->issue->assignedTo;?></th>
<?php endif;?>
<th class='w-80px'><?php echo $lang->issue->status;?></th>
<th class='c-status'><?php echo $lang->issue->status;?></th>
</tr>
</thead>
<tbody>
module/block/view/waterfallriskblock.html.php
+11 -9
View File
@@ -2,8 +2,10 @@
<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
<?php else:?>
<style>
.block-risks .c-pri {width: 45px;text-align: center;}
.block-risks .c-status {width: 80px;}
.block-risks .c-id {width: 40px;}
.block-risks .c-pri {width: 70px; text-align: center;}
.block-risks .c-strategy, .block-risks .c-status {width: 60px;}
.block-risks .c-user, .block-risks .c-rate, .block-risks .c-category {width: 80px;}
.pri-low {color: #000000;}
.pri-middle {color: #FF9900;}
.pri-high {color: #E53333;}
@@ -12,17 +14,17 @@
<table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-risks <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
<tr>
<th class='c-id w-50px'><?php echo $lang->idAB;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-name'><?php echo $lang->risk->name;?></th>
<?php if($longBlock):?>
<th class='w-60px'> <?php echo $lang->risk->strategy;?></th>
<th class='c-strategy'> <?php echo $lang->risk->strategy;?></th>
<?php endif;?>
<th class='w-60px'><?php echo $lang->risk->status;?></th>
<th class='c-status'><?php echo $lang->risk->status;?></th>
<?php if($longBlock):?>
<th class='w-80px'><?php echo $lang->risk->rate;?></th>
<th class='w-80px'><?php echo $lang->risk->pri;?></th>
<th class='w-80px'><?php echo $lang->risk->assignedTo;?></th>
<th class='w-80px'><?php echo $lang->risk->category;?></th>
<th class='c-rate'><?php echo $lang->risk->rate;?></th>
<th class='c-pri'><?php echo $lang->risk->pri;?></th>
<th class='c-user'><?php echo $lang->risk->assignedTo;?></th>
<th class='c-category'><?php echo $lang->risk->category;?></th>
<?php endif;?>
</tr>
</thead>
module/install/css/step5.css
+2
View File
@@ -0,0 +1,2 @@
.c-company {width: 80px !important;}
.c-company-value {width: 300px !important;}
module/install/css/step5.en.css
+2
View File
@@ -0,0 +1,2 @@
.c-company {width: 150px !important;}
.c-company-value {width: 350px !important;}
module/repo/control.php
+1 -1
View File
@@ -1162,7 +1162,7 @@ class repo extends control
}
/**
* Ajax load product by repoID.
* Ajax:: Load product by repoID.
*
* @param int $repoID
* @access public
module/webhook/css/common.css
+3
View File
@@ -0,0 +1,3 @@
.c-webhook-action {width: 300px;}
.c-type, .c-result {width: 200px;}
.c-action {width: 100px;}
module/webhook/view/bind.html.php
+2 -2
View File
@@ -16,8 +16,8 @@
if($webhook->type == 'feishuuser') echo $lang->webhook->feishuUserid;
?>
</th>
<th class='w-100px'><?php echo $lang->actions;?></th>
<th class='w-100px'>
<th class='c-action'><?php echo $lang->actions;?></th>
<th class='c-action'>
<?php
if($webhook->type == 'dinguser') echo $lang->webhook->dingBindStatus;
if($webhook->type == 'wechatuser') echo $lang->webhook->wechatBindStatus;
www/theme/default/style.css
+4 -3
View File
@@ -50,10 +50,11 @@ a.showMoreImage:hover {opacity: 1;}
.create-list>li>a>.icon {left: 5px !important;}
.c-icon {width: 20px;}
.c-number {width: 70px;}
.c-company {width: 80px;}
.c-number {width: 80px;}
.c-company, .c-budget {width: 80px;}
.c-status, .c-user, .c-date, .c-encode {width: 100px;}
.c-full-date, .c-text {width: 150px;}
.c-object-type {width: 130px;}
.c-full-date, .c-mobile, .c-text {width: 150px;}
.c-module {width: 180px;}
.c-object {width: 250px;}
.c-case-step {width: 300px;}