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

pull/6827/head
Hagen Schink 11 years ago
commit 049539e0ae
  1. 1
      CHANGELOG.md
  2. 2
      app/assets/stylesheets/costs/costs.css.erb
  3. 4
      app/models/activity/cost_object_activity_provider.rb
  4. 3
      config/locales/de.yml
  5. 3
      config/locales/en.yml
  6. 6
      lib/open_project/costs/hooks/activity_hook.rb

@ -2,6 +2,7 @@
## 5.0.1.pre11
* `#2250` [Accessibility] activity icon labels
* `#2258` [Accessibility] linearisation of issue show form
* removed not needed require of core css files
* firxed cuke

@ -11,7 +11,7 @@
background-position: 20px 40%;
}
dt.cost_object:before {
dt > .icon-cost_object:before {
content: "\e003";
}

@ -21,6 +21,10 @@ class Activity::CostObjectActivityProvider < Activity::BaseActivityProvider
]
end
def event_type(event, activity)
'cost_object'
end
def event_title(event, activity)
"#{l(:label_cost_object)} ##{event['journable_id']}: #{event['cost_object_subject']}"
end

@ -92,6 +92,9 @@ de:
description_date_for_new_rate: "Datum für neuen Satz"
events:
cost_object: "Budget bearbeitet"
group_by_others: "In keiner der Gruppen"
help_click_to_edit: "Hier Klicken zum bearbeiten."

@ -92,6 +92,9 @@ en:
description_date_for_new_rate: "Date for new rate"
events:
cost_object: "Budget edited"
group_by_others: "not in any group"
help_click_to_edit: "Click here to edit."

@ -1,4 +1,10 @@
class OpenProject::Costs::Hooks::ActivityHook < Redmine::Hook::ViewListener
render_on :activity_index_head,
:partial => 'hooks/costs/activity_index_head'
render_on :users_show_head,
partial: 'hooks/costs/activity_index_head'
render_on :search_index_head,
partial: 'hooks/costs/activity_index_head'
end

Loading…
Cancel
Save