diff --git a/README.rst b/README.rst index d7733988..4855d647 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,6 @@ Features * 12-Factor_ based settings via django-environ_ * Optimized development and production settings * Registration via django-allauth_ -* User avatars via django-avatar_ * Procfile_ for deploying to Heroku * Grunt build for compass and livereload * Basic e-mail configurations for send emails via SendGrid_ diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py index 8d8ae674..6971dbd6 100644 --- a/{{cookiecutter.repo_name}}/config/settings/common.py +++ b/{{cookiecutter.repo_name}}/config/settings/common.py @@ -36,7 +36,6 @@ DJANGO_APPS = ( ) THIRD_PARTY_APPS = ( 'crispy_forms', # Form layouts - 'avatar', # for user avatars 'allauth', # registration 'allauth.account', # registration 'allauth.socialaccount', # registration diff --git a/{{cookiecutter.repo_name}}/config/urls.py b/{{cookiecutter.repo_name}}/config/urls.py index bd730660..fafc1c0f 100644 --- a/{{cookiecutter.repo_name}}/config/urls.py +++ b/{{cookiecutter.repo_name}}/config/urls.py @@ -21,9 +21,6 @@ urlpatterns = patterns('', # noqa url(r'^users/', include("{{ cookiecutter.repo_name }}.users.urls", namespace="users")), url(r'^accounts/', include('allauth.urls')), - # Uncomment the next line to enable avatars - url(r'^avatar/', include('avatar.urls')), - # Your stuff: custom urls includes go here diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index cb61a20a..5a44667a 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -27,9 +27,6 @@ psycopg2==2.6 unicode-slugify==0.1.3 django-autoslug==1.7.2 -# Useful things -django-avatar==2.0 - # Time zones support pytz==2015.2 diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html deleted file mode 100644 index 077b81b5..00000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html +++ /dev/null @@ -1,23 +0,0 @@ -{% raw %} -{% extends "avatar/base.html" %} -{% load i18n avatar_tags %} -{% load url from future %} - -{% block content %} -
-
-
-

{% trans "Your current avatar: " %}

- {% avatar user %} - {% if not avatars %} -

{% trans "You haven't uploaded an avatar yet. Please upload one now." %}

- {% endif %} -
- {{ upload_avatar_form.as_p }} -

{% csrf_token %}

-
-
-
-
-{% endblock %} -{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html deleted file mode 100644 index febc17f0..00000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html +++ /dev/null @@ -1 +0,0 @@ -{% raw %}{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html deleted file mode 100644 index 6a0e6e9d..00000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html +++ /dev/null @@ -1,5 +0,0 @@ -{% raw %}{% extends "base.html" %} - -{% block title %}django-avatar{% endblock %} -{% block content %}{% endblock %} -{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html deleted file mode 100644 index 0acbc703..00000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html +++ /dev/null @@ -1,29 +0,0 @@ -{% raw %}{% extends "avatar/base.html" %} -{% load i18n avatar_tags %} -{% load url from future %} - -{% block content %} -
-
-
-

{% trans "Your current avatar: " %}

- {% avatar user %} - {% if not avatars %} -

{% trans "You haven't uploaded an avatar yet. Please upload one now." %}

- {% else %} -
-
    - {{ primary_avatar_form.as_ul }} -
-

{% csrf_token %}

-
- {% endif %} -
- {{ upload_avatar_form.as_p }} -

{% csrf_token %}

-
-
-
-
-{% endblock %} -{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html deleted file mode 100644 index 896b6ea4..00000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html +++ /dev/null @@ -1,25 +0,0 @@ -{% raw %}{% extends "avatar/base.html" %} -{% load i18n %} -{% load url from future %} - -{% block content %} -
-
-
-

{% trans "Please select the avatars that you would like to delete." %}

- {% if not avatars %} - {% url 'avatar_change' as avatar_change_url %} -

{% blocktrans %}You have no avatars to delete. Please upload one now.{% endblocktrans %}

- {% else %} -
-
    - {{ delete_avatar_form.as_ul }} -
-

{% csrf_token %}

-
- {% endif %} -
-
-
-{% endblock %} -{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html index 508c845a..62ef2805 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html @@ -1,5 +1,4 @@ {% raw %}{% extends "base.html" %} -{% load avatar_tags %} {% load static %} {% block title %}User: {{ object.username }}{% endblock %} @@ -15,13 +14,12 @@ {% if object == request.user %} - +
My Info E-Mail - Avatar
@@ -32,4 +30,4 @@
{% endblock content %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html index f7c03fd7..a37b70c1 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html @@ -1,13 +1,11 @@ {% raw %}{% extends "base.html" %} {% load static %}{% load i18n %} -{% load avatar_tags %} - {% block title %}Members{% endblock %} {% block content %}
- +

Users

@@ -19,15 +17,15 @@
-{% endblock content %}{% endraw %} \ No newline at end of file +{% endblock content %}{% endraw %}