From 3e0acc0b7e1fda93d8bdd9df7b7c8c9551fad864 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 2 Jan 2008 22:41:53 +0000 Subject: [PATCH] Slight improvements to the browser views. ApplicationHelper#set_html_title replaced by html_title with arguments and can be called several times in views to append elements to the title. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1032 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 21 ++++++++++--------- app/helpers/repositories_helper.rb | 2 +- app/views/admin/index.rhtml | 2 +- app/views/admin/info.rhtml | 2 +- app/views/admin/mail_options.rhtml | 2 +- app/views/admin/projects.rhtml | 2 +- app/views/common/403.rhtml | 2 +- app/views/common/404.rhtml | 2 +- app/views/custom_fields/list.rhtml | 2 +- app/views/documents/index.rhtml | 2 +- app/views/documents/show.rhtml | 2 +- app/views/enumerations/list.rhtml | 2 +- app/views/issue_statuses/list.rhtml | 2 +- app/views/issues/index.rhtml | 6 +++--- app/views/issues/show.rhtml | 2 +- app/views/my/account.rhtml | 2 +- app/views/my/page.rhtml | 2 +- app/views/news/index.rhtml | 2 +- app/views/news/show.rhtml | 2 +- app/views/projects/activity.rhtml | 2 +- app/views/projects/calendar.rhtml | 2 +- app/views/projects/gantt.rhtml | 2 +- app/views/projects/list.rhtml | 2 +- app/views/projects/list_files.rhtml | 2 +- app/views/projects/roadmap.rhtml | 2 +- app/views/projects/settings.rhtml | 2 +- app/views/projects/show.rhtml | 2 +- app/views/repositories/_dir_list.rhtml | 4 ++-- .../repositories/_dir_list_content.rhtml | 14 ++++++------- app/views/repositories/_navigation.rhtml | 2 ++ app/views/repositories/_revisions.rhtml | 12 +++++------ app/views/repositories/annotate.rhtml | 2 ++ app/views/repositories/browse.rhtml | 2 +- app/views/repositories/changes.rhtml | 2 +- app/views/repositories/diff.rhtml | 2 ++ app/views/repositories/revision.rhtml | 2 +- app/views/repositories/revisions.rhtml | 2 +- app/views/repositories/show.rhtml | 2 +- app/views/repositories/stats.rhtml | 4 +++- app/views/roles/list.rhtml | 2 +- app/views/roles/workflow.rhtml | 2 +- app/views/search/index.rhtml | 2 +- app/views/settings/edit.rhtml | 2 +- app/views/trackers/list.rhtml | 2 +- app/views/users/list.rhtml | 2 +- app/views/versions/show.rhtml | 2 +- app/views/wiki/edit.rhtml | 2 +- app/views/wiki/show.rhtml | 2 +- lang/bg.yml | 1 + lang/cs.yml | 1 + lang/de.yml | 1 + lang/en.yml | 1 + lang/es.yml | 1 + lang/fr.yml | 1 + lang/he.yml | 1 + lang/it.yml | 1 + lang/ja.yml | 1 + lang/ko.yml | 1 + lang/nl.yml | 1 + lang/pl.yml | 1 + lang/pt-br.yml | 1 + lang/pt.yml | 1 + lang/ro.yml | 1 + lang/ru.yml | 1 + lang/sr.yml | 1 + lang/sv.yml | 1 + lang/zh-tw.yml | 1 + lang/zh.yml | 1 + public/stylesheets/application.css | 10 +++++++++ 69 files changed, 107 insertions(+), 68 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c6a1ba49..e3ac2498f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -145,16 +145,17 @@ module ApplicationHelper links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil end - def set_html_title(text) - @html_header_title = text - end - - def html_title - title = [] - title << @project.name if @project - title << @html_header_title - title << Setting.app_title - title.compact.join(' - ') + def html_title(*args) + if args.empty? + title = [] + title << @project.name if @project + title += @html_title if @html_title + title << Setting.app_title + title.compact.join(' - ') + else + @html_title ||= [] + @html_title += args + end end ACCESSKEYS = {:edit => 'e', diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index d2d04604d..d7d7f4349 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -55,7 +55,7 @@ module RepositoriesHelper def with_leading_slash(path) path ||= '' - path.starts_with?("/") ? "/#{path}" : path + path.starts_with?('/') ? path : "/#{path}" end def subversion_field_tags(form, repository) diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index 933e288a0..1c6cbdee5 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -44,4 +44,4 @@ <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>

-<% set_html_title l(:label_administration) -%> +<% html_title(l(:label_administration)) -%> diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml index 4d442f5ad..15ab94851 100644 --- a/app/views/admin/info.rhtml +++ b/app/views/admin/info.rhtml @@ -24,4 +24,4 @@ <% end %> -<% set_html_title(l(:label_information_plural)) -%> +<% html_title(l(:label_information_plural)) -%> diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml index a4b923873..698933b9b 100644 --- a/app/views/admin/mail_options.rhtml +++ b/app/views/admin/mail_options.rhtml @@ -30,4 +30,4 @@ <%= submit_tag l(:button_save) %> <% end %> -<% set_html_title(l(:field_mail_notification)) -%> +<% html_title(l(:field_mail_notification)) -%> diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index 295cfd101..3a759ecaa 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -47,4 +47,4 @@

<%= pagination_links_full @project_pages, @project_count %>

-<% set_html_title l(:label_project_plural) -%> +<% html_title(l(:label_project_plural)) -%> diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml index d2d03f811..d1173a186 100644 --- a/app/views/common/403.rhtml +++ b/app/views/common/403.rhtml @@ -3,4 +3,4 @@

<%= l(:notice_not_authorized) %>

Back

-<% set_html_title '403' %> +<% html_title '403' %> diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml index 080b04842..753e716c6 100644 --- a/app/views/common/404.rhtml +++ b/app/views/common/404.rhtml @@ -3,4 +3,4 @@

<%= l(:notice_file_not_found) %>

Back

-<% set_html_title '404' %> +<% html_title '404' %> diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index bbdfeffb4..4fd381a17 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -52,4 +52,4 @@ <%= javascript_tag "showTab('#{@tab}');" %> -<% set_html_title(l(:label_custom_field_plural)) -%> +<% html_title(l(:label_custom_field_plural)) -%> diff --git a/app/views/documents/index.rhtml b/app/views/documents/index.rhtml index a7cefb733..ff58c2b2f 100644 --- a/app/views/documents/index.rhtml +++ b/app/views/documents/index.rhtml @@ -36,4 +36,4 @@ <% end %> <% end %> -<% set_html_title l(:label_document_plural) -%> +<% html_title(l(:label_document_plural)) -%> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 8f53f1abe..599ac389b 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -35,4 +35,4 @@ <% end %> <% end %> -<% set_html_title h(@document.title) -%> +<% html_title @document.title -%> diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 2e069f392..9de9bf37c 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -25,4 +25,4 @@

<%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %>

<% end %> -<% set_html_title(l(:label_enumerations)) -%> +<% html_title(l(:label_enumerations)) -%> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index a45f5d4d0..e35911813 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -34,4 +34,4 @@

<%= pagination_links_full @issue_status_pages %>

-<% set_html_title(l(:label_issue_status_plural)) -%> +<% html_title(l(:label_issue_status_plural)) -%> diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index c298b9bcc..48697c505 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -1,6 +1,6 @@ <% if @query.new_record? %>

<%=l(:label_issue_plural)%>

- <% set_html_title l(:label_issue_plural) %> + <% html_title(l(:label_issue_plural)) %> <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> <%= hidden_field_tag('project_id', @project.id) if @project %> @@ -32,9 +32,9 @@ <% end %> -

<%= @query.name %>

+

<%=h @query.name %>

- <% set_html_title @query.name %> + <% html_title @query.name %> <% end %> <%= error_messages_for 'query' %> <% if @query.valid? %> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 37e1d4abd..006efa3d5 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -116,7 +116,7 @@ end %>   -<% set_html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> +<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <% content_for :sidebar do %> <%= render :partial => 'issues/sidebar' %> diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml index fe2e5625b..77568836d 100644 --- a/app/views/my/account.rhtml +++ b/app/views/my/account.rhtml @@ -45,4 +45,4 @@ <%= render :partial => 'sidebar' %> <% end %> -<% set_html_title l(:label_my_account) -%> +<% html_title(l(:label_my_account)) -%> diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml index db292da37..26ee44fcc 100644 --- a/app/views/my/page.rhtml +++ b/app/views/my/page.rhtml @@ -39,4 +39,4 @@ <%= javascript_tag 'new ContextMenu({})' %> -<% set_html_title l(:label_my_page) -%> +<% html_title(l(:label_my_page)) -%> diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index 354467229..b958c475e 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -33,4 +33,4 @@ <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <% end %> -<% set_html_title l(:label_news_plural) -%> +<% html_title(l(:label_news_plural)) -%> diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml index 2b71c48ad..e0cd09990 100644 --- a/app/views/news/show.rhtml +++ b/app/views/news/show.rhtml @@ -43,4 +43,4 @@ <% end %> <% end %> -<% set_html_title(h(@news.title)) -%> +<% html_title @news.title -%> diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index d22443bc0..41a8ae100 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -40,4 +40,4 @@ <% end %> <% end %> -<% set_html_title l(:label_activity) -%> +<% html_title(l(:label_activity)) -%> diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 39f171626..171e82345 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -39,4 +39,4 @@ <% end %> <% end %> -<% set_html_title l(:label_calendar) -%> +<% html_title(l(:label_calendar)) -%> diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index 395514b61..0e252aeae 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -246,4 +246,4 @@ if Date.today >= @date_from and Date.today <= @date_to %> <% end %> <% end %> -<% set_html_title l(:label_gantt) -%> +<% html_title(l(:label_gantt)) -%> diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml index c7630c0a2..a18f63e43 100644 --- a/app/views/projects/list.rhtml +++ b/app/views/projects/list.rhtml @@ -17,4 +17,4 @@ <% end %> -<% set_html_title l(:label_project_plural) -%> +<% html_title(l(:label_project_plural)) -%> diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index b9f688509..9b297de59 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -43,4 +43,4 @@ -<% set_html_title l(:label_attachment_plural) -%> +<% html_title(l(:label_attachment_plural)) -%> diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml index daf7639fc..4dc94b8c6 100644 --- a/app/views/projects/roadmap.rhtml +++ b/app/views/projects/roadmap.rhtml @@ -47,4 +47,4 @@ <% end %> <% end %> -<% set_html_title l(:label_roadmap) %> +<% html_title(l(:label_roadmap)) %> diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 37a469df1..5516623a3 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -15,4 +15,4 @@ <%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name] javascript_tag "showTab('#{tab}');" %> -<% set_html_title l(:label_settings) -%> +<% html_title(l(:label_settings)) -%> diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index ecde32bde..2b930e01e 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -82,4 +82,4 @@ <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> <% end %> -<% set_html_title l(:label_overview) -%> +<% html_title(l(:label_overview)) -%> diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml index 1ed623ae8..5590652f5 100644 --- a/app/views/repositories/_dir_list.rhtml +++ b/app/views/repositories/_dir_list.rhtml @@ -1,10 +1,10 @@ - +
- + diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml index 0d84da387..352575259 100644 --- a/app/views/repositories/_dir_list_content.rhtml +++ b/app/views/repositories/_dir_list_content.rhtml @@ -1,8 +1,8 @@ <% @entries.each do |entry| %> <% tr_id = Digest::MD5.hexdigest(entry.path) depth = params[:depth].to_i %> - - + - - - - + + + + <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %> - + <% end %> diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml index 9f40e0abd..b7ac989bc 100644 --- a/app/views/repositories/_navigation.rhtml +++ b/app/views/repositories/_navigation.rhtml @@ -17,3 +17,5 @@ dirs.each do |dir| <% end %> <%= "@ #{revision}" if revision %> + +<% html_title(with_leading_slash(path)) -%> diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml index d1ef83576..ea722329f 100644 --- a/app/views/repositories/_revisions.rhtml +++ b/app/views/repositories/_revisions.rhtml @@ -1,5 +1,5 @@ <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %> -
<%= l(:field_name) %> <%= l(:field_filesize) %> <%= l(:label_revision) %><%= l(:label_date) %><%= l(:label_age) %> <%= l(:field_author) %> <%= l(:field_comments) %>
+
<%= if entry.is_dir? link_to_remote h(entry.name), {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id}, @@ -22,11 +22,11 @@ else :style => "margin-left: #{18 * depth}px;" end %> <%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %><%= format_time(entry.lastrev.time) if entry.lastrev %><%=h(entry.lastrev.author) if entry.lastrev %><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %><%=h(entry.lastrev.author) if entry.lastrev %><%=h truncate(changeset.comments, 50) unless changeset.nil? %><%=h truncate(changeset.comments, 50) unless changeset.nil? %>
+
@@ -12,17 +12,17 @@ <% show_diff = entry && entry.is_file? && revisions.size > 1 %> <% line_num = 1 %> <% revisions.each do |changeset| %> - + - - - + + + <% line_num += 1 %> <% end %>
#
<%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %> <%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %> <%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %><%= format_time(changeset.committed_on) %><%=h changeset.committer %><%= textilizable(changeset.comments) %><%= format_time(changeset.committed_on) %><%=h changeset.committer %><%= textilizable(changeset.comments) %>
-<%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %> +<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %> <% end %> diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml index 9a3fc834b..3aa884104 100644 --- a/app/views/repositories/annotate.rhtml +++ b/app/views/repositories/annotate.rhtml @@ -21,6 +21,8 @@ +<% html_title(l(:button_annotate)) -%> + <% content_for :header_tags do %> <%= stylesheet_link_tag 'scm' %> <% end %> diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml index 0ba24fd86..868388f11 100644 --- a/app/views/repositories/browse.rhtml +++ b/app/views/repositories/browse.rhtml @@ -10,4 +10,4 @@ <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml index 218459128..55842a28b 100644 --- a/app/views/repositories/changes.rhtml +++ b/app/views/repositories/changes.rhtml @@ -17,4 +17,4 @@ <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%> -<% set_html_title(h(@entry.name)) -%> +<% html_title(l(:label_change_plural)) -%> diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml index de6cdc50c..88c5f17a0 100644 --- a/app/views/repositories/diff.rhtml +++ b/app/views/repositories/diff.rhtml @@ -88,6 +88,8 @@ <% end %> <% end %> +<% html_title(with_leading_slash(@path), 'Diff') -%> + <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> <% end %> diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml index 265070e37..80cfdf2b7 100644 --- a/app/views/repositories/revision.rhtml +++ b/app/views/repositories/revision.rhtml @@ -62,4 +62,4 @@ <%= stylesheet_link_tag "scm" %> <% end %> -<% set_html_title("#{l(:label_revision)} #{@changeset.revision}") -%> +<% html_title("#{l(:label_revision)} #{@changeset.revision}") -%> diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml index 99c3f7afd..ac5919dd6 100644 --- a/app/views/repositories/revisions.rhtml +++ b/app/views/repositories/revisions.rhtml @@ -16,4 +16,4 @@ <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <% end %> -<% set_html_title l(:label_revision_plural) -%> +<% html_title(l(:label_revision_plural)) -%> diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml index 9fb45514d..469ac063e 100644 --- a/app/views/repositories/show.rhtml +++ b/app/views/repositories/show.rhtml @@ -22,4 +22,4 @@ <%= stylesheet_link_tag "scm" %> <% end %> -<% set_html_title l(:label_repository) -%> +<% html_title(l(:label_repository)) -%> diff --git a/app/views/repositories/stats.rhtml b/app/views/repositories/stats.rhtml index 7a9423f8c..76ce892d5 100644 --- a/app/views/repositories/stats.rhtml +++ b/app/views/repositories/stats.rhtml @@ -8,4 +8,6 @@
-

<%= link_to l(:button_back), :action => 'show', :id => @project %>

\ No newline at end of file +

<%= link_to l(:button_back), :action => 'show', :id => @project %>

+ +<% html_title(l(:label_repository), l(:label_statistics)) -%> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index fabc5edcd..202fdf41c 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -33,4 +33,4 @@

<%= link_to l(:label_permissions_report), :action => 'report' %>

-<% set_html_title(l(:label_role_plural)) -%> +<% html_title(l(:label_role_plural)) -%> diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml index 02f1b48a2..0f08b0d22 100644 --- a/app/views/roles/workflow.rhtml +++ b/app/views/roles/workflow.rhtml @@ -55,4 +55,4 @@ <% end %> -<% set_html_title(l(:label_workflow)) -%> +<% html_title(l(:label_workflow)) -%> diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml index 9f156cbe1..29c604a21 100644 --- a/app/views/search/index.rhtml +++ b/app/views/search/index.rhtml @@ -42,4 +42,4 @@ <% end %>

-<% set_html_title(l(:label_search)) -%> +<% html_title(l(:label_search)) -%> diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index b1db0e7ad..b1762a0e3 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -102,4 +102,4 @@ <%= submit_tag l(:button_save) %> <% end %> -<% set_html_title(l(:label_settings)) -%> +<% html_title(l(:label_settings)) -%> diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 447507210..9ccfda386 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -32,4 +32,4 @@

<%= pagination_links_full @tracker_pages %>

-<% set_html_title(l(:label_tracker_plural)) -%> +<% html_title(l(:label_tracker_plural)) -%> diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index fbac1e8e9..50054c989 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -57,4 +57,4 @@

<%= pagination_links_full @user_pages, @user_count %>

-<% set_html_title(l(:label_user_plural)) -%> +<% html_title(l(:label_user_plural)) -%> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index a7c4f2b37..1c2a0be44 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -11,4 +11,4 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -<% set_html_title h(@version.name) %> +<% html_title @version.name %> diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml index 94581104f..32acbfff6 100644 --- a/app/views/wiki/edit.rhtml +++ b/app/views/wiki/edit.rhtml @@ -28,4 +28,4 @@ <%= stylesheet_link_tag 'scm' %> <% end %> -<% set_html_title @page.pretty_title %> +<% html_title @page.pretty_title %> diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index d23491711..6f1df124b 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -47,4 +47,4 @@ <%= render :partial => 'sidebar' %> <% end %> -<% set_html_title @page.pretty_title %> +<% html_title @page.pretty_title %> diff --git a/lang/bg.yml b/lang/bg.yml index 635ead5a5..916e89268 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/cs.yml b/lang/cs.yml index 89cc177b5..db2055f6c 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/de.yml b/lang/de.yml index faa992933..2d4a95c2d 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/en.yml b/lang/en.yml index 36c060d36..2419b05db 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -458,6 +458,7 @@ label_registration_activation_by_email: account activation by email label_registration_manual_activation: manual account activation label_registration_automatic_activation: automatic account activation label_display_per_page: 'Per page: %s' +label_age: Age button_login: Login button_submit: Submit diff --git a/lang/es.yml b/lang/es.yml index 6ec8db0f1..717d4014d 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -555,3 +555,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/fr.yml b/lang/fr.yml index c13500e03..394865a21 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -458,6 +458,7 @@ label_registration_activation_by_email: activation du compte par email label_registration_manual_activation: activation manuelle du compte label_registration_automatic_activation: activation automatique du compte label_display_per_page: 'Par page: %s' +label_age: Age button_login: Connexion button_submit: Soumettre diff --git a/lang/he.yml b/lang/he.yml index 09070bd82..322b10b7c 100644 --- a/lang/he.yml +++ b/lang/he.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/it.yml b/lang/it.yml index 8c87a8b34..561215f78 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ja.yml b/lang/ja.yml index 150c62283..eb30edb26 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -553,3 +553,4 @@ label_issues_by: %s別の問題 field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ko.yml b/lang/ko.yml index 001ddd395..d0e03b364 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/nl.yml b/lang/nl.yml index 0c8085ba1..74eff69ea 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pl.yml b/lang/pl.yml index c086cce63..f1513ac92 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -552,3 +552,4 @@ label_issues_by: Zagadnienia wprowadzone przez %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 564ee4b0a..33719d11b 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pt.yml b/lang/pt.yml index aaab55a51..c042589e3 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ro.yml b/lang/ro.yml index 6fdce2081..e615472ad 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ru.yml b/lang/ru.yml index 1be4615bb..d40379788 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/sr.yml b/lang/sr.yml index a4bed33ea..6e571d6e1 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/sv.yml b/lang/sv.yml index fd84f2a58..dd4117115 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index 6bc341cba..889f86a1c 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -552,3 +552,4 @@ enumeration_activities: 活動 (time tracking) field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/zh.yml b/lang/zh.yml index 31e8b239b..c758f5490 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -555,3 +555,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 37bddbc05..eaef2ae87 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -77,6 +77,16 @@ tr.issue td.subject, tr.issue td.category { white-space: normal; } tr.issue td.subject { text-align: left; } tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;} +tr.entry { border: 1px solid #f8f8f8; } +tr.entry td { white-space: nowrap; } +tr.entry td.filename { width: 30%; } +tr.entry td.size { text-align: right; font-size: 90%; } +tr.entry td.revision, tr.entry td.author { text-align: center; } +tr.entry td.age { text-align: right; } + +tr.changeset td.author { text-align: center; width: 15%; } +tr.changeset td.committed_on { text-align: center; width: 15%; } + tr.message { height: 2.6em; } tr.message td.last_message { font-size: 80%; } tr.message.locked td.subject a { background-image: url(../images/locked.png); } -- 2.39.5