From 00ca8c9b989728b00b5d8f28e29ca05d659f55f1 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Thu, 9 Jan 2014 10:58:09 +0100 Subject: [PATCH 01/11] Sketch activity icon labels --- app/assets/stylesheets/fonts/openproject_icon_font.css.sass | 5 +++++ app/views/activities/index.html.erb | 3 ++- config/locales/de.yml | 2 ++ config/locales/en.yml | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass index cd8eaaf6ab..2b2a9f531c 100644 --- a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass +++ b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass @@ -247,26 +247,31 @@ dt.message:before, 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 ca35729874..074ec9c6d7 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -39,7 +39,8 @@ See doc/COPYRIGHT.rdoc for more details.

<%= format_activity_day(day) %>

<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> -
+
+ <%= icon_wrapper("icon-context icon-#{e.event_type}", t("label_events_#{e.event_type}".underscore)) %> <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %> <%= format_time(e.event_datetime.to_time, false) %> <%= content_tag('span', link_to(e.project.name, e.project), :class => 'project') if (@project.nil? || @project != e.project) && e.project %> diff --git a/config/locales/de.yml b/config/locales/de.yml index a651ca923d..d02680b994 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -685,6 +685,8 @@ de: label_enumerations: "Aufzählungen" label_environment: "Umgebung" label_equals: "ist" + label_events_work_package_closed: 'Arbeitspaket geschlossen' + label_events_work_package_edited: 'Arbeitspaket bearbeitet' label_example: "Beispiel" label_export_to: "Auch abrufbar als:" label_f_hour: "%{value} Stunde" diff --git a/config/locales/en.yml b/config/locales/en.yml index e6cb4181f5..17468601e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -681,6 +681,8 @@ en: label_enumerations: "Enumerations" label_environment: "Environment" label_equals: "is" + label_events_work_package_closed: 'Work package closed' + label_events_work_package_edited: 'Work package edited' label_example: "Example" label_export_to: "Also available in:" label_f_hour: "%{value} hour" From 66f5c2fb0b1ac3d2c8eb64a441a17fbb67f5ae94 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 09:42:52 +0100 Subject: [PATCH 02/11] Add event types and names to activity providers (#2250) --- app/models/activity/base_activity_provider.rb | 12 +++++++++++- app/models/activity/changeset_activity_provider.rb | 4 ++++ app/models/activity/news_activity_provider.rb | 4 ++++ app/models/activity/time_entry_activity_provider.rb | 4 ++++ config/locales/de.yml | 12 ++++++++++-- config/locales/en.yml | 13 +++++++++++-- .../lib/acts_as_activity_provider.rb | 2 ++ lib/plugins/acts_as_event/lib/acts_as_event.rb | 2 +- 8 files changed, 47 insertions(+), 6 deletions(-) diff --git a/app/models/activity/base_activity_provider.rb b/app/models/activity/base_activity_provider.rb index 5b035bc5f1..9fe15f621a 100644 --- a/app/models/activity/base_activity_provider.rb +++ b/app/models/activity/base_activity_provider.rb @@ -31,6 +31,7 @@ # The base activity provider class provides a default implementation for the # # most common activity jobs. You may implement the following methods to set # # the respective activity details: # +# - event_name # # - event_title # # - event_type # # - event_description # @@ -83,7 +84,7 @@ class Activity::BaseActivityProvider end def format_event(event, event_data, activity) - [:event_title, :event_type, :event_description, :event_datetime, :event_path, :event_url].each do |a| + [:event_name, :event_title, :event_type, :event_description, :event_datetime, :event_path, :event_url].each do |a| event[a] = self.send(a, event_data, activity) if self.class.method_defined? a end @@ -123,4 +124,13 @@ class Activity::BaseActivityProvider def projection_statement(table, column, name) table[column].as(name) end + + class UndefinedEventTypeError < StandardError; end + def event_type(event, activity) + raise UndefinedEventTypeError.new('Abstract method event_type called') + end + + def event_name(event, activity) + I18n.t(event_type(event, activity).underscore, scope: 'events') + end end diff --git a/app/models/activity/changeset_activity_provider.rb b/app/models/activity/changeset_activity_provider.rb index f1c27311ee..a71495875c 100644 --- a/app/models/activity/changeset_activity_provider.rb +++ b/app/models/activity/changeset_activity_provider.rb @@ -53,6 +53,10 @@ class Activity::ChangesetActivityProvider < Activity::BaseActivityProvider protected + def event_type(event, activity) + 'changeset' + end + def event_title(event, activity) revision = format_revision(event) diff --git a/app/models/activity/news_activity_provider.rb b/app/models/activity/news_activity_provider.rb index aaee01519f..386d04054c 100644 --- a/app/models/activity/news_activity_provider.rb +++ b/app/models/activity/news_activity_provider.rb @@ -48,6 +48,10 @@ class Activity::NewsActivityProvider < Activity::BaseActivityProvider event['title'] end + def event_type(event, activity) + 'news' + end + def event_path(event, activity) Rails.application.routes.url_helpers.news_path(url_helper_parameter(event)) end diff --git a/app/models/activity/time_entry_activity_provider.rb b/app/models/activity/time_entry_activity_provider.rb index 8ac87b2840..c5a101ec25 100644 --- a/app/models/activity/time_entry_activity_provider.rb +++ b/app/models/activity/time_entry_activity_provider.rb @@ -60,6 +60,10 @@ class Activity::TimeEntryActivityProvider < Activity::BaseActivityProvider "#{l_hours(event['time_entry_hours'])} (#{time_entry_object_name})" end + def event_type(event, activity) + 'time-entry' + end + def work_package_title(event) Activity::WorkPackageActivityProvider.work_package_title(event['journable_id'], event['work_package_subject'], diff --git a/config/locales/de.yml b/config/locales/de.yml index d02680b994..9b341c0436 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -520,6 +520,16 @@ de: error_menu_item_not_created: Menüpunkt konnte nicht hinzugefügt werden. error_menu_item_not_saved: Menüpunkt konnte nicht aktualisiert werden. + events: + changeset: Changeset bearbeitet + message: Nachricht + news: News + reply: Antwort + time_entry: Zeiterfassungseintrag-Bearbeitung + wiki_page: Wiki-Bearbeitung + work_package_closed: 'Arbeitspaket geschlossen' + work_package_edit: 'Arbeitspaket bearbeitet' + work_package_note: 'Arbeitspaket kommentiert' general_csv_decimal_separator: "," general_csv_encoding: "ISO-8859-1" @@ -685,8 +695,6 @@ de: label_enumerations: "Aufzählungen" label_environment: "Umgebung" label_equals: "ist" - label_events_work_package_closed: 'Arbeitspaket geschlossen' - label_events_work_package_edited: 'Arbeitspaket bearbeitet' label_example: "Beispiel" label_export_to: "Auch abrufbar als:" label_f_hour: "%{value} Stunde" diff --git a/config/locales/en.yml b/config/locales/en.yml index 17468601e0..bdbb60e595 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -517,6 +517,17 @@ en: error_menu_item_not_created: Menu item could not be added error_menu_item_not_saved: Menu item could not be saved + events: + changeset: 'Changeset edited' + message: Message + news: News + reply: Reply + time_entry: 'Timelog edited' + wiki_page: 'Wiki page edited' + work_package_closed: 'Work Package closed' + work_package_edit: 'Work Package edited' + work_package_note: 'Work Package note added' + general_csv_decimal_separator: "." general_csv_encoding: "ISO-8859-1" general_csv_separator: "," @@ -681,8 +692,6 @@ en: label_enumerations: "Enumerations" label_environment: "Environment" label_equals: "is" - label_events_work_package_closed: 'Work package closed' - label_events_work_package_edited: 'Work package edited' label_example: "Example" label_export_to: "Also available in:" label_f_hour: "%{value} hour" diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb index 2f4fe8ed3f..5a890be5eb 100644 --- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb @@ -54,6 +54,7 @@ module Redmine end Event = Struct.new(:provider, + :event_name, :event_title, :event_description, :author_id, @@ -212,6 +213,7 @@ module Redmine datetime = e['event_datetime'].is_a?(String) ? DateTime.parse(e['event_datetime']) : e['event_datetime'] event = Redmine::Acts::ActivityProvider::Event.new(self, + nil, nil, e['event_description'], e['event_author'].to_i, diff --git a/lib/plugins/acts_as_event/lib/acts_as_event.rb b/lib/plugins/acts_as_event/lib/acts_as_event.rb index 009eb4c461..bcf3e8a171 100644 --- a/lib/plugins/acts_as_event/lib/acts_as_event.rb +++ b/lib/plugins/acts_as_event/lib/acts_as_event.rb @@ -54,7 +54,7 @@ module Redmine base.extend ClassMethods end - %w(datetime title description author type).each do |attr| + %w(datetime title description author name type).each do |attr| src = <<-END_SRC def event_#{attr} option = event_options[:#{attr}] From 8e12d655436ce2f898730a58b4b1f9ecf2305ee2 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 11:54:13 +0100 Subject: [PATCH 03/11] 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.

<%= format_activity_day(day) %>

<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> -
- <%= icon_wrapper("icon-context icon-#{e.event_type}", t("label_events_#{e.event_type}".underscore)) %> +
+ <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %> <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %> <%= format_time(e.event_datetime.to_time, false) %> <%= 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.

<%= format_activity_day(day) %>

<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> -
+
+ <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %> <%= format_time(e.event_datetime, false) %> <%= 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' From b37bb3edd6537acd1b44d94a41074c8c51da1bab Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 15:54:55 +0100 Subject: [PATCH 04/11] Add icon labels to search#index --- app/models/work_package.rb | 7 +++++++ app/views/search/index.html.erb | 3 ++- lib/plugins/acts_as_event/lib/acts_as_event.rb | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/work_package.rb b/app/models/work_package.rb index 9e8bd4366a..a6293bd7a3 100644 --- a/app/models/work_package.rb +++ b/app/models/work_package.rb @@ -172,6 +172,12 @@ class WorkPackage < ActiveRecord::Base end end + def self.event_name + Proc.new do |o| + I18n.t(o.event_type.underscore, scope: 'events') + end + end + def self.event_type Proc.new do |o| journal = o.last_journal @@ -197,6 +203,7 @@ class WorkPackage < ActiveRecord::Base acts_as_event title: JournalizedProcs.event_title, type: JournalizedProcs.event_type, + name: JournalizedProcs.event_name, url: JournalizedProcs.event_url register_on_journal_formatter(:id, 'parent_id') diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index 368b1d6ce1..e3c541342d 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -59,7 +59,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% @results.each do |e| %> -
+
+ <%= icon_wrapper("icon-context icon-#{e.event_type}", e.event_name) %> <% if e.project != @project %> <%= e.project %> <% end %> diff --git a/lib/plugins/acts_as_event/lib/acts_as_event.rb b/lib/plugins/acts_as_event/lib/acts_as_event.rb index bcf3e8a171..3f5361d028 100644 --- a/lib/plugins/acts_as_event/lib/acts_as_event.rb +++ b/lib/plugins/acts_as_event/lib/acts_as_event.rb @@ -41,6 +41,7 @@ module Redmine :description => :description, :author => :author, :url => {:controller => '/welcome'}, + :name => ::I18n.t(self.name.underscore, scope: 'events'), :type => self.name.underscore.dasherize } cattr_accessor :event_options From 9c2c4608395e5f87f0ac8e3fee0c5a2902c78c27 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 16:04:16 +0100 Subject: [PATCH 05/11] Add change log entry (#2250) --- doc/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 2d356c9ca9..751832f8e2 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -56,6 +56,7 @@ See doc/COPYRIGHT.rdoc for more details. * `#2160` [Accessibility] Link form elements to their label - new LDAP authentication * `#2161` [Accessibility] Link form elements to their label - new color * `#2229` [Accessibility] low contrast in calendar view +* `#2250` [Accessibility] activity icon labels * `#2258` [Accessibility] linearisation of issue show form * `#2500` Change default configuration in new OpenProject application so new projects are not public by default * `#3370` [Design] Clean-up and refactoring existing CSS for content area From c3b175bde95beb49bcce6515abb696cac6ce49ca Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Thu, 9 Jan 2014 10:58:09 +0100 Subject: [PATCH 06/11] Sketch activity icon labels --- config/locales/de.yml | 2 ++ config/locales/en.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/config/locales/de.yml b/config/locales/de.yml index c351933da8..a6ba0c1077 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -695,6 +695,8 @@ de: label_enumerations: "Aufzählungen" label_environment: "Umgebung" label_equals: "ist" + label_events_work_package_closed: 'Arbeitspaket geschlossen' + label_events_work_package_edited: 'Arbeitspaket bearbeitet' label_example: "Beispiel" label_export_to: "Auch abrufbar als:" label_f_hour: "%{value} Stunde" diff --git a/config/locales/en.yml b/config/locales/en.yml index 45f8559921..0ab02eaa9d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -692,6 +692,8 @@ en: label_enumerations: "Enumerations" label_environment: "Environment" label_equals: "is" + label_events_work_package_closed: 'Work package closed' + label_events_work_package_edited: 'Work package edited' label_example: "Example" label_export_to: "Also available in:" label_f_hour: "%{value} hour" From 39a90e35436ef41f89a3ebb3196d857394f6ba6c Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 09:42:52 +0100 Subject: [PATCH 07/11] Add event types and names to activity providers (#2250) --- config/locales/de.yml | 2 -- config/locales/en.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index a6ba0c1077..c351933da8 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -695,8 +695,6 @@ de: label_enumerations: "Aufzählungen" label_environment: "Umgebung" label_equals: "ist" - label_events_work_package_closed: 'Arbeitspaket geschlossen' - label_events_work_package_edited: 'Arbeitspaket bearbeitet' label_example: "Beispiel" label_export_to: "Auch abrufbar als:" label_f_hour: "%{value} Stunde" diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ab02eaa9d..45f8559921 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -692,8 +692,6 @@ en: label_enumerations: "Enumerations" label_environment: "Environment" label_equals: "is" - label_events_work_package_closed: 'Work package closed' - label_events_work_package_edited: 'Work package edited' label_example: "Example" label_export_to: "Also available in:" label_f_hour: "%{value} hour" From e4939464bef863d264ec360eeb337a8b4b908231 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Mon, 13 Jan 2014 16:04:16 +0100 Subject: [PATCH 08/11] Add change log entry (#2250) --- doc/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 751832f8e2..813813d52a 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -33,6 +33,7 @@ See doc/COPYRIGHT.rdoc for more details. * `#2153` [Accessibility] Required fields MUST be displayed as required - group new * `#2157` [Accessibility] Required fields MUST be displayed as required - enumeration new * `#2228` [Accessibility] low contrast in backlogs task view +* `#2250` [Accessibility] activity icon labels * `#2734` [API] Access-Key not supported for all controllers * `#3120` Implement a test suite the spikes can be developed against * `#3251` [Timelines] Filtering for Responsible filters everything @@ -41,6 +42,12 @@ See doc/COPYRIGHT.rdoc for more details. * `#3546` Better icon for Timelines Module * `#3547` Change color of Apply button in Activity * `#3667` Better icon for Roadmap +* `#3120` Implement a test suite the spikes can be developed against +* `#3251` [Timelines] Filtering for Responsible filters everything +* `#3453` Highlight project in bread crumb +* `#3546` Better icon for Timelines Module +* `#3547` Change color of Apply button in Activity +* `#3667` Better icon for Roadmap ## 3.0.0pre42 From 94365d79d047c230d98e32de979e45eed9811b86 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Tue, 14 Jan 2014 12:49:02 +0100 Subject: [PATCH 09/11] Update icon font css rules (#2250) --- .../fonts/openproject_icon_font.css.sass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass index 771050b22a..3a03558dbd 100644 --- a/app/assets/stylesheets/fonts/openproject_icon_font.css.sass +++ b/app/assets/stylesheets/fonts/openproject_icon_font.css.sass @@ -157,7 +157,7 @@ .icon-cancel:before content: "\e005" -dt.changeset:before, +dt > .icon-changeset:before, .icon-changeset:before content: "\e006" @@ -191,7 +191,7 @@ dt.changeset:before, .icon-not-watch:before content: "\e00f" -dt.news:before, +dt > .icon-news:before, .icon-news:before content: "\e010" @@ -225,14 +225,14 @@ dt.news:before, .icon-priority:before content: "\e01a" -dt.project:before, +dt > .icon-project:before, .icon-projects:before content: "\e01b" .icon-publish:before content: "\e01c" -dt.message:before, +dt > .icon-message:before, .icon-quote:before content: "\e01d" @@ -261,7 +261,7 @@ dt > .icon-work_package-note:before, .icon-ticket-note:before content: "\e024" -dt > .icon-time_entry:before, +dt > .icon-time-entry:before, .icon-time:before content: "\e025" @@ -319,7 +319,7 @@ dt > .icon-time_entry:before, .icon-attention1:before content: "\e038" -dt.attachment:before, +dt > .icon-attachment:before, .icon-attachment:before content: "\e039" @@ -365,7 +365,7 @@ dt.attachment:before, .icon-bubble2:before content: "\e047" -dt.reply:before, +dt > .icon-reply:before, .icon-bubble3:before content: "\e048" @@ -757,7 +757,7 @@ dt.reply:before, .icon-wiki2:before content: "\e027" -dt.wiki-page:before, +dt > .icon-wiki-page:before, .icon-wiki-edit:before content: "\e0c9" From 7b1d4f1350e541d884a6e1e25f522afbaa3e2901 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Wed, 15 Jan 2014 11:35:50 +0100 Subject: [PATCH 10/11] Add view hook to users show... (#2250) ... to enable plugins to add their own activity icons --- app/views/users/show.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index f44fdbb4ec..a226135893 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -27,6 +27,10 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> +<% content_for :header_tags do %> + <%= call_hook :users_show_head %> +<% end %> +
<%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
From 61beca59994b03f2f554949dcc129fea616a5cb2 Mon Sep 17 00:00:00 2001 From: Till Breuer Date: Wed, 15 Jan 2014 11:53:57 +0100 Subject: [PATCH 11/11] Add view hook to search#index (#2250) --- app/views/search/index.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index e3c541342d..2b07f699a3 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -27,6 +27,10 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> +<% content_for :header_tags do %> + <%= call_hook :search_index_head %> +<% end %> +

<%= l(:label_search) %>