Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

Make ordergroup break fields a bit nicer

This commit is contained in:
wvengen 2016-03-11 13:56:02 +01:00
parent b067808937
commit 42eb6c8509
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/inputs/date_picker_input.rb
View File

@ -1,6 +1,6 @@
class DatePickerInput < SimpleForm::Inputs::StringInput class DatePickerInput < SimpleForm::Inputs::StringInput
def input(wrapper_options) def input(wrapper_options)
options = merge_wrapper_options(input_html_options, wrapper_options) options = merge_wrapper_options(input_html_options, wrapper_options)
@builder.text_field attribute_name, options.merge(class: 'datepicker') @builder.text_field attribute_name, options.merge(class: 'input-small datepicker')
end end
end end

5
app/views/admin/ordergroups/_form.html.haml
View File

@ -5,8 +5,9 @@
= f.input :contact_person = f.input :contact_person
= f.input :contact_phone = f.input :contact_phone
= f.input :contact_address = f.input :contact_address
= f.input :break_start, as: :date_picker .fold-line
= f.input :break_end, as: :date_picker = f.input :break_start, as: :date_picker, label: Ordergroup.human_attribute_name('break')
= f.input :break_end, as: :date_picker, label: Ordergroup.human_attribute_name('break_until')
- if FoodsoftConfig[:use_apple_points] - if FoodsoftConfig[:use_apple_points]
= f.input :ignore_apple_restriction, :label => false, :inline_label => true = f.input :ignore_apple_restriction, :label => false, :inline_label => true
= render 'shared/group_form_fields', f: f, captured: captured = render 'shared/group_form_fields', f: f, captured: captured

1
config/locales/en.yml
View File

@ -101,6 +101,7 @@ en:
account_balance: Account balance account_balance: Account balance
available_funds: Available credit available_funds: Available credit
break: (Last) break break: (Last) break
break_until: until
contact: Contact contact: Contact
contact_address: Address contact_address: Address
contact_person: Contact person contact_person: Contact person