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

Removes duplicate heading info, fixes headings structure

Browse Source
This commit is contained in:
decabeza
2018-02-28 16:10:14 +01:00
parent bd3929a7dc
commit 7a888b71fd
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/budgets/investments/_header.html.erb
View File

@@ -23,13 +23,17 @@
</div>
<% if @ballot.valid_heading?(@heading) %>
<div class="progress-bar-nav" data-fixed-bar>
<h1><%= @heading.name %></h1>
<h2>
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<div id="progress_bar" class="no-margin-top">
<%= render 'budgets/ballot/progress_bar' %>
</div>
</div>
<% else %>
<h1><%= @heading.name %></h1>
<h2>
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<div class="small-12 medium-9">
<div class="callout warning">
<%= t("budgets.investments.header.different_heading_assigned_html",
@@ -47,11 +51,13 @@
</div>
<% end %>
<% else %>
<h1 class="margin-top"><%= @heading.name %></h1>
<h2>
<h2 class="margin-top">
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<h3>
<span class="tagline"><%= t("budgets.investments.header.price") %></span>
<%= @budget.formatted_heading_price(@heading) %>
</h2>
</h3>
<% end %>
</div>
</div>

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

@@ -43,10 +43,6 @@
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="small-12 margin-bottom">
<h2><%= t("budgets.investments.index.by_heading", heading: @heading.name) %></h2>
</div>
<% end %>
<%= render("shared/advanced_search", search_path: budget_investments_url(@budget)) %>