From 5d7f67105b3075d6b771eccc5b19ff983668f7d1 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Sun, 1 Nov 2015 06:51:03 -0500
Subject: [PATCH] [ticket/12649] Change sort & display options in footers to
 dropdown menu

PHPBB3-12649
---
 phpBB/language/en/common.php                  |  2 ++
 .../prosilver/template/display_options.html   | 24 +++++++++++++++++++
 .../styles/prosilver/template/mcp_forum.html  | 11 ++-------
 phpBB/styles/prosilver/template/mcp_logs.html | 11 ++-------
 .../prosilver/template/mcp_notes_user.html    | 12 ++--------
 .../styles/prosilver/template/mcp_queue.html  | 12 +++-------
 .../prosilver/template/mcp_reports.html       | 12 +++-------
 .../prosilver/template/mcp_warn_list.html     | 10 ++------
 .../prosilver/template/search_results.html    | 24 +++++--------------
 .../prosilver/template/ucp_attachments.html   | 12 +++-------
 .../prosilver/template/ucp_pm_viewfolder.html | 13 +++-------
 .../prosilver/template/viewforum_body.html    | 20 +++++-----------
 .../prosilver/template/viewtopic_body.html    | 20 +++++-----------
 phpBB/styles/prosilver/theme/bidi.css         |  8 +++----
 phpBB/styles/prosilver/theme/buttons.css      |  6 ++++-
 phpBB/styles/prosilver/theme/common.css       |  4 ----
 phpBB/styles/prosilver/theme/forms.css        | 18 ++++++++++++++
 17 files changed, 91 insertions(+), 128 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/display_options.html

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47e04d9360..a065c23ac0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -693,8 +693,10 @@ $lang = array_merge($lang, array(
 	'SORRY_AUTH_READ'			=> 'You are not authorised to read this forum.',
 	'SORRY_AUTH_VIEW_ATTACH'	=> 'You are not authorised to download this attachment.',
 	'SORT_BY'					=> 'Sort by',
+	'SORT_DIRECTION'			=> 'Direction',
 	'SORT_JOINED'				=> 'Joined date',
 	'SORT_LOCATION'				=> 'Location',
+	'SORT_OPTIONS'				=> 'Display and sorting options',
 	'SORT_RANK'					=> 'Rank',
 	'SORT_POSTS'				=> 'Posts',
 	'SORT_TOPIC_TITLE'			=> 'Topic title',
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html
new file mode 100644
index 0000000000..d0f37f4daa
--- /dev/null
+++ b/phpBB/styles/prosilver/template/display_options.html
@@ -0,0 +1,24 @@
+<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools">
+	<span title="{L_SORT_OPTIONS}" class="button icon-button sort-icon dropdown-trigger dropdown-select"></span>
+	<div class="dropdown hidden">
+		<div class="pointer"><div class="pointer-inner"></div></div>
+		<div class="dropdown-contents">
+			<fieldset class="display-options">
+			<!-- IF S_SORT_OPTIONS -->
+				<label>{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>
+				<label>{L_SORT_DIRECTION}{L_COLON} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
+				<hr class="dashed" />
+				<input type="submit" class="button2" name="sort" value="{L_SORT}" />
+			<!-- ELSE -->
+				<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
+				<!-- IF S_SELECT_SORT_KEY -->
+				<label>{L_SORT_BY}{L_COLON} {S_SELECT_SORT_KEY}</label>
+				<label>{L_SORT_DIRECTION}{L_COLON} {S_SELECT_SORT_DIR}</label>
+				<!-- ENDIF -->
+				<hr class="dashed" />
+				<input type="submit" class="button2" name="sort" value="{L_GO}" />
+			<!-- ENDIF -->
+			</fieldset>
+		</div>
+	</div>
+</div>
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 9b472ccd30..ed9ab17dfc 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -97,16 +97,9 @@
 		</ul>
 	<!-- ENDIF -->
 
-	<fieldset class="display-options">
-		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<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 />
-
 	<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 4f74085968..097a680837 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -51,16 +51,9 @@
 	</table>
 
 	<!-- IF .log -->
-		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-			<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 />
-
 		<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 3e8d47eb9d..2af95701bc 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -90,17 +90,9 @@
 	</tbody>
 	</table>
 
-	<hr />
-
-	<fieldset class="display-options">
-		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<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 />
-
 	<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 864b231142..b95fb559f2 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -73,16 +73,10 @@
 		<!-- END postrow -->
 		</ul>
 
-		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- 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 />
-
 		<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 24c0479f63..48a9cc11fc 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -79,16 +79,10 @@
 		<!-- END postrow -->
 		</ul>
 
-		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
-			<!-- 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 />
-
 		<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 d0e80a1479..5fe43dd3ce 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -43,15 +43,9 @@
 		</tbody>
 		</table>
 
-		<fieldset class="display-options">
-			<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-			<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 />
-
 		<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 57d80bd804..58544d0328 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -165,24 +165,13 @@
 	<!-- END searchresults -->
 <!-- ENDIF -->
 
-<!-- IF .pagination or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->
-	<form method="post" action="{S_SEARCH_ACTION}">
-
-	<fieldset class="display-options">
-		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
-			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label>
-			<input type="submit" name="sort" value="{L_GO}" class="button2" />
-		<!-- ENDIF -->
-	</fieldset>
-
-	</form>
-
-	<hr />
-<!-- ENDIF -->
-
-<!-- IF .pagination or .searchresults or PAGE_NUMBER -->
 <div class="action-bar bottom">
+	<!-- IF .searchresults and (S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY) -->
+	<form method="post" action="{S_SEARCH_ACTION}">
+		<!-- INCLUDE display_options.html -->
+	</form>
+		<!-- ENDIF -->
+
 	<div class="pagination">
 		{SEARCH_MATCHES}
 		<!-- IF .pagination -->
@@ -192,7 +181,6 @@
 		<!-- 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 1d4963273c..9de08f17b9 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -50,16 +50,10 @@
 		<!-- END attachrow -->
 		</ul>
 
-		<fieldset class="display-options">
-			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
-			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
-			<input class="button2" type="submit" name="sort" value="{L_SORT}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-
-		<hr />
-
 		<div class="action-bar bottom">
+			<!-- INCLUDE display_options.html -->
+			{S_FORM_TOKEN}
+
 			<div class="pagination">
 				{TOTAL_ATTACHMENTS} {L_TITLE}
 				<!-- IF .pagination --> 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 47e4d1c63a..93a5adec4c 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -105,6 +105,9 @@
 		<hr />
 	
 		<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 --> 
@@ -119,16 +122,6 @@
 		</div>
 	</div>
 
-	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
-	<fieldset class="display-options">
-		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<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" />
-		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
-	</fieldset>
-	<!-- ENDIF -->
-
 	<!-- INCLUDE ucp_pm_message_footer.html -->
 <!-- ENDIF -->
 <!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 087cf668cf..2a7db4e231 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -217,20 +217,6 @@
 	<!-- ENDIF -->
 <!-- END topicrow -->
 
-<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
-	<form method="post" action="{S_FORUM_ACTION}">
-		<fieldset class="display-options">
-	<!-- IF not S_IS_BOT -->
-			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-			<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" />
-	<!-- ENDIF -->
-		</fieldset>
-	</form>
-	<hr />
-<!-- ENDIF -->
-
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
 	<div class="action-bar bottom">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
@@ -245,6 +231,12 @@
 			</div>
 		<!-- 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 07215708a9..9f0d624b1c 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -343,19 +343,6 @@
 	<!-- INCLUDE quickreply_editor.html -->
 <!-- ENDIF -->
 
-<!-- IF S_NUM_POSTS > 1 or .pagination -->
-	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
-	<fieldset class="display-options" style="margin-top: 0; ">
-		<!-- IF not S_IS_BOT -->
-		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<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" />
-		<!-- ENDIF -->
-	</fieldset>
-	</form>
-	<hr />
-<!-- ENDIF -->
-
 <!-- EVENT viewtopic_body_topic_actions_before -->
 <div class="action-bar bottom">
 	<div class="buttons">
@@ -372,6 +359,12 @@
 
 	<!-- INCLUDE viewtopic_topic_tools.html -->
 
+	<!-- IF (S_NUM_POSTS > 1 or .pagination) and not S_IS_BOT  -->
+		<form method="post" action="{S_TOPIC_ACTION}">
+		<!-- INCLUDE display_options.html -->
+		</form>
+	<!-- ENDIF -->
+
 	<!-- IF .quickmod -->
 		<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
 			<span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span>
@@ -399,7 +392,6 @@
 			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
-	<div class="clear"></div>
 </div>
 
 <!-- EVENT viewtopic_body_footer_before -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f3468ebcf2..e444416b80 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -88,10 +88,6 @@
 
 /* Dropdown menu
 ---------------------------------------- */
-.rtl .dropdown-container.topic-tools {
-	float: right;
-}
-
 .rtl .dropdown li {
 	text-align: right;
 }
@@ -910,6 +906,10 @@ li.breadcrumbs span:first-child > a {
 	padding-right: 0;
 }
 
+.rtl .dropdown fieldset.display-options label {
+	text-align: left;
+}
+
 /* Display actions for ucp and mcp pages */
 .rtl fieldset.display-actions {
 	text-align: left;
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index a816c7f7f2..aa041066da 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -82,7 +82,7 @@
 	font-size: 0;
 }
 
-.tools-icon:before, .modtools-icon:before, .search-icon:before, .search-adv-icon:before {
+.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;
@@ -92,6 +92,10 @@
 .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; }
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 5dd5ecdb28..66604e58e8 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -455,10 +455,6 @@ ul.linklist.bulletin > li.no-bulletin:before {
 	top: auto;
 }
 
-.dropdown-container.topic-tools {
-	float: left;
-}
-
 .dropdown-up .dropdown {
 	top: auto;
 	bottom: 1.2em;
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 777f011c35..167fc81854 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -177,6 +177,24 @@ fieldset.display-options a {
 	margin-top: 3px;
 }
 
+.dropdown fieldset.display-options {
+	font-size: 1em;
+	margin: 0;
+	padding: 0;
+}
+
+.dropdown fieldset.display-options label {
+	display: block;
+	margin: 4px;
+	padding: 0;
+	text-align: right;
+	white-space: nowrap;
+}
+
+.dropdown fieldset.display-options select {
+	min-width: 120px;
+}
+
 /* Display actions for ucp and mcp pages */
 fieldset.display-actions {
 	text-align: right;