diff --git a/app/views/spree/admin/reports/bulk_coop.html.haml b/app/views/spree/admin/reports/bulk_coop.html.haml index c405b78526..c9178d89db 100644 --- a/app/views/spree/admin/reports/bulk_coop.html.haml +++ b/app/views/spree/admin/reports/bulk_coop.html.haml @@ -2,17 +2,17 @@ = label_tag nil, t(:date_range) %br .date-range-filter - %div{"class" => "left sub-field"} + .left.sub-field = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' - %div{"class" => "right sub-field"} + .right.sub-field = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br - %div{"class" => "row"} - %div{"class" => "four columns alpha"} + .row + .four.columns.alpha = label_tag nil, "Distributor: " = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => 'All'}, {:class => "select2 fullwidth"}) = label_tag nil, "Report Type: " diff --git a/app/views/spree/admin/reports/customers.html.haml b/app/views/spree/admin/reports/customers.html.haml index db5fc94ce6..aef51702a6 100644 --- a/app/views/spree/admin/reports/customers.html.haml +++ b/app/views/spree/admin/reports/customers.html.haml @@ -1,19 +1,19 @@ = form_tag spree.customers_admin_reports_url do |f| %br - %div{"class" => "row"} - %div{"class" => "four columns alpha"} + .row + .four.columns.alpha = label_tag nil, "Distributor: " = select_tag(:distributor_id, options_from_collection_for_select(@distributors, :id, :name, params[:distributor_id]), {:include_blank => true, :class => "select2 fullwidth"}) - %div{"class" => "four columns"} + .four.columns = label_tag nil, "Supplier: " = select_tag(:supplier_id, options_from_collection_for_select(@suppliers, :id, :name, params[:supplier_id]), {:include_blank => true, :class => "select2 fullwidth"}) - %div{"class" => "six columns"} + .six.columns = label_tag nil, "Order Cycle: " = select_tag(:order_cycle_id, options_for_select(report_order_cycle_options(@order_cycles), params[:order_cycle_id]), diff --git a/app/views/spree/admin/reports/orders_and_distributors.html.haml b/app/views/spree/admin/reports/orders_and_distributors.html.haml index 26137158b0..05e07243b3 100644 --- a/app/views/spree/admin/reports/orders_and_distributors.html.haml +++ b/app/views/spree/admin/reports/orders_and_distributors.html.haml @@ -2,11 +2,11 @@ = label_tag nil, t(:date_range) %br .date-range-filter - %div{"class" => "left sub-field"} + .left.sub-field = s.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' - %div{"class" => "right sub-field"} + .right.sub-field = s.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) diff --git a/app/views/spree/admin/reports/payments.html.haml b/app/views/spree/admin/reports/payments.html.haml index 9f145e2858..26c523e87a 100644 --- a/app/views/spree/admin/reports/payments.html.haml +++ b/app/views/spree/admin/reports/payments.html.haml @@ -2,17 +2,17 @@ = label_tag nil, t(:date_range) %br .date-range-filter - %div{"class" => "left sub-field"} + .left.sub-field = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' - %div{"class" => "right sub-field"} + .right.sub-field = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br - %div{"class" => "row"} - %div{"class" => "four columns alpha"} + .row + .four.columns.alpha = label_tag nil, "Distributor: " = f.collection_select(:distributor_id_eq, @distributors, :id, :name, {:include_blank => 'All'}, {:class => "select2 fullwidth"}) = label_tag nil, "Report Type: " diff --git a/app/views/spree/admin/reports/products_and_inventory.html.haml b/app/views/spree/admin/reports/products_and_inventory.html.haml index 22bd58c29f..c3470e6047 100644 --- a/app/views/spree/admin/reports/products_and_inventory.html.haml +++ b/app/views/spree/admin/reports/products_and_inventory.html.haml @@ -1,21 +1,21 @@ = form_tag spree.products_and_inventory_admin_reports_url do |f| %br - %div{"class" => "row"} - %div{"class" => "four columns alpha"} + .row + .four.columns.alpha = label_tag nil, "Distributor: " = select_tag(:distributor_id, options_from_collection_for_select(@distributors, :id, :name, params[:distributor_id]), {:include_blank => true, :class => "select2 fullwidth"}) - %div{"class" => "four columns"} + .four.columns = label_tag nil, "Supplier: " = select_tag(:supplier_id, options_from_collection_for_select(@suppliers, :id, :name, params[:supplier_id]), {:include_blank => true, :class => "select2 fullwidth"}) - %div{"class" => "six columns"} + .six.columns = label_tag nil, "Order Cycle: " = select_tag(:order_cycle_id, options_for_select(report_order_cycle_options(@order_cycles), params[:order_cycle_id]),