diff --git a/avatar/templates/avatar/avatar.html b/avatar/templates/avatar/avatar.html
deleted file mode 100644
index 6346d96..0000000
--- a/avatar/templates/avatar/avatar.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- <!-- Insert your title here -->
-
-
-
-
-
diff --git a/avatar/templates/avatar/gallery.html b/avatar/templates/avatar/gallery.html
deleted file mode 100644
index 6346d96..0000000
--- a/avatar/templates/avatar/gallery.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- <!-- Insert your title here -->
-
-
-
-
-
diff --git a/avatar/urls.py b/avatar/urls.py
index 02a9981..edb684a 100644
--- a/avatar/urls.py
+++ b/avatar/urls.py
@@ -9,10 +9,4 @@ urlpatterns = [
url(r'^render_primary/(?P[\w\d\@\.\-_]{3,30})/(?P[\d]+)/$',
views.render_primary,
name='avatar_render_primary'),
- url(r'^list/(?P[\+\w\@\.]+)/$',
- views.avatar_gallery,
- name='avatar_gallery'),
- url(r'^list/(?P[\+\w\@\.]+)/(?P[\d]+)/$',
- views.avatar,
- name='avatar'),
]
diff --git a/avatar/views.py b/avatar/views.py
index 24d6b34..18ead7c 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -1,4 +1,3 @@
-from django.http import Http404
from django.shortcuts import render, redirect
from django.utils import six
from django.utils.translation import ugettext as _
@@ -11,7 +10,7 @@ from avatar.forms import PrimaryAvatarForm, DeleteAvatarForm, UploadAvatarForm
from avatar.models import Avatar
from avatar.signals import avatar_updated
from avatar.util import (get_primary_avatar, get_default_avatar_url,
- get_user_model, get_user, invalidate_cache)
+ invalidate_cache)
def _get_next(request):
@@ -160,65 +159,6 @@ def delete(request, extra_context=None, next_override=None, *args, **kwargs):
return render(request, 'avatar/confirm_delete.html', context)
-def avatar_gallery(request, username, template_name="avatar/gallery.html"):
- try:
- user = get_user(username)
- except get_user_model().DoesNotExist:
- raise Http404
-
- context = {
- "other_user": user,
- "avatars": user.avatar_set.all(),
- }
-
- return render(request, template_name, context)
-
-
-def avatar(request, username, id, template_name="avatar/avatar.html"):
- try:
- user = get_user(username)
- except get_user_model().DoesNotExist:
- raise Http404
- avatars = user.avatar_set.order_by("-date_uploaded")
- index = None
- avatar = None
- if avatars:
- avatar = avatars.get(pk=id)
- if not avatar:
- return Http404
-
- index = avatars.filter(date_uploaded__gt=avatar.date_uploaded).count()
- count = avatars.count()
-
- if index == 0:
- prev = avatars.reverse()[0]
- if count <= 1:
- next = avatars[0]
- else:
- next = avatars[1]
- else:
- prev = avatars[index - 1]
-
- if (index + 1) >= count:
- next = avatars[0]
- prev_index = index - 1
- if prev_index < 0:
- prev_index = 0
- prev = avatars[prev_index]
- else:
- next = avatars[index + 1]
-
- return render(request, template_name, {
- "other_user": user,
- "avatar": avatar,
- "index": index + 1,
- "avatars": avatars,
- "next": next,
- "prev": prev,
- "count": count,
- })
-
-
def render_primary(request, user=None, size=settings.AVATAR_DEFAULT_SIZE):
size = int(size)
avatar = get_primary_avatar(user, size=size)