Updated audit entry text and style

pmenglund · May 4, 2010 · 0d56fb9 · 0d56fb9
1 parent 2aee9fa
commit 0d56fb9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/app/views/timeline_events/_timeline_event.haml b/app/views/timeline_events/_timeline_event.haml
@@ -1,10 +1,15 @@
 - te = timeline_event
 - is_current = @node && te.subject == @node
-- subject = is_current ? "This node" : te.subject_type
+- subject_name = te.subject && te.subject_name
+- subject = is_current ? "This node" : subject_name
+
+- is_secondary = @node && te.secondary_subject == @node
+- secondary_name = te.secondary_subject && te.secondary_name
+- secondary = is_secondary ? "this node" : secondary_name
 
 %li{:class => te.object_type}
-  = link_to_unless is_current || te.secondary_subject_type,  subject, te.subject
+  %span.date
+    = te.created_at
+  = begin; link_to_unless is_current, subject, te.subject; rescue NoMethodError; subject; end
   = te.action
-  = link_to te.secondary_name, te.secondary_subject if te.secondary_subject_type
-  = time_ago_in_words(te.created_at)
-  ago
+  = link_to_unless is_secondary, secondary, te.secondary_subject if te.secondary_subject_type
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -35,6 +35,12 @@ ol.timeline li {
   position: relative;
 }
 
+ol.timeline li span.date {
+  color: #666;
+  display: inline-block;
+  width: 9em;
+}
+
 ul.status {
   list-style: none;
 }