Merge pull request #34 from finnlabs/activity-icon-labels-2250

CHANGELOG.md

@@ -23,6 +23,7 @@ See doc/COPYRIGHT.md for more details.
 ## 3.0.6
 
 * Adaptations for new icon font
+* `#2250` [Accessibility] activity icon labels
 * `#2759` Fix: [Performance] Activity View very slow
 * `#3119` [Migration] Meetings do not migrate planning element references
 * `#3329` Refactor Duplicated Code Journals

app/assets/stylesheets/meeting/meeting.css.erb

@@ -34,15 +34,15 @@ div.tabular > div { margin: 0;
 #meeting_agenda_preview fieldset {margin-top: 1em; background: url(<%= asset_path 'draft.png' %>);}
 #meeting_minutes_preview fieldset {margin-top: 1em; background: url(<%= asset_path 'draft.png' %>);}
 
-dt.meeting:before {
+dt > .icon-meeting:before {
   content: "\e057";
 }
 
-dt.meeting-agenda:before {
+dt > .icon-meeting-agenda:before {
   content: "\e023";
 }
 
-dt.meeting-minutes:before {
+dt > .icon-meeting-minutes:before {
   content: "\e022";
 }
 

app/models/activity/meeting_activity_provider.rb

@@ -19,7 +19,7 @@
 #++
 
 class Activity::MeetingActivityProvider < Activity::BaseActivityProvider
-  
+
   acts_as_activity_provider type: 'meetings',
                             activities: [ :meeting, :meeting_content ],
                             permission: :view_meetings
@@ -76,6 +76,19 @@ class Activity::MeetingActivityProvider < Activity::BaseActivityProvider
 
   protected
 
+  def event_name(event, activity)
+    case event['event_description']
+    when 'Agenda closed'
+      I18n.t('meeting_agenda_closed', scope: 'events')
+    when 'Agenda opened'
+      I18n.t('meeting_agenda_opened', scope: 'events')
+    when 'Minutes created'
+      I18n.t('meeting_minutes_created', scope: 'events')
+    else
+      super
+    end
+  end
+
   def event_title(event, activity)
     case activity
     when :meeting

config/locales/de.yml

@@ -35,6 +35,14 @@ de:
   description_attended: "teilgenommen"
   description_invite: "eingeladen"
 
+  events:
+    meeting: Meeting bearbeitet
+    meeting_agenda: Meeting Agenda bearbeitet
+    meeting_agenda_closed: Meeting Agenda abgeschlossen
+    meeting_agenda_opened: Meeting Agenda geöffnet
+    meeting_minutes: Meeting Protokoll bearbeitet
+    meeting_minutes_created: Meeting Protokoll erstellt
+
   label_meeting: "Besprechung"
   label_meeting_plural: "Besprechungen"
   label_meeting_new: "Neue Besprechung"

config/locales/en.yml

@@ -35,6 +35,14 @@ en:
   description_attended: "attended"
   description_invite: "invited"
 
+  events:
+    meeting: Meeting edited
+    meeting_agenda: Meeting agenda edited
+    meeting_agenda_closed: Meeting agenda closed
+    meeting_agenda_opened: Meeting agenda opened
+    meeting_minutes: Meeting minutes edited
+    meeting_minutes_created: Meeting minutes created
+
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"

lib/open_project/meeting/hooks.rb

@@ -20,6 +20,13 @@
 module OpenProject::Meeting
   class Hooks < Redmine::Hook::ViewListener
     render_on :activity_index_head,
-              :partial => 'hooks/meetings/activity_index_head'
+              partial: 'hooks/meetings/activity_index_head'
+
+    render_on :users_show_head,
+              partial: 'hooks/meetings/activity_index_head'
+
+    render_on :search_index_head,
+              partial: 'hooks/meetings/activity_index_head'
+
   end
 end