From 09a433be619a1743f4618f1fcc00757ee6895c6e Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 3 Jun 2014 16:30:05 +0200
Subject: [PATCH] [ticket/12613] Pagination should never be in responsive
 linklist

PHPBB3-12613
---
 .../styles/prosilver/template/mcp_forum.html  | 40 +++++++++----------
 phpBB/styles/prosilver/template/mcp_logs.html | 33 ++++++++-------
 .../prosilver/template/mcp_notes_user.html    | 32 ++++++++-------
 .../styles/prosilver/template/mcp_queue.html  | 30 ++++++++------
 .../prosilver/template/mcp_reports.html       | 31 ++++++++------
 .../styles/prosilver/template/mcp_topic.html  | 16 ++++----
 .../prosilver/template/mcp_warn_list.html     | 32 +++++++++------
 .../prosilver/template/memberlist_body.html   | 18 +++++----
 .../prosilver/template/search_results.html    | 21 +++++-----
 .../prosilver/template/ucp_attachments.html   | 30 ++++++++------
 .../prosilver/template/ucp_groups_manage.html | 16 ++++----
 .../template/ucp_main_bookmarks.html          | 16 +++++---
 .../template/ucp_main_subscribed.html         | 20 ++++++----
 .../prosilver/template/ucp_notifications.html |  4 +-
 .../template/ucp_pm_message_header.html       | 15 +++----
 .../prosilver/template/ucp_pm_viewfolder.html | 36 ++++++++---------
 .../prosilver/template/viewonline_body.html   | 16 ++++----
 phpBB/styles/prosilver/theme/content.css      | 12 +++++-
 phpBB/styles/prosilver/theme/cp.css           |  4 +-
 phpBB/styles/prosilver/theme/responsive.css   |  4 +-
 20 files changed, 236 insertions(+), 190 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 02c6edb05b..8c584e3dd7 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -11,16 +11,16 @@
 	<div class="inner">
 
 	<!-- IF .pagination or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
-				<!-- IF .pagination --> 
-					<!-- INCLUDE pagination.html -->
-				<!-- ELSE --> 
-					{PAGE_NUMBER}
-				<!-- ENDIF -->
-			</li>
-		</ul>
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF .pagination --> 
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 	<!-- ENDIF -->
 
 	<!-- IF .topicrow -->
@@ -104,16 +104,16 @@
 	<hr />
 
 	<!-- IF .pagination or TOTAL_TOPICS -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
-				<!-- IF .pagination --> 
-					<!-- INCLUDE pagination.html -->
-				<!-- ELSE --> 
-					{PAGE_NUMBER}
-				<!-- ENDIF -->
-			</li>
-		</ul>
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF .pagination --> 
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+	</div>
 	<!-- ENDIF -->
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 0aba36b8fd..c046d59ef3 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -7,19 +7,19 @@
 <div class="panel">
 	<div class="inner">
 
-	<ul class="linklist">
-		<li class="leftside">
-			{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
-		</li>
-		<li class="rightside pagination">
-			<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF -->
+	<div class="action-bar">
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		<!-- IF .pagination or TOTAL -->
+		<div class="pagination">
+			<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
 			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE --> 
-				{PAGE_NUMBER}
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+		<!-- ENDIF -->
+	</div>
 
 	<table class="table1">
 	<thead>
@@ -62,16 +62,19 @@
 
 		<hr />
 
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 		{S_FORM_TOKEN}
 		</div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 127cf7cb08..f3492f89e6 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -50,19 +50,19 @@
 <div class="panel">
 	<div class="inner">
 
-	<ul class="linklist">
-		<li class="leftside">
-			{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
-		</li>
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} &bull; <!-- ENDIF -->
+	<div class="action-bar">
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		<!-- IF .pagination or TOTAL_REPORTS -->
+		<div class="pagination">
+			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
 			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE --> 
-				{PAGE_NUMBER}
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+		<!-- ENDIF -->
+	</div>
 
 	<table class="table1">
 	<thead>
@@ -102,16 +102,18 @@
 
 	<hr />
 
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} &bull; <!-- ENDIF -->
+	<!-- IF .pagination or TOTAL_REPORTS -->
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
 			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE --> 
-				{PAGE_NUMBER}
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+	</div>
+	<!-- ENDIF -->
 
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index 4cee8c0094..86922b5a41 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -16,16 +16,19 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL --> {TOTAL} &bull; <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 		<ul class="topiclist missing-column">
 			<li class="header">
 				<dl>
@@ -81,16 +84,19 @@
 
 		<hr />
 
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL} &bull; <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL -->{TOTAL}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 	<!-- ELSE -->
 		<p class="notopics"><strong>
 			<!-- IF S_RESTORE -->
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index 62edf22958..05ffe97f16 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -18,16 +18,19 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS} &bull; <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL_REPORTS -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 		<ul class="topiclist missing-column">
 			<li class="header">
 				<dl>
@@ -84,17 +87,21 @@
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		</fieldset>
+
 		<hr />
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL -->{TOTAL_REPORTS} &bull; <!-- ENDIF -->
+
+		<!-- IF .pagination or TOTAL_REPORTS -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL -->{TOTAL_REPORTS}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
 
 	<!-- ELSE -->
 		<p><strong>{L_NO_REPORTS}</strong></p>
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 19ee123eba..3654f15adc 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -151,16 +151,16 @@
 	<hr />
 
 	<!-- IF .pagination or TOTAL_POSTS -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_POSTS --> {TOTAL_POSTS} &bull; <!-- ENDIF -->
-			<!-- IF .pagination -->
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_POSTS -->{TOTAL_POSTS}<!-- ENDIF -->
+			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				{PAGE_NUMBER}
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+	</div>
 	<!-- ENDIF -->
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index 731c945fe6..585dd97a73 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -10,17 +10,19 @@
 	<p>{L_WARNED_USERS_EXPLAIN}</p>
 
 	<!-- IF .user -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull;  <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL_USERS -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
-		
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 		<table class="table1">
 		<thead>
 			<tr>
@@ -48,18 +50,22 @@
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
 			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		</fieldset>
+
 		<hr />
 
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull;  <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL_USERS -->
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 	<!-- ELSE -->
 		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 9891ec71ce..60fbbf4975 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -150,16 +150,18 @@
 
 <hr />
 
-<ul class="linklist">
-	<li class="rightside pagination">{TOTAL_USERS}
-		<!-- IF .pagination -->
-			&bull;
+<!-- IF .pagination or TOTAL_USERS -->
+<div class="action-bar">
+	<div class="pagination">
+		{TOTAL_USERS}
+		<!-- IF .pagination --> 
 			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			{PAGE_NUMBER}
+		<!-- ELSE --> 
+			 &bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
-	</li>
-</ul>
+	</div>
+</div>
+<!-- ENDIF -->
 
 <!-- IF S_IN_SEARCH_POPUP -->
 	<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 9e770a2d66..c6a6dcc4f5 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -177,17 +177,16 @@
 <!-- ENDIF -->
 
 <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
-	<ul class="linklist">
-		<li class="rightside pagination">
-			{SEARCH_MATCHES}
-			<!-- IF .pagination -->
-				&bull;
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				{PAGE_NUMBER}
-			<!-- ENDIF -->
-		</li>
-	</ul>
+<div class="action-bar">
+	<div class="rightside pagination">
+		{SEARCH_MATCHES}
+		<!-- IF .pagination --> 
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE --> 
+			 &bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+</div>
 <!-- ENDIF -->
 
 <!-- INCLUDE jumpbox.html -->
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 587e3eaed5..974d3e53b7 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -10,16 +10,19 @@
 	<p>{L_ATTACHMENTS_EXPLAIN}</p>
 
 	<!-- IF .attachrow -->
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} &bull; <!-- ENDIF -->
+
+		<!-- IF .pagination or TOTAL_ATTACHMENTS -->
+		<div class="action-bar">
+			<div class="rightside pagination">
+				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>	
+			</div>
+		</div>
+		<!-- ENDIF -->
 		
 		<ul class="topiclist">
 			<li class="header">
@@ -59,16 +62,19 @@
 
 		<hr />
 		
-		<ul class="linklist">
-			<li class="rightside pagination">
-				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE} &bull; <!-- ENDIF -->
+		<!-- IF .pagination or TOTAL_ATTACHMENTS -->
+		<div class="action-bar">
+			<div class="rightside pagination">
+				<!-- IF TOTAL_ATTACHMENTS -->{TOTAL_ATTACHMENTS} {L_TITLE}<!-- ENDIF -->
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE --> 
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
-			</li>
-		</ul>
+			</div>
+		</div>
+		<!-- ENDIF -->
+
 	<!-- ELSE -->
 		<p><strong>{L_UCP_NO_ATTACHMENTS}</strong></p>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index df80135acb..16e80ae206 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -159,15 +159,13 @@
 	</tbody>
 	</table>
 
-	<ul class="linklist">
-		<li class="leftside pagination">
-			<!-- IF .pagination --> 
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE --> 
-				{PAGE_NUMBER}
-			<!-- ENDIF -->
-		</li>
-	</ul>
+	<!-- IF .pagination -->
+	<div class="action-bar">
+		<div class="rightside pagination"> 
+			<!-- INCLUDE pagination.html -->
+		</div>
+	</div>
+	<!-- ENDIF -->
 
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index b9e3c16524..c68b05d09f 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -75,16 +75,20 @@
 		</li>
 	<!-- END topicrow -->
 	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
+
+	<!-- IF .pagination or TOTAL_TOPICS -->
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
 			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE --> 
-				{PAGE_NUMBER}
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+	</div>
+	<!-- ENDIF -->
+
 <!-- ELSE -->
 	<p><strong>{L_NO_BOOKMARKS}</strong></p>
 <!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 74ab5226cb..936d653947 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -109,16 +109,20 @@
 		</li>
 	<!-- END topicrow -->
 	</ul>
-	<ul class="linklist">
-		<li class="rightside pagination">
-			<!-- IF TOTAL_TOPICS --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
-			<!-- IF .pagination -->
+
+	<!-- IF .pagination or TOTAL_TOPICS -->
+	<div class="action-bar">
+		<div class="pagination">
+			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS}<!-- ENDIF -->
+			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				{PAGE_NUMBER}
+			<!-- ELSE --> 
+				 &bull; {PAGE_NUMBER}
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
+	</div>
+	<!-- ENDIF -->
+
 <!-- ELSEIF S_TOPIC_NOTIFY -->
     <ul class="topiclist">
         <li class="header">
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index b400a3c8b1..a6412e09e7 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -94,11 +94,11 @@
 			<!-- IF .pagination or TOTAL_COUNT -->
 				<div class="topic-actions">
 					<div class="pagination">
-						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF -->
+						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]<!-- ENDIF -->
 						<!-- IF .pagination -->
 							<!-- INCLUDE pagination.html -->
 						<!-- ELSE -->
-							{PAGE_NUMBER}
+							  &bull; {PAGE_NUMBER}
 						<!-- ENDIF -->
 					</div>
 				</div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 56e27811c6..213f31d521 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -4,8 +4,9 @@
 
 <div class="panel">
 	<div class="inner">
-
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
+
+	<div class="topic-actions">
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
 			<!-- IF U_POST_REPLY_PM -->
@@ -43,17 +44,17 @@
 	<!-- ENDIF -->
 
 	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-	<ul class="linklist">
-		<li class="rightside pagination">
+		<div class="rightside pagination">
 			<!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a><!-- ENDIF -->
+	
 			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF -->
+				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
 				<!-- IF .pagination -->
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE -->
-					{PAGE_NUMBER}
+					 &bull; {PAGE_NUMBER}
 				<!-- ENDIF -->
 			<!-- ENDIF -->
-		</li>
-	</ul>
+		</div>
 	<!-- ENDIF -->
+	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index d51676b5aa..6009ab70f7 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -96,26 +96,26 @@
 	<!-- ENDIF -->
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-actions">
-		<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-		<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
-		<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
-	</fieldset>
-
-	<hr />
-
-	<ul class="linklist">
+		<fieldset class="display-actions">
+			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
+			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
+			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
+		</fieldset>
+	
+		<hr />
+	
 		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-		<li class="rightside pagination">
-			<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF -->
-			<!-- IF .pagination --> 
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE --> 
-				{PAGE_NUMBER}
-			<!-- ENDIF -->
-		</li>
+		<div class="action-bar">
+			<div class="pagination">
+				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES}<!-- ENDIF -->
+				<!-- IF .pagination --> 
+					<!-- INCLUDE pagination.html -->
+				<!-- ELSE --> 
+					 &bull; {PAGE_NUMBER}
+				<!-- ENDIF -->
+			</div>
+		</div>
 		<!-- ENDIF -->
-	</ul>
 	<!-- ENDIF -->
 
 		</div>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index a8fb6424b6..54d57ce1ed 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -3,15 +3,15 @@
 <h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>
 <p>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> &bull; <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a><!-- ENDIF --></p>
 
-<ul class="linklist">
-	<li class="rightside pagination">
+<div class="action-bar">
+	<div class="pagination">
 		<!-- IF .pagination --> 
 			<!-- INCLUDE pagination.html -->
 		<!-- ELSE --> 
 			{PAGE_NUMBER}
 		<!-- ENDIF -->
-	</li>
-</ul>
+	</div>
+</div>
 
 <div class="forumbg forumbg-table">
 	<div class="inner">
@@ -49,15 +49,15 @@
 
 <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->
 
-<ul class="linklist">
-	<li class="rightside pagination">
+<div class="action-bar">
+	<div class="pagination">
 		<!-- IF .pagination --> 
 			<!-- INCLUDE pagination.html -->
 		<!-- ELSE --> 
 			{PAGE_NUMBER}
 		<!-- ENDIF -->
-	</li>
-</ul>
+	</div>
+</div>
 
 <!-- INCLUDE jumpbox.html -->
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 8c1c2c3926..1956a61f8e 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -238,8 +238,18 @@ div[class].topic-actions {
 }
 
 .topic-actions:after {
-	content: '';
 	clear: both;
+	content: '';
+	display: block;
+}
+
+.action-bar {
+	margin: 4px 0;
+}
+
+.action-bar:after {
+	clear: both;
+	content: '';
 	display: block;
 }
 
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 61df82c0ce..59887de302 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -60,9 +60,7 @@ ul.cplist {
 }
 
 #cp-main .pagination {
-	float: right;
-	width: auto;
-	padding-top: 1px;
+	margin: 0;
 }
 
 #cp-main .postbody p {
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index aee6b422ce..a587dd3ee4 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -509,11 +509,11 @@ fieldset.display-actions {
 		margin: 0;
 	}
 
-	.topic-actions > .pagination, fieldset.jumpbox {
+	.topic-actions > .pagination, fieldset.jumpbox, .action-bar > .pagination {
 		text-align: center;
 	}
 
-	.topic-actions > .pagination {
+	.topic-actions > .pagination, .action-bar > .pagination {
 		float: none;
 		clear: both;
 		padding-bottom: 1px;