mirror of
https://github.com/jazzband/django-avatar.git
synced 2026-03-16 22:20:30 +00:00
added AVATAR_BASE_URL setting
This commit is contained in:
parent
bc0a34612c
commit
7ccd5cdf66
3 changed files with 8 additions and 3 deletions
|
|
@ -13,6 +13,7 @@ AVATAR_STORAGE_DIR = getattr(settings, 'AVATAR_STORAGE_DIR', 'avatars')
|
|||
AVATAR_GRAVATAR_BACKUP = getattr(settings, 'AVATAR_GRAVATAR_BACKUP', True)
|
||||
AVATAR_GRAVATAR_DEFAULT = getattr(settings, 'AVATAR_GRAVATAR_DEFAULT', None)
|
||||
AVATAR_DEFAULT_URL = getattr(settings, 'AVATAR_DEFAULT_URL', 'avatar/img/default.jpg')
|
||||
AVATAR_BASE_URL = getattr(settings, 'AVATAR_BASE_URL', 'http://www.gravatar.com')
|
||||
AVATAR_MAX_AVATARS_PER_USER = getattr(settings, 'AVATAR_MAX_AVATARS_PER_USER', 42)
|
||||
AVATAR_MAX_SIZE = getattr(settings, 'AVATAR_MAX_SIZE', 1024 * 1024)
|
||||
AVATAR_THUMB_FORMAT = getattr(settings, 'AVATAR_THUMB_FORMAT', "JPEG")
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse
|
|||
from django.contrib.auth.models import User
|
||||
|
||||
from avatar.settings import (AVATAR_GRAVATAR_BACKUP, AVATAR_GRAVATAR_DEFAULT,
|
||||
AVATAR_DEFAULT_SIZE)
|
||||
AVATAR_DEFAULT_SIZE, AVATAR_BASE_URL)
|
||||
from avatar.util import get_primary_avatar, get_default_avatar_url, cache_result
|
||||
|
||||
register = template.Library()
|
||||
|
|
@ -25,7 +25,8 @@ def avatar_url(user, size=AVATAR_DEFAULT_SIZE):
|
|||
params = {'s': str(size)}
|
||||
if AVATAR_GRAVATAR_DEFAULT:
|
||||
params['d'] = AVATAR_GRAVATAR_DEFAULT
|
||||
return "http://www.gravatar.com/avatar/%s/?%s" % (
|
||||
return "%s/avatar/%s/?%s" % (
|
||||
AVATAR_BASE_URL,
|
||||
md5_constructor(user.email).hexdigest(),
|
||||
urllib.urlencode(params))
|
||||
else:
|
||||
|
|
|
|||
5
setup.py
5
setup.py
|
|
@ -1,6 +1,6 @@
|
|||
from setuptools import setup, find_packages
|
||||
|
||||
version = '2.0a1'
|
||||
version = '2.0a2'
|
||||
|
||||
LONG_DESCRIPTION = """
|
||||
Using django-avatar
|
||||
|
|
@ -110,6 +110,9 @@ Global Settings
|
|||
There are a number of settings available to easily customize the avatars that
|
||||
appear on the site. Listed below are those settings:
|
||||
|
||||
AVATAR_BASE_URL
|
||||
The base URL where to get avatars at gravatar.com. Defaults to ``http://www.gravatar.com``.
|
||||
|
||||
AUTO_GENERATE_AVATAR_SIZES
|
||||
An iterable of integers representing the sizes of avatars to generate on
|
||||
upload. This can save rendering time later on if you pre-generate the
|
||||
|
|
|
|||
Loading…
Reference in a new issue