Changeset 1277

Show
Ignore:
Timestamp:
10/26/06 20:34:53 (2 years ago)
Author:
pdcawley
Message:

Wow! What a lot of 'start_form_tags' there were.

Getting rid of those deprecation warnings cover most of the mods here.

Other mods are getting rid of various instance variable access.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • experimental/restful/app/controllers/admin/content_controller.rb

    r1275 r1277  
    4545 
    4646  def preview 
    47     @headers["Content-Type"] = "text/html; charset=utf-8" 
     47    headers["Content-Type"] = "text/html; charset=utf-8" 
    4848    @article = Article.new(params[:article]) 
    4949    render :layout => false 

  • experimental/restful/app/controllers/admin/pages_controller.rb

    r1033 r1277  
    4343 
    4444  def preview 
    45     @headers["Content-Type"] = "text/html; charset=utf-8" 
     45    headers["Content-Type"] = "text/html; charset=utf-8" 
    4646    @page = this_blog.pages.build(params[:page]) 
    4747    render :layout => false 

  • experimental/restful/app/controllers/admin/textfilters_controller.rb

    r977 r1277  
    7373 
    7474  def preview 
    75     @headers["Content-Type"] = "text/html; charset=utf-8" 
     75    headers["Content-Type"] = "text/html; charset=utf-8" 
    7676    @textfilter = params[:textfilter] 
    7777    render :layout => false 

  • experimental/restful/app/controllers/articles_controller.rb

    r1275 r1277  
    8888  # Receive comments to articles 
    8989  def comment 
    90     unless @request.xhr? || this_blog.sp_allow_non_ajax_comments 
     90    unless request.xhr? || this_blog.sp_allow_non_ajax_comments 
    9191      render_error("non-ajax commenting is disabled") 
    9292      return 
    …… 
    200200 
    201201  def set_headers 
    202     @headers["Content-Type"] = "text/html; charset=utf-8" 
     202    headers["Content-Type"] = "text/html; charset=utf-8" 
    203203  end 
    204204 

  • experimental/restful/app/controllers/content_controller.rb

    r1275 r1277  
    4949  def auto_discovery_defaults 
    5050    @auto_discovery_url_rss = 
    51         @request.instance_variable_get(:@auto_discovery_url_rss) 
     51      request.instance_variable_get(:@auto_discovery_url_rss) 
    5252    @auto_discovery_url_atom = 
    53          @request.instance_variable_get(:@auto_discovery_url_atom) 
     53         request.instance_variable_get(:@auto_discovery_url_atom) 
    5454    unless @auto_discovery_url_rss && @auto_discovery_url_atom 
    5555      auto_discovery_feed(:type => 'feed') 
    56       @request.instance_variable_set(:@auto_discovery_url_rss, 
    57                                       @auto_discovery_url_rss) 
    58       @request.instance_variable_set(:@auto_discovery_url_atom, 
    59                                       @auto_discovery_url_atom) 
     56      request.instance_variable_set(:@auto_discovery_url_rss, 
     57                                    @auto_discovery_url_rss) 
     58      request.instance_variable_set(:@auto_discovery_url_atom, 
     59                                    @auto_discovery_url_atom) 
    6060    end 
    6161  end 

  • experimental/restful/app/controllers/live_controller.rb

    r915 r1277  
    55    @search = params[:q] 
    66    @articles = Article.search(@search) 
    7     @headers["Content-Type"] = "text/html; charset=utf-8" 
     7    headers["Content-Type"] = "text/html; charset=utf-8" 
    88  end 
    99 

  • experimental/restful/app/controllers/theme_controller.rb

    r1275 r1277  
    2626  def render_theme_item(type, file, mime = nil) 
    2727    mime ||= mime_for(file) 
    28     render :text => "Not Found", :status => 404 and return if file.split(%r{[\\/]}).include?("..") 
    29     send_file this_blog.current_theme.path + "/#{type}/#{file}", :type => mime, :disposition => 'inline', :stream => false 
     28    if file.split(%r{[\\/]}).include?("..") 
     29      render :text => "Not Found", :status => 404 
     30      return 
     31    end 
     32    send_file(this_blog.current_theme.path + "/#{type}/#{file}", 
     33              :type => mime, :disposition => 'inline', :stream => false) 
    3034  end 
    3135 

  • experimental/restful/app/views/accounts/login.rhtml

    r1245 r1277  
    1 <%= start_form_tag :action=> "login" %> 
     1<% form_tag :action=> "login" do %> 
    22 
    33 
    …… 
    2121</div> 
    2222 
    23 <%= end_form_tag %> 
     23<% end %> 
    2424 

  • experimental/restful/app/views/accounts/signup.rhtml

    r1007 r1277  
    1 <%= start_form_tag :action=> "signup" %> 
     1<% form_tag :action=> "signup" do %> 
    22 
    33<%= error_messages_for 'user' %><br/> 
    44 
    55<div title="Account signup" id="loginform"> 
    6   <h3>Signup</h3>   
     6  <h3>Signup</h3> 
    77  <div  class="form"> 
    88  <label for="user_login">Desired login:</label><br/> 
    …… 
    2323</div> 
    2424 
    25 <%= end_form_tag %> 
     25<% end %> 
    2626 

  • experimental/restful/app/views/admin/blacklist/destroy.rhtml

    r361 r1277  
    66 
    77  <p>Are you sure you want to delete this item?</p> 
    8   <%= start_form_tag :action => "destroy", :id => @blacklist_pattern.id %> 
     8  <% form_tag :action => "destroy", :id => @blacklist_pattern.id do %> 
    99  <%= confirm_delete %> 
    10   <%= end_form_tag %> 
     10  <% end %> 

  • experimental/restful/app/views/admin/blacklist/edit.rhtml

    r365 r1277  
    11  <% @page_heading = 'Blacklist Patterns' %> 
    22 
    3   <%= start_form_tag :action=>"edit", :id => @blacklist_pattern.id %> 
    4    
     3  <% form_tag :action=>"edit", :id => @blacklist_pattern.id do %> 
     4 
    55  <h3>Editing pattern</h3> 
    6   <div class="form">    
     6  <div class="form"> 
    77    <%= render_partial "form" %> 
    88  </div> 
    99 
    1010  <div id="operations"> 
    11     <%= save %> or <%= cancel %>   
     11    <%= save %> or <%= cancel %> 
    1212  </div> 
    1313 
    14   <%= end_form_tag %> 
     14  <% end %> 

  • experimental/restful/app/views/admin/blacklist/_quick_post.rhtml

    r656 r1277  
    1 <%= start_form_tag :action=>"new" %> 
     1<% form_tag :action=>"new" do %> 
    22 
    33<p> 
    4   <label for="blacklist_pattern_pattern">Pattern:</label>  
     4  <label for="blacklist_pattern_pattern">Pattern:</label> 
    55  <%= text_field 'blacklist_pattern', 'pattern'  %> 
    66</p> 
    77<p> 
    8   <label for="blacklist_pattern_type">Type:</label>  
     8  <label for="blacklist_pattern_type">Type:</label> 
    99  <select name="blacklist_pattern[type]"> 
    1010  <%= options_for_select [ ['String', 'StringPattern'], ['Regex', 'RegexPattern' ] ]  %> 
    …… 
    1414  <%= save("Add pattern") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a> 
    1515</div> 
    16 <%= end_form_tag %> 
     16</p> 
     17<% end %> 

  • experimental/restful/app/views/admin/categories/destroy.rhtml

    r558 r1277  
    33  <% content_for('tasks') do %> 
    44    <%= task_show 'Show this category', @category.id %> 
    5   <% end %>  
     5  <% end %> 
    66 
    77  <p>Are you sure you want to delete the category '<%= @category.name %>'?</p> 
    8   <%= start_form_tag :action => "destroy", :id => @category.id %> 
     8  <% form_tag :action => "destroy", :id => @category.id do %> 
    99  <%= confirm_delete("Delete this category") %> 
    10   <%= end_form_tag %> 
     10  <% end %> 

  • experimental/restful/app/views/admin/categories/edit.rhtml

    r365 r1277  
    11  <% @page_heading = 'Categories' %> 
    22 
    3   <%= start_form_tag :action=>"edit", :id => @category.id %> 
     3  <% form_tag :action=>"edit", :id => @category.id do %> 
    44  <h3>Editing category</h3> 
    5   <div class="form">    
     5  <div class="form"> 
    66    <%= render_partial "form" %> 
    77  </div> 
    88 
    99  <div id="operations"> 
    10     <%= save %> or <%= cancel %>   
     10    <%= save %> or <%= cancel %> 
    1111  </div> 
    1212 
    13   <%= end_form_tag %> 
     13  <% end %> 

  • experimental/restful/app/views/admin/categories/show.rhtml

    r1233 r1277  
    55  <% end %> 
    66 
    7   <%= start_form_tag :action=>"new" %> 
     7  <% form_tag :action=>"new" do %> 
    88  <div class="list"> 
    99    <table cellspacing="1" cellpadding="0"> 
    …… 
    1717    </table> 
    1818  </div> 
    19   <%= end_form_tag %> 
     19  <% end %> 

  • experimental/restful/app/views/admin/categories/_quick_post.rhtml

    r656 r1277  
    1 <%= start_form_tag :action=>"new" %> 
     1<% form_tag :action=>"new" do %> 
    22 
    33<p> 
    44  <label for="category_name">Title:</label><br/> 
    5   <%= text_field 'category', 'name'  %>   
     5  <%= text_field 'category', 'name'  %> 
    66</p> 
    77 
    …… 
    99  <%= save("Add category") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a> 
    1010</div> 
    11 <%= end_form_tag %> 
     11<% end %> 

  • experimental/restful/app/views/admin/comments/destroy.rhtml

    r1233 r1277  
    33  <% content_for('tasks') do %> 
    44    <%= task_show 'Show this comment', @comment.id %> 
    5   <% end %>  
     5  <% end %> 
    66 
    77  <p>Are you sure you want to delete this item?</p> 
    8   <%= start_form_tag %> 
     8  <% form_tag do %> 
    99  <%= hidden_field "comment", "id" %> 
    1010  <%= confirm_delete %> 
    11   <%= end_form_tag %> 
     11  <% end %> 

  • experimental/restful/app/views/admin/comments/edit.rhtml

    r1233 r1277  
    33  <% content_for('tasks') do %> 
    44    <li><%= link_to_permalink @comment,'View comment on your blog' %></li> 
    5   <% end %>  
     5  <% end %> 
    66 
    7   <%= start_form_tag :action=>"edit", :id => @comment.id %> 
     7  <% form_tag :action=>"edit", :id => @comment.id do %> 
    88 
    99  <h3>Editing comment</h3> 
    10   <div class="form">    
     10  <div class="form"> 
    1111    <%= render_partial "form" %> 
    1212  </div> 
    1313 
    1414  <div id="operations"> 
    15     <%= save %> or <%= cancel %>   
     15    <%= save %> or <%= cancel %> 
    1616  </div> 
    1717 
    18   <%= end_form_tag %> 
     18  <% end %> 

  • experimental/restful/app/views/admin/comments/new.rhtml

    r1233 r1277  
    22 
    33  <h3>Creating comment</h3> 
    4    
    5   <%= start_form_tag :action=>"new" %> 
    64 
    7   <div class="form">     
     5  <% form_tag :action=>"new" do %> 
     6 
     7  <div class="form"> 
    88    <%= render_partial "form" %> 
    99  </div> 
    1010 
    1111  <div id="operations"> 
    12     <%= save %> or <%= cancel %>   
     12    <%= save %> or <%= cancel %> 
    1313  </div> 
    1414 
    15   <%= end_form_tag %> 
     15  <% end %> 

  • experimental/restful/app/views/admin/content/destroy.rhtml

    r1250 r1277  
    66 
    77  <p>Are you sure you want to delete this article ( <%=h @article.title -%> )?</p> 
    8   <%= start_form_tag :controller => '/admin/content', :action => 'destroy' %> 
     8  <% form_tag :controller => '/admin/content', :action => 'destroy' do %> 
    99  <%= hidden_field_tag "id", @article.id %> 
    1010  <%= confirm_delete("Delete this article") %> 
    11   <%= end_form_tag %> 
     11  <% end %> 

  • experimental/restful/app/views/admin/content/edit.rhtml

    r1233 r1277  
    11  <% @page_heading = 'Articles' %> 
    2    
     2 
    33  <% content_for('tasks') do %> 
    44    <%= task_new 'Create new article' %> 
    55    <li><%= link_to 'View article on your blog', @article.permalink_url %></li> 
    6   <% end %>  
     6  <% end %> 
    77 
    8   <%= start_form_tag({ :action => "edit", :id => @article }, :id => "article_form", :enctype => "multipart/form-data") %> 
     8  <% form_tag({ :action => "edit", :id => @article }, :id => "article_form", :enctype => "multipart/form-data") do %> 
    99  <h3>Editing article</h3> 
    1010 
    …… 
    1212    <!-- LIVE PREVIEW --> 
    1313    <div id="preview" class="post" style="display:none;"></div> 
    14     <!-- /LIVE PREVIEW -->      
     14    <!-- /LIVE PREVIEW --> 
    1515    <%= render_partial "form" %> 
    1616  </div> 
    1717 
    1818  <div id="operations"> 
    19     <%= save %> or <%= cancel %>   
     19    <%= save %> or <%= cancel %> 
    2020  </div> 
    2121 
    22   <%= end_form_tag %> 
     22  <% end %> 
    2323 
    24   <%= observe_form "article_form",  
    25         :frequency => 2,  
     24  <%= observe_form "article_form", 
     25        :frequency => 2, 
    2626        :update => "preview", 
    2727        :complete => "Element.show('preview')", 
    28         :url => { :action => "preview" } %>       
     28        :url => { :action => "preview" } %> 

  • experimental/restful/app/views/admin/content/new.rhtml

    r825 r1277  
    33  <h3>Creating article</h3> 
    44 
    5   <%= start_form_tag({ :action => "new" }, :id => "article_form", :enctype => "multipart/form-data") %> 
    6    
    7    
    8   <div class="form">    
    9     <!-- LIVE PREVIEW -->  
     5  <% form_tag({ :action => "new" }, :id => "article_form", :enctype => "multipart/form-data") do %> 
     6 
     7 
     8  <div class="form"> 
     9    <!-- LIVE PREVIEW --> 
    1010    <div id="preview" class="post" style="display: none;"></div> 
    1111    <!-- /LIVE PREVIEW --> 
    …… 
    1414 
    1515  <div id="operations"> 
    16     <%= save("Save this article") %> or <%= cancel %>   
     16    <%= save("Save this article") %> or <%= cancel %> 
    1717  </div> 
    1818 
    19   <%= end_form_tag %> 
     19  <% end %> 
    2020 
    21   <%= observe_form "article_form",  
    22         :frequency => 2,  
     21  <%= observe_form "article_form", 
     22        :frequency => 2, 
    2323        :update => "preview", 
    2424        :complete => "Element.show('preview')", 
    25         :url => { :action => "preview" } %>       
     25        :url => { :action => "preview" } %> 
    2626 
    27        
     27 

  • experimental/restful/app/views/admin/content/_quick_post.rhtml

    r656 r1277  
    1   <%= start_form_tag :action=>"new" %> 
     1  <% form_tag :action=>"new" do %> 
    22<p> 
    33  <label for="articles_title">Title:</label><br /> 
    …… 
    1818  <%= save("Save Post") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a> 
    1919</div> 
    20 <%= end_form_tag %> 
     20<% end %> 

  • experimental/restful/app/views/admin/feedback/list.rhtml

    r1218 r1277  
    88 
    99<div class="search"> 
    10   <%= form_tag({:action => 'index'}, :method => :get) %> 
     10  <% form_tag({:action => 'index'}, :method => :get) do %> 
    1111    <label for="search">Feedback Search:</label><input type="text" id="feedback_search" name="search" value="<%=h params[:search] %>" size="15" /> 
    12   <%= end_form_tag %> 
     12  <% end %> 
    1313</div> 
    1414 
    1515<div class="list"> 
    16   <%= form_tag({:action => 'bulkops'}, :method => :post) %> 
     16  <% form_tag({:action => 'bulkops'}, :method => :post) do %> 
    1717  <br/> 
    1818  <%= submit_tag "Delete Checked Items" %> &nbsp; 
    …… 
    4242  <%= submit_tag "Mark Checked Items as Spam" %> 
    4343  <%= submit_tag "Confirm Classification of Checked Items" %> 
    44   </form> 
     44  <% end %> 
    4545</div> 
    4646 

  • experimental/restful/app/views/admin/feedback/_item.rhtml

    r1276 r1277  
    1414  <td class="field"><%=h item.ip %></td> 
    1515  <td class="field"><%=h distance_of_time_in_words_to_now(item.created_at) %> ago</td> 
    16   <td class="field"><%= link_to image_tag('delete.png'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :post => true %></td> 
     16  <td class="field"><%= link_to image_tag('delete.png'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td> 
    1717</tr> 

  • experimental/restful/app/views/admin/general/index.rhtml

    r1242 r1277  
    11  <% @page_heading = 'Blog settings' %> 
    22 
    3   <%= start_form_tag :action => 'update'%> 
     3  <% form_tag :action => 'update' do %> 
    44 
    55  <div class="tasks"> 
    …… 
    8484 
    8585    <p>This setting allows you to disable trackbacks for every article in 
    86        your blog.  It won't remove existing trackbacks, but it will prevent 
    87        any further attempt to add a trackback anywhere on your blog.  You can 
    88        enable or disable trackbacks per-article using the article's extended 
    89         settings.  See also the  
     86    your blog.  It won't remove existing trackbacks, but it will prevent 
     87    any further attempt to add a trackback anywhere on your blog.  You can 
     88    enable or disable trackbacks per-article using the article's extended 
     89    settings.  See also the 
    9090      <a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false">"Enable Trackbacks by default" setting</a> above. 
    91        </p> 
     91    </p> 
    9292    <p> 
    9393      <input name="setting[global_pings_disable]" id="global_pings_disable" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.global_pings_disable%> /> 
    …… 
    162162          <label for="sp_global">Enable spam protection</label> 
    163163        </p> 
    164                 <p>Typo can (optionally) use the <a href="http://akismet.com">Akismet</a> spam-filtering service.  You need to register with  
    165                   Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here. 
    166                </p> 
     164        <p>Typo can (optionally) use the <a href="http://akismet.com">Akismet</a> spam-filtering service.  You need to register with 
     165           Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here. 
     166        </p> 
    167167        <p> 
    168168          <label for="sp_akismet_key">Akismet Key</label> 
    169169          <input name="setting[sp_akismet_key]" id="sp_akismet_key" type="text" value="<%=h this_blog.sp_akismet_key %>"/> 
    170170        </p> 
    171                <p>You can optionally disable non-Ajax comments.  Typo will always use Ajax for comment submission if Javascript is enabled, 
    172                   so non-Ajax comments are either from spammers or users without Javascript. 
    173                </p> 
     171        <p>You can optionally disable non-Ajax comments.  Typo will always use Ajax for comment submission if Javascript is enabled, 
     172           so non-Ajax comments are either from spammers or users without Javascript. 
     173        </p> 
    174174        <p> 
    175175          <input name="setting[sp_allow_non_ajax_comments]" id="sp_allow_non_ajax_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_allow_non_ajax_comments%> /> 
    …… 
    244244  </div> 
    245245 
    246   <%= end_form_tag %> 
     246  <% end %> 

  • experimental/restful/app/views/admin/general/update_database.rhtml

    r407 r1277  
    66   <h3>Information</h3> 
    77   <p> 
    8      <label>Current database version:</label>  
     8     <label>Current database version:</label> 
    99     <span class="db_version"><%= @current_version %></span> 
    1010   </p> 
    1111   <p> 
    12      <label>New database version:</label>  
     12     <label>New database version:</label> 
    1313     <span class="db_version"><%= @needed_version %></span> 
    1414   </p> 
    1515   <p> 
    16      <label>Your database supports migrations:</label>  
     16     <label>Your database supports migrations:</label> 
    1717     <span class="db_version"><%= @support ? 'yes' : 'no' %></span> 
    1818   </p> 
    1919  </div> 
    20    
    21      
     20 
     21 
    2222  <% unless @needed_migrations.blank? %> 
    2323  <div id="gensettings" class="set" style="margin-top:10px;"> 
    …… 
    2626    <% for migration in @needed_migrations %> 
    2727    <li><%= migration.humanize %></li> 
    28     <% end %>   
     28    <% end %> 
    2929    </ul> 
    3030  </div> 
    3131  <% end %> 
    32    
     32 
    3333</div> 
    3434 
    3535 
    36 <%= start_form_tag :action => 'migrate' %> 
     36<% form_tag :action => 'migrate' do %> 
    3737 <div id="operations" class="tasks"> 
    3838   <% if @current_version == @needed_version %> 
    …… 
    4242   <% end %> 
    4343 </div> 
    44 <%= end_form_tag %> 
     44<% end %> 

  • experimental/restful/app/views/admin/pages/destroy.rhtml

    r1233 r1277  
    33  <% content_for('tasks') do %> 
    44    <%= task_show "Show this page", @page.id %> 
    5   <% end %>  
     5  <% end %> 
    66 
    77  <p>Are you sure you want to delete the page '<%= @page[:name] %>'?</p> 
    8   <%= start_form_tag :controller => '/admin/pages', :action => 'destroy' %> 
     8  <% form_tag :controller => '/admin/pages', :action => 'destroy' do %> 
    99  <%= hidden_field "page", "id" %> 
    1010  <%= confirm_delete("Delete this page") %> 
    11   <%= end_form_tag %> 
     11  <% end %> 

  • experimental/restful/app/views/admin/pages/edit.rhtml

    r1233 r1277  
    11  <% @page_heading = 'Pages' %> 
    2    
     2 
    33  <% content_for('tasks') do %> 
    44    <%= task_new 'Create new page' %> 
    55    <li><%= link_to 'View page on your blog', @page.permalink_url %></li> 
    6   <% end %>  
     6  <% end %> 
    77 
    8   <%= start_form_tag({ :action => "edit", :id => @page }, :id => "page_form") %> 
     8  <% form_tag({ :action => "edit", :id => @page }, :id => "page_form") do %> 
    99  <h3>Editing page</h3> 
    1010 
    …… 
    1212    <!-- LIVE PREVIEW --> 
    1313    <div id="preview" class="post" style="display:none;"></div> 
    14     <!-- /LIVE PREVIEW -->      
     14    <!-- /LIVE PREVIEW --> 
    1515    <%= render :partial => "form" %> 
    1616  </div> 
    1717 
    1818  <div id="operations"> 
    19     <%= save %> or <%= cancel %>   
     19    <%= save %> or <%= cancel %> 
    2020  </div> 
    2121 
    22   <%= end_form_tag %> 
     22  <% end %> 
    2323 
    24   <%= observe_form "page_form",  
    25         :frequency => 2,  
     24  <%= observe_form "page_form", 
     25        :frequency => 2, 
    2626        :update => "preview", 
    2727        :complete => "Element.show('preview')", 

  • experimental/restful/app/views/admin/pages/new.rhtml

    r461 r1277  
    33  <h3>Creating page</h3> 
    44 
    5   <%= start_form_tag({ :action => "new" }, :id => "page_form") %> 
    6    
    7   <div class="form">    
    8     <!-- LIVE PREVIEW -->  
     5  <% form_tag({ :action => "new" }, :id => "page_form") do %> 
     6 
     7  <div class="form"> 
     8    <!-- LIVE PREVIEW --> 
    99    <div id="preview" class="post" style="display: none;"></div> 
    1010    <!-- /LIVE PREVIEW --> 
    …… 
    1313 
    1414  <div id="operations"> 
    15     <%= save %> or <%= cancel %>   
     15    <%= save %> or <%= cancel %> 
    1616  </div> 
    1717 
    18   <%= end_form_tag %> 
     18  <% end %> 
    1919 
    20   <%= observe_form "page_form",  
    21         :frequency => 2,  
     20  <%= observe_form "page_form", 
     21        :frequency => 2, 
    2222        :update => "preview", 
    2323        :complete => "Element.show('preview')", 
    24         :url => { :action => "preview" } %>       
     24        :url => { :action => "preview" } %> 

  • experimental/restful/app/views/admin/pages/_quick_post.rhtml

    r656 r1277  
    1 <%= start_form_tag :action=>"new" %> 
     1<% form_tag :action=>"new" do %> 
    22<p> 
    33  <label for="page_title">Location:</label><br/> 
    …… 
    1919  <%= save("Save Post") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a> 
    2020</div> 
    21 <%= end_form_tag %> 
     21<% end %> 

  • experimental/restful/app/views/admin/resources/destroy.rhtml

    r534 r1277  
    33  <% content_for('tasks') do %> 
    44    <%= task_new 'Upload a new File' %> 
    5   <% end %>  
     5  <% end %> 
    66 
    77  <p>Are you sure you want to delete this file ( <%= @file.filename -%> )?</p> 
    8   <%= start_form_tag :action => 'destroy' %> 
     8  <% form_tag :action => 'destroy' do %> 
    99  <%= hidden_field "file", "id" %> 
    1010  <%= confirm_delete("Delete this file from the webserver?") %> 
    11   <%= end_form_tag %> 
     11  <% end %> 

  • experimental/restful/app/views/admin/resources/new.rhtml

    r534 r1277  
    88<%= submit_tag 'Upload' -%> 
    99<div id='status' style="display: none"><%= upload_status_tag %></div> 
    10 <%= end_form_tag %> 
     10</form> 
    1111 
    1212<div id="message"><%= @message %></div> 

  • experimental/restful/app/views/admin/resources/_metadata_add.rhtml

    r915 r1277  
    1 <%= start_form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") %> 
     1<% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %> 
    22<div class="form"> 
    33  <b>Resource MetaData</b><br /> 
    …… 
    2020<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('add-resource-metadata-<%= id %>', {duration: 0.4}); return false;" >Cancel</a> 
    2121</div> 
    22 <%= end_form_tag %> 
     22<% end %> 

  • experimental/restful/app/views/admin/resources/_metadata_edit.rhtml

    r864 r1277  
    1 <%= start_form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") %> 
     1<% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %> 
    22<div class="form"> 
    33  <b>Resource MetaData</b><br /> 
    …… 
    1717    <input name="resource[itunes_explicit]" type="checkbox"  value="1" <%= 'checked="checked"' if resource.itunes_explicit%>>Explicit</input><input name="resource[itunes_explicit]" type="hidden" value="0" /> 
    1818  <br /> 
    19   <input name="resource[id]" type="hidden" value="<%= id %>" />  
     19  <input name="resource[id]" type="hidden" value="<%= id %>" /> 
    2020<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('edit-resource-metadata-<%= id %>', {duration: 0.4}); return false;" >Cancel</a> 
    2121</div> 
    22 <%= end_form_tag %> 
     22<% end %> 

  • experimental/restful/app/views/admin/resources/_mime_edit.rhtml

    r840 r1277  
    1 <%= start_form_tag({ :action => "set_mime" }, :id => id, :enctype => "multipart/form-data") %> 
     1<% form_tag({ :action => "set_mime" }, :id => id, :enctype => "multipart/form-data") do %> 
    22<div class="form"> 
    33  <label for="resource_mime_<%= id %>">Content Type:</label><br/> 
    44  <input name="resource[mime]" size="22" id="resource_mime_<%= id %>" type="text" value="<%=h mime %>" /><br /> 
    5   <input name="resource[id]" type="hidden" value="<%= id %>" />  
     5  <input name="resource[id]" type="hidden" value="<%= id %>" /> 
    66<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('edit-resource-mime-<%= id %>', {duration: 0.4}); return false;" >Cancel</a> 
    77</div> 
    8 <%= end_form_tag %> 
     8<% end %> 

  • experimental/restful/app/views/admin/textfilters/destroy.rhtml

    r1233 r1277  
    22 
    33  <% content_for('tasks') do %> 
    4   <% end %>  
     4  <% end %> 
    55 
    66  <p>Are you sure you want to delete this filter '<%= @textfilter.name %>'?</p> 
    7   <%= start_form_tag :controller => '/admin/textfilters', :action => 'destroy' %> 
     7  <% form_tag :controller => '/admin/textfilters', :action => 'destroy' do %> 
    88  <%= hidden_field "textfilter", "id" %>&nbs