* fix UI of views with querybox.

This commit is contained in:
Catouse
2018-05-29 18:28:44 +08:00
parent bd406387b5
commit 6d3b51c826
16 changed files with 31 additions and 58 deletions
+1 -6
View File
@@ -18,9 +18,4 @@ function setModule(obj)
$(this).find("[data-module='" + libModule + "']").find("select[id^='module']").val(moduleID).trigger("chosen:updated");
}
})
}
$(function()
{
ajaxGetSearchForm('#querybox');
});
}
+1 -4
View File
@@ -40,7 +40,7 @@ js::set('branch', $branch);
</div>
</div>
<div class='main-col'>
<div id='queryBox' class='cell'></div>
<div id='queryBox' class='cell<?php if($browseType == 'bysearch') echo ' show';?>'></div>
<form class='main-table table-case' data-ride='table' id='batchForm' method='post'>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
@@ -207,8 +207,5 @@ js::set('branch', $branch);
<script>
$('#module' + moduleID).closest('li').addClass('active');
$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
<?php if($browseType == 'bysearch'):?>
if($('#query li.active').size() == 0) ajaxGetSearchForm();
<?php endif;?>
</script>
<?php include '../../common/view/footer.html.php';?>
+8 -6
View File
@@ -19,9 +19,8 @@
</div>
</div>
</div>
<div id='mainContent' class='main-content'>
<div id='queryBox' class='show'></div>
<hr class='small' />
<div id='queryBox' class='show cell'></div>
<div id='mainContent'>
<form class='main-table' method='post' target='hiddenwin' id='importFromLib' data-ride='table'>
<table class='table has-sort-head table-fixed'>
<thead>
@@ -69,10 +68,13 @@
<?php if($cases):?>
<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->testcase->import, '', 'btn');?>
<div class='table-actions btn-toolbar show-always'>
<?php echo html::submitButton($lang->testcase->import, '', 'btn btn-secondary');?>
</div>
<?php echo html::linkButton($lang->goback, $this->session->caseList);?>
<div class="btn-toolbar">
<?php echo html::linkButton($lang->goback, $this->session->caseList);?>
</div>
<div class='table-statistic'></div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
+10 -11
View File
@@ -11,14 +11,16 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id'><?php echo $case->id;?></span>
<?php echo html::a($this->createLink('case', 'view', 'caseID=' . $case->id), $case->title, '_blank');?>
</h2>
<div id="mainMenu" class="clearfix">
<div class='btn-toolbar pull-left'>
<div class="page-title">
<span class="label label-id"><?php echo $case->id;?></span>
<?php echo html::a($this->createLink('case', 'view', 'caseID=' . $case->id), $case->title, '_blank', 'class="text"');?> <span class='text-muted'><i class="icon-angle-right"></i> <span><?php echo $lang->testcase->linkCases;?></span></span>
</div>
</div>
<div id='queryBox' class='show'></div>
</div>
<div id='queryBox' class='cell show'></div>
<div id='mainContent'>
<?php if($cases2Link):?>
<form class='main-table' method='post' target='hiddenwin' id='linkCasesForm' data-ride='table'>
<table class='table' id='caseList'>
@@ -60,13 +62,10 @@
</table>
<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();?></div>
<div class='table-actions btn-toolbar show-always'><?php echo html::submitButton('', '', 'btn btn-secondary');?></div>
<?php echo html::hidden('case', $case->id);?>
</div>
</form>
<?php endif;?>
</div>
<script>
$(function(){ajaxGetSearchForm();});
</script>
<?php include '../../common/view/footer.html.php';?>