Add activity labels to activities#index and users#show

pull/814/head
Till Breuer 11 years ago
parent 66f5c2fb0b
commit 8e12d65543
  1. 10
      app/assets/stylesheets/fonts/openproject_icon_font.css.sass
  2. 4
      app/views/activities/index.html.erb
  3. 3
      app/views/users/show.html.erb
  4. 4
      config/locales/de.yml
  5. 4
      config/locales/en.yml

@ -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"

@ -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 %>

@ -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 %>

@ -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'

@ -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'

Loading…
Cancel
Save