Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
daitingting
@@ -1,5 +1,5 @@
|
||||
#todoBatchAddHeader {padding-bottom: 12px;}
|
||||
#todoBatchAddHeader .input-group {width: 220px; position: relative; top: -3px; left: 15px;}
|
||||
#todoBatchAddHeader .input-group {width: 230px; position: relative; top: -3px; left: 15px;}
|
||||
#todoBatchAddForm .col-id {width: 50px; text-align: center; color: #838A9D}
|
||||
#todoBatchAddForm .col-type {width: 120px;}
|
||||
#todoBatchAddForm .col-pri {width: 90px;}
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
#mainContent{margin: 0px auto;}
|
||||
#mainContent .actions{float: right;}
|
||||
@@ -13,48 +13,57 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='assignedToTab'>" . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
echo "<li id='openedByTab'>" . html::a(inlink('bug', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
echo "<li id='resolvedByTab'>" . html::a(inlink('bug', "account=$account&type=resolvedBy"), $lang->user->resolvedBy) . "</li>";
|
||||
echo "<li id='closedByTab'>" . html::a(inlink('bug', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th class='w-type'><?php echo $lang->typeAB;?></th>
|
||||
<th><?php echo $lang->bug->title;?></th>
|
||||
<th class='w-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
|
||||
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($bugs as $bug):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
|
||||
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
|
||||
<td><?php echo $lang->bug->typeList[$bug->type]?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
|
||||
<td><?php echo $users[$bug->openedBy];?></td>
|
||||
<td><?php echo $users[$bug->resolvedBy];?></td>
|
||||
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($bugs):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
$active = $type == 'assignedTo' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
|
||||
$active = $type == 'openedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
|
||||
$active = $type == 'resolvedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=resolvedBy"), $lang->user->resolvedBy) . "</li>";
|
||||
|
||||
$active = $type == 'closedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-lg'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th class='w-type'><?php echo $lang->typeAB;?></th>
|
||||
<th><?php echo $lang->bug->title;?></th>
|
||||
<th class='w-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
|
||||
<th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($bugs as $bug):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
|
||||
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
|
||||
<td><?php echo $lang->bug->typeList[$bug->type]?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
|
||||
<td><?php echo $users[$bug->openedBy];?></td>
|
||||
<td><?php echo $users[$bug->resolvedBy];?></td>
|
||||
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($bugs):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -13,8 +13,9 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div id="mainMenu" class="clearfix">
|
||||
<div class="btn-toolbar pull-left">
|
||||
<?php js::set('period', $type);?>
|
||||
<div id='mainContent'>
|
||||
<div id='contentNav'>
|
||||
<?php foreach($lang->action->periods as $period => $label):?>
|
||||
<?php
|
||||
$label = "<span class='text'>$label</span>";
|
||||
@@ -28,9 +29,8 @@
|
||||
?>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
</div>
|
||||
<div id="mainContent" class="main-content">
|
||||
<div id="dynamics">
|
||||
|
||||
<div id="dynamics" class='main-content'>
|
||||
<?php $firstAction = '';?>
|
||||
<?php foreach($dateGroups as $date => $actions):?>
|
||||
<?php $isToday = date(DT_DATE4) == $date;?>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<?php
|
||||
$date = isset($date) ? $date : helper::today();
|
||||
|
||||
echo "<div class='input-control space w-150px'>" . $userList . "</div>";
|
||||
echo "<div class='input-control w-150px'>" . $userList . "</div>";
|
||||
|
||||
$methodName = $this->app->getMethodName();
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
echo html::a($this->createLink('user', 'bug', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
|
||||
$label = "<span class='text'>{$lang->user->test}</span>";
|
||||
$active = $methodName == 'testtask' ? ' btn-active-text' : '';
|
||||
$active = ($methodName == 'testtask' or $methodName == 'testcase')? ' btn-active-text' : '';
|
||||
echo html::a($this->createLink('user', 'testtask', "account=$account"), $label, '', "class='btn btn-link $active'");
|
||||
}
|
||||
|
||||
|
||||
@@ -13,15 +13,16 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='main-header'>
|
||||
<h2>
|
||||
<span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']);?> <strong><?php echo $user->id;?></strong></span>
|
||||
<strong><?php echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
|
||||
<small class='text-muted'> <?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?></small>
|
||||
</h2>
|
||||
<div class='actions'>
|
||||
<?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
|
||||
<div id='mainContent' class='main-content mw-600px'>
|
||||
<div class='main-header'>
|
||||
<h2>
|
||||
<span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']);?></span>
|
||||
<strong><?php echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
|
||||
<?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?>
|
||||
</h2>
|
||||
<div class='actions'>
|
||||
<?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class='table table-borderless table-data'>
|
||||
|
||||
@@ -14,40 +14,42 @@
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-100px'><?php echo $lang->project->code;?></th>
|
||||
<th class="text-left"><?php echo $lang->project->name;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->begin;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->end;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->team->role;?></th>
|
||||
<th class='w-date'><?php echo $lang->team->join;?></th>
|
||||
<th class='w-110px'><?php echo $lang->team->hours;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($projects as $project):?>
|
||||
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($projectLink, $project->id);?></td>
|
||||
<td><?php echo $project->code;?></td>
|
||||
<td class="text-left"><?php echo html::a($projectLink, $project->name);?></td>
|
||||
<td><?php echo $project->begin;?></td>
|
||||
<td><?php echo $project->end;?></td>
|
||||
<?php if(isset($project->delay)):?>
|
||||
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
|
||||
<?php else:?>
|
||||
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
|
||||
<?php endif;?>
|
||||
<td><?php echo $project->role;?></td>
|
||||
<td><?php echo $project->join;?></td>
|
||||
<td><?php echo $project->hours;?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-100px'><?php echo $lang->project->code;?></th>
|
||||
<th class="text-left"><?php echo $lang->project->name;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->begin;?></th>
|
||||
<th class='w-date'><?php echo $lang->project->end;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-user'><?php echo $lang->team->role;?></th>
|
||||
<th class='w-date'><?php echo $lang->team->join;?></th>
|
||||
<th class='w-110px'><?php echo $lang->team->hours;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($projects as $project):?>
|
||||
<?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($projectLink, $project->id);?></td>
|
||||
<td><?php echo $project->code;?></td>
|
||||
<td class="text-left"><?php echo html::a($projectLink, $project->name);?></td>
|
||||
<td><?php echo $project->begin;?></td>
|
||||
<td><?php echo $project->end;?></td>
|
||||
<?php if(isset($project->delay)):?>
|
||||
<td class='project-delay'><?php echo $lang->project->delayed;?></td>
|
||||
<?php else:?>
|
||||
<td class='project-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
|
||||
<?php endif;?>
|
||||
<td><?php echo $project->role;?></td>
|
||||
<td><?php echo $project->join;?></td>
|
||||
<td><?php echo $project->hours;?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -13,51 +13,60 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='assignedToTab'>" . html::a(inlink('story', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
echo "<li id='openedByTab'>" . html::a(inlink('story', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
echo "<li id='reviewedByTab'>" . html::a(inlink('story', "account=$account&type=reviewedBy"), $lang->user->reviewedBy) . "</li>";
|
||||
echo "<li id='closedByTab'>" . html::a(inlink('story', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'> <?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'> <?php echo $lang->priAB;?></th>
|
||||
<th class='w-200px'> <?php echo $lang->story->product;?></th>
|
||||
<th> <?php echo $lang->story->title;?></th>
|
||||
<th class='w-150px'> <?php echo $lang->story->plan;?></th>
|
||||
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-hour'> <?php echo $lang->story->estimateAB;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($stories as $key => $story):?>
|
||||
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
|
||||
<td><?php echo $story->productTitle;?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
|
||||
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
|
||||
<td><?php echo $users[$story->openedBy];?></td>
|
||||
<td><?php echo $story->estimate;?></td>
|
||||
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
|
||||
<td><?php echo $lang->story->stageList[$story->stage];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($stories):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
$active = $type == 'assignedTo' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
|
||||
$active = $type == 'openedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
|
||||
$active = $type == 'reviewedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=reviewedBy"), $lang->user->reviewedBy) . "</li>";
|
||||
|
||||
$active = $type == 'closedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-lg'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'> <?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'> <?php echo $lang->priAB;?></th>
|
||||
<th class='w-200px'> <?php echo $lang->story->product;?></th>
|
||||
<th> <?php echo $lang->story->title;?></th>
|
||||
<th class='w-150px'> <?php echo $lang->story->plan;?></th>
|
||||
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-hour'> <?php echo $lang->story->estimateAB;?></th>
|
||||
<th class='w-status'><?php echo $lang->statusAB;?></th>
|
||||
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($stories as $key => $story):?>
|
||||
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
|
||||
<td><?php echo $story->productTitle;?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
|
||||
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
|
||||
<td><?php echo $users[$story->openedBy];?></td>
|
||||
<td><?php echo $story->estimate;?></td>
|
||||
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
|
||||
<td><?php echo $lang->story->stageList[$story->stage];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($stories):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
<div>
|
||||
</div>
|
||||
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -13,51 +13,62 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='assignedToTab'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
echo "<li id='openedByTab'>" . html::a(inlink('task', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
echo "<li id='finishedByTab'>" . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy) . "</li>";
|
||||
echo "<li id='closedByTab'>" . html::a(inlink('task', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
echo "<li id='canceledByTab'>" . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed' id='tasktable'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th><?php echo $lang->task->project;?></th>
|
||||
<th><?php echo $lang->task->name;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
|
||||
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->statusAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td><?php echo $task->estimate;?></td>
|
||||
<td><?php echo $task->consumed;?></td>
|
||||
<td><?php echo $task->left;?></td>
|
||||
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
|
||||
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
$active = $type == 'assignedTo' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
|
||||
|
||||
$active = $type == 'openedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=openedBy"), $lang->user->openedBy) . "</li>";
|
||||
|
||||
$active = $type == 'finishedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy) . "</li>";
|
||||
|
||||
$active = $type == 'closedBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=closedBy"), $lang->user->closedBy) . "</li>";
|
||||
|
||||
$active = $type == 'canceledBy' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-lg' id='tasktable'>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<th class='w-id'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-pri'><?php echo $lang->priAB;?></th>
|
||||
<th><?php echo $lang->task->project;?></th>
|
||||
<th><?php echo $lang->task->name;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
|
||||
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
|
||||
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->statusAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
|
||||
<td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td><?php echo $task->estimate;?></td>
|
||||
<td><?php echo $task->consumed;?></td>
|
||||
<td><?php echo $task->left;?></td>
|
||||
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
|
||||
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -12,51 +12,59 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='testtaskTab'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "</li>";
|
||||
echo "<li id='case2HimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "</li>";
|
||||
echo "<li id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='mainContent'>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
echo "<li id='testtaskTab'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "</li>";
|
||||
|
||||
$active = $type == 'case2Him' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "</li>";
|
||||
$active = $type == 'caseByHim' ? 'active' : '';
|
||||
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<table class='table tablesorter table-fixed'>
|
||||
<?php
|
||||
$vars = "account=$account&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
|
||||
$this->app->loadLang('testtask');
|
||||
?>
|
||||
<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> <?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='w-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='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($cases as $case):?>
|
||||
<?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
|
||||
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
|
||||
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
|
||||
<td><?php echo $users[$case->openedBy];?></td>
|
||||
<td><?php echo $users[$case->lastRunner];?></td>
|
||||
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
|
||||
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
|
||||
<td class='<?php echo $case->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
<tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
|
||||
</table>
|
||||
<script language="Javascript">$("#testTab").addClass('active'); $("#<?php echo $type;?>Tab").addClass('active'); </script>
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-lg'>
|
||||
<?php
|
||||
$vars = "account=$account&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
|
||||
$this->app->loadLang('testtask');
|
||||
?>
|
||||
<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> <?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='w-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='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($cases as $case):?>
|
||||
<?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
|
||||
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
|
||||
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
|
||||
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
|
||||
<td><?php echo $users[$case->openedBy];?></td>
|
||||
<td><?php echo $users[$case->lastRunner];?></td>
|
||||
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
|
||||
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
|
||||
<td class='<?php echo $case->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($cases):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -12,46 +12,48 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
echo "<li id='testtaskTab'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "</li>";
|
||||
echo "<li id='case2HimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "</li>";
|
||||
echo "<li id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id='mainContent'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<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->project);?></th>
|
||||
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
|
||||
<th class='w-50px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td class='nobr'><?php echo $task->projectName?></td>
|
||||
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
|
||||
<td><?php echo $task->begin?></td>
|
||||
<td><?php echo $task->end?></td>
|
||||
<td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
echo "<li class='active'>" . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "</li>";
|
||||
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "</li>";
|
||||
echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<div class='main-table'>
|
||||
<table class='table has-sort-head table-lg'>
|
||||
<?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
|
||||
<thead>
|
||||
<tr class='colhead'>
|
||||
<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->project);?></th>
|
||||
<th> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
|
||||
<th class='w-80px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
|
||||
<th class='w-50px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($tasks as $task):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
|
||||
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
|
||||
<td class='nobr'><?php echo $task->projectName?></td>
|
||||
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
|
||||
<td><?php echo $task->begin?></td>
|
||||
<td><?php echo $task->end?></td>
|
||||
<td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
</tbody>
|
||||
</table>
|
||||
<?php if($tasks):?>
|
||||
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<script language="Javascript">$("#testTab").addClass('active'); $("#testtaskTab").addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -13,23 +13,26 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include "../../common/view/datepicker.html.php"; ?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<script language='Javascript'>var account='<?php echo $account;?>'</script>
|
||||
<div class='sub-featurebar'>
|
||||
<ul class='nav'>
|
||||
<?php
|
||||
foreach($lang->todo->periods as $period => $label)
|
||||
{
|
||||
$vars = "account={$account}&date=$period";
|
||||
if($period == 'before') $vars .= "&status=undone";
|
||||
echo "<li id='$period'>" . html::a(inlink('todo', $vars), $label) . '</li> ';
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php js::set('account', $account);?>
|
||||
<?php js::set('type', $type);?>
|
||||
<div id='mainContent'>
|
||||
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform' class='main-table table-task'>
|
||||
<nav id='contentNav'>
|
||||
<ul class='nav nav-default'>
|
||||
<?php
|
||||
foreach($lang->todo->periods as $period => $label)
|
||||
{
|
||||
$active = $type == $period ? 'active' : '';
|
||||
$vars = "account={$account}&date=$period";
|
||||
if($period == 'before') $vars .= "&status=undone";
|
||||
echo "<li id='$period' class='$active'>" . html::a(inlink('todo', $vars), $label) . '</li> ';
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' data-ride='table' id='todoform' class='main-table table-todo'>
|
||||
<table class='table has-sort-head table-fixed'>
|
||||
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
|
||||
<?php $vars = "account=$account&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>
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user