beef-articles 0.4.7 → 0.4.8

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/app/controllers/admin/articles_controller.rb

@@ -85,7 +85,7 @@ class Admin::ArticlesController < Admin::BaseController
   end
   
   def preview
-    preview_params = params[:news_article]
+    preview_params = params[:article]
     article = Article.find_by_id(params[:id])
     preview_params.reverse_merge!(article.attributes) if article
     session[:article_preview] = preview_params

data/app/views/articles/_article.html.erb

@@ -5,10 +5,7 @@
 <dd>
   <%= "#{link_to(image_tag(article.assets.images.first.public_filename(:thumb)), article)}" unless article.assets.images.first.nil? %>
   <p class="description"><%=h truncate(article.description, :length => 250) %> <%= link_to "(more)", article_path(article) %></p>
-  <% if article.allow_comments %>
-    <p><%= article.comments.count %> <%= link_to 'Leave a comment', article_path(article, :anchor => 'respond') %></p>
-  <% end %>    
-    
-    <%= render :partial => 'meta', :locals => {:article => article } %>
+
+  <%= render :partial => 'meta', :locals => {:article => article } %>
 </dd>
 <!-- eo:post -->

data/app/views/articles/_meta.html.erb

@@ -1,3 +1,7 @@
 <p class="post-meta">
-    Posted by <%= article.author %> on <%= article.published_at.to_formatted_s(:short_dot) %> by <%= link_to article.author, articles_authored_path(article.updated_by.permalink) %> 
+  <% if article.comments.any? or article.allow_comments? %>
+    <span class="comment"><%= pluralize( article.comments.count, 'Comment' )%></span> |
+    <%= link_to 'Leave a comment', article_path(article, :anchor => 'respond') %> |
+  <% end -%>
+  Posted by <%= article.author %> on <span class="date"><%= article.published_at.to_formatted_s(:short_dot) %></span>
 </p>

data/app/views/articles/show.html.erb

@@ -2,24 +2,16 @@
   <%= auto_discovery_link_tag :rss, articles_path(:rss) %>
 <% end %>
 
-<div id="supporting-content">
-    <h2>Archive</h2>
-      <%= archive %>
-      
-    <%= related_articles(@article) %>
-</div>
-
-
 <div id="main-content">
   <h1><%=h @article.title %></h1>
-  <%= @article.body %>
-  
   <%= render :partial => 'meta', :locals => {:article => @article } %>
-  
-  <%= gallery @images %>
 
-  <%= documents @documents %>
-  
+  <%= @article.body %>
+
+  <%= gallery @article.assets %>
+
+  <%= documents @article.assets %>
+
   <h4 id="share-title" title="Share This Article">Share This</h4>
   <p class="share-links">
     <%= mail_link @article %> <%= digg_link @article %> <%= delicious_link @article %> <%= facebook_link @article %> <%= stumble_link @article %> <%= twitter_link @article %> <%= reddit_link @article %> <%= technorati_link @article %>
@@ -28,7 +20,7 @@
 <% if @article.allow_comments? or @article.comments.any? -%>
   <div id="comments">
     <h2>Comments</h2>
-    
+
 <% if @article.comments.empty? -%>
     <p class="no-comments">There are currently no comments.</p>
 <% else -%>
@@ -44,3 +36,13 @@
 
 </div><!-- eo:main-content -->
 
+<div id="supporting-content">
+  <h2>Archive</h2>
+  <%= archive %>
+
+  <%= related_articles(@article) %>
+</div>
+
+
+
+

data/beef-articles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-articles}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-02-24}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -64,8 +64,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Article/Blogging engine}
   s.test_files = [
     "test/articles_test.rb",
-     "test/test_helper.rb",
-     "test/schema.rb"
+     "test/schema.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +00:00
+date: 2010-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,5 +112,5 @@ specification_version: 3
 summary: Article/Blogging engine
 test_files: 
 - test/articles_test.rb
-- test/test_helper.rb
 - test/schema.rb
+- test/test_helper.rb