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

Merge pull request #1023 from consul/index

Browse Source 
adds geozone and unfeasible filters to spending proposals index
This commit is contained in:
Enrique García
2016-03-30 15:28:09 +02:00
parent 3b9da7b463 4fad283947
commit b3ed70dbbc
7 changed files with 88 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/spending_proposals/_sidebar.html.erb
View File

@@ -2,10 +2,14 @@
<h3 class="sidebar-title"><%= t("spending_proposals.index.sidebar.geozones") %></h3>
<br>
<div class="geozone">
<% Geozone.names.each do |geozone| %>
<%= link_to geozone, spending_proposals_path(search: geozone) %>
<%= link_to t('geozones.all'), spending_proposals_path(geozone: nil) %>
<%= link_to t('geozones.none'), spending_proposals_path(geozone: 'all') %>
<% Geozone.all.each do |geozone| %>
<%= link_to geozone.name, spending_proposals_path(geozone: geozone.id) %>
<% end %>
</div>
<div class="sidebar-divider"></div>
<h3 class="sidebar-title"><%= t("spending_proposals.index.sidebar.feasibility") %></h3>
<br>
<br>
<%= link_to t('spending_proposals.index.sidebar.unfeasible'), spending_proposals_path(unfeasible: '1') %>

8
app/views/spending_proposals/index.html.erb
View File

@@ -10,10 +10,12 @@
<div id="investment-projects" class="investment-projects-list small-12 medium-9 column">
<div class="small-12 search-results">
<% if @search_terms %>
<%= content_tag(:h2, t("spending_proposals.index.unfeasible")) if params[:unfeasible].present? %>
<%= content_tag(:h2, t("spending_proposals.index.by_geozone", geozone: @geozone_name)) if @geozone_name.present? %>
<% if params[:search].present? %>
<h2>
<%= page_entries_info @spending_proposals %>
<%= t("spending_proposals.index.search_results", count: @spending_proposals.size, search_term: @search_terms) %>
<%= t("spending_proposals.index.search_results", count: @spending_proposals.size, search_term: params[:search]) %>
</h2>
<% end %>
</div>
@@ -26,7 +28,7 @@
</div>
<div class="small-12 medium-3 column">
<aside class="margin-bottom">
<aside id="sidebar" class="margin-bottom">
<%= render 'sidebar' %>
</aside>
</div>