mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-03-12 17:05:46 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
b8c94556ca
|
@ -1103,7 +1103,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
echo "</div>\n";
|
||||
} /* }}} */
|
||||
|
||||
function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
|
||||
function pageList($pageNumber, $totalPages, $baseURI, $params, $dataparams=[]) { /* {{{ */
|
||||
|
||||
$maxpages = 25; // skip pages when more than this is shown
|
||||
$range = 5; // pages left and right of current page
|
||||
|
@ -1122,11 +1122,17 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
$first=false;
|
||||
}
|
||||
|
||||
$datastr = '';
|
||||
if($dataparams) {
|
||||
$datastr .= ' ';
|
||||
foreach($dataparams as $k=>$v)
|
||||
$datastr .= 'data-'.$k.'="'.$v.'"';
|
||||
}
|
||||
echo "<div class=\"pagination pagination-small\">";
|
||||
echo "<ul>";
|
||||
if($totalPages <= $maxpages) {
|
||||
for ($i = 1; $i <= $totalPages; $i++) {
|
||||
echo "<li ".($i == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$i."\">".$i."</a></li>";
|
||||
echo "<li ".($i == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$i."\" data-page=\"".$i."\"".$datastr.">".$i."</a></li>";
|
||||
}
|
||||
} else {
|
||||
if($pageNumber-$range > 1)
|
||||
|
@ -1146,21 +1152,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
$end -= $diff;
|
||||
}
|
||||
if($pageNumber > 1)
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber-1)."\">«</a></li>";
|
||||
echo "<li ".(1 == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=1\">1</a></li>";
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber-1)."\" data-page=\"".($pageNumber-1)."\"".$datastr.">«</a></li>";
|
||||
echo "<li ".(1 == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=1\" data-page=\"1\"".$datastr.">1</a></li>";
|
||||
if($start > 2)
|
||||
echo "<li><span>...</span></li>";
|
||||
for($j=$start; $j<=$end; $j++)
|
||||
echo "<li ".($j == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$j."\">".$j."</a></li>";
|
||||
echo "<li ".($j == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$j."\" data-page=\"".$j."\"".$datastr.">".$j."</a></li>";
|
||||
if($end < $totalPages-1)
|
||||
echo "<li><span>...</span></li>";
|
||||
if($end < $totalPages)
|
||||
echo "<li ".($totalPages == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$totalPages."\">".$totalPages."</a></li>";
|
||||
echo "<li ".($totalPages == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$totalPages."\" data-page=\"".$totalPages."\"".$datastr.">".$totalPages."</a></li>";
|
||||
if($pageNumber < $totalPages)
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\">»</a></li>";
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\" data-page=\"".($pageNumber+1)."\"".$datastr.">»</a></li>";
|
||||
}
|
||||
if ($totalPages>1) {
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=all\">".getMLText("all_pages")."</a></li>";
|
||||
echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
|
||||
}
|
||||
echo "</ul>";
|
||||
echo "</div>";
|
||||
|
|
|
@ -1007,7 +1007,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
|
||||
} /* }}} */
|
||||
|
||||
function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
|
||||
function pageList($pageNumber, $totalPages, $baseURI, $params, $dataparams=[]) { /* {{{ */
|
||||
|
||||
$maxpages = 25; // skip pages when more than this is shown
|
||||
$range = 2; // pages left and right of current page
|
||||
|
@ -1026,11 +1026,17 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
$first=false;
|
||||
}
|
||||
|
||||
$datastr = '';
|
||||
if($dataparams) {
|
||||
$datastr .= ' ';
|
||||
foreach($dataparams as $k=>$v)
|
||||
$datastr .= 'data-'.$k.'="'.$v.'"';
|
||||
}
|
||||
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>";
|
||||
echo "<li class=\"page-item".($i == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$i."\" data-page=\"".$i."\"".$datastr.">".$i."</a></li>";
|
||||
}
|
||||
} else {
|
||||
if($pageNumber-$range > 1)
|
||||
|
@ -1050,21 +1056,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
|
|||
$end -= $diff;
|
||||
}
|
||||
// if($pageNumber > 1)
|
||||
echo "<li class=\"page-item".($pageNumber == 1 ? " disabled" : "")."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber-1)."\">«</a></li>";
|
||||
echo "<li class=\"page-item".(1 == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=1\">1</a></li>";
|
||||
echo "<li class=\"page-item".($pageNumber == 1 ? " disabled" : "")."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber-1)."\" data-page=\"".($pageNumber-1)."\"".$datastr.">«</a></li>";
|
||||
echo "<li class=\"page-item".(1 == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=1\" data-page=\"1\"".$datastr.">1</a></li>";
|
||||
if($start > 2)
|
||||
echo "<li class=\"page-item disabled\"><a class=\"page-link\">...</a></li>";
|
||||
for($j=$start; $j<=$end; $j++)
|
||||
echo "<li class=\"page-item".($j == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$j."\">".$j."</a></li>";
|
||||
echo "<li class=\"page-item".($j == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$j."\" data-page=\"".$j."\"".$datastr.">".$j."</a></li>";
|
||||
if($end < $totalPages-1)
|
||||
echo "<li class=\"page-item disabled\"><a class=\"page-link\">...</a></li>";
|
||||
if($end < $totalPages)
|
||||
echo "<li class=\"page-item".($totalPages == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$totalPages."\">".$totalPages."</a></li>";
|
||||
echo "<li class=\"page-item".($totalPages == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".$totalPages."\" data-page=\"".$totalPages."\"".$datastr.">".$totalPages."</a></li>";
|
||||
if($pageNumber < $totalPages)
|
||||
echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\">»</a></li>";
|
||||
echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\" data-page=\"".($pageNumber+1)."\"".$datastr.">»</a></li>";
|
||||
}
|
||||
if ($totalPages>1) {
|
||||
echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=all\">".getMLText("all_pages")."</a></li>";
|
||||
echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
|
||||
}
|
||||
echo "</ul>";
|
||||
echo "</nav>";
|
||||
|
|
Loading…
Reference in New Issue
Block a user