diff options
-rw-r--r-- | app/controllers/refinery/blog/blog_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 2 | ||||
-rw-r--r-- | app/views/refinery/blog/shared/_rss_feed.html.erb | 2 | ||||
-rw-r--r-- | config/locales/sk.yml | 2 | ||||
-rw-r--r-- | config/routes.rb | 4 | ||||
-rw-r--r-- | lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb | 2 | ||||
-rw-r--r-- | lib/refinery/blog/configuration.rb | 3 |
7 files changed, 11 insertions, 6 deletions
diff --git a/app/controllers/refinery/blog/blog_controller.rb b/app/controllers/refinery/blog/blog_controller.rb index 54a8b03..6327199 100644 --- a/app/controllers/refinery/blog/blog_controller.rb +++ b/app/controllers/refinery/blog/blog_controller.rb @@ -10,7 +10,7 @@ module Refinery protected def find_page - @page = Refinery::Page.find_by_link_url("/blog") + @page = Refinery::Page.find_by_link_url(Refinery::Blog.page_url) end end end diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index b04000b..6c9049d 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -71,7 +71,7 @@ module Refinery def tagged @tag = ActsAsTaggableOn::Tag.find(params[:tag_id]) @tag_name = @tag.name - @posts = Post.tagged_with(@tag_name).page(params[:page]) + @posts = Post.tagged_with(@tag_name).with_globalize.page(params[:page]) end protected diff --git a/app/views/refinery/blog/shared/_rss_feed.html.erb b/app/views/refinery/blog/shared/_rss_feed.html.erb index 27ddf23..20979b4 100644 --- a/app/views/refinery/blog/shared/_rss_feed.html.erb +++ b/app/views/refinery/blog/shared/_rss_feed.html.erb @@ -1,2 +1,4 @@ <h2><%= t('.title') %></h2> <%= link_to t('.subscribe'), refinery.blog_rss_feed_path, :id => "rss_feed_subscribe"%> + +<% content_for :meta, auto_discovery_link_tag(:atom, refinery.blog_rss_feed_url, :title => 'RSS Feed') -%> diff --git a/config/locales/sk.yml b/config/locales/sk.yml index db0b99e..7f37f16 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -126,7 +126,7 @@ sk: comment: komentár comments: by: 'Odoslal %{who}' - time_ago: '%{time} spáť' + time_ago: 'pred %{time}' thank_you: 'Vďaka za komentár.' thank_you_moderated: 'Ďakujeme za Váš komentár. Vaša správa čaká na schválenie a čoskoro sa objaví.' index: diff --git a/config/routes.rb b/config/routes.rb index ad8d138..f3467bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Refinery::Core::Engine.routes.draw do - namespace :blog do + namespace :blog, :path => Refinery::Blog.page_url do root :to => "posts#index" resources :posts, :only => [:show] @@ -12,7 +12,7 @@ Refinery::Core::Engine.routes.draw do namespace :blog, :path => '' do namespace :admin, :path => 'refinery' do - scope :path => 'blog' do + scope :path => Refinery::Blog.page_url do root :to => "posts#index" resources :posts do diff --git a/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb b/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb index ac340d7..294c258 100644 --- a/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb +++ b/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb @@ -8,4 +8,6 @@ Refinery::Blog.configure do |config| # config.post_teaser_length = <%= Refinery::Blog.post_teaser_length.inspect %> # config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %> + + # config.page_url = <%= Refinery::Blog.page_url.inspect %> end diff --git a/lib/refinery/blog/configuration.rb b/lib/refinery/blog/configuration.rb index 0f00501..b7598e8 100644 --- a/lib/refinery/blog/configuration.rb +++ b/lib/refinery/blog/configuration.rb @@ -3,12 +3,13 @@ module Refinery include ActiveSupport::Configurable config_accessor :validate_source_url, :comments_per_page, :posts_per_page, - :post_teaser_length, :share_this_key + :post_teaser_length, :share_this_key, :page_url self.validate_source_url = false self.comments_per_page = 10 self.posts_per_page = 10 self.post_teaser_length = 250 self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" + self.page_url = "/blog" end end |