refinerycms-blog 0.9.8.0.rc2 → 1.0.rc10

data/app/controllers/admin/blog/comments_controller.rb

@@ -10,13 +10,27 @@ class Admin::Blog::CommentsController < Admin::BaseController
   end
 
   def approved
-    @blog_comments = BlogComment.approved
-    render :action => 'index'
+    unless params[:id].present?
+      @blog_comments = BlogComment.approved
+      render :action => 'index'
+    else
+      @blog_comment = BlogComment.find(params[:id])
+      @blog_comment.approve!
+      flash[:notice] = t('admin.blog.comments.approved', :author => @blog_comment.name)
+      redirect_to :action => params[:return_to] || 'index'
+    end
   end
 
   def rejected
-    @blog_comments = BlogComment.rejected
-    render :action => 'index'
+    unless params[:id].present?
+      @blog_comments = BlogComment.rejected
+      render :action => 'index'
+    else
+      @blog_comment = BlogComment.find(params[:id])
+      @blog_comment.reject!
+      flash[:notice] = t('admin.blog.comments.rejected', :author => @blog_comment.name)
+      redirect_to :action => params[:return_to] || 'index'
+    end
   end
 
 end

data/app/controllers/admin/blog/settings_controller.rb

@@ -4,12 +4,19 @@ class Admin::Blog::SettingsController < Admin::BaseController
     @recipients = BlogComment::Notification.recipients
 
     if request.post?
-      BlogComment::Notification.recipients == params[:recipients]
+      BlogComment::Notification.recipients = params[:recipients]
+      flash[:notice] = t('admin.blog.settings.notification_recipients.updated',
+                         :recipients => BlogComment::Notification.recipients)
+      unless request.xhr? or from_dialog?
+        redirect_back_or_default(admin_blog_posts_path)
+      else
+        render :text => "<script type='text/javascript'>parent.window.location = '#{admin_blog_posts_path}';</script>"
+      end
     end
   end
 
   def moderation
-    enabled = BlogComment::Moderation.toggle
+    enabled = BlogComment::Moderation.toggle!
     unless request.xhr?
       redirect_back_or_default(admin_blog_posts_path)
     else

data/app/controllers/blog/categories_controller.rb

@@ -0,0 +1,7 @@
+class Blog::CategoriesController < BlogController
+
+  def show
+    @category = BlogCategory.find(params[:id])
+  end
+  
+end

data/app/controllers/blog/posts_controller.rb

@@ -0,0 +1,43 @@
+class Blog::PostsController < BlogController
+
+  before_filter :find_all_blog_posts
+  before_filter :find_blog_post, :only => [:show, :comment]
+  
+  def index
+    respond_to do |format|
+      format.html
+      format.rss
+    end
+  end
+  
+  def show
+    @blog_comment = BlogComment.new
+    present(@page)
+  end
+
+  def comment
+    if (@blog_comment = @blog_post.comments.create(params[:blog_comment])).valid?
+      if BlogComment::Moderation.enabled?
+        flash[:notice] = t('blog.posts.comments.thank_you_moderated')
+        redirect_to blog_post_url(params[:id])
+      else
+        flash[:notice] = t('blog.posts.comments.thank_you')
+        redirect_to blog_post_url(params[:id],
+                                  :anchor => "comment-#{@blog_comment.to_param}")
+      end
+    else
+      render :action => 'show'
+    end
+  end
+
+protected
+
+  def find_blog_post
+    @blog_post = BlogPost.live.find(params[:id])
+  end
+
+  def find_all_blog_posts
+    @blog_posts = BlogPost.live
+  end
+
+end

data/app/controllers/blog_controller.rb

@@ -0,0 +1,15 @@
+class BlogController < ApplicationController
+  
+  before_filter :find_page, :find_all_blog_categories
+
+protected
+
+  def find_page
+    @page = Page.find_by_link_url("/blog")
+  end
+
+  def find_all_blog_categories
+    @blog_categories = BlogCategory.all
+  end
+
+end

data/app/models/blog_comment.rb

@@ -4,7 +4,7 @@ class BlogComment < ActiveRecord::Base
                :email_field => :email,
                :message_field => :body
 
-  belongs_to :post, :class_name => 'BlogPost'
+  belongs_to :post, :class_name => 'BlogPost', :foreign_key => 'blog_post_id'
 
   acts_as_indexed :fields => [:name, :email, :message]
 
@@ -14,9 +14,35 @@ class BlogComment < ActiveRecord::Base
   validates_format_of :email,
                       :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
 
-  named_scope :unmoderated, :conditions => {:state => nil}
-  named_scope :approved, :conditions => {:state => 'approved'}
-  named_scope :rejected, :conditions => {:state => 'rejected'}
+  if Rails.version < '3.0.0'
+    named_scope :unmoderated, :conditions => {:state => nil}
+    named_scope :approved, :conditions => {:state => 'approved'}
+    named_scope :rejected, :conditions => {:state => 'rejected'}
+  else
+    scope :unmoderated, :conditions => {:state => nil}
+    scope :approved, :conditions => {:state => 'approved'}
+    scope :rejected, :conditions => {:state => 'rejected'}
+  end
+
+  def approve!
+    self.update_attribute(:state, 'approved')
+  end
+
+  def reject!
+    self.update_attribute(:state, 'rejected')
+  end
+
+  def rejected?
+    self.state == 'rejected'
+  end
+
+  def approved?
+    self.state == 'approved'
+  end
+
+  def unmoderated?
+    self.state.nil?
+  end
 
   before_create do |comment|
     unless BlogComment::Moderation.enabled?
@@ -28,14 +54,18 @@ class BlogComment < ActiveRecord::Base
     class << self
       def enabled?
         RefinerySetting.find_or_set(:comment_moderation, true, {
-          :scoping => :blog
+          :scoping => :blog,
+          :restricted => false,
+          :callback_proc_as_string => nil
         })
       end
 
-      def toggle
+      def toggle!
         RefinerySetting[:comment_moderation] = {
           :value => !self.enabled?,
-          :scoping => :blog
+          :scoping => :blog,
+          :restricted => false,
+          :callback_proc_as_string => nil
         }
       end
     end
@@ -44,17 +74,21 @@ class BlogComment < ActiveRecord::Base
   module Notification
     class << self
       def recipients
-        RefinerySetting.find_or_set(
-          :comment_notification_recipients,
-          (Role[:refinery].users.first.email rescue ''),
-          {:scoping => :blog}
-        )
+        RefinerySetting.find_or_set(:comment_notification_recipients,
+                                    (Role[:refinery].users.first.email rescue ''),
+                                    {
+                                      :scoping => :blog,
+                                      :restricted => false,
+                                      :callback_proc_as_string => nil
+                                    })
       end
 
       def recipients=(emails)
         RefinerySetting[:comment_notification_recipients] = {
           :value => emails,
-          :scoping => :blog
+          :scoping => :blog,
+          :restricted => false,
+          :callback_proc_as_string => nil
         }
       end
     end

data/app/models/blog_post.rb

@@ -12,7 +12,11 @@ class BlogPost < ActiveRecord::Base
 
   default_scope :order => "created_at DESC"
 
-  named_scope :live, :conditions => {:draft => false}
+  if Rails.version < '3.0.0'
+    named_scope :live, :conditions => {:draft => false}
+  else
+    scope :live, :conditions => {:draft => false}
+  end
 
   def category_ids=(ids)
     self.categories = ids.reject{|id| id.blank?}.collect {|c_id|
@@ -27,5 +31,22 @@ class BlogPost < ActiveRecord::Base
       })
     end
   end
+  
+  module ShareThis
+    DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+    
+    class << self
+      def key
+        RefinerySetting.find_or_set(:share_this_key, BlogPost::ShareThis::DEFAULT_KEY, {
+          :scoping => :blog
+        })
+      end
+      
+      def enabled?
+        key = BlogPost::ShareThis.key
+        key.present? and key != BlogPost::ShareThis::DEFAULT_KEY
+      end
+    end
+  end
 
 end

data/app/views/admin/blog/_submenu.html.erb

@@ -24,7 +24,12 @@
 
   <ul class='collapsible_menu'>
     <li>
-      <%= link_to t('.comments.title'), '#',
+      <% if BlogComment.unmoderated.any? %>
+        <% title = t('.comments.title_with_count', :new_count => BlogComment.unmoderated.size) %>
+      <% else %>
+        <% title = t('.comments.title') %>
+      <% end %>
+      <%= link_to title, '#',
                   :class => 'comments_icon' %>
     </li>
     <li>

data/app/views/admin/blog/categories/_category.html.erb

@@ -4,11 +4,13 @@
     <span class="preview">&nbsp;</span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_edit.png"), 
+    <%= link_to refinery_icon_tag("application_edit.png"),
                 edit_admin_blog_category_path(category, :dialog => true, :height => 325),
                 :title => t('.edit') %>
     <%= link_to refinery_icon_tag("delete.png"), admin_blog_category_path(category),
                 :class => "cancel confirm-delete",
-                :title => t('.delete') %>
+                :title => t('.delete'),
+                :'data-method' => 'delete',
+                :'data-confirm' => t('shared.admin.delete.message', :title => category.title) %>
   </span>
 </li>

data/app/views/admin/blog/categories/_form.html.erb

@@ -1,6 +1,14 @@
 <% form_for [:admin, @blog_category] do |f| -%>
-  <%= f.error_messages %>
-
+  <% if Rails.version < '3.0.0'%>
+    <%= f.error_messages %>
+  <% else %>
+    <%= render :partial => "/shared/admin/error_messages",
+               :locals => {
+                 :object => f.object,
+                 :include_object_name => true
+               } %>
+  <% end %>
+  
   <div class='field'>
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>

data/app/views/admin/blog/comments/_comment.html.erb

@@ -1,17 +1,20 @@
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(comment) -%>">
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= "comment-#{comment.to_param}" -%>">
   <span class='title'>
     <%=h comment.name %>
     <span class="preview"> - <%= truncate(comment.message, :length => 75) %></span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(comment.post,
-                                                                       :anchor => "comment-#{comment.to_param}"),
-        :title => t('.view_live'),
-        :target => "_blank" %>
-    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_blog_comment_path(comment),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), admin_blog_comment_path(comment),
-        :class => "cancel confirm-delete",
-        :title => t('.delete') %>
+    <%= link_to refinery_icon_tag("application_go.png"),
+                blog_post_url(comment.post, :anchor => "comment-#{comment.to_param}"),
+                :title => t('.view_live'),
+                :target => "_blank" unless comment.unmoderated? %>
+    <%= link_to refinery_icon_tag('zoom.png'), admin_blog_comment_path(comment),
+                :title => t('.read') %>
+    <%= link_to refinery_icon_tag("cross.png"), 
+                rejected_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                :title => t('.reject') unless comment.rejected? %>
+    <%= link_to refinery_icon_tag("tick.png"), 
+                approved_admin_blog_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
+                :title => t('.approve') unless comment.approved? %>
   </span>
 </li>

data/app/views/admin/blog/comments/index.html.erb

@@ -28,7 +28,7 @@
     <% else %>
       <h3>
         <%= t('.no_items_yet',
-              :type => (t("admin.blog.submenu.comments.#{action_name}").downcase unless action_name == 'index')) %>
+              :type => t("admin.blog.submenu.comments.#{action_name.gsub('index', 'new')}").downcase) %>
       </h3>
     <% end %>
   <% end %>

data/app/views/admin/blog/comments/show.html.erb

@@ -0,0 +1,63 @@
+<div id='actions'>
+  <h2><%= t('.details')%></h2>
+  <p>
+    <strong><%= t('.age') %>:</strong> <%= time_ago_in_words(@blog_comment.created_at) %>
+  </p>
+  <h2><%= t('.actions') %></h2>
+  <ul>
+    <li>
+      <%= link_to t('.back'), {:action => 'index'}, :class => "back_icon" %>
+    </li>
+    <li>
+      <%= link_to t('.reject'), rejected_admin_blog_comment_path(@blog_comment, :return_to => 'rejected'),
+          :class => 'comment_cross_icon' unless @blog_comment.rejected? %>
+    </li>
+    <li>
+      <%= link_to t('.approve'), approved_admin_blog_comment_path(@blog_comment, :return_to => 'approved'),
+          :class => 'comment_tick_icon' unless @blog_comment.approved? %>
+    </li>
+  </ul>
+</div>
+<div id='records'>
+  <h2><%= t('.comment') %></h2>
+  <table id='inquiry'>
+    <tr>
+      <td>
+        <strong><%= t('.blog_post') %></strong>
+      </td>
+      <td>
+        <%= link_to @blog_comment.post.title,
+                    blog_post_url(@blog_comment.post, :anchor => "comment-#{@blog_comment.to_param}"),
+                    :target => '_blank' %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <strong><%= t('.from') %></strong>
+      </td>
+      <td>
+        <%= @blog_comment.name %> [<%= mail_to @blog_comment.email, @blog_comment.email, {:title => t('.click_to_email')} %>]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <strong><%= t('.date') %></strong>
+      </td>
+      <td>
+        <%= l(Date.parse(@blog_comment.created_at.to_s), :format => :long) %>
+      </td>
+    </tr>
+    <tr>
+      <td valign='top'>
+        <strong><%= t('.message') %></strong>
+      </td>
+      <td>
+        <p style='margin-top: 0px'>
+          <%= @blog_comment.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
+        </p>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<% content_for :head, stylesheet_link_tag('refinery/refinerycms-blog') %>

data/app/views/admin/blog/posts/_form.html.erb

@@ -1,5 +1,13 @@
 <% form_for [:admin, @blog_post] do |f| -%>
-  <%= f.error_messages %>
+  <% if Rails.version < '3.0.0'%>
+    <%= f.error_messages %>
+  <% else %>
+    <%= render :partial => "/shared/admin/error_messages",
+               :locals => {
+                 :object => f.object,
+                 :include_object_name => true
+               } %>
+  <% end %>
 
   <div class='field'>
     <%= f.label :title -%>

data/app/views/admin/blog/posts/_post.html.erb

@@ -11,6 +11,8 @@
          :title => t('.edit') %>
     <%= link_to refinery_icon_tag("delete.png"), admin_blog_post_path(post),
         :class => "cancel confirm-delete",
-        :title => t('.delete') %>
+        :title => t('.delete'),
+        :'data-method' => 'delete',
+        :'data-confirm' => t('shared.admin.delete.message', :title => post.title) %>
   </span>
 </li>

data/app/views/blog/categories/show.html.erb

@@ -0,0 +1,20 @@
+<% content_for :body_content_title, @category.title %>
+
+<% content_for :body_content_left do %>
+  <% if @category.posts.any? %>
+  <ul id="blog_posts">
+    <%= render :partial => "/blog/shared/post", :collection => @category.posts %>
+  </ul>
+  <% else %>
+    <p>
+      <%= t('.no_posts') %>
+    </p>
+  <% end %>
+<% end %>
+
+<% content_for :body_content_right do %>
+  <%= render :partial => "/blog/shared/categories" %>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>
+<% content_for :head, stylesheet_link_tag('refinerycms-blog') %>