From 5d51f929c6e12929c09cc53bc9b323d277b4c9bf Mon Sep 17 00:00:00 2001 From: Alinson Santos Date: Tue, 11 Mar 2008 13:19:29 -0300 Subject: [PATCH] Fuso horario --- app/views/log/index.html.haml | 2 +- app/views/log/index.rss.builder | 2 +- app/views/wiki/_history.html.haml | 2 +- app/views/wiki/versions.html.haml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/log/index.html.haml b/app/views/log/index.html.haml index 5718c81..b0a38b1 100644 --- a/app/views/log/index.html.haml +++ b/app/views/log/index.html.haml @@ -14,7 +14,7 @@ %th Descrição - @log_entries.each do |entry| %tr - %td= entry.created_at.strftime("%d/%m/%y %H:%M:%S") + %td= tz(entry.created_at).strftime("%d/%m/%y %H:%M:%S") %td= link_to truncate(h(entry.user.display_name), 20), user_path(entry.user) - unless @course %td= link_to h(entry.course.short_name), course_url(entry.course) diff --git a/app/views/log/index.rss.builder b/app/views/log/index.rss.builder index baca083..3a0c0b8 100644 --- a/app/views/log/index.rss.builder +++ b/app/views/log/index.rss.builder @@ -10,7 +10,7 @@ xml.rss(:version=>"2.0") do description = render(:partial => 'log/log_entry.html.haml', :locals => { :entry => entry }) xml.title("") xml.description(description + " por #{link_to h(entry.user.display_name), user_url(entry.user)}") - xml.pubDate(entry.created_at.rfc2822) + xml.pubDate(tz(entry.created_at).rfc2822) xml.link(course_log_url(@course, :id => entry)) xml.guid(course_log_url(@course, :id => entry)) end diff --git a/app/views/wiki/_history.html.haml b/app/views/wiki/_history.html.haml index ba4a61e..2b922b9 100644 --- a/app/views/wiki/_history.html.haml +++ b/app/views/wiki/_history.html.haml @@ -1,5 +1,5 @@ = action_icon('undo', "Reverter", edit_course_wiki_url(@course, @wiki_page, :description => "Revertendo para versão #{page.version}", :version => page.version)) + " " -= link_to page.updated_at.strftime("%d/%m/%y %H:%M:%S"), course_wiki_url(@course, @wiki_page, :version => page.version) += link_to tz(page.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_url(@course, @wiki_page, :version => page.version) = "por #{link_to h(page.user.display_name), user_path(page.user)}" if page.respond_to?(:user) and !page.user.nil? - if page.description and !page.description.empty? diff --git a/app/views/wiki/versions.html.haml b/app/views/wiki/versions.html.haml index fc43cb4..a778f2d 100644 --- a/app/views/wiki/versions.html.haml +++ b/app/views/wiki/versions.html.haml @@ -24,7 +24,7 @@ %input{:type => "radio", :name => "from", :value => entry.version, :onclick => "history_from(#{entry.version})"} %td.narrow %input{:type => "radio", :name => "to", :value => entry.version, :onclick => %"history_to(#{entry.version})"} - %td= link_to(entry.updated_at.strftime("%d/%m/%y %H:%M:%S"), course_wiki_url(@course, @wiki_page, :version => entry.version)) + %td= link_to(tz(entry.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_url(@course, @wiki_page, :version => entry.version)) %td= link_to truncate(h(User.find(entry.user_id).display_name), 20), user_path(User.find(entry.user_id)) %td = entry.description