Skip to content

Commit

Permalink
Merge pull request consuldemocracy#2397 from consul/hide_order_select…
Browse files Browse the repository at this point in the history
…or_if_only_one_order

Hide order selectors when only one order available
  • Loading branch information
bertocq authored Jan 30, 2018
2 parents a159e17 + ee7ba46 commit c06276b
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 36 deletions.
30 changes: 16 additions & 14 deletions app/views/shared/_order_selector.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<form class="inline-block">
<label for="order-selector-participation" class="show-for-sr"><%= t("#{i18n_namespace}.select_order") %></label>
<select class="js-location-changer js-order-selector select-order"
data-order="<%= @current_order %>"
name="order-selector"
id="order-selector-participation">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @current_order %>
value='<%= current_path_with_query_params(order: order, page: 1) %>'>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</form>
<% if @valid_orders.present? && @valid_orders.count > 1 %>
<form class="inline-block">
<label for="order-selector-participation" class="show-for-sr"><%= t("#{i18n_namespace}.select_order") %></label>
<select class="js-location-changer js-order-selector select-order"
data-order="<%= @current_order %>"
name="order-selector"
id="order-selector-participation">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @current_order %>
value='<%= current_path_with_query_params(order: order, page: 1) %>'>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</form>
<% end %>
45 changes: 23 additions & 22 deletions app/views/shared/_wide_order_selector.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@
#
# i18n_namespace: for example "moderation.debates.index"
%>

<div class="wide-order-selector small-12 medium-8">
<form>
<div class="small-12 medium-6 float-left">
<label for="order-selector-participation">
<%= t("#{i18n_namespace}.select_order") %>
</label>
</div>
<div class="small-12 medium-6 float-left">
<select class="js-location-changer js-order-selector select-order"
data-order="<%= @current_order %>" name="order-selector"
id="order-selector-participation">
<% @valid_orders.each do |order| %>
<% value = current_path_with_query_params(order: order, page: 1) %>
<option value="<%= value %>" <%= 'selected' if order == @current_order %>>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</div>
</form>
</div>
<% if @valid_orders.present? && @valid_orders.count > 1 %>
<div class="wide-order-selector small-12 medium-8">
<form>
<div class="small-12 medium-6 float-left">
<label for="order-selector-participation">
<%= t("#{i18n_namespace}.select_order") %>
</label>
</div>
<div class="small-12 medium-6 float-left">
<select class="js-location-changer js-order-selector select-order"
data-order="<%= @current_order %>" name="order-selector"
id="order-selector-participation">
<% @valid_orders.each do |order| %>
<% value = current_path_with_query_params(order: order, page: 1) %>
<option value="<%= value %>" <%= 'selected' if order == @current_order %>>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</div>
</form>
</div>
<% end %>

0 comments on commit c06276b

Please sign in to comment.