diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2014-02-16 19:34:48 +0100 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2014-02-16 19:34:48 +0100 |
commit | 0416924f0efee7680551aac4c222e4d22cf6d3bb (patch) | |
tree | 1c3ca2a21740a6cd8145bbd42c11b082e59cc5ad | |
parent | 136a680e868621f28b7f4e2e5c165c9c668b1f9d (diff) | |
parent | 92f488d04f12324613f17f3cadde3bc131d3f457 (diff) | |
download | hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.tar.gz hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.tar.bz2 hmnoweb-0416924f0efee7680551aac4c222e4d22cf6d3bb.zip |
Merge branch 'banner-ads'
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/_color_scheme.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/hmno_banners.scss | 9 | ||||
-rw-r--r-- | app/assets/stylesheets/hmno_page.scss | 13 | ||||
-rw-r--r-- | app/views/layouts/application.html.erb | 1 | ||||
-rw-r--r-- | app/views/refinery/banners/shared/_banner_image.html.erb | 1 | ||||
-rw-r--r-- | db/migrate/20140216165731_create_banners_banners.refinery_banners.rb | 35 | ||||
-rw-r--r-- | db/migrate/20140216165732_create_banners_banners_pages.refinery_banners.rb | 16 | ||||
-rw-r--r-- | db/schema.rb | 24 | ||||
-rw-r--r-- | db/seeds.rb | 2 | ||||
-rw-r--r-- | vagrant/bootstrap.sh | 2 |
12 files changed, 101 insertions, 11 deletions
@@ -57,3 +57,5 @@ gem 'refinerycms-inquiries', '~> 2.0.0' gem 'refinerycms-search', '~> 2.0.0' gem 'refinerycms-page-images', '~> 2.0.0' gem 'refinerycms-videojs' +gem 'refinerycms-pc_banners', '~> 2.0.2' + diff --git a/Gemfile.lock b/Gemfile.lock index 13c4dfe..cdb99be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,6 +175,8 @@ GEM babosa (!= 0.3.6) refinerycms-core (= 2.0.10) seo_meta (~> 1.3.0) + refinerycms-pc_banners (2.0.2) + refinerycms-pages (~> 2.0.1) refinerycms-resources (2.0.10) dragonfly (~> 0.9.8) rack-cache (>= 0.5.3) @@ -238,6 +240,7 @@ DEPENDENCIES refinerycms-i18n (~> 2.0.0) refinerycms-inquiries (~> 2.0.0) refinerycms-page-images (~> 2.0.0) + refinerycms-pc_banners (~> 2.0.2) refinerycms-search (~> 2.0.0) refinerycms-videojs rvm-capistrano 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..d01570e --- /dev/null +++ b/app/assets/stylesheets/hmno_banners.scss @@ -0,0 +1,9 @@ +@import "color_scheme"; + +#slider { + margin: { + left: $sidebar-margin; + right: $sidebar-margin; + } + 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; } } 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 @@ </header> <section id="page"> <%= render 'common/left_sidebar' %> + <%= render :partial => 'refinery/banners/shared/banners' %> <%= yield %> <%= render 'common/right_sidebar' %> </section> 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/db/migrate/20140216165731_create_banners_banners.refinery_banners.rb b/db/migrate/20140216165731_create_banners_banners.refinery_banners.rb new file mode 100644 index 0000000..d2d1968 --- /dev/null +++ b/db/migrate/20140216165731_create_banners_banners.refinery_banners.rb @@ -0,0 +1,35 @@ +# This migration comes from refinery_banners (originally 1) +class CreateBannersBanners < ActiveRecord::Migration + + def up + create_table :refinery_banners do |t| + t.string :name + t.string :title + t.string :description + t.integer :image_id + t.string :url + t.boolean :is_active + t.date :start_date + t.date :expiry_date + t.integer :position + t.integer :position + + t.timestamps + end + + end + + def down + if defined?(::Refinery::UserPlugin) + ::Refinery::UserPlugin.destroy_all({:name => "refinerycms-banners"}) + end + + if defined?(::Refinery::Page) + ::Refinery::Page.delete_all({:link_url => "/banners/banners"}) + end + + drop_table :refinery_banners + + end + +end diff --git a/db/migrate/20140216165732_create_banners_banners_pages.refinery_banners.rb b/db/migrate/20140216165732_create_banners_banners_pages.refinery_banners.rb new file mode 100644 index 0000000..175e593 --- /dev/null +++ b/db/migrate/20140216165732_create_banners_banners_pages.refinery_banners.rb @@ -0,0 +1,16 @@ +# This migration comes from refinery_banners (originally 2) +class CreateBannersBannersPages < ActiveRecord::Migration
+ def self.up
+ create_table :refinery_banners_pages, :id => false do |t|
+ t.integer :page_id
+ t.integer :banner_id
+ end
+
+ add_index :refinery_banners_pages, :page_id
+ add_index :refinery_banners_pages, :banner_id
+ end
+
+ def self.down
+ drop_table :refinery_banners_pages
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb index 7ef62f9..94a7af9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,29 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20131223174901) do +ActiveRecord::Schema.define(:version => 20140216165732) do + + create_table "refinery_banners", :force => true do |t| + t.string "name" + t.string "title" + t.string "description" + t.integer "image_id" + t.string "url" + t.boolean "is_active" + t.date "start_date" + t.date "expiry_date" + t.integer "position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "refinery_banners_pages", :id => false, :force => true do |t| + t.integer "page_id" + t.integer "banner_id" + end + + add_index "refinery_banners_pages", ["banner_id"], :name => "index_refinery_banners_pages_on_banner_id" + add_index "refinery_banners_pages", ["page_id"], :name => "index_refinery_banners_pages_on_page_id" create_table "refinery_blog_categories", :force => true do |t| t.string "title" diff --git a/db/seeds.rb b/db/seeds.rb index 8364d2f..7391f95 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -17,3 +17,5 @@ Refinery::Inquiries::Engine.load_seed # Added by Refinery CMS Search engine Refinery::Search::Engine.load_seed + +Refinery::Banners::Engine.load_seed diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 14c42f3..7395aa7 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash pacman -Suyq --noconfirm -pacman -Sq ruby gcc make sqlite3 nodejs --noconfirm +pacman -Sq ruby gcc make sqlite3 nodejs imagemagick --noconfirm echo "export GEM_HOME=`gem env gemdir`" > /etc/profile.d/rubygems.sh source /etc/profile.d/rubygems.sh gem install bundler --no-rdoc --no-ri --no-user-install |