From fd41003fb74e75dfc3b9e266dd370270e09fa283 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Tue, 16 Jun 2015 14:47:40 +1000 Subject: [PATCH] Change all global links to www --- app/models/content_configuration.rb | 2 +- app/views/admin/shared/_user_guide_link.html.haml | 2 +- .../confirmation_instructions.html.haml | 2 +- app/views/enterprise_mailer/welcome.html.haml | 2 +- .../shared/_enterprise_type_flowchart.html.haml | 8 ++++---- app/views/shared/_footer.html.haml | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/content_configuration.rb b/app/models/content_configuration.rb index 22eb6e0d87..117e2b5e61 100644 --- a/app/models/content_configuration.rb +++ b/app/models/content_configuration.rb @@ -17,5 +17,5 @@ class ContentConfiguration < Spree::Preferences::Configuration [Calendar](/) EOS - preference :footer_about_url, :string, default: "http://global.openfoodnetwork.org/ofn-local/open-food-network-australia/" + preference :footer_about_url, :string, default: "http://www.openfoodnetwork.org/ofn-local/open-food-network-australia/" end diff --git a/app/views/admin/shared/_user_guide_link.html.haml b/app/views/admin/shared/_user_guide_link.html.haml index af83d96936..bfae6002e7 100644 --- a/app/views/admin/shared/_user_guide_link.html.haml +++ b/app/views/admin/shared/_user_guide_link.html.haml @@ -1 +1 @@ -= button_link_to "User Guide", "http://global.openfoodnetwork.org/platform/user-guide/", :icon => 'icon-external-link', :id => 'user_guide_link', target: '_blank' += button_link_to "User Guide", "http://www.openfoodnetwork.org/platform/user-guide/", :icon => 'icon-external-link', :id => 'user_guide_link', target: '_blank' diff --git a/app/views/enterprise_mailer/confirmation_instructions.html.haml b/app/views/enterprise_mailer/confirmation_instructions.html.haml index 3fe7ba09e9..3ee6e8fd12 100644 --- a/app/views/enterprise_mailer/confirmation_instructions.html.haml +++ b/app/views/enterprise_mailer/confirmation_instructions.html.haml @@ -15,7 +15,7 @@ %p After confirming your email you can access your administration account for this enterprise. See the - = link_to 'User Guide', 'http://global.openfoodnetwork.org/platform/user-guide/' + = link_to 'User Guide', 'http://www.openfoodnetwork.org/platform/user-guide/' = "to find out more about #{ Spree::Config[:site_name] }'s features and to start using your profile or online store." = render 'shared/mailers/signoff' diff --git a/app/views/enterprise_mailer/welcome.html.haml b/app/views/enterprise_mailer/welcome.html.haml index 3cd9d14034..ea939dbc6f 100644 --- a/app/views/enterprise_mailer/welcome.html.haml +++ b/app/views/enterprise_mailer/welcome.html.haml @@ -8,7 +8,7 @@ %p The User Guide with detailed support for setting up your Producer or Hub is here: - = link_to 'Open Food Network User Guide', 'http://global.openfoodnetwork.org/platform/user-guide/' + = link_to 'Open Food Network User Guide', 'http://www.openfoodnetwork.org/platform/user-guide/' %p You can manage your account by logging into the diff --git a/app/views/shared/_enterprise_type_flowchart.html.haml b/app/views/shared/_enterprise_type_flowchart.html.haml index b2da9de0ba..7fda2e0891 100644 --- a/app/views/shared/_enterprise_type_flowchart.html.haml +++ b/app/views/shared/_enterprise_type_flowchart.html.haml @@ -6,11 +6,11 @@ %br %br %p{style: "text-align: center;"} - %a{href: "http://global.openfoodnetwork.org/platform/features/"} More Features + %a{href: "http://www.openfoodnetwork.org/platform/features/"} More Features \| - %a{href: "http://global.openfoodnetwork.org/platform/user-guide/"} User Guide + %a{href: "http://www.openfoodnetwork.org/platform/user-guide/"} User Guide \| - if type == 'hubs' - %a{href: "http://global.openfoodnetwork.org/platform/user-guide/faqs/hub-faqs/"} Hub FAQs + %a{href: "http://www.openfoodnetwork.org/platform/user-guide/faqs/hub-faqs/"} Hub FAQs - elsif type == 'producers' - %a{href: "http://global.openfoodnetwork.org/platform/user-guide/faqs/producer-faqs/"} Producer FAQs + %a{href: "http://www.openfoodnetwork.org/platform/user-guide/faqs/producer-faqs/"} Producer FAQs diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 56495bdb8e..de9d9e341a 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -16,13 +16,13 @@ .small-12.medium-4.medium-offset-2.columns.text-center %h6 OFN Global %p - %a{href: "http://global.openfoodnetwork.org", target: "_blank"} Home + %a{href: "http://www.openfoodnetwork.org", target: "_blank"} Home %span | - %a{href: "http://global.openfoodnetwork.org/news/", target: "_blank"} News + %a{href: "http://www.openfoodnetwork.org/news/", target: "_blank"} News %span | - %a{href: "http://global.openfoodnetwork.org/about/history-team/", target: "_blank"} About + %a{href: "http://www.openfoodnetwork.org/about/history-team/", target: "_blank"} About %span | - %a{href: "http://global.openfoodnetwork.org/contact/", target: "_blank"} Contact + %a{href: "http://www.openfoodnetwork.org/contact/", target: "_blank"} Contact .small-12.medium-4.columns.text-center @@ -32,7 +32,7 @@ %span | %a{href: "http://community.openfoodnetwork.org", target: "_blank"} Community %span | - %a{href: "http://global.openfoodnetwork.org/platform/user-guide/", target: "_blank"} User Guide + %a{href: "http://www.openfoodnetwork.org/platform/user-guide/", target: "_blank"} User Guide .medium-2.columns.text-center / Placeholder @@ -103,7 +103,7 @@ %p %a{href: "/groups/signup"} Groups sign-up %p - %a{href: "http://global.openfoodnetwork.org/platform/food-system-partners/", target: "_blank"} Food systems partners + %a{href: "http://www.openfoodnetwork.org/platform/food-system-partners/", target: "_blank"} Food systems partners .medium-2.columns.text-center / Placeholder