rails 3 fixes

app/views/attachments/edit.html.haml

@@ -2,6 +2,6 @@
 %h1.title Modificar arquivo
 
 %p
-  - form_for :attachment, @attachment, :url => course_attachment_url, :html => { :method => 'put', :multipart => 'true' } do
+  = form_for @attachment, :url => course_attachment_url, :html => { :method => 'put', :multipart => 'true' } do
     = render :partial => 'form'
     = submit_tag 'Editar', :accesskey => 'e'

app/views/attachments/new.html.haml

@@ -2,6 +2,6 @@
 %h1.title Adicionar arquivo
 
 %p
-  - form_for :attachment, @attachment, :url => course_attachments_url, :html => { :method => 'post', :multipart => 'true' } do
+  = form_for @attachment, :url => course_attachments_url, :html => { :method => 'post', :multipart => 'true' } do
     = render :partial => 'form'
     = submit_tag "Criar", :accesskey => 'e'

app/views/courses/edit.html.haml

@@ -2,6 +2,6 @@
 %h1.title Editar disciplina
 
 %p
-  - form_tag course_path(@course.id), :method => :put do
+  = form_tag course_path(@course.id), :method => :put do
     = render :partial => 'form'
     = submit_tag 'Editar', :accesskey => 'e'

app/views/courses/new.html.haml

@@ -1,6 +1,6 @@
 %h4.title= App.title
 %h1.title Adicionar disciplina
 
-- form_tag courses_url, :method => :post do
+= form_tag courses_url, :method => :post do
   = render :partial => 'form'
   = submit_tag "Cadastrar", :accesskey => 'e'

app/views/events/edit.html.haml

@@ -2,6 +2,6 @@
 %h1.title Editar evento
 
 %p
-  - form_tag course_event_url(@course, @event), :method => :put do
+  = form_tag course_event_url(@course, @event), :method => :put do
     = render :partial => 'form'
     = submit_tag 'Editar', :accesskey => 'e'

app/views/events/new.html.haml

@@ -2,6 +2,6 @@
 %h1.title Adicionar evento
 
 %p
-  - form_tag course_events_url(@course), :method => :post do
+  = form_tag course_events_url(@course), :method => :post do
     = render :partial => 'form'
     = submit_tag "Adicionar", :accesskey => 'e'

app/views/layouts/attachments.html.haml

@@ -1,11 +1,11 @@
 - @title = "#{App.title} - #{h(@course.full_name)}"
 - @location = capture do 
-  = link_to(App.title, index_url, :accesskey => 'z') + "›"
-  = link_to("Disciplinas", courses_url) + "›"
-  = link_to(h(@course.full_name), course_url(@course)) + "›"
+  = link_to(App.title, index_url, :accesskey => 'z') + "›"
+  = link_to("Disciplinas", courses_url) + "›"
+  = link_to(h(@course.full_name), course_url(@course)) + "›"
   = link_to("Arquivos", course_attachments_url(@course))
   - if @attachment.id
-    = "›" + link_to(truncate(h(@attachment.file_name)), course_attachment_url)
+    = "›" + link_to(truncate(h(@attachment.file_name)), course_attachment_url)
     - @title = @title + " - #{truncate(h(@attachment.file_name))}"
 
 - @left_panel = render 'courses/left_panel'

app/views/layouts/courses.html.haml

@@ -1,9 +1,9 @@
 - @title = "#{App.title}"
 - @location = capture do
-  = link_to(App.title, index_url, :accesskey => 'z') + "›";
+  = link_to(App.title, index_url, :accesskey => 'z') + "›";
   = link_to("Disciplinas", courses_url)
   - if @course and @course.id
-    = "› " + link_to(h(@course.full_name), course_url)
+    = "› " + link_to(h(@course.full_name), course_url)
     - @title = @title + " - #{h(@course.full_name)}"
   - else
     - @title = @title + " - Disciplinas"

app/views/layouts/events.html.haml

@@ -1,8 +1,8 @@
 - @title = "#{App.title} - #{h(@course.full_name)} - Calendário"
 - @location = capture do 
-  = link_to(App.title, index_url, :accesskey => 'z') + "›"
-  = link_to("Disciplinas", courses_url) + "›"
-  = link_to(h(@course.full_name), course_url(@course)) + "›"
+  = link_to(App.title, index_url, :accesskey => 'z') + "›"
+  = link_to("Disciplinas", courses_url) + "›"
+  = link_to(h(@course.full_name), course_url(@course)) + "›"
   = link_to("Calendário", course_events_url)
 
 - @left_panel = render 'courses/left_panel'

app/views/layouts/log.html.haml

@@ -1,9 +1,9 @@
 - if @course
   - @title = "#{App.title} - #{h(@course.full_name)} - Mudanças recentes"
   - @location = capture do 
-    = link_to(App.title, index_url, :accesskey => 'z') + "›"
-    = link_to("Disciplinas", courses_url) + "›"
-    = link_to(h(@course.full_name), course_url(@course)) + "›"
+    = link_to(App.title, index_url, :accesskey => 'z') + "›"
+    = link_to("Disciplinas", courses_url) + "›"
+    = link_to(h(@course.full_name), course_url(@course)) + "›"
     = link_to("Mudanças Recentes", course_log_url(@course))
 
   - @left_panel = render 'courses/left_panel'
@@ -12,7 +12,7 @@
 - else
   - @title = "#{App.title} - Mudanças recentes"
   - @location = capture do 
-    = link_to(App.title, index_url) + "›"
+    = link_to(App.title, index_url) + "›"
     = link_to("Mudanças recentes", log_url)
 
   - @content = yield

app/views/layouts/news.html.haml

@@ -1,8 +1,8 @@
 - @title = "#{App.title} - #{h(@course.full_name)} - Notícias"
 - @location = capture do 
-  = link_to(App.title, index_url, :accesskey => 'z') + "›"
-  = link_to("Disciplinas", courses_url) + "›"
-  = link_to(h(@course.full_name), course_url(@course)) + "›"
+  = link_to(App.title, index_url, :accesskey => 'z') + "›"
+  = link_to("Disciplinas", courses_url) + "›"
+  = link_to(h(@course.full_name), course_url(@course)) + "›"
   = link_to("Noticias", course_news_url(@course))
 
 - @left_panel = render 'courses/left_panel'

app/views/layouts/users.html.haml

@@ -1,9 +1,9 @@
 - @title = App.title
 - @location = capture do
-  = link_to(App.title, index_url, :accesskey => 'z') + "›";
+  = link_to(App.title, index_url, :accesskey => 'z') + "›";
   = link_to("Usuários", users_path)
   - if @user and @user.id
-    = "› " + link_to(h(@user.name), user_url(@user))
+    = "› " + link_to(h(@user.name), user_url(@user))
     - @title = @title + " - #{h(@user.display_name)}"
 
 - @left_panel = render('widgets/menu_navigation') + render('widgets/menu_user')

app/views/layouts/wiki.html.haml

@@ -1,11 +1,11 @@
 - @title = "#{App.title} - #{h(@course.full_name)}"
 - @location = capture do 
-  = link_to(App.title, index_url, :accesskey => 'z') + "›"
-  = link_to("Disciplinas", courses_url) + "›"
-  = link_to(h(@course.full_name), course_url(@course)) + "›"
+  = link_to(App.title, index_url, :accesskey => 'z') + "›"
+  = link_to("Disciplinas", courses_url) + "›"
+  = link_to(h(@course.full_name), course_url(@course)) + "›"
   = link_to("Wiki", course_wiki_url(@course))
   - if @wiki_page.title?
-    = "›" + link_to(h(@wiki_page.title), course_wiki_instance_url(@course, @wiki_page))
+    = "›" + link_to(h(@wiki_page.title), course_wiki_instance_url(@course, @wiki_page))
     - @title = @title + " - #{h(@wiki_page.title)}"
 
 - @left_panel = render 'courses/left_panel'

app/views/news/edit.html.haml

@@ -2,6 +2,6 @@
 %h1.title Editar noticia
 
 %p
-  - form_tag course_news_instance_url(@course, @news), :method => :put do
+  = form_tag course_news_instance_url(@course, @news), :method => :put do
     = render :partial => 'form'
     = submit_tag 'Editar', :accesskey => 'e'

app/views/news/new.html.haml

@@ -1,6 +1,6 @@
 %h4.title= @course.full_name
 %h1.title Adicionar notícia
 
-- form_tag course_news_url, :method => :post do
+= form_tag course_news_url, :method => :post do
   = render :partial => 'form'
   = submit_tag "Adicionar", :accesskey => 'e'

app/views/user/change_password.html.erb

@@ -4,7 +4,7 @@
 <p>
 <%= error_messages_for 'user' %><br/>
 
-<% form_tag :action => 'change_password' do %>
+<%= form_tag :action => 'change_password' do %>
 
 <label for="user_password">Nova senha</label><br/>
 <%= password_field "user", "password", :size => 20, :value=>"" %><br/>

app/views/user/edit.html.erb

@@ -4,7 +4,7 @@
 <p>
 <%= error_messages_for 'user' %><br/>
 
-<% form_tag :action => 'update', :id => @user do %>
+<%= form_tag :action => 'update', :id => @user do %>
 
 <label for="user_name">Nome</label><br/>
 <%= text_field "user", "name", :size => 20 %><br/>

app/views/user/forgot_password.html.erb

@@ -4,7 +4,7 @@
 <p>
 <%= error_messages_for 'user' %><br/>
 
-<% form_tag :action=>'forgot_password' do %>
+<%= form_tag :action=>'forgot_password' do %>
 
 Email<br/>
 <%= text_field "user","email" %><br/><br/>

app/views/user/login.html.erb

@@ -4,7 +4,7 @@
 <p>
 <%= error_messages_for 'user' %><br/>
 
-<% form_tag :action=> "login" do %>
+<%= form_tag :action=> "login" do %>
 
 <label for="user_login">Login:</label><br/>
 <%= text_field "user", "login", :size => 20 %><br/>

app/views/user/show.html.erb

@@ -13,7 +13,7 @@
 <% @news_messages.each do |n| %>
 	<div class="line">
 		<h4 class="left"><%= n.timestamp.strftime("%d de %B") %></h4>
-		<h4><%= link_to h(n.course.full_name) , course_news_instance_url(n.course, n) %> &rsaquo;
+		<h4><%= link_to h(n.course.full_name) , course_news_instance_url(n.course, n) %> ›
 		<a href="#" id="new_<%=n.id%>"><%= h(n.title) %></a></h4>
 
 		<p id="new_desc_<%= n.id %>" style="display:none">
@@ -48,7 +48,7 @@
 		<% end %>
 			<li>
 				<div class="time"><%= event.time.strftime("%H:%M") %></div>
-				<%= link_to h(event.course.full_name), course_event_url(event.course, event) %> &rsaquo;
+				<%= link_to h(event.course.full_name), course_event_url(event.course, event) %> ›
 				<a href="#" id="event_<%= event.id %>"><%= h(event.title) %></a>
 
 				<div id="desc_<%= event.id %>" class="description" style="display:none">

app/views/user/signup.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title">Criar conta</h1>
 
 <p>
-<% form_tag :action=> "signup" do %>
+<%= form_tag :action=> "signup" do %>
 
 <%= error_messages_for 'user' %><br/>
 

app/views/users/dashboard.html.haml

@@ -19,7 +19,7 @@
           %td.top.aright
             = n.timestamp.strftime("%d de %B")
           %td
-            = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
+            = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
             = link_to(h(n.title), course_news_instance_url(n.course, n))
             - unless n.body.empty?
               %p= truncate(h(n.body), :length => 300)
@@ -42,7 +42,7 @@
           %td.top
             = n.time.strftime("%H:%M")
           %td.top
-            = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
+            = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
             = link_to(h(n.title), course_event_url(n.course, n))
 
   .box

app/views/users/edit.html.haml

@@ -4,7 +4,7 @@
 %h1.title Editar perfil
 
 %p
-  - form_tag user_path(@user.id), :method => 'put' do
+  = form_tag user_path(@user.id), :method => 'put' do
     = render :partial => 'form_profile'
     = submit_tag 'Editar', :accesskey => 'e'
     %button#show_preview{:type => "button", :accesskey => 'v'}

app/views/users/login.html.haml

@@ -4,7 +4,7 @@
 %p
   = error_messages_for :user
   
-  - form_tag login_path do
+  = form_tag login_path do
     %dl
       %dt
         %label{:for => 'user_login'} Login

app/views/users/recover_password.html.haml

@@ -3,7 +3,7 @@
 
 - if params[:key]
   %p= error_messages_for :user
-  - form_tag recover_password_with_key_path(params[:key]) do
+  = form_tag recover_password_with_key_path(params[:key]) do
     %dl
       %dt
         %label{:for => 'user_login'} Login
@@ -27,7 +27,7 @@
     %p Uma mensagem de confirmacão foi enviado para o seu email.
 
   - else
-    - form_tag recover_password_path do
+    = form_tag recover_password_path do
       %dl
         %dt
           %label{:for => 'user_email'} Email

app/views/users/settings.html.haml

@@ -2,6 +2,6 @@
 %h1.title Editar configurações
 
 %p
-  - form_tag settings_url do
+  = form_tag settings_url do
     = render :partial => 'form_settings'
     = submit_tag 'Editar', :accesskey => 'e'

app/views/users/signup.html.haml

@@ -2,6 +2,6 @@
 %h1.title Nova conta
 
 %p
-  - form_tag signup_path do
+  = form_tag signup_path do
     = render :partial => 'form_settings', :locals => { :signup => true }
     = submit_tag 'Criar'

app/views/widgets/shoutbox.html.erb

@@ -7,7 +7,7 @@
 				<li>Carregando...</li>
 			</ul>
 			<% if session[:user] %>
-			<% form_tag(
+			<%= form_tag(
 				{:controller => 'message', :action => 'create'}, {:id => 'shoutbox_form' }) do %>
 				<div>
 					<%= text_area :message, :body %>

app/views/wiki/edit.html.haml

@@ -4,7 +4,7 @@
 %h1.title= "Editar #{h(@wiki_page.title)}"
 
 %p
-  - form_tag course_wiki_instance_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', :accesskey => 'e'
     %button#show_preview{:type => "button", :accesskey => 'v'}

app/views/wiki/new.html.haml

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

app/views/wiki/versions.html.haml

@@ -8,7 +8,7 @@
   == radios_to = #{h(@history_to)};
   == radios_from = #{h(@history_from)};
 
-- form_tag diff_course_wiki_instance_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