diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index 836d31b9fd..edbbb5f241 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -113,6 +113,14 @@ form.order_cycle { margin-right: 2em; } } + .collection-details { + input { + width: 90% + } + span { + font-size: 1rem + } + } } .coordinator-fees { margin-top: 1em; diff --git a/app/views/admin/order_cycles/_exchange_form.html.haml b/app/views/admin/order_cycles/_exchange_form.html.haml index 0e3dbb4340..6e910df7cc 100644 --- a/app/views/admin/order_cycles/_exchange_form.html.haml +++ b/app/views/admin/order_cycles/_exchange_form.html.haml @@ -15,8 +15,10 @@ {{ exchange.tags.length }} %td.collection-details = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', 'placeholder' => 'Ready for (ie. Date / Time)', 'ng-model' => 'exchange.pickup_time', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator' + %span.icon-question-sign{'ofn-with-tip' => "#{t('admin.order_cycles.edit.pickup_time_tip')}"} %br/ = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', 'placeholder' => 'Pick-up instructions', 'ng-model' => 'exchange.pickup_instructions', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator' + %span.icon-question-sign{'ofn-with-tip' => "#{t('admin.order_cycles.edit.pickup_instructions_tip')}"} %td.fees %ol{ ng: { show: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } } %li{'ng-repeat' => 'enterprise_fee in exchange.enterprise_fees'} diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2269ed6d92..d1fde27b6a 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -199,6 +199,8 @@ en-GB: order_cycles: edit: choose_products_from: "Choose Products From:" + pickup_time_tip: 'Display name for order cycle delivery, e.g "Monday"' + pickup_instructions_tip: 'Additional notes for this selection' enterprise: select_outgoing_oc_products_from: Select outgoing OC products from enterprises: diff --git a/config/locales/en.yml b/config/locales/en.yml index 63eff8f8f2..9d544dac9e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -278,6 +278,9 @@ en: order_cycles: edit: choose_products_from: "Choose Products From:" + pickup_time_tip: 'Display name for order cycle delivery, e.g "Monday"' + pickup_instructions_tip: 'Additional notes for this selection' + enterprise: select_outgoing_oc_products_from: Select outgoing OC products from