Further work on core pagination solution

Author: philwareham

README.md

@@ -102,7 +102,6 @@ For example:
 
 All plugins we use are installed via Composer:
 
-* [`etc_pagination`](https://github.com/etc-plugins/etc_pagination) ✓ Composer
 * [`pat_if_amp`](https://github.com/cara-tm/pat_if_amp) ✓ Composer
 * [`rah_comment_spam`](https://github.com/gocom/rah_comment_spam) ✓ Composer
 * [`smd_thumbnail`](https://github.com/bloke/smd_thumbnail) ✓ Composer

composer.json

@@ -8,7 +8,6 @@
     "textpattern/installer": "1.0.10",
     "bloke/smd_thumbnail": "0.4.0-beta",
     "cara-tm/pat_if_amp": "0.3.7",
-    "etc-plugins/etc_pagination": "0.5.0",
     "rah/rah_comment_spam": "0.9.0"
   }
 }

src/templates/forms/misc/pagination.txp

@@ -0,0 +1,16 @@
+<txp:pages pg="pg" evaluate="5,2,8,4,6">
+    <nav class="paginator" aria-label="Blog navigation">
+        Pages:
+        <txp:newer showalways link=""><a rel="prev" href="<txp:yield item="url" />" title="Go to previous page" aria-label="Go to previous page">Previous</a></txp:newer>
+        <ul class="pagination">
+            <txp:newer shift link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:newer>
+            <txp:evaluate test="newer"><txp:newer shift="-2" link=""><li role="separator" title="More pages" aria-label="More pages">…</li></txp:newer></txp:evaluate>
+            <txp:newer total shift="2" link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:newer>
+            <txp:newer shift="0" link=""><li class="current"><b title="Current page" aria-current="page"><txp:yield item="page" /></b></li></txp:newer>
+            <txp:older total shift="2" link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:older>
+            <txp:evaluate test="older"><txp:older shift="-2" link=""><li role="separator" title="More pages" aria-label="More pages">…</li></txp:older></txp:evaluate>
+            <txp:older shift link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" /> (last page)" aria-label="Go to page <txp:yield item="page" /> (last page)"><txp:yield item="page" /></a></li></txp:older>
+        </ul>
+        <txp:older showalways link=""><a rel="next" href="<txp:yield item="url" />" title="Go to next page" aria-label="Go to next page">Next</a></txp:older>
+    </nav>
+</txp:pages>

src/templates/pages/blog.txp

@@ -121,22 +121,7 @@
                 <txp:if_article_list>
                     <div class="layout-4col-3span">
                         <txp:article form="article_listing_blog" limit="12" />
-                        <txp:pages pg="pg" evaluate="5,2,8,4,6">
-                            <nav class="paginator" aria-label="Blog navigation">
-                                Pages:
-                                <txp:newer showalways link=""><a rel="prev" href="<txp:yield item="url" />" title="Go to previous page" aria-label="Go to previous page">Previous</a></txp:newer>
-                                <ul class="pagination">
-                                    <txp:newer shift link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:newer>
-                                    <txp:evaluate test="newer"><txp:newer shift="-2" link=""><li role="separator" title="More pages" aria-label="More pages">…</li></txp:newer></txp:evaluate>
-                                    <txp:newer total shift="2" link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:newer>
-                                    <txp:newer shift="0" link=""><li class="current"><b title="Current page" aria-current="page"><txp:yield item="page" /></b></li></txp:newer>
-                                    <txp:older total shift="2" link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" />" aria-label="Go to page <txp:yield item="page" />"><txp:yield item="page" /></a></li></txp:older>
-                                    <txp:evaluate test="older"><txp:older shift="-2" link=""><li role="separator" title="More pages" aria-label="More pages">…</li></txp:older></txp:evaluate>
-                                    <txp:older shift link=""><li><a href="<txp:yield item="url" />" title="Go to page <txp:yield item="page" /> (last page)" aria-label="Go to page <txp:yield item="page" /> (last page)"><txp:yield item="page" /></a></li></txp:older>
-                                </ul>
-                                <txp:older showalways link=""><a rel="next" href="<txp:yield item="url" />" title="Go to next page" aria-label="Go to next page">Next</a></txp:older>
-                            </nav>
-                        </txp:pages>
+                        <txp:output_form form="pagination" />
                     </div>
                 <txp:else />
                     <txp:article form="blog" />

src/templates/pages/default.txp

@@ -271,17 +271,7 @@ foreach ($json->topic as $topic) {
                     <div class="teaser-container">
                         <txp:article searchform="article_listing" limit="12" />
                     </div>
-                    <txp:evaluate test>
-                        <nav class="paginator" aria-label="Page navigation">
-                            Pages:
-                            <txp:etc_pagination range="3"
-                                prev='<a rel="prev" href="{href}" title="Go to previous page" aria-label="Go to previous page">Previous</a>'
-                                next='<a rel="next" href="{href}" title="Go to next page" aria-label="Go to next page">Next</a>'
-                                link='<li><a href="{href}" title="Go to page {*}" aria-label="Go to page {*}">{*}</a></li>,<li class="current"><b title="Current page" aria-current="page">{*}</b></li>'
-                                gap='<li role="separator" title="More pages" aria-label="More pages">…</li>'
-                                mask='{prev}<ul class="pagination">{first}{<+}{links}{+>}{last}</ul>{next}' />
-                        </nav>
-                    </txp:evaluate>
+                    <txp:output_form form="pagination" />
                 <txp:else />
                     <div class="article-description" itemprop="description">
                         <txp:if_search_results>
@@ -311,17 +301,7 @@ foreach ($json->topic as $topic) {
                     <div class="teaser-container">
                         <txp:article form="article_listing_blog" limit="12" />
                     </div>
-                    <txp:evaluate test>
-                        <nav class="paginator" aria-label="Blog navigation">
-                            Pages:
-                            <txp:etc_pagination range="3"
-                                prev='<a rel="prev" href="{href}" title="Go to previous page" aria-label="Go to previous page">Previous</a>'
-                                next='<a rel="next" href="{href}" title="Go to next page" aria-label="Go to next page">Next</a>'
-                                link='<li><a href="{href}" title="Go to page {*}" aria-label="Go to page {*}">{*}</a></li>,<li class="current"><b title="Current page" aria-current="page">{*}</b></li>'
-                                gap='<li role="separator" title="More pages" aria-label="More pages">…</li>'
-                                mask='{prev}<ul class="pagination">{first}{<+}{links}{+>}{last}</ul>{next}' />
-                        </nav>
-                    </txp:evaluate>
+                    <txp:output_form form="pagination" />
                 </div>
                 <txp:output_form form="sidebar" />
             </div>