Render small avatars for inline events

Dmitriy Zaporozhets
1 parent 9174020f
Showing 3 changed files with 18 additions and 1 deletions Show diff stats
app/assets/stylesheets/sections/events.scss
app/models/event.rb
app/views/events/_event.html.haml
@@ -35,6 +35,13 @@
     padding-top: 0;
   }
  
+  &.event-inline {
+    .avatar {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
   padding: 14px 0px;
   border-bottom: 1px solid #eee;
   .event-title {
@@ -291,4 +291,14 @@ class Event &lt; ActiveRecord::Base
       "Wall"
     end.downcase
   end
+
+  def body?
+    if push?
+      push_with_commits?
+    elsif note?
+      true
+    else
+      target.respond_to? :title
+    end
+  end
 end
 - if event.proper?
-  %div.event-item
+  .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
     %span.cgray.pull-right
       #{time_ago_in_words(event.created_at)} ago.
...	...	@@ -35,6 +35,13 @@
35	35	padding-top: 0;
36	36	}
37	37
	38	+ &.event-inline {
	39	+ .avatar {
	40	+ width: 16px;
	41	+ height: 16px;
	42	+ }
	43	+ }
	44	+
38	45	padding: 14px 0px;
39	46	border-bottom: 1px solid #eee;
40	47	.event-title {
...	...
...	...	@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base
291	291	"Wall"
292	292	end.downcase
293	293	end
	294	+
	295	+ def body?
	296	+ if push?
	297	+ push_with_commits?
	298	+ elsif note?
	299	+ true
	300	+ else
	301	+ target.respond_to? :title
	302	+ end
	303	+ end
294	304	end
...	...
1	1	- if event.proper?
2		- %div.event-item
	2	+ .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
3	3	%span.cgray.pull-right
4	4	#{time_ago_in_words(event.created_at)} ago.
5	5
...	...