diff options
| author | PayBas <contact@paybas.com> | 2014-06-01 10:54:04 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-05 09:59:35 +0200 |
| commit | c47b546bf08775d215da4bd07e7a93cbc68b322f (patch) | |
| tree | dd0aa34a08967b59cb1d0b6db3193310e290b68a | |
| parent | 9808b5525814baed62fe40fc6955f1e5d4327c71 (diff) | |
| download | forums-c47b546bf08775d215da4bd07e7a93cbc68b322f.tar forums-c47b546bf08775d215da4bd07e7a93cbc68b322f.tar.gz forums-c47b546bf08775d215da4bd07e7a93cbc68b322f.tar.bz2 forums-c47b546bf08775d215da4bd07e7a93cbc68b322f.tar.xz forums-c47b546bf08775d215da4bd07e7a93cbc68b322f.zip | |
[ticket/12613] Renamed jump-to to page-jump to prevent confusion
Jump-to can easily be confused with forum-jump.
Also switched the lang vars to reflect changes better
PHPBB3-12613
| -rw-r--r-- | phpBB/adm/style/pagination.html | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/pagination.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 20 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/pagination.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/posting_smilies.html | 2 |
9 files changed, 28 insertions, 28 deletions
diff --git a/phpBB/adm/style/pagination.html b/phpBB/adm/style/pagination.html index 7158f83fbc..5e755723e8 100644 --- a/phpBB/adm/style/pagination.html +++ b/phpBB/adm/style/pagination.html @@ -1,5 +1,5 @@ - <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • + <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a> • <ul> <!-- BEGIN pagination --> <!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li> diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d2aa0fea54..8a10ad3851 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -340,8 +340,8 @@ $lang = array_merge($lang, array( 'JOINED' => 'Joined', 'JUMP_PAGE' => 'Enter the page number you wish to go to', 'JUMP_TO' => 'Jump to', - 'JUMP_TO_PAGE' => 'Click to jump to page…', - 'JUMP_TO_PAGE_FORM' => 'Jump to page:', + 'JUMP_TO_PAGE' => 'Jump to page:', + 'JUMP_TO_PAGE_CLICK' => 'Click to jump to page…', 'KB' => 'KB', 'KIB' => 'KiB', diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 3eadad59f9..a4d4c7527c 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -25,7 +25,7 @@ function popup(url, width, height, name) { /** * Jump to page */ -function jumpto(item) { +function pageJump(item) { var page = item.val(), per_page = item.attr('data-per-page'), @@ -356,22 +356,22 @@ function parse_document(container) * Pagination */ container.find('.pagination .page-jump-form :button').click(function() { - $input = $(this).siblings("input[name='page-number']"); - jumpto($input); + $input = $(this).siblings("input.inputbox"); + pageJump($input); }); - container.find(".pagination .page-jump-form input[name='page-number']").on("keypress", function(event) { + container.find(".pagination .page-jump-form input.inputbox").on("keypress", function(event) { if (event.which == 13 || event.keyCode == 13) { event.preventDefault(); - jumpto($(this)); + pageJump($(this)); } }); container.find('.pagination-trigger').click(function() { - $container = $(this).parent(); + $dropdown_container = $(this).parent(); - if (!$container.hasClass('dropdown-visible')) { - $input = $container.find("input[name='page-number']"); + if (!$dropdown_container.hasClass('dropdown-visible')) { + $input = $dropdown_container.find("input.inputbox"); setTimeout(function() { $input.focus(); },100); } }); diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 6e2e02b31a..080a946ffd 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -1,11 +1,11 @@ <ul> <!-- IF BASE_URL --> - <li class="dropdown-container dropdown-button-control dropdown-jump-to jump-to"> - <a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> + <li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump"> + <a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a> <div class="dropdown hidden"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents"> - <li>{L_JUMP_TO_PAGE_FORM}</li> + <li>{L_JUMP_TO_PAGE}</li> <li class="page-jump-form"> <input type="text" name="page-number" maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" /> <input class="button2" value="{L_GO}" type="button" /> diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index a21cd1e3ec..88a934594c 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -188,7 +188,7 @@ dl.details dd { border-color: #B4BAC0; } -.pagination li.next a, .pagination li.previous a, .pagination li.jump-to a { +.pagination li.next a, .pagination li.previous a, .pagination li.page-jump a { background-image: url("./images/icons_pagination.png"); } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 804599bf6c..3c7d3c5adc 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -858,17 +858,17 @@ li.pagination ul { padding: 0; } -.pagination li.jump-to { +.pagination li.page-jump { margin: 0 5px; } -.pagination li.jump-to a, .pagination li.next a, .pagination li.previous a { +.pagination li.page-jump a, .pagination li.next a, .pagination li.previous a { font-size: 0; height: 13px; width: 11px; } -.pagination li.jump-to a { +.pagination li.page-jump a { background-position: 0 2px; background-repeat: no-repeat; width: 24px; @@ -884,7 +884,7 @@ li.pagination ul { background-repeat: no-repeat; } -.pagination li.jump-to a:hover { background-position: 0 -18px; } +.pagination li.page-jump a:hover { background-position: 0 -18px; } .pagination li.next a:hover { background-position: -50px -18px; } .pagination li.previous a:hover { background-position: -30px -18px; } @@ -1201,28 +1201,28 @@ form > p.post-notice strong { padding-left: 2px; } -.dropdown-jump-to .dropdown { +.dropdown-page-jump .dropdown { top: 20px; } -.dropdown-jump-to.dropdown-up .dropdown { +.dropdown-page-jump.dropdown-up .dropdown { bottom: 20px; } -.dropdown-jump-to .dropdown-contents { +.dropdown-page-jump .dropdown-contents { margin: 0; } -.dropdown-jump-to ul.dropdown-contents { +.dropdown-page-jump ul.dropdown-contents { display: inherit; } -.dropdown-jump-to .dropdown-contents li { +.dropdown-page-jump .dropdown-contents li { display: list-item; padding-bottom: 4px; padding-top: 4px; } -.dropdown-jump-to input.tiny { +.dropdown-page-jump input.tiny { width: 50px; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index b9d3ef4432..aee6b422ce 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -519,7 +519,7 @@ fieldset.display-actions { padding-bottom: 1px; } - .topic-actions > .pagination li.jump-to { + .topic-actions > .pagination li.page-jump { margin: 0 2px; } diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html index 550b28d305..b1c1d0e6c9 100644 --- a/phpBB/styles/subsilver2/template/pagination.html +++ b/phpBB/styles/subsilver2/template/pagination.html @@ -1,5 +1,5 @@ <!-- IF .pagination --> - <!-- IF BASE_URL --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a></b><!-- ENDIF --> + <!-- IF BASE_URL --><b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{L_GOTO_PAGE}</a></b><!-- ENDIF --> <!-- BEGIN pagination --> <!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a> <!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong> diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html index 0be71098db..7087414fa8 100644 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ b/phpBB/styles/subsilver2/template/posting_smilies.html @@ -18,7 +18,7 @@ <tr> <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" /></a> <!-- END smiley --><br /> <!-- IF .pagination --> - <b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{L_GOTO_PAGE}</a> + <b><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{L_GOTO_PAGE}</a> <!-- BEGIN pagination --> <!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a> <!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong> |