From: Eric Davis Date: Tue, 22 Dec 2009 23:23:54 +0000 (+0000) Subject: Added the revision title to any revision links. X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=9f59cd64ab9fd10668cad6bbeae3c4daadb0325a;p=redminele%2Fredmine.git Added the revision title to any revision links. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3216 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cdb64f41..0876127a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -96,6 +96,15 @@ module ApplicationHelper link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options) end + # Generates a link to a SCM revision + # Options: + # * :text - Link text (default to the formatted revision) + def link_to_revision(revision, project, options={}) + text = options.delete(:text) || format_revision(revision) + + link_to(text, {:controller => 'repositories', :action => 'revision', :id => project, :rev => revision}, :title => l(:label_revision_id, revision)) + end + def toggle_link(name, id, options={}) onclick = "Element.toggle('#{id}'); " onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ") diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml index 8b6a067b..4e4589e1 100644 --- a/app/views/repositories/_dir_list_content.rhtml +++ b/app/views/repositories/_dir_list_content.rhtml @@ -17,7 +17,7 @@ <%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %> <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> -<%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> +<%= link_to_revision(changeset.revision, @project) if changeset %> <%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %> <%= changeset.nil? ? h(entry.lastrev.author.to_s.split('<').first) : changeset.author if entry.lastrev %> <%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %> diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml index 8fb15525..26fb5b69 100644 --- a/app/views/repositories/_revisions.rhtml +++ b/app/views/repositories/_revisions.rhtml @@ -13,7 +13,7 @@ <% line_num = 1 %> <% revisions.each do |changeset| %> -<%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %> +<%= link_to_revision(changeset.revision, project) %> <%= 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) %> diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml index b205be37..92597dff 100644 --- a/app/views/repositories/revision.rhtml +++ b/app/views/repositories/revision.rhtml @@ -1,13 +1,13 @@
« <% unless @changeset.previous.nil? -%> - <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %> + <%= link_to_revision(@changeset.previous.revision, @project, :text => l(:label_previous)) %> <% else -%> <%= l(:label_previous) %> <% end -%> | <% unless @changeset.next.nil? -%> - <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %> + <%= link_to_revision(@changeset.next.revision, @project, :text => l(:label_next)) %> <% else -%> <%= l(:label_next) %> <% end -%> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 4302542c..1bc29d0b 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -856,3 +856,4 @@ bg: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 5e33bb8a..35097cf2 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -880,3 +880,4 @@ bs: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/ca.yml b/config/locales/ca.yml index c5120180..07feeea0 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -859,3 +859,4 @@ ca: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 4ad8ad62..7ab2c211 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -862,3 +862,4 @@ cs: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/da.yml b/config/locales/da.yml index 24685581..2b2b378a 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -882,3 +882,4 @@ da: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/de.yml b/config/locales/de.yml index e11ffb52..fc2699f4 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -882,3 +882,4 @@ de: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/el.yml b/config/locales/el.yml index 13f8f37c..3b88da26 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -862,3 +862,4 @@ el: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/en.yml b/config/locales/en.yml index 3eee529d..cab7ff4a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -580,6 +580,7 @@ en: label_tag: Tag label_revision: Revision label_revision_plural: Revisions + label_revision_id: "Revision {{value}}" label_associated_revisions: Associated revisions label_added: added label_modified: modified diff --git a/config/locales/es.yml b/config/locales/es.yml index c0aa91db..a5c38a7c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -903,3 +903,4 @@ es: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 93d354dc..c9e4c313 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -892,3 +892,4 @@ fi: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index aa7fdafa..b676cd2e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -885,3 +885,4 @@ fr: enumeration_system_activity: Activité système setting_gravatar_default: Default Gravatar image setting_start_of_week: Start calendars on + label_revision_id: Revision {{value}} diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 363a54ef..f540981f 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -882,3 +882,4 @@ gl: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/he.yml b/config/locales/he.yml index bc172382..1eb00484 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -866,3 +866,4 @@ he: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 8c9f289f..a0961cd8 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -887,3 +887,4 @@ setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/it.yml b/config/locales/it.yml index 627daf34..2b5ee2fd 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -869,3 +869,4 @@ it: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 1257db26..5bf9fa18 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -891,3 +891,4 @@ ja: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 081c3acd..91d8c098 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -922,3 +922,4 @@ ko: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/lt.yml b/config/locales/lt.yml index b21fb5c3..957f9ff8 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -930,3 +930,4 @@ lt: label_update_issue_done_ratios: Update issue done ratios permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3acefe89..37fa32a3 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -844,3 +844,4 @@ nl: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/no.yml b/config/locales/no.yml index a8b064c0..b4956011 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -857,3 +857,4 @@ setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/pl.yml b/config/locales/pl.yml index d3e50219..64cec48e 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -885,3 +885,4 @@ pl: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 6491b0c5..69da727b 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -890,3 +890,4 @@ pt-BR: permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 24c24190..7601b202 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -874,3 +874,4 @@ pt: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 9a089118..6217b849 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -859,3 +859,4 @@ ro: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c01e52a6..cde29d94 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -970,3 +970,4 @@ ru: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/sk.yml b/config/locales/sk.yml index a2063083..16a9f260 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -861,3 +861,4 @@ sk: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 61f84ad8..736e3db4 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -858,3 +858,4 @@ sl: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/sr.yml b/config/locales/sr.yml index b58df8c6..ed425550 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -877,3 +877,4 @@ setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/sv.yml b/config/locales/sv.yml index c73a7568..f674e77f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -911,3 +911,4 @@ sv: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/th.yml b/config/locales/th.yml index 8ad86d00..745c340f 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -859,3 +859,4 @@ th: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/tr.yml b/config/locales/tr.yml index e98b53f0..e4138597 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -889,3 +889,4 @@ tr: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 55dc50c5..df646914 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -858,3 +858,4 @@ uk: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/vi.yml b/config/locales/vi.yml index d498cb53..31e6d0a4 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -921,3 +921,4 @@ vi: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}} diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 03ca09c1..46cbcafd 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -955,3 +955,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + label_revision_id: Revision {{value}} diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e34c5c3f..1a41b40b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -886,3 +886,4 @@ zh: setting_start_of_week: Start calendars on permission_view_issues: View Issues label_display_used_statuses_only: Only display statuses that are used by this tracker + label_revision_id: Revision {{value}}