Merge pull request #13 from finnlabs/feature/improve_icon_font

pull/6827/head
Hagen Schink 11 years ago
commit a22f6ea701
  1. 2
      CHANGELOG.md
  2. 4
      app/views/principal_roles/_show_table_row.html.erb
  3. 2
      app/views/principal_roles/index.html.erb
  4. 2
      app/views/roles/index.html.erb

@ -1,5 +1,7 @@
# Changelog
* Adaptations for new icon font
## 1.0.1.pre2
* `#2459` Squashed old migrations

@ -22,7 +22,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to_function l(:button_edit), "return false;", :class => 'icon icon-edit' %>
<%end%>
<%= link_to_remote(l(:button_delete), { :url => principal_role_url(principal_role.id),
:method => :delete },
:class => 'icon icon-del') %>
:method => :delete },
:class => 'icon icon-delete') %>
</td>
</tr>

@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to(l(:button_delete), principal_role_path(role),
:method => :delete,
:confirm => l(:text_are_you_sure),
:class => 'icon icon-del')%>
:class => 'icon icon-delete')%>
</td>
</tr>
<% end %>

@ -43,7 +43,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to(l(:button_delete), role_path(role),
:method => :delete,
:confirm => l(:text_are_you_sure),
:class => 'icon icon-del') unless role.builtin? %>
:class => 'icon icon-delete') unless role.builtin? %>
</td>
</tr>
<% end %>

Loading…
Cancel
Save