Merge pull request #59 from finnlabs/fix/toolbar-title

Fix escaped toolbar

app/views/roles/edit.html.erb

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Role.model_name.human} #{@role.name}" %>
 
-<%= toolbar title: "#{link_to Role.model_name.human(:count => 2), roles_path} &raquo; #{h @role.name}" %>
+<%= breadcrumb_toolbar link_to(Role.model_name.human(:count => 2), roles_path), @role.name) %>
 
 <%= labelled_tabular_form_for @role, :url => { :action => 'update' }, :html => {:id => 'role_form'}, :as => :role do |f| %>
 <%= hidden_field_tag :id, @role.id %>

app/views/roles/new.html.erb

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <% html_title l(:label_administration), l("label_group_new") %>
 
-<%= toolbar title: "#{link_to Role.model_name.human(:count => 2), roles_path} &raquo; #{l(:label_role_new)}" %>
+<%= breadcrumb_toolbar link_to(Role.model_name.human(:count => 2), roles_path), l(:label_role_new) %>
 
 <%= labelled_tabular_form_for @role, :url => { :action => 'create' }, :html => {:id => 'role_form'}, :as => :role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f, :role => @role, :member_role => @member_role, :global_role => @global_role, :roles => @roles,  :member_permissions => @member_permissions, :global_permissions => @global_permissions} %>