removes old proposals successful banner
This commit is contained in:
@@ -19,7 +19,6 @@ class DebatesController < ApplicationController
|
|||||||
|
|
||||||
def index_customization
|
def index_customization
|
||||||
@featured_debates = @debates.featured
|
@featured_debates = @debates.featured
|
||||||
@proposal_successfull_exists = Proposal.successful.exists?
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
|||||||
@@ -35,8 +35,6 @@ class ProposalsController < ApplicationController
|
|||||||
def index_customization
|
def index_customization
|
||||||
discard_archived
|
discard_archived
|
||||||
load_retired
|
load_retired
|
||||||
load_successful_proposals
|
|
||||||
load_featured unless @proposal_successful_exists
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def vote
|
def vote
|
||||||
@@ -115,9 +113,4 @@ class ProposalsController < ApplicationController
|
|||||||
@resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))
|
@resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_successful_proposals
|
|
||||||
@proposal_successful_exists = Proposal.successful.exists?
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -42,11 +42,7 @@
|
|||||||
<%= render "shared/banner" %>
|
<%= render "shared/banner" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @proposal_successful_exists %>
|
<% unless @tag_filter || @search_terms || !has_featured? %>
|
||||||
<%= render "proposals/successful_banner" %>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<% unless @tag_filter || @search_terms || !has_featured? || @proposal_successful_exists %>
|
|
||||||
<%= render "featured_debates" %>
|
<%= render "featured_debates" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
|
||||||
@@ -44,9 +44,7 @@
|
|||||||
<%= render "shared/banner" %>
|
<%= render "shared/banner" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @proposal_successful_exists %>
|
<% if @featured_proposals.present? %>
|
||||||
<%= render "successful_banner" %>
|
|
||||||
<% elsif @featured_proposals.present? %>
|
|
||||||
<div id="featured-proposals" class="row featured-proposals">
|
<div id="featured-proposals" class="row featured-proposals">
|
||||||
<div class="small-12 column">
|
<div class="small-12 column">
|
||||||
<h2>
|
<h2>
|
||||||
|
|||||||
@@ -448,9 +448,6 @@ en:
|
|||||||
vote_answer: "Vote %{answer}"
|
vote_answer: "Vote %{answer}"
|
||||||
voted: "You have voted %{answer}"
|
voted: "You have voted %{answer}"
|
||||||
poll: "Poll"
|
poll: "Poll"
|
||||||
banner:
|
|
||||||
featured_title: "#NextVoting"
|
|
||||||
info: "New proposals that have reached the voting phase."
|
|
||||||
proposal_notifications:
|
proposal_notifications:
|
||||||
new:
|
new:
|
||||||
title: "Send message"
|
title: "Send message"
|
||||||
|
|||||||
@@ -448,9 +448,6 @@ es:
|
|||||||
vote_answer: "Votar %{answer}"
|
vote_answer: "Votar %{answer}"
|
||||||
voted: "Has votado %{answer}"
|
voted: "Has votado %{answer}"
|
||||||
poll: "Votación"
|
poll: "Votación"
|
||||||
banner:
|
|
||||||
featured_title: "#PróximaVotación"
|
|
||||||
info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
|
|
||||||
proposal_notifications:
|
proposal_notifications:
|
||||||
new:
|
new:
|
||||||
title: "Enviar mensaje"
|
title: "Enviar mensaje"
|
||||||
|
|||||||
Reference in New Issue
Block a user