From 97bcbb81b9a4aa28a6ada414e988c71c1c9a9bc0 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 30 Mar 2016 16:46:06 +1100 Subject: [PATCH] Change text of register call in the dropdown Unified code for the dropdown and the footer. Both contain the register call and are both pointing to the register path now. The footer still pointed to the global site before. --- app/assets/stylesheets/darkswarm/footer.sass | 2 +- app/views/shared/_footer.html.haml | 8 +------- app/views/shared/_register_call.html.haml | 7 +++++++ app/views/shared/menu/_alert.html.haml | 8 +------- config/locales/en.yml | 6 ++++-- 5 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 app/views/shared/_register_call.html.haml diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass index 76dd0f4384..a0d2244c0e 100644 --- a/app/assets/stylesheets/darkswarm/footer.sass +++ b/app/assets/stylesheets/darkswarm/footer.sass @@ -30,7 +30,7 @@ footer background-color: transparent border: none padding: 0 - a.big-alert + a.alert-cta @include csstrans width: 100% border: 1px solid rgba($dark-grey, 0.35) diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index fd7f5faf4e..e3e1f44174 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -7,13 +7,7 @@ .row .small-12.medium-8.medium-offset-2.columns.text-center .alert-box - %a.big-alert{href: "http://www.openfoodnetwork.org", target: "_blank"} - %h6 - = t :alert_selling_on_ofn -   - %strong - = t :alert_start_here - %i.ofn-i_054-point-right + = render 'shared/register_call' .row .small-12.medium-4.medium-offset-2.columns.text-center %h6 diff --git a/app/views/shared/_register_call.html.haml b/app/views/shared/_register_call.html.haml new file mode 100644 index 0000000000..8c2d95ed2e --- /dev/null +++ b/app/views/shared/_register_call.html.haml @@ -0,0 +1,7 @@ +%a.alert-cta{href: registration_path, target: "_blank"} + %h6 + = t '.selling_on_ofn' +   + %strong + = t '.register' + %i.ofn-i_054-point-right diff --git a/app/views/shared/menu/_alert.html.haml b/app/views/shared/menu/_alert.html.haml index b6ee3acfb1..6512358cc3 100644 --- a/app/views/shared/menu/_alert.html.haml +++ b/app/views/shared/menu/_alert.html.haml @@ -1,10 +1,4 @@ .text-center.page-alert.fixed{ "ofn-page-alert" => true } .alert-box - %a.alert-cta{href: registration_path, target: "_blank"} - %h6 - = t 'alert_selling_on_ofn' -   - %strong - = t 'alert_start_here' - %i.ofn-i_054-point-right + = render 'shared/register_call' %a.close{ ng: { click: "close()" } } × diff --git a/config/locales/en.yml b/config/locales/en.yml index e0ff91d08d..0d4d65e88f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -118,6 +118,10 @@ en: show_closed_shops: "Show closed shops" hide_closed_shops: "Hide closed shops" show_on_map: "Show all on the map" + shared: + register_call: + selling_on_ofn: "Interested in getting on the Open Food Network?" + register: "Register here" shop: messages: login: "login" @@ -167,8 +171,6 @@ en: on_demand: On demand none: None - alert_selling_on_ofn: "Interested in selling food on the Open Food Network?" - alert_start_here: "Start here" label_shops: "Shops" label_map: "Map" label_producers: "Producers"