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

* improve UI of build/view.

Browse Source
This commit is contained in:
Catouse
2018-05-29 15:26:41 +08:00
parent 311bff018a
commit 4fe06dfde8
9 changed files with 78 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/css/common.css
-7
View File
@@ -1,7 +0,0 @@
.contentDiv { height:190px; overflow-y:auto; margin-bottom: 10px!important}
.contentDiv .panel-heading {line-height: 14px;}
.green {color:green}
input[type=checkbox].ml-10px{margin-left:10px;}
.pdl-8px{padding-left:8px;}
.input-group > .input-group-addon.fix-padding{padding: 0;}
module/build/css/view.css
+3 -9
View File
@@ -1,9 +1,3 @@
#unlinkStoryList, #unlinkBugList{border:1px solid #ddd;}
.table-footer .text {line-height: 30px;}
.table-footer .table-actions {margin-right: 10px;}
#buildInfo > div {padding-top: 15px;}
#querybox form {margin: 0px !important;}
#moreOrLite {right: 0px !important;}
.linkBox #searchForm .form-actions {padding-bottom: 5px;}
.linkBox .table-header {padding: 8px 15px; border-bottom: 1px solid #cbd0db;}
#unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;}
module/build/js/view.js
+5 -7
View File
@@ -3,13 +3,11 @@ function showLink(buildID, type, param)
var method = type == 'story' ? 'linkStory' : 'linkBug';
$.get(createLink('build', method, 'buildID=' + buildID + (typeof(param) == 'undefined' ? '' : param)), function(data)
{
var obj = type == 'story' ? '.tab-pane#stories .linkBox' : '.tab-pane#bugs .linkBox';
$(obj).html(data);
$('#' + type + 'List').closest('form').hide();
var formID = type == 'story' ? '#unlinkedStoriesForm' : '#unlinkedBugsForm';
$('[data-ride="table"]').table();
var $pane = $(type == 'story' ? '#stories' : '#bugs');
$pane.find('.main-table').hide();
var $linkBox = $pane.find('.linkBox').html(data).removeClass('hidden');
$linkBox.find('[data-ride="table"]').table();
$.toggleQueryBox(true, $linkBox.find('#queryBox'));
});
}
$(function()
module/build/view/linkbug.html.php
+8 -11
View File
@@ -13,8 +13,8 @@
<div id='queryBox' class='show'></div>
<div id='unlinkBugList'>
<form class='main-table table-bug' data-ride='table' method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkBug', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<div class='table-header'>
<div class='table-statistic'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></div>
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
</div>
<table class='table'>
<thead>
@@ -61,17 +61,14 @@
<?php if($unlinkedCount):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<div class="table-actions btn-toolbar show-always">
<?php echo html::submitButton($lang->build->linkBug, '', 'btn');?>
</div>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'");?>
<div class="btn-toolbar">
<?php echo html::a(inlink('view', "buildID={$build->id}&type=bug"), $lang->goback, '', "class='btn'");?>
</div>
<div class='table-statistic'></div>
</div>
<?php endif;?>
</form>
</div>
<script>
$(function()
{
// ajaxGetSearchForm('#bugs .linkBox #querybox');
})
</script>
</div>
module/build/view/linkstory.html.php
+8 -11
View File
@@ -13,8 +13,8 @@
<div id='queryBox' class='show'></div>
<div id='unlinkStoryList'>
<form class='main-table table-story' data-ride='table' method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkStory', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
<div class='table-header'>
<div class='table-statistic'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></div>
<div class='table-header hl-primary text-primary strong'>
<?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
</div>
<table class='table'>
<thead>
@@ -65,17 +65,14 @@
<?php if($unlinkedCount):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php echo html::submitButton($lang->build->linkStory, '', 'btn');?>
<div class="table-actions btn-toolbar show-always">
<?php echo html::submitButton($lang->build->linkStory, '', 'btn btn-secondary');?>
</div>
<?php echo html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->goback, '', "class='btn'");?>
<div class="btn-toolbar">
<?php echo html::a(inlink('view', "buildID={$build->id}&type=story"), $lang->goback, '', "class='btn'");?>
</div>
<div class='table-statistic'></div>
</div>
<?php endif;?>
</form>
</div>
<script>
$(function()
{
// ajaxGetSearchForm('#stories .linkBox #querybox');
})
</script>
module/build/view/view.html.php
+50 -48
View File
@@ -75,16 +75,16 @@ tbody tr td:first-child input{display:none;}
<div class='tabs' id='tabsNav'>
<?php $countStories = count($stories); $countBugs = count($bugs); $countNewBugs = count($generatedBugs);?>
<ul class='nav nav-tabs'>
<li <?php if($type == 'story') echo "class='active'"?>><a href='#stories' data-toggle='tab'><?php echo html::icon($lang->icons['story'], 'green') . ' ' . $lang->build->stories;?></a></li>
<li <?php if($type == 'bug') echo "class='active'"?>><a href='#bugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'green') . ' ' . $lang->build->bugs;?></a></li>
<li <?php if($type == 'newbug') echo "class='active'"?>><a href='#newBugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'red') . ' ' . $lang->build->generatedBugs;?></a></li>
<li <?php if($type == 'buildInfo') echo "class='active'"?>><a href='#buildInfo' data-toggle='tab'><?php echo html::icon($lang->icons['plan'], 'blue') . ' ' . $lang->build->view;?></a></li>
<li <?php if($type == 'story') echo "class='active'"?>><a href='#stories' data-toggle='tab'><?php echo html::icon($lang->icons['story'], 'text-primary') . ' ' . $lang->build->stories;?></a></li>
<li <?php if($type == 'bug') echo "class='active'"?>><a href='#bugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'text-green') . ' ' . $lang->build->bugs;?></a></li>
<li <?php if($type == 'newbug') echo "class='active'"?>><a href='#newBugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'text-red') . ' ' . $lang->build->generatedBugs;?></a></li>
<li <?php if($type == 'buildInfo') echo "class='active'"?>><a href='#buildInfo' data-toggle='tab'><?php echo html::icon($lang->icons['plan'], 'text-info') . ' ' . $lang->build->view;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane <?php if($type == 'story') echo 'active'?>' id='stories'>
<?php if(common::hasPriv('build', 'linkStory')):?>
<div class='actions'><?php echo html::a("javascript:showLink($build->id, \"story\")", '<i class="icon-link"></i> ' . $lang->build->linkStory, '', "class='btn btn-primary'");?></div>
<div class='linkBox'></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-story' data-ride='table' method='post' target='hiddenwin' action='<?php echo inlink('batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
<table class='table has-sort-head' id='storyList'>
@@ -152,7 +152,7 @@ tbody tr td:first-child input{display:none;}
<?php echo html::submitButton($lang->build->batchUnlink, '', 'btn');?>
</div>
<?php endif;?>
<div class='text'><?php echo sprintf($lang->build->finishStories, $countStories);?></div>
<div class='table-statistic'><?php echo sprintf($lang->build->finishStories, $countStories);?></div>
</div>
<?php endif;?>
</form>
@@ -160,7 +160,7 @@ tbody tr td:first-child input{display:none;}
<div class='tab-pane <?php if($type == 'bug') echo 'active'?>' id='bugs'>
<?php if(common::hasPriv('build', 'linkBug')):?>
<div class='actions'><?php echo html::a("javascript:showLink($build->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->build->linkBug, '', "class='btn btn-primary'");?></div>
<div class='linkBox'></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
<table class='table has-sort-head' id='bugList'>
@@ -233,48 +233,50 @@ tbody tr td:first-child input{display:none;}
</form>
</div>
<div class='tab-pane <?php if($type == 'newbug') echo 'active'?>' id='newBugs'>
<table class='main-table table has-sort-head'>
<?php $vars = "buildID={$build->id}&type=newbug&link=$link&param=$param&orderBy=%s";?>
<thead>
<tr class='text-center'>
<th class='c-id text-left'><?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='text-left'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-100px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-date'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-100px'> <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($generatedBugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='text-left'><?php printf('%03d', $bug->id);?></td>
<td>
<span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
</td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($countNewBugs):?>
<div class='table-footer'>
<div class='text'><?php echo sprintf($lang->build->createdBugs, $countNewBugs);?></div>
<div class='main-table'>
<table class='table has-sort-head'>
<?php $vars = "buildID={$build->id}&type=newbug&link=$link&param=$param&orderBy=%s";?>
<thead>
<tr class='text-center'>
<th class='c-id text-left'><?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='text-left'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-100px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->status);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-date'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->bug->openedDateAB);?></th>
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-100px'> <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
</tr>
</thead>
<tbody class='text-center'>
<?php foreach($generatedBugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr>
<td class='text-left'><?php printf('%03d', $bug->id);?></td>
<td>
<span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
</td>
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo substr($bug->openedDate, 5, 11)?></td>
<td><?php echo $users[$bug->resolvedBy];?></td>
<td><?php echo substr($bug->resolvedDate, 5, 11)?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($countNewBugs):?>
<div class='table-footer'>
<div class='text'><?php echo sprintf($lang->build->createdBugs, $countNewBugs);?></div>
</div>
<?php endif;?>
</div>
<?php endif;?>
</div>
<div class='tab-pane <?php if($type == 'buildInfo') echo 'active'?>' id='buildInfo'>
<div class='cell'>
module/search/view/buildform.html.php
+1 -1
View File
@@ -242,7 +242,7 @@ function executeQuery(queryID)
$(function()
{
var $searchForm = $('#searchForm');
var $searchForm = $('<?php echo "#{$module}-search";?>').closest('form');
$searchForm.find('select.chosen').chosen();
/*
www/js/zui/min.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long