summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-22 10:56:15 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-08-22 10:56:15 -0400
commit970ae88b10b2c5632ba6476c942e81fb1b88c096 (patch)
tree69f08a82ed2d711293f37a24cca7cf89208a864a
parent260305720861c09a37373bf00689c9ea4e51f1cc (diff)
downloadaskbot-970ae88b10b2c5632ba6476c942e81fb1b88c096.tar.gz
askbot-970ae88b10b2c5632ba6476c942e81fb1b88c096.tar.bz2
askbot-970ae88b10b2c5632ba6476c942e81fb1b88c096.zip
fixed autocompleter and tipped input for the ask as someone else fields
-rw-r--r--askbot/forms.py2
-rw-r--r--askbot/skins/common/media/js/post.js13
-rw-r--r--askbot/skins/default/media/style/style.less3
3 files changed, 10 insertions, 8 deletions
diff --git a/askbot/forms.py b/askbot/forms.py
index 7baec106..0011210d 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -785,7 +785,7 @@ class PostAsSomeoneForm(forms.Form):
'Can create new accounts.'
),
required=False,
- widget=forms.TextInput(attrs={'class': 'tipped-input'})
+ widget=forms.TextInput()
)
post_author_email = forms.CharField(
initial=_('Email address:'),
diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js
index 36031332..7739e716 100644
--- a/askbot/skins/common/media/js/post.js
+++ b/askbot/skins/common/media/js/post.js
@@ -3883,8 +3883,6 @@ $(document).ready(function() {
var proxyUserNameInput = $('#id_post_author_username');
var proxyUserEmailInput = $('#id_post_author_email');
if (proxyUserNameInput.length === 1) {
- var tip = new TippedInput();
- tip.decorate(proxyUserNameInput);
var userSelectHandler = function(data) {
proxyUserEmailInput.val(data['data'][0]);
@@ -3893,6 +3891,7 @@ $(document).ready(function() {
var fakeUserAc = new AutoCompleter({
url: '/get-users-info/',//askbot['urls']['get_users_info'],
preloadData: true,
+ promptText: gettext('User name:'),
minChars: 1,
useCache: true,
matchInside: true,
@@ -3900,11 +3899,13 @@ $(document).ready(function() {
delay: 10,
onItemSelect: userSelectHandler
});
+
fakeUserAc.decorate(proxyUserNameInput);
- }
- if (proxyUserEmailInput.length === 1) {
- var tip = new TippedInput();
- tip.decorate(proxyUserEmailInput);
+ if (proxyUserEmailInput.length === 1) {
+ var tip = new TippedInput();
+ tip.decorate(proxyUserEmailInput);
+ }
+
}
//if groups are enabled - activate share functions
var groupsInput = $('#share_group_name');
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 60ddc4be..425e39f8 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -40,7 +40,8 @@ input, select {
}
input[type="text"].prompt,
-input[type="password"].prompt {
+input[type="password"].prompt,
+input.tipped-input.blank {
font-style: italic;
color: @info-text;
}