Merge pull request #128 from colab/1.12.x

1.12.x

Merge pull request #128 from colab/1.12.x
1.12.x
Lucas Kanashiro
2 parents 9eb1b7a9 91d859bb
Showing 93 changed files with 3224 additions and 1505 deletions Show diff stats
.coveragerc
colab/accounts/filters.py
colab/accounts/forms.py
colab/accounts/models.py
colab/accounts/search_indexes.py
colab/accounts/signals.py
colab/accounts/templates/accounts/manage_subscriptions.html
colab/accounts/templates/accounts/user_detail.html
colab/accounts/templates/accounts/user_update_form.html
colab/accounts/templates/search/user_search_preview.html
colab/accounts/templatetags/date_format.py
colab/accounts/tests/test_forms.py
colab/accounts/tests/test_request.py
colab/accounts/tests/test_user.py
colab/accounts/tests/test_user_subscription.py
colab/accounts/tests/test_utils_validators.py
colab/accounts/tests/utils.py
colab/accounts/urls.py
colab/accounts/widgets/__init__.py
colab/home/context_processors.py
@@ -7,6 +7,8 @@ omit =
 	*/urls.py
 	*/settings.py
 	*/tests.py
+  colab/celery.py
+  colab/wsgi.py
 source =
     colab/
@@ -0,0 +1,24 @@
+from django.utils.translation import ugettext as _
+
+
+def get_filters(request):
+    return {
+        'user': {
+            'name': _(u'User'),
+            'icon': 'user',
+            'fields': (
+                (
+                    'username',
+                    _(u'Username'),
+                    request.get('username'),
+                ),
+                ('name', _(u'Name'), request.get('name')),
+                (
+                    'institution',
+                    _(u'Institution'),
+                    request.get('institution'),
+                ),
+                ('role', _(u'Role'), request.get('role'))
+            ),
+        },
+    }
 # -*- coding: utf-8 -*-
-from collections import OrderedDict
+from importlib import import_module
 from django import forms
 from django.conf import settings
-from django.contrib.auth import authenticate, get_user_model
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.tokens import default_token_generator
-from django.contrib.sites.shortcuts import get_current_site
+from django.contrib.auth import get_user_model
+from django.contrib.auth.forms import (ReadOnlyPasswordHashField,
+                                       SetPasswordForm, PasswordChangeForm)
 from django.core.urlresolvers import reverse
-from django.template import loader
-from django.utils.encoding import force_bytes
 from django.utils.functional import lazy
-from django.utils.http import urlsafe_base64_encode
-from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
-
+from .signals import user_created
 from .utils.validators import validate_social_account
 from .utils import mailman
@@ -168,7 +163,41 @@ class ListsForm(forms.Form):
                                     choices=lazy(get_lists_choices, list)())
-class UserCreationForm(UserForm):
+class ColabSetPasswordFormMixin(object):
+
+    def apply_custom_validators(self, password):
+        for app in settings.COLAB_APPS.values():
+            if 'password_validators' in app:
+                for validator_path in app.get('password_validators'):
+                    module_path, func_name = validator_path.rsplit('.', 1)
+                    module = import_module(module_path)
+                    validator_func = getattr(module, func_name, None)
+                    if validator_func:
+                        validator_func(password)
+
+        return password
+
+    def clean_new_password2(self):
+        try:
+            password = super(ColabSetPasswordFormMixin,
+                             self).clean_new_password2()
+        except AttributeError:
+            password = self.cleaned_data['new_password2']
+
+        self.apply_custom_validators(password)
+        return password
+
+    def clean_password2(self):
+        try:
+            password = super(ColabSetPasswordFormMixin, self).clean_password2()
+        except AttributeError:
+            password = self.cleaned_data['password2']
+
+        self.apply_custom_validators(password)
+        return password
+
+
+class UserCreationForm(UserForm, ColabSetPasswordFormMixin):
     """
     A form that creates a user, with no privileges, from the given username and
     password.
@@ -181,12 +210,13 @@ class UserCreationForm(UserForm):
         'password_mismatch': _("The two password fields didn't match."),
     }
     username = forms.RegexField(label=_("Username"), max_length=30,
-                                regex=r'^[\w.@+-]+$',
+                                regex=r'^[\w]+$',
                                 help_text=_(("Required. 30 characters or fewer"
                                              ". Letter and digits.")),
                                 error_messages={
                                     'invalid': _(("This value may contain only"
                                                   " letters and numbers."))})
+
     password1 = forms.CharField(label=_("Password"),
                                 widget=forms.PasswordInput)
     password2 = forms.CharField(label=_("Password confirmation"),
@@ -238,19 +268,26 @@ class UserCreationForm(UserForm):
                 self.error_messages['password_mismatch'],
                 code='password_mismatch',
             )
+
+        super(UserCreationForm, self).clean_password2()
         return password2
     def save(self, commit=True):
         user = super(UserCreationForm, self).save(commit=False)
-        user.set_password(self.cleaned_data["password1"])
+        password = self.cleaned_data["password1"]
+        user.set_password(password)
+
         if commit:
             user.save()
+
+        user_created.send(user.__class__, user=user, password=password)
+
         return user
 class UserChangeForm(forms.ModelForm):
     username = forms.RegexField(
-        label=_("Username"), max_length=30, regex=r"^[\w*]",
+        label=_("Username"), max_length=30, regex=r'^[\w]+$',
         help_text=_("Required. 30 characters or fewer. Letters and digits."),
         error_messages={
             'invalid': _("This value may contain only letters and numbers.")})
@@ -286,234 +323,9 @@ class UserChangeForm(forms.ModelForm):
         return self.initial["password"]
-class AuthenticationForm(forms.Form):
-    """
-    Base class for authenticating users. Extend this to get a form that accepts
-    username/password logins.
-    """
-    username = forms.CharField(max_length=254)
-    password = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
+class ColabSetPasswordForm(ColabSetPasswordFormMixin, SetPasswordForm):
+    pass
-    error_messages = {
-        'invalid_login': _("Please enter a correct %(username)s and password. "
-                           "Note that both fields may be case-sensitive."),
-        'inactive': _("This account is inactive."),
-    }
-
-    def __init__(self, request=None, *args, **kwargs):
-        """
-        The 'request' parameter is set for custom auth use by subclasses.
-        The form data comes in via the standard 'data' kwarg.
-        """
-        self.request = request
-        self.user_cache = None
-        super(AuthenticationForm, self).__init__(*args, **kwargs)
-
-        # Set the label for the "username" field.
-        UserModel = get_user_model()
-        self.username_field = UserModel._meta.get_field(
-            UserModel.USERNAME_FIELD)
-        if self.fields['username'].label is None:
-            self.fields['username'].label = capfirst(
-                self.username_field.verbose_name)
-
-    def clean(self):
-        username = self.cleaned_data.get('username')
-        password = self.cleaned_data.get('password')
-
-        if username and password:
-            self.user_cache = authenticate(username=username,
-                                           password=password)
-            if self.user_cache is None:
-                raise forms.ValidationError(
-                    self.error_messages['invalid_login'],
-                    code='invalid_login',
-                    params={'username': self.username_field.verbose_name},
-                )
-            else:
-                self.confirm_login_allowed(self.user_cache)
-
-        return self.cleaned_data
-
-    def confirm_login_allowed(self, user):
-        """
-        Controls whether the given User may log in. This is a policy setting,
-        independent of end-user authentication. This default behavior is to
-        allow login by active users, and reject login by inactive users.
-        If the given user cannot log in, this method should raise a
-        ``forms.ValidationError``.
-        If the given user may log in, this method should return None.
-        """
-        if not user.is_active:
-            raise forms.ValidationError(
-                self.error_messages['inactive'],
-                code='inactive',
-            )
-    def get_user_id(self):
-        if self.user_cache:
-            return self.user_cache.id
-        return None
-
-    def get_user(self):
-        return self.user_cache
-
-
-class PasswordResetForm(forms.Form):
-    email = forms.EmailField(label=_("Email"), max_length=254)
-
-    def save(self, domain_override=None,
-             subject_template_name='registration/password_reset_subject.txt',
-             email_template_name='registration/password_reset_email.html',
-             use_https=False, token_generator=default_token_generator,
-             from_email=None, request=None, html_email_template_name=None):
-        """
-        Generates a one-use only link for resetting password and sends to the
-        user.
-        """
-        from django.core.mail import send_mail
-        UserModel = get_user_model()
-        email = self.cleaned_data["email"]
-        active_users = UserModel._default_manager.filter(
-            email__iexact=email, is_active=True)
-        for user in active_users:
-            # Make sure that no email is sent to a user that actually has
-            # a password marked as unusable
-            if not user.has_usable_password():
-                continue
-            if not domain_override:
-                current_site = get_current_site(request)
-                site_name = current_site.name
-                domain = current_site.domain
-            else:
-                site_name = domain = domain_override
-            c = {
-                'email': user.email,
-                'domain': domain,
-                'site_name': site_name,
-                'uid': urlsafe_base64_encode(force_bytes(user.pk)),
-                'user': user,
-                'token': token_generator.make_token(user),
-                'protocol': 'https' if use_https else 'http',
-            }
-            subject = loader.render_to_string(subject_template_name, c)
-            # Email subject *must not* contain newlines
-            subject = ''.join(subject.splitlines())
-            email = loader.render_to_string(email_template_name, c)
-
-            if html_email_template_name:
-                html_email = loader.render_to_string(html_email_template_name,
-                                                     c)
-            else:
-                html_email = None
-            send_mail(subject, email, from_email, [user.email],
-                      html_message=html_email)
-
-
-class SetPasswordForm(forms.Form):
-    """
-    A form that lets a user change set their password without entering the old
-    password
-    """
-    error_messages = {
-        'password_mismatch': _("The two password fields didn't match."),
-    }
-    new_password1 = forms.CharField(label=_("New password"),
-                                    widget=forms.PasswordInput)
-    new_password2 = forms.CharField(label=_("New password confirmation"),
-                                    widget=forms.PasswordInput)
-
-    def __init__(self, user, *args, **kwargs):
-        self.user = user
-        super(SetPasswordForm, self).__init__(*args, **kwargs)
-
-    def clean_new_password2(self):
-        password1 = self.cleaned_data.get('new_password1')
-        password2 = self.cleaned_data.get('new_password2')
-        if password1 and password2:
-            if password1 != password2:
-                raise forms.ValidationError(
-                    self.error_messages['password_mismatch'],
-                    code='password_mismatch',
-                )
-        return password2
-
-    def save(self, commit=True):
-        self.user.set_password(self.cleaned_data['new_password1'])
-        if commit:
-            self.user.save()
-        return self.user
-
-
-class PasswordChangeForm(SetPasswordForm):
-    """
-    A form that lets a user change their password by entering their old
-    password.
-    """
-    error_messages = dict(SetPasswordForm.error_messages, **{
-        'password_incorrect': _("Your old password was entered incorrectly. "
-                                "Please enter it again."),
-    })
-    old_password = forms.CharField(label=_("Old password"),
-                                   widget=forms.PasswordInput)
-
-    def clean_old_password(self):
-        """
-        Validates that the old_password field is correct.
-        """
-        old_password = self.cleaned_data["old_password"]
-        if not self.user.check_password(old_password):
-            raise forms.ValidationError(
-                self.error_messages['password_incorrect'],
-                code='password_incorrect',
-            )
-        return old_password
-
-PasswordChangeForm.base_fields = OrderedDict(
-    (k, PasswordChangeForm.base_fields[k])
-    for k in ['old_password', 'new_password1', 'new_password2']
-)
-
-
-class AdminPasswordChangeForm(forms.Form):
-    """
-    A form used to change the password of a user in the admin interface.
-    """
-    error_messages = {
-        'password_mismatch': _("The two password fields didn't match."),
-    }
-    password1 = forms.CharField(label=_("Password"),
-                                widget=forms.PasswordInput)
-    password2 = forms.CharField(label=_("Password (again)"),
-                                widget=forms.PasswordInput)
-
-    def __init__(self, user, *args, **kwargs):
-        self.user = user
-        super(AdminPasswordChangeForm, self).__init__(*args, **kwargs)
-
-    def clean_password2(self):
-        password1 = self.cleaned_data.get('password1')
-        password2 = self.cleaned_data.get('password2')
-        if password1 and password2:
-            if password1 != password2:
-                raise forms.ValidationError(
-                    self.error_messages['password_mismatch'],
-                    code='password_mismatch',
-                )
-        return password2
-
-    def save(self, commit=True):
-        """
-        Saves the new password.
-        """
-        self.user.set_password(self.cleaned_data["password1"])
-        if commit:
-            self.user.save()
-        return self.user
-
-    def _get_changed_data(self):
-        data = super(AdminPasswordChangeForm, self).changed_data
-        for name in self.fields.keys():
-            if name not in data:
-                return []
-        return ['password']
+class ColabPasswordChangeForm(ColabSetPasswordFormMixin, PasswordChangeForm):
+    pass
@@ -2,18 +2,26 @@
 import urlparse
-from django.db import models
 from django.contrib.auth.models import AbstractUser, UserManager
-from django.core import validators
 from django.core.urlresolvers import reverse
+from django.db import models
 from django.utils.crypto import get_random_string
 from django.utils.translation import ugettext_lazy as _
+from .signals import user_created, user_password_changed
 from .utils import mailman
 class ColabUserManager(UserManager):
+    def _create_user(self, username, email, password,
+                     is_staff, is_superuser, **kwargs):
+        args = (username, email, password, is_staff, is_superuser)
+        user = super(ColabUserManager, self)._create_user(*args, **kwargs)
+
+        user_created.send(user.__class__, user=user, password=password)
+        return user
+
     def create_user(self, username, email=None, password=None, **extra_fields):
         # It creates a valid password for users
@@ -68,6 +76,11 @@ class User(AbstractUser):
         self.username = self.username.lower()
         super(User, self).save(*args, **kwargs)
+    def set_password(self, raw_password):
+        super(User, self).set_password(raw_password)
+        if self.pk:
+            user_password_changed.send(User, user=self, password=raw_password)
+
 # We need to have `email` field set as unique but Django does not
 #   support field overriding (at least not until 1.6).
@@ -77,8 +90,3 @@ User._meta.get_field(&#39;email&#39;)._unique = True
 User._meta.get_field('username').help_text = _(
     u'Required. 30 characters or fewer. Letters and digits.'
 )
-User._meta.get_field('username').validators[0] = validators.RegexValidator(
-    r'^\w+$',
-    _('Enter a valid username.'),
-    'invalid'
-)
@@ -22,6 +22,7 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
     google_talk = indexes.CharField(model_attr='google_talk', null=True,
                                     stored=False)
     webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
+    date_joined = indexes.DateTimeField(model_attr='date_joined')
     def get_model(self):
         return User
@@ -0,0 +1,6 @@
+
+from django.dispatch import Signal
+
+
+user_created = Signal(providing_args=['user', 'password'])
+user_password_changed = Signal(providing_args=['user', 'password'])
@@ -12,7 +12,7 @@
     <div class="row">
       {% for email, lists in membership.items %}
-      <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
+      <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
         <div class="panel panel-default">
           <div class="panel-heading">
             <h3 class="panel-title">{{ email }}</h3>
@@ -133,7 +133,7 @@
       <h3>{% trans "Latest posted" %} </h3>
       <ul class="message-list">
       {% for doc in emails %}
-        {% include "message-preview.html" with result=doc %}
+        {% include "dashboard-message-preview.html" with result=doc %}
       {% empty %}
         <li>{% trans "There are no posts by this user so far." %}</li>
       {% endfor %}
@@ -148,7 +148,7 @@
       <h3>{% trans "Latest contributions" %}</h3>
       <ul class="message-list">
       {% for result in results %}
-        {% include "message-preview.html" %}
+        {% include "dashboard-message-preview.html" %}
       {% empty %}
         <li>{% trans "No contributions of this user so far." %}</li>
       {% endfor %}
 {% extends "base.html" %}
-{% load i18n gravatar %}
+{% load i18n gravatar plugins widgets_tag %}
 {% block head_js %}
 <script>
@@ -102,7 +102,6 @@ $(function() {
 </script>
 {% endblock %}
-
 {% block main-content %}
   <div class="col-lg-12">
@@ -118,6 +117,17 @@ $(function() {
   <br>
   <br>
+  <style type="text/css">
+    .tab-pane{
+      border: 1px solid #DDD;
+      border-top: none;
+      padding: 10px;
+    }
+
+    .nav-tabs a:focus {
+       outline: none;
+    }
+  </style>
   <form method="post">
     {% csrf_token %}
@@ -192,9 +202,13 @@ $(function() {
       </div>
     </div>
     <div class="row">
-      <div class="submit">
-        <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
+      <div class="col-md-12">
+        <div class="links-group">
+          <button type="submit" class="btn btn-primary btn-lg" expanded="false">{% trans "Update" %}</button>
+          <a href="{% url 'user_profile' user %}" class="btn btn-default btn-lg" role="button">{% trans "Go to profile panel" %}</a>
+        </div>
       </div>
     </div>
   </form>
+
 {% endblock %}
@@ -0,0 +1,25 @@
+{% load i18n tz highlight gravatar date_format %}
+
+<div class="row">
+  <div class="col-md-2 center">
+    <a href="{% url 'user_profile' username=result.username %}">
+      {% block gravatar_img %}{% gravatar result.email 100 %}{% endblock gravatar_img %}
+    </a>
+  </div>
+  <div class="col-md-10">
+    <strong><a href="{% url 'user_profile' username=result.username %}">
+
+        {% if query %}
+            <h4>{% highlight result.name with query %}</h4></a>
+        {% else %}
+            <h4>{{ result.name }}</h4></a>
+        {% endif %}
+
+    </strong>
+    <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
+    <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
+  </div>
+</div>
+<div class="row">
+  <hr>
+</div>
@@ -0,0 +1,20 @@
+from django import template
+from django.utils.translation import ugettext as _
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def date_format(context, date):
+    formatted_date = _('%(m)s %(d)s %(y)s' % {'m': date.strftime('%B'),
+                                              'd': date.day,
+                                              'y': date.year})
+    return formatted_date
+
+
+@register.simple_tag(takes_context=True)
+def datetime_format(context, date):
+    formatted_date = date_format(context, date)
+    formatted_time = _('%(hour)s:%(min)s' % {'hour': date.hour,
+                                             'min': date.strftime('%I')})
+    formatted_datetime = _('%s at %s' % (formatted_date, formatted_time))
+    return formatted_datetime
@@ -3,11 +3,51 @@ Test Form class.
 Objective: Test parameters, and behavior.
 """
-from django.test import TestCase
+import datetime
+from mock import patch
+
+from django.test import TestCase, override_settings
 from django.core.urlresolvers import reverse
-from colab.accounts.forms import UserCreationForm
+from colab.accounts.forms import (UserCreationForm, UserChangeForm,
+                                  UserUpdateForm, UserForm, get_lists_choices,
+                                  ColabSetPasswordForm,
+                                  ColabPasswordChangeForm)
+from colab.accounts import forms as accounts_forms
 from colab.accounts.models import User
+from colab.accounts.utils import mailman
+
+
+class SetPasswordFormTestCase(TestCase):
+
+    TEST_COLAB_APPS = {
+        'test_plugin': {
+            'password_validators': (
+                'colab.accounts.tests.utils.password_validator',
+            )
+        }
+    }
+
+    @property
+    def user(self):
+        return User.objects.create_user(username='test_user',
+                                        email='test@example.com')
+
+    @property
+    def valid_form_data(self):
+        return {'new_password1': '12345',
+                'new_password2': '12345'}
+
+    def test_no_custom_validators(self):
+        form = ColabSetPasswordForm(self.user, data=self.valid_form_data)
+        self.assertTrue(form.is_valid(), True)
+
+    @override_settings(COLAB_APPS=TEST_COLAB_APPS)
+    @patch('colab.accounts.tests.utils.password_validator')
+    def test_custom_validator(self, validator):
+        form = ColabSetPasswordForm(self.user, data=self.valid_form_data)
+        self.assertTrue(form.is_valid())
+        validator.assert_called_with('12345')
 class FormTest(TestCase):
@@ -24,26 +64,274 @@ class FormTest(TestCase):
         user.last_name = "COLAB"
         user.save()
-    def create_form_data(self):
-        form_data = {'email': 'usertest@colab.com.br',
+    def tearDown(self):
+        pass
+
+    def create_form_data(self, email, username):
+        form_data = {'email': email,
                      'first_name': 'colabName',
                      'last_name': 'secondName',
-                     'username': 'colab',
+                     'username': username,
                      'password1': '123colab4',
                      'password2': '123colab4'}
         form = UserCreationForm(data=form_data)
         return form
+    def create_update_form_data(self):
+        updated_data = {'username': "colab",
+                        'email': 'email@email.com',
+                        'last_login': datetime.date.today(),
+                        'date_joined': datetime.date.today(),
+                        'twitter': 'nick_twitter',
+                        'first_name': 'colabName',
+                        'last_name': 'secondName',
+                        }
+        initial = {'email': 'email@email.com',
+                   'first_name': 'colabName',
+                   'last_name': 'secondName',
+                   'username': 'colab',
+                   'password': '123colab4'}
+        form = UserUpdateForm(initial=initial, data=updated_data)
+        return form
+
+    def create_change_form_data(self, username):
+        updated_data = {'username': username,
+                        'email': 'email@email.com',
+                        'last_login': datetime.date.today(),
+                        'date_joined': datetime.date.today()}
+
+        initial = {'email': 'email@email.com',
+                   'first_name': 'colabName',
+                   'last_name': 'secondName',
+                   'username': 'colab',
+                   'password': '123colab4'}
+        form = UserChangeForm(initial=initial, data=updated_data)
+        return form
+
+    def create_user_form_data(self):
+        initial = {'email': 'email@email.com',
+                   'first_name': 'colabName',
+                   'last_name': 'secondName',
+                   'username': 'colab',
+                   'password': '123colab4'}
+        form = UserForm(data=initial)
+        return form
+
     def test_already_registered_email(self):
-        form = self.create_form_data()
+        form = self.create_form_data('usertest@colab.com.br',
+                                     'colab')
         self.assertFalse(form.is_valid())
+        self.assertIn('duplicate_email', form.error_messages)
     def test_registered_email_message(self):
-        form = self.create_form_data()
+        form = self.create_form_data('usertest@colab.com.br',
+                                     'colab')
         msg = form.error_messages.get('duplicate_email') % {
             'url': reverse('login')
         }
         self.assertIn(msg, str(form))
-    def tearDown(self):
-        pass
+    def test_valid_username(self):
+        form = self.create_form_data('user@email.com',
+                                     'colab123')
+        self.assertTrue(form.is_valid())
+
+    def test_already_created_username(self):
+        form = self.create_form_data('usertest@colab.com.br',
+                                     'USERtestCoLaB')
+        self.assertFalse(form.is_valid())
+        self.assertIn('duplicate_username', form.error_messages)
+
+    def test_not_valid_username(self):
+        form = self.create_form_data('user@email.com',
+                                     'colab!')
+        self.assertFalse(form.is_valid())
+
+    def test_update_valid_username(self):
+        form = self.create_change_form_data('colab123')
+        self.assertTrue(form.is_valid())
+
+    def test_update_not_valid_username(self):
+        form = self.create_change_form_data('colab!')
+        self.assertFalse(form.is_valid())
+
+    @patch.object(accounts_forms, "validate_social_account")
+    def test_validate_social_account(self, validate_social_account):
+        validate_social_account.return_value = False
+
+        form = self.create_update_form_data()
+        self.assertFalse(form.is_valid())
+        self.assertIn("Social account does not exist", form.errors['twitter'])
+
+    def test_required_valid_fields_user_form(self):
+        form_data = {
+            'first_name': 'colabName',
+            'last_name': 'secondName',
+            'username': 'colab',
+        }
+
+        form = UserForm(data=form_data)
+
+        self.assertTrue(form.is_valid())
+
+    def test_required_empty_fields_user_form(self):
+        form_data = {
+            'first_name': '',
+            'last_name': '',
+            'username': '',
+        }
+
+        form = UserForm(data=form_data)
+
+        self.assertFalse(form.is_valid())
+
+        self.assertIn('first_name', form.errors)
+        self.assertIn('last_name', form.errors)
+        self.assertIn('username', form.errors)
+
+    def test_blank_required_fields_user_form(self):
+        form_data = {
+            'first_name': '  ',
+            'last_name': '  ',
+            'username': '  ',
+        }
+
+        form = UserForm(data=form_data)
+
+        self.assertFalse(form.is_valid())
+
+        self.assertIn('first_name', form.errors)
+        self.assertIn('last_name', form.errors)
+        self.assertIn('username', form.errors)
+
+    @patch.object(mailman, "all_lists")
+    def test_get_list_choices(self, all_lists):
+        all_lists.return_value = [
+            {'listname': 'listA', 'description': 'A'},
+            {'listname': 'listB', 'description': 'B'},
+            {'listname': 'listC', 'description': 'C'},
+            {'listname': 'listD', 'description': 'D'},
+        ]
+        lists = get_lists_choices()
+        self.assertEqual(lists, [('listA', u'listA (A)'),
+                                 ('listB', u'listB (B)'),
+                                 ('listC', u'listC (C)'),
+                                 ('listD', u'listD (D)')])
+
+
+class ChangePasswordFormTestCase(TestCase):
+
+    TEST_COLAB_APPS = {
+        'test_plugin': {
+            'password_validators': (
+                'colab.accounts.tests.utils.password_validator',
+            )
+        }
+    }
+
+    @property
+    def user(self):
+        u = User.objects.create_user(username='test_user',
+                                     email='test@example.com')
+        u.set_password("123colab4")
+        return u
+
+    @property
+    def valid_form_data(self):
+        return {'old_password': '123colab4',
+                'new_password1': '12345',
+                'new_password2': '12345'}
+
+    def test_no_custom_validators(self):
+        form = ColabPasswordChangeForm(self.user, data=self.valid_form_data)
+        self.assertTrue(form.is_valid(), True)
+
+    @override_settings(COLAB_APPS=TEST_COLAB_APPS)
+    @patch('colab.accounts.tests.utils.password_validator')
+    def test_custom_validator(self, validator):
+        form = ColabPasswordChangeForm(self.user, data=self.valid_form_data)
+        self.assertTrue(form.is_valid())
+        validator.assert_called_with('12345')
+
+
+class UserCreationFormTestCase(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.user = User.objects.create_user(username='user1234',
+                                            email='teste1234@example.com',
+                                            first_name='test_first_name',
+                                            last_name='test_last_name')
+
+        cls.user.set_password("123colab4")
+        cls.user.save()
+
+    def get_form_data(self, email, username='test_user',
+                      password1='12345', password2='12345'):
+        return {
+            'first_name': 'test_first_name',
+            'last_name': 'test_last_name',
+            'username': username,
+            'email': email,
+            'password1': password1,
+            'password2': password2
+        }
+
+    def test_clean_mail_error(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste1234@example.com'))
+        self.assertFalse(creation_form.is_valid())
+        self.assertTrue('email' in creation_form.errors)
+        self.assertEqual(1, len(creation_form.errors))
+
+    def test_clean_mail(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com'))
+        self.assertTrue(creation_form.is_valid())
+
+    def test_clean_username_error(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user1234'))
+        self.assertFalse(creation_form.is_valid())
+        self.assertTrue('username' in creation_form.errors)
+        self.assertEqual(1, len(creation_form.errors))
+
+    def test_clean_username(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user12345'))
+        self.assertTrue(creation_form.is_valid())
+
+    def test_clean_password2_empty_password1(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user12345',
+                                    password1=''))
+        self.assertFalse(creation_form.is_valid())
+        self.assertTrue('password1' in creation_form.errors)
+        self.assertEqual(1, len(creation_form.errors))
+
+    def test_clean_password2_empty_password2(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user12345',
+                                    password2=''))
+        self.assertFalse(creation_form.is_valid())
+        self.assertTrue('password2' in creation_form.errors)
+
+    def test_clean_password2_different_passwords(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user12345',
+                                    password1='1234'))
+        self.assertFalse(creation_form.is_valid())
+        self.assertTrue('password2' in creation_form.errors)
+        self.assertEqual(1, len(creation_form.errors))
+        self.assertEqual(1, len(creation_form.errors))
+
+    def test_clean_password(self):
+        creation_form = UserCreationForm(
+            data=self.get_form_data('teste12345@example.com',
+                                    username='user12345'))
+        self.assertTrue(creation_form.is_valid())
@@ -6,6 +6,8 @@ Objective: Test requests.
 from django.test import TestCase, Client
 from django.test.client import RequestFactory
 from colab.accounts.models import User
+from colab.accounts.context_processors import social_network_enabled
+from django.conf import settings
 class RequestTest(TestCase):
@@ -65,3 +67,26 @@ class RequestTest(TestCase):
         self.assertEqual(302, response.status_code)
         self.assertEqual("http://testserver/account/usertest/subscriptions",
                          response.url)
+
+
+class SocialNetworkTest(TestCase):
+    """docstring for SocialNetworkTest"""
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.client = Client()
+
+    def create_user(self):
+        self.user_test = User()
+        self.user_test.username = "usertest"
+        self.user_test.email = "usertest@colab.com.br"
+        self.user_test.set_password("1234colab")
+        self.user_test.save()
+
+    def test_social_network(self):
+        self.create_user()
+        self.client.login(username="usertest", password='1234colab')
+        response = self.client.get('/myaccount/')
+        result = social_network_enabled(response)['SOCIAL_NETWORK_ENABLED']
+        self.assertTrue(result)
+        self.assertTrue(settings.SOCIAL_NETWORK_ENABLED)
@@ -43,7 +43,7 @@ class UserTest(TestCase):
                                   expected_last_name, first_name, last_name):
         data = {'first_name': first_name,
                 'last_name': last_name}
-        self.client.post('/account/usertestcolab/edit', data)
+        self.client.post('/account/' + self.user.username + '/edit', data)
         user = User.objects.get(id=1)
         self.assertEqual(expected_first_name, user.first_name)
         self.assertEqual(expected_last_name, user.last_name)
@@ -52,7 +52,7 @@ class UserTest(TestCase):
         data = {'first_name': 'usertestcolab',
                 'last_name': 'colab',
                 field_name: value}
-        self.client.post('/account/usertestcolab/edit', data)
+        self.client.post('/account/' + self.user.username + '/edit', data)
         user = User.objects.get(id=1)
         self.assertEqual(expected_value, getattr(user, field_name))
@@ -77,10 +77,6 @@ class UserTest(TestCase):
         empty_list = ()
         self.assertEqual(empty_list, self.user.mailinglists())
-    def test_update_subscription(self):
-        pass
-        # TODO: You should have mailman connection.
-
     def test_save(self):
         username_test = "USERtestCoLaB"
@@ -374,3 +370,78 @@ class UserTest(TestCase):
         self.authenticate_user()
         self.validate_non_mandatory_fields('bio', '', ' ')
         self.user.delete()
+
+    def test_user_without_login(self):
+        response = self.client.get("/account/" + self.user.username + "/edit")
+        self.assertEqual(response.status_code, 403)
+
+    def test_signup_with_post_not_success(self):
+        data_user = {
+            'username': 'username',
+            'password1': 'safepassword',
+            'password2': 'safepassword',
+        }
+        before = User.objects.count()
+        self.client.post('/account/register', data=data_user)
+        after = User.objects.count()
+        self.assertEqual(before, after)
+
+    def test_signup_with_post_with_success(self):
+        data_user = {
+            'username': 'username',
+            'first_name': 'first name',
+            'last_name': 'last name',
+            'email': 'mail@mail.com',
+            'password1': 'safepassword',
+            'password2': 'safepassword',
+        }
+        before = User.objects.count()
+        self.client.post('/account/register', data=data_user)
+        after = User.objects.count()
+        self.assertEqual(before + 1, after)
+
+    def test_user_logged_in_profile(self):
+        self.authenticate_user()
+        self.client.get("/account/" + self.user.username)
+        self.assertEqual(self.client.session['_auth_user_id'], self.user.id)
+
+    def test_user_not_logged_in_profile(self):
+        self.client.get("/account/" + self.user.username)
+        self.assertEqual(self.client.session, {})
+
+    def test_password_changed_message(self):
+        self.message_test('Your password was changed.',
+                          "/account/change-password-done")
+
+    def test_password_reset_done_custom_message(self):
+        self.message_test("We&#39;ve emailed you instructions for setting " +
+                          "your password. You should be receiving them " +
+                          "shortly.", "/account/password-reset-done/")
+
+    def test_password_rest_complete_message(self):
+        self.message_test("Your password has been set. You may go ahead and " +
+                          "log in now.", "/account/password-reset-complete/")
+
+    def message_test(self, message, url):
+        self.authenticate_user()
+        response = self.client.get(url, follow=True)
+        self.assertIn(message, response.content)
+
+    @mock.patch('colab.accounts.signals.user_password_changed.send')
+    @mock.patch('colab.accounts.signals.user_created.send')
+    def test_user_created_signal(self, user_created_send,
+                                 user_password_changed_send):
+        user = User.objects.create_user(
+            username='test_user',
+            password='12345',
+            email='test@example.com',
+        )
+        user_created_send.assert_called_with(User, user=user, password='12345')
+        user_password_changed_send.assert_not_called()
+
+    @mock.patch('colab.accounts.signals.user_password_changed.send')
+    def test_user_password_changed_signal(self, user_password_changed_send):
+        user = User.objects.first()
+        user.set_password('54321')
+        user_password_changed_send.assert_called_with(User, user=user,
+                                                      password='54321')
@@ -0,0 +1,91 @@
+"""
+Test User Mailing list Subscriptions class.
+Objective: Test parameters, and behavior.
+"""
+
+from mock import patch
+from colab.accounts.models import User
+from django.test import TestCase, Client
+from colab.accounts.utils import mailman
+
+
+class UserSubscriptionTest(TestCase):
+    OK = 200
+    FORBIDDEN_ACCESS = 403
+
+    def setUp(self):
+        self.user = self.create_user()
+        self.client = Client()
+
+    def tearDown(self):
+        pass
+
+    def create_user(self):
+        user = User()
+        user.username = "USERtestCoLaB"
+        user.set_password("123colab4")
+        user.email = "usertest@colab.com.br"
+        user.id = 1
+        user.twitter = "usertestcolab"
+        user.facebook = "usertestcolab"
+        user.first_name = "USERtestCoLaB"
+        user.last_name = "COLAB"
+        user.save()
+
+        return user
+
+    def authenticate_user(self, user=None, password='123colab4'):
+        if not user:
+            user = self.user
+        user.needs_update = False
+        user.save()
+        self.client.login(username=user.username,
+                          password=password)
+
+    def test_manage_subscription_logged_in(self):
+        self.authenticate_user()
+        response = self.client.get("/account/" + self.user.username +
+                                   "/subscriptions")
+        self.assertEqual(response.status_code, self.OK)
+
+    def test_manage_subscription_without_login(self):
+        response = self.client.get("/account/" + self.user.username +
+                                   "/subscriptions")
+        self.assertEqual(response.status_code, self.FORBIDDEN_ACCESS)
+
+    @patch.object(mailman, 'all_lists')
+    @patch.object(mailman, 'mailing_lists')
+    def test_context_data_generation(self, mailing_lists, all_lists):
+        data_user = {
+            'username': 'username1',
+            'first_name': 'first name1',
+            'last_name': 'last name1',
+            'email': 'mail1@mail.com',
+            'password1': 'safepassword',
+            'password2': 'safepassword',
+        }
+        self.client.post('/account/register', data=data_user)
+        user1 = User.objects.last()
+        user1.is_active = True
+        user1.save()
+        self.authenticate_user(user1, 'safepassword')
+
+        mail_lists = [
+            {"listname": "name_mock_1", "description": "descript_1"},
+            {"listname": "name_mock_2", "description": "descript_2"},
+            {"listname": "name_mock_3", "description": "descript_3"},
+        ]
+        all_lists.return_value = mail_lists
+
+        my_mail_lists = [
+            "name_mock_1",
+            "name_mock_3",
+        ]
+        mailing_lists.return_value = my_mail_lists
+        response = self.client.get("/account/" + user1.username +
+                                   "/subscriptions")
+        self.assertEqual(response.status_code, self.OK)
+        mailresponse = response.context_data['membership'][user1.email]
+        mailresponse = map(lambda x: x[-1], mailresponse)
+        expected_value = [True, False, True]
+        self.assertEqual(mailresponse, expected_value)
@@ -0,0 +1,19 @@
+import urllib2
+from mock import patch, Mock
+
+from django.test import TestCase
+
+from ..utils.validators import validate_social_account
+
+
+class TestValidators(TestCase):
+
+    @patch('urllib2.urlopen',
+           side_effect=urllib2.HTTPError(500, "test", 1, 2, None))
+    def test_validate_social_account_with_fake_account(self, urlopen_mock):
+        self.assertFalse(validate_social_account('john-fake',
+                                                 'http://twitter.com'))
+
+    @patch('urllib2.urlopen', return_value=Mock(code=200))
+    def test_validate_social_account(self, urlopen_mock):
+        self.assertTrue(validate_social_account('john', 'http://twitter.com'))
@@ -0,0 +1,5 @@
+from django.forms import ValidationError
+
+
+def password_validator(password):
+    raise ValidationError('Test error')
 from django.conf import settings
 from django.conf.urls import patterns, url
+from django.contrib.auth import views as auth_views
 from .views import (UserProfileDetailView, UserProfileUpdateView,
                     ManageUserSubscriptionsView)
-
-from colab.accounts import views
-from django.contrib.auth import views as auth_views
+from .forms import ColabPasswordChangeForm, ColabSetPasswordForm
 urlpatterns = patterns('',
@@ -22,15 +21,17 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
         auth_views.password_reset_confirm,
-        {'template_name':'registration/password_reset_confirm_custom.html'},
+        {'template_name':'registration/password_reset_confirm_custom.html',
+         'set_password_form': ColabSetPasswordForm},
         name="password_reset_confirm"),
     url(r'^password-reset/?$', auth_views.password_reset,
         {'template_name':'registration/password_reset_form_custom.html'},
         name="password_reset"),
-    url(r'^change-password/?$',auth_views.password_change,
-        {'template_name':'registration/password_change_form_custom.html'},
+    url(r'^change-password/?$', auth_views.password_change,
+        {'template_name': 'registration/password_change_form_custom.html',
+         'password_change_form': ColabPasswordChangeForm},
         name='password_change'),
     url(r'^change-password-done/?$',
@@ -16,7 +16,7 @@ def ribbon(request):
     if not enabled:
         return {'ribbon': False}
-    url = 'http://beta.softwarepublico.gov.br/gitlab/softwarepublico/colab'
+    url = 'http://github.com/colab/colab'
     text = _('Fork me!')
     return {
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 13:15+0000\n"
+"POT-Creation-Date: 2015-11-24 17:46+0000\n"
 "PO-Revision-Date: 2015-09-04 19:21+0000\n"
 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
 "Language-Team: English (http://www.transifex.com/colab/colab/language/en/)\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: accounts/admin.py:18
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
+msgid "Social"
+msgstr ""
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
+#, fuzzy
+#| msgid "Username"
+msgid "Users"
+msgstr "Username"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
+msgid "Communities"
+msgstr "Communities"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
+#, fuzzy
+#| msgid "My Profile"
+msgid "Profile"
+msgstr "My Profile"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
+msgid "Control Panel"
+msgstr ""
+
+#: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr "Personal info"
-#: accounts/admin.py:24
+#: colab/accounts/admin.py:24
 msgid "Permissions"
 msgstr "Permissions"
-#: accounts/admin.py:28
+#: colab/accounts/admin.py:28
 msgid "Important dates"
 msgstr "Important dates"
-#: accounts/forms.py:37
+#: colab/accounts/filters.py:7
+#: colab/accounts/templates/search/user_search_preview.html:12
+#, fuzzy
+#| msgid "Username"
+msgid "User"
+msgstr "Username"
+
+#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
+#: colab/accounts/forms.py:246
+#, fuzzy
+#| msgid "Filename"
+msgid "Username"
+msgstr "Filename"
+
+#: colab/accounts/filters.py:15
+msgid "Name"
+msgstr "Name"
+
+#: colab/accounts/filters.py:18
+msgid "Institution"
+msgstr "Institution"
+
+#: colab/accounts/filters.py:21
+msgid "Role"
+msgstr "Role"
+
+#: colab/accounts/forms.py:30
 msgid "Social account does not exist"
 msgstr "Social account does not exist"
-#: accounts/forms.py:65 accounts/forms.py:71 accounts/forms.py:77
+#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
+#: colab/accounts/forms.py:70
 msgid "This field cannot be blank."
 msgstr "This field cannot be blank."
-#: accounts/forms.py:118 accounts/templates/accounts/user_detail.html:38
+#: colab/accounts/forms.py:111
+#: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
-#: accounts/forms.py:119
+#: colab/accounts/forms.py:112
 msgid "Write something about you in 200 characters or less."
 msgstr "Write something about you in 200 characters or less."
-#: accounts/forms.py:148
+#: colab/accounts/forms.py:157
 msgid "Mailing lists"
 msgstr "Mailing lists"
-#: accounts/forms.py:161
+#: colab/accounts/forms.py:170
 #, python-format
 msgid "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
 msgstr "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
-#: accounts/forms.py:163
+#: colab/accounts/forms.py:172
 msgid "A user with that username already exists."
 msgstr "A user with that username already exists."
-#: accounts/forms.py:164 accounts/forms.py:401 accounts/forms.py:465
+#: colab/accounts/forms.py:173
 msgid "The two password fields didn't match."
 msgstr "The two password fields didn't match."
-#: accounts/forms.py:166 accounts/forms.py:236 search/forms.py:38
-msgid "Username"
-msgstr "Username"
-
-#: accounts/forms.py:173 accounts/forms.py:240 accounts/forms.py:277
-#: accounts/forms.py:467
+#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
 msgid "Password"
 msgstr "Password"
-#: accounts/forms.py:175
+#: colab/accounts/forms.py:185
 msgid "Password confirmation"
 msgstr "Password confirmation"
-#: accounts/forms.py:237 accounts/models.py:78
+#: colab/accounts/forms.py:247 colab/accounts/models.py:77
 msgid "Required. 30 characters or fewer. Letters and digits."
 msgstr "Required. 30 characters or fewer. Letters and digits."
-#: accounts/forms.py:239
+#: colab/accounts/forms.py:249
 msgid "This value may contain only letters and numbers."
 msgstr "This value may contain only letters and numbers."
-#: accounts/forms.py:241
+#: colab/accounts/forms.py:252
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
-msgstr "Raw passwords are not stored, so there is no way to see this user's password, but you can change the password using <a href=\"password/\">this form</a>."
-
-#: accounts/forms.py:280
-#, python-format
-msgid ""
-"Please enter a correct %(username)s and password. Note that both fields may "
-"be case-sensitive."
-msgstr "Please enter a correct %(username)s and password. Note that both fields may be case-sensitive."
-
-#: accounts/forms.py:282
-msgid "This account is inactive."
-msgstr "This account is inactive."
-
-#: accounts/forms.py:345
-msgid "Email"
-msgstr "Email"
-
-#: accounts/forms.py:403
-msgid "New password"
-msgstr "New password"
-
-#: accounts/forms.py:405
-msgid "New password confirmation"
-msgstr "New password confirmation"
-
-#: accounts/forms.py:436
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Your old password was entered incorrectly. Please enter it again."
-
-#: accounts/forms.py:439
-msgid "Old password"
-msgstr "Old password"
-
-#: accounts/forms.py:469
-msgid "Password (again)"
-msgstr "Password (again)"
-
-#: accounts/models.py:82
-msgid "Enter a valid username."
-msgstr "Enter a valid username."
+msgstr ""
+"Raw passwords are not stored, so there is no way to see this user's "
+"password, but you can change the password using <a href=\"password/\">this "
+"form</a>."
-#: accounts/templates/accounts/manage_subscriptions.html:6
+#: colab/accounts/templates/accounts/manage_subscriptions.html:6
 msgid "Group Subscriptions"
 msgstr "Group Subscriptions"
-#: accounts/templates/accounts/manage_subscriptions.html:36
+#: colab/accounts/templates/accounts/manage_subscriptions.html:36
 msgid "Update subscriptions"
 msgstr "Update subscriptions"
-#: accounts/templates/accounts/user_create_form.html:5
+#: colab/accounts/templates/accounts/user_create_form.html:5
 msgid "Sign up"
 msgstr "Sign up"
-#: accounts/templates/accounts/user_create_form.html:10
-#: accounts/templates/registration/login.html:14
-#: accounts/templates/registration/password_change_form_custom.html:12
-#: accounts/templates/registration/password_reset_confirm_custom.html:14
-#: accounts/templates/registration/password_reset_form_custom.html:9
+#: colab/accounts/templates/accounts/user_create_form.html:10
+#: colab/accounts/templates/registration/login.html:14
+#: colab/accounts/templates/registration/password_change_form_custom.html:12
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:14
+#: colab/accounts/templates/registration/password_reset_form_custom.html:9
 msgid "Please correct the errors below and try again."
 msgstr "Please correct the errors below and try again."
-#: accounts/templates/accounts/user_create_form.html:17
+#: colab/accounts/templates/accounts/user_create_form.html:17
 msgid "Required fields"
 msgstr "Required fields"
-#: accounts/templates/accounts/user_create_form.html:29
+#: colab/accounts/templates/accounts/user_create_form.html:29
 msgid "Personal Information"
 msgstr "Personal Information"
-#: accounts/templates/accounts/user_create_form.html:46
+#: colab/accounts/templates/accounts/user_create_form.html:46
 msgid "Subscribe to groups"
 msgstr "Subscribe to groups"
-#: accounts/templates/accounts/user_create_form.html:60
-#: templates/base.html:100 templates/base.html.py:105 templates/header.html:40
-#: templates/header.html.py:45
+#: colab/accounts/templates/accounts/user_create_form.html:60
+#: colab/templates/header.html:38 colab/templates/header.html.py:43
 msgid "Register"
 msgstr "Register"
-#: accounts/templates/accounts/user_detail.html:8
+#: colab/accounts/templates/accounts/user_detail.html:8
 msgid "Messages"
 msgstr "Messages"
-#: accounts/templates/accounts/user_detail.html:9 templates/home.html:7
+#: colab/accounts/templates/accounts/user_detail.html:9
+#: colab/templates/home.html:7
 msgid "Contributions"
 msgstr "Contributions"
-#: accounts/templates/accounts/user_detail.html:29
+#: colab/accounts/templates/accounts/user_detail.html:29
 msgid "edit profile"
 msgstr "edit profile"
-#: accounts/templates/accounts/user_detail.html:30
+#: colab/accounts/templates/accounts/user_detail.html:30
 msgid "group membership"
 msgstr "group membership"
-#: accounts/templates/accounts/user_detail.html:66
+#: colab/accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr "Twitter account"
-#: accounts/templates/accounts/user_detail.html:69
+#: colab/accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr "Facebook account"
-#: accounts/templates/accounts/user_detail.html:74
+#: colab/accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr "Google talk account"
-#: accounts/templates/accounts/user_detail.html:78
+#: colab/accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr "Github account"
-#: accounts/templates/accounts/user_detail.html:82
+#: colab/accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr "Personal webpage"
-#: accounts/templates/accounts/user_detail.html:88
+#: colab/accounts/templates/accounts/user_detail.html:88
 msgid "Groups: "
 msgstr "Groups: "
-#: accounts/templates/accounts/user_detail.html:101
+#: colab/accounts/templates/accounts/user_detail.html:101
 msgid "Collaborations by Type"
 msgstr "Collaborations by Type"
-#: accounts/templates/accounts/user_detail.html:117
+#: colab/accounts/templates/accounts/user_detail.html:117
 msgid "Participation by Group"
 msgstr "Participation by Group"
-#: accounts/templates/accounts/user_detail.html:133
+#: colab/accounts/templates/accounts/user_detail.html:133
 msgid "Latest posted"
 msgstr "Latest posted"
-#: accounts/templates/accounts/user_detail.html:138
+#: colab/accounts/templates/accounts/user_detail.html:138
 msgid "There are no posts by this user so far."
 msgstr "There are no posts by this user so far."
-#: accounts/templates/accounts/user_detail.html:142
+#: colab/accounts/templates/accounts/user_detail.html:142
 msgid "View more posts..."
 msgstr "View more posts..."
-#: accounts/templates/accounts/user_detail.html:148
+#: colab/accounts/templates/accounts/user_detail.html:148
 msgid "Latest contributions"
 msgstr "Latest contributions"
-#: accounts/templates/accounts/user_detail.html:153
+#: colab/accounts/templates/accounts/user_detail.html:153
 msgid "No contributions of this user so far."
 msgstr "No contributions of this user so far."
-#: accounts/templates/accounts/user_detail.html:157
+#: colab/accounts/templates/accounts/user_detail.html:157
 msgid "View more contributions..."
 msgstr "View more contributions..."
-#: accounts/templates/accounts/user_update_form.html:65
+#: colab/accounts/templates/accounts/user_update_form.html:70
 msgid "We sent a verification email to "
 msgstr "We sent a verification email to "
-#: accounts/templates/accounts/user_update_form.html:66
+#: colab/accounts/templates/accounts/user_update_form.html:71
 msgid "Please follow the instructions in it."
 msgstr "Please follow the instructions in it."
-#: accounts/templates/accounts/user_update_form.html:110
+#: colab/accounts/templates/accounts/user_update_form.html:123
 msgid "profile information"
 msgstr "profile information"
-#: accounts/templates/accounts/user_update_form.html:115
+#: colab/accounts/templates/accounts/user_update_form.html:128
 msgid "Change your avatar at Gravatar.com"
 msgstr "Change your avatar at Gravatar.com"
-#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:56
+#: colab/accounts/templates/accounts/user_update_form.html:178
+#: colab/search/utils.py:56
 msgid "Emails"
 msgstr "Emails"
-#: accounts/templates/accounts/user_update_form.html:151
+#: colab/accounts/templates/accounts/user_update_form.html:187
 msgid "Primary"
 msgstr "Primary"
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:190
 msgid "Setting..."
 msgstr "Setting..."
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:190
 msgid "Set as Primary"
 msgstr "Set as Primary"
-#: accounts/templates/accounts/user_update_form.html:155
+#: colab/accounts/templates/accounts/user_update_form.html:191
 msgid "Deleting..."
 msgstr "Deleting..."
-#: accounts/templates/accounts/user_update_form.html:155
-#: accounts/templates/accounts/user_update_form.html:167
+#: colab/accounts/templates/accounts/user_update_form.html:191
+#: colab/accounts/templates/accounts/user_update_form.html:203
 msgid "Delete"
 msgstr "Delete"
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:202
 msgid "Sending verification..."
 msgstr "Sending verification..."
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:202
 msgid "Verify"
 msgstr "Verify"
-#: accounts/templates/accounts/user_update_form.html:174
+#: colab/accounts/templates/accounts/user_update_form.html:210
 msgid "Add another email address:"
 msgstr "Add another email address:"
-#: accounts/templates/accounts/user_update_form.html:177
+#: colab/accounts/templates/accounts/user_update_form.html:213
 msgid "Add"
 msgstr "Add"
-#: accounts/templates/accounts/user_update_form.html:185
-#: accounts/templates/accounts/user_update_form.html:189
-#: accounts/templates/registration/password_change_form_custom.html:26
-#: accounts/templates/registration/password_reset_confirm_custom.html:28
+#: colab/accounts/templates/accounts/user_update_form.html:221
+#: colab/accounts/templates/accounts/user_update_form.html:225
+#: colab/accounts/templates/registration/password_change_form_custom.html:26
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr "Change Password"
-#: accounts/templates/accounts/user_update_form.html:196
+#: colab/accounts/templates/accounts/user_update_form.html:233
 msgid "Update"
 msgstr "Update"
-#: accounts/templates/registration/login.html:10
-#: accounts/templates/registration/password_change_form_custom.html:10
-#: accounts/templates/registration/password_reset_confirm_custom.html:12
+#: colab/accounts/templates/accounts/user_update_form.html:234
+msgid "Go to profile panel"
+msgstr ""
+
+#: colab/accounts/templates/registration/login.html:10
+#: colab/accounts/templates/registration/password_change_form_custom.html:10
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:12
 msgid "Please correct the error below and try again."
 msgstr "Please correct the error below and try again."
-#: accounts/templates/registration/login.html:34
-#: accounts/templates/registration/login.html:54 templates/base.html:99
-#: templates/base.html.py:101 templates/base.html:104
-#: templates/base.html.py:106 templates/header.html:39
-#: templates/header.html.py:41 templates/header.html:44
-#: templates/header.html.py:46
+#: colab/accounts/templates/registration/login.html:34
+#: colab/accounts/templates/registration/login.html:54
+#: colab/templates/header.html:37 colab/templates/header.html.py:39
+#: colab/templates/header.html:42 colab/templates/header.html.py:44
 msgid "Login"
 msgstr "Login"
-#: accounts/templates/registration/login.html:56
+#: colab/accounts/templates/registration/login.html:56
 msgid "Forgot Password?"
 msgstr "Forgot Password?"
-#: accounts/templates/registration/password_change_form_custom.html:54
-#: accounts/templates/registration/password_reset_confirm_custom.html:51
+#: colab/accounts/templates/registration/password_change_form_custom.html:54
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:51
 msgid "Change my password"
 msgstr "Change my password"
-#: accounts/templates/registration/password_reset_confirm_custom.html:3
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:3
 msgid "Setting New password"
 msgstr "Setting New password"
-#: accounts/templates/registration/password_reset_form_custom.html:23
+#: colab/accounts/templates/registration/password_reset_form_custom.html:23
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
-msgstr "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one."
+msgstr ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
-#: accounts/templates/registration/password_reset_form_custom.html:26
+#: colab/accounts/templates/registration/password_reset_form_custom.html:26
 msgid "Email address:"
 msgstr "Email address:"
-#: accounts/templates/registration/password_reset_form_custom.html:37
+#: colab/accounts/templates/registration/password_reset_form_custom.html:37
 msgid "Reset password"
 msgstr "Reset password"
-#: accounts/views.py:126
+#: colab/accounts/templates/search/user_search_preview.html:11
+#: colab/search/forms.py:19
+#: colab/search/templates/search/includes/search_filters.html:134
+#: colab/search/templates/search/includes/search_filters.html:136
+#: colab/search/templates/search/includes/search_filters.html:168
+#: colab/search/templates/search/includes/search_filters.html:169
+msgid "Since"
+msgstr "Since"
+
+#: colab/accounts/templates/search/user_search_preview.html:12
+#, fuzzy
+#| msgid "Register"
+msgid "Registered in"
+msgstr "Register"
+
+#: colab/accounts/templatetags/date_format.py:8
+#, python-format
+msgid "%(m)s %(d)s %(y)s"
+msgstr ""
+
+#: colab/accounts/templatetags/date_format.py:17
+#, python-format
+msgid "%(hour)s:%(min)s"
+msgstr ""
+
+#: colab/accounts/templatetags/date_format.py:19
+#, python-format
+msgid "%s at %s"
+msgstr ""
+
+#: colab/accounts/views.py:126
 msgid "Your profile has been created!"
 msgstr "Your profile has been created!"
-#: accounts/views.py:186
+#: colab/accounts/views.py:186
 msgid "Your password was changed."
 msgstr "Your password was changed."
-#: accounts/views.py:202
+#: colab/accounts/views.py:202
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Your password has been set. You may go ahead and log in now."
-#: home/context_processors.py:20
+#: colab/home/context_processors.py:20
 msgid "Fork me!"
 msgstr "Fork me!"
-#: plugins/gitlab/models.py:27
-msgid "Gitlab Project"
-msgstr "Gitlab Project"
-
-#: plugins/gitlab/models.py:28
-msgid "Gitlab Projects"
-msgstr "Gitlab Projects"
-
-#: plugins/gitlab/models.py:54
-msgid "Gitlab Group"
-msgstr "Gitlab Group"
-
-#: plugins/gitlab/models.py:55
-msgid "Gitlab Groups"
-msgstr "Gitlab Groups"
-
-#: plugins/gitlab/models.py:91
-msgid "Gitlab Merge Request"
-msgstr "Gitlab Merge Request"
-
-#: plugins/gitlab/models.py:92
-msgid "Gitlab Merge Requests"
-msgstr "Gitlab Merge Requests"
-
-#: plugins/gitlab/models.py:120
-msgid "Gitlab Issue"
-msgstr "Gitlab Issue"
-
-#: plugins/gitlab/models.py:121
-msgid "Gitlab Issues"
-msgstr "Gitlab Issues"
-
-#: plugins/gitlab/models.py:176 plugins/gitlab/models.py:177
-msgid "Gitlab Comments"
-msgstr "Gitlab Comments"
-
-#: plugins/noosfero/models.py:39
-msgid "Community"
-msgstr "Community"
-
-#: plugins/noosfero/models.py:40
-msgid "Communities"
-msgstr "Communities"
-
-#: plugins/noosfero/models.py:67
-msgid "Article"
-msgstr "Article"
-
-#: plugins/noosfero/models.py:68
-msgid "Articles"
-msgstr "Articles"
-
-#: rss/feeds.py:13
+#: colab/rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr "Latest Discussions"
-#: rss/feeds.py:32
+#: colab/rss/feeds.py:32
 msgid "Discussions Most Relevance"
 msgstr "Discussions Most Relevance"
-#: rss/feeds.py:51
+#: colab/rss/feeds.py:51
 msgid "Latest collaborations"
 msgstr "Latest collaborations"
-#: search/forms.py:16 search/templates/search/search.html:46
-#: templates/base.html:89 templates/header.html:29
+#: colab/search/forms.py:16 colab/search/templates/search/search.html:39
+#: colab/templates/header.html:27
 msgid "Search"
 msgstr "Search"
-#: search/forms.py:18
+#: colab/search/forms.py:18
 msgid "Type"
 msgstr "Type"
-#: search/forms.py:19 search/views.py:20
-msgid "Author"
-msgstr "Author"
-
-#: search/forms.py:20
-msgid "Modified by"
-msgstr "Modified by"
-
-#: search/forms.py:22
-msgid "Status"
-msgstr "Status"
-
-#: search/forms.py:26 search/views.py:23
-msgid "Mailinglist"
-msgstr "Mailinglist"
-
-#: search/forms.py:30
-msgid "Milestone"
-msgstr "Milestone"
-
-#: search/forms.py:31
-msgid "Priority"
-msgstr "Priority"
-
-#: search/forms.py:32
-msgid "Component"
-msgstr "Component"
-
-#: search/forms.py:33
-msgid "Severity"
-msgstr "Severity"
-
-#: search/forms.py:34
-msgid "Reporter"
-msgstr "Reporter"
-
-#: search/forms.py:35
-msgid "Keywords"
-msgstr "Keywords"
-
-#: search/forms.py:36
-msgid "Collaborators"
-msgstr "Collaborators"
-
-#: search/forms.py:37
-msgid "Repository"
-msgstr "Repository"
-
-#: search/forms.py:39
-msgid "Name"
-msgstr "Name"
-
-#: search/forms.py:40
-msgid "Institution"
-msgstr "Institution"
-
-#: search/forms.py:41
-msgid "Role"
-msgstr "Role"
-
-#: search/forms.py:42 search/templates/search/includes/search_filters.html:132
-#: search/templates/search/includes/search_filters.html:134
-#: search/templates/search/includes/search_filters.html:166
-#: search/templates/search/includes/search_filters.html:167
-msgid "Since"
-msgstr "Since"
-
-#: search/forms.py:43 search/templates/search/includes/search_filters.html:141
-#: search/templates/search/includes/search_filters.html:143
-#: search/templates/search/includes/search_filters.html:170
-#: search/templates/search/includes/search_filters.html:171
+#: colab/search/forms.py:20
+#: colab/search/templates/search/includes/search_filters.html:143
+#: colab/search/templates/search/includes/search_filters.html:145
+#: colab/search/templates/search/includes/search_filters.html:172
+#: colab/search/templates/search/includes/search_filters.html:173
 msgid "Until"
 msgstr "Until"
-#: search/forms.py:44
-msgid "Filename"
-msgstr "Filename"
-
-#: search/forms.py:45
-msgid "Used by"
-msgstr "Used by"
-
-#: search/forms.py:46
-msgid "File type"
-msgstr "File type"
-
-#: search/forms.py:47
-msgid "Size"
-msgstr "Size"
-
-#: search/templates/search/includes/search_filters.html:5
-#: search/templates/search/includes/search_filters.html:33
-#: search/templates/search/includes/search_filters.html:51
-#: search/templates/search/includes/search_filters.html:69
+#: colab/search/templates/search/includes/search_filters.html:5
+#: colab/search/templates/search/includes/search_filters.html:33
+#: colab/search/templates/search/includes/search_filters.html:51
+#: colab/search/templates/search/includes/search_filters.html:69
 msgid "Remove filter"
 msgstr "Remove filter"
-#: search/templates/search/includes/search_filters.html:88
-#: search/templates/search/includes/search_filters.html:152
-#: search/templates/search/includes/search_filters.html:176
+#: colab/search/templates/search/includes/search_filters.html:88
+#: colab/search/templates/search/includes/search_filters.html:154
+#: colab/search/templates/search/includes/search_filters.html:178
 msgid "Filter"
 msgstr "Filter"
-#: search/templates/search/includes/search_filters.html:94
+#: colab/search/templates/search/includes/search_filters.html:94
 msgid "Sort by"
 msgstr "Sort by"
-#: search/templates/search/includes/search_filters.html:111
+#: colab/search/templates/search/includes/search_filters.html:111
 msgid "Types"
 msgstr "Types"
-#: search/templates/search/includes/search_filters.html:117 search/views.py:18
-msgid "Discussion"
-msgstr "Discussion"
-
-#: search/templates/search/search.html:5
+#: colab/search/templates/search/search.html:5
 msgid "search"
 msgstr "search"
-#: search/templates/search/search.html:51
+#: colab/search/templates/search/search.html:44
 msgid "documents found"
 msgstr "documents found"
-#: search/templates/search/search.html:62
+#: colab/search/templates/search/search.html:55
 msgid "Search here"
 msgstr "Search here"
-#: search/templates/search/search.html:74
-#: search/templates/search/search.html:84
+#: colab/search/templates/search/search.html:67
 msgid "Filters"
 msgstr "Filters"
-#: search/templates/search/search.html:105
+#: colab/search/templates/search/search.html:76
 msgid "No results for your search."
 msgstr "No results for your search."
-#: search/templates/search/search.html:107
+#: colab/search/templates/search/search.html:78
 msgid "You are searching for"
 msgstr "You are searching for"
-#: settings.py:113
+#: colab/settings.py:111
 msgid "English"
 msgstr "English"
-#: settings.py:114
+#: colab/settings.py:112
 msgid "Portuguese"
 msgstr "Portuguese"
-#: settings.py:115
+#: colab/settings.py:113
 msgid "Spanish"
 msgstr "Spanish"
-#: settings.py:138
+#: colab/settings.py:136
 msgid "Recent activity"
 msgstr "Recent activity"
-#: settings.py:142
+#: colab/settings.py:140
 msgid "Relevance"
 msgstr "Relevance"
-#: settings.py:151
+#: colab/settings.py:149
 msgid "Document"
 msgstr "Document"
-#: settings.py:153
+#: colab/settings.py:151
 msgid "Presentation"
 msgstr "Presentation"
-#: settings.py:154
+#: colab/settings.py:152
 msgid "Text"
 msgstr "Text"
-#: settings.py:155
+#: colab/settings.py:153
 msgid "Code"
 msgstr "Code"
-#: settings.py:157
+#: colab/settings.py:155
 msgid "Compressed"
 msgstr "Compressed"
-#: settings.py:158
+#: colab/settings.py:156
 msgid "Image"
 msgstr "Image"
-#: settings.py:160
+#: colab/settings.py:158
 msgid "Spreadsheet"
 msgstr "Spreadsheet"
-#: templates/404.html:5
+#: colab/templates/404.html:5
 msgid "Not found. Keep searching! :)"
 msgstr "Not found. Keep searching! :)"
-#: templates/500.html:2
+#: colab/templates/500.html:2
 msgid "Ooopz... something went wrong!"
 msgstr "Ooopz... something went wrong!"
-#: templates/base.html:83 templates/header.html:21
-msgid "Groups"
-msgstr "Groups"
-
-#: templates/base.html:119 templates/header.html:59
-msgid "My Profile"
-msgstr "My Profile"
-
-#: templates/base.html:120 templates/base.html.py:121 templates/header.html:60
-#: templates/header.html.py:61
-msgid "Logout"
-msgstr "Logout"
-
-#: templates/base.html:132 templates/base.html.py:135 templates/header.html:72
-#: templates/header.html.py:75
-msgid "Search here..."
-msgstr "Search here..."
-
-#: templates/base.html:149
+#: colab/templates/base.html:74
 msgid "The login has failed. Please, try again."
 msgstr "The login has failed. Please, try again."
-#: templates/footer.html:6
+#: colab/templates/footer.html:6
 msgid "Last email imported at"
 msgstr "Last email imported at"
-#: templates/footer.html:12
+#: colab/templates/footer.html:12
 msgid "The contents of this site is published under license"
 msgstr "The contents of this site is published under license"
-#: templates/footer.html:15
+#: colab/templates/footer.html:15
 msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
 msgstr "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
-#: templates/header.html:26
-msgid "Paste"
-msgstr "Paste"
+#: colab/templates/header.html:21
+msgid "Groups"
+msgstr "Groups"
+
+#: colab/templates/header.html:57
+#, fuzzy
+#| msgid "My Profile"
+msgid "My Profile"
+msgstr "My Profile"
+
+#: colab/templates/header.html:58 colab/templates/header.html.py:59
+msgid "Logout"
+msgstr "Logout"
-#: templates/home.html:17
+#: colab/templates/header.html:70 colab/templates/header.html.py:73
+msgid "Search here..."
+msgstr "Search here..."
+
+#: colab/templates/home.html:17
 msgid "Latest Collaborations"
 msgstr "Latest Collaborations"
-#: templates/home.html:21
+#: colab/templates/home.html:21
 msgid "RSS - Latest collaborations"
 msgstr "RSS - Latest collaborations"
-#: templates/home.html:30
+#: colab/templates/home.html:30
 msgid "View more collaborations..."
 msgstr "View more collaborations..."
-#: templates/home.html:37
+#: colab/templates/home.html:37
 msgid "Collaboration Graph"
 msgstr "Collaboration Graph"
-#: templates/home.html:48
+#: colab/templates/home.html:48
 msgid "Most Relevant Threads"
 msgstr "Most Relevant Threads"
-#: templates/home.html:52
+#: colab/templates/home.html:52
 msgid "RSS - Most Relevant Threads"
 msgstr "RSS - Most Relevant Threads"
-#: templates/home.html:60 templates/home.html.py:79
+#: colab/templates/home.html:60 colab/templates/home.html.py:79
 msgid "View more discussions..."
 msgstr "View more discussions..."
-#: templates/home.html:67
+#: colab/templates/home.html:67
 msgid "Latest Threads"
 msgstr "Latest Threads"
-#: templates/home.html:71
+#: colab/templates/home.html:71
 msgid "RSS - Latest Threads"
 msgstr "RSS - Latest Threads"
+
+#, fuzzy
+#~| msgid "Gitlab Projects"
+#~ msgid "Public Projects"
+#~ msgstr "Gitlab Projects"
+
+#, fuzzy
+#~| msgid "Gitlab Project"
+#~ msgid "New Project"
+#~ msgstr "Gitlab Project"
+
+#, fuzzy
+#~| msgid "Gitlab Projects"
+#~ msgid "Projects"
+#~ msgstr "Gitlab Projects"
+
+#, fuzzy
+#~| msgid "Gitlab Issues"
+#~ msgid "Issues"
+#~ msgstr "Gitlab Issues"
+
+#, fuzzy
+#~| msgid "Gitlab Merge Requests"
+#~ msgid "Merge Requests"
+#~ msgstr "Gitlab Merge Requests"
+
+#~ msgid ""
+#~ "Please enter a correct %(username)s and password. Note that both fields "
+#~ "may be case-sensitive."
+#~ msgstr ""
+#~ "Please enter a correct %(username)s and password. Note that both fields "
+#~ "may be case-sensitive."
+
+#~ msgid "This account is inactive."
+#~ msgstr "This account is inactive."
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "New password"
+#~ msgstr "New password"
+
+#~ msgid "New password confirmation"
+#~ msgstr "New password confirmation"
+
+#~ msgid "Your old password was entered incorrectly. Please enter it again."
+#~ msgstr "Your old password was entered incorrectly. Please enter it again."
+
+#~ msgid "Old password"
+#~ msgstr "Old password"
+
+#~ msgid "Password (again)"
+#~ msgstr "Password (again)"
+
+#~ msgid "Enter a valid username."
+#~ msgstr "Enter a valid username."
+
+#~ msgid "Gitlab Group"
+#~ msgstr "Gitlab Group"
+
+#~ msgid "Gitlab Groups"
+#~ msgstr "Gitlab Groups"
+
+#~ msgid "Gitlab Merge Request"
+#~ msgstr "Gitlab Merge Request"
+
+#~ msgid "Gitlab Issue"
+#~ msgstr "Gitlab Issue"
+
+#~ msgid "Gitlab Comments"
+#~ msgstr "Gitlab Comments"
+
+#~ msgid "Community"
+#~ msgstr "Community"
+
+#~ msgid "Article"
+#~ msgstr "Article"
+
+#~ msgid "Articles"
+#~ msgstr "Articles"
+
+#~ msgid "Author"
+#~ msgstr "Author"
+
+#~ msgid "Modified by"
+#~ msgstr "Modified by"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Mailinglist"
+#~ msgstr "Mailinglist"
+
+#~ msgid "Milestone"
+#~ msgstr "Milestone"
+
+#~ msgid "Priority"
+#~ msgstr "Priority"
+
+#~ msgid "Component"
+#~ msgstr "Component"
+
+#~ msgid "Severity"
+#~ msgstr "Severity"
+
+#~ msgid "Reporter"
+#~ msgstr "Reporter"
+
+#~ msgid "Keywords"
+#~ msgstr "Keywords"
+
+#~ msgid "Collaborators"
+#~ msgstr "Collaborators"
+
+#~ msgid "Repository"
+#~ msgstr "Repository"
+
+#~ msgid "Used by"
+#~ msgstr "Used by"
+
+#~ msgid "File type"
+#~ msgstr "File type"
+
+#~ msgid "Size"
+#~ msgstr "Size"
+
+#~ msgid "Discussion"
+#~ msgstr "Discussion"
+
+#~ msgid "Paste"
+#~ msgstr "Paste"
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>, 2015
 # macártur de sousa carvalho <macartur.sc@gmail.com>, 2015
@@ -10,703 +10,740 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: colab\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-01 13:15+0000\n"
+"POT-Creation-Date: 2015-11-24 17:46+0000\n"
 "PO-Revision-Date: 2015-09-07 19:13+0000\n"
 "Last-Translator: Lucas Kanashiro Duarte <kanashiro.duarte@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/colab/colab/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/colab/colab/"
+"language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: accounts/admin.py:18
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:21
+msgid "Social"
+msgstr "Social"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:26
+#, fuzzy
+#| msgid "Username"
+msgid "Users"
+msgstr "Usuário"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:28
+msgid "Communities"
+msgstr "Comunidades"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:30
+#, fuzzy
+#| msgid "My Profile"
+msgid "Profile"
+msgstr "Meu Perfil"
+
+#: colab-noosfero-plugin/tests/plugins.d/noosfero.py:32
+msgid "Control Panel"
+msgstr "Painel de Controle"
+
+#: colab/accounts/admin.py:18
 msgid "Personal info"
 msgstr "Informações Pessoais"
-#: accounts/admin.py:24
+#: colab/accounts/admin.py:24
 msgid "Permissions"
 msgstr "Permissões"
-#: accounts/admin.py:28
+#: colab/accounts/admin.py:28
 msgid "Important dates"
 msgstr "Datas importantes"
-#: accounts/forms.py:37
+#: colab/accounts/filters.py:7
+#: colab/accounts/templates/search/user_search_preview.html:12
+#, fuzzy
+#| msgid "Username"
+msgid "User"
+msgstr "Usuário"
+
+#: colab/accounts/filters.py:12 colab/accounts/forms.py:175
+#: colab/accounts/forms.py:246
+#, fuzzy
+#| msgid "Filename"
+msgid "Username"
+msgstr "Nome do arquivo"
+
+#: colab/accounts/filters.py:15
+msgid "Name"
+msgstr "Nome"
+
+#: colab/accounts/filters.py:18
+msgid "Institution"
+msgstr "Instituição"
+
+#: colab/accounts/filters.py:21
+msgid "Role"
+msgstr "Papel"
+
+#: colab/accounts/forms.py:30
 msgid "Social account does not exist"
 msgstr "Conta social não existe"
-#: accounts/forms.py:65 accounts/forms.py:71 accounts/forms.py:77
+#: colab/accounts/forms.py:58 colab/accounts/forms.py:64
+#: colab/accounts/forms.py:70
 msgid "This field cannot be blank."
 msgstr "Este campo não pode ficar em branco."
-#: accounts/forms.py:118 accounts/templates/accounts/user_detail.html:38
+#: colab/accounts/forms.py:111
+#: colab/accounts/templates/accounts/user_detail.html:38
 msgid "Bio"
 msgstr "Bio"
-#: accounts/forms.py:119
+#: colab/accounts/forms.py:112
 msgid "Write something about you in 200 characters or less."
 msgstr "Escreva algo sobre você em 200 caracteres ou menos."
-#: accounts/forms.py:148
+#: colab/accounts/forms.py:157
 msgid "Mailing lists"
 msgstr "Listas de e-mail"
-#: accounts/forms.py:161
+#: colab/accounts/forms.py:170
 #, python-format
 msgid "Email already used. Is it you?  Please <a href='%(url)s'>login</a>"
-msgstr "Este email ja está sendo utilizado.Caso seja o seu efetue o <a href='%(url)s'>login</a>"
+msgstr ""
+"Este email ja está sendo utilizado.Caso seja o seu efetue o <a "
+"href='%(url)s'>login</a>"
-#: accounts/forms.py:163
+#: colab/accounts/forms.py:172
 msgid "A user with that username already exists."
 msgstr "Já existe um usuário com este nome."
-#: accounts/forms.py:164 accounts/forms.py:401 accounts/forms.py:465
+#: colab/accounts/forms.py:173
 msgid "The two password fields didn't match."
 msgstr "Os dois campos de senha não conferem."
-#: accounts/forms.py:166 accounts/forms.py:236 search/forms.py:38
-msgid "Username"
-msgstr "Usuário"
-
-#: accounts/forms.py:173 accounts/forms.py:240 accounts/forms.py:277
-#: accounts/forms.py:467
+#: colab/accounts/forms.py:183 colab/accounts/forms.py:251
 msgid "Password"
 msgstr "Senha"
-#: accounts/forms.py:175
+#: colab/accounts/forms.py:185
 msgid "Password confirmation"
 msgstr "Confirmação de senha"
-#: accounts/forms.py:237 accounts/models.py:78
+#: colab/accounts/forms.py:247 colab/accounts/models.py:77
 msgid "Required. 30 characters or fewer. Letters and digits."
 msgstr "Obrigatório. 30 caracteres ou menos. Letras ou digitos."
-#: accounts/forms.py:239
+#: colab/accounts/forms.py:249
 msgid "This value may contain only letters and numbers."
 msgstr "Este campo pode conter apenas letras e números."
-#: accounts/forms.py:241
+#: colab/accounts/forms.py:252
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
 "password, but you can change the password using <a href=\"password/\">this "
 "form</a>."
-msgstr "Senhas em claro não são armazenadas, então não será possível visualizar sua senha, no entanto você poderá modificar sua senha utilizando <a href=\\\"password/\\\">este formulário</a>."
-
-#: accounts/forms.py:280
-#, python-format
-msgid ""
-"Please enter a correct %(username)s and password. Note that both fields may "
-"be case-sensitive."
-msgstr "Por favor entre com um %(username)s e senha. Note que ambos os campos diferenciam letras maiúsculas de minúsculas"
-
-#: accounts/forms.py:282
-msgid "This account is inactive."
-msgstr "Esta conta está inativa."
-
-#: accounts/forms.py:345
-msgid "Email"
-msgstr "Email"
-
-#: accounts/forms.py:403
-msgid "New password"
-msgstr "Nova senha"
-
-#: accounts/forms.py:405
-msgid "New password confirmation"
-msgstr "Confirmar nova senha"
-
-#: accounts/forms.py:436
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Sua senha atual está incorreta. Por favor tente novamente."
-
-#: accounts/forms.py:439
-msgid "Old password"
-msgstr "Senha atual"
-
-#: accounts/forms.py:469
-msgid "Password (again)"
-msgstr "Senha (novamente)"
-
-#: accounts/models.py:82
-msgid "Enter a valid username."
-msgstr "Insira um nome de usuário válido."
+msgstr ""
+"Senhas em claro não são armazenadas, então não será possível visualizar sua "
+"senha, no entanto você poderá modificar sua senha utilizando <a href=\\"
+"\"password/\\\">este formulário</a>."
-#: accounts/templates/accounts/manage_subscriptions.html:6
+#: colab/accounts/templates/accounts/manage_subscriptions.html:6
 msgid "Group Subscriptions"
 msgstr "Inscrições em grupos"
-#: accounts/templates/accounts/manage_subscriptions.html:36
+#: colab/accounts/templates/accounts/manage_subscriptions.html:36
 msgid "Update subscriptions"
 msgstr "Atualizar inscrições"
-#: accounts/templates/accounts/user_create_form.html:5
+#: colab/accounts/templates/accounts/user_create_form.html:5
 msgid "Sign up"
 msgstr "Cadastrar"
-#: accounts/templates/accounts/user_create_form.html:10
-#: accounts/templates/registration/login.html:14
-#: accounts/templates/registration/password_change_form_custom.html:12
-#: accounts/templates/registration/password_reset_confirm_custom.html:14
-#: accounts/templates/registration/password_reset_form_custom.html:9
+#: colab/accounts/templates/accounts/user_create_form.html:10
+#: colab/accounts/templates/registration/login.html:14
+#: colab/accounts/templates/registration/password_change_form_custom.html:12
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:14
+#: colab/accounts/templates/registration/password_reset_form_custom.html:9
 msgid "Please correct the errors below and try again."
 msgstr "Por favor corrija os erros abaixo e tente novamente."
-#: accounts/templates/accounts/user_create_form.html:17
+#: colab/accounts/templates/accounts/user_create_form.html:17
 msgid "Required fields"
 msgstr "Campos obrigatórios"
-#: accounts/templates/accounts/user_create_form.html:29
+#: colab/accounts/templates/accounts/user_create_form.html:29
 msgid "Personal Information"
 msgstr "Informações pessoais"
-#: accounts/templates/accounts/user_create_form.html:46
+#: colab/accounts/templates/accounts/user_create_form.html:46
 msgid "Subscribe to groups"
 msgstr "Inscreva-se nos grupos"
-#: accounts/templates/accounts/user_create_form.html:60
-#: templates/base.html:100 templates/base.html.py:105 templates/header.html:40
-#: templates/header.html.py:45
+#: colab/accounts/templates/accounts/user_create_form.html:60
+#: colab/templates/header.html:38 colab/templates/header.html.py:43
 msgid "Register"
 msgstr "Cadastre-se"
-#: accounts/templates/accounts/user_detail.html:8
+#: colab/accounts/templates/accounts/user_detail.html:8
 msgid "Messages"
 msgstr "Mensagens"
-#: accounts/templates/accounts/user_detail.html:9 templates/home.html:7
+#: colab/accounts/templates/accounts/user_detail.html:9
+#: colab/templates/home.html:7
 msgid "Contributions"
 msgstr "Contribuições"
-#: accounts/templates/accounts/user_detail.html:29
+#: colab/accounts/templates/accounts/user_detail.html:29
 msgid "edit profile"
 msgstr "editar perfil"
-#: accounts/templates/accounts/user_detail.html:30
+#: colab/accounts/templates/accounts/user_detail.html:30
 msgid "group membership"
 msgstr "Inscrições nos grupos"
-#: accounts/templates/accounts/user_detail.html:66
+#: colab/accounts/templates/accounts/user_detail.html:66
 msgid "Twitter account"
 msgstr "Conta Twitter"
-#: accounts/templates/accounts/user_detail.html:69
+#: colab/accounts/templates/accounts/user_detail.html:69
 msgid "Facebook account"
 msgstr "Conta Facebook"
-#: accounts/templates/accounts/user_detail.html:74
+#: colab/accounts/templates/accounts/user_detail.html:74
 msgid "Google talk account"
 msgstr "Conta Google talk"
-#: accounts/templates/accounts/user_detail.html:78
+#: colab/accounts/templates/accounts/user_detail.html:78
 msgid "Github account"
 msgstr "Conta Github"
-#: accounts/templates/accounts/user_detail.html:82
+#: colab/accounts/templates/accounts/user_detail.html:82
 msgid "Personal webpage"
 msgstr "Página web pessoal"
-#: accounts/templates/accounts/user_detail.html:88
+#: colab/accounts/templates/accounts/user_detail.html:88
 msgid "Groups: "
 msgstr "Grupos: "
-#: accounts/templates/accounts/user_detail.html:101
+#: colab/accounts/templates/accounts/user_detail.html:101
 msgid "Collaborations by Type"
 msgstr "Colaborações por tipo"
-#: accounts/templates/accounts/user_detail.html:117
+#: colab/accounts/templates/accounts/user_detail.html:117
 msgid "Participation by Group"
 msgstr "Participação por grupo"
-#: accounts/templates/accounts/user_detail.html:133
+#: colab/accounts/templates/accounts/user_detail.html:133
 msgid "Latest posted"
 msgstr "Últimas postagens"
-#: accounts/templates/accounts/user_detail.html:138
+#: colab/accounts/templates/accounts/user_detail.html:138
 msgid "There are no posts by this user so far."
 msgstr "Não há posts deste usuário até agora."
-#: accounts/templates/accounts/user_detail.html:142
+#: colab/accounts/templates/accounts/user_detail.html:142
 msgid "View more posts..."
 msgstr "Ver mais postagens..."
-#: accounts/templates/accounts/user_detail.html:148
+#: colab/accounts/templates/accounts/user_detail.html:148
 msgid "Latest contributions"
 msgstr "Últimas colaborações"
-#: accounts/templates/accounts/user_detail.html:153
+#: colab/accounts/templates/accounts/user_detail.html:153
 msgid "No contributions of this user so far."
 msgstr "Não há contribuições deste usuário até agora."
-#: accounts/templates/accounts/user_detail.html:157
+#: colab/accounts/templates/accounts/user_detail.html:157
 msgid "View more contributions..."
 msgstr "Ver mais colaborações..."
-#: accounts/templates/accounts/user_update_form.html:65
+#: colab/accounts/templates/accounts/user_update_form.html:70
 msgid "We sent a verification email to "
 msgstr "Enviamos um email de verificação para "
-#: accounts/templates/accounts/user_update_form.html:66
+#: colab/accounts/templates/accounts/user_update_form.html:71
 msgid "Please follow the instructions in it."
 msgstr "Por favor, siga as instruções."
-#: accounts/templates/accounts/user_update_form.html:110
+#: colab/accounts/templates/accounts/user_update_form.html:123
 msgid "profile information"
 msgstr "informações do perfil"
-#: accounts/templates/accounts/user_update_form.html:115
+#: colab/accounts/templates/accounts/user_update_form.html:128
 msgid "Change your avatar at Gravatar.com"
 msgstr "Troque seu avatar em Gravatar.com"
-#: accounts/templates/accounts/user_update_form.html:142 search/utils.py:56
+#: colab/accounts/templates/accounts/user_update_form.html:178
+#: colab/search/utils.py:56
 msgid "Emails"
 msgstr "Emails"
-#: accounts/templates/accounts/user_update_form.html:151
+#: colab/accounts/templates/accounts/user_update_form.html:187
 msgid "Primary"
 msgstr "Primário"
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:190
 msgid "Setting..."
 msgstr "Definindo..."
-#: accounts/templates/accounts/user_update_form.html:154
+#: colab/accounts/templates/accounts/user_update_form.html:190
 msgid "Set as Primary"
 msgstr "Definir como Primário"
-#: accounts/templates/accounts/user_update_form.html:155
+#: colab/accounts/templates/accounts/user_update_form.html:191
 msgid "Deleting..."
 msgstr "Apagando..."
-#: accounts/templates/accounts/user_update_form.html:155
-#: accounts/templates/accounts/user_update_form.html:167
+#: colab/accounts/templates/accounts/user_update_form.html:191
+#: colab/accounts/templates/accounts/user_update_form.html:203
 msgid "Delete"
 msgstr "Apagar"
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:202
 msgid "Sending verification..."
 msgstr "Enviando verificação..."
-#: accounts/templates/accounts/user_update_form.html:166
+#: colab/accounts/templates/accounts/user_update_form.html:202
 msgid "Verify"
 msgstr "Verificar"
-#: accounts/templates/accounts/user_update_form.html:174
+#: colab/accounts/templates/accounts/user_update_form.html:210
 msgid "Add another email address:"
 msgstr "Adicionar outro endereço de email"
-#: accounts/templates/accounts/user_update_form.html:177
+#: colab/accounts/templates/accounts/user_update_form.html:213
 msgid "Add"
 msgstr "Adicionar"
-#: accounts/templates/accounts/user_update_form.html:185
-#: accounts/templates/accounts/user_update_form.html:189
-#: accounts/templates/registration/password_change_form_custom.html:26
-#: accounts/templates/registration/password_reset_confirm_custom.html:28
+#: colab/accounts/templates/accounts/user_update_form.html:221
+#: colab/accounts/templates/accounts/user_update_form.html:225
+#: colab/accounts/templates/registration/password_change_form_custom.html:26
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:28
 msgid "Change Password"
 msgstr "Trocar senha"
-#: accounts/templates/accounts/user_update_form.html:196
+#: colab/accounts/templates/accounts/user_update_form.html:233
 msgid "Update"
 msgstr "Atualizar"
-#: accounts/templates/registration/login.html:10
-#: accounts/templates/registration/password_change_form_custom.html:10
-#: accounts/templates/registration/password_reset_confirm_custom.html:12
+#: colab/accounts/templates/accounts/user_update_form.html:234
+#| msgid "Control Panel"
+msgid "Go to profile panel"
+msgstr "Ir para meu perfil"
+
+#: colab/accounts/templates/registration/login.html:10
+#: colab/accounts/templates/registration/password_change_form_custom.html:10
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:12
 msgid "Please correct the error below and try again."
 msgstr "Por favor corrija o erro abaixo e tente novamente."
-#: accounts/templates/registration/login.html:34
-#: accounts/templates/registration/login.html:54 templates/base.html:99
-#: templates/base.html.py:101 templates/base.html:104
-#: templates/base.html.py:106 templates/header.html:39
-#: templates/header.html.py:41 templates/header.html:44
-#: templates/header.html.py:46
+#: colab/accounts/templates/registration/login.html:34
+#: colab/accounts/templates/registration/login.html:54
+#: colab/templates/header.html:37 colab/templates/header.html.py:39
+#: colab/templates/header.html:42 colab/templates/header.html.py:44
 msgid "Login"
 msgstr "Entrar"
-#: accounts/templates/registration/login.html:56
+#: colab/accounts/templates/registration/login.html:56
 msgid "Forgot Password?"
 msgstr "Esqueci minha Senha?"
-#: accounts/templates/registration/password_change_form_custom.html:54
-#: accounts/templates/registration/password_reset_confirm_custom.html:51
+#: colab/accounts/templates/registration/password_change_form_custom.html:54
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:51
 msgid "Change my password"
 msgstr "Alterar minha senha"
-#: accounts/templates/registration/password_reset_confirm_custom.html:3
+#: colab/accounts/templates/registration/password_reset_confirm_custom.html:3
 msgid "Setting New password"
 msgstr "Definir Nova Senha"
-#: accounts/templates/registration/password_reset_form_custom.html:23
+#: colab/accounts/templates/registration/password_reset_form_custom.html:23
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
-msgstr "Esqueceu sua senha? Digite seu email abaixo, e enviaremos instruções para redefinir sua senha."
+msgstr ""
+"Esqueceu sua senha? Digite seu email abaixo, e enviaremos instruções para "
+"redefinir sua senha."
-#: accounts/templates/registration/password_reset_form_custom.html:26
+#: colab/accounts/templates/registration/password_reset_form_custom.html:26
 msgid "Email address:"
 msgstr "Endereço de email: "
-#: accounts/templates/registration/password_reset_form_custom.html:37
+#: colab/accounts/templates/registration/password_reset_form_custom.html:37
 msgid "Reset password"
 msgstr "Redefinir senha"
-#: accounts/views.py:126
+#: colab/accounts/templates/search/user_search_preview.html:11
+#: colab/search/forms.py:19
+#: colab/search/templates/search/includes/search_filters.html:134
+#: colab/search/templates/search/includes/search_filters.html:136
+#: colab/search/templates/search/includes/search_filters.html:168
+#: colab/search/templates/search/includes/search_filters.html:169
+msgid "Since"
+msgstr "Desde"
+
+#: colab/accounts/templates/search/user_search_preview.html:12
+#, fuzzy
+#| msgid "Register"
+msgid "Registered in"
+msgstr "Cadastre-se"
+
+#: colab/accounts/templatetags/date_format.py:8
+#, python-format
+msgid "%(m)s %(d)s %(y)s"
+msgstr ""
+
+#: colab/accounts/templatetags/date_format.py:17
+#, python-format
+msgid "%(hour)s:%(min)s"
+msgstr ""
+
+#: colab/accounts/templatetags/date_format.py:19
+#, python-format
+msgid "%s at %s"
+msgstr ""
+
+#: colab/accounts/views.py:126
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
-#: accounts/views.py:186
+#: colab/accounts/views.py:186
 msgid "Your password was changed."
 msgstr "Sua senha foi modificada."
-#: accounts/views.py:202
+#: colab/accounts/views.py:202
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Sua senha foi modificada. Você já pode efetuar o login agora."
-#: home/context_processors.py:20
+#: colab/home/context_processors.py:20
 msgid "Fork me!"
 msgstr "Fork me!"
-#: plugins/gitlab/models.py:27
-msgid "Gitlab Project"
-msgstr "Projeto no Gitlab"
-
-#: plugins/gitlab/models.py:28
-msgid "Gitlab Projects"
-msgstr "Projetos no Gitlab"
-
-#: plugins/gitlab/models.py:54
-msgid "Gitlab Group"
-msgstr "Grupo no Gitlab"
-
-#: plugins/gitlab/models.py:55
-msgid "Gitlab Groups"
-msgstr "Grupos no Gitlab"
-
-#: plugins/gitlab/models.py:91
-msgid "Gitlab Merge Request"
-msgstr "Envio de Contribuição no Gitlab"
-
-#: plugins/gitlab/models.py:92
-msgid "Gitlab Merge Requests"
-msgstr "Envio de Contribuições no Gitlab"
-
-#: plugins/gitlab/models.py:120
-msgid "Gitlab Issue"
-msgstr "Tíquete no Gitlab"
-
-#: plugins/gitlab/models.py:121
-msgid "Gitlab Issues"
-msgstr "Tíquetes no Gitlab"
-
-#: plugins/gitlab/models.py:176 plugins/gitlab/models.py:177
-msgid "Gitlab Comments"
-msgstr "Comentários no Gitlab"
-
-#: plugins/noosfero/models.py:39
-msgid "Community"
-msgstr "Comunidade"
-
-#: plugins/noosfero/models.py:40
-msgid "Communities"
-msgstr "Comunidades"
-
-#: plugins/noosfero/models.py:67
-msgid "Article"
-msgstr "Artigo"
-
-#: plugins/noosfero/models.py:68
-msgid "Articles"
-msgstr "Artigos"
-
-#: rss/feeds.py:13
+#: colab/rss/feeds.py:13
 msgid "Latest Discussions"
 msgstr "Últimas discussões"
-#: rss/feeds.py:32
+#: colab/rss/feeds.py:32
 msgid "Discussions Most Relevance"
 msgstr "Discussões Mais Relevantes"
-#: rss/feeds.py:51
+#: colab/rss/feeds.py:51
 msgid "Latest collaborations"
 msgstr "Últimas colaborações"
-#: search/forms.py:16 search/templates/search/search.html:46
-#: templates/base.html:89 templates/header.html:29
+#: colab/search/forms.py:16 colab/search/templates/search/search.html:39
+#: colab/templates/header.html:27
 msgid "Search"
 msgstr "Busca"
-#: search/forms.py:18
+#: colab/search/forms.py:18
 msgid "Type"
 msgstr "Tipo"
-#: search/forms.py:19 search/views.py:20
-msgid "Author"
-msgstr "Autor"
-
-#: search/forms.py:20
-msgid "Modified by"
-msgstr "Modificado por"
-
-#: search/forms.py:22
-msgid "Status"
-msgstr "Status"
-
-#: search/forms.py:26 search/views.py:23
-msgid "Mailinglist"
-msgstr "Lista de discussão"
-
-#: search/forms.py:30
-msgid "Milestone"
-msgstr "Marco"
-
-#: search/forms.py:31
-msgid "Priority"
-msgstr "Prioridade"
-
-#: search/forms.py:32
-msgid "Component"
-msgstr "Componente"
-
-#: search/forms.py:33
-msgid "Severity"
-msgstr "Severidade"
-
-#: search/forms.py:34
-msgid "Reporter"
-msgstr "Relator"
-
-#: search/forms.py:35
-msgid "Keywords"
-msgstr "Palavras chave"
-
-#: search/forms.py:36
-msgid "Collaborators"
-msgstr "Colaboradores"
-
-#: search/forms.py:37
-msgid "Repository"
-msgstr "Repositório"
-
-#: search/forms.py:39
-msgid "Name"
-msgstr "Nome"
-
-#: search/forms.py:40
-msgid "Institution"
-msgstr "Instituição"
-
-#: search/forms.py:41
-msgid "Role"
-msgstr "Papel"
-
-#: search/forms.py:42 search/templates/search/includes/search_filters.html:132
-#: search/templates/search/includes/search_filters.html:134
-#: search/templates/search/includes/search_filters.html:166
-#: search/templates/search/includes/search_filters.html:167
-msgid "Since"
-msgstr "Desde"
-
-#: search/forms.py:43 search/templates/search/includes/search_filters.html:141
-#: search/templates/search/includes/search_filters.html:143
-#: search/templates/search/includes/search_filters.html:170
-#: search/templates/search/includes/search_filters.html:171
+#: colab/search/forms.py:20
+#: colab/search/templates/search/includes/search_filters.html:143
+#: colab/search/templates/search/includes/search_filters.html:145
+#: colab/search/templates/search/includes/search_filters.html:172
+#: colab/search/templates/search/includes/search_filters.html:173
 msgid "Until"
 msgstr "Até"
-#: search/forms.py:44
-msgid "Filename"
-msgstr "Nome do arquivo"
-
-#: search/forms.py:45
-msgid "Used by"
-msgstr "Usado por"
-
-#: search/forms.py:46
-msgid "File type"
-msgstr "Tipo do arquivo"
-
-#: search/forms.py:47
-msgid "Size"
-msgstr "Tamanho"
-
-#: search/templates/search/includes/search_filters.html:5
-#: search/templates/search/includes/search_filters.html:33
-#: search/templates/search/includes/search_filters.html:51
-#: search/templates/search/includes/search_filters.html:69
+#: colab/search/templates/search/includes/search_filters.html:5
+#: colab/search/templates/search/includes/search_filters.html:33
+#: colab/search/templates/search/includes/search_filters.html:51
+#: colab/search/templates/search/includes/search_filters.html:69
 msgid "Remove filter"
 msgstr "Remover filtro"
-#: search/templates/search/includes/search_filters.html:88
-#: search/templates/search/includes/search_filters.html:152
-#: search/templates/search/includes/search_filters.html:176
+#: colab/search/templates/search/includes/search_filters.html:88
+#: colab/search/templates/search/includes/search_filters.html:154
+#: colab/search/templates/search/includes/search_filters.html:178
 msgid "Filter"
 msgstr "Filtro"
-#: search/templates/search/includes/search_filters.html:94
+#: colab/search/templates/search/includes/search_filters.html:94
 msgid "Sort by"
 msgstr "Ordenar por"
-#: search/templates/search/includes/search_filters.html:111
+#: colab/search/templates/search/includes/search_filters.html:111
 msgid "Types"
 msgstr "Tipos"
-#: search/templates/search/includes/search_filters.html:117 search/views.py:18
-msgid "Discussion"
-msgstr "Discussão"
-
-#: search/templates/search/search.html:5
+#: colab/search/templates/search/search.html:5
 msgid "search"
 msgstr "busca"
-#: search/templates/search/search.html:51
+#: colab/search/templates/search/search.html:44
 msgid "documents found"
 msgstr "documentos encontrados"
-#: search/templates/search/search.html:62
+#: colab/search/templates/search/search.html:55
 msgid "Search here"
 msgstr "Pesquise aqui"
-#: search/templates/search/search.html:74
-#: search/templates/search/search.html:84
+#: colab/search/templates/search/search.html:67
 msgid "Filters"
 msgstr "Filtros"
-#: search/templates/search/search.html:105
+#: colab/search/templates/search/search.html:76
 msgid "No results for your search."
 msgstr "Não há resultados para sua busca."
-#: search/templates/search/search.html:107
+#: colab/search/templates/search/search.html:78
 msgid "You are searching for"
 msgstr "Você está procurando por"
-#: settings.py:113
+#: colab/settings.py:111
 msgid "English"
 msgstr "Inglês"
-#: settings.py:114
+#: colab/settings.py:112
 msgid "Portuguese"
 msgstr "Português"
-#: settings.py:115
+#: colab/settings.py:113
 msgid "Spanish"
 msgstr "Espanhol"
-#: settings.py:138
+#: colab/settings.py:136
 msgid "Recent activity"
 msgstr "Atividade recente"
-#: settings.py:142
+#: colab/settings.py:140
 msgid "Relevance"
 msgstr "Relevância"
-#: settings.py:151
+#: colab/settings.py:149
 msgid "Document"
 msgstr "Documento"
-#: settings.py:153
+#: colab/settings.py:151
 msgid "Presentation"
 msgstr "Apresentação"
-#: settings.py:154
+#: colab/settings.py:152
 msgid "Text"
 msgstr "Texto"
-#: settings.py:155
+#: colab/settings.py:153
 msgid "Code"
 msgstr "Código"
-#: settings.py:157
+#: colab/settings.py:155
 msgid "Compressed"
 msgstr "Compactado"
-#: settings.py:158
+#: colab/settings.py:156
 msgid "Image"
 msgstr "Imagem"
-#: settings.py:160
+#: colab/settings.py:158
 msgid "Spreadsheet"
 msgstr "Planilha"
-#: templates/404.html:5
+#: colab/templates/404.html:5
 msgid "Not found. Keep searching! :)"
 msgstr "Não encontrado. Continue procurando! :)"
-#: templates/500.html:2
+#: colab/templates/500.html:2
 msgid "Ooopz... something went wrong!"
 msgstr "Ooopa... algo saiu errado!"
-#: templates/base.html:83 templates/header.html:21
-msgid "Groups"
-msgstr "Grupos"
-
-#: templates/base.html:119 templates/header.html:59
-msgid "My Profile"
-msgstr "Meu Perfil"
-
-#: templates/base.html:120 templates/base.html.py:121 templates/header.html:60
-#: templates/header.html.py:61
-msgid "Logout"
-msgstr "Sair"
-
-#: templates/base.html:132 templates/base.html.py:135 templates/header.html:72
-#: templates/header.html.py:75
-msgid "Search here..."
-msgstr "Pesquise aqui..."
-
-#: templates/base.html:149
+#: colab/templates/base.html:74
 msgid "The login has failed. Please, try again."
 msgstr "O login falhou. Por favor, tente novamente."
-#: templates/footer.html:6
+#: colab/templates/footer.html:6
 msgid "Last email imported at"
 msgstr "Último email importado em"
-#: templates/footer.html:12
+#: colab/templates/footer.html:12
 msgid "The contents of this site is published under license"
 msgstr "O conteúdo deste site está publicado sob a licença"
-#: templates/footer.html:15
+#: colab/templates/footer.html:15
 msgid "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
 msgstr "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual"
-#: templates/header.html:26
-msgid "Paste"
-msgstr "Cole aqui"
+#: colab/templates/header.html:21
+msgid "Groups"
+msgstr "Grupos"
+
+#: colab/templates/header.html:57
+#| msgid "My Profile"
+msgid "My Profile"
+msgstr "Meu Perfil"
+
+#: colab/templates/header.html:58 colab/templates/header.html.py:59
+msgid "Logout"
+msgstr "Sair"
+
+#: colab/templates/header.html:70 colab/templates/header.html.py:73
+msgid "Search here..."
+msgstr "Pesquise aqui..."
-#: templates/home.html:17
+#: colab/templates/home.html:17
 msgid "Latest Collaborations"
 msgstr "Últimas Colaborações"
-#: templates/home.html:21
+#: colab/templates/home.html:21
 msgid "RSS - Latest collaborations"
 msgstr "RSS - Últimas Colaborações"
-#: templates/home.html:30
+#: colab/templates/home.html:30
 msgid "View more collaborations..."
 msgstr "Ver mais colaborações..."
-#: templates/home.html:37
+#: colab/templates/home.html:37
 msgid "Collaboration Graph"
 msgstr "Gráfico de Colaborações"
-#: templates/home.html:48
+#: colab/templates/home.html:48
 msgid "Most Relevant Threads"
 msgstr "Discussões Mais Relevantes"
-#: templates/home.html:52
+#: colab/templates/home.html:52
 msgid "RSS - Most Relevant Threads"
 msgstr "RSS - Discussões Mais Relevantes"
-#: templates/home.html:60 templates/home.html.py:79
+#: colab/templates/home.html:60 colab/templates/home.html.py:79
 msgid "View more discussions..."
 msgstr "Ver mais discussões..."
-#: templates/home.html:67
+#: colab/templates/home.html:67
 msgid "Latest Threads"
 msgstr "Últimas Discussões"
-#: templates/home.html:71
+#: colab/templates/home.html:71
 msgid "RSS - Latest Threads"
 msgstr "RSS - Últimas Discussões"
+
+#, fuzzy
+#~| msgid "Gitlab Projects"
+#~ msgid "Public Projects"
+#~ msgstr "Projetos no Gitlab"
+
+#, fuzzy
+#~| msgid "Gitlab Project"
+#~ msgid "New Project"
+#~ msgstr "Projeto no Gitlab"
+
+#, fuzzy
+#~| msgid "Gitlab Projects"
+#~ msgid "Projects"
+#~ msgstr "Projetos no Gitlab"
+
+#, fuzzy
+#~| msgid "Gitlab Issues"
+#~ msgid "Issues"
+#~ msgstr "Tíquetes no Gitlab"
+
+#, fuzzy
+#~| msgid "Gitlab Merge Requests"
+#~ msgid "Merge Requests"
+#~ msgstr "Envio de Contribuições no Gitlab"
+
+#~ msgid ""
+#~ "Please enter a correct %(username)s and password. Note that both fields "
+#~ "may be case-sensitive."
+#~ msgstr ""
+#~ "Por favor entre com um %(username)s e senha. Note que ambos os campos "
+#~ "diferenciam letras maiúsculas de minúsculas"
+
+#~ msgid "This account is inactive."
+#~ msgstr "Esta conta está inativa."
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "New password"
+#~ msgstr "Nova senha"
+
+#~ msgid "New password confirmation"
+#~ msgstr "Confirmar nova senha"
+
+#~ msgid "Your old password was entered incorrectly. Please enter it again."
+#~ msgstr "Sua senha atual está incorreta. Por favor tente novamente."
+
+#~ msgid "Old password"
+#~ msgstr "Senha atual"
+
+#~ msgid "Password (again)"
+#~ msgstr "Senha (novamente)"
+
+#~ msgid "Enter a valid username."
+#~ msgstr "Insira um nome de usuário válido."
+
+#~ msgid "Gitlab Group"
+#~ msgstr "Grupo no Gitlab"
+
+#~ msgid "Gitlab Groups"
+#~ msgstr "Grupos no Gitlab"
+
+#~ msgid "Gitlab Merge Request"
+#~ msgstr "Envio de Contribuição no Gitlab"
+
+#~ msgid "Gitlab Issue"
+#~ msgstr "Tíquete no Gitlab"
+
+#~ msgid "Gitlab Comments"
+#~ msgstr "Comentários no Gitlab"
+
+#~ msgid "Community"
+#~ msgstr "Comunidade"
+
+#~ msgid "Article"
+#~ msgstr "Artigo"
+
+#~ msgid "Articles"
+#~ msgstr "Artigos"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modified by"
+#~ msgstr "Modificado por"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Mailinglist"
+#~ msgstr "Lista de discussão"
+
+#~ msgid "Milestone"
+#~ msgstr "Marco"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridade"
+
+#~ msgid "Component"
+#~ msgstr "Componente"
+
+#~ msgid "Severity"
+#~ msgstr "Severidade"
+
+#~ msgid "Reporter"
+#~ msgstr "Relator"
+
+#~ msgid "Keywords"
+#~ msgstr "Palavras chave"
+
+#~ msgid "Collaborators"
+#~ msgstr "Colaboradores"
+
+#~ msgid "Repository"
+#~ msgstr "Repositório"
+
+#~ msgid "Used by"
+#~ msgstr "Usado por"
+
+#~ msgid "File type"
+#~ msgstr "Tipo do arquivo"
+
+#~ msgid "Size"
+#~ msgstr "Tamanho"
+
+#~ msgid "Discussion"
+#~ msgstr "Discussão"
+
+#~ msgid "Paste"
+#~ msgstr "Cole aqui"
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TimeStampPlugin',
+            fields=[
+                ('id', models.IntegerField(serialize=False, primary_key=True)),
+                ('name', models.CharField(unique=True, max_length=255)),
+                ('timestamp', models.DateTimeField(default=datetime.datetime(1, 1, 1, 0, 0), blank=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]
@@ -0,0 +1,29 @@
+from django.db import models
+from django.utils import timezone
+
+
+class TimeStampPlugin(models.Model):
+    '''
+        Class used to store timestamps from plugins
+    '''
+    id = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=255, unique=True, null=False)
+    timestamp = models.DateTimeField(default=timezone.datetime.min, blank=True)
+
+    @classmethod
+    def update_timestamp(cls, class_name, **kwargs):
+        instance = TimeStampPlugin.objects.get_or_create(name=class_name)[0]
+        last_updated = kwargs.get('last_updated', '')
+
+        if last_updated:
+            format = "%Y/%m/%d %H:%M:%S"
+            instance.timestamp = timezone.datetime.strptime(last_updated,
+                                                            format)
+        else:
+            instance.timestamp = timezone.datetime.now()
+        instance.save()
+
+    @classmethod
+    def get_last_updated(cls, class_name):
+        instance = TimeStampPlugin.objects.get_or_create(name=class_name)[0]
+        return instance.timestamp
@@ -0,0 +1,135 @@
+from mock import Mock
+
+from django.test import TestCase, Client
+from django.core.cache import cache
+
+from colab.plugins.templatetags import plugins
+from colab.accounts.models import User
+
+
+class PluginsMenuTest(TestCase):
+
+    def setUp(self):
+        self.user = self.create_user()
+        self.client = Client()
+        cache.clear()
+
+    def tearDown(self):
+        cache.clear()
+        self.client.logout()
+
+    def create_user(self):
+        user = User()
+        user.username = "USERtestCoLaB"
+        user.set_password("123colab4")
+        user.email = "usertest@colab.com.br"
+        user.id = 1
+        user.first_name = "USERtestCoLaB"
+        user.last_name = "COLAB"
+        user.save()
+
+        return user
+
+    def authenticate_user(self):
+        self.client.login(username=self.user.username,
+                          password="123colab4")
+
+    def test_plugins_menu_without_menu_urls(self):
+        self.authenticate_user()
+        plugin_1 = {'menu_title': 'myTitle', 'menu_urls': []}
+
+        test_context = {'user': self.user,
+                        'plugins': {'plugin_1': plugin_1}}
+
+        menu = plugins.plugins_menu(test_context)
+
+        self.assertEquals(menu.strip(), "")
+
+    def test_plugins_menu_with_1_menu_urls(self):
+        self.authenticate_user()
+        link = 'http://url'
+        title = 'myTitle'
+        plugin_1 = {'menu_title': title,
+                    'menu_urls': [{'url': link, 'display': 'LRU'}]}
+
+        test_context = {'user': self.user,
+                        'plugins': {'plugin_1': plugin_1}}
+
+        menu = plugins.plugins_menu(test_context)
+
+        self.assertIn(link, menu)
+        self.assertIn(title, menu)
+
+    def test_plugins_menu_with_many_menu_urls(self):
+        self.authenticate_user()
+
+        link1 = 'http://url1'
+        title1 = 'myTitle1'
+        display1 = 'LRU1'
+        link2 = 'http://url2'
+        display2 = 'LRU2'
+
+        plugin_1 = {'menu_title': title1,
+                    'menu_urls': [{'url': link1, 'display': display1},
+                                  {'url': link2, 'display': display2}]}
+
+        test_context = {'user': self.user,
+                        'plugins': {'plugin_1': plugin_1}}
+
+        menu = plugins.plugins_menu(test_context)
+
+        self.assertIn(link1, menu)
+        self.assertIn(title1, menu)
+        self.assertIn(display1, menu)
+        self.assertIn(link2, menu)
+        self.assertIn(display2, menu)
+
+    def test_plugins_menu_with_multiple_plugins(self):
+        self.authenticate_user()
+
+        link1 = 'http://url1'
+        title1 = 'myTitle1'
+        display1 = 'LRU1'
+        link2 = 'http://url2'
+        display2 = 'LRU2'
+
+        plugin_1 = {'menu_title': title1,
+                    'menu_urls': [{'url': link1, 'display': display1},
+                                  {'url': link2, 'display': display2}]}
+
+        title2 = 'myTitle2'
+        plugin_2 = {'menu_title': title2,
+                    'menu_urls': []}
+
+        test_context = {'user': self.user,
+                        'plugins': {'plugin_1': plugin_1,
+                                    'plugin_2': plugin_2}}
+
+        menu = plugins.plugins_menu(test_context)
+
+        self.assertIn(link1, menu)
+        self.assertIn(title1, menu)
+        self.assertIn(display1, menu)
+        self.assertIn(link2, menu)
+        self.assertIn(display2, menu)
+        self.assertNotIn(title2, menu)
+
+    class ColabUrlMock(Mock):
+        def auth(self):
+            return True
+
+    def test_plugins_menu_with_inactivate_user(self):
+        self.user.is_active = False
+        self.user.save()
+
+        self.authenticate_user()
+        title = 'myTitle'
+        plugin_1 = {'menu_title': title,
+                    'menu_urls': [self.ColabUrlMock()]}
+
+        test_context = {'user': self.user,
+                        'plugins': {'plugin_1': plugin_1}}
+
+        menu = plugins.plugins_menu(test_context)
+
+        self.assertEquals("", menu.strip())
@@ -0,0 +1,32 @@
+import mock
+
+from django.test import TestCase
+from django.utils import timezone
+from colab.plugins.models import TimeStampPlugin
+
+
+class UserTest(TestCase):
+
+    def test_update_timestamp_without_last_updated(self):
+        result = timezone.datetime(2009, 1, 1).replace(tzinfo=timezone.utc)
+        with mock.patch.object(timezone, 'datetime',
+                               mock.Mock(wraps=timezone.datetime)) as mock_:
+            mock_.now.return_value = result
+            TimeStampPlugin.get_last_updated('TestPluginUpdate')
+            TimeStampPlugin.update_timestamp('TestPluginUpdate')
+            timestamp = TimeStampPlugin.get_last_updated('TestPluginUpdate')
+        self.assertEquals(result, timestamp)
+
+    def test_update_timestamp_with_last_updated(self):
+        TimeStampPlugin.get_last_updated('TestPluginUpdate')
+        date = '2015/12/23 00:00:00'
+        TimeStampPlugin.update_timestamp('TestPluginUpdate', last_updated=date)
+
+        timestamp = TimeStampPlugin.get_last_updated('TestPluginUpdate')
+        result = timezone.datetime.strptime(date, "%Y/%m/%d %H:%M:%S")\
+            .replace(tzinfo=timezone.utc)
+        self.assertEquals(timestamp, result)
+
+    def test_first_get_last_update(self):
+        timestamp = TimeStampPlugin.get_last_updated('Test')
+        self.assertEqual(timezone.datetime.min, timestamp)
@@ -0,0 +1,22 @@
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from ..views import ColabProxyView
+from colab.accounts.models import User
+
+
+class ViewsTest(TestCase):
+
+    def setUp(self):
+        self.view = ColabProxyView()
+        self.factory = RequestFactory()
+        self.user = User.objects.create_user(
+            username='john', email='john@test.org', password='123',
+            first_name='John', last_name='John')
+
+    def test_dispatch_without_app_label(self):
+        request = self.factory.get('/')
+        request.user = self.user
+
+        with self.assertRaises(NotImplementedError):
+            self.view.dispatch(request, '/')
 from django.apps import AppConfig
+from ..conf import get_plugin_config
 class ColabPluginAppConfig(AppConfig):
     colab_proxied_app = True
+    namespace = None
-    def register_signals(self):
+    def __init__(self, app_name, app_module):
+        super(ColabPluginAppConfig, self).__init__(app_name, app_module)
+        self.set_namespace()
+
+    def set_namespace(self):
+        config = get_plugin_config(self.name)
+        config['urls']['namespace'] = self.namespace
+
+    def register_signal(self):
         pass
-    def connect_signals(self):
+    def connect_signal(self):
         pass
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+import importlib
+
+from django.conf import settings
+
+
+def import_plugin_filters(request):
+    plugin_filters = {}
+    for app_name in settings.INSTALLED_APPS:
+
+        module_name = '{}.filters'.format(app_name)
+        try:
+            module = importlib.import_module(module_name)
+        except ImportError:
+            continue
+
+        get_filters = getattr(module, 'get_filters', None)
+        if get_filters:
+            plugin_filters.update(get_filters(request))
+
+    return plugin_filters
@@ -0,0 +1,23 @@
+from mock import patch
+
+from django.test import TestCase
+from django.apps import AppConfig
+
+from colab.plugins.utils.apps import ColabPluginAppConfig
+
+
+class AppsTest(TestCase):
+
+    @patch.object(AppConfig, '_path_from_module')
+    @patch('colab.plugins.utils.apps.get_plugin_config')
+    def test_set_namespace(self, get_plugin_config_mock,
+                           path_from_module_mock):
+        path_from_module_mock.return_value = "/fake/path"
+
+        get_plugin_config_mock.return_value = {'urls': {}}
+        conf = get_plugin_config_mock()
+
+        ColabPluginAppConfig("test", "test_app")
+
+        self.assertIn('namespace', conf['urls'])
+        self.assertEquals(None, conf['urls']['namespace'])
@@ -76,13 +76,7 @@ class BaseIndex(indexes.SearchIndex):
         )
     def prepare_modified_by(self, obj):
-        if hasattr(obj, 'modified_by'):
-            modified_by = obj.get_modified_by()
-            if modified_by:
-                return modified_by.get_full_name()
-        if self.author_obj:
-            return self.author_obj.get_full_name()
-        return obj.author
+        return self.prepare_fullname(obj)
     def prepare_modified_by_url(self, obj):
         if hasattr(obj, 'modified_by'):
@@ -9,42 +9,25 @@ from haystack.forms import SearchForm
 from haystack.inputs import AltParser
 from haystack.inputs import AutoQuery
-from colab.super_archives.models import MailingList
+from colab.plugins.utils import filters_importer
 class ColabSearchForm(SearchForm):
     q = forms.CharField(label=_('Search'), required=False)
     order = forms.CharField(widget=forms.HiddenInput(), required=False)
     type = forms.CharField(required=False, label=_(u'Type'))
-    author = forms.CharField(required=False, label=_(u'Author'))
-    modified_by = forms.CharField(required=False, label=_(u'Modified by'))
-    # ticket status
-    tag = forms.CharField(required=False, label=_(u'Status'))
-    # mailinglist tag
-    list = forms.MultipleChoiceField(
-        required=False,
-        label=_(u'Mailinglist'),
-        choices=[(v, v) for v in MailingList.objects.values_list(
-                 'name', flat=True)]
-    )
-    milestone = forms.CharField(required=False, label=_(u'Milestone'))
-    priority = forms.CharField(required=False, label=_(u'Priority'))
-    component = forms.CharField(required=False, label=_(u'Component'))
-    severity = forms.CharField(required=False, label=_(u'Severity'))
-    reporter = forms.CharField(required=False, label=_(u'Reporter'))
-    keywords = forms.CharField(required=False, label=_(u'Keywords'))
-    collaborators = forms.CharField(required=False, label=_(u'Collaborators'))
-    repository_name = forms.CharField(required=False, label=_(u'Repository'))
-    username = forms.CharField(required=False, label=_(u'Username'))
-    name = forms.CharField(required=False, label=_(u'Name'))
-    institution = forms.CharField(required=False, label=_(u'Institution'))
-    role = forms.CharField(required=False, label=_(u'Role'))
     since = forms.DateField(required=False, label=_(u'Since'))
     until = forms.DateField(required=False, label=_(u'Until'))
-    filename = forms.CharField(required=False, label=_(u'Filename'))
-    used_by = forms.CharField(required=False, label=_(u'Used by'))
-    mimetype = forms.CharField(required=False, label=_(u'File type'))
-    size = forms.CharField(required=False, label=_(u'Size'))
+
+    excluded_fields = []
+
+    def __init__(self, *args, **kwargs):
+        super(ColabSearchForm, self).__init__(*args, **kwargs)
+        extra = filters_importer.import_plugin_filters({})
+        for filter_types in extra.values():
+            for field in filter_types['fields']:
+                self.fields[field[0]] = forms.CharField(required=False,
+                                                        label=field[1])
     def search(self):
         if not self.is_valid():
@@ -52,46 +35,22 @@ class ColabSearchForm(SearchForm):
         # filter_or goes here
         sqs = self.searchqueryset.all()
-        mimetype = self.cleaned_data['mimetype']
-        if mimetype:
-            filter_mimetypes = {'mimetype__in': []}
-            for type_, display, mimelist in settings.FILE_TYPE_GROUPINGS:
-                if type_ in mimetype:
-                    filter_mimetypes['mimetype__in'] += mimelist
-                    if not self.cleaned_data['size']:
-                        sqs = sqs.filter_or(mimetype__in=mimelist)
-
-        if self.cleaned_data['size']:
-            # (1024 * 1024) / 2
-            # (1024 * 1024) * 10
-            filter_sizes = {}
-            filter_sizes_exp = {}
-            if '<500KB' in self.cleaned_data['size']:
-                filter_sizes['size__lt'] = 524288
-            if '500KB__10MB' in self.cleaned_data['size']:
-                filter_sizes_exp['size__gte'] = 524288
-                filter_sizes_exp['size__lte'] = 10485760
-            if '>10MB' in self.cleaned_data['size']:
-                filter_sizes['size__gt'] = 10485760
-
-            if self.cleaned_data['mimetype']:
-                # Add the mimetypes filters to this dict and filter it
-                if filter_sizes_exp:
-                    filter_sizes_exp.update(filter_mimetypes)
-                    sqs = sqs.filter_or(**filter_sizes_exp)
-                for filter_or in filter_sizes.items():
-                    filter_or = dict((filter_or, ))
-                    filter_or.update(filter_mimetypes)
-                    sqs = sqs.filter_or(**filter_or)
-            else:
-                for filter_or in filter_sizes.items():
-                    filter_or = dict((filter_or, ))
-                    sqs = sqs.filter_or(**filter_or)
-                sqs = sqs.filter_or(**filter_sizes_exp)
-        if self.cleaned_data['used_by']:
-            sqs = sqs.filter_or(used_by__in=self.cleaned_data['used_by']
-                                                .split())
+        kwargs = {}
+
+        self.excluded_fields.extend(['q', 'type', 'since', 'until', 'order'])
+
+        if self.cleaned_data['type']:
+            all_types = self.cleaned_data['type'].split(' ')
+            sqs = sqs.filter_or(type__in=all_types)
+
+        for key in self.fields.keys():
+            value = self.cleaned_data[key]
+            if value and key not in self.excluded_fields:
+                print key, '-' + value
+                kwargs[key] = self.cleaned_data[key]
+
+        sqs = sqs.filter(**kwargs)
         if self.cleaned_data['q']:
             q = unicodedata.normalize(
@@ -115,62 +74,15 @@ class ColabSearchForm(SearchForm):
             else:
                 sqs = sqs.filter(content=AutoQuery(q))
-        if self.cleaned_data['type']:
-            sqs = sqs.filter(type=self.cleaned_data['type'])
-
         if self.cleaned_data['order']:
             for option, dict_order in settings.ORDERING_DATA.items():
                 if self.cleaned_data['order'] == option:
                     if dict_order['fields']:
                         sqs = sqs.order_by(*dict_order['fields'])
-        if self.cleaned_data['author']:
-            sqs = sqs.filter(
-                fullname_and_username__contains=self.cleaned_data['author']
-            )
-
-        if self.cleaned_data['modified_by']:
-            modified_by_data = self.cleaned_date['modified_by']
-            sqs = sqs.filter(
-                fullname_and_username__contains=modified_by_data
-            )
-
-        if self.cleaned_data['milestone']:
-            sqs = sqs.filter(milestone=self.cleaned_data['milestone'])
-        if self.cleaned_data['priority']:
-            sqs = sqs.filter(priority=self.cleaned_data['priority'])
-        if self.cleaned_data['severity']:
-            sqs = sqs.filter(severity=self.cleaned_data['severity'])
-        if self.cleaned_data['reporter']:
-            sqs = sqs.filter(reporter=self.cleaned_data['reporter'])
-        if self.cleaned_data['keywords']:
-            sqs = sqs.filter(keywords=self.cleaned_data['keywords'])
-        if self.cleaned_data['collaborators']:
-            sqs = sqs.filter(collaborators=self.cleaned_data['collaborators'])
-        if self.cleaned_data['repository_name']:
-            sqs = sqs.filter(
-                repository_name=self.cleaned_data['repository_name']
-            )
-        if self.cleaned_data['username']:
-            sqs = sqs.filter(username=self.cleaned_data['username'])
-        if self.cleaned_data['name']:
-            sqs = sqs.filter(name=self.cleaned_data['name'])
-        if self.cleaned_data['institution']:
-            sqs = sqs.filter(institution=self.cleaned_data['institution'])
-        if self.cleaned_data['role']:
-            sqs = sqs.filter(role=self.cleaned_data['role'])
-        if self.cleaned_data['tag']:
-            sqs = sqs.filter(tag=self.cleaned_data['tag'])
-
-        if self.cleaned_data['list']:
-            sqs = sqs.filter(tag__in=self.cleaned_data['list'])
-
         if self.cleaned_data['since']:
             sqs = sqs.filter(modified__gte=self.cleaned_data['since'])
         if self.cleaned_data['until']:
             sqs = sqs.filter(modified__lte=self.cleaned_data['until'])
-        if self.cleaned_data['filename']:
-            sqs = sqs.filter(filename=self.cleaned_data['filename'])
-
         return sqs
@@ -0,0 +1,3 @@
+{% load i18n tz highlight search_preview_templates %}
+{% get_dashboard_search_preview_templates result  as template_target %}
+{% include template_target %}
@@ -0,0 +1,3 @@
+{% load i18n tz highlight search_preview_templates %}
+{% get_search_preview_templates result  as template_target %}
+{% include template_target %}
@@ -16,12 +16,12 @@
     <input type="hidden" name="since" value="{{ request.GET.since }}" />
     <input type="hidden" name="until" value="{{ request.GET.until }}" />
-    {% for field_lookup, field_display, field_value in filters.fields %}
+    {% for field_lookup, field_display, field_value, field_type, field_choices in filters.fields %}
       <div class="form-group">
         <label for="{{ field_lookup }}">{{ field_display }}</label>
-        {% if field_lookup == "list" %}
+        {% if field_type == "list" %}
           <select name="{{ field_lookup }}" class="form-control" multiple>
-            {% for value, option in form.fields.list.choices %}
+            {% for value, option in field_choices %}
               <option value="{{ value }}" {% if value in field_value %}selected{% endif %}>{{ option }}</option>
             {% endfor %}
           </select>
@@ -112,10 +112,12 @@
   <ul class="unstyled-list">
-    <li>
-      <span class="glyphicon glyphicon-envelope"></span>
-      <a href="{% append_to_get type='thread' %}">{% trans "Discussion" %}</a>
-    </li>
+      {% for type, name, icon in filters_options %}
+      <li>
+        <span class="glyphicon glyphicon-{{icon}}"></span>
+        <a href="{% append_to_get type=type %}">{% trans name %}</a>
+      </li>
+      {% endfor %}
   </ul>
 {% endif %}
 <hr />
@@ -25,13 +25,6 @@ We must use STATIC_URL because we have a language composing the URL
       {% endif %}
     });
-    $('#collapseFilters').on('hide.bs.collapse', function() {
-      $('.collapse-icon-controller').toggleClass('glyphicon-collapse-down glyphicon-collapse-up');
-    });
-    $('#collapseFilters').on('show.bs.collapse', function() {
-      $('.collapse-icon-controller').toggleClass('glyphicon-collapse-down glyphicon-collapse-up');
-    });
-
   });
 </script>
 {% endblock %}
@@ -74,28 +67,6 @@ We must use STATIC_URL because we have a language composing the URL
       <h3>{% trans "Filters" %}</h3>
       {% include "search/includes/search_filters.html" %}
     </div>
-
-    <div class="col-xs-12 col-sm-12 hidden-md hidden-lg">
-      <div class="panel-group" id="accordion">
-        <div class="panel panel-default">
-          <div class="panel-heading subject">
-            <a data-toggle="collapse" data-parent="#accordion" href="#collapseFilters">
-              <h4 class="panel-title">
-                {% trans "Filters" %}
-                <span class="glyphicon glyphicon-collapse-down pull-right collapse-icon-controller"></span>
-              </h4>
-            </a>
-          </div>
-          <div id="collapseFilters" class="panel-collapse collapse">
-            <div class="panel-body">
-              {% include "search/includes/search_filters.html" %}
-            </div>
-          </div>
-        </div>
-      </div>
-      <hr />
-    </div>
-  
     <div class="col-md-10 col-lg-10">
       <ul class="list-unstyled">
       {% for result in page.object_list  %}
@@ -0,0 +1,18 @@
+from django import template
+
+
+register = template.Library()
+
+
+@register.assignment_tag
+def get_search_preview_templates(model_indexed):
+    app_type = model_indexed.type
+
+    return "search/{}_search_preview.html".format(app_type)
+
+
+@register.assignment_tag
+def get_dashboard_search_preview_templates(model_indexed):
+    app_type = model_indexed.type
+
+    return "dashboard/{}_search_preview.html".format(app_type)
@@ -1,59 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from django.test import TestCase,  Client
-from django.core.management import call_command
-
-
-class SearchViewTest(TestCase):
-
-    fixtures = ['test_data.json']
-
-    def setUp(self):
-        call_command('rebuild_index', interactive=False, verbosity=0)
-        self.client = Client()
-
-    def tearDown(self):
-        call_command('clear_index', interactive=False, verbosity=0)
-
-    def test_search_thread(self):
-        request = self.client.get('/search/?q=thread')
-        thread_list = request.context['page'].object_list
-
-        self.assertEqual(3,  len(thread_list))
-
-        condition = any('This is a repply to Thread 1 on list A' in
-                        t.description for t in thread_list)
-        self.assertTrue(condition)
-        condition = any('This is a repply to Thread 1 on list B' in
-                        t.description for t in thread_list)
-        self.assertTrue(condition)
-        condition = any('This is a repply to Thread 1 on list C' in
-                        t.description for t in thread_list)
-        self.assertTrue(condition)
-
-    def test_search_account_by_firstName(self):
-        request = self.client.get('/search/?q=Chuck')
-        user_list = request.context['page'].object_list
-
-        self.assertEqual(1, len(user_list))
-
-        self.assertIn('chucknorris@mail.com',  user_list[0].object.email)
-        self.assertIn('Chuck',  user_list[0].object.first_name)
-        self.assertIn('Norris',  user_list[0].object.last_name)
-        self.assertIn('chucknorris',  user_list[0].object.username)
-
-    def test_search_account_by_lastName(self):
-        request = self.client.get('/search/?q=Norris')
-        user_list = request.context['page'].object_list
-
-        self.assertEqual(2, len(user_list))
-
-        self.assertIn('heisenberg@mail.com',  user_list[1].object.email)
-        self.assertIn('Heisenberg',  user_list[1].object.first_name)
-        self.assertIn('Norris',  user_list[1].object.last_name)
-        self.assertIn('heisenbergnorris',  user_list[1].object.username)
-
-        self.assertIn('chucknorris@mail.com',  user_list[0].object.email)
-        self.assertIn('Chuck',  user_list[0].object.first_name)
-        self.assertIn('Norris',  user_list[0].object.last_name)
-        self.assertIn('chucknorris',  user_list[0].object.username)
@@ -0,0 +1,106 @@
+# -*- coding:utf-8 -*-
+
+import math
+from mock import Mock
+
+from django.test import TestCase,  Client
+from colab.search.base_indexes import BaseIndex
+
+
+class SearchViewTest(TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+    def tearDown(self):
+        pass
+
+    def test_get_updated_field(self):
+        base_index = BaseIndex()
+
+        self.assertEquals('modified', base_index.get_updated_field())
+
+    def test_get_boost(self):
+        obj = Mock(hits=10)
+        base_index = BaseIndex()
+
+        self.assertEquals(1, base_index.get_boost(obj))
+
+        obj = Mock(hits=11)
+        self.assertEquals(math.log(11), base_index.get_boost(obj))
+
+    def test_prepare_author(self):
+        obj = Mock(author="author")
+        base_index = BaseIndex()
+        setattr(base_index, 'author_obj', None)
+
+        self.assertEquals("author", base_index.prepare_author(obj))
+
+        base_index.author_obj = Mock(username="carlin")
+        self.assertEquals("carlin", base_index.prepare_author(obj))
+
+    def test_prepare_author_url(self):
+        base_index = BaseIndex()
+        setattr(base_index, 'author_obj', None)
+
+        self.assertEquals(None, base_index.prepare_author_url(None))
+
+        base_index.author_obj = Mock(get_absolute_url=lambda: "url_test")
+        self.assertEquals("url_test", base_index.prepare_author_url(None))
+
+    class AuthorMockObject:
+        author = "author"
+
+    def test_prepare_modified_by(self):
+        base_index = BaseIndex()
+        setattr(base_index, 'author_obj', None)
+        obj = self.AuthorMockObject()
+
+        self.assertEquals("author", base_index.prepare_modified_by(obj))
+
+        base_index.author_obj = Mock(get_full_name=lambda: "full_name")
+        self.assertEquals("full_name", base_index.prepare_modified_by(obj))
+
+        mock_modified_by = Mock(get_full_name=lambda: "full_name")
+        obj = Mock(modified_by="somebody",
+                   get_modified_by=lambda: mock_modified_by)
+
+        self.assertEquals("full_name", base_index.prepare_modified_by(obj))
+
+    def test_prepare_fullname_and_username(self):
+        base_index = BaseIndex()
+        setattr(base_index, 'author_obj', Mock(username="user",
+                                               get_full_name=lambda: "name"))
+
+        expected = "{}\n{}".format("name", "user")
+        self.assertEquals(expected,
+                          base_index.prepare_fullname_and_username(None))
+
+        base_index.author_obj = None
+        obj = self.AuthorMockObject()
+        self.assertEquals("author",
+                          base_index.prepare_fullname_and_username(obj))
+
+        mock_modified_by = Mock(get_full_name=lambda: "full_name",
+                                username="user")
+        obj = Mock(modified_by="somebody",
+                   get_modified_by=lambda: mock_modified_by)
+
+        expected = "{}\n{}".format("full_name", "user")
+        self.assertEquals(expected,
+                          base_index.prepare_fullname_and_username(obj))
+
+    def test_prepare_modified_by_url(self):
+        base_index = BaseIndex()
+        setattr(base_index, 'author_obj', None)
+
+        self.assertEquals(None, base_index.prepare_modified_by_url(None))
+
+        base_index.author_obj = Mock(get_absolute_url=lambda: "urlurl")
+        self.assertEquals("urlurl", base_index.prepare_modified_by_url(None))
+
+        mock_modified_by = Mock(get_absolute_url=lambda: "urlurl")
+        obj = Mock(modified_by="somebody",
+                   get_modified_by=lambda: mock_modified_by)
+
+        self.assertEquals("urlurl", base_index.prepare_modified_by_url(obj))
@@ -0,0 +1,130 @@
+# -*- coding:utf-8 -*-
+
+import mock
+
+from colab.plugins.utils import filters_importer
+from django.test import TestCase,  Client
+from django.core.management import call_command
+from colab.search.forms import ColabSearchForm
+
+
+class SearchViewTest(TestCase):
+
+    fixtures = ['test_data.json']
+
+    def setUp(self):
+        call_command('rebuild_index', interactive=False, verbosity=0)
+        self.client = Client()
+
+    def tearDown(self):
+        call_command('clear_index', interactive=False, verbosity=0)
+
+    def test_search_thread(self):
+        request = self.client.get('/search/?q=thread')
+        thread_list = request.context['page'].object_list
+
+        self.assertEqual(3,  len(thread_list))
+
+        condition = any('This is a repply to Thread 1 on list A' in
+                        t.description for t in thread_list)
+        self.assertTrue(condition)
+        condition = any('This is a repply to Thread 1 on list B' in
+                        t.description for t in thread_list)
+        self.assertTrue(condition)
+        condition = any('This is a repply to Thread 1 on list C' in
+                        t.description for t in thread_list)
+        self.assertTrue(condition)
+
+    def test_search_account_by_firstName(self):
+        request = self.client.get('/search/?q=Chuck')
+        user_list = request.context['page'].object_list
+
+        self.assertEqual(1, len(user_list))
+
+        self.assertIn('chucknorris@mail.com',  user_list[0].object.email)
+        self.assertIn('Chuck',  user_list[0].object.first_name)
+        self.assertIn('Norris',  user_list[0].object.last_name)
+        self.assertIn('chucknorris',  user_list[0].object.username)
+
+    def test_search_account_by_lastName(self):
+        request = self.client.get('/search/?q=Norris')
+        user_list = request.context['page'].object_list
+
+        self.assertEqual(2, len(user_list))
+
+        self.assertIn('heisenberg@mail.com',  user_list[1].object.email)
+        self.assertIn('Heisenberg',  user_list[1].object.first_name)
+        self.assertIn('Norris',  user_list[1].object.last_name)
+        self.assertIn('heisenbergnorris',  user_list[1].object.username)
+
+        self.assertIn('chucknorris@mail.com',  user_list[0].object.email)
+        self.assertIn('Chuck',  user_list[0].object.first_name)
+        self.assertIn('Norris',  user_list[0].object.last_name)
+        self.assertIn('chucknorris',  user_list[0].object.username)
+
+    def test_search_plugin_filters(self):
+        plugin_filter = {
+            'plugin_name': {
+                'name': 'PluginData',
+                'icon': 'plugin_icon',
+                'fields': (
+                    ('field_1', 'Field1', ''),
+                    ('field_2', 'Field2', ''),
+                ),
+            },
+        }
+        filters_importer.import_plugin_filters = mock.Mock(
+            return_value=plugin_filter)
+
+        request = self.client.get('/search/?q=')
+
+        value = [('plugin_name', 'PluginData', 'plugin_icon')]
+
+        self.assertEqual(request.context['filters_options'], value)
+
+    def test_search_dynamic_form_fields(self):
+        plugin_filter = {
+            'plugin_name': {
+                'name': 'PluginData',
+                'icon': 'plugin_icon',
+                'fields': (
+                    ('field_1', 'Field1', ''),
+                    ('field_2', 'Field2', ''),
+                ),
+            },
+        }
+        filters_importer.import_plugin_filters = mock.Mock(
+            return_value=plugin_filter)
+
+        form = ColabSearchForm()
+
+        self.assertIn('field_1', form.fields.keys())
+        self.assertIn('field_2', form.fields.keys())
+
+    def test_search_multiple_filters(self):
+        request = self.client.get('/search/?q=&type=thread+user')
+        user_list = request.context['page'].object_list
+
+        self.assertEqual(6, len(user_list))
+
+        self.assertIn('admin@mail.com',  user_list[0].object.email)
+        self.assertIn('admin',  user_list[0].object.username)
+
+        self.assertIn('chucknorris@mail.com',  user_list[1].object.email)
+        self.assertIn('Chuck',  user_list[1].object.first_name)
+        self.assertIn('Norris',  user_list[1].object.last_name)
+        self.assertIn('chucknorris',  user_list[1].object.username)
+
+        self.assertIn('heisenberg@mail.com',  user_list[2].object.email)
+        self.assertIn('Heisenberg',  user_list[2].object.first_name)
+        self.assertIn('Norris',  user_list[2].object.last_name)
+        self.assertIn('heisenbergnorris',  user_list[2].object.username)
+
+        self.assertIn('Admin Administrator',  user_list[3].author)
+        self.assertIn('Response to Thread 1A',  user_list[3].title)
+
+        self.assertIn('Admin Administrator',  user_list[4].author)
+        self.assertIn('Message 1 on Thread 1B',  user_list[4].title)
+
+        self.assertIn('Admin Administrator',  user_list[5].author)
+        self.assertIn('Message 1 on Thread 1C',  user_list[5].title)
@@ -0,0 +1,34 @@
+# -*- coding:utf-8 -*-
+
+from django.test import TestCase
+from colab.search.templatetags.search_preview_templates import (
+    get_search_preview_templates)
+from mock import MagicMock, PropertyMock
+
+
+class SearchTemplateTagsTest(TestCase):
+
+    def setUp(self):
+        self.model_indexed_mock = MagicMock()
+        self.template_path = "{}/{}_search_preview.html"
+
+    def set_mock_value(self, value):
+        type(self.model_indexed_mock).type = PropertyMock(return_value=value)
+
+    def test_get_search_preview_templates_with_user(self):
+        self.set_mock_value("user")
+        include_path = get_search_preview_templates(self.model_indexed_mock)
+        self.assertEqual(include_path, self.template_path.format("search",
+                                                                 "user"))
+
+    def test_get_search_preview_templates_with_thread(self):
+        self.set_mock_value("thread")
+        include_path = get_search_preview_templates(self.model_indexed_mock)
+        self.assertEqual(include_path,
+                         self.template_path.format("search", "thread"))
+
+    def test_get_search_preview_templates_with_plugin(self):
+        self.set_mock_value("plugin_model")
+        include_path = get_search_preview_templates(self.model_indexed_mock)
+        self.assertEqual(include_path,
+                         self.template_path.format("search", "plugin_model"))
 # -*- coding:utf-8 -*-
 from django.conf import settings
-from django.utils.translation import ugettext as _
 from haystack.views import SearchView
+from colab.plugins.utils import filters_importer
 class ColabSearchView(SearchView):
@@ -13,127 +13,6 @@ class ColabSearchView(SearchView):
             self.request.LANGUAGE_CODE, (None, None)
         )
-        types = {
-            'thread': {
-                'name': _(u'Discussion'),
-                'fields': (
-                    ('author', _(u'Author'), self.request.GET.get('author')),
-                    (
-                        'list',
-                        _(u'Mailinglist'),
-                        self.request.GET.getlist('list')
-                    ),
-                ),
-            },
-        }
-        # TODO: Replace for a more generic plugin architecture
-        # if settings.TRAC_ENABLED:
-        #     types['wiki'] = {
-        #         'name': _(u'Wiki'),
-        #         'fields': (
-        #             ('author', _(u'Author'), self.request.GET.get('author')),
-        #             (
-        #                 'collaborators',
-        #                 _(u'Collaborators'),
-        #                 self.request.GET.get('collaborators'),
-        #             ),
-        #         ),
-        #     }
-
-        #     types['ticket'] = {
-        #         'name': _(u'Ticket'),
-        #         'fields': (
-        #             (
-        #                 'milestone',
-        #                 _(u'Milestone'),
-        #                 self.request.GET.get('milestone')
-        #             ),
-        #             (
-        #                 'priority',
-        #                 _(u'Priority'),
-        #                 self.request.GET.get('priority')
-        #             ),
-        #             (
-        #                 'component',
-        #                 _(u'Component'),
-        #                 self.request.GET.get('component')
-        #             ),
-        #             (
-        #                 'severity',
-        #                 _(u'Severity'),
-        #                 self.request.GET.get('severity')
-        #             ),
-        #             (
-        #                 'reporter',
-        #                 _(u'Reporter'),
-        #                 self.request.GET.get('reporter')
-        #             ),
-        #             ('author', _(u'Author'), self.request.GET.get('author')),
-        #             ('tag', _(u'Status'), self.request.GET.get('tag')),
-        #             (
-        #                 'keywords',
-        #                 _(u'Keywords'),
-        #                 self.request.GET.get('keywords'),
-        #             ),
-        #             (
-        #                 'collaborators',
-        #                 _(u'Collaborators'),
-        #                 self.request.GET.get('collaborators')
-        #             ),
-        #         ),
-        #     }
-
-        #     types['changeset'] = {
-        #         'name': _(u'Changeset'),
-        #         'fields': (
-        #             ('author', _(u'Author'), self.request.GET.get('author')),
-        #             (
-        #                 'repository_name',
-        #                 _(u'Repository'),
-        #                 self.request.GET.get('repository_name'),
-        #             ),
-        #         )
-        #     }
-
-        #     types['user'] = {
-        #         'name': _(u'User'),
-        #         'fields': (
-        #             (
-        #                 'username',
-        #                 _(u'Username'),
-        #                 self.request.GET.get('username'),
-        #             ),
-        #             ('name', _(u'Name'), self.request.GET.get('name')),
-        #             (
-        #                 'institution',
-        #                 _(u'Institution'),
-        #                 self.request.GET.get('institution'),
-        #             ),
-        #             ('role', _(u'Role'), self.request.GET.get('role'))
-        #         ),
-        #     }
-
-        #     types['attachment'] = {
-        #         'name': _(u'Attachment'),
-        #         'fields': (
-        #             (
-        #                 'filename',
-        #                 _(u'Filename'),
-        #                 self.request.GET.get('filename')
-        #             ),
-        #             ('author', _(u'Author'), self.request.GET.get('author')),
-        #             (
-        #                 'used_by',
-        #                 _(u'Used by'), self.request.GET.get('used_by')),
-        #             (
-        #                 'mimetype',
-        #                 _(u'File type'),
-        #                 self.request.GET.get('mimetype')
-        #             ),
-        #             ('size', _(u'Size'), self.request.GET.get('size')),
-        #         )
-        #     }
-
         try:
             type_chosen = self.form.cleaned_data.get('type')
         except AttributeError:
@@ -143,26 +22,17 @@ class ColabSearchView(SearchView):
         size_choices = ()
         used_by_choices = ()
-        # if type_chosen == 'attachment':
-        #     mimetype_choices = [
-        #         (type_, display)
-        #        for type_, display, mimelist_ in settings.FILE_TYPE_GROUPINGS]
-        #     size_choices = [
-        #         ('<500KB', u'< 500 KB'),
-        #         ('500KB__10MB', u'>= 500 KB <= 10 MB'),
-        #         ('>10MB', u'> 10 MB'),
-        #     ]
-        #     used_by_choices = set([
-        #         (v, v) for v in Attachment.objects.values_list('used_by',
-        #                                                        flat=True)
-        #     ])
-
         mimetype_chosen = self.request.GET.get('mimetype')
         size_chosen = self.request.GET.get('size')
         used_by_chosen = self.request.GET.get('used_by')
+        types = filters_importer.import_plugin_filters(self.request.GET)
+
+        filters_options = [(k, v['name'], v['icon'])
+                           for (k, v) in types.iteritems()]
         return dict(
             filters=types.get(type_chosen),
+            filters_options=filters_options,
             type_chosen=type_chosen,
             order_data=settings.ORDERING_DATA,
             date_format=date_format,
@@ -53,6 +53,7 @@ INSTALLED_APPS = (
     'colab',
     'colab.home',
     'colab.plugins',
+    'colab.widgets',
     'colab.super_archives',
     'colab.rss',
     'colab.search',
@@ -80,11 +81,8 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
-STATIC_ROOT = '/usr/share/nginx/colab/static/'
-MEDIA_ROOT = '/usr/share/nginx/colab/media/'
-
+STATIC_ROOT = '/var/lib/colab/static/'
 STATIC_URL = '/static/'
-MEDIA_URL = '/media/'
 STATICFILES_STORAGE = \
     'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
@@ -134,7 +132,7 @@ ATTACHMENTS_FOLDER_PATH = &#39;/mnt/trac/attachments/&#39;
 # the indexes
 ORDERING_DATA = {
-    'latest':  {
+    'latest': {
         'name': _(u'Recent activity'),
         'fields': ('-modified', '-created'),
     },
@@ -142,6 +140,10 @@ ORDERING_DATA = {
         'name': _(u'Relevance'),
         'fields': None,
     },
+    'type': {
+        'name': _(u'Type'),
+        'fields': ('type',),
+    }
 }
@@ -293,3 +295,5 @@ TEMPLATE_DIRS += (
 )
 conf.validate_database(DATABASES, DEFAULT_DATABASE, DEBUG)
+
+conf.load_widgets_settings()
@@ -0,0 +1,46 @@
+/* Header */
+
+#header-searchbox {
+    width: 190px;
+}
+
+#header-hr {
+    margin-top: 0;
+}
+
+.navbar-default .navbar-brand,
+.navbar a.dropdown-toggle.user {
+    padding: 0;
+    margin-top: 5px;
+    margin-left: 10px;
+}
+
+.navbar-brand img {
+    height: 40px;
+}
+
+#user-menu .wrapper {
+    padding: 3px 10px;
+    white-space: nowrap;
+}
+
+#user-menu .wrapper a {
+    margin: 5px 0;
+}
+
+#user-menu .user-info {
+    display: inline-block;
+    vertical-align: top;
+    padding-left: 5px;
+}
+
+#user-menu .user-info span {
+    display: block;
+}
+
+#user-menu .dropdown-menu .thumbnail {
+    width: 100px;
+    display: inline-block;
+}
+
+/* End of Header */
 \ No newline at end of file
@@ -7,54 +7,6 @@ li hr {
     margin: 10px 0;
 }
-/* Header */
-
-#header-searchbox {
-    width: 190px;
-}
-
-#header-hr {
-    margin-top: 0;
-}
-
-.navbar-default .navbar-brand,
-.navbar a.dropdown-toggle.user {
-    padding: 0;
-    margin-top: 5px;
-    margin-left: 10px;
-}
-
-.navbar-brand img {
-    height: 40px;
-}
-
-#user-menu .wrapper {
-    padding: 3px 10px;
-    white-space: nowrap;
-}
-
-#user-menu .wrapper a {
-    margin: 5px 0;
-}
-
-#user-menu .user-info {
-    display: inline-block;
-    vertical-align: top;
-    padding-left: 5px;
-}
-
-#user-menu .user-info span {
-    display: block;
-}
-
-#user-menu .dropdown-menu .thumbnail {
-    width: 80px;
-    display: inline-block;
-}
-
-/* End of Header */
-
-
 /* From message-preview.html*/
 .quiet {
     color: #999;
@@ -115,6 +67,11 @@ form.signup .form-group {
     margin-left: 0.5em;
 }
+div.links-group {
+    text-align: center;
+    margin-bottom: 20px;
+}
+
 div.submit {
     margin: auto;
     margin-bottom: 2em;
@@ -0,0 +1,22 @@
+from django.utils.translation import ugettext as _
+from colab.super_archives.models import MailingList
+
+
+def get_filters(request):
+    return {
+        'thread': {
+            'name': _(u'Discussion'),
+            'icon': 'envelope',
+            'fields': (
+                ('author', _(u'Author'), request.get('author')),
+                (
+                    'tag',
+                    _(u'Mailinglist'),
+                    request.get('tag'),
+                    'list',
+                    [(v, v) for v in MailingList.objects.values_list(
+                        'name', flat=True)]
+                ),
+            ),
+        },
+    }
@@ -0,0 +1,100 @@
+[
+    {
+      "fields": {
+        "last_name": "Administrator",
+        "webpage": "",
+        "twitter": "",
+        "is_staff": true,
+        "user_permissions": [],
+        "date_joined": "2015-01-28T12:34:58.770Z",
+        "google_talk": "",
+        "first_name": "Admin",
+        "is_superuser": true,
+        "last_login": "2015-01-28T12:35:39.621Z",
+        "verification_hash": null,
+        "role": "",
+        "email": "admin@mail.com",
+        "username": "admin",
+        "bio": "",
+        "needs_update": true,
+        "is_active": true,
+        "facebook": "",
+        "groups": [],
+        "password": "pbkdf2_sha256$12000$iiKCMnLZnFJw$UTx89LB8oYTiw9UqkcglzFLmIaZtbr+ZzF1cG3vfcyo=",
+        "institution": "",
+        "github": "",
+        "modified": "2015-01-28T12:45:27.375Z"
+      },
+      "model": "accounts.user",
+      "pk": 1
+    },
+    {
+      "fields": {
+        "last_name": "Norris",
+        "webpage": "",
+        "twitter": "",
+        "is_staff": true,
+        "user_permissions": [],
+        "date_joined": "2015-01-28T12:34:58.770Z",
+        "google_talk": "",
+        "first_name": "Chuck",
+        "is_superuser": true,
+        "last_login": "2015-01-28T12:35:39.621Z",
+        "verification_hash": null,
+        "role": "",
+        "email": "chucknorris@mail.com",
+        "username": "chucknorris",
+        "bio": "",
+        "needs_update": true,
+        "is_active": true,
+        "facebook": "",
+        "groups": [],
+        "password": "123colab4",
+        "institution": "",
+        "github": "",
+        "modified": "2015-01-28T12:45:27.375Z"
+      },
+      "model": "accounts.user",
+      "pk": 2
+    },
+
+    {
+      "fields": {
+        "last_name": "Norris",
+        "webpage": "",
+        "twitter": "",
+        "is_staff": true,
+        "user_permissions": [],
+        "date_joined": "2015-01-28T12:34:58.770Z",
+        "google_talk": "",
+        "first_name": "Heisenberg",
+        "is_superuser": true,
+        "last_login": "2015-01-28T12:35:39.621Z",
+        "verification_hash": null,
+        "role": "",
+        "email": "heisenberg@mail.com",
+        "username": "heisenbergnorris",
+        "bio": "",
+        "needs_update": true,
+        "is_active": true,
+        "facebook": "",
+        "groups": [],
+        "password": "pbkdf2_sha256$12000$iiKCMnLZnFJw$UTx89LB8oYTiw9UqkcglzFLmIaZtbr+ZzF1cG3vfcyo=",
+        "institution": "",
+        "github": "",
+        "modified": "2015-01-28T12:45:27.375Z"
+      },
+      "model": "accounts.user",
+      "pk": 3
+    },
+    {
+      "fields": {
+        "real_name": "Administrator",
+        "user": 1,
+        "md5": "edb0e96701c209ab4b50211c856c50c4",
+        "address": "admin@mail.com"
+      },
+      "model": "super_archives.emailaddress",
+      "pk": 1
+    }
+]
@@ -117,7 +117,7 @@ class Command(BaseCommand, object):
         # Get messages from each mbox
         for mbox in mailing_lists_mboxes:
             mbox_path = os.path.join(mailinglist_dir, mbox, mbox)
-            mailinglist_name = mbox.split('.')[0]
+            mailinglist_name = os.path.splitext(mbox)[0]
             # Check if the mailinglist is set not to be imported
             if exclude_lists and mailinglist_name in exclude_lists:
@@ -0,0 +1,69 @@
+{% load i18n tz highlight %}
+
+<li class="preview-message">
+<span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
+
+{% if result.tag %}
+<a href="{% firstof result.mailinglist_url result.mailinglist.get_absolute_url result.url %}">
+  <span class="label label-primary">{{ result.tag }}</span>
+</a>
+{% endif %}
+
+{% if result.title %}
+  <a href="{{ result.url }}{% if result.type == 'thread' and result.latest_message_pk %}#msg-{{ result.latest_message_pk }}{% elif result.type == 'thread' and result.pk %}#msg-{{ result.pk }}{% endif %}" {% if result.latest_description %}title="{{ result.latest_description|escape|truncatechars:150 }}"{% elif result.description %}title="{{ result.description|escape|truncatechars:150 }}"{% endif %}>
+    <span class="subject">
+      <!-- a striptags filter was raising an error here because using with highlight -->
+      {% if query %}
+        {% highlight result.title with query max_length "1000" %}
+      {% else %}
+        {{ result.title }}
+      {% endif %}
+    </span>
+  </a>
+{% endif %}
+
+{% if result.description %}
+      <!-- a striptags filter was raising an error here because using with highlight -->
+  <span class="quiet">- {% if query %}
+    {% highlight result.description with query max_length "150" %}
+  {% else %}
+    {% if result.latest_description %}
+      {{ result.latest_description|striptags|escape|truncatechars:150 }}
+    {% elif result.description %}
+      {{ result.description|striptags|escape|truncatechars:150 }}
+    {% endif %}
+  {% endif %}
+  </span>
+{% endif %}
+
+{% if result.fullname or result.modified or result.modified_by %}
+  <div class="quiet">
+    {% if result.modified_by %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.modified_by_url %}
+          <a href="{{ result.modified_by_url }}">
+        {% else %}
+          <span>
+        {% endif %}
+
+        {% if query %}
+          {% highlight result.modified_by with query %}
+        {% else %}
+          {{ result.modified_by }}
+        {% endif %}
+
+        {% if result.modified_by_url %}
+          </a>
+        {% else %}
+          </span>
+        {% endif %}
+      </span>
+    {% else %}
+      <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
+    {% endif %}
+    {% if result.modified %}
+      <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span>
+    {% endif %}
+  </div>
+{% endif %}
+</li>
 \ No newline at end of file
@@ -1,69 +0,0 @@
-{% load i18n tz highlight %}
-
-<li class="preview-message">
-<span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
-
-{% if result.tag %}
-<a href="{% firstof result.mailinglist_url result.mailinglist.get_absolute_url result.url %}">
-  <span class="label label-primary">{{ result.tag }}</span>
-</a>
-{% endif %}
-
-{% if result.title %}
-  <a href="{{ result.url }}{% if result.type == 'thread' and result.latest_message_pk %}#msg-{{ result.latest_message_pk }}{% elif result.type == 'thread' and result.pk %}#msg-{{ result.pk }}{% endif %}" {% if result.latest_description %}title="{{ result.latest_description|escape|truncatechars:150 }}"{% elif result.description %}title="{{ result.description|escape|truncatechars:150 }}"{% endif %}>
-    <span class="subject">
-      <!-- a striptags filter was raising an error here because using with highlight -->
-      {% if query %}
-        {% highlight result.title with query max_length "1000" %}
-      {% else %}
-        {{ result.title }}
-      {% endif %}
-    </span>
-  </a>
-{% endif %}
-
-{% if result.description %}
-      <!-- a striptags filter was raising an error here because using with highlight -->
-  <span class="quiet">- {% if query %}
-    {% highlight result.description with query max_length "150" %}
-  {% else %}
-    {% if result.latest_description %}
-      {{ result.latest_description|striptags|escape|truncatechars:150 }}
-    {% elif result.description %}
-      {{ result.description|striptags|escape|truncatechars:150 }}
-    {% endif %}
-  {% endif %}
-  </span>
-{% endif %}
-
-{% if result.fullname or result.modified or result.modified_by %}
-  <div class="quiet">
-    {% if result.modified_by %}
-      <span class="pull-left">{% trans "by" %}
-        {% if result.modified_by_url %}
-          <a href="{{ result.modified_by_url }}">
-        {% else %}
-          <span>
-        {% endif %}
-
-        {% if query %}
-          {% highlight result.modified_by with query %}
-        {% else %}
-          {{ result.modified_by }}
-        {% endif %}
-
-        {% if result.modified_by_url %}
-          </a>
-        {% else %}
-          </span>
-        {% endif %}
-      </span>
-    {% else %}
-      <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
-    {% endif %}
-    {% if result.modified %}
-      <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span>
-    {% endif %}
-  </div>
-{% endif %}
-</li>
@@ -0,0 +1,33 @@
+{% load i18n tz highlight date_format %}
+
+<div class="row">
+  <div class="col-md-12">
+    <small>{% datetime_format result.modified %} -
+
+        {% if query %}
+            <a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>
+        {% else %}
+            <a href="{{result.modified_by_url}}">{{result.modified_by }}</a>
+        {% endif %}
+
+    </small><br>
+
+    {% if query %}
+        <h4><a href="{{result.url}}">{% highlight result.title with query max_length "1000"%}</a></h4>
+    {% else %}
+        <h4><a href="{{result.url}}">{{ result.title }}</a></h4>
+    {% endif %}
+
+    {% with result.latest_description|truncatewords:"85" as description %}
+
+        {% if query %}
+            {% highlight description with query max_length "1000" %}<br>
+        {% else %}
+            {{description | default_if_none:"a"}}<br>
+        {% endif %}
+
+    {% endwith %}
+    <small>{% trans "Registred in" %}: <strong>{% trans "Discussion" %}</strong></small>
+  </div>
+  <hr>
+</div>
@@ -0,0 +1,71 @@
+# -*- coding:utf-8 -*-
+
+from mock import patch
+
+from colab.accounts.models import User
+from django.test import TestCase, Client
+from colab.super_archives.models import EmailAddressValidation, EmailAddress
+
+
+class EmailValidationTest(TestCase):
+
+    fixtures = ['test_user.json']
+
+    def setUp(self):
+        self.client = Client()
+
+    def authenticate_user(self):
+        self.client.login(username='chucknorris', password='123colab4')
+
+    @patch('colab.super_archives.views.send_verification_email',
+           return_value="")
+    def test_send_verification_email_successfuly(self,
+                                                 mock_send_verification_email):
+        user = User.objects.get(username='chucknorris')
+
+        EmailAddressValidation.create(user.email, user)
+
+        email_addr, created = EmailAddress.objects.get_or_create(
+            address=user.email)
+        email_addr.user = user
+        email_addr.save()
+
+        self.authenticate_user()
+
+        response = self.client.post('/archives/manage/email/validate/',
+                                    {'user': user.id, 'email': user.email})
+
+        self.assertEqual(response.status_code, 204)
+        self.assertTrue(mock_send_verification_email.called)
+
+    @patch('colab.super_archives.views.send_verification_email',
+           return_value="")
+    def test_send_verification_email_with_not_verified_email(
+            self, send_verification_email):
+        self.authenticate_user()
+
+        user = User.objects.get(username='chucknorris')
+
+        response = self.client.post('/archives/manage/email/validate/',
+                                    {
+                                        'user': user.id,
+                                        'email': "email@mail.com",
+                                    })
+
+        self.assertEqual(response.status_code, 404)
+        self.assertFalse(send_verification_email.called)
+
+    @patch('colab.super_archives.views.send_verification_email',
+           return_value="")
+    def test_send_verification_email_with_not_valid_user_id(
+            self, send_verification_email):
+        self.authenticate_user()
+
+        user = User.objects.get(username='chucknorris')
+
+        response = self.client.post('/archives/manage/email/validate/',
+                                    {'user': len(User.objects.all()) + 1,
+                                     'email': user.email})
+
+        self.assertEqual(response.status_code, 404)
+        self.assertFalse(send_verification_email.called)
@@ -0,0 +1,28 @@
+from django.test import TestCase
+
+from ..utils.blocks import EmailBlock
+
+
+class TestEmailBlock(TestCase):
+
+    def setUp(self):
+        self.email_block = EmailBlock()
+
+    def test_html2text_without_br_tag(self):
+        html = '<a>Hello, world!</a>'
+        text = self.email_block._html2text(html)
+
+        self.assertEquals(text, 'Hello, world!')
+
+    def test_html2text_with_br_tag(self):
+        html = '<a>Hello, world</a>!<br><p>Test with br tag</p>!'
+        text = self.email_block._html2text(html)
+
+        self.assertEquals(text, 'Hello, world!\nTest with br tag!')
+
+    def test_mark_links(self):
+        html = 'http://test.org/'
+        text = self.email_block._mark_links(html)
+
+        self.assertEquals(text, '<a target="_blank" href=' +
+                                '"http://test.org/">http://test.org/</a>')
@@ -6,7 +6,7 @@ from .views import (EmailView, EmailValidationView, ThreadView,
 urlpatterns = patterns(
     'super_archives.views',
-    url(r'thread/(?P<mailinglist>[-\w]+)/(?P<thread_token>[-\w]+)$',
+    url(r'thread/(?P<mailinglist>[-.\w]+)/(?P<thread_token>[-.\w]+)$',
         ThreadView.as_view(), name="thread_view"),
     url(r'thread/$', ThreadDashboardView.as_view(), name='thread_list'),
     url(r'manage/email/validate/?$', EmailValidationView.as_view(),
@@ -25,7 +25,7 @@ class EmailBlock(list):
     def _html2text(self, text):
         if RE_WRAPPED_BY_HTML.match(text.strip()):
-            return html2text(text)
+            return html2text(text).strip()
         text, n = RE_BR_TO_LINEBREAK.subn('\n', text)
         text = strip_tags(text)
@@ -103,7 +103,7 @@ class ThreadView(View):
         }
         url = urlparse.urljoin(settings.MAILMAN_API_URL,
-                               mailinglist + '/sendmail')
+                               'sendmail/' + mailinglist)
         error_msg = None
         try:
@@ -277,14 +277,14 @@ class EmailValidationView(View):
         try:
             email = EmailAddressValidation.objects.get(address=email_addr,
                                                        user_id=user_id)
-        except http.DoesNotExist:
+        except EmailAddressValidation.DoesNotExist:
             raise http.Http404
         try:
             location = reverse('archive_email_view',
                                kwargs={'key': email.validation_key})
             verification_url = request.build_absolute_uri(location)
-            send_verification_email(request, email_addr, email.user,
+            send_verification_email(email_addr, email.user,
                                     email.validation_key, verification_url)
         except smtplib.SMTPException:
             logging.exception('Error sending validation email')
@@ -2,11 +2,12 @@
 {% load i18n gravatar plugins %}
 {% load static from staticfiles %}
+{% block html %}
 <html>
   <head>
   {% block head %}
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
     {% block metarobots %}
       {% if ROBOTS_NOINDEX %}
         <meta name="robots" content="noindex, nofollow" />
@@ -46,6 +47,11 @@
     <link rel="stylesheet" href="{% static 'css/screen.css' %}"
         type="text/css" media="screen" />
+    <link rel="stylesheet" href="{% static 'css/header.css' %}"
+        type="text/css" media="screen" />
+
+    <link rel="stylesheet" href="{% static 'css/footer.css' %}"
+        type="text/css" media="screen" />
   {% endblock %}
   </head>
@@ -101,3 +107,4 @@
   {% block footer_js %}{% endblock %}
   </body>
 </html>
+{% endblock %}
@@ -22,7 +22,7 @@
       </a>
       <ul class="message-list">
         {% for result in latest_results %}
-          {% include "message-preview.html" %}
+          {% include "dashboard-message-preview.html" %}
         {% endfor %}
       </ul>
       <a class="column-align"
@@ -53,7 +53,7 @@
       </a>
       <ul class="message-list">
         {% for thread in hottest_threads %}
-          {% include "message-preview.html" with result=thread %}
+          {% include "dashboard-message-preview.html" with result=thread %}
         {% endfor %}
       </ul>
       <a href="{% url 'haystack_search' %}?type=thread">
@@ -72,7 +72,7 @@
       </a>
       <ul class="message-list">
         {% for thread in latest_threads %}
-          {% include "message-preview.html" with result=thread.latest_message %}
+          {% include "dashboard-message-preview.html" with result=thread.latest_message %}
         {% endfor %}
       </ul>
       <a href="{% url 'haystack_search' %}?type=thread&amp;order=latest">
@@ -3,7 +3,7 @@ from django.conf import settings
 from django.views.generic import TemplateView
 from django.contrib import admin
 from django.views.generic import RedirectView
-
+from accounts.views import UserProfileUpdateView
 admin.autodiscover()
@@ -24,9 +24,3 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'', include('colab.plugins.urls')),
 )
-
-if settings.DEBUG:
-    urlpatterns += static.static(
-        settings.MEDIA_URL,
-        document_root=settings.MEDIA_ROOT
-    )
@@ -32,7 +32,7 @@ def _load_py_file(py_path, path):
     try:
         py_settings = importlib.import_module(py_path)
-    except IOError:
+    except ImportError:
         msg = ('Could not open settings file {}. Please '
                'check if the file exists and if user '
                'has read rights.').format(py_path)
@@ -49,12 +49,12 @@ def _load_py_file(py_path, path):
         sys.path.remove(path)
     py_setting = {var: getattr(py_settings, var) for var in dir(py_settings)
-                  if not var.startswith('__')}
+                  if not var.startswith('_')}
     return py_setting
-def load_py_settings():
+def load_py_settings(settings_dir='/etc/colab/settings.d'):
     settings_file = os.getenv('COLAB_SETTINGS', '/etc/colab/settings.py')
     settings_module = settings_file.split('.')[-2].split('/')[-1]
     py_path = "/".join(settings_file.split('/')[:-1])
@@ -67,8 +67,6 @@ def load_py_settings():
     py_settings = _load_py_file(settings_module, py_path)
-    # Read settings from settings.d
-    settings_dir = '/etc/colab/settings.d'
     logger.info('Settings directory: %s', settings_dir)
     if not os.path.exists(settings_dir):
@@ -127,18 +125,47 @@ def load_colab_apps():
         app_label = app_name.split('.')[-1]
         COLAB_APPS[app_label] = {}
-        COLAB_APPS[app_label]['menu_title'] = py_settings_d.get('menu_title')
+        COLAB_APPS[app_label] = py_settings_d
-        fields = ['verbose_name', 'upstream', 'urls',
-                  'menu_urls', 'middlewares', 'dependencies',
-                  'context_processors', 'private_token', 'name', 'extra']
+    return {'COLAB_APPS': COLAB_APPS}
-        for key in fields:
-            value = py_settings_d.get(key)
-            if value:
-                COLAB_APPS[app_label][key] = value
-    return {'COLAB_APPS': COLAB_APPS}
+def load_widgets_settings():
+    settings_file = os.getenv('COLAB_WIDGETS_SETTINGS',
+                              '/etc/colab/widgets_settings.py')
+    settings_module = settings_file.split('.')[-2].split('/')[-1]
+    py_path = "/".join(settings_file.split('/')[:-1])
+    logger.info('Widgets Settings file: %s', settings_file)
+
+    if not os.path.exists(py_path):
+        return
+
+    original_path = sys.path
+    sys.path.append(py_path)
+
+    if os.path.exists(settings_file):
+        importlib.import_module(settings_module)
+
+    # Read settings from widgets.d
+    settings_dir = os.getenv('COLAB_WIDGETS', '/etc/colab/widgets.d')
+    logger.info('Widgets Settings directory: %s', settings_dir)
+    sys.path = original_path
+
+    if not os.path.exists(settings_dir):
+        return
+
+    for file_name in os.listdir(settings_dir):
+        if not file_name.endswith('.py'):
+            continue
+
+        original_path = sys.path
+        sys.path.append(settings_dir)
+
+        file_module = file_name.split('.')[0]
+        importlib.import_module(file_module)
+        logger.info('Loaded %s/%s', settings_dir, file_name)
+
+        sys.path = original_path
 def validate_database(database_dict, default_db, debug):
@@ -0,0 +1,56 @@
+
+# Set to false in production
+DEBUG = True
+TEMPLATE_DEBUG = False
+
+# System admins
+ADMINS = [['John Foo', 'john@example.com'], ['Mary Bar', 'mary@example.com']]
+
+MANAGERS = ADMINS
+
+COLAB_FROM_ADDRESS = '"Colab" <noreply@example.com>'
+SERVER_EMAIL = '"Colab" <noreply@example.com>'
+
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+EMAIL_SUBJECT_PREFIX = '[colab]'
+
+SECRET_KEY = 'not-a-secret'
+
+ALLOWED_HOSTS = [
+    'localhost',
+]
+
+# Uncomment to enable social networks fields profile
+SOCIAL_NETWORK_ENABLED = True
+
+# Disable indexing
+ROBOTS_NOINDEX = True
+
+LOGGING = {
+    'version': 1,
+
+    'handlers': {
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler',
+        },
+    },
+
+    'loggers': {
+        'colab.mailman': {
+            'handlers': ['null'],
+            'propagate': False,
+        },
+        'haystack': {
+            'handlers': ['null'],
+            'propagate': False,
+        },
+    },
+}
+
+STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
+
+from colab.settings import INSTALLED_APPS
+
+INSTALLED_APPS += ('behave_django', )
@@ -0,0 +1,15 @@
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "gitlab"
+verbose_name = "Gitlab"
+
+upstream = 'https://localhost/gitlab/'
+private_token = 'AVA8vrohDpoSws41zd1w'
+
+urls = {
+    "include": "gitlab.urls",
+    "prefix": 'gitlab/',
+    "namespace": "gitlab"
+}
+
+url = colab_url_factory('gitlab')
@@ -0,0 +1,15 @@
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "noosfero"
+verbose_name = "Noosfero"
+private_token = "ef9a334177c620b68e75a89844e8a402"
+
+upstream = 'http://localhost/social/'
+
+urls = {
+    "include": "noosfero.urls",
+    "prefix": '^social/',
+    "namespace": "social"
+}
+
+url = colab_url_factory('social')
@@ -0,0 +1,10 @@
+from colab.plugins.utils.menu import colab_url_factory
+
+verbose_name = "SPB Plugin"
+urls = {
+    "include": "colab_spb.urls",
+    "prefix": '^spb/',
+    "namespace": "colab_spb"
+}
+
+url = colab_url_factory('colab_spb')
@@ -0,0 +1,2 @@
+RIBBON_ENABLED = False
+TEST = 'test'
@@ -0,0 +1 @@
+)
+import sys
 from django.test import TestCase, override_settings
 from django.conf import settings
-from ..conf import DatabaseUndefined, validate_database
+from ..conf import (DatabaseUndefined, validate_database,
+                    InaccessibleSettings, _load_py_file, load_py_settings,
+                    load_colab_apps, load_widgets_settings)
+
+from mock import patch
+
+
+test_files_dir = "./colab/utils/tests"
 class TestConf(TestCase):
@@ -16,3 +24,78 @@ class TestConf(TestCase):
         with self.assertRaises(DatabaseUndefined):
             validate_database(settings.DATABASES, settings.DEFAULT_DATABASE,
                               settings.DEBUG)
+
+    def test_load_py_file_with_io_error(self):
+        self.assertRaises(InaccessibleSettings,
+                          _load_py_file, 'settings_test', '/etc/colab/')
+
+    def test_load_py_file_with_syntax_error(self):
+        self.assertRaises(InaccessibleSettings,
+                          _load_py_file, 'settings_with_syntax_error',
+                          test_files_dir)
+
+    def test_load_py_file(self):
+        py_settings = _load_py_file('colab_settings', test_files_dir)
+
+        self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
+        self.assertTrue(py_settings['SOCIAL_NETWORK_ENABLED'])
+
+        self.assertIn('EMAIL_PORT', py_settings)
+        self.assertEquals(py_settings['EMAIL_PORT'], 25)
+
+    @patch('os.getenv', return_value='/path/fake/settings.py')
+    def test_load_py_settings_with_inaccessible_settings(self, mock):
+        self.assertRaises(InaccessibleSettings, load_py_settings)
+
+    @patch('os.getenv', return_value=test_files_dir + '/colab_settings.py')
+    def test_load_py_settings_without_settings_d(self, mock):
+        py_settings = load_py_settings('/path/fake/settings.d/test.py')
+
+        self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
+        self.assertTrue(py_settings['SOCIAL_NETWORK_ENABLED'])
+
+        self.assertIn('EMAIL_PORT', py_settings)
+        self.assertEquals(py_settings['EMAIL_PORT'], 25)
+
+    @patch('os.listdir', return_value=[test_files_dir + '/settings.d/test.py',
+                                       'non_python_file'])
+    @patch('colab.utils.conf._load_py_file',
+           side_effect=[{'SOCIAL_NETWORK_ENABLED': True, 'EMAIL_PORT': 25},
+                        {'TEST': 'test'}])
+    def test_load_py_settings_with_settings_d(self, mock_py, mock_listdir):
+        py_settings = load_py_settings(test_files_dir + '/settings.d/')
+
+        self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
+        self.assertTrue(py_settings['SOCIAL_NETWORK_ENABLED'])
+
+        self.assertIn('EMAIL_PORT', py_settings)
+        self.assertEquals(py_settings['EMAIL_PORT'], 25)
+
+        self.assertIn('TEST', py_settings)
+        self.assertEquals(py_settings['TEST'], 'test')
+
+    @patch('os.getenv', return_value='/path/fake/plugins.d/')
+    def test_load_colab_apps_without_plugins_d_directory(self, mock):
+        colab_apps = load_colab_apps()
+        self.assertIn('COLAB_APPS', colab_apps)
+        self.assertEquals(colab_apps['COLAB_APPS'], {})
+
+    @patch('os.getenv', return_value=test_files_dir + '/plugins.d/')
+    def test_load_colab_apps_with_plugins_d_directory(self, os_getenv):
+        sys.path.insert(0, os_getenv.return_value)
+        colab_apps = load_colab_apps()
+
+        self.assertIn('gitlab', colab_apps['COLAB_APPS'])
+        self.assertIn('noosfero', colab_apps['COLAB_APPS'])
+        sys.path.remove(os_getenv.return_value)
+
+        self.assertNotIn(os_getenv.return_value, sys.path)
+
+    @patch('os.getenv', return_value='/path/fake/widgets_settings.py')
+    def test_load_widgets_settings_without_settings(self, mock):
+        self.assertIsNone(load_widgets_settings())
+
+    @patch('os.getenv', side_effect=[test_files_dir + '/colab_settings.py',
+                                     '/path/fake/widgets_settings.py'])
+    def test_load_widgets_settings_without_settings_d(self, mock):
+        self.assertIsNone(load_widgets_settings())
@@ -0,0 +1,3 @@
+# from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,3 @@
+# from django.db import models
+
+# Create your models here.
@@ -0,0 +1,15 @@
+from django import template
+from colab.widgets.widget_manager import WidgetManager
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def import_widgets(context, area_id, widget_var=None):
+    if not widget_var:
+        widget_var = "widgets_{}".format(area_id)
+
+    context[widget_var] = WidgetManager.get_widgets(area_id, context=context)
+
+    return ""
@@ -0,0 +1,98 @@
+from django.test import TestCase
+
+from colab.widgets.widget_manager import WidgetManager, Widget
+
+
+class WigetMock(Widget):
+
+    def __init__(self, content=""):
+        self.content = content
+
+
+class WidgetManagerTest(TestCase):
+
+    html_content = "<head><meta charset='UTF-8'></head><body><p>T</p></body>"
+    widget_area = 'profile'
+    widget_id = 'widget_id'
+
+    def ovewrited_widget_instance(self, content):
+
+        class WidgetOverwrited(Widget):
+            identifier = 'widget_id'
+
+            def generate_content(self, request=None):
+                self.content = content
+        return WidgetOverwrited()
+
+    def default_widget_instance(self):
+
+        class WidgetDefault(Widget):
+            pass
+
+        return WidgetDefault()
+
+    def setUp(self):
+        custom_widget = self.ovewrited_widget_instance(self.html_content)
+        WidgetManager.register_widget(self.widget_area, custom_widget)
+
+    def tearDown(self):
+        WidgetManager.unregister_widget(self.widget_area, self.widget_id)
+
+    def test_widget_default_values(self):
+        widget = self.default_widget_instance()
+        self.assertEqual(widget.identifier, None)
+        self.assertEqual(widget.name, None)
+        self.assertEqual(widget.content, '')
+        self.assertEqual(widget.template, '')
+
+    def test_add_widgets_to_key_area(self):
+        self.assertEqual(len(WidgetManager.get_widgets(self.widget_area)), 1)
+
+    def test_remove_widgets_in_key_area(self):
+        area = 'admin'
+        widget_instance = self.ovewrited_widget_instance(self.html_content)
+
+        WidgetManager.register_widget(area, widget_instance)
+        WidgetManager.unregister_widget(area, self.widget_id)
+
+        self.assertEqual(len(WidgetManager.get_widgets(area)), 0)
+
+    def test_get_body(self):
+        custom_widget = self.ovewrited_widget_instance(self.html_content)
+
+        custom_widget.generate_content()
+        self.assertEqual(custom_widget.get_body(), "<p>T</p>")
+
+    def test_get_header(self):
+        custom_widget = self.ovewrited_widget_instance(self.html_content)
+
+        custom_widget.generate_content()
+        self.assertEqual(custom_widget.get_header(), "<meta charset='UTF-8'>")
+
+    def test_get_header_wrong(self):
+        widget = self.default_widget_instance()
+        widget.content = "<head> Teste <head>"
+        self.assertEqual(widget.get_header(), '')
+
+    def test_get_body_wrong(self):
+        widget = self.default_widget_instance()
+        widget.content = "<body> Teste <body>"
+        self.assertEqual(widget.get_body(), '')
+
+    def test_generate_content(self):
+        widgets = WidgetManager.get_widgets(self.widget_area)
+        self.assertEqual(widgets[0].content, self.html_content)
+
+    def test_widget_with_invalid_area(self):
+        self.assertEqual(WidgetManager.get_widgets("area"), [])
+
+    def test_generate_content_without_template(self):
+        widget = self.default_widget_instance()
+        with self.assertRaises(Exception):
+            widget.generate_content()
+
+    def test_generate_content_with_template(self):
+        widget = self.default_widget_instance()
+        widget.template = self.html_content
+        with self.assertRaises(Exception):
+            widget.generate_content()
@@ -0,0 +1,37 @@
+import unittest
+from mock import patch
+
+from colab.widgets.templatetags.widgets_tag import import_widgets
+from colab.widgets.widget_manager import WidgetManager, Widget
+from django.template import Context
+
+
+class WigetMock(Widget):
+
+    def __init__(self, content=""):
+        self.content = content
+
+
+class WidgetsTest(unittest.TestCase):
+
+    @patch.object(WidgetManager, 'get_widgets')
+    def test_import_widgets_tag(self, get_widgets):
+        return_list = [WigetMock(), WigetMock(), WigetMock()]
+        get_widgets.return_value = return_list
+
+        context = Context({'request': ""})
+        import_widgets(context, 'area')
+
+        self.assertIn('widgets_area', context)
+        self.assertEquals(context['widgets_area'], return_list)
+
+    @patch.object(WidgetManager, 'get_widgets')
+    def test_import_widgets_tag_with_named_var(self, get_widgets):
+        return_list = [WigetMock(), WigetMock(), WigetMock()]
+        get_widgets.return_value = return_list
+
+        context = Context({'request': ""})
+        import_widgets(context, 'area', 'var')
+
+        self.assertIn('var', context)
+        self.assertEquals(context['var'], return_list)
@@ -0,0 +1,3 @@
+# from django.shortcuts import render
+
+# Create your views here.
@@ -0,0 +1,65 @@
+from django.utils.safestring import mark_safe
+from django.template.loader import render_to_string
+
+
+class Widget(object):
+    identifier = None
+    name = None
+    content = ''
+    template = ''
+
+    def get_body(self):
+        # avoiding regex in favor of performance
+        start = self.content.find('<body>')
+        end = self.content.find('</body>')
+
+        if -1 in [start, end]:
+            return ''
+
+        body = self.content[start + len('<body>'):end]
+        return mark_safe(body)
+
+    def get_header(self):
+        # avoiding regex in favor of performance
+        start = self.content.find('<head>')
+        end = self.content.find('</head>')
+
+        if -1 in [start, end]:
+            return ''
+
+        head = self.content[start + len('<head>'):end]
+        return mark_safe(head)
+
+    def generate_content(self, **kwargs):
+        if not self.template:
+            class_name = self.__class__.__name__
+            raise Exception("Template not defined in {}.".format(class_name))
+        self.content = render_to_string(self.template, kwargs.get('context'))
+
+
+class WidgetManager(object):
+    widget_categories = {}
+
+    @staticmethod
+    def register_widget(category, widget):
+        if category not in WidgetManager.widget_categories:
+            WidgetManager.widget_categories[category] = []
+
+        WidgetManager.widget_categories[category].append(widget)
+
+    @staticmethod
+    def unregister_widget(category, widget_identifier):
+        if category in WidgetManager.widget_categories:
+            for widget in WidgetManager.widget_categories[category]:
+                if widget.identifier == widget_identifier:
+                    WidgetManager.widget_categories[category].remove(widget)
+
+    @staticmethod
+    def get_widgets(category, **kwargs):
+        if category not in WidgetManager.widget_categories:
+            return []
+
+        widgets = WidgetManager.widget_categories[category][:]
+        for widget in widgets:
+            widget.generate_content(**kwargs)
+        return widgets
@@ -4,3 +4,77 @@ Developer Documentation
 Getting Started
 ---------------
 .. TODO
+
+Widgets
+-------
+
+A widget is a piece of HTML that will be inserted in a specific spot in a page to render some view.
+
+To create a new widget you need to extend the ``Widget`` class from ``colab.widgets``. In the child class you can override the methods below, but it is not mandatory:
+
+.. attribute:: get_header
+
+    This method should return the HTML code to be used in the page's head. So, it will extract the head content from the ``content``.
+
+.. attribute:: get_body
+
+    This method should return the HTML code to be used in the page's body. So, it will extract the body content from the ``content``.
+
+.. attribute:: generate_content
+
+    This method will set the ``content`` when the widget is requested by the ``WidgetManager``. The ``content`` contains a HTML code that will be rendered in the target page.
+
+The Widget class has the following attributes:
+
+.. attribute:: identifier
+
+        The identifier has to be a unique string across the widgets.
+
+.. attribute:: name
+
+        The widget name is the string that will be used to render in the view, if needed.
+
+Example Widget:
+
+.. code-block:: python
+
+        from colab.widgets.widget_manager import Widget
+
+        class MyWidget(Widget):
+            identifier = 'my_widget_id'
+            name = 'My Widget'
+            def generate_content(self, **kwargs):
+                # process HTML content
+                self.content = processed_content
+
+To add the widget in a view check the Widgets section in User Documentation.
+To use a widget in the templates, you have to use the ``import_widget`` tag inside the ``html`` block.
+This way, the kwargs parameter will have a ``context`` key from the ``html``.
+You can also set the variable that the widgets of an area will be imported.
+Or you can use the default name, which is ``widgets_area_name``.
+For example, in the ``profile`` area the variable name is ``widgets_profile``.
+This variable will be inserted directly in the page ``context``.
+
+.. code-block:: python
+
+    {% load widgets_tag %}
+
+    {% block html %}
+       {% import_widgets 'profile' %}
+       {{ block.super }}
+    {% endblock %}
+
+    {# example of how to use #}
+    {% block head %}
+      {{ block.super }}
+
+      {% for widget in widgets_profile %}
+        {{ widget.get_header }}
+      {% endfor %}
+
+    {% endblock %}
+
+
+.. warning::
+
+    Warning! Remember to use the tag ``{{ block.super }}`` inside the html block. Otherwise, the page will appear blank.
@@ -23,6 +23,8 @@ signals structure, some steps are required:
   contain any special character, such as dot or comma. It is suggested to name
   the variable "short_name", but that nomenclature is not strictly
   necessary.
+* Finally, the variable namespace should also be defined. This variable is the
+  url namespace for django reverse.
 * In order to actually register the signals, it is necessary to implement the
   method register_signal, which require the name of the plugin that is
   registering the signals and a list of signals to be registered as parameters.
@@ -34,6 +36,7 @@ signals structure, some steps are required:
   be seen below:
 .. code-block:: python
+
    from colab.celery import app
    @app.task(bind=True)
@@ -48,6 +51,7 @@ signals structure, some steps are required:
 .. code-block:: python
+
    from colab.plugins.utils.apps import ColabPluginAppConfig
    from colab.signals.signals import register_signal, connect_signal
    from colab.plugins.PLUGIN.tasks import HANDLING_METHOD
@@ -55,6 +59,7 @@ signals structure, some steps are required:
    class PluginApps(ColabPluginAppConfig):
         short_name = PLUGIN_NAME
         signals_list = [SIGNAL1, SIGNAL2]
+        namespace = PLUGIN_NAMESPACE
         def registered_signal(self):
             register_signal(self.short_name, self.signals_list)
@@ -71,6 +76,7 @@ signals structure, some steps are required:
   \*\*kwargs. As you can see below:
 .. code-block:: python
+
    from colab.signals.signals import send
    send(signal_name, sender)
@@ -78,4 +84,137 @@ signals structure, some steps are required:
 * If you want to run celery manually to make some tests, you should execute:
 .. code-block:: shell
-   celery -A colab worker --loglevel=debug
+
+   colab-admin celeryC worker --loglevel=debug
+
+Search
+----------
+
+In order to make some plugin model's searchable, it is necessary to create
+some files. First of all, it is necessary to create a directory named "search"
+inside the templates directory, that should be found on the plugin root
+directory.
+
+Once the search folder exist, it is necessary to create a html file that will
+describe how a model item will be displayed on the colab search page. This file
+name must follow the pattern:
+
+MODELNAME_search_preview.html
+
+Where the MODELNAME should be the name of the model object that will be
+represented on the html file. An example for this file can be seen bellow:
+
+.. code-block:: guess
+
+   {% load i18n tz highlight gravatar date_format %}
+
+    <div class="row">
+    <div class="col-md-2 center">
+        <a href="{% url 'user_profile' username=result.username %}">
+        {% block gravatar_img %}{% gravatar result.email 100 %}{% endblock gravatar_img %}
+        </a>
+    </div>
+    <div class="col-md-10">
+        <strong><a href="{% url 'user_profile' username=result.username %}">
+
+            {% if query %}
+                <h4>{% highlight result.name with query %}</h4></a>
+            {% else %}
+                <h4>{{ result.name }}</h4></a>
+            {% endif %}
+
+        </strong>
+        <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
+        <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
+    </div>
+    </div>
+    <div class="row">
+    <hr>
+    </div>
+
+As can be seen in the above example, it also possible to highlight the elements being searched. This can be seen on
+the following example:
+
+.. code-block:: html
+
+    {% if query %}
+        <h4>{% highlight result.name with query %}</h4></a>
+    {% else %}
+        <h4>{{ result.name }}</h4></a>
+    {% endif %}
+
+It can be seen that if a query text was used on the search, it will highlight the element if it is present on the query, if not,
+the element will be displayed without a highlight. Therefore, in order to highlight some fields, it is necessary
+to first check if there is a query search. If there is, use the tag "highlight" before the field name. However, it
+must be said that the highlight tag should be followed by a complement, such as "with query", as can be seen on the example
+above. This complement is used to allow the highlight only if the attribute is actually present on the query used to perform a search.
+
+Also a another file that must be created is the search_index.py one. This file
+must be placed at the plugin root directory. This file dictates how haystack
+will index the plugins models. If there is any doubt about how to create this
+file, it's possible to check the official haystack documentation that can be
+seen on the bellow link.
+
+`Guide to create a SearchIndexesFiles`_
+
+.. _`Guide to create a SearchIndexesFiles`: http://django-haystack.readthedocs.org/en/v2.4.0/tutorial.html#creating-searchindexes
+
+It can also be seen in the guide above that an indexes directory should be
+created. This directory should be placed inside the search directory originally
+created in this tutorial. Inside this directory, create a txt file for each
+model that can be queried. Each of this files must contain the model fields that
+will be search if no filter is applied. If there is any doubts to create these
+files, please check the `Guide to create a SearchIndexesFiles`_.
+
+Storing TimeStamp
+---------------
+TimeStamp is a parameter to control the last time a model was updated, you should use it
+when you want the data updated after a given time. To do that the colab's model (colab.plugins.models) have a
+TimeStampPlugin class, used to store all last updates from timestamp from all plugins.
+
+Class Methods:
+   update_timestamp(cls,class_name): allow store a current datetime.
+
+   get_last_updated_timestamp(cls,class_name): allow get a datetime with last timestamp stored from class_name.
+
+Example Usage:
+
+.. code-block:: python
+   from colab.plugins.models import TimeStampPlugin
+
+   class TestPlugin():
+
+       def update_timestamp(self):
+          TimeStampPlugin.update_timestamp('TestPlugin')
+
+       def get_last_updated_timestamp(self):
+          return TimeStampPlugin.get_last_updated_timestamp('TestPlugin')
+
+
+Password Validation
+-------------------
+
+Allows the plugin to define rules to set the password. The validators
+are functions which receive the password as only argument and if it 
+doesn't match the desired rules raises a `ValidationError`. The message
+sent in the validation error will be displayed to user in the HTML form.
+
+Example:
+
+.. code-block:: python
+
+   ## myplugin/password_validators.py
+
+   def has_uppercase_char(password):
+       for char in password:
+           if char.isupper():
+               return
+
+       raise ValidationError('Password must have at least one upper case char')
+
+   ## /etc/colab/plugins.d/myplugin.py
+
+   password_validators = (
+       'myplugin.password_validators.has_uppercase_char',
+   )
+
@@ -58,6 +58,27 @@ View the following file:
 The file /etc/colab/settings.py have the configurations of colab, this configurations overrides the django settings.py
+Widgets
+-------
+
+A widget is a piece of HTML that will be inserted in a specific spot in a page to render some view.
+
+To configure the widgets you have to edit, or create, the file ``/etc/colab/widgets_settings.py``. Or you can create a py file inside the folder ``/etc/colab/widgets.d``.
+
+Example:
+
+.. code-block:: python
+
+   # Widget Manager handles all widgets and must be imported to register them
+   from colab.widgets.widget_manager import WidgetManager
+
+   # Specific code for Gitlab's Widget
+   from colab_gitlab.widgets import GitlabProfileWidget
+
+   WidgetManager.register_widget('profile', GitlabProfileWidget())
+
+
+In this example the Gitlab's widget is added in a new tab inside the user profile.
 Add a new plugin
 ----------------
@@ -65,7 +86,7 @@ Add a new plugin
 - Make sure the application has the following requirements
-  - Suport for remote user authentication
+  - Support for remote user authentication
   - A relative url root
@@ -77,6 +98,8 @@ Add a new plugin
   - create file: [plugin_name].py
+- Atention: Any URL used in the plugins' settings should not be preceded by "/"
+
 Use this template for the plugin configuration file
 .. code-block:: python
@@ -95,7 +118,6 @@ Use this template for the plugin configuration file
     urls = {
         'include': '[plugin_module_path].urls',
-        'namespace': '[plugin_name]',
         'prefix': '[application_prefix]/', # Exemple: http://site.com/[application_prefix]/
     }
@@ -104,10 +126,10 @@ Use this template for the plugin configuration file
     url = colab_url_factory('[plugin_name]')
     menu_urls = {
-        url(display=_('[name_of_link_page]'), viewname='[name_of_view_in_the_application]', kwargs={'path': '/[page_appication_path]/' }, auth=True),
+        url(display=_('[name_of_link_page]'), viewname='[name_of_view_in_the_application]', kwargs={'path': '[page_appication_path]/' }, auth=True),
         # You can have more than one url
-        url(display=_('[name_of_link_page]'), viewname='[another_name_of_view_in_the_application]', kwargs={'path': '/[another_page_appication_path]/' }, auth=True),
+        url(display=_('[name_of_link_page]'), viewname='[another_name_of_view_in_the_application]', kwargs={'path': '[another_page_appication_path]/' }, auth=True),
     }
@@ -143,6 +165,15 @@ Declares the additional installed apps that this plugin depends on.
 This doesn't automatically install the python dependecies, only add to django
 apps.
+.. attribute:: password_validators
+
+A lista of functions to validade password in the moment it's set.
+This allows plugins to define their own password validators. For
+example if the proxied app requires the password to have at least
+one upper case character it should provide a password validator
+for that.
+
+
 urls
 ++++
@@ -152,9 +183,8 @@ urls
 .. attribute:: prefix
     Declares the prefix for the url.
-.. attribute:: namespace
-    Declares the namespace for the url.
+    - Atention: Any URL used in the plugins' settings should not be preceded by "/"
 menu
 ++++
@@ -164,7 +194,7 @@ These variables defines the menu title and links of the plugin.
 .. attribute:: menu_title
     Declares the menu title.
-.. attribute:: menu_links
+.. attribute:: menu_urls
     Declares the menu items and its links.
     This should be a tuple object with several colab_url elements.
@@ -172,6 +202,9 @@ These variables defines the menu title and links of the plugin.
     namespace.
     The auth parameter indicates wether the link should only be displayed when
     the user is logged in.
+    The ``kwargs`` parameter receives a dict, where the key ``path`` should be
+    a path URL to the page. Remember that this path is a URL, therefore it
+    should never be preceded by "/".
 Example:
@@ -182,8 +215,8 @@ Example:
     url = colab_url_factory('plugin_app_name')
     menu_urls = (
-       url(display=_('Profile'), viewname='profile', kwargs={'path': '/profile/'}, auth=True),
-       url(display=_('Profile Two'), viewname='profile2', kwargs={'path': '/profile/2'}, auth=True),
+       url(display=_('Profile'), viewname='profile', kwargs={'path': 'profile/'}, auth=True),
+       url(display=_('Profile Two'), viewname='profile2', kwargs={'path': 'profile/2'}, auth=True),
     )
 Extra Template Folders
 [flake8]
-exclude = **/migrations/*,**/urls.py
+exclude = **/migrations/*,**/urls.py,colab/utils/tests/settings_with_syntax_error.py
@@ -5,7 +5,9 @@ import sys
 os.environ['DJANGO_SETTINGS_MODULE'] = 'colab.settings'
 os.environ['COLAB_SETTINGS'] = 'tests/colab_settings.py'
+os.environ['COLAB_WIDGETS_SETTINGS'] = 'tests/widgets_settings.py'
 os.environ['COLAB_PLUGINS'] = 'tests/plugins.d'
+os.environ['COLAB_WIDGETS'] = 'tests/widgets.d'
 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc'
@@ -14,23 +16,34 @@ import coverage
 from django.conf import settings
 from django.test.utils import get_runner
+import colab.settings
-def runtests():
+def runtests(test_suites=[]):
     if django.VERSION >= (1, 7, 0):
         django.setup()
     test_runner = get_runner(settings)
-    failures = test_runner(interactive=False, failfast=False).run_tests([])
+    failures = test_runner(interactive=False, failfast=False).run_tests(
+        test_suites)
     sys.exit(failures)
-def run_with_coverage():
+def run_with_coverage(test_suites=[]):
     if os.path.exists('.coverage'):
         os.remove('.coverage')
     coverage.process_startup()
-    runtests()
+    runtests(test_suites)
 if __name__ == '__main__':
-    run_with_coverage()
+    all_valid_apps = True
+
+    for arg in sys.argv[1:]:
+        if arg not in colab.settings.INSTALLED_APPS:
+            print arg + " App not found"
+            print "Try colab." + arg
+            all_valid_apps = False
+
+    if all_valid_apps:
+        run_with_coverage(sys.argv[1:])
	@@ -7,6 +7,8 @@ omit =		@@ -7,6 +7,8 @@ omit =
7	*/urls.py	7	*/urls.py
8	*/settings.py	8	*/settings.py
9	*/tests.py	9	*/tests.py
		10	+ colab/celery.py
		11	+ colab/wsgi.py
10	source =	12	source =
11	colab/	13	colab/
12		14
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+from django.utils.translation import ugettext as _
	2	+
	3	+
	4	+def get_filters(request):
	5	+ return {
	6	+ 'user': {
	7	+ 'name': _(u'User'),
	8	+ 'icon': 'user',
	9	+ 'fields': (
	10	+ (
	11	+ 'username',
	12	+ _(u'Username'),
	13	+ request.get('username'),
	14	+ ),
	15	+ ('name', _(u'Name'), request.get('name')),
	16	+ (
	17	+ 'institution',
	18	+ _(u'Institution'),
	19	+ request.get('institution'),
	20	+ ),
	21	+ ('role', _(u'Role'), request.get('role'))
	22	+ ),
	23	+ },
	24	+ }
1	# -- coding: utf-8 --	1	# -- coding: utf-8 --
2		2
3	-from collections import OrderedDict	3	+from importlib import import_module
4		4
5	from django import forms	5	from django import forms
6	from django.conf import settings	6	from django.conf import settings
7	-from django.contrib.auth import authenticate, get_user_model
8	-from django.contrib.auth.forms import ReadOnlyPasswordHashField
9	-from django.contrib.auth.tokens import default_token_generator
10	-from django.contrib.sites.shortcuts import get_current_site	7	+from django.contrib.auth import get_user_model
		8	+from django.contrib.auth.forms import (ReadOnlyPasswordHashField,
		9	+ SetPasswordForm, PasswordChangeForm)
11	from django.core.urlresolvers import reverse	10	from django.core.urlresolvers import reverse
12	-from django.template import loader
13	-from django.utils.encoding import force_bytes
14	from django.utils.functional import lazy	11	from django.utils.functional import lazy
15	-from django.utils.http import urlsafe_base64_encode
16	-from django.utils.text import capfirst
17	from django.utils.translation import ugettext_lazy as _	12	from django.utils.translation import ugettext_lazy as _
18	from django.utils.safestring import mark_safe	13	from django.utils.safestring import mark_safe
19		14
20	-	15	+from .signals import user_created
21	from .utils.validators import validate_social_account	16	from .utils.validators import validate_social_account
22	from .utils import mailman	17	from .utils import mailman
23		18
	@@ -168,7 +163,41 @@ class ListsForm(forms.Form):		@@ -168,7 +163,41 @@ class ListsForm(forms.Form):
168	choices=lazy(get_lists_choices, list)())	163	choices=lazy(get_lists_choices, list)())
169		164
170		165
171	-class UserCreationForm(UserForm):	166	+class ColabSetPasswordFormMixin(object):
		167	+
		168	+ def apply_custom_validators(self, password):
		169	+ for app in settings.COLAB_APPS.values():
		170	+ if 'password_validators' in app:
		171	+ for validator_path in app.get('password_validators'):
		172	+ module_path, func_name = validator_path.rsplit('.', 1)
		173	+ module = import_module(module_path)
		174	+ validator_func = getattr(module, func_name, None)
		175	+ if validator_func:
		176	+ validator_func(password)
		177	+
		178	+ return password
		179	+
		180	+ def clean_new_password2(self):
		181	+ try:
		182	+ password = super(ColabSetPasswordFormMixin,
		183	+ self).clean_new_password2()
		184	+ except AttributeError:
		185	+ password = self.cleaned_data['new_password2']
		186	+
		187	+ self.apply_custom_validators(password)
		188	+ return password
		189	+
		190	+ def clean_password2(self):
		191	+ try:
		192	+ password = super(ColabSetPasswordFormMixin, self).clean_password2()
		193	+ except AttributeError:
		194	+ password = self.cleaned_data['password2']
		195	+
		196	+ self.apply_custom_validators(password)
		197	+ return password
		198	+
		199	+
		200	+class UserCreationForm(UserForm, ColabSetPasswordFormMixin):
172	"""	201	"""
173	A form that creates a user, with no privileges, from the given username and	202	A form that creates a user, with no privileges, from the given username and
174	password.	203	password.
	@@ -181,12 +210,13 @@ class UserCreationForm(UserForm):		@@ -181,12 +210,13 @@ class UserCreationForm(UserForm):
181	'password_mismatch': _("The two password fields didn't match."),	210	'password_mismatch': _("The two password fields didn't match."),
182	}	211	}
183	username = forms.RegexField(label=_("Username"), max_length=30,	212	username = forms.RegexField(label=_("Username"), max_length=30,
184	- regex=r'^[\w.@+-]+$',	213	+ regex=r'^[\w]+$',
185	help_text=_(("Required. 30 characters or fewer"	214	help_text=_(("Required. 30 characters or fewer"
186	". Letter and digits.")),	215	". Letter and digits.")),
187	error_messages={	216	error_messages={
188	'invalid': _(("This value may contain only"	217	'invalid': _(("This value may contain only"
189	" letters and numbers."))})	218	" letters and numbers."))})
		219	+
190	password1 = forms.CharField(label=_("Password"),	220	password1 = forms.CharField(label=_("Password"),
191	widget=forms.PasswordInput)	221	widget=forms.PasswordInput)
192	password2 = forms.CharField(label=_("Password confirmation"),	222	password2 = forms.CharField(label=_("Password confirmation"),
	@@ -238,19 +268,26 @@ class UserCreationForm(UserForm):		@@ -238,19 +268,26 @@ class UserCreationForm(UserForm):
238	self.error_messages['password_mismatch'],	268	self.error_messages['password_mismatch'],
239	code='password_mismatch',	269	code='password_mismatch',
240	)	270	)
		271	+
		272	+ super(UserCreationForm, self).clean_password2()
241	return password2	273	return password2
242		274
243	def save(self, commit=True):	275	def save(self, commit=True):
244	user = super(UserCreationForm, self).save(commit=False)	276	user = super(UserCreationForm, self).save(commit=False)
245	- user.set_password(self.cleaned_data["password1"])	277	+ password = self.cleaned_data["password1"]
		278	+ user.set_password(password)
		279	+
246	if commit:	280	if commit:
247	user.save()	281	user.save()
		282	+
		283	+ user_created.send(user.__class__, user=user, password=password)
		284	+
248	return user	285	return user
249		286
250		287
251	class UserChangeForm(forms.ModelForm):	288	class UserChangeForm(forms.ModelForm):
252	username = forms.RegexField(	289	username = forms.RegexField(
253	- label=_("Username"), max_length=30, regex=r"^[\w*]",	290	+ label=_("Username"), max_length=30, regex=r'^[\w]+$',
254	help_text=_("Required. 30 characters or fewer. Letters and digits."),	291	help_text=_("Required. 30 characters or fewer. Letters and digits."),
255	error_messages={	292	error_messages={
256	'invalid': _("This value may contain only letters and numbers.")})	293	'invalid': _("This value may contain only letters and numbers.")})
	@@ -286,234 +323,9 @@ class UserChangeForm(forms.ModelForm):		@@ -286,234 +323,9 @@ class UserChangeForm(forms.ModelForm):
286	return self.initial["password"]	323	return self.initial["password"]
287		324
288		325
289	-class AuthenticationForm(forms.Form):
290	- """
291	- Base class for authenticating users. Extend this to get a form that accepts
292	- username/password logins.
293	- """
294	- username = forms.CharField(max_length=254)
295	- password = forms.CharField(label=_("Password"), widget=forms.PasswordInput)	326	+class ColabSetPasswordForm(ColabSetPasswordFormMixin, SetPasswordForm):
		327	+ pass
296		328
297	- error_messages = {
298	- 'invalid_login': _("Please enter a correct %(username)s and password. "
299	- "Note that both fields may be case-sensitive."),
300	- 'inactive': _("This account is inactive."),
301	- }
302	-
303	- def __init__(self, request=None, args, *kwargs):
304	- """
305	- The 'request' parameter is set for custom auth use by subclasses.
306	- The form data comes in via the standard 'data' kwarg.
307	- """
308	- self.request = request
309	- self.user_cache = None
310	- super(AuthenticationForm, self).__init__(args, *kwargs)
311	-
312	- # Set the label for the "username" field.
313	- UserModel = get_user_model()
314	- self.username_field = UserModel._meta.get_field(
315	- UserModel.USERNAME_FIELD)
316	- if self.fields['username'].label is None:
317	- self.fields['username'].label = capfirst(
318	- self.username_field.verbose_name)
319	-
320	- def clean(self):
321	- username = self.cleaned_data.get('username')
322	- password = self.cleaned_data.get('password')
323	-
324	- if username and password:
325	- self.user_cache = authenticate(username=username,
326	- password=password)
327	- if self.user_cache is None:
328	- raise forms.ValidationError(
329	- self.error_messages['invalid_login'],
330	- code='invalid_login',
331	- params={'username': self.username_field.verbose_name},
332	- )
333	- else:
334	- self.confirm_login_allowed(self.user_cache)
335	-
336	- return self.cleaned_data
337	-
338	- def confirm_login_allowed(self, user):
339	- """
340	- Controls whether the given User may log in. This is a policy setting,
341	- independent of end-user authentication. This default behavior is to
342	- allow login by active users, and reject login by inactive users.
343	- If the given user cannot log in, this method should raise a
344	- ``forms.ValidationError``.
345	- If the given user may log in, this method should return None.
346	- """
347	- if not user.is_active:
348	- raise forms.ValidationError(
349	- self.error_messages['inactive'],
350	- code='inactive',
351	- )
352		329
353	- def get_user_id(self):
354	- if self.user_cache:
355	- return self.user_cache.id
356	- return None
357	-
358	- def get_user(self):
359	- return self.user_cache
360	-
361	-
362	-class PasswordResetForm(forms.Form):
363	- email = forms.EmailField(label=_("Email"), max_length=254)
364	-
365	- def save(self, domain_override=None,
366	- subject_template_name='registration/password_reset_subject.txt',
367	- email_template_name='registration/password_reset_email.html',
368	- use_https=False, token_generator=default_token_generator,
369	- from_email=None, request=None, html_email_template_name=None):
370	- """
371	- Generates a one-use only link for resetting password and sends to the
372	- user.
373	- """
374	- from django.core.mail import send_mail
375	- UserModel = get_user_model()
376	- email = self.cleaned_data["email"]
377	- active_users = UserModel._default_manager.filter(
378	- email__iexact=email, is_active=True)
379	- for user in active_users:
380	- # Make sure that no email is sent to a user that actually has
381	- # a password marked as unusable
382	- if not user.has_usable_password():
383	- continue
384	- if not domain_override:
385	- current_site = get_current_site(request)
386	- site_name = current_site.name
387	- domain = current_site.domain
388	- else:
389	- site_name = domain = domain_override
390	- c = {
391	- 'email': user.email,
392	- 'domain': domain,
393	- 'site_name': site_name,
394	- 'uid': urlsafe_base64_encode(force_bytes(user.pk)),
395	- 'user': user,
396	- 'token': token_generator.make_token(user),
397	- 'protocol': 'https' if use_https else 'http',
398	- }
399	- subject = loader.render_to_string(subject_template_name, c)
400	- # Email subject must not contain newlines
401	- subject = ''.join(subject.splitlines())
402	- email = loader.render_to_string(email_template_name, c)
403	-
404	- if html_email_template_name:
405	- html_email = loader.render_to_string(html_email_template_name,
406	- c)
407	- else:
408	- html_email = None
409	- send_mail(subject, email, from_email, [user.email],
410	- html_message=html_email)
411	-
412	-
413	-class SetPasswordForm(forms.Form):
414	- """
415	- A form that lets a user change set their password without entering the old
416	- password
417	- """
418	- error_messages = {
419	- 'password_mismatch': _("The two password fields didn't match."),
420	- }
421	- new_password1 = forms.CharField(label=_("New password"),
422	- widget=forms.PasswordInput)
423	- new_password2 = forms.CharField(label=_("New password confirmation"),
424	- widget=forms.PasswordInput)
425	-
426	- def __init__(self, user, args, *kwargs):
427	- self.user = user
428	- super(SetPasswordForm, self).__init__(args, *kwargs)
429	-
430	- def clean_new_password2(self):
431	- password1 = self.cleaned_data.get('new_password1')
432	- password2 = self.cleaned_data.get('new_password2')
433	- if password1 and password2:
434	- if password1 != password2:
435	- raise forms.ValidationError(
436	- self.error_messages['password_mismatch'],
437	- code='password_mismatch',
438	- )
439	- return password2
440	-
441	- def save(self, commit=True):
442	- self.user.set_password(self.cleaned_data['new_password1'])
443	- if commit:
444	- self.user.save()
445	- return self.user
446	-
447	-
448	-class PasswordChangeForm(SetPasswordForm):
449	- """
450	- A form that lets a user change their password by entering their old
451	- password.
452	- """
453	- error_messages = dict(SetPasswordForm.error_messages, **{
454	- 'password_incorrect': _("Your old password was entered incorrectly. "
455	- "Please enter it again."),
456	- })
457	- old_password = forms.CharField(label=_("Old password"),
458	- widget=forms.PasswordInput)
459	-
460	- def clean_old_password(self):
461	- """
462	- Validates that the old_password field is correct.
463	- """
464	- old_password = self.cleaned_data["old_password"]
465	- if not self.user.check_password(old_password):
466	- raise forms.ValidationError(
467	- self.error_messages['password_incorrect'],
468	- code='password_incorrect',
469	- )
470	- return old_password
471	-
472	-PasswordChangeForm.base_fields = OrderedDict(
473	- (k, PasswordChangeForm.base_fields[k])
474	- for k in ['old_password', 'new_password1', 'new_password2']
475	-)
476	-
477	-
478	-class AdminPasswordChangeForm(forms.Form):
479	- """
480	- A form used to change the password of a user in the admin interface.
481	- """
482	- error_messages = {
483	- 'password_mismatch': _("The two password fields didn't match."),
484	- }
485	- password1 = forms.CharField(label=_("Password"),
486	- widget=forms.PasswordInput)
487	- password2 = forms.CharField(label=_("Password (again)"),
488	- widget=forms.PasswordInput)
489	-
490	- def __init__(self, user, args, *kwargs):
491	- self.user = user
492	- super(AdminPasswordChangeForm, self).__init__(args, *kwargs)
493	-
494	- def clean_password2(self):
495	- password1 = self.cleaned_data.get('password1')
496	- password2 = self.cleaned_data.get('password2')
497	- if password1 and password2:
498	- if password1 != password2:
499	- raise forms.ValidationError(
500	- self.error_messages['password_mismatch'],
501	- code='password_mismatch',
502	- )
503	- return password2
504	-
505	- def save(self, commit=True):
506	- """
507	- Saves the new password.
508	- """
509	- self.user.set_password(self.cleaned_data["password1"])
510	- if commit:
511	- self.user.save()
512	- return self.user
513	-
514	- def _get_changed_data(self):
515	- data = super(AdminPasswordChangeForm, self).changed_data
516	- for name in self.fields.keys():
517	- if name not in data:
518	- return []
519	- return ['password']	330	+class ColabPasswordChangeForm(ColabSetPasswordFormMixin, PasswordChangeForm):
		331	+ pass
	@@ -22,6 +22,7 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):		@@ -22,6 +22,7 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
22	google_talk = indexes.CharField(model_attr='google_talk', null=True,	22	google_talk = indexes.CharField(model_attr='google_talk', null=True,
23	stored=False)	23	stored=False)
24	webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)	24	webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
		25	+ date_joined = indexes.DateTimeField(model_attr='date_joined')
25		26
26	def get_model(self):	27	def get_model(self):
27	return User	28	return User
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+
	2	+from django.dispatch import Signal
	3	+
	4	+
	5	+user_created = Signal(providing_args=['user', 'password'])
	6	+user_password_changed = Signal(providing_args=['user', 'password'])
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12		12
13	<div class="row">	13	<div class="row">
14	{% for email, lists in membership.items %}	14	{% for email, lists in membership.items %}
15	- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">	15	+ <div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
16	<div class="panel panel-default">	16	<div class="panel panel-default">
17	<div class="panel-heading">	17	<div class="panel-heading">
18	<h3 class="panel-title">{{ email }}</h3>	18	<h3 class="panel-title">{{ email }}</h3>
	@@ -133,7 +133,7 @@		@@ -133,7 +133,7 @@
133	<h3>{% trans "Latest posted" %} </h3>	133	<h3>{% trans "Latest posted" %} </h3>
134	<ul class="message-list">	134	<ul class="message-list">
135	{% for doc in emails %}	135	{% for doc in emails %}
136	- {% include "message-preview.html" with result=doc %}	136	+ {% include "dashboard-message-preview.html" with result=doc %}
137	{% empty %}	137	{% empty %}
138	<li>{% trans "There are no posts by this user so far." %}</li>	138	<li>{% trans "There are no posts by this user so far." %}</li>
139	{% endfor %}	139	{% endfor %}
	@@ -148,7 +148,7 @@		@@ -148,7 +148,7 @@
148	<h3>{% trans "Latest contributions" %}</h3>	148	<h3>{% trans "Latest contributions" %}</h3>
149	<ul class="message-list">	149	<ul class="message-list">
150	{% for result in results %}	150	{% for result in results %}
151	- {% include "message-preview.html" %}	151	+ {% include "dashboard-message-preview.html" %}
152	{% empty %}	152	{% empty %}
153	<li>{% trans "No contributions of this user so far." %}</li>	153	<li>{% trans "No contributions of this user so far." %}</li>
154	{% endfor %}	154	{% endfor %}
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+{% load i18n tz highlight gravatar date_format %}
	2	+
	3	+<div class="row">
	4	+ <div class="col-md-2 center">
	5	+ <a href="{% url 'user_profile' username=result.username %}">
	6	+ {% block gravatar_img %}{% gravatar result.email 100 %}{% endblock gravatar_img %}
	7	+ </a>
	8	+ </div>
	9	+ <div class="col-md-10">
	10	+ <strong><a href="{% url 'user_profile' username=result.username %}">
	11	+
	12	+ {% if query %}
	13	+ <h4>{% highlight result.name with query %}</h4></a>
	14	+ {% else %}
	15	+ <h4>{{ result.name }}</h4></a>
	16	+ {% endif %}
	17	+
	18	+ </strong>
	19	+ <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
	20	+ <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
	21	+ </div>
	22	+</div>
	23	+<div class="row">
	24	+ <hr>
	25	+</div>
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+from django import template
	2	+from django.utils.translation import ugettext as _
	3	+register = template.Library()
	4	+
	5	+
	6	+@register.simple_tag(takes_context=True)
	7	+def date_format(context, date):
	8	+ formatted_date = _('%(m)s %(d)s %(y)s' % {'m': date.strftime('%B'),
	9	+ 'd': date.day,
	10	+ 'y': date.year})
	11	+ return formatted_date
	12	+
	13	+
	14	+@register.simple_tag(takes_context=True)
	15	+def datetime_format(context, date):
	16	+ formatted_date = date_format(context, date)
	17	+ formatted_time = _('%(hour)s:%(min)s' % {'hour': date.hour,
	18	+ 'min': date.strftime('%I')})
	19	+ formatted_datetime = _('%s at %s' % (formatted_date, formatted_time))
	20	+ return formatted_datetime
	@@ -3,11 +3,51 @@ Test Form class.		@@ -3,11 +3,51 @@ Test Form class.
3	Objective: Test parameters, and behavior.	3	Objective: Test parameters, and behavior.
4	"""	4	"""
5		5
6	-from django.test import TestCase	6	+import datetime
		7	+from mock import patch
		8	+
		9	+from django.test import TestCase, override_settings
7	from django.core.urlresolvers import reverse	10	from django.core.urlresolvers import reverse
8		11
9	-from colab.accounts.forms import UserCreationForm	12	+from colab.accounts.forms import (UserCreationForm, UserChangeForm,
		13	+ UserUpdateForm, UserForm, get_lists_choices,
		14	+ ColabSetPasswordForm,
		15	+ ColabPasswordChangeForm)
		16	+from colab.accounts import forms as accounts_forms
10	from colab.accounts.models import User	17	from colab.accounts.models import User
		18	+from colab.accounts.utils import mailman
		19	+
		20	+
		21	+class SetPasswordFormTestCase(TestCase):
		22	+
		23	+ TEST_COLAB_APPS = {
		24	+ 'test_plugin': {
		25	+ 'password_validators': (
		26	+ 'colab.accounts.tests.utils.password_validator',
		27	+ )
		28	+ }
		29	+ }
		30	+
		31	+ @property
		32	+ def user(self):
		33	+ return User.objects.create_user(username='test_user',
		34	+ email='test@example.com')
		35	+
		36	+ @property
		37	+ def valid_form_data(self):
		38	+ return {'new_password1': '12345',
		39	+ 'new_password2': '12345'}
		40	+
		41	+ def test_no_custom_validators(self):
		42	+ form = ColabSetPasswordForm(self.user, data=self.valid_form_data)
		43	+ self.assertTrue(form.is_valid(), True)
		44	+
		45	+ @override_settings(COLAB_APPS=TEST_COLAB_APPS)
		46	+ @patch('colab.accounts.tests.utils.password_validator')
		47	+ def test_custom_validator(self, validator):
		48	+ form = ColabSetPasswordForm(self.user, data=self.valid_form_data)
		49	+ self.assertTrue(form.is_valid())
		50	+ validator.assert_called_with('12345')
11		51
12		52
13	class FormTest(TestCase):	53	class FormTest(TestCase):
	@@ -24,26 +64,274 @@ class FormTest(TestCase):		@@ -24,26 +64,274 @@ class FormTest(TestCase):
24	user.last_name = "COLAB"	64	user.last_name = "COLAB"
25	user.save()	65	user.save()
26		66
27	- def create_form_data(self):
28	- form_data = {'email': 'usertest@colab.com.br',	67	+ def tearDown(self):
		68	+ pass
		69	+
		70	+ def create_form_data(self, email, username):
		71	+ form_data = {'email': email,
29	'first_name': 'colabName',	72	'first_name': 'colabName',
30	'last_name': 'secondName',	73	'last_name': 'secondName',
31	- 'username': 'colab',	74	+ 'username': username,
32	'password1': '123colab4',	75	'password1': '123colab4',
33	'password2': '123colab4'}	76	'password2': '123colab4'}
34	form = UserCreationForm(data=form_data)	77	form = UserCreationForm(data=form_data)
35	return form	78	return form
36		79
		80	+ def create_update_form_data(self):
		81	+ updated_data = {'username': "colab",
		82	+ 'email': 'email@email.com',
		83	+ 'last_login': datetime.date.today(),
		84	+ 'date_joined': datetime.date.today(),
		85	+ 'twitter': 'nick_twitter',
		86	+ 'first_name': 'colabName',
		87	+ 'last_name': 'secondName',
		88	+ }
		89	+ initial = {'email': 'email@email.com',
		90	+ 'first_name': 'colabName',
		91	+ 'last_name': 'secondName',
		92	+ 'username': 'colab',
		93	+ 'password': '123colab4'}
		94	+ form = UserUpdateForm(initial=initial, data=updated_data)
		95	+ return form
		96	+
		97	+ def create_change_form_data(self, username):
		98	+ updated_data = {'username': username,
		99	+ 'email': 'email@email.com',
		100	+ 'last_login': datetime.date.today(),
		101	+ 'date_joined': datetime.date.today()}
		102	+
		103	+ initial = {'email': 'email@email.com',
		104	+ 'first_name': 'colabName',
		105	+ 'last_name': 'secondName',
		106	+ 'username': 'colab',
		107	+ 'password': '123colab4'}
		108	+ form = UserChangeForm(initial=initial, data=updated_data)
		109	+ return form
		110	+
		111	+ def create_user_form_data(self):
		112	+ initial = {'email': 'email@email.com',
		113	+ 'first_name': 'colabName',
		114	+ 'last_name': 'secondName',
		115	+ 'username': 'colab',
		116	+ 'password': '123colab4'}
		117	+ form = UserForm(data=initial)
		118	+ return form
		119	+
37	def test_already_registered_email(self):	120	def test_already_registered_email(self):
38	- form = self.create_form_data()	121	+ form = self.create_form_data('usertest@colab.com.br',
		122	+ 'colab')
39	self.assertFalse(form.is_valid())	123	self.assertFalse(form.is_valid())
		124	+ self.assertIn('duplicate_email', form.error_messages)
40		125
41	def test_registered_email_message(self):	126	def test_registered_email_message(self):
42	- form = self.create_form_data()	127	+ form = self.create_form_data('usertest@colab.com.br',
		128	+ 'colab')
43	msg = form.error_messages.get('duplicate_email') % {	129	msg = form.error_messages.get('duplicate_email') % {
44	'url': reverse('login')	130	'url': reverse('login')
45	}	131	}
46	self.assertIn(msg, str(form))	132	self.assertIn(msg, str(form))
47		133
48	- def tearDown(self):
49	- pass	134	+ def test_valid_username(self):
		135	+ form = self.create_form_data('user@email.com',
		136	+ 'colab123')
		137	+ self.assertTrue(form.is_valid())
		138	+
		139	+ def test_already_created_username(self):
		140	+ form = self.create_form_data('usertest@colab.com.br',
		141	+ 'USERtestCoLaB')
		142	+ self.assertFalse(form.is_valid())
		143	+ self.assertIn('duplicate_username', form.error_messages)
		144	+
		145	+ def test_not_valid_username(self):
		146	+ form = self.create_form_data('user@email.com',
		147	+ 'colab!')
		148	+ self.assertFalse(form.is_valid())
		149	+
		150	+ def test_update_valid_username(self):
		151	+ form = self.create_change_form_data('colab123')
		152	+ self.assertTrue(form.is_valid())
		153	+
		154	+ def test_update_not_valid_username(self):
		155	+ form = self.create_change_form_data('colab!')
		156	+ self.assertFalse(form.is_valid())
		157	+
		158	+ @patch.object(accounts_forms, "validate_social_account")
		159	+ def test_validate_social_account(self, validate_social_account):
		160	+ validate_social_account.return_value = False
		161	+
		162	+ form = self.create_update_form_data()
		163	+ self.assertFalse(form.is_valid())
		164	+ self.assertIn("Social account does not exist", form.errors['twitter'])
		165	+
		166	+ def test_required_valid_fields_user_form(self):
		167	+ form_data = {
		168	+ 'first_name': 'colabName',
		169	+ 'last_name': 'secondName',
		170	+ 'username': 'colab',
		171	+ }
		172	+
		173	+ form = UserForm(data=form_data)
		174	+
		175	+ self.assertTrue(form.is_valid())
		176	+
		177	+ def test_required_empty_fields_user_form(self):
		178	+ form_data = {
		179	+ 'first_name': '',
		180	+ 'last_name': '',
		181	+ 'username': '',
		182	+ }
		183	+
		184	+ form = UserForm(data=form_data)
		185	+
		186	+ self.assertFalse(form.is_valid())
		187	+
		188	+ self.assertIn('first_name', form.errors)
		189	+ self.assertIn('last_name', form.errors)
		190	+ self.assertIn('username', form.errors)
		191	+
		192	+ def test_blank_required_fields_user_form(self):
		193	+ form_data = {
		194	+ 'first_name': ' ',
		195	+ 'last_name': ' ',
		196	+ 'username': ' ',
		197	+ }
		198	+
		199	+ form = UserForm(data=form_data)
		200	+
		201	+ self.assertFalse(form.is_valid())
		202	+
		203	+ self.assertIn('first_name', form.errors)
		204	+ self.assertIn('last_name', form.errors)
		205	+ self.assertIn('username', form.errors)
		206	+
		207	+ @patch.object(mailman, "all_lists")
		208	+ def test_get_list_choices(self, all_lists):
		209	+ all_lists.return_value = [
		210	+ {'listname': 'listA', 'description': 'A'},
		211	+ {'listname': 'listB', 'description': 'B'},
		212	+ {'listname': 'listC', 'description': 'C'},
		213	+ {'listname': 'listD', 'description': 'D'},
		214	+ ]
		215	+ lists = get_lists_choices()
		216	+ self.assertEqual(lists, [('listA', u'listA (A)'),
		217	+ ('listB', u'listB (B)'),
		218	+ ('listC', u'listC (C)'),
		219	+ ('listD', u'listD (D)')])
		220	+
		221	+
		222	+class ChangePasswordFormTestCase(TestCase):
		223	+
		224	+ TEST_COLAB_APPS = {
		225	+ 'test_plugin': {
		226	+ 'password_validators': (
		227	+ 'colab.accounts.tests.utils.password_validator',
		228	+ )
		229	+ }
		230	+ }
		231	+
		232	+ @property
		233	+ def user(self):
		234	+ u = User.objects.create_user(username='test_user',
		235	+ email='test@example.com')
		236	+ u.set_password("123colab4")
		237	+ return u
		238	+
		239	+ @property
		240	+ def valid_form_data(self):
		241	+ return {'old_password': '123colab4',
		242	+ 'new_password1': '12345',
		243	+ 'new_password2': '12345'}
		244	+
		245	+ def test_no_custom_validators(self):
		246	+ form = ColabPasswordChangeForm(self.user, data=self.valid_form_data)
		247	+ self.assertTrue(form.is_valid(), True)
		248	+
		249	+ @override_settings(COLAB_APPS=TEST_COLAB_APPS)
		250	+ @patch('colab.accounts.tests.utils.password_validator')
		251	+ def test_custom_validator(self, validator):
		252	+ form = ColabPasswordChangeForm(self.user, data=self.valid_form_data)
		253	+ self.assertTrue(form.is_valid())
		254	+ validator.assert_called_with('12345')
		255	+
		256	+
		257	+class UserCreationFormTestCase(TestCase):
		258	+
		259	+ @classmethod
		260	+ def setUpClass(cls):
		261	+ cls.user = User.objects.create_user(username='user1234',
		262	+ email='teste1234@example.com',
		263	+ first_name='test_first_name',
		264	+ last_name='test_last_name')
		265	+
		266	+ cls.user.set_password("123colab4")
		267	+ cls.user.save()
		268	+
		269	+ def get_form_data(self, email, username='test_user',
		270	+ password1='12345', password2='12345'):
		271	+ return {
		272	+ 'first_name': 'test_first_name',
		273	+ 'last_name': 'test_last_name',
		274	+ 'username': username,
		275	+ 'email': email,
		276	+ 'password1': password1,
		277	+ 'password2': password2
		278	+ }
		279	+
		280	+ def test_clean_mail_error(self):
		281	+ creation_form = UserCreationForm(
		282	+ data=self.get_form_data('teste1234@example.com'))
		283	+ self.assertFalse(creation_form.is_valid())
		284	+ self.assertTrue('email' in creation_form.errors)
		285	+ self.assertEqual(1, len(creation_form.errors))
		286	+
		287	+ def test_clean_mail(self):
		288	+ creation_form = UserCreationForm(
		289	+ data=self.get_form_data('teste12345@example.com'))
		290	+ self.assertTrue(creation_form.is_valid())
		291	+
		292	+ def test_clean_username_error(self):
		293	+ creation_form = UserCreationForm(
		294	+ data=self.get_form_data('teste12345@example.com',
		295	+ username='user1234'))
		296	+ self.assertFalse(creation_form.is_valid())
		297	+ self.assertTrue('username' in creation_form.errors)
		298	+ self.assertEqual(1, len(creation_form.errors))
		299	+
		300	+ def test_clean_username(self):
		301	+ creation_form = UserCreationForm(
		302	+ data=self.get_form_data('teste12345@example.com',
		303	+ username='user12345'))
		304	+ self.assertTrue(creation_form.is_valid())
		305	+
		306	+ def test_clean_password2_empty_password1(self):
		307	+ creation_form = UserCreationForm(
		308	+ data=self.get_form_data('teste12345@example.com',
		309	+ username='user12345',
		310	+ password1=''))
		311	+ self.assertFalse(creation_form.is_valid())
		312	+ self.assertTrue('password1' in creation_form.errors)
		313	+ self.assertEqual(1, len(creation_form.errors))
		314	+
		315	+ def test_clean_password2_empty_password2(self):
		316	+ creation_form = UserCreationForm(
		317	+ data=self.get_form_data('teste12345@example.com',
		318	+ username='user12345',
		319	+ password2=''))
		320	+ self.assertFalse(creation_form.is_valid())
		321	+ self.assertTrue('password2' in creation_form.errors)
		322	+
		323	+ def test_clean_password2_different_passwords(self):
		324	+ creation_form = UserCreationForm(
		325	+ data=self.get_form_data('teste12345@example.com',
		326	+ username='user12345',
		327	+ password1='1234'))
		328	+ self.assertFalse(creation_form.is_valid())
		329	+ self.assertTrue('password2' in creation_form.errors)
		330	+ self.assertEqual(1, len(creation_form.errors))
		331	+ self.assertEqual(1, len(creation_form.errors))
		332	+
		333	+ def test_clean_password(self):
		334	+ creation_form = UserCreationForm(
		335	+ data=self.get_form_data('teste12345@example.com',
		336	+ username='user12345'))
		337	+ self.assertTrue(creation_form.is_valid())