# HG changeset patch # User cavaliet # Date 1373302501 -7200 # Node ID 8a02a23cdaba80ea231ae697ac71a567497e93ce # Parent 1851a338a069dfcf45246da97f03bfb96d78cd71 registration first step diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/config.py.tmpl --- a/src/egonomy/config.py.tmpl Fri Jul 05 16:54:38 2013 +0200 +++ b/src/egonomy/config.py.tmpl Mon Jul 08 18:55:01 2013 +0200 @@ -144,3 +144,11 @@ SENSEETIVE_API_USER = "user" SENSEETIVE_API_PASSWORD = "pwd" SENSEETIVE_API_TENANT = "projectX" + +ACCOUNT_ACTIVATION_DAYS = 7 # If you want to change settings + +EMAIL_USE_TLS = %(email_use_tls)s +EMAIL_HOST = '%(email_host)s' +EMAIL_HOST_USER = '%(email_host_user)s' +EMAIL_HOST_PASSWORD = '%(email_host_user)s' +EMAIL_PORT = %(email_port)d diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/settings.py --- a/src/egonomy/settings.py Fri Jul 05 16:54:38 2013 +0200 +++ b/src/egonomy/settings.py Mon Jul 08 18:55:01 2013 +0200 @@ -139,6 +139,7 @@ 'django.contrib.admindocs', 'django_extensions', 'south', + 'registration', 'sorl.thumbnail', 'haystack', 'egonomy', @@ -181,6 +182,7 @@ HAYSTACK_SIGNAL_PROCESSOR = 'egonomy.search_indexes.EgonomySignalProcessor' +ACCOUNT_ACTIVATION_DAYS = 7 from .config import * #@UnusedWildImport diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/static/egonomy/css/style.css --- a/src/egonomy/static/egonomy/css/style.css Fri Jul 05 16:54:38 2013 +0200 +++ b/src/egonomy/static/egonomy/css/style.css Mon Jul 08 18:55:01 2013 +0200 @@ -259,6 +259,12 @@ .search-form-big input[type=text]{background: url(../img/icon-search-big.png) right 10px center no-repeat #FFF;font-family: 'Lato'; font-weight : bold; font-style : italic; font-size: 24px; border: 1px solid #D0D0D0; height: 52px; line-height: 52px; padding: 0 50px 0 10px;} .search-form-big select{height: 24px; vertical-align: middle;} +/* register pages */ +.register{font-family: 'josefin_sans'; font-size: 18px; margin: 10px 0;} +.register p{margin: 10px 0;} +.register a:hover{ border-bottom: 1px solid #000;} + + #map{width: 100%; height: 360px; margin-bottom: 20px;} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/activate.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/activate.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,13 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+ {% if account %} +

{% trans "Account successfully activated" %}

+

{% trans "Log in" %}

+ {% else %} +

{% trans "Account activation failed" %}

+ {% endif %} +
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/activation_complete.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/activation_complete.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,8 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Your account is now activated." %}

+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/activation_email.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/activation_email.txt Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,6 @@ +{% load i18n %} +{% trans "Activate account at" %} {{ site.name }}: + +http://{{ site.domain }}{% url 'registration_activate' activation_key %} + +{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/activation_email_subject.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/activation_email_subject.txt Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,1 @@ +{% load i18n %}{% trans "Account activation on" %} {{ site.name }} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/login.html --- a/src/egonomy/templates/registration/login.html Fri Jul 05 16:54:38 2013 +0200 +++ b/src/egonomy/templates/registration/login.html Mon Jul 08 18:55:01 2013 +0200 @@ -7,23 +7,15 @@ {% block content %} {% if form.errors %}

{% trans "Sorry, that's not a valid username or password." %}

- {% endif %} -
+ {% endif %} +
-
{% csrf_token %} -
    - {{form.as_ul}} -
- -
- -
-
+ {{form.as_p}} +
+

{% trans "Still not a user ? Create an account" %}

{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_change_done.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_change_done.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,8 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Password changed" %}

+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_change_form.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_change_form.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,12 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_reset_complete.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_reset_complete.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,9 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Password reset successfully" %}

+

{% trans "Log in" %}

+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_reset_confirm.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_reset_confirm.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,16 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+ {% if validlink %} +
+ {% csrf_token %} + {{ form.as_p }} + +
+ {% else %} +

{% trans "Password reset failed" %}

+ {% endif %} +
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_reset_done.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_reset_done.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,8 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "Email with password reset instructions has been sent." %}

+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_reset_email.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_reset_email.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,5 @@ +{% load i18n %} +{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: +{% block reset_link %} +{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid, token=token %} +{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/password_reset_form.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/password_reset_form.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,12 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/registration_complete.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/registration_complete.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,8 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+

{% trans "You are now registered. Activation email sent." %}

+
+{% endblock %} \ No newline at end of file diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/templates/registration/registration_form.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/egonomy/templates/registration/registration_form.html Mon Jul 08 18:55:01 2013 +0200 @@ -0,0 +1,12 @@ +{% extends "egonomy_newbase.html" %} +{% load i18n %} + +{% block content %} +
+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+{% endblock %} diff -r 1851a338a069 -r 8a02a23cdaba src/egonomy/urls.py --- a/src/egonomy/urls.py Fri Jul 05 16:54:38 2013 +0200 +++ b/src/egonomy/urls.py Mon Jul 08 18:55:01 2013 +0200 @@ -37,6 +37,7 @@ # login logout view url(r'^login/', 'django.contrib.auth.views.login', name='login'), url(r'^logout/', 'django.contrib.auth.views.logout', name='logout'), + (r'^accounts/', include('registration.backends.default.urls')), ) urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff -r 1851a338a069 -r 8a02a23cdaba virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Fri Jul 05 16:54:38 2013 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Mon Jul 08 18:55:01 2013 +0200 @@ -19,7 +19,7 @@ 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.31.tar.gz', 'local':"distribute-0.6.31.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.5/tarball/', 'local':"Django-1.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.0.2.tar.gz', 'local':"django-extensions-1.0.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, + 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/downloads/django-registration-1.0.tar.gz', 'local':"django-registration-1.0.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, 'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.5.tar.gz', 'local':"south-0.7.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/sorl/sorl-thumbnail/archive/master.tar.gz', 'local':"sorl-thumbnail-v11.12.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'LIBJPEG': {'setup': None, 'url':'jpegsrc.v9.tar.gz', 'local':'jpegsrc.v9.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}}, diff -r 1851a338a069 -r 8a02a23cdaba virtualenv/res/src/django-registration-0.8.tar.gz Binary file virtualenv/res/src/django-registration-0.8.tar.gz has changed diff -r 1851a338a069 -r 8a02a23cdaba virtualenv/res/src/django-registration-1.0.tar.gz Binary file virtualenv/res/src/django-registration-1.0.tar.gz has changed