From c76bd65b400bdf6dd3097ed3d380b0a256e12ace Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 5 Jun 2017 16:29:48 +0200
Subject: [PATCH] removes old proposals successful banner

---
 app/controllers/debates_controller.rb           | 1 -
 app/controllers/proposals_controller.rb         | 7 -------
 app/views/debates/index.html.erb                | 6 +-----
 app/views/proposals/_successful_banner.html.erb | 9 ---------
 app/views/proposals/index.html.erb              | 4 +---
 config/locales/en.yml                           | 3 ---
 config/locales/es.yml                           | 3 ---
 7 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 app/views/proposals/_successful_banner.html.erb

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 9b29080dd..b8d6bdf10 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -19,7 +19,6 @@ class DebatesController < ApplicationController
 
   def index_customization
     @featured_debates = @debates.featured
-    @proposal_successfull_exists = Proposal.successful.exists?
   end
 
   def show
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 3a9db4c5d..b4599676d 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -35,8 +35,6 @@ class ProposalsController < ApplicationController
   def index_customization
     discard_archived
     load_retired
-    load_successful_proposals
-    load_featured unless @proposal_successful_exists
   end
 
   def vote
@@ -115,9 +113,4 @@ class ProposalsController < ApplicationController
         @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))
       end
     end
-
-    def load_successful_proposals
-      @proposal_successful_exists = Proposal.successful.exists?
-    end
-
 end
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index a92735c2d..73cafe392 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -42,11 +42,7 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% if @proposal_successful_exists %>
-        <%= render "proposals/successful_banner" %>
-      <% end %>
-
-      <% unless @tag_filter || @search_terms || !has_featured? || @proposal_successful_exists %>
+      <% unless @tag_filter || @search_terms || !has_featured? %>
         <%= render "featured_debates" %>
       <% end %>
 
diff --git a/app/views/proposals/_successful_banner.html.erb b/app/views/proposals/_successful_banner.html.erb
deleted file mode 100644
index 3bde0e097..000000000
--- a/app/views/proposals/_successful_banner.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="next-voting" class="row sucessfull-proposals-banner">
-  <%= link_to polls_path do %>
-    <div class="small-12 column padding">
-      <div class="icon-successful"></div>
-      <h2><%= t("poll_questions.banner.featured_title") %></h2>
-      <p><%= t("poll_questions.banner.info") %></p>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 65a02a9c1..77a551fc6 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -44,9 +44,7 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% if @proposal_successful_exists %>
-        <%= render "successful_banner" %>
-      <% elsif @featured_proposals.present? %>
+      <% if @featured_proposals.present? %>
         <div id="featured-proposals" class="row featured-proposals">
           <div class="small-12 column">
             <h2>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 90b8ceadb..ea070e095 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -448,9 +448,6 @@ en:
       vote_answer: "Vote %{answer}"
       voted: "You have voted %{answer}"
       poll: "Poll"
-    banner:
-      featured_title: "#NextVoting"
-      info: "New proposals that have reached the voting phase."
   proposal_notifications:
     new:
       title: "Send message"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4f38fc369..cdca72c57 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -448,9 +448,6 @@ es:
       vote_answer: "Votar %{answer}"
       voted: "Has votado %{answer}"
       poll: "Votación"
-    banner:
-      featured_title: "#PróximaVotación"
-      info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
   proposal_notifications:
     new:
       title: "Enviar mensaje"