Merge branch 'master' into budget

2016-09-02 12:47:54 +02:00
parent f159bc355f 362f45378c
commit b8b71d0ab0
44 changed files with 684 additions and 126 deletions
--- a/CUSTOMIZE_ES.md
+++ b/CUSTOMIZE_ES.md
@@ -0,0 +1,214 @@
+# Personalización
+
+Puedes modificar consul y ponerle tu propia imagen, para esto debes primero hacer un fork de https://github.com/consul/consul creando un repositorio nuevo en Github. Puedes usar otro servicio como Gitlab, pero no te olvides de poner el enlace en el footer a tu repositorio en cumplimiento con la licencia de este proyecto (GPL Affero 3). 
+
+Hemos creado una estructura específica donde puedes sobreescribir y personalizar la aplicación para que puedas actualizar sin que tengas problemas al hacer merge y se sobreescriban por error tus cambios. Intentamos que Consul sea una aplicación Ruby on Rails lo más plain vanilla posible para facilitar el acceso de nuevas desarrolladoras. 
+
+## Ficheros y directorios especiales
+
+Para adaptarlo puedes hacerlo a través de los directorios que están en custom dentro de:
+
+* config/locales/custom/
+* app/assets/images/custom/
+* app/views/custom/
+* app/controllers/custom/
+* app/models/custom/
+
+Aparte de estos directorios también cuentas con ciertos ficheros para:
+
+* app/assets/stylesheets/custom.css
+* app/assets/javascripts/custom.js
+* Gemfile_custom
+* config/application.custom.rb
+
+### Internacionalización 
+
+Si quieres modificar algún texto de la web deberías encontrarlos en los ficheros formato YML disponibles en *config/locales/*. Puedes leer la [guía de internacionalización](http://guides.rubyonrails.org/i18n.html) de Ruby on Rails sobre como funciona este sistema. 
+
+Las adaptaciones los debes poner en el directorio *config/locales/custom/*, recomendamos poner solo los textos que quieras personalizar. Por ejemplo si quieres personalizar el texto de "Ayuntamiento de Madrid, 2016" que se encuentra en el footer en todas las páginas, primero debemos ubicar en que plantilla se encuentra (app/views/layouts/_footer.html.erb), vemos que en el código pone lo siguiente: 
+```
+<%= t("layouts.footer.copyright", year: Time.now.year) %> 
+```
+
+Y que en el fichero config/locales/es.yml sigue esta estructura (solo ponemos lo relevante para este caso): 
+
+```
+es:
+  layouts:
+    footer:
+      copyright: Ayuntamiento de Madrid, %{year}
+
+```
+
+Si creamos el fichero config/locales/custom/es.yml y modificamos "Ayuntamiento de Madrid" por el nombre de la organización que se este haciendo la modificación. Recomendamos directamente copiar los ficheros config/locales/ e ir revisando y corrigiendo las que querramos, borrando las líneas que no querramos traducir. 
+
+### Imágenes
+
+Si quieres sobreescribir alguna imagen debes primero fijarte el nombre que tiene, por defecto se encuentran en *app/assets/images*. Por ejemplo si quieres modificar *app/assets/images/logo_header.png* debes poner otra con ese mismo nombre en el directorio app/assets/images/custom. Los iconos que seguramente quieras modificar son: 
+
+* apple-touch-icon-200.png
+* icon_home.png
+* logo_email.png
+* logo_header.png
+* map.jpg
+* social-media-icon.png
+
+### Vistas (HTML)
+
+Si quieres modificar el HTML de alguna página puedes hacerlo copiando el HTML de *app/views* y poniendolo en *app/views/custom* respetando los subdirectorios que encuentres ahí. Por ejemplo si quieres modificar *app/views/pages/conditions.html* debes copiarlo y modificarla en app/views/custom/pages/conditions.html.erb
+
+### CSS
+
+Si quieres cambiar algun selector CSS (de las hojas de estilo) puedes hacerlo en el fichero *app/assets/stylesheets/custom.scss*. Por ejemplo si quieres cambiar el color del header (.top-links) puedes hacerlo agregando: 
+
+```
+.top-links {
+  background: red;
+}
+```
+
+Usamos un preprocesador de CSS, [SASS, con la sintaxis SCSS](http://sass-lang.com/guide). 
+
+### Javascript
+
+Si quieres agregar código Javascript puedes hacerlo en el fichero *app/assets/javascripts/custom.js". Por ejemplo si quieres que salga una alerta puedes poner lo siguiente: 
+
+```
+$(function(){
+  alert('foobar');
+});
+```
+
+### Modelos
+
+Si quieres agregar modelos nuevos, o modificar o agregar métodos a uno ya existente puedes hacerlo en *app/models/custom*. En el caso de los modelos antiguos debes primero hacer un require de la dependencia. 
+
+Por ejemplo en el caso del Ayuntamiento de Madrid se requiere comprobar que el código postal durante la verificación sigue un cierto formato (empieza con 280). Esto se realiza creando este fichero en *app/models/custom/verification/residence.rb*: 
+
+```
+require_dependency Rails.root.join('app', 'models', 'verification', 'residence').to_s
+
+class Verification::Residence
+
+  validate :postal_code_in_madrid
+  validate :residence_in_madrid
+
+  def postal_code_in_madrid
+    errors.add(:postal_code, I18n.t('verification.residence.new.error_not_allowed_postal_code')) unless valid_postal_code?
+  end
+
+  def residence_in_madrid
+    return if errors.any?
+
+    unless residency_valid?
+      errors.add(:residence_in_madrid, false)
+      store_failed_attempt
+      Lock.increase_tries(user)
+    end
+  end
+
+  private
+
+    def valid_postal_code?
+      postal_code =~ /^280/
+    end
+
+end
+```
+
+No olvides poner los tests relevantes en *spec/models/custom*, siguiendo con el ejemplo pondriamos lo siguiente en *spec/models/custom/residence_spec.rb*:
+
+
+```
+require 'rails_helper'
+
+describe Verification::Residence do
+ 
+  let(:residence) { build(:verification_residence, document_number: "12345678Z") }
+
+  describe "verification" do 
+
+    describe "postal code" do
+      it "should be valid with postal codes starting with 280" do
+        residence.postal_code = "28012"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(0)
+
+        residence.postal_code = "28023"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(0)
+      end
+
+      it "should not be valid with postal codes not starting with 280" do
+        residence.postal_code = "12345"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(1)
+
+        residence.postal_code = "13280"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(1)
+        expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered in the municipality of Madrid.")
+      end
+    end
+
+  end
+
+end
+```
+
+### Controladores
+
+TODO
+
+### Gemfile
+
+Para agregar librerías (gems) nuevas puedes hacerlo en el fichero *Gemfile_custom*. Por ejemplo si quieres agregar la gema [rails-footnotes](https://github.com/josevalim/rails-footnotes) debes hacerlo agregandole 
+
+```
+gem 'rails-footnotes', '~> 4.0'
+```
+
+Y siguiendo el flujo clásico en Ruby on Rails (bundle install y seguir con los pasos específicos de la gema en la documentación)
+
+### application.rb 
+
+Cuando necesites extender o modificar el *config/application.rb* puedes hacerlo a través del fichero *config/application_custom.rb*. Por ejemplo si quieres modificar el idioma por defecto al inglés pondrías lo siguiente: 
+
+
+```
+module Consul
+  class Application < Rails::Application
+    config.i18n.default_locale = :en
+    config.i18n.available_locales = [:en, :es]
+  end
+end
+```
+
+Recuerda que para ver reflejado estos cambios debes reiniciar el servidor de desarrollo.
+
+### lib/
+
+TODO
+
+### public/
+
+TODO
+
+### Seeds
+
+TODO
+
+## Actualizar 
+
+Te recomendamos que agregues el remote de consul para facilitar este proceso de merge: 
+
+```
+$ git remote add consul https://github.com/consul/consul 
+```
+
+Con esto puedes actualizarte con 
+
+```
+git checkout -b consul_update
+git pull consul master
+```
--- a/7
+++ b/7
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'

 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.7'
+gem 'rails', '4.2.7.1'
 # Use PostgreSQL
 gem 'pg'
 # Use SCSS for stylesheets
@@ -19,6 +19,9 @@ gem 'jquery-ui-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'

+# Fix sprockets on the
+gem 'sprockets', '~> 3.6.3'
+
 gem 'devise', '~> 3.5.7'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -94,3 +97,5 @@ group :development do
  # Access an IRB console on exception pages or by using <%= console %> in views
  gem 'web-console', '3.3.0'
 end
+
+eval_gemfile './Gemfile_custom'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,36 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7)
-      actionview (= 4.2.7)
-      activesupport (= 4.2.7)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      rack (~> 1.6)
      rack-test (~> 0.6.2)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7)
-      activesupport (= 4.2.7)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7)
-      activesupport (= 4.2.7)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
      globalid (>= 0.3.0)
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
      builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      arel (~> 6.0)
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
@@ -67,7 +67,7 @@ GEM
    bcrypt (3.1.11)
    browser (2.2.0)
    builder (3.2.2)
-    bullet (5.1.1)
+    bullet (5.2.0)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.10.0)
    byebug (9.0.5)
@@ -114,12 +114,12 @@ GEM
      execjs
    coffee-script-source (1.10.0)
    concurrent-ruby (1.0.2)
-    coveralls (0.8.14)
+    coveralls (0.8.15)
      json (>= 1.8, < 3)
      simplecov (~> 0.12.0)
      term-ansicolor (~> 1.3)
      thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
    daemons (1.2.3)
    dalli (2.7.6)
    database_cleaner (1.5.3)
@@ -156,7 +156,7 @@ GEM
    factory_girl_rails (4.7.0)
      factory_girl (~> 4.7.0)
      railties (>= 3.0.0)
-    faker (1.6.5)
+    faker (1.6.6)
      i18n (~> 0.5)
    faraday (0.9.2)
      multipart-post (>= 1.2, < 3)
@@ -174,7 +174,7 @@ GEM
      rspec (~> 3.0)
      ruby-progressbar (~> 1.4)
    geocoder (1.3.7)
-    globalid (0.3.6)
+    globalid (0.3.7)
      activesupport (>= 4.1.0)
    groupdate (3.0.1)
      activesupport (>= 3)
@@ -290,16 +290,16 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.7)
-      actionmailer (= 4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
-      activemodel (= 4.2.7)
-      activerecord (= 4.2.7)
-      activesupport (= 4.2.7)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7)
+      railties (= 4.2.7.1)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
@@ -309,9 +309,9 @@ GEM
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
-    railties (4.2.7)
-      actionpack (= 4.2.7)
-      activesupport (= 4.2.7)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    raindrops (0.16.0)
@@ -350,7 +350,7 @@ GEM
    safely_block (0.1.1)
      errbase
    sass (3.4.22)
-    sass-rails (5.0.5)
+    sass-rails (5.0.6)
      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
@@ -396,7 +396,7 @@ GEM
    thread (0.2.2)
    thread_safe (0.3.5)
    tilt (2.0.5)
-    tins (1.6.0)
+    tins (1.11.0)
    tolk (1.9.3)
      rails (>= 4.0, < 4.3)
      safe_yaml (>= 0.8.6)
@@ -408,7 +408,7 @@ GEM
      tilt (>= 1.4, < 3)
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.1)
      execjs (>= 0.3.0, < 3)
    unicorn (5.1.0)
      kgio (~> 2.6)
@@ -485,7 +485,7 @@ DEPENDENCIES
  pg_search
  poltergeist
  quiet_assets
-  rails (= 4.2.7)
+  rails (= 4.2.7.1)
  redcarpet
  responders
  rinku
@@ -496,6 +496,7 @@ DEPENDENCIES
  social-share-button
  spring
  spring-commands-rspec
+  sprockets (~> 3.6.3)
  tolk
  turbolinks
  turnout
--- a/5
+++ b/5
@@ -0,0 +1,5 @@
+# Overrides and adds customized gems in this file
+# Read more on documentation: 
+# * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md#gemfile
+# * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md#gemfile
+#
--- a/README.md
+++ b/README.md
@@ -62,6 +62,10 @@ But for some actions like voting, you will need a verified user, the seeds file
 **user:** verified@consul.dev
 **pass:** 12345678

+### Customization
+
+See [CUSTOMIZE_ES.md](CUSTOMIZE_ES.md)
+
 ### OAuth

 To test authentication services with external OAuth suppliers - right now Twitter, Facebook and Google - you'll need to create an "application" in each of the supported platforms and set the *key* and *secret* provided in your *secrets.yml*
--- a/README_ES.md
+++ b/README_ES.md
@@ -61,6 +61,9 @@ Pero para ciertas acciones, como apoyar, necesitarás un usuario verificado, el
 **user:** verified@consul.dev
 **pass:** 12345678

+### Customización
+
+Ver fichero [CUSTOMIZE_ES.md](CUSTOMIZE_ES.md)

 ### OAuth

--- a/app/assets/images/custom/.keep
+++ b/app/assets/images/custom/.keep
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,7 +16,7 @@
 //= require jquery-ui/datepicker-es
 //= require foundation
 //= require turbolinks
-//= require ckeditor/init
+//= require ckeditor/loader
 //= require_directory ./ckeditor
 //= require social-share-button
 //= require initial
@@ -45,6 +45,7 @@
 //= require valuation_spending_proposal_form
 //= require embed_video
 //= require banners
+//= require custom

 var initialize_modules = function() {
  App.Comments.initialize();
--- a/app/assets/javascripts/ckeditor/loader.js.erb
+++ b/app/assets/javascripts/ckeditor/loader.js.erb
@@ -0,0 +1,3 @@
+//= require ckeditor/init
+
+CKEDITOR.config.customConfig = '<%= javascript_path 'ckeditor/config.js' %>';
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -0,0 +1,7 @@
+// Overrides and adds customized javascripts in this file
+// Read more on documentation: 
+// * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md#javascript
+// * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md#javascript
+//
+//
+
--- a/app/assets/stylesheets/custom.scss
+++ b/app/assets/stylesheets/custom.scss
@@ -1,2 +1,5 @@
 // Overrides and adds customized styles in this file
-//
+// Read more on documentation:
+// * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md#css
+// * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md#css
+//
--- a/app/mailers/mailer.rb
+++ b/app/mailers/mailer.rb
@@ -60,8 +60,8 @@ class Mailer < ApplicationMailer
    end
  end

-  def proposal_notification_digest(user)
-    @notifications = user.notifications.where(notifiable_type: "ProposalNotification")
+  def proposal_notification_digest(user, notifications)
+    @notifications = notifications

    with_user(user) do
      mail(to: user.email, subject: t('mailers.proposal_notification_digest.title', org_name: Setting['org_name']))
--- a/app/models/custom/.keep
+++ b/app/models/custom/.keep
--- a/app/models/custom/verification/residence.rb
+++ b/app/models/custom/verification/residence.rb
@@ -0,0 +1,29 @@
+
+require_dependency Rails.root.join('app', 'models', 'verification', 'residence').to_s
+
+class Verification::Residence
+
+  validate :postal_code_in_madrid
+  validate :residence_in_madrid
+
+  def postal_code_in_madrid
+    errors.add(:postal_code, I18n.t('verification.residence.new.error_not_allowed_postal_code')) unless valid_postal_code?
+  end
+
+  def residence_in_madrid
+    return if errors.any?
+
+    unless residency_valid?
+      errors.add(:residence_in_madrid, false)
+      store_failed_attempt
+      Lock.increase_tries(user)
+    end
+  end
+
+  private
+
+    def valid_postal_code?
+      postal_code =~ /^280/
+    end
+
+end
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -2,9 +2,11 @@ class Notification < ActiveRecord::Base
  belongs_to :user, counter_cache: true
  belongs_to :notifiable, polymorphic: true

-  scope :unread, -> { all }
-  scope :recent, -> { order(id: :desc) }
-  scope :for_render, -> { includes(:notifiable) }
+  scope :unread,      -> { all }
+  scope :recent,      -> { order(id: :desc) }
+  scope :not_emailed, -> { where(emailed_at: nil) }
+  scope :for_render,  -> { includes(:notifiable) }
+

  def timestamp
    notifiable.created_at
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -95,7 +95,7 @@ class Proposal < ActiveRecord::Base
  end

  def voters
-    votes_for.voters
+    User.active.where(id: votes_for.voters)
  end

  def editable?
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,6 +53,7 @@ class User < ActiveRecord::Base
  scope :for_render,     -> { includes(:organization) }
  scope :by_document,    -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) }
  scope :email_digest,   -> { where(email_digest: true) }
+  scope :active,         -> { where(erased_at: nil) }

  before_validation :clean_document_number

--- a/app/models/verification/residence.rb
+++ b/app/models/verification/residence.rb
@@ -16,8 +16,6 @@ class Verification::Residence

  validate :allowed_age
  validate :document_number_uniqueness
-  validate :postal_code_in_madrid
-  validate :residence_in_madrid

  def initialize(attrs={})
    self.date_of_birth = parse_date('date_of_birth', attrs)
@@ -45,20 +43,6 @@ class Verification::Residence
    errors.add(:document_number, I18n.t('errors.messages.taken')) if User.where(document_number: document_number).any?
  end

-  def postal_code_in_madrid
-    errors.add(:postal_code, I18n.t('verification.residence.new.error_not_allowed_postal_code')) unless valid_postal_code?
-  end
-
-  def residence_in_madrid
-    return if errors.any?
-
-    unless residency_valid?
-      errors.add(:residence_in_madrid, false)
-      store_failed_attempt
-      Lock.increase_tries(user)
-    end
-  end
-
  def store_failed_attempt
    FailedCensusCall.create({
      user: user,
@@ -97,8 +81,4 @@ class Verification::Residence
      self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
    end

-    def valid_postal_code?
-      postal_code =~ /^280/
-    end
-
 end
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -74,6 +74,7 @@

            <% if comment.children.size > 0 %>
              <%= link_to "", class: "js-toggle-children relative", data:  {'id': "#{dom_id(comment)}"} do %>
+                <span class="sr-only"><%= t("shared.show") %></span>
                <span id="<%= dom_id(comment) %>_children_arrow" class="icon-arrow-down"></span> <%= t("comments.comment.responses", count: comment.children.size) %>
              <% end %>
            <% else %>
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -7,7 +7,9 @@
      <% if can?(:vote, comment) %>
        <%= link_to vote_comment_path(comment, value: 'yes'),
            method: "post", remote: true do %>
-            <span class="icon-angle-up"></span>
+            <span class="icon-angle-up">
+              <span class="sr-only"><%= t('votes.agree') %></span>
+            </span>
        <% end %>
      <% else %>
        <span class="icon-angle-up"></span>
@@ -19,7 +21,9 @@
      <% if can?(:vote, comment) %>
        <%= link_to vote_comment_path(comment, value: 'no'),
            method: "post", remote: true do %>
-            <span class="icon-angle-down"></span>
+            <span class="icon-angle-down">
+              <span class="sr-only"><%= t('votes.disagree') %></span>
+            </span>
        <% end %>
      <% else %>
        <span class="icon-angle-down"></span>
--- a/app/views/custom/.keep
+++ b/app/views/custom/.keep
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -3,7 +3,9 @@
  <div class="in-favor inline-block">
    <%= link_to vote_debate_path(debate, value: 'yes'),
        class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %>
-      <span class="icon-like"></span>
+      <span class="icon-like">
+        <span class="sr-only"><%= t('votes.agree') %></span>
+      </span>
      <span class="percentage"><%= votes_percentage('likes', debate) %></span>
    <% end %>
  </div>
@@ -12,7 +14,9 @@

  <div class="against inline-block">
    <%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %>
-      <span class="icon-unlike"></span>
+      <span class="icon-unlike">
+        <span class="sr-only"><%= t('votes.disagree') %></span>
+      </span>
      <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
    <% end %>
  </div>
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -1,6 +1,7 @@
 <% if user_signed_in? %>
  <li>
    <%= link_to notifications_path, class: "notifications", accesskey: "n" do %>
+      <span class="sr-only"><%= t("layouts.header.notifications") %></span>
      <% if current_user.notifications_count > 0 %>
        <span class="icon-circle" aria-hidden="true"></span>
        <span class="icon-notification" aria-hidden="true" title="<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>">
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -21,24 +21,24 @@
  <main>
    <div class="row text-center margin">
      <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_debate.png", size: "168x168", alt: t("welcome.debates.alt"), title: t("welcome.debates.title")) %>
+        <%= image_tag("icon_home_debate.png", size: "168x168", alt: "", title: t("welcome.debates.title")) %>
        <h2><%= t("welcome.debates.title") %></h2>
        <p><%= t("welcome.debates.description") %></p>

      </div>
      <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_proposal.png", size: "168x168", alt: t("welcome.proposal.alt"), title: t("welcome.proposal.title"))  %>
+        <%= image_tag("icon_home_proposal.png", size: "168x168", alt: "", title: t("welcome.proposal.title"))  %>
        <h2><%= t("welcome.proposal.title") %></h2>
        <p><%= t("welcome.proposal.description") %></p>
      </div>

      <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_decide.png", size: "168x168", alt: t("welcome.decide.alt"), title: t("welcome.decide.title")) %>
+        <%= image_tag("icon_home_decide.png", size: "168x168", alt: "", title: t("welcome.decide.title")) %>
        <h2><%= t("welcome.decide.title") %></h2>
        <p><%= t("welcome.decide.description") %></p>
      </div>
      <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_do.png", size: "168x168", alt: t("welcome.do.alt"), title: t("welcome.do.title")) %>
+        <%= image_tag("icon_home_do.png", size: "168x168", alt: "", title: t("welcome.do.title")) %>
        <h2><%= t("welcome.do.title") %></h2>
        <p><%= t("welcome.do.description") %></p>
      </div>
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,4 @@
+
 require File.expand_path('../boot', __FILE__)

 require 'rails/all'
@@ -34,5 +35,17 @@ module Consul
    config.autoload_paths << Rails.root.join('lib')
    config.time_zone = 'Madrid'
    config.active_job.queue_adapter = :delayed_job
+
+    # Consul specific custom overrides
+    # Read more on documentation:
+    # * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md
+    # * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md
+    #
+    config.autoload_paths << "#{Rails.root}/app/controllers/custom"
+    config.autoload_paths << "#{Rails.root}/app/models/custom"
+    config.paths['app/views'].unshift(Rails.root.join('app', 'views', 'custom'))
+
  end
 end
+
+require "./config/application_custom.rb"
--- a/config/application_custom.rb
+++ b/config/application_custom.rb
@@ -0,0 +1,4 @@
+module Consul
+  class Application < Rails::Application
+  end
+end
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,8 +9,12 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += %w( ckeditor/* )
+Rails.application.config.assets.precompile += %w( ckeditor/config.js )
 Rails.application.config.assets.precompile += %w( ie_lt9.js )
 Rails.application.config.assets.precompile += %w( stat_graphs.js )
 Rails.application.config.assets.precompile += %w( print.css )
 Rails.application.config.assets.precompile += %w( ie.css )
+
+# Loads app/assets/images/custom before app/assets/images
+images_path = Rails.application.config.assets.paths
+images_path = images_path.insert(0, Rails.root.join("app", "assets", "images", "custom").to_s)
--- a/config/initializers/ckeditor.rb
+++ b/config/initializers/ckeditor.rb
@@ -0,0 +1,4 @@
+Ckeditor.setup do |config|
+  config.assets_languages = I18n.available_locales.map(&:to_s)
+  config.assets_plugins = []
+end
--- a/config/locales/custom/.keep
+++ b/config/locales/custom/.keep
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -205,6 +205,7 @@ en:
      more_information: More information
      my_account_link: My account
      my_activity_link: My activity
+      notifications: Notifications
      new_notifications:
        one: You have a new notification
        other: You have %{count} new notifications
@@ -420,6 +421,7 @@ en:
    flag: Flag as inappropriate
    print:
      print_button: Print this info
+    show: Show
    suggest:
      debate:
        found:
@@ -571,19 +573,15 @@ en:
      not_voting_allowed: Voting phase is closed
  welcome:
    debates:
-      alt: Icon debates
      description: For meeting, discussing and sharing the things that matter to us in our city.
      title: Debates
    decide:
-      alt: Icon decide
      description: The public decides if it accepts or rejects the most supported proposals.
      title: You decide
    do:
-      alt: Icon it gets done
      description: If the proposal is accepted by the majority, the City Council accepts it as its own and it gets done.
      title: It gets done
    proposal:
-      alt: Icon propose
      description: Open space for citizen proposals about the kind of city we want to live in.
      title: You propose
    verification:
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -205,6 +205,7 @@ es:
      more_information: Más información
      my_account_link: Mi cuenta
      my_activity_link: Mi actividad
+      notifications: Notificaciones
      new_notifications:
        one: Tienes una nueva notificación
        other: Tienes %{count} notificaciones nuevas
@@ -420,6 +421,7 @@ es:
    flag: Denunciar como inapropiado
    print:
      print_button: Imprimir esta información
+    show: Mostrar
    suggest:
      debate:
        found:
@@ -571,19 +573,15 @@ es:
      not_voting_allowed: El periodo de votación está cerrado.
  welcome:
    debates:
-      alt: Icono debates
      description: Encontrarnos, debatir y compartir lo que nos parece importante en nuestra ciudad.
      title: Debates
    decide:
-      alt: Icono decides
      description: La ciudadanía decide si acepta o rechaza las propuestas más apoyadas.
      title: Decides
    do:
-      alt: Icono se hace
      description: Si la propuesta es aceptada mayoritariamente, el Ayuntamiento la asume como propia y se hace.
      title: Se hace
    proposal:
-      alt: Icono propones
      description: Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir.
      title: Propones
    verification:
--- a/db/migrate/20160803154011_add_emailed_at_to_notifications.rb
+++ b/db/migrate/20160803154011_add_emailed_at_to_notifications.rb
@@ -0,0 +1,5 @@
+class AddEmailedAtToNotifications < ActiveRecord::Migration
+  def change
+    add_column :notifications, :emailed_at, :datetime
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 20160617172616) do
+ActiveRecord::Schema.define(version: 20160803154011) do

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"
@@ -338,10 +338,11 @@ ActiveRecord::Schema.define(version: 20160617172616) do
  add_index "moderators", ["user_id"], name: "index_moderators_on_user_id", using: :btree

  create_table "notifications", force: :cascade do |t|
-    t.integer "user_id"
-    t.integer "notifiable_id"
-    t.string  "notifiable_type"
-    t.integer "counter",         default: 1
+    t.integer  "user_id"
+    t.integer  "notifiable_id"
+    t.string   "notifiable_type"
+    t.integer  "counter",         default: 1
+    t.datetime "emailed_at"
  end

  add_index "notifications", ["user_id"], name: "index_notifications_on_user_id", using: :btree
--- a/lib/email_digest.rb
+++ b/lib/email_digest.rb
@@ -1,14 +1,27 @@
 class EmailDigest

-  def initialize
+  attr_accessor :user, :notifications
+
+  def initialize(user)
+    @user = user
  end

-  def create
-    User.email_digest.each do |user|
-      if user.notifications.where(notifiable_type: "ProposalNotification").any?
-        Mailer.proposal_notification_digest(user).deliver_later
-      end
+  def notifications
+    user.notifications.not_emailed.where(notifiable_type: "ProposalNotification")
+  end
+
+  def pending_notifications?
+    notifications.any?
+  end
+
+  def deliver
+    if pending_notifications?
+      Mailer.proposal_notification_digest(user, notifications.to_a).deliver_later
    end
  end

+  def mark_as_emailed
+    notifications.update_all(emailed_at: Time.now)
+  end
+
 end
--- a/lib/tasks/emails.rake
+++ b/lib/tasks/emails.rake
@@ -2,8 +2,11 @@ namespace :emails do

  desc "Sends email digest of proposal notifications to each user"
  task digest: :environment do
-    email_digest = EmailDigest.new
-    email_digest.create
+    User.email_digest.find_each do |user|
+      email_digest = EmailDigest.new(user)
+      email_digest.deliver
+      email_digest.mark_as_emailed
+    end
  end

 end
--- a/spec/features/emails_spec.rb
+++ b/spec/features/emails_spec.rb
@@ -201,8 +201,9 @@ feature 'Emails' do
      notification2 = create_proposal_notification(proposal2)
      notification3 = create_proposal_notification(proposal3)

-      email_digest = EmailDigest.new
-      email_digest.create
+      email_digest = EmailDigest.new(user)
+      email_digest.deliver
+      email_digest.mark_as_emailed

      email = open_last_email
      expect(email).to have_subject("Proposal notifications in Consul")
@@ -227,6 +228,11 @@ feature 'Emails' do

      expect(email).to_not have_body_text(proposal3.title)
      expect(email).to have_body_text(/#{account_path}/)
+
+      notification1.reload
+      notification2.reload
+      expect(notification1.emailed_at).to be
+      expect(notification2.emailed_at).to be
    end

  end
--- a/spec/features/notifications_spec.rb
+++ b/spec/features/notifications_spec.rb
@@ -180,9 +180,10 @@ feature "Notifications" do

      find(".icon-notification").click

+      notification_for_user1 = Notification.where(user: user1).first
      expect(page).to have_css ".notification", count: 1
      expect(page).to have_content "There is one new notification on #{proposal.title}"
-      expect(page).to have_xpath "//a[@href='#{notification_path(Notification.last)}']"
+      expect(page).to have_xpath "//a[@href='#{notification_path(notification_for_user1)}']"

      logout
      login_as user2
@@ -190,9 +191,10 @@ feature "Notifications" do

      find(".icon-notification").click

+      notification_for_user2 = Notification.where(user: user2).first
      expect(page).to have_css ".notification", count: 1
      expect(page).to have_content "There is one new notification on #{proposal.title}"
-      expect(page).to have_xpath "//a[@href='#{notification_path(Notification.first)}']"
+      expect(page).to have_xpath "//a[@href='#{notification_path(notification_for_user2)}']"

      logout
      login_as user3
--- a/spec/features/proposal_notifications_spec.rb
+++ b/spec/features/proposal_notifications_spec.rb
@@ -24,6 +24,44 @@ feature 'Proposal Notifications' do
    expect(page).to have_content "Please share it with others so we can make it happen!"
  end

+  scenario "Send a notification (Active voter)" do
+    author = create(:user)
+    proposal = create(:proposal, author: author)
+
+    voter = create(:user, :level_two)
+    create(:vote, voter: voter, votable: proposal)
+
+    create_proposal_notification(proposal)
+
+    expect(Notification.count).to eq(1)
+  end
+
+  scenario "Send a notification (Blocked voter)" do
+    author = create(:user)
+    proposal = create(:proposal, author: author)
+
+    voter = create(:user, :level_two)
+    create(:vote, voter: voter, votable: proposal)
+    voter.block
+
+    create_proposal_notification(proposal)
+
+    expect(Notification.count).to eq(0)
+  end
+
+  scenario "Send a notification (Erased voter)" do
+    author = create(:user)
+    proposal = create(:proposal, author: author)
+
+    voter = create(:user, :level_two)
+    create(:vote, voter: voter, votable: proposal)
+    voter.erase
+
+    create_proposal_notification(proposal)
+
+    expect(Notification.count).to eq(0)
+  end
+
  scenario "Show notifications" do
    proposal = create(:proposal)
    notification1 = create(:proposal_notification, proposal: proposal, title: "Hey guys", body: "Just wanted to let you know that...")
--- a/spec/lib/email_digests_spec.rb
+++ b/spec/lib/email_digests_spec.rb
@@ -2,8 +2,126 @@ require 'rails_helper'

 describe EmailDigest do

-  describe "create" do
-    pending "only send unread notifications"
+  describe "notifications" do
+
+    it "returns notifications for a user" do
+      user1 = create(:user)
+      user2 = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification1 = create(:notification, notifiable: proposal_notification, user: user1)
+      notification2 = create(:notification, notifiable: proposal_notification, user: user2)
+
+      email_digest = EmailDigest.new(user1)
+
+      expect(email_digest.notifications).to include(notification1)
+      expect(email_digest.notifications).to_not include(notification2)
+    end
+
+    it "returns only proposal notifications" do
+      user = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      comment = create(:comment)
+
+      notification1 = create(:notification, notifiable: proposal_notification, user: user)
+      notification2 = create(:notification, notifiable: comment,               user: user)
+
+      email_digest = EmailDigest.new(user)
+
+      expect(email_digest.notifications).to include(notification1)
+      expect(email_digest.notifications).to_not include(notification2)
+    end
+
+  end
+
+  describe "pending_notifications?" do
+
+    it "returns true when notifications have not been emailed" do
+      user = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification = create(:notification, notifiable: proposal_notification, user: user)
+
+      email_digest = EmailDigest.new(user)
+      expect(email_digest.pending_notifications?).to be
+    end
+
+    it "returns false when notifications have been emailed" do
+      user = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+
+      email_digest = EmailDigest.new(user)
+      expect(email_digest.pending_notifications?).to_not be
+    end
+
+    it "returns false when there are no notifications for a user" do
+      user = create(:user)
+      email_digest = EmailDigest.new(user)
+      expect(email_digest.pending_notifications?).to_not be
+    end
+
+  end
+
+  describe "deliver" do
+
+    it "delivers email if notifications pending" do
+      user = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification = create(:notification, notifiable: proposal_notification, user: user)
+
+      reset_mailer
+      email_digest = EmailDigest.new(user)
+      email_digest.deliver
+
+      email = open_last_email
+      expect(email).to have_subject("Proposal notifications in Consul")
+    end
+
+    it "does not deliver email if no notifications pending" do
+      user = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
+
+      reset_mailer
+      email_digest = EmailDigest.new(user)
+      email_digest.deliver
+
+      expect(all_emails.count).to eq(0)
+    end
+
+  end
+
+  describe "mark_as_emailed" do
+
+    it "marks notifications as emailed" do
+      user1 = create(:user)
+      user2 = create(:user)
+
+      proposal_notification = create(:proposal_notification)
+      notification1 = create(:notification, notifiable: proposal_notification, user: user1)
+      notification2 = create(:notification, notifiable: proposal_notification, user: user1)
+      notification3 = create(:notification, notifiable: proposal_notification, user: user2)
+
+      expect(notification1.emailed_at).to_not be
+      expect(notification2.emailed_at).to_not be
+      expect(notification3.emailed_at).to_not be
+
+      email_digest = EmailDigest.new(user1)
+      email_digest.mark_as_emailed
+
+      notification1.reload
+      notification2.reload
+      notification3.reload
+      expect(notification1.emailed_at).to be
+      expect(notification2.emailed_at).to be
+      expect(notification3.emailed_at).to_not be
+    end
+
  end

 end
--- a/spec/models/custom/.keep
+++ b/spec/models/custom/.keep
--- a/spec/models/custom/residence_spec.rb
+++ b/spec/models/custom/residence_spec.rb
@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+describe Verification::Residence do
+
+  let(:residence) { build(:verification_residence, document_number: "12345678Z") }
+
+  describe "verification" do
+
+    describe "postal code" do
+      it "should be valid with postal codes starting with 280" do
+        residence.postal_code = "28012"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(0)
+
+        residence.postal_code = "28023"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(0)
+      end
+
+      it "should not be valid with postal codes not starting with 280" do
+        residence.postal_code = "12345"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(1)
+
+        residence.postal_code = "13280"
+        residence.valid?
+        expect(residence.errors[:postal_code].size).to eq(1)
+        expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered.")
+      end
+    end
+
+  end
+
+end
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -367,6 +367,50 @@ describe Proposal do
    end
  end

+  describe "voters" do
+
+    it "returns users that have voted for the proposal" do
+      proposal = create(:proposal)
+      voter1 = create(:user, :level_two)
+      voter2 = create(:user, :level_two)
+      voter3 = create(:user, :level_two)
+
+      create(:vote, voter: voter1, votable: proposal)
+      create(:vote, voter: voter2, votable: proposal)
+
+      expect(proposal.voters).to include(voter1)
+      expect(proposal.voters).to include(voter2)
+      expect(proposal.voters).to_not include(voter3)
+    end
+
+    it "does not return users that have been erased" do
+      proposal = create(:proposal)
+      voter1 = create(:user, :level_two)
+      voter2 = create(:user, :level_two)
+
+      create(:vote, voter: voter1, votable: proposal)
+      create(:vote, voter: voter2, votable: proposal)
+      voter2.erase
+
+      expect(proposal.voters).to include(voter1)
+      expect(proposal.voters).to_not include(voter2)
+    end
+
+    it "does not return users that have been blocked" do
+      proposal = create(:proposal)
+      voter1 = create(:user, :level_two)
+      voter2 = create(:user, :level_two)
+
+      create(:vote, voter: voter1, votable: proposal)
+      create(:vote, voter: voter2, votable: proposal)
+      voter2.block
+
+      expect(proposal.voters).to include(voter1)
+      expect(proposal.voters).to_not include(voter2)
+    end
+
+  end
+
  describe "search" do

    context "attributes" do
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -30,29 +30,6 @@ describe Verification::Residence do
      expect(residence.errors[:date_of_birth]).to include("You must be at least 16 years old")
    end

-    describe "postal code" do
-      it "should be valid with postal codes starting with 280" do
-        residence.postal_code = "28012"
-        residence.valid?
-        expect(residence.errors[:postal_code].size).to eq(0)
-
-        residence.postal_code = "28023"
-        residence.valid?
-        expect(residence.errors[:postal_code].size).to eq(0)
-      end
-
-      it "should not be valid with postal codes not starting with 280" do
-        residence.postal_code = "12345"
-        residence.valid?
-        expect(residence.errors[:postal_code].size).to eq(1)
-
-        residence.postal_code = "13280"
-        residence.valid?
-        expect(residence.errors[:postal_code].size).to eq(1)
-        expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered.")
-      end
-    end
-
    it "should validate uniquness of document_number" do
      user = create(:user)
      residence.user = user
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -325,6 +325,34 @@ describe User do

  end

+  describe "scopes" do
+
+    describe "active" do
+
+      it "returns users that have not been erased" do
+        user1 = create(:user, erased_at: nil)
+        user2 = create(:user, erased_at: nil)
+        user3 = create(:user, erased_at: Time.now)
+
+        expect(User.active).to include(user1)
+        expect(User.active).to include(user2)
+        expect(User.active).to_not include(user3)
+      end
+
+      it "returns users that have not been blocked" do
+        user1 = create(:user)
+        user2 = create(:user)
+        user3 = create(:user)
+        user3.block
+
+        expect(User.active).to include(user1)
+        expect(User.active).to include(user2)
+        expect(User.active).to_not include(user3)
+      end
+
+    end
+  end
+
  describe "self.search" do
    it "find users by email" do
      user1 = create(:user, email: "larry@consul.dev")