Adds missing html titles (#14517).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12050 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb
index 25716ff9e9b165b65fa8e7ead42d1fbb73e6e2ea..4b1d3767ee83d1f3d900ef708f1d07220f507c88 100644 (file)
--- a/app/views/admin/plugins.html.erb
+++ b/app/views/admin/plugins.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(:label_plugins) %></h2>
+<%= title l(:label_plugins) %>
 
 <% if @plugins.any? %>
 <table class="list plugins">

diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb
index 00c13d5810a8039836d965998f456de71f6597f8..b7b198973bd5537368aaa32a21277176f4fe7ec6 100644 (file)
--- a/app/views/admin/projects.html.erb
+++ b/app/views/admin/projects.html.erb
@@ -2,7 +2,7 @@
 <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
-<h2><%=l(:label_project_plural)%></h2>
+<%= title l(:label_project_plural) %>
 
 <%= form_tag({}, :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
@@ -41,5 +41,3 @@
   </tbody>
 </table>
 </div>
-
-<% html_title(l(:label_project_plural)) -%>

diff --git a/app/views/auth_sources/edit.html.erb b/app/views/auth_sources/edit.html.erb
index aee3baf56977d27911cfcf0d18f2439ada69a4dd..7f3d07e087608e0f292b130bbfc60597e48b0c26 100644 (file)
--- a/app/views/auth_sources/edit.html.erb
+++ b/app/views/auth_sources/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_auth_source)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
+<%= title [l(:label_auth_source_plural), auth_sources_path], @auth_source.name %>
 
 <%= labelled_form_for @auth_source, :as => :auth_source, :url => auth_source_path(@auth_source), :html => {:id => 'auth_source_form'} do |f| %>
   <%= render :partial => auth_source_partial_name(@auth_source), :locals => { :f => f } %>

diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
index 3d7fa8ff6e1d0eab31e7ec71ba89a8387cae28c6..975146180641a4a0b8f0347621e92ae8e5cfa9af 100644 (file)
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -2,7 +2,7 @@
 <%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
-<h2><%=l(:label_auth_source_plural)%></h2>
+<%= title l(:label_auth_source_plural) %>
 
 <table class="list">
   <thead><tr>

diff --git a/app/views/auth_sources/new.html.erb b/app/views/auth_sources/new.html.erb
index d6d6bc5b3e659138cfcfce0d0c0c55a8c497b7ef..e9307faaf77898dcfde38507a75c3fc1a69c8709 100644 (file)
--- a/app/views/auth_sources/new.html.erb
+++ b/app/views/auth_sources/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_auth_source_new)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
+<%= title [l(:label_auth_source_plural), auth_sources_path], "#{l(:label_auth_source_new)} (#{@auth_source.auth_method_name})" %>
 
 <%= labelled_form_for @auth_source, :as => :auth_source, :url => auth_sources_path, :html => {:id => 'auth_source_form'} do |f| %>
   <%= hidden_field_tag 'type', @auth_source.type %>

diff --git a/app/views/custom_fields/edit.html.erb b/app/views/custom_fields/edit.html.erb
index 43a8ebf30b2b5d185b4825f90b0d82522fc6bff7..803ba0558776870853e3c607a6089ae45d7ed460 100644 (file)
--- a/app/views/custom_fields/edit.html.erb
+++ b/app/views/custom_fields/edit.html.erb
@@ -1,6 +1,6 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
-  &#187; <%=h @custom_field.name %></h2>
+<%= title [l(:label_custom_field_plural), custom_fields_path],
+  [l(@custom_field.type_name), custom_fields_path(:tab => @custom_field.class.name)],
+  @custom_field.name %>
 
 <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put, :id => 'custom_field_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/custom_fields/index.html.erb b/app/views/custom_fields/index.html.erb
index 7b29e25e797a49467652a8849edca4fffe896464..b4e87f066a793f6c3ec2036ae1e0980baffbd525 100644 (file)
--- a/app/views/custom_fields/index.html.erb
+++ b/app/views/custom_fields/index.html.erb
@@ -1,5 +1,3 @@
-<h2><%=l(:label_custom_field_plural)%></h2>
+<%= title l(:label_custom_field_plural) %>
 
 <%= render_tabs custom_fields_tabs %>
-
-<% html_title(l(:label_custom_field_plural)) -%>

diff --git a/app/views/custom_fields/new.html.erb b/app/views/custom_fields/new.html.erb
index 71e7197ec5039dd5f78233c7620c5ab2646bf2d1..7af7735f0f8b14b4c9763af163670b83f20eca72 100644 (file)
--- a/app/views/custom_fields/new.html.erb
+++ b/app/views/custom_fields/new.html.erb
@@ -1,6 +1,6 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
-  &#187; <%= l(:label_custom_field_new) %></h2>
+<%= title [l(:label_custom_field_plural), custom_fields_path],
+  [l(@custom_field.type_name), custom_fields_path(:tab => @custom_field.class.name)],
+  l(:label_custom_field_new) %>
 
 <%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path, :html => {:id => 'custom_field_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb
index b469d4f9b393a1078b5816919c9520eec5ebc2f9..503cf4ccaa47263580393671c479b78ac728ada1 100644 (file)
--- a/app/views/enumerations/destroy.html.erb
+++ b/app/views/enumerations/destroy.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %>
 
 <%= form_tag({}, :method => :delete) do %>
 <div class="box">

diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb
index e5c523390ecd2c02048b879b7f62898527d7050c..59a7aa6baef547143290c8de5129321ce7b34eda 100644 (file)
--- a/app/views/enumerations/edit.html.erb
+++ b/app/views/enumerations/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=h @enumeration %></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %>
 
 <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>

diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb
index dfbd99f529d9e018f27e8f98aafe2af6bf2965d8..1714e8e8977ccd60900db452f8df03d2a43cdf69 100644 (file)
--- a/app/views/enumerations/new.html.erb
+++ b/app/views/enumerations/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=l(:label_enumeration_new)%></h2>
+<%= title [l(@enumeration.option_name), enumerations_path], l(:label_enumeration_new) %>
 
 <%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %>
   <%= f.hidden_field :type  %>

diff --git a/app/views/issue_statuses/edit.html.erb b/app/views/issue_statuses/edit.html.erb
index d52d61bd2a0ff8c940a074c4b5348a30b2f0654d..425ab43d999fbd015ded32f21b97bf1c22071665 100644 (file)
--- a/app/views/issue_statuses/edit.html.erb
+++ b/app/views/issue_statuses/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=h @issue_status %></h2>
+<%= title [l(:label_issue_status_plural), issue_statuses_path], @issue_status.name %>
 
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>

diff --git a/app/views/issue_statuses/new.html.erb b/app/views/issue_statuses/new.html.erb
index c9e60abcd906957eb6d14f07444c81b952d427a3..86f2131b226e57b38f39a69a98410f9443edea04 100644 (file)
--- a/app/views/issue_statuses/new.html.erb
+++ b/app/views/issue_statuses/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_issue_status_plural), issue_statuses_path %> &#187; <%=l(:label_issue_status_new)%></h2>
+<%= title [l(:label_issue_status_plural), issue_statuses_path], l(:label_issue_status_new) %>
 
 <%= labelled_form_for @issue_status do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 45a258249d53faa049e1e6b24a42f8844120b778..feb9e792f7a368c51d5ff8949f6a63394e037ac9 100644 (file)
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_new)%></h2>
+<%= title l(:label_issue_new) %>
 
 <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
 

diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb
index d5762e08d72ed5fae73cdf0c3f7b4f3a1d0008f2..ac392b72c20367ce06ff9cf3f4c5736fe81805e8 100644 (file)
--- a/app/views/projects/destroy.html.erb
+++ b/app/views/projects/destroy.html.erb
@@ -1,4 +1,5 @@
-<h2><%=l(:label_confirmation)%></h2>
+<%= title l(:label_confirmation) %>
+
 <div class="warning">
 <p><strong><%=h @project_to_destroy %></strong><br />
 <%=l(:text_project_destroy_confirmation)%>

diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 58d8192ce71e23379ebd790814c6b4558290820f..a14a9cf3e9f9326708cd9a40cef6f8a60c6a09ab 100644 (file)
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%=l(:label_project_new)%></h2>
+<%= title l(:label_project_new) %>
 
 <%= labelled_form_for @project do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/roles/edit.html.erb b/app/views/roles/edit.html.erb
index 7caca3002f6dde68def82e3757afbaf375ac5b2d..dc52202b58d6cd7a21371db51a9d298f1a00052a 100644 (file)
--- a/app/views/roles/edit.html.erb
+++ b/app/views/roles/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=h @role.name %></h2>
+<%= title [l(:label_role_plural), roles_path], @role.name %>
 
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/roles/new.html.erb b/app/views/roles/new.html.erb
index 0e5dfeb9c89e4e735970a35b4daa4dce154b6d98..752992cfae9a9f573e6bc23f2df255f887fe8a4a 100644 (file)
--- a/app/views/roles/new.html.erb
+++ b/app/views/roles/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_role_new)%></h2>
+<%= title [l(:label_role_plural), roles_path], l(:label_role_new) %>
 
 <%= labelled_form_for @role do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index af78715e02931e8f710b307ffb706a407f17967e..bf745a66ade8dd41dd42f47d372b90d4093780ba 100644 (file)
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_role_plural), roles_path %> &#187; <%=l(:label_permissions_report)%></h2>
+<%= title [l(:label_role_plural), roles_path], l(:label_permissions_report) %>
 
 <%= form_tag(permissions_roles_path, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '', :id => nil %>

diff --git a/app/views/settings/plugin.html.erb b/app/views/settings/plugin.html.erb
index 367f5920cc50f1f7bf6a905d2a17f77d2b4f534b..0d5b837d35b40fa9fb4442a5f76c9e047a8998b8 100644 (file)
--- a/app/views/settings/plugin.html.erb
+++ b/app/views/settings/plugin.html.erb
@@ -1,4 +1,4 @@
-<h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
+<%= title [l(:label_plugins), {:controller => 'admin', :action => 'plugins'}], @plugin.name %>
 
 <div id="settings">
 <%= form_tag({:action => 'plugin'}) do %>

diff --git a/app/views/trackers/edit.html.erb b/app/views/trackers/edit.html.erb
index 76744c403d6b0d2344a0a927a5e77674366eca8f..857c6ac22c02173564c0e3acdbb7210ab61eba12 100644 (file)
--- a/app/views/trackers/edit.html.erb
+++ b/app/views/trackers/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=h @tracker %></h2>
+<%= title [l(:label_tracker_plural), trackers_path], @tracker.name %>
 
 <%= labelled_form_for @tracker do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
index ef8959147d68e92782e009f4ed4c2fbd0940501d..d3e31fe45fa521ecdb468e48eafcb41a9515b7bb 100644 (file)
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%= l(:field_summary) %></h2>
+<%= title [l(:label_tracker_plural), trackers_path], l(:field_summary) %>
 
 <% if @trackers.any? %>
   <%= form_tag fields_trackers_path do %>
@@ -73,5 +73,3 @@
 <% else %>
   <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-
-<% html_title l(:field_summary) %>

diff --git a/app/views/trackers/new.html.erb b/app/views/trackers/new.html.erb
index 7bd8c6a00d88c21cc506ea659d92ddc7239122da..4fe1efec88fef50976fd507eb28725bf1a75d00c 100644 (file)
--- a/app/views/trackers/new.html.erb
+++ b/app/views/trackers/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_tracker_plural), trackers_path %> &#187; <%=l(:label_tracker_new)%></h2>
+<%= title [l(:label_tracker_plural), trackers_path], l(:label_tracker_new) %>
 
 <%= labelled_form_for @tracker do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index fa4f38a640f3d69e85af2e3c506d9230597a2789..d46521730e2d731d2a702c32d9be7e2b5f930cf2 100644 (file)
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -4,8 +4,6 @@
 <%= delete_link user_path(@user) if User.current != @user %>
 </div>
 
-<h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=h @user.login %></h2>
+<%= title [l(:label_user_plural), users_path], @user.login %>
 
 <%= render_tabs user_settings_tabs %>
-
-<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 4eca39d07ac8f16975bffd4d2f1bff6775f312fd..255788e027c31f73c70d1a8af7b4ae4bafbd1ebb 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h2>
+<%= title [l(:label_user_plural), users_path], l(:label_user_new) %>
 
 <%= labelled_form_for @user do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>

diff --git a/app/views/workflows/copy.html.erb b/app/views/workflows/copy.html.erb
index 62334c9623f1f95c2555a451128c5b3a058a693a..78997caf555284cbba5fa49ea9d9a0b2cd26b7f3 100644 (file)
--- a/app/views/workflows/copy.html.erb
+++ b/app/views/workflows/copy.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_workflow), workflows_edit_path %> &#187; <%=l(:button_copy)%></h2>
+<%= title [l(:label_workflow), workflows_edit_path], l(:button_copy) %>
 
 <%= form_tag({}, :id => 'workflow_copy_form') do %>
 <fieldset class="tabular box">

diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
index a7f2dae62d14254524d47bef15fa43a255f370e1..8c02653c50d51681bbac995900bfbe7a16ceceb9 100644 (file)
--- a/app/views/workflows/edit.html.erb
+++ b/app/views/workflows/edit.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => 'action_menu' %>
 
-<h2><%=l(:label_workflow)%></h2>
+<%= title l(:label_workflow) %>
 
 <div class="tabs">
   <ul>
@@ -54,5 +54,3 @@
     <%= submit_tag l(:button_save) %>
   <% end %>
 <% end %>
-
-<% html_title(l(:label_workflow)) -%>

diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb
index 9ddb71b105c218b0ab222133feb2322d1b58cb7d..8e87dfd6b432535db8dba1d5164ba2511bcaf657 100644 (file)
--- a/app/views/workflows/index.html.erb
+++ b/app/views/workflows/index.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to l(:label_workflow), workflows_edit_path %> &#187; <%=l(:field_summary)%></h2>
+<%= title [l(:label_workflow), workflows_edit_path], l(:field_summary) %>
 
 <% if @workflow_counts.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>

diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 6046201d31ca96bab5fbf7ec12beac6c1381d19b..89c3ceef92565a73d0990d4470eef2dcce2204e6 100644 (file)
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => 'action_menu' %>
 
-<h2><%=l(:label_workflow)%></h2>
+<%= title l(:label_workflow) %>
 
 <div class="tabs">
   <ul>