Upgrade to refinery 2.1.0

11 files changed, 265 insertions, 136 deletions

diff --git a/Gemfile b/Gemfile
index 9a8d824..950ff7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
-gem 'jquery-rails', '~> 2.0.0'
+gem 'jquery-rails', '~> 2.3.0'
 
 # To use ActiveModel has_secure_password
 gem 'bcrypt-ruby', '~> 3.0.0'
@@ -57,15 +57,17 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 # gem 'debugger'
 
 # Refinery CMS
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.1.0'
 
 # Specify additional Refinery CMS Extensions here (all optional):
-gem 'refinerycms-i18n', '~> 2.0.0'
-gem 'refinerycms-blog', '~> 2.0.0'
-gem 'refinerycms-inquiries', '~> 2.0.0'
-gem 'refinerycms-search', '~> 2.0.0'
-gem 'refinerycms-page-images', '~> 2.0.0'
+gem 'refinerycms-i18n', '~> 2.1.0'
+gem 'refinerycms-blog', '~> 2.1.0'
+gem 'refinerycms-inquiries', '~> 2.1.0'
+gem 'refinerycms-search', '~> 2.1.0'
+gem 'refinerycms-page-images', '~> 2.1.0'
 gem 'refinerycms-videojs'
-gem 'refinerycms-pc_banners', '~> 2.0.2'
+gem 'refinerycms-pc_banners',
+    :git => "https://github.com/DriesS/refinerycms-pc_banners.git",
+    :branch => "2-1-stable"
 
 gem 'piwik_analytics', '~> 1.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b468e39..dbcf943 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,12 @@
 GIT
+  remote: https://github.com/DriesS/refinerycms-pc_banners.git
+  revision: 05d5475264f0b666ef3e9ea0f29c0d3b42522d43
+  branch: 2-1-stable
+  specs:
+    refinerycms-pc_banners (2.0.2)
+      refinerycms-pages (~> 2.1.0)
+
+GIT
   remote: https://github.com/snake66/capistrano-postgresql.git
   revision: a51bd6bdcb8f14a844cacff6c18d6942adea8c23
   branch: make-sudo-optional
@@ -10,12 +18,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    actionmailer (3.2.20)
-      actionpack (= 3.2.20)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
       mail (~> 2.5.4)
-    actionpack (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -23,29 +31,29 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.20)
-      activesupport (= 3.2.20)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activeresource (3.2.20)
-      activemodel (= 3.2.20)
-      activesupport (= 3.2.20)
-    activesupport (3.2.20)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.4.1)
       rails (>= 3, < 5)
-    acts_as_indexed (0.7.8)
+    acts_as_indexed (0.8.3)
     arel (3.0.3)
     awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
-    babosa (0.3.10)
+    babosa (1.0.2)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
     capistrano (3.3.5)
@@ -73,69 +81,69 @@ GEM
       execjs
     coffee-script-source (1.6.2)
     colorize (0.7.7)
-    devise (2.0.5)
+    decorators (1.0.5)
+      railties (>= 3.0.19)
+    devise (2.2.8)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
-    dragonfly (0.9.14)
+      warden (~> 1.2.1)
+    dragonfly (0.9.15)
       multi_json (~> 1.0)
       rack
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     filters_spam (0.3)
-    friendly_id (4.0.9)
-    globalize3 (0.3.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      paper_trail (~> 2)
+    friendly_id (4.0.10.1)
+      activerecord (>= 3.0, < 4.0)
+    globalize (3.1.0)
+      activemodel (>= 3.1.0, < 4.0.0)
+      activerecord (>= 3.1.0, < 4.0.0)
     hike (1.2.3)
     i18n (0.7.0)
     journey (1.0.4)
-    jquery-rails (2.0.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.8.1)
+    jquery-rails (2.3.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.3)
     lorem (0.1.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.1)
+    multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.1)
-    orm_adapter (0.0.7)
-    paper_trail (2.7.1)
-      activerecord (~> 3.0)
-      railties (~> 3.0)
+    orm_adapter (0.5.0)
     pg (0.15.1)
     piwik_analytics (1.0.2)
       actionpack
       activesupport
       rails (>= 3.0.0)
     polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
+    rack (1.4.7)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.20)
-      actionmailer (= 3.2.20)
-      actionpack (= 3.2.20)
-      activerecord (= 3.2.20)
-      activeresource (= 3.2.20)
-      activesupport (= 3.2.20)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.20)
-    rails_autolink (1.1.0)
-      rails (> 3.1)
-    railties (3.2.20)
-      actionpack (= 3.2.20)
-      activesupport (= 3.2.20)
+      railties (= 3.2.22)
+    rails-i18n (0.7.4)
+      i18n (~> 0.5)
+    rails_autolink (1.0.9)
+      rails (~> 3.1)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -143,79 +151,82 @@ GEM
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    refinerycms (2.0.10)
-      bundler (~> 1.0)
-      refinerycms-authentication (= 2.0.10)
-      refinerycms-core (= 2.0.10)
-      refinerycms-dashboard (= 2.0.10)
-      refinerycms-images (= 2.0.10)
-      refinerycms-pages (= 2.0.10)
-      refinerycms-resources (= 2.0.10)
-    refinerycms-authentication (2.0.10)
-      devise (~> 2.0.5)
-      orm_adapter (~> 0.0.7)
-      refinerycms-core (= 2.0.10)
-    refinerycms-blog (2.0.4)
+    refinerycms (2.1.5)
+      bundler (>= 1.2.2, < 2.0)
+      refinerycms-authentication (= 2.1.5)
+      refinerycms-core (= 2.1.5)
+      refinerycms-dashboard (= 2.1.5)
+      refinerycms-images (= 2.1.5)
+      refinerycms-pages (= 2.1.5)
+      refinerycms-resources (= 2.1.5)
+    refinerycms-acts-as-indexed (1.0.0)
+      acts_as_indexed (~> 0.8.0)
+      refinerycms-core (~> 2.1.0)
+    refinerycms-authentication (2.1.5)
+      actionmailer (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+      devise (~> 2.2.3)
+      refinerycms-core (= 2.1.5)
+    refinerycms-blog (2.1.0)
       acts-as-taggable-on
       filters_spam (~> 0.2)
-      rails_autolink
-      refinerycms-core (~> 2.0.3)
-      refinerycms-settings (~> 2.0.1)
-      seo_meta (~> 1.3.0)
-    refinerycms-core (2.0.10)
-      acts_as_indexed (~> 0.7.7)
+      friendly_id (~> 4.0.4)
+      rails_autolink (~> 1.0.7)
+      refinerycms-core (~> 2.1.0)
+      refinerycms-settings (~> 2.1.0)
+      seo_meta (~> 1.4.0)
+    refinerycms-core (2.1.5)
+      actionpack (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+      activerecord (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
       awesome_nested_set (~> 2.1.3)
-      coffee-rails (~> 3.2.1)
-      friendly_id (~> 4.0.9)
-      globalize3 (~> 0.3.0)
-      jquery-rails (~> 2.0.0)
-      rails (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+      decorators (~> 1.0.0)
+      jquery-rails (~> 2.3.0)
+      railties (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0)
+      refinerycms-i18n (~> 2.1.0)
       sass-rails (~> 3.2.3)
-      truncate_html (~> 0.5.5)
-      uglifier (>= 1.0.3)
+      truncate_html (~> 0.9)
       will_paginate (~> 3.0.2)
-    refinerycms-dashboard (2.0.10)
-      refinerycms-core (= 2.0.10)
-    refinerycms-i18n (2.0.2)
-      refinerycms-core (~> 2.0.0)
-      routing-filter (>= 0.2.3)
-    refinerycms-images (2.0.10)
-      dragonfly (~> 0.9.8)
-      rack-cache (>= 0.5.3)
-      refinerycms-core (= 2.0.10)
-    refinerycms-inquiries (2.0.3)
+    refinerycms-dashboard (2.1.5)
+      refinerycms-core (= 2.1.5)
+    refinerycms-i18n (2.1.0)
+      rails-i18n (~> 0.7.3)
+      routing-filter (~> 0.3.0)
+    refinerycms-images (2.1.5)
+      dragonfly (~> 0.9.14)
+      refinerycms-core (= 2.1.5)
+    refinerycms-inquiries (2.1.0)
       filters_spam (~> 0.2)
-      refinerycms-core (~> 2.0.1)
-      refinerycms-settings (~> 2.0.1)
-    refinerycms-page-images (2.0.1)
-      refinerycms-pages (~> 2.0.0)
-    refinerycms-pages (2.0.10)
+      refinerycms-core (~> 2.1.0)
+      refinerycms-settings (~> 2.1.0)
+    refinerycms-page-images (2.1.0)
+      refinerycms-pages (~> 2.1.0)
+    refinerycms-pages (2.1.5)
       awesome_nested_set (~> 2.1.3)
       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)
-      refinerycms-core (= 2.0.10)
-    refinerycms-search (2.0.0)
-      refinerycms-core (~> 2.0.4)
-    refinerycms-settings (2.0.2)
-      refinerycms-core (~> 2.0.1)
+      friendly_id (~> 4.0.9)
+      globalize (~> 3.1.0)
+      refinerycms-core (= 2.1.5)
+      seo_meta (~> 1.4.0)
+    refinerycms-resources (2.1.5)
+      acts_as_indexed (~> 0.8.0)
+      dragonfly (~> 0.9.12)
+      refinerycms-core (= 2.1.5)
+    refinerycms-search (2.1.0)
+      refinerycms-acts-as-indexed (~> 1.0.0)
+      refinerycms-core (~> 2.1.0)
+    refinerycms-settings (2.1.1)
+      refinerycms-core (~> 2.1.1)
     refinerycms-videojs (0.5.5.1)
       dragonfly
       rack-cache
       refinerycms-core
     routing-filter (0.3.1)
       actionpack
-    sass (3.2.7)
+    sass (3.4.19)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    seo_meta (1.3.0)
+    seo_meta (1.4.0)
       railties (>= 3.0.0)
     spork (0.9.2)
     spork-testunit (0.0.8)
@@ -235,14 +246,14 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    truncate_html (0.5.5)
-    tzinfo (0.3.42)
+    truncate_html (0.9.3)
+    tzinfo (0.3.45)
     uglifier (2.0.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    warden (1.1.1)
+      json (>= 1.8.0)
+    warden (1.2.3)
       rack (>= 1.0)
-    will_paginate (3.0.4)
+    will_paginate (3.0.7)
 
 PLATFORMS
   ruby
@@ -258,18 +269,18 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rvm
   coffee-rails (~> 3.2)
-  jquery-rails (~> 2.0.0)
+  jquery-rails (~> 2.3.0)
   lorem
   pg
   piwik_analytics (~> 1.0.2)
   rails (~> 3.2)
-  refinerycms (~> 2.0.0)
-  refinerycms-blog (~> 2.0.0)
-  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 (~> 2.1.0)
+  refinerycms-blog (~> 2.1.0)
+  refinerycms-i18n (~> 2.1.0)
+  refinerycms-inquiries (~> 2.1.0)
+  refinerycms-page-images (~> 2.1.0)
+  refinerycms-pc_banners!
+  refinerycms-search (~> 2.1.0)
   refinerycms-videojs
   sass-rails (~> 3.2)
   spork
diff --git a/app/views/refinery/_header.html.erb b/app/views/refinery/_header.html.erb
index f5450fa..8b0c424 100644
--- a/app/views/refinery/_header.html.erb
+++ b/app/views/refinery/_header.html.erb
@@ -1,7 +1,4 @@
 <div id='logo'>
   <%= link_to image_tag("logo.png", :alt => "Heavymetal.no"), refinery.root_path %>
 </div>
-<%= render(:partial => "/refinery/menu", :locals => {
-             :dom_id => 'menu',
-             :css => 'menu'
-           }) %>
+<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %>
diff --git a/db/migrate/20131124113008_add_slug_to_refinery_users.refinery_authentication.rb b/db/migrate/20131124113008_add_slug_to_refinery_users.refinery_authentication.rb
new file mode 100644
index 0000000..69a3a15
--- /dev/null
+++ b/db/migrate/20131124113008_add_slug_to_refinery_users.refinery_authentication.rb
@@ -0,0 +1,8 @@
+# This migration comes from refinery_authentication (originally 20120301234455)
+class AddSlugToRefineryUsers < ActiveRecord::Migration
+  def change
+    add_column :refinery_users, :slug, :string
+    add_index :refinery_users, :slug
+
+  end
+end
diff --git a/db/migrate/20131124113021_create_blog_translations.refinery_blog.rb b/db/migrate/20131124113021_create_blog_translations.refinery_blog.rb
new file mode 100644
index 0000000..b88aa3c
--- /dev/null
+++ b/db/migrate/20131124113021_create_blog_translations.refinery_blog.rb
@@ -0,0 +1,18 @@
+# This migration comes from refinery_blog (originally 20120530102901)
+class CreateBlogTranslations < ActiveRecord::Migration
+  def up
+    Refinery::Blog::Post.create_translation_table!({
+      :body => :text,
+      :custom_teaser => :text,
+      :custom_url => :string,
+      :slug => :string,
+      :title => :string
+    }, {
+      :migrate_data => true
+    })
+  end
+
+  def down
+    Refinery::Blog::Post.drop_translation_table! :migrate_data => true
+  end
+end
diff --git a/db/migrate/20131124113022_delete_cached_slugs.refinery_blog.rb b/db/migrate/20131124113022_delete_cached_slugs.refinery_blog.rb
new file mode 100644
index 0000000..eecb0d6
--- /dev/null
+++ b/db/migrate/20131124113022_delete_cached_slugs.refinery_blog.rb
@@ -0,0 +1,7 @@
+# This migration comes from refinery_blog (originally 20120531113632)
+class DeleteCachedSlugs < ActiveRecord::Migration
+  def change
+    remove_column Refinery::Blog::Category.table_name, :cached_slug
+    remove_column Refinery::Blog::Post.table_name, :cached_slug
+  end
+end
diff --git a/db/migrate/20131124113023_create_category_translations.refinery_blog.rb b/db/migrate/20131124113023_create_category_translations.refinery_blog.rb
new file mode 100644
index 0000000..57af33f
--- /dev/null
+++ b/db/migrate/20131124113023_create_category_translations.refinery_blog.rb
@@ -0,0 +1,15 @@
+# This migration comes from refinery_blog (originally 20120601151114)
+class CreateCategoryTranslations < ActiveRecord::Migration
+  def up
+    Refinery::Blog::Category.create_translation_table!({
+      :title => :string,
+      :slug => :string
+    }, {
+      :migrate_data => true
+    })
+  end
+
+  def down
+    Refinery::Blog::Category.drop_translation_table! :migrate_data => true
+  end
+end
diff --git a/db/migrate/20131124113030_remove_image_ext_from_refinery_images.refinery_images.rb b/db/migrate/20131124113030_remove_image_ext_from_refinery_images.refinery_images.rb
new file mode 100644
index 0000000..8ec2e55
--- /dev/null
+++ b/db/migrate/20131124113030_remove_image_ext_from_refinery_images.refinery_images.rb
@@ -0,0 +1,10 @@
+# This migration comes from refinery_images (originally 20120625093918)
+class RemoveImageExtFromRefineryImages < ActiveRecord::Migration
+  def up
+    remove_column :refinery_images, :image_ext
+  end
+
+  def down
+    add_column :refinery_images, :image_ext, :string
+  end
+end
diff --git a/db/migrate/20131124113126_add_slug_to_refinery_settings.refinery_settings.rb b/db/migrate/20131124113126_add_slug_to_refinery_settings.refinery_settings.rb
new file mode 100644
index 0000000..ae7b60f
--- /dev/null
+++ b/db/migrate/20131124113126_add_slug_to_refinery_settings.refinery_settings.rb
@@ -0,0 +1,6 @@
+# This migration comes from refinery_settings (originally 20130414130143)
+class AddSlugToRefinerySettings < ActiveRecord::Migration
+  def change
+    add_column :refinery_settings, :slug, :string, :unique => true
+  end
+end
diff --git a/db/migrate/20151113210550_remove_meta_keywords_from_seo_meta.seo_meta_engine.rb b/db/migrate/20151113210550_remove_meta_keywords_from_seo_meta.seo_meta_engine.rb
new file mode 100644
index 0000000..f956379
--- /dev/null
+++ b/db/migrate/20151113210550_remove_meta_keywords_from_seo_meta.seo_meta_engine.rb
@@ -0,0 +1,29 @@
+# This migration comes from seo_meta_engine (originally 20120518234749)
+class RemoveMetaKeywordsFromSeoMeta < ActiveRecord::Migration
+  def up
+    c = ActiveRecord::Base.connection_config
+    if c[:adapter] == 'sqlite3'
+      remove_index "seo_meta", :name => "index_seo_meta_on_seo_meta_id_and_seo_meta_type"
+    end
+
+    remove_column :seo_meta, :meta_keywords
+
+    if c[:adapter] == 'sqlite3'
+      add_index "seo_meta", ["seo_meta_id", "seo_meta_type"], :name => "index_seo_meta_on_seo_meta_id_and_seo_meta_type"
+    end
+  end
+
+  def down
+    c = ActiveRecord::Base.connection_config
+    if c[:adapter] == 'sqlite3'
+      remove_index "seo_meta", :name => "index_seo_meta_on_seo_meta_id_and_seo_meta_type"
+    end
+
+    add_column :seo_meta, :meta_keywords, :string
+
+    if c[:adapter] == 'sqlite3'
+      add_index "seo_meta", ["seo_meta_id", "seo_meta_type"], :name => "index_seo_meta_on_seo_meta_id_and_seo_meta_type"
+    end
+  end
+end
+
diff --git a/db/schema.rb b/db/schema.rb
index dfb4893..1fce98c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140302204529) do
+ActiveRecord::Schema.define(:version => 20151113210550) do
 
   create_table "refinery_banners", :force => true do |t|
     t.string   "name"
@@ -39,7 +39,6 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.string   "title"
     t.datetime "created_at",                      :null => false
     t.datetime "updated_at",                      :null => false
-    t.string   "cached_slug"
     t.string   "slug"
     t.integer  "sidebar_position", :default => 0
     t.integer  "sidebar_items",    :default => 5
@@ -55,6 +54,18 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
 
   add_index "refinery_blog_categories_blog_posts", ["blog_category_id", "blog_post_id"], :name => "index_blog_categories_blog_posts_on_bc_and_bp"
 
+  create_table "refinery_blog_category_translations", :force => true do |t|
+    t.integer  "refinery_blog_category_id"
+    t.string   "locale",                    :null => false
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
+    t.string   "title"
+    t.string   "slug"
+  end
+
+  add_index "refinery_blog_category_translations", ["locale"], :name => "index_refinery_blog_category_translations_on_locale"
+  add_index "refinery_blog_category_translations", ["refinery_blog_category_id"], :name => "index_a0315945e6213bbe0610724da0ee2de681b77c31"
+
   create_table "refinery_blog_comments", :force => true do |t|
     t.integer  "blog_post_id"
     t.boolean  "spam"
@@ -68,6 +79,21 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
 
   add_index "refinery_blog_comments", ["id"], :name => "index_refinery_blog_comments_on_id"
 
+  create_table "refinery_blog_post_translations", :force => true do |t|
+    t.integer  "refinery_blog_post_id"
+    t.string   "locale",                :null => false
+    t.datetime "created_at",            :null => false
+    t.datetime "updated_at",            :null => false
+    t.text     "body"
+    t.text     "custom_teaser"
+    t.string   "custom_url"
+    t.string   "slug"
+    t.string   "title"
+  end
+
+  add_index "refinery_blog_post_translations", ["locale"], :name => "index_refinery_blog_post_translations_on_locale"
+  add_index "refinery_blog_post_translations", ["refinery_blog_post_id"], :name => "index_refinery_blog_post_translations_on_refinery_blog_post_id"
+
   create_table "refinery_blog_posts", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -76,7 +102,6 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.datetime "created_at",                      :null => false
     t.datetime "updated_at",                      :null => false
     t.integer  "user_id"
-    t.string   "cached_slug"
     t.string   "custom_url"
     t.text     "custom_teaser"
     t.string   "source_url"
@@ -118,7 +143,6 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.integer  "image_width"
     t.integer  "image_height"
     t.string   "image_uid"
-    t.string   "image_ext"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end
@@ -228,6 +252,7 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.string   "form_value_type"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
+    t.string   "slug"
   end
 
   add_index "refinery_settings", ["name"], :name => "index_refinery_settings_on_name"
@@ -255,9 +280,11 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.datetime "reset_password_sent_at"
     t.datetime "created_at",             :null => false
     t.datetime "updated_at",             :null => false
+    t.string   "slug"
   end
 
   add_index "refinery_users", ["id"], :name => "index_refinery_users_on_id"
+  add_index "refinery_users", ["slug"], :name => "index_refinery_users_on_slug"
 
   create_table "refinery_video_files", :force => true do |t|
     t.string   "file_name"
@@ -287,7 +314,6 @@ ActiveRecord::Schema.define(:version => 20140302204529) do
     t.integer  "seo_meta_id"
     t.string   "seo_meta_type"
     t.string   "browser_title"
-    t.string   "meta_keywords"
     t.text     "meta_description"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false