Merge pull request #3824 from mkllnk/aus-content-updates

Aus content updates

app/models/content_configuration.rb

@@ -12,11 +12,14 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration
   has_attached_file :logo_mobile_svg, default_url: "/assets/ofn-logo-mobile.svg"
 
   # Home page
+  preference :home_page_alert_html, :text
   preference :home_hero, :file
   preference :home_show_stats, :boolean, default: true
   has_attached_file :home_hero, default_url: "/assets/home/home.jpg"
 
   # Producer sign-up page
+  # All the following defaults using I18n don't work.
+  # https://github.com/openfoodfoundation/openfoodnetwork/issues/3816
   preference :producer_signup_pricing_table_html, :text, default: I18n.t(:content_configuration_pricing_table)
   preference :producer_signup_case_studies_html, :text, default: I18n.t(:content_configuration_case_studies)
   preference :producer_signup_detail_html, :text, default: I18n.t(:content_configuration_detail)

app/models/preference_sections/home_page_section.rb

@@ -6,6 +6,7 @@ module PreferenceSections
 
     def preferences
       [
+        :home_page_alert_html,
         :home_hero,
         :home_show_stats
       ]

app/views/shared/_connect_learn_call.html.haml

@@ -1,12 +0,0 @@
-:css
-  .page-alert .alert-box { background-color: #fdddac; }
-
-.alert-cta
-  %h6
-    Open Food Network
-    %strong
-      = link_to t(:label_connect), "https://openfoodnetwork.org/au/connect/", target: '_blank'
-    and
-    %strong
-      = link_to t(:label_learn), "https://openfoodnetwork.org/au/learn/", target: '_blank'
-    \- Go exploring and get inspired!

app/views/shared/_page_alert.html.haml

@@ -1,5 +1,6 @@
-- if feature? :connect_learn_homepage
-  = render "shared/connect_learn_call"
+- if ContentConfig.home_page_alert_html.present?
+  .alert-cta
+    %h6= raw ContentConfig.home_page_alert_html
 
 - else
   = render "shared/register_call"

config/locales/en.yml

@@ -1196,7 +1196,7 @@ en:
   menu_4_title: "Groups"
   menu_4_url: "/groups"
   menu_5_title: "About"
-  menu_5_url: "http://www.openfoodnetwork.org/"
+  menu_5_url: "https://about.openfoodnetwork.org.au/"
   menu_6_title: "Connect"
   menu_6_url: "https://openfoodnetwork.org/au/connect/"
   menu_7_title: "Learn"
@@ -1682,7 +1682,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   sell_hubs_detail: "Set up a profile for your food enterprise or organisation on the OFN. At any time you can upgrade your profile to a multi-producer shop."
   sell_groups_detail: "Set up a tailored directory of enterprises (producers and other food enterprises) for your region or for your organisation."
   sell_user_guide: "Find out more in our user guide."
-  sell_listing_price: "Listing on the OFN is free.  Opening and running a shop on OFN is free.  Setting up a group directory on OFN for your organisation or regional network is free."
+  sell_listing_price: "Listing on the OFN is free. Opening and running a shop on OFN is free up to $500 of monthly sales. If you sell more you can choose your community contribution between 1% and 3% of sales. For more detail on pricing visit the Software Platform section via the About link in the top menu."
   sell_embed: "We can also embed an OFN shop in your own customised website or build a customised local food network website for your region."
   sell_ask_services: "Ask us about OFN services."