More forum styling.

steveklabnik · steveklabnik · commit 6b770ef1da84 · 2010-08-15T02:25:18.000-04:00
diff --git a/Rakefile b/Rakefile
@@ -41,8 +41,8 @@ namespace :db do
 		#make an admin user
 		require 'models/hacker'
 		admin = Hacker.create({
-			:username => "admin",
-			:email => "admin@example.com",
+			:username => "steve",
+			:email => "steve@steveklabnik.com",
 			:password => "password",
 			:password_confirmation => "password",
 			:admin => true
@@ -90,13 +90,15 @@ Esse insolens mnesarchum eam id, nec ad detracto disputando. Nec malorum postula
 			:title => "HALP ME!",
 			:body => "I just don't understand!",
 			:forum => "learning_ruby",
-			:author => "somebody"
+			:author => "somebody",
+			:author_email => "somebody@example.com"
 		})
 
 		#and a reply:
 		halp.replies << Reply.new({
 			:body => "I'd love to help you!",
-			:author => "admin"
+			:author => "steve",
+			:author_email => "steve@steveklabnik.com"
 		})
 
 		halp.save
diff --git a/controllers/forums.rb b/controllers/forums.rb
@@ -61,6 +61,7 @@
 post "/forums/reply/to/:forum/:discussion" do
 	@discussion = Discussion.first(:forum => params[:forum], :slug => params[:discussion])
 	params[:reply][:author] = current_user.username
+	params[:reply][:author_email] = current_user.email
 	@discussion.replies << Reply.new(params[:reply])
 	@discussion.save
 
diff --git a/models/reply.rb b/models/reply.rb
@@ -8,6 +8,7 @@ class Reply
 
 	#the person who wrote it
 	key :author, String
+	key :author_email, String
 
 	#we need to make sure we have an author
 	validate_on_create :author_check
diff --git a/views/discussions/show.haml b/views/discussions/show.haml
@@ -1,14 +1,27 @@
 %p{:style => "float:left;padding-right:1em"}
-  %img{:src => gravatar_url_for(@discussion.author)}
+	%img{:src => gravatar_url_for(@discussion.author)}
 %h1= @discussion.title
 %p{:style => "padding-bottom:1em"} By <a href="/hackers/#{@discussion.author}">#{@discussion.author}</a>
 
 %p= @discussion.body
 
-%ul
-  - @discussion.replies.each do |reply|
-    %li #{reply.author} says: #{reply.body}
+%hr 
+
+- @discussion.replies.each do |reply|
+	.comment{:style => "clear:both"}
+		%div{:class => "left"}
+			%a{:href => "/hackers/#{reply.author}"}
+				%img{:src => gravatar_url_for(reply.author_email), :alt => "#{reply.author.downcase}_gravatar", :class => "comment_gravatar"}
+		%div{:style => "width:500px"}
+			%p
+				<a href="/hackers/#{reply.author}">#{reply.author}</a> says:
+			%p
+				= reply.body
+
+%hr
 
 - unless current_user.nil?
-  %a{ :href => "/forums/reply/to/#{@discussion.forum}/#{@discussion.slug}"} Reply
+	%a{ :href => "/forums/reply/to/#{@discussion.forum}/#{@discussion.slug}"} Reply
+	%br
+	%br
 %a{ :href => "/forums/#{@discussion.forum}" } Back to Discussions
diff --git a/views/posts/show.haml b/views/posts/show.haml
@@ -1,29 +1,31 @@
 .post
-  %h1= @post.title
-  - markdown = RDiscount.new(@post.body, :smart, :filter_html)
-  %div!= markdown.to_html
-  %hr
-  - @post.comments.each do |comment|
-    .comment{:style => "clear:both"}
-      %div{:class => "left"}
-        %a{:href => "/hackers/#{comment.author}"}
-          %img{:src => gravatar_url_for(comment.author_email), :alt => "#{comment.author.downcase}_gravatar", :class => "comment_gravatar"}
-      %div{:style => "width:500px"}
-        %p
-          <a href="/hackers/#{comment.author}">#{comment.author}</a> says:
-        %p
-          = comment.body
-  - if logged_in?
-    %hr
-    %form{:action => "/comments", :method => "POST"}
-      %input{:type => "hidden", :id => "post_id", :name => "post_id", :value => @post.id}
-      %label{:for => "comment_body"} Submit your opinion:
-      %br
-      %textarea{:id => "comment_body", :name => "comment[body]", :cols => 70, :rows => 5}
-      %br
-      %input{:type => "submit", :value => "Submit"}
-  - else
-    %p <a href="/login">Log in</a> to add your own commentary.
-  %hr
-  %a{:href => "/blog"}Back to blog
+	%h1= @post.title
+	- markdown = RDiscount.new(@post.body, :smart, :filter_html)
+	%div!= markdown.to_html
+	%hr
+	%br
+	- @post.comments.each do |comment|
+		.comment{:style => "clear:both"}
+			%div{:class => "left"}
+				%a{:href => "/hackers/#{comment.author}"}
+					%img{:src => gravatar_url_for(comment.author_email), :alt => "#{comment.author.downcase}_gravatar", :class => "comment_gravatar"}
+			%div{:style => "width:500px"}
+				%p
+					<a href="/hackers/#{comment.author}">#{comment.author}</a> says:
+				%p
+					= comment.body
+	%br
+	- if logged_in?
+		%hr
+		%form{:action => "/comments", :method => "POST"}
+			%input{:type => "hidden", :id => "post_id", :name => "post_id", :value => @post.id}
+			%label{:for => "comment_body"} Submit your opinion:
+			%br
+			%textarea{:id => "comment_body", :name => "comment[body]", :cols => 70, :rows => 5}
+			%br
+			%input{:type => "submit", :value => "Submit"}
+	- else
+		%p <a href="/login">Log in</a> to add your own commentary.
+	%hr
+	%a{:href => "/blog"}Back to blog
 
