Commit graph

120 commits

Author SHA1 Message Date
mark_story
a3ae58da09 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
ADmad
47708c52cd Allow content to be added before existing content in view block. 2012-10-02 00:11:54 +05:30
mark_story
affb3192ad Fix issue where including elements + extending views fails.
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
2012-09-30 22:44:27 -04:00
ADmad
89ab0a2d06 Fix docblock 2012-09-30 23:44:32 +05:30
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
Tigran Gabrielyan
6d98069f13 Added ability to set default view block content 2012-09-18 00:41:30 -07:00
Kyle Robinson Young
bc40ac7d3f Remove unused variables and code 2012-09-05 17:19:13 -07:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
Kyle Robinson Young
ee9a545c7d Correct docblock see tags to ViewBlock
Fixes http://cakephp.lighthouseapp.com/projects/43067/tickets/97-about-api-description-of-viewassign
2012-08-29 21:53:29 -07:00
Paul Redmond
a993a7a50d Fixing typo in view property during unset() 2012-08-24 23:11:25 -07:00
Florian Krämer
83903cd5b4 Changing the signature of View::_elementCache() 2012-07-06 02:13:34 +02:00
Florian Krämer
b2bb7bf2ae Fixing a few issues within the new methods 2012-07-06 00:22:39 +02:00
Florian Krämer
ca9ff0283c Refactoring View::element() 2012-07-04 11:48:10 +02:00
Jose Lorenzo Rodriguez
51635c2ca6 Merge remote-tracking branch 'origin/2.1' into 2.2
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-06-06 11:06:06 -04:30
Rachman Chavik
8966f1b324 create CakeRequest in View instead of in CakeEmail 2012-06-04 22:21:41 +07:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
024e30eb42 Fix coding standards errors.
Adding a private property allows fixing of 4 naming standards
errors.
2012-05-20 16:06:41 -04:00
mark_story
4dc07b6d39 Merge branch '2.1' into 2.2 2012-05-16 21:08:06 -04:00
mark_story
cbd6cafed7 The event manager should be re-used.
View::__construct() gets the controller's event manager,
only to override it the first time getEventManager() is called.

Don't overwrite the Controller's event manager as it allows plugins
to more easily hook into the view process.
2012-05-14 21:18:09 -04:00
Jose Lorenzo Rodriguez
ed0c5a4746 Merge branch '2.2-lazy-helpers' into 2.2 2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
Justin A. Barnes
2c0cd1f2dd Fixed doc typo in lib/Cake/View/View.php 2012-04-16 18:30:10 -05:00
Jose Lorenzo Rodriguez
d17a471451 Initial middelware implementation 2012-04-15 11:39:08 -04:30
Majna
17cbcf4406 Fix rendering element from plugin controller.
Fixes #2661

Signed-off-by: mark_story <mark@mark-story.com>
2012-04-14 10:24:54 -04:00
Jose Lorenzo Rodriguez
f688d5777e Implementing helper lazy loading 2012-03-27 23:44:23 -04:30
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
0df239de2b Fix some coding standards issues. 2012-03-03 15:59:36 -05:00
ADmad
a31be56f42 Wrapping error string in translator function. 2012-02-26 20:34:30 +05:30
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Jose Lorenzo Rodriguez
715c848577 Bringing theme code up to date with 2.0, cleaning logic a bit 2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b Fixing a few failing test cases 2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4 Adding a simpler solution to the missing view files problem without altering the built paths in App 2012-02-20 15:39:03 -04:30
Jose Lorenzo Rodriguez
cec9d2e615 Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
This reverts commit 5c792aa831.
2012-02-20 15:21:03 -04:30
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01:00
ADmad
5c792aa831 Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit. 2012-02-16 18:15:12 +05:30
Tigran Gabrielyan
7fe6a4d5ea Added Plugin.asset support for HtmlHelper css(), script(), and image() with tests 2012-02-07 20:20:50 -08:00
ADmad
c0690a3eff Added reponse object as property of View class View::$response. Refactored HtmlHelper::media() a bit. 2012-02-06 20:45:00 +05:30
Stefano Zoffoli
edeca2fd3c Fix for extending plugin's view
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-31 21:04:21 -05:00
AD7six
ecbe337052 Make extending a missing element throw an exception
A layout extending a missing layout throws a missing-layout exception
A view extendinga missing view throws a missing-view exception
Now, an element extending a missing element throws a logic exception

in addition "absolute" paths can be used such that (using elements as an
example)

$this->extend('foo') - extends View/Elements/foo.ctp
$this->extend('/foo') - extends View/foo.ctp

Closes #2504
2012-01-25 13:04:45 +01:00
AD7six
11ed1e6ea5 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-24 13:55:56 +01:00
AD7six
def96c0460 throw an exception if the view you try to extend doesn't exist
or element, or layout
2012-01-24 13:54:39 +01:00
Ceeram
95aa7e32c3 include theme in _passedVars array 2012-01-24 10:42:18 +01:00
Jose Diaz-Gonzalez
c2519e702d Merging ThemeView and View class
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
2012-01-22 15:45:26 -05:00
Ceeram
7badb1d252 fix magic __isset() 2012-01-14 12:42:10 -05:00
mark_story
d238d8c0bb Fix incorrect __isset().
There was a missing $ before name.  Fixes issues
with dynamic properties not being handled correctly.

Fixes #2450
2012-01-09 21:47:57 -05:00
mark_story
6c902a19b3 Fix issue with rendering elements inside blocks.
Fixes exceptions being raised when you tried to render
elements inside blocks.  Instead compare the number of open blocks.
This should not change before/after rendering a view.
2011-12-30 14:56:31 -05:00