* changed ui of search form.

This commit is contained in:
Catouse
2014-03-18 17:21:15 +08:00
parent 1c6aaba942
commit d4e07814e8
7 changed files with 137 additions and 123 deletions
+2 -4
View File
@@ -314,16 +314,14 @@ class common extends control
}
if($type == 'button')
{
echo "<span class='link-button'>";
if($method != 'edit' and $method != 'copy' and $method != 'delete')
{
echo html::a($link, "<i class='$class'></i> " . $title, $target, "class='$extraClass'", true);
echo html::a($link, "<i class='$class'></i> " . $title, $target, "class='btn $extraClass'", true);
}
else
{
echo html::a($link, "<i class='$class'></i>", $target, "class='link-icon $extraClass' title='$title'", false);
echo html::a($link, "<i class='$class'></i>", $target, "class='btn $extraClass' title='$title'", false);
}
echo "</span>";
}
else
{
+2 -1
View File
@@ -1,4 +1,4 @@
.panel-block {height: 207px;overflow: auto; padding: 0}
.panel-block {height: 208px;overflow: auto; padding: 0}
.panel-block.dynamic {height: 435px;}
.panel-block .panel-heading {padding: 6px 10px; margin: 0;}
.panel-block .panel-actions {line-height: 36px; margin-right: -5px;}
@@ -9,3 +9,4 @@
.panel-block td .progressbar {display: inline-block; height: 16px; background: #229F24;}
.panel-block .icon {color: #666; display: inline-block; margin-right: 2px;}
#wrap .outer {padding: 20px 20px 0}
.outer .panel-block .table tbody > tr:last-child td {border-bottom: none}
+34 -33
View File
@@ -12,45 +12,46 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/treeview.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<?php include '../../common/view/dropmenu.html.php';?>
<?php js::set('browseType', $browseType);?>
<div id='featurebar'>
<div class='f-left'>
<span id='allstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=allStory"), $lang->product->allStory);?></span>
<span id='assignedtomeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=assignedtome"), $lang->product->assignedToMe);?></span>
<span id='openedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=openedByMe"), $lang->product->openedByMe);?></span>
<span id='reviewedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=reviewedByMe"), $lang->product->reviewedByMe);?></span>
<span id='closedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=closedByMe"), $lang->product->closedByMe);?></span>
<span id='draftstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=draftStory"), $lang->product->draftStory);?></span>
<span id='activestoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=activeStory"), $lang->product->activeStory);?></span>
<span id='changedstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=changedStory"), $lang->product->changedStory);?></span>
<span id='closedstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=closedStory"), $lang->product->closedStory);?></span>
<span id='bysearchTab' ><a href='#' class='link-icon'><i class='icon-search icon'></i>&nbsp;<?php echo $lang->product->searchStory;?></a></span>
</div>
<div class='f-right'>
<nav class='nav'>
<li id='allstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=allStory"), $lang->product->allStory);?></li>
<li id='assignedtomeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=assignedtome"), $lang->product->assignedToMe);?></li>
<li id='openedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=openedByMe"), $lang->product->openedByMe);?></li>
<li id='reviewedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=reviewedByMe"), $lang->product->reviewedByMe);?></li>
<li id='closedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=closedByMe"), $lang->product->closedByMe);?></li>
<li id='draftstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=draftStory"), $lang->product->draftStory);?></li>
<li id='activestoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=activeStory"), $lang->product->activeStory);?></li>
<li id='changedstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=changedStory"), $lang->product->changedStory);?></li>
<li id='closedstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=closedStory"), $lang->product->closedStory);?></li>
<li id='bysearchTab'><a href='javascript:;'><i class='icon-search icon'></i> <?php echo $lang->product->searchStory;?></a></li>
</nav>
<div class='actions'>
<div class='btn-group'>
<div class="btn-group">
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='icon-download-alt'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='exportActionMenu'>
<?php
$misc = common::hasPriv('story', 'export') ? "class='export'" : "class=disabled";
$link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy") : '#';
echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
?>
</ul>
</div>
<?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
</div>
<div class='btn-group'>
<?php
echo '<span class="link-button dropButton">';
echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick='toggleSubMenu(this.id,\"bottom\",0)' title='{$lang->export}'");
echo '</span>';
common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID");
common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID");
common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'button', 'plus-sign');
common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID", '', 'button', 'plus');
?>
</div>
</div>
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<div id='exportActionMenu' class='listMenu hidden'>
<ul>
<?php
$misc = common::hasPriv('story', 'export') ? "class='export'" : "class=disabled";
$link = common::hasPriv('story', 'export') ? $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy") : '#';
echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
?>
</ul>
</div>
<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
<div class='treeSlider' id='storyTree'><span>&nbsp;</span></div>
<form method='post' id='productStoryForm'>
<table class='cont-lt1'>
+64 -56
View File
@@ -13,14 +13,20 @@
<?php include '../../common/view/alert.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<style>
.helplink {display:none}
.button-s, .button-r, .button-c {padding:3px}
.select-1 {width:80%}
.text-2{margin-bottom:2px; width:123px}
.select-2{margin-bottom:2px}
#searchform input.date{width:110px}
</style>
<script language='Javascript'>
var dtOptions =
{
language: '<?php echo $this->app->getClientLang();?>',
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
minView: 2,
forceParse: 0,
format: 'yyyy-mm-dd'
};
$(function() {
$('.date').each(function(){
@@ -33,10 +39,7 @@ $(function() {
$('.date').val(time);
}
});
startDate = new Date(1970, 1, 1);
$(".date").datePicker({createButton:true, startDate:startDate, displayDynamic:true})
.dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_RIGHT)
$(".date").datetimepicker(dtOptions);
});
var params = <?php echo json_encode($fieldParams);?>;
@@ -61,7 +64,7 @@ function setField(fieldName, fieldNO)
if(typeof(params[fieldName]['class']) != undefined && params[fieldName]['class'] == 'date')
{
$("#value" + fieldNO).datePicker({createButton:true, startDate:startDate, displayDynamic:true})
$("#value" + fieldNO).datetimepicker(dtOptions);
$("#value" + fieldNO).addClass('date'); // Shortcut the width of the datepicker to make sure align with others.
var groupItems = <?php echo $config->search->groupItems?>;
var maxNO = 2 * groupItems;
@@ -73,7 +76,7 @@ function setField(fieldName, fieldNO)
$('#operator' + nextNO).val('<=');
$('#valueBox' + nextNO).html($('#box' + fieldName).children().clone());
$('#valueBox' + nextNO).children().attr({name : 'value' + nextNO, id : 'value' + nextNO});
$("#value" + nextNO).datePicker({createButton:true, startDate:startDate, displayDynamic:true});
$("#value" + nextNO).datetimepicker(dtOptions);
$("#value" + nextNO).addClass('date');
}
}
@@ -187,18 +190,17 @@ function deleteQuery()
foreach($fieldParams as $fieldName => $param)
{
echo "<span id='box$fieldName'>";
if($param['control'] == 'select') echo html::select($fieldName, $param['values'], '', "class='select-2 searchSelect'");
if($param['control'] == 'input') echo html::input($fieldName, '', "class='text-2 searchInput'");
if($param['control'] == 'select') echo html::select($fieldName, $param['values'], '', "class='form-control searchSelect'");
if($param['control'] == 'input') echo html::input($fieldName, '', "class='form-control searchInput'");
echo '</span>';
}
?>
</div>
<form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='searchform'>
<table class='table-1'>
<tr valign='middle'>
<th width='50'><i class="icon icon-search icon-large"></i></th>
<td class='a-right'>
<nobr>
<form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='searchform' class='form-condensed'>
<table class='table table-condensed table-form'>
<tr>
<td>
<table class='table'>
<?php
$formSessionName = $module . 'Form';
$formSession = $this->session->$formSessionName;
@@ -206,102 +208,108 @@ foreach($fieldParams as $fieldName => $param)
$fieldNO = 1;
for($i = 1; $i <= $groupItems; $i ++)
{
$spanClass = $i == 1 ? 'inline' : 'hidden';
echo "<div><span id='searchbox$fieldNO' class='$spanClass'>";
$spanClass = $i == 1 ? '' : 'hidden';
echo "<tr id='searchbox$fieldNO' class='$spanClass'>";
/* Get params of current field. */
$currentField = $formSession["field$fieldNO"];
$param = $fieldParams[$currentField];
/* Print and or. */
echo "<td class='text-right w-60px'>";
if($i == 1) echo "<span id='searchgroup1'><strong>{$lang->search->group1}</strong></span>" . html::hidden("andOr$fieldNO", 'AND');
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"], "class='form-control'");
echo '</td>';
/* Print field. */
echo html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)'");
echo "<td class='w-100px'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)' class='form-control'") . '</td>';
/* Print operator. */
echo html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"]);
echo "<td class='w-70px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
/* Print value. */
echo "<span id='valueBox$fieldNO'>";
if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='select-2 searchSelect'");
echo "<td id='valueBox$fieldNO'>";
if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect'");
if($param['control'] == 'input')
{
$fieldName = $formSession["field$fieldNO"];
$extraClass = isset($param['class']) ? $param['class'] : '';
echo html::input("value$fieldNO", $formSession["value$fieldNO"], "class='text-2 $extraClass searchInput'");
echo html::input("value$fieldNO", $formSession["value$fieldNO"], "class='form-control $extraClass searchInput'");
}
echo '</span>';
echo '</td>';
$fieldNO ++;
echo '</span></div>';
echo '</tr>';
}
?>
</nobr>
</table>
</td>
<td class='a-center' width='60'><nobr><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'])?></nobr></td>
<td class='a-right'>
<nobr>
<td class='text-center nobr'><?php echo html::select('groupAndOr', $lang->search->andor, $formSession['groupAndOr'], "class='form-control w-60px'")?></td>
<td>
<table class='table'>
<?php
for($i = 1; $i <= $groupItems; $i ++)
{
$spanClass = $i == 1 ? 'inline' : 'hidden';
echo "<div><span id='searchbox$fieldNO' class='$spanClass'>";
$spanClass = $i == 1 ? '' : 'hidden';
echo "<tr id='searchbox$fieldNO' class='$spanClass'>";
/* Get params of current field. */
$currentField = $formSession["field$fieldNO"];
$param = $fieldParams[$currentField];
/* Print and or. */
echo "<td class='text-right w-60px'>";
if($i == 1) echo "<span id='searchgroup2'><strong>{$lang->search->group2}</strong></span>" . html::hidden("andOr$fieldNO", 'AND');
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"], "class='form-control'");
echo '</td>';
/* Print field. */
echo html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)'");
echo "<td class='w-100px'>" . html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)' class='form-control'") . '</td>';
/* Print operator. */
echo html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"]);
echo "<td class='w-70px'>" . html::select("operator$fieldNO", $lang->search->operators, $formSession["operator$fieldNO"], "class='form-control'") . '</td>';
/* Print value. */
echo "<span id='valueBox$fieldNO'>";
if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='select-2 searchSelect'");
echo "<td id='valueBox$fieldNO'>";
if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], "class='form-control searchSelect'");
if($param['control'] == 'input')
{
$fieldName = $formSession["field$fieldNO"];
$extraClass = isset($param['class']) ? $param['class'] : '';
echo html::input("value$fieldNO", $formSession["value$fieldNO"], "class='text-2 $extraClass searchInput'");
echo html::input("value$fieldNO", $formSession["value$fieldNO"], "class='form-control $extraClass searchInput'");
}
echo '</span>';
echo '</td>';
$fieldNO ++;
echo '</span></div>';
echo '</tr>';
}
?>
</nobr>
</table>
</td>
<td width='150'>
<nobr>
<td class='w-180px'>
<?php
echo html::hidden('module', $module);
echo html::hidden('actionURL', $actionURL);
echo html::hidden('groupItems', $groupItems);
echo html::submitButton($lang->search->common);
echo html::commonButton($lang->search->reset, 'onclick=resetForm();');
echo html::commonButton($lang->save, 'onclick=saveQuery()');
echo "<div class='btn-group'>";
echo html::submitButton("<i class='icon-search'></i> " . $lang->search->common, '', 'btn-primary');
echo html::commonButton($lang->search->reset, 'onclick=resetForm(); class=btn');
echo html::commonButton($lang->save, 'onclick=saveQuery() class=btn');
echo '</div>';
?>
</nobr>
</td>
<td width='180'>
<td class='w-120px'>
<div class='input-group'>
<?php
echo html::select('queryID', $queries, $queryID, 'class=select-1 onchange=executeQuery(this.value)');
if(common::hasPriv('search', 'deleteQuery')) echo html::a('javascript:deleteQuery()', '<i class="link-icon icon-remove"></i>', '', '');
echo html::select('queryID', $queries, $queryID, 'onchange=executeQuery(this.value) class=form-control');
if(common::hasPriv('search', 'deleteQuery')) echo "<span class='input-group-btn'>" . html::a('javascript:deleteQuery()', '<i class="icon-remove"></i>', '', 'class=btn') . '</span>';
?>
</div>
</td>
<th width='50' class='a-center' style='cursor:pointer; padding:0'>
<a id="searchmore" href="javascript:showmore()"><i class="icon-double-angle-down icon-2x link-icon"></i></a>
<a id="searchlite" href="javascript:showlite()" class="hidden"><i class="icon-double-angle-up icon-2x link-icon"></i></a>
<a id="searchmore" href="javascript:showmore()"><i class="icon-double-angle-down icon-2x"></i></a>
<a id="searchlite" href="javascript:showlite()" class="hidden"><i class="icon-double-angle-up icon-2x"></i></a>
<?php echo html::hidden('formType', 'lite');?>
</th>
</tr>
+5 -4
View File
File diff suppressed because one or more lines are too long
+5 -6
View File
@@ -495,7 +495,7 @@ function setRepoLink()
/* Set the colorbox of export. */
function setExport()
{
if($('.export').size()) $(".export").colorbox({width:650, height:240, iframe:true, transition:'none', scrolling:true});
// if($('.export').size()) $(".export").colorbox({width:650, height:240, iframe:true, transition:'none', scrolling:true});
}
/**
@@ -578,7 +578,6 @@ function toggleSearch()
if(browseType == 'bymodule')
{
$('#treebox').addClass('hidden');
$('.divider').addClass('hidden');
$('#bymoduleTab').removeClass('active');
}
else
@@ -587,14 +586,13 @@ function toggleSearch()
}
$('#bysearchTab').addClass('active');
ajaxGetSearchForm();
$('#querybox').removeClass('hidden');
$('#querybox').addClass('show');
},
function()
{
if(browseType == 'bymodule')
{
$('#treebox').removeClass('hidden');
$('.divider').removeClass('hidden');
$('#bymoduleTab').addClass('active');
}
else
@@ -602,7 +600,7 @@ function toggleSearch()
$('#' + browseType +'Tab').addClass('active');
}
$('#bysearchTab').removeClass('active');
$('#querybox').addClass('hidden');
$('#querybox').removeClass('show');
}
);
}
@@ -617,7 +615,8 @@ function ajaxGetSearchForm()
{
if($('#querybox').html() == '')
{
$.get(createLink('search', 'buildForm'), function(data){
$.get(createLink('search', 'buildForm'), function(data)
{
$('#querybox').html(data);
});
}
+25 -19
View File
@@ -12,7 +12,7 @@
/* Width definitions */
.w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%}
.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px}
.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px}
.w-id {width:60px;} .w-pri {width:30px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px}
@@ -55,6 +55,8 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ
.link-icon:hover{color:#000;text-shadow:1px 1px 3px rgba(0,0,0,0.25);}
i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{font-size: 14px}
i.icon-2x[class^="icon-"], i.icon-2x[class*=" icon-"], .link-icon i.icon-2x[class^="icon-"], .link-icon i.icon-2x[class*=" icon-"] {font-size: 2em}
.icon-green-testcase-import:before,.icon-gray-testcase-import:before,
.icon-green-common-import:before,.icon-gray-common-import:before{content: "\f019";}
.icon-green-common-exportTemplet:before,.icon-gray-common-exportTemplet:before{content: "\f093";}
@@ -187,6 +189,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.table-form td > .row > [class*="col-"] {padding-right: 0;line-height: 34px}
.table-form td .checkbox {margin: 0}
.table-form td .btn + .btn {margin-left: 8px;}
.table-form td .btn-group .btn + .btn {margin-left: -1px;}
/* Table data */
.table-data th, .table-data td {padding: 5px;}
@@ -196,7 +199,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.form-condensed .table-form {margin-bottom: 0;}
.form-condensed .table-form td, .form-condensed .table-form th {padding: 5px; font-size: 12px;}
.form-condensed .table-form td + td, .form-condensed .table-form th + th {padding-left: 5%;}
.form-condensed fieldset {background-color: #eee; padding: 2px 15px 2px 5px; margin-bottom: 10px; margin-top: 35px; border-radius: 6px; position: relative;}
.form-condensed fieldset {background-color: #eee; padding: 2px 15px 2px 5px; margin-bottom: 10px; margin-top: 35px; border-radius: 2px; position: relative;}
.form-condensed fieldset.fieldset-primary {background-color: transparent; padding: 0; margin-top: 0;}
.form-condensed fieldset .table-form {margin-bottom: 0;}
.form-condensed fieldset.collapsed {padding: 1px;}
@@ -325,8 +328,10 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#featurebar .nav > li.active > a, #featurebar .nav > li.active > a:hover, #featurebar .nav > li.active > a:active, #featurebar .nav > li.active > a:focus {font-weight: bold; color: #333}
#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900}
#featurebar .btn-group {margin-right: 5px;}
#featurebar .btn-group > .btn-group {margin-right: 0;}
#featurebar .btn {padding: 4px 12px}
#featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8}
#featurebar .actions {float: right; margin-top: -2px;}
/* table in outer */
.outer .table .btn-icon {margin-left: -2px}
@@ -346,6 +351,24 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group {float: left; margin-right: 10px}
.outer .table tfoot .pager {margin: 0;}
/* Querybox */
#querybox {margin: 35px -10px -7px; background-color: #fff; height: 0; transition: all 1s; border-top: 1px solid #ddd; position: relative; z-index: 199; overflow: hidden; display: none; padding: 10px}
#querybox.show {display: block; height: auto}
#bysearchTab {transition: all 0.3s;}
#bysearchTab.active {background: #fff; padding: 2px 10px 3px; border: 1px solid #ddd; border-bottom: none}
#bysearchTab.active:hover {background: #f1f1f1}
#bysearchTab.active > a:after {font-size: 14px; font-family: ZenIcon; content: ' \e6e2'; color: #808080}
#featurebar .nav {z-index: 999; position: relative;}
#querybox .form-control {padding: 2px;}
#querybox .table-form td {border: none}
#querybox .btn {padding: 5px 8px;}
#querybox .table-form td td {padding: 2px;}
#querybox .table .table {margin: 0;}
.outer #querybox .table tr > th:first-child, .outer #querybox .table tr > td:first-child,
.outer #querybox .table tr > th:last-child, .outer #querybox .table tr > td:last-child,
.outer #querybox .table tbody > tr:last-child td {padding: 2px}
#querybox a:hover {text-decoration: none;}
/* Container in outer */
.outer .container {padding: 20px;}
.outer .container .table-form, .outer .container .table-data {margin-top: 10px;}
@@ -464,23 +487,6 @@ td>select{padding-left: 0;padding-right: 0}
.navbar li>a:hover {color:#ff3600;}
/*-----------------------SPECIAL PART SETTING--------------------*/
/* Querybox */
#querybox{margin: -20px -20px 20px -20px;background-color: #ffc;}
#querybox table{border: none;border-bottom: 1px solid #e5e5e5;}
#querybox td{vertical-align: middle;}
#querybox select,#querybox input[type="text"]{min-width: 95px;max-width: 140px;}
#querybox input[type="text"]{min-width: 80px;width: 130px;}
#querybox select[name='value1'],#querybox select[name='value2'],#querybox select[name='value3'],#querybox select[name='value4'],#querybox select[name='value5'],#querybox select[name='value6']{min-width: 80px;width: 140px}
#querybox .button-c,#querybox .button-s{width: auto;min-width: 42px; margin-right:5px;}
#querybox select[name='operator6'],#querybox select[name='operator5'], #querybox select[name='operator4'],#querybox select[name='operator3'], #querybox select[name='operator2'],#querybox select[name='operator1'], #querybox select[name='groupAndOr'],#querybox select[name='andOr1'],#querybox select[name='andOr2'],#querybox select[name='andOr3'],#querybox select[name='andOr4'],#querybox select[name='andOr5'],#querybox select[name='andOr6']{width: 65px;min-width: 65px;}
#querybox select[name='field4'],#querybox select[name='field3'],#querybox select[name='field5'],#querybox select[name='field6'],
#querybox select[name='field2'],#querybox select[name='field1']{width: 95px;}
#querybox select[name='queryID']{width:90%;}
@media(max-width:1220px)
{
#querybox input[type="text"],#querybox select[name='value3'],#querybox select[name='value5']{min-width: 70px;width: 70px;}
}
/* Tree slider. */
.treeSlider{position:absolute;background-color: #bbb;background-repeat: repeat-x;border: 1px solid #bbb;border-left:none;cursor: pointer;width: 8px;height: 50px;left: 20px;border-radius:0px 10px 10px 0px}
.treeSlider span {position:absolute;top:40%;left:2px;border-bottom: 4px solid transparent;border-top: 4px solid transparent;border-right: 4px solid #000000;border-left: 0 none;height: 0;width: 0;}