mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-09 13:06:14 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
52fdbb8c16
|
@ -470,7 +470,7 @@ $(document).ready(function() {
|
|||
<li class="nav-item <?php echo ($fullsearch == true && $facetsearch == false) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == true && $facetsearch == false) ? 'active' : ''; ?>" data-target="#fulltext" data-toggle="tab" role="button"><?php printMLText('fullsearch'); ?></a></li>
|
||||
<?php
|
||||
}
|
||||
if($enablefacetsearch) {
|
||||
if($enablefullsearch && $enablefacetsearch) {
|
||||
?>
|
||||
<li class="nav-item <?php echo ($facetsearch == true && $facetsearch == true) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($facetsearch == true && $facetsearch == true) ? 'active' : ''; ?>" data-target="#facetfulltext" data-toggle="tab" role="button"><?php printMLText('facetfullsearch'); ?></a></li>
|
||||
<?php
|
||||
|
@ -1074,7 +1074,7 @@ $(document).ready(function() {
|
|||
// }}}
|
||||
|
||||
// Fulltext search with facets Form {{{
|
||||
if($enablefacetsearch) {
|
||||
if($enablefullsearch && $enablefacetsearch) {
|
||||
echo "<div class=\"tab-pane ".(($fullsearch == true && $facetsearch == true) ? 'active' : '')."\" id=\"facetfulltext\">\n";
|
||||
?>
|
||||
<form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form2">
|
||||
|
|
Loading…
Reference in New Issue
Block a user