From f6ee0152edff08023c33c2ecb49a0251d2926408 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 13 Jun 2014 14:53:45 +0200
Subject: [PATCH] [ticket/12613] Add distinction between top/bottom action-bar

PHPBB3-12613
---
 phpBB/styles/prosilver/template/mcp_forum.html             | 4 ++--
 phpBB/styles/prosilver/template/mcp_logs.html              | 4 ++--
 phpBB/styles/prosilver/template/mcp_notes_user.html        | 4 ++--
 phpBB/styles/prosilver/template/mcp_queue.html             | 4 ++--
 phpBB/styles/prosilver/template/mcp_reports.html           | 4 ++--
 phpBB/styles/prosilver/template/mcp_topic.html             | 2 +-
 phpBB/styles/prosilver/template/mcp_warn_list.html         | 4 ++--
 phpBB/styles/prosilver/template/memberlist_body.html       | 4 ++--
 phpBB/styles/prosilver/template/search_results.html        | 4 ++--
 phpBB/styles/prosilver/template/ucp_attachments.html       | 4 ++--
 phpBB/styles/prosilver/template/ucp_groups_manage.html     | 2 +-
 phpBB/styles/prosilver/template/ucp_main_bookmarks.html    | 2 +-
 phpBB/styles/prosilver/template/ucp_main_subscribed.html   | 2 +-
 phpBB/styles/prosilver/template/ucp_notifications.html     | 4 ++--
 phpBB/styles/prosilver/template/ucp_pm_message_header.html | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewfolder.html     | 2 +-
 phpBB/styles/prosilver/template/viewforum_body.html        | 4 ++--
 phpBB/styles/prosilver/template/viewonline_body.html       | 4 ++--
 phpBB/styles/prosilver/template/viewtopic_body.html        | 4 ++--
 phpBB/styles/prosilver/theme/common.css                    | 4 ++--
 20 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 20139a203b..c9f81a4099 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -10,7 +10,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<div class="action-bar">
+	<div class="action-bar top">
 		<div class="pagination">
 			{TOTAL_TOPICS}
 			<!-- IF .pagination --> 
@@ -101,7 +101,7 @@
 
 	<hr />
 
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_TOPICS}
 			<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 5a3404f00a..eaa3838f17 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -7,7 +7,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<div class="action-bar">
+	<div class="action-bar top">
 		{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}" />
 		<div class="pagination">
 			{TOTAL}
@@ -60,7 +60,7 @@
 
 		<hr />
 
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 190e33d8c7..ec317b141a 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -50,7 +50,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<div class="action-bar">
+	<div class="action-bar top">
 		{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}" />
 		<div class="pagination">
 			{TOTAL_REPORTS}
@@ -100,7 +100,7 @@
 
 	<hr />
 
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_REPORTS}
 			<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index baef7dd77a..864b231142 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -16,7 +16,7 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<div class="action-bar">
+		<div class="action-bar top">
 			<div class="pagination">
 				{TOTAL}
 				<!-- IF .pagination --> 
@@ -82,7 +82,7 @@
 
 		<hr />
 
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index 25366da04e..24c0479f63 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -18,7 +18,7 @@
 	<p>{L_EXPLAIN}</p>
 
 	<!-- IF .postrow -->
-		<div class="action-bar">
+		<div class="action-bar top">
 			<div class="pagination">
 				{TOTAL_REPORTS}
 				<!-- IF .pagination --> 
@@ -88,7 +88,7 @@
 
 		<hr />
 
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL_REPORTS}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 593cb2d490..a83b42dba0 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -150,7 +150,7 @@
 
 	<hr />
 
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_POSTS}
 			<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index b481a8fb83..d0e80a1479 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -10,7 +10,7 @@
 	<p>{L_WARNED_USERS_EXPLAIN}</p>
 
 	<!-- IF .user -->
-		<div class="action-bar">
+		<div class="action-bar top">
 			<div class="pagination">
 				{TOTAL_USERS}
 				<!-- IF .pagination --> 
@@ -51,7 +51,7 @@
 
 		<hr />
 
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL_USERS}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 07b525eed3..512df7b0a7 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -23,7 +23,7 @@
 	<!-- ELSE -->
 		<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2>
 
-		<div class="action-bar">
+		<div class="action-bar top">
 			<div class="member-search panel">
 				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}" id="member_search" data-alt-text="{LA_HIDE_MEMBER_SEARCH}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}" id="member_search" data-alt-text="{LA_FIND_USERNAME}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
 				<strong>
@@ -141,7 +141,7 @@
 
 </form>
 
-<div class="action-bar">
+<div class="action-bar bottom">
 	<div class="pagination">
 		{TOTAL_USERS}
 		<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 9d6c25b177..47aa8d85de 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -14,7 +14,7 @@
 <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->
 	<form method="post" action="{S_SEARCH_ACTION}">
 
-	<div class="action-bar">
+	<div class="action-bar top">
 
 	<!-- IF SEARCH_MATCHES -->
 		<div class="search-box">
@@ -176,7 +176,7 @@
 <!-- ENDIF -->
 
 <!-- IF .pagination or .searchresults or PAGE_NUMBER -->
-<div class="action-bar">
+<div class="action-bar bottom">
 	<div class="pagination">
 		{SEARCH_MATCHES}
 		<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 5b5763fb6e..ddbf892dee 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -10,7 +10,7 @@
 	<p>{L_ATTACHMENTS_EXPLAIN}</p>
 
 	<!-- IF .attachrow -->
-		<div class="action-bar">
+		<div class="action-bar top">
 			<div class="pagination">
 				{TOTAL_ATTACHMENTS} {L_TITLE}
 				<!-- IF .pagination --> 
@@ -59,7 +59,7 @@
 
 		<hr />
 
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL_ATTACHMENTS} {L_TITLE}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 393f336dea..3b805c4862 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -160,7 +160,7 @@
 	</table>
 
 	<!-- IF .pagination -->
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination"> 
 			<!-- INCLUDE pagination.html -->
 		</div>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 35236771c5..f74728bdb3 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -76,7 +76,7 @@
 	<!-- END topicrow -->
 	</ul>
 
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_TOPICS}
 			<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index c9d7cd989c..ef03317578 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -110,7 +110,7 @@
 	<!-- END topicrow -->
 	</ul>
 
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<div class="pagination">
 			{TOTAL_TOPICS}
 			<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 85ec046e16..8910769cce 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -42,7 +42,7 @@
 			</table>
 		<!-- ELSE -->
 			<!-- IF .notification_list -->
-				<div class="action-bar">
+				<div class="action-bar top">
 					<div class="pagination">
 						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
 						{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
@@ -89,7 +89,7 @@
 				</ul>
 			</div>
 
-			<div class="action-bar">
+			<div class="action-bar bottom">
 				<div class="pagination">
 					{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
 					<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index ce86c3c138..d777de908d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -6,7 +6,7 @@
 	<div class="inner">
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
 
-	<div class="action-bar">
+	<div class="action-bar top">
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
 			<!-- IF U_POST_REPLY_PM -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 01e426841e..d93a62282e 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -104,7 +104,7 @@
 	
 		<hr />
 	
-		<div class="action-bar">
+		<div class="action-bar bottom">
 			<div class="pagination">
 				{TOTAL_MESSAGES}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index aa92a235c5..c44e830b9c 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -35,7 +35,7 @@
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
-	<div class="action-bar" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
+	<div class="action-bar top" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
@@ -220,7 +220,7 @@
 <!-- ENDIF -->
 
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
-	<div class="action-bar">
+	<div class="action-bar bottom">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 			<div class="buttons">
 				<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index 54d57ce1ed..ee1672c6c9 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -3,7 +3,7 @@
 <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>
 
-<div class="action-bar">
+<div class="action-bar top">
 	<div class="pagination">
 		<!-- IF .pagination --> 
 			<!-- INCLUDE pagination.html -->
@@ -49,7 +49,7 @@
 
 <!-- IF LEGEND --><p><em>{L_LEGEND}{L_COLON} {LEGEND}</em></p><!-- ENDIF -->
 
-<div class="action-bar">
+<div class="action-bar bottom">
 	<div class="pagination">
 		<!-- IF .pagination --> 
 			<!-- INCLUDE pagination.html -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 1d68a95cd4..b9cdf03599 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -25,7 +25,7 @@
 	</div>
 <!-- ENDIF -->
 
-<div class="action-bar">
+<div class="action-bar top">
 
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
@@ -337,7 +337,7 @@
 <!-- ENDIF -->
 
 <!-- EVENT viewtopic_body_topic_actions_before -->
-<div class="action-bar">
+<div class="action-bar bottom">
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
 		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 62aecf4607..aa28cd6962 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -825,8 +825,8 @@ fieldset.fields1 dl.pmlist dd.recipients {
 	width: auto;
 }
 
-.pagination img {
-	vertical-align: middle;
+.action-bar.bottom .pagination {
+	margin-top: 0;
 }
 
 .pagination > ul {