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

Merge pull request #387 from AyuntamientoMadrid/improve_design

Browse Source 
Improve design
This commit is contained in:
Raimond Garcia
2015-09-07 01:08:58 +02:00
parent f54b1c9f54 30073ca820
commit 5b671ce623
35 changed files with 339 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app/views/debates/index.html.erb
View File

@@ -1,50 +1,43 @@
<section role="main">
<div class="filters row">
<div class="small-12 medium-9 column">
<% if @search_terms %>
<div class="inline-block small-12 medium-8" >
<h2>
<%= page_entries_info @debates %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
</h2>
</div>
<% elsif @tag_filter %>
<div class="inline-block small-12 medium-8" >
<h2>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
</div>
<% end %>
<div class="inline-block <%= 'right' if (@tag_filter || @search_terms) %>">
<% if @tag_filter || @search_terms %>
<h6 class="inline-block">
<%= t("debates.index.select_order") %>
</h6>
<% else %>
<h2 class="inline-block">
<%= t("debates.index.select_order_long") %>
</h2>
<% end %>
<form class="inline-block">
<select class="js-location-changer" name="order-selector">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @order %>
value='<%= current_path_with_query_params(order: order) %>'>
<%= t("debates.index.orders.#{order}") %>
</option>
<% end %>
</select>
</form>
</div>
</div>
</div>
<div class="row">
<div class="wrap row">
<div id="debates" class="debates-list small-12 medium-9 column js-order-<%= @order.dasherize %>">
<div class="filters">
<div class="small-12 medium-8 column">
<% if @search_terms %>
<h2>
<%= page_entries_info @debates %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
</h2>
<% elsif @tag_filter %>
<h2>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
<% end %>
</div>
<div class="inline-block <%= 'right' if (@tag_filter || @search_terms) %>">
<% if @tag_filter || @search_terms %>
<h6 class="inline-block">
<%= t("debates.index.select_order") %>
</h6>
<% else %>
<h2 class="inline-block">
<%= t("debates.index.select_order_long") %>
</h2>
<% end %>
<form class="inline-block">
<select class="js-location-changer" name="order-selector">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @order %>
value='<%= current_path_with_query_params(order: order) %>'>
<%= t("debates.index.orders.#{order}") %>
</option>
<% end %>
</select>
</form>
</div>
</div>
<%= render @debates %>
<%= paginate @debates %>
</div>