gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-10 19:12:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-06 22:22:56 +02:00
commit bf62dd68e9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
views/bootstrap/class.Search.php
View File

@ -71,6 +71,12 @@ $(document).ready( function() {
/* Add js for catching click on document in one page mode */ /* Add js for catching click on document in one page mode */
$this->printClickDocumentJs(); $this->printClickDocumentJs();
$this->printClickFolderJs(); $this->printClickFolderJs();
?>
$(document).ready(function() {
$('body').on('submit', '#form1', function(ev){
});
});
<?php
} /* }}} */ } /* }}} */
function export() { /* {{{ */ function export() { /* {{{ */
@ -235,8 +241,10 @@ function typeahead() { /* {{{ */
$this->rowStart(); $this->rowStart();
$this->columnStart(4); $this->columnStart(4);
$this->contentHeading(getMLText('search')); $this->contentHeading("<button class=\"btn btn-primary\" id=\"searchform-toggle\" data-toggle=\"collapse\" href=\"#searchform\"><i class=\"fa fa-exchange\"></i></button> ".getMLText('search'), true);
//echo "<pre>";print_r($_GET);echo "</pre>"; if($this->query) {
echo "<div id=\"searchform\" class=\"collapse mb-sm-4\">";
}
?> ?>
<ul class="nav nav-pills" id="searchtab"> <ul class="nav nav-pills" id="searchtab">
<li class="nav-item <?php echo ($fullsearch == false) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == false) ? 'active' : ''; ?>" data-target="#database" data-toggle="tab"><?php printMLText('databasesearch'); ?></a></li> <li class="nav-item <?php echo ($fullsearch == false) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == false) ? 'active' : ''; ?>" data-target="#database" data-toggle="tab"><?php printMLText('databasesearch'); ?></a></li>
@ -623,6 +631,7 @@ foreach($facets as $facetname=>$values) {
?> ?>
</div> </div>
<?php <?php
echo "</div>";
$this->columnEnd(); $this->columnEnd();
$this->columnStart(8); $this->columnStart(8);
$this->contentHeading(getMLText('search_results')); $this->contentHeading(getMLText('search_results'));