aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/layouts
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-20 22:09:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-20 22:09:12 +0000
commite1056530665d5c8eed2c325157fbb88553eb2678 (patch)
tree30341bae8b9a63faed289f9dc56c1a654a449731 /actionpack/test/fixtures/layouts
parent89cb34c9cfe9d169b79206b74c602e91bc7116a5 (diff)
downloadrails-e1056530665d5c8eed2c325157fbb88553eb2678.tar.gz
rails-e1056530665d5c8eed2c325157fbb88553eb2678.tar.bz2
rails-e1056530665d5c8eed2c325157fbb88553eb2678.zip
Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures/layouts')
-rw-r--r--actionpack/test/fixtures/layouts/builder.rxml3
-rw-r--r--actionpack/test/fixtures/layouts/standard.rhtml1
-rw-r--r--actionpack/test/fixtures/layouts/talk_from_action.rhtml2
-rw-r--r--actionpack/test/fixtures/layouts/yield.rhtml2
4 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/test/fixtures/layouts/builder.rxml b/actionpack/test/fixtures/layouts/builder.rxml
index 729af4b8bc..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/builder.rxml
+++ b/actionpack/test/fixtures/layouts/builder.rxml
@@ -1,3 +0,0 @@
-xml.wrapper do
- xml << @content_for_layout
-end \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/standard.rhtml b/actionpack/test/fixtures/layouts/standard.rhtml
index 368764e6f4..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/standard.rhtml
+++ b/actionpack/test/fixtures/layouts/standard.rhtml
@@ -1 +0,0 @@
-<html><%= @content_for_layout %><%= @variable_for_layout %></html> \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/talk_from_action.rhtml b/actionpack/test/fixtures/layouts/talk_from_action.rhtml
index 187aab07a2..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/talk_from_action.rhtml
+++ b/actionpack/test/fixtures/layouts/talk_from_action.rhtml
@@ -1,2 +0,0 @@
-<title><%= @title || @content_for_title %></title>
-<%= @content_for_layout -%> \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/yield.rhtml b/actionpack/test/fixtures/layouts/yield.rhtml
index 482dc9022e..e69de29bb2 100644
--- a/actionpack/test/fixtures/layouts/yield.rhtml
+++ b/actionpack/test/fixtures/layouts/yield.rhtml
@@ -1,2 +0,0 @@
-<title><%= yield :title %></title>
-<%= yield %>