Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of github.com:jezdez/django-avatar

Browse source 
Conflicts:
	avatar/urls.py
	avatar/views.py
	setup.py
This commit is contained in:
Jannis Leidel 2013-03-04 11:33:40 +01:00
commit 47664e3fbe
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
avatar/settings.py
View file

@ -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")

5
avatar/templatetags/avatar_tags.py
View file

@ -9,7 +9,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
from avatar.models import Avatar
@ -27,7 +27,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:

18
avatar/urls.py
View file

@ -1,12 +1,12 @@
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('avatar.views',
url('^add/$', 'add', name='avatar_add'),
url('^webcam-upload/(?P<id>\d+)', 'webcam_upload', name='avatar-webcam-upload'),
url('^change/$', 'change', name='avatar_change'),
url('^delete/$', 'delete', name='avatar_delete'),
url('^render_primary/(?P<user>[\+\w]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
url('^list/(?P<username>[\+\w]+)/$', 'avatar_gallery', name='avatar_gallery'),
url('^list/(?P<username>[\+\w]+)/(?P<id>[\d]+)/$', 'avatar', name='avatar'),
urlpatterns = patterns(
'avatar.views',
url(r'^add/$', 'add', name='avatar_add'),
url(r'^webcam-upload/(?P<id>\d+)', 'webcam_upload', name='avatar-webcam-upload'),
url(r'^change/$', 'change', name='avatar_change'),
url(r'^delete/$', 'delete', name='avatar_delete'),
url(r'^render_primary/(?P<user>[\w\d\.\-_]{3,30})/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
url(r'^list/(?P<username>[\+\w]+)/$', 'avatar_gallery', name='avatar_gallery'),
url(r'^list/(?P<username>[\+\w]+)/(?P<id>[\d]+)/$', 'avatar', name='avatar'),
)

5
setup.py
View file

@ -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
@ -160,7 +163,7 @@ setup(
url='http://github.com/ericflo/django-avatar/',
license='BSD',
packages=find_packages(),
package_data = {
package_data={
'avatar': [
'templates/notification/*/*.*',
'templates/avatar/*.html',