diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee index c0818acafa..0e1a0ab45c 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee @@ -68,6 +68,7 @@ angular.module('admin.orderCycles') $scope.removeCoordinatorFee = ($event, index) -> $event.preventDefault() OrderCycle.removeCoordinatorFee(index) + $scope.order_cycle_form.$dirty = true $scope.addExchangeFee = ($event, exchange) -> $event.preventDefault() @@ -76,6 +77,7 @@ angular.module('admin.orderCycles') $scope.removeExchangeFee = ($event, exchange, index) -> $event.preventDefault() OrderCycle.removeExchangeFee(exchange, index) + $scope.order_cycle_form.$dirty = true $scope.removeDistributionOfVariant = (variant_id) -> OrderCycle.removeDistributionOfVariant(variant_id) diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index 1532ea8520..4b5703d317 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -203,6 +203,10 @@ text-angular { .ta-scroll-window > .ta-bind { max-height: 400px; min-height: 100px; + outline: none; + p { + margin-bottom: 1.5rem; + } } .ta-scroll-window.form-control { min-height: 100px; diff --git a/app/views/checkout/_authentication.html.haml b/app/views/checkout/_authentication.html.haml index 45d977d8e3..d157901059 100644 --- a/app/views/checkout/_authentication.html.haml +++ b/app/views/checkout/_authentication.html.haml @@ -9,7 +9,7 @@ %button.primary.expand{"auth" => "login"} = t :label_login .small-2.columns.text-center - %p.pad-top= "-#{t :action_or}-" + %p.pad-top= "#{t :action_or}" .small-5.columns.text-center %button.neutral-btn.dark.expand{"ng-click" => "enabled = true"} = t :checkout_as_guest diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 1ae4439cd9..69757a02a6 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -40,16 +40,28 @@ %span.nav-primary %i.ofn-i_036-producers = t 'label_producers' - %li.li-menu - %a{href: "https://openfoodnetwork.org/au/connect/"} - %span.nav-primary - %i.ofn-i_035-groups - = t 'label_connect' - %li.li-menu - %a{href: "https://openfoodnetwork.org/au/learn/"} - %span.nav-primary - %i.ofn-i_013-help - = t 'label_learn' + - if feature? :connect_learn_homepage + %li.li-menu + %a{href: "https://openfoodnetwork.org/au/connect/"} + %span.nav-primary + %i.ofn-i_035-groups + = t 'label_connect' + %li.li-menu + %a{href: "https://openfoodnetwork.org/au/learn/"} + %span.nav-primary + %i.ofn-i_013-help + = t 'label_learn' + - else + %li.li-menu + %a{href: main_app.groups_path} + %span.nav-primary + %i.ofn-i_035-groups + = t 'label_groups' + %li.li-menu + %a{href: ContentConfig.footer_about_url} + %span.nav-primary + %i.ofn-i_013-help + = t 'label_about' %li - if spree_current_user.nil? diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee index 5fec8b93f5..ac7e52a366 100644 --- a/spec/javascripts/unit/order_cycle_spec.js.coffee +++ b/spec/javascripts/unit/order_cycle_spec.js.coffee @@ -300,6 +300,7 @@ describe 'OrderCycle controllers', -> scope.removeCoordinatorFee(event, 0) expect(event.preventDefault).toHaveBeenCalled() expect(OrderCycle.removeCoordinatorFee).toHaveBeenCalledWith(0) + expect(scope.order_cycle_form.$dirty).toEqual true it 'Adds exchange fees', -> scope.addExchangeFee(event) @@ -310,6 +311,7 @@ describe 'OrderCycle controllers', -> scope.removeExchangeFee(event, 'exchange', 0) expect(event.preventDefault).toHaveBeenCalled() expect(OrderCycle.removeExchangeFee).toHaveBeenCalledWith('exchange', 0) + expect(scope.order_cycle_form.$dirty).toEqual true it 'Removes distribution of a variant', -> scope.removeDistributionOfVariant('variant')