From 74f90dada367e6d42ce53471cf1e26024a4c8fa7 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 17 Jul 2015 15:56:38 +1000 Subject: [PATCH] Allow overriding mobile logo (raster and SVG) and home hero image --- app/controllers/admin/contents_controller.rb | 4 ++-- app/models/content_configuration.rb | 6 ++++++ app/models/spree/preferences/configuration_decorator.rb | 4 ---- app/views/home/index.html.haml | 4 ++++ app/views/shared/menu/_mobile_menu.html.haml | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 app/models/spree/preferences/configuration_decorator.rb diff --git a/app/controllers/admin/contents_controller.rb b/app/controllers/admin/contents_controller.rb index 02dc246930..d1c761d4ad 100644 --- a/app/controllers/admin/contents_controller.rb +++ b/app/controllers/admin/contents_controller.rb @@ -1,8 +1,8 @@ module Admin class ContentsController < Spree::Admin::BaseController def edit - @preference_sections = [{name: 'Header', preferences: [:logo]}, - {name: 'Home page', preferences: [:home_show_stats]}, + @preference_sections = [{name: 'Header', preferences: [:logo, :logo_mobile, :logo_mobile_svg]}, + {name: 'Home page', preferences: [:home_hero, :home_show_stats]}, {name: 'Producer signup page', preferences: [:producer_signup_pricing_table_html, :producer_signup_case_studies_html, :producer_signup_detail_html]}, {name: 'Hub signup page', preferences: [:hub_signup_pricing_table_html, :hub_signup_case_studies_html, :hub_signup_detail_html]}, {name: 'Group signup page', preferences: [:group_signup_pricing_table_html, :group_signup_case_studies_html, :group_signup_detail_html]}, diff --git a/app/models/content_configuration.rb b/app/models/content_configuration.rb index 0bf4c4e852..7614c207f9 100644 --- a/app/models/content_configuration.rb +++ b/app/models/content_configuration.rb @@ -4,10 +4,16 @@ class ContentConfiguration < Spree::Preferences::FileConfiguration # Header include OpenFoodNetwork::Paperclippable preference :logo, :file + preference :logo_mobile, :file + preference :logo_mobile_svg, :file has_attached_file :logo + has_attached_file :logo_mobile + has_attached_file :logo_mobile_svg # Home page preference :home_show_stats, :boolean, default: true + preference :home_hero, :file + has_attached_file :home_hero # Producer sign-up page preference :producer_signup_pricing_table_html, :text, default: "(TODO: Pricing table)" diff --git a/app/models/spree/preferences/configuration_decorator.rb b/app/models/spree/preferences/configuration_decorator.rb deleted file mode 100644 index 04a9f35f6b..0000000000 --- a/app/models/spree/preferences/configuration_decorator.rb +++ /dev/null @@ -1,4 +0,0 @@ -module Spree::Preferences - Configuration.class_eval do - end -end diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 3f284a5e37..ee4fca7b27 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,3 +1,7 @@ +:css + #tagline:before { background-image: url("#{ContentConfig.home_hero.url}") } + + %div{"ng-controller" => "HomeCtrl"} = render partial: "shared/menu/alert" diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 869785fce5..d43c95ca46 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -6,7 +6,7 @@ %section.left .ofn-logo %a{href: root_path} - %img{src: "/assets/logo-black.png", srcset: "/assets/logo-black.svg", width: "75", height: "26"} + %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"} %section.right{"ng-cloak" => true} .cart @@ -18,7 +18,7 @@ %ul.off-canvas-list %li.ofn-logo %a{href: root_path} - %img{src: "/assets/logo-black.png", srcset: "/assets/logo-black.svg", width: "75", height: "26"} + %img{src: ContentConfig.logo_mobile.url, srcset: ContentConfig.logo_mobile_svg.url, width: "75", height: "26"} %li.li-menu - if current_page? main_app.shops_path %a{"ofn-scroll-to" => "hubs"}