support version 2.0 of django-avatar app and improve the "manage avatars" page

Author: evgenyfadeev

askbot/__init__.py

@@ -13,6 +13,7 @@
 #values - the package qualifier to use for pip
 REQUIREMENTS = {
     'akismet': 'akismet',
+    'avatar': 'django-avatar>=2.0',
     'bs4': 'beautifulsoup4',
     'coffin': 'Coffin>=0.3,<=0.3.8',
     'compressor': 'django-compressor==1.2',

askbot/doc/source/changelog.rst

@@ -3,6 +3,7 @@ Changes in Askbot
 
 Development version (only in the repository)
 --------------------------------------------
+* Improved support of uploadable avatars
 * Added authentication via MediaWiki
 * Added option to specify `ASKBOT_QUESTION_TITLE_RENDERER` function
 * Added option to specify `ASKBOT_HTML_MODERATOR` function

askbot/doc/source/optional-modules.rst

@@ -187,10 +187,9 @@ Uploaded avatars
 ================
 
 To enable uploadable avatars (in addition to :ref:`gravatars <gravatar>`), 
-please install development version of
-application ``django-avatar``, with the following command::
-
-    pip install -e git+git://github.com/ericflo/django-avatar.git#egg=django-avatar
+please install application ``django-avatar``, with the following command::
+    
+    pip install django-avatar
 
 Then add ``avatar`` to the list of ``INSTALLED_APPS`` in your ``settings.py`` file 
 and run (to install database table used by the avatar app):

askbot/media/style/style.css

@@ -231,6 +231,9 @@ body.user-messages {
   margin: 0 auto;
   padding: 0;
 }
+.sr-only {
+  display: none;
+}
 /* ----- Notify message bar , check blocks/system_messages.html ----- */
 .notify {
   position: fixed;
@@ -2940,6 +2943,45 @@ ul.js-related-tags li {
 .user-profile-page.inbox-forum .message:last-child, .user-profile-page.inbox-flags .message:last-child {
   border: none;
 }
+.user-profile-page ul.avatars {
+  list-style: none;
+  margin-left: 0;
+}
+.user-profile-page ul.avatars li {
+  display: inline-block;
+  max-width: 128px;
+  position: relative;
+  vertical-align: top;
+}
+.user-profile-page ul.avatars img {
+  height: 128px;
+  width: 128px;
+}
+.user-profile-page ul.avatars .avatar-delete {
+  margin-right: 5px;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+.user-profile-page ul.avatars form {
+  text-align: center;
+}
+.user-profile-page ul.avatars label[for="id_avatar"] {
+  display: none;
+}
+.avatar-label {
+  background: black;
+  color: white !important;
+  cursor: help;
+  padding: 5px;
+  position: absolute;
+}
+.avatar-primary-label {
+  height: 28px;
+  line-height: 28px !important;
+  margin: 3px 0 0 0;
+  text-align: center;
+}
 .user-profile-page.inbox-forum .new {
   background: #FFF8C6;
 }

askbot/media/style/style.less

@@ -239,6 +239,10 @@ body.user-messages {
     padding: 0;
 }
 
+.sr-only {
+    display: none;
+}
+
 
 /* ----- Notify message bar , check blocks/system_messages.html ----- */
 
@@ -3146,6 +3150,46 @@ ul.js-related-tags li {
     }
 }
 
+.user-profile-page ul.avatars {
+    list-style: none;
+    margin-left: 0;
+    li {
+        display: inline-block;
+        max-width: 128px;
+        position: relative;
+        vertical-align: top;
+    }
+    img {
+        height: 128px;
+        width: 128px;
+    }
+    .avatar-delete {
+        margin-right: 5px;
+        position: absolute;
+        right: 0;
+        top: 0;
+    }
+    form {
+        text-align: center;
+    }
+    label[for="id_avatar"] {
+        display: none;
+    }
+}
+.avatar-label {
+    background: black;
+    color: white !important;
+    cursor: help;
+    padding: 5px;
+    position: absolute;
+}
+.avatar-primary-label {
+    height: 28px;
+    line-height: 28px !important;
+    margin: 3px 0 0 0;
+    text-align: center;
+}
+
 .user-profile-page.inbox-forum {
     .new {
         background: #FFF8C6;

askbot/models/__init__.py

@@ -289,15 +289,11 @@ def user_get_avatar_url(self, size=48):
     """
     if 'avatar' in django_settings.INSTALLED_APPS:
         if self.avatar_type == 'n':
-            import avatar
-            if askbot_settings.ENABLE_GRAVATAR: #avatar.settings.AVATAR_GRAVATAR_BACKUP:
-                return self.get_gravatar_url(size)
-            else:
-                return self.get_default_avatar_url(size)
+            return self.get_default_avatar_url(size)
         elif self.avatar_type == 'a':
-            kwargs = {'user_id': self.id, 'size': size}
+            kwargs = {'user': self.username, 'size': size}
             try:
-                return reverse('avatar_render_primary', kwargs = kwargs)
+                return reverse('avatar_render_primary', kwargs=kwargs)
             except NoReverseMatch:
                 message = 'Please, make sure that avatar urls are in the urls.py '\
                           'or update your django-avatar app, '\

askbot/startup_procedures.py

@@ -600,12 +600,7 @@ def test_avatar():
     """if "avatar" is in the installed apps,
     checks that the module is actually installed"""
     if 'avatar' in django_settings.INSTALLED_APPS:
-        try_import('Image', 'PIL', short_message = True)
-        try_import(
-            'avatar',
-            '-e git+git://github.com/ericflo/django-avatar.git#egg=avatar',
-            short_message = True
-        )
+        try_import('avatar', 'django-avatar', short_message=True)
 
 def test_haystack():
     if 'haystack' in django_settings.INSTALLED_APPS:

askbot/templates/avatar/add.html

@@ -0,0 +1,7 @@
+<img src="{{ avatar.url }}" height="128" width="128" 
+    {% if avatar.is_primary %}
+        alt="{% trans username=view_user.username|escape %}{{ username }}'s primary avatar{% endtrans %}"
+    {% else %}
+        alt="{% trans username=view_user.username|escape %}{{ username }}'s avatar{% endtrans %}"
+    {% endif %}
+/>