From a9b777bce2c0c91ce901fbea31e19290ccf09460 Mon Sep 17 00:00:00 2001 From: Christian Ratz Date: Mon, 2 Dec 2013 17:16:15 +0100 Subject: [PATCH 1/3] use icon from new icon font --- lib/open_project/meeting/engine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/meeting/engine.rb b/lib/open_project/meeting/engine.rb index 0e74e1211b..06b87df2a7 100644 --- a/lib/open_project/meeting/engine.rb +++ b/lib/open_project/meeting/engine.rb @@ -55,7 +55,7 @@ module OpenProject::Meeting :caption => :project_module_meetings, :param => :project_id, :after => :wiki, - :html => {:'data-icon2' => 'l' } + :html => {:class => 'icon5 icon-quote' } menu :project_menu, :new_meeting, {:controller => '/meetings', :action => 'new'}, :param => :project_id, :caption => :label_meeting_new, From c7a012cf13cb48a93b5030e8e7629385e253bd78 Mon Sep 17 00:00:00 2001 From: Christian Ratz Date: Tue, 3 Dec 2013 10:37:13 +0100 Subject: [PATCH 2/3] Use new icons from icon font --- app/helpers/meeting_contents_helper.rb | 10 +++++----- app/views/meetings/show.html.erb | 2 +- lib/open_project/meeting/engine.rb | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/helpers/meeting_contents_helper.rb b/app/helpers/meeting_contents_helper.rb index 2f8ae05ed9..7d8f37f370 100644 --- a/app/helpers/meeting_contents_helper.rb +++ b/app/helpers/meeting_contents_helper.rb @@ -48,16 +48,16 @@ module MeetingContentsHelper def close_meeting_agenda_link(content_type, meeting) case content_type when "meeting_agenda" - link_to_if_authorized l(:label_meeting_close), {:controller => '/meeting_agendas', :action => 'close', :meeting_id => meeting}, :method => :put, :class => "icon icon-lock show-meeting_agenda" + link_to_if_authorized l(:label_meeting_close), {:controller => '/meeting_agendas', :action => 'close', :meeting_id => meeting}, :method => :put, :class => "icon icon-locked show-meeting_agenda" when "meeting_minutes" - link_to_if_authorized l(:label_meeting_agenda_close), {:controller => '/meeting_agendas', :action => 'close', :meeting_id => meeting}, :method => :put, :class => "icon icon-lock show-meeting_minutes" + link_to_if_authorized l(:label_meeting_agenda_close), {:controller => '/meeting_agendas', :action => 'close', :meeting_id => meeting}, :method => :put, :class => "icon icon-locked show-meeting_minutes" end end def open_meeting_agenda_link(content_type, meeting) case content_type when "meeting_agenda" - link_to_if_authorized l(:label_meeting_open), {:controller => '/meeting_agendas', :action => 'open', :meeting_id => meeting}, :method => :put, :class => 'icon icon-unlock show-meeting_agenda', :confirm => l(:text_meeting_agenda_open_are_you_sure) + link_to_if_authorized l(:label_meeting_open), {:controller => '/meeting_agendas', :action => 'open', :meeting_id => meeting}, :method => :put, :class => 'icon icon-unlocked show-meeting_agenda', :confirm => l(:text_meeting_agenda_open_are_you_sure) when "meeting_minutes" end end @@ -67,10 +67,10 @@ module MeetingContentsHelper end def meeting_content_history_link(content_type, meeting) - link_to_if_authorized l(:label_history), {:controller => '/' + content_type.pluralize, :action => 'history', :meeting_id => meeting}, :class => "icon icon-history show-#{content_type}" + link_to_if_authorized l(:label_history), {:controller => '/' + content_type.pluralize, :action => 'history', :meeting_id => meeting}, :class => "icon icon-wiki show-#{content_type}" end def meeting_content_notify_link(content_type, meeting) - link_to_if_authorized l(:label_notify), {:controller => '/' + content_type.pluralize, :action => 'notify', :meeting_id => meeting}, :method => :put, :class => "icon icon-notification show-#{content_type}" + link_to_if_authorized l(:label_notify), {:controller => '/' + content_type.pluralize, :action => 'notify', :meeting_id => meeting}, :method => :put, :class => "icon icon-mail show-#{content_type}" end end diff --git a/app/views/meetings/show.html.erb b/app/views/meetings/show.html.erb index edfe5d9dad..e75ba4831c 100644 --- a/app/views/meetings/show.html.erb +++ b/app/views/meetings/show.html.erb @@ -22,7 +22,7 @@ See doc/COPYRIGHT.md for more details. <%= watcher_link @meeting, User.current %> <%= link_to_if_authorized(l(:button_edit), {:controller => '/meetings', :action => 'edit', :id => @meeting}, :class => 'icon icon-edit')%> <%= link_to_if_authorized(l(:button_copy), {:controller => '/meetings', :action => 'copy', :id => @meeting}, :class => 'icon icon-copy')%> - <%= link_to_if_authorized(l(:button_delete), {:controller => '/meetings', :action => 'destroy', :id => @meeting}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del')%> + <%= link_to_if_authorized(l(:button_delete), {:controller => '/meetings', :action => 'destroy', :id => @meeting}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-delete')%>

<%= l(:label_meeting) %>: <%= link_to @meeting %>

diff --git a/lib/open_project/meeting/engine.rb b/lib/open_project/meeting/engine.rb index 06b87df2a7..a37a48e656 100644 --- a/lib/open_project/meeting/engine.rb +++ b/lib/open_project/meeting/engine.rb @@ -55,11 +55,12 @@ module OpenProject::Meeting :caption => :project_module_meetings, :param => :project_id, :after => :wiki, - :html => {:class => 'icon5 icon-quote' } + :html => {:class => 'icon2 icon-quote' } menu :project_menu, :new_meeting, {:controller => '/meetings', :action => 'new'}, :param => :project_id, :caption => :label_meeting_new, - :parent => :meetings + :parent => :meetings, + :html => {:class => 'icon2 icon-add' } ActiveSupport::Inflector.inflections do |inflect| inflect.uncountable "meeting_minutes" From c793a58935ee3b25729bcf26a1cd1ebb5b37453d Mon Sep 17 00:00:00 2001 From: Christian Ratz Date: Wed, 4 Dec 2013 10:29:40 +0100 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c74064797..980365576a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ See doc/COPYRIGHT.md for more details. # Changelog +* Adaptations for new icon font * `#2759` Fix: [Performance] Activity View very slow * `#3119` [Migration] Meetings do not migrate planning element references * added icon for new project menu