aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Drive the final stake through @content_for_*'s heart!Yehuda Katz + Carl Lerche2009-06-173-4/+4
|
* Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-271-0/+0
| | | | | | | | ActionView::Template is now completely independent from template storage, which allows different back ends such as the database. ActionView::Template's only responsibility is to take in the template source (passed in from ActionView::Path), compile it, and render it.
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-131-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-071-0/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * correctly handle layouts for AJAX requests and regular js files [#2052 ↵Matt Jones2009-02-241-0/+2
|/ | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Ensure @content_for_* is checked before yielding to block in render :layout ↵Ryan Bates2008-10-281-0/+2
| | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed rendering of partials with layout when done from site layout (closes ↵David Heinemeier Hansson2008-01-032-0/+6
| | | | | | #9209) [antramm] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8541 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Purge empty filesJeremy Kemper2007-09-114-0/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7465 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Apply the rest of Chads patchDavid Heinemeier Hansson2007-02-214-0/+8
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added .erb and .builder as preferred aliases to the now deprecated .rhtml ↵David Heinemeier Hansson2007-02-204-8/+0
| | | | | | 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
* Fix that render :text didn't interpolate instance variables (Closes #2629, ↵David Heinemeier Hansson2005-10-281-1/+1
| | | | | | #2626) [skaes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Yield @content_for_ variables to templates #2058 [Sam Stephenson]Jamis Buck2005-09-011-0/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2094 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed regression for content_for #1820 [Stefan Kaes]David Heinemeier Hansson2005-07-241-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added test for template to layout variable transferDavid Heinemeier Hansson2005-07-231-0/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* InitialDavid Heinemeier Hansson2004-11-242-0/+4
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:44:50 +0000