@@ -3,6 +3,8 @@ class Comment < ActiveRecord::Base belongs_to :post belongs_to :user + before_save :format_author_website + validates_presence_of :post, :body validates_presence_of :author_name, :author_email, :unless => :user validates_format_of :author_email, :if => :author_email, :with => Authlogic::Regex.email, @@ -18,4 +20,19 @@ class Comment < ActiveRecord::Base self[:author_email] end + protected + + # make sure no one leaves site as just http:// and that is starts with that + def format_author_website + return if author_website.blank? + self.author_website = case author_website + when /^http:\/\/$/ + nil + when /^http:\/\// + author_website + else + 'http://' + author_website + end + end + end app/models/comment.rb @@ -1,6 +1,6 @@ -%li.comment{:id => dom_id(comment)} +%li.comment{:id => dom_id(comment), :class => (comment.user ? 'member' : nil)} %h5.meta %span.author= comment.author_website.blank? ? comment.author_name : link_to(comment.author_name, comment.author_website, :rel => 'nofollow', :target => '_blank') - %span.date= comment.created_at.to_s(:micro) + %abbr.date{:title => comment.created_at.to_s(:full_ordinal)}= comment.created_at.to_s(:micro) = simple_format comment.body \ No newline at end of file app/views/comments/_comment.html.haml @@ -1,11 +1,12 @@ -%h1= @post.title -.meta - %span.author= @post.user.name - %span.date= @post.created_at.to_s(:micro) +.post + %h1= @post.title + .meta + %span.author= @post.user.name + %abbr.date{:title => @post.created_at.to_s(:full_ordinal)}= @post.created_at.to_s(:micro) -.html= @post.body + .html= @post.body_html -%h3#comments= "#{pluralize(@post.comments.count, 'Comment')} so far" +%h4#comments= "#{pluralize(@post.comments.count, 'Comment')} so far" %ol#comments = render @post.comments app/views/posts/show.html.haml @@ -69,4 +69,18 @@ color: #929292; } -/* END Temporary Style */ \ No newline at end of file +/* END Temporary Style */ + +/* Posts */ +.post h1 { margin-bottom: 0.3em; } +.post .meta { font-size: 1.4em; line-height: 1.2em; margin-bottom: 2em; padding-left: 0.5em; border-left: 3px solid #C6C6C6; } +.post .meta .author { + color: #B60600; +} +.post .html { margin-bottom: 2em; } +.meta .date { color: #999; } + +.comment { padding-left: 0.5em; border-left: 3px solid #C6C6C6; } +.comment.member { border-color: #B60600; } +.comment .meta { margin: 0; border: none; font-size: 1em; } +.comment .meta .author, .comment .meta .author a { color: #B60600; } \ No newline at end of file public/stylesheets/application.css e31160403bc4547bbfc8a0165007bc522c758e89 jdpace jared@codewordstudios.com http://github.com/jdpace/hubbub/commit/7d677c73868d965add3dc812a6f6f2d7c09ee2dd 7d677c73868d965add3dc812a6f6f2d7c09ee2dd 2009-10-21T13:05:49-07:00 2009-10-21T13:05:49-07:00 Give the post show page some style 16d19c21c95d65a511e5b5f938afe43dd56811aa jdpace jared@codewordstudios.com