gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +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 21:24:54 +02:00
commit 065244c128
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,10 +231,11 @@ function typeahead() { /* {{{ */
$this->htmlStartPage(getMLText("search_results"));
$this->globalNavigation();
$this->contentStart();
$this->pageNavigation(getMLText("search_results"), "");
$this->pageNavigation("", "");
$this->rowStart();
$this->columnStart(4);
$this->contentHeading(getMLText('search'));
//echo "<pre>";print_r($_GET);echo "</pre>";
?>
<ul class="nav nav-pills" id="searchtab">
@ -624,6 +625,7 @@ foreach($facets as $facetname=>$values) {
<?php
$this->columnEnd();
$this->columnStart(8);
$this->contentHeading(getMLText('search_results'));
// Search Result {{{
$foldercount = $doccount = 0;
if($entries) {

6
views/bootstrap4/class.Bootstrap4.php
View File

@ -968,7 +968,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
$maxpages = 25; // skip pages when more than this is shown
$range = 5; // pages left and right of current page
$range = 2; // pages left and right of current page
if (!is_numeric($pageNumber) || !is_numeric($totalPages) || $totalPages<2) {
return;
}
@ -984,8 +984,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$first=false;
}
echo "<nav aria-label=\"pagination pagination-small\">";
echo "<ul class=\"pagination\">";
echo "<nav aria-label=\"pagination\">";
echo "<ul class=\"pagination pagination-sm\">";
if($totalPages <= $maxpages) {
for ($i = 1; $i <= $totalPages; $i++) {
echo "<li class=\"page-item".($i == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$i."\">".$i."</a></li>";

2
views/bootstrap4/styles/styles.css
View File

@ -29,7 +29,7 @@ html {
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
margin-bottom: 70px;
}
@media (max-width: 991px) {
body {