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>
	@@ -40,6 +40,14 @@ server {		@@ -40,6 +40,14 @@ server {
40	proxy_pass http://10.1.2.81;	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	location / {	51	location / {
44	try_files /home/colab/colab/www$uri @django;	52	try_files /home/colab/colab/www$uri @django;
45	}	53	}
	@@ -5,7 +5,7 @@ django-piston==0.2.3		@@ -5,7 +5,7 @@ django-piston==0.2.3
5	pytz==2011n	5	pytz==2011n
6	chardet==1.0.1	6	chardet==1.0.1
7	python-dateutil==1.5	7	python-dateutil==1.5
8	-django-cliauth==0.9	8	+django-cliauth==0.9.1
9	django-mobile==0.3.0	9	django-mobile==0.3.0
10	django-haystack==2.1	10	django-haystack==2.1
11	pysolr==2.1	11	pysolr==2.1
	@@ -28,10 +28,10 @@ tornado==3.1.1		@@ -28,10 +28,10 @@ tornado==3.1.1
28	# Deps for Single SignOn (SSO)	28	# Deps for Single SignOn (SSO)
29	git+https://github.com/mozilla/django-browserid	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	# Converse.js (XMPP client)	33	# Converse.js (XMPP client)
34	-django-conversejs==0.2.8	34	+django-conversejs==0.2.9
35	git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent	35	git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
36		36
37	# Feedzilla (planet) and deps	37	# Feedzilla (planet) and deps
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+class XMPPChangePwdException(Exception):
	2	+ """Error changing XMPP Account password"""
	@@ -4,6 +4,8 @@ from django import forms		@@ -4,6 +4,8 @@ from django import forms
4	from django.contrib.auth import get_user_model	4	from django.contrib.auth import get_user_model
5	from django.utils.translation import ugettext_lazy as _	5	from django.utils.translation import ugettext_lazy as _
6		6
		7	+from conversejs.models import XMPPAccount
		8	+
7	from super_archives.models import MailingList	9	from super_archives.models import MailingList
8	from .utils.validators import validate_social_account	10	from .utils.validators import validate_social_account
9		11
	@@ -50,7 +52,7 @@ class UserUpdateForm(UserForm):		@@ -50,7 +52,7 @@ class UserUpdateForm(UserForm):
50		52
51	class Meta:	53	class Meta:
52	model = User	54	model = User
53	- fields = ('username', 'first_name', 'last_name',	55	+ fields = ('first_name', 'last_name',
54	'institution', 'role', 'twitter', 'facebook',	56	'institution', 'role', 'twitter', 'facebook',
55	'google_talk', 'webpage')	57	'google_talk', 'webpage')
56		58
	@@ -64,3 +66,38 @@ class ListsForm(forms.Form):		@@ -64,3 +66,38 @@ class ListsForm(forms.Form):
64	required=False,	66	required=False,
65	widget=forms.CheckboxSelectMultiple,	67	widget=forms.CheckboxSelectMultiple,
66	choices=LISTS_NAMES)	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
@@ -0,0 +1,21 @@		@@ -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,7 +109,7 @@
109	<div>	109	<div>
110	{% for badge in user_.badge_set.all %}	110	{% for badge in user_.badge_set.all %}
111	{% translate badge as badge_trans %}	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	{% endfor %}	113	{% endfor %}
114	</div>	114	</div>
115	</div>	115	</div>
	@@ -178,6 +178,21 @@ $(function() {		@@ -178,6 +178,21 @@ $(function() {
178	</div>	178	</div>
179	</div>	179	</div>
180	</div>	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	</div>	196	</div>
182	<div class="row">	197	<div class="row">
183	<div class="submit">	198	<div class="submit">
	@@ -6,20 +6,26 @@ import datetime		@@ -6,20 +6,26 @@ import datetime
6	from collections import OrderedDict	6	from collections import OrderedDict
7		7
8	from django.contrib import messages	8	from django.contrib import messages
		9	+from django.db import transaction
9	from django.db.models import Count	10	from django.db.models import Count
10	from django.contrib.auth import get_user_model	11	from django.contrib.auth import get_user_model
11	from django.utils.translation import ugettext as _	12	from django.utils.translation import ugettext as _
12	-from django.shortcuts import render, redirect	13	+from django.shortcuts import render, redirect, get_object_or_404
13	from django.core.urlresolvers import reverse	14	from django.core.urlresolvers import reverse
14	from django.core.exceptions import PermissionDenied	15	from django.core.exceptions import PermissionDenied
15	from django.views.generic import DetailView, UpdateView	16	from django.views.generic import DetailView, UpdateView
		17	+from django.utils.decorators import method_decorator
16		18
		19	+from conversejs import xmpp
		20	+from conversejs.models import XMPPAccount
17	from haystack.query import SearchQuerySet	21	from haystack.query import SearchQuerySet
18		22
19	from super_archives.models import EmailAddress, Message	23	from super_archives.models import EmailAddress, Message
20	from super_archives.utils.email import send_email_lists	24	from super_archives.utils.email import send_email_lists
21	from search.utils import trans	25	from search.utils import trans
22	-from .forms import UserCreationForm, ListsForm, UserUpdateForm	26	+from .forms import (UserCreationForm, ListsForm, UserUpdateForm,
		27	+ ChangeXMPPPasswordForm)
		28	+from .errors import XMPPChangePwdException
23	from .utils import mailman	29	from .utils import mailman
24		30
25		31
	@@ -129,6 +135,14 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):		@@ -129,6 +135,14 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
129	http_method_names = [u'get', u'post']	135	http_method_names = [u'get', u'post']
130	template_name = u'accounts/manage_subscriptions.html'	136	template_name = u'accounts/manage_subscriptions.html'
131		137
		138	+ def get_object(self, args, *kwargs):
		139	+ obj = super(ManageUserSubscriptionsView, self).get_object(*args,
		140	+ **kwargs)
		141	+ if self.request.user != obj and not self.request.user.is_superuser:
		142	+ raise PermissionDenied
		143	+
		144	+ return obj
		145	+
132	def post(self, request, args, *kwargs):	146	def post(self, request, args, *kwargs):
133	user = self.get_object()	147	user = self.get_object()
134	for email in user.emails.values_list('address', flat=True):	148	for email in user.emails.values_list('address', flat=True):
	@@ -160,3 +174,47 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):		@@ -160,3 +174,47 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
160	context.update(kwargs)	174	context.update(kwargs)
161		175
162	return super(ManageUserSubscriptionsView, self).get_context_data(**context)	176	return super(ManageUserSubscriptionsView, self).get_context_data(**context)
		177	+
		178	+
		179	+class ChangeXMPPPasswordView(UpdateView):
		180	+ model = XMPPAccount
		181	+ form_class = ChangeXMPPPasswordForm
		182	+ fields = ['password', ]
		183	+ template_name = 'accounts/change_password.html'
		184	+
		185	+ def get_success_url(self):
		186	+ return reverse('user_profile', kwargs={
		187	+ 'username': self.request.user.username
		188	+ })
		189	+
		190	+ def get_object(self, queryset=None):
		191	+ obj = get_object_or_404(XMPPAccount, user=self.request.user.pk)
		192	+ self.old_password = obj.password
		193	+ return obj
		194	+
		195	+ def form_valid(self, form):
		196	+ transaction.set_autocommit(False)
		197	+
		198	+ response = super(ChangeXMPPPasswordView, self).form_valid(form)
		199	+
		200	+ changed = xmpp.change_password(
		201	+ self.object.jid,
		202	+ self.old_password,
		203	+ form.cleaned_data['password1']
		204	+ )
		205	+
		206	+ if not changed:
		207	+ messages.error(
		208	+ self.request,
		209	+ _(u'Could not change your password. Please, try again later.')
		210	+ )
		211	+ transaction.rollback()
		212	+ return response
		213	+ else:
		214	+ transaction.commit()
		215	+
		216	+ messages.success(
		217	+ self.request,
		218	+ _("You've changed your password successfully!")
		219	+ )
		220	+ return response
	@@ -1,502 +0,0 @@	@@ -1,502 +0,0 @@
1	-[
2	-{
3	- "pk": 6,
4	- "model": "badger.badge",
5	- "fields": {
6	- "awardees": [],
7	- "comparison": "gte",
8	- "description": "More than 10000 Messages",
9	- "title": "Diamond Messenger",
10	- "image": "badges/diamond_messenger.png",
11	- "value": 10000,
12	- "user_attr": "messages",
13	- "type": "auto",
14	- "order": 4
15	- }
16	-},
17	-{
18	- "pk": 8,
19	- "model": "badger.badge",
20	- "fields": {
21	- "awardees": [],
22	- "comparison": "gte",
23	- "description": "More than 100 messages",
24	- "title": "Brass Messenger",
25	- "image": "badges/brass_messenger.png",
26	- "value": 100,
27	- "user_attr": "messages",
28	- "type": "auto",
29	- "order": 1
30	- }
31	-},
32	-{
33	- "pk": 9,
34	- "model": "badger.badge",
35	- "fields": {
36	- "awardees": [],
37	- "comparison": "gte",
38	- "description": "More than 500 Messages",
39	- "title": "Silver Messenger",
40	- "image": "badges/silver_messenger.png",
41	- "value": 500,
42	- "user_attr": "messages",
43	- "type": "auto",
44	- "order": 2
45	- }
46	-},
47	-{
48	- "pk": 10,
49	- "model": "badger.badge",
50	- "fields": {
51	- "awardees": [],
52	- "comparison": "gte",
53	- "description": "More than 1000 Messages",
54	- "title": "Gold Messenger",
55	- "image": "badges/gold_messenger.png",
56	- "value": 1000,
57	- "user_attr": "messages",
58	- "type": "auto",
59	- "order": 3
60	- }
61	-},
62	-{
63	- "pk": 11,
64	- "model": "badger.badge",
65	- "fields": {
66	- "awardees": [],
67	- "comparison": "gte",
68	- "description": "More than 10 Tickets",
69	- "title": "Brass Tracker",
70	- "image": "badges/brass_tracker.png",
71	- "value": 10,
72	- "user_attr": "tickets",
73	- "type": "auto",
74	- "order": 5
75	- }
76	-},
77	-{
78	- "pk": 12,
79	- "model": "badger.badge",
80	- "fields": {
81	- "awardees": [],
82	- "comparison": "gte",
83	- "description": "More than 50 Tickets",
84	- "title": "Silver Tracker",
85	- "image": "badges/silver_tracker.png",
86	- "value": 50,
87	- "user_attr": "tickets",
88	- "type": "auto",
89	- "order": 6
90	- }
91	-},
92	-{
93	- "pk": 13,
94	- "model": "badger.badge",
95	- "fields": {
96	- "awardees": [],
97	- "comparison": "gte",
98	- "description": "Mais que 100 Tickets",
99	- "title": "Gold Tracker",
100	- "image": "badges/gold_tracker.png",
101	- "value": 100,
102	- "user_attr": "tickets",
103	- "type": "auto",
104	- "order": 7
105	- }
106	-},
107	-{
108	- "pk": 14,
109	- "model": "badger.badge",
110	- "fields": {
111	- "awardees": [],
112	- "comparison": "gte",
113	- "description": "Mais que 500 Tickets",
114	- "title": "Diamond Tracker",
115	- "image": "badges/diamond_tracker.png",
116	- "value": 500,
117	- "user_attr": "tickets",
118	- "type": "auto",
119	- "order": 8
120	- }
121	-},
122	-{
123	- "pk": 15,
124	- "model": "badger.badge",
125	- "fields": {
126	- "awardees": [],
127	- "comparison": "gte",
128	- "description": "More than 100 Changesets",
129	- "title": "Brass Coder",
130	- "image": "badges/brass_coder.png",
131	- "value": 100,
132	- "user_attr": "revisions",
133	- "type": "auto",
134	- "order": 9
135	- }
136	-},
137	-{
138	- "pk": 16,
139	- "model": "badger.badge",
140	- "fields": {
141	- "awardees": [],
142	- "comparison": "gte",
143	- "description": "More than 500 Changesets",
144	- "title": "Silver Coder",
145	- "image": "badges/silver_coder.png",
146	- "value": 500,
147	- "user_attr": "revisions",
148	- "type": "auto",
149	- "order": 10
150	- }
151	-},
152	-{
153	- "pk": 17,
154	- "model": "badger.badge",
155	- "fields": {
156	- "awardees": [],
157	- "comparison": "gte",
158	- "description": "More than 1000 Changesets",
159	- "title": "Gold Coder",
160	- "image": "badges/gold_coder.png",
161	- "value": 1000,
162	- "user_attr": "revisions",
163	- "type": "auto",
164	- "order": 11
165	- }
166	-},
167	-{
168	- "pk": 18,
169	- "model": "badger.badge",
170	- "fields": {
171	- "awardees": [],
172	- "comparison": "gte",
173	- "description": "More than 10000 Changesets",
174	- "title": "Diamond Coder",
175	- "image": "badges/diamond_coder.png",
176	- "value": 10000,
177	- "user_attr": "revisions",
178	- "type": "auto",
179	- "order": 12
180	- }
181	-},
182	-{
183	- "pk": 19,
184	- "model": "badger.badge",
185	- "fields": {
186	- "awardees": [],
187	- "comparison": "gte",
188	- "description": "More than 10 Wikis",
189	- "title": "Brass Writer",
190	- "image": "badges/brass_writer.png",
191	- "value": 10,
192	- "user_attr": "wikis",
193	- "type": "auto",
194	- "order": 13
195	- }
196	-},
197	-{
198	- "pk": 20,
199	- "model": "badger.badge",
200	- "fields": {
201	- "awardees": [],
202	- "comparison": "gte",
203	- "description": "More than 50 Wikis",
204	- "title": "Silver Writer",
205	- "image": "badges/silver_writer.png",
206	- "value": 50,
207	- "user_attr": "wikis",
208	- "type": "auto",
209	- "order": 14
210	- }
211	-},
212	-{
213	- "pk": 21,
214	- "model": "badger.badge",
215	- "fields": {
216	- "awardees": [],
217	- "comparison": "gte",
218	- "description": "More than 100 Wikis",
219	- "title": "Gold Writer",
220	- "image": "badges/gold_writer.png",
221	- "value": 100,
222	- "user_attr": "wikis",
223	- "type": "auto",
224	- "order": 15
225	- }
226	-},
227	-{
228	- "pk": 22,
229	- "model": "badger.badge",
230	- "fields": {
231	- "awardees": [],
232	- "comparison": "gte",
233	- "description": "More than 500 Wikis",
234	- "title": "Diamond Writer",
235	- "image": "badges/diamond_writer.png",
236	- "value": 500,
237	- "user_attr": "wikis",
238	- "type": "auto",
239	- "order": 16
240	- }
241	-},
242	-{
243	- "pk": 23,
244	- "model": "badger.badge",
245	- "fields": {
246	- "awardees": [],
247	- "comparison": "gte",
248	- "description": "More than 500 Contributions",
249	- "title": "Brass Contributor",
250	- "image": "badges/brass_contributor.png",
251	- "value": 500,
252	- "user_attr": "contributions",
253	- "type": "auto",
254	- "order": 17
255	- }
256	-},
257	-{
258	- "pk": 24,
259	- "model": "badger.badge",
260	- "fields": {
261	- "awardees": [],
262	- "comparison": "gte",
263	- "description": "More than 1000 Contributions",
264	- "title": "Silver Contributor",
265	- "image": "badges/silver_contributor.png",
266	- "value": 1000,
267	- "user_attr": "contributions",
268	- "type": "auto",
269	- "order": 18
270	- }
271	-},
272	-{
273	- "pk": 25,
274	- "model": "badger.badge",
275	- "fields": {
276	- "awardees": [],
277	- "comparison": "gte",
278	- "description": "More than 3000 Contributions",
279	- "title": "Gold Contributor",
280	- "image": "badges/gold_contributor.png",
281	- "value": 3000,
282	- "user_attr": "contributions",
283	- "type": "auto",
284	- "order": 19
285	- }
286	-},
287	-{
288	- "pk": 26,
289	- "model": "badger.badge",
290	- "fields": {
291	- "awardees": [],
292	- "comparison": "gte",
293	- "description": "More than 5000 Contributions",
294	- "title": "Diamond Contributor",
295	- "image": "badges/diamond_contributor.png",
296	- "value": 5000,
297	- "user_attr": "contributions",
298	- "type": "auto",
299	- "order": 20
300	- }
301	-},
302	-{
303	- "pk": 1,
304	- "model": "badger.badgei18n",
305	- "fields": {
306	- "i18n_language": "pt-br",
307	- "i18n_source": 8,
308	- "description": "Mais que 100 Mensagens",
309	- "title": "Mensageiro Bronze"
310	- }
311	-},
312	-{
313	- "pk": 2,
314	- "model": "badger.badgei18n",
315	- "fields": {
316	- "i18n_language": "pt-br",
317	- "i18n_source": 9,
318	- "description": "Mais que 500 Mensagens",
319	- "title": "Mensageiro Prata"
320	- }
321	-},
322	-{
323	- "pk": 3,
324	- "model": "badger.badgei18n",
325	- "fields": {
326	- "i18n_language": "pt-br",
327	- "i18n_source": 6,
328	- "description": "Mais que 10000 Mensagens",
329	- "title": "Mensageiro Diamante"
330	- }
331	-},
332	-{
333	- "pk": 4,
334	- "model": "badger.badgei18n",
335	- "fields": {
336	- "i18n_language": "pt-br",
337	- "i18n_source": 10,
338	- "description": "Mais que 1000 Mensagens",
339	- "title": "Mensageiro Ouro"
340	- }
341	-},
342	-{
343	- "pk": 5,
344	- "model": "badger.badgei18n",
345	- "fields": {
346	- "i18n_language": "pt-br",
347	- "i18n_source": 11,
348	- "description": "Mais que 10 T\u00edquetes",
349	- "title": "Rastreador Bronze"
350	- }
351	-},
352	-{
353	- "pk": 6,
354	- "model": "badger.badgei18n",
355	- "fields": {
356	- "i18n_language": "pt-br",
357	- "i18n_source": 12,
358	- "description": "Mais que 50 T\u00edquetes",
359	- "title": "Rastreador Prata"
360	- }
361	-},
362	-{
363	- "pk": 7,
364	- "model": "badger.badgei18n",
365	- "fields": {
366	- "i18n_language": "pt-br",
367	- "i18n_source": 13,
368	- "description": "Mais que 100 T\u00edquetes",
369	- "title": "Rastreador Ouro"
370	- }
371	-},
372	-{
373	- "pk": 8,
374	- "model": "badger.badgei18n",
375	- "fields": {
376	- "i18n_language": "pt-br",
377	- "i18n_source": 14,
378	- "description": "Mais que 500 T\u00edquetes",
379	- "title": "Rastreador Diamante"
380	- }
381	-},
382	-{
383	- "pk": 9,
384	- "model": "badger.badgei18n",
385	- "fields": {
386	- "i18n_language": "pt-br",
387	- "i18n_source": 15,
388	- "description": "Mais que 100 Modifica\u00e7\u00f5es de c\u00f3digo",
389	- "title": "Programador Bronze"
390	- }
391	-},
392	-{
393	- "pk": 10,
394	- "model": "badger.badgei18n",
395	- "fields": {
396	- "i18n_language": "pt-br",
397	- "i18n_source": 16,
398	- "description": "Mais que 500 Modifica\u00e7\u00f5es de c\u00f3digo",
399	- "title": "Programador Prata"
400	- }
401	-},
402	-{
403	- "pk": 11,
404	- "model": "badger.badgei18n",
405	- "fields": {
406	- "i18n_language": "pt-br",
407	- "i18n_source": 17,
408	- "description": "Mais que 1000 Modifica\u00e7\u00f5es de c\u00f3digo",
409	- "title": "Programador Ouro"
410	- }
411	-},
412	-{
413	- "pk": 12,
414	- "model": "badger.badgei18n",
415	- "fields": {
416	- "i18n_language": "pt-br",
417	- "i18n_source": 18,
418	- "description": "Mais que 10000 Modifica\u00e7\u00f5es de c\u00f3digo",
419	- "title": "Programador Diamante"
420	- }
421	-},
422	-{
423	- "pk": 13,
424	- "model": "badger.badgei18n",
425	- "fields": {
426	- "i18n_language": "pt-br",
427	- "i18n_source": 19,
428	- "description": "Escreveu mais que 10 Wikis",
429	- "title": "Escritor Bronze"
430	- }
431	-},
432	-{
433	- "pk": 14,
434	- "model": "badger.badgei18n",
435	- "fields": {
436	- "i18n_language": "pt-br",
437	- "i18n_source": 20,
438	- "description": "Escreveu mais que 50 Wikis",
439	- "title": "Escritor Prata"
440	- }
441	-},
442	-{
443	- "pk": 15,
444	- "model": "badger.badgei18n",
445	- "fields": {
446	- "i18n_language": "pt-br",
447	- "i18n_source": 21,
448	- "description": "Escreveu mais que 100 Wikis",
449	- "title": "Escritor Ouro"
450	- }
451	-},
452	-{
453	- "pk": 16,
454	- "model": "badger.badgei18n",
455	- "fields": {
456	- "i18n_language": "pt-br",
457	- "i18n_source": 22,
458	- "description": "Escreveu mais que 500 Wikis",
459	- "title": "Escritor Diamante"
460	- }
461	-},
462	-{
463	- "pk": 17,
464	- "model": "badger.badgei18n",
465	- "fields": {
466	- "i18n_language": "pt-br",
467	- "i18n_source": 23,
468	- "description": "Mais que 500 Contribui\u00e7\u00f5es",
469	- "title": "Contribuidor Bronze"
470	- }
471	-},
472	-{
473	- "pk": 18,
474	- "model": "badger.badgei18n",
475	- "fields": {
476	- "i18n_language": "pt-br",
477	- "i18n_source": 24,
478	- "description": "Mais que 1000 Contribui\u00e7\u00f5es",
479	- "title": "Contribuidor Prata"
480	- }
481	-},
482	-{
483	- "pk": 19,
484	- "model": "badger.badgei18n",
485	- "fields": {
486	- "i18n_language": "pt-br",
487	- "i18n_source": 25,
488	- "description": "Mais que 3000 Contribui\u00e7\u00f5es",
489	- "title": "Contribuidor Ouro"
490	- }
491	-},
492	-{
493	- "pk": 20,
494	- "model": "badger.badgei18n",
495	- "fields": {
496	- "i18n_language": "pt-br",
497	- "i18n_source": 26,
498	- "description": "Mais que 5000 Contribui\u00e7\u00f5es",
499	- "title": "Contribuidor Diamante"
500	- }
501	-}
502	-]
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+# -- coding: utf-8 --
	2	+
	3	+import base64
	4	+
	5	+from django import forms
	6	+from django.utils.translation import ugettext_lazy as _
	7	+
	8	+from PIL import Image
	9	+
	10	+from .models import Badge
	11	+
	12	+try:
	13	+ from cStringIO import StringIO
	14	+except ImportError:
	15	+ from StringIO import StringIO
	16	+
	17	+
	18	+class BadgeForm(forms.ModelForm):
	19	+ image = forms.ImageField(label=_(u'Image'), required=False)
	20	+
	21	+ class Meta:
	22	+ model = Badge
	23	+ fields = (
	24	+ 'title', 'description', 'image', 'user_attr', 'comparison',
	25	+ 'value', 'awardees'
	26	+ )
	27	+
	28	+ def clean_image(self):
	29	+ if not self.instance.pk and not self.cleaned_data['image']:
	30	+ raise forms.ValidationError(_(u'You must add an Image'))
	31	+ return self.cleaned_data['image']
	32	+
	33	+ def save(self, commit=True):
	34	+
	35	+ instance = super(BadgeForm, self).save(commit=False)
	36	+
	37	+ if self.cleaned_data['image']:
	38	+ img = Image.open(self.cleaned_data['image'])
	39	+ img = img.resize((50, 50), Image.ANTIALIAS)
	40	+ f = StringIO()
	41	+ img.save(f, 'png')
	42	+ instance.image_base64 = f.getvalue().encode('base64')
	43	+ f.close()
	44	+
	45	+ if commit:
	46	+ instance.save()
	47	+
	48	+ return instance