makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12613] Renamed jump-to to page-jump to prevent confusion

Browse source 
Jump-to can easily be confused with forum-jump.
Also switched the lang vars to reflect changes better

PHPBB3-12613
This commit is contained in:
PayBas 2014-06-01 10:54:04 +02:00
parent 9808b55258
commit c47b546bf0
9 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/pagination.html
View file

@ -1,5 +1,5 @@
<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a> &bull;
<ul> <ul>
<!-- BEGIN pagination --> <!-- BEGIN pagination -->
<!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li> <!-- IF pagination.S_IS_PREV --><li><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a></li>

4
phpBB/language/en/common.php
View file

@ -340,8 +340,8 @@ $lang = array_merge($lang, array(
'JOINED' => 'Joined', 'JOINED' => 'Joined',
'JUMP_PAGE' => 'Enter the page number you wish to go to', 'JUMP_PAGE' => 'Enter the page number you wish to go to',
'JUMP_TO' => 'Jump to', 'JUMP_TO' => 'Jump to',
'JUMP_TO_PAGE' => 'Click to jump to page…', 'JUMP_TO_PAGE' => 'Jump to page:',
'JUMP_TO_PAGE_FORM' => 'Jump to page:', 'JUMP_TO_PAGE_CLICK' => 'Click to jump to page…',
'KB' => 'KB', 'KB' => 'KB',
'KIB' => 'KiB', 'KIB' => 'KiB',

16
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -25,7 +25,7 @@ function popup(url, width, height, name) {
/** /**
* Jump to page * Jump to page
*/ */
function jumpto(item) { function pageJump(item) {
var page = item.val(), var page = item.val(),
per_page = item.attr('data-per-page'), per_page = item.attr('data-per-page'),
@ -356,22 +356,22 @@ function parse_document(container)
* Pagination * Pagination
*/ */
container.find('.pagination .page-jump-form :button').click(function() { container.find('.pagination .page-jump-form :button').click(function() {
$input = $(this).siblings("input[name='page-number']"); $input = $(this).siblings("input.inputbox");
jumpto($input); 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) { if (event.which == 13 || event.keyCode == 13) {
event.preventDefault(); event.preventDefault();
jumpto($(this)); pageJump($(this));
} }
}); });
container.find('.pagination-trigger').click(function() { container.find('.pagination-trigger').click(function() {
$container = $(this).parent(); $dropdown_container = $(this).parent();
if (!$container.hasClass('dropdown-visible')) { if (!$dropdown_container.hasClass('dropdown-visible')) {
$input = $container.find("input[name='page-number']"); $input = $dropdown_container.find("input.inputbox");
setTimeout(function() { $input.focus(); },100); setTimeout(function() { $input.focus(); },100);
} }
}); });

6
phpBB/styles/prosilver/template/pagination.html
View file

@ -1,11 +1,11 @@
<ul> <ul>
<!-- IF BASE_URL --> <!-- IF BASE_URL -->
<li class="dropdown-container dropdown-button-control dropdown-jump-to jump-to"> <li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
<a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> <a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a>
<div class="dropdown hidden"> <div class="dropdown hidden">
<div class="pointer"><div class="pointer-inner"></div></div> <div class="pointer"><div class="pointer-inner"></div></div>
<ul class="dropdown-contents"> <ul class="dropdown-contents">
<li>{L_JUMP_TO_PAGE_FORM}</li> <li>{L_JUMP_TO_PAGE}</li>
<li class="page-jump-form"> <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 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" /> <input class="button2" value="{L_GO}" type="button" />

2
phpBB/styles/prosilver/theme/colours.css
View file

@ -188,7 +188,7 @@ dl.details dd {
border-color: #B4BAC0; 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"); background-image: url("./images/icons_pagination.png");
} }

20
phpBB/styles/prosilver/theme/common.css
View file

@ -858,17 +858,17 @@ li.pagination ul {
padding: 0; padding: 0;
} }
.pagination li.jump-to { .pagination li.page-jump {
margin: 0 5px; 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; font-size: 0;
height: 13px; height: 13px;
width: 11px; width: 11px;
} }
.pagination li.jump-to a { .pagination li.page-jump a {
background-position: 0 2px; background-position: 0 2px;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 24px; width: 24px;
@ -884,7 +884,7 @@ li.pagination ul {
background-repeat: no-repeat; 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.next a:hover { background-position: -50px -18px; }
.pagination li.previous a:hover { background-position: -30px -18px; } .pagination li.previous a:hover { background-position: -30px -18px; }
@ -1201,28 +1201,28 @@ form > p.post-notice strong {
padding-left: 2px; padding-left: 2px;
} }
.dropdown-jump-to .dropdown { .dropdown-page-jump .dropdown {
top: 20px; top: 20px;
} }
.dropdown-jump-to.dropdown-up .dropdown { .dropdown-page-jump.dropdown-up .dropdown {
bottom: 20px; bottom: 20px;
} }
.dropdown-jump-to .dropdown-contents { .dropdown-page-jump .dropdown-contents {
margin: 0; margin: 0;
} }
.dropdown-jump-to ul.dropdown-contents { .dropdown-page-jump ul.dropdown-contents {
display: inherit; display: inherit;
} }
.dropdown-jump-to .dropdown-contents li { .dropdown-page-jump .dropdown-contents li {
display: list-item; display: list-item;
padding-bottom: 4px; padding-bottom: 4px;
padding-top: 4px; padding-top: 4px;
} }
.dropdown-jump-to input.tiny { .dropdown-page-jump input.tiny {
width: 50px; width: 50px;
} }

2
phpBB/styles/prosilver/theme/responsive.css
View file

@ -519,7 +519,7 @@ fieldset.display-actions {
padding-bottom: 1px; padding-bottom: 1px;
} }
.topic-actions > .pagination li.jump-to { .topic-actions > .pagination li.page-jump {
margin: 0 2px; margin: 0 2px;
} }

2
phpBB/styles/subsilver2/template/pagination.html
View file

@ -1,5 +1,5 @@
<!-- IF .pagination --> <!-- 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 --> <!-- BEGIN pagination -->
<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a> <!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{L_PREVIOUS}</a>
<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong> <!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>

2
phpBB/styles/subsilver2/template/posting_smilies.html
View file

@ -18,7 +18,7 @@
<tr> <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 /> <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 --> <!-- 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 --> <!-- BEGIN pagination -->
<!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a> <!-- IF pagination.S_IS_PREV --><a href="{pagination.PAGE_URL}">{pagination.PAGE_NUMBER}</a>
<!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong> <!-- ELSEIF pagination.S_IS_CURRENT --><strong>{pagination.PAGE_NUMBER}</strong>