makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4015 from RMcGirr83/ticket_12649

Browse source 
[ticket/12649] Change sort & display options in footers to dropdown menu
This commit is contained in:
Marc Alexander 2015-11-25 13:39:58 +01:00
commit 4f0ecb0180
15 changed files with 100 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/common.php
View file

@ -698,8 +698,10 @@ $lang = array_merge($lang, array(
'SORRY_AUTH_READ_TOPIC' => 'You are not authorised to read this topic.',
'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',

27
phpBB/styles/prosilver/template/display_options.html Normal file
View file

@ -0,0 +1,27 @@
<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools">
<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select">
<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i>
<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>
</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>

11
phpBB/styles/prosilver/template/mcp_forum.html
View file

@ -108,16 +108,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>
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_TOPICS}
<!-- IF .pagination -->

11
phpBB/styles/prosilver/template/mcp_logs.html
View file

@ -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>
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL}
<!-- IF .pagination -->

12
phpBB/styles/prosilver/template/mcp_notes_user.html
View file

@ -90,17 +90,9 @@
</tbody>
</table>
<hr />
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
<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 bar-bottom">
<div class="pagination">
{TOTAL_REPORTS}
<!-- IF .pagination -->

12
phpBB/styles/prosilver/template/mcp_queue.html
View file

@ -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>
<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 -->
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL}
<!-- IF .pagination -->

12
phpBB/styles/prosilver/template/mcp_reports.html
View file

@ -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>
<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 -->
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_REPORTS}
<!-- IF .pagination -->

10
phpBB/styles/prosilver/template/mcp_warn_list.html
View file

@ -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>
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_USERS}
<!-- IF .pagination -->

20
phpBB/styles/prosilver/template/search_results.html
View file

@ -209,24 +209,13 @@
<!-- END searchresults -->
<!-- ENDIF -->
<!-- IF .pagination or .searchresults or S_SELECT_SORT_KEY or S_SELECT_SORT_DAYS -->
<div class="action-bar bottom">
<!-- IF .searchresults and (S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY) -->
<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>
<!-- INCLUDE display_options.html -->
</form>
<!-- ENDIF -->
<hr />
<!-- ENDIF -->
<!-- IF .pagination or .searchresults or PAGE_NUMBER -->
<div class="action-bar bar-bottom">
<div class="pagination">
{SEARCH_MATCHES}
<!-- IF .pagination -->
@ -236,7 +225,6 @@
<!-- ENDIF -->
</div>
</div>
<!-- ENDIF -->
<!-- INCLUDE jumpbox.html -->

12
phpBB/styles/prosilver/template/ucp_attachments.html
View file

@ -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 -->
@ -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}" />
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
{S_FORM_TOKEN}
</fieldset>
<hr />
<div class="action-bar bar-bottom">
<div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE}
<!-- IF .pagination -->

15
phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
View file

@ -107,7 +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 -->
@ -122,16 +125,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 -->

32
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -248,20 +248,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 bar-bottom">
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
@ -278,6 +264,24 @@
<!-- EVENT viewforum_buttons_bottom_after -->
<!-- ENDIF -->
<!-- IF S_SELECT_SORT_DAYS and not S_IS_BOT -->
<form method="post" action="{S_FORUM_ACTION}">
<!-- INCLUDE display_options.html -->
</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 -->
<!-- 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}

20
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -376,19 +376,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 bar-bottom">
<!-- EVENT viewtopic_buttons_bottom_before -->
@ -406,6 +393,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="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">
@ -436,7 +429,6 @@
<!-- ENDIF -->
</div>
<!-- ENDIF -->
<div class="clear"></div>
</div>
<!-- EVENT viewtopic_body_footer_before -->

4
phpBB/styles/prosilver/theme/bidi.css
View file

@ -862,6 +862,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;

18
phpBB/styles/prosilver/theme/forms.css
View file

@ -183,6 +183,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;