aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-05-10 22:13:40 +0200
committerAlban Peignier2018-05-10 22:13:40 +0200
commit3364755e26c5a4a54a6de6080bf1177ee03c7183 (patch)
tree6d153ce33821fdfcbc73a601b297fb8ddda105fb
parent0ef1a1d4f948ffa4e7d681dfc9a27d8783b7568e (diff)
downloadchouette-core-3364755e26c5a4a54a6de6080bf1177ee03c7183.tar.bz2
Move per-page-select group in the second line in referential_vehicle_journeys/_filters. Refs #69236923-consolidated-offer
-rw-r--r--app/views/referential_vehicle_journeys/_filters.html.slim10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim
index bcb980f64..31053c5ba 100644
--- a/app/views/referential_vehicle_journeys/_filters.html.slim
+++ b/app/views/referential_vehicle_journeys/_filters.html.slim
@@ -1,15 +1,12 @@
= search_form_for @q, url: referential_vehicle_journeys_path(@referential), html: {method: :get}, class: 'form form-filter' do |f|
input type="hidden" name="display" value=params[:display]
- .ffg-row.w73
+ .ffg-row.w85
.input-group.search_bar
= f.search_field :published_journey_name_or_objectid_cont, placeholder: t('.published_journey_name_or_objectid'), class: 'form-control'
span.input-group-btn
button.btn.btn-default#search-btn type='submit'
span.fa.fa-search
- .ffg-row.w27
- .form-group.per-page-select
- = I18n.t("simple_form.per_page")
- = %w(10 50 100).each_with_index.map{ |v, i| (params[:per_page] == v || params[:per_page].nil? && i == 0) ? "<span class='selected'>#{v}</span>" : link_to(v, referential_vehicle_journeys_path(@referential, q: params[:q], per_page: v)) }.join(' - ').html_safe
+ .ffg-row.w15
- if has_feature?(:consolidated_offers)
.form-group
.btn-group
@@ -19,6 +16,9 @@
span.fa.fa-th-large
.ffg-row
+ .form-group.per-page-select
+ = I18n.t("simple_form.per_page")
+ = %w(10 50 100).each_with_index.map{ |v, i| (params[:per_page] == v || params[:per_page].nil? && i == 0) ? "<span class='selected'>#{v}</span>" : link_to(v, referential_vehicle_journeys_path(@referential, q: params[:q], per_page: v)) }.join(' - ').html_safe
.form-group.togglable class=filter_item_class(params[:q], :company_id_eq_any)
= f.label Chouette::VehicleJourney.human_attribute_name(:company), required: false, class: 'control-label'
- if @all_companies.present?