Skip to content

Commit c638704

Browse files
BurntimeXBurntimeX
authored
Merge pull request #419 from WoltLab/pagination-tutorial
Update outdated pagination in the tutorial
2 parents bcc15ff + b7c4d50 commit c638704

File tree

10 files changed

+140
-70
lines changed

10 files changed

+140
-70
lines changed

‎snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
</nav>
1515
</header>
1616

17-
{hascontent}
17+
{if $pages > 1}
1818
<div class="paginationTop">
19-
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
19+
<woltlab-core-pagination
20+
page="{$pageNo}"
21+
count="{$pages}"
22+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
23+
></woltlab-core-pagination>
2024
</div>
21-
{/hascontent}
25+
{/if}
2226

2327
{if $objects|count}
2428
<div class="section tabularBox">
@@ -54,11 +58,15 @@
5458
</div>
5559

5660
<footer class="contentFooter">
57-
{hascontent}
61+
{if $pages > 1}
5862
<div class="paginationBottom">
59-
{content}{@$pagesLinks}{/content}
63+
<woltlab-core-pagination
64+
page="{$pageNo}"
65+
count="{$pages}"
66+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
67+
></woltlab-core-pagination>
6068
</div>
61-
{/hascontent}
69+
{/if}
6270

6371
<nav class="contentFooterNavigation">
6472
<ul>

‎snippets/tutorial/tutorial-series/part-1/templates/personList.tpl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141

4242
{include file='header'}
4343

44-
{hascontent}
44+
{if $pages > 1}
4545
<div class="paginationTop">
46-
{content}
47-
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
48-
{/content}
46+
<woltlab-core-pagination
47+
page="{$pageNo}"
48+
count="{$pages}"
49+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
50+
></woltlab-core-pagination>
4951
</div>
50-
{/hascontent}
52+
{/if}
5153

5254
{if $items}
5355
<div class="section sectionContainerList">
@@ -84,11 +86,15 @@
8486
{/if}
8587

8688
<footer class="contentFooter">
87-
{hascontent}
89+
{if $pages > 1}
8890
<div class="paginationBottom">
89-
{content}{@$pagesLinks}{/content}
91+
<woltlab-core-pagination
92+
page="{$pageNo}"
93+
count="{$pages}"
94+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
95+
></woltlab-core-pagination>
9096
</div>
91-
{/hascontent}
97+
{/if}
9298

9399
{hascontent}
94100
<nav class="contentFooterNavigation">

‎snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
</nav>
1515
</header>
1616

17-
{hascontent}
17+
{if $pages > 1}
1818
<div class="paginationTop">
19-
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
19+
<woltlab-core-pagination
20+
page="{$pageNo}"
21+
count="{$pages}"
22+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
23+
></woltlab-core-pagination>
2024
</div>
21-
{/hascontent}
25+
{/if}
2226

2327
{if $objects|count}
2428
<div class="section tabularBox">
@@ -54,11 +58,15 @@
5458
</div>
5559

5660
<footer class="contentFooter">
57-
{hascontent}
61+
{if $pages > 1}
5862
<div class="paginationBottom">
59-
{content}{@$pagesLinks}{/content}
63+
<woltlab-core-pagination
64+
page="{$pageNo}"
65+
count="{$pages}"
66+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
67+
></woltlab-core-pagination>
6068
</div>
61-
{/hascontent}
69+
{/if}
6270

6371
<nav class="contentFooterNavigation">
6472
<ul>

‎snippets/tutorial/tutorial-series/part-3/templates/personList.tpl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141

4242
{include file='header'}
4343

44-
{hascontent}
44+
{if $pages > 1}
4545
<div class="paginationTop">
46-
{content}
47-
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
48-
{/content}
46+
<woltlab-core-pagination
47+
page="{$pageNo}"
48+
count="{$pages}"
49+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
50+
></woltlab-core-pagination>
4951
</div>
50-
{/hascontent}
52+
{/if}
5153

5254
{if $items}
5355
<div class="section sectionContainerList">
@@ -91,11 +93,15 @@
9193
{/if}
9294

9395
<footer class="contentFooter">
94-
{hascontent}
96+
{if $pages > 1}
9597
<div class="paginationBottom">
96-
{content}{@$pagesLinks}{/content}
98+
<woltlab-core-pagination
99+
page="{$pageNo}"
100+
count="{$pages}"
101+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
102+
></woltlab-core-pagination>
97103
</div>
98-
{/hascontent}
104+
{/if}
99105

100106
{hascontent}
101107
<nav class="contentFooterNavigation">

‎snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
</nav>
1515
</header>
1616

17-
{hascontent}
17+
{if $pages > 1}
1818
<div class="paginationTop">
19-
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
19+
<woltlab-core-pagination
20+
page="{$pageNo}"
21+
count="{$pages}"
22+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
23+
></woltlab-core-pagination>
2024
</div>
21-
{/hascontent}
25+
{/if}
2226

2327
{if $objects|count}
2428
<div class="section tabularBox">
@@ -54,11 +58,15 @@
5458
</div>
5559

5660
<footer class="contentFooter">
57-
{hascontent}
61+
{if $pages > 1}
5862
<div class="paginationBottom">
59-
{content}{@$pagesLinks}{/content}
63+
<woltlab-core-pagination
64+
page="{$pageNo}"
65+
count="{$pages}"
66+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
67+
></woltlab-core-pagination>
6068
</div>
61-
{/hascontent}
69+
{/if}
6270

6371
<nav class="contentFooterNavigation">
6472
<ul>

‎snippets/tutorial/tutorial-series/part-4/templates/personList.tpl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141

4242
{include file='header'}
4343

44-
{hascontent}
44+
{if $pages > 1}
4545
<div class="paginationTop">
46-
{content}
47-
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
48-
{/content}
46+
<woltlab-core-pagination
47+
page="{$pageNo}"
48+
count="{$pages}"
49+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
50+
></woltlab-core-pagination>
4951
</div>
50-
{/hascontent}
52+
{/if}
5153

5254
{if $items}
5355
<div class="section sectionContainerList">
@@ -91,11 +93,15 @@
9193
{/if}
9294

9395
<footer class="contentFooter">
94-
{hascontent}
96+
{if $pages > 1}
9597
<div class="paginationBottom">
96-
{content}{@$pagesLinks}{/content}
98+
<woltlab-core-pagination
99+
page="{$pageNo}"
100+
count="{$pages}"
101+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
102+
></woltlab-core-pagination>
97103
</div>
98-
{/hascontent}
104+
{/if}
99105

100106
{hascontent}
101107
<nav class="contentFooterNavigation">

‎snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
</nav>
1515
</header>
1616

17-
{hascontent}
17+
{if $pages > 1}
1818
<div class="paginationTop">
19-
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
19+
<woltlab-core-pagination
20+
page="{$pageNo}"
21+
count="{$pages}"
22+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
23+
></woltlab-core-pagination>
2024
</div>
21-
{/hascontent}
25+
{/if}
2226

2327
{if $objects|count}
2428
<div class="section tabularBox">
@@ -54,11 +58,15 @@
5458
</div>
5559

5660
<footer class="contentFooter">
57-
{hascontent}
61+
{if $pages > 1}
5862
<div class="paginationBottom">
59-
{content}{@$pagesLinks}{/content}
63+
<woltlab-core-pagination
64+
page="{$pageNo}"
65+
count="{$pages}"
66+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
67+
></woltlab-core-pagination>
6068
</div>
61-
{/hascontent}
69+
{/if}
6270

6371
<nav class="contentFooterNavigation">
6472
<ul>

‎snippets/tutorial/tutorial-series/part-5/templates/personList.tpl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141

4242
{include file='header'}
4343

44-
{hascontent}
44+
{if $pages > 1}
4545
<div class="paginationTop">
46-
{content}
47-
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
48-
{/content}
46+
<woltlab-core-pagination
47+
page="{$pageNo}"
48+
count="{$pages}"
49+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
50+
></woltlab-core-pagination>
4951
</div>
50-
{/hascontent}
52+
{/if}
5153

5254
{if $items}
5355
<div class="section sectionContainerList">
@@ -95,11 +97,15 @@
9597
{/if}
9698

9799
<footer class="contentFooter">
98-
{hascontent}
100+
{if $pages > 1}
99101
<div class="paginationBottom">
100-
{content}{@$pagesLinks}{/content}
102+
<woltlab-core-pagination
103+
page="{$pageNo}"
104+
count="{$pages}"
105+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
106+
></woltlab-core-pagination>
101107
</div>
102-
{/hascontent}
108+
{/if}
103109

104110
{hascontent}
105111
<nav class="contentFooterNavigation">

‎snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
</nav>
1515
</header>
1616

17-
{hascontent}
17+
{if $pages > 1}
1818
<div class="paginationTop">
19-
{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
19+
<woltlab-core-pagination
20+
page="{$pageNo}"
21+
count="{$pages}"
22+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
23+
></woltlab-core-pagination>
2024
</div>
21-
{/hascontent}
25+
{/if}
2226

2327
{if $objects|count}
2428
<div class="section tabularBox">
@@ -54,11 +58,15 @@
5458
</div>
5559

5660
<footer class="contentFooter">
57-
{hascontent}
61+
{if $pages > 1}
5862
<div class="paginationBottom">
59-
{content}{@$pagesLinks}{/content}
63+
<woltlab-core-pagination
64+
page="{$pageNo}"
65+
count="{$pages}"
66+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
67+
></woltlab-core-pagination>
6068
</div>
61-
{/hascontent}
69+
{/if}
6270

6371
<nav class="contentFooterNavigation">
6472
<ul>

‎snippets/tutorial/tutorial-series/part-6/templates/personList.tpl‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141

4242
{include file='header'}
4343

44-
{hascontent}
44+
{if $pages > 1}
4545
<div class="paginationTop">
46-
{content}
47-
{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
48-
{/content}
46+
<woltlab-core-pagination
47+
page="{$pageNo}"
48+
count="{$pages}"
49+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
50+
></woltlab-core-pagination>
4951
</div>
50-
{/hascontent}
52+
{/if}
5153

5254
{if $items}
5355
<div class="section sectionContainerList">
@@ -95,11 +97,15 @@
9597
{/if}
9698

9799
<footer class="contentFooter">
98-
{hascontent}
100+
{if $pages > 1}
99101
<div class="paginationBottom">
100-
{content}{@$pagesLinks}{/content}
102+
<woltlab-core-pagination
103+
page="{$pageNo}"
104+
count="{$pages}"
105+
url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
106+
></woltlab-core-pagination>
101107
</div>
102-
{/hascontent}
108+
{/if}
103109

104110
{hascontent}
105111
<nav class="contentFooterNavigation">

0 commit comments

Comments
 (0)