From 5869eb184123eaca3a2ba4c0993cc3d4be5e9075 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 8 Jan 2021 11:23:23 +0100 Subject: [PATCH] add new div container to use flexbox properties for its two child divs named: select-and-closing-container --- .../enterprises/_change_order_cycle.html.haml | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/app/views/enterprises/_change_order_cycle.html.haml b/app/views/enterprises/_change_order_cycle.html.haml index 7ef49f9d62..09528f2606 100644 --- a/app/views/enterprises/_change_order_cycle.html.haml +++ b/app/views/enterprises/_change_order_cycle.html.haml @@ -1,27 +1,28 @@ %div{"ng-controller" => "OrderCycleChangeCtrl", "ng-cloak" => true} - %closing - %div{"ng-if" => "OrderCycle.selected()"} - %div{"ng-if" => "closesInLessThan3Months()"} - = t :enterprises_next_closing - %strong {{ OrderCycle.orders_close_at() | date_in_words }} - %div{"ng-if" => "!closesInLessThan3Months()"} - = t :enterprises_currently_open - %div{"ng-if" => "!OrderCycle.selected()"} - = t :enterprises_choose + .select-and-closing-container + %closing + %div{"ng-if" => "OrderCycle.selected()"} + %div{"ng-if" => "closesInLessThan3Months()"} + = t :enterprises_next_closing + %strong {{ OrderCycle.orders_close_at() | date_in_words }} + %div{"ng-if" => "!closesInLessThan3Months()"} + = t :enterprises_currently_open + %div{"ng-if" => "!OrderCycle.selected()"} + = t :enterprises_choose - .order-cycle-select - .select-label - %span= t :enterprises_ready_for + .order-cycle-select + .select-label + %span= t :enterprises_ready_for - - if oc_select_options.count == 1 - %p - = oc_select_options.first[:time] + - if oc_select_options.count == 1 + %p + = oc_select_options.first[:time] - - else - %select.select2.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", - "ofn-change-order-cycle" => true, - "disabled" => require_customer?, - "ng-options" => "oc.id as oc.time for oc in #{oc_select_options.to_json}"} + - else + %select.select2.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", + "ofn-change-order-cycle" => true, + "disabled" => require_customer?, + "ng-options" => "oc.id as oc.time for oc in #{oc_select_options.to_json}"} - - if oc_select_options.count > 1 - %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select + - if oc_select_options.count > 1 + %option{value: "", disabled: "", selected: ""}= t :shopping_oc_select