spud_blog 0.8.18 → 0.9.0

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

@@ -1,3 +1,7 @@
+<% content_for :title do %>
+	News | <%=current_site_name%>
+<% end %>
+
 <% content_for :head do %>
 	<%= spud_news_rss_link %>
 <% end %>
@@ -19,7 +23,7 @@
 				<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">
-					<%= raw post.content %>
+					<%= truncate_html post.content.html_safe, :length => 250 %>
 				</div>
 			</div>
 		<% end %>
@@ -28,4 +32,4 @@
 	<% end %>
 </div>
 
-<%= will_paginate @posts %>
+<%= will_paginate @posts %>

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

@@ -1,5 +1,5 @@
 <% content_for :title do %>
-	<%= @post.title %> | <%= Spud::Core.site_name %>
+	<%= @post.title %> | <%=current_site_name%>
 <% end %>
 
 <% content_for :head do %>
@@ -24,4 +24,4 @@
 	<div id="spud_news_post_content">
 		<%= raw @post.content %>
 	</div>
-</div>
+</div>

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

@@ -1,4 +1,5 @@
 <%= content_for :data_controls do %>
+	<%= link_to "Manage Categories", spud_admin_post_categories_path, :class => 'btn spud_blog_manage_categories', :title => 'Manage Categories' %>
 	<%= link_to "New Post", new_spud_admin_news_post_path, :class => "btn btn-primary", :title => "New Post" %>
 <% end %>
 
@@ -27,7 +28,7 @@
 					<td><%= post.author.full_name %></td>
 					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), news_post_path(post.url_name)) %></td>
 					<td align="right">
-						<%= link_to 'Delete', spud_admin_news_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'btn btn-danger' %>
+						<%= link_to 'Delete', spud_admin_news_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'btn btn-small btn-danger' %>
 					</td>
 				</tr>
 			<%end%>
@@ -36,4 +37,8 @@
 	<div class="spud_admin_pagination">
 		<%= will_paginate @posts %>
 	</div>
+
+	<script>
+		$(document).ready(Spud.Admin.PostCategories.index);
+	</script>
 <%end%>

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

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

data/app/views/spud/admin/post_categories/_category.html.erb

@@ -0,0 +1,14 @@
+<%= content_tag :li, :class => 'spud_blog_category_manager_item', 'data-id' => category.id do %>
+  <span class="spud_blog_category_manager_item_name">
+    <%= category.name %>
+  </span>
+  <span class="spud_blog_category_manager_item_actions">
+    <%= link_to 'Edit', edit_spud_admin_post_category_path(category), :class => 'btn btn-mini spud_blog_category_edit' %>
+    <%= link_to 'Delete', spud_admin_post_category_path(category), :class => 'btn btn-mini btn-danger spud_blog_category_delete' %>
+  </span>
+  <ul class="spud_blog_category_manager_item_children">
+    <% if @post_categories[category.id] %>
+      <%= render :partial => 'category', :collection => @post_categories[category.id] %>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/spud/admin/post_categories/_form.html.erb

@@ -1,33 +1,23 @@
-<%= form_for @post_category, :url => path, :html => {:class => 'form-horizontal'} do |f| %>	
-<%=error_messages_for(f.object)%>
+<%= form_for @post_category, :url => (@post_category.new_record? ? spud_admin_post_categories_path : spud_admin_post_category_path(@post_category)), :html => {:class => 'form-horizontal spud_post_category_form'} do |f| %>
+
+	<%= error_messages_for(f.object) %>
 
 	<fieldset>
-		<legend>Category Info</legend>
-		
-			<div class="control-group">
-				<%= f.label :name,"Name",:class => "control-label" %>
-				<div class="controls">
-					<%= f.text_field :name %>
-				</div>
+		<div class="control-group">
+			<%= f.label :name,"Name",:class => "control-label" %>
+			<div class="controls">
+				<%= f.text_field :name %>
 			</div>
-			<div class="control-group">
-				<%= label_tag :parent,'Parent',:class => "control-label" %>
-				<div class="controls">
-					<select name="spud_post_category[parent_id]">
-						<option value="0">No Parent</option>
-						<%= options_for_select(SpudPostCategory.options_for_categories(:filter => @post_category.id), @post_category.parent_id) %>
-					</select>
-				</div>
+		</div>
+		<div class="control-group">
+			<%= label_tag :parent,'Parent',:class => "control-label" %>
+			<div class="controls">
+				<select name="spud_post_category[parent_id]">
+					<option value="">No Parent</option>
+					<%= options_for_select(SpudPostCategory.options_for_categories(:filter => @post_category.id), @post_category.parent_id) %>
+				</select>
 			</div>
-		
+		</div>
 	</fieldset>
 
-	<div class="form-actions">
-    	<%=f.submit "Save Post Category", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",request.referer,:class => "btn"%>
-    </div>
-
-<% end %>
-
-<script type="text/javascript">
-	$(document).ready(Spud.Admin.Posts.edit);
-</script>
+<% end %>

data/app/views/spud/admin/post_categories/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => 'form', :locals => {:path => spud_admin_post_category_path(@post_category)} %>
+<%= render :partial => 'form' %>

data/app/views/spud/admin/post_categories/index.html.erb

@@ -1,29 +1,6 @@
-<%= content_for :data_controls do %>
-	<%= link_to "New Post Category", new_spud_admin_post_category_path, :class => "btn btn-primary", :title => "New Post Category" %>
-<% end %>
-
-<%=content_for :detail do %>
-	<table class="admin-table">
-		<thead>
-			<tr>
-        <th>Name</th>
-        <th># Occurances</th>
-				<th>&nbsp;</th>
-			</tr>			
-		</thead>
-		<tbody>
-			<% @post_categories.each do |category| %>
-				<tr>
-					<td><%= link_to category.name, edit_spud_admin_post_category_path(category) %></td>
-					<td><%= category.posts.size %></td>
-					<td align="right">
-						<%= link_to 'Delete', spud_admin_post_category_path(category), :method => :delete, :confirm => 'Are you sure you want to delete this category?', :class => 'btn btn-danger' %>
-					</td>
-				</tr>
-			<%end%>
-		</tbody>
-	</table>
-	<div class="spud_admin_pagination">
-		<%= will_paginate @post_categories %>
-	</div>
-<%end%>
+<div class="spud_blog_category_manager">
+	<%= link_to "New Post Category", new_spud_admin_post_category_path, :class => "btn btn-small btn-primary spud_blog_category_add_new", :title => "New Post Category" %>
+	<ul class="spud_blog_category_manager_list">
+		<%= render :partial => 'category', :collection => @post_categories[nil] %>
+	</ul>
+</div>

data/app/views/spud/admin/posts/_category.html.erb

@@ -1,9 +1,9 @@
-<li class="spud_post_form_category">
+<%= content_tag :li, :class => 'spud_post_form_category', 'data-id' => category.id do %>
 	<%= check_box_tag 'spud_post[category_ids][]', category.id, @post.category_ids.include?(category.id), :id => "spud_post_category_#{category.id}" %>
 	<%= label_tag "spud_post_category_#{category.id}", category.name %>
-	<% if @categories[category.id] %>
-		<ul>
-			<%= render :partial => '/spud/admin/posts/category', :collection => @categories[category.id] %>
-		</ul>
-	<% end %>
-</li>
+  <ul>
+    <% if @categories[category.id] %>
+      <%= render :partial => '/spud/admin/posts/category', :collection => @categories[category.id] %>
+  	<% end %>
+  </ul>
+<% end %>

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

@@ -1,24 +1,14 @@
 <%=error_messages_for(f.object)%>
 
 <fieldset>
-  <div class="control-group">
-		<%=f.label :title, :required=>true,:style =>"display:none;", :class=>"control-label"%>
-    <%=f.text_field :title, :class => "full-width",:placeholder=>"Enter title here"%>  
-  </div>
+	<%= f.label :title, :required=>true,:style =>"display:none;" %>
+  <%= f.text_field :title, :class => "full-width",:placeholder=>"Enter title here" %>
 </fieldset>
 
 <div>
 	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
 </div>
 
-<fieldset>
-	<legend>Categories</legend>
-	<input type="hidden" name="spud_post[category_ids][]" value="" />
-	<ul id="spud_post_categories_form">
-		<%= render :partial => '/spud/admin/posts/category', :collection => @categories[0] %>
-	</ul>
-</fieldset>
-
 <% if Spud::Blog.config.has_custom_fields %>
 <fieldset>
 	<legend>Custom Fields</legend>		
@@ -26,71 +16,84 @@
 </fieldset>
 <% end %>
 
-<% if Spud::Core.config.multisite_mode_enabled %>
-<fieldset id="spud_post_site_options">
-	<legend>Sites</legend>
-	<div class="control-group">
-		<div class="controls">
-			<span class="help-block"><b>Choose which websites you would like to publish to:</b></span>
-			<%= spud_post_site_check_box_tag(Spud::Core.default_site_config, @post) %>
-			<%= spud_post_site_label_tag(Spud::Core.default_site_config) %>
-			<% Spud::Core.config.multisite_config.each do |site| %>
-				<%= spud_post_site_check_box_tag(site, @post) %>
-				<%= spud_post_site_label_tag(site) %>
-			<% end %>
-		</div>
-	</div>
-</fieldset>
-<% end %>
-
-<fieldset>
+<fieldset class="spud_post_form_fieldset">
 	<legend>Advanced</legend>
 	
-		<div class="control-group">
-			<%= f.label :published_at, 'Publish Date', :class=>"control-label" %>
-			<div class="controls">
+		<div class="spud_post_form_col">
+			<h4>Meta Data</h4>
+
+			<div class="spud_post_form_row">
+				<%= f.label :published_at, 'Publish Date' %>
 				<%= f.text_field :published_at,:value => f.object.published_at.strftime("%Y-%m-%d %H:%M") , :class => 'spud_form_date_picker' %>
 			</div>
-		</div>
-		<%if @current_user.super_admin%>
-			<div class="control-group">
-				<%= f.label :spud_user_id, 'Author', :class=>"control-label" %>
-				<div class="controls">
-					<%=f.select :spud_user_id,options_for_select(SpudUser.order(:first_name,:last_name,:login).all.collect{|user| [user.full_name,user.id]},f.object.spud_user_id)%>
+			
+			<% if @current_user.super_admin %>
+				<div class="spud_post_form_row">
+					<%= f.label :spud_user_id, 'Author' %>
+					<%= f.select :spud_user_id,options_for_select(SpudUser.order(:first_name,:last_name,:login).all.collect{|user| [user.full_name,user.id]},f.object.spud_user_id)%>
+				</div>
+			<% else %>
+				<%= f.hidden_field :spud_user_id %>
+			<% end %>
+
+			<% if Spud::Core.config.multisite_mode_enabled %>
+				<div class="spud_post_form_row">
+					<%= f.label :sites, 'Websites to Publish' %>
+					<div class="spud_post_form_input_group">
+						<%= spud_post_site_check_box_tag(Spud::Core.default_site_config, @post) %>
+						<%= spud_post_site_label_tag(Spud::Core.default_site_config) %>
+						<% Spud::Core.config.multisite_config.each do |site| %>
+							<%= spud_post_site_check_box_tag(site, @post) %>
+							<%= spud_post_site_label_tag(site) %>
+						<% end %>
+					</div>
+				</div>
+			<% end %>
+
+			<div class="spud_post_form_row">
+				<%= f.label :visible %>
+				<div class="spud_post_form_input_group">
+					<%= f.radio_button :visible, true %>
+					<label class="radio inline" for="spud_post_visible_true">Yes</label>
+					<%= f.radio_button :visible, false %>
+					<label class="radio inline" for="spud_post_visible_false">No</label>
 				</div>
 			</div>
-		<%else%>
-			<%= f.hidden_field :spud_user_id %>
-		<%end%>
-		<div class="control-group">
-			<%= f.label :visible, :class=>"control-label" %>
-			<div class="controls">
-				<%= f.check_box :visible %>
-			</div>
-		</div>
-		<div class="control-group">
-			<%= f.label :meta_keywords, 'Keywords', :class=>"control-label" %>
-			<div class="controls">
-				<%= f.text_field :meta_keywords ,:style=>"width:600px;" %>
-		        <span class="help-block">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
+
+			<% unless @post.is_news %>
+				<div class="spud_post_form_row">
+					<%= f.label :comments_enabled,"Comments Enabled" %>
+					<div class="spud_post_form_input_group">
+						<%= f.radio_button :comments_enabled, true %>
+						<label class="radio inline" for="spud_post_comments_enabled_true">Yes</label>
+						<%= f.radio_button :comments_enabled, false %>
+						<label class="radio inline" for="spud_post_comments_enabled_false">No</label>
+					</div>
+				</div>
+			<% end %>
+
+			<div class="spud_post_form_row">
+				<%= f.label :meta_keywords, 'Keywords' %>
+				<%= f.text_field :meta_keywords %>
+				<span class="spud_post_form_help_block">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
 			</div>
-		</div>
-		<div class="control-group">
-			<%= f.label :meta_description, 'Description', :class=>"control-label" %>
-			<div class="controls">
-				<%= f.text_area :meta_description, :style =>"width:600px;height:40px;"%>
-		        <span class="help-block">A short description of the article. This is what appears on a search engines search result page.</span>
+
+			<div class="spud_post_form_row">
+				<%= f.label :meta_description, 'Description' %>
+				<%= f.text_area :meta_description %>
+				<span class="spud_post_form_help_block">A short description of the article. This is what appears on a search engines search result page.</span>
 			</div>
 		</div>
-		<% unless @post.is_news %>
-		<div class="control-group">
-			<%= f.label :comments_enabled,"Comments Enabled", :class=>"control-label" %>
-			<div class="controls">
-				<%= f.check_box :comments_enabled %>
-			</div>
+
+		<div class="spud_post_form_col">
+			<h4>Categories</h4>
+			<%= link_to 'Add Category', new_spud_admin_post_category_path, :class => 'btn btn-mini spud_post_add_category' %>
+			<input type="hidden" name="spud_post[category_ids][]" value="" />
+			<ul class="spud_post_categories_form">
+				<%= render :partial => '/spud/admin/posts/category', :collection => @categories[nil] %>
+			</ul>
 		</div>
-		<% end %>
-	</ol>
+
 </fieldset>
 <%= f.hidden_field :is_news %>
 

data/app/views/spud/admin/posts/index.html.erb

@@ -1,4 +1,5 @@
 <%= content_for :data_controls do %>
+	<%= link_to "Manage Categories", spud_admin_post_categories_path, :class => 'btn spud_blog_manage_categories', :title => 'Manage Categories' %>
 	<%= link_to "New Post", new_spud_admin_post_path, :class => "btn btn-primary", :title => "New Post" %>
 <% end %>
 
@@ -37,4 +38,8 @@
 	<div class="spud_admin_pagination">
 		<%= will_paginate @posts %>
 	</div>
+
+	<script>
+		$(document).ready(Spud.Admin.PostCategories.index);
+	</script>
 <%end%>

data/app/views/spud/admin/posts/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @post, :url => spud_admin_posts_path, :html => {:class => 'form-horizontal'} do |f| %>	
+<%= form_for @post, :url => spud_admin_posts_path do |f| %>	
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

data/db/migrate/20121113135812_add_nested_set_to_post_categories.rb

@@ -0,0 +1,21 @@
+class AddNestedSetToPostCategories < ActiveRecord::Migration
+  def up
+    change_table :spud_post_categories do |t|
+      t.integer :lft
+      t.integer :rgt
+      t.integer :depth
+    end
+
+    # Populates lft, rgt, and depth values for nested set
+    SpudPostCategory.where(:parent_id => 0).update_all({:parent_id => nil})
+    SpudPostCategory.rebuild!
+  end
+
+  def down
+    change_table :spud_post_categories do |t|
+      t.remove :ltf
+      t.remove :rgt
+      t.remove :depth
+    end
+  end
+end

data/lib/spud_blog/configuration.rb

@@ -5,8 +5,8 @@ module Spud
       :base_layout, :news_layout, :blog_enabled,
       :news_enabled, :posts_per_page, :blog_path,
       :news_path, :enable_sitemap, :has_custom_fields,
-      :enable_action_caching, :action_caching_duration,
-      :enable_full_page_caching,:enable_rakismet
+      :cache_mode, :action_caching_duration,
+      :enable_rakismet
     )
     self.base_layout = 'application'
     self.news_layout = nil
@@ -17,9 +17,8 @@ module Spud
     self.news_path = 'news'
     self.enable_sitemap = true
     self.has_custom_fields = false
-    self.enable_action_caching = false
+    self.cache_mode = nil #options :full_page, :action
     self.action_caching_duration = 3600
-    self.enable_full_page_caching = false
     self.enable_rakismet = false
   end
 end

data/lib/spud_blog/engine.rb

@@ -1,4 +1,8 @@
 require 'spud_core'
+require 'awesome_nested_set'
+require 'spud_permalinks'
+require 'truncate_html'
+
 module Spud
   module Blog
     class Engine < Rails::Engine
@@ -13,12 +17,6 @@ module Spud
 
       engine_name :spud_blog
       initializer :admin do
-        Spud::Core.config.admin_applications += [{
-          :name => 'Post Categories',
-          :thumbnail => 'spud/admin/posts_thumb.png',
-          :url => '/spud/admin/post_categories',
-          :order => 3
-        }]
         if Spud::Blog.enable_sitemap == true
           Spud::Core.config.sitemap_urls += [:spud_blog_sitemap_url]
         end
@@ -41,6 +39,8 @@ module Spud
       end
       initializer :assets do
         Rails.application.config.assets.precompile += ['spud/admin/posts.css','spud/blog/validity.css']
+        Spud::Core.append_admin_javascripts('spud/admin/posts')
+        Spud::Core.append_admin_stylesheets('spud/admin/posts')
       end
       initializer :associations do
         SpudUser.class_eval do

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.8.18"
+	  VERSION = "0.9.0"
 	end
 end

data/test/dummy/log/development.log

@@ -0,0 +1,36 @@
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
+   (153.8ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (287.7ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateSpudPosts (20120125180945)
+   (163.8ms)  CREATE TABLE `spud_posts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `title` varchar(255), `content` text, `comments_enabled` tinyint(1) DEFAULT 0, `visible` tinyint(1) DEFAULT 1, `published_at` datetime, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (225.6ms)  CREATE INDEX `index_spud_posts_on_spud_user_id` ON `spud_posts` (`spud_user_id`)
+   (178.6ms)  CREATE INDEX `index_spud_posts_on_visible` ON `spud_posts` (`visible`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125180945')
+Migrating to CreateSpudPostCategories (20120125181022)
+   (214.2ms)  CREATE TABLE `spud_post_categories` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (209.6ms)  CREATE TABLE `spud_post_categories_posts` (`spud_post_id` int(11), `spud_post_category_id` int(11)) ENGINE=InnoDB
+   (182.2ms)  CREATE INDEX `index_spud_post_categories_posts_on_spud_post_category_id` ON `spud_post_categories_posts` (`spud_post_category_id`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181022')
+Migrating to CreateSpudPostComments (20120125181359)
+   (171.4ms)  CREATE TABLE `spud_post_comments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_post_id` int(11), `author` varchar(255), `content` text, `approved` tinyint(1) DEFAULT 0, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (237.9ms)  CREATE INDEX `index_spud_post_comments_on_spud_post_id` ON `spud_post_comments` (`spud_post_id`)
+   (227.0ms)  CREATE INDEX `index_spud_post_comments_on_approved` ON `spud_post_comments` (`approved`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181359')
+Migrating to AddUrlToSpudPosts (20120127143054)
+   (239.3ms)  ALTER TABLE `spud_posts` ADD `url_name` varchar(255)
+   (234.5ms)  CREATE INDEX `index_spud_posts_on_url_name` ON `spud_posts` (`url_name`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127143054')
+Migrating to AddUrlToSpudPostCategories (20120127144942)
+   (196.9ms)  ALTER TABLE `spud_post_categories` ADD `parent_id` int(11) DEFAULT 0
+   (220.7ms)  ALTER TABLE `spud_post_categories` ADD `url_name` varchar(255)
+   (179.0ms)  CREATE INDEX `index_spud_post_categories_on_parent_id` ON `spud_post_categories` (`parent_id`)
+   (178.4ms)  CREATE INDEX `index_spud_post_categories_on_url_name` ON `spud_post_categories` (`url_name`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127144942')
+Migrating to AddIsNewsToSpudPosts (20120210165540)
+   (207.1ms)  ALTER TABLE `spud_posts` ADD `is_news` tinyint(1) DEFAULT 0
+   (212.3ms)  CREATE INDEX `index_spud_posts_on_is_news` ON `spud_posts` (`is_news`)
+   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120210165540')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations`