consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes custom content on budget investment index

Browse Source
This commit is contained in:
decabeza
2018-03-23 19:54:57 +01:00
parent e9f140ff23
commit 2fb51710f8
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/budgets/investments/index.html.erb
View File

@@ -6,7 +6,10 @@
<% end %> <% end %>
<% content_for :canonical do %> <% content_for :canonical do %>
<% if @heading.present? %> <% if @heading.present? %>
<%= render "shared/canonical", href: budget_investments_url(@budget, heading_id: @heading.id, filter: @current_filter) %> <%= render "shared/canonical",
href: budget_investments_url(@budget,
heading_id: @heading.id,
filter: @current_filter) %>
<% else %> <% else %>
<%= render "shared/canonical", href: budget_investments_url(@budget) %> <%= render "shared/canonical", href: budget_investments_url(@budget) %>
<% end %> <% end %>
@@ -25,7 +28,9 @@
<h2><%= t("shared.search_results") %></h2> <h2><%= t("shared.search_results") %></h2>
<p> <p>
<%= page_entries_info @investments %> <%= page_entries_info @investments %>
<%= t("budgets.investments.index.search_results_html", count: @investments.size, search_term: params[:search]) %> <%= t("budgets.investments.index.search_results_html",
count: @investments.size,
search_term: params[:search]) %>
</p> </p>
</div> </div>
</div> </div>
@@ -39,8 +44,12 @@
<div class="small-12 margin-bottom"> <div class="small-12 margin-bottom">
<h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2> <h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<div class="callout primary margin"> <div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text", <%= t("budgets.investments.index.unfeasible_text") %>
definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %> </div>
</div>
<% elsif @heading.present? %>
<div class="row">
<div class="small-12 column">
</div> </div>
</div> </div>
<% end %> <% end %>
@@ -49,8 +58,11 @@
<%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %> <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %>
<% if investments_default_view? %>
<% @investments.each do |investment| %> <% @investments.each do |investment| %>
<%= render partial: '/budgets/investments/investment', locals: { <%= render partial: '/budgets/investments/investment',
locals: {
investment: investment, investment: investment,
investment_ids: @investment_ids, investment_ids: @investment_ids,
investment_votes: @investment_votes, investment_votes: @investment_votes,
@@ -58,6 +70,21 @@
} %> } %>
<% end %> <% end %>
<%= render "banners" if @budget.selecting? || @budget.balloting? %>
<%= paginate @investments %>
<% else %>
<% @investments.each do |investment| %>
<%= render partial: '/budgets/investments/investment_minimal',
locals: { investment: investment } %>
<% end %>
<%= render "banners" if @budget.selecting? || @budget.balloting? %>
<%= paginate @investments %>
<% end %>
<%= paginate @investments %> <%= paginate @investments %>
</div> </div>