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

* refactor views.

Browse Source
This commit is contained in:
Catouse
2018-05-29 16:07:34 +08:00
parent 9c5739bd86
commit f108052b89
12 changed files with 112 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/css/view.css
+1 -1
View File
@@ -1,3 +1,3 @@
.linkBox #searchForm .form-actions {padding-bottom: 5px;}
.linkBox #queryBox .search-form .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
+1
View File
@@ -10,6 +10,7 @@ function showLink(buildID, type, param)
$.toggleQueryBox(true, $linkBox.find('#queryBox'));
});
}
$(function()
{
if(flow != 'onlyTest')
module/productplan/css/view.css
+1 -1
View File
@@ -14,6 +14,6 @@
#planInfo > div {padding-top: 15px;}
.linkBox #searchForm .form-actions {padding-bottom: 5px;}
.linkBox #queryBox .search-form .form-actions {padding-bottom: 5px;}
.linkBox .table-header {padding: 8px 15px; border-bottom: 1px solid #cbd0db;}
#unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;}
module/productplan/js/view.js
+1 -1
View File
@@ -1,4 +1,4 @@
function showLink(buildID, type, param)
function showLink(planID, type, param)
{
var method = type == 'story' ? 'linkStory' : 'linkBug';
$.get(createLink('productplan', method, 'planID=' + planID + (typeof(param) == 'undefined' ? '' : param) + (typeof(orderBy) == 'undefined' ? '' : "&orderBy=" + orderBy)), function(data)
module/project/view/linkstory.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<style>
#searchForm .form-actions {padding-bottom: 10px!important;}
.search-form .form-actions {padding-bottom: 10px!important;}
</style>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
module/release/css/common.css
-4
View File
@@ -1,7 +1,3 @@
.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:7px;}
.pdl-8px{padding-left:8px;}
.checkbox-primary{display:inline-block;}
module/release/css/view.css
+6 -11
View File
@@ -1,15 +1,10 @@
.tabs{position:relative;}
.tabs .nav-tabs>li{margin-bottom:0px;}
.tabs .tab-content .tab-pane #queryBox{margin:0px; border-left:1px solid #ddd; border-right:1px solid #ddd;}
.tabs .tab-content .tab-pane #queryBox form{padding-left:0px;}
.checkbox.btn{margin-top:0px}
#unlinkStoryList, #unlinkBugList, #unlinkLeftBugList{border:1px solid #ddd;}
.table-footer .text {line-height:30px;}
.table-footer .btn-toolbar {margin-right: 10px;}
#releaseInfo > div {padding-top: 15px;}
#queryBox form {margin: 0px !important;}
#moreOrLite {right: 0px !important;}
.linkBox #queryBox .search-form .form-actions {padding-bottom: 5px;}
.linkBox .table-header {padding: 8px 15px; border-bottom: 1px solid #cbd0db;}
#unlinkStoryList, #unlinkBugList, #unlinkLeftBugList {border-top: 1px solid #cbd0db;}
#tabsNav .nav-tabs > li.pull-right {margin-right: 120px; margin-top: -5px}
#tabsNav .nav-tabs > li.active + li.pull-right {margin-right: 0;}
module/release/js/view.js
+6 -7
View File
@@ -5,15 +5,14 @@ function showLink(releaseID, type, param)
if(type == 'leftBug') param += '&type=leftBug';
$.get(createLink('release', method, 'releaseID=' + releaseID + param), function(data)
{
var obj = type == 'story' ? '.tab-pane#stories .linkBox' : (type == 'leftBug' ? '.tab-pane#leftBugs .linkBox' : '.tab-pane#bugs .linkBox');
$(obj).html(data);
$('#' + type + 'List').closest('form').hide();
var formID = type == 'story' ? '#unlinkedStoriesForm' : (type == 'leftBug' ? '#unlinkedLeftBugsForm' : '#unlinkedBugsForm');
$('[data-ride="table"]').table();
var $pane = $(type == 'story' ? '#stories' : (type == 'leftBug' ? '#leftBugs' : '#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()
{
if(link == 'true') showLink(releaseID, type, param);
module/release/view/linkbug.html.php
+6 -9
View File
@@ -17,8 +17,8 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
?>
<div id='<?php echo $type == 'bug' ? 'unlinkBugList' : 'unlinkLeftBugList';?>'>
<form class='main-table' method='post' target='hiddenwin' id='<?php echo $formID?>' action='<?php echo $this->createLink('release', 'linkBug', "releaseID=$release->id&browseType=$browseType&param=$param&type=$type")?>' data-ride='table'>
<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>
@@ -68,13 +68,10 @@ $formID = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
<?php echo html::submitButton($lang->release->linkBug, '', 'btn');?>
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
<div class="btn-toolbar">
<?php echo html::a(inlink('view', "releaseID=$release->id&type=$type"), $lang->goback, '', "class='btn'");?>
</div>
<div class='table-statistic'></div>
</div>
</form>
</div>
<script>
$(function()
{
ajaxGetSearchForm('#<?php echo $type == 'bug' ? 'bugs' : 'leftBugs'?> .linkBox #queryBox')
})
</script>
module/release/view/linkstory.html.php
+7 -10
View File
@@ -13,8 +13,8 @@
<div id='queryBox' class='show'></div>
<div id='unlinkStoryList'>
<form class='main-table' method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>' data-ride='table'>
<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>
@@ -68,13 +68,10 @@
<?php echo html::submitButton($lang->release->linkStory, '', 'btn');?>
</div>
<?php endif;?>
<?php echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");?>
<div class="btn-toolbar">
<?php echo html::a(inlink('view', "releaseID=$release->id&type=story"), $lang->goback, '', "class='btn'");?>
</div>
<div class='table-statistic'></div>
</div>
</form>
</div>
<script>
$(function()
{
ajaxGetSearchForm('#stories .linkBox #queryBox');
})
</script>
</div>
module/release/view/view.html.php
+67 -71
View File
@@ -47,15 +47,15 @@
<div id='mainContent' class='main-content'>
<div class='main-col'>
<div class='main'>
<div class='tabs'>
<div class='tabs' id='tabsNav'>
<?php $countStories = count($stories); $countBugs = count($bugs); $countLeftBugs = count($leftBugs);?>
<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->release->stories;?></a></li>
<li <?php if($type == 'story') echo "class='active'"?>><a href='#stories' data-toggle='tab'><?php echo html::icon($lang->icons['story'], 'text-green') . ' ' . $lang->release->stories;?></a></li>
<?php if($this->config->global->flow != 'onlyStory'):?>
<li <?php if($type == 'bug') echo "class='active'"?>><a href='#bugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'green') . ' ' . $lang->release->bugs;?></a></li>
<li <?php if($type == 'leftBug') echo "class='active'"?>><a href='#leftBugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'red') . ' ' . $lang->release->generatedBugs;?></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->release->bugs;?></a></li>
<li <?php if($type == 'leftBug') echo "class='active'"?>><a href='#leftBugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'text-red') . ' ' . $lang->release->generatedBugs;?></a></li>
<?php endif;?>
<li <?php if($type == 'releaseInfo') echo "class='active'"?>><a href='#releaseInfo' data-toggle='tab'><?php echo html::icon($lang->icons['plan'], 'blue') . ' ' . $lang->release->view;?></a></li>
<li <?php if($type == 'releaseInfo') echo "class='active'"?>><a href='#releaseInfo' data-toggle='tab'><?php echo html::icon($lang->icons['plan'], 'text-info') . ' ' . $lang->release->view;?></a></li>
<?php if($countStories or ($this->config->global->flow != 'onlyStory' and ($countBugs or $countLeftBugs))):?>
<li class='pull-right'><div><?php common::printIcon('release', 'export', '', '', 'button', '', '', "export btn-sm");?></div></li>
<?php endif;?>
@@ -63,8 +63,8 @@
<div class='tab-content'>
<div class='tab-pane <?php if($type == 'story') echo 'active'?>' id='stories'>
<?php if(common::hasPriv('release', 'linkStory')):?>
<div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-sm btn-primary'");?></div>
<div class='linkBox'></div>
<div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-primary'");?></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-story' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkStory', "release=$release->id");?>" id='linkedStoriesForm' data-ride="table">
<table class='table has-sort-head' id='storyList'>
@@ -134,8 +134,8 @@
</div>
<div class='tab-pane <?php if($type == 'bug') echo 'active'?>' id='bugs'>
<?php if(common::hasPriv('release', 'linkBug')):?>
<div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
<div class='linkBox'></div>
<div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id");?>" id='linkedBugsForm' data-ride="table">
<table class='table has-sort-head' id='bugList'>
@@ -205,8 +205,8 @@
</div>
<div class='tab-pane <?php if($type == 'leftBug') echo 'active'?>' id='leftBugs'>
<?php if(common::hasPriv('release', 'linkBug')):?>
<div class='action'><?php echo html::a("javascript:showLink({$release->id}, \"leftBug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-sm btn-primary'");?></div>
<div class='linkBox'></div>
<div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"leftBug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
<div class='linkBox cell hidden'></div>
<?php endif;?>
<form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
<table class='table has-sort-head' id='leftBugList'>
@@ -276,70 +276,66 @@
</div>
<div class='tab-pane <?php if($type == 'releaseInfo') echo 'active'?>' id='releaseInfo'>
<div class="main-row">
<div class="main-col col-8">
<div class='cell'>
<div class='detail'>
<div class='detail-title'><?php echo $lang->release->basicInfo?></div>
<div class='detail-content'>
<table class='table table-data'>
<div class='cell'>
<div class='detail'>
<div class='detail-title'><?php echo $lang->release->basicInfo?></div>
<div class='detail-content'>
<table class='table table-data'>
<tr>
<th class='w-80px'><?php echo $lang->release->product;?></th>
<td><?php echo $release->productName;?></td>
</tr>
<?php if($release->productType != 'normal'):?>
<tr>
<th class='w-80px'><?php echo $lang->release->product;?></th>
<td><?php echo $release->productName;?></td>
<th><?php echo $lang->product->branch;?></th>
<td><?php echo $branchName;?></td>
</tr>
<?php if($release->productType != 'normal'):?>
<tr>
<th><?php echo $lang->product->branch;?></th>
<td><?php echo $branchName;?></td>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->release->name;?></th>
<td><?php echo $release->name;?></td>
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<td title='<?php echo $release->buildName?>'>
<?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
</td>
</tr>
<tr>
<th><?php echo $lang->release->status;?></th>
<td><?php echo $lang->release->statusList[$release->status];?></td>
</tr>
<tr>
<th><?php echo $lang->release->date;?></th>
<td><?php echo $release->date;?></td>
</tr>
<tr>
<th><?php echo $lang->release->desc;?></th>
<td><?php echo $release->desc;?></td>
</tr>
</table>
</div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->files?></div>
<div class='detail-content article-content'>
<?php
if($release->files)
{
echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
}
elseif($release->filePath)
{
echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
}
elseif($release->scmPath)
{
echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
}
?>
</div>
</div>
<?php include '../../common/view/action.html.php';?>
<?php endif;?>
<tr>
<th><?php echo $lang->release->name;?></th>
<td><?php echo $release->name;?></td>
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<td title='<?php echo $release->buildName?>'>
<?php echo ($release->project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
</td>
</tr>
<tr>
<th><?php echo $lang->release->status;?></th>
<td><?php echo $lang->release->statusList[$release->status];?></td>
</tr>
<tr>
<th><?php echo $lang->release->date;?></th>
<td><?php echo $release->date;?></td>
</tr>
<tr>
<th><?php echo $lang->release->desc;?></th>
<td><?php echo $release->desc;?></td>
</tr>
</table>
</div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->files?></div>
<div class='detail-content article-content'>
<?php
if($release->files)
{
echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
}
elseif($release->filePath)
{
echo $lang->release->filePath . html::a($release->filePath, $release->filePath, '_blank');
}
elseif($release->scmPath)
{
echo $lang->release->scmPath . html::a($release->scmPath, $release->scmPath, '_blank');
}
?>
</div>
</div>
<?php include '../../common/view/action.html.php';?>
</div>
</div>
</div>
module/search/view/buildform.html.php
+15 -14
View File
@@ -14,23 +14,24 @@
$jsRoot = $this->app->getWebRoot() . "js/";
include '../../common/view/datepicker.html.php';
include '../../common/view/chosen.html.php';
$formId = 'searchForm-' . uniqid('');
?>
<style>
#selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
#selectPeriod > .dropdown-header {background: #f1f1f1; display: block; text-align: center; padding: 4px 0; line-height: 20px; margin: 5px 10px; font-size: 14px; border-radius: 2px; color: #333; font-size: 12px}
#groupAndOr {display: inline-block;}
#searchForm > table {margin: 0 auto;}
#searchForm > table > tbody > tr > td {padding: 10px 15px; color: #838A9D;}
#searchForm .form-actions {padding-bottom: 20px; padding-top: 0;}
#searchForm .chosen-container[id^="field"] .chosen-drop {min-width: 140px;}
#searchForm [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
#searchForm [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;}
#searchForm .chosen-container .chosen-drop ul.chosen-results li {white-space:normal}
#searchForm input.date::-webkit-input-placeholder {color: #000000; opacity: 1;}
#searchForm input.date::-moz-placeholder {color: #000000; opacity: 1;}
#searchForm input.date:-ms-input-placeholder {color: #000000; opacity: 1;}
#searchForm .btn-expand-form {background: transparent;}
#searchForm .btn-expand-form:hover {background: #e9f2fb;}
#<?php echo $formId;?> > table {margin: 0 auto;}
#<?php echo $formId;?> > table > tbody > tr > td {padding: 10px 15px; color: #838A9D;}
#<?php echo $formId;?> .form-actions {padding-bottom: 20px; padding-top: 0;}
#<?php echo $formId;?> .chosen-container[id^="field"] .chosen-drop {min-width: 140px;}
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;}
#<?php echo $formId;?> .chosen-container .chosen-drop ul.chosen-results li {white-space:normal}
#<?php echo $formId;?> input.date::-webkit-input-placeholder {color: #000000; opacity: 1;}
#<?php echo $formId;?> input.date::-moz-placeholder {color: #000000; opacity: 1;}
#<?php echo $formId;?> input.date:-ms-input-placeholder {color: #000000; opacity: 1;}
#<?php echo $formId;?> .btn-expand-form {background: transparent;}
#<?php echo $formId;?> .btn-expand-form:hover {background: #e9f2fb;}
.showmore .btn-expand-form .icon-chevron-double-down:before {content: '\e959';}
#userQueries {border-left: 1px solid #eee; vertical-align: top;}
@@ -42,7 +43,7 @@ include '../../common/view/chosen.html.php';
#userQueries .label > .icon-close {position: absolute; top: 2px; right: 2px; border-radius: 9px; font-size: 12px; line-height: 18px; width: 18px; display: inline-block;}
#userQueries .label > .icon-close:hover {background-color: #ff5d5d; color: #fff;}
</style>
<form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='searchForm'>
<form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='<?php echo $formId;?>' class='search-form'>
<div class='hidden'>
<?php
/* Print every field as an html object, select or input. Thus when setFiled is called, copy it's html to build the search form. */
@@ -242,7 +243,7 @@ function executeQuery(queryID)
$(function()
{
var $searchForm = $('<?php echo "#{$module}-search";?>').closest('form');
var $searchForm = $('#<?php echo $formId;?>');
$searchForm.find('select.chosen').chosen();
/*