Added timestamps. Some styling.

steveklabnik · steveklabnik · commit 6d8762a8f2f0 · 2010-08-15T00:48:51.000-04:00
diff --git a/controllers/forums.rb b/controllers/forums.rb
@@ -11,8 +11,23 @@
 	#we use this in the view
 	@forum = params[:forum]
 
+	#this is kind of an ugly way to do this.
+	@forum_name,
+	@forum_description =
+		case @forum
+		when 'learning_ruby'
+			["Learning Ruby",
+				"A place to learn about the Ruby programming language."]
+		when 'hackety_help'
+			["Hackety Help",
+				"Have a question about Hackety? You're in the right place!"]
+		when 'clubhouse'
+			["The Clubhouse",
+				"A place to talk to other Hackers about anything you'd like to talk about."]
+		end
+
 	#gotta find all the discussions in this forum
-	@discussions = Discussion.all(:forum => params[:forum])
+	@discussions = Discussion.all(:forum => params[:forum]).sort{|a,b| a.updated_at <=> b.updated_at}.reverse
 
 	#render the template!
 	haml :"forums/show"
diff --git a/models/discussion.rb b/models/discussion.rb
@@ -21,6 +21,8 @@ class Discussion
 	#this is the slug for the url
 	key :slug, String 
 
+	timestamps!
+
 	before_save :make_slug
 	validate_on_create :author_check
  
diff --git a/views/discussions/show.haml b/views/discussions/show.haml
@@ -1,5 +1,7 @@
+%p{:style => "float:left;padding-right:1em"}
+  %img{:src => gravatar_url_for(@discussion.author)}
 %h1= @discussion.title
-%p #{@discussion.author} says:
+%p{:style => "padding-bottom:1em"} By <a href="/hackers/#{@discussion.author}">#{@discussion.author}</a>
 
 %p= @discussion.body
 
diff --git a/views/forums/show.haml b/views/forums/show.haml
@@ -1,9 +1,12 @@
-%ul
-- @discussions.each do |discussion|
-  %li
-    %a{ :href => "/forums/#{@forum}/#{discussion.slug}" }= discussion.title
-
+%h1 Hackety Hack Forums: #{@forum_name}
+%p{:style => "padding-top:1em;padding-bottom:1em"}= @forum_description
 - unless current_user.nil?
   %a{:href => "/forums/#{@forum}/discussions/new"} New Discussion
+%ol
+  - @discussions.each do |discussion|
+    %li
+      %a{ :href => "/forums/#{@forum}/#{discussion.slug}" }= discussion.title
+      (posted by <a href="/hackers/#{discussion.author}">#{discussion.author}</a>)
+
 
 %a{ :href => "/forums" } Back to Forum List
