From 858e8cd419e6856b7ceb86858480b596100b6315 Mon Sep 17 00:00:00 2001 From: Jeremy Bush Date: Thu, 29 Sep 2011 14:13:20 -0500 Subject: [PATCH 1/8] Fixing reference to Kostache_Layout --- README.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index a0d5d64..e957533 100644 --- a/README.markdown +++ b/README.markdown @@ -129,11 +129,11 @@ You must define partials within the $_partials array in your view class. The ke ## Using the View_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 From d45b63b2c3e7401b932861c9e51235eaed2b0f61 Mon Sep 17 00:00:00 2001 From: Aaron Sofaly Date: Wed, 12 Oct 2011 11:04:25 -0700 Subject: [PATCH 2/8] changed {{>body}}; to {{>content}} --- guide/kostache.usage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/kostache.usage.md b/guide/kostache.usage.md index d7eafb3..0ce82d2 100644 --- a/guide/kostache.usage.md +++ b/guide/kostache.usage.md @@ -39,7 +39,7 @@ You must define partials within the $_partials array in your view class. The ke 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. -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 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. 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. From 8f45b379dd4d2482bfd353ea25e9210de6908e59 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sat, 19 Nov 2011 01:01:21 +0000 Subject: [PATCH 3/8] Updating documentation for renaming of View_Layout to Kostache_Layout --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index e957533..4b5a9e9 100644 --- a/README.markdown +++ b/README.markdown @@ -127,7 +127,7 @@ 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 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. From b7a8c553d12cd7ddac34134e9e2153ca25980b58 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sat, 19 Nov 2011 01:09:30 +0000 Subject: [PATCH 4/8] Updating *more* documentation for renaming of View_Layout to Kostache_Layout --- guide/kostache.usage.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guide/kostache.usage.md b/guide/kostache.usage.md index 0ce82d2..9bd0148 100644 --- a/guide/kostache.usage.md +++ b/guide/kostache.usage.md @@ -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 {{>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 From 0f62798d8e728f3203c5e1722121b604290b189b Mon Sep 17 00:00:00 2001 From: Woody Gilk Date: Sun, 27 Nov 2011 08:36:18 -0600 Subject: [PATCH 5/8] Bumping Mustache.php to version v0.8.1 --- vendor/mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/mustache b/vendor/mustache index a037d2d..1e23df0 160000 --- a/vendor/mustache +++ b/vendor/mustache @@ -1 +1 @@ -Subproject commit a037d2d4503db8f3c77c4bfb84355791642a9c39 +Subproject commit 1e23df0cdb4a970395a80cc28413dba27e3dbac3 From bb35f15434e6da1b4b769465cbf5643978ff1248 Mon Sep 17 00:00:00 2001 From: Woody Gilk Date: Sun, 8 Jan 2012 19:05:22 -0600 Subject: [PATCH 6/8] Bumped Mustache.php to v0.9.0 --- vendor/mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/mustache b/vendor/mustache index 1e23df0..5934fd8 160000 --- a/vendor/mustache +++ b/vendor/mustache @@ -1 +1 @@ -Subproject commit 1e23df0cdb4a970395a80cc28413dba27e3dbac3 +Subproject commit 5934fd8a86e14f5a957b11b133283733abac0920 From c98e58a6ce008a90cc83dc57652de68c3a7eb000 Mon Sep 17 00:00:00 2001 From: Woody Gilk Date: Sun, 8 Jan 2012 19:12:53 -0600 Subject: [PATCH 7/8] Moved all copyrights to 2012 --- LICENSE.md | 4 ++-- classes/kohana/kostache.php | 4 ++-- classes/kohana/kostache/layout.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 2118430..c749f09 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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 diff --git a/classes/kohana/kostache.php b/classes/kohana/kostache.php index 33a30a9..c839937 100644 --- a/classes/kohana/kostache.php +++ b/classes/kohana/kostache.php @@ -6,8 +6,8 @@ * @category Base * @author Jeremy Bush * @author Woody Gilk - * @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 { diff --git a/classes/kohana/kostache/layout.php b/classes/kohana/kostache/layout.php index 46bb758..1b8a7d2 100644 --- a/classes/kohana/kostache/layout.php +++ b/classes/kohana/kostache/layout.php @@ -6,8 +6,8 @@ * @category Base * @author Jeremy Bush * @author Woody Gilk - * @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 { From 3e4288246209b794fbc5424faad6bac1257f38a2 Mon Sep 17 00:00:00 2001 From: Woody Gilk Date: Sun, 8 Jan 2012 19:13:39 -0600 Subject: [PATCH 8/8] Bump version to v2.0.6 --- classes/kohana/kostache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/kohana/kostache.php b/classes/kohana/kostache.php index c839937..4538898 100644 --- a/classes/kohana/kostache.php +++ b/classes/kohana/kostache.php @@ -12,7 +12,7 @@ */ 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