From 71832b5ff19ba025aedc2e7371fa60607c23ce98 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 11 Sep 2015 13:26:31 +0200
Subject: [PATCH 01/17] adds whenever

---
 Gemfile            |  1 +
 Gemfile.lock       |  4 ++++
 config/schedule.rb | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 config/schedule.rb

diff --git a/Gemfile b/Gemfile
index 05d9ec2e9..6840329ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,7 @@ gem 'delayed_job_active_record'
 gem 'daemons'
 gem 'devise-async'
 gem 'newrelic_rpm'
+gem 'whenever', require: false
 
 gem 'ahoy_matey', '~> 1.2.1'
 gem 'groupdate'   # group temporary data
diff --git a/Gemfile.lock b/Gemfile.lock
index 6dfcba2b0..4814dc6af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,6 +87,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    chronic (0.10.2)
     ckeditor (4.1.3)
       cocaine
       orm_adapter (~> 0.5.0)
@@ -392,6 +393,8 @@ GEM
     websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    whenever (0.9.4)
+      chronic (>= 0.6.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -457,6 +460,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   unicorn
   web-console (~> 2.0)
+  whenever
 
 BUNDLED WITH
    1.10.6
diff --git a/config/schedule.rb b/config/schedule.rb
new file mode 100644
index 000000000..de75cf9d4
--- /dev/null
+++ b/config/schedule.rb
@@ -0,0 +1,20 @@
+# Use this file to easily define all of your cron jobs.
+#
+# It's helpful, but not entirely necessary to understand cron before proceeding.
+# http://en.wikipedia.org/wiki/Cron
+
+# Example:
+#
+# set :output, "/path/to/my/cron_log.log"
+#
+# every 2.hours do
+#   command "/usr/bin/some_great_command"
+#   runner "MyModel.some_method"
+#   rake "some:great:rake:task"
+# end
+#
+# every 4.days do
+#   runner "AnotherModel.prune_old_records"
+# end
+
+# Learn more: http://github.com/javan/whenever

From 44b5ea601866e9b77af299fe75870d06ff13ec63 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 11 Sep 2015 14:23:41 +0200
Subject: [PATCH 02/17] first try at integrating whenever and capistrano

---
 config/deploy.rb               | 5 +++++
 config/deploy/preproduction.rb | 2 +-
 config/deploy/production.rb    | 2 +-
 config/deploy/staging.rb       | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index f09c199f9..fe93826a1 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,3 +1,8 @@
+set :whenever_command, "bundle exec whenever"
+set :whenever_environment, defer { stage }
+set :whenever_roles, [ :cron ]
+require 'whenever/capistrano'
+
 # config valid only for current version of Capistrano
 lock '3.4.0'
 
diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb
index 97759d6ce..a514f84eb 100644
--- a/config/deploy/preproduction.rb
+++ b/config/deploy/preproduction.rb
@@ -6,5 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :preproduction
 set :rails_env, :preproduction
 
-server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
+server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron)
 server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 8b784cf21..5e002af1a 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -7,6 +7,6 @@ set :stage, :production
 set :rails_env, :production
 
 #server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
-server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)
+server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron)
 server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
 server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 0822fb9a1..c97bb9a7f 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -6,6 +6,6 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :staging
 set :rails_env, :staging
 
-server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
+server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer cron)
 
 

From 054f3b94e5adb28a9c4c500cef4f5ac08349f6ef Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Fri, 11 Sep 2015 17:32:10 +0200
Subject: [PATCH 03/17] uses -> instead of refer

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index fe93826a1..de48908d2 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 set :whenever_command, "bundle exec whenever"
-set :whenever_environment, defer { stage }
+set :whenever_environment, -> { stage }
 set :whenever_roles, [ :cron ]
 require 'whenever/capistrano'
 

From 74d07d337de3753e735d5ff373dfdec457cbd549 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 08:45:00 +0200
Subject: [PATCH 04/17] adds a dummy task to schedule.rb

---
 config/schedule.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/schedule.rb b/config/schedule.rb
index de75cf9d4..308cdc69c 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -18,3 +18,7 @@
 # end
 
 # Learn more: http://github.com/javan/whenever
+
+every 1.minute do
+  command "date > ~/cron-test.txt"
+end

From 05bfaa5c30a823f4cf6e554e09a07e12388b2486 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 08:56:47 +0200
Subject: [PATCH 05/17] move whenever require to Capfile

---
 Capfile          |  1 +
 config/deploy.rb | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Capfile b/Capfile
index 3e0bb4329..372653a5e 100644
--- a/Capfile
+++ b/Capfile
@@ -10,6 +10,7 @@ require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 #require 'capistrano/passenger'
 require 'capistrano/delayed-job'
+require 'whenever/capistrano'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/config/deploy.rb b/config/deploy.rb
index de48908d2..26711fbff 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,8 +1,3 @@
-set :whenever_command, "bundle exec whenever"
-set :whenever_environment, -> { stage }
-set :whenever_roles, [ :cron ]
-require 'whenever/capistrano'
-
 # config valid only for current version of Capistrano
 lock '3.4.0'
 
@@ -11,7 +6,6 @@ def deploysecret(key)
   @deploy_secrets_yml.fetch(key.to_s, 'undefined')
 end
 
-
 set :rails_env, fetch(:stage)
 set :rvm_ruby_version, '2.2.3'
 set :rvm_type, :user
@@ -52,6 +46,10 @@ set(:config_files, %w(
   sidekiq.yml
 ))
 
+set :whenever_command, "bundle exec whenever"
+set :whenever_environment, -> { fetch(:stage) }
+set :whenever_roles, [ :cron ]
+
 namespace :deploy do
   # Check right version of deploy branch
   # before :deploy, "deploy:check_revision"

From 1e59d3259ae53066db9e89efddada27c55856dcb Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 09:01:16 +0200
Subject: [PATCH 06/17] removes unnecessary whenever setup

---
 config/deploy.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 26711fbff..5d4b15960 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -46,9 +46,7 @@ set(:config_files, %w(
   sidekiq.yml
 ))
 
-set :whenever_command, "bundle exec whenever"
-set :whenever_environment, -> { fetch(:stage) }
-set :whenever_roles, [ :cron ]
+set :whenever_roles, -> { :cron }
 
 namespace :deploy do
   # Check right version of deploy branch

From 747c604127377fdf39c8e8e8555df0807a3260eb Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Sat, 12 Sep 2015 18:05:15 +0200
Subject: [PATCH 07/17] Fixes styles for mobile version

---
 app/assets/stylesheets/participacion.scss | 84 ++++++++++++++++++-----
 app/views/debates/index.html.erb          | 26 +++----
 app/views/layouts/_header.html.erb        |  6 +-
 app/views/layouts/devise.html.erb         |  3 +-
 app/views/welcome/welcome.html.erb        |  2 +-
 config/locales/devise_views.en.yml        |  4 +-
 config/locales/devise_views.es.yml        |  4 +-
 config/locales/es.yml                     |  2 +-
 8 files changed, 91 insertions(+), 40 deletions(-)

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index c6cd8c4a7..5a7d4c6d7 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -301,14 +301,37 @@ header {
     font-family: inherit;
     font-size: rem-calc(16);
     margin-top: 0;
+
+    &.see-more {
+      width: 100%;
+
+      @media (min-width: $small-breakpoint) {
+        width: auto;
+      }
+    }
+  }
+
+  .home-page {
+    text-align: center;
+
+    @media (min-width: $small-breakpoint) {
+      text-align: left;
+    }
   }
 
   .more-info {
     color: white;
+    display: block;
     font-size: rem-calc(14);
-    margin-left: rem-calc(24);
+    margin-bottom: rem-calc(24);
     text-decoration: underline;
 
+    @media (min-width: $small-breakpoint) {
+      display: inline-block;
+      margin-bottom: 0;
+      margin-left: rem-calc(24);
+    }
+
     &:hover {
       opacity: .75;
     }
@@ -330,10 +353,14 @@ header {
   }
 
   .icon-external {
+    display: inline-block;
     font-size: rem-calc(12);
     opacity: .5;
+    padding-top: rem-calc(3);
+    vertical-align: top;
 
     @media (min-width: $small-breakpoint) {
+      padding-top: 0;
       position: absolute;
       right: -18px;
       top: 3px;
@@ -419,11 +446,6 @@ header {
       font-size: rem-calc(16);
       font-weight: lighter;
       line-height: $line-height*2;
-      padding-left: rem-calc(12);
-
-      @media (min-width: $small-breakpoint) {
-        padding-left: 0;
-      }
 
       span {
         *display: inline; /* IE */
@@ -503,6 +525,18 @@ header {
   margin-right: rem-calc(24);
   width: 100%;
 
+  ul {
+    margin-left: 0;
+
+    @media (min-width: $small-breakpoint) {
+      margin-left:rem-calc(24);
+    }
+  }
+
+  ul li {
+    background: none;
+  }
+
   ul li > a {
     font-size: rem-calc(14);
 
@@ -510,13 +544,17 @@ header {
       border-radius: 0;
       line-height: $line-height*1.5;
       text-align: left;
+      background: none;
+      padding-left: rem-calc(6);
     }
 
     @media (min-width: $small-breakpoint) {
       &.button {
+        background: $brand;
         border-radius: rem-calc(3);
         line-height: rem-calc(15);
         margin-top: rem-calc(24);
+        padding-left: rem-calc(15);
         text-align: center;
       }
     }
@@ -550,7 +588,7 @@ header {
     li:not(.has-form) a:not(.button) {
       background: none;
       color: white;
-      padding: 0 rem-calc(6);
+      padding: rem-calc(12) 0;
 
       @media (min-width: $small-breakpoint) {
         line-height: $line-height*4;
@@ -608,7 +646,7 @@ header {
 
   a {
     color: $text;
-    display: block;
+    display: inline-block;
     font-size: rem-calc(14);
     font-weight: bold;
     line-height: $line-height*2;
@@ -616,12 +654,26 @@ header {
     text-align: left;
 
     @media (min-width: $small-breakpoint) {
-      display: inline-block;
       line-height: $line-height*3;
       margin-left: rem-calc(12);
       margin-right: rem-calc(72);
     }
 
+    &:after {
+      color: $border;
+      content: "|";
+      padding: 0 rem-calc(12);
+
+      @media (min-width: $small-breakpoint) {
+        content: none;
+        padding: 0;
+      }
+    }
+
+    &:last-child:after {
+      content: none;
+    }
+
     &:hover {
       color: $link;
     }
@@ -758,7 +810,6 @@ footer {
   background: #065687 image-url("auth_bg.jpg");
   background-repeat: no-repeat;
   background-size: cover;
-  padding-top: rem-calc(24);
 
   @media (min-width: $small-breakpoint) {
     padding-top: rem-calc(48);
@@ -772,9 +823,8 @@ footer {
     @include logo;
 
     a {
-      line-height: $line-height;
 
-      span {
+      span.logo-site {
         vertical-align: middle;
       }
     }
@@ -1058,7 +1108,11 @@ img.initialjs-avatar {
   h2 {
     display: inline-block;
     font-size: rem-calc(24);
-    margin-left: rem-calc(-17);
+    margin: rem-calc(12) 0;
+
+    @media (min-width: $small-breakpoint) {
+      margin: rem-calc(24) 0;
+    }
   }
 
   select {
@@ -1070,10 +1124,6 @@ img.initialjs-avatar {
     padding: rem-calc(12);
     width: auto;
 
-    @media (max-width: $small) {
-      margin-left: rem-calc(-17);
-    }
-
     @media (min-width: $small-breakpoint) {
       margin: 0 0 rem-calc(24) rem-calc(12);
     }
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index bbd77577c..9d576bfc2 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -3,17 +3,17 @@
   <div class="wrap row">
     <div id="debates" class="debates-list small-12 medium-9 column js-order-<%= @order.dasherize %>">
       <div class="filters">
-        <div class="small-12 medium-7 column">
+        <div class="small-12 medium-7 left">
           <% if @search_terms %>
-              <h2 class="margin-top">
-                <%= page_entries_info @debates %>
-                <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
-              </h2>
+            <h2 class="margin-top">
+              <%= page_entries_info @debates %>
+              <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
+            </h2>
           <% elsif @tag_filter %>
-              <h2 class="margin-top">
-                <%= page_entries_info @debates %>
-                <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
-              </h2>
+            <h2 class="margin-top">
+              <%= page_entries_info @debates %>
+              <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
+            </h2>
           <% end %>
         </div>
         <% if @tag_filter || @search_terms %>
@@ -22,10 +22,10 @@
               <%= t("debates.index.select_order") %>
             </h6>
         <% else %>
-          <div class="small-12 column margin-top inline-block">
-          <h2 class="inline-block">
-            <%= t("debates.index.select_order_long") %>
-          </h2>
+          <div class="small-12 inline-block">
+            <h2 class="inline-block">
+              <%= t("debates.index.select_order_long") %>
+            </h2>
         <% end %>
           <form class="inline-block">
              <select class="js-location-changer" name="order-selector">
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index e4e38674d..9226c048a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -33,7 +33,7 @@
     <section class="subnavigation row">
       <%#= link_to t("layouts.header.welcome"), root_path %>
       <%#= link_to t("layouts.header.initiatives"), "#" %>
-      <div class="small-8 column">
+      <div class="small-12 medium-8 column">
       <%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
       <%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information"))  %>
       <%= link_to t("layouts.header.external_link_blog_url"), target: "_blank" do %>
@@ -48,11 +48,11 @@
   </div>
 
   <% if home_page? %>
-    <div class="row">
+    <div class="row home-page">
       <div class="small-12 medium-7 column">
         <h1><%= t("layouts.header.open_city_title") %></h1>
         <p><%= t("layouts.header.open_city_slogan") %></p>
-        <%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius" %>
+        <%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius see-more" %>
         <%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
       </div>
 
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index f18364c43..c7b6ed372 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -18,7 +18,8 @@
       <div class="small-12 medium-8 large-5 column small-centered">
         <h1>
           <%= link_to root_path do %>
-            <%= image_tag("auth_logo.png", class: "left", size: "450x96", alt: t('layouts.header.logo')) %>
+            <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
+            <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
           <% end %>
         </h1>
       </div>
diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb
index 965edb795..181e9703b 100644
--- a/app/views/welcome/welcome.html.erb
+++ b/app/views/welcome/welcome.html.erb
@@ -4,7 +4,7 @@
 <p><%= t("welcome.welcome.instructions_3_html") %></p>
 <p>
   <%= link_to t("welcome.welcome.verify_account"),
-      verification_path, class: "button large success radius margin-top expand" %>
+      verification_path, class: "button success radius margin-top expand" %>
 </p>
 <p class="text-center">
   <%= link_to t("welcome.welcome.go_to_index"),
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 9562f63f8..632caf3a9 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -3,7 +3,7 @@ en:
     confirmations:
       title: "Resend confirmation instructions"
       email_label: Email
-      submit: "Resend confirmation instructions"
+      submit: "Resend confirmation"
     mailer:
       confirmation_instructions:
         title: "Welcome to open government portal"
@@ -37,7 +37,7 @@ en:
       new:
         title: "Forgot your password?"
         email_label: "Email"
-        send_submit: "Send me reset password instructions"
+        send_submit: "Send me reset password"
     users:
       registrations:
         edit:
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 9fa3a5adc..970be1ea8 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -3,7 +3,7 @@ es:
     confirmations:
       title: "Reenviar instrucciones de confirmación"
       email_label: Email
-      submit: "Reenviar instrucciones de confirmación"
+      submit: "Reenviar instrucciones"
     mailer:
       confirmation_instructions:
         title: "Te damos la bienvenida al Portal de Gobierno Abierto del Ayuntamiento de Madrid"
@@ -37,7 +37,7 @@ es:
       new:
         title: "¿Has olvidado tu contraseña?"
         email_label: "Email"
-        send_submit: "Recibir instrucciones para recuperar mi contraseña"
+        send_submit: "Recibir instrucciones"
     users:
       registrations:
         edit:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d2b51d551..d7b15082e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -215,7 +215,7 @@ es:
       instructions_3_html: "Sin verificar tus datos <b>el acceso que tienes es limitado</b>. Verificarlos ahora te permitirá, por ejemplo, apoyar propuestas ciudadanas."
       verify_account: "Verificar mi cuenta"
       go_to_index: "Quiero entrar como un usuario no verificado (acceso limitado)"
-      instructions_4_html: "Si quieres verificarte más tarde, puedes hacerlo en <i>Mi cuenta -> Verificar mi cuenta</i>."
+      instructions_4_html: "Si quieres verificarte más tarde, puedes hacerlo en <i>Mi cuenta > Verificar mi cuenta</i>."
   omniauth:
     finish_signup:
       title: Añade tu email

From 417757c4b091eea0c99f999500011c0c7e08c643 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Sat, 12 Sep 2015 18:05:33 +0200
Subject: [PATCH 08/17] Fixes add flags on mobile devices

---
 app/assets/stylesheets/debates.scss       | 15 ++++++--
 app/views/comments/_flag_actions.html.erb | 46 ++++++++++++-----------
 app/views/debates/_flag_actions.html.erb  | 42 +++++++++++----------
 3 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 9a59761d2..a2acbea13 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -305,11 +305,12 @@
   .panel {
     border-radius: 0;
     box-shadow: 0px 1px 3px 0 $border;
-    margin-bottom: rem-calc(4);
+    margin-bottom: rem-calc(12);
     min-height: rem-calc(192);
     padding-top: rem-calc(12);
 
     @media (min-width: $small-breakpoint) {
+      margin-bottom: rem-calc(-1);
       padding-bottom: rem-calc(12);
     }
 
@@ -373,7 +374,6 @@
 
     .total-votes {
       display: inline-block;
-      float: none;
       line-height: $line-height;
       margin-left: rem-calc(24);
       padding-top: rem-calc(12);
@@ -381,6 +381,7 @@
 
       @media (min-width: $small-breakpoint) {
         display: block;
+        float: none;
         line-height: $line-height*2;
         margin-left: 0;
         padding-top: 0;
@@ -399,7 +400,7 @@
 
     .not-logged {
       line-height: $line-height;
-      padding-top: rem-calc(36);
+      padding-top: rem-calc(24);
     }
 
     .anonymous-votes, .organizations-votes {
@@ -752,6 +753,14 @@
 // 06. Flags
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+.flag-content {
+
+  .button {
+    background: none;
+    padding: 0;
+  }
+}
+
 .flag-disable {
   color: $text-medium;
   line-height: rem-calc(24);
diff --git a/app/views/comments/_flag_actions.html.erb b/app/views/comments/_flag_actions.html.erb
index c056204e7..007ab90b4 100644
--- a/app/views/comments/_flag_actions.html.erb
+++ b/app/views/comments/_flag_actions.html.erb
@@ -1,23 +1,25 @@
-<% if show_flag_action? comment %>
-  <span class="divider">&nbsp;|&nbsp;</span>
-  <a id="flag-expand-comment-<%= comment.id %>" data-dropdown="flag-drop-comment-<%= comment.id %>" aria-controls="flag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.flag') %>">
-    &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
-  </a>
-  <ul id="flag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
-    <li>
-      <%= link_to t("shared.flag"), flag_comment_path(comment), method: :put, remote: true, id: "flag-comment-#{comment.id}" %>
-    </li>
-  </ul>
-<% end %>
+<span class="flag-content">
+  <% if show_flag_action? comment %>
+    <span class="divider">&nbsp;|&nbsp;</span>
+    <a class="button" id="flag-expand-comment-<%= comment.id %>" data-dropdown="flag-drop-comment-<%= comment.id %>" aria-controls="flag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.flag') %>">
+      &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
+    </a>
+    <ul id="flag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+      <li>
+        <%= link_to t("shared.flag"), flag_comment_path(comment), method: :put, remote: true, id: "flag-comment-#{comment.id}" %>
+      </li>
+    </ul>
+  <% end %>
 
-<% if show_unflag_action? comment %>
-  <span class="divider">&nbsp;|&nbsp;</span>
-  <a id="unflag-expand-comment-<%= comment.id %>" data-dropdown="unflag-drop-comment-<%= comment.id %>" aria-controls="unflag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.unflag') %>">
-    &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
-  </a>
-  <ul id="unflag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
-    <li>
-      <%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put, remote: true, id: "unflag-comment-#{comment.id}" %>
-    </li>
-  </ul>
-<% end %>
+  <% if show_unflag_action? comment %>
+    <span class="divider">&nbsp;|&nbsp;</span>
+    <a class="button" id="unflag-expand-comment-<%= comment.id %>" data-dropdown="unflag-drop-comment-<%= comment.id %>" aria-controls="unflag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.unflag') %>">
+      &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
+    </a>
+    <ul id="unflag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+      <li>
+        <%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put, remote: true, id: "unflag-comment-#{comment.id}" %>
+      </li>
+    </ul>
+  <% end %>
+</span>
diff --git a/app/views/debates/_flag_actions.html.erb b/app/views/debates/_flag_actions.html.erb
index 20f147df9..9456d82d2 100644
--- a/app/views/debates/_flag_actions.html.erb
+++ b/app/views/debates/_flag_actions.html.erb
@@ -1,21 +1,23 @@
-<% if show_flag_action? debate %>
-  <a id="flag-expand-debate-<%= debate.id %>" data-dropdown="flag-drop-debate-<%= debate.id %>" aria-controls="flag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.flag') %>">
-    &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
-  </a>
-  <ul id="flag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
-    <li>
-      <%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
-    </li>
-  </ul>
-<% end %>
+<span class="flag-content">
+  <% if show_flag_action? debate %>
+    <a class="button" id="flag-expand-debate-<%= debate.id %>" data-dropdown="flag-drop-debate-<%= debate.id %>" aria-controls="flag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.flag') %>">
+      &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
+    </a>
+    <ul id="flag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+      <li>
+        <%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
+      </li>
+    </ul>
+  <% end %>
 
-<% if show_unflag_action? debate %>
-  <a id="unflag-expand-debate-<%= debate.id %>" data-dropdown="unflag-drop-debate-<%= debate.id %>" aria-controls="unflag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.unflag') %>">
-    &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
-  </a>
-  <ul id="unflag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
-    <li>
-      <%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
-    </li>
-  </ul>
-<% end %>
+  <% if show_unflag_action? debate %>
+    <a class="button" id="unflag-expand-debate-<%= debate.id %>" data-dropdown="unflag-drop-debate-<%= debate.id %>" aria-controls="unflag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.unflag') %>">
+      &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
+    </a>
+    <ul id="unflag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+      <li>
+        <%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
+      </li>
+    </ul>
+  <% end %>
+</span>

From d6c52ec866ddf9c1662a32161e265757d0e281c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:05:51 +0200
Subject: [PATCH 09/17] puts organizations out of verification process

---
 app/controllers/verification_controller.rb    |  4 ++-
 app/views/account/show.html.erb               | 32 +++++++++----------
 .../verification/verification_path_spec.rb    | 10 ++++++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/controllers/verification_controller.rb b/app/controllers/verification_controller.rb
index 6d1945af4..adb3ee345 100644
--- a/app/controllers/verification_controller.rb
+++ b/app/controllers/verification_controller.rb
@@ -11,7 +11,9 @@ class VerificationController < ApplicationController
   private
 
     def next_step_path(user = current_user)
-      if user.level_three_verified?
+      if user.organization?
+        { path: account_path }
+      elsif user.level_three_verified?
         { path: account_path, notice: t('verification.redirect_notices.already_verified') }
       elsif user.verification_letter_sent?
         { path: edit_letter_path }
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index d580052e2..b1382ce4c 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,22 +1,22 @@
 <div class="row account">
   <div class="small-12 column">
     <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
-
-    <div>
-      <span class="right verify-account">
-        <% if current_user.level_three_verified? %>
-          <p class="verified">
-            <i class="icon-check"></i>
-            <%= t("account.show.verified_account") %>
-          </p>
-        <% elsif current_user.level_two_verified? %>
-          <%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success right" %>
-        <% else %>
-          <%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success right" %>
-        <% end %>
-      </span>
-    </div>
-
+    <% unless @account.organization? %>
+      <div>
+        <span class="right verify-account">
+          <% if current_user.level_three_verified? %>
+            <p class="verified">
+              <i class="icon-check"></i>
+              <%= t("account.show.verified_account") %>
+            </p>
+          <% elsif current_user.level_two_verified? %>
+            <%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success right" %>
+          <% else %>
+            <%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success right" %>
+          <% end %>
+        </span>
+      </div>
+    <% end %>
     <h1 class="inline-block"><%= t("account.show.title") %></h1>
 
     <%= form_for @account, as: :account, url: account_path do |f| %>
diff --git a/spec/features/verification/verification_path_spec.rb b/spec/features/verification/verification_path_spec.rb
index 2967f5e2f..bfd284500 100644
--- a/spec/features/verification/verification_path_spec.rb
+++ b/spec/features/verification/verification_path_spec.rb
@@ -2,6 +2,16 @@ require 'rails_helper'
 
 feature 'Verification path' do
 
+  scenario "User is an organization" do
+    user = create(:user, verified_at: Time.now)
+    create(:organization, user: user)
+
+    login_as(user)
+    visit verification_path
+
+    expect(current_path).to eq account_path
+  end
+
   scenario "User is verified" do
     user = create(:user, verified_at: Time.now)
 

From 120b1a65c27dfedad0899a5ad2d09ace953e7cc1 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Sat, 12 Sep 2015 18:13:52 +0200
Subject: [PATCH 10/17] Changes tests for new texts

---
 config/locales/en.yml          | 1 -
 config/locales/es.yml          | 1 -
 spec/features/users_spec.rb    | 2 +-
 spec/support/common_actions.rb | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 98afaeb4f..5a48149b9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,6 @@ en:
       external_link_blog_url: "/blog"
       open_gov: "%{open} government"
       open: "Open"
-      logo: "Open government | Participation"
       participation: Participation
       open_city_title: "The city you want, it will be the city you want."
       open_city_slogan:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d7b15082e..5a502045c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -10,7 +10,6 @@ es:
       external_link_blog_url: "/blog"
       open_gov: "Gobierno %{open}"
       open: "abierto"
-      logo: "Gobierno abierto | Participación"
       participation: Participación
       open_city_title: "La ciudad que quieres será la ciudad que quieras."
       open_city_slogan:
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index f47042de2..2a3b19b5d 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -176,7 +176,7 @@ feature 'Users' do
     click_link 'Forgot your password?'
 
     fill_in 'user_email', with: 'manuela@madrid.es'
-    click_button 'Send me reset password instructions'
+    click_button 'Send me reset password'
 
     expect(page).to have_content "You will receive an email with instructions on how to reset your password in a few minutes."
 
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 508daa297..2de06ce92 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -41,7 +41,7 @@ module CommonActions
     click_link 'Forgot your password?'
 
     fill_in 'user_email', with: 'manuela@madrid.es'
-    click_button 'Send me reset password instructions'
+    click_button 'Send me reset password'
   end
 
   def comment_on(debate, user = nil)

From 6b0edac6fc31d153838696e1cff8079e48f2e636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:16:14 +0200
Subject: [PATCH 11/17] adds responsible_name to organizations

---
 .../organizations/registrations_controller.rb |  2 +-
 app/models/organization.rb                    | 15 ++++++++++-
 .../organizations/registrations/new.html.erb  |  5 +++-
 config/locales/activerecord.en.yml            |  1 +
 config/locales/activerecord.es.yml            |  1 +
 config/locales/devise_views.en.yml            |  2 ++
 config/locales/devise_views.es.yml            |  2 ++
 ...8_add_responsible_name_to_organizations.rb |  5 ++++
 db/schema.rb                                  | 27 ++++++++++++++++---
 spec/factories.rb                             |  1 +
 spec/features/organizations_spec.rb           |  1 +
 spec/models/user_spec.rb                      |  3 ++-
 12 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20150912145218_add_responsible_name_to_organizations.rb

diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb
index 0341ef4ed..c0f69da33 100644
--- a/app/controllers/organizations/registrations_controller.rb
+++ b/app/controllers/organizations/registrations_controller.rb
@@ -29,7 +29,7 @@ class Organizations::RegistrationsController < Devise::RegistrationsController
   private
 
     def sign_up_params
-      params.require(:user).permit(:email, :password, :phone_number, :password_confirmation, :captcha, :captcha_key, :terms_of_service, organization_attributes: [:name])
+      params.require(:user).permit(:email, :password, :phone_number, :password_confirmation, :captcha, :captcha_key, :terms_of_service, organization_attributes: [:name, :responsible_name])
     end
 
 end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 0797849e7..069afc27f 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -3,7 +3,9 @@ class Organization < ActiveRecord::Base
 
   validates :name, presence: true
   validates :name, uniqueness: true
-  validate :validate_name_length
+  validate  :validate_name_length
+  validates :responsible_name, presence: true
+  validate  :validate_responsible_name_length
 
   delegate :email, :phone_number, to: :user
 
@@ -37,6 +39,10 @@ class Organization < ActiveRecord::Base
     @@name_max_length ||= self.columns.find { |c| c.name == 'name' }.limit || 60
   end
 
+  def self.responsible_name_max_length
+    @@responsible_name_max_length ||= self.columns.find { |c| c.name == 'responsible_name' }.limit || 60
+  end
+
   private
 
     def validate_name_length
@@ -46,4 +52,11 @@ class Organization < ActiveRecord::Base
       validator.validate(self)
     end
 
+    def validate_responsible_name_length
+      validator = ActiveModel::Validations::LengthValidator.new(
+        attributes: :responsible_name,
+        maximum: Organization.responsible_name_max_length)
+      validator.validate(self)
+    end
+
 end
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 1b95a2d5d..b9bc32f4a 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -7,9 +7,12 @@
 
       <%= f.fields_for :organization do |fo| %>
         <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
+        <%= fo.label t("devise_views.organizations.registrations.new.responsible_name_label") %>
+        <span class="note"><%= t("devise_views.organizations.registrations.new.responsible_name_note") %></span>
+        <%= fo.text_field :responsible_name, maxlength: Organization.responsible_name_max_length, label: false %>
       <% end %>
 
-      <%= f.email_field :email,     placeholder: t("devise_views.organizations.registrations.new.email_label") %>
+      <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>
 
       <%= f.text_field  :phone_number,  placeholder: t("devise_views.organizations.registrations.new.phone_number_label") %>
 
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index 94b1fa0c9..7967520e9 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -25,3 +25,4 @@ en:
         official_level: Official level
       organization:
         name: Organization name
+        responsible_name: Person in charge
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index f566026de..695c72df6 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -25,3 +25,4 @@ es:
         official_level: Nivel del cargo
       organization:
         name: Nombre de organización
+        responsible_name: Persona responsable del colectivo
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 9562f63f8..f4058837f 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -74,6 +74,8 @@ en:
         new:
           title: "Sign up as organization / collective"
           organization_name_label: "Organization name"
+          responsible_name_label: "Name and surname of the person in charge"
+          responsible_name_note: "The responsible representative of the organization"
           email_label: "Email"
           password_label: "Password"
           phone_number_label: "Phone number"
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 9fa3a5adc..814d4e535 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -74,6 +74,8 @@ es:
         new:
           title: "Registrarse como organización / colectivo"
           organization_name_label: "Nombre de la organización"
+          responsible_name_label: "Nombre y apellidos de la persona responsable del colectivo"
+          responsible_name_note: "Será la persona representante de la asociación/colectivo en cuyo nombre se presenten las propuestas"
           email_label: "Email"
           password_label: "Contraseña"
           phone_number_label: "Teléfono"
diff --git a/db/migrate/20150912145218_add_responsible_name_to_organizations.rb b/db/migrate/20150912145218_add_responsible_name_to_organizations.rb
new file mode 100644
index 000000000..ffffd31ce
--- /dev/null
+++ b/db/migrate/20150912145218_add_responsible_name_to_organizations.rb
@@ -0,0 +1,5 @@
+class AddResponsibleNameToOrganizations < ActiveRecord::Migration
+  def change
+    add_column :organizations, :responsible_name, :string, limit: 60
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fde03fe30..40408573d 100644
--- 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: 20150910152734) do
+ActiveRecord::Schema.define(version: 20150912145218) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -165,7 +165,7 @@ ActiveRecord::Schema.define(version: 20150910152734) do
   create_table "locks", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "tries",        default: 0
-    t.datetime "locked_until", default: '2015-09-10 13:46:11', null: false
+    t.datetime "locked_until", default: '2015-09-11 17:24:30', null: false
     t.datetime "created_at",                                   null: false
     t.datetime "updated_at",                                   null: false
   end
@@ -180,13 +180,32 @@ ActiveRecord::Schema.define(version: 20150910152734) do
 
   create_table "organizations", force: :cascade do |t|
     t.integer  "user_id"
-    t.string   "name",        limit: 60
+    t.string   "name",             limit: 60
     t.datetime "verified_at"
     t.datetime "rejected_at"
+    t.string   "responsible_name", limit: 60
   end
 
   add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
 
+  create_table "proposals", force: :cascade do |t|
+    t.string   "title",             limit: 80
+    t.text     "description"
+    t.string   "question"
+    t.string   "external_url"
+    t.integer  "author_id"
+    t.datetime "hidden_at"
+    t.integer  "flags_count",                  default: 0
+    t.datetime "ignored_flag_at"
+    t.integer  "cached_votes_up",              default: 0
+    t.integer  "comments_count",               default: 0
+    t.datetime "confirmed_hide_at"
+    t.integer  "hot_score",         limit: 8,  default: 0
+    t.integer  "confidence_score",             default: 0
+    t.datetime "created_at",                               null: false
+    t.datetime "updated_at",                               null: false
+  end
+
   create_table "settings", force: :cascade do |t|
     t.string "key"
     t.string "value"
@@ -246,7 +265,7 @@ ActiveRecord::Schema.define(version: 20150910152734) do
     t.integer  "official_level",                      default: 0
     t.datetime "hidden_at"
     t.string   "sms_confirmation_code"
-    t.string   "username",                     limit: 60
+    t.string   "username",                 limit: 60
     t.string   "document_number"
     t.string   "document_type"
     t.datetime "residence_verified_at"
diff --git a/spec/factories.rb b/spec/factories.rb
index ff3f60540..8513d4d16 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -149,6 +149,7 @@ FactoryGirl.define do
 
   factory :organization do
     user
+    responsible_name "Johnny Utah"
     sequence(:name) { |n| "org#{n}" }
 
     trait :verified do
diff --git a/spec/features/organizations_spec.rb b/spec/features/organizations_spec.rb
index 15cd4b41b..a42e78dad 100644
--- a/spec/features/organizations_spec.rb
+++ b/spec/features/organizations_spec.rb
@@ -9,6 +9,7 @@ feature 'Organizations' do
     visit new_organization_registration_path
 
     fill_in 'user_organization_attributes_name',  with: 'Greenpeace'
+    fill_in 'user_organization_attributes_responsible_name', with: 'Dorothy Stowe'
     fill_in 'user_email',                         with: 'green@peace.com'
     fill_in 'user_password',                      with: 'greenpeace'
     fill_in 'user_password_confirmation',         with: 'greenpeace'
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e8e710dd0..756810395 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -161,11 +161,12 @@ describe User do
   end
 
   describe "organization_attributes" do
-    before(:each) { subject.organization_attributes = {name: 'org'} }
+    before(:each) { subject.organization_attributes = {name: 'org', responsible_name: 'julia'} }
 
     it "triggers the creation of an associated organization" do
       expect(subject.organization).to be
       expect(subject.organization.name).to eq('org')
+      expect(subject.organization.responsible_name).to eq('julia')
     end
 
     it "deactivates the validation of username, and activates the validation of organization" do

From d8c9974d1ad6876ca1f0a79729600af824ba905f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:16:40 +0200
Subject: [PATCH 12/17] adds responsible_name to org's account page

---
 app/controllers/account_controller.rb | 2 +-
 app/views/account/show.html.erb       | 1 +
 config/locales/en.yml                 | 1 +
 config/locales/es.yml                 | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 625452196..b0bd18e5b 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -23,7 +23,7 @@ class AccountController < ApplicationController
 
     def account_params
       if @account.organization?
-        params.require(:account).permit(:phone_number, :email_on_debate_comment, :email_on_comment_reply, organization_attributes: [:name])
+        params.require(:account).permit(:phone_number, :email_on_debate_comment, :email_on_comment_reply, organization_attributes: [:name, :responsible_name])
       else
         params.require(:account).permit(:username, :email_on_debate_comment, :email_on_comment_reply)
       end
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index b1382ce4c..e43c424de 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -33,6 +33,7 @@
           <% if @account.organization? %>
             <%= f.fields_for :organization do |fo| %>
               <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("account.show.organization_name_label") %>
+              <%= fo.text_field :responsible_name, autofocus: true, maxlength: Organization.responsible_name_max_length, placeholder: t("account.show.organization_responsible_name_placeholder") %>
             <% end %>
             <%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 98afaeb4f..bca35eb2e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -176,6 +176,7 @@ en:
       username_label: "Username"
       phone_number_label: "Phone number"
       organization_name_label: "Organization name"
+      organization_responsible_name_placeholder: "The responsible representative of the organization"
       notifications: Notifications
       finish_verification: "Finish verification"
       verified_account: Verified account
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d2b51d551..bd3722b71 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -176,6 +176,7 @@ es:
       username_label: "Nombre de usuario"
       phone_number_label: "Teléfono"
       organization_name_label: "Nombre de la organización"
+      organization_responsible_name_placeholder: "Representante de la asociación/colectivo"
       notifications: Notificaciones
       finish_verification: "Finalizar verificación"
       verified_account: Cuenta verificada

From 40840f74c66cbd0fc1c7c0184e325541f1cd09ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:16:51 +0200
Subject: [PATCH 13/17] updates dev_seeds

---
 db/dev_seeds.rb |  3 ++-
 db/schema.rb    | 18 ------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 64cc190cd..93474c7b3 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -27,7 +27,8 @@ moderator.create_moderator
 (1..10).each do |i|
   org_name = Faker::Company.name
   org_user = create_user("org#{i}@madrid.es", org_name)
-  org = org_user.create_organization(name: org_name)
+  org_responsible_name = Faker::Name.name
+  org = org_user.create_organization(name: org_name, responsible_name: org_responsible_name)
 
   verified = [true, false].sample
   if verified then
diff --git a/db/schema.rb b/db/schema.rb
index 40408573d..dca1e8354 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -188,24 +188,6 @@ ActiveRecord::Schema.define(version: 20150912145218) do
 
   add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
 
-  create_table "proposals", force: :cascade do |t|
-    t.string   "title",             limit: 80
-    t.text     "description"
-    t.string   "question"
-    t.string   "external_url"
-    t.integer  "author_id"
-    t.datetime "hidden_at"
-    t.integer  "flags_count",                  default: 0
-    t.datetime "ignored_flag_at"
-    t.integer  "cached_votes_up",              default: 0
-    t.integer  "comments_count",               default: 0
-    t.datetime "confirmed_hide_at"
-    t.integer  "hot_score",         limit: 8,  default: 0
-    t.integer  "confidence_score",             default: 0
-    t.datetime "created_at",                               null: false
-    t.datetime "updated_at",                               null: false
-  end
-
   create_table "settings", force: :cascade do |t|
     t.string "key"
     t.string "value"

From eb8d8f47663d4c5c2d074b34e309dd0fd1bf15f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:41:34 +0200
Subject: [PATCH 14/17] changes migration to update invalid orgs

---
 ...0912145218_add_responsible_name_to_organizations.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20150912145218_add_responsible_name_to_organizations.rb b/db/migrate/20150912145218_add_responsible_name_to_organizations.rb
index ffffd31ce..08598e7c4 100644
--- a/db/migrate/20150912145218_add_responsible_name_to_organizations.rb
+++ b/db/migrate/20150912145218_add_responsible_name_to_organizations.rb
@@ -1,5 +1,13 @@
 class AddResponsibleNameToOrganizations < ActiveRecord::Migration
-  def change
+  def up
     add_column :organizations, :responsible_name, :string, limit: 60
+
+    Organization.find_each do |org|
+      org.update(responsible_name: org.name) if org.responsible_name.blank?
+    end
+  end
+
+  def down
+    remove_column :organizations, :responsible_name
   end
 end

From d814baaf1005347025d99459a2b75b7737084916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 12 Sep 2015 18:47:11 +0200
Subject: [PATCH 15/17] shows responsible person in admin/organizations

---
 app/views/admin/organizations/index.html.erb  | 1 +
 app/views/admin/organizations/search.html.erb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb
index 51a8dd959..aebcbea54 100644
--- a/app/views/admin/organizations/index.html.erb
+++ b/app/views/admin/organizations/index.html.erb
@@ -25,6 +25,7 @@
     <td><%= organization.name %></td>
     <td><%= organization.email %></td>
     <td><%= organization.phone_number %></td>
+    <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
         <i class="icon-check"></i>
diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb
index 3bc8ccedc..99f2a1f81 100644
--- a/app/views/admin/organizations/search.html.erb
+++ b/app/views/admin/organizations/search.html.erb
@@ -21,6 +21,7 @@
     <td><%= organization.name %></td>
     <td><%= organization.email %></td>
     <td><%= organization.phone_number %></td>
+    <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
         <i class="icon-check"></i>

From 08cf75fb953410eebe4eda1e3366cdad817d868d Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 19:30:26 +0200
Subject: [PATCH 16/17] Fixes bug: users were creating new organisations
 instead of updating existing ones

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 3ddf4df54..723f92458 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -32,7 +32,7 @@ class User < ActiveRecord::Base
 
   validates_associated :organization, message: false
 
-  accepts_nested_attributes_for :organization
+  accepts_nested_attributes_for :organization, update_only: true
 
   scope :administrators, -> { joins(:administrators) }
   scope :moderators,     -> { joins(:moderator) }

From 934b8f481e124bc1d3fb76fa2aabe30db7d102e2 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 12 Sep 2015 19:30:59 +0200
Subject: [PATCH 17/17] Fixes styling in organizations/registrations/success

---
 .../registrations/success.html.erb            | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/views/organizations/registrations/success.html.erb b/app/views/organizations/registrations/success.html.erb
index 89f5c75cc..66a1918e9 100644
--- a/app/views/organizations/registrations/success.html.erb
+++ b/app/views/organizations/registrations/success.html.erb
@@ -1,15 +1,9 @@
-<div class="auth row">
-  <div class="small-12 medium-8 column small-centered">
-    <div class="panel">
-      <h2><%= t("devise_views.organizations.registrations.success.title") %></h2>
-      <p><%= t("devise_views.organizations.registrations.success.thank_you_html") %></p>
-      <p><%= t("devise_views.organizations.registrations.success.instructions_1_html") %></p>
-      <p><%= t("devise_views.organizations.registrations.success.instructions_2_html") %></p>
-      <p><%= t("devise_views.organizations.registrations.success.instructions_3_html") %></p>
-      <p>
-        <%= link_to t("devise_views.organizations.registrations.success.back_to_index"),
-            root_path, class: "button radius small margin-top" %>
-      </p>
-    </div>
-  </div>
-</div>
+<h2><%= t("devise_views.organizations.registrations.success.title") %></h2>
+<p><%= t("devise_views.organizations.registrations.success.thank_you_html") %></p>
+<p><%= t("devise_views.organizations.registrations.success.instructions_1_html") %></p>
+<p><%= t("devise_views.organizations.registrations.success.instructions_2_html") %></p>
+<p><%= t("devise_views.organizations.registrations.success.instructions_3_html") %></p>
+<p>
+  <%= link_to t("devise_views.organizations.registrations.success.back_to_index"),
+      root_path, class: "button radius small margin-top expand" %>
+</p>