From bf7112f090ebae8facd6bf9574e577423ed8e543 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Wed, 26 Dec 2018 12:58:43 +0100
Subject: [PATCH 01/27] make parameter 'skip_map' accessible on creating an
 investment

---
 .../budgets/investments_controller.rb         |  3 +-
 .../management/budget_investments_spec.rb     |  9 ++++
 spec/shared/features/mappable.rb              | 53 +++++++++++++------
 3 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/app/controllers/management/budgets/investments_controller.rb b/app/controllers/management/budgets/investments_controller.rb
index d4ecac8d40e..da22677b611 100644
--- a/app/controllers/management/budgets/investments_controller.rb
+++ b/app/controllers/management/budgets/investments_controller.rb
@@ -52,7 +52,8 @@ def load_investment_votes(investments)
     end
 
     def investment_params
-      params.require(:budget_investment).permit(:title, :description, :external_url, :heading_id, :tag_list, :organization_name, :location)
+      params.require(:budget_investment).permit(:title, :description, :external_url, :heading_id,
+                                                :tag_list, :organization_name, :location, :skip_map)
     end
 
     def only_verified_users
diff --git a/spec/features/management/budget_investments_spec.rb b/spec/features/management/budget_investments_spec.rb
index 9f0ca79382d..10b80ff1dcd 100644
--- a/spec/features/management/budget_investments_spec.rb
+++ b/spec/features/management/budget_investments_spec.rb
@@ -9,6 +9,15 @@
     @heading = create(:budget_heading, group: @group, name: "Health")
   end
 
+  it_behaves_like "mappable",
+                  "budget_investment",
+                  "investment",
+                  "new_management_budget_investment_path",
+                  "",
+                  "management_budget_investment_path",
+                  { "budget_id": "budget_id" },
+                  management = true
+
   context "Create" do
     before { @budget.update(phase: 'accepting') }
 
diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb
index 4f01ac5bb73..1ae371e8da3 100644
--- a/spec/shared/features/mappable.rb
+++ b/spec/shared/features/mappable.rb
@@ -1,4 +1,10 @@
-shared_examples "mappable" do |mappable_factory_name, mappable_association_name, mappable_new_path, mappable_edit_path, mappable_show_path, mappable_path_arguments|
+shared_examples "mappable" do |mappable_factory_name,
+                               mappable_association_name,
+                               mappable_new_path,
+                               mappable_edit_path,
+                               mappable_show_path,
+                               mappable_path_arguments,
+                               management = false|
 
   include ActionView::Helpers
 
@@ -6,6 +12,7 @@
   let!(:arguments)    { {} }
   let!(:mappable)     { create(mappable_factory_name.to_s.to_sym) }
   let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) }
+  let(:management)    { management }
 
   before do
     Setting['feature.map'] = true
@@ -16,7 +23,7 @@
     before { set_arguments(arguments, mappable, mappable_path_arguments) }
 
     scenario "Should not show marker by default on create #{mappable_factory_name}", :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -27,7 +34,7 @@
     end
 
     scenario "Should show marker on create #{mappable_factory_name} when click on map", :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -39,7 +46,7 @@
     end
 
     scenario "Should create #{mappable_factory_name} with map", :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -50,7 +57,7 @@
     end
 
     scenario "Can not display map on #{mappable_factory_name} when not fill marker on map", :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -63,7 +70,7 @@
 
     scenario "Can not display map on #{mappable_factory_name} when feature.map is disabled", :js do
       Setting['feature.map'] = false
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -74,7 +81,7 @@
     end
 
     scenario 'Errors on create' do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("submit_#{mappable_factory_name}_form")
@@ -83,7 +90,7 @@
     end
 
     scenario 'Skip map', :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       send("fill_in_#{mappable_factory_name}_form")
@@ -94,7 +101,7 @@
     end
 
     scenario 'Toggle map', :js do
-      login_as user
+      do_login_for user
       visit send(mappable_new_path, arguments)
 
       check "#{mappable_factory_name}_skip_map"
@@ -115,7 +122,7 @@
     before { skip } if mappable_edit_path.blank?
 
     scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
 
@@ -124,7 +131,7 @@
     end
 
     scenario "Should edit default values from map on #{mappable_factory_name} edit page", :js do
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       find(".map_location").click
@@ -137,7 +144,7 @@
     end
 
     scenario "Should edit mappable on #{mappable_factory_name} without change map", :js do
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       fill_in "#{mappable_factory_name}_title", with: "New title"
@@ -150,7 +157,7 @@
     end
 
     scenario "Can not display map on #{mappable_factory_name} edit when remove map marker", :js do
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       click_link "Remove map marker"
@@ -162,7 +169,7 @@
 
     scenario "Can not display map on #{mappable_factory_name} edit when feature.map is disabled", :js do
       Setting['feature.map'] = false
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       fill_in "#{mappable_factory_name}_title", with: "New title"
@@ -173,7 +180,7 @@
 
     scenario 'No errors on update', :js do
       skip ""
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       click_link "Remove map marker"
@@ -183,7 +190,7 @@
     end
 
     scenario 'No need to skip map on update' do
-      login_as mappable.author
+      do_login_for mappable.author
 
       visit send(mappable_edit_path, id: mappable.id)
       click_link "Remove map marker"
@@ -196,7 +203,10 @@
 
   describe "At #{mappable_show_path}" do
 
-    before { set_arguments(arguments, mappable, mappable_path_arguments) }
+    before do
+      set_arguments(arguments, mappable, mappable_path_arguments)
+      do_login_for(user) if management
+    end
 
     scenario "Should display map on #{mappable_factory_name} show page", :js do
       arguments[:id] = mappable.id
@@ -229,6 +239,15 @@
 
 end
 
+def do_login_for(user)
+  if management
+    login_as_manager
+    login_managed_user(user)
+  else
+    login_as(user)
+  end
+end
+
 def fill_in_proposal_form
   fill_in 'proposal_title', with: 'Help refugees'
   fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?'

From 82a2dd622badb43791c55f030925abd013ecc1f0 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Wed, 8 Mar 2017 22:34:34 +0100
Subject: [PATCH 02/27] hotfix to load categories on error

---
 app/controllers/management/budgets/investments_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/management/budgets/investments_controller.rb b/app/controllers/management/budgets/investments_controller.rb
index da22677b611..2e879b6e16f 100644
--- a/app/controllers/management/budgets/investments_controller.rb
+++ b/app/controllers/management/budgets/investments_controller.rb
@@ -23,6 +23,7 @@ def create
       notice = t('flash.actions.create.notice', resource_name: Budget::Investment.model_name.human, count: 1)
       redirect_to management_budget_investment_path(@budget, @investment), notice: notice
     else
+      load_categories
       render :new
     end
   end

From d3671491e885384b8337042769fb70d1959c1ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 28 Dec 2018 12:50:45 +0100
Subject: [PATCH 03/27] Enable indentation width cop

This cop is necessary so the `Layout/IndentationConsistency` cop works
properly when its `EnforcedStyle` is set to `Rails`, and so incorrect
indentation for `private` methods is properly detected.
---
 .rubocop_basic.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml
index 7d7074e9f09..7711c48b63e 100644
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -18,6 +18,9 @@ AllCops:
 Layout/IndentationConsistency:
   EnforcedStyle: rails
 
+Layout/IndentationWidth:
+  Enabled: true
+
 Layout/EndOfLine:
   EnforcedStyle: lf
 

From a982f97cbdf47610d8c3b31cc17298934d0ff17c Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 27 Dec 2018 13:02:44 +0100
Subject: [PATCH 04/27] Adds documents list on legislation process proposals
 phase

---
 app/views/legislation/processes/proposals.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb
index eb8caa153ba..53e11485c4f 100644
--- a/app/views/legislation/processes/proposals.html.erb
+++ b/app/views/legislation/processes/proposals.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'key_dates', process: @process, phase: :proposals %>
 
 <%= render 'proposals_content', process: @process, proposals: @proposals %>

From a8fb479be59d4d7ea97db6be4380f0fe9c224566 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 28 Dec 2018 13:01:34 +0100
Subject: [PATCH 05/27] Adds specs for show view has document present on all
 phases

---
 spec/features/legislation/processes_spec.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb
index 4b71a0ccd36..7d286c85d40 100644
--- a/spec/features/legislation/processes_spec.rb
+++ b/spec/features/legislation/processes_spec.rb
@@ -134,12 +134,21 @@
     context "show" do
       include_examples "not published permissions", :legislation_process_path
 
-      scenario '#show view has document present' do
+      scenario 'show view has document present on all phases' do
         process = create(:legislation_process)
         document = create(:document, documentable: process)
+        phases = ["Debate", "Proposals", "Draft publication",
+                  "Comments", "Final result publication"]
+
         visit legislation_process_path(process)
 
-        expect(page).to have_content(document.title)
+        phases.each do |phase|
+          within(".legislation-process-list") do
+            find('li', :text => "#{phase}").click_link
+          end
+
+          expect(page).to have_content(document.title)
+        end
       end
 
       scenario 'show additional info button' do

From db86f0e7ab6f18f019c7c9d6235614d3c1fd3a78 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 27 Dec 2018 20:16:39 +0100
Subject: [PATCH 06/27] Changes styles to tabs on processes key dates

---
 .../stylesheets/legislation_process.scss      | 112 +++++++++++-------
 1 file changed, 71 insertions(+), 41 deletions(-)

diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss
index 0bfff8b239f..c870b0e32ec 100644
--- a/app/assets/stylesheets/legislation_process.scss
+++ b/app/assets/stylesheets/legislation_process.scss
@@ -44,69 +44,99 @@
 // 02. Legislation process navigation
 // ----------------------------------
 
-.legislation-process-categories {
-  position: relative;
+.legislation-process-list {
+  border-bottom: 1px solid $border;
+}
 
-  .legislation-process-list {
-    border-bottom: 1px solid $medium-gray;
-    margin: 0 rem-calc(16) rem-calc(16);
+.key-dates {
+  list-style-type: none;
+  margin: 0 rem-calc(-10);
 
-    ul {
-      list-style: none;
-      margin: 0 auto;
-      margin-bottom: 0;
-      padding-left: 0;
-    }
+  @include breakpoint(medium) {
+    margin: 0;
+  }
 
-    li {
-      border-bottom: 2px solid transparent;
-      cursor: pointer;
+  li {
+    border: 1px solid $border;
+    display: block;
+    margin: rem-calc(-1) 0;
+    position: relative;
+
+    @include breakpoint(medium) {
+      background: #fafafa;
       display: inline-block;
-      margin-bottom: $line-height;
-      margin-right: $line-height;
-      transition: all 0.4s;
+      border-bottom: 0;
+      border-top-left-radius: rem-calc(6);
+      border-top-right-radius: rem-calc(6);
+      margin-bottom: 0;
+      margin-right: $line-height / 4;
+      margin-top: 0;
 
-      @include breakpoint(medium) {
-        margin-bottom: 0;
+      &:hover:not(.is-active) {
+        background: $highlight;
       }
 
-      &:hover,
-      &:active,
-      &:focus {
-        border-bottom: 2px solid $brand;
+      &::after {
+        content: '' !important;
       }
+    }
 
-      a,
-      h4 {
-        display: block;
-        color: #6d6d6d;
-        margin-bottom: 0;
-      }
+    &::after {
+      content: '\63';
+      font-family: "icons" !important;
+      font-size: rem-calc(24);
+      pointer-events: none;
+      position: absolute;
+      right: 12px;
+      top: 12px;
     }
 
     a {
-      &:hover,
-      &:active {
+      display: block;
+      padding: $line-height / 4 $line-height / 2;
+
+      @include breakpoint(medium) {
+        display: inline-block;
+      }
+
+      &:hover {
         text-decoration: none;
       }
 
-      p {
+      h4 {
         margin-bottom: 0;
-
-        @include breakpoint(medium) {
-          margin-bottom: rem-calc(16);
-        }
       }
     }
+  }
 
-    .is-active {
-      border-bottom: 2px solid $brand;
+  span {
+    color: $text-medium;
+    font-size: $small-font-size;
+  }
 
-      a,
-      h4 {
-        color: $brand;
+  .is-active {
+    background: $highlight;
+    position: relative;
+
+    @include breakpoint(medium) {
+      background: none;
+      border: 1px solid $border;
+      border-bottom: 0;
+
+      &::after {
+        border-bottom: 1px solid #fefefe;
+        bottom: -1px;
+        content: '' !important;
+        left: 0;
+        position: absolute;
+        width: 100%;
       }
     }
+
+    &::after {
+      content: '\61';
+      color: $link;
+    }
   }
 }
 

From 2ac3406a989855dd52b358d850073aab24034741 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 27 Dec 2018 20:17:38 +0100
Subject: [PATCH 07/27] Updates key dates i18n

---
 config/locales/en/legislation.yml    | 2 +-
 config/locales/es-AR/legislation.yml | 2 +-
 config/locales/es-BO/legislation.yml | 2 +-
 config/locales/es-CL/legislation.yml | 2 +-
 config/locales/es-CO/legislation.yml | 2 +-
 config/locales/es-CR/legislation.yml | 2 +-
 config/locales/es-DO/legislation.yml | 2 +-
 config/locales/es-EC/legislation.yml | 2 +-
 config/locales/es-GT/legislation.yml | 2 +-
 config/locales/es-HN/legislation.yml | 2 +-
 config/locales/es-MX/legislation.yml | 2 +-
 config/locales/es-NI/legislation.yml | 2 +-
 config/locales/es-PA/legislation.yml | 2 +-
 config/locales/es-PE/legislation.yml | 2 +-
 config/locales/es-PR/legislation.yml | 2 +-
 config/locales/es-PY/legislation.yml | 2 +-
 config/locales/es-SV/legislation.yml | 2 +-
 config/locales/es-UY/legislation.yml | 2 +-
 config/locales/es-VE/legislation.yml | 2 +-
 config/locales/es/legislation.yml    | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml
index ed142fd493c..e1c71f6c6b7 100644
--- a/config/locales/en/legislation.yml
+++ b/config/locales/en/legislation.yml
@@ -82,7 +82,7 @@ en:
         see_latest_comments: See latest comments
         see_latest_comments_title: Comment on this process
       shared:
-        key_dates: Key dates
+        key_dates: Participation phases
         debate_dates: Debate
         draft_publication_date: Draft publication
         allegations_dates: Comments
diff --git a/config/locales/es-AR/legislation.yml b/config/locales/es-AR/legislation.yml
index 846e74d5a13..92714dc197d 100644
--- a/config/locales/es-AR/legislation.yml
+++ b/config/locales/es-AR/legislation.yml
@@ -73,7 +73,7 @@ es-AR:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-BO/legislation.yml b/config/locales/es-BO/legislation.yml
index 1b5d5ed55c0..85247082674 100644
--- a/config/locales/es-BO/legislation.yml
+++ b/config/locales/es-BO/legislation.yml
@@ -73,7 +73,7 @@ es-BO:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-CL/legislation.yml b/config/locales/es-CL/legislation.yml
index ab17069eee6..2a254f7f795 100644
--- a/config/locales/es-CL/legislation.yml
+++ b/config/locales/es-CL/legislation.yml
@@ -73,7 +73,7 @@ es-CL:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-CO/legislation.yml b/config/locales/es-CO/legislation.yml
index aaae703d3c5..1b8a1763710 100644
--- a/config/locales/es-CO/legislation.yml
+++ b/config/locales/es-CO/legislation.yml
@@ -73,7 +73,7 @@ es-CO:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-CR/legislation.yml b/config/locales/es-CR/legislation.yml
index db9d5cda44e..c262a9e5306 100644
--- a/config/locales/es-CR/legislation.yml
+++ b/config/locales/es-CR/legislation.yml
@@ -73,7 +73,7 @@ es-CR:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-DO/legislation.yml b/config/locales/es-DO/legislation.yml
index 5492300ec40..9d737a8dd2d 100644
--- a/config/locales/es-DO/legislation.yml
+++ b/config/locales/es-DO/legislation.yml
@@ -73,7 +73,7 @@ es-DO:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-EC/legislation.yml b/config/locales/es-EC/legislation.yml
index ec08d9ed0dd..cad9eb51df2 100644
--- a/config/locales/es-EC/legislation.yml
+++ b/config/locales/es-EC/legislation.yml
@@ -73,7 +73,7 @@ es-EC:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-GT/legislation.yml b/config/locales/es-GT/legislation.yml
index 03328bcfb00..2a672648f3f 100644
--- a/config/locales/es-GT/legislation.yml
+++ b/config/locales/es-GT/legislation.yml
@@ -73,7 +73,7 @@ es-GT:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-HN/legislation.yml b/config/locales/es-HN/legislation.yml
index 1184bda4ba8..8b10aa0e46f 100644
--- a/config/locales/es-HN/legislation.yml
+++ b/config/locales/es-HN/legislation.yml
@@ -73,7 +73,7 @@ es-HN:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-MX/legislation.yml b/config/locales/es-MX/legislation.yml
index cd64b635353..81697e4931b 100644
--- a/config/locales/es-MX/legislation.yml
+++ b/config/locales/es-MX/legislation.yml
@@ -73,7 +73,7 @@ es-MX:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-NI/legislation.yml b/config/locales/es-NI/legislation.yml
index d364ccb0065..c112c516ca9 100644
--- a/config/locales/es-NI/legislation.yml
+++ b/config/locales/es-NI/legislation.yml
@@ -73,7 +73,7 @@ es-NI:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-PA/legislation.yml b/config/locales/es-PA/legislation.yml
index bfade748781..59fc865ce3b 100644
--- a/config/locales/es-PA/legislation.yml
+++ b/config/locales/es-PA/legislation.yml
@@ -73,7 +73,7 @@ es-PA:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-PE/legislation.yml b/config/locales/es-PE/legislation.yml
index 8732d96ebb5..1a6088a984d 100644
--- a/config/locales/es-PE/legislation.yml
+++ b/config/locales/es-PE/legislation.yml
@@ -73,7 +73,7 @@ es-PE:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-PR/legislation.yml b/config/locales/es-PR/legislation.yml
index 7aa3e0aa0f5..a8a8daad186 100644
--- a/config/locales/es-PR/legislation.yml
+++ b/config/locales/es-PR/legislation.yml
@@ -73,7 +73,7 @@ es-PR:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-PY/legislation.yml b/config/locales/es-PY/legislation.yml
index 60b9864fad9..6d18bb5899f 100644
--- a/config/locales/es-PY/legislation.yml
+++ b/config/locales/es-PY/legislation.yml
@@ -73,7 +73,7 @@ es-PY:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-SV/legislation.yml b/config/locales/es-SV/legislation.yml
index 528d2ce5e16..dae905caa58 100644
--- a/config/locales/es-SV/legislation.yml
+++ b/config/locales/es-SV/legislation.yml
@@ -73,7 +73,7 @@ es-SV:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-UY/legislation.yml b/config/locales/es-UY/legislation.yml
index 548cf6f5e8c..1917fb92e6b 100644
--- a/config/locales/es-UY/legislation.yml
+++ b/config/locales/es-UY/legislation.yml
@@ -73,7 +73,7 @@ es-UY:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es-VE/legislation.yml b/config/locales/es-VE/legislation.yml
index 38d51b1f7d5..79528f0938e 100644
--- a/config/locales/es-VE/legislation.yml
+++ b/config/locales/es-VE/legislation.yml
@@ -73,7 +73,7 @@ es-VE:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         result_publication_date: Publicación resultados
diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml
index 766089a43f9..18bd8d5ef2a 100644
--- a/config/locales/es/legislation.yml
+++ b/config/locales/es/legislation.yml
@@ -82,7 +82,7 @@ es:
         see_latest_comments: Ver últimas aportaciones
         see_latest_comments_title: Aportar a este proceso
       shared:
-        key_dates: Fechas clave
+        key_dates: Fases de participación
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         allegations_dates: Comentarios

From dd8e2d63114b8c7ca12b8b481afc626e2eb700b6 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 27 Dec 2018 20:18:34 +0100
Subject: [PATCH 08/27] Shows participation phases only if there is a phase
 enabled

---
 app/models/legislation/process.rb             |   4 +
 .../legislation/processes/_key_dates.html.erb | 110 +++++++++---------
 spec/factories/legislations.rb                |  19 +++
 spec/features/legislation/processes_spec.rb   |  17 ++-
 4 files changed, 94 insertions(+), 56 deletions(-)

diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
index e9bfe02a469..be8cc74c308 100644
--- a/app/models/legislation/process.rb
+++ b/app/models/legislation/process.rb
@@ -80,6 +80,10 @@ def result_publication
     Legislation::Process::Publication.new(result_publication_date, result_publication_enabled)
   end
 
+  def enabled_phases?
+    PHASES_AND_PUBLICATIONS.any? { |process| send(process).enabled? }
+  end
+
   def enabled_phases_and_publications_count
     PHASES_AND_PUBLICATIONS.count { |process| send(process).enabled? }
   end
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index 6fbea50537f..7181e68cf56 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -1,65 +1,65 @@
-<nav class="legislation-process-categories">
-  <div class="legislation-process-list">
-    <div class="row">
-      <div class="small-12 column">
+<nav class="<%= 'legislation-process-list' if process.enabled_phases? %>">
+  <div class="row">
+    <div class="small-12 column">
+      <% if process.enabled_phases? %>
         <h3><%= t("legislation.processes.shared.key_dates") %></h3>
+      <% end %>
 
-        <ul>
-          <% if process.debate_phase.enabled? %>
-            <li <%= 'class=is-active' if phase.to_sym == :debate_phase %>>
-              <%= link_to debate_legislation_process_path(process) do %>
-                <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
-                <p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
+      <ul class="key-dates">
+        <% if process.debate_phase.enabled? %>
+          <li <%= 'class=is-active' if phase.to_sym == :debate_phase %>>
+            <%= link_to debate_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.debate_dates") %></h4>
+              <span><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
 
-          <% if process.proposals_phase.enabled? %>
-            <li <%= 'class=is-active' if phase.to_sym == :proposals %>>
-              <%= link_to proposals_legislation_process_path(process) do %>
-                <h4><%= t('legislation.processes.shared.proposals_dates') %></h4>
-                <p><%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
+        <% if process.proposals_phase.enabled? %>
+          <li <%= 'class=is-active' if phase.to_sym == :proposals %>>
+            <%= link_to proposals_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.proposals_dates") %></h4>
+              <span><%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
 
-          <% if process.draft_publication.enabled? %>
-            <li <%= 'class=is-active' if phase.to_sym == :draft_publication %>>
-              <%= link_to draft_publication_legislation_process_path(process) do %>
-                <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
-                <p><%= format_date(process.draft_publication_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
+        <% if process.draft_publication.enabled? %>
+          <li <%= 'class=is-active' if phase.to_sym == :draft_publication %>>
+            <%= link_to draft_publication_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.draft_publication_date") %></h4>
+              <span><%= format_date(process.draft_publication_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
 
-          <% if process.allegations_phase.enabled? %>
-            <li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>>
-              <%= link_to allegations_legislation_process_path(process) do %>
-                <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
-                <p><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
+        <% if process.allegations_phase.enabled? %>
+          <li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>>
+            <%= link_to allegations_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.allegations_dates") %></h4>
+              <span><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
 
-          <% if process.result_publication.enabled? %>
-            <li <%= 'class=is-active' if phase.to_sym == :result_publication %>>
-              <%= link_to result_publication_legislation_process_path(process) do %>
-                <h4><%= t('legislation.processes.shared.result_publication_date') %></h4>
-                <p><%= format_date(process.result_publication_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
+        <% if process.result_publication.enabled? %>
+          <li <%= 'class=is-active' if phase.to_sym == :result_publication %>>
+            <%= link_to result_publication_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.result_publication_date") %></h4>
+              <span><%= format_date(process.result_publication_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
 
-          <% if process.milestones.any? %>
-            <li class="milestones <%= "is-active" if phase == :milestones %>">
-              <%= link_to milestones_legislation_process_path(process) do %>
-                <h4><%= t("legislation.processes.shared.milestones_date") %></h4>
-                <p><%= format_date(process.milestones.order_by_publication_date.last.publication_date) %></p>
-              <% end %>
-            </li>
-          <% end %>
-        </ul>
-      </div>
+        <% if process.milestones.any? %>
+          <li class="milestones <%= "is-active" if phase == :milestones %>">
+            <%= link_to milestones_legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.milestones_date") %></h4>
+              <span><%= format_date(process.milestones.order_by_publication_date.last.publication_date) %></span>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
     </div>
   </div>
 </nav>
diff --git a/spec/factories/legislations.rb b/spec/factories/legislations.rb
index 79a617d677c..e911f574ebf 100644
--- a/spec/factories/legislations.rb
+++ b/spec/factories/legislations.rb
@@ -100,6 +100,25 @@
       end_date   { 1.week.from_now }
     end
 
+    trait :empty do
+      start_date { Date.current - 5.days }
+      end_date { Date.current + 5.days }
+      debate_start_date nil
+      debate_end_date nil
+      draft_publication_date nil
+      allegations_start_date nil
+      allegations_end_date nil
+      proposals_phase_start_date nil
+      proposals_phase_end_date nil
+      result_publication_date nil
+      debate_phase_enabled false
+      allegations_phase_enabled false
+      proposals_phase_enabled false
+      draft_publication_enabled false
+      result_publication_enabled false
+      published true
+    end
+
   end
 
   factory :legislation_draft_version, class: 'Legislation::DraftVersion' do
diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb
index 4b71a0ccd36..6d732bfd14b 100644
--- a/spec/features/legislation/processes_spec.rb
+++ b/spec/features/legislation/processes_spec.rb
@@ -47,17 +47,32 @@
       end
     end
 
-    scenario 'Key dates are displayed on current locale' do
+    scenario 'Participation phases are displayed only if there is a phase enabled' do
+      process = create(:legislation_process, :empty)
+      process_debate = create(:legislation_process)
+
+      visit legislation_process_path(process)
+
+      expect(page).not_to have_content("Participation phases")
+
+      visit legislation_process_path(process_debate)
+
+      expect(page).to have_content("Participation phases")
+    end
+
+    scenario 'Participation phases are displayed on current locale' do
       process = create(:legislation_process, proposals_phase_start_date: Date.new(2018, 01, 01),
                                              proposals_phase_end_date: Date.new(2018, 12, 01))
 
       visit legislation_process_path(process)
 
+      expect(page).to have_content("Participation phases")
       expect(page).to have_content("Proposals")
       expect(page).to have_content("01 Jan 2018 - 01 Dec 2018")
 
       visit legislation_process_path(process, locale: "es")
 
+      expect(page).to have_content("Fases de participación")
       expect(page).to have_content("Propuestas")
       expect(page).to have_content("01 ene 2018 - 01 dic 2018")
     end

From 6a580ede5b68f11c4980172ee0e6c202bf8dbac8 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 27 Dec 2018 20:19:08 +0100
Subject: [PATCH 09/27] Improves layout of admin legislation homepage form

---
 app/views/admin/legislation/homepages/_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/legislation/homepages/_form.html.erb b/app/views/admin/legislation/homepages/_form.html.erb
index e6b7cf2f442..aa3ee4151db 100644
--- a/app/views/admin/legislation/homepages/_form.html.erb
+++ b/app/views/admin/legislation/homepages/_form.html.erb
@@ -11,7 +11,7 @@
   </div>
 
   <%= f.translatable_fields do |translations_form| %>
-    <div class="small-12 column end">
+    <div class="small-12 column">
       <div class="ckeditor">
         <%= translations_form.cktext_area :homepage,
                                           language: I18n.locale,
@@ -22,7 +22,7 @@
     </div>
   <% end %>
 
-  <div class="small-12 medium-3 column clear end">
+  <div class="small-12 medium-3 column end margin-top">
     <%= f.submit(class: "button success expanded", value: t("admin.legislation.processes.#{admin_submit_action(@process)}.submit_button")) %>
   </div>
 <% end %>

From 6b58a71f3fbab597df91bf0d2dca431d3d7fbfcf Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 28 Dec 2018 16:18:11 +0100
Subject: [PATCH 10/27] Shows tabs only on large screens

Also moves ::after styles inside breakpoint(large down) to avoid use !important
---
 .../stylesheets/legislation_process.scss      | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss
index c870b0e32ec..fd75187f883 100644
--- a/app/assets/stylesheets/legislation_process.scss
+++ b/app/assets/stylesheets/legislation_process.scss
@@ -52,7 +52,7 @@
   list-style-type: none;
   margin: 0 rem-calc(-10);
 
-  @include breakpoint(medium) {
+  @include breakpoint(large) {
     margin: 0;
   }
 
@@ -62,7 +62,20 @@
     margin: rem-calc(-1) 0;
     position: relative;
 
-    @include breakpoint(medium) {
+    @include breakpoint(large down) {
+
+      &::after {
+        content: '\63';
+        font-family: "icons" !important;
+        font-size: rem-calc(24);
+        pointer-events: none;
+        position: absolute;
+        right: 12px;
+        top: 12px;
+      }
+    }
+
+    @include breakpoint(large) {
       background: #fafafa;
       display: inline-block;
       border-bottom: 0;
@@ -77,25 +90,15 @@
       }
 
       &::after {
-        content: '' !important;
+        content: '';
       }
     }
 
-    &::after {
-      content: '\63';
-      font-family: "icons" !important;
-      font-size: rem-calc(24);
-      pointer-events: none;
-      position: absolute;
-      right: 12px;
-      top: 12px;
-    }
-
     a {
       display: block;
       padding: $line-height / 4 $line-height / 2;
 
-      @include breakpoint(medium) {
+      @include breakpoint(large) {
         display: inline-block;
       }
 
@@ -118,7 +121,15 @@
     background: $highlight;
     position: relative;
 
-    @include breakpoint(medium) {
+    @include breakpoint(large down) {
+
+      &::after {
+        content: '\61';
+        color: $link;
+      }
+    }
+
+    @include breakpoint(large) {
       background: none;
       border: 1px solid $border;
       border-bottom: 0;
@@ -126,17 +137,12 @@
       &::after {
         border-bottom: 1px solid #fefefe;
         bottom: -1px;
-        content: '' !important;
+        content: '';
         left: 0;
         position: absolute;
         width: 100%;
       }
     }
-
-    &::after {
-      content: '\61';
-      color: $link;
-    }
   }
 }
 

From 5924a7038559c649ff8d006c34e8626714dd66a9 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 28 Dec 2018 19:36:18 +0100
Subject: [PATCH 11/27] Removes arrow icon on active process phase

---
 app/assets/stylesheets/legislation_process.scss | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss
index fd75187f883..990581236c3 100644
--- a/app/assets/stylesheets/legislation_process.scss
+++ b/app/assets/stylesheets/legislation_process.scss
@@ -121,14 +121,6 @@
     background: $highlight;
     position: relative;
 
-    @include breakpoint(large down) {
-
-      &::after {
-        content: '\61';
-        color: $link;
-      }
-    }
-
     @include breakpoint(large) {
       background: none;
       border: 1px solid $border;
@@ -137,12 +129,15 @@
       &::after {
         border-bottom: 1px solid #fefefe;
         bottom: -1px;
-        content: '';
         left: 0;
         position: absolute;
         width: 100%;
       }
     }
+
+    &::after {
+      content: '';
+    }
   }
 }
 

From d2b394396858fc80186c6f3ac23ca82613264069 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Wed, 19 Dec 2018 13:22:43 +0100
Subject: [PATCH 12/27] improve rendering of map in the sidebar

---
 app/assets/stylesheets/layout.scss          | 1 -
 app/views/budgets/investments/_map.html.erb | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 14ec9e35450..a2e3ed6bffe 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -851,7 +851,6 @@ footer {
 .categories a,
 .geozone a,
 .sidebar-links a,
-.sidebar-map a,
 .tags span {
   background: #ececec;
   border-radius: rem-calc(6);
diff --git a/app/views/budgets/investments/_map.html.erb b/app/views/budgets/investments/_map.html.erb
index 37aa50f6721..f22a5d7ee18 100644
--- a/app/views/budgets/investments/_map.html.erb
+++ b/app/views/budgets/investments/_map.html.erb
@@ -1,7 +1,4 @@
-<div class="sidebar-divider"></div>
-<br>
-
-<ul id="sidebar-map" class="no-bullet sidebar-map">
+<ul class="no-bullet sidebar-map">
   <div class="map">
     <%= render_map(@map_location, "budgets", false, nil, @investments_map_coordinates) %>
   </div>

From 2081269a6780641aa4bd6e521a6d9b3c9d95733e Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Wed, 19 Dec 2018 16:17:33 +0100
Subject: [PATCH 13/27] fix Hound violations

---
 .../admin/budget_headings_controller.rb       |  3 ++-
 .../content_blocks_controller.rb              | 21 +++++++++++++++----
 .../budgets/ballot/lines_controller.rb        |  4 +++-
 .../budgets/investments_controller.rb         |  4 +++-
 app/helpers/content_blocks_helper.rb          |  4 +++-
 ...grate_spending_proposals_to_investments.rb |  6 ++++--
 spec/features/admin/budget_groups_spec.rb     | 13 +++++++-----
 spec/features/admin/budget_headings_spec.rb   | 19 ++++++++++-------
 spec/features/budgets/investments_spec.rb     |  6 ++++--
 spec/features/tags/budget_investments_spec.rb |  3 ++-
 ...nt_block_spec.rb => content_block_spec.rb} |  8 ++++---
 spec/models/budget/heading_spec.rb            |  7 ++++---
 12 files changed, 66 insertions(+), 32 deletions(-)
 rename spec/models/budget/{heading_content_block_spec.rb => content_block_spec.rb} (58%)

diff --git a/app/controllers/admin/budget_headings_controller.rb b/app/controllers/admin/budget_headings_controller.rb
index 8143f369013..98ec7a2616a 100644
--- a/app/controllers/admin/budget_headings_controller.rb
+++ b/app/controllers/admin/budget_headings_controller.rb
@@ -62,7 +62,8 @@ def headings_index
     end
 
     def budget_heading_params
-      params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content, :latitude, :longitude)
+      params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content,
+                                             :latitude, :longitude)
     end
 
 end
diff --git a/app/controllers/admin/site_customization/content_blocks_controller.rb b/app/controllers/admin/site_customization/content_blocks_controller.rb
index 2fb38c01835..da54d6e6a1c 100644
--- a/app/controllers/admin/site_customization/content_blocks_controller.rb
+++ b/app/controllers/admin/site_customization/content_blocks_controller.rb
@@ -1,6 +1,10 @@
 class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomization::BaseController
   load_and_authorize_resource :content_block, class: "SiteCustomization::ContentBlock",
-                               except: [:delete_heading_content_block, :edit_heading_content_block, :update_heading_content_block]
+                               except: [
+                                 :delete_heading_content_block,
+                                 :edit_heading_content_block,
+                                 :update_heading_content_block
+                               ]
 
   def index
     @content_blocks = SiteCustomization::ContentBlock.order(:name, :locale)
@@ -27,7 +31,11 @@ def create
   end
 
   def edit
-    @selected_content_block =  (@content_block.is_a? SiteCustomization::ContentBlock) ? @content_block.name : "hcb_#{ @content_block.heading_id }"
+    if @content_block.is_a? SiteCustomization::ContentBlock
+      @selected_content_block = @content_block.name
+    else
+      @selected_content_block = "hcb_#{@content_block.heading_id}"
+    end
   end
 
   def update
@@ -65,7 +73,11 @@ def delete_heading_content_block
 
   def edit_heading_content_block
     @content_block = Budget::ContentBlock.find(params[:id])
-    @selected_content_block =  (@content_block.is_a? Budget::ContentBlock) ? "hcb_#{ @content_block.heading_id }" : @content_block.heading.name
+    if @content_block.is_a? Budget::ContentBlock
+      @selected_content_block = "hcb_#{@content_block.heading_id}"
+    else
+      @selected_content_block = @content_block.heading.name
+    end
     @is_heading_content_block = true
     render :edit
   end
@@ -116,7 +128,8 @@ def new_heading_content_block
       heading_content_block = Budget::ContentBlock.new
       heading_content_block.body = params[:site_customization_content_block][:body]
       heading_content_block.locale = params[:site_customization_content_block][:locale]
-      heading_content_block.heading_id =   params[:site_customization_content_block][:name].sub('hcb_', '').to_i
+      block_heading_id = params[:site_customization_content_block][:name].sub('hcb_', '').to_i
+      heading_content_block.heading_id = block_heading_id
       heading_content_block
     end
 end
diff --git a/app/controllers/budgets/ballot/lines_controller.rb b/app/controllers/budgets/ballot/lines_controller.rb
index 9e693064cd7..95f21ebb712 100644
--- a/app/controllers/budgets/ballot/lines_controller.rb
+++ b/app/controllers/budgets/ballot/lines_controller.rb
@@ -78,7 +78,9 @@ def load_ballot_referer
 
         def load_map
           @investments ||= []
-          @investments_map_coordinates = MapLocation.where(investment: @investments).map(&:json_data)
+          @investments_map_coordinates = MapLocation.where(investment: @investments).map do |loc|
+            loc.json_data
+          end
           @map_location = MapLocation.load_from_heading(@heading)
         end
 
diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb
index c0e91b080b8..3d86a265204 100644
--- a/app/controllers/budgets/investments_controller.rb
+++ b/app/controllers/budgets/investments_controller.rb
@@ -43,7 +43,9 @@ def index
       @investments = all_investments.page(params[:page]).per(10).for_render
 
       @investment_ids = @investments.pluck(:id)
-      @investments_map_coordinates =  MapLocation.where(investment_id: all_investments).map { |l| l.json_data }
+      @investments_map_coordinates =  MapLocation.where(investment: all_investments).map do |loc|
+        loc.json_data
+      end
 
       load_investment_votes(@investments)
       @tag_cloud = tag_cloud
diff --git a/app/helpers/content_blocks_helper.rb b/app/helpers/content_blocks_helper.rb
index a2e968c08a4..6969bd7f146 100644
--- a/app/helpers/content_blocks_helper.rb
+++ b/app/helpers/content_blocks_helper.rb
@@ -1,6 +1,8 @@
 module ContentBlocksHelper
   def valid_blocks
-    options = SiteCustomization::ContentBlock::VALID_BLOCKS.map { |key| [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key] }
+    options = SiteCustomization::ContentBlock::VALID_BLOCKS.map do
+      |key| [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key]
+    end
     Budget::Heading.allow_custom_content.each do |heading|
       options.push([heading.name, "hcb_#{heading.id}"])
     end
diff --git a/lib/migrate_spending_proposals_to_investments.rb b/lib/migrate_spending_proposals_to_investments.rb
index 1f3fe1f39f6..7983c547ecb 100644
--- a/lib/migrate_spending_proposals_to_investments.rb
+++ b/lib/migrate_spending_proposals_to_investments.rb
@@ -8,10 +8,12 @@ def import(sp)
 
     if sp.geozone_id.present?
       group   = budget.groups.find_or_create_by!(name: "Barrios")
-      heading = group.headings.find_or_create_by!(name: sp.geozone.name, price: 10000000, latitude: '40.416775', longitude: '-3.703790')
+      heading = group.headings.find_or_create_by!(name: sp.geozone.name, price: 10000000,
+                                                  latitude: '40.416775', longitude: '-3.703790')
     else
       group   = budget.groups.find_or_create_by!(name: "Toda la ciudad")
-      heading = group.headings.find_or_create_by!(name: "Toda la ciudad", price: 10000000, latitude: '40.416775', longitude: '-3.703790')
+      heading = group.headings.find_or_create_by!(name: "Toda la ciudad", price: 10000000,
+                                                  latitude: '40.416775', longitude: '-3.703790')
     end
 
     feasibility = case sp.feasible
diff --git a/spec/features/admin/budget_groups_spec.rb b/spec/features/admin/budget_groups_spec.rb
index b3e6d5eaa99..2d465a2243a 100644
--- a/spec/features/admin/budget_groups_spec.rb
+++ b/spec/features/admin/budget_groups_spec.rb
@@ -20,7 +20,9 @@
     end
 
     scenario "Disabled with a feature flag" do
-      expect { visit admin_budget_groups_path(budget) }.to raise_exception(FeatureFlags::FeatureDisabled)
+      expect do
+        visit admin_budget_groups_path(budget)
+      end.to raise_exception(FeatureFlags::FeatureDisabled)
     end
 
   end
@@ -30,7 +32,8 @@
     scenario "Displaying no groups for budget" do
       visit admin_budget_groups_path(budget)
 
-      expect(page).to have_content "No groups created yet. Each user will be able to vote in only one heading per group."
+      expect(page).to have_content "No groups created yet. "
+      expect(page).to have_content "Each user will be able to vote in only one heading per group."
     end
 
     scenario "Displaying groups" do
@@ -49,21 +52,21 @@
         expect(page).to have_content(group1.name)
         expect(page).to have_content(group1.max_votable_headings)
         expect(page).to have_content(group1.headings.count)
-        expect(page).to have_link "Manage headings", href: admin_budget_group_headings_path(budget, group1)
+        expect(page).to have_link "Manage headings"
       end
 
       within "#budget_group_#{group2.id}" do
         expect(page).to have_content(group2.name)
         expect(page).to have_content(group2.max_votable_headings)
         expect(page).to have_content(group2.headings.count)
-        expect(page).to have_link "Manage headings", href: admin_budget_group_headings_path(budget, group2)
+        expect(page).to have_link "Manage headings"
       end
 
       within "#budget_group_#{group3.id}" do
         expect(page).to have_content(group3.name)
         expect(page).to have_content(group3.max_votable_headings)
         expect(page).to have_content(group3.headings.count)
-        expect(page).to have_link "Manage headings", href: admin_budget_group_headings_path(budget, group3)
+        expect(page).to have_link "Manage headings"
       end
     end
 
diff --git a/spec/features/admin/budget_headings_spec.rb b/spec/features/admin/budget_headings_spec.rb
index 92e1fe4fd2f..5b300c7bb96 100644
--- a/spec/features/admin/budget_headings_spec.rb
+++ b/spec/features/admin/budget_headings_spec.rb
@@ -21,7 +21,9 @@
     end
 
     scenario "Disabled with a feature flag" do
-      expect { visit admin_budget_group_headings_path(budget, group) }.to raise_exception(FeatureFlags::FeatureDisabled)
+      expect do
+        visit admin_budget_group_headings_path(budget, group)
+      end.to raise_exception(FeatureFlags::FeatureDisabled)
     end
 
   end
@@ -31,7 +33,8 @@
     scenario "Displaying no headings for group" do
       visit admin_budget_group_headings_path(budget, group)
 
-      expect(page).to have_content "No headings created yet. Each user will be able to vote in only one heading per group."
+      expect(page).to have_content "No headings created yet. "
+      expect(page).to have_content "Each user will be able to vote in only one heading per group."
     end
 
     scenario "Displaying headings" do
@@ -47,8 +50,8 @@
         expect(page).to have_content "€1,000"
         expect(page).not_to have_content "10000"
         expect(page).to have_content "Yes"
-        expect(page).to have_link "Edit", href: edit_admin_budget_group_heading_path(budget, group, heading1)
-        expect(page).to have_link "Delete", href: admin_budget_group_heading_path(budget, group, heading1)
+        expect(page).to have_link "Edit"
+        expect(page).to have_link "Delete"
       end
 
       within "#budget_heading_#{heading2.id}" do
@@ -56,8 +59,8 @@
         expect(page).to have_content "€2,000"
         expect(page).to have_content "10000"
         expect(page).to have_content "No"
-        expect(page).to have_link "Edit", href: edit_admin_budget_group_heading_path(budget, group, heading2)
-        expect(page).to have_link "Delete", href: admin_budget_group_heading_path(budget, group, heading2)
+        expect(page).to have_link "Edit"
+        expect(page).to have_link "Delete"
       end
 
       within "#budget_heading_#{heading3.id}" do
@@ -65,8 +68,8 @@
         expect(page).to have_content "€3,000"
         expect(page).to have_content "10000"
         expect(page).to have_content "No"
-        expect(page).to have_link "Edit", href: edit_admin_budget_group_heading_path(budget, group, heading3)
-        expect(page).to have_link "Delete", href: admin_budget_group_heading_path(budget, group, heading3)
+        expect(page).to have_link "Edit"
+        expect(page).to have_link "Delete"
       end
     end
 
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 0128de18de6..b8f2a9dfa5c 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -1425,10 +1425,12 @@ def investments_order
       user = create(:user, :level_two)
 
       global_group   = create(:budget_group, budget: budget, name: 'Global Group')
-      global_heading = create(:budget_heading, group: global_group, name: 'Global Heading', latitude: -43.145412, longitude: 12.009423)
+      global_heading = create(:budget_heading, group: global_group, name: 'Global Heading',
+                              latitude: -43.145412, longitude: 12.009423)
 
       carabanchel_heading = create(:budget_heading, group: group, name: "Carabanchel")
-      new_york_heading    = create(:budget_heading, group: group, name: "New York", latitude: -43.223412, longitude: 12.009423)
+      new_york_heading    = create(:budget_heading, group: group, name: "New York",
+                                   latitude: -43.223412, longitude: 12.009423)
 
       sp1 = create(:budget_investment, :selected, price: 1, heading: global_heading)
       sp2 = create(:budget_investment, :selected, price: 10, heading: global_heading)
diff --git a/spec/features/tags/budget_investments_spec.rb b/spec/features/tags/budget_investments_spec.rb
index 855ad934ff1..9994a542503 100644
--- a/spec/features/tags/budget_investments_spec.rb
+++ b/spec/features/tags/budget_investments_spec.rb
@@ -5,7 +5,8 @@
   let(:author)  { create(:user, :level_two, username: 'Isabel') }
   let(:budget)  { create(:budget, name: "Big Budget") }
   let(:group)   { create(:budget_group, name: "Health", budget: budget) }
-  let!(:heading) { create(:budget_heading, name: "More hospitals", group: group, latitude: '40.416775', longitude: '-3.703790') }
+  let!(:heading) { create(:budget_heading, name: "More hospitals",
+                          group: group, latitude: '40.416775', longitude: '-3.703790') }
   let!(:tag_medio_ambiente) { create(:tag, :category, name: 'Medio Ambiente') }
   let!(:tag_economia) { create(:tag, :category, name: 'Economía') }
   let(:admin) { create(:administrator).user }
diff --git a/spec/models/budget/heading_content_block_spec.rb b/spec/models/budget/content_block_spec.rb
similarity index 58%
rename from spec/models/budget/heading_content_block_spec.rb
rename to spec/models/budget/content_block_spec.rb
index 7dd6c2f391a..5e77adad682 100644
--- a/spec/models/budget/heading_content_block_spec.rb
+++ b/spec/models/budget/content_block_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Budget::ContentBlock do
+describe Budget::ContentBlock do
   let(:block) { build(:heading_content_block) }
 
   it "is valid" do
@@ -9,12 +9,14 @@
 
   it "Heading is unique per locale" do
     heading_content_block_en = create(:heading_content_block, locale: "en")
-    invalid_block = build(:heading_content_block, heading: heading_content_block_en.heading, locale: "en")
+    invalid_block = build(:heading_content_block,
+                          heading: heading_content_block_en.heading, locale: "en")
 
     expect(invalid_block).to be_invalid
     expect(invalid_block.errors.full_messages).to include("Heading has already been taken")
 
-    valid_block = build(:heading_content_block, heading: heading_content_block_en.heading, locale: "es")
+    valid_block = build(:heading_content_block,
+                        heading: heading_content_block_en.heading, locale: "es")
     expect(valid_block).to be_valid
   end
 end
diff --git a/spec/models/budget/heading_spec.rb b/spec/models/budget/heading_spec.rb
index 816d7507efb..02e859cff5d 100644
--- a/spec/models/budget/heading_spec.rb
+++ b/spec/models/budget/heading_spec.rb
@@ -7,8 +7,8 @@
 
   it_behaves_like "sluggable", updatable_slug_trait: :drafting_budget
 
-  describe "::OSM_DISTRICT_LEVEL_ZOOM" do
-    it "should be defined" do
+  describe "OSM_DISTRICT_LEVEL_ZOOM constant" do
+    it "is defined" do
       expect(Budget::Heading::OSM_DISTRICT_LEVEL_ZOOM).to be 12
     end
   end
@@ -205,7 +205,8 @@
     end
 
     it "Allows longitude inside [-180,180] interval" do
-      heading = create(:budget_heading, group: group, name: 'Longitude is inside [-180,180] interval')
+      heading = create(:budget_heading, group: group,
+                       name: 'Longitude is inside [-180,180] interval')
 
       heading.longitude = '180'
       expect(heading).to be_valid

From c5a7492128323b0c3dd7084ef96b769d9db1d79f Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Thu, 27 Dec 2018 19:48:47 +0100
Subject: [PATCH 14/27] add some improvements on budget headings

Show information about longitude and latitude in a budget heading
Show information about custom content in a budget heading
Fix render of map (zoom scrollable and points clickable)
Fix typo in app/models/map_location.rb
---
 app/assets/javascripts/map.js.coffee          |  2 +-
 app/assets/stylesheets/layout.scss            |  2 +-
 app/models/map_location.rb                    |  2 +-
 app/views/admin/budget_groups/edit.html.erb   |  2 +-
 .../admin/budget_headings/_form.html.erb      |  6 ++++++
 app/views/admin/budget_headings/edit.html.erb |  2 +-
 config/locales/en/admin.yml                   |  6 ++++--
 config/locales/es/admin.yml                   |  6 ++++--
 spec/features/admin/budget_groups_spec.rb     |  4 ++--
 spec/features/admin/budget_headings_spec.rb   | 20 +++++++++----------
 10 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee
index 241093d759f..562b035e00f 100644
--- a/app/assets/javascripts/map.js.coffee
+++ b/app/assets/javascripts/map.js.coffee
@@ -74,7 +74,7 @@ App.Map =
     openMarkerPopup = (e) ->
       marker = e.target
 
-      $.ajax 'investments/' + marker.options['id'] + '/json_data',
+      $.ajax '/investments/' + marker.options['id'] + '/json_data',
         type: 'GET'
         dataType: 'json'
         success: (data) ->
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index a2e3ed6bffe..88738c07257 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -881,7 +881,7 @@ footer {
 .sidebar-map {
 
   .map {
-    z-index: -1;
+    z-index: 0;
   }
 }
 
diff --git a/app/models/map_location.rb b/app/models/map_location.rb
index d141c167d45..892ba8f2052 100644
--- a/app/models/map_location.rb
+++ b/app/models/map_location.rb
@@ -22,7 +22,7 @@ def self.load_from_heading(heading)
     map = new
     map.zoom = Budget::Heading::OSM_DISTRICT_LEVEL_ZOOM
     map.latitude = heading.latitude.to_f if heading.latitude.present?
-    map.longitude = heading.longitude.to_f if heading.latitude.present?
+    map.longitude = heading.longitude.to_f if heading.longitude.present?
     map
   end
 
diff --git a/app/views/admin/budget_groups/edit.html.erb b/app/views/admin/budget_groups/edit.html.erb
index 4ed1ad7f976..0730a42068d 100644
--- a/app/views/admin/budget_groups/edit.html.erb
+++ b/app/views/admin/budget_groups/edit.html.erb
@@ -1,3 +1,3 @@
 <%= render "header", action: "edit" %>
 
-<%= render "form", path: admin_budget_group_path(@budget, @group), action: "edit" %>
+<%= render "form", path: admin_budget_group_path(@budget, @group), action: "submit" %>
diff --git a/app/views/admin/budget_headings/_form.html.erb b/app/views/admin/budget_headings/_form.html.erb
index ebc5aa2aecf..f11ecb2306d 100644
--- a/app/views/admin/budget_headings/_form.html.erb
+++ b/app/views/admin/budget_headings/_form.html.erb
@@ -32,8 +32,14 @@
                       label: t("admin.budget_headings.form.longitude"),
                       maxlength: 22,
                       placeholder: "longitude" %>
+    <p class="help-text" id="budgets-coordinates-help-text">
+      <%= t("admin.budget_headings.form.coordinates_info") %>
+    </p>
 
     <%= f.check_box :allow_custom_content, label: t("admin.budget_headings.form.allow_content_block") %>
+    <p class="help-text" id="budgets-content-blocks-help-text">
+      <%= t("admin.budget_headings.form.content_blocks_info") %>
+    </p>
 
     <%= f.submit t("admin.budget_headings.form.#{action}"), class: "button success" %>
   <% end %>
diff --git a/app/views/admin/budget_headings/edit.html.erb b/app/views/admin/budget_headings/edit.html.erb
index a01fa70a420..124d075107f 100644
--- a/app/views/admin/budget_headings/edit.html.erb
+++ b/app/views/admin/budget_headings/edit.html.erb
@@ -1,3 +1,3 @@
 <%= render "header", action: "edit" %>
 
-<%= render "form", path: admin_budget_group_heading_path(@budget, @group, @heading), action: "edit" %>
+<%= render "form", path: admin_budget_group_heading_path(@budget, @group, @heading), action: "submit" %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index edff8acf78d..5db9d07559d 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -151,9 +151,11 @@ en:
         amount: "Amount"
         population: "Population (optional)"
         population_info: "Budget Heading population field is used for Statistic purposes at the end of the Budget to show for each Heading that represents an area with population what percentage voted. The field is optional so you can leave it empty if it doesn't apply."
-        latitude: "Latitude"
-        longitude: "Longitude"
+        latitude: "Latitude (optional)"
+        longitude: "Longitude (optional)"
+        coordinates_info: "If latitude and longitude are provided, the investments page for this heading will include a map. This map will be centered using those coordinates."
         allow_content_block: "Allow content block"
+        content_blocks_info: "If allow content block is checked, you will be able to create custom content related to this heading from the section Settings > Custom content blocks. This content will appear on the investments page for this heading."
         create: "Create new heading"
         edit: "Edit heading"
         submit: "Save heading"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index c099bce585b..f43cefd02ea 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -151,9 +151,11 @@ es:
         amount: "Cantidad"
         population: "Población (opcional)"
         population_info: "El campo población de las partidas presupuestarias se usa con fines estadísticos únicamente, con el objetivo de mostrar el porcentaje de votos habidos en cada partida que represente un área con población. Es un campo opcional, así que puedes dejarlo en blanco si no aplica."
-        latitude: "Latitud"
-        longitude: "Longitud"
+        latitude: "Latitud (opcional)"
+        longitude: "Longitud (opcional)"
+        coordinates_info: "Si se añaden los campos latitud y longitud, en la página de proyectos de esta partida aparecerá un mapa, que estará centrado en esas coordenadas."
         allow_content_block: "Permitir bloque de contenidos"
+        content_blocks_info: "Si se permite el bloque de contenidos, se tendrá la oportunidad de crear bloques de contenido relativos a esta partida desde la sección Configuración > Personalizar bloques. Este contenido aparecerá en la página de proyectos de esta partida."
         create: "Crear nueva partida"
         edit: "Editar partida"
         submit: "Guardar partida"
diff --git a/spec/features/admin/budget_groups_spec.rb b/spec/features/admin/budget_groups_spec.rb
index 2d465a2243a..414f3618a62 100644
--- a/spec/features/admin/budget_groups_spec.rb
+++ b/spec/features/admin/budget_groups_spec.rb
@@ -154,7 +154,7 @@
 
       fill_in "Group name", with: "Districts"
       select "2", from: "Maximum number of headings in which a user can vote"
-      click_button "Edit group"
+      click_button "Save group"
 
       expect(page).to have_content "Group updated successfully"
 
@@ -170,7 +170,7 @@
       expect(page).to have_field "Group name", with: "All City"
 
       fill_in "Group name", with: "Districts"
-      click_button "Edit group"
+      click_button "Save group"
 
       expect(page).not_to have_content "Group updated successfully"
       expect(page).to have_css("label.error", text: "Group name")
diff --git a/spec/features/admin/budget_headings_spec.rb b/spec/features/admin/budget_headings_spec.rb
index 5b300c7bb96..7094ab9dec8 100644
--- a/spec/features/admin/budget_headings_spec.rb
+++ b/spec/features/admin/budget_headings_spec.rb
@@ -147,8 +147,8 @@
       expect(page).to have_field "Heading name", with: heading.name
       expect(page).to have_field "Amount", with: heading.price
       expect(page).to have_field "Population (optional)", with: heading.population
-      expect(page).to have_field "Longitude", with: heading.longitude
-      expect(page).to have_field "Latitude", with: heading.latitude
+      expect(page).to have_field "Longitude (optional)", with: heading.longitude
+      expect(page).to have_field "Latitude (optional)", with: heading.latitude
       expect(find_field("Allow content block")).not_to be_checked
     end
 
@@ -170,17 +170,17 @@
       expect(page).to have_field "Heading name", with: "All City"
       expect(page).to have_field "Amount", with: 1000
       expect(page).to have_field "Population (optional)", with: 10000
-      expect(page).to have_field "Longitude", with: 20.50
-      expect(page).to have_field "Latitude", with: -10.50
+      expect(page).to have_field "Longitude (optional)", with: 20.50
+      expect(page).to have_field "Latitude (optional)", with: -10.50
       expect(find_field("Allow content block")).to be_checked
 
       fill_in "Heading name", with: "Districts"
       fill_in "Amount", with: "2000"
       fill_in "Population (optional)", with: "20000"
-      fill_in "Longitude", with: "-40.47"
-      fill_in "Latitude", with: "25.25"
+      fill_in "Longitude (optional)", with: "-40.47"
+      fill_in "Latitude (optional)", with: "25.25"
       uncheck "Allow content block"
-      click_button "Edit heading"
+      click_button "Save heading"
 
       expect(page).to have_content "Heading updated successfully"
 
@@ -188,8 +188,8 @@
       expect(page).to have_field "Heading name", with: "Districts"
       expect(page).to have_field "Amount", with: 2000
       expect(page).to have_field "Population (optional)", with: 20000
-      expect(page).to have_field "Longitude", with: -40.47
-      expect(page).to have_field "Latitude", with: 25.25
+      expect(page).to have_field "Longitude (optional)", with: -40.47
+      expect(page).to have_field "Latitude (optional)", with: 25.25
       expect(find_field("Allow content block")).not_to be_checked
     end
 
@@ -200,7 +200,7 @@
       expect(page).to have_field "Heading name", with: "All City"
 
       fill_in "Heading name", with: "Districts"
-      click_button "Edit heading"
+      click_button "Save heading"
 
       expect(page).not_to have_content "Heading updated successfully"
       expect(page).to have_css("label.error", text: "Heading name")

From 1ea18f0c89c137b8396cc44d30a9783ce32bfe48 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Wed, 2 Jan 2019 12:50:01 +0100
Subject: [PATCH 15/27] refactor - correct place for block variable

---
 app/helpers/content_blocks_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/content_blocks_helper.rb b/app/helpers/content_blocks_helper.rb
index 6969bd7f146..23453219c44 100644
--- a/app/helpers/content_blocks_helper.rb
+++ b/app/helpers/content_blocks_helper.rb
@@ -1,7 +1,7 @@
 module ContentBlocksHelper
   def valid_blocks
-    options = SiteCustomization::ContentBlock::VALID_BLOCKS.map do
-      |key| [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key]
+    options = SiteCustomization::ContentBlock::VALID_BLOCKS.map do |key|
+      [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key]
     end
     Budget::Heading.allow_custom_content.each do |heading|
       options.push([heading.name, "hcb_#{heading.id}"])

From 650fe2553ec996d5cb2215542ea01baacab1f2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Checa?= <MariaCheca@users.noreply.github.com>
Date: Thu, 12 Apr 2018 13:40:33 +0200
Subject: [PATCH 16/27] Add default order for admin budget investments list

When there's no sorting option selected, by default it orders the investment list by supports and, for those with the same number of supports, by ID.
---
 app/controllers/admin/budget_investments_controller.rb |  2 +-
 app/models/budget/investment.rb                        |  2 ++
 spec/features/admin/budget_investments_spec.rb         | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb
index 6797f63d0a6..60ab11d7c59 100644
--- a/app/controllers/admin/budget_investments_controller.rb
+++ b/app/controllers/admin/budget_investments_controller.rb
@@ -77,7 +77,7 @@ def resource_name
 
     def load_investments
       @investments = Budget::Investment.scoped_filter(params, @current_filter)
-      @investments = @investments.order_filter(params[:sort_by]) if params[:sort_by].present?
+                                       .order_filter(params[:sort_by])
       @investments = @investments.page(params[:page]) unless request.format.csv?
     end
 
diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
index 110da873281..1b528a9cbe4 100644
--- a/app/models/budget/investment.rb
+++ b/app/models/budget/investment.rb
@@ -142,6 +142,8 @@ def self.advanced_filters(params, results)
     def self.order_filter(sorting_param)
       if sorting_param.present? && SORTING_OPTIONS.include?(sorting_param)
         send("sort_by_#{sorting_param}")
+      else
+        order(cached_votes_up: :desc).order(id: :desc)
       end
     end
 
diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 276e4bf2bc6..e64c7ad6674 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -603,6 +603,16 @@
       create(:budget_investment, title: 'C Third Investment', cached_votes_up: 10, budget: budget)
     end
 
+    scenario "Default sorting" do
+      create(:budget_investment, title: 'D Fourth Investment', cached_votes_up: 50, budget: budget)
+
+      visit admin_budget_budget_investments_path(budget)
+
+      expect('D Fourth Investment').to appear_before('B First Investment')
+      expect('D Fourth Investment').to appear_before('A Second Investment')
+      expect('A Second Investment').to appear_before('C Third Investment')
+    end
+
     scenario 'Sort by ID' do
       visit admin_budget_budget_investments_path(budget, sort_by: 'id')
 

From e3eb87addb1389aaccd29ee359c3a2dcfbc7afde Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 28 Jul 2016 16:00:13 +0200
Subject: [PATCH 17/27] checks for deleted proposals

---
 .../admin/stats/proposal_notifications.html.erb    |  8 +++++++-
 config/locales/en/admin.yml                        |  1 +
 config/locales/es/admin.yml                        |  1 +
 spec/features/admin/stats_spec.rb                  | 14 ++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb
index 102eb0c6012..e26ac3431a8 100644
--- a/app/views/admin/stats/proposal_notifications.html.erb
+++ b/app/views/admin/stats/proposal_notifications.html.erb
@@ -31,7 +31,13 @@
         <td>
           <h3>
             <%= notification.title %>
-            <small><%= link_to notification.proposal.title, proposal_path(notification.proposal) %></small>
+            <small>
+              <% if notification.proposal.present? %>
+                <%= link_to notification.proposal.title, proposal_path(notification.proposal) %>
+              <% else %>
+                <%= t("admin.stats.proposal_notifications.not_available") %><br>
+              <% end %>
+            </small>
           </h3>
           <p><%= notification.body %></p>
         </td>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index edff8acf78d..596d6f43cbb 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1302,6 +1302,7 @@ en:
         title: Proposal notifications
         total: Total
         proposals_with_notifications: Proposals with notifications
+        not_available: "Proposal not available"
       polls:
         title: Poll Stats
         all: Polls
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index c099bce585b..62807d1875f 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1301,6 +1301,7 @@ es:
         title: Notificaciones de propuestas
         total: Total
         proposals_with_notifications: Propuestas con notificaciones
+        not_available: "Esta propuesta ya no está disponible"
       polls:
         title: Estadísticas de votaciones
         all: Votaciones
diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb
index 48e2513bade..24df9b3bc10 100644
--- a/spec/features/admin/stats_spec.rb
+++ b/spec/features/admin/stats_spec.rb
@@ -137,6 +137,20 @@
       end
     end
 
+    scenario "Deleted proposals" do
+      proposal_notification = create(:proposal_notification)
+      proposal_notification.proposal.destroy
+
+      visit admin_stats_path
+      click_link "Proposal notifications"
+
+      expect(page).to have_css(".proposal_notification", count: 1)
+
+      expect(page).to have_content proposal_notification.title
+      expect(page).to have_content proposal_notification.body
+      expect(page).to have_content "Proposal not available"
+    end
+
   end
 
   context "Direct messages" do

From 9a60135d9f651058ab2757c53379a62598d064d3 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Fri, 28 Dec 2018 11:43:55 +0100
Subject: [PATCH 18/27] [Consistency] remove semicolons from controllers

---
 app/controllers/admin/budget_phases_controller.rb | 3 ++-
 app/controllers/graphql_controller.rb             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/budget_phases_controller.rb b/app/controllers/admin/budget_phases_controller.rb
index 8b71e5a0dba..d0eef18d8ae 100644
--- a/app/controllers/admin/budget_phases_controller.rb
+++ b/app/controllers/admin/budget_phases_controller.rb
@@ -2,7 +2,8 @@ class Admin::BudgetPhasesController < Admin::BaseController
 
   before_action :load_phase, only: [:edit, :update]
 
-  def edit; end
+  def edit
+  end
 
   def update
     if @phase.update(budget_phase_params)
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index 5f3fd0a9f74..47130bfaf82 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -3,7 +3,8 @@ class GraphqlController < ApplicationController
   skip_before_action :verify_authenticity_token
   skip_authorization_check
 
-  class QueryStringError < StandardError; end
+  class QueryStringError < StandardError
+  end
 
   def query
     begin

From be864ee92f06f5af1f8c3e66bc99a730f7c8829c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 9 Jan 2019 12:55:22 +0100
Subject: [PATCH 19/27] Make sure selected investment is visibile in spec

After changing the order for budget investments, the selected investment
didn't appear on the first page anymore, and so it couldn't be clicked
on during the test.
---
 .../features/admin/budget_investments_spec.rb | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index e64c7ad6674..8242dc89129 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -1126,18 +1126,22 @@
       end
     end
 
-    scenario "Pagination after unselecting an investment", :js do
-      create_list(:budget_investment, 30, budget: budget)
+    feature "Pagination" do
+      background { selected_bi.update(cached_votes_up: 50) }
 
-      visit admin_budget_budget_investments_path(budget)
+      scenario "After unselecting an investment", :js do
+        create_list(:budget_investment, 30, budget: budget)
 
-      within("#budget_investment_#{selected_bi.id}") do
-        click_link('Selected')
-      end
+        visit admin_budget_budget_investments_path(budget)
 
-      click_link('Next')
+        within("#budget_investment_#{selected_bi.id}") do
+          click_link('Selected')
+        end
+
+        click_link('Next')
 
-      expect(page).to have_link('Previous')
+        expect(page).to have_link('Previous')
+      end
     end
   end
 

From 7c06320f392a01ecdab9ed567d30712813f91b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 9 Jan 2019 12:55:27 +0100
Subject: [PATCH 20/27] Fix typo

---
 spec/features/admin/budget_investments_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
index 8242dc89129..7e5a6be03b6 100644
--- a/spec/features/admin/budget_investments_spec.rb
+++ b/spec/features/admin/budget_investments_spec.rb
@@ -609,7 +609,7 @@
       visit admin_budget_budget_investments_path(budget)
 
       expect('D Fourth Investment').to appear_before('B First Investment')
-      expect('D Fourth Investment').to appear_before('A Second Investment')
+      expect('B First Investment').to appear_before('A Second Investment')
       expect('A Second Investment').to appear_before('C Third Investment')
     end
 

From 15dbfdf6e8b5d11f6daf5a758bfa3c46b594ffd6 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 9 Jan 2019 12:27:49 +0100
Subject: [PATCH 21/27] Enable line length rubocop rule

---
 .rubocop.yml       | 3 ---
 .rubocop_basic.yml | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 36b92b2f7f0..07a45ca67b6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,8 +1,5 @@
 inherit_from: .rubocop_basic.yml
 
-Metrics/LineLength:
-  Max: 100
-
 Bundler/DuplicatedGem:
   Enabled: true
 
diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml
index 7711c48b63e..687429ca087 100644
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -30,5 +30,8 @@ Layout/TrailingBlankLines:
 Layout/TrailingWhitespace:
   Enabled: true
 
+Metrics/LineLength:
+  Max: 100
+
 RSpec/NotToNot:
   Enabled: true

From 0858f4c6f4a986cd271464c77dbb2c8047ba6bc4 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Thu, 3 Jan 2019 17:44:44 +0100
Subject: [PATCH 22/27] cleanup (remove unused code)

---
 app/controllers/budgets/ballot/lines_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/budgets/ballot/lines_controller.rb b/app/controllers/budgets/ballot/lines_controller.rb
index 95f21ebb712..c2e617e08f9 100644
--- a/app/controllers/budgets/ballot/lines_controller.rb
+++ b/app/controllers/budgets/ballot/lines_controller.rb
@@ -2,7 +2,6 @@ module Budgets
   module Ballot
     class LinesController < ApplicationController
       before_action :authenticate_user!
-      #before_action :ensure_final_voting_allowed
       before_action :load_budget
       before_action :load_ballot
       before_action :load_tag_cloud
@@ -33,10 +32,6 @@ def destroy
 
       private
 
-        def ensure_final_voting_allowed
-          return head(:forbidden) unless @budget.balloting?
-        end
-
         def line_params
           params.permit(:investment_id, :budget_id)
         end

From d77183ee09023b042ae3935dd8ee3e556e25daca Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Fri, 4 Jan 2019 13:08:47 +0100
Subject: [PATCH 23/27] Improvement - CRUD budgets and content blocks

---
 app/helpers/admin_helper.rb                       |  4 ++++
 app/views/admin/_menu.html.erb                    |  3 +--
 app/views/admin/budget_groups/index.html.erb      |  4 ++++
 app/views/admin/budget_headings/index.html.erb    |  2 +-
 .../content_blocks/index.html.erb                 | 12 ++++++------
 .../budgets/investments/_content_blocks.html.erb  |  4 +---
 app/views/layouts/_footer.html.erb                |  5 +----
 config/locales/en/admin.yml                       | 13 ++++++++-----
 config/locales/es/admin.yml                       | 15 +++++++++------
 spec/features/admin/budget_groups_spec.rb         |  3 +--
 spec/features/admin/budget_headings_spec.rb       |  3 +--
 11 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 903a1e0a333..55825aba01b 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -29,6 +29,10 @@ def moderated_sections
      "hidden_budget_investments"]
   end
 
+  def menu_budgets?
+    %w[budgets budget_groups budget_headings budget_investments].include?(controller_name)
+  end
+
   def menu_budget?
     ["spending_proposals"].include?(controller_name)
   end
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 6e393e805c3..c6ea681720a 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -56,8 +56,7 @@
     <% end %>
 
     <% if feature?(:budgets) %>
-      <li class="section-title <%= "is-active" if controller_name == "budgets" ||
-                                                  controller_name == "milestone_statuses" %>">
+      <li class="section-title <%= "is-active" if menu_budgets? %>">
         <%= link_to admin_budgets_path do %>
           <span class="icon-budget"></span>
           <strong><%= t("admin.menu.budgets") %></strong>
diff --git a/app/views/admin/budget_groups/index.html.erb b/app/views/admin/budget_groups/index.html.erb
index 506698fb795..3d6176312f2 100644
--- a/app/views/admin/budget_groups/index.html.erb
+++ b/app/views/admin/budget_groups/index.html.erb
@@ -1,3 +1,7 @@
+<%= back_link_to admin_budgets_path, t("admin.budget_groups.index.back") %>
+
+<div class="clear"></div>
+
 <h2 class="inline-block"><%= @budget.name %></h2>
 
 <%= link_to t("admin.budget_groups.form.create"),
diff --git a/app/views/admin/budget_headings/index.html.erb b/app/views/admin/budget_headings/index.html.erb
index a5a2a75aff9..372c7ceb2d7 100644
--- a/app/views/admin/budget_headings/index.html.erb
+++ b/app/views/admin/budget_headings/index.html.erb
@@ -1,4 +1,4 @@
-<%= back_link_to admin_budget_groups_path(@budget) %>
+<%= back_link_to admin_budget_groups_path(@budget), t("admin.budget_headings.index.back") %>
 
 <div class="clear"></div>
 <h2 class="inline-block"><%= "#{@budget.name} / #{@group.name}" %></h2>
diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb
index ccc13bcf23b..26579fd4c0c 100644
--- a/app/views/admin/site_customization/content_blocks/index.html.erb
+++ b/app/views/admin/site_customization/content_blocks/index.html.erb
@@ -9,13 +9,13 @@
 <h3><%= t("admin.site_customization.content_blocks.information") %></h3>
 
 <p><%= t("admin.site_customization.content_blocks.about") %></p>
-<p><%= t("admin.site_customization.content_blocks.top_links_html") %></p>
+<p><%= t("admin.site_customization.content_blocks.html_format") %></p>
 
-<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
-
-<p class="margin-top"><%= t("admin.site_customization.content_blocks.footer_html") %></p>
+<p>
+  <code><%= '<li><a href="http://site1.com">Site 1</a></li>' %></code><br>
+  <code><%= '<li><a href="http://site2.com">Site 2</a></li>' %></code><br>
+  <code><%= '<li><a href="http://site3.com">Site 3</a></li>' %></code><br>
+</p>
 
 <% if @content_blocks.any? || @headings_content_blocks.any? %>
   <table class="cms-page-list">
diff --git a/app/views/budgets/investments/_content_blocks.html.erb b/app/views/budgets/investments/_content_blocks.html.erb
index de86b50fe69..30f938a9421 100644
--- a/app/views/budgets/investments/_content_blocks.html.erb
+++ b/app/views/budgets/investments/_content_blocks.html.erb
@@ -1,7 +1,5 @@
 <% if @heading.allow_custom_content %>
-  <br>
-
-  <ul id="content_block" class="no-bullet categories">
+  <ul class="no-bullet categories">
     <% @heading_content_blocks.each do |content_block| %>
     	<%= raw content_block.body %>
     <% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index e4e3a2d5c6c..5a0a02f5fe4 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -89,12 +89,9 @@
               <% end %>
             </li>
           <% end %>
+          <%= raw content_block("footer", I18n.locale) %>
         </ul>
       </div>
     </div>
   </div>
-
-  <div class="row">
-    <%= raw content_block("footer", I18n.locale) %>
-  </div>
 </footer>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 386f5219357..7033fefbfd2 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -117,7 +117,7 @@ en:
       headings_edit: "Edit Headings"
       headings_manage: "Manage headings"
       max_votable_headings: "Maximum number of headings in which a user can vote"
-      no_groups: "No groups created yet. Each user will be able to vote in only one heading per group."
+      no_groups: "There are no groups."
       amount:
         one: "There is 1 group"
         other: "There are %{count} groups"
@@ -133,9 +133,11 @@ en:
         edit: "Edit group"
         name: "Group name"
         submit: "Save group"
+      index:
+        back: "Go back to budgets"
     budget_headings:
       name: "Name"
-      no_headings: "No headings created yet. Each user will be able to vote in only one heading per group."
+      no_headings: "There are no headings."
       amount:
         one: "There is 1 heading"
         other: "There are %{count} headings"
@@ -159,6 +161,8 @@ en:
         create: "Create new heading"
         edit: "Edit heading"
         submit: "Save heading"
+      index:
+        back: "Go back to groups"
     budget_phases:
       edit:
         start_date: Start date
@@ -1347,9 +1351,8 @@ en:
     site_customization:
       content_blocks:
         information: Information about content blocks
-        about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
-        top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
-        footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
+        about: "You can create HTML content blocks that can be inserted in different places of your website."
+        html_format: "A content block is a group of links, and it must have the following format:"
         no_blocks: "There are no content blocks."
         create:
           notice: Content block created successfully
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 35e611a92f2..0075225c748 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -117,7 +117,7 @@ es:
       headings_edit: "Editar Partidas"
       headings_manage: "Gestionar partidas"
       max_votable_headings: "Máximo número de partidas en que un usuario puede votar"
-      no_groups: "No hay grupos creados todavía. Cada usuario podrá votar en una sola partida de cada grupo."
+      no_groups: "No hay grupos."
       amount:
         one: "Hay 1 grupo de partidas presupuestarias"
         other: "Hay %{count} grupos de partidas presupuestarias"
@@ -133,9 +133,11 @@ es:
         edit: "Editar grupo"
         name: "Nombre del grupo"
         submit: "Guardar grupo"
+      index:
+        back: "Volver a presupuestos"
     budget_headings:
       name: "Nombre"
-      no_headings: "No hay partidas creadas todavía. Cada usuario podrá votar en una sola partida de cada grupo."
+      no_headings: "No hay partidas."
       amount:
         one: "Hay 1 partida presupuestarias"
         other: "Hay %{count} partidas presupuestarias"
@@ -159,6 +161,8 @@ es:
         create: "Crear nueva partida"
         edit: "Editar partida"
         submit: "Guardar partida"
+      index:
+        back: "Volver a grupos"
     budget_phases:
       edit:
         start_date: Fecha de Inicio
@@ -1345,10 +1349,9 @@ es:
         title: Verificaciones incompletas
     site_customization:
       content_blocks:
-        information: Información sobre los bloques de texto
-        about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
-        top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
-        footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
+        information: "Información sobre los bloques de contenido"
+        about: "Puedes crear bloques de contenido HTML que se podrán incrustar en diferentes sitios de tu página."
+        html_format: "Un bloque de contenido es un grupo de enlaces, y debe de tener el siguiente formato:"
         no_blocks: "No hay bloques de texto."
         create:
           notice: Bloque creado correctamente
diff --git a/spec/features/admin/budget_groups_spec.rb b/spec/features/admin/budget_groups_spec.rb
index 414f3618a62..869ef55e980 100644
--- a/spec/features/admin/budget_groups_spec.rb
+++ b/spec/features/admin/budget_groups_spec.rb
@@ -32,8 +32,7 @@
     scenario "Displaying no groups for budget" do
       visit admin_budget_groups_path(budget)
 
-      expect(page).to have_content "No groups created yet. "
-      expect(page).to have_content "Each user will be able to vote in only one heading per group."
+      expect(page).to have_content "There are no groups."
     end
 
     scenario "Displaying groups" do
diff --git a/spec/features/admin/budget_headings_spec.rb b/spec/features/admin/budget_headings_spec.rb
index 7094ab9dec8..93428fe5fec 100644
--- a/spec/features/admin/budget_headings_spec.rb
+++ b/spec/features/admin/budget_headings_spec.rb
@@ -33,8 +33,7 @@
     scenario "Displaying no headings for group" do
       visit admin_budget_group_headings_path(budget, group)
 
-      expect(page).to have_content "No headings created yet. "
-      expect(page).to have_content "Each user will be able to vote in only one heading per group."
+      expect(page).to have_content "There are no headings."
     end
 
     scenario "Displaying headings" do

From 4af0de2d1d5dac7fc5f09ed0061f8a2463db2ae4 Mon Sep 17 00:00:00 2001
From: Julian Herrero <microweb10@gmail.com>
Date: Sun, 13 Jan 2019 20:49:05 +0100
Subject: [PATCH 24/27] Enable double quotes rubocop rule

---
 .rubocop_basic.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml
index 687429ca087..cebf55084a3 100644
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -35,3 +35,6 @@ Metrics/LineLength:
 
 RSpec/NotToNot:
   Enabled: true
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

From 73637de0d01829026ade4b60182cbe4260dc4538 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 9 Jan 2019 12:29:00 +0100
Subject: [PATCH 25/27] Adds homepage phase and tab to legislation processes
 show

---
 app/models/legislation/process.rb                   | 8 ++++++--
 app/views/legislation/processes/_key_dates.html.erb | 9 +++++++++
 app/views/legislation/processes/show.html.erb       | 4 ++--
 config/locales/en/legislation.yml                   | 1 +
 config/locales/es/legislation.yml                   | 1 +
 spec/features/legislation/processes_spec.rb         | 8 ++++++++
 6 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
index be8cc74c308..dc880552b0e 100644
--- a/app/models/legislation/process.rb
+++ b/app/models/legislation/process.rb
@@ -18,8 +18,8 @@ class Legislation::Process < ActiveRecord::Base
   translates :homepage,           touch: true
   include Globalizable
 
-  PHASES_AND_PUBLICATIONS = %i[draft_phase debate_phase allegations_phase proposals_phase
-                               draft_publication result_publication].freeze
+  PHASES_AND_PUBLICATIONS = %i[homepage_phase draft_phase debate_phase allegations_phase
+                               proposals_phase draft_publication result_publication].freeze
 
   has_many :draft_versions, -> { order(:id) }, class_name: 'Legislation::DraftVersion',
                                                foreign_key: 'legislation_process_id',
@@ -54,6 +54,10 @@ class Legislation::Process < ActiveRecord::Base
                                    draft_end_date IS NOT NULL and (draft_start_date > ? or
                                    draft_end_date < ?))", Date.current, Date.current) }
 
+  def homepage_phase
+    Legislation::Process::Phase.new(start_date, end_date, homepage_enabled)
+  end
+
   def draft_phase
     Legislation::Process::Phase.new(draft_start_date, draft_end_date, draft_phase_enabled)
   end
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index 7181e68cf56..b10fdb32c52 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -6,6 +6,15 @@
       <% end %>
 
       <ul class="key-dates">
+        <% if process.homepage_enabled? && process.homepage.present? %>
+          <li <%= 'class=is-active' if phase.to_sym == :homepage %>>
+            <%= link_to legislation_process_path(process) do %>
+              <h4><%= t("legislation.processes.shared.homepage") %></h4>
+              <br>
+            <% end %>
+          </li>
+        <% end %>
+
         <% if process.debate_phase.enabled? %>
           <li <%= 'class=is-active' if phase.to_sym == :debate_phase %>>
             <%= link_to debate_legislation_process_path(process) do %>
diff --git a/app/views/legislation/processes/show.html.erb b/app/views/legislation/processes/show.html.erb
index fa4c54e97c2..4d84818791b 100644
--- a/app/views/legislation/processes/show.html.erb
+++ b/app/views/legislation/processes/show.html.erb
@@ -4,9 +4,9 @@
 
 <%= render 'documents/additional_documents', documents: @process.documents %>
 
-<%= render 'key_dates', process: @process, phase: :debate_phase %>
+<%= render 'key_dates', process: @process, phase: :homepage %>
 
-<div class="row">
+<div class="row margin-top">
   <div class="small-12 medium-9 column">
     <%= AdminWYSIWYGSanitizer.new.sanitize(@process.homepage) %>
   </div>
diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml
index e1c71f6c6b7..58384a0e187 100644
--- a/config/locales/en/legislation.yml
+++ b/config/locales/en/legislation.yml
@@ -83,6 +83,7 @@ en:
         see_latest_comments_title: Comment on this process
       shared:
         key_dates: Participation phases
+        homepage: Homepage
         debate_dates: Debate
         draft_publication_date: Draft publication
         allegations_dates: Comments
diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml
index 18bd8d5ef2a..3702fbcb744 100644
--- a/config/locales/es/legislation.yml
+++ b/config/locales/es/legislation.yml
@@ -83,6 +83,7 @@ es:
         see_latest_comments_title: Aportar a este proceso
       shared:
         key_dates: Fases de participación
+        homepage: Inicio
         debate_dates: Debate previo
         draft_publication_date: Publicación borrador
         allegations_dates: Comentarios
diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb
index 1bd51989d5a..3379e53fce1 100644
--- a/spec/features/legislation/processes_spec.rb
+++ b/spec/features/legislation/processes_spec.rb
@@ -201,6 +201,10 @@
 
         visit legislation_process_path(process)
 
+        within(".key-dates") do
+          expect(page).to have_content("Homepage")
+        end
+
         expect(page).to     have_content("This is the process homepage")
         expect(page).not_to have_content("Participate in the debate")
       end
@@ -213,6 +217,10 @@
 
         visit legislation_process_path(process)
 
+        within(".key-dates") do
+          expect(page).not_to have_content("Homepage")
+        end
+
         expect(page).to have_content("This phase is not open yet")
         expect(page).not_to have_content("This is the process homepage")
       end

From 9dfbeed140591b111126281eddda4a6da8f5e2cc Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 10 Jan 2019 14:25:33 +0100
Subject: [PATCH 26/27] Moves draft and final result publication dates from
 tabs to sidebar

---
 .../legislation/processes/_header.html.erb    | 24 ++++++++++++++++
 .../legislation/processes/_key_dates.html.erb | 18 ------------
 spec/features/legislation/processes_spec.rb   | 28 +++++++++++++++++--
 3 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/app/views/legislation/processes/_header.html.erb b/app/views/legislation/processes/_header.html.erb
index 2c3eb22b103..4c6acea907b 100644
--- a/app/views/legislation/processes/_header.html.erb
+++ b/app/views/legislation/processes/_header.html.erb
@@ -34,6 +34,30 @@
         url: legislation_process_url(@process),
         description: @process.title
       } %>
+
+      <% if process.draft_publication.enabled? %>
+        <div class="sidebar-divider"></div>
+        <p class="sidebar-title">
+          <%= t("legislation.processes.shared.draft_publication_date") %>
+        </p>
+        <p>
+          <%= link_to draft_publication_legislation_process_path(@process) do %>
+            <strong><%= format_date(process.draft_publication_date) %></strong>
+          <% end %>
+        </p>
+      <% end %>
+
+      <% if process.result_publication.enabled? %>
+        <div class="sidebar-divider"></div>
+        <p class="sidebar-title">
+          <%= t("legislation.processes.shared.result_publication_date") %>
+        </p>
+        <p>
+          <%= link_to result_publication_legislation_process_path(@process) do %>
+            <strong><%= format_date(process.result_publication_date) %></strong>
+          <% end %>
+        </p>
+      <% end %>
     </aside>
   </div>
 </div>
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index b10fdb32c52..835aeff34c7 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -33,15 +33,6 @@
           </li>
         <% end %>
 
-        <% if process.draft_publication.enabled? %>
-          <li <%= 'class=is-active' if phase.to_sym == :draft_publication %>>
-            <%= link_to draft_publication_legislation_process_path(process) do %>
-              <h4><%= t("legislation.processes.shared.draft_publication_date") %></h4>
-              <span><%= format_date(process.draft_publication_date) %></span>
-            <% end %>
-          </li>
-        <% end %>
-
         <% if process.allegations_phase.enabled? %>
           <li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>>
             <%= link_to allegations_legislation_process_path(process) do %>
@@ -51,15 +42,6 @@
           </li>
         <% end %>
 
-        <% if process.result_publication.enabled? %>
-          <li <%= 'class=is-active' if phase.to_sym == :result_publication %>>
-            <%= link_to result_publication_legislation_process_path(process) do %>
-              <h4><%= t("legislation.processes.shared.result_publication_date") %></h4>
-              <span><%= format_date(process.result_publication_date) %></span>
-            <% end %>
-          </li>
-        <% end %>
-
         <% if process.milestones.any? %>
           <li class="milestones <%= "is-active" if phase == :milestones %>">
             <%= link_to milestones_legislation_process_path(process) do %>
diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb
index 3379e53fce1..7d8157f3760 100644
--- a/spec/features/legislation/processes_spec.rb
+++ b/spec/features/legislation/processes_spec.rb
@@ -152,8 +152,7 @@
       scenario 'show view has document present on all phases' do
         process = create(:legislation_process)
         document = create(:document, documentable: process)
-        phases = ["Debate", "Proposals", "Draft publication",
-                  "Comments", "Final result publication"]
+        phases = ["Debate", "Proposals", "Comments"]
 
         visit legislation_process_path(process)
 
@@ -166,6 +165,31 @@
         end
       end
 
+      scenario 'show draft publication and final result publication dates' do
+        process = create(:legislation_process, draft_publication_date: Date.new(2019, 01, 10),
+                                               result_publication_date: Date.new(2019, 01, 20))
+
+        visit legislation_process_path(process)
+
+        within("aside") do
+          expect(page).to have_content("Draft publication")
+          expect(page).to have_content("10 Jan 2019")
+          expect(page).to have_content("Final result publication")
+          expect(page).to have_content("20 Jan 2019")
+        end
+      end
+
+      scenario 'do not show draft publication and final result publication dates if are empty' do
+        process = create(:legislation_process, :empty)
+
+        visit legislation_process_path(process)
+
+        within("aside") do
+          expect(page).not_to have_content("Draft publication")
+          expect(page).not_to have_content("Final result publication")
+        end
+      end
+
       scenario 'show additional info button' do
         process = create(:legislation_process, additional_info: "Text for additional info of the process")
 

From f2210bc5b5a30a2c57b125365a6add81021b07a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 16 Jan 2019 13:28:59 +0100
Subject: [PATCH 27/27] Update changelog for release 0.18.1

---
 CHANGELOG.md                               | 25 ++++++++++++++++++++++
 app/controllers/installation_controller.rb |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 955ffc300d2..3121f26705b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,30 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [0.18.1](https://github.com/consul/consul/tree/v0.18.1) (2019-01-17)
+
+### Added
+
+- **Legislation:** Legislation process homepage phase [\#3188](https://github.com/consul/consul/pull/3188)
+- **Legislation:** Show documents on processes proposals phase [\#3136](https://github.com/consul/consul/pull/3136)
+- **Maintenance-Refactorings:** Remove semicolons from controllers [\#3160](https://github.com/consul/consul/pull/3160)
+- **Maintenance-Refactorings:** Remove before action not used [\#3167](https://github.com/consul/consul/pull/3167)
+- **Maintenance-Rubocop:** Enable double quotes rubocop rule [\#3175](https://github.com/consul/consul/pull/3175)
+- **Maintenance-Rubocop:** Enable line length rubocop rule [\#3165](https://github.com/consul/consul/pull/3165)
+- **Maintenance-Rubocop:** Add rubocop rule to indent private methods [\#3134](https://github.com/consul/consul/pull/3134)
+
+### Changed
+
+- **Admin:** Improve CRUD budgets and content blocks [\#3173](https://github.com/consul/consul/pull/3173)
+- **Design/UX:** new CRUD budgets, content blocks and heading map [\#3150](https://github.com/consul/consul/pull/3150)
+- **Design/UX:** Processes key dates [\#3137](https://github.com/consul/consul/pull/3137)
+
+### Fixed
+
+- **Admin:** checks for deleted proposals [\#3154](https://github.com/consul/consul/pull/3154)
+- **Admin:** Add default order for admin budget investments list [\#3151](https://github.com/consul/consul/pull/3151)
+- **Budgets:** Bug Management Cannot create Budget Investment without a map location [\#3133](https://github.com/consul/consul/pull/3133)
+
 ## [0.18.0](https://github.com/consul/consul/compare/v0.17...v0.18) (2018-12-27)
 
 ### Added
@@ -47,6 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - **Admin:** Improve visualization for small resolution [\#3025](https://github.com/consul/consul/pull/3025)
 - **Admin:** Budgets admin [\#3012](https://github.com/consul/consul/pull/3012)
 - **Budgets:** Budget investments social share [\#3053](https://github.com/consul/consul/pull/3053)
+- **Design/UX:** Documents title [\#3131](https://github.com/consul/consul/pull/3131)
 - **Design/UX:** Proposal create question [\#3122](https://github.com/consul/consul/pull/3122)
 - **Design/UX:** Budget investments price explanation [\#3121](https://github.com/consul/consul/pull/3121)
 - **Design/UX:** Change CRUD for budget groups and headings [\#3106](https://github.com/consul/consul/pull/3106)
diff --git a/app/controllers/installation_controller.rb b/app/controllers/installation_controller.rb
index bc0e329433e..8aef8b6596b 100644
--- a/app/controllers/installation_controller.rb
+++ b/app/controllers/installation_controller.rb
@@ -12,7 +12,7 @@ def details
 
   def consul_installation_details
    {
-     release: 'v0.18'
+     release: "v0.18.1"
    }.merge(features: settings_feature_flags)
   end