mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-22 16:22:58 +02:00
Merge remote-tracking branch 'PayBas/ticket/12613' into develop-ascraeus
* PayBas/ticket/12613: (25 commits) [ticket/12613] Add distinction between top/bottom action-bar [ticket/12613] Replaced topic-actions with action-bar [ticket/12613] Remove responsive linklist from memberlist [ticket/12613] Remove unnecessary checks and clean up CSS [ticket/12613] role="navigation" not allowed on <ul> [ticket/12613] Improved screen reader functionality [ticket/12613] Removed unnecessary checks [ticket/12613] Set fixed font-size [ticket/12613] Slightly better icons [ticket/12613] Typo and L_COLON [ticket/12613] Small inconsistency fixes [ticket/12613] Don't display page-jump if all pages are visible (6) [ticket/12613] Fixes from comments (single quotes and typos) [ticket/12613] Minor $bull; and <hr> fix [ticket/12613] Pagination should never be in responsive linklist [ticket/12613] Minor CSS fixes [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing [ticket/12613] Renamed jump-to to page-jump to prevent confusion [ticket/12613] Removed form in order to prevent nested forms [ticket/12613] Fix functional test and post sorting bug ...
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<div class="topic-actions">
|
||||
<div class="action-bar top">
|
||||
|
||||
<div class="buttons">
|
||||
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
|
||||
@@ -51,11 +51,11 @@
|
||||
|
||||
<!-- IF .pagination or TOTAL_POSTS -->
|
||||
<div class="pagination">
|
||||
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} •
|
||||
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS}
|
||||
<!-- IF .pagination -->
|
||||
<!-- INCLUDE pagination.html -->
|
||||
<!-- ELSE -->
|
||||
{PAGE_NUMBER}
|
||||
• {PAGE_NUMBER}
|
||||
<!-- ENDIF -->
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
@@ -320,28 +320,26 @@
|
||||
<hr class="divider" />
|
||||
<!-- EVENT viewtopic_body_postrow_post_after -->
|
||||
<!-- END postrow -->
|
||||
|
||||
<!-- IF S_QUICK_REPLY -->
|
||||
<!-- INCLUDE quickreply_editor.html -->
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_NUM_POSTS > 1 or U_PREVIOUS_PAGE or U_NEXT_PAGE -->
|
||||
<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
|
||||
|
||||
<!-- 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 U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
|
||||
<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
|
||||
<!-- 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="topic-actions">
|
||||
<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 -->">
|
||||
@@ -354,11 +352,11 @@
|
||||
|
||||
<!-- IF .pagination or TOTAL_POSTS -->
|
||||
<div class="pagination">
|
||||
{TOTAL_POSTS} •
|
||||
{TOTAL_POSTS}
|
||||
<!-- IF .pagination -->
|
||||
<!-- INCLUDE pagination.html -->
|
||||
<!-- ELSE -->
|
||||
{PAGE_NUMBER}
|
||||
• {PAGE_NUMBER}
|
||||
<!-- ENDIF -->
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
|
Reference in New Issue
Block a user