Merge pull request #138 from finnlabs/accessibility/25150/icon-font

[ci skip]

app/views/meeting_contents/diff.html.erb

@@ -25,7 +25,7 @@ See doc/COPYRIGHT.md for more details.
   <% if authorize_for(@content_type.pluralize, :history) %>
     <li class="toolbar-item">
       <%= link_to({controller: "/#{@content_type.pluralize}", action: 'history', meeting_id: @meeting }, class: 'button') do %>
-        <i class="button--icon icon-wiki"></i> <%= l(:label_history) %>
+        <%= op_icon('button--icon icon-wiki') %> <%= l(:label_history) %>
       <% end %>
     </li>
   <% end %>

app/views/meetings/index.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.md for more details.
          title="<%= I18n.t(:label_meeting_new) %>"
          arial-label="<%= I18n.t(:label_meeting_new) %>"
          class="button -alt-highlight">
-        <i class="button--icon icon-add"></i>
+        <%= op_icon('button--icon icon-add') %>
         <span class="button--text"><%= t(:label_meeting) %></span>
       </a>
   <% end %>

app/views/meetings/show.html.erb

@@ -33,14 +33,14 @@ See doc/COPYRIGHT.md for more details.
   <% if authorize_for(:meetings, :edit) %>
     <li class="toolbar-item">
       <%= link_to({:controller => '/meetings', :action => 'edit', :id => @meeting}, class: 'button',:accesskey => accesskey(:edit)) do%>
-        <i class="button--icon icon-edit"></i> <%= l(:button_edit) %>
+        <%= op_icon('button--icon icon-edit') %> <%= l(:button_edit) %>
       <% end %>
     </li>
   <% end %>
   <% if authorize_for(:meetings, :copy) %>
     <li class="toolbar-item">
       <%= link_to({:controller => '/meetings', :action => 'copy', :id => @meeting}, class: 'button') do %>
-        <i class="button--icon icon-copy"></i> <%= l(:button_copy) %>
+        <%= op_icon('button--icon icon-copy') %> <%= l(:button_copy) %>
       <% end %>
     </li>
   <% end %>
@@ -50,7 +50,7 @@ See doc/COPYRIGHT.md for more details.
                   class: 'button',
                   method: :delete,
                   confirm: l(:text_are_you_sure)) do %>
-        <i class="button--icon icon-delete"></i> <%= l(:button_delete) %>
+        <%= op_icon('button--icon icon-delete') %> <%= l(:button_delete) %>
       <% end %>
     </li>
   <% end %>

lib/open_project/meeting/engine.rb

@@ -52,7 +52,7 @@ module OpenProject::Meeting
            caption: :project_module_meetings,
            param: :project_id,
            after: :wiki,
-           html: { class: 'icon2 icon-meetings' }
+           icon: 'icon2 icon-meetings'
 
       ActiveSupport::Inflector.inflections do |inflect|
         inflect.uncountable 'meeting_minutes'