aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Added exception handling of missing layouts (closes #5373) [chris@ozmm.org]David Heinemeier Hansson2006-07-051-0/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add layout attribute to response object with the name of the layout that was ↵Marcel Molina2006-05-171-0/+1
| | | | | | rendered, or nil if none rendered. [Kevin Clark kevin.clark@gmail.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4346 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina ↵Marcel Molina2006-04-291-2/+3
| | | | | | Jr.] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4312 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Update layout and content_for documentation to use yield rather than magic ↵Marcel Molina2006-04-251-5/+7
| | | | | | @content_for instance variables. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4262 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Performance speedup for ActionController (closes #4174) [Stefan Kaes] ↵David Heinemeier Hansson2006-03-201-2/+7
| | | | | | Includes caching of filter chains -- be on the lookout for problems with that! git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3989 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Simplify controller_pathNicholas Seckar2006-03-131-3/+22
| | | | | | | Cache File.directory? calls to avoid filesystem calls when using layouts git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3861 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Rendering xml shouldnt happen inside any layout. Added class proxying to ↵David Heinemeier Hansson2006-03-131-1/+1
| | | | | | RJS, so you can call page.field.clear("my_field") to generate Field.clear("my_field");. Added :content_type option to render, so you can change the content type on the fly. Do type/subtype reordering of Accept header preferences for xml types (aka make Firefox work with respond_to). CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3852 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Replace dubious controller parent class in filter docs. Closes #3655, #3722.Marcel Molina2006-02-081-4/+6
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added reusable reloading support through the inclusion of the Relodable ↵David Heinemeier Hansson2006-01-291-4/+5
| | | | | | module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets [DHH]. Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]. Refactored extensions to module, class, and object in active support [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix render(:update) to not render layoutsSam Stephenson2006-01-231-0/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3472 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Change layout discovery to take into account the change in semantics with ↵Marcel Molina2006-01-221-1/+1
| | | | | | File.join and nil arguments. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3462 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add render :update for inline RJSSam Stephenson2006-01-201-4/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3441 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Automatically discover layouts when a controller is namespaced. Closes ↵Marcel Molina2006-01-151-4/+9
| | | | | | #2199, #3424. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Allow auto-discovery of third party template library layouts.Marcel Molina2006-01-121-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Don't include a layout when rendering an rjs template using render's ↵Marcel Molina2005-12-171-1/+1
| | | | | | :template option. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3316 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Correct docs for automatic layout assignment. Closes #2610.Marcel Molina2005-11-201-1/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Make rjs templates always implicitly skip out on layouts.Marcel Molina2005-11-181-5/+7
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix that render :text didn't interpolate instance variables (Closes #2629, ↵David Heinemeier Hansson2005-10-281-0/+1
| | | | | | #2626) [skaes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed docs (closes #2468)David Heinemeier Hansson2005-10-261-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2749 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Make sure :layout => false is always used when rendering inside a layoutJamis Buck2005-08-051-1/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1970 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improved performance of test app req/sec with ~10% refactoring the render ↵David Heinemeier Hansson2005-07-241-30/+40
| | | | | | method #1823 [Stefan Kaes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improved performance with 5-30% through a series of Action Pack ↵David Heinemeier Hansson2005-07-231-1/+1
| | | | | | optimizations #1811 [Stefan Kaes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Made documentation ready for release (AP)David Heinemeier Hansson2005-07-061-3/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1731 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Partly tuned docs for release (AP)David Heinemeier Hansson2005-07-061-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* render(:template) applies a layout by default. render("foo/bar") works with ↵Jamis Buck2005-06-151-2/+2
| | | | | | a layout again. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1424 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* render(:action) and render() are the only two render calls to use a layout ↵Jamis Buck2005-06-011-6/+4
| | | | | | by default. All others default to :layout => false. Also, allow :layout => true to be a synonym for :layout => nil. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* render(:inline) defaults to :layout => falseJamis Buck2005-05-301-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* render(:text), render(:partial), and render(:nothing) always default to ↵Jamis Buck2005-05-301-5/+17
| | | | | | :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1369 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* render :nothing shouldnt cause layoutsDavid Heinemeier Hansson2005-05-221-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Cure some ills discovered with the refactoringDavid Heinemeier Hansson2005-05-221-29/+21
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1351 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Deprecated all render_* methods in favor of consolidating all rendering ↵David Heinemeier Hansson2005-05-221-11/+10
| | | | | | behavior in Base#render(options). This enables more natural use of combining options, such as layouts git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1350 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Deprecated redirect_to_path and redirect_to_url in favor of letting ↵David Heinemeier Hansson2005-05-221-3/+31
| | | | | | redirect_to do the right thing when passed either a path or url. Introduced r as a unified method for render (still under construction) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1349 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed documentation snafus #575, #576, #577, #585David Heinemeier Hansson2005-02-071-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@525 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added conditional layouts like <tt>layout "weblog_standard", :except => ↵David Heinemeier Hansson2005-01-111-21/+63
| | | | | | :rss</tt> #452 [Marcel Molina] -- We are still missing unit tests for layouts in general, so please do contribute if you want some testing workout git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@387 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added documentation for using render_with_layoutDavid Heinemeier Hansson2004-12-291-0/+16
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@272 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added documentation for automatic layout inclusion #328 [Marcel]David Heinemeier Hansson2004-12-191-0/+9
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de