Commit graph

123 commits

Author SHA1 Message Date
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
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