From 3840659d7ab471514cddac6825839433023af9c0 Mon Sep 17 00:00:00 2001
From: Ben Hood <ben.hood@maropost.com>
Date: Wed, 23 Feb 2022 19:05:23 +1000
Subject: [PATCH] NEV-388 add the pgnum to the view type selector and the
 sorting form

---
 src/templates/cms/category.template.html         | 2 ++
 src/templates/cms/home.template.html             | 2 +-
 src/templates/cms/includes/sidebar.template.html | 3 ++-
 src/templates/cms/search_results.template.html   | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/templates/cms/category.template.html b/src/templates/cms/category.template.html
index aeb51d92..42e73106 100644
--- a/src/templates/cms/category.template.html
+++ b/src/templates/cms/category.template.html
@@ -91,6 +91,7 @@ <h1 class="page-header">
 			</script>
 			<form method="get" name="viewForm" action="[@config:CURRENT_URL@]" class="hidden">
 				<input name="rf" type="hidden" value="[%FILTER_CODE%][%/FILTER_CODE%]">
+				<input name="pgnum" type="hidden" value="[@form:pgnum@]" />
 				<input name="viewby" type="hidden" value=""/>
 			</form>
 			<div class="viewby btn-group">
@@ -106,6 +107,7 @@ <h1 class="page-header">
 		<div class="col-8 col-md-5 col-lg-4">
 			<form method="get" action="[@config:CURRENT_URL@]">
 				<input name="rf" type="hidden" value="[%FILTER_CODE%][%/FILTER_CODE%]">
+				<input name="pgnum" type="hidden" value="[@form:pgnum@]" />
 				<div class="form-row">
 					<label class="col-2 col-form-label" for="sortby">Sort</label>
 					<div class="col-10">
diff --git a/src/templates/cms/home.template.html b/src/templates/cms/home.template.html
index 4f859e27..6496c801 100644
--- a/src/templates/cms/home.template.html
+++ b/src/templates/cms/home.template.html
@@ -25,7 +25,7 @@
 				</section>
 			[%/param%]
 			[%param *ifempty%]
-				<a class="neto-placeholder neto-placeholder-rotator btn-loads" data-loading-text="<i class='fa fa-spinner fa-spin' style='font-size: 14px'></i>" href="[@config:home_url@]/_cpanel?item=adw&page=view&id=New&plan_id=1">
+				<a class="neto-placeholder neto-placeholder-rotator btn-loads" data-loading-text="<i class='fa fa-spinner fa-spin' style='font-size: 14px'></i>" href="[@config:home_url@]/_cpanel/adw/view?id=New&plan_id=1">
 					Click to add a banner<br/>
 				</a>
 			[%/param%]
diff --git a/src/templates/cms/includes/sidebar.template.html b/src/templates/cms/includes/sidebar.template.html
index da8617d8..e647c0be 100644
--- a/src/templates/cms/includes/sidebar.template.html
+++ b/src/templates/cms/includes/sidebar.template.html
@@ -114,7 +114,8 @@ <h3 class="h4 mb-0">
 								<p id="price-range"></p><p id="price-range-text" class="price_range"></p>
 								<form id="pricesearch" method="get" action="[@config:current_url@]">
 									<input type="hidden" name="rf" value="[%FILTER_CODE id:'price'%][%/FILTER_CODE%]">
-									<input  name="pr" type="hidden" value="">
+									<input name="pgnum" type="hidden" value="[@form:pgnum@]" />
+									<input name="pr" type="hidden" value="">
 									<input type="submit" value="Filter Price" class="btn btn-outline-secondary btn-sm" />
 									[%if [@selected@]%]<a href="[@remove_url@]" class="btn btn-outline-secondary btn-sm" rel="nofollow"> Clear</a>[%/if%]
 								</form>
diff --git a/src/templates/cms/search_results.template.html b/src/templates/cms/search_results.template.html
index 6a5214b9..44bb02b4 100644
--- a/src/templates/cms/search_results.template.html
+++ b/src/templates/cms/search_results.template.html
@@ -58,6 +58,7 @@ <h1>
 							</script>
 							<form method="get" name="viewForm" action="[@config:CURRENT_URL@]" class="hidden">
 								<input name="rf" type="hidden" value="[%filter_code/%]" >
+								<input name="pgnum" type="hidden" value="[@form:pgnum@]" />
 								<input name="viewby" type="hidden" value="" />
 							</form>
 							<div class="viewby btn-group">
@@ -71,6 +72,7 @@ <h1>
 						<div class="col-8 col-md-5 col-lg-4">
 							<form method="get" class="form-horizontal" action="[@config:CURRENT_URL@]">
 								<input name="rf" type="hidden" value="[%filter_code/%]" >
+								<input name="pgnum" type="hidden" value="[@form:pgnum@]" />
 								<div class="form-row">
 									<label class="col-2 col-form-label" for="sortby">Sort</label>
 									<div class="col-10">