fix all upgrade warnings from the rails_upgrade plugin

2026-03-08 05:32:37 +01:00 · 2012-04-18 14:22:58 +02:00 · 2012-04-18 14:22:58 +02:00 · fd433d76d8
commit fd433d76d8
parent fd4fb6df9e
47 changed files with 288 additions and 2284 deletions
--- a/app/views/contexts/_new_context_form.rhtml
+++ b/app/views/contexts/_new_context_form.rhtml
@ -6,7 +6,7 @@
  </div>

  <div id="context_new" class="context_new" style="display:block">
-    <% form_for(@new_context, :html => {:id => 'context-form',:name=>'context',:class => "inline-form", :method => :post }) do -%>
+    <%= form_for(@new_context, :html => {:id => 'context-form',:name=>'context',:class => "inline-form", :method => :post }) do -%>

      <div id="error_status"><%= error_messages_for('context') %></div>

--- a/app/views/data/yaml_form.de.html.erb
+++ b/app/views/data/yaml_form.de.html.erb
@ -8,7 +8,7 @@
      <p>F&uuml;gen Sie den Inhalt der kopierten YAML Datei in das untenstehende Formular ein:</p>
    </div>
    <p>
-      <% form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %>
+      <%= form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %>
        <%= f.text_area :yaml %><br />
        <input type="submit" value="Daten importieren">
      <% end %>
--- a/app/views/data/yaml_form.en.html.erb
+++ b/app/views/data/yaml_form.en.html.erb
@ -1,14 +1,14 @@
 <div id="display_box">
  <div id="feeds">
    <div id="feedlegend">
-      <p><b>Beware</b>: all your current data will be destroyed before importing 
-        the YAML file, so if you have access to the database, we strongly recommend 
+      <p><b>Beware</b>: all your current data will be destroyed before importing
+        the YAML file, so if you have access to the database, we strongly recommend
        backing up the database right now in case that anything goes wrong.
      </p>
      <p>Paste the contents of the YAML file you exported into the text box below:</p>
    </div>
    <p>
-      <% form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %>
+      <%= form_for :import, @import, :url => {:controller => 'data', :action => 'yaml_import'} do |f| %>
        <%= f.text_area :yaml %><br />
        <input type="submit" value="Import data">
      <% end %>
--- a/app/views/login/login.html.erb
+++ b/app/views/login/login.html.erb
@ -11,21 +11,21 @@
  <h3><%= t('login.please_login') %>:</h3>
 <% if show_database_form %>
  <div id="database_auth_form" style="display:<%=(@prefered_auth.eql?('database')) ? "block" : "none"%>">
-      <% form_tag :action=> 'login' do %>
+      <%= form_tag :action=> 'login' do %>
        <table>
          <tr>
            <td><label for="user_login"><%= User.human_attribute_name('login') %>:</label></td>
            <td><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
          </tr>
-          <tr> 
+          <tr>
            <td><label for="user_password"><%= User.human_attribute_name('password') %>:</label></td>
            <td><input type="password" name="user_password" id="user_password" class="login_text" /></td>
          </tr>
-         <tr> 
+         <tr>
            <td><label for="user_noexpiry"><%= t('login.user_no_expiry') %>:</label></td>
            <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
          </tr>
-          <tr> 
+          <tr>
            <td></td>
            <td><input type="submit" name="login" value="<%= t('login.sign_in') %> &#187;" class="primary" /></td>
          </tr>
@ -36,17 +36,17 @@

 <% if show_openid_form %>
  <div id="openid_auth_form" style="display:<%=(@prefered_auth.eql?('openid')) ? "block" : "none"%>">
-    <% form_tag :action=> 'login' do %>
+    <%= form_tag :action=> 'login' do %>
      <table>
        <tr>
          <td><label for="openid_url"><%= User.human_attribute_name('open_id_url') %>:</label></td>
          <td><input type="text" name="openid_url" id="openid_url" value="<%= @openid_url %>" class="login_text open_id" /></td>
        </tr>
-       <tr> 
+       <tr>
          <td><label for="user_noexpiry"><%= t('login.user_no_expiry') %>:</label></td>
          <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
        </tr>
-        <tr> 
+        <tr>
          <td></td>
          <td><input type="submit" name="login" value="<%= t('login.sign_in') %> &#187;" class="primary" /></td>
        </tr>
@ -59,7 +59,7 @@
  <div id="cas_auth_form" style="display:<%=(@prefered_auth.eql?('cas')) ? "block" : "none"%>">
      <table>
        <tr>
-          <td>	
+          <td>
 			<% if @username && @user%>
 			  <p><%= t('login.cas_logged_in_greeting', :username => @username) %></p>
 			<% elsif @username %>
--- a/app/views/login/login_mobile.html.erb
+++ b/app/views/login/login_mobile.html.erb
@ -11,21 +11,21 @@

 <% if show_database_form %>
  <div id="database_auth_form">
-      <% form_tag login_path(:format => 'm') do %>
+      <%= form_tag login_path(:format => 'm') do %>
        <table>
          <tr>
            <td><label for="user_login"><%= User.human_attribute_name('login') %>:</label></td>
            <td><input type="text" name="user_login" id="user_login" value="" class="login_text" /></td>
          </tr>
-          <tr> 
+          <tr>
            <td><label for="user_password"><%= User.human_attribute_name('password') %>:</label></td>
            <td><input type="password" name="user_password" id="user_password" class="login_text" /></td>
          </tr>
-         <tr> 
+         <tr>
            <td><label for="user_noexpiry"><%= t('login.user_no_expiry') %>:</label></td>
            <td><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked="checked" /></td>
          </tr>
-          <tr> 
+          <tr>
            <td>&nbsp;</td>
            <td><input type="submit" name="login" value="<%= t('login.sign_in') %> &#187;" class="primary" /></td>
          </tr>
@ -34,28 +34,4 @@
  </div>
 <% end %>

-<% if show_openid_form %>
-
-  <h4><%= t('login.mobile_use_openid') %>:</h4>
-
-  <div id="openid_auth_form">
-    <% form_tag login_path(:format => 'm') do %>
-      <table>
-        <tr>
-          <td width="100px"><label for="openid_url"><%= User.human_attribute_name('open_id_url') %>:</label></td>
-          <td width="100px"><input type="text" name="openid_url" id="openid_url" value="<%= @openid_url %>" class="login_text open_id" /></td>
-        </tr>
-       <tr> 
-          <td width="100px"><label for="user_noexpiry"><%= t('login.user_no_expiry') %>:</label></td>
-          <td width="100px"><input type="checkbox" name="user_noexpiry" id="user_noexpiry" checked  /></td>
-        </tr>
-        <tr> 
-          <td width="100px"></td>
-          <td><input type="submit" name="login" value="<%= t('login.sign_in') %> &#187;" class="primary" /></td>
-        </tr>
-      </table>
-    <% end %>
-  </div>
- <% end %>
- 
 </div>
--- a/app/views/preferences/index.html.erb
+++ b/app/views/preferences/index.html.erb
@ -2,7 +2,7 @@

  <div id="edit_error_status"><%= error_messages_for(:user) + error_messages_for(:prefs) %></div>

-  <% form_tag :action => 'update' do %>
+  <%= form_tag :action => 'update' do %>
  <div id="tabs">
  	<ul>
      <li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
--- a/app/views/projects/_new_project_form.rhtml
+++ b/app/views/projects/_new_project_form.rhtml
@ -6,7 +6,7 @@
  </div>

  <div id="project_new" class="project_new" style="display:block">
-    <% form_for(@new_project, :html => {:id => 'project_form',:name=>'project',:class => "inline-form", :method => :post }) do -%>
+    <%= form_for(@new_project, :html => {:id => 'project_form',:name=>'project',:class => "inline-form", :method => :post }) do -%>
      <div id="error_status"><%= error_messages_for("project") %></div>

      <label for="project_name"><%= Project.human_attribute_name(:name) %>:</label><br />
--- a/app/views/recurring_todos/_edit_form.html.erb
+++ b/app/views/recurring_todos/_edit_form.html.erb
@ -1,5 +1,5 @@
 <div class="recurring_container">
-<% form_for(@recurring_todo, :html=> { :id=>'recurring-todo-form-edit-action', :name=>'recurring_todo', :class => 'inline-form' }) do |f| -%>
+<%= form_for(@recurring_todo, :html=> { :id=>'recurring-todo-form-edit-action', :name=>'recurring_todo', :class => 'inline-form' }) do |f| -%>
  <div id="edit_error_status"><%= error_messages_for("item", :object_name => 'action') %></div>

  <div id="recurring_todo_form_container">
--- a/app/views/recurring_todos/_recurring_todo_form.erb
+++ b/app/views/recurring_todos/_recurring_todo_form.erb
@ -1,6 +1,6 @@
 <%- reset_tab_index %>
 <div class="recurring_container">
-<% form_for(@new_recurring_todo, :html=> { :id=>'recurring-todo-form-new-action', :name=>'recurring_todo', :class => 'inline-form' }) do -%>
+<%= form_for(@new_recurring_todo, :html=> { :id=>'recurring-todo-form-new-action', :name=>'recurring_todo', :class => 'inline-form' }) do -%>
    <div id="error_status"><%= error_messages_for("item", :object_name => 'action') %></div>

    <div id="recurring_todo_form_container">
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@ -1,5 +1,5 @@
 <div id="display_box_search">
-  <% form_tag({:action => :results}, :id => 'search-form') do %>
+  <%= form_tag({:action => :results}, :id => 'search-form') do %>
    <%= text_field_tag(:search, params[:search]) %>
    <%= submit_tag t('common.search') %>
  <% end %>
--- a/app/views/todos/edit_mobile.html.erb
+++ b/app/views/todos/edit_mobile.html.erb
@ -1,4 +1,4 @@
-<% form_tag todo_path(@todo, :format => 'm'), :name => 'mobileEdit', :method => :put do %>
+<%= form_tag todo_path(@todo, :format => 'm'), :name => 'mobileEdit', :method => :put do %>
  <%= render :partial => 'edit_mobile_form', :locals => { :parent_container_type => "show_mobile" } %>
  <p><input type="submit" value="<%= t('common.update') %>" tabindex="6" accesskey="#" /></p>
 <% end -%>
--- a/app/views/todos/new.m.erb
+++ b/app/views/todos/new.m.erb
@ -1,4 +1,4 @@
-<% form_tag todos_path(:format => 'm'), :method => :post do %>
+<%= form_tag todos_path(:format => 'm'), :method => :post do %>
  <%= render :partial => 'edit_mobile_form' %>
  <p><input type="submit" value="<%= t('common.create') %>" tabindex="12" accesskey="#" /></p>
 <% end -%>
--- a/app/views/users/change_auth_type.html.erb
+++ b/app/views/users/change_auth_type.html.erb
@ -6,7 +6,7 @@

  <p><%= t('users.select_authentication_type') %></p>

-  <% form_tag :action => 'update_auth_type' do %>
+  <%= form_tag :action => 'update_auth_type' do %>
 	  <div><label for="user_auth_type"><%= t('users.label_auth_type') %>:</label> <%=   select('user', 'auth_type', Tracks::Config.auth_schemes.collect {|p| [ p, p ] }) %></div>
 	  <div id="open_id" style="display:<%= current_user.auth_type == 'open_id' ? 'block' : 'none' %>"><label for="openid_url"><%= t('users.identity_url') %>:</label> <input type="text" name="openid_url" value="<%= current_user.open_id_url %>" class="open_id" /></div>
 		<div class="actions"><%= submit_tag t('users.auth_change_submit') %> <%= link_to t('common.cancel'), preferences_path %></div>
--- a/app/views/users/change_password.html.erb
+++ b/app/views/users/change_password.html.erb
@ -6,7 +6,7 @@

  <p><%= t('users.change_password_prompt') %></p>

-  <% form_tag :action => 'update_password' do %>
+  <%= form_tag :action => 'update_password' do %>
    <%= render :partial => 'update_password' %>
    <br/>
    <%= link_to t('common.cancel'), preferences_path %>
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@ -1,5 +1,5 @@
 <div title="<%= t('users.account_signup') %>" id="signupform" class="form">
-<% form_tag :action=> "create" do %>
+<%= form_tag :action=> "create" do %>

  <%= error_messages_for 'user' %><br/>