Merge branch 'master' into flag-renaming

This commit is contained in:
kikito
2015-08-27 19:06:29 +02:00
24 changed files with 282 additions and 34 deletions

View File

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

View File

@@ -4,18 +4,7 @@
<div class="filters row">
<div class="small-12 column">
<h2><%= t("debates.index.showing") %></h2>
<select class="inline-block">
<option value="filter_news">
<%= t("debates.index.filter_news") %>
</option>
<option value="filter_votes">
<%= t("debates.index.filter_votes") %>
</option>
<option value="filter_rated">
<%= t("debates.index.filter_rated") %>
</option>
</select>
<%= render 'order_selector' %>
</div>
</div>
<!-- /. Filters -->