* adjust search buildform.

This commit is contained in:
wyd621
2013-10-31 04:09:54 +00:00
parent 682563e41c
commit d67982d351
2 changed files with 16 additions and 17 deletions
+10 -10
View File
@@ -18,7 +18,7 @@
.select-1 {width:80%}
.text-2{margin-bottom:2px; width:123px}
.select-2{margin-bottom:2px}
.date{width:104px}
#searchform input.date{width:110px}
</style>
<script language='Javascript'>
@@ -187,7 +187,7 @@ 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'] == 'select') echo html::select($fieldName, $param['values'], '', "class='select-2 searchSelect'");
if($param['control'] == 'input') echo html::input($fieldName, '', "class='text-2 searchInput'");
echo '</span>';
}
@@ -207,7 +207,7 @@ foreach($fieldParams as $fieldName => $param)
for($i = 1; $i <= $groupItems; $i ++)
{
$spanClass = $i == 1 ? 'inline' : 'hidden';
echo "<span id='searchbox$fieldNO' class='$spanClass'>";
echo "<div><span id='searchbox$fieldNO' class='$spanClass'>";
/* Get params of current field. */
$currentField = $formSession["field$fieldNO"];
@@ -215,7 +215,7 @@ foreach($fieldParams as $fieldName => $param)
/* Print and or. */
if($i == 1) echo "<span id='searchgroup1'><strong>{$lang->search->group1}</strong></span>" . html::hidden("andOr$fieldNO", 'AND');
if($i > 1) echo "<br />" . html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
/* Print field. */
echo html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)'");
@@ -235,7 +235,7 @@ foreach($fieldParams as $fieldName => $param)
echo '</span>';
$fieldNO ++;
echo '</span>';
echo '</span></div>';
}
?>
</nobr>
@@ -247,7 +247,7 @@ foreach($fieldParams as $fieldName => $param)
for($i = 1; $i <= $groupItems; $i ++)
{
$spanClass = $i == 1 ? 'inline' : 'hidden';
echo "<span id='searchbox$fieldNO' class='$spanClass'>";
echo "<div><span id='searchbox$fieldNO' class='$spanClass'>";
/* Get params of current field. */
$currentField = $formSession["field$fieldNO"];
@@ -255,7 +255,7 @@ foreach($fieldParams as $fieldName => $param)
/* Print and or. */
if($i == 1) echo "<span id='searchgroup2'><strong>{$lang->search->group2}</strong></span>" . html::hidden("andOr$fieldNO", 'AND');
if($i > 1) echo "<br />" . html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
if($i > 1) echo html::select("andOr$fieldNO", $lang->search->andor, $formSession["andOr$fieldNO"]);
/* Print field. */
echo html::select("field$fieldNO", $searchFields, $formSession["field$fieldNO"], "onchange='setField(this.value, $fieldNO)'");
@@ -276,12 +276,12 @@ foreach($fieldParams as $fieldName => $param)
echo '</span>';
$fieldNO ++;
echo '</span>';
echo '</span></div>';
}
?>
</nobr>
</td>
<td width='100'>
<td width='180' class='a-center'>
<nobr>
<?php
echo html::hidden('module', $module);
@@ -293,7 +293,7 @@ foreach($fieldParams as $fieldName => $param)
?>
</nobr>
</td>
<td width='250' class='a-center'>
<td width='150' class='a-center'>
<?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>', '', '');
+6 -7
View File
@@ -509,13 +509,12 @@ table.data-table td:last-child{padding-right: 20px;}
#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;}
@media(max-width:1610px){
#querybox input[type="text"],#querybox select[name='value3'],#querybox select[name='value5']{min-width: 80px;width: 80px;}
#querybox .button-c,#querybox .button-s{width: auto;min-width: 42px;}
#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']{width: 65px;min-width: 65px;}
#querybox select[name='queryID'], #querybox select[name='field4'],#querybox select[name='field3'],
#querybox select[name='field2'],#querybox select[name='field1']{width: 95px;}
}
#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;}
#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='queryID'], #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;}
@media(max-width:1220px){
#querybox input[type="text"],#querybox select[name='value3'],#querybox select[name='value5']{min-width: 70px;width: 70px;}
}