jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1480 项目留言区回复时间显示问题

This commit is contained in:
z9hang 2014-11-10 15:09:48 +08:00
parent 6964a787b2
commit 9bd1af9541
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/application_helper.rb
View File

@ -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

2
app/views/projects/_history.html.erb
View File

@ -30,7 +30,7 @@
</span>
<span class="font_lighter" style="float: right">
<%= l(:label_bids_published) %>&nbsp;
<%= time_tag(journal.created_on).html_safe %>&nbsp;
<%= time_tag(journal.created_on,:style => "float:initial").html_safe %>&nbsp;
<%= l(:label_bids_published_ago) %>
</span>
</div>