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

Revert "Fix pagination for "stable archives" in themes."

Browse Source 
This reverts commit 4e662bf17c420cc997c39c9501cfe0df509d9a09
in parts.

With this - now reverted - commit, the prev/next
arrows in pagination were swapped because they
were the wrong way around. Unfortunately, later on,
the root cause was fixes by "unswapping" the prev/next
links in core, so now the pagination arrows were
... eh ... wrongly swapped. So this commit has to
be reverted.

Backported from master branch.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2019-08-24 08:39:01 +02:00
parent 40113925b6
commit e2c0c82aeb
3 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/bulletproof/entries.tpl
View File

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

16
templates/timeline/entries.tpl
View File

@ -285,14 +285,6 @@
{if $footer_totalPages >1 } {if $footer_totalPages >1 }
<nav class="pagination"> <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`"} {assign var="paginationStartPage" value="`$footer_currentPage-3`"}
{if $footer_currentPage+3 > $footer_totalPages} {if $footer_currentPage+3 > $footer_totalPages}
{assign var="paginationStartPage" value="`$footer_totalPages-4`"} {assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@ -300,8 +292,8 @@
{if $paginationStartPage <= 0} {if $paginationStartPage <= 0}
{assign var="paginationStartPage" value="1"} {assign var="paginationStartPage" value="1"}
{/if} {/if}
{if $linkPrevPage} {if $footer_prev_page}
<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> <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} {/if}
{if $paginationStartPage > 1} {if $paginationStartPage > 1}
<a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a> <a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@ -322,8 +314,8 @@
{if $smarty.section.i.index <= $footer_totalPages} {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> <a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
{/if} {/if}
{if $linkNextPage} {if $footer_next_page}
<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> <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} {/if}
</nav> </nav>
{/if} {/if}

16
templates/timeline/index.tpl
View File

@ -114,14 +114,6 @@
{if $footer_totalPages >1 && !isset($staticpage_pagetitle)} {if $footer_totalPages >1 && !isset($staticpage_pagetitle)}
<nav class="pagination pull-right"> <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`"} {assign var="paginationStartPage" value="`$footer_currentPage-3`"}
{if $footer_currentPage+3 > $footer_totalPages} {if $footer_currentPage+3 > $footer_totalPages}
{assign var="paginationStartPage" value="`$footer_totalPages-4`"} {assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@ -129,8 +121,8 @@
{if $paginationStartPage <= 0} {if $paginationStartPage <= 0}
{assign var="paginationStartPage" value="1"} {assign var="paginationStartPage" value="1"}
{/if} {/if}
{if $linkPrevPage} {if $footer_prev_page}
<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> <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} {/if}
{if $paginationStartPage > 1} {if $paginationStartPage > 1}
<a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a> <a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@ -151,8 +143,8 @@
{if $smarty.section.i.index <= $footer_totalPages} {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> <a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
{/if} {/if}
{if $linkNextPage} {if $footer_next_page}
<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> <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} {/if}
</nav> </nav>
{/if} {/if}