From bf435a8f3df9d66bfdce89318bd5e1cf0e84fbee Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 6 May 2015 15:17:28 +1000
Subject: [PATCH] Make home page what's happening text and about URL
 configurable

---
 app/controllers/admin/contents_controller.rb |  2 +-
 app/models/content_configuration.rb          |  3 +++
 app/views/home/_stats.html.haml              |  2 +-
 app/views/shared/_footer.html.haml           |  3 +--
 app/views/shared/menu/_large_menu.html.haml  |  9 ++++-----
 app/views/shared/menu/_mobile_menu.html.haml | 13 ++++++-------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/contents_controller.rb b/app/controllers/admin/contents_controller.rb
index da7ad76a5e..8e46bed7c9 100644
--- a/app/controllers/admin/contents_controller.rb
+++ b/app/controllers/admin/contents_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class ContentsController < Spree::Admin::BaseController
     def edit
-      @preferences = [:home_tagline_cta]
+      @preferences = [:home_tagline_cta, :home_whats_happening, :footer_about_url]
     end
 
     def update
diff --git a/app/models/content_configuration.rb b/app/models/content_configuration.rb
index 635e819a62..41f958abf8 100644
--- a/app/models/content_configuration.rb
+++ b/app/models/content_configuration.rb
@@ -1,3 +1,6 @@
 class ContentConfiguration < Spree::Preferences::Configuration
   preference :home_tagline_cta, :string, default: "Browse Open Food Network Australia"
+  preference :home_whats_happening, :string, default: "Thanks for making the Open Food Network possible. Our vision is a better food system, and we're proud of what we're achieving together."
+
+  preference :footer_about_url, :string, default: "http://global.openfoodnetwork.org/ofn-local/open-food-network-australia/"
 end
diff --git a/app/views/home/_stats.html.haml b/app/views/home/_stats.html.haml
index 135a28dfa3..ce49fcabfd 100644
--- a/app/views/home/_stats.html.haml
+++ b/app/views/home/_stats.html.haml
@@ -2,7 +2,7 @@
   .row
     .small-12.medium-8.medium-offset-2.columns.text-center
       %h3 What's happening on OFN Australia?
-      %p.text-big Thanks for making the Open Food Network possible. Our vision is a better food system, and we're proud of what we're achieving together.
+      %p.text-big= ContentConfig.home_whats_happening
       %br
       %br
       -# .stat1
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index fe8ca36284..b73d5d8783 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -85,8 +85,7 @@
         %p
           %a{href: "/groups"} Groups
         %p
-          // Needs to link to correct About page as per menu
-          %a{href: "/about"} About
+          %a{href: ContentConfig.footer_about_url} About
 
       .small-12.medium-2.columns.text-left
         %h4 Join us
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index ee7cbef2c9..e95e51967f 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -2,9 +2,9 @@
   %section.top-bar-section
     %ul.left{}
       %li.ofn-logo
-        %a{href: root_path} 
+        %a{href: root_path}
           %img{src: "/assets/logo-white.png", srcset: "/assets/logo-white.svg", width: "75", height: "26"}
-      %li.divider 
+      %li.divider
       %li
         %a{href: main_app.shops_path}
           %span.nav-primary Shops
@@ -22,8 +22,7 @@
           %span.nav-primary Groups
       %li.divider
       %li
-        // TODO: Rohan - About path is content manageable:
-        %a{href: main_app.groups_path}
+        %a{href: ContentConfig.footer_about_url}
           %span.nav-primary About
       %li.divider
   %section.top-bar-section
@@ -36,7 +35,7 @@
       %li.divider
       %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true}
         %a{href: main_app.shop_path}
-          %em Shopping &#64; 
+          %em Shopping &#64;
           %span.nav-primary.nav-branded {{ CurrentHub.hub.name }}
       %li.divider
       %li.cart{"ng-cloak" => true}
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index 38b14ac802..662af2addd 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -15,28 +15,27 @@
         %img{src: "/assets/logo-white.png", srcset: "/assets/logo-white.svg", width: "75", height: "26"}
     %li.li-menu
       %a{href: main_app.shops_path}
-        %span.nav-primary 
+        %span.nav-primary
           %i.ofn-i_019-map-pin
           Shops
     %li.li-menu
       %a{href: main_app.map_path}
-        %span.nav-primary 
+        %span.nav-primary
           %i.ofn-i_037-map
           Map
     %li.li-menu
       %a{href: main_app.producers_path}
-        %span.nav-primary 
+        %span.nav-primary
           %i.ofn-i_036-producers
           Producers
     %li.li-menu
       %a{href: main_app.groups_path}
-        %span.nav-primary 
+        %span.nav-primary
           %i.ofn-i_035-groups
           Groups
     %li.li-menu
-      %a{href: main_app.groups_path}
-        // TODO: Rohan - About path is content manageable:
-        %span.nav-primary 
+      %a{href: ContentConfig.footer_about_url}
+        %span.nav-primary
           %i.ofn-i_013-help
           About