aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.rb
Commit message (Collapse)AuthorAgeFilesLines
* fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-071-5/+5
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* correctly handle layouts for AJAX requests and regular js files [#2052 ↵Matt Jones2009-02-241-7/+14
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* make action_controller/layouts pick templates from the current instance's ↵Sven Fuchs2009-02-201-32/+26
| | | | | | view_paths instead of the class view_paths [#1974 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* implicitly rendering a js response should not use the default layout [#1844 ↵Adam McCrea2009-02-051-1/+1
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Ensure the full path is used when searching for layouts [#1803 state:resolved]Joshua Peek2009-01-271-1/+1
|
* Ensure the template format is always passed to the template finder. Now we ↵Joshua Peek2008-12-211-4/+18
| | | | can cleanup some nasty stuff.
* Reinstate "Super lazy load view paths in development mode (no indexing or ↵Joshua Peek2008-11-281-28/+10
| | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading."
* Revert "Super lazy load view paths in development mode (no indexing or ↵David Heinemeier Hansson2008-11-271-10/+28
| | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading. This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
* Super lazy load view paths in development mode (no indexing or caching at ↵Joshua Peek2008-11-261-28/+10
| | | | all). Switch layout finders to use view path api to take advantage of cache.
* Revert "Revert "Add layout functionality to mailers.""David Heinemeier Hansson2008-09-091-1/+5
| | | | This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060.
* Revert "Add layout functionality to mailers."David Heinemeier Hansson2008-09-091-5/+1
| | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa.
* Some performance goodness for inheritable attributes.Clemens Kofler2008-09-031-6/+6
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-311-4/+4
| | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
* Add layout functionality to mailers.Pratik Naik2008-08-311-1/+5
| | | | | Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up.
* Moved layout exemption logic into the viewJoshua Peek2008-08-311-3/+5
|
* Move layout rendering logic to ActionView::BasePratik Naik2008-08-311-42/+11
|
* Move copying ivar logic from ActionController::Base to ActionView::BasePratik Naik2008-08-311-1/+0
|
* Dont pass controller partial layout option to viewPratik Naik2008-08-301-1/+1
|
* Refactor template preloading. New abstractions include Renderable mixins and ↵Joshua Peek2008-07-121-1/+1
| | | | a refactored Template class.
* Made ActionView::Base#render_file privateJoshua Peek2008-06-251-1/+1
|
* Replaced TemplateFinder abstraction with ViewLoadPathsJoshua Peek2008-06-171-1/+1
|
* Move missing template logic to ActionViewPratik Naik2008-04-191-3/+1
|
* Ruby 1.9 compat: encoding and multibyte test fixesJeremy Kemper2008-04-011-22/+20
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Make sure render :update support the options hash. Closes #11088 ↵Michael Koziarski2008-02-121-3/+3
| | | | | | [ernesto.jimenez] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Reapply the TemplateFinder first applied in [8669] then reverted in [8676]. ↵Michael Koziarski2008-01-211-12/+1
| | | | | | Closes #10800 [lifofifo] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Revert r8669 for now, breaks Action Mailer. Reopens #10800.Jeremy Kemper2008-01-191-1/+12
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Introduce TemplateFinder to handle view paths and lookups. Closes #10800.Jeremy Kemper2008-01-191-12/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Update layout docs. Closes #10584 [Cheah Chu Yeow]Jeremy Kemper2007-12-211-15/+14
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Explain how the layout macro behaves when passed a path that contains a ↵Marcel Molina2007-12-131-1/+2
| | | | | | directory. Closes #10492 [loincloth] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Adding missing space to documentation of the layout method. Closes #7126 ↵Marcel Molina2007-12-051-1/+1
| | | | | | [orangechicken, jeremymcanally] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8317 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix typos (closes #10378)David Heinemeier Hansson2007-12-051-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8301 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat, consistent load pathsJeremy Kemper2007-10-021-4/+6
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that render template did not honor exempt_from_layout (closes #9698) ↵David Heinemeier Hansson2007-09-301-3/+3
| | | | | | [pezra] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed the layout defaults (closes #9564) [lifo]David Heinemeier Hansson2007-09-281-14/+19
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added failing tests for iphoneDavid Heinemeier Hansson2007-09-251-4/+11
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that default layouts did not take the format into account #9564 [lifofifo]David Heinemeier Hansson2007-09-181-1/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7514 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Random hits from the style naziDavid Heinemeier Hansson2007-09-091-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7438 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix layout overriding response status. Closes #9476.Jeremy Kemper2007-09-081-1/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Remove deprecated functionality from actionpack. Closes #8958 [lifofifo]Michael Koziarski2007-09-031-15/+7
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7403 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Find layouts even if they're not in the first view_paths directory. Closes ↵Rick Olson2007-08-151-5/+3
| | | | | | #9258 [caio] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7321 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add some performance enhancements to ActionView.Rick Olson2007-05-151-1/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Allow layouts with extension of .html.erb. Closes #8032 [Josh Knowles]Rick Olson2007-04-121-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Consistent public/protected/private visibility for chained methods. Closes ↵Jeremy Kemper2007-03-131-19/+20
| | | | | | #7813. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6396 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Options are more often than not meaningless babble, just go nondescript insteadDavid Heinemeier Hansson2007-03-011-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6275 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added .erb and .builder as preferred aliases to the now deprecated .rhtml ↵David Heinemeier Hansson2007-02-201-3/+3
| | | | | | 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
* Allow Controllers to have multiple view_paths instead of a single ↵Rick Olson2007-02-041-7/+12
| | | | | | template_root. Closes #2754 [John Long] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Make RDoc not spew errors on install because of HTML comments in code commentsDavid Heinemeier Hansson2006-12-311-4/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ensure render :json => ... skips the layout. Closes #6808 [Josh Peek]Rick Olson2006-12-191-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Deprecate @responseJeremy Kemper2006-09-291-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* New dependencies implementationNicholas Seckar2006-08-081-1/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de