3 files changed, 95 insertions, 6 deletions

diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb
index bd5dd49..e8ffed2 100644
--- a/app/controllers/admin/blog/posts_controller.rb
+++ b/app/controllers/admin/blog/posts_controller.rb
@@ -3,6 +3,59 @@ class Admin::Blog::PostsController < Admin::BaseController
   crudify :blog_post,
           :title_attribute => :title,
           :order => 'published_at DESC'
+          
+  def uncategorized
+    @blog_posts = BlogPost.uncategorized.paginate({
+      :page => params[:page],
+      :per_page => BlogPost.per_page
+    })
+  end
+  
+  def create
+    # if the position field exists, set this object as last object, given the conditions of this class.
+    if BlogPost.column_names.include?("position")
+      params[:blog_post].merge!({
+        :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
+      })
+    end
+    
+    if BlogPost.column_names.include?("user_id")
+      params[:blog_post].merge!({
+        :user_id => current_user.id
+      })
+    end
+
+    if (@blog_post = BlogPost.create(params[:blog_post])).valid?
+      (request.xhr? ? flash.now : flash).notice = t(
+        'refinery.crudify.created',
+        :what => "'#{@blog_post.title}'"
+      )
+
+      unless from_dialog?
+        unless params[:continue_editing] =~ /true|on|1/
+          redirect_back_or_default(admin_blog_posts_url)
+        else
+          unless request.xhr?
+            redirect_to :back
+          else
+            render :partial => "/shared/message"
+          end
+        end
+      else
+        render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
+      end
+    else
+      unless request.xhr?
+        render :action => 'new'
+      else
+        render :partial => "/shared/admin/error_messages",
+               :locals => {
+                 :object => @blog_post,
+                 :include_object_name => true
+               }
+      end
+    end
+  end
 
   before_filter :find_all_categories,
                 :only => [:new, :edit, :create, :update]
diff --git a/app/controllers/admin/blog/settings_controller.rb b/app/controllers/admin/blog/settings_controller.rb
index cc9261b..a805d9c 100644
--- a/app/controllers/admin/blog/settings_controller.rb
+++ b/app/controllers/admin/blog/settings_controller.rb
@@ -10,7 +10,8 @@ class Admin::Blog::SettingsController < Admin::BaseController
       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>"
+        render :text => "<script type='text/javascript'>parent.window.location = '#{admin_blog_posts_path}';</script>",
+               :layout => false
       end
     end
   end
@@ -20,7 +21,18 @@ class Admin::Blog::SettingsController < Admin::BaseController
     unless request.xhr?
       redirect_back_or_default(admin_blog_posts_path)
     else
-      render :json => {:enabled => enabled}
+      render :json => {:enabled => enabled},
+             :layout => false
+    end
+  end
+
+  def comments
+    enabled = BlogComment.toggle!
+    unless request.xhr?
+      redirect_back_or_default(admin_blog_posts_path)
+    else
+      render :json => {:enabled => enabled},
+             :layout => false
     end
   end
 
diff --git a/app/controllers/blog/posts_controller.rb b/app/controllers/blog/posts_controller.rb
index f7b6f3c..9c413ed 100644
--- a/app/controllers/blog/posts_controller.rb
+++ b/app/controllers/blog/posts_controller.rb
@@ -2,6 +2,7 @@ class Blog::PostsController < BlogController
 
   before_filter :find_all_blog_posts, :except => [:archive]
   before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
+  before_filter :find_tags
 
   respond_to :html, :js, :rss
 
@@ -45,13 +46,32 @@ class Blog::PostsController < BlogController
   end
 
   def archive
-    date = "#{params[:month]}/#{params[:year]}"
-    @archive_date = Time.parse(date)
-    @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
+    if params[:month].present?
+      date = "#{params[:month]}/#{params[:year]}"
+      @archive_date = Time.parse(date)
+      @date_title = @archive_date.strftime('%B %Y')
+      @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    else
+      date = "01/#{params[:year]}"
+      @archive_date = Time.parse(date)
+      @date_title = @archive_date.strftime('%Y')
+      @blog_posts = BlogPost.live.by_year(@archive_date).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    end
+    respond_with (@blog_posts)
+  end
+  
+  def tagged
+    @tag_name = params[:tag_name]
+    @blog_posts = BlogPost.tagged_with(@tag_name.titleize).paginate({
       :page => params[:page],
       :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
     })
-    respond_with (@blog_posts)
   end
 
 protected
@@ -72,5 +92,9 @@ protected
       :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
     })
   end
+  
+  def find_tags
+    @tags = BlogPost.tag_counts_on(:tags)
+  end
 
 end