Merge pull request #275 from mlovic/filter-topic

Allow debates to be filtered by topic
This commit is contained in:
Raimond Garcia
2015-08-28 17:41:38 +02:00
8 changed files with 88 additions and 24 deletions

View File

@@ -1,5 +0,0 @@
<form class="inline-block">
<select class="js-order-selector" name="order-selector">
<%= available_options_for_order_selector(@valid_orders, @order) %>
</select>
</form>

View File

@@ -1,25 +1,37 @@
<section role="main">
<!-- Filters -->
<div class="filters row">
<div class="small-12 column">
<h2><%= t("debates.index.showing") %></h2>
<%= render 'order_selector' %>
</div>
</div>
<!-- /. Filters -->
<div class="small-9 column">
<div class="inline-block" >
<% if @tag_filter %>
<h2>
<%= t("debates.index.filter_topic",
number: @debates.size,
topic: @tag_filter).html_safe %>
</h2>
<% else %>
<h2><%= t("debates.index.select_topic") %></h2>
<form class="inline-block">
<select class="js-tag-filter" name="tag-filter">
<option value="all" selected="selected"><%= t("debates.index.all") %></option>
<%= options_from_collection_for_select(ActsAsTaggableOn::Tag.all, :name, :name) %>
</select>
</form>
<% end %>
</div>
<div class="inline-block right">
<h6 class="inline-block"><%= t("debates.index.select_order") %></h6>
<form class="inline-block">
<select class="js-order-selector" name="order-selector">
<%= available_options_for_order_selector(@valid_orders, @order) %>
</select>
</form>
</div>
<!-- Filter topic results -->
<div class="filters row">
<div class="small-12 column">
<h2>
<%= t("debates.index.filter_topic",
number: "N",
topic: "topic").html_safe %>
</h2>
</div>
</div>
<!-- /. Filter topic results -->
<div class="row">
<div id="debates" class="debates-list small-12 medium-9 column">