From 93421980d48b968b825922063c2dab9e9ee8cb4c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 16 Feb 2014 19:08:29 +0100 Subject: Add refinery-banners engine. --- app/decorators/controllers/refinery/pages_controller_decorator.rb | 3 +++ app/views/refinery/banners/shared/_banner_image.html.erb | 1 + app/views/refinery/pages/home.html.erb | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 app/views/refinery/banners/shared/_banner_image.html.erb (limited to 'app') diff --git a/app/decorators/controllers/refinery/pages_controller_decorator.rb b/app/decorators/controllers/refinery/pages_controller_decorator.rb index d93ae9d..2e972e9 100644 --- a/app/decorators/controllers/refinery/pages_controller_decorator.rb +++ b/app/decorators/controllers/refinery/pages_controller_decorator.rb @@ -19,6 +19,9 @@ ApplicationController.class_eval do # find_all_blog_categories find_tags + + # Load active banners + @banners = Refinery::Banners::Banner.active end def populate_home_page diff --git a/app/views/refinery/banners/shared/_banner_image.html.erb b/app/views/refinery/banners/shared/_banner_image.html.erb new file mode 100644 index 0000000..7d0dc25 --- /dev/null +++ b/app/views/refinery/banners/shared/_banner_image.html.erb @@ -0,0 +1 @@ +<%= link_to(image_fu(banner_image.image, '500x'), banner_image.url) %> \ No newline at end of file diff --git a/app/views/refinery/pages/home.html.erb b/app/views/refinery/pages/home.html.erb index 66cd6b7..6207663 100644 --- a/app/views/refinery/pages/home.html.erb +++ b/app/views/refinery/pages/home.html.erb @@ -1,4 +1,6 @@ <% content_for :body do %> + <%= render :partial => 'refinery/banners/shared/banners' %> + <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %> <% if @posts.any? %> -- cgit v1.2.3 From ea5d5dc4fc6923a3701eb0e0b68fdf936217233c Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 16 Feb 2014 19:08:57 +0100 Subject: Fix styling for banners - Put banners in center of container - Set minimum size of page and elements to make room for banners --- app/assets/stylesheets/_color_scheme.scss | 4 +++- app/assets/stylesheets/hmno_banners.scss | 3 +++ app/assets/stylesheets/hmno_page.scss | 13 +++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 app/assets/stylesheets/hmno_banners.scss (limited to 'app') diff --git a/app/assets/stylesheets/_color_scheme.scss b/app/assets/stylesheets/_color_scheme.scss index bec9288..2b9cd79 100644 --- a/app/assets/stylesheets/_color_scheme.scss +++ b/app/assets/stylesheets/_color_scheme.scss @@ -31,4 +31,6 @@ $body-bg: black; $spacing: 10px; $sidebar-width: 200px; - +$sidebar-margin: $sidebar-width + 2 * $spacing; +$min-center-width: 500px; +$min-page-width: 2 * $sidebar-margin + $min-center-width + 4 * $spacing; diff --git a/app/assets/stylesheets/hmno_banners.scss b/app/assets/stylesheets/hmno_banners.scss new file mode 100644 index 0000000..205b7c9 --- /dev/null +++ b/app/assets/stylesheets/hmno_banners.scss @@ -0,0 +1,3 @@ +#slider { + text-align: center; +} diff --git a/app/assets/stylesheets/hmno_page.scss b/app/assets/stylesheets/hmno_page.scss index 132724b..deda694 100644 --- a/app/assets/stylesheets/hmno_page.scss +++ b/app/assets/stylesheets/hmno_page.scss @@ -2,25 +2,22 @@ #page_container { background: $bg; - - margin: { - left: 5em; - right: 5em; - } + min-width: $min-page-width; #page { position: relative; min-height: 1000px; - padding: $spacing; + padding: $spacing / 2; #body_content { + min-width: $min-center-width; margin: { left: $sidebar-width + 3 * $spacing; right: $sidebar-width + 3 * $spacing; } padding: { - left: 0.5em; - right: 0.5em; + left: $spacing / 2; + right: $spacing / 2; } } -- cgit v1.2.3 From d54d4ca358206971540241bb617dc6dacb097136 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 16 Feb 2014 19:19:18 +0100 Subject: Render banners from layout instead of modifying all views. --- app/assets/stylesheets/hmno_banners.scss | 6 ++++++ app/views/layouts/application.html.erb | 1 + app/views/refinery/pages/home.html.erb | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/hmno_banners.scss b/app/assets/stylesheets/hmno_banners.scss index 205b7c9..d01570e 100644 --- a/app/assets/stylesheets/hmno_banners.scss +++ b/app/assets/stylesheets/hmno_banners.scss @@ -1,3 +1,9 @@ +@import "color_scheme"; + #slider { + margin: { + left: $sidebar-margin; + right: $sidebar-margin; + } text-align: center; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 43e0863..6f3b70c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,6 +11,7 @@
<%= render 'common/left_sidebar' %> + <%= render :partial => 'refinery/banners/shared/banners' %> <%= yield %> <%= render 'common/right_sidebar' %>
diff --git a/app/views/refinery/pages/home.html.erb b/app/views/refinery/pages/home.html.erb index 6207663..66cd6b7 100644 --- a/app/views/refinery/pages/home.html.erb +++ b/app/views/refinery/pages/home.html.erb @@ -1,6 +1,4 @@ <% content_for :body do %> - <%= render :partial => 'refinery/banners/shared/banners' %> - <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %> <% if @posts.any? %> -- cgit v1.2.3 From 92f488d04f12324613f17f3cadde3bc131d3f457 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 16 Feb 2014 19:29:19 +0100 Subject: Display published ads instead of active. This means that ads will only be shown between their start-publishin date, and their end-publishing date. They will also only be shown on the pages where they are enabled. This allows different ads on different pages, or ads only on some pages, while others completely without ads. --- app/decorators/controllers/refinery/pages_controller_decorator.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'app') diff --git a/app/decorators/controllers/refinery/pages_controller_decorator.rb b/app/decorators/controllers/refinery/pages_controller_decorator.rb index 2e972e9..d93ae9d 100644 --- a/app/decorators/controllers/refinery/pages_controller_decorator.rb +++ b/app/decorators/controllers/refinery/pages_controller_decorator.rb @@ -19,9 +19,6 @@ ApplicationController.class_eval do # find_all_blog_categories find_tags - - # Load active banners - @banners = Refinery::Banners::Banner.active end def populate_home_page -- cgit v1.2.3