From b7c4d5014d8ae752101dfde1de23710ea7a6aedc Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 29 Feb 2024 15:40:21 +0100
Subject: [PATCH] Update outdated pagination in the tutorial

---
 .../part-1/acptemplates/personList.tpl        | 20 ++++++++++++-----
 .../part-1/templates/personList.tpl           | 22 ++++++++++++-------
 .../part-3/acptemplates/personList.tpl        | 20 ++++++++++++-----
 .../part-3/templates/personList.tpl           | 22 ++++++++++++-------
 .../part-4/acptemplates/personList.tpl        | 20 ++++++++++++-----
 .../part-4/templates/personList.tpl           | 22 ++++++++++++-------
 .../part-5/acptemplates/personList.tpl        | 20 ++++++++++++-----
 .../part-5/templates/personList.tpl           | 22 ++++++++++++-------
 .../part-6/acptemplates/personList.tpl        | 20 ++++++++++++-----
 .../part-6/templates/personList.tpl           | 22 ++++++++++++-------
 10 files changed, 140 insertions(+), 70 deletions(-)

diff --git a/snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl b/snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl
index caa87a9a..7bc9e853 100644
--- a/snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-1/acptemplates/personList.tpl
@@ -14,11 +14,15 @@
 	</nav>
 </header>
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $objects|count}
 	<div class="section tabularBox">
@@ -54,11 +58,15 @@
 	</div>
 	
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination
+					page="{$pageNo}"
+					count="{$pages}"
+					url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+				></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 		
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/snippets/tutorial/tutorial-series/part-1/templates/personList.tpl b/snippets/tutorial/tutorial-series/part-1/templates/personList.tpl
index b2eab306..3d9e6f54 100644
--- a/snippets/tutorial/tutorial-series/part-1/templates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-1/templates/personList.tpl
@@ -41,13 +41,15 @@
 
 {include file='header'}
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}
-			{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-		{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $items}
 	<div class="section sectionContainerList">
@@ -84,11 +86,15 @@
 {/if}
 
 <footer class="contentFooter">
-	{hascontent}
+	{if $pages > 1}
 		<div class="paginationBottom">
-			{content}{@$pagesLinks}{/content}
+			<woltlab-core-pagination
+				page="{$pageNo}"
+				count="{$pages}"
+				url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+			></woltlab-core-pagination>
 		</div>
-	{/hascontent}
+	{/if}
 	
 	{hascontent}
 		<nav class="contentFooterNavigation">
diff --git a/snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl b/snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl
index caa87a9a..7bc9e853 100644
--- a/snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-3/acptemplates/personList.tpl
@@ -14,11 +14,15 @@
 	</nav>
 </header>
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $objects|count}
 	<div class="section tabularBox">
@@ -54,11 +58,15 @@
 	</div>
 	
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination
+					page="{$pageNo}"
+					count="{$pages}"
+					url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+				></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 		
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/snippets/tutorial/tutorial-series/part-3/templates/personList.tpl b/snippets/tutorial/tutorial-series/part-3/templates/personList.tpl
index 089b0fa7..1838c02c 100644
--- a/snippets/tutorial/tutorial-series/part-3/templates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-3/templates/personList.tpl
@@ -41,13 +41,15 @@
 
 {include file='header'}
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}
-			{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-		{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $items}
 	<div class="section sectionContainerList">
@@ -91,11 +93,15 @@
 {/if}
 
 <footer class="contentFooter">
-	{hascontent}
+	{if $pages > 1}
 		<div class="paginationBottom">
-			{content}{@$pagesLinks}{/content}
+			<woltlab-core-pagination
+				page="{$pageNo}"
+				count="{$pages}"
+				url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+			></woltlab-core-pagination>
 		</div>
-	{/hascontent}
+	{/if}
 	
 	{hascontent}
 		<nav class="contentFooterNavigation">
diff --git a/snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl b/snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl
index caa87a9a..7bc9e853 100644
--- a/snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-4/acptemplates/personList.tpl
@@ -14,11 +14,15 @@
 	</nav>
 </header>
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $objects|count}
 	<div class="section tabularBox">
@@ -54,11 +58,15 @@
 	</div>
 	
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination
+					page="{$pageNo}"
+					count="{$pages}"
+					url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+				></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 		
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/snippets/tutorial/tutorial-series/part-4/templates/personList.tpl b/snippets/tutorial/tutorial-series/part-4/templates/personList.tpl
index 089b0fa7..1838c02c 100644
--- a/snippets/tutorial/tutorial-series/part-4/templates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-4/templates/personList.tpl
@@ -41,13 +41,15 @@
 
 {include file='header'}
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}
-			{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-		{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $items}
 	<div class="section sectionContainerList">
@@ -91,11 +93,15 @@
 {/if}
 
 <footer class="contentFooter">
-	{hascontent}
+	{if $pages > 1}
 		<div class="paginationBottom">
-			{content}{@$pagesLinks}{/content}
+			<woltlab-core-pagination
+				page="{$pageNo}"
+				count="{$pages}"
+				url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+			></woltlab-core-pagination>
 		</div>
-	{/hascontent}
+	{/if}
 	
 	{hascontent}
 		<nav class="contentFooterNavigation">
diff --git a/snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl b/snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl
index caa87a9a..7bc9e853 100644
--- a/snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-5/acptemplates/personList.tpl
@@ -14,11 +14,15 @@
 	</nav>
 </header>
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $objects|count}
 	<div class="section tabularBox">
@@ -54,11 +58,15 @@
 	</div>
 	
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination
+					page="{$pageNo}"
+					count="{$pages}"
+					url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+				></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 		
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/snippets/tutorial/tutorial-series/part-5/templates/personList.tpl b/snippets/tutorial/tutorial-series/part-5/templates/personList.tpl
index 96a9dca4..55636ffd 100644
--- a/snippets/tutorial/tutorial-series/part-5/templates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-5/templates/personList.tpl
@@ -41,13 +41,15 @@
 
 {include file='header'}
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}
-			{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-		{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $items}
 	<div class="section sectionContainerList">
@@ -95,11 +97,15 @@
 {/if}
 
 <footer class="contentFooter">
-	{hascontent}
+	{if $pages > 1}
 		<div class="paginationBottom">
-			{content}{@$pagesLinks}{/content}
+			<woltlab-core-pagination
+				page="{$pageNo}"
+				count="{$pages}"
+				url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+			></woltlab-core-pagination>
 		</div>
-	{/hascontent}
+	{/if}
 	
 	{hascontent}
 		<nav class="contentFooterNavigation">
diff --git a/snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl b/snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl
index caa87a9a..7bc9e853 100644
--- a/snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-6/acptemplates/personList.tpl
@@ -14,11 +14,15 @@
 	</nav>
 </header>
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}{pages print=true assign=pagesLinks controller="PersonList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $objects|count}
 	<div class="section tabularBox">
@@ -54,11 +58,15 @@
 	</div>
 	
 	<footer class="contentFooter">
-		{hascontent}
+		{if $pages > 1}
 			<div class="paginationBottom">
-				{content}{@$pagesLinks}{/content}
+				<woltlab-core-pagination
+					page="{$pageNo}"
+					count="{$pages}"
+					url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+				></woltlab-core-pagination>
 			</div>
-		{/hascontent}
+		{/if}
 		
 		<nav class="contentFooterNavigation">
 			<ul>
diff --git a/snippets/tutorial/tutorial-series/part-6/templates/personList.tpl b/snippets/tutorial/tutorial-series/part-6/templates/personList.tpl
index 96a9dca4..55636ffd 100644
--- a/snippets/tutorial/tutorial-series/part-6/templates/personList.tpl
+++ b/snippets/tutorial/tutorial-series/part-6/templates/personList.tpl
@@ -41,13 +41,15 @@
 
 {include file='header'}
 
-{hascontent}
+{if $pages > 1}
 	<div class="paginationTop">
-		{content}
-			{pages print=true assign=pagesLinks controller='PersonList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
-		{/content}
+		<woltlab-core-pagination
+			page="{$pageNo}"
+			count="{$pages}"
+			url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+		></woltlab-core-pagination>
 	</div>
-{/hascontent}
+{/if}
 
 {if $items}
 	<div class="section sectionContainerList">
@@ -95,11 +97,15 @@
 {/if}
 
 <footer class="contentFooter">
-	{hascontent}
+	{if $pages > 1}
 		<div class="paginationBottom">
-			{content}{@$pagesLinks}{/content}
+			<woltlab-core-pagination
+				page="{$pageNo}"
+				count="{$pages}"
+				url="{link controller='PersonList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}"
+			></woltlab-core-pagination>
 		</div>
-	{/hascontent}
+	{/if}
 	
 	{hascontent}
 		<nav class="contentFooterNavigation">
-- 
2.20.1