Atualizando para o Rails 2.3.2

This commit is contained in:
2009-07-16 11:55:04 -03:00
parent dcfc38eb09
commit 8e9b698944
71 changed files with 220 additions and 173 deletions

View File

@@ -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 tz(page.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_url(@course, @wiki_page, :version => page.version)
= action_icon('undo', "Reverter", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{page.version}", :version => page.version)) + " "
= link_to tz(page.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_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?

View File

@@ -7,5 +7,5 @@
%li= render :partial => 'wiki/history', :locals => { :page => @to }
%li= render :partial => 'wiki/history', :locals => { :page => @from }
= link_to "Comparar outras versões", versions_course_wiki_url(@course, @wiki_page, :from => @from.version, :to => @to.version)
= link_to "Comparar outras versões", versions_course_wiki_instance_url(@course, @wiki_page, :from => @from.version, :to => @to.version)
= format_diff h(@diff)

View File

@@ -4,7 +4,7 @@
%h1.title= "Editar #{h(@wiki_page.title)}"
%p
- form_tag course_wiki_url(@course, @wiki_page.id), :method => :put do
- form_tag course_wiki_instance_url(@course, @wiki_page.id), :method => :put do
= render :partial => 'form'
= submit_tag 'Salvar'
%button#show_preview{:type => "button"}

View File

@@ -4,7 +4,7 @@
%h1.title Adicionar página wiki
%p
- form_tag course_wiki_url(@course, @wiki_page.id) do
- form_tag course_wiki_url(@course) do
= render :partial => 'form'
= submit_tag "Criar"
%button#show_preview{:type => "button"}

View File

@@ -3,9 +3,9 @@
= javascript_include_tag 'wiki'
.cmd
= action_icon 'edit', 'Editar', edit_course_wiki_url
= action_icon 'undo', 'Historico', versions_course_wiki_url
= action_icon 'trash', 'Excluir página wiki', course_wiki_url, :confirm => 'Tem certeza que deseja excluir?', :method => :delete
= action_icon 'edit', 'Editar', edit_course_wiki_instance_url
= action_icon 'undo', 'Historico', versions_course_wiki_instance_url
= action_icon 'trash', 'Excluir página wiki', course_wiki_instance_url, :confirm => 'Tem certeza que deseja excluir?', :method => :delete
%h4.title= h(@course.full_name)
%h1.title= h(@wiki_page.title)

View File

@@ -8,7 +8,7 @@
== radios_to = #{h(@history_to)};
== radios_from = #{h(@history_from)};
- form_tag diff_course_wiki_url(@course, @wiki_page), :method => :get do
- form_tag diff_course_wiki_instance_url(@course, @wiki_page), :method => :get do
%button{:type => "submit"}= "Comparar as versões selecionadas"
.box
%table
@@ -24,12 +24,12 @@
%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(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_with_deleted(entry.user_id).display_name), 20), user_path(User.find_with_deleted(entry.user_id))
%td= link_to(tz(entry.updated_at).strftime("%d/%m/%y %H:%M:%S"), course_wiki_instance_url(@course, @wiki_page, :version => entry.version))
%td= link_to truncate(h(User.find_with_deleted(entry.user_id).display_name), :length => 20), user_path(User.find_with_deleted(entry.user_id))
%td
= entry.description
- if (entry.version > @wiki_page.versions.minimum(:version))
= "(" + link_to("diff", diff_course_wiki_url(@course, @wiki_page, :from => entry.version - 1, :to => entry.version)) + ")"
= "(" + link_to("edit", edit_course_wiki_url(@course, @wiki_page, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
= "(" + link_to("diff", diff_course_wiki_instance_url(@course, @wiki_page, :from => entry.version - 1, :to => entry.version)) + ")"
= "(" + link_to("edit", edit_course_wiki_instance_url(@course, @wiki_page, :description => "Revertendo para versão #{entry.version}", :version => entry.version)) + ")"
/= will_paginate @versions