1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649

PHPBB3-12649
This commit is contained in:
RMcGirr83
2015-11-04 11:05:25 -05:00
parent f518a57d0d
commit de984caf98
13 changed files with 59 additions and 20 deletions

View File

@@ -21,4 +21,4 @@
</fieldset>
</div>
</div>
</div>
</div>

View File

@@ -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 -->

View File

@@ -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 -->

View File

@@ -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 -->

View File

@@ -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 -->

View File

@@ -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 -->

View File

@@ -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 -->

View File

@@ -214,7 +214,7 @@
<form method="post" action="{S_SEARCH_ACTION}">
<!-- INCLUDE display_options.html -->
</form>
<!-- ENDIF -->
<!-- ENDIF -->
<div class="pagination">
{SEARCH_MATCHES}

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 -->
@@ -52,6 +52,7 @@
<div class="action-bar bottom">
<!-- INCLUDE display_options.html -->
{S_FORM_TOKEN}
<div class="pagination">
{TOTAL_ATTACHMENTS} {L_TITLE}

View File

@@ -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 -->

View File

@@ -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}

View File

@@ -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">