diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod index b173277028..246464537b 100644 --- a/lib/Mojolicious/Guides/Rendering.pod +++ b/lib/Mojolicious/Guides/Rendering.pod @@ -530,6 +530,11 @@ as a render argument (not a stash value). my $html = $c->render_to_string('reminder', layout => 'mail'); +For renderers that support C templates, such as C, you can also pass a layout with the C +stash value. + + $c->render(inline => 'World', inline_layout => 'Hello <%= content %>!'); + =head2 Partial templates You can break up bigger templates into smaller, more manageable chunks. These partial templates can also be shared with diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm index 1e7dd70d1f..185cc298fc 100644 --- a/lib/Mojolicious/Renderer.pm +++ b/lib/Mojolicious/Renderer.pm @@ -108,6 +108,10 @@ sub render { # Inheritance my $content = $stash->{'mojo.content'} //= {}; local $content->{content} = $output =~ /\S/ ? $output : undef if $stash->{extends} || $stash->{layout}; + if ($stash->{inline_layout}) { + @$options{inline} = delete $stash->{inline_layout}; + if ($self->_render_template($c, \my $tmp, $options)) { $output = $tmp } + } while ((my $next = _next($stash)) && !defined $inline) { @$options{qw(handler template)} = ($stash->{handler}, $next); $options->{format} = $stash->{format} || $self->default_format; diff --git a/t/mojolicious/layouted_lite_app.t b/t/mojolicious/layouted_lite_app.t index 8756f96587..798be3d417 100644 --- a/t/mojolicious/layouted_lite_app.t +++ b/t/mojolicious/layouted_lite_app.t @@ -97,6 +97,16 @@ get '/content_with'; get '/inline' => {inline => '<%= "inline!" %>'}; +get '/inline/inline_layout' => sub { + my $c = shift; + $c->render(inline => '<%= "inline!" %>', inline_layout => 'layouted_inline <%== content %>'); +}; + +get '/inline/template_with_inline_layout' => sub { + my $c = shift; + $c->render(template => 'variants', format => 'txt', inline_layout => 'layouted_inline <%== content %>'); +}; + get '/inline/again' => {inline => 0}; get '/data' => {data => 0}; @@ -254,6 +264,15 @@ subtest 'Inline template' => sub { $t->get_ok('/inline')->status_is(200)->header_is(Server => 'Mojolicious (Perl)')->content_is("inline!\n"); }; +subtest 'Inline with layout' => sub { + $t->get_ok('/inline/inline_layout')->status_is(200)->header_is(Server => 'Mojolicious (Perl)') + ->content_is("layouted_inline inline!\n\n"); +}; + +subtest 'Template with inline layout' => sub { + $t->get_ok('/inline/template_with_inline_layout')->status_is(200)->content_is("layouted_inline Desktop!\n"); +}; + subtest '"0" inline template' => sub { $t->get_ok('/inline/again')->status_is(200)->header_is(Server => 'Mojolicious (Perl)')->content_is("0\n"); };