diff --git a/core/app/views/refinery/_head.html.erb b/core/app/views/refinery/_head.html.erb index 8f3b4187f1..0d5945148d 100644 --- a/core/app/views/refinery/_head.html.erb +++ b/core/app/views/refinery/_head.html.erb @@ -3,7 +3,6 @@ <%= browser_title(yield(:title)) %> <%= raw %() if @meta.meta_description.present? -%> - <%= raw %() if @meta.meta_keywords.present? -%> <%= raw %() if @canonical.present? -%> <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%> <%= yield :meta %> diff --git a/core/lib/refinery/base_presenter.rb b/core/lib/refinery/base_presenter.rb index aa9f402ef0..42b81f0175 100644 --- a/core/lib/refinery/base_presenter.rb +++ b/core/lib/refinery/base_presenter.rb @@ -5,8 +5,7 @@ class BasePresenter :title => proc { |p| (p.model.class.name.titleize if p.model.present?) }, :path => proc { |p| p.title }, :browser_title => nil, - :meta_description => nil, - :meta_keywords => nil + :meta_description => nil } attr_reader :model diff --git a/pages/app/models/refinery/page.rb b/pages/app/models/refinery/page.rb index 52419eb1fc..2f2f973cd9 100644 --- a/pages/app/models/refinery/page.rb +++ b/pages/app/models/refinery/page.rb @@ -14,7 +14,7 @@ class Page < Core::BaseModel class Translation is_seo_meta - attr_accessible :browser_title, :meta_description, :meta_keywords, :locale + attr_accessible :browser_title, :meta_description, :locale end attr_accessible :title @@ -23,7 +23,7 @@ class Translation seo_fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten delegate(*(seo_fields << {:to => :translation})) - attr_accessible :id, :deletable, :link_url, :menu_match, :meta_keywords, + attr_accessible :id, :deletable, :link_url, :menu_match, :skip_to_first_child, :position, :show_in_menu, :draft, :parts_attributes, :browser_title, :meta_description, :parent_id, :menu_title, :page_id, :layout_template, @@ -44,7 +44,7 @@ class Translation :scope => :parent # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed - acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, + acts_as_indexed :fields => [:title, :meta_description, :menu_title, :browser_title, :all_page_part_content] has_many :parts, diff --git a/pages/spec/models/refinery/page_spec.rb b/pages/spec/models/refinery/page_spec.rb index 1eb19755d3..544a8e8398 100644 --- a/pages/spec/models/refinery/page_spec.rb +++ b/pages/spec/models/refinery/page_spec.rb @@ -326,10 +326,6 @@ def turn_on_marketable_urls context 'meta data' do context 'responds to' do - it 'meta_keywords' do - page.respond_to?(:meta_keywords) - end - it 'meta_description' do page.respond_to?(:meta_description) end @@ -340,11 +336,6 @@ def turn_on_marketable_urls end context 'allows us to assign to' do - it 'meta_keywords' do - page.meta_keywords = 'Some, great, keywords' - page.meta_keywords.should == 'Some, great, keywords' - end - it 'meta_description' do page.meta_description = 'This is my description of the page for search results.' page.meta_description.should == 'This is my description of the page for search results.' @@ -357,14 +348,6 @@ def turn_on_marketable_urls end context 'allows us to update' do - it 'meta_keywords' do - page.meta_keywords = 'Some, great, keywords' - page.save - - page.reload - page.meta_keywords.should == 'Some, great, keywords' - end - it 'meta_description' do page.meta_description = 'This is my description of the page for search results.' page.save