diff options
Diffstat (limited to 'phpBB/styles/prosilver')
-rw-r--r-- | phpBB/styles/prosilver/template/display_options.html | 24 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 10 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_logs.html | 10 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_notes_user.html | 11 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_queue.html | 11 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_reports.html | 12 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_list.html | 9 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 20 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/ucp_attachments.html | 11 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewfolder.html | 12 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 20 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 20 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/buttons.css | 12 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 4 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 18 |
15 files changed, 83 insertions, 121 deletions
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html new file mode 100644 index 0000000000..bf5663376a --- /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>
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 1f48b19c18..610d34acb8 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -108,16 +108,8 @@ </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 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 9b4c4c786f..62a8f7b42b 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -51,16 +51,8 @@ </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 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 a9c1e49360..2811ddafc8 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -90,17 +90,8 @@ </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 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 169d201b16..9d256746cf 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -73,16 +73,9 @@ <!-- 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" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar 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 fbdd63ae9c..8f51027485 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" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> - <input type="submit" name="sort" value="{L_GO}" class="button2" /> - </fieldset> - - <hr /> - <div class="action-bar 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 568705e7d0..278a4fa5b4 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -43,15 +43,8 @@ </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 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 c63415915b..5be65cf8e4 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -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 --> diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index 0ea0661c37..acad0a44c8 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -50,16 +50,9 @@ <!-- 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> + <div class="action-bar bottom"> + <!-- INCLUDE display_options.html --> - <hr /> - - <div class="action-bar bar-bottom"> <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 3914b33091..11cc2b95ec 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -108,6 +108,8 @@ <hr /> <div class="action-bar 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 +124,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 f36e17369e..d5eb0c1598 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -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,12 @@ <!-- 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 --> + <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> • <!-- ENDIF --> {TOTAL_TOPICS} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 0c64adc305..dc487e3e4d 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -375,19 +375,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 --> @@ -405,6 +392,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"> @@ -435,7 +428,6 @@ <!-- ENDIF --> </div> <!-- ENDIF --> - <div class="clear"></div> </div> <!-- EVENT viewtopic_body_footer_before --> diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 7f93dbdf89..856aa31699 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -64,6 +64,18 @@ border-right-width: 0; } +.sort-icon:before { + background-position: -265px 0; + background-position: -80px 0; + height: 16px; + margin-top: 2px; +} + +.dropdown-visible .sort-icon:before, +.nojs .dropdown-container:hover .sort-icon:before { + background-position: -265px -20px; +} + .button-icon-only { padding-left: 3px; padding-right: 3px; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e5a147f034..c4005d45bf 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -391,10 +391,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 371a56fca5..e8efbc6045 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -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; |