From 860e3ab526bbcccd64aac45fa377c14e78ef345c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 19 May 2012 12:25:16 +0300
Subject: [PATCH] Event feed: Icons for some events

---
 app/assets/images/event_mr_merged.png           | Bin 0 -> 463 bytes
 app/assets/images/event_push.png                | Bin 0 -> 632 bytes
 app/assets/stylesheets/common.scss              |   7 +++++++
 app/assets/stylesheets/ui_basic.scss            |   1 -
 app/assets/stylesheets/ui_mars.scss             |   1 -
 app/views/events/_event_merge_request.html.haml |   2 ++
 app/views/events/_event_push.html.haml          |   2 ++
 7 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/images/event_mr_merged.png
 create mode 100644 app/assets/images/event_push.png

diff --git a/app/assets/images/event_mr_merged.png b/app/assets/images/event_mr_merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..30aea0b6e55985cc8e881d952d1f4282cc80a046
GIT binary patch
literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{
z2@)MQM<#Fp00B=)L_t(I%iWW)N&`U<hQCCOO%Op5MT25vvoUHcm5A;37P4<4_#(c-
zf>>B?r-G$o6;>qnTBxX}7J`_wnZUB-%q4aXEZoff`|bR<H;^NgGkeOJ{XE)24%j4c
zFX^n;_VG7;u?MUKG=ULWP36q!z(C*tm<jS}sr7GJIkN*C0coJ?JnwpK4|4;RGZTOp
z2UF4O2cQj9y|z#B-r<Y}pMgc7EPya-KmvUBeap(3GVmUi$Gx`6pqJ8j{7+!|7vOQu
zTF?J*2)F`PGWIorHLvY=-VRR$mPQsk`7&_UvqR-f5jX|50#HGwCIzZd{T$f#+P1Sg
zya-?gS+BqbunD{b^%Q6Tmt8F@XI6pr=zv?G;<Zg=Ix0Xb($tkR^(@Ov^1(|oa&unW
zw=Uy&2aEw<K+S7=)77%qwk0;Mf%zCFnh#(>G>s4j@B>kWXKTjC0O|k$002ovPDHLk
FV1kZ7yrKXA

literal 0
HcmV?d00001

diff --git a/app/assets/images/event_push.png b/app/assets/images/event_push.png
new file mode 100644
index 0000000000000000000000000000000000000000..930faee6aa2a441ab0805910cf815212f95cfe83
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{
z2@)=dmq%s*00H<(L_t(I%dOPEYZOrs2k_5rB!qySkQ9rWUSc5#Tck)33yF|2!Y#qG
zNm8Xxy88ptd5wwDhd<HMQVc1wSjpL&B5W0+Mf?F#^laY2v20Qp2VOI8-uKPScfQk5
zV`(Txk>L)eaTyKl;~k!2x6HHe)whirusJ-#2oCWWUG#7jO^o3f3uT_YI1w-n#X45-
z2JJG>-k(sxHLPI{oifjs>w?zPQ1sGJEY;j4X()zj{H-(;f6`EN`o3hK%oQw`dDf{(
z>H!{Aon@YFqJ_mY6isME0zTtynP;;#S<J_t!rd~@wrXNt;WjQLk<AgbYXWZ$fWgBw
z6tguIv@wjSB#y>mm4Gx9<9Hd_?OPAe(@<Qjl-`Xa)l4uGM`I9d2p=(8nS@5n<U<;Y
z;YyZUm`-ph&e`CPzhf(I)RcD%*YT_3?_&I1{IyrZ;HNYc$2EX^WuEQT_<Q}a*^df1
zt4-n{iP~)b2fzhvCsF8QQBMD4X(+B>0wKX}6#Cj3vRjQL?IdvpEnqGUMXM6{6W{P9
zp0CkYRnk0`$~-%23|!pDB3gs;iqafp|3?Mv3AV~SyH~fqIuZ1BTwmQ&dbS!f+w6m#
zv|yXqh>F;c3g|D`$=IHW*t4ZF&o)lo*b($Rrs6ow#0?Dx*hauknP*4Uw|@aR*tis<
Sh#*h^0000<MNUMnLSTY4niLlR

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c7112de3120..ca797ed06f4 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -645,6 +645,13 @@ p.time {
   .avatar { 
     width:32px;
   }
+  .event_icon { 
+    float:right;
+    margin-right:2px;
+    img { 
+      width:20px;
+    }
+  }
   ul { 
     margin-left:50px;
     margin-bottom:5px;
diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss
index b60662c0b4b..16517dc73be 100644
--- a/app/assets/stylesheets/ui_basic.scss
+++ b/app/assets/stylesheets/ui_basic.scss
@@ -83,7 +83,6 @@
 
     .project_name {
       float:left;
-      width:360px;
       margin:0;
       margin-right:30px;
       font-size:20px;
diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss
index 24951991dd3..feb02e1febc 100644
--- a/app/assets/stylesheets/ui_mars.scss
+++ b/app/assets/stylesheets/ui_mars.scss
@@ -97,7 +97,6 @@
     }
     .project_name {
       float:left;
-      width:360px;
       margin:0;
       margin-right:30px;
       font-size:20px;
diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml
index ecb0e9ff394..5c1c66e0afb 100644
--- a/app/views/events/_event_merge_request.html.haml
+++ b/app/views/events/_event_merge_request.html.haml
@@ -1,3 +1,5 @@
+- if event.action_name == "merged"
+  .event_icon= image_tag "event_mr_merged.png"
 = image_tag gravatar_icon(event.author_email), :class => "avatar"
 %strong #{event.author_name} 
 %span.event_label= event.action_name
diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml
index a94dc653dd8..aff66385681 100644
--- a/app/views/events/_event_push.html.haml
+++ b/app/views/events/_event_push.html.haml
@@ -1,7 +1,9 @@
 %div
+  .event_icon= image_tag "event_push.png"
   = image_tag gravatar_icon(event.author_email), :class => "avatar"
   %strong #{event.author_name} 
   %span.event_label= event.push_action_name
+  = event.ref_type
   = link_to project_commits_path(event.project, :ref => event.ref_name) do
     %strong= event.ref_name
   at 
-- 
GitLab