diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-10-17 23:03:33 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-10-17 23:34:37 +0200 |
| commit | 99dd73aac720e54af6f18d72ca1d70af9e5e7ab9 (patch) | |
| tree | 7f1376bb41dacafa46b890528269f6fa371d69c4 | |
| parent | 7ce43d49d8aadeab7db316741cc9d2503fee844c (diff) | |
| download | forums-99dd73aac720e54af6f18d72ca1d70af9e5e7ab9.tar forums-99dd73aac720e54af6f18d72ca1d70af9e5e7ab9.tar.gz forums-99dd73aac720e54af6f18d72ca1d70af9e5e7ab9.tar.bz2 forums-99dd73aac720e54af6f18d72ca1d70af9e5e7ab9.tar.xz forums-99dd73aac720e54af6f18d72ca1d70af9e5e7ab9.zip | |
[ticket/11018] Fix several paginations in ACP
PHPBB3-11018
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 16 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_inactive.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_logs.html | 8 |
3 files changed, 19 insertions, 15 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index bdec9eb3cb..c69dedbcfb 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -381,11 +381,10 @@ <div class="pagination"> <!-- IF .pagination or TOTAL_FILES --> {L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE} - <!-- IF .pagination --> - • - <!-- INCLUDE pagination.html --> - <!-- ELSE --> - {S_ON_PAGE} + <!-- IF .pagination --> + • <!-- INCLUDE pagination.html --> + <!-- ELSE --> + • {S_ON_PAGE} <!-- ENDIF --> <!-- ENDIF --> </div> @@ -427,7 +426,12 @@ <hr /> <div class="pagination"> - {L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE}<!-- IF S_ON_PAGE --><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {S_ON_PAGE}<!-- ENDIF --><!-- ENDIF --> + {L_NUMBER_FILES}: {TOTAL_FILES} • {L_TOTAL_SIZE}: {TOTAL_SIZE} + <!-- IF .pagination --> + • <!-- INCLUDE pagination.html --> + <!-- ELSE --> + • {S_ON_PAGE} + <!-- ENDIF --> </div> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index ad5871f291..0b3b1b02d1 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -10,11 +10,11 @@ <div class="clearfix"></div> -<div class="pagination"> <!-- IF .pagination --> +<div class="pagination"> <!-- INCLUDE pagination.html --> -<!-- ENDIF --> </div> +<!-- ENDIF --> <table cellspacing="1"> <thead> @@ -53,15 +53,15 @@ </table> <fieldset class="display-options"> - {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION --> Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> + {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> <input class="button2" type="submit" value="{L_GO}" name="sort" /> </fieldset> <hr /> -<!-- IF PAGINATION --> +<!-- IF .pagination --> <div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> + <!-- INCLUDE pagination.html --> </div> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 16638a5a72..1e54f89afe 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -12,11 +12,11 @@ {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /> </fieldset> -<div class="pagination" style="float: right; margin: 15px 0 2px 0"> <!-- IF .pagination --> +<div class="pagination" style="float: right; margin: 15px 0 2px 0"> <!-- INCLUDE pagination.html --> -<!-- ENDIF --> </div> +<!-- ENDIF --> <div class="clearfix"> </div> <div><br style="clear: both;" /></div> @@ -54,9 +54,9 @@ </tbody> </table> -<!-- IF PAGINATION --> +<!-- IF .pagination --> <div class="pagination"> - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> • <span>{PAGINATION}</span> + <!-- INCLUDE pagination.html --> </div> <!-- ENDIF --> |