From de984caf98c09a921db203e26b55ebefb57e5e50 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Wed, 4 Nov 2015 11:05:25 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/ticket_12649' into
 ticket_12649

PHPBB3-12649
---
 .../prosilver/template/display_options.html   |  2 +-
 .../styles/prosilver/template/mcp_forum.html  |  3 +-
 phpBB/styles/prosilver/template/mcp_logs.html |  5 ++-
 .../prosilver/template/mcp_notes_user.html    |  3 +-
 .../styles/prosilver/template/mcp_queue.html  |  3 +-
 .../prosilver/template/mcp_reports.html       |  4 +-
 .../prosilver/template/mcp_warn_list.html     |  3 +-
 .../prosilver/template/search_results.html    |  2 +-
 .../prosilver/template/ucp_attachments.html   |  3 +-
 .../prosilver/template/ucp_pm_viewfolder.html |  3 +-
 .../prosilver/template/viewforum_body.html    |  6 +++
 .../prosilver/template/viewtopic_body.html    |  2 +-
 phpBB/styles/prosilver/theme/buttons.css      | 40 +++++++++++++++----
 13 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html
index bf5663376a..d0f37f4daa 100644
--- a/phpBB/styles/prosilver/template/display_options.html
+++ b/phpBB/styles/prosilver/template/display_options.html
@@ -21,4 +21,4 @@
 			</fieldset>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 610d34acb8..147afff0f5 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -108,8 +108,9 @@
 		</ul>
 	<!-- ENDIF -->
 
-	<div class="action-bar bar-bottom">
+	<div class="action-bar bottom">
 		<!-- INCLUDE display_options.html -->
+
 		<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 62a8f7b42b..a50bd95ccd 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -51,8 +51,9 @@
 	</table>
 
 	<!-- IF .log -->
-		<div class="action-bar bar-bottom">
-		<!-- INCLUDE display_options.html -->
+		<div class="action-bar bottom">
+			<!-- INCLUDE display_options.html -->
+
 			<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 2811ddafc8..6a9d88389c 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -90,8 +90,9 @@
 	</tbody>
 	</table>
 
-	<div class="action-bar bar-bottom">
+	<div class="action-bar bottom">
 		<!-- INCLUDE display_options.html -->
+
 		<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 9d256746cf..ce58d110e1 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -73,9 +73,10 @@
 		<!-- END postrow -->
 		</ul>
 
-		<div class="action-bar bar-bottom">
+		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
+
 			<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 8f51027485..4131d9f2f3 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -79,10 +79,10 @@
 		<!-- END postrow -->
 		</ul>
 
-		<div class="action-bar bar-bottom">
+		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
-			
+
 			<div class="pagination">
 				{TOTAL_REPORTS}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index 278a4fa5b4..215e155d5c 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -43,8 +43,9 @@
 		</tbody>
 		</table>
 
-		<div class="action-bar bar-bottom">
+		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
+
 			<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 5be65cf8e4..858a7d3072 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -214,7 +214,7 @@
 	<form method="post" action="{S_SEARCH_ACTION}">
 		<!-- INCLUDE display_options.html -->
 	</form>
-	<!-- ENDIF -->
+		<!-- ENDIF -->
 
 	<div class="pagination">
 		{SEARCH_MATCHES}
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index acad0a44c8..9de08f17b9 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 bar-top">
+		<div class="action-bar top">
 			<div class="pagination">
 				{NUM_ATTACHMENTS}
 				<!-- IF .pagination --> 
@@ -52,6 +52,7 @@
 
 		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
+			{S_FORM_TOKEN}
 
 			<div class="pagination">
 				{TOTAL_ATTACHMENTS} {L_TITLE}
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 11cc2b95ec..a3d58c8749 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -107,9 +107,10 @@
 	
 		<hr />
 	
-		<div class="action-bar bar-bottom">
+		<div class="action-bar bottom">
 			<!-- INCLUDE display_options.html -->
 			<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
+
 			<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 d5eb0c1598..3355765561 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -270,6 +270,12 @@
 			</form>
 		<!-- ENDIF -->
 
+		<!-- IF S_SELECT_SORT_DAYS and not S_IS_BOT -->
+			<form method="post" action="{S_FORUM_ACTION}">
+			<!-- INCLUDE display_options.html -->
+			</form>
+		<!-- ENDIF -->
+
 		<div class="pagination">
 			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
 			{TOTAL_TOPICS}
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index dc487e3e4d..cd7e5e0b92 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -397,7 +397,7 @@
 		<!-- INCLUDE display_options.html -->
 		</form>
 	<!-- ENDIF -->
-	
+
 	<!-- IF .quickmod -->
 	<div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
 		<span title="{L_QUICK_MOD}" class="button button-secondary dropdown-trigger dropdown-select">
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 856aa31699..94371f34ce 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -53,15 +53,41 @@
 	border-radius: 0 4px 4px 0;
 }
 
-.search-header .button-search,
-.search-header .button-search-end {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	padding: 3px 5px;
+.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before, .sort-icon:before {
+	background-position: -80px 0;
+	height: 16px;
+	margin-top: 2px;
+	width: 16px;
 }
 
-.search-header .button-search-end {
-	border-right-width: 0;
+.dropdown-visible .tools-icon:before,
+.nojs .dropdown-container:hover .tools-icon:before			{ background-position: -80px -20px; }
+
+.sort-icon:before											{ background-position: -265px 0; }
+.dropdown-visible .sort-icon:before,
+.nojs .dropdown-container:hover .sort-icon:before			{ background-position: -265px -20px; }
+
+.search-icon:before											{ background-position: -245px 0; }
+.search-icon:hover:before									{ background-position: -245px -20px; }
+
+.search-adv-icon:before										{ background-position: -265px 0; }
+.search-adv-icon:hover:before								{ background-position: -265px -20px; }
+
+.modtools-icon:before										{ background-position: -225px 0; }
+.dropdown-visible .modtools-icon:before,
+.nojs .dropdown-container:hover .modtools-icon:before		{ background-position: -225px -20px; }
+
+/* Icon images
+---------------------------------------- */
+.small-icon {
+	background-position: 0 50%;
+	background-repeat: no-repeat;
+	background-image: none;
+}
+
+.small-icon > a {
+	display: inline-block;
+	padding: 0 0 0 18px;
 }
 
 .sort-icon:before {