Mark Story
3ad4dd63bf
Removing unused variables from CacheHelper::cache()
...
Removing non-existant variable output from generated cache files.
2009-12-28 22:15:07 -05:00
Mark Story
2db479dc90
Making CacheHelper create $this->Html style helper references.
2009-12-28 21:58:56 -05:00
Mark Story
6749e1166b
Making cacheAction array settings use action names instead of url paths. This removes the ability to set different durations for specific passed arguments. However, makes passed args, named params, and querystring params all behave the same in regard to cacheAction. Test cases updated.
2009-12-28 21:26:51 -05:00
Mark Story
45a3eb250f
Starting refactoring of cachehelper to use Router::reverse to generate check/match strings. Removing dead code as well.
2009-12-28 13:38:36 -05:00
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
20c02e39d6
Adding doc block for options on NumberHelper::currency()
2009-12-22 19:17:23 -05:00
Mark Story
0b558c6eb0
Adding code to make tests from previous commit pass.
2009-12-22 19:12:11 -05:00
Mark Story
1a387e6b8a
Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
...
Tests added. Fixes #129
This reverses the change made in efa36abdf0
which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
c00cebb0c3
Removing doc for param that no longer exists.
2009-12-21 09:54:35 -05:00
ceeram
6d8fa76bed
edit of docblock
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-21 09:52:33 -05:00
Mark Story
5274dce9f1
Making set vars with Js->set go to the top of the buffered scripts array. Tests added.
...
Updating doc blocks for JsHelper and JsBaseEngineHelper.
Fixes #131
2009-12-21 09:41:36 -05:00
Mark Story
42fa6ff04a
Fixing JsHelper::writeBuffer when inline is set to false. Scripts are now enclosed in a script tag. Fixes #130
2009-12-21 09:29:28 -05:00
ADmad
f36e5eff5f
Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc
2009-12-20 13:22:43 +05:30
ADmad
cea102c357
Updating doc block to reflect that url can be string or array and removing 'escapeTitle' param. Use key 'escape' in options instead
2009-12-20 00:46:47 +05:30
Mark Story
071c6f0e8b
Merge branch 'sql-dump' into 1.3-misc
2009-12-19 13:32:01 -05:00
Mark Story
42e13edd85
Adding file header to sql dump element.
2009-12-19 13:24:00 -05:00
Mark Story
6efe61d9b2
Removing controller dump and debug = 3 support from View. Controller dumps often cause memory overflow errors, and are generally not useful.
2009-12-19 12:30:31 -05:00
Mark Story
a89fcba243
Updating DboSource::getLog() and showLog() to use a View element.
...
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
cbb29dcc5d
Extracting sql dump generation into a view element.
...
Changing the behavior of DboSource::getLog().
Adding sql dump element to layout.
2009-12-19 12:09:01 -05:00
Mark Story
3eaff3e021
Correcting FormHelper::minute() to fix issues with extracting values from array formatted data. Fixes #107
2009-12-19 11:55:35 -05:00
Mark Story
e8f0ea951a
Updating tests and doc blocks for JsHelper::writeBuffer() to return null if no scripts have been buffered. Fixes #108
2009-12-16 23:48:29 -05:00
kleingeist
2d9b13fe88
Prevent JsHelper::writeBuffer() to return empty lines (or empty onDomReady events)
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 23:36:40 -05:00
Mark Story
8960a01649
Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc
2009-12-16 23:08:00 -05:00
Mark Story
09966a7f63
Adding support for .ttf, .otf, .eot to MediaView. These are common font assets used with @font-face techniques.
2009-12-16 12:48:34 -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
4f985e465b
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-13 23:53:20 -05:00
Joël Perras
7b1ccfff57
Changing error handler to send a HTTP/1.1 500 error when missingTable, missingDatabase or missingConnection is encountered. Increased test coverage of libs/error.php to 100%. Fixes #70 .
2009-12-13 23:53:19 -05:00
Mark Story
f26d5efd0c
Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
...
Tests updated.
Fixes #96
2009-12-10 23:37:55 -05:00
Mark Story
6b657d9a9d
Fixing failing tests due to incorrect merging.
2009-12-08 23:07:43 -05:00
Mark Story
de7658e78b
Modifying FormHelper::create() and FormHelper::secure() to use hidden divs instead of hidden fieldsets. This improves the semantics of FormHelper and allows generated html to more easily pass HTML4.0 validation.
...
Test cases updated.
2009-12-08 22:58:08 -05:00
Mark Story
efa36abdf0
Fixing double merging of url options in paginator helper. This was causing duplicate passed url parameters in next()/prev().
...
Test cases added.
Fixes #391
2009-12-08 10:01:33 -05:00
predominant
13ffd76178
Removing "Long description for file" from /cake/libs tree.
2009-12-08 20:19:02 +11:00
mark_story
24b636cc71
Merge branch 'mergers' into 1.2-merger
...
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00
mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
bbb61b28f7
Merge branch '1.3-misc' into mergers
2009-12-06 21:11:26 -05:00
mark_story
4cefb5fbd0
Applying patch from kleingeist to fix Js->value incorrectly calling Helper::value()
2009-12-06 20:45:12 -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
mark_story
547ed839d9
Correcting constructor of MediaView to fix issues with viewVars not being set.
...
Correcting use of MediaView in Dispatcher. Fixes #366
2009-12-01 09:50:27 -05:00
mark_story
cd46f4db2e
Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370
2009-11-30 09:19:25 -05:00
phpnut
7b78e475ca
Merge branch '1.3' of code.cakephp.org:cakephp into 1.3
2009-11-27 00:55:45 -06:00
phpnut
43fdde2dad
Removing unneeded code in Dispatcher::cached();
...
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
18e0537869
Adding variable initialization
2009-11-26 17:50:33 -05: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
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
mark_story
e345b2f788
Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-25 22:23:38 -05: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
3b1256cefb
Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc
2009-11-24 22:10:11 -05:00
mark_story
69b72083be
Adding docblock and removing a call to array_slice()
2009-11-24 22:06:55 -05:00
dogmatic
53bfc8cca2
a new take on toList and more tests for passing a different separator
2009-11-24 22:00:33 -05:00
dogmatic
398113f828
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0
fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
58446e0785
Adding documentation note about $options['q'] Refs #357
2009-11-24 11:57:56 -05: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
predominant
cf42c8dd7f
Updating default views and baking templates to use $this->Helper syntax for helpers.
2009-11-04 15:52:56 +11:00