Merge branch 'release/2.0.6'

This commit is contained in:
Woody Gilk 2012-01-08 19:13:52 -06:00
commit 9e9b439884
6 changed files with 16 additions and 16 deletions

View file

@ -1,7 +1,7 @@
The MIT License
Copyright (c) 2010-2011 Jeremy Bush
Copyright (c) 2011 Woody Gilk
Copyright (c) 2010-2012 Jeremy Bush
Copyright (c) 2011-2012 Woody Gilk
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View file

@ -127,13 +127,13 @@ You must define partials within the $_partials array in your view class. The ke
'footer' => 'footer/default', // Loads templates/footer/default.mustache
);
## Using the View_Layout class
## Using the Kostache_Layout class
Kostache comes with a View_Layout class instead of a template controller. This allows your layouts to be more OOP and self contained, and they do not rely on your controllers so much.
Kostache comes with a Kostache_Layout class instead of a template controller. This allows your layouts to be more OOP and self contained, and they do not rely on your controllers so much.
To use it, have your view extend the View_Layout class. You can then specify your own layout file by placing it in templates/layout.mustache. At a minimum, it needs to have a {{>content}} partial defined in it.
To use it, have your view extend the Kostache_Layout class. You can then specify your own layout file by placing it in templates/layout.mustache. At a minimum, it needs to have a {{>content}} partial defined in it.
If you have a view that extends the View_Layout class, but wish to render only the template and not the entire layout, you can set the public $render_layout property to FALSE. This is useful if you want to use the same view class for external requests and HMVC requests.
If you have a view that extends the Kostache_Layout class, but wish to render only the template and not the entire layout, you can set the public $render_layout property to FALSE. This is useful if you want to use the same view class for external requests and HMVC requests.
$view = new View_Post_List;
if ($this->request !== Request::instance) // Is internal request

View file

@ -6,13 +6,13 @@
* @category Base
* @author Jeremy Bush <jeremy.bush@kohanaframework.org>
* @author Woody Gilk <woody.gilk@kohanaframework.org>
* @copyright (c) 2010-2011 Jeremy Bush
* @copyright (c) 2011 Woody Gilk
* @copyright (c) 2010-2012 Jeremy Bush
* @copyright (c) 2011-2012 Woody Gilk
* @license MIT
*/
abstract class Kohana_Kostache {
const VERSION = '2.0.5';
const VERSION = '2.0.6';
/**
* Factory method for Kostache views. Accepts a template path and an

View file

@ -6,8 +6,8 @@
* @category Base
* @author Jeremy Bush <jeremy.bush@kohanaframework.org>
* @author Woody Gilk <woody.gilk@kohanaframework.org>
* @copyright (c) 2010-2011 Jeremy Bush
* @copyright (c) 2011 Woody Gilk
* @copyright (c) 2010-2012 Jeremy Bush
* @copyright (c) 2011-2012 Woody Gilk
* @license MIT
*/
abstract class Kohana_Kostache_Layout extends Kostache {

View file

@ -35,13 +35,13 @@ You must define partials within the $_partials array in your view class. The ke
'footer' => 'footer/default', // Loads templates/footer/default.mustache
);
## Using the View_Layout class
## Using the Kostache_Layout class
Kostache comes with a View_Layout class instead of a template controller. This allows your layouts to be more OOP and self contained, and they do not rely on your controllers so much.
Kostache comes with a Kostache_Layout class instead of a template controller. This allows your layouts to be more OOP and self contained, and they do not rely on your controllers so much.
To use it, have your view extend the View_Layout class. You can then specify your own layout file by placing it in templates/layout.mustache. At a minimum, it needs to have a {{>body}}; partial defined in it.
To use it, have your view extend the Kostache_Layout class. You can then specify your own layout file by placing it in templates/layout.mustache. At a minimum, it needs to have a {{>content}} partial defined in it.
If you have a view that extends the View_Layout class, but wish to render only the template and not the entire layout, you can set the public $render_layout property to FALSE. This is useful if you want to use the same view class for external requests and HMVC requests.
If you have a view that extends the Kostache_Layout class, but wish to render only the template and not the entire layout, you can set the public $render_layout property to FALSE. This is useful if you want to use the same view class for external requests and HMVC requests.
$view = new View_Post_List;
if ($this->request !== Request::instance) // Is internal request

2
vendor/mustache vendored

@ -1 +1 @@
Subproject commit a037d2d4503db8f3c77c4bfb84355791642a9c39
Subproject commit 5934fd8a86e14f5a957b11b133283733abac0920