app/controllers/admin/posts_controller.rb app/views/admin/posts/_fields.html.haml app/views/admin/posts/edit.html.haml app/views/admin/posts/index.html.haml app/views/admin/posts/new.html.haml app/views/admin/posts/show.html.haml db/migrate/20091021210446_add_excerpt_to_posts.rb test/functional/admin/posts_controller_test.rb @@ -8,7 +8,7 @@ class Post < ActiveRecord::Base validates_presence_of :title, :body, :user validate_on_create :validate_user_is_author - before_save :cache_body_html + before_save :cache_html named_scope :ordered, :order => 'id DESC' @@ -18,9 +18,14 @@ class Post < ActiveRecord::Base protected - def cache_body_html + def cache_html blue_cloth = BlueCloth::new(body) self.body_html = blue_cloth.to_html + + unless excerpt.blank? + blue_cloth = BlueCloth::new(excerpt) + self.excerpt_html = blue_cloth.to_html + end end def validate_user_is_author app/models/post.rb @@ -2,7 +2,7 @@ #nav-bar %ul %li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards) - %li= link_to 'Blog', '#' + %li= link_to 'Posts', admin_posts_path, :class => active_if_here(:posts) %li= link_to 'Pages', admin_pages_path, :class => active_if_here(:pages) %li= link_to 'Users', '#', :class => active_if_here(:users) %div.clear \ No newline at end of file app/views/admin/shared/_navigation.html.haml @@ -9,4 +9,5 @@ - if index = link_to pluralize(post.comments.count, 'comment'), post_path(post, :anchor => 'comments'), :class => 'comments' - .html= post.body_html \ No newline at end of file + .html + = index && !post.excerpt.blank? ? post.excerpt_html : post.body_html \ No newline at end of file app/views/posts/_post.html.haml @@ -5,4 +5,5 @@ per_page: # Admin Pagination limits admin_per_page: - pages: 10 \ No newline at end of file + pages: 10 + posts: 10 \ No newline at end of file config/config.yml @@ -24,6 +24,7 @@ ActionController::Routing::Routes.draw do |map| admin.logout '/logout', :controller => 'user_sessions', :action => :destroy admin.resources :pages + admin.resources :posts admin.root :controller => 'dashboards', :action => 'show' end config/routes.rb @@ -12,6 +12,7 @@ body { .clear { clear: both; } .clear-left { clear: left; } .clear-right { clear: right; } +.nowrap { white-space: nowrap; } /* Headings */ h1, h2, h3, h4, h5, h6 { padding: 0.2em 0; margin-bottom: 1em; border-bottom: 1px solid #E2E2E2;} @@ -119,6 +120,7 @@ form textarea { font-size: inherit; font-family: inherit; color: #787878; border: 1px solid #C6C6C6; } +form textarea.short { height: 8em; } form input[type=submit] { display:block; width: auto; padding: 0.5em; font-size: 1.2em; line-height: 1em; text-transform: uppercase; public/stylesheets/admin/admin.css @@ -4,7 +4,7 @@ class PostsControllerTest < ActionController::TestCase context "GET /posts" do setup do - @posts = [] + @posts = WillPaginate::Collection.new(1, App.per_page[:posts], 3) 3.times {|t| @posts << Factory.build(:post, :url => "post-#{t}", :created_at => 1.day.ago)} Post.stubs(:ordered).returns(@posts).stubs(:paginate).returns(@posts) get :index test/functional/posts_controller_test.rb e224c988575713cfe8cb401e32cf2bbfc4c5939c jdpace jared@codewordstudios.com http://github.com/jdpace/hubbub/commit/52c51a0a9abd00316ee37fe4c842817ea9ce98f1 52c51a0a9abd00316ee37fe4c842817ea9ce98f1 2009-10-21T14:44:52-07:00 2009-10-21T14:44:52-07:00 Add an admin interface for dealing with posts fdd9df9b288082bb33fad66b71b1419a8cad291f jdpace jared@codewordstudios.com