From db6f82fa4c3ead60645255ce358cc22bc7ea1e31 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 14 Sep 2016 11:09:36 +0200
Subject: [PATCH] Moves banner to a partial and includes it on debates index

---
 app/controllers/debates_controller.rb                 |  1 +
 app/views/debates/index.html.erb                      |  6 +++++-
 app/views/proposals/_proposal_ballots_banner.html.erb |  9 +++++++++
 app/views/proposals/index.html.erb                    | 10 +---------
 config/locales/en.yml                                 |  2 +-
 config/locales/es.yml                                 |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 app/views/proposals/_proposal_ballots_banner.html.erb

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index e077e5e8a..48aeb9167 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -22,6 +22,7 @@ class DebatesController < ApplicationController
 
   def index_customization
      @featured_debates = @debates.featured
+     @proposal_ballots = Proposal.successfull.sort_by_confidence_score
   end
 
   def show
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 6809782b1..ce9978172 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -29,7 +29,11 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% unless @tag_filter || @search_terms || !has_featured? %>
+      <% if @proposal_ballots.present? %>
+        <%= render "proposals/proposal_ballots_banner" %>
+      <% end %>
+
+      <% unless @tag_filter || @search_terms || !has_featured? || @proposal_ballots.present? %>
         <%= render "featured_debates" %>
       <% end %>
 
diff --git a/app/views/proposals/_proposal_ballots_banner.html.erb b/app/views/proposals/_proposal_ballots_banner.html.erb
new file mode 100644
index 000000000..df210a535
--- /dev/null
+++ b/app/views/proposals/_proposal_ballots_banner.html.erb
@@ -0,0 +1,9 @@
+<div id="next-voting" class="row featured-proposals-ballot-banner">
+  <%= link_to proposal_ballots_path do %>
+    <div class="small-12 column padding">
+      <div class="icon-successfull"></div>
+      <h2><%= t("proposal_ballots.featured_title") %></h2>
+      <p><%= t("proposal_ballots.info") %></p>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index e314b7ad4..d4756b87b 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -32,15 +32,7 @@
       <% end %>
 
       <% if @proposal_ballots.present? %>
-        <div id="next-voting" class="row featured-proposals-ballot-banner">
-          <%= link_to proposal_ballots_path do %>
-            <div class="small-12 column padding">
-              <div class="icon-successfull"></div>
-              <h2><%= t("proposal_ballots.featured_title") %></h2>
-              <p><%= t("proposal_ballots.info") %></p>
-            </div>
-          <% end %>
-        </div>
+        <%= render "proposal_ballots_banner" %>
       <% elsif @featured_proposals.present? %>
         <div id="featured-proposals" class="row featured-proposals">
           <div class="small-12 column">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ca999c2ca..4cbcb4079 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -376,7 +376,7 @@ en:
     title: "Votings"
     description_html: "The proposals that have reached the <strong>required supports <em>(%{supports})</em></strong> will be voted."
     date_title: "Dates of participation"
-    date: "November 21 to November 27, 2016"
+    date: "Soon we'll announce the date of vote these proposals."
     successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
     voting: "next voting"
     featured_title: "#VotingProposal"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4bd924b21..7a73af6fc 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -376,7 +376,7 @@ es:
     title: "Votaciones"
     description_html: "Las propuestas que han alcanzado el <strong>número de apoyos necesarios <em>(%{supports})</em></strong> pasarán a votación."
     date_title: "Fechas de participación"
-    date: "Del 21 de noviembre al 27 de noviembre de 2016"
+    date: "En breve anunciaremos la fecha de votación de estas propuestas."
     successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
     voting: "próxima votación"
     featured_title: "#VotaUnaPropuesta"