From 8e12d655436ce2f898730a58b4b1f9ecf2305ee2 Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Mon, 13 Jan 2014 11:54:13 +0100
Subject: [PATCH] Add activity labels to activities#index and users#show

---
 .../stylesheets/fonts/openproject_icon_font.css.sass   | 10 ----------
 app/views/activities/index.html.erb                    |  4 ++--
 app/views/users/show.html.erb                          |  3 ++-
 config/locales/de.yml                                  |  4 ++--
 config/locales/en.yml                                  |  4 ++--
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass
index 2b2a9f531c..771050b22a 100644
--- a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass
+++ b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass
@@ -245,32 +245,22 @@ dt.message:before,
 .icon-status:before
   content: "\e020"
 
-dt.issue:before,
-dt.work_package:before,
 dt > .icon-work_package:before,
 .icon-ticket:before
   content: "\e021"
 
-dt.issue-closed:before,
-dt.work_package-closed:before,
 dt > .icon-work_package-closed:before,
 .icon-ticket-checked:before
   content: "\e022"
 
-dt.issue-edit:before,
-dt.work_package-edit:before,
 dt > .icon-work_package-edit:before,
 .icon-ticket-edit:before
   content: "\e023"
 
-dt.issue-note:before,
-dt.work_package-note:before,
 dt > .icon-work_package-note:before,
 .icon-ticket-note:before
   content: "\e024"
 
-dt.time_entry:before,
-dt.time-entry:before,
 dt > .icon-time_entry:before,
 .icon-time:before
   content: "\e025"
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 074ec9c6d7..8915cc45a8 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -39,8 +39,8 @@ See doc/COPYRIGHT.rdoc for more details.
     <h3><%= format_activity_day(day) %></h3>
     <dl>
       <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-        <dt class="<%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
-          <%= icon_wrapper("icon-context icon-#{e.event_type}", t("label_events_#{e.event_type}".underscore)) %>
+        <dt class="<%= e.event_type %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
+          <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %>
           <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
           <span class="time"><%= format_time(e.event_datetime.to_time, false) %></span>
           <%= content_tag('span', link_to(e.project.name, e.project), :class => 'project') if (@project.nil? || @project != e.project) && e.project %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 21377f6c65..f44fdbb4ec 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -78,7 +78,8 @@ See doc/COPYRIGHT.rdoc for more details.
         <h4><%= format_activity_day(day) %></h4>
         <dl>
           <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-            <dt class="icon-context <%= e.event_type %>">
+            <dt class="<%= e.event_type %>">
+              <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') %>
               <%= link_to format_activity_title(e.event_title), e.event_url %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9b341c0436..c351933da8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -522,9 +522,9 @@ de:
 
   events:
     changeset: Changeset bearbeitet
-    message: Nachricht
+    message: Nachricht bearbeitet
     news: News
-    reply: Antwort
+    reply: Antwort erstellt
     time_entry: Zeiterfassungseintrag-Bearbeitung
     wiki_page: Wiki-Bearbeitung
     work_package_closed: 'Arbeitspaket geschlossen'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bdbb60e595..45f8559921 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -519,9 +519,9 @@ en:
 
   events:
     changeset: 'Changeset edited'
-    message: Message
+    message: Message edited
     news: News
-    reply: Reply
+    reply: Replied
     time_entry: 'Timelog edited'
     wiki_page: 'Wiki page edited'
     work_package_closed: 'Work Package closed'