Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups

Conflicts:
	askbot/skins/default/media/style/style.less

7 files changed, 32 insertions, 18 deletions

diff --git a/askbot/deps/django_authopenid/forms.py b/askbot/deps/django_authopenid/forms.py
index db2afcd8..fbc5c6ff 100644
--- a/askbot/deps/django_authopenid/forms.py
+++ b/askbot/deps/django_authopenid/forms.py
@@ -308,14 +308,14 @@ class LoginForm(forms.Form):
 class OpenidRegisterForm(forms.Form):
     """ openid signin form """
     next = NextUrlField()
-    username = UserNameField()
+    username = UserNameField(widget_attrs={'tabindex': 0})
     email = UserEmailField()
 
 class ClassicRegisterForm(SetPasswordForm):
     """ legacy registration form """
 
     next = NextUrlField()
-    username = UserNameField()
+    username = UserNameField(widget_attrs={'tabindex': 0})
     email = UserEmailField()
     login_provider = PasswordLoginProviderField()
     #fields password1 and password2 are inherited
diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js
index 7739e716..b1d85f72 100644
--- a/askbot/skins/common/media/js/post.js
+++ b/askbot/skins/common/media/js/post.js
@@ -329,7 +329,7 @@ DraftPost.prototype.decorate = function(element) {
     this._element = element;
     this.assignContentElements();
     this.backupData();
-    setInterval(this.getSaveHandler(), 5000);//auto-save twice a minute
+    setInterval(this.getSaveHandler(), 30000);//auto-save twice a minute
     var me = this;
     window.onbeforeunload = function() {
         var saveHandler = me.getSaveHandler();
diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js
index e0a5af7b..ef3726e2 100644
--- a/askbot/skins/common/media/js/utils.js
+++ b/askbot/skins/common/media/js/utils.js
@@ -494,9 +494,11 @@ TippedInput.prototype.decorate = function(element){
                 .addClass('blank');
         }
     });
-    makeKeyHandler(27, function(){
-        $(element).blur();
-    });
+    $(element).keydown(
+        makeKeyHandler(27, function(){
+            $(element).blur();
+        })
+    );
 };
 
 /**
@@ -2077,6 +2079,7 @@ AutoCompleter.prototype.setEventHandlers = function(){
     self._element.blur(function() {
         if ($.trim(self._element.val()) === '') {
             self.setPrompt();
+            self._results.hide();
             return true;
         }
         if (self.finishOnBlur_) {
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 1bcd336b..a381c29a 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -316,16 +316,13 @@ body.user-messages {
         .sprites(0px,-95px);
     }
 
-    #navBadges{
-       .sprites(0px,-170px);
-    }
-
-    #navUsers{
-        .sprites(3px,-132px);
+    #navUsers,
+    #navGroups{
+        .sprites(3px,-133px)
     }
 
-    #navGroups{
-        .sprites(3px,-132px);
+    #navBadges{
+        .sprites(3px,-170px)
     }
 
     a.group-name {
diff --git a/askbot/skins/default/templates/question/sidebar.html b/askbot/skins/default/templates/question/sidebar.html
index f595634b..4d431ef2 100644
--- a/askbot/skins/default/templates/question/sidebar.html
+++ b/askbot/skins/default/templates/question/sidebar.html
@@ -49,6 +49,7 @@
 </div>
 
 <div class="clearfix"></div>
+{% if settings.GROUPS_ENABLED %}
 <div class="box sharing-widget">
     {% if thread.is_private() %}
         <h2>{% trans %}Invite{% endtrans %}</h2>
@@ -137,6 +138,7 @@
         <p>{% trans site_name=settings.APP_SHORT_NAME %}This thread is public, all members of {{ site_name }} can read this page.{% endtrans %}</p>
     {% endif %}
 </div>
+{% endif %}
 
 {% if settings.SIDEBAR_QUESTION_SHOW_META %}
 <div class="box statsWidget">
@@ -154,7 +156,7 @@
 </div>
 {% endif %}
 
-{% if similar_threads.data and settings.SIDEBAR_QUESTION_SHOW_RELATED %}
+{% if similar_threads.data() and settings.SIDEBAR_QUESTION_SHOW_RELATED %}
     {#% cache 1800 "related_questions" related_questions question.id language_code %#}
     <div class="box">
         <h2>{% trans %}Related questions{% endtrans %}</h2>
diff --git a/askbot/utils/forms.py b/askbot/utils/forms.py
index f607e62b..e8f9e622 100644
--- a/askbot/utils/forms.py
+++ b/askbot/utils/forms.py
@@ -59,6 +59,7 @@ class UserNameField(StrippedNonEmptyCharField):
         must_exist=False,
         skip_clean=False,
         label=_('Choose a screen name'),
+        widget_attrs=None,
         **kw
     ):
         self.must_exist = must_exist
@@ -79,8 +80,14 @@ class UserNameField(StrippedNonEmptyCharField):
         if 'error_messages' in kw:
             error_messages.update(kw['error_messages'])
             del kw['error_messages']
+
+        if widget_attrs:
+            widget_attrs.update(login_form_widget_attrs)
+        else:
+            widget_attrs = login_form_widget_attrs
+
         super(UserNameField,self).__init__(max_length=30,
-                widget=forms.TextInput(attrs=login_form_widget_attrs),
+                widget=forms.TextInput(attrs=widget_attrs),
                 label=label,
                 error_messages=error_messages,
                 **kw
diff --git a/askbot/views/commands.py b/askbot/views/commands.py
index 1ad8a401..88ccc76c 100644
--- a/askbot/views/commands.py
+++ b/askbot/views/commands.py
@@ -530,12 +530,17 @@ def get_tag_list(request):
     """returns tags to use in the autocomplete
     function
     """
-    tag_names = models.Tag.objects.filter(
+    tags = models.Tag.objects.filter(
                         deleted = False,
                         status = models.Tag.STATUS_ACCEPTED
-                    ).values_list(
+                    ).exclude(
+                        name__startswith='_internal_'
+                    )
+
+    tag_names = tags.values_list(
                         'name', flat = True
                     )
+
     output = '\n'.join(map(escape, tag_names))
     return HttpResponse(output, mimetype = 'text/plain')