Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bootstrap input-group for date range #1817

Merged
merged 1 commit into from
Apr 5, 2017
Merged

Use bootstrap input-group for date range #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions backend/app/assets/stylesheets/spree/backend/components/_date-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
.date-range-filter {
.range-divider {
padding: 0;
}
input.datepicker {
width: 96px !important;
color: $gray;
}
}

Expand Down
8 changes: 4 additions & 4 deletions backend/app/views/spree/admin/orders/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<div class="field-block col-xs-12 col-md-6 col-lg-4 col-xl-3">
<div class="date-range-filter field">
<%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
<div class="date-range-fields">
<%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
<div class="date-range-fields input-group">
<%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>

<span class="range-divider">
<span class="range-divider input-group-addon">
<i class="fa fa-arrow-right"></i>
</span>

<%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
<%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
</div>
</div>

Expand Down
12 changes: 6 additions & 6 deletions backend/app/views/spree/admin/shared/_report_criteria.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<%= search_form_for @search, url: spree.sales_total_admin_reports_path do |s| %>
<div class="date-range-filter field align-center">
<%= label_tag nil, Spree.t(:start), class: 'inline' %>
<%= s.text_field :created_at_gt, class: 'datepicker datepicker-from', value: datepicker_field_value(params[:q][:created_at_gt]) %>
<div class="date-range-filter field">
<div class="date-range-fields input-group">
<%= s.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:created_at_gt]), placeholder: Spree.t(:start) %>

<span class="range-divider">
<span class="range-divider input-group-addon">
<i class="fa fa-arrow-right"></i>
</span>

<%= s.text_field :created_at_lt, class: 'datepicker datepicker-to', value: datepicker_field_value(params[:q][:created_at_lt]) %>
<%= label_tag nil, Spree.t(:end), class: 'inline' %>
<%= s.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:created_at_lt]), placeholder: Spree.t(:end) %>
</div>
</div>

<div class="actions filter-actions">
Expand Down
16 changes: 8 additions & 8 deletions backend/app/views/spree/admin/shared/_report_order_criteria.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<%= search_form_for @search, url: spree.sales_total_admin_reports_path do |s| %>
<div class="date-range-filter field align-center">
<%= label_tag :q_completed_at_gt, Spree.t(:start), class: 'inline' %>
<%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from', value: datepicker_field_value(params[:q][:completed_at_gt]) %>
<div class="date-range-filter field">
<div class="date-range-fields input-group">
<%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: Spree.t(:start) %>

<span class="range-divider">
<i class="fa fa-arrow-right"></i>
</span>
<span class="range-divider input-group-addon">
<i class="fa fa-arrow-right"></i>
</span>

<%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to', value: datepicker_field_value(params[:q][:completed_at_lt]) %>
<%= label_tag :q_completed_at_lt, Spree.t(:end), class: 'inline' %>
<%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]), placeholder: Spree.t(:end) %>
</div>
</div>

<div class="actions filter-actions">
Expand Down
8 changes: 4 additions & 4 deletions backend/app/views/spree/admin/stock_transfers/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<div class="field-block col-xs-3">
<div class="date-range-filter field">
<%= f.label nil, Spree.t(:date_range) %>
<div class="date-range-fields">
<%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
<div class="date-range-fields input-group">
<%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>

<span class="range-divider">
<span class="range-divider input-group-addon">
<i class="fa fa-arrow-right"></i>
</span>

<%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
<%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
</div>
</div>
</div>
Expand Down
10 changes: 6 additions & 4 deletions backend/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
<div class="field-block col-xs-3">
<div class="date-range-filter field">
<label for="q_created_at_gt">Date Range</label>
<div class="date-range-fields">
<input class="datepicker" placeholder="Date">
<span class="range-divider"><i class="fa fa-arrow-right"></i></span>
<input class="datepicker" placeholder="Picker">
<div class="input-group date-range-fields">
<input class="form-control datepicker datepicker-from" placeholder="From">
<span class="range-divider input-group-addon">
<i class="fa fa-arrow-right"></i>
</span>
<input class="form-control datepicker datepicker-to" placeholder="To">
</div>
</div>
</div>
Expand Down