@@ -3,11 +3,29 @@ module NestedLayoutTags
class TagError < StandardError; end
+ desc %{
+ Renders the contents of the tag inside of a "parent" layout, which is selected via the +name+
+ attribute. The contents of this tag are placed at a corresponding <r:content_for_layout/> tag
+ within the parent layout. This tag is intended to be used within your layouts, and should
+ only appear once per layout.
+
+ *Usage:*
+
+ <r:inside_layout name="master">
+ <div id="main-column">
+ <r:content_for_layout/>
+ </div>
+ </r:inside_layout>
+
+ }
tag 'inside_layout' do |tag|
if name = tag.attr['name']
# Prepare the stacks
tag.globals.nested_layouts_content_stack ||= []
tag.globals.nested_layouts_layout_stack ||= []
+
+ # Remember the original layout to support the +layout+ tag
+ tag.globals.page_original_layout ||= tag.globals.page.layout # Remember the original layout
# Find the layout
name.strip!
@@ -31,11 +49,50 @@ module NestedLayoutTags
end
end
+ desc %{
+ Allows nested layouts to target this layout. The contents of <r:inside_layout> tag blocks in another
+ layout will have their contents inserted at the location given by this tag (if they target this
+ layout). This tag also behaves like a standard <r:content/> tag if this layout is specified directly
+ by a page.
+
+ This tag is intended to be used inside layouts.
+
+ *Usage:*
+
+ <html>
+ <body>
+ <r:content_for_layout/>
+ </body>
+ </html>
+
+ }
tag 'content_for_layout' do |tag|
tag.globals.nested_layouts_content_stack ||= []
# return the saved content if any, or mimic a default +<r:content/>+ tag (render the body part)
tag.globals.nested_layouts_content_stack.pop || tag.globals.page.render_snippet(tag.locals.page.part('body'))
end
-
+
+ desc %{
+ Return the layout name of the current page.
+
+ *Usage:*
+
+ <html>
+ <body id="<r:layout/>"
+ My body tag has an id corresponding to the layout I use. Sweet!
+ </body>
+ </html>
+ }
+ tag 'layout' do |tag|
+ if layout = tag.globals.page_original_layout
+ layout.name
+ else
+ if layout = tag.globals.page.layout
+ layout.name
+ else
+ ''
+ end
+ end
+ end
end
\ No newline at end of file
lib/nested_layout_tags.rb
@@ -1,12 +1,10 @@
require File.dirname(__FILE__) + '/../spec_helper'
describe "Nested Layout Tags" do
- scenario :pages
-
before :each do
setup_page_and_layouts
end
-
+
it 'should render without layout' do
@page.layout = nil
@page.render.should == 'Hello World!'
@@ -37,6 +35,27 @@ describe "Nested Layout Tags" do
@page.render.should == %{<html><body><div id="multiword"><div id="nested-multiword">Hello World!</div></div></body></html>}
end
+ context "with <r:layout/> tags" do
+ before(:each) do
+ @page.parts.first.content = "<r:layout/>"
+ end
+
+ it 'should render correctly for a traditional layout' do
+ @page.layout = @layouts[:traditional]
+ @page.render.should == %{<html><body>traditional</body></html>}
+ end
+
+ it 'should render correctly for a non-nested layout' do
+ @page.layout = @layouts[:master]
+ @page.render.should == %{<html><body>master</body></html>}
+ end
+
+ it 'should render correctly for a nested layout' do
+ @page.layout = @layouts[:nest1]
+ @page.render.should == %{<html><body><div id="nest1">nest1</div></body></html>}
+ end
+
+ end
end
def setup_page_and_layouts
spec/models/nested_layout_tags_spec.rb
2eee1b26237874a6d015700525fec2016dcbc028
Michael Klett
michael@webadvocate.com
http://github.com/moklett/radiant-nested-layouts-extension/commit/3307d0bbe1d361ced6dbc7a01e0e278b23a44526
3307d0bbe1d361ced6dbc7a01e0e278b23a44526
2009-06-28T18:46:24-07:00
2009-06-28T18:46:24-07:00
Added the <r:layout/> tag, and some inline docs (desc) for all tags.
00f95e46f289910c0ea1bfa3bd104113df18fe26
Michael Klett
michael@webadvocate.com