Commit graph

170 commits

Author SHA1 Message Date
phpnut
3ad0595b86 Forgot to add plugin elements for additional tests 2009-11-25 23:20:43 -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
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -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
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
mark_story
28d3488cb2 Adding file headers to config files in test app.
Updating doc blocks.
Updating formatting.
2009-11-15 18:09:04 -05:00
ceeram
7a4793a20c refactoring Configure::load() to load config files from plugins, tests and config files added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-15 17:56:49 -05:00
mark_story
fb483e9bff Adding file headers. 2009-11-14 20:25:45 -05:00
mark_story
040f94cb81 Adding test case files used for previous commit. 2009-11-14 20:10:40 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
predominant
884490f1a1 Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +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
531eaaad4e Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-06 15:54:01 +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
84c8cc3f36 Adding tests for importing loggers from app/libs and plugin/libs.
Adding tests for failed configs.
2009-11-05 20:13:15 -05:00
mark_story
54c772c5d5 Updating fileheader. 2009-11-05 19:49:12 -05:00
mark_story
8c46cc49fb Fixing issue in Dispatcher::cached() where plugins ending in asset extensions would be incorrectly handled.
Test added
Fixes #237
2009-11-03 13:14:38 -05:00
SkieDr
35d5ffca71 add library fixture for app::import tests 2009-10-28 16:09:17 +03:00
mark_story
0cc1d84737 Removing use of e() from core and test suite. 2009-10-21 12:57:03 -04:00
SkieDr
fb64d14442 Add support libs folder into app and plugins that will allow to split users and vendors code. Libs files should follow cake naming conventions for files names and classes. 2009-10-21 14:59:12 +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
05f6099def Enabling plugin.name schema file creation and addition.
Making CakeSchema::load() use plugin parameter, tests added.
Plugin schema file added to test_app.
2009-10-04 13:32:33 -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
jperras
7e5fe04a77 Merge branch '1.3-misc' into 1.3-misc-plugin-datasources 2009-09-24 23:14:12 -04:00
jperras
12c5ebf5ba Moving test plugin datasource to the correct location. 2009-09-24 19:37:07 -04:00
jperras
0c0e5d111b Adding stub datasource to test_app. 2009-09-24 19:21:09 -04:00
mark_story
50bd279018 Merge branch '1.3-auth' into 1.3 2009-09-20 17:53:23 -04:00
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -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
8d6135a8d1 Adding support for plugin models used in Auth::$userModel 2009-08-13 11:39:59 -03:00
burzum
417bdb4514 Fixing building of the right vendor path in the dispatcher in the case the plugin name appears again in the path 2009-08-12 16:08:31 +02: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
gwoo
766e12bc2a Merge branch '1.3' into 1.3-newlines 2009-07-25 10:41:40 -07:00
gwoo
986af28de0 Merge branch '1.2' into 1.3 2009-07-24 15:57:30 -07: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
mark_story
565cd96120 Fixing issue in CakeTestCase where fixture tables were incorrectly detected and dropped when running tests with no $test config or $test config and $default config on the same database.
Updating TestAppsPostsController to fix compatibility issues with postgres.
Defining $name in CakeTestFixture to remove notice errors, when constructing a nameless Fixture.
Fixes #6518

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8254 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-24 16:29:18 +00:00
gwoo
a2f0ab8b27 Merge branch '1.2' into 1.3 2009-07-20 09:31:56 -07:00
gwoo
7818eae206 fixes #6455, i18n locale message category bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8218 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-03 15:54:26 +00:00
mark_story
1c6d0d5642 Removing old files. 2009-07-01 00:48:53 -04:00
mark_story
ad98139e35 Moving bake templates into templates/default.
Adding 'console template themes' to TemplateTask.
Adding test cases for console themes.
Moving files around.
2009-07-01 00:24:20 -04:00
mark_story
15fb1a711a Updating TemplateTask adding test case and test object file. 2009-05-12 22:00:30 -04:00
gwoo
643651fe56 Merge master in 1.3 2009-03-19 14:10:13 -07:00
gwoo
3d4c5b424d adding models/behaviors for object persist tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8119 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-19 20:10:10 +00:00
davidpersson
3c3b852099 Changing package of tests from "cake.tests" to "cake".
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
mark_story
99a2fa439c Fixing errors in Configure test.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7928 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 04:14:34 +00:00
renan.saddam
64c3d1ef95 Fixing issue when Dispatcher is getting plugin shell. Fixes #5740.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7871 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-13 00:33:53 +00: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
renan.saddam
50752a840a Added support to multiline plural message string. Fixes #5663.
Converting "\r\n" (Windows) to "\n" (Non-Windows) when extracting and when translating the message.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7834 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-06 22:57:50 +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
renan.saddam
3ab9854300 Added test to disprove non-supported multiline plural message. Fixes #5663.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7786 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-28 01:51:18 +00:00
mark_story
f875c0098b Updating test_suite header to improve readability of connection names.
Adding test for using CakeTestCase::testAction() with fixturize parameter.
Updating TestsAppPostsController and adding Post Model to test suite.
Refs #5620

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7760 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-17 16:39:39 +00:00
phpnut
760f79f4ec Closes #1855, Separate translation files per plugin. This is now supported using !__d() and !__dn().
Example singular usage: !__d('plugin_name', $string, true); returns translated singular string from pluginsPath/plugin_name/locale/"language"/LC_MESSAGE/plugin_name.(po/mo).
	Example plural usage: sprintf(!__dn('plugin_name', '%d = 1', '%d = 0 or > 1', $number, true), $number ); returns translated plural strings from pluginsPath/plugin_name/locale/"language"/LC_MESSAGE/plugin_name.(po/mo).
Closes #5007, Support for multiple additional locale paths. Configure::write('localePaths', $paths); accepts an array of $paths. $localePaths = array(); can also be used in bootstrap.php
Added Configure::$shellPaths; additional paths can be set in bootstrap.php $shellPaths = array();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7754 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-16 05:16:00 +00:00
mark_story
f94bc3e4bc Adding Test case for Shell
Adding Comment Model to test_app
Fixing Plugin model loading in Shells, fixes #5566

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7726 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-10 02:14:57 +00:00
renan.saddam
67abae6307 Adding remaining tests to I18n (rule 11-14).
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7724 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-10 00:39:01 +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
DarkAngelBGE
cc425a5e0a adding a couple whitespace corrections (trailing tabs, newlines, ..)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7654 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-24 11:52:29 +00:00
mark_story
fafb01b09d Fixing modelClass when using plugin models.
Added TestPluginPost to test_app/test_plugin
Test case added.
Closes #5459

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7641 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 04:10:49 +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
renan.saddam
5cedddb9d2 Fixing since tag from file added on last commit
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7630 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-19 02:40:07 +00:00
renan.saddam
597f7642fa Added tests to disprove strange App::import behavior. Closes #5395
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7629 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-19 02:37:20 +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
8e6a5a7214 Fixing issue with CakeTestCase::testAction not properly being able to simulate query string parameters.
Added tests for various parameter syntaxes.  
Closes #5400

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7585 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 16:48:52 +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
mark_story
e114cc4e80 Adding test case for CakeTestCase (72% coverage). Adding necessary pieces to test_app as well.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7490 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-23 17:28:08 +00:00
mark_story
5ff62650e5 Correcting file layout in test_app. Fixing tests in Configure test and ThemeView Test.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7413 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 16:23:16 +00:00
mark_story
7f75f74f5b Updated test_plugin/tests views to reflect changes made in tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7390 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 00:55:24 +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
mark_story
d7b043a374 Fixing test_app/test_plugin files. Many had incorrect file / class names. Added tests to cover plugin class loading, and dispatching.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7355 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 02:19:05 +00:00
gwoo
20439c098b adding another test case for img from vendors, closes #5033
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7317 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 12:24:51 +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
gwoo
013e9889e5 updating file engine and test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7252 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 01:09:54 +00:00
gwoo
352b121220 fixes #4916, i18n quoted strings. fixes #4968, quoted strings in cache
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7243 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 00:27:33 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
52b9f7a889 closes #4903, closes #4669 allows serving images from vendors and plugin vendors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7200 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-17 04:24:55 +00:00
gwoo
069fb0011c fixes #4839, assets served from vendors must provide proper extension to ensure accurate content type header is set
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7185 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:05:06 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00