Changeset 7261

Timestamp:

08/02/07 20:10:03 (1 year ago)

Author:

david

Message:

Added partial layouts (see example in action_view/lib/partials.rb) [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/partials.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/fixtures/test/_layout_for_partial.html.erb (added)
• trunk/actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb (added)
• trunk/actionpack/test/fixtures/test/calling_partial_with_layout.html.erb (added)
• trunk/actionpack/test/fixtures/test/using_layout_around_block.html.erb (added)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added partial layouts (see example in action_view/lib/partials.rb) [DHH]
-
-* Allow you to set custom :conditions on resource routes.  [Rick]

trunk/actionpack/lib/action_view/base.rb

@@ -305 +305 @@
-        options = options.reverse_merge(:type => :erb, :locals => {}, :use_full_path => true)
-
-
+
+
+
+
+
+
+
+
+
+
+
-          render_file(options[:file], options[:use_full_path], options[:locals])
-        elsif options[:partial] && options[:collection]

trunk/actionpack/lib/action_view/partials.rb

@@ -45 +45 @@
-  #
-  # This will render the partial "advertisement/_ad.erb" regardless of which controller this is being called from.
+  #
+  # == Rendering partials with layouts
+  #
+  # Partials can have their own layouts applied to them. These layouts are different than the ones that are specified globally
+  # for the entire action, but they work in a similar fashion. Imagine a list with two types of users:
+  #
+  #   <!-- app/views/users/index.html.erb -->
+  #   Here's the administrator:
+  #   <%= render :partial => "user", :layout => "administrator", :locals => { :user => administrator } %>
+  #
+  #   Here's the editor:
+  #   <%= render :partial => "user", :layout => "editor", :locals => { :user => editor } %>
+  #
+  #   <!-- app/views/users/_user.html.erb -->
+  #   Name: <%= user.name %>
+  #
+  #   <!-- app/views/users/_administrator.html.erb -->
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     <%= yield %>
+  #   </div>
+  #
+  #   <!-- app/views/users/_editor.html.erb -->
+  #   <div id="editor">
+  #     Deadline: $<%= user.deadline %>
+  #     <%= yield %>
+  #   </div>
+  #
+  # ...this will return:
+  #
+  #   Here's the administrator:
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  #   Here's the editor:
+  #   <div id="editor">
+  #     Deadline: $<%= user.deadline %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  # You can also apply a layout to a block within any template:
+  #
+  #   <!-- app/views/users/_chief.html.erb -->
+  #   <% render(:layout => "administrator", :locals => { :user => chief }) do %>
+  #     Title: <%= chief.title %>
+  #   <% end %>
+  #
+  # ...this will return:
+  #
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Title: <%= chief.name %>
+  #   </div>
+  #
+  # As you can see, the :locals hash is shared between both the partial and its layout.
-  module Partials
-    private

trunk/actionpack/test/controller/new_render_test.rb

@@ -348 +348 @@
-    response.content_type = Mime::RSS
-    render :text => "hello world!"
+  end
+
+  def render_call_to_partial_with_layout
+    render :action => "calling_partial_with_layout"
+  end
+
+  def render_using_layout_around_block
+    render :action => "using_layout_around_block"
-  end
-
@@ -794 +802 @@
-    assert_equal "http://www.nextangle.com/customers/1", @response.headers["Location"]
-  end
+
+  def test_render_call_to_partial_with_layout
+    get :render_call_to_partial_with_layout
+    assert_equal "Before (David)\nInside from partial (David)\nAfter", @response.body
+  end
+  
+  def test_using_layout_around_block
+    get :using_layout_around_block
+    assert_equal "Before (David)\nInside from block\nAfter", @response.body
+  end
-end