From 066f42070a2163d4431607d65ad951523dbb89e4 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Fri, 9 Dec 2016 14:12:00 +0000 Subject: [PATCH 1/6] Fixed confusing wysiwyg line breaks display discrepency --- app/assets/stylesheets/admin/openfoodnetwork.css.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index 1532ea8520..f8035304f5 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -203,6 +203,9 @@ text-angular { .ta-scroll-window > .ta-bind { max-height: 400px; min-height: 100px; + p { + margin-bottom: 1.5rem; + } } .ta-scroll-window.form-control { min-height: 100px; From c8f0502e71a912e17f89d66adeafe67d2ef2f66b Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 16 Dec 2016 14:32:48 +1100 Subject: [PATCH 2/6] Apply connect_learn_homepage feature toggle to mobile menu --- app/views/shared/menu/_mobile_menu.html.haml | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 1ae4439cd9..066c3a8034 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -40,16 +40,17 @@ %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' %li - if spree_current_user.nil? From 9793450ed0e4446236479cb5886faab41d9bba61 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 16 Dec 2016 14:40:13 +1100 Subject: [PATCH 3/6] Make mobile menu mimic the large menu --- app/views/shared/menu/_mobile_menu.html.haml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 066c3a8034..69757a02a6 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -51,6 +51,17 @@ %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? From 0b2281dfe2efaf876eb569bd2bd7c3574549460e Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Sat, 17 Dec 2016 16:07:39 +0000 Subject: [PATCH 4/6] Adjustment for chrome browser --- app/assets/stylesheets/admin/openfoodnetwork.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index f8035304f5..4b5703d317 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -203,6 +203,7 @@ text-angular { .ta-scroll-window > .ta-bind { max-height: 400px; min-height: 100px; + outline: none; p { margin-bottom: 1.5rem; } From 7531c8cbc9eb0010e88c44db3966611c29ee792e Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 19 Dec 2016 11:10:12 +0000 Subject: [PATCH 5/6] Removed dashes --- app/views/checkout/_authentication.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6ae1272281e2142c666401883f8864185045419b Mon Sep 17 00:00:00 2001 From: Levent Ali Date: Wed, 26 Oct 2016 16:59:01 +0100 Subject: [PATCH 6/6] Mark order cycle form as dirty when removing fees Resolves an issue where removing coordinator/exchange fees wasn't allowing users to save the OC. Fixes #1165 --- .../javascripts/admin/order_cycles/controllers/edit.js.coffee | 2 ++ spec/javascripts/unit/order_cycle_spec.js.coffee | 2 ++ 2 files changed, 4 insertions(+) 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/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')