|
|
|
@ -756,16 +756,16 @@ module ApplicationHelper
|
|
|
|
|
return ss
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# def time_tag(time, *args)
|
|
|
|
|
# options = args.extract_options!
|
|
|
|
|
# text = distance_of_time_in_words(Time.now, time)
|
|
|
|
|
# if @project
|
|
|
|
|
# content_tag('acronym', text, options.reverse_merge(: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, options.reverse_merge(:title => format_time(time)))
|
|
|
|
|
# end
|
|
|
|
|
# end
|
|
|
|
|
def time_tag(time, *args)
|
|
|
|
|
options = args.extract_options!
|
|
|
|
|
text = distance_of_time_in_words(Time.now, time)
|
|
|
|
|
if @project
|
|
|
|
|
content_tag('acronym', text, options.reverse_merge(: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, options.reverse_merge(:title => format_time(time)))
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def syntax_highlight_lines(name, content)
|
|
|
|
|
lines = []
|
|
|
|
|