diff options
| author | Joe Sak <joe@joesak.com> | 2011-02-24 22:29:41 -0600 |
|---|---|---|
| committer | Joe Sak <joe@joesak.com> | 2011-02-24 22:29:41 -0600 |
| commit | c9c38df5ba94fa6dfa6f04cffd24a96e9e5d88ca (patch) | |
| tree | f90583adf8ac3b7b323a796dc3182fa3c926620d /app/views/blog | |
| parent | e218c8fc5bb5084d50b0be4b01dc83ca51decca0 (diff) | |
| parent | 2b322a7bf4f64e1c019eff163d90b9cbf52ee501 (diff) | |
| download | refinerycms-blog-c9c38df5ba94fa6dfa6f04cffd24a96e9e5d88ca.tar.gz refinerycms-blog-c9c38df5ba94fa6dfa6f04cffd24a96e9e5d88ca.tar.bz2 refinerycms-blog-c9c38df5ba94fa6dfa6f04cffd24a96e9e5d88ca.zip | |
Closes GH-44. Authors are now associated with blog posts by current_user Merge branch 'addingusers'
Conflicts:
app/models/blog_post.rb
Diffstat (limited to 'app/views/blog')
| -rw-r--r-- | app/views/blog/posts/_post.html.erb | 2 | ||||
| -rw-r--r-- | app/views/blog/shared/_post.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb index 6a16631..d1c204e 100644 --- a/app/views/blog/posts/_post.html.erb +++ b/app/views/blog/posts/_post.html.erb @@ -9,7 +9,7 @@ <details> <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'> <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>. - </time> + </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %> <% if (categories = @blog_post.categories).any? %> <aside class='filed_in'> <%= t('blog.posts.show.filed_in') %> diff --git a/app/views/blog/shared/_post.html.erb b/app/views/blog/shared/_post.html.erb index 2bc71e0..345081a 100644 --- a/app/views/blog/shared/_post.html.erb +++ b/app/views/blog/shared/_post.html.erb @@ -5,7 +5,7 @@ <details> <time datetime="<%=l post.published_at.to_date, :format => :default %>" class='posted_at'> <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>. - </time> + </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %> <% if (categories = post.categories).any? %> <aside class='filed_in'> <%= t('filed_in', :scope => 'blog.posts.show') %> |