Fixing activity render

rainly · Aug 20, 2008 · 568bcbd · 568bcbd
1 parent 23289a3
commit 568bcbd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 30 deletions.
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
@@ -1,36 +1,7 @@
 module ProjectsHelper
 
   def activity_display(activity, options = {})
-
-    haml_tag :span, :class => "activity #{activity.target_type}".downcase do
-
-      puts activity.user_name
-      puts " "
-      puts activity.action_name
-      puts " "
-
-      puts activity.midsentence
-      puts " "          
-
-
-      puts activity_target_link(activity)
-      puts " "
-      puts activity.endconnector
-
-      if activity.project_id
-        puts " "
-        puts link_to(activity.project_name.to_s+".", project_url(:id => activity.project_id))
-      else
-        puts "."
-      end
-
-      # display time
-      haml_tag :span, :class => "when" do
-        puts time_ago_in_words(activity.happened_at)
-        puts " ago"
-      end
-
-    end
+    partial "activities/activity", options.merge(:activity => activity)
   end
 
   def activity_target_link(activity)    

diff --git a/app/views/activities/_activity.html.haml b/app/views/activities/_activity.html.haml
@@ -0,0 +1,17 @@
+- if local_assigns[:activity]
+  %span.activity{:class => activity.target_type.downcase}
+
+    = activity.user_name
+    = activity.action_name
+    = activity.midsentence
+    = activity_target_link(activity)
+    = activity.endconnector
+
+    - if activity.project_id
+      = activity.endconnector+link_to(activity.project_name.to_s+".", project_url(:id => activity.project_id))
+    - else
+      == #{activity.endconnector}.
+
+    %span.when
+      = time_ago_in_words(activity.happened_at)
+      ago