Permalink
Browse files

Merge remote-tracking branch 'JohnAgan/2-0-stable' into 2-0-stable

  • Loading branch information...
2 parents 7eaa7cf + a0b4913 commit cab146a48dc25578a0fc68b80faf29d094945ece @parndt parndt committed Sep 5, 2012
@@ -10,7 +10,7 @@ class BlogController < ::ApplicationController
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
View
@@ -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 @@
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
@@ -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
@@ -3,12 +3,13 @@ module Blog
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

0 comments on commit cab146a

Please sign in to comment.