github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-14 00:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,373 Commits 34 Branches 105 Tags
2-3-github
Commit Graph

39 Commits

Author SHA1 Message Date
Gaspard Bucher
8371d6f0c1 Fixes a bug where layouts provided with an absolute path would not be found because they were prefixed by 'layouts'. This bug only appears if the path does not contain the word 'layouts'. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#3207 state:committed]
 2009-09-28 14:40:21 +13:00
thedarkone
3191535ff0 Fix layouts with absolute paths [#2134 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-05 18:49:22 -06:00
Sven Fuchs
8c5cc66a83 make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-20 14:19:45 -06:00
Jeremy Kemper
c90572e3ab Use instance_eval instead of adding an accessor to the class 2009-01-07 14:49:12 -08:00
Yaroslav Markin
fdaa9ed033 Fix ActionPack build on Windows: we really should not test anything regarding symlinks on Windows. 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-27 17:33:13 +00:00
Joshua Peek
9fc23745f1 Reinstate "Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading." 2008-11-28 11:18:28 -06:00
David Heinemeier Hansson
5fa0457542 Revert "Super lazy load view paths in development mode (no indexing or 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 4d910b0333.
 2008-11-27 21:04:24 +01:00
Joshua Peek
4d910b0333 Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache. 2008-11-26 20:54:47 -06:00
Jeremy Kemper
c82e8e1f48 Move controller assertions from base TestCase to AC:: and AV::TestCase 2008-11-07 15:42:34 -05:00
Joshua Peek
086c3520c4 Moved layout exemption logic into the view 2008-08-31 11:34:46 -05:00
Ryan Bates
38c7d73e73 pass yielded arguments to block for ActionView::Base#render with :layout [#847 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-08-17 19:29:24 -05:00
Joshua Peek
d2ccb852d4 Removed lagacy TemplateHandler#render API. Left in a legacy TemplateHandler and Compilable stub so plugins will not have to change anything. 2008-07-18 16:00:20 -05:00
Joshua Peek
73b34e9f75 Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class. 2008-07-12 14:33:46 -05:00
Joshua Peek
6ebdd0e32b Changed ActionView::TemplateHandler#render API method signature to render(template, local_assigns = {}) 2008-07-11 15:40:41 -05:00
Joshua Peek
01637796d7 Revert "Moved TemplateHandlers to Base" 
This reverts commit 42d215a925.

Conflicts:

	actionpack/lib/action_view/inline_template.rb
	actionpack/lib/action_view/template.rb
 2008-07-03 21:09:37 -05:00
Joshua Peek
42d215a925 Moved TemplateHandlers to Base 2008-07-03 12:48:00 -05:00
Pratik Naik
ef4c65088f Move missing template logic to ActionView 2008-04-19 18:59:13 +01:00
Jeremy Kemper
5c0656c9ee Fix layouts in symlinked paths. Closes #9136 [court3nay, caio] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 20:54:26 +00:00
Pratik Naik
a96272a0c5 Moved template handlers related code from ActionView::Base to ActionView::Template 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8981 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-05 02:03:24 +00:00
Michael Koziarski
51b6619d4e Refactor partial rendering into a PartialTemplate class. [Pratik] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8976 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-03 04:01:35 +00:00
Michael Koziarski
e6de95889d * Pass around handler instances, not their classes [Koz] 
* Move compilation, rendering and 'compilable?' checks into the Handlers [Koz]
 * Remove delegate_* methods as the handler is now an instance [Koz]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-11 04:45:06 +00:00
Jeremy Kemper
9d755f1983 require abstract_unit directly since test is in load path 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8564 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-01-05 13:32:06 +00:00
Jeremy Kemper
0ee1cb2cd3 Ruby 1.9 compat, consistent load paths 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-02 05:32:14 +00:00
David Heinemeier Hansson
860cf2d44e Fixed that render template did not honor exempt_from_layout (closes #9698) [pezra] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-30 22:59:24 +00:00
Jeremy Kemper
f1b12b62f4 Fix layout overriding response status. Closes #9476. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-08 03:12:03 +00:00
Rick Olson
ebf9b3737b Add some performance enhancements to ActionView. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-15 06:36:34 +00:00
Rick Olson
f5b8fc0335 Allow layouts with extension of .html.erb. Closes #8032 [Josh Knowles] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-04-12 17:11:48 +00:00
David Heinemeier Hansson
e105653066 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
 2007-02-20 22:09:12 +00:00
Rick Olson
69b0e5c44a Allow Controllers to have multiple view_paths instead of a single template_root. Closes #2754 [John Long] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-02-04 20:47:05 +00:00
Jeremy Kemper
55efae2720 Allow exempt_from_layout :rhtml. References #6742, closes #7026. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5927 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-01-14 13:57:44 +00:00
Jeremy Kemper
88e02f6e56 Failing test for exempt_from_layout :rhtml. References #6742. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-01-12 10:31:24 +00:00
Jeremy Kemper
35ffc1afbe Declare file extensions exempt from layouts. Closes #6219. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5126 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-16 01:31:17 +00:00
David Heinemeier Hansson
11c715a53f Added exception handling of missing layouts (closes #5373) [chris@ozmm.org] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-07-05 02:38:55 +00:00
Marcel Molina
7252666b74 Add layout attribute to response object with the name of the layout that was 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
 2006-05-17 07:25:36 +00:00
David Heinemeier Hansson
cc6e8ae57a Removed XML argument style for respond_to, so type.xml(object.to_xml) no longer works -- it wasnt worth the exception 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-18 21:17:14 +00:00
Marcel Molina
4793a2f5cd Automatically discover layouts when a controller is namespaced. Closes #2199, #3424. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-15 11:28:55 +00:00
Marcel Molina
751b6be464 Allow auto-discovery of third party template library layouts. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-01-12 07:16:23 +00:00
Jeremy Kemper
7bb486055e r1318@iwill: jeremy | 2005-06-15 01:08:22 -0700 
Ticket 1394 - Helper isolation
 r1319@iwill:  jeremy | 2005-06-15 01:10:00 -0700
 Formulate a test case for helper isolation.
 r1331@iwill:  jeremy | 2005-06-15 15:21:07 -0700
 Update changelog
 r1332@iwill:  jeremy | 2005-06-15 15:21:30 -0700
 Remove superfluous, broken layout_test
 r1333@iwill:  jeremy | 2005-06-15 15:24:10 -0700
 Use an anonymous Module to store helpers per-class instead of tossing them all in template_class.  Create a new helper module for subclasses which includes its superclass' helper module.  Remove unnecessary ActionView::Base.controller_delegate.  Update helper tests.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2005-06-15 17:17:58 +00:00
David Heinemeier Hansson
db045dbbf6 Initial 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2004-11-24 01:04:44 +00:00