Commit graph

62 commits

Author SHA1 Message Date
Mark Story
7a620b62b0 Merge branch '1.3-misc' into mergers
Conflicts:
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
Mark Story
3f7405c8d6 Removing cakeDebug from test_app layout.
Adding skips for tests that can cause failures when cache dirs are not writable.
2009-12-19 19:47:20 -05:00
ceeram
64045e1e18 Apply new Helper syntax to remaining files
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-14 18:52:13 -05:00
Mark Story
47a9401d43 Adding test case for cached view files, and fatal errors caused by the view instance not being registered. View instances are now registered when rendering view caches, and unregistered if the cached view fails. This fixes issues rendering flash messages with custom layouts and fixes FormHelper methods inside nocache blocks.
Fixes #60
2009-12-13 12:39:39 -05:00
mark_story
bbb61b28f7 Merge branch '1.3-misc' into mergers 2009-12-06 21:11:26 -05:00
mark_story
3b74c93582 Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381 2009-12-03 09:55:49 -05:00
phpnut
8bc84948f0 Adding more tests for theme assets 2009-11-27 10:27:15 -06:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached();
Fixing path search for themes
2009-11-27 00:49:20 -06:00
phpnut
903a1fd95a Adding new Configure::$App['www_root']
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
phpnut
948f6b21e5 Refactored last commit changes are:
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
phpnut
49c11a8219 More work allowing assets in themes and plugins. 2009-11-25 11:06:28 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
predominant
884490f1a1 Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
0cc1d84737 Removing use of e() from core and test suite. 2009-10-21 12:57:03 -04:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
f12cbdba38 Fixing CacheHelper and multiple cake:nocache tags in a view file, breaking cake:nocache following $content_for_layout. Fixes #136 2009-10-01 01:03:47 -04:00
mark_story
4d458e93b6 Updating SessionHelper::flash() to use elements for custom flash wrapping html instead of layouts. 2009-09-01 00:03:56 -04:00
mark_story
213b78727f Removing use of e() from core and test suite. 2009-08-27 22:51:10 -04:00
renan.saddam
ae89e709d2 Refactoring extract shell. Supporting use of $foo['bar'] as $count. 2009-08-06 18:14:25 -03:00
AD7six
b9987e1712 whitespace normalization 2009-08-02 16:09:39 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
AD7six
f64f4cbddc whitespace normalization 2009-07-26 11:59:51 +02:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
e40428801e Removing all uses of uses() global method & replacing with require or App::import. 2009-07-24 13:41:08 -04:00
renan.saddam
111b886570 Removed trailing whitespaces from tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7848 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:58:37 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
AD7six
3ddc5e6be2 adding failing testcase for identical <cake:nocache> content confussion.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7703 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-05 18:27:02 +00:00
phpnut
385ebbce1f Closes #5509 Executable flag set on sequencial_nocache.ctp
Closes #3817 Some non-executable files in source tree have executable permissions

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7702 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-05 00:19:25 +00:00
mark_story
b6f9e1e537 Correcting scaffold view file implementation. Was incorrectly using separate add and edit templates. Changes bring scaffold templates more inline with bake templates.
Tests added to cover use with both primary app and plugins. Refs #4862 and closes #5484 

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7671 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-27 03:48:23 +00:00
nate
42911f5bc3 Adding example Ajax layout for Auth test
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7638 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-20 21:48:43 +00:00
AD7six
0df14f183f adding cache test with multiple no cache tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7591 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-10 16:48:43 +00:00
phpnut
bfa180e4af Setting missing props on files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7588 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:51:28 +00:00
mark_story
e5cfd69636 Adding test layout with cake:nocache tags.
Adding tests to CacheHelper
Fixing CacheHelper not parsing cake:nocache after $content_for_layout when view file has cake:nocache tags as well.
Closes #5275

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7560 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-05 21:41:07 +00:00
TommyO
c466cfdc8b Adding elements and templates to test app for EmailComponent
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7359 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 13:34:46 +00:00
gwoo
a764b471f6 closes #5011, target _blank for all html links that open new windows
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7310 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-04 13:44:23 +00:00
renan.saddam
57dabe311f adding test case to #4980, proving cake:nocache bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7262 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-26 05:26:10 +00:00