mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #627 from th-h/thh-pagination

Browse Source 
Fix pagination for "stable archives" in themes.
This commit is contained in:
Thomas Hochstein 2019-08-17 00:03:42 +02:00 committed by GitHub
commit 2f9b8e23b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/bulletproof/entries.tpl
View File

@ -418,6 +418,14 @@
{if $template_option.show_pagination == 'true' && $footer_totalPages > 1}
<div class="pagination">
{assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
{if $archiveSortStable}
{assign var="linkPrevPage" value="`$footer_next_page`"}
{assign var="linkNextPage" value="`$footer_prev_page`"}
{else}
{assign var="linkPrevPage" value="`$footer_prev_page`"}
{assign var="linkNextPage" value="`$footer_next_page`"}
{/if}
{assign var="paginationStartPage" value="`$footer_currentPage-3`"}
{if $footer_currentPage+3 > $footer_totalPages}
{assign var="paginationStartPage" value="`$footer_totalPages-6`"}
@ -425,8 +433,8 @@
{if $paginationStartPage <= 0}
{assign var="paginationStartPage" value="1"}
{/if}
{if $footer_prev_page}
<a title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><span class="pagearrow">&#9668;</span></a>
{if $linkPrevPage}
<a title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><span class="pagearrow">&#9668;</span></a>
{/if}
{if $paginationStartPage > 1}
<a href="{$footer_pageLink|replace:'%s':'1'}">1</a>
@ -447,8 +455,8 @@
{if $smarty.section.i.index <= $footer_totalPages}
<a href="{$footer_pageLink|replace:'%s':$footer_totalPages}">{$footer_totalPages}</a>
{/if}
{if $footer_next_page}
<a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><span class="pagearrow">&#9658;</span></a>
{if $linkNextPage}
<a title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><span class="pagearrow">&#9658;</span></a>
{/if}
</div>
{/if}

16
templates/timeline/entries.tpl
View File

@ -285,6 +285,14 @@
{if $footer_totalPages >1 }
<nav class="pagination">
{assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
{if $archiveSortStable}
{assign var="linkPrevPage" value="`$footer_next_page`"}
{assign var="linkNextPage" value="`$footer_prev_page`"}
{else}
{assign var="linkPrevPage" value="`$footer_prev_page`"}
{assign var="linkNextPage" value="`$footer_next_page`"}
{/if}
{assign var="paginationStartPage" value="`$footer_currentPage-3`"}
{if $footer_currentPage+3 > $footer_totalPages}
{assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@ -292,8 +300,8 @@
{if $paginationStartPage <= 0}
{assign var="paginationStartPage" value="1"}
{/if}
{if $footer_prev_page}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><i class="fas fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
{if $linkPrevPage}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><i class="fas fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
{/if}
{if $paginationStartPage > 1}
<a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@ -314,8 +322,8 @@
{if $smarty.section.i.index <= $footer_totalPages}
<a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
{/if}
{if $footer_next_page}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><i class="fas fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
{if $linkNextPage}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><i class="fas fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
{/if}
</nav>
{/if}

16
templates/timeline/index.tpl
View File

@ -114,6 +114,14 @@
{if $footer_totalPages >1 && !isset($staticpage_pagetitle)}
<nav class="pagination pull-right">
{assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
{if $archiveSortStable}
{assign var="linkPrevPage" value="`$footer_next_page`"}
{assign var="linkNextPage" value="`$footer_prev_page`"}
{else}
{assign var="linkPrevPage" value="`$footer_prev_page`"}
{assign var="linkNextPage" value="`$footer_next_page`"}
{/if}
{assign var="paginationStartPage" value="`$footer_currentPage-3`"}
{if $footer_currentPage+3 > $footer_totalPages}
{assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@ -121,8 +129,8 @@
{if $paginationStartPage <= 0}
{assign var="paginationStartPage" value="1"}
{/if}
{if $footer_prev_page}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><i class="fa fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
{if $linkPrevPage}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><i class="fa fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
{/if}
{if $paginationStartPage > 1}
<a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@ -143,8 +151,8 @@
{if $smarty.section.i.index <= $footer_totalPages}
<a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
{/if}
{if $footer_next_page}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><i class="fa fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
{if $linkNextPage}
<a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><i class="fa fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
{/if}
</nav>
{/if}