tb_blog 1.1.3 → 1.2.0

data/app/controllers/admin/news_posts_controller.rb

@@ -1,69 +0,0 @@
-class Admin::NewsPostsController < Admin::ApplicationController
-
-	respond_to :html, :xml, :json
-	before_filter :find_post, :only => [:show, :edit, :update, :destroy]
-	add_breadcrumb 'News Posts', :admin_news_posts_path
-	belongs_to_spud_app :news_posts
-
-	def index
-		@posts = SpudPost.where(:is_news => true).order('published_at desc').includes(:author).paginate(:page => params[:page], :per_page => 15)
-		respond_with @posts
-	end
-
-	def edit
-		@categories = SpudPostCategory.ordered
-		respond_with @post
-	end
-
-	def update
-		@categories = SpudPostCategory.ordered
-		params[:spud_post][:spud_site_ids] ||= []
-		if @post.update_attributes(post_params)
-	    flash[:notice] = 'News Post was successfully updated.'
-		end
-    respond_with @post, :location => admin_news_posts_path
-	end
-
-	def new
-		@categories = SpudPostCategory.ordered
-		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :is_news => true, :comments_enabled => false, :spud_site_ids => [current_site_id])
-		respond_with @post
-	end
-
-	def create
-		@categories = SpudPostCategory.ordered
-		params[:spud_post][:spud_site_ids] ||= []
-		@post = SpudPost.new(post_params)
-		@post.is_news = true
-		if @post.save
-    	flash[:notice] = 'News Post was successfully created.'
-		end
-    respond_with @post, :location => admin_news_posts_path
-	end
-
-	def destroy
-		if @post.destroy
-	    flash[:notice] = 'News Post was successfully deleted.'
-		end
-    respond_with @post, :location => admin_news_posts_path
-	end
-
-private
-
-	def find_post
-		@post = SpudPost.find(params[:id])
-		if @post.blank?
-			flash[:error] = 'News Post not found!'
-			redirect_to admin_news_posts_path and return false
-		end
-	end
-
-	def post_params
-		permitted = [:published_at, :title, :content, :spud_user_id, :url_name, :visible, :comments_enabled, :meta_keywords, :meta_description, :content_format, :category_ids => [], :spud_site_ids => []]
-		if Spud::Blog.permitted_attributes.present?
-			permitted = permitted + Spud::Blog.permitted_attributes
-		end
-		params.require(:spud_post).permit(permitted)
-	end
-
-end

data/app/controllers/blog/sitemaps_controller.rb

@@ -1,10 +0,0 @@
-class Blog::SitemapsController < Spud::ApplicationController
-	
-  respond_to :xml
-	
-  def show
-		@posts = SpudPost.visible.ordered.all
-		respond_with @pages
-  end
-
-end

data/app/controllers/blog_controller.rb

@@ -1,129 +0,0 @@
-class BlogController < ApplicationController
-
-	respond_to :html, :xml, :json, :rss
-	layout Spud::Blog.base_layout
-
-  before_filter :find_post, :only => [:show, :create_comment]
-
-  def index
-    @posts = SpudPost.for_user(current_user).visible.blog_posts.ordered.paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
-    if Spud::Core.config.multisite_mode_enabled
-      @posts = @posts.for_spud_site(current_site_id)
-    end
-    respond_with @posts
-  end
-
-  # The sole purpose of this action is to redirect from a POST to an seo-friendly url
-  def filter
-    if !params[:category_url_name].blank? && !params[:archive_date].blank?
-      redirect_to blog_category_archive_path(params[:category_url_name], params[:archive_date])
-    elsif !params[:category_url_name].blank?
-      redirect_to blog_category_path(params[:category_url_name])
-    elsif !params[:archive_date].blank?
-      redirect_to blog_archive_path(params[:archive_date])
-    else
-      redirect_to blog_path
-    end
-  end
-
-  def category
-    page = 1
-    if params[:page].blank? == false
-      page = params[:page].to_i
-      if page.to_s != params[:page].to_s
-        if(page > 1)
-          redirect_to blog_category_path(:page => page),:status => :moved_permanently and return
-        else
-          redirect_to blog_category_path(:page => nil),:status => :moved_permanently and return
-        end
-      end
-    end
-
-    if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      if Spud::Core.config.multisite_mode_enabled
-        @posts = @post_category.posts.for_user(current_user).visible.blog_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
-      else
-        @posts = @post_category.posts.for_user(current_user).visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
-      end
-    else
-      redirect_to blog_path
-      return
-    end
-    respond_with @posts do |format|
-      format.html { render 'index' }
-    end
-  end
-
-  def archive
-    if Spud::Core.config.multisite_mode_enabled
-      @posts = SpudPost.for_user(current_user).visible.blog_posts.from_archive(params[:archive_date]).for_spud_site(current_site_id).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
-    else
-      @posts = SpudPost.for_user(current_user).visible.blog_posts.from_archive(params[:archive_date]).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
-    end
-    respond_with @posts do |format|
-      format.html { render 'index' }
-    end
-  end
-
-  def show
-    if @post.comments_enabled
-      @comment = SpudPostComment.new()
-    end
-  	respond_with @post
-  end
-
-  def create_comment
-    unless params[:comment_validation].blank? # trap spam bots
-      render :nothing => true
-      return
-    end
-    @comment = @post.comments.new(comment_params)
-    @comment.user_agent = request.env["HTTP_USER_AGENT"]
-    @comment.user_ip = request.remote_ip
-    @comment.referrer = request.referrer
-    @comment.approved = Spud::Blog.default_comment_approval
-    @comment.permalink = blog_post_url(@post.url_name)
-    if @comment.save
-      if @comment.approved?
-        flash[:notice] = 'Your comment has been posted.'
-      else
-        flash[:notice] = 'Your comment has been saved and will appear after being reviewed by an administrator.'
-      end
-      @comment = SpudPostComment.new()
-    end
-    respond_with @comment do |format|
-    	format.html { 
-        render 'show'
-      }
-    end
-  end
-
-  private
-
-  def find_post
-    @post = SpudPost.for_user(current_user).where(:url_name => params[:id]).first
-		if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
-			raise Spud::NotFoundError.new(:item => 'post')
-		end
-  end
-
-  def comment_params
-    params.require(:spud_post_comment).permit(:author, :content)
-  end
-
-  def get_page_number
-    page = 1
-    if params[:page].blank? == false
-      page = params[:page].to_i
-      if page.to_s != params[:page].to_s
-        if(page > 1)
-          redirect_to blog_path(:page => page), :status => :moved_permanently and return
-        else
-          redirect_to blog_path(:page => nil), :status => :moved_permanently and return
-        end
-      end
-    end
-    return page
-  end
-
-end

data/app/controllers/news_controller.rb

@@ -1,69 +0,0 @@
-class NewsController < ApplicationController
-
-	respond_to :html, :xml, :json, :rss
-	layout Spud::Blog.news_layout
-
-  before_filter :find_post, :only => [:show]
-
-  def index
-    @posts = SpudPost.for_user(current_user).visible.news_posts.ordered.paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
-    if Spud::Core.config.multisite_mode_enabled
-      @posts = @posts.for_spud_site(current_site_id)
-    end
-    respond_with @posts
-  end
-
-  # The sole purpose of this action is to redirect from a POST to an seo-friendly url
-  def filter
-    if !params[:category_url_name].blank? && !params[:archive_date].blank?
-      redirect_to news_category_archive_path(params[:category_url_name], params[:archive_date])
-    elsif !params[:category_url_name].blank?
-      redirect_to news_category_path(params[:category_url_name])
-    elsif !params[:archive_date].blank?
-      redirect_to news_archive_path(params[:archive_date])
-    else
-      redirect_to news_path
-    end
-  end
-
-  def category
-    if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      if Spud::Core.config.multisite_mode_enabled
-        @posts = @post_category.posts.for_user(current_user).visible.news_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
-      else
-        @posts = @post_category.posts.for_user(current_user).visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
-      end
-    else
-      redirect_to news_path
-      return
-    end
-    respond_with @posts do |format|
-      format.html { render 'index' }
-    end
-  end
-
-  def archive
-    if Spud::Core.config.multisite_mode_enabled
-      @posts = SpudPost.for_user(current_user).visible.news_posts.for_spud_site(current_site_id).from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
-    else
-      @posts = SpudPost.for_user(current_user).visible.news_posts.from_archive(params[:archive_date]).paginate(:page => params[:page], :per_page => Spud::Blog.config.posts_per_page)
-    end
-    respond_with @posts do |format|
-      format.html { render 'index' }
-    end
-  end
-
-  def show
-		respond_with @post
-  end
-
-private
-
-  def find_post
-    @post = SpudPost.for_user(current_user).where(:url_name => params[:id]).first
-    if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
-      raise Spud::NotFoundError.new(:item => 'post')
-    end
-  end
-
-end

data/app/views/admin/news_posts/edit.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @post, :url => admin_news_post_path(@post), :html => {:class => 'form-horizontal'} do |f| %>	
-	<%= render :partial => '/admin/posts/form', :locals => {:f => f} %>
-<% end %>

data/app/views/admin/news_posts/index.html.erb

@@ -1,42 +0,0 @@
-<%= content_for :data_controls do %>
-	<%= link_to "Manage Categories", admin_post_categories_path, :class => 'btn spud_blog_manage_categories', :title => 'Manage Categories' %>
-	<%= link_to "New Post", new_admin_news_post_path, :class => "btn btn-primary", :title => "New Post" %>
-<% end %>
-
-<%=content_for :detail do %>
-	<table class="table table-striped">
-		<thead>
-			<tr>
-				<th>Title</th>
-				<th>Author</th>
-				<th>Published At</th>
-				<th>&nbsp;</th>
-			</tr>			
-		</thead>
-		<tbody>
-			<% @posts.each do |post| %>
-				<tr>
-					<td>
-						<%= link_to post.title, news_post_path(post.url_name), :target => :blank %>
-						<% if !post.visible? %>
-							<span class="badge">Draft</span>
-						<% end %>
-					</td>
-					<td><%= post.author.full_name %></td>
-					<td><%= post.published_at.strftime('%m/%d/%Y') %></td>
-					<td class="text-right">
-						<%= link_to 'Edit', edit_admin_news_post_path(post), :class => 'btn btn-small' %>
-						<%= link_to 'Delete', admin_news_post_path(post), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this post?'}, :class => 'btn btn-small btn-danger' %>
-					</td>
-				</tr>
-			<%end%>
-		</tbody>
-	</table>
-	<div class="spud_admin_pagination">
-		<%= will_paginate @posts %>
-	</div>
-
-	<script>
-		$(document).ready(spud.admin.post_categories.index);
-	</script>
-<%end%>

data/app/views/admin/news_posts/new.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @post, :url => admin_news_posts_path do |f| %>	
-	<%= render :partial => '/admin/posts/form', :locals => {:f => f} %>
-<% end %>

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

@@ -1,6 +0,0 @@
-<% cache(@comment) do %>
-  <li>
-    <h6>Posted by: <%= comment.author %></h6>
-    <p><%= comment.content %></p>
-  </li>
-<% end %>

data/app/views/blog/sitemaps/show.xml.builder

@@ -1,16 +0,0 @@
-
-xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
-
-# create the urlset
-xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
-  @posts.each do |post|
-    xml.url do
-      if post.is_news
-        xml.loc news_post_url(post.url_name)
-      else
-        xml.loc blog_post_url(post.url_name)
-      end 
-      xml.lastmod post.published_at.xmlschema
-    end
-  end
-end

data/app/views/news/index.html.erb

@@ -1,37 +0,0 @@
-<% @page_title = 'News' %>
-
-<% content_for :head do %>
-  <%= spud_news_rss_link %>
-<% end %>
-
-<% cache(cache_key_for_spud_collection(@posts, :cache_params => [:category_url_name, :archive_date, :page], :for_user => true)) do %>
-<div id="spud_news_filters">
-  <%= form_tag news_path, :class => 'spud_blog_filter_form' do %>
-    <label>Category:</label>
-    <%= spud_post_category_select %>
-    <label>Month:</label>
-    <%= spud_post_archive_select %>
-    <input type="submit" value="Submit" />
-  <% end %>
-</div>
-
-<div id="spud_news_posts">
-  <% if @posts.length > 0 %>
-    <% @posts.includes(:categories, :author).each do |post| %>
-      <% cache(post) do %>
-        <div class="spud_news_post">
-          <h3><%= link_to post.title, news_post_path(post.url_name) %></h3>
-          <h4>Posted by <%= post.author.full_name %> on <%= post.display_date %></h4>
-          <div class="spud_news_post_content">
-            <%= truncate_html post.content_processed.html_safe, :length => 250 %>
-          </div>
-        </div>
-      <% end %>
-    <% end %>
-  <% else %>
-    <p>No posts were found in this category</p>
-  <% end %>
-</div>
-<% end %>
-
-<%= will_paginate @posts %>

data/app/views/news/index.rss.builder

@@ -1,18 +0,0 @@
-xml.instruct! :xml, :version => "1.0" 
-xml.rss :version => "2.0" do
-  xml.channel do
-    xml.title "#{Spud::Core.site_name} News"
-    xml.description "News articles for #{Spud::Core.site_name}"
-    xml.link news_url(:format => :rss)
-    
-    for article in @posts
-      xml.item do
-        xml.title article.title
-        xml.description strip_tags(article.content_processed).truncate(250)
-        xml.pubDate article.created_at.to_s(:rfc822)
-        xml.link news_post_url(article.url_name)
-        xml.guid news_post_url(article.url_name)
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-<% content_for :title do %>
-  <%= @post.title %> | <%=current_site_name%>
-<% end %>
-
-<% content_for :head do %>
-  <% cache([@post, 'head']) do %>
-    <%= spud_news_rss_link %>
-    <meta name="description" content="<%= @post.meta_description %>" />
-    <% if @post.meta_keywords.blank? %>
-      <meta name="keywords" content="<%= @post.categories.collect{ |c| c.name }.join(',') %>" />
-    <% else %>
-      <meta name="keywords" content="<%= @post.meta_keywords %>" />
-    <% end %>
-  <% end %>
-<% end %>
-
-<% cache(@post) do %>
-  <div class="spud_news_post">
-    <h3><%= @post.title %></h3>
-    <h4>Posted by <%= @post.author.full_name %> on <%= @post.display_date %></h4>
-    <% if @post.categories.any? %>
-    <p id="spud_news_post_categories">
-      Filed under
-      <%= raw(@post.categories.collect{ |c| link_to c.name, news_category_path(c.url_name) }.join(', ')) %>
-    </p>
-    <% end %>
-    <div id="spud_news_post_content">
-      <%= raw @post.content_processed %>
-    </div>
-  </div>
-<% end %>