lib/tasks/soapbox/test_post.textile @@ -15,7 +15,7 @@ class Admin::PostsController < Admin::AdminController if @post.save format.html { # if we want to preview here use the id to avoid permlink clashes - params[:preview] ? redirect_to(preview_admin_post_url(@post.id, {:status => 'preview'})) : redirect_to(edit_admin_post_url(@post.permalink)) + params[:preview] ? redirect_to(preview_admin_post_url(@post, {:status => 'preview'})) : redirect_to(edit_admin_post_url(@post.permalink)) } else format.html { render :action => "new" } @@ -53,7 +53,6 @@ class Admin::PostsController < Admin::AdminController def preview #mark the post as a preview @post_preview = true - puts params.inspect if params[:status] == 'preview' @post = Post.get(params[:id]) app/controllers/admin/posts_controller.rb @@ -40,6 +40,7 @@ class PostsController < ApplicationController def by_month @posts = Post.find_by_year_and_month(params[:year], params[:month]) + @month_name = @posts.first.created_at.strftime("%B") respond_to do |format| format.html # by_year.html.erb app/controllers/posts_controller.rb @@ -1,7 +1,8 @@ module PostsHelper - def link_to_post(post) + def link_to_post(post, title=nil) + post_title = title ||post.title year, month = post.year_and_month - link_to h(post.title), "#{year}/#{month}/#{post.permalink}" + link_to h(post_title), "#{year}/#{month}/#{post.permalink}" end def post_date(post) @@ -19,6 +20,12 @@ module PostsHelper list.join("\n ") end + def content_for_post(post) + # search through replace the  with a link and not display the rest + content = post.body.gsub(/.*$/m, link_to_post(post, 'Read more ...')) + RedCloth.new(content).to_html + end + def recent_posts content_tag(:ul, @recent_posts.collect { |post| content_tag(:li, link_to_post(post)) }.join("\n"), app/helpers/posts_helper.rb @@ -24,16 +24,20 @@ <h2><%= blog_title %></h2> <%= content_tag(:p, blog_strapline) if blog_strapline %> </div> - <div class="p-content"> - <%#= render :partial => 'layouts/flashes' -%> - <%= yield %> - </div> - <div id="s-content"> - <%= render :partial => 'shared/s_content' unless post_preview? -%> + <div id="content" class="clearfix"> + <div id="p-content"> + <%#= render :partial => 'layouts/flashes' -%> + <%= yield %> + + </div> + <div id="s-content"> + <%= render :partial => 'shared/s_content' unless post_preview? -%> + </div> </div> + <div id="footer"> - <p>Some footer text and a copywrite</p> + <p>Some footer text and a copy write</p> </div> </div> </body> app/views/layouts/application.html.erb @@ -2,6 +2,6 @@ <h2><%= link_to_post(post) %></h2> <p class="date"><%= post_date(post) %></p> <div class="body"> - <%= RedCloth.new(post.body).to_html %> + <%= content_for_post(post) %> </div> </div> \ No newline at end of file app/views/posts/_post.html.erb @@ -3,7 +3,9 @@ %> <h1>Archives</h1> <p>Browse the archives and find what you want</p> -<h2>By Month</h2> -<ul> - <%= by_month_list(@post_sum_by_month) %> -</ul> +<div id="by_month"> + <h2>By Month</h2> + <ul> + <%= by_month_list(@post_sum_by_month) %> + </ul> +</div> app/views/posts/archives.html.erb @@ -1,3 +1,7 @@ +<% + @page = {:title => "Posts in #{@month_name}" } +%> +<h1>Posts in <strong><%= @month_name %></strong></h1> <% unless @posts.empty? %> <div id="posts"> <%= render :partial => "post", :collection => @posts %> app/views/posts/by_month.html.erb @@ -1,3 +1,9 @@ +<% + @page = {:title => "Posts in #{params[:year]}" } +%> +<h1>Posts in <strong><%= params[:year] %></strong></h1> <% unless @posts.empty? %> - <%= render :partial => "post", :collection => @posts %> + <div id="posts"> + <%= render :partial => "post", :collection => @posts %> + </div> <% end %> \ No newline at end of file app/views/posts/by_year.html.erb @@ -1,2 +1,5 @@ +<h3>about</h3> +<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p> + <h3>Recent Posts</h3> <%= recent_posts %> \ No newline at end of file app/views/shared/_s_content.html.erb @@ -1,17 +1,19 @@ +require 'faker' namespace :soapbox do - task :create_test_blog_post => :environment do - id = 'testing123' - @post = Post.get(id) - - #clear it out and start again - @post.destroy if @post + task :create_test_posts => :environment do + + #grab the textile from the templates folder - body = File.read(File.dirname(__FILE__) + "/soapbox/#{id}.textile") - - @post = Post.new(:title => id, :body => body) - @post.save + body = File.read(File.dirname(__FILE__) + "/soapbox/test_post.textile") + now = Time.now + + 5.times do |i| + title = Faker::Lorem.sentence + @post = Post.new(:title => title, :body => body, :created_at => Time.gm(now.year, now.month, i+1, now.hour, now.min, now.sec), :status => 'published') + @post.save! + end end end \ No newline at end of file lib/tasks/soapbox.rake @@ -27,6 +27,17 @@ No border-top:1px solid #CCCCCC; } +#p-content { + width: 70%; + float:left; + margin-right: 5%; +} + +#s-content { + width: 25%; + float:left; +} + /* navigation -------------------------------------------------------------------*/ #navigation { @@ -46,4 +57,27 @@ No padding: 0.5em 1em 0.5em 1em; margin-left: 1em; display:block; - } \ No newline at end of file + } + +/* secondary content +-------------------------------------------------------------------*/ +#s-content { + +} + + #s-content h3 { + font-size: 200%; + margin-bottom: 10px; + } + + #s-content p, #s-content li { + color:#222; + font-family:corbel,'lucida grande',helvetica,sans-serif; + font-size:120%; + line-height:1.5; + margin-bottom: 10px; + } + + #s-content ul { + margin-left: 15px; + } \ No newline at end of file public/stylesheets/blog.layout.css @@ -34,6 +34,27 @@ body { font-weight: normal; } +#p-content h2 { + font-family:Cambria,Georgia,serif; + font-size: 300%; + color: #464646; + font-weight: normal; +} + +#p-content ul { + margin-left: 18px; +} + +#p-content p, #p-content li { + color:#222; + font-family:corbel,'lucida grande',helvetica,sans-serif; + font-size:150%; + line-height:1.5; + margin-top: 20px; + margin-bottom: 40px; + margin-bottom: 1.5em; +} + /* index page -------------------------------------------------------------------*/ #posts h2 { @@ -68,7 +89,7 @@ body { word-spacing: 0.20em; } -.post h1 { +#p-content h1 { font-size: 400%; margin-bottom: 20px; text-align: center; @@ -81,16 +102,8 @@ body { text-align:center; } -.post .body { - color:#222; - font-family:corbel,'lucida grande',helvetica,sans-serif; - font-size:150%; - line-height:1.5; - margin-top: 20px; - margin-bottom: 40px; - } - - .post .body p { - margin-bottom: 1.5em; - } +/* archives page +-------------------------------------------------------------------*/ +#by_month { +} \ No newline at end of file public/stylesheets/master.css @@ -89,7 +89,7 @@ describe Admin::PostsController do it "should redirect to preview page" do Post.should_receive(:new).with({'these' => 'params'}).and_return(@foo = mock_post(:save => true, :status= => true, :preview? => true)) post :create, :post => {:these => 'params'}, :preview => 'Preview' - response.should redirect_to(preview_admin_post_url(mock_post.permalink)) + response.should redirect_to(preview_admin_post_url(mock_post, {:status => 'preview'})) end end spec/controllers/admin/posts_controller_spec.rb @@ -76,16 +76,22 @@ describe PostsController do describe "GET 'by_month'" do it "should be successful" do - Post.stub!(:find_by_year_and_month).and_return([mock_post]) + Post.stub!(:find_by_year_and_month).and_return([mock_post(:created_at => Time.gm(2009, 9))]) get :by_month, :year => "2009", :month => "09" response.should be_success end it "should assign post as @post" do - Post.stub!(:find_by_year_and_month).and_return([mock_post]) + Post.stub!(:find_by_year_and_month).and_return([mock_post(:created_at => Time.gm(2009, 9))]) get :by_month, :year => "2009", :month => "09" assigns[:posts].should == [mock_post] end + + it "should assign month name as @month_name" do + Post.stub!(:find_by_year_and_month).and_return([mock_post(:created_at => Time.gm(2009, 12))]) + get :by_month, :year => "2009", :month => "12" + assigns[:month_name].should == 'December' + end end describe "GET 'archives'" do spec/controllers/posts_controller_spec.rb @@ -12,6 +12,11 @@ describe PostsHelper do link_to_post(@post).should == '<a href="2009/06/a-title">a title</a>' end + it "link_to_post should return a full permalink for a post with a custom title" do + @post = mock_post(:permalink => "a-title", :year_and_month => ["2009", "06"], :title => "a title") + link_to_post(@post, 'foo bar').should == '<a href="2009/06/a-title">foo bar</a>' + end + describe "display the posts date" do it "should display nicely formatted date" do @post = mock_post(:created_at => "2008/06/24 14:10:27 +0000", :new_record? => false) spec/helpers/posts_helper_spec.rb 62c8fe6b112eff5576d127f9d5476b8f00be2df5 Ben Aldred benaldred@gmail.com http://github.com/benaldred/soapbox/commit/95fa6e1cdb65f3e7532c519a3947275065430917 95fa6e1cdb65f3e7532c519a3947275065430917

2009-10-13T01:08:33-07:00

more basic stying, fake blog post rake task and read more link f44f9a03a5d3f8b0ad85db9a8040c3859358a3c3 Ben Aldred benaldred@gmail.com