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

[ticket/12613] Removed form in order to prevent nested forms

Browse source 
PHPBB3-12613
This commit is contained in:
PayBas 2014-05-30 13:49:30 +02:00
parent f2c7890c64
commit 9808b55258
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,12 +25,12 @@ function popup(url, width, height, name) {
/** /**
* Jump to page * Jump to page
*/ */
function jumpto(form) { function jumpto(item) {
var page = $(form).find("input[name='page-number']").val(), var page = item.val(),
per_page = $(form).find("input[name='per-page']").val(), per_page = item.attr('data-per-page'),
base_url = $(form).find("input[name='base-url']").val(), base_url = item.attr('data-base-url'),
start_name = $(form).find("input[name='start-name']").val(); start_name = item.attr('data-start-name');
if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) { if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) {
if (base_url.indexOf('?') === -1) { if (base_url.indexOf('?') === -1) {
@ -355,11 +355,18 @@ function parse_document(container)
/** /**
* Pagination * Pagination
*/ */
container.find('form.page-jump-form').submit(function(event) { container.find('.pagination .page-jump-form :button').click(function() {
event.preventDefault(); $input = $(this).siblings("input[name='page-number']");
jumpto($(this)); jumpto($input);
}); });
container.find(".pagination .page-jump-form input[name='page-number']").on("keypress", function(event) {
if (event.which == 13 || event.keyCode == 13) {
event.preventDefault();
jumpto($(this));
}
});
container.find('.pagination-trigger').click(function() { container.find('.pagination-trigger').click(function() {
$container = $(this).parent(); $container = $(this).parent();

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

@ -6,16 +6,9 @@
<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_FORM}</li>
<li> <li class="page-jump-form">
<form class="page-jump-form" method="get"> <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}" />
<fieldset> <input class="button2" value="{L_GO}" type="button" />
<input type="text" name="page-number" maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" />
<input class="button2" value="{L_GO}" type="submit" />
<input type="hidden" value="{PER_PAGE}" name="per-page">
<input type="hidden" value="{START_NAME}" name="start-name">
<input type="hidden" value="{BASE_URL|e('html_attr')}" name="base-url">
</fieldset>
</form>
</li> </li>
</ul> </ul>
</div> </div>