diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8544b2cf3..1d528c183 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -578,12 +578,13 @@ module ApplicationHelper return ss end - def time_tag(time) + def time_tag(time, *args) + options = args.extract_options! text = distance_of_time_in_words(Time.now, time) if @project - link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time)) + link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) else - content_tag('acronym', text, :title => format_time(time)) + content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) end end diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb index beb31f830..38ee59e38 100644 --- a/app/views/projects/_history.html.erb +++ b/app/views/projects/_history.html.erb @@ -30,7 +30,7 @@ <%= l(:label_bids_published) %>  - <%= time_tag(journal.created_on).html_safe %>  + <%= time_tag(journal.created_on,:style => "float:initial").html_safe %>  <%= l(:label_bids_published_ago) %>