isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Atualizando para o Rails 2.3.2

Browse Source
This commit is contained in:
Alinson S. Xavier
2009-07-16 11:55:04 -03:00
parent dcfc38eb09
commit 8e9b698944
71 changed files with 220 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/log/_news_log_entry.html.haml
View File

@@ -1,4 +1,4 @@
= "Notícia " + link_to(h(entry.news.title), course_news_url(entry.course, entry.news, :version => entry.version))
= "Notícia " + link_to(h(entry.news.title), course_news_instance_url(entry.course, entry.news, :version => entry.version))
= "criada " if entry.kind_of?(NewsCreateLogEntry)
= "editada " if entry.kind_of?(NewsEditLogEntry)

14
app/views/log/_wiki_log_entry.html.haml
View File

@@ -1,24 +1,24 @@
- if entry.version
= "Página " + link_to(h(entry.wiki_page.title), course_wiki_url(entry.course, entry.wiki_page.id, :version => entry.version))
= "Página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id, :version => entry.version))
- else
= "Página " + link_to(h(entry.wiki_page.title), course_wiki_url(entry.course, entry.wiki_page.id))
= "Página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id))
= "criada " if entry.kind_of?(WikiCreateLogEntry)
= "editada " if entry.kind_of?(WikiEditLogEntry)
= "excluída " if entry.kind_of?(WikiDeleteLogEntry)
= "restaurada " if entry.kind_of?(WikiRestoreLogEntry)
- current_version = WikiPage.find_version(entry.wiki_page.id, entry.version)
- previous_version = entry.wiki_page.previous_version(entry.version)
- current_version = entry.wiki_page.versions.find_by_version(entry.version)
- previous_version = current_version.previous
- if entry.kind_of?(WikiEditLogEntry)
- if current_version.description and !current_version.description.empty?
= "(<i>#{h(current_version.description)}</i>)"
- unless previous_version.nil?
= "(" + link_to("diff", diff_course_wiki_url(entry.course, entry.wiki_page.id, :from => previous_version.version, :to => entry.version)) + ")"
= "(" + link_to("diff", diff_course_wiki_instance_url(entry.course, entry.wiki_page.id, :from => previous_version.version, :to => entry.version)) + ")"
= "(" + link_to("edit", edit_course_wiki_url(entry.course, entry.wiki_page.id, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
= "(" + link_to("edit", edit_course_wiki_instance_url(entry.course, entry.wiki_page.id, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
- unless previous_version.nil?
= "(" + link_to("undo", edit_course_wiki_url(entry.course, entry.wiki_page.id, :description => "Revertendo para versão #{previous_version.version}", :version => previous_version.version)) + ")"
= "(" + link_to("undo", edit_course_wiki_instance_url(entry.course, entry.wiki_page.id, :description => "Revertendo para versão #{previous_version.version}", :version => previous_version.version)) + ")"

6
app/views/log/index.html.haml
View File

@@ -1,8 +1,8 @@
%h4.title= @course ? h(@course.full_name) : App.title
%h1.title Mudanças recentes
- if @course
= auto_discovery_link_tag :rss, formatted_course_log_url(@course, :rss)
-# if @course
=# auto_discovery_link_tag :rss, course_log_url(@course.id, :format => :rss)
.box
%table
@@ -15,7 +15,7 @@
- @log_entries.each do |entry|
%tr
%td= tz(entry.created_at).strftime("%d/%m/%y&nbsp;%H:%M:%S")
%td= link_to truncate(h(entry.user.display_name), 20), user_path(entry.user)
%td= link_to truncate(h(entry.user.display_name), :length => 20), user_url(entry.user.id)
- unless @course
%td= link_to h(entry.course.short_name), course_url(entry.course)
%td= render(:partial => 'log/log_entry', :locals => { :entry => entry })