Moving accounts releated stuff from deprecated

Sergio Oliveira
1 parent 08fa10f3
Showing 20 changed files with 376 additions and 620 deletions Show diff stats
src/accounts/auth.py
src/accounts/templates/accounts/account_message.html
src/accounts/templates/accounts/email_signup-email-confirmation.html
src/accounts/templates/accounts/signup-form.html
src/accounts/templates/accounts/user-profile.html
src/accounts/urls.py
src/accounts/views.py
src/colab/custom_settings.py
src/colab/deprecated/locale/pt_BR/LC_MESSAGES/django.po
src/colab/deprecated/templates/account_change_password.html
src/colab/deprecated/templates/account_message.html
src/colab/deprecated/templates/account_request_reset_password.html
src/colab/deprecated/templates/email_account-reset-password.html
src/colab/deprecated/templates/email_signup-email-confirmation.html
src/colab/deprecated/templates/signup-form.html
src/colab/deprecated/templates/user-profile.html
src/colab/deprecated/views/signup.py
src/colab/deprecated/views/userprofile.py
src/colab/local_settings-dev.py
src/colab/urls.py
@@ -6,5 +6,4 @@ class ColabBrowserIDBackend(BrowserIDBackend):
         return self.User.objects.filter(emails__address=email)
     def authenticate(self, *args, **kw):
-        #import pdb; pdb.set_trace();
         return super(ColabBrowserIDBackend, self).authenticate(*args, **kw)
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main-content %}
+
+<span class="span-24 {{ msg_css_class }}">
+  {% trans msg %}
+</span>
+
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+{% trans "Welcome to the Colab!" %}
+
+{% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}
+
+<a href="http://{{ server_name }}{% url 'email_verification' hash %}"> 
+  http://{{ server_name }}{% url 'email_verification' hash %}
+</a>
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% load form_field %}
+{% load i18n %}
+{% block main-content %}
+
+<h2>{% trans "Sign up" %}</h2>
+
+{% if form.errors %}
+<div class="alert"><b>{% trans "Please correct the errors below and try again." %}</b></div>
+{% endif %}
+
+<div class="avatar-placeholder box">
+  <label class="avatar-placeholder">{% trans "Avatar" %}</label >
+  <div class="avatar-image avatar">
+    <img  src="{{ STATIC_URL }}img/user.png" alt="user"/>
+  </div>
+  <p>
+    {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>.
+  </p>
+</div>
+
+
+<p class="required span-24 last">
+  <label>{% trans "Required fields" %}</label>  
+</p>
+
+<form class="span-24" id="signup" action="." method="post">
+  {% csrf_token %}
+  
+  <fieldset class="box span-11">
+    <legend>{% trans "Access Information" %}</legend>
+    {% render_form_field form.username %}
+    {% render_form_field form.password1 %}
+    {% render_form_field form.password2 %}
+  </fieldset>
+
+  <fieldset class="box last">
+    <legend>{% trans "Professionals Information" %}</legend>
+    {% render_form_field form.institution %}
+    {% render_form_field form.role %}
+  </fieldset>
+  
+  <fieldset class="box span-11">
+    <legend>{% trans "Personal Information" %}</legend>    
+    {% render_form_field form.first_name %}
+    {% render_form_field form.last_name %}
+    {% render_form_field form.email %}
+  </fieldset>
+
+  <fieldset class="box last">
+    <legend>{% trans "Others" %}</legend>
+    {% render_form_field form.twitter %}
+    {% render_form_field form.facebook %}
+    {% render_form_field form.google_talk %}
+    {% render_form_field form.webpage %}
+  </fieldset>
+ 
+  <fieldset class="box span-11">
+    <legend>{% trans "Subscribe to mail lists" %}</legend>
+    {% render_form_field form.lists %}
+  </fieldset>
+ 
+  <div class="span-24">
+    <input class="right" type="submit" value="{% trans 'Register' %}"/>
+  </div>
+</form>
+{% endblock %}
@@ -0,0 +1,113 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load form_field %}
+
+{% block head_js %}
+  {% include "pizza-chart.html" with chart_div="collabs" chart_width=390 chart_height=230 %}
+{% endblock %}
+
+{% block main-content %}
+  {% if not user_profile %}
+    <span class="notice span-24">
+      <b>{% trans "User not registered." %}</b> {% trans "Is that you?" %}
+      <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
+    </span>
+
+  {% else %}
+
+    {% ifequal request.user.username user_profile.user.username %}
+      <span class="success span-24">
+        {% trans "Hey, look at you! Do you want to " %}
+        <a href="{% url 'user_profile_update' request.user %}">{% trans "update your profile" %}</a>?
+      </span>
+    {% endifequal %}
+
+  {% endif %}
+
+  <div id="user-profile">
+    <h2>{{ email_address.get_full_name }}</h2>
+
+    <div class="span-4">
+      <img class="avatar" width="120px" heigth="120px"
+           src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" />
+    </div>
+
+    <div class="span-20 last">
+      <div class="span-10">
+        <form action="{% url 'user_profile_update' request.user %}" method='post'>
+          {% csrf_token %}
+
+          <h3>{% trans "Personal Information" %}</h3>
+          <ul id="user-info">
+            <li>
+              {{ form.username.label_tag }}: {{ user_profile.user.username }}
+            </li>
+            <li>
+              {% render_form_field form.institution user_profile.institution %}
+            </li>
+            <li>
+              {% render_form_field form.role user_profile.role %}
+            </li>
+          </ul>
+
+          <hr class="space" />
+
+          <h3>{% trans "Other informations" %}</h3>
+          <ul>
+            <li>
+              {% render_form_field form.twitter user_profile.twitter %}
+            </li>
+            <li>
+              {% render_form_field form.facebook user_profile.facebook %}
+            </li>
+            <li>
+              {% render_form_field form.google_talk user_profile.google_talk %}
+            </li>
+            <li>
+              {% render_form_field form.webpage user_profile.webpage %}
+            </li>
+          </ul>
+
+          <hr class="space"/>
+          {% if editable %}
+            <span class="span-5">
+              <input class="right" type="submit" value="{% trans 'Save' %}"/>
+            </span>
+          {% endif %}
+        </form>
+      </div>
+
+      {% if type_count %}
+      <div class="span-10 last">
+        <h3 class="center">{% trans "Collaborations by Area" %}</h3>
+        <div id="collabs"></div>
+      </div>
+      {% endif %}
+    </div>
+
+    <hr class="space" />
+
+    <div class="span-13">
+      <h3>{% trans "Latest posted" %} </h3>
+      <ul class="colborder">
+      {% for doc in emails %}
+        {% include "message-preview.html" %}
+      {% empty %}
+        <li>{% trans "There are no posts by this user so far." %}</li>
+      {% endfor %}
+      </ul>
+    </div>
+
+    <div class="span-11 last">
+      <h3>{% trans "Community inside participations" %}</h3>
+      <ul>
+      {% for doc in docs %}
+        {% include "message-preview.html" %}
+      {% empty %}
+        <li>{% trans "No contributions of this user so far." %}</li>
+      {% endfor %}
+      </ul>
+    </div>
+
+  </div>
+{% endblock %}
@@ -0,0 +1,25 @@
+
+from django.conf.urls import patterns, include, url
+
+
+urlpatterns = patterns('',
+
+    url(r'^$', 'accounts.views.signup', name='signup'),
+
+    url(r'^verify/(?P<hash>[\w]{32})/$',
+        'accounts.views.verify_email', name='email_verification'),
+
+    # TODO: review and redo those weird views from 
+    #   colab.deprecated.views.userprofile moving them to accounts.views 
+    url(r'^user/(?P<username>[\w@+.-]+)/?$',
+        'colab.deprecated.views.userprofile.by_username', name='user_profile'),
+
+    url(r'^user/$', 'colab.deprecated.views.userprofile.by_request_user',
+        name='user_profile_by_request_user'),
+
+    url(r'^user/hash/(?P<emailhash>[\w]+)$',
+        'colab.deprecated.views.userprofile.by_emailhash'),
+
+    url(r'^user/(?P<username>[\w@+.-]+)/edit/?$',
+        'colab.deprecated.views.userprofile.update', name='user_profile_update'),
+)
-# Create your views here.
+#!/usr/bin/env python
+# encoding: utf-8
+
+import uuid
+from colab.deprecated import signup as signup_
+
+from django.template import RequestContext
+from django.contrib.auth.models import User
+from django.utils.translation import ugettext as _
+from django.shortcuts import render, get_object_or_404
+
+from super_archives.forms import UserCreationForm
+from super_archives.models import UserProfile, EmailAddress
+
+
+def signup(request):
+
+    # If the request method is GET just return the form
+    if request.method == 'GET':
+        form = UserCreationForm()
+        return render(request, 'accounts/signup-form.html', {'form': form})
+
+    # If the request method is POST try to store data
+    form = UserCreationForm(request.POST)
+
+    # If there is validation errors give the form back to the user
+    if not form.is_valid():
+        return render(request, 'accounts/signup-form.html', {'form': form})
+
+    user = User(
+        username=form.cleaned_data.get('username'),
+        email=form.cleaned_data.get('email'),
+        first_name=form.cleaned_data.get('first_name'),
+        last_name=form.cleaned_data.get('last_name'),
+        is_active=False,
+    )
+    user.set_password(form.cleaned_data.get('password1'))
+    user.save()
+
+    profile = UserProfile(
+        user=user,
+        institution=form.cleaned_data.get('institution'),
+        role=form.cleaned_data.get('role'),
+        twitter=form.cleaned_data.get('twitter'),
+        facebook=form.cleaned_data.get('facebook'),
+        google_talk=form.cleaned_data.get('google_talk'),
+        webpage=form.cleaned_data.get('webpage'),
+        verification_hash=uuid.uuid4().get_hex(),
+    )
+    profile.save()
+
+    signup_.send_verification_email(request, user)
+
+    mailing_lists = form.cleaned_data.get('lists')
+    if mailing_lists:
+        signup_.send_email_lists(user, mailing_lists)
+
+
+    # Check if the user's email have been used previously
+    #   in the mainling lists to link the user to old messages
+    email_addr, created = EmailAddress.objects.get_or_create(address=user.email)
+    if created:
+        email_addr.real_name = user.get_full_name()
+
+    email_addr.user = user
+    email_addr.save()
+
+    template_data = {
+        'msg': _((u'Registration completed successfully. Please visit your '
+                u'email address to validate it.')),
+        'msg_css_class': 'success',
+    }
+
+    return render(request, 'accounts/account_message.html', template_data)
+
+
+def verify_email(request, hash):
+    """Verify hash and activate user's account"""
+
+    profile = get_object_or_404(UserProfile, verification_hash=hash)
+
+    profile.verification_hash = 'verified'
+    profile.save()
+
+    profile.user.is_active = True
+    profile.user.save()
+
+    template_data = {
+        'msg': _(u'E-mail validated correctly.'),
+        'msg_css_class': 'success',
+    }
+
+    return render(request, 'accounts/account_message.html', template_data)
@@ -49,11 +49,17 @@ LOGGING = {
             'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s',
         },
     },
+    'filters': {
+         'require_debug_false': {
+             '()': 'django.utils.log.RequireDebugFalse'
+         }
+     },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
             'class': 'django.utils.log.AdminEmailHandler',
             'include_html': True,
+            'filters': ['require_debug_false'],
         },
         'sentry': {
             'level': 'ERROR',
@@ -96,16 +102,6 @@ LOGGING = {
 SERVER_EMAIL = '"Colab Interlegis" <noreply@interlegis.leg.br>'
 EMAIL_HOST_USER = SERVER_EMAIL
-#SOLR_HOSTNAME = 'solr.interlegis.leg.br'
-SOLR_HOSTNAME = '10.1.2.154'
-SOLR_PORT = '8080'
-SOLR_SELECT_PATH = '/solr/select'
-
-SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
-SOLR_BASE_QUERY = """
-    ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
-"""
-
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
@@ -140,14 +136,40 @@ STATICFILES_DIRS = (
 STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static')
+
+### Proxy configuration
 SOCKS_SERVER = None
 SOCKS_PORT = None
+
+### Feedzilla  (planet)
 from feedzilla.settings import *
 FEEDZILLA_PAGE_SIZE = 5
 FEEDZILLA_SITE_TITLE = gettext(u'Planet Colab')
 FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
+
+### BrowserID / Persona
+SITE_URL = 'http://colab.interlegis.leg.br'
+
+LOGIN_REDIRECT_URL = '/'
+LOGIN_REDIRECT_URL_FAILURE = '/'
+LOGOUT_REDIRECT_URL = '/'
+BROWSERID_CREATE_USER = False
+
+
+### Apache Solr
+#SOLR_HOSTNAME = 'solr.interlegis.leg.br'
+SOLR_HOSTNAME = '10.1.2.154'
+SOLR_PORT = '8080'
+SOLR_SELECT_PATH = '/solr/select'
+
+SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
+SOLR_BASE_QUERY = """
+    ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
+"""
+
+
 try:
     from local_settings import *
 except ImportError:
@@ -37,31 +37,15 @@ msgstr &quot;Não encontrado. Continue procurando! :)&quot;
 msgid "Ooopz... something went wrong!"
 msgstr "Ooopz... algo saiu errado!"
-#: templates/account_change_password.html:9 templates/signup-form.html:9
+#: templates/signup-form.html:9
 msgid "Please correct the errors below and try again."
 msgstr "Por favor, corrija os erros abaixo e tente novamente."
-#: templates/account_change_password.html:20
-msgid "Change password"
-msgstr "Alterar senha"
-
-#: templates/account_request_reset_password.html:5 templates/login.html:30
-msgid "I forgot my password"
-msgstr "Esqueci minha senha"
-
-#: templates/account_request_reset_password.html:11
-msgid "User"
-msgstr "Usuário"
-
-#: templates/account_request_reset_password.html:13
-msgid "Send new password"
-msgstr "Enviar nova senha"
-
 #: templates/base.html:71 templates/login.html:44 templates/signup-form.html:6
 msgid "Sign up"
 msgstr "Cadastre-se"
-#: templates/base.html:74 templates/login.html:17
+#: templates/base.html:74
 msgid "Login"
 msgstr "Login"
@@ -122,27 +106,6 @@ msgstr &quot;O conteúdo deste site está publicado sob a licença&quot;
 msgid "Creative Commons - attribution, non-commercial"
 msgstr "Creative Commons - atribuição e não-comercial"
-#: templates/email_account-reset-password.html:3
-#, python-format
-msgid ""
-"\n"
-"  This email was sent to confirm the password change request \n"
-"  to the user's <b>%(username)s</b> of Interlegis Colab. If you have not \n"
-"  made the request, please ignore this message.\n"
-msgstr ""
-"\n"
-"  Este email foi enviado para confirmar a solicitação de troca de senha \n"
-"  para o usuário <b>%(username)s</b> do Colab Interlegis. Caso você não \n"
-"  tenha realizado a solicitação por favor ignore esta mensagem.\n"
-
-#: templates/email_account-reset-password.html:12
-msgid ""
-"\n"
-"  To perform the password change visit the link below:\n"
-msgstr ""
-"\n"
-"  Para realizar a troca de senha acesse o link abaixo:\n"
-
 #: templates/email_signup-email-confirmation.html:3
 msgid "Welcome to the Colab!"
 msgstr "Bem-vindo ao Colab!"
@@ -202,23 +165,6 @@ msgstr &quot;RSS - Últimas Discussões&quot;
 msgid "View more discussions..."
 msgstr "Ver mais discussões..."
-#: templates/login.html:36
-msgid "Not already registered? Sign up!"
-msgstr "Não possui cadastro? Casdastre-se"
-
-#: templates/login.html:38
-msgid ""
-"To access some features of Colab you must be registered. \n"
-"        If you are not already registered systems in the community "
-"Interlegis \n"
-"        click on the link below and get to work!\n"
-"        "
-msgstr ""
-"Para acessar alguns dos recursos do Colab é necessário estar registrado. \n"
-"Caso você ainda não esteja cadastrado nos sistemas da comunidade "
-"Interlegis \n"
-"clique no link abaixo e comece a colaborar!"
-
 #: templates/open-data.html:6
 msgid "OpenData - Communities Interlegis"
 msgstr "OpenData - Comunidades Interlegis"
@@ -1,24 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load form_field %}
-
-{% block main-content %}
-
-{% if form.errors %}
-  <div class="alert">
-    <b>{% trans "Please correct the errors below and try again." %}</b>
-  </div>
-{% endif %}
-
-<form method="POST" action=".">
-  {% csrf_token %}
-
-  <fieldset class="span-24 box">
-    {% render_form_field form.old_password %}
-    {% render_form_field form.new_password1 %}
-    {% render_form_field form.new_password2 %}
-    <input type="submit" value="{% trans 'Change password' %}"/>
-  </fieldset>
-  
-</form>
-{% endblock %}
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block main-content %}
-
-<span class="span-24 {{ msg_css_class }}">
-  {% trans msg %}
-</span>
-
-{% endblock %}
 \ No newline at end of file
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block main-content %}
-<h2>{% trans "I forgot my password" %}</h2>
-
-<form method="POST" action="{% url 'request_reset_password' %}">
-  {% csrf_token %}
-
-  <fieldset class="span-24 center box">
-    <label>{% trans "User" %}:</label>
-    <input name="username"/>
-    <input type="submit" value="{% trans 'Send new password' %}"/>
-  </fieldset>
-
-</form>
-
-{% endblock %}
@@ -1,19 +0,0 @@
-{% load i18n %}
-
-{% blocktrans %}
-  This email was sent to confirm the password change request 
-  to the user's <b>{{ username }}</b> of Interlegis Colab. If you have not 
-  made the request, please ignore this message.
-{% endblocktrans %}
-
-<br/>
-<br/>
-
-{% blocktrans %}
-  To perform the password change visit the link below:
-{% endblocktrans %}
-<br/>
-
-<a href="http://{{ server_name }}{% url 'reset_password' hash %}"> 
-  http://{{ server_name }}{% url 'reset_password' hash %}
-</a>
@@ -1,9 +0,0 @@
-{% load i18n %}
-
-{% trans "Welcome to the Colab!" %}
-
-{% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}
-
-<a href="http://{{ server_name }}{% url 'email_verification' hash %}"> 
-  http://{{ server_name }}{% url 'email_verification' hash %}
-</a>
@@ -1,67 +0,0 @@
-{% extends "base.html" %}
-{% load form_field %}
-{% load i18n %}
-{% block main-content %}
-
-<h2>{% trans "Sign up" %}</h2>
-
-{% if form.errors %}
-<div class="alert"><b>{% trans "Please correct the errors below and try again." %}</b></div>
-{% endif %}
-
-<div class="avatar-placeholder box">
-  <label class="avatar-placeholder">{% trans "Avatar" %}</label >
-  <div class="avatar-image avatar">
-    <img  src="{{ STATIC_URL }}img/user.png" alt="user"/>
-  </div>
-  <p>
-    {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>.
-  </p>
-</div>
-
-
-<p class="required span-24 last">
-  <label>{% trans "Required fields" %}</label>  
-</p>
-
-<form class="span-24" id="signup" action="." method="post">
-  {% csrf_token %}
-  
-  <fieldset class="box span-11">
-    <legend>{% trans "Access Information" %}</legend>
-    {% render_form_field form.username %}
-    {% render_form_field form.password1 %}
-    {% render_form_field form.password2 %}
-  </fieldset>
-
-  <fieldset class="box last">
-    <legend>{% trans "Professionals Information" %}</legend>
-    {% render_form_field form.institution %}
-    {% render_form_field form.role %}
-  </fieldset>
-  
-  <fieldset class="box span-11">
-    <legend>{% trans "Personal Information" %}</legend>    
-    {% render_form_field form.first_name %}
-    {% render_form_field form.last_name %}
-    {% render_form_field form.email %}
-  </fieldset>
-
-  <fieldset class="box last">
-    <legend>{% trans "Others" %}</legend>
-    {% render_form_field form.twitter %}
-    {% render_form_field form.facebook %}
-    {% render_form_field form.google_talk %}
-    {% render_form_field form.webpage %}
-  </fieldset>
- 
-  <fieldset class="box span-11">
-    <legend>{% trans "Subscribe to mail lists" %}</legend>
-    {% render_form_field form.lists %}
-  </fieldset>
- 
-  <div class="span-24">
-    <input class="right" type="submit" value="{% trans 'Register' %}"/>
-  </div>
-</form>
-{% endblock %}
@@ -1,116 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load form_field %}
-
-{% block head_js %}
-  {% include "pizza-chart.html" with chart_div="collabs" chart_width=390 chart_height=230 %}
-{% endblock %}
-
-{% block main-content %}
-  {% if not user_profile %}
-    <span class="notice span-24">
-      <b>{% trans "User not registered." %}</b> {% trans "Is that you?" %}
-      <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
-    </span>
-
-  {% else %}
-
-    {% ifequal request.user.username user_profile.user.username %}
-      <span class="success span-24">
-        {% trans "Hey, look at you! Do you want to " %}
-        <a href="{% url 'user_profile_update' request.user %}">{% trans "update your profile" %}</a>?
-      </span>
-    {% endifequal %}
-
-  {% endif %}
-
-  <div id="user-profile">
-    <h2>{{ email_address.get_full_name }}</h2>
-
-    <div class="span-4">
-      <img class="avatar" width="120px" heigth="120px"
-           src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" />
-    </div>
-
-    <div class="span-20 last">
-      <div class="span-10">
-        <form action="{% url 'user_profile_update' request.user %}" method='post'>
-          {% csrf_token %}
-
-          <h3>{% trans "Personal Information" %}</h3>
-          <ul id="user-info">
-            <li>
-              {{ form.username.label_tag }}: {{ user_profile.user.username }}
-              {% ifequal request.user.username user_profile.user.username %}
-                (<a href="{% url 'change_password' %}">{% trans "change password" %}</a>)
-              {% endifequal %}
-            </li>
-            <li>
-              {% render_form_field form.institution user_profile.institution %}
-            </li>
-            <li>
-              {% render_form_field form.role user_profile.role %}
-            </li>
-          </ul>
-
-          <hr class="space" />
-
-          <h3>{% trans "Other informations" %}</h3>
-          <ul>
-            <li>
-              {% render_form_field form.twitter user_profile.twitter %}
-            </li>
-            <li>
-              {% render_form_field form.facebook user_profile.facebook %}
-            </li>
-            <li>
-              {% render_form_field form.google_talk user_profile.google_talk %}
-            </li>
-            <li>
-              {% render_form_field form.webpage user_profile.webpage %}
-            </li>
-          </ul>
-
-          <hr class="space"/>
-          {% if editable %}
-            <span class="span-5">
-              <input class="right" type="submit" value="{% trans 'Save' %}"/>
-            </span>
-          {% endif %}
-        </form>
-      </div>
-
-      {% if type_count %}
-      <div class="span-10 last">
-        <h3 class="center">{% trans "Collaborations by Area" %}</h3>
-        <div id="collabs"></div>
-      </div>
-      {% endif %}
-    </div>
-
-    <hr class="space" />
-
-    <div class="span-13">
-      <h3>{% trans "Latest posted" %} </h3>
-      <ul class="colborder">
-      {% for doc in emails %}
-        {% include "message-preview.html" %}
-      {% empty %}
-        <li>{% trans "There are no posts by this user so far." %}</li>
-      {% endfor %}
-      </ul>
-    </div>
-
-    <div class="span-11 last">
-      <h3>{% trans "Community inside participations" %}</h3>
-      <ul>
-      {% for doc in docs %}
-        {% include "message-preview.html" %}
-      {% empty %}
-        <li>{% trans "No contributions of this user so far." %}</li>
-      {% endfor %}
-      </ul>
-    </div>
-
-  </div>
-{% endblock %}
@@ -1,223 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-"""
-signup.py
-
-Created by Sergio Campos on 2012-01-10.
-"""
-
-import uuid
-from colab.deprecated import signup as signup_
-
-from django.template import RequestContext
-from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.forms import SetPasswordForm, PasswordChangeForm
-from django.shortcuts import render_to_response, redirect, get_object_or_404
-
-from super_archives.forms import UserCreationForm
-from super_archives.models import UserProfile, EmailAddress
-
-
-def signup(request):
-
-    # If the request method is GET just return the form
-    if request.method == 'GET':
-        form = UserCreationForm()
-        return render_to_response('signup-form.html', {'form': form}, 
-                                  RequestContext(request))
-
-    # If the request method is POST try to store data
-    form = UserCreationForm(request.POST)
-    
-    # If there is validation errors give the form back to the user
-    if not form.is_valid():
-        return render_to_response('signup-form.html', {'form': form}, 
-                                  RequestContext(request))
-
-    user = User(
-        username=form.cleaned_data.get('username'),
-        email=form.cleaned_data.get('email'),
-        first_name=form.cleaned_data.get('first_name'),
-        last_name=form.cleaned_data.get('last_name'),
-        is_active=False,
-    )
-    user.set_password(form.cleaned_data.get('password1'))
-    user.save()
-    
-    profile = UserProfile(
-        user=user,
-        institution=form.cleaned_data.get('institution'),
-        role=form.cleaned_data.get('role'),
-        twitter=form.cleaned_data.get('twitter'),
-        facebook=form.cleaned_data.get('facebook'),
-        google_talk=form.cleaned_data.get('google_talk'),
-        webpage=form.cleaned_data.get('webpage'),
-        verification_hash=uuid.uuid4().get_hex(),
-    )
-    profile.save()
-    
-    signup_.send_verification_email(request, user)
-
-    mailing_lists = form.cleaned_data.get('lists')
-    if mailing_lists:
-        signup_.send_email_lists(user, mailing_lists)
-
-
-    # Check if the user's email have been used previously 
-    #   in the mainling lists to link the user to old messages  
-    email_addr, created = EmailAddress.objects.get_or_create(address=user.email)
-    if created:
-        email_addr.real_name = user.get_full_name()
-
-    email_addr.user = user
-    email_addr.save()
-    
-    template_data = {
-        'msg': _((u'Registration completed successfully. Please visit your '
-                u'email address to validate it.')),
-        'msg_css_class': 'success', 
-    }
-    
-    return render_to_response('account_message.html', template_data,
-                              RequestContext(request))
-
-
-def verify_email(request, hash):
-    """Verify hash and activate user's account"""
-    
-    profile = get_object_or_404(UserProfile, verification_hash=hash)
-    
-    profile.verification_hash = 'verified'
-    profile.save()
-    
-    profile.user.is_active = True
-    profile.user.save()
-    
-    template_data = {
-        'msg': _(u'E-mail validated correctly.'),
-        'msg_css_class': 'success', 
-    }
-    
-    return render_to_response('account_message.html', template_data,
-                              RequestContext(request))
-    
-
-def request_reset_password(request):
-    """Request a password reset.
-    
-    In case request method is GET it will display the password reset
-    form. Otherwise we'll look for a username in the POST request to
-    have its password reset. This user will receive a link where he
-    will be allowed to change his password.
-    
-    """
-    
-    if request.method == 'GET':
-        return render_to_response('account_request_reset_password.html', {},
-                                  RequestContext(request))
-    
-    username = request.POST.get('username')
-
-    try:
-        user = User.objects.get(username=username)
-    except User.DoesNotExist:
-        user = None
-    
-    if user and user.is_active:
-        profile = user.profile
-        profile.verification_hash = uuid.uuid4().get_hex()
-        profile.save()
-                
-        signup_.send_reset_password_email(request, user)
-    
-    msg = _((u'For your safety, in a few moments you will receive '
-           u'an email asking you to confirm the password '
-           u'change request. Please wait.'))
-    
-    template_data = {
-        'msg': msg,
-        'msg_css_class': 'info', 
-    }
-    
-    return render_to_response('account_message.html', template_data,
-                              RequestContext(request))
-
-
-def reset_password(request, hash):
-    """Perform a password change.
-    
-    If the request method is set to GET and the hash matches a form 
-    will be displayed to the user allowing the password change.
-    If the request method is POST the user password will be changed
-    to the newly set data.
-    
-    """
-    
-    profile = get_object_or_404(UserProfile, verification_hash=hash)
-    user = profile.user
-    
-    form = SetPasswordForm(profile.user)
-    
-    template_data = {
-        'form': form,
-        'hash': hash,
-    }
-    
-    if request.method == 'GET':
-        return render_to_response('account_change_password.html', 
-                                  template_data, RequestContext(request))
-
-
-    form = SetPasswordForm(user, request.POST)
-    template_data.update({'form': form})
-    
-    if not form.is_valid():
-        return render_to_response('account_change_password.html', 
-                                  template_data, RequestContext(request))
-
-    profile.verification_hash = 'verified'
-    profile.save()
-
-    user.set_password(form.cleaned_data.get('new_password1'))
-    user.save()
-
-    template_data.update({
-        'msg': _(u'Password changed successfully!'),
-        'msg_css_class': 'success',
-    })
-    return render_to_response('account_message.html', template_data,
-                              RequestContext(request))
-
-@login_required
-def change_password(request):
-    """Change a password for an authenticated user."""
-    
-    form = PasswordChangeForm(request.user)
-    
-    template_data = {
-        'form': form
-    }
-    
-    if request.method == 'GET':
-        return render_to_response('account_change_password.html',
-                                  template_data, RequestContext(request))
-    
-    form = PasswordChangeForm(request.user, request.POST)
-    template_data.update({'form': form})
-    
-    if not form.is_valid():
-        return render_to_response('account_change_password.html', 
-                                  template_data, RequestContext(request))
-                                  
-    request.user.set_password(form.cleaned_data.get('new_password1'))
-    request.user.save()
-    
-    template_data.update({
-        'msg': _(u'Password changed successfully!'),
-        'msg_css_class': 'success',
-    })
-    return render_to_response('account_message.html', template_data,
-                              RequestContext(request))    
-    
@@ -10,55 +10,55 @@ from django.template import RequestContext
 from django.contrib.auth.models import User
 from django.forms.models import model_to_dict
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.shortcuts import render, get_object_or_404, redirect
 from colab.deprecated import solrutils
 from super_archives.forms import UserCreationForm, UserUpdateForm
 from super_archives.models import Message, UserProfile, EmailAddress
-                                        
+
 def read(request, user, email_address=None, editable=False, form=None):
-    
+
     if form is None:
         form = UserCreationForm()
-    
+
     if user:
         email_addresses = user.emails.all()
         profile = user.profile
         last_modified_docs = solrutils.get_latest_collaborations(
             username=user.username
         )
-        
+
         type_count = solrutils.count_types(
             filters={'collaborator': user.username}
         )
-        
+
     else:
         email_addresses = [email_address]
         profile = None
         last_modified_docs = []
         type_count = {}
-        
+
     if not email_address and email_addresses:
         email_address = email_addresses[0]
     email_addresses_ids = tuple([str(addr.id) for addr in email_addresses])
-    
+
     query = """
-    SELECT 
-        * 
+    SELECT
+        *
     FROM
         super_archives_message JOIN (
             SELECT id
             FROM super_archives_message
             WHERE from_address_id IN (%(ids)s)
             GROUP BY thread_id, id
-        ) AS subquery 
+        ) AS subquery
         ON subquery.id = super_archives_message.id
-    ORDER BY 
+    ORDER BY
         received_time DESC
     LIMIT 10;
-    
+
     """ % {'ids': ','.join(email_addresses_ids)}
     emails = Message.objects.raw(query)
@@ -73,9 +73,8 @@ def read(request, user, email_address=None, editable=False, form=None):
         'type_count': type_count,
         'docs': last_modified_docs,
     }
-    
-    return render_to_response('user-profile.html', template_data, 
-                              RequestContext(request))
+
+    return render(request, 'accounts/user-profile.html', template_data)
 @login_required
@@ -97,7 +96,7 @@ def by_emailhash(request, emailhash):
 def update(request, username):
     profile = get_object_or_404(UserProfile, user__username=username)
     form = UserUpdateForm(initial=model_to_dict(profile))
-    
+
     if request.method == "GET":
         return read(request, profile.user, editable=True, form=form)
@@ -112,5 +111,5 @@ def update(request, username):
     profile.google_talk = form.cleaned_data.get('google_talk')
     profile.webpage = form.cleaned_data.get('webpage')
     profile.save()
-    
+
     return redirect('user_profile', profile.user.username)
@@ -21,12 +21,3 @@ SECRET_KEY = &#39;)(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj&#39;
 #SOCKS_PORT = 9050
 SITE_URL = 'http://localhost:8000'
-
-# Path to redirect to on successful login.
-LOGIN_REDIRECT_URL = '/'
-
-# Path to redirect to on unsuccessful login attempt.
-LOGIN_REDIRECT_URL_FAILURE = '/'
-
-# Path to redirect to on logout.
-LOGOUT_REDIRECT_URL = '/'
 from django.conf.urls import patterns, include, url
 from django.views.generic import TemplateView
-
-# Uncomment the next two lines to enable the admin:
 from django.contrib import admin
+
 admin.autodiscover()
 urlpatterns = patterns('',
     url(r'^$', 'colab.deprecated.views.other.home', name='home'),
-
-    url(r'^archives/', include('super_archives.urls')),
-    
-    url(r'^api/', include('api.urls')),
-    url(r'^rss/', include('rss.urls')),
+    url(r'^search/$', 'colab.deprecated.views.other.search', name='search'),
     url(r'open-data/$', TemplateView.as_view(template_name='open-data.html'), 
         name='opendata'),
-    url(r'^user/(?P<username>[\w@+.-]+)/?$',
-        'colab.deprecated.views.userprofile.by_username', name='user_profile'),
-    
-    url(r'^user/$', 'colab.deprecated.views.userprofile.by_request_user', 
-        name='user_profile_by_request_user'),
+    url(r'^archives/', include('super_archives.urls')),
-    url(r'^user/hash/(?P<emailhash>[\w]+)$',
-        'colab.deprecated.views.userprofile.by_emailhash'),
+    url(r'^api/', include('api.urls')),
-    url(r'^user/(?P<username>[\w@+.-]+)/edit/?$', 
-        'colab.deprecated.views.userprofile.update', name='user_profile_update'),
-        
-    url(r'^search/$', 'colab.deprecated.views.other.search', name='search'),
-
-    url(r'^account/$', 'colab.deprecated.views.signup.signup', name='signup'), 
-
-    url(r'^account/changepassword/$', 'colab.deprecated.views.signup.change_password',
-        name='change_password'),
-
-    url(r'^account/resetpassword/$', 
-        'colab.deprecated.views.signup.request_reset_password', 
-        name='request_reset_password'),
-        
-    url(r'^account/reset_password/(?P<hash>[\w]{32})/$',
-        'colab.deprecated.views.signup.reset_password', name='reset_password'),
-
-    url(r'^signup/verify/(?P<hash>[\w]{32})/$', 
-        'colab.deprecated.views.signup.verify_email', name='email_verification'), 
-
-    url(r'^account/login/$', 'django.contrib.auth.views.login', 
-        {'template_name': 'login.html'}, name='login'),
+    url(r'^rss/', include('rss.urls')),
-    url(r'^account/logout/$', 'django.contrib.auth.views.logout', 
-        {'next_page': '/'}, name='logout'),
+    url(r'^user/', include('accounts.urls')),    # Kept for backwards compatibility
+    url(r'^signup/', include('accounts.urls')),  # (same here) TODO: move to nginx
+    url(r'^account/', include('accounts.urls')),
     url(r'^planet/', include('feedzilla.urls')),
@@ -59,4 +29,3 @@ urlpatterns = patterns(&#39;&#39;,
     # Uncomment the next line to enable the admin:
     url(r'^colab/admin/', include(admin.site.urls)),
 )
-
	@@ -6,5 +6,4 @@ class ColabBrowserIDBackend(BrowserIDBackend):		@@ -6,5 +6,4 @@ class ColabBrowserIDBackend(BrowserIDBackend):
6	return self.User.objects.filter(emails__address=email)	6	return self.User.objects.filter(emails__address=email)
7		7
8	def authenticate(self, args, *kw):	8	def authenticate(self, args, *kw):
9	- #import pdb; pdb.set_trace();
10	return super(ColabBrowserIDBackend, self).authenticate(args, *kw)	9	return super(ColabBrowserIDBackend, self).authenticate(args, *kw)
	@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
		1	+{% extends "base.html" %}
		2	+{% load i18n %}
		3	+
		4	+{% block main-content %}
		5	+
		6	+<span class="span-24 {{ msg_css_class }}">
		7	+ {% trans msg %}
		8	+</span>
		9	+
		10	+{% endblock %}
0	\ No newline at end of file	11	\ No newline at end of file
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+{% load i18n %}
	2	+
	3	+{% trans "Welcome to the Colab!" %}
	4	+
	5	+{% trans "To activate your account, please confirm your mail's activation by accessing the following link:" %}
	6	+
	7	+<a href="http://{{ server_name }}{% url 'email_verification' hash %}">
	8	+ http://{{ server_name }}{% url 'email_verification' hash %}
	9	+</a>
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+{% extends "base.html" %}
	2	+{% load form_field %}
	3	+{% load i18n %}
	4	+{% block main-content %}
	5	+
	6	+<h2>{% trans "Sign up" %}</h2>
	7	+
	8	+{% if form.errors %}
	9	+<div class="alert"><b>{% trans "Please correct the errors below and try again." %}</b></div>
	10	+{% endif %}
	11	+
	12	+<div class="avatar-placeholder box">
	13	+ <label class="avatar-placeholder">{% trans "Avatar" %}</label >
	14	+ <div class="avatar-image avatar">
	15	+ <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
	16	+ </div>
	17	+ <p>
	18	+ {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>.
	19	+ </p>
	20	+</div>
	21	+
	22	+
	23	+<p class="required span-24 last">
	24	+ <label>{% trans "Required fields" %}</label>
	25	+</p>
	26	+
	27	+<form class="span-24" id="signup" action="." method="post">
	28	+ {% csrf_token %}
	29	+
	30	+ <fieldset class="box span-11">
	31	+ <legend>{% trans "Access Information" %}</legend>
	32	+ {% render_form_field form.username %}
	33	+ {% render_form_field form.password1 %}
	34	+ {% render_form_field form.password2 %}
	35	+ </fieldset>
	36	+
	37	+ <fieldset class="box last">
	38	+ <legend>{% trans "Professionals Information" %}</legend>
	39	+ {% render_form_field form.institution %}
	40	+ {% render_form_field form.role %}
	41	+ </fieldset>
	42	+
	43	+ <fieldset class="box span-11">
	44	+ <legend>{% trans "Personal Information" %}</legend>
	45	+ {% render_form_field form.first_name %}
	46	+ {% render_form_field form.last_name %}
	47	+ {% render_form_field form.email %}
	48	+ </fieldset>
	49	+
	50	+ <fieldset class="box last">
	51	+ <legend>{% trans "Others" %}</legend>
	52	+ {% render_form_field form.twitter %}
	53	+ {% render_form_field form.facebook %}
	54	+ {% render_form_field form.google_talk %}
	55	+ {% render_form_field form.webpage %}
	56	+ </fieldset>
	57	+
	58	+ <fieldset class="box span-11">
	59	+ <legend>{% trans "Subscribe to mail lists" %}</legend>
	60	+ {% render_form_field form.lists %}
	61	+ </fieldset>
	62	+
	63	+ <div class="span-24">
	64	+ <input class="right" type="submit" value="{% trans 'Register' %}"/>
	65	+ </div>
	66	+</form>
	67	+{% endblock %}
@@ -0,0 +1,113 @@		@@ -0,0 +1,113 @@
	1	+{% extends "base.html" %}
	2	+{% load i18n %}
	3	+{% load form_field %}
	4	+
	5	+{% block head_js %}
	6	+ {% include "pizza-chart.html" with chart_div="collabs" chart_width=390 chart_height=230 %}
	7	+{% endblock %}
	8	+
	9	+{% block main-content %}
	10	+ {% if not user_profile %}
	11	+ <span class="notice span-24">
	12	+ <b>{% trans "User not registered." %}</b> {% trans "Is that you?" %}
	13	+ <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
	14	+ </span>
	15	+
	16	+ {% else %}
	17	+
	18	+ {% ifequal request.user.username user_profile.user.username %}
	19	+ <span class="success span-24">
	20	+ {% trans "Hey, look at you! Do you want to " %}
	21	+ <a href="{% url 'user_profile_update' request.user %}">{% trans "update your profile" %}</a>?
	22	+ </span>
	23	+ {% endifequal %}
	24	+
	25	+ {% endif %}
	26	+
	27	+ <div id="user-profile">
	28	+ <h2>{{ email_address.get_full_name }}</h2>
	29	+
	30	+ <div class="span-4">
	31	+ <img class="avatar" width="120px" heigth="120px"
	32	+ src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" />
	33	+ </div>
	34	+
	35	+ <div class="span-20 last">
	36	+ <div class="span-10">
	37	+ <form action="{% url 'user_profile_update' request.user %}" method='post'>
	38	+ {% csrf_token %}
	39	+
	40	+ <h3>{% trans "Personal Information" %}</h3>
	41	+ <ul id="user-info">
	42	+ <li>
	43	+ {{ form.username.label_tag }}: {{ user_profile.user.username }}
	44	+ </li>
	45	+ <li>
	46	+ {% render_form_field form.institution user_profile.institution %}
	47	+ </li>
	48	+ <li>
	49	+ {% render_form_field form.role user_profile.role %}
	50	+ </li>
	51	+ </ul>
	52	+
	53	+ <hr class="space" />
	54	+
	55	+ <h3>{% trans "Other informations" %}</h3>
	56	+ <ul>
	57	+ <li>
	58	+ {% render_form_field form.twitter user_profile.twitter %}
	59	+ </li>
	60	+ <li>
	61	+ {% render_form_field form.facebook user_profile.facebook %}
	62	+ </li>
	63	+ <li>
	64	+ {% render_form_field form.google_talk user_profile.google_talk %}
	65	+ </li>
	66	+ <li>
	67	+ {% render_form_field form.webpage user_profile.webpage %}
	68	+ </li>
	69	+ </ul>
	70	+
	71	+ <hr class="space"/>
	72	+ {% if editable %}
	73	+ <span class="span-5">
	74	+ <input class="right" type="submit" value="{% trans 'Save' %}"/>
	75	+ </span>
	76	+ {% endif %}
	77	+ </form>
	78	+ </div>
	79	+
	80	+ {% if type_count %}
	81	+ <div class="span-10 last">
	82	+ <h3 class="center">{% trans "Collaborations by Area" %}</h3>
	83	+ <div id="collabs"></div>
	84	+ </div>
	85	+ {% endif %}
	86	+ </div>
	87	+
	88	+ <hr class="space" />
	89	+
	90	+ <div class="span-13">
	91	+ <h3>{% trans "Latest posted" %} </h3>
	92	+ <ul class="colborder">
	93	+ {% for doc in emails %}
	94	+ {% include "message-preview.html" %}
	95	+ {% empty %}
	96	+ <li>{% trans "There are no posts by this user so far." %}</li>
	97	+ {% endfor %}
	98	+ </ul>
	99	+ </div>
	100	+
	101	+ <div class="span-11 last">
	102	+ <h3>{% trans "Community inside participations" %}</h3>
	103	+ <ul>
	104	+ {% for doc in docs %}
	105	+ {% include "message-preview.html" %}
	106	+ {% empty %}
	107	+ <li>{% trans "No contributions of this user so far." %}</li>
	108	+ {% endfor %}
	109	+ </ul>
	110	+ </div>
	111	+
	112	+ </div>
	113	+{% endblock %}
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+
	2	+from django.conf.urls import patterns, include, url
	3	+
	4	+
	5	+urlpatterns = patterns('',
	6	+
	7	+ url(r'^$', 'accounts.views.signup', name='signup'),
	8	+
	9	+ url(r'^verify/(?P<hash>[\w]{32})/$',
	10	+ 'accounts.views.verify_email', name='email_verification'),
	11	+
	12	+ # TODO: review and redo those weird views from
	13	+ # colab.deprecated.views.userprofile moving them to accounts.views
	14	+ url(r'^user/(?P<username>[\w@+.-]+)/?$',
	15	+ 'colab.deprecated.views.userprofile.by_username', name='user_profile'),
	16	+
	17	+ url(r'^user/$', 'colab.deprecated.views.userprofile.by_request_user',
	18	+ name='user_profile_by_request_user'),
	19	+
	20	+ url(r'^user/hash/(?P<emailhash>[\w]+)$',
	21	+ 'colab.deprecated.views.userprofile.by_emailhash'),
	22	+
	23	+ url(r'^user/(?P<username>[\w@+.-]+)/edit/?$',
	24	+ 'colab.deprecated.views.userprofile.update', name='user_profile_update'),
	25	+)
1	-# Create your views here.	1	+#!/usr/bin/env python
		2	+# encoding: utf-8
		3	+
		4	+import uuid
		5	+from colab.deprecated import signup as signup_
		6	+
		7	+from django.template import RequestContext
		8	+from django.contrib.auth.models import User
		9	+from django.utils.translation import ugettext as _
		10	+from django.shortcuts import render, get_object_or_404
		11	+
		12	+from super_archives.forms import UserCreationForm
		13	+from super_archives.models import UserProfile, EmailAddress
		14	+
		15	+
		16	+def signup(request):
		17	+
		18	+ # If the request method is GET just return the form
		19	+ if request.method == 'GET':
		20	+ form = UserCreationForm()
		21	+ return render(request, 'accounts/signup-form.html', {'form': form})
		22	+
		23	+ # If the request method is POST try to store data
		24	+ form = UserCreationForm(request.POST)
		25	+
		26	+ # If there is validation errors give the form back to the user
		27	+ if not form.is_valid():
		28	+ return render(request, 'accounts/signup-form.html', {'form': form})
		29	+
		30	+ user = User(
		31	+ username=form.cleaned_data.get('username'),
		32	+ email=form.cleaned_data.get('email'),
		33	+ first_name=form.cleaned_data.get('first_name'),
		34	+ last_name=form.cleaned_data.get('last_name'),
		35	+ is_active=False,
		36	+ )
		37	+ user.set_password(form.cleaned_data.get('password1'))
		38	+ user.save()
		39	+
		40	+ profile = UserProfile(
		41	+ user=user,
		42	+ institution=form.cleaned_data.get('institution'),
		43	+ role=form.cleaned_data.get('role'),
		44	+ twitter=form.cleaned_data.get('twitter'),
		45	+ facebook=form.cleaned_data.get('facebook'),
		46	+ google_talk=form.cleaned_data.get('google_talk'),
		47	+ webpage=form.cleaned_data.get('webpage'),
		48	+ verification_hash=uuid.uuid4().get_hex(),
		49	+ )
		50	+ profile.save()
		51	+
		52	+ signup_.send_verification_email(request, user)
		53	+
		54	+ mailing_lists = form.cleaned_data.get('lists')
		55	+ if mailing_lists:
		56	+ signup_.send_email_lists(user, mailing_lists)
		57	+
		58	+
		59	+ # Check if the user's email have been used previously
		60	+ # in the mainling lists to link the user to old messages
		61	+ email_addr, created = EmailAddress.objects.get_or_create(address=user.email)
		62	+ if created:
		63	+ email_addr.real_name = user.get_full_name()
		64	+
		65	+ email_addr.user = user
		66	+ email_addr.save()
		67	+
		68	+ template_data = {
		69	+ 'msg': _((u'Registration completed successfully. Please visit your '
		70	+ u'email address to validate it.')),
		71	+ 'msg_css_class': 'success',
		72	+ }
		73	+
		74	+ return render(request, 'accounts/account_message.html', template_data)
		75	+
		76	+
		77	+def verify_email(request, hash):
		78	+ """Verify hash and activate user's account"""
		79	+
		80	+ profile = get_object_or_404(UserProfile, verification_hash=hash)
		81	+
		82	+ profile.verification_hash = 'verified'
		83	+ profile.save()
		84	+
		85	+ profile.user.is_active = True
		86	+ profile.user.save()
		87	+
		88	+ template_data = {
		89	+ 'msg': _(u'E-mail validated correctly.'),
		90	+ 'msg_css_class': 'success',
		91	+ }
		92	+
		93	+ return render(request, 'accounts/account_message.html', template_data)
	@@ -37,31 +37,15 @@ msgstr "Não encontrado. Continue procurando! :)"		@@ -37,31 +37,15 @@ msgstr "Não encontrado. Continue procurando! :)"
37	msgid "Ooopz... something went wrong!"	37	msgid "Ooopz... something went wrong!"
38	msgstr "Ooopz... algo saiu errado!"	38	msgstr "Ooopz... algo saiu errado!"
39		39
40	-#: templates/account_change_password.html:9 templates/signup-form.html:9	40	+#: templates/signup-form.html:9
41	msgid "Please correct the errors below and try again."	41	msgid "Please correct the errors below and try again."
42	msgstr "Por favor, corrija os erros abaixo e tente novamente."	42	msgstr "Por favor, corrija os erros abaixo e tente novamente."
43		43
44	-#: templates/account_change_password.html:20
45	-msgid "Change password"
46	-msgstr "Alterar senha"
47	-
48	-#: templates/account_request_reset_password.html:5 templates/login.html:30
49	-msgid "I forgot my password"
50	-msgstr "Esqueci minha senha"
51	-
52	-#: templates/account_request_reset_password.html:11
53	-msgid "User"
54	-msgstr "Usuário"
55	-
56	-#: templates/account_request_reset_password.html:13
57	-msgid "Send new password"
58	-msgstr "Enviar nova senha"
59	-
60	#: templates/base.html:71 templates/login.html:44 templates/signup-form.html:6	44	#: templates/base.html:71 templates/login.html:44 templates/signup-form.html:6
61	msgid "Sign up"	45	msgid "Sign up"
62	msgstr "Cadastre-se"	46	msgstr "Cadastre-se"
63		47
64	-#: templates/base.html:74 templates/login.html:17	48	+#: templates/base.html:74
65	msgid "Login"	49	msgid "Login"
66	msgstr "Login"	50	msgstr "Login"
67		51
	@@ -122,27 +106,6 @@ msgstr "O conteúdo deste site está publicado sob a licença"		@@ -122,27 +106,6 @@ msgstr "O conteúdo deste site está publicado sob a licença"
122	msgid "Creative Commons - attribution, non-commercial"	106	msgid "Creative Commons - attribution, non-commercial"
123	msgstr "Creative Commons - atribuição e não-comercial"	107	msgstr "Creative Commons - atribuição e não-comercial"
124		108
125	-#: templates/email_account-reset-password.html:3
126	-#, python-format
127	-msgid ""
128	-"\n"
129	-" This email was sent to confirm the password change request \n"
130	-" to the user's <b>%(username)s</b> of Interlegis Colab. If you have not \n"
131	-" made the request, please ignore this message.\n"
132	-msgstr ""
133	-"\n"
134	-" Este email foi enviado para confirmar a solicitação de troca de senha \n"
135	-" para o usuário <b>%(username)s</b> do Colab Interlegis. Caso você não \n"
136	-" tenha realizado a solicitação por favor ignore esta mensagem.\n"
137	-
138	-#: templates/email_account-reset-password.html:12
139	-msgid ""
140	-"\n"
141	-" To perform the password change visit the link below:\n"
142	-msgstr ""
143	-"\n"
144	-" Para realizar a troca de senha acesse o link abaixo:\n"
145	-
146	#: templates/email_signup-email-confirmation.html:3	109	#: templates/email_signup-email-confirmation.html:3
147	msgid "Welcome to the Colab!"	110	msgid "Welcome to the Colab!"
148	msgstr "Bem-vindo ao Colab!"	111	msgstr "Bem-vindo ao Colab!"
	@@ -202,23 +165,6 @@ msgstr "RSS - Últimas Discussões"		@@ -202,23 +165,6 @@ msgstr "RSS - Últimas Discussões"
202	msgid "View more discussions..."	165	msgid "View more discussions..."
203	msgstr "Ver mais discussões..."	166	msgstr "Ver mais discussões..."
204		167
205	-#: templates/login.html:36
206	-msgid "Not already registered? Sign up!"
207	-msgstr "Não possui cadastro? Casdastre-se"
208	-
209	-#: templates/login.html:38
210	-msgid ""
211	-"To access some features of Colab you must be registered. \n"
212	-" If you are not already registered systems in the community "
213	-"Interlegis \n"
214	-" click on the link below and get to work!\n"
215	-" "
216	-msgstr ""
217	-"Para acessar alguns dos recursos do Colab é necessário estar registrado. \n"
218	-"Caso você ainda não esteja cadastrado nos sistemas da comunidade "
219	-"Interlegis \n"
220	-"clique no link abaixo e comece a colaborar!"
221	-
222	#: templates/open-data.html:6	168	#: templates/open-data.html:6
223	msgid "OpenData - Communities Interlegis"	169	msgid "OpenData - Communities Interlegis"
224	msgstr "OpenData - Comunidades Interlegis"	170	msgstr "OpenData - Comunidades Interlegis"
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-{% extends "base.html" %}
2	-{% load i18n %}
3	-{% load form_field %}
4	-
5	-{% block main-content %}
6	-
7	-{% if form.errors %}
8	- <div class="alert">
9	- <b>{% trans "Please correct the errors below and try again." %}</b>
10	- </div>
11	-{% endif %}
12	-
13	-<form method="POST" action=".">
14	- {% csrf_token %}
15	-
16	- <fieldset class="span-24 box">
17	- {% render_form_field form.old_password %}
18	- {% render_form_field form.new_password1 %}
19	- {% render_form_field form.new_password2 %}
20	- <input type="submit" value="{% trans 'Change password' %}"/>
21	- </fieldset>
22	-
23	-</form>
24	-{% endblock %}
	@@ -1,10 +0,0 @@		@@ -1,10 +0,0 @@
1	-{% extends "base.html" %}
2	-{% load i18n %}
3	-
4	-{% block main-content %}
5	-
6	-<span class="span-24 {{ msg_css_class }}">
7	- {% trans msg %}
8	-</span>
9	-
10	-{% endblock %}
11	\ No newline at end of file	0	\ No newline at end of file