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
f83a024a10
Increasing code coverage for View and ThemeView
2009-11-25 23:17:15 -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
0977029c89
Removing limit of image, js and css in plugins
2009-11-25 09:47:23 -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
8cdee90b4f
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05: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
mark_story
a729fc4d62
Merge branch '1.3-cache' into 1.3-misc
2009-11-21 17:16:38 -05:00
mark_story
c11509483c
Removing use of Helper::output from core helpers.
...
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
a96c157d94
Applying optimizations to use of count() from 'jrbasso'
2009-11-21 15:14:21 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
9b6b258fed
Replace function is_integer (alias) by is_int.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
burzum
67cea6d21c
Fixing a problem with setting Paginator::sort() defaults directon to desc
2009-11-17 02:11:23 +01:00
mark_story
925fda7ba6
Updating core layout, and skel layout to reflect changes in session->flash().
...
Updating skel layout to use $this->Helper.
2009-11-16 20:01:55 -05:00
Jippi
e6801c22e1
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-16 23:19:11 +00:00
Jippi
2cb0c3acb3
Changed SessionHelper::flash to return message instead of echoing it
2009-11-16 23:15:24 +00:00
mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
predominant
0049c9ad81
Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback.
2009-11-15 21:18:46 +11:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
d93c94f702
Fixing failing test, picked in from 1.2.
2009-11-13 09:53:31 -05:00
mark_story
f0628d100b
Fixing issues with getting values from habtm data after form posting and validation has failed.
...
Tests added.
Refs #279
2009-11-09 21:00:19 -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
mark_story
7981b44db4
Merge branch '1.3-misc' into mergers
2009-11-08 21:39:55 -05:00
mark_story
30dc0cfe56
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00
Removing unused $view property from CacheHelper.
...
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8
passedArgs from current request are auto merged with url options of paginator helper
...
Signed-off-by: Florian Krmer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0
Removing deprecated code in Html::css()
...
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217
Merge branch '1.3' into 1.3-misc
2009-11-06 09:25:11 -05: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
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
mark_story
e776cf1ad2
Adding tests and fixing inline parameter being converted to an attribute.
...
Fixes #265
2009-11-05 23:32:39 -05:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
predominant
490e76460f
Changing quotes and adding spaces. Standarization cleanup.
2009-11-06 13:46:49 +11:00
predominant
2669b6179f
Fix committed merge conflict for home page.
2009-11-05 14:30:56 +11:00
mark_story
380b49a446
Fixing Helper::value() and extraction of habtm data. Refs #256
2009-11-04 14:05:12 -05:00
mark_story
dc07a05fca
Merge branch '1.3' into 1.3-misc
2009-11-04 09:20:21 -05:00
predominant
59c62426c9
Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc
2009-11-04 16:11:35 +11:00
