diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-21 00:29:44 +0000 |
| commit | 21187c0fb4fc559927a2f947f909dedd85969ffb (patch) | |
| tree | efd0ceb5c3a88531916186e97aa106041c293975 /actionpack/test/fixtures/layouts | |
| parent | b5419cd66ea160d1ee94f3ca521bb44adf3a21ca (diff) | |
| download | rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.gz rails-21187c0fb4fc559927a2f947f909dedd85969ffb.tar.bz2 rails-21187c0fb4fc559927a2f947f909dedd85969ffb.zip | |
Apply the rest of Chads patch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures/layouts')
| -rw-r--r-- | actionpack/test/fixtures/layouts/builder.builder | 3 | ||||
| -rw-r--r-- | actionpack/test/fixtures/layouts/standard.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/layouts/talk_from_action.erb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/layouts/yield.erb | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/layouts/builder.builder b/actionpack/test/fixtures/layouts/builder.builder new file mode 100644 index 0000000000..729af4b8bc --- /dev/null +++ b/actionpack/test/fixtures/layouts/builder.builder @@ -0,0 +1,3 @@ +xml.wrapper do + xml << @content_for_layout +end
\ No newline at end of file diff --git a/actionpack/test/fixtures/layouts/standard.erb b/actionpack/test/fixtures/layouts/standard.erb new file mode 100644 index 0000000000..368764e6f4 --- /dev/null +++ b/actionpack/test/fixtures/layouts/standard.erb @@ -0,0 +1 @@ +<html><%= @content_for_layout %><%= @variable_for_layout %></html>
\ No newline at end of file diff --git a/actionpack/test/fixtures/layouts/talk_from_action.erb b/actionpack/test/fixtures/layouts/talk_from_action.erb new file mode 100644 index 0000000000..187aab07a2 --- /dev/null +++ b/actionpack/test/fixtures/layouts/talk_from_action.erb @@ -0,0 +1,2 @@ +<title><%= @title || @content_for_title %></title> +<%= @content_for_layout -%>
\ No newline at end of file diff --git a/actionpack/test/fixtures/layouts/yield.erb b/actionpack/test/fixtures/layouts/yield.erb new file mode 100644 index 0000000000..482dc9022e --- /dev/null +++ b/actionpack/test/fixtures/layouts/yield.erb @@ -0,0 +1,2 @@ +<title><%= yield :title %></title> +<%= yield %> |