Merge pull request #4 from TracyWebTech/master

Updating

Merge pull request #4 from TracyWebTech/master
Updating
Sergio Oliveira
2 parents 4a86615c 1ce3e428
Showing 48 changed files with 682 additions and 546 deletions Show diff stats
fabfile.py
puppet/modules/colab/templates/nginx/site_default.erb
requirements.txt
src/accounts/errors.py
src/accounts/forms.py
src/accounts/models.py
src/accounts/templates/accounts/change_password.html
src/accounts/templates/accounts/user_detail.html
src/accounts/templates/accounts/user_update_form.html
src/accounts/urls.py
src/accounts/views.py
src/badger/admin.py
src/badger/fixtures/badges.json
src/badger/fixtures/images/brass_coder.png
src/badger/fixtures/images/brass_contributor.png
src/badger/fixtures/images/brass_messenger.png
src/badger/fixtures/images/brass_tracker.png
src/badger/fixtures/images/brass_writer.png
src/badger/fixtures/images/diamond_coder.png
src/badger/fixtures/images/diamond_contributor.png
@@ -81,7 +81,6 @@ def deploy(update=False):
     if update:
         update_requirements()
  
-    load_badges()
     with cd('~/colab/src/'), prefix(WORKON_COLAB):
         run('python manage.py syncdb')
         run('python manage.py migrate')
@@ -91,17 +90,6 @@ def deploy(update=False):
     sudo('supervisorctl restart all')
  
  
-def load_badges(local=False):
-    path = '/vagrant/' if local else '~/colab/'
-
-    run(u'mkdir -p {}www/media/badges'.format(path))
-
-    with cd(u'{}src/'.format(path)), prefix(WORKON_COLAB):
-        run('cp badger/fixtures/images/*.png ../www/media/badges/')
-        run('python manage.py loaddata badger/fixtures/badges.json')
-        run('python manage.py update_badges')
-
-
 def rebuild_index(age=None, batch=None):
     with cd('~/colab/src/'), prefix(WORKON_COLAB):
         age_arg = ''
@@ -139,5 +127,4 @@ def runserver(update_requirements=False):
  
         run('python manage.py syncdb')
         run('python manage.py migrate')
-        load_badges(local=True)
         run('python manage.py runserver 0.0.0.0:7000')
@@ -40,6 +40,14 @@ server {
         proxy_pass http://10.1.2.81;
     }
  
+    location /ci/static {
+        proxy_pass http://10.1.2.171:8080;
+    }
+
+    location /ci/adjuncts {
+        proxy_pass http://10.1.2.171:8080;
+    }
+
     location / {
         try_files /home/colab/colab/www$uri @django;
     }
@@ -5,7 +5,7 @@ django-piston==0.2.3
 pytz==2011n
 chardet==1.0.1
 python-dateutil==1.5
-django-cliauth==0.9
+django-cliauth==0.9.1
 django-mobile==0.3.0
 django-haystack==2.1
 pysolr==2.1
@@ -28,10 +28,10 @@ tornado==3.1.1
 # Deps for Single SignOn (SSO)
 git+https://github.com/mozilla/django-browserid
  
-django-revproxy==0.2.5
+django-revproxy==0.2.7
  
 # Converse.js (XMPP client)
-django-conversejs==0.2.8
+django-conversejs==0.2.9
 git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
  
 # Feedzilla (planet) and deps
@@ -0,0 +1,2 @@
+class XMPPChangePwdException(Exception):
+    """Error changing XMPP Account password"""
@@ -4,6 +4,8 @@ from django import forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
  
+from conversejs.models import XMPPAccount
+
 from super_archives.models import MailingList
 from .utils.validators import validate_social_account
  
@@ -50,7 +52,7 @@ class UserUpdateForm(UserForm):
  
     class Meta:
         model = User
-        fields = ('username', 'first_name', 'last_name',
+        fields = ('first_name', 'last_name',
                   'institution', 'role', 'twitter', 'facebook',
                   'google_talk', 'webpage')
  
@@ -64,3 +66,38 @@ class ListsForm(forms.Form):
                                       required=False,
                                       widget=forms.CheckboxSelectMultiple,
                                       choices=LISTS_NAMES)
+
+
+class ChangeXMPPPasswordForm(forms.ModelForm):
+    password1 = forms.CharField(label=_("Password"),
+        widget=forms.PasswordInput)
+    password2 = forms.CharField(label=_("Password confirmation"),
+        widget=forms.PasswordInput,
+        help_text=_("Enter the same password as above, for verification."))
+
+    class Meta:
+        model = XMPPAccount
+        fields = ('password1', 'password2')
+
+    def __init__(self, *args, **kwargs):
+        super(ChangeXMPPPasswordForm, self).__init__(*args, **kwargs)
+
+        for field_name, field in self.fields.items():
+            # Adds form-control class to all form fields
+            field.widget.attrs.update({'class': 'form-control'})
+
+    def clean_password2(self):
+        password1 = self.cleaned_data.get("password1")
+        password2 = self.cleaned_data.get("password2")
+        if password1 and password2 and password1 != password2:
+            raise forms.ValidationError(
+                _("Password mismatch"),
+                code='password_mismatch',
+            )
+        return password2
+
+    def save(self, commit=True):
+        self.instance.password = self.cleaned_data['password2']
+        if commit:
+            self.instance.save()
+        return self.instance
+# -*- coding: utf-8 -*-
  
 import urlparse
  
-from django.db import models
+from django.db import models, DatabaseError
+from django.contrib.auth.hashers import check_password
 from django.contrib.auth.models import AbstractUser
 from django.core.urlresolvers import reverse
  
+from conversejs import xmpp
+
 from .utils import mailman
  
  
@@ -18,6 +22,13 @@ class User(AbstractUser):
     verification_hash = models.CharField(max_length=32, null=True, blank=True)
     modified = models.DateTimeField(auto_now=True)
  
+    def check_password(self, raw_password):
+
+        if self.xmpp.exists() and raw_password == self.xmpp.first().password:
+            return True
+
+        return super(User, self).check_password(raw_password)
+
     def get_absolute_url(self):
         return reverse('user_profile', kwargs={'username': self.username})
  
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block main-content %}
+<form method="POST" role="form">
+  {% csrf_token %}
+  <div class="row">
+    <h2>{% trans "Change XMPP Client and SVN Password" %}</h2>
+    <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
+      {% for field in form %}
+        <div class="form-group required{% if field.errors %} alert alert-danger has-error{% endif %}">
+          <label for="{{ field.name }}" class="control-label">{{ field.label }}</label>
+          {{ field }}
+          {{ field.errors }}
+        </div>
+      {% endfor %}
+      <button class="btn btn-primary">{% trans "Change Password" %}</button>
+    </div>
+  </div>
+</form>
+{% endblock %}
@@ -109,7 +109,7 @@
               <div>
                 {% for badge in user_.badge_set.all %}
                   {% translate badge as badge_trans %}
-                  <img src="{{ badge.get_badge_url }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
+                  <img src="data:image/png;base64,{{ badge.image_base64 }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
                 {% endfor %}
               </div>
             </div>
@@ -178,6 +178,21 @@ $(function() {
           </div>
         </div>
       </div>
+
+      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
+          </div>
+          <div class="panel-body">
+            <div class="form-group">
+            {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
+            </div>
+            <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
+          </div>
+        </div>
+      </div>
+
     </div>
     <div class="row">
       <div class="submit">
  
 from django.conf.urls import patterns, include, url
  
-from .views import UserProfileDetailView, UserProfileUpdateView, \
-                   ManageUserSubscriptionsView
+from .views import (UserProfileDetailView, UserProfileUpdateView,
+                    ManageUserSubscriptionsView, ChangeXMPPPasswordView)
  
  
 urlpatterns = patterns('',
     url(r'^register/$', 'accounts.views.signup', name='signup'),
  
+    url(r'^change-password/$',
+        ChangeXMPPPasswordView.as_view(), name='change_password'),
+
+    url(r'^logout/?$', 'django.contrib.auth.views.logout'),
+
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
  
@@ -6,20 +6,26 @@ import datetime
 from collections import OrderedDict
  
 from django.contrib import messages
+from django.db import transaction
 from django.db.models import Count
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext as _
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 from django.views.generic import DetailView, UpdateView
+from django.utils.decorators import method_decorator
  
+from conversejs import xmpp
+from conversejs.models import XMPPAccount
 from haystack.query import SearchQuerySet
  
 from super_archives.models import EmailAddress, Message
 from super_archives.utils.email import send_email_lists
 from search.utils import trans
-from .forms import UserCreationForm, ListsForm, UserUpdateForm
+from .forms import (UserCreationForm, ListsForm, UserUpdateForm,
+                    ChangeXMPPPasswordForm)
+from .errors import XMPPChangePwdException
 from .utils import mailman
  
  
@@ -129,6 +135,14 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
     http_method_names = [u'get', u'post']
     template_name = u'accounts/manage_subscriptions.html'
  
+    def get_object(self, *args, **kwargs):
+        obj = super(ManageUserSubscriptionsView, self).get_object(*args,
+                                                                  **kwargs)
+        if self.request.user != obj and not self.request.user.is_superuser:
+            raise PermissionDenied
+
+        return obj
+
     def post(self, request, *args, **kwargs):
         user = self.get_object()
         for email in user.emails.values_list('address', flat=True):
@@ -160,3 +174,47 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
         context.update(kwargs)
  
         return super(ManageUserSubscriptionsView, self).get_context_data(**context)
+
+
+class ChangeXMPPPasswordView(UpdateView):
+    model = XMPPAccount
+    form_class = ChangeXMPPPasswordForm
+    fields = ['password', ]
+    template_name = 'accounts/change_password.html'
+
+    def get_success_url(self):
+        return reverse('user_profile', kwargs={
+            'username': self.request.user.username
+        })
+
+    def get_object(self, queryset=None):
+        obj = get_object_or_404(XMPPAccount, user=self.request.user.pk)
+        self.old_password = obj.password
+        return obj
+
+    def form_valid(self, form):
+        transaction.set_autocommit(False)
+
+        response = super(ChangeXMPPPasswordView, self).form_valid(form)
+
+        changed = xmpp.change_password(
+            self.object.jid,
+            self.old_password,
+            form.cleaned_data['password1']
+        )
+
+        if not changed:
+            messages.error(
+                self.request,
+                _(u'Could not change your password. Please, try again later.')
+            )
+            transaction.rollback()
+            return response
+        else:
+            transaction.commit()
+
+        messages.success(
+            self.request,
+            _("You've changed your password successfully!")
+        )
+        return response
@@ -3,6 +3,7 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
  
+from .forms import BadgeForm
 from .models import Badge, BadgeI18N
  
  
@@ -11,6 +12,7 @@ class BadgeI18NInline(admin.TabularInline):
  
  
 class BadgeAdmin(admin.ModelAdmin):
+    form = BadgeForm
     inlines = [BadgeI18NInline, ]
     list_display = ['title', 'description', 'order']
     list_editable = ['order', ]
@@ -1,502 +0,0 @@
-[
-{
-    "pk": 6,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 10000 Messages",
-        "title": "Diamond Messenger",
-        "image": "badges/diamond_messenger.png",
-        "value": 10000,
-        "user_attr": "messages",
-        "type": "auto",
-        "order": 4
-    }
-},
-{
-    "pk": 8,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 100 messages",
-        "title": "Brass Messenger",
-        "image": "badges/brass_messenger.png",
-        "value": 100,
-        "user_attr": "messages",
-        "type": "auto",
-        "order": 1
-    }
-},
-{
-    "pk": 9,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 500 Messages",
-        "title": "Silver Messenger",
-        "image": "badges/silver_messenger.png",
-        "value": 500,
-        "user_attr": "messages",
-        "type": "auto",
-        "order": 2
-    }
-},
-{
-    "pk": 10,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 1000 Messages",
-        "title": "Gold Messenger",
-        "image": "badges/gold_messenger.png",
-        "value": 1000,
-        "user_attr": "messages",
-        "type": "auto",
-        "order": 3
-    }
-},
-{
-    "pk": 11,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 10 Tickets",
-        "title": "Brass Tracker",
-        "image": "badges/brass_tracker.png",
-        "value": 10,
-        "user_attr": "tickets",
-        "type": "auto",
-        "order": 5
-    }
-},
-{
-    "pk": 12,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 50 Tickets",
-        "title": "Silver Tracker",
-        "image": "badges/silver_tracker.png",
-        "value": 50,
-        "user_attr": "tickets",
-        "type": "auto",
-        "order": 6
-    }
-},
-{
-    "pk": 13,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "Mais que 100 Tickets",
-        "title": "Gold Tracker",
-        "image": "badges/gold_tracker.png",
-        "value": 100,
-        "user_attr": "tickets",
-        "type": "auto",
-        "order": 7
-    }
-},
-{
-    "pk": 14,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "Mais que 500 Tickets",
-        "title": "Diamond Tracker",
-        "image": "badges/diamond_tracker.png",
-        "value": 500,
-        "user_attr": "tickets",
-        "type": "auto",
-        "order": 8
-    }
-},
-{
-    "pk": 15,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 100 Changesets",
-        "title": "Brass Coder",
-        "image": "badges/brass_coder.png",
-        "value": 100,
-        "user_attr": "revisions",
-        "type": "auto",
-        "order": 9
-    }
-},
-{
-    "pk": 16,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 500 Changesets",
-        "title": "Silver Coder",
-        "image": "badges/silver_coder.png",
-        "value": 500,
-        "user_attr": "revisions",
-        "type": "auto",
-        "order": 10
-    }
-},
-{
-    "pk": 17,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 1000 Changesets",
-        "title": "Gold Coder",
-        "image": "badges/gold_coder.png",
-        "value": 1000,
-        "user_attr": "revisions",
-        "type": "auto",
-        "order": 11
-    }
-},
-{
-    "pk": 18,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 10000 Changesets",
-        "title": "Diamond Coder",
-        "image": "badges/diamond_coder.png",
-        "value": 10000,
-        "user_attr": "revisions",
-        "type": "auto",
-        "order": 12
-    }
-},
-{
-    "pk": 19,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 10 Wikis",
-        "title": "Brass Writer",
-        "image": "badges/brass_writer.png",
-        "value": 10,
-        "user_attr": "wikis",
-        "type": "auto",
-        "order": 13
-    }
-},
-{
-    "pk": 20,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 50 Wikis",
-        "title": "Silver Writer",
-        "image": "badges/silver_writer.png",
-        "value": 50,
-        "user_attr": "wikis",
-        "type": "auto",
-        "order": 14
-    }
-},
-{
-    "pk": 21,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 100 Wikis",
-        "title": "Gold Writer",
-        "image": "badges/gold_writer.png",
-        "value": 100,
-        "user_attr": "wikis",
-        "type": "auto",
-        "order": 15
-    }
-},
-{
-    "pk": 22,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 500 Wikis",
-        "title": "Diamond Writer",
-        "image": "badges/diamond_writer.png",
-        "value": 500,
-        "user_attr": "wikis",
-        "type": "auto",
-        "order": 16
-    }
-},
-{
-    "pk": 23,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 500 Contributions",
-        "title": "Brass Contributor",
-        "image": "badges/brass_contributor.png",
-        "value": 500,
-        "user_attr": "contributions",
-        "type": "auto",
-        "order": 17
-    }
-},
-{
-    "pk": 24,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 1000 Contributions",
-        "title": "Silver Contributor",
-        "image": "badges/silver_contributor.png",
-        "value": 1000,
-        "user_attr": "contributions",
-        "type": "auto",
-        "order": 18
-    }
-},
-{
-    "pk": 25,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 3000 Contributions",
-        "title": "Gold Contributor",
-        "image": "badges/gold_contributor.png",
-        "value": 3000,
-        "user_attr": "contributions",
-        "type": "auto",
-        "order": 19
-    }
-},
-{
-    "pk": 26,
-    "model": "badger.badge",
-    "fields": {
-        "awardees": [],
-        "comparison": "gte",
-        "description": "More than 5000 Contributions",
-        "title": "Diamond Contributor",
-        "image": "badges/diamond_contributor.png",
-        "value": 5000,
-        "user_attr": "contributions",
-        "type": "auto",
-        "order": 20
-    }
-},
-{
-    "pk": 1,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 8,
-        "description": "Mais que 100 Mensagens",
-        "title": "Mensageiro Bronze"
-    }
-},
-{
-    "pk": 2,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 9,
-        "description": "Mais que 500 Mensagens",
-        "title": "Mensageiro Prata"
-    }
-},
-{
-    "pk": 3,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 6,
-        "description": "Mais que 10000 Mensagens",
-        "title": "Mensageiro Diamante"
-    }
-},
-{
-    "pk": 4,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 10,
-        "description": "Mais que 1000 Mensagens",
-        "title": "Mensageiro Ouro"
-    }
-},
-{
-    "pk": 5,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 11,
-        "description": "Mais que 10 T\u00edquetes",
-        "title": "Rastreador Bronze"
-    }
-},
-{
-    "pk": 6,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 12,
-        "description": "Mais que 50 T\u00edquetes",
-        "title": "Rastreador Prata"
-    }
-},
-{
-    "pk": 7,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 13,
-        "description": "Mais que 100 T\u00edquetes",
-        "title": "Rastreador Ouro"
-    }
-},
-{
-    "pk": 8,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 14,
-        "description": "Mais que 500 T\u00edquetes",
-        "title": "Rastreador Diamante"
-    }
-},
-{
-    "pk": 9,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 15,
-        "description": "Mais que 100 Modifica\u00e7\u00f5es de c\u00f3digo",
-        "title": "Programador Bronze"
-    }
-},
-{
-    "pk": 10,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 16,
-        "description": "Mais que 500 Modifica\u00e7\u00f5es de c\u00f3digo",
-        "title": "Programador Prata"
-    }
-},
-{
-    "pk": 11,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 17,
-        "description": "Mais que 1000 Modifica\u00e7\u00f5es de c\u00f3digo",
-        "title": "Programador Ouro"
-    }
-},
-{
-    "pk": 12,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 18,
-        "description": "Mais que 10000 Modifica\u00e7\u00f5es de c\u00f3digo",
-        "title": "Programador Diamante"
-    }
-},
-{
-    "pk": 13,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 19,
-        "description": "Escreveu mais que 10 Wikis",
-        "title": "Escritor Bronze"
-    }
-},
-{
-    "pk": 14,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 20,
-        "description": "Escreveu mais que 50 Wikis",
-        "title": "Escritor Prata"
-    }
-},
-{
-    "pk": 15,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 21,
-        "description": "Escreveu mais que 100 Wikis",
-        "title": "Escritor Ouro"
-    }
-},
-{
-    "pk": 16,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 22,
-        "description": "Escreveu mais que 500 Wikis",
-        "title": "Escritor Diamante"
-    }
-},
-{
-    "pk": 17,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 23,
-        "description": "Mais que 500 Contribui\u00e7\u00f5es",
-        "title": "Contribuidor Bronze"
-    }
-},
-{
-    "pk": 18,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 24,
-        "description": "Mais que 1000 Contribui\u00e7\u00f5es",
-        "title": "Contribuidor Prata"
-    }
-},
-{
-    "pk": 19,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 25,
-        "description": "Mais que 3000 Contribui\u00e7\u00f5es",
-        "title": "Contribuidor Ouro"
-    }
-},
-{
-    "pk": 20,
-    "model": "badger.badgei18n",
-    "fields": {
-        "i18n_language": "pt-br",
-        "i18n_source": 26,
-        "description": "Mais que 5000 Contribui\u00e7\u00f5es",
-        "title": "Contribuidor Diamante"
-    }
-}
-]
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+
+import base64
+
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+from PIL import Image
+
+from .models import Badge
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+
+class BadgeForm(forms.ModelForm):
+    image = forms.ImageField(label=_(u'Image'), required=False)
+
+    class Meta:
+        model = Badge
+        fields = (
+            'title', 'description', 'image', 'user_attr', 'comparison',
+            'value', 'awardees'
+        )
+
+    def clean_image(self):
+        if not self.instance.pk and not self.cleaned_data['image']:
+            raise forms.ValidationError(_(u'You must add an Image'))
+        return self.cleaned_data['image']
+
+    def save(self, commit=True):
+
+        instance = super(BadgeForm, self).save(commit=False)
+
+        if self.cleaned_data['image']:
+            img = Image.open(self.cleaned_data['image'])
+            img = img.resize((50, 50), Image.ANTIALIAS)
+            f = StringIO()
+            img.save(f, 'png')
+            instance.image_base64 = f.getvalue().encode('base64')
+            f.close()
+
+        if commit:
+            instance.save()
+
+        return instance
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Badge.image_base64'
+        db.add_column(u'badger_badge', 'image_base64',
+                      self.gf('django.db.models.fields.TextField')(default=''),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Badge.image_base64'
+        db.delete_column(u'badger_badge', 'image_base64')
+
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'badger.badge': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
+            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
+            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'image_base64': ('django.db.models.fields.TextField', [], {}),
+            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'badger.badgei18n': {
+            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['badger']
 \ No newline at end of file
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+import base64
+import os
+
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from django.conf import settings
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        for obj in orm.Badge.objects.all():
+            img = open(os.path.join(settings.MEDIA_ROOT, obj.image.path))
+            obj.image_base64 = base64.b64encode(img.read())
+            obj.save()
+
+    def backwards(self, orm):
+        for obj in orm.Badge.objects.all():
+            obj.image_base64 = ''
+            obj.save()
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'badger.badge': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
+            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
+            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+            'image_base64': ('django.db.models.fields.TextField', [], {}),
+            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'badger.badgei18n': {
+            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['badger']
+    symmetrical = True
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Badge.image'
+        db.delete_column(u'badger_badge', 'image')
+
+
+    def backwards(self, orm):
+        # Adding field 'Badge.image'
+        db.add_column(u'badger_badge', 'image',
+                      self.gf('django.db.models.fields.files.ImageField')(default='', max_length=100),
+                      keep_default=False)
+
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'badger.badge': {
+            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
+            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
+            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image_base64': ('django.db.models.fields.TextField', [], {}),
+            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'badger.badgei18n': {
+            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['badger']
 \ No newline at end of file
@@ -4,7 +4,6 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from PIL import Image
 from i18n_model.models import I18nModel
  
  
@@ -38,7 +37,7 @@ class Badge(models.Model):
                              null=True)
     description = models.CharField(_(u'Description'), max_length=200,
                                    blank=True, null=True)
-    image = models.ImageField(upload_to='badges')
+    image_base64 = models.TextField(_(u'Image'))
     type = models.CharField(_(u'Type'), max_length=200, choices=TYPE_CHOICES)
     user_attr = models.CharField(
         _(u'User attribute'),max_length=100,
@@ -71,16 +70,6 @@ class Badge(models.Model):
         verbose_name_plural = _(u'Badges')
         ordering = ['order', ]
  
-    def get_badge_url(self):
-        return u'{}{}'.format(settings.MEDIA_URL, self.image)
-
-    def save(self, *args, **kwargs):
-        img = Image.open(self.image)
-        (width, height) = img.size
-        img = img.resize((50, 50), Image.ANTIALIAS)
-        super(Badge, self).save(*args, **kwargs)
-        img.save(self.image.path)
-
     def __unicode__(self):
         return u'{} ({}, {})'.format(
             self.title,
@@ -183,10 +183,12 @@ LOGGING = {
         'django_browserid': {
             'handlers': ['sentry'],
             'level': 'WARNING',
+            'propagate': False,
         },
         'conversejs': {
             'handlers': ['console'],
             'level': 'DEBUG',
+            'propagate': False,
         },
     }
 }
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-21 10:48+0000\n"
+"POT-Creation-Date: 2013-11-26 13:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,19 +29,35 @@ msgstr &quot;Permissões&quot;
 msgid "Important dates"
 msgstr "Datas importantes"
  
-#: accounts/forms.py:22
+#: accounts/forms.py:24
 msgid "Social account does not exist"
 msgstr "Conta social não existe"
  
-#: accounts/forms.py:63
+#: accounts/forms.py:65
 msgid "Mailing lists"
 msgstr "Listas de e-mail"
  
-#: accounts/views.py:121
+#: accounts/forms.py:72
+msgid "Password"
+msgstr "Senha"
+
+#: accounts/forms.py:74
+msgid "Password confirmation"
+msgstr "Confirmação de senha"
+
+#: accounts/forms.py:76
+msgid "Enter the same password as above, for verification."
+msgstr "Digite a mesma senha que acima, para verificação."
+
+#: accounts/forms.py:94
+msgid "Password mismatch"
+msgstr "Senhas diferentes"
+
+#: accounts/views.py:127
 msgid "Your profile has been created!"
 msgstr "Seu perfil foi criado!"
  
-#: accounts/views.py:122
+#: accounts/views.py:128
 msgid ""
 "You must login to validated your profile. Profiles not validated are deleted "
 "in 24h."
@@ -49,11 +65,29 @@ msgstr &quot;&quot;
 "Você deve se logar para validar seu perfil. Perfis não validados serão "
 "deletados em 24h."
  
+#: accounts/views.py:209
+msgid "Could not change your password. Please, try again later."
+msgstr ""
+"Não conseguimos alterar sua senha. Por favor, tente novamente mais tarde."
+
+#: accounts/views.py:218
+msgid "You've changed your password successfully!"
+msgstr "Senha alterada com sucesso!"
+
 #: accounts/management/commands/delete_invalid.py:42
 #, python-format
 msgid "%(count)s users deleted."
 msgstr "%(count)s usuários deletados."
  
+#: accounts/templates/accounts/change_password.html:8
+msgid "Change XMPP Client and SVN Password"
+msgstr "Trocar senha do SVN e do Mensageiro"
+
+#: accounts/templates/accounts/change_password.html:17
+#: accounts/templates/accounts/user_update_form.html:191
+msgid "Change Password"
+msgstr "Trocar senha"
+
 #: accounts/templates/accounts/manage_subscriptions.html:6
 msgid "Mailing List Subscriptions"
 msgstr "Inscrições em listas de e-mails"
@@ -195,7 +229,19 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
 msgid "Add"
 msgstr "Adicionar"
  
-#: accounts/templates/accounts/user_update_form.html:184
+#: accounts/templates/accounts/user_update_form.html:185
+msgid "Change SVN and XMPP Client password"
+msgstr "Trocar a senha do SVN e do Mensageiro"
+
+#: accounts/templates/accounts/user_update_form.html:189
+msgid ""
+"You don't need to change this password. Change it only if you really know "
+"what you are doing."
+msgstr ""
+"Você não precisa trocar essa senha. Troque-a somente se tem certeza do que "
+"está fazendo."
+
+#: accounts/templates/accounts/user_update_form.html:199
 msgid "Update"
 msgstr "Atualizar"
  
@@ -0,0 +1,25 @@
+<rules
+    xmlns="http://namespaces.plone.org/diazo"
+    xmlns:css="http://namespaces.plone.org/diazo/css"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <before theme-children="/html/head" content-children="/html/head" />
+    <before css:theme-children="#main-content" css:content-children="body" />
+
+    <merge attributes="class" css:theme="body" css:content="body" />
+    <drop css:content="#top-panel" />
+
+    <after theme-children="/html/head">
+      <script>jQuery.noConflict();</script>
+      <style>
+        #breadcrumbs {
+          border: 0 !important;
+        }
+
+        #right-top-nav {
+          margin-right: 5em !important;
+        }
+      </style>
+    </after>
+
+</rules>
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+import datetime
+from django.db import connections
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        # Selecting trac database
+        connection = connections['trac']
+
+        cursor = connection.cursor()
+
+        cursor.execute('''
+            CREATE OR REPLACE VIEW wiki_view AS SELECT
+                wiki.name AS name,
+                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
+                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
+                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
+                 AND wiki3.version = 1) AS author,
+                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified
+            FROM wiki
+            GROUP BY wiki.name;
+        ''')
+
+    def backwards(self, orm):
+        # Selecting trac database
+        connection = connections['trac']
+
+        cursor = connection.cursor()
+
+        cursor.execute('''
+            CREATE OR REPLACE VIEW wiki_view AS SELECT
+                wiki.name AS name,
+                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
+                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
+                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
+                 AND wiki3.version = 1) AS author,
+                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS created,
+                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS modified
+            FROM wiki
+            GROUP BY wiki.name;
+        ''')
+
+    models = {
+        u'proxy.attachment': {
+            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
+            'attach_id': ('django.db.models.fields.TextField', [], {}),
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'filename': ('django.db.models.fields.TextField', [], {}),
+            'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
+            'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'used_by': ('django.db.models.fields.TextField', [], {})
+        },
+        u'proxy.revision': {
+            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.ticket': {
+            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.wiki': {
+            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['proxy']
+    symmetrical = True
@@ -101,6 +101,8 @@ class ColabSearchForm(SearchForm):
                 'q.alt': '*.*',
                 'pf': 'title^2.1 author^1.9 description^1.7',
                 'mm': '2<70%',
+
+                # Date boosting: http://wiki.apache.org/solr/FunctionQuery#Date_Boosting
                 'bf': 'recip(ms(NOW/HOUR,modified),3.16e-11,1,1)^10',
             }
  
@@ -25,6 +25,9 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
         model_attr='mailinglist__get_absolute_url',
         indexed=False,
     )
+    latest_message_pk = indexes.IntegerField(
+        model_attr='latest_message__pk', indexed=False
+    )
     score = indexes.IntegerField(model_attr='score')
  
     def get_model(self):
@@ -10,7 +10,7 @@
 {% endif %}
  
 {% if result.title %}
-  <a href="{{ result.url }}" {% if result.latest_description %}title="{{ result.latest_description|escape|truncatechars:150 }}"{% elif result.description %}title="{{ result.description|escape|truncatechars:150 }}"{% endif %}>
+  <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 %}
@@ -10,11 +10,11 @@ class TimezoneMiddleware(object):
  
         try:
             offset = int(offset) * -1
+            tz = pytz.FixedOffset(offset)
         except ValueError:
             offset = 0
  
         if offset:
-            tz = pytz.FixedOffset(offset)
             timezone.activate(tz)
         else:
             timezone.deactivate()
 <script type="text/javascript">
   var date = new Date();
-  $.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });
+  jQuery.cookie('utc_offset', date.getTimezoneOffset(), { path: '/' });
 </script>
...	...	@@ -81,7 +81,6 @@ def deploy(update=False):
81	81	if update:
82	82	update_requirements()
83	83
84		- load_badges()
85	84	with cd('~/colab/src/'), prefix(WORKON_COLAB):
86	85	run('python manage.py syncdb')
87	86	run('python manage.py migrate')
...	...	@@ -91,17 +90,6 @@ def deploy(update=False):
91	90	sudo('supervisorctl restart all')
92	91
93	92
94		-def load_badges(local=False):
95		- path = '/vagrant/' if local else '~/colab/'
96		-
97		- run(u'mkdir -p {}www/media/badges'.format(path))
98		-
99		- with cd(u'{}src/'.format(path)), prefix(WORKON_COLAB):
100		- run('cp badger/fixtures/images/*.png ../www/media/badges/')
101		- run('python manage.py loaddata badger/fixtures/badges.json')
102		- run('python manage.py update_badges')
103		-
104		-
105	93	def rebuild_index(age=None, batch=None):
106	94	with cd('~/colab/src/'), prefix(WORKON_COLAB):
107	95	age_arg = ''
...	...	@@ -139,5 +127,4 @@ def runserver(update_requirements=False):
139	127
140	128	run('python manage.py syncdb')
141	129	run('python manage.py migrate')
142		- load_badges(local=True)
143	130	run('python manage.py runserver 0.0.0.0:7000')
...	...
...	...	@@ -40,6 +40,14 @@ server {
40	40	proxy_pass http://10.1.2.81;
41	41	}
42	42
	43	+ location /ci/static {
	44	+ proxy_pass http://10.1.2.171:8080;
	45	+ }
	46	+
	47	+ location /ci/adjuncts {
	48	+ proxy_pass http://10.1.2.171:8080;
	49	+ }
	50	+
43	51	location / {
44	52	try_files /home/colab/colab/www$uri @django;
45	53	}
...	...
...	...	@@ -5,7 +5,7 @@ django-piston==0.2.3
5	5	pytz==2011n
6	6	chardet==1.0.1
7	7	python-dateutil==1.5
8		-django-cliauth==0.9
	8	+django-cliauth==0.9.1
9	9	django-mobile==0.3.0
10	10	django-haystack==2.1
11	11	pysolr==2.1
...	...	@@ -28,10 +28,10 @@ tornado==3.1.1
28	28	# Deps for Single SignOn (SSO)
29	29	git+https://github.com/mozilla/django-browserid
30	30
31		-django-revproxy==0.2.5
	31	+django-revproxy==0.2.7
32	32
33	33	# Converse.js (XMPP client)
34		-django-conversejs==0.2.8
	34	+django-conversejs==0.2.9
35	35	git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
36	36
37	37	# Feedzilla (planet) and deps
...	...
...	...	@@ -0,0 +1,2 @@
	1	+class XMPPChangePwdException(Exception):
	2	+ """Error changing XMPP Account password"""
...	...
...	...	@@ -4,6 +4,8 @@ from django import forms
4	4	from django.contrib.auth import get_user_model
5	5	from django.utils.translation import ugettext_lazy as _
6	6
	7	+from conversejs.models import XMPPAccount
	8	+
7	9	from super_archives.models import MailingList
8	10	from .utils.validators import validate_social_account
9	11
...	...	@@ -50,7 +52,7 @@ class UserUpdateForm(UserForm):
50	52
51	53	class Meta:
52	54	model = User
53		- fields = ('username', 'first_name', 'last_name',
	55	+ fields = ('first_name', 'last_name',
54	56	'institution', 'role', 'twitter', 'facebook',
55	57	'google_talk', 'webpage')
56	58
...	...	@@ -64,3 +66,38 @@ class ListsForm(forms.Form):
64	66	required=False,
65	67	widget=forms.CheckboxSelectMultiple,
66	68	choices=LISTS_NAMES)
	69	+
	70	+
	71	+class ChangeXMPPPasswordForm(forms.ModelForm):
	72	+ password1 = forms.CharField(label=_("Password"),
	73	+ widget=forms.PasswordInput)
	74	+ password2 = forms.CharField(label=_("Password confirmation"),
	75	+ widget=forms.PasswordInput,
	76	+ help_text=_("Enter the same password as above, for verification."))
	77	+
	78	+ class Meta:
	79	+ model = XMPPAccount
	80	+ fields = ('password1', 'password2')
	81	+
	82	+ def __init__(self, args, *kwargs):
	83	+ super(ChangeXMPPPasswordForm, self).__init__(args, *kwargs)
	84	+
	85	+ for field_name, field in self.fields.items():
	86	+ # Adds form-control class to all form fields
	87	+ field.widget.attrs.update({'class': 'form-control'})
	88	+
	89	+ def clean_password2(self):
	90	+ password1 = self.cleaned_data.get("password1")
	91	+ password2 = self.cleaned_data.get("password2")
	92	+ if password1 and password2 and password1 != password2:
	93	+ raise forms.ValidationError(
	94	+ _("Password mismatch"),
	95	+ code='password_mismatch',
	96	+ )
	97	+ return password2
	98	+
	99	+ def save(self, commit=True):
	100	+ self.instance.password = self.cleaned_data['password2']
	101	+ if commit:
	102	+ self.instance.save()
	103	+ return self.instance
...	...
	1	+# -- coding: utf-8 --
1	2
2	3	import urlparse
3	4
4		-from django.db import models
	5	+from django.db import models, DatabaseError
	6	+from django.contrib.auth.hashers import check_password
5	7	from django.contrib.auth.models import AbstractUser
6	8	from django.core.urlresolvers import reverse
7	9
	10	+from conversejs import xmpp
	11	+
8	12	from .utils import mailman
9	13
10	14
...	...	@@ -18,6 +22,13 @@ class User(AbstractUser):
18	22	verification_hash = models.CharField(max_length=32, null=True, blank=True)
19	23	modified = models.DateTimeField(auto_now=True)
20	24
	25	+ def check_password(self, raw_password):
	26	+
	27	+ if self.xmpp.exists() and raw_password == self.xmpp.first().password:
	28	+ return True
	29	+
	30	+ return super(User, self).check_password(raw_password)
	31	+
21	32	def get_absolute_url(self):
22	33	return reverse('user_profile', kwargs={'username': self.username})
23	34
...	...
...	...	@@ -0,0 +1,21 @@
	1	+{% extends "base.html" %}
	2	+{% load i18n %}
	3	+
	4	+{% block main-content %}
	5	+<form method="POST" role="form">
	6	+ {% csrf_token %}
	7	+ <div class="row">
	8	+ <h2>{% trans "Change XMPP Client and SVN Password" %}</h2>
	9	+ <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
	10	+ {% for field in form %}
	11	+ <div class="form-group required{% if field.errors %} alert alert-danger has-error{% endif %}">
	12	+ <label for="{{ field.name }}" class="control-label">{{ field.label }}</label>
	13	+ {{ field }}
	14	+ {{ field.errors }}
	15	+ </div>
	16	+ {% endfor %}
	17	+ <button class="btn btn-primary">{% trans "Change Password" %}</button>
	18	+ </div>
	19	+ </div>
	20	+</form>
	21	+{% endblock %}
...	...
...	...	@@ -109,7 +109,7 @@
109	109	<div>
110	110	{% for badge in user_.badge_set.all %}
111	111	{% translate badge as badge_trans %}
112		- <img src="{{ badge.get_badge_url }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
	112	+ <img src="data:image/png;base64,{{ badge.image_base64 }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
113	113	{% endfor %}
114	114	</div>
115	115	</div>
...	...
...	...	@@ -178,6 +178,21 @@ $(function() {
178	178	</div>
179	179	</div>
180	180	</div>
	181	+
	182	+ <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
	183	+ <div class="panel panel-default">
	184	+ <div class="panel-heading">
	185	+ <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
	186	+ </div>
	187	+ <div class="panel-body">
	188	+ <div class="form-group">
	189	+ {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
	190	+ </div>
	191	+ <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
	192	+ </div>
	193	+ </div>
	194	+ </div>
	195	+
181	196	</div>
182	197	<div class="row">
183	198	<div class="submit">
...	...
1	1
2	2	from django.conf.urls import patterns, include, url
3	3
4		-from .views import UserProfileDetailView, UserProfileUpdateView, \
5		- ManageUserSubscriptionsView
	4	+from .views import (UserProfileDetailView, UserProfileUpdateView,
	5	+ ManageUserSubscriptionsView, ChangeXMPPPasswordView)
6	6
7	7
8	8	urlpatterns = patterns('',
9	9	url(r'^register/$', 'accounts.views.signup', name='signup'),
10	10
	11	+ url(r'^change-password/$',
	12	+ ChangeXMPPPasswordView.as_view(), name='change_password'),
	13	+
	14	+ url(r'^logout/?$', 'django.contrib.auth.views.logout'),
	15	+
11	16	url(r'^(?P<username>[\w@+.-]+)/?$',
12	17	UserProfileDetailView.as_view(), name='user_profile'),
13	18
...	...