spud_blog 0.7.5 → 0.8.0

data/app/controllers/spud/admin/posts_controller.rb

@@ -27,7 +27,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 
 	def new
 		@categories = SpudPostCategory.grouped
-		@post = SpudPost.new(:published_at => Date.today, :spud_user_id => current_user.id)
+		@post = SpudPost.new(:published_at => Time.now.strftime("%Y-%m-%d %H:%M"), :spud_user_id => current_user.id)
 		respond_with @post
 	end
 

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

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

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

@@ -1,5 +1,5 @@
 <%= content_for :data_controls do %>
-	<%= link_to "New Post", new_spud_admin_news_post_path, :class => "button", :title => "New Post" %>
+	<%= link_to "New Post", new_spud_admin_news_post_path, :class => "btn btn-primary", :title => "New Post" %>
 <% end %>
 
 <%=content_for :detail do %>
@@ -19,7 +19,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 => 'spud_admin_button_delete' %>
+						<%= 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' %>
 					</td>
 				</tr>
 			<%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 => 'right_aligned_form'} do |f| %>	
+<%= form_for @post, :url => spud_admin_news_posts_path, :html => {:class => 'form-horizontal'} do |f| %>	
 	<%= render :partial => '/spud/admin/posts/form', :locals => {:f => f} %>
 <% end %>

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

@@ -1,36 +1,30 @@
-<%= form_for @post_category, :url => path, :html => {:class => 'right_aligned_form'} do |f| %>	
-
-	<% if @post_category.errors.any? %>
-    <div class="spud_admin_form_error_list">
-      <h4><%= pluralize(@post_category.errors.count, "error") %> prohibited you from saving this post:</h4>
-      <ul>
-      <% @post_category.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+<%= form_for @post_category, :url => path, :html => {:class => 'form-horizontal'} do |f| %>	
+<%=error_messages_for(f.object)%>
 
 	<fieldset>
-		<legend>Post Category</legend>
-		<ol>
-			<li>
-				<%= f.label :name %>
-				<%= f.text_field :name %>
-			</li>
-			<li>
-				<%= label_tag 'Parent' %>
-				<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>
-			</li>
-		</ol>
+		<legend>Category Info</legend>
+		
+			<div class="control-group">
+				<%= f.label :name,"Name",:class => "control-label" %>
+				<div class="controls">
+					<%= f.text_field :name %>
+				</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="0">No Parent</option>
+						<%= options_for_select(SpudPostCategory.options_for_categories(:filter => @post_category.id), @post_category.parent_id) %>
+					</select>
+				</div>
+			</div>
+		
 	</fieldset>
 
-	<fieldset class="submit">
-		<%= f.submit 'Save Post Category' %> or <%= link_to "cancel", request.referer %>
-	</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 %>
 

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

@@ -1,5 +1,5 @@
 <%= content_for :data_controls do %>
-	<%= link_to "New Post Category", new_spud_admin_post_category_path, :class => "button", :title => "New Post Category" %>
+	<%= link_to "New Post Category", new_spud_admin_post_category_path, :class => "btn btn-primary", :title => "New Post Category" %>
 <% end %>
 
 <%=content_for :detail do %>
@@ -17,7 +17,7 @@
 					<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 => 'spud_admin_button_delete' %>
+						<%= 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%>

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

@@ -1,24 +1,17 @@
-	<% if @post.errors.any? %>
-    <div class="spud_admin_form_error_list">
-      <h4><%= pluralize(@post.errors.count, "error") %> prohibited you from saving this post:</h4>
-      <ul>
-      <% @post.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+<%=error_messages_for(f.object)%>
 
-	<fieldset>
-		<legend>Post Title</legend>
-		<p>
-			<%= f.text_field :title, :class => 'full-width' %>
-		</p>
-	</fieldset>
+<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>
+</fieldset>
 
 	<div>
-		<%= f.label :content %>
-		<%= f.text_area :content, :class => 'wysiwym tinymce' %>
+		<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
 	</div>
 
 	<fieldset>
@@ -31,45 +24,57 @@
 	<% if Spud::Blog.config.has_custom_fields %>
 	<fieldset>
 		<legend>Custom Fields</legend>
-		<ol>
+		
 			<%= render :partial => '/spud/admin/posts/custom_fields', :locals => {:f => f} %>
-		</ol>
+		
 	</fieldset>
 	<% end %>
 
 	<fieldset>
 		<legend>Advanced</legend>
-		<ol>
-			<li>
-				<%= f.label :published_at, 'Publish Date' %>
-				<%= f.text_field :published_at, :class => 'spud_form_date_picker' %>
-			</li>
-			<li>
-				<%= f.label :visible %>
-				<%= f.check_box :visible %>
-			</li>
-			<li>
-				<%= f.label :meta_keywords, 'Keywords' %>
-				<%= f.text_field :meta_keywords %>
-			</li>
-			<li>
-				<%= f.label :meta_description, 'Description' %>
-				<%= f.text_area :meta_description, :rows => 4, :cols => 75 %>
-			</li>
+		
+			<div class="control-group">
+				<%= f.label :published_at, 'Publish Date', :class=>"control-label" %>
+				<div class="controls">
+					<%= f.text_field :published_at, :class => 'spud_form_date_picker' %>
+				</div>
+			</div>
+			<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>
+				</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>
+			</div>
 			<% unless @post.is_news %>
-			<li>
-				<%= f.label :comments_enabled %>
-				<%= f.check_box :comments_enabled %>
-			</li>
+			<div class="control-group">
+				<%= f.label :comments_enabled,"Comments Enabled", :class=>"control-label" %>
+				<div class="controls">
+					<%= f.check_box :comments_enabled %>
+				</div>
+			</div>
 			<% end %>
 		</ol>
 	</fieldset>
-
-	<fieldset class="submit">
-		<%= f.hidden_field :is_news %>
+	<%= f.hidden_field :is_news %>
 		<%= f.hidden_field :spud_user_id %>
-		<%= f.submit 'Save Post', :class => "wymupdate"%> or <%= link_to "cancel",request.referer %>
-	</fieldset>
+	<div class="form-actions">
+    	<%=f.submit "Save Post", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",request.referer,:class => "btn"%>
+    </div>
+
 
 <script type="text/javascript">
 	$(document).ready(Spud.Admin.Posts.edit);

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

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

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

@@ -1,5 +1,5 @@
 <%= content_for :data_controls do %>
-	<%= link_to "New Post", new_spud_admin_post_path, :class => "button", :title => "New Post" %>
+	<%= link_to "New Post", new_spud_admin_post_path, :class => "btn btn-primary", :title => "New Post" %>
 <% end %>
 
 <%=content_for :detail do %>
@@ -21,7 +21,7 @@
 					<td><%= link_to(post.published_at.strftime('%m/%d/%Y'), blog_post_path(post.url_name)) %></td>
 					<td><%= post.comments.size %></td>
 					<td align="right">
-						<%= link_to 'Delete', spud_admin_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'spud_admin_button_delete' %>
+						<%= link_to 'Delete', spud_admin_post_path(post), :method => :delete, :confirm => 'Are you sure you want to delete this post?', :class => 'btn btn-danger' %>
 					</td>
 				</tr>
 			<%end%>

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

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

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.7.5"
+	  VERSION = "0.8.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` 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70287430407040 !ruby/object:Gem::Requirement
+  requirement: &70171144191680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,24 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287430407040
+  version_requirements: *70171144191680
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70287430406340 !ruby/object:Gem::Requirement
+  requirement: &70171144191160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70287430406340
+  version_requirements: *70171144191160
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70287430404940 !ruby/object:Gem::Requirement
+  requirement: &70171144190440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +46,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70287430404940
+  version_requirements: *70171144190440
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70287430400680 !ruby/object:Gem::Requirement
+  requirement: &70171144190060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287430400680
+  version_requirements: *70171144190060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287430392240 !ruby/object:Gem::Requirement
+  requirement: &70171144189580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287430392240
+  version_requirements: *70171144189580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70287430390220 !ruby/object:Gem::Requirement
+  requirement: &70171144189120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287430390220
+  version_requirements: *70171144189120
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70287430388980 !ruby/object:Gem::Requirement
+  requirement: &70171144188580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70287430388980
+  version_requirements: *70171144188580
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70287430387680 !ruby/object:Gem::Requirement
+  requirement: &70171144188040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +101,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70287430387680
+  version_requirements: *70171144188040
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70287430386520 !ruby/object:Gem::Requirement
+  requirement: &70171144187580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +112,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70287430386520
+  version_requirements: *70171144187580
 description: Spud blogging/news and rss engine.
 email:
 - greg@westlakedesign.com
@@ -214,6 +217,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
+- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -235,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1816796039144768112
+      hash: 2775193958016340119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,10 +248,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1816796039144768112
+      hash: 2775193958016340119
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Spud Blog Engine.
@@ -274,6 +278,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
+- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html