aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Colón <david@davidiq.com>2012-06-26 21:29:27 -0400
committerNathan Guse <nathaniel.guse@gmail.com>2013-01-15 23:29:06 -0600
commit4306a7641f92dd34e8c3a132017a146607b3e2db (patch)
tree4cd062ef2c1b4fedae28070b4bc426252a836fc3
parentbabe07caefe8a035f711fd76c38b4dbeb0a8e804 (diff)
downloadforums-4306a7641f92dd34e8c3a132017a146607b3e2db.tar
forums-4306a7641f92dd34e8c3a132017a146607b3e2db.tar.gz
forums-4306a7641f92dd34e8c3a132017a146607b3e2db.tar.bz2
forums-4306a7641f92dd34e8c3a132017a146607b3e2db.tar.xz
forums-4306a7641f92dd34e8c3a132017a146607b3e2db.zip
[ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did. PHPBB3-10786
-rw-r--r--phpBB/styles/prosilver/template/ajax.js8
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_body.html2
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 968f57bba2..6ce3b38981 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -194,12 +194,16 @@ $('#quick-mod-select').change(function () {
/**
* Toggle the member search panel in memberlist.php.
+*
+* If user returns to search page after viewing results the search panel is automatically displayed.
+* In any case the link will toggle the display status of the search panel and link text will be
+* appropriately changed based on the status of the search panel.
*/
$('#member_search').click(function () {
$('#memberlist_search').slideToggle('fast');
phpbb.ajax_callbacks['alt_text'].call(this);
- //Focus on the username textbox if it's available and displayed
- if ($('#username').length > 0 && $('#memberlist_search').is(':visible')) {
+ // Focus on the username textbox if it's available and displayed
+ if ($('#memberlist_search').is(':visible')) {
$('#username').focus();
}
return false;
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index c7ba116d34..09336fb8a3 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -4,7 +4,7 @@
<!-- INCLUDE overall_header.html -->
<!-- ENDIF -->
-<!-- IF S_SEARCH_USER -->
+<!-- IF S_SEARCH_USER -->
<!-- INCLUDE memberlist_search.html -->
<!-- ENDIF -->