Merge remote branch 'origin/master'
This commit is contained in:
commit
c67c282bc4
2 changed files with 6 additions and 6 deletions
|
@ -4,13 +4,13 @@
|
|||
<h1><%= link_to post.title, blog_post_url(post) %></h1>
|
||||
<details>
|
||||
<time datetime="<%= post.published_at.strftime('%Y-%m-%d') %>" class='posted_at'>
|
||||
<%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>.
|
||||
<%= t('blog.shared.posts.created_at', :when => post.published_at.strftime('%d %B %Y')) %>.
|
||||
</time>
|
||||
<% if (categories = post.categories).any? %>
|
||||
<aside class='filed_in'>
|
||||
<%= t('.filed_in') %>
|
||||
<%= t('filed_in', :scope => 'blog.posts.show') %>
|
||||
<% categories.each_with_index do |category, index| %>
|
||||
<%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
|
||||
<%= link_to category.title, blog_category_url(category) -%><%= ',' if index < ((categories.length) - 1) %>
|
||||
<% end %>
|
||||
</aside>
|
||||
<% end %>
|
||||
|
|
|
@ -6,8 +6,8 @@ if Rails.version < '3.0.0'
|
|||
blog.post ':id', :controller => "posts", :action => 'show'
|
||||
blog.category 'categories/:id', :controller => "categories", :action => 'show'
|
||||
blog.post_blog_comments ':id/comments', :controller => 'posts', :action => 'comment'
|
||||
|
||||
|
||||
|
||||
|
||||
## what is the rails2 syntax for this? sorry ;__;
|
||||
# get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
|
||||
end
|
||||
|
@ -45,7 +45,7 @@ else
|
|||
end
|
||||
|
||||
scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
|
||||
scope(:path => 'blog', :name_prefix => 'admin', :as => 'blog', :module => 'blog') do
|
||||
scope(:path => 'blog', :as => 'blog', :module => 'blog') do
|
||||
root :to => 'posts#index'
|
||||
resources :posts
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue