aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/assets/javascript/core.js28
-rw-r--r--phpBB/memberlist.php3
-rw-r--r--phpBB/styles/prosilver/template/memberlist_search.html8
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_search.html9
-rw-r--r--phpBB/styles/subsilver2/theme/stylesheet.css1
5 files changed, 36 insertions, 13 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index c2291c7001..82c78ae715 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -515,26 +515,34 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
// Listen live search box events
$('.liveinput').keyup(function() {
var str = this.value;
- var j = 0;
if (str.length < 3) {
- $("#livesearch").innerHTML="";
- return;
- }
-
+ return;
+ }
+ var link, name;
+ var clone = $("#user-search-row-tpl").clone();
+ $("#livesearch").html("");
+ clone.appendTo("#livesearch");
$.ajax({
url:'memberlist.php?mode=livesearch&'+"&q="+str,
success:function(result) {
$.each(result, function(idx, elem) {
- j = (idx%2)+1;
- $("#livesearch").append("<tr class='bg" + j + " row" + j + "'><td><a href='memberlist.php?mode=viewprofile&u=" + elem.id + "' target='_blank'>" + elem.name + "</a></td></tr>");
- })
- }
+ link = "memberlist.php?mode=viewprofile&u=" + elem.id;
+ name = elem.name;
+ clone = $("#user-search-row-tpl").clone();
+ clone.find(".user-search-link").attr("href", link);
+ clone.find(".user-search-name").html(name);
+ clone.attr("style", "");
+ clone.appendTo("#livesearch");
+ });
+ }
});
});
$('.liveinput').blur(function() {
setTimeout(function () {
- document.getElementById("livesearch").innerHTML="";
+ var clone = $("#user-search-row-tpl").clone();
+ $("#livesearch").html("");
+ clone.appendTo("#livesearch");
}, 500);
});
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 67e168e7bb..7cea4a59d7 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -983,11 +983,12 @@ switch ($mode)
case 'livesearch':
$username_chars = $request->variable('q', '', true);
+ $username_chars = strtolower($username_chars);
$sql = 'SELECT username, user_id
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('user_type', array(USER_NORMAL, USER_FOUNDER)) . '
- AND username ' . $db->sql_like_expression($username_chars . $db->any_char);
+ AND LOWER(username) ' . $db->sql_like_expression($username_chars . $db->any_char);
$result = $db->sql_query_limit($sql, 10);
$user_list = array();
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 15f44bf2e5..e407aed616 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -9,7 +9,13 @@
<fieldset class="fields1 column1">
<dl>
<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
- <dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox liveinput" autocomplete="off" /> <table class="table1" id="livesearch"></table></dd>
+ <dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox liveinput" autocomplete="off" />
+ <table class="table1 zebra-list" id="livesearch">
+ <tr id="user-search-row-tpl" style="display: none;">
+ <td><a class="user-search-link user-search-name" target='_blank'></a></td>
+ </tr>
+ </table>
+ </dd>
</dl>
<!-- IF S_EMAIL_SEARCH_ALLOWED -->
<dl>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 5ebff93320..1ee4abccd4 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -75,7 +75,14 @@
</tr>
<tr>
<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
- <td class="row2"><input class="post liveinput" type="text" name="username" value="{USERNAME}" autocomplete="off" /> <table class="tablebg" id="livesearch"></table></td>
+ <td class="row2">
+ <input class="post liveinput" type="text" name="username" value="{USERNAME}" autocomplete="off" />
+ <table class="tablebg" id="livesearch">
+ <tr id="user-search-row-tpl" style="display: none;">
+ <td><a class="user-search-link user-search-name" target='_blank'></a></td>
+ </tr>
+ </table>
+ </td>
<!-- IF S_EMAIL_SEARCH_ALLOWED -->
<td class="row1"><b class="genmed">{L_EMAIL}{L_COLON}</b></td>
<td class="row2"><input class="post" type="email" name="email" value="{EMAIL}" /></td>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index ef18e22ccb..7e112aeb11 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -708,6 +708,7 @@ pre {
margin: 0px;
position: absolute;
box-shadow: 1px 2px 5px rgb(175,167,167);
+ border-spacing: 0px;
z-index: 999;
overflow: auto;
}