diff options
30 files changed, 68 insertions, 8 deletions
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index 02eb5ae89..933e288a0 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -42,4 +42,6 @@ <p class="icon22 icon22-info"> <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %> -</p>
\ No newline at end of file +</p> + +<% set_html_title l(:label_administration) -%> diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml index 179fda1a8..4d442f5ad 100644 --- a/app/views/admin/info.rhtml +++ b/app/views/admin/info.rhtml @@ -23,3 +23,5 @@ <% end %> </table> <% end %> + +<% set_html_title(l(:label_information_plural)) -%> diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml index 997cc3b22..a4b923873 100644 --- a/app/views/admin/mail_options.rhtml +++ b/app/views/admin/mail_options.rhtml @@ -29,3 +29,5 @@ <%= submit_tag l(:button_save) %> <% end %> + +<% set_html_title(l(:field_mail_notification)) -%> diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index 423d56ebe..e9d5e8537 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -47,3 +47,5 @@ <p><%= pagination_links_full @project_pages, :status => @status %> [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p> + +<% set_html_title l(:label_project_plural) -%> diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index 8862b3de1..bbdfeffb4 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -50,4 +50,6 @@ </div> <% end %> -<%= javascript_tag "showTab('#{@tab}');" %>
\ No newline at end of file +<%= javascript_tag "showTab('#{@tab}');" %> + +<% set_html_title(l(:label_custom_field_plural)) -%> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 779315b22..8f53f1abe 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -3,9 +3,9 @@ <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> </div> -<h2><%= @document.title %></h2> +<h2><%=h @document.title %></h2> -<p><em><%= @document.category.name %><br /> +<p><em><%=h @document.category.name %><br /> <%= format_date @document.created_on %></em></p> <%= textilizable @document.description, :attachments => @document.attachments %> <br /> @@ -34,3 +34,5 @@ <%= submit_tag l(:button_add) %> <% end %> <% end %> + +<% set_html_title h(@document.title) -%> diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index bab4df830..2e069f392 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -24,3 +24,5 @@ <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p> <% end %> + +<% set_html_title(l(:label_enumerations)) -%> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index aaeec559a..05506f3c7 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -32,4 +32,6 @@ </tbody> </table> -<%= pagination_links_full @issue_status_pages %>
\ No newline at end of file +<%= pagination_links_full @issue_status_pages %> + +<% set_html_title(l(:label_issue_status_plural)) -%> diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml index 0badc4b94..fe2e5625b 100644 --- a/app/views/my/account.rhtml +++ b/app/views/my/account.rhtml @@ -44,3 +44,5 @@ <% content_for :sidebar do %> <%= render :partial => 'sidebar' %> <% end %> + +<% set_html_title l(:label_my_account) -%> diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml index 89d11ddea..db292da37 100644 --- a/app/views/my/page.rhtml +++ b/app/views/my/page.rhtml @@ -38,3 +38,5 @@ <div id="context-menu" style="display: none;"></div> <%= javascript_tag 'new ContextMenu({})' %> + +<% set_html_title l(:label_my_page) -%> diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index a956f86d0..0b677d241 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -32,3 +32,5 @@ <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <% end %> + +<% set_html_title l(:label_news_plural) -%> diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml index 32a24e85e..e4d7da4db 100644 --- a/app/views/news/show.rhtml +++ b/app/views/news/show.rhtml @@ -41,3 +41,5 @@ <p><%= submit_tag l(:button_add) %></p> <% end %> <% end %> + +<% set_html_title h(@news.title) -%> diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index c902d60a3..d22443bc0 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -39,3 +39,5 @@ <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p> <% end %> <% end %> + +<% set_html_title l(:label_activity) -%> diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 2c02d59ad..39f171626 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -38,3 +38,5 @@ <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p> <% end %> <% end %> + +<% set_html_title l(:label_calendar) -%> diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index a66754842..395514b61 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -245,3 +245,5 @@ if Date.today >= @date_from and Date.today <= @date_to %> <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p> <% end %> <% end %> + +<% set_html_title l(:label_gantt) -%> diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml index c6e5b4dec..c7630c0a2 100644 --- a/app/views/projects/list.rhtml +++ b/app/views/projects/list.rhtml @@ -16,3 +16,5 @@ <span class="icon icon-fav"><%= l(:label_my_projects) %></span> </div> <% end %> + +<% set_html_title l(:label_project_plural) -%> diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml index bb272ee86..6829b9bf5 100644 --- a/app/views/projects/list_documents.rhtml +++ b/app/views/projects/list_documents.rhtml @@ -35,3 +35,5 @@ <label><%= radio_button_tag 'sort_by', 'author', (@sort_by == 'author'), :onclick => 'this.form.submit();' %> <%= l(:field_author) %></label> <% end %> <% end %> + +<% set_html_title l(:label_document_plural) -%> diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index 0e4f19d81..b9f688509 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -41,4 +41,6 @@ <% end %> <% end %> </tbody> -</table>
\ No newline at end of file +</table> + +<% set_html_title l(:label_attachment_plural) -%> diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 13359de61..37a469df1 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -14,3 +14,5 @@ <%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name] javascript_tag "showTab('#{tab}');" %> + +<% set_html_title l(:label_settings) -%> diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index bb01df1f4..ecde32bde 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -81,3 +81,5 @@ <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> <% end %> + +<% set_html_title l(:label_overview) -%> diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml index f843983db..218459128 100644 --- a/app/views/repositories/changes.rhtml +++ b/app/views/repositories/changes.rhtml @@ -16,3 +16,5 @@ </p> <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%> + +<% set_html_title(h(@entry.name)) -%> diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml index 64d1668bc..d87dfa955 100644 --- a/app/views/repositories/revision.rhtml +++ b/app/views/repositories/revision.rhtml @@ -62,3 +62,5 @@ <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> <% end %> + +<% set_html_title("#{l(:label_revision)} #{@changeset.revision}") -%> diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml index 2a45fc2ef..4483a482c 100644 --- a/app/views/repositories/revisions.rhtml +++ b/app/views/repositories/revisions.rhtml @@ -16,3 +16,5 @@ <%= stylesheet_link_tag "scm" %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <% end %> + +<% set_html_title l(:label_revision_plural) -%> diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml index c9f44d575..9fb45514d 100644 --- a/app/views/repositories/show.rhtml +++ b/app/views/repositories/show.rhtml @@ -21,3 +21,5 @@ <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> <% end %> + +<% set_html_title l(:label_repository) -%> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index bdea2475f..02bb20f5e 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -32,3 +32,5 @@ <p><%= pagination_links_full @role_pages %></p> <p><%= link_to l(:label_permissions_report), :action => 'report' %></p> + +<% set_html_title(l(:label_role_plural)) -%> diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml index 0a435744f..02f1b48a2 100644 --- a/app/views/roles/workflow.rhtml +++ b/app/views/roles/workflow.rhtml @@ -54,3 +54,5 @@ <% end %> <% end %> + +<% set_html_title(l(:label_workflow)) -%> diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml index 695107fe8..9f156cbe1 100644 --- a/app/views/search/index.rhtml +++ b/app/views/search/index.rhtml @@ -41,3 +41,5 @@ }, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
<% end %>
</center></p>
+
+<% set_html_title(l(:label_search)) -%>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index 4a0a400a3..758045f05 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -98,3 +98,5 @@ <%= submit_tag l(:button_save) %> <% end %> + +<% set_html_title(l(:label_settings)) -%> diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 8517c44d6..d339bdba0 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -30,4 +30,6 @@ </tbody> </table> -<%= pagination_links_full @tracker_pages %>
\ No newline at end of file +<%= pagination_links_full @tracker_pages %> + +<% set_html_title(l(:label_tracker_plural)) -%> diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index 2ffbcd6f6..3f879d7a6 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -57,4 +57,6 @@ <p><%= pagination_links_full @user_pages, :status => @status %> [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ] -</p>
\ No newline at end of file +</p> + +<% set_html_title(l(:label_user_plural)) -%> |