Fix all toolbar titles

app/views/activities/index.html.erb

@@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <%= call_hook :activity_index_head %>
 
-<%= toolbar title: (@author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe),
+<%= toolbar title: (@author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author))).html_safe,
             subtitle: l(:label_date_from_to, start: format_date(@date_to - @days), end: format_date(@date_to-1))
 %>
 

app/views/auth_sources/edit.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{l(:label_auth_source)} #{@auth_source.name}" %>
-<%= toolbar title: "#{l(:label_auth_source)} (#{h @auth_source.auth_method_name})" %>
+<%= toolbar title: "#{l(:label_auth_source)} (#{@auth_source.auth_method_name})" %>
 
 <%= labelled_tabular_form_for @auth_source, as: :auth_source do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/auth_sources/new.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), l(:label_auth_source_new) %>
-<%= toolbar title: "#{l(:label_auth_source_new)} (#{h @auth_source.auth_method_name})" %>
+<%= toolbar title: "#{l(:label_auth_source_new)} (#{@auth_source.auth_method_name})" %>
 
 <%= labelled_tabular_form_for @auth_source, as: :auth_source do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/categories/destroy.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{Category.model_name.human} #{h @category.name}" %>
+<%= toolbar title: "#{Category.model_name.human} #{@category.name}" %>
 <%= form_tag({}, {method: :delete}) do %>
   <div class="box">
     <p><strong><%= l(:text_work_package_category_destroy_question, @issue_count) %></strong></p>

app/views/custom_fields/edit.html.erb

@@ -31,8 +31,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
     &raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
-    &raquo; #{@custom_field.name}
-  }.squish
+    &raquo; #{h @custom_field.name}
+  }.squish.html_safe
 %>
 
 <%= labelled_tabular_form_for @custom_field, as: :custom_field,

app/views/custom_fields/new.html.erb

@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
     &raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
     &raquo; #{l(:label_custom_field_new)}
-  }.squish
+  }.squish.html_safe
 %>
 
 <%= labelled_tabular_form_for @custom_field, as: :custom_field,

app/views/enumerations/destroy.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}" %>
+<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}".html_safe %>
 <%= styled_form_tag({}, method: :delete) do %>
   <section class="form--section">
     <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>

app/views/enumerations/edit.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Enumeration.model_name.human} #{h @enumeration.name}" %>
-<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}" %>
+<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}".html_safe %>
 
 <%= labelled_tabular_form_for @enumeration do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/enumerations/new.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), l(:label_enumeration_new) %>
-<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{l(:label_enumeration_new)}" %>
+<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{l(:label_enumeration_new)}".html_safe %>
 <%= labelled_tabular_form_for @enumeration do |f| %>
   <%= render partial: 'form', locals: { f: f } %>
   <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-checkmark' %>

app/views/groups/edit.html.erb

@@ -28,5 +28,5 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Group.model_name.human} #{h @group.name}" %>
-<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{@group.name}" %>
+<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{@group.name}".html_safe %>
 <%= render_tabs group_settings_tabs %>

app/views/groups/new.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), l("label_group_new") %>
-<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{l(:label_group_new)}" %>
+<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{l(:label_group_new)}".html_safe %>
 
 <%= labelled_tabular_form_for(@group) do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/groups/show.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{h @group.name}" %>
+<%= toolbar title: "#{link_to l(:label_group_plural), groups_path} &raquo; #{h @group.name}".html_safe %>
 <ul>
   <% @group.users.each do |user| %>
     <li><%=h user %></li>

app/views/news/show.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: "#{avatar(@news.author)}  #{h @news.title}" do %>
+<%= toolbar title: "#{avatar(@news.author)}  #{h @news.title}".html_safe do %>
   <% if User.current.allowed_to?(:manage_news, @project) %>
     <li class="toolbar-item">
       <%= link_to(edit_news_path(@news),

app/views/planning_element_type_colors/confirm_destroy.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: h(@color.name) %>
+<%= toolbar title: @color.name %>
 <%= labelled_tabular_form_for @color,
             url: color_url(@color),
             html: {method: 'delete'},

app/views/project_types/confirm_destroy.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: h(@project_type.name) %>
+<%= toolbar title: @project_type.name %>
 <%= labelled_tabular_form_for(@project_type,
             url: project_type_path(@project_type),
             html: {method: 'delete'}) do |f| %>

app/views/project_types/edit.html.erb

@@ -30,7 +30,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{h @project_type.name}" %>
-<%= toolbar title: "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{h @project_type.name}" %>
+<%= toolbar title: "#{l(:label_edit)} #{l("timelines.admin_menu.project_type")} #{@project_type.name}" %>
 <%= labelled_tabular_form_for(@project_type,
              url: project_type_path(@project_type),
              html: {method: 'put'}) do |f| %>

app/views/repositories/diff.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: "#{l(:label_revision)} #{@diff_format_revisions} #{h @path}" do %>
+<%= toolbar title: "#{l(:label_revision)} #{@diff_format_revisions} #{@path}" do %>
   <li class="toolbar-item">
     <%= form_tag({path: to_path_param(@path)}, method: :get) do %>
       <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>

app/views/roles/edit.html.erb

@@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Role.model_name.human} #{h @role.name}" %>
 
-<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{@role.name}" %>
+<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{@role.name}".html_safe %>
 
 
 <%= labelled_tabular_form_for @role, html: { id: 'role_form' }, as: :role do |f| %>

app/views/roles/new.html.erb

@@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% html_title l(:label_administration), l("label_group_new") %>
 
-<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_role_new)}" %>
+<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_role_new)}".html_safe %>
 
 <%= labelled_tabular_form_for @role, html: {id: 'role_form'}, as: :role do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/roles/report.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_permissions_report)}" %>
+<%= toolbar title: "#{link_to(l(:label_role_plural), roles_path)} &raquo; #{l(:label_permissions_report)}".html_safe %>
 <%= form_tag(roles_path, method: :put, id: 'permissions_form') do %>
   <%= hidden_field_tag 'permissions[0]', '', id: nil %>
   <div class="autoscroll">

app/views/settings/plugin.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{l(:label_settings)}: #{h @plugin.name}" %>
+<%= toolbar title: "#{l(:label_settings)}: #{@plugin.name}" %>
 <div id="settings">
   <%= styled_form_tag({action: 'plugin'}) do %>
     <div class="box">

app/views/statuses/edit.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Status.model_name.human} #{h @status.name}" %>
-<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{h @status.name}"%>
+<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{h @status.name}".html_safe %>
 
 <%= labelled_tabular_form_for(@status) do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/statuses/new.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), l(:label_work_package_status_new) %>
-<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{l(:label_work_package_status_new)}"%>
+<%= toolbar title: "#{link_to l(:label_work_package_status_plural), new_status_path} &raquo; #{l(:label_work_package_status_new)}".html_safe %>
 
 <%= labelled_tabular_form_for(@status) do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/timelines/confirm_destroy.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title I18n.t("timelines.delete_timeline", timeline: @timeline.name) %>
-<%= toolbar title: h(@timeline.name) %>
+<%= toolbar title: @timeline.name %>
 <%= labelled_tabular_form_for @timeline,
             url: project_timeline_path(@project, @timeline),
             html: {method: 'delete'} do |f| %>

app/views/timelines/edit.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 <% html_title I18n.t("timelines.edit_timeline", timeline: h(@timeline.name)) %>
-<%= toolbar title: I18n.t("timelines.edit_timeline", timeline: h(@timeline.name)) %>
+<%= toolbar title: I18n.t("timelines.edit_timeline", timeline: @timeline.name) %>
 
 <%= labelled_tabular_form_for(@timeline,
             url: project_timeline_path(@project, @timeline),

app/views/timelines/show.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title "#{l('timelines.project_menu.timelines')}: #{h @timeline.name}" %>
-<%= toolbar title: h(@timeline.name) do %>
+<%= toolbar title: @timeline.name do %>
   <% if timeline_action_authorized?(:new) %>
     <li class="toolbar-item">
       <%= new_timeline_link @project do %>

app/views/types/edit.html.erb

@@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% html_title l(:label_administration), "#{l(:label_edit)} #{Type.model_name.human} #{h @type.name}" %>
 
-<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{h @type.name}" %>
+<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{h @type.name}".html_safe %>
 
 <%= form_for @type, builder: TabularFormBuilder, lang: current_language do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/types/new.html.erb

@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 
 <% html_title l(:label_administration), l(:label_type_new) %>
-<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{t(:label_type_new)}" %>
+<%= toolbar title: "#{link_to t(:label_type_plural), types_path} &raquo; #{t(:label_type_new)}".html_safe %>
 
 <%= form_for controller.type, builder: TabularFormBuilder, lang: current_language  do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

app/views/users/show.html.erb

@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <%= call_hook :users_show_head %>
 <% end %>
 
-<%= toolbar title: "#{avatar @user} #{h(@user.name)}" do %>
+<%= toolbar title: "#{avatar @user} #{h(@user.name)}".html_safe do %>
   <% if User.current.admin? %>
     <li class="toolbar-item">
       <%= link_to edit_user_path(@user), class: 'button', accesskey: accesskey(:edit) do %>

app/views/versions/show.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: h(@version.name) do %>
+<%= toolbar title: @version.name do %>
  <% if authorize_for(:versions, :edit) %>
     <li class="toolbar-item">
       <%= link_to(edit_version_path(@version), class: 'button') do %>

app/views/wiki/destroy.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{h(@page.pretty_title)}" %>
+<%= toolbar title: @page.pretty_title %>
 <%= form_tag({}, method: :delete) do %>
   <div class="box">
     <p><strong><%= l(:text_wiki_page_destroy_question, descendants: @descendants_count) %></strong></p>

app/views/wiki/edit.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{h(@page.pretty_title)}" %>
+<%= toolbar title: @page.pretty_title %>
 <%= labelled_tabular_form_for @content, as: :content, url: {action: 'update', id: @page}, html: {method: :put, multipart: true, id: 'wiki_form'} do |f| %>
   <%= f.hidden_field :lock_version %>
   <%= error_messages_for 'content' %>

app/views/wiki/edit_parent_page.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: "#{t(:button_change_parent_page)}: #{h(@page.title)}" %>
+<%= toolbar title: "#{t(:button_change_parent_page)}: #{@page.title}" %>
 
 <%= error_messages_for 'page' %>
 

app/views/wiki/history.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: "#{h(@page.pretty_title)}" %>
+<%= toolbar title: @page.pretty_title %>
 <h3><%= l(:label_history) %></h3>
 <%= form_tag({action: "diff"}, method: :get) do %>
   <div class="generic-table--container">

app/views/wiki/rename.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<%= toolbar title: "#{l(:button_rename)} #{h(@original_title)}" %>
+<%= toolbar title: "#{l(:button_rename)} #{@original_title}" %>
 
 <%= error_messages_for 'page' %>
 

app/views/work_packages/calendars/index.html.erb

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-<%= toolbar title: (@query.new_record? ? l(:label_calendar) : h(@query.name)) %>
+<%= toolbar title: (@query.new_record? ? l(:label_calendar) : @query.name) %>
 <%= form_tag(work_packages_calendar_index_path, method: :get, id: 'query_form') do %>
   <%= hidden_field_tag('project_id', @project.to_param) if @project%>
   <fieldset id="filters" class="form--fieldset -collapsible collapsed" >