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

* Finish task #41764.

Browse Source
This commit is contained in:
liyuchun
2021-08-30 13:00:53 +08:00
parent d82f45a7df
commit 46f2dc73c3
10 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/css/batchedit.css
+5
View File
@@ -1,3 +1,8 @@
.input-group > .form-control:first-child {border-right: 0;}
div[id*="ends"] .chosen-single {border-left: none;}
.c-id {width: 40px;}
.c-pri {width: 100px;}
.c-status {width: 120px;}
.c-date {width: 300px;}
module/todo/view/batchedit.html.php
+6 -6
View File
@@ -36,14 +36,14 @@
<table class='table table-form'>
<thead>
<tr class='text-center'>
<th class='w-40px'> <?php echo $lang->idAB;?></th>
<th class='w-100px'> <?php echo $lang->todo->date;?></th>
<th class='w-110px'> <?php echo $lang->todo->type;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->todo->pri;?></th>
<th class='c-id'> <?php echo $lang->idAB;?></th>
<th class='c-date'> <?php echo $lang->todo->date;?></th>
<th class='c-type'> <?php echo $lang->todo->type;?></th>
<th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->todo->pri;?></th>
<th><?php echo $lang->todo->name;?></th>
<th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
<th class='w-300px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'status', ' hidden')?>'> <?php echo $lang->todo->status;?></th>
<th class='c-date<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='c-status<?php echo zget($visibleFields, 'status', ' hidden')?>'> <?php echo $lang->todo->status;?></th>
</tr>
</thead>
<tbody>
module/user/css/batchcreate.css
+5
View File
@@ -1,2 +1,7 @@
th.required:after {position: relative; right: 10px;}
td .passwordBox {border-left-width: 0px!important;}
.c-id {width: 40px;}
.c-dept {width: 150px;}
.c-realname {width: 130px;}
.c-role, .c-group, .c-commiter, .c-join, .c-contact {width: 120px;}
module/user/css/common.css
+2
View File
@@ -1,3 +1,5 @@
#featurebar ul.nav li .chosen-container a.chosen-single {background: #F8FAFE; border: none; -webkit-box-shadow: none; box-shadow: none; padding-top: 5px;}
.w-verifyPassword {width: 120px !important;}
.w-enVerifyPassword {width: 150px !important;}
.c-id {width: 70px;}
.c-hours {width: 110px;}
module/user/view/batchcreate.html.php
+17 -17
View File
@@ -45,27 +45,27 @@
<table class="table table-form">
<thead>
<tr class='text-center'>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden') . zget($requiredFields, 'dept', '', ' required');?>'> <?php echo $lang->user->dept;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-dept<?php echo zget($visibleFields, 'dept', ' hidden') . zget($requiredFields, 'dept', '', ' required');?>'> <?php echo $lang->user->dept;?></th>
<th class='accountThWidth required'><?php echo $lang->user->account;?></th>
<th class='w-130px required'><?php echo $lang->user->realname;?></th>
<th class='w-120px<?php echo zget($requiredFields, 'role', '', ' required')?>'><?php echo $lang->user->role;?></th>
<th class='w-120px'><?php echo $lang->user->group;?></th>
<th class='c-realname required'><?php echo $lang->user->realname;?></th>
<th class='c-role<?php echo zget($requiredFields, 'role', '', ' required')?>'><?php echo $lang->user->role;?></th>
<th class='c-group'><?php echo $lang->user->group;?></th>
<th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth) . zget($requiredFields, 'email', '', ' required')?>'><?php echo $lang->user->email;?></th>
<th class='genderThWidth<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
<th class="<?php echo $minWidth;?> required"><?php echo $lang->user->password;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden') . zget($requiredFields, 'commiter', '', ' required')?>'> <?php echo $lang->user->commiter;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'> <?php echo $lang->user->join;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'> <?php echo $lang->user->skype;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'> <?php echo $lang->user->qq;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'dingding', ' hidden')?>'><?php echo $lang->user->dingding;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'weixin', ' hidden')?>'> <?php echo $lang->user->weixin;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'> <?php echo $lang->user->mobile;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'slack', ' hidden')?>'> <?php echo $lang->user->slack;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'whatsapp', ' hidden')?>'><?php echo $lang->user->whatsapp;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'> <?php echo $lang->user->phone;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
<th class='c-commiter<?php echo zget($visibleFields, 'commiter', ' hidden') . zget($requiredFields, 'commiter', '', ' required')?>'> <?php echo $lang->user->commiter;?></th>
<th class='c-join<?php echo zget($visibleFields, 'join', ' hidden')?>'> <?php echo $lang->user->join;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'skype', ' hidden')?>'> <?php echo $lang->user->skype;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'qq', ' hidden')?>'> <?php echo $lang->user->qq;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'dingding', ' hidden')?>'><?php echo $lang->user->dingding;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'weixin', ' hidden')?>'> <?php echo $lang->user->weixin;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'mobile', ' hidden')?>'> <?php echo $lang->user->mobile;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'slack', ' hidden')?>'> <?php echo $lang->user->slack;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'whatsapp', ' hidden')?>'><?php echo $lang->user->whatsapp;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'phone', ' hidden')?>'> <?php echo $lang->user->phone;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
<th class='c-contact<?php echo zget($visibleFields, 'zipcode', ' hidden')?>'> <?php echo $lang->user->zipcode;?></th>
</tr>
</thead>
<tbody>
module/user/view/bug.html.php
+8 -8
View File
@@ -38,14 +38,14 @@
<?php $vars = "userID={$user->id}&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='text-center'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='text-left'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-100px'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-100px'> <?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-severity'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='text-left'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
</tr>
</thead>
<tbody>
module/user/view/execution.html.php
+7 -7
View File
@@ -19,14 +19,14 @@
<?php $vars = "userID={$user->id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class="text-left"><?php common::printOrderLink('name', $orderBy, $vars, $lang->user->name);?></th>
<th class='w-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-user'> <?php echo $lang->team->role;?></th>
<th class='w-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->execution->begin);?></th>
<th class='w-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
<th class='w-date'> <?php echo $lang->team->join;?></th>
<th class='w-110px'> <?php echo $lang->team->hours;?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-user'> <?php echo $lang->team->role;?></th>
<th class='c-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->execution->begin);?></th>
<th class='c-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
<th class='c-date'> <?php echo $lang->team->join;?></th>
<th class='c-hours'> <?php echo $lang->team->hours;?></th>
</tr>
</thead>
<tbody>
module/user/view/testcase.html.php
+6 -6
View File
@@ -34,14 +34,14 @@
?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='w-120px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='c-user'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='c-date'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='c-result'><?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
</tr>
</thead>
module/user/view/testtask.html.php
+7 -7
View File
@@ -27,13 +27,13 @@
<?php $vars = "userID={$user->id}&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->execution);?></th>
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-80px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->execution);?></th>
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='c-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='c-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
</tr>
</thead>
<tbody>
module/user/view/todo.html.php
+8 -8
View File
@@ -18,7 +18,7 @@
<div id='mainContent'>
<nav id='contentNav'>
<ul class='nav nav-default'>
<?php
<?php
foreach($lang->todo->periods as $period => $label)
{
$active = $type == $period ? 'active' : '';
@@ -35,14 +35,14 @@
<?php $vars = "userID={$user->id}&type=$type&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
<th class='w-70px'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='c-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
<th class='c-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->todo->name);?></th>
<th class='w-60px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
<th class='w-hour'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->todo->endAB);?></th>
<th class='w-70px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
<th class='c-date'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
<th class='c-date'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->todo->endAB);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
</tr>
</thead>
<tbody>