Commit graph

767 commits

Author SHA1 Message Date
phpnut
8bc84948f0 Adding more tests for theme assets 2009-11-27 10:27:15 -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
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
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
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
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
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01: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
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05: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
bfde6b81fe Adding test to form helper to increase code coverage. 2009-11-13 09:48:31 -05:00
mark_story
8d407ac915 Adding test to form helper to increase code coverage. 2009-11-13 09:45:25 -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
4a08bd120d Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-07 10:41:12 -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
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
mark_story
380b49a446 Fixing Helper::value() and extraction of habtm data. Refs #256 2009-11-04 14:05:12 -05:00
mark_story
b974127562 Adding tests for habtm data selection. Refs #256 2009-11-04 13:56:44 -05:00
mark_story
1d22adbc1a Merge branch '1.3-misc' into 1.3 2009-11-03 22:50:11 -05:00
renan.saddam
034b5c435c Allowing FormHelper::month() to use a $monthNames array as values. 2009-11-02 13:51:16 -02:00
ceeram
a3775937a4 Tests updated for new output of FormHelper::input
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-02 00:19:01 -05:00
mark_story
a87d31cc7f Fixing $cacheAction requiring the inclusion of the controller name for view cache files to be generated. This behavior makes the cache helper behave as documented.
Test cases added.  Fixes #232
2009-11-02 00:07:02 -05:00
mark_story
d77761e03b Fixing merged test from 1.2 2009-11-01 12:31:57 -05:00
mark_story
35fa099f6a Updating ajax helper test to reflect changes in FormHelper parameter usage. 2009-11-01 12:20:37 -05:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
44d7742b85 Minor refactoring and removal of duplicate test. 2009-10-31 16:28:43 -04:00
tPl0ch
2331cfde60 Added 'before' and 'after' options to FormHelper::submit(). Test cases updated.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-31 16:21:53 -04:00
mark_story
24a75a27bf Updating Javacsript helper to use a real skipIf 2009-10-31 14:25:52 -04:00
mark_story
6726b76077 Refactoring input() to reduce number of method calls.
Applying patch from 'j3ffy' to allow user defined types to override magic select type.
Test case added.
Fixes #5109
2009-10-31 01:45:17 -04:00
mark_story
9ed7a5cd55 Adding new options into doc blocks.
Removing todo as its implemented already.
2009-10-31 00:58:21 -04:00
mark_story
ac302bb6c2 Minor refactoring.
Adding tests for form->create() with file type forms.
2009-10-31 00:08:49 -04:00
mark_story
15da4a7007 Moving tests around to be closer in the file to similar tests.
Reformatting tests.
Adding/updating doc blocks for test methods.
2009-10-30 23:23:33 -04:00
José Lorenzo Rodríguez
adea104edb Allowing output disabling of hidden fields in checkbox and radio input types. closes #6185
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:47:31 -04:00
José Lorenzo Rodríguez
1c47b2182e Adding form encoding default in form create options. Default is always taken from Configure::read('App.encoding'). closes #6042 2009-10-30 22:35:21 -04:00
José Lorenzo Rodríguez
dfc1014fba Making current action be the default for new forms. Updating test accordingly. closes #5353
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:29:49 -04:00
mark_story
55fc72c533 Moving test method and adding doc block. 2009-10-30 22:25:49 -04:00
José Lorenzo Rodríguez
4752fc04da Adding test case to prove it is possible to escape error messages using form::input options parameter, closes #2920 as invalid
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:24:18 -04:00
renan.saddam
e7074c1e5c Moving parameters to $options on Text::truncate() and Text::highlight(). 2009-10-29 01:23:44 -02:00
mark_story
0b232742d9 Adding skip() for CacheHelper test to check if app/tmp/cache/views is writable. 2009-10-22 00:38:37 -04:00
mark_story
dac26d92bc Reformatting tests, and fixing trailing whitespace.
Adding doc comments for new form helper tests.
2009-10-22 00:24:54 -04:00
mark_story
6123ed47c4 Removing empty strings that caused undefined string offset errors.
Trimming trailing spaces.
2009-10-22 00:17:48 -04:00
José Lorenzo Rodríguez
597643cd0c Fixing small error in last commit 2009-10-22 00:17:31 -04:00
José Lorenzo Rodríguez
ce743c00e8 Expanding Helper an View functionaility to accept deep nested entitities.
This allows the form helper to render inputs with arbitrary number of dot separated parts
2009-10-22 00:17:23 -04:00
José Lorenzo Rodríguez
50ec80ff50 Continuing work on Helper::setEntity and associated methods 2009-10-22 00:17:14 -04:00
José Lorenzo Rodríguez
2941e89da3 Making Helper::viewEntity accept any number of levels 2009-10-22 00:16:37 -04:00
renan.saddam
4e8c268536 Making the test more clear by avoind +-2 days thing. Fixes #186. 2009-10-21 19:19:21 -02:00
mark_story
fa6b1b1a20 Changing FormHelper::button() to actually create <button> elements instead of input elements. Test cases added. 2009-10-19 23:57:23 -04:00
mark_story
08f07a9aa4 Changing FormHelper::submit() to be able to create all types of submit buttons. Use 'type' option to create reset or button type inputs.
Test cases added.
2009-10-19 23:44:50 -04:00
jperras
ae342c6f2c Fixing skip in previous commit: if skip condition evaluates to true, to prevent a fatal error from being produced. 2009-10-19 13:22:14 -04:00
jperras
daafac8a64 Merge branch '1.2' of code.cakephp.org:cakephp into 1.2 2009-10-19 12:51:32 -04:00
jperras
7ff3fcc4c4 Adding skip for non-existence of DateTimeZone class in time helper tests. 2009-10-19 12:51:06 -04:00
mark_story
2675bbcd53 Fixing FormHelper::__selectOptions incorrectly selecting options due to type juggling. Fixes #167 2009-10-18 22:05:17 -04:00
mark_story
057e3ff0aa Removing $showEmpty parameter from all select based widgets.
Use attributes[empty] instead.  This change unifies the api between form->input() and other widget methods.
Tests and docblocks updated.
2009-10-17 01:29:16 -04:00
mark_story
0dee625215 Removing escape parameter from para()
Renaming parameters.
2009-10-16 23:14:42 -04:00
mark_story
3c1d134685 Updating doc blocks.
Renaming inline param for style() to oneline.
Removing escape parameters from div() and tag()
2009-10-16 23:11:13 -04:00
mark_story
8e2f58d086 Removing HtmlHelper::css() inline parameter. Use $options[inline] instead.
Adding tests for inline = false script and css generation.
2009-10-16 23:00:31 -04:00
mark_story
6bb53a5c9d Removing HtmlHelper::link()'s escapeTitle parameter. $options[escape] now controls escaping of attributes and title text. 2009-10-16 22:49:44 -04:00
mark_story
7344c0ce7d Removing $inline parameter from HtmlHelper::meta() inline is now an option. 2009-10-16 22:31:56 -04:00
mark_story
f9f2986f48 Implementing Form helper default options. Allows the creation of persistent form options when opening a form.
Adding patch from 'Ceeram' / 'bankai'
Refs #56.
2009-10-16 22:02:07 -04:00
mark_story
6dcc819121 Updating fileheaders. 2009-10-16 22:02:07 -04:00
mark_story
f07df02087 Making JsHelper::set() work well with setting the variables to an object property. 2009-10-16 22:02:06 -04:00
mark_story
4be98b6ed9 Adding JsHelper::set() + test cases. 2009-10-16 22:02:06 -04:00
renan.saddam
43dbf71624 Doing a little optimization for php 5.1 <, also fixing tests on Windows. Fixes #155. 2009-10-15 18:09:58 -03:00
mark_story
906eb82e9b Fixing typo in prototype engine helper. Fixes #172 2009-10-15 11:09:13 -04:00
mark_story
082156f9a1 Fixing FormHelper::input() label's for attribute when a datetime type is created and dateFormat or timeFormat is set to NONE. Fixes #168 2009-10-14 21:17:00 -04:00
mark_story
604b7e0a10 Splitting a long test for FormHelper up into smaller test cases. 2009-10-14 20:10:32 -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
e77ff5ae50 Fixing CacheHelper tests when app/views/posts/index.ctp exists. 2009-10-11 21:42:15 -04:00
mark_story
ee7015c9bd Adding tests for utf8 chars to TextHelper::truncate() 2009-10-07 23:56:38 -04:00
mark_story
0d3ef03b9f Updating file headers. 2009-10-07 23:43:01 -04:00
mark_story
06162d5022 Deprecating TextHelper::trim() as it is an alias for truncate().
Expanding use of mb_ methods.
Tests updated.
2009-10-07 23:43:01 -04:00
mark_story
c47e899ba1 Fixing HtmlHelper::css, and JavascriptHelper::link so that files containing the asset extension always get the extension added. Test cases added. Refs #139 2009-10-02 12:53:20 -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
58ec259714 Merge branch '1.3-router' into 1.3-misc 2009-09-30 00:51:20 -04:00